Conservancy/symposion_app
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Don't show T&Cs on the additional products page

Browse source
This commit is contained in:
James Polley 2018-09-30 13:53:55 +10:00
parent b54d4bc04a
commit 455f721b98
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
pinaxcon/settings.py
View file

@ -350,6 +350,7 @@ ATTENDEE_PROFILE_MODEL = "pinaxcon.registrasion.models.AttendeeProfile"
ATTENDEE_PROFILE_FORM = "pinaxcon.registrasion.forms.ProfileForm" ATTENDEE_PROFILE_FORM = "pinaxcon.registrasion.forms.ProfileForm"
INVOICE_CURRENCY = "AUD" INVOICE_CURRENCY = "AUD"
TICKET_PRODUCT_CATEGORY = 1 TICKET_PRODUCT_CATEGORY = 1
TERMS_PRODUCT_CATEGORY = 2
ATTENDEE_PROFILE_FORM = "pinaxcon.registrasion.forms.ProfileForm" ATTENDEE_PROFILE_FORM = "pinaxcon.registrasion.forms.ProfileForm"
#REGIDESK #REGIDESK

6
vendor/registrasion/registrasion/views.py vendored
View file

@ -90,8 +90,9 @@ def guided_registration(request, page_number=None):
page_number: page_number:
1) Profile form (and e-mail address?) 1) Profile form (and e-mail address?)
2) Ticket type 2) Ticket type
3) Remaining products 3) T&C Consent
4) Mark registration as complete 4) Remaining products
5) Mark registration as complete
Returns: Returns:
render: Renders ``registrasion/guided_registration.html``, render: Renders ``registrasion/guided_registration.html``,
@ -272,6 +273,7 @@ def _guided_registration_products(request, mode):
cats = cats.filter(id=settings.TICKET_PRODUCT_CATEGORY) cats = cats.filter(id=settings.TICKET_PRODUCT_CATEGORY)
elif mode == GUIDED_MODE_ALL_ADDITIONAL: elif mode == GUIDED_MODE_ALL_ADDITIONAL:
cats = cats.exclude(id=settings.TICKET_PRODUCT_CATEGORY) cats = cats.exclude(id=settings.TICKET_PRODUCT_CATEGORY)
cats = cats.exclude(id=settings.TERMS_PRODUCT_CATEGORY)
elif mode == GUIDED_MODE_EXCLUDE_COMPLETE: elif mode == GUIDED_MODE_EXCLUDE_COMPLETE:
cats = cats.exclude(id=settings.TICKET_PRODUCT_CATEGORY) cats = cats.exclude(id=settings.TICKET_PRODUCT_CATEGORY)
cats = cats.exclude(id__in=old_cats) cats = cats.exclude(id__in=old_cats)