Fixes for payment form on book page.

diff --git a/src/catalogue/templates/catalogue/book_wide.html b/src/catalogue/templates/catalogue/book_wide.html
index 84eb9dd..d7c2a09 100644 (file)
--- a/src/catalogue/templates/catalogue/book_wide.html
+++ b/src/catalogue/templates/catalogue/book_wide.html
@@ -25,8 +25,6 @@
   <p class="book-box-tools book-box-tools-warn">
     {% chunk "book-preview-warn" %}
   </p>
   <p class="book-box-tools book-box-tools-warn">
     {% chunk "book-preview-warn" %}
   </p>

-
-  {% include "club/payment_info.html" %}

 {% endblock %}
 
 
 {% endblock %}
 
 


@@ -54,8 +52,11 @@
           {% chunk 'club_form_bottom' %}
         </form>
       {% endwith %}
           {% chunk 'club_form_bottom' %}
         </form>
       {% endwith %}

+
+      {% include "club/payment_info.html" %}

     {% endif %}
 
     {% endif %}
 

+

   </div>
 {% endblock %}
 
   </div>
 {% endblock %}
 

diff --git a/src/catalogue/views.py b/src/catalogue/views.py
index 9a36b73..398c61c 100644 (file)
--- a/src/catalogue/views.py
+++ b/src/catalogue/views.py
@@ -18,7 +18,7 @@ from django.views.decorators.cache import never_cache
 
 from ajaxable.utils import AjaxableFormView
 from club.forms import ScheduleForm
 
 from ajaxable.utils import AjaxableFormView
 from club.forms import ScheduleForm

-from club.models import Membership
+from club.models import Club, Membership

 from annoy.models import DynamicTextInsert
 from pdcounter import views as pdcounter_views
 from picture.models import Picture, PictureArea
 from annoy.models import DynamicTextInsert
 from pdcounter import views as pdcounter_views
 from picture.models import Picture, PictureArea


@@ -291,6 +291,7 @@ def book_detail(request, slug):
             'book_children': book.children.all().order_by('parent_number', 'sort_key'),
             'active_menu_item': 'books',
             'club_form': ScheduleForm() if book.preview else None,
             'book_children': book.children.all().order_by('parent_number', 'sort_key'),
             'active_menu_item': 'books',
             'club_form': ScheduleForm() if book.preview else None,

+            'club': Club.objects.first() if book.preview else None,

         })
 
 
         })