Changeset - 539fa2dfdd2b
[Not reviewed]
make_dev_container.sh
Show inline comments
...
 
@@ -23,3 +23,3 @@ 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
 

	
pinaxcon/registrasion/management/commands/populate_inventory.py
Show inline comments
...
 
@@ -63,3 +63,3 @@ class Command(BaseCommand):
 
                        "For details of what products are included, see our "
 
                        "<a href='https://linux.conf.au/attend/tickets/'>registration page</a>",
 
                        "<a href='https://linux.conf.au/attend/tickets/'>registration page</a>.",
 
            required=True,
...
 
@@ -103,9 +103,6 @@ class Command(BaseCommand):
 
                        "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,
...
 
@@ -131,4 +128,6 @@ class Command(BaseCommand):
 
            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 <a href=\"https://linux.conf.au/attend/shirts\">"
 
                        "sizing guide</a>.",
 
            required=False,
...
 
@@ -357,9 +356,13 @@ class Command(BaseCommand):
 
        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"),
 
            ),
 
            "semi_fitted": ShirtGroup(
 
                "Semi-Fitted",
 
                ("XS", "S", "M", "L", "XL", "2XL"),
 
            ),
 
            "womens": ShirtGroup(
 
                "Women's Classic Fit",
 
                ("8", "10", "12", "14", "16", "18"),
 
            "fitted": ShirtGroup(
 
                "Fitted",
 
                ("XS", "S", "M", "L", "XL", "2XL"),
 
            ),
...
 
@@ -465,3 +468,3 @@ class Command(BaseCommand):
 
            ("description", ),
 
            description="Reserrved for volunteers and organizers",
 
            description="Reserved for volunteers and organisers",
 
            condition=cond.FlagBase.DISABLE_IF_FALSE,
...
 
@@ -565,3 +568,3 @@ class Command(BaseCommand):
 

	
 
        # Speaker dinner tickets are for primary and secondary speakers
 
        # Speaker dinner tickets are for primary speakers only
 
        speaker_dinner_tickets = self.find_or_make(
...
 
@@ -572,3 +575,3 @@ class Command(BaseCommand):
 
            is_presenter=True,
 
            is_copresenter=True,
 
            is_copresenter=False,
 
        )
...
 
@@ -769,3 +772,3 @@ class Command(BaseCommand):
 
            ("description", ),
 
            description="Complimentary for ticket holder staff)",
 
            description="Complimentary for ticket holder (Staff)",
 
        )
pinaxcon/settings.py
Show inline comments
...
 
@@ -362,3 +362,3 @@ ATTENDEE_PROFILE_MODEL = "pinaxcon.registrasion.models.AttendeeProfile"
 
ATTENDEE_PROFILE_FORM = "pinaxcon.registrasion.forms.ProfileForm"
 
INVOICE_CURRENCY = "NZD"
 
INVOICE_CURRENCY = "AUD"
 
TICKET_PRODUCT_CATEGORY = 1
...
 
@@ -548,12 +548,12 @@ SPEAKERS_DINNER_ADULT = SpeakersDinnerCat.create(
 

	
 
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_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))
pinaxcon/templates/_form_snippet.html
Show inline comments
...
 
@@ -12,7 +12,10 @@
 

	
 
<p>
 
{% if form|has_required_fields %}
 
<blockquote>
 
  Fields marked with a * are required
 
</blockquote>
 
Fields marked with a * are required.
 
{% endif %}
 
{% if form|has_price_fields %}
 
<strong>Item prices are before any discount.</strong>
 
{% endif %}
 
</p>
 

	
pinaxcon/templates/registrasion/_invoice_details.html
Show inline comments
...
 
@@ -5,6 +5,6 @@
 
<h3>Linux Australia</h3>
 
<h4>GST #90-792-369</h4>
 
<h4>ABN 56 987 117 479</h4>
 

	
 
<p>
 
  Enquiries: please e-mail <a href="mailto:contact@lca2019.org">contact@lca2019.org</a>
 
  Enquiries: please e-mail <a href="mailto:contact@lca2020.linux.org.au">contact@lca2020.linux.org.au</a>
 
</p>
...
 
@@ -25,3 +25,3 @@
 

	
 
<p>This invoice has been issued as a result of an application to attend {% conference_name %}. All amounts are in New Zealand Dollars (NZD).</p>
 
<p>This invoice has been issued as a result of an application to attend {% conference_name %}. All amounts are in Australian Dollars (AUD).</p>
 

	
...
 
@@ -49,3 +49,3 @@
 
    <tr>
 
      <th colspan="3">Includes 15% New Zealand Goods and Services Tax</th>
 
      <th colspan="3">Includes 10% Australian Goods and Services Tax</th>
 
      <td class="text-right">${{ invoice.value|gst}}</td>
...
 
@@ -89,3 +89,2 @@
 
  ABN 56 987 117 479 <br />
 
  NZ GST #90-792-369
 
<p>
pinaxcon/templates/registrasion/base.html
Show inline comments
 
{% extends "utility_page.html" %}
 
{% extends "site_base.html" %}
 
{% load staticfiles %}
 
{% load lca2018_tags %}
 
{% load i18n %}
 

	
 
{% block head_title %}{% block page_title %}{% endblock %}{% endblock %}
 

	
 
{% block utility_body %}
 
  {% block proposals_body %}
 
  {% endblock %}
 
{% block content_base %}
 
{% block content %}
 
  <div class="jumbotron rego-content">
 
    {% block proposals_body %}
 
    {% endblock %}
 
  </div>
 
{% endblock content %}
 
{% endblock %}
 

	
pinaxcon/templates/registrasion/discount_list.html
Show inline comments
 
{% if discounts %}
 
<div class="my-4 py-4 px-4">
 
  <h4>Discounts and Complimentary Items</h4>
 
  <p>The following discounts and complimentary items are available to you. If you wish to take advantage of this offer, you must choose your items below. The discounts will be applied automatically when you check out.</p>
 
<div class="alert alert-danger my-4 pb-4 text-center">
 
  <h4 class="alert-heading">Discounts and Complimentary Items</h4>
 
  <p>The following discounts and complimentary items are available to you:</p>
 
  {% regroup discounts by discount.description as discounts_grouped %}
 
  <ul class="d-inline-block text-left">
 
  {% for discount_type in discounts_grouped %}
 
  <strong>{{ discount_type.grouper }}</strong>
 
  <ul>
 
    {% for discount in discount_type.list %}
 
    <li>{{ discount.quantity }} &times; {{ discount.clause }}</li>
 
    {% endfor %}
 
  </ul>
 
    <li>
 
      <strong>{{ discount_type.grouper }}</strong>
 
      <ul>
 
        {% for discount in discount_type.list %}
 
        <li>{{ discount.quantity }} &times; {{ discount.clause }}</li>
 
        {% endfor %}
 
      </ul>
 
    </li>
 
  {% endfor %}
 
  </ul>
 
  <p>
 
    <strong>
 
    Please ensure you enter a value in the form below to take advantage of this discount.<br>
 
    The discounts will be applied automatically when you check out.
 
    </strong>
 
  </p>
 
  <p class="mb-0">
 
    <strong>
 
    If you do not enter anything, you will not receive anything from this category.
 
    </strong>
 
  </p>
 
</div>
pinaxcon/templates/registrasion/guided_registration.html
Show inline comments
...
 
@@ -3,4 +3,4 @@
 

	
 
{% block header_title %}Buy Your Ticket{% endblock %}
 
{% block header_paragraph %}Step {{ current_step }} of {{ total_steps|add:1 }} &ndash; {{ title }} {% endblock %}
 
{% block page_title %}Buy Your Ticket{% endblock %}
 
{% block page_lead %}Step {{ current_step }} of {{ total_steps|add:1 }} &ndash; {{ title }} {% endblock %}
 

	
...
 
@@ -10,3 +10,3 @@
 
  {% endfor %}
 
<script type="text/javascript">
 
  <script type="text/javascript">
 
    postcode_label = $("label[for='id_profile-state']");
...
 
@@ -22,5 +22,3 @@
 
        $("#id_profile-country").change();
 

	
 
      </script>
 

	
 
  </script>
 
{% endblock %}
...
 
@@ -28,3 +26,2 @@
 
{% block proposals_body %}
 

	
 
  <form class="form-horizontal" method="POST" action="" enctype="multipart/form-data">
...
 
@@ -40,19 +37,17 @@
 
    <fieldset>
 
        {% if section.discounts %}
 
          {% include "registrasion/discount_list.html" with discounts=section.discounts %}
 
        {% endif %}
 
      {% if section.discounts %}
 
        {% include "registrasion/discount_list.html" with discounts=section.discounts %}
 
      {% endif %}
 

	
 
        {% include "_form_snippet.html" with form=section.form %}
 
      {% include "_form_snippet.html" with form=section.form %}
 

	
 
        <br />
 
      </fieldset>
 
        {% endfor %}
 
      <br />
 
    </fieldset>
 
    {% endfor %}
 

	
 
      {% if current_step > 1 %}
 
      <a class="btn btn-primary" role="button" href="{{ previous_step }}">Back</a>
 
      {% endif %}
 
      <input class="btn btn-primary" type="submit" value="Next Step" />
 
    {% if current_step > 1 %}
 
    <a class="btn btn-secondary" role="button" href="{{ previous_step }}">Back</a>
 
    {% endif %}
 
    <input class="btn btn-primary" type="submit" value="Next Step" />
 
  </form>
 

	
 

	
 
{% endblock %}
pinaxcon/templates/registrasion/invoice.html
Show inline comments
...
 
@@ -5,3 +5,4 @@
 

	
 
{% block header_title %}{% conference_name %}{% endblock %}
 
{% block head_title %}Tax Invoice/Statement #{{ invoice.id }}{% endblock %}
 
{% block page_title %}{% conference_name %}{% endblock %}
 

	
...
 
@@ -9,3 +10,3 @@
 
{% include "registrasion/_invoice_details.html" %}
 
<div class="hidden-print mb-4 pb-4">
 
<div class="d-print-none mb-4 pb-4">
 
  {% if invoice.is_unpaid %}
...
 
@@ -28,3 +29,3 @@
 
  {% if user.is_staff %}
 
  <a class="btn btn-primary" href="{% url "manual_payment" invoice.id %}">Apply manual payment</a>
 
  <a class="btn btn-secondary" href="{% url "manual_payment" invoice.id %}">Apply manual payment</a>
 
  {% endif %}
...
 
@@ -39,4 +40,2 @@
 

	
 

	
 

	
 
{% endblock %}
pinaxcon/templates/registrasion/product_category.html
Show inline comments
...
 
@@ -4,4 +4,3 @@
 

	
 
{% block header_title %}Product Category: {{ category.name }}{% endblock %}
 
{% block header_inset_image %}{% illustration "lavender.svg" %}{% endblock %}
 
{% block page_title %}Product Category: {{ category.name }}{% endblock %}
 

	
...
 
@@ -10,4 +9,2 @@
 
  {{ form.media.js }}
 

	
 

	
 
{% endblock %}
...
 
@@ -16,3 +13,2 @@
 

	
 

	
 
  <form class="form-horizontal my-4" method="post" action="">
...
 
@@ -20,5 +16,2 @@
 

	
 

	
 
    <div class="vertical-bigger"></div>
 

	
 
    {% items_purchased category as items %}
...
 
@@ -28,7 +21,5 @@
 
      {% include "registrasion/_items_list.html" with items=items %}
 

	
 
    {% endif %}
 

	
 

	
 
    <h1>{{ category.name }}</h1>
 
    <h2>{{ category.name }}</h2>
 
    <blockquote>{{ category.description|safe }}</blockquote>
...
 
@@ -40,3 +31,3 @@
 

	
 
      <h2>Make a selection</h2>
 
      <h3>Make a selection</h3>
 
      {% include "_form_snippet.html" with form=form %}
...
 
@@ -44,6 +35,4 @@
 
      <br />
 
      <div class="btn-group">
 
          <input class="btn btn-primary" type="submit" value="Add to cart" />
 
          <a href="{% url "dashboard" %}" class="btn btn-default">Return to dashboard</a>
 
      </div>
 
      <input class="btn btn-primary" type="submit" value="Add to cart" />
 
      <a href="{% url "dashboard" %}" class="btn btn-link">Return to dashboard</a>
 
    </fieldset>
...
 
@@ -51,3 +40,2 @@
 

	
 

	
 
{% endblock %}
pinaxcon/templates/registrasion/review.html
Show inline comments
...
 
@@ -4,5 +4,4 @@
 

	
 
{% block header_title %}Review your selection{% endblock %}
 
{% block header_inset_image %}{% illustration "wineglass.svg" %}{% endblock %}
 
{% block header_paragraph %}
 
{% block page_title %}Review your selection{% endblock %}
 
{% block page_lead %}
 
  Please ensure that you have selected all of the products you require, including
...
 
@@ -24,4 +23,3 @@
 
    <h2>Current selection</h2>
 
    <p>You've selected the following items, which will be in your invoice when
 
      you check out:<p>
 
    <p>You've selected the following items, which will be in your invoice when you check out:<p>
 
    {% include "registrasion/_items_list.html" with items=pending %}
...
 
@@ -41,16 +39,18 @@
 
    <h2>Modify your selection</h2>
 
    <p>
 

	
 
    {% missing_categories as missing %}
 
    {% if missing %}
 
        <strong>You have <em>not</em> selected anything from the following
 
          categories. If your ticket includes any of these, you still need to
 
          make a selection:
 
        </strong>
 
    <div class="alert alert-warning my-4 pb-4">
 
      <h4 class="alert-heading">You have empty categories</h4>
 
      <p>You have <em>not</em> selected anything from the following
 
        categories. If your ticket includes any of these, you still need to
 
        make a selection:
 
      </p>
 

	
 
      {% include "registrasion/_category_list.html" with categories=missing %}
 
      {% endif %}
 
    </p>
 
    </div>
 
    {% endif %}
 

	
 
    <p>
 
      <strong>You can also change your selection from these categories:</strong>
 
      <strong>You can change your selection from these categories:</strong>
 
      {% available_categories as available %}
...
 
@@ -66,3 +66,2 @@
 

	
 

	
 
  <div class="my-4">
...
 
@@ -90,4 +89,2 @@
 

	
 

	
 

	
 
{% endblock %}
pinaxcon/templates/registrasion/stripe/credit_card_payment.html
Show inline comments
...
 
@@ -65,3 +65,3 @@
 

	
 
{% block header_title %}Credit card payment for invoice #{{ invoice.id}}{% endblock %}
 
{% block page_title %}Credit card payment for invoice #{{ invoice.id}}{% endblock %}
 

	
pinaxcon/templates/site_base.html
Show inline comments
...
 
@@ -33,3 +33,3 @@
 
  {% block template_overrides %}{% endblock %}
 
  <header class="clearfix hidden-print">
 
  <header class="clearfix d-print-none">
 
    {% block alert %}{% endblock %}
...
 
@@ -40,3 +40,3 @@
 
  <div class="container my-5 alert alert-primary">
 
    <ul class="messagelist hidden-print list-unstyled">
 
    <ul class="messagelist d-print-none list-unstyled">
 
      {% for message in messages %}
...
 
@@ -49,3 +49,6 @@
 
  <main role="main" class="{% block main_class %}container{% endblock %}">
 
    <h1 class="page-title mb-5">{% block page_title %}{% endblock %}</h1>
 
    <div class="page-header mb-5">
 
      <h1 class="page-title">{% block page_title %}{% endblock %}</h1>
 
      <p class="lead">{% block page_lead %}{% endblock %}</p>
 
    </div>
 

	
...
 
@@ -53,3 +56,2 @@
 
    {% block body_out %}
 

	
 
    <div class="row">
...
 
@@ -100,3 +102,3 @@
 

	
 
  <footer class="footer mt-4">
 
  <footer class="footer mt-4 d-print-none">
 
    <div class="container py-4">
pinaxcon/templates/symposion/dashboard/_categories.html
Show inline comments
...
 
@@ -32,5 +32,5 @@
 

	
 
{% if not user.attendee.completed_registration %}
 
<div class="mb-4">
 
  <div class="row">
 
    {% if not user.attendee.completed_registration %}
 
    <div class="col-12">
...
 
@@ -39,9 +39,10 @@
 
      <div class="mt-auto">
 
        <a class="btn btn-primary" role="button" href="{% url "guided_registration" %}">Get your ticket</a>
 
        <a class="btn btn-lg btn-primary" role="button" href="{% url "guided_registration" %}">Get your ticket</a>
 
      </div>
 
    </div>
 
    </div>
 
  </div>
 
</div>
 
    {% else %}
 
{% else %}
 
<div class="mb-4">
 
  <div class="row">
 
    <div class="col-md-6 my-3 d-flex flex-column">
...
 
@@ -112,2 +113,3 @@
 

	
 
    {% if false %}
 
    <div class="col-md-6 my-3 d-flex flex-column">
...
 
@@ -119,2 +121,3 @@
 
    </div>
 
    {% endif %}
 

	
pinaxcon/templates/utility_page.html
Show inline comments
...
 
@@ -3,3 +3,3 @@
 

	
 
{% block header_title %}{% block page_title %}{% endblock %}{% endblock %}
 
{% block head_title %}{% block page_title %}{% endblock %}{% endblock %}
 

	
pinaxcon/templatetags/lca2019_tags.py
Show inline comments
...
 
@@ -19,2 +19,23 @@ def has_required_fields(form):
 

	
 
@register.filter
 
def has_price_fields(form):
 
    for field in form:
 
        if isinstance(field, Form):
 
            return has_price_fields(field)
 

	
 
        if '$' in field.field.help_text:
 
            return True
 

	
 
        if '$' in field.field.label:
 
            return True
 

	
 
        choices = getattr(field.field, 'choices', [])
 
        if choices:
 
            for choice_id, choice_text in choices:
 
                if '$' in choice_text:
 
                    return True
 

	
 
    return False
 

	
 

	
 
@register.filter
...
 
@@ -43,2 +64,2 @@ def twitter_handle(txt):
 
    # Add @ to twitter handle if not present
 
    return txt if txt.startswith('@') else '@{}'.format(txt)
...
 
\ No newline at end of file
 
    return txt if txt.startswith('@') else '@{}'.format(txt)
static/src/scss/app.scss
Show inline comments
...
 
@@ -63,2 +63,7 @@ h3, .h3 {
 

	
 
.rego-content {
 
    border: 1px solid #000;
 
    background-color: #fff;
 
}
 

	
 
/* END LCA2020 */
...
 
@@ -71,2 +76,4 @@ h3, .h3 {
 

	
 
label.label-required:after { content: ' *'; }
 

	
 
.abstract, .bio, .monospace-text {
...
 
@@ -74,2 +81,2 @@ h3, .h3 {
 
    white-space: pre-wrap;
 
}
...
 
\ No newline at end of file
 
}
vendor/registrasion/registrasion/views.py
Show inline comments
...
 
@@ -347,4 +347,4 @@ def _guided_registration_profile_and_voucher(request):
 
        form=profile_form,
 
        description=("<div class=\"text-info\"><em>You can come back and edit these details any time before January 15, "
 
                     "2018.</em></div>"),
 
        description=("<div class=\"text-info\"><em>You can come back and edit these details any time before "
 
                     "January 6 2020.</em></div>"),
 
    )
0 comments (0 inline, 0 general)