diff --git a/pinaxcon/registrasion/models.py b/pinaxcon/registrasion/models.py index 276641e2..2267c9c6 100644 --- a/pinaxcon/registrasion/models.py +++ b/pinaxcon/registrasion/models.py @@ -135,7 +135,7 @@ class AttendeeProfile(rego.AttendeeProfileBase): ) country = CountryField( verbose_name="Country", - default="AU", + default="US", ) state = models.CharField( max_length=256, @@ -146,8 +146,7 @@ class AttendeeProfile(rego.AttendeeProfileBase): of_legal_age = models.BooleanField( verbose_name="Are you over 18?", help_text="Being under 18 will not stop you from attending the " - "conference. We need to know whether you are over 18 to " - "allow us to cater for you at venues that serve alcohol.", + "conference.", blank=True, ) dietary_restrictions = models.CharField( @@ -185,6 +184,7 @@ class AttendeeProfile(rego.AttendeeProfileBase): "Linux Australia " "membership.", blank=True, + default=False, ) lca_announce = models.BooleanField( diff --git a/pinaxcon/settings.py b/pinaxcon/settings.py index 2388b514..ef98098c 100644 --- a/pinaxcon/settings.py +++ b/pinaxcon/settings.py @@ -376,8 +376,8 @@ MAIN_CONFERENCE_PROPOSAL_KINDS = ("Talk",) # Registrasion bits: ATTENDEE_PROFILE_MODEL = "pinaxcon.registrasion.models.AttendeeProfile" ATTENDEE_PROFILE_FORM = "pinaxcon.registrasion.forms.ProfileForm" -INVOICE_CURRENCY = "AUD" -GST_RATE = Decimal('0.1') +INVOICE_CURRENCY = "USD" +GST_RATE = Decimal('0') TICKET_PRODUCT_CATEGORY = 1 TERMS_PRODUCT_CATEGORY = 2 ATTENDEE_PROFILE_FORM = "pinaxcon.registrasion.forms.ProfileForm"