{% block page_title %}{% endblock %}
+{% block page_title %}{% endblock %}
+{% block page_lead %}{% endblock %}
+diff --git a/make_dev_container.sh b/make_dev_container.sh
index 919b7d6a..4ed7cd61 100755
--- a/make_dev_container.sh
+++ b/make_dev_container.sh
@@ -21,7 +21,7 @@ docker exec symposion ./manage.py migrate
docker exec symposion ./manage.py loaddata ./fixtures/{conference,sites,sitetree,flatpages}.json
docker exec symposion ./manage.py create_review_permissions
docker exec symposion ./manage.py loaddata ./fixtures/????/*.json
-#docker exec symposion ./manage.py populate_inventory
+docker exec symposion ./manage.py populate_inventory
if [ -e ./symposion-tools ]; then
pushd ./symposion-tools
diff --git a/pinaxcon/registrasion/management/commands/populate_inventory.py b/pinaxcon/registrasion/management/commands/populate_inventory.py
index c0877d34..ec274571 100644
--- a/pinaxcon/registrasion/management/commands/populate_inventory.py
+++ b/pinaxcon/registrasion/management/commands/populate_inventory.py
@@ -61,7 +61,7 @@ class Command(BaseCommand):
name="Ticket",
description="Each type of ticket has different included products. "
"For details of what products are included, see our "
- "registration page",
+ "registration page.",
required=True,
render_type=inv.Category.RENDER_TYPE_RADIO,
limit_per_user=1,
@@ -101,13 +101,10 @@ class Command(BaseCommand):
name="Speakers' Dinner Ticket",
description="Tickets to our exclusive Speakers' Dinner on the "
"evening of "
- f"{settings.SPEAKER_DINNER_TICKET_DATE: %A %d %B}. "
- "You may purchase up "
- "to 5 tickets in total, for significant others and "
- "family members.",
+ f"{settings.SPEAKER_DINNER_TICKET_DATE: %A %d %B}.",
required=False,
render_type=inv.Category.RENDER_TYPE_QUANTITY,
- limit_per_user=5,
+ limit_per_user=1,
order=30,
)
self.pdns_category = self.find_or_make(
@@ -129,8 +126,10 @@ class Command(BaseCommand):
inv.Category,
("name",),
name="Shirt",
- description="Commemorative conference polo shirts, featuring the "
- f"linux.conf.au {settings.LCA_START.year} artwork.",
+ description="Commemorative conference shirts, featuring the "
+ f"linux.conf.au {settings.LCA_START.year} artwork. "
+ "View the "
+ "sizing guide.",
required=False,
render_type=inv.Category.RENDER_TYPE_ITEM_QUANTITY,
order=50,
@@ -355,13 +354,17 @@ class Command(BaseCommand):
# Shirts
ShirtGroup = namedtuple("ShirtGroup", ("prefix", "sizes"))
shirt_names = {
- "mens": ShirtGroup(
- "Men's/Straight Cut",
- ("S", "M", "L", "XL", "2XL", "3XL", "4XL"),
+ "straight": ShirtGroup(
+ "Straight Cut",
+ ("S", "M", "L", "XL", "2XL", "3XL", "4XL", "5XL"),
),
- "womens": ShirtGroup(
- "Women's Classic Fit",
- ("8", "10", "12", "14", "16", "18"),
+ "semi_fitted": ShirtGroup(
+ "Semi-Fitted",
+ ("XS", "S", "M", "L", "XL", "2XL"),
+ ),
+ "fitted": ShirtGroup(
+ "Fitted",
+ ("XS", "S", "M", "L", "XL", "2XL"),
),
}
@@ -463,7 +466,7 @@ class Command(BaseCommand):
volunteer_ticket_cap = self.find_or_make(
cond.TimeOrStockLimitFlag,
("description", ),
- description="Reserrved for volunteers and organizers",
+ description="Reserved for volunteers and organisers",
condition=cond.FlagBase.DISABLE_IF_FALSE,
limit=62,
)
@@ -563,14 +566,14 @@ class Command(BaseCommand):
speaker_tickets.proposal_kind.set(self.main_conference_proposals)
speaker_tickets.products.set([self.ticket_speaker, ])
- # Speaker dinner tickets are for primary and secondary speakers
+ # Speaker dinner tickets are for primary speakers only
speaker_dinner_tickets = self.find_or_make(
cond.SpeakerFlag,
("description", ),
description="Speaker dinner tickets",
condition=cond.FlagBase.ENABLE_IF_TRUE,
is_presenter=True,
- is_copresenter=True,
+ is_copresenter=False,
)
speaker_dinner_tickets.proposal_kind.set(self.main_conference_proposals)
speaker_dinner_tickets.categories.set([self.speakers_dinner_ticket, ])
@@ -767,7 +770,7 @@ class Command(BaseCommand):
ticket_staff_inclusions = self.find_or_make(
cond.IncludedProductDiscount,
("description", ),
- description="Complimentary for ticket holder staff)",
+ description="Complimentary for ticket holder (Staff)",
)
ticket_staff_inclusions.enabling_products.set([
self.ticket_team,
diff --git a/pinaxcon/settings.py b/pinaxcon/settings.py
index cc0c83f0..e3d62ad5 100644
--- a/pinaxcon/settings.py
+++ b/pinaxcon/settings.py
@@ -360,7 +360,7 @@ PROPOSAL_FORMS = {
# Registrasion bits:
ATTENDEE_PROFILE_MODEL = "pinaxcon.registrasion.models.AttendeeProfile"
ATTENDEE_PROFILE_FORM = "pinaxcon.registrasion.forms.ProfileForm"
-INVOICE_CURRENCY = "NZD"
+INVOICE_CURRENCY = "AUD"
TICKET_PRODUCT_CATEGORY = 1
TERMS_PRODUCT_CATEGORY = 2
ATTENDEE_PROFILE_FORM = "pinaxcon.registrasion.forms.ProfileForm"
@@ -546,14 +546,14 @@ SPEAKERS_DINNER_ADULT = SpeakersDinnerCat.create(
"Includes an adult's meal and full beverage service.",
timedelta(hours=1))
-SPEAKERS_DINNER_CHILD = SpeakersDinnerCat.create(
- "Child", Decimal("60.00"),
- "Children 14 and under. "
- "Includes a child's meal and soft drink service.",
- timedelta(hours=1))
+# SPEAKERS_DINNER_CHILD = SpeakersDinnerCat.create(
+# "Child", Decimal("60.00"),
+# "Children 14 and under. "
+# "Includes a child's meal and soft drink service.",
+# timedelta(hours=1))
-SPEAKERS_DINNER_INFANT = SpeakersDinnerCat.create(
- "Infant", Decimal("00.00"),
- "Infant must be seated in an adult's lap. "
- "No food or beverage service.",
- timedelta(hours=1))
+# SPEAKERS_DINNER_INFANT = SpeakersDinnerCat.create(
+# "Infant", Decimal("00.00"),
+# "Infant must be seated in an adult's lap. "
+# "No food or beverage service.",
+# timedelta(hours=1))
diff --git a/pinaxcon/templates/_form_snippet.html b/pinaxcon/templates/_form_snippet.html
index c0d40045..01609625 100644
--- a/pinaxcon/templates/_form_snippet.html
+++ b/pinaxcon/templates/_form_snippet.html
@@ -10,10 +10,13 @@
{% endif %}
+
{% if form|has_required_fields %} -
- Fields marked with a * are required -+Fields marked with a * are required. {% endif %} +{% if form|has_price_fields %} +Item prices are before any discount. +{% endif %} + {{ form|crispy }} diff --git a/pinaxcon/templates/registrasion/_invoice_details.html b/pinaxcon/templates/registrasion/_invoice_details.html index aac6070e..51609ba7 100644 --- a/pinaxcon/templates/registrasion/_invoice_details.html +++ b/pinaxcon/templates/registrasion/_invoice_details.html @@ -3,10 +3,10 @@
- Enquiries: please e-mail contact@lca2019.org + Enquiries: please e-mail contact@lca2020.linux.org.au
This invoice has been issued as a result of an application to attend {% conference_name %}. All amounts are in New Zealand Dollars (NZD).
+This invoice has been issued as a result of an application to attend {% conference_name %}. All amounts are in Australian Dollars (AUD).
Includes 15% New Zealand Goods and Services Tax | +Includes 10% Australian Goods and Services Tax | ${{ invoice.value|gst}} |
---|