Changeset - 4f46c715289a
[Not reviewed]
0 3 1
Christopher Neugebauer - 8 years ago 2016-09-14 03:51:16
chrisjrn@gmail.com
Makes the review screen *much* more comprehensive.

Fixes #7
4 files changed with 50 insertions and 9 deletions:
0 comments (0 inline, 0 general)
pinaxcon/templates/dashboard.html
Show inline comments
...
 
@@ -48,195 +48,193 @@
 
                <tr>
 
                    <th>Title</th>
 
                    <th>Session type</th>
 
                    <th>Status</th>
 
                    <th>Actions</th>
 
                </tr>
 
                {% for proposal in user.speaker_profile.proposals.all %}
 
                    {% include "symposion/proposals/_proposal_row.html" %}
 
                {% endfor %}
 
            </table>
 
        {% endif %}
 

	
 
        {% if user.speaker_profile %}
 
            {% associated_proposals as associated_proposals %}
 
            {% if associated_proposals %}
 
                <div class="panel-body">
 
                    <h4>Proposals you have joined as an additional speaker</h4>
 
                </div>
 
                <table class="table">
 
                    <tr>
 
                        <th>Title</th>
 
                        <th>Session type</th>
 
                        <th>Status</th>
 
                        <th>Actions</th>
 
                    </tr>
 
                    {% for proposal in associated_proposals %}
 
                        {% include "symposion/proposals/_proposal_row.html" %}
 
                    {% endfor %}
 
                </table>
 
            {% endif %}
 

	
 
            {% pending_proposals as pending_proposals %}
 
            {% if pending_proposals %}
 
                <div class="panel-body"><h4>Proposals you have been invited to join</h4></div>
 
                <table class="table">
 
                    <tr>
 
                        <th>Title</th>
 
                        <th>Session type</th>
 
                        <th>Status</th>
 
                        <th>Actions</th>
 
                    </tr>
 
                    {% for proposal in pending_proposals %}
 
                        {% include "symposion/proposals/_pending_proposal_row.html" %}
 
                    {% endfor %}
 
                </table>
 
            {% endif %}
 
        {% endif %}
 
    </div>
 

	
 
    <div class="panel panel-default">
 
        <div class="panel-heading">
 
            <div class="pull-right">
 
                {% if not user.attendee.completed_registration %}
 
                    <a href="{% url "guided_registration" %}" class="btn btn-xs btn-default">
 
                        <i class="fa fa-plus-sign"></i> Register for the conference
 
                    </a>
 
                {% else %}
 
                  <a href="{% url "attendee_edit" %}" class="btn btn-xs btn-default">
 
                      <i class="fa fa-pencil"></i> Edit your attendee profile
 
                  </a>
 

	
 
                  {% items_pending as pending %}
 
                  {% if pending %}
 
                    <a href="{% url "checkout" %}" class="btn btn-xs btn-default">
 
                        <i class="fa fa-credit-card"></i> Check out and pay
 
                    </a>
 
                  {% endif %}
 
                {% endif %}
 
            </div>
 
            <h3 class="panel-title">
 
              <i class="fa fa-ticket"></i>
 
                {% trans "Registration" %}
 
            </h3>
 

	
 
        </div>
 

	
 
        <div class="panel-body">
 
            {% if not user.attendee.completed_registration %}
 
                <p>To attend the conference, you must purchase a ticket. <a href="{% url "guided_registration" %}">Use our registration form to purchase your ticket</a>.
 
            {% else %}
 
              <h4>Your registration</h4>
 
                  {% items_pending as pending %}
 
                  {% if pending %}
 
                    <h5>Items pending payment</h5>
 
                    {% include "registrasion/items_list.html" with items=pending %}
 
                    <p><a href="{% url "checkout" %}" class="btn btn-xs btn-default">
 
                        <i class="fa fa-credit-card"></i>
 
                        Check out and pay for these items.</a></p>
 
                  {% endif %}
 
                {% items_purchased as purchased %}
 
                {% if purchased %}
 
                  <h5>Paid items</h5>
 
                  {% include "registrasion/items_list.html" with items=purchased %}
 
                {% endif %}
 
                <h5>Add/Update items</h5>
 
                {% available_categories as categories %}
 
                {% for category in categories %}
 
                  <li><a href="{% url "product_category" category.id %}">{{ category.name }}</a></li>
 
                {% endfor %}
 
                {% include "registrasion/_category_list.html" with categories=categories %}
 
              </ul>
 

	
 
              {% invoices as invoices %}
 
              {% if invoices %}
 
              <h5>Invoices</h5>
 
                <ul>
 
                  {% for invoice in invoices %}
 
                    {% if not invoice.is_void %}
 
                      <li>
 
                          <a href="{% url "invoice" invoice.id %}">Invoice {{ invoice.id }}</a>
 
                          - ${{ invoice.value }} ({{ invoice.get_status_display }})
 
                      </li>
 
                    {% endif %}
 
                  {% endfor %}
 
                </ul>
 
              {% endif %}
 

	
 
              {% available_credit as credit %}
 
              {% if credit %}
 
                <p>You have ${{ credit }} leftover from refunded invoices. Contact the conference organisers
 
                  to put this toward other purchases, or to refund it.</p>
 
              {% endif %}
 
            {% endif %}
 

	
 
          {% if user.is_staff %}
 
            <h4>Registration reports</h4>
 

	
 
            <p><a href="{% url "reports_list" %}">View available reports</a>.
 
            </p>
 
          {% endif %}
 
          </div>
 
    </div>
 

	
 
    <div class="panel panel-default">
 
        <div class="panel-heading">
 
            <div class="pull-right header-actions">
 
                {% if not user.sponsorships.exists %}
 
                    <a href="{% url "sponsor_apply" %}" class="btn btn-xs btn-default">
 
                        <i class="fa fa-plus-sign"></i>
 
                        Apply to be a sponsor
 
                    </a>
 
                {% endif %}
 
            </div>
 
            <h3 class="panel-title">
 
                <i class="fa fa-briefcase"></i>
 
                {% trans "Sponsorship" %}
 
            </h3>
 
        </div>
 

	
 
        <div class="panel-body">
 
            {% if not user.sponsorships.exists %}
 
                <p>If you or your organization would be interested in sponsorship opportunities, <a href="{% url "sponsor_apply" %}">use our online form to apply to be a sponsor</a>.
 
            {% else %}
 
                <h4>Your Sponsorship</h4>
 
                <ul class="list-group">
 
                    {% for sponsorship in user.sponsorships.all %}
 
                        <li class="list-group-item">
 
                            <a href="{% url "sponsor_detail" sponsorship.pk %}"><b>{{ sponsorship.name }}</b></a>
 
                            ({{ sponsorship.level }})
 
                            {% if not sponsorship.active %}
 
                                <span class="label label-warning">awaiting approval</span>
 
                            {% endif %}
 
                        </li>
 
                    {% endfor %}
 
                </ul>
 
            {% endif %}
 
            {% if user.is_staff %}
 
                <p>
 
                    As staff, you can directly <a href="{% url "sponsor_add" %}">add a sponsor</a> if the organization isn't
 
                    applying themselves.
 
                </p>
 
            {% endif %}
 
        </div>
 
    </div>
 

	
 
    {% if review_sections %}
 
        <div class="panel panel-default">
 
            <div class="panel-heading">
 
                <h3 class="panel-title">
 
                    <i class="fa fa-briefcase"></i>
 
                    {% trans "Reviews" %}
 
                </h3>
 
            </div>
 
            <div class="panel-body">
 
                <h4>Reviews by Section</h4>
 
                <ul>
 
                    {% for section in review_sections %}
 
                        <h5>{{ section }}</h5>
 
                        <li><a href="{% url "review_section" section.section.slug %}">All</a></li>
 
                        <li><a href="{% url "user_reviewed" section.section.slug %}">Reviewed by you</a></li>
 
                        <li><a href="{% url "user_not_reviewed" section.section.slug %}">Not Reviewed by you</a></li>
 
                    {% endfor %}
 
                </ul>
 

	
 
                {% comment %}
 
                <h4>My Assignments</h4>
pinaxcon/templates/registrasion/_category_list.html
Show inline comments
 
new file 100644
 
<ul>
 
  {% for category in categories %}
 
    {% if not category in exclude %}
 
      <li><a href="{% url "product_category" category.id %}">{{ category.name }}</a></li>
 
    {% endif %}
 
  {% endfor %}
 
</ul>
pinaxcon/templates/registrasion/guided_registration_complete.html
Show inline comments
 
{% extends "registrasion/base.html" %}
 
{% load bootstrap %}
 
{% load registrasion_tags %}
 

	
 
{% block body %}
 

	
 
  <h1>Conference Registration – Review</h1>
 
  <h1>Review your selection</h1>
 

	
 
  {% items_pending as pending %}
 
  {% if pending %}
 

	
 
  <p><em>Step 4 of 4</em></p>
 
  <h3>Current selection</h3>
 

	
 
  <p>You're almost done! You've selected the following items:<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 %}
 

	
 
  <p>You've already paid for the following items:</p>
 
  {% items_purchased as purchased %}
 
  {% if purchased %}
 
    {% include "registrasion/items_list.html" with items=purchased suffix="(PAID)" %}
 
  {% endif %}
 

	
 

	
 
  {% missing_categories as missing %}
 

	
 
  <h3>Add to your selection</h3>
 

	
 
  <p>You can add these items now, or you can come back and add them in a
 
    later purchase. </p>
 

	
 
  {% if missing %}
 

	
 
    <p>
 
      <strong>You have <em>not</em> selected any items from the following
 
        categories:</strong>
 
    </p>
 
    {% include "registrasion/_category_list.html" with categories=missing %}
 

	
 
  {% endif %}
 

	
 
  <h3></h3>
 

	
 
  <p><strong>You can also select more items from these categories:</strong></p>
 

	
 
  {% available_categories as available %}
 
  {% include "registrasion/_category_list.html" with categories=available exclude=missing %}
 

	
 
  <h3>What next?</h3>
 

	
 
  <p>You can either generate an invoice and pay for your registration, or return to
 
    the dashboard to make amendments.</p>
 
      the dashboard.</p>
 

	
 
  <div class="form-actions">
 
    <a class="btn btn-default" href="{% url "checkout" %}">Check out and pay</a>
 
    <a class="btn btn-default" href="{% url "checkout" %}">
 
      <i class="fa fa-credit-card"></i> Check out and pay
 
    </a>
 
    <a class="btn btn-default" href="{% url "dashboard" %}">Return to dashboard</a>
 
  </div>
 

	
 
  {% else %}
 

	
 
  <p>You have no items that need to be paid.</p>
 

	
 
  <div class="form-actions">
 
    <a class="btn btn-default" href="{% url "dashboard" %}">Return to dashboard</a>
 
  </div>
 

	
 
  {% endif %}
 

	
 
{% endblock %}
pinaxcon/templates/registrasion/items_list.html
Show inline comments
 
{% if items %}
 
  <ul>
 
    {% for item in items %}
 
      <li>{{ item.quantity }} &times; {{ item.product }}</li>
 
      <li>{{ item.quantity }} &times; {{ item.product }} {{ suffix }}</li>
 
    {% endfor %}
 
  </ul>
 
{% endif %}
0 comments (0 inline, 0 general)