Changeset - 796c8cca18d9
pinaxcon/registrasion/admin.py
Show inline comments
 
new file 100644
 
import models
 

	
 
from django.contrib import admin
 
from django.utils.translation import ugettext_lazy as _
 

	
 
@admin.register(models.AttendeeProfile)
 
class UserProfileAdmin(admin.ModelAdmin):
 
    model = models.AttendeeProfile
 
    list_display = ("name", "company", "name_per_invoice")
pinaxcon/templates/dashboard.html
Show inline comments
...
 
@@ -111,3 +111,3 @@
 
                    <a href="{% url "checkout" %}" class="btn btn-xs btn-default">
 
                        <i class="fa fa-credit-card"></i> Pay your registration
 
                        <i class="fa fa-credit-card"></i> Check out and pay
 
                    </a>
...
 
@@ -131,3 +131,6 @@
 
                    <h5>Items pending payment</h5>
 
                    {% include "registrasion/items_list.html" with items=pending %}
 
                    {% 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 %}
...
 
@@ -136,3 +139,3 @@
 
                  <h5>Paid items</h5>
 
                  {% include "registrasion/items_list.html" with items=purchased %}
 
                  {% include "registrasion/_items_list.html" with items=purchased %}
 
                {% endif %}
...
 
@@ -140,5 +143,3 @@
 
                {% 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>
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/_invoice_details.html
Show inline comments
...
 
@@ -12,3 +12,3 @@
 
    {% endif %}
 
    <li><strong>Recipient:</strong> {{ invoice_user.attendee.attendeeprofilebase.invoice_recipient|linebreaksbr}}</li>
 
    <li><strong>Recipient:</strong> {{ invoice.recipient|linebreaksbr}}</li>
 
  </ul>
pinaxcon/templates/registrasion/_items_list.html
Show inline comments
 
file renamed from pinaxcon/templates/registrasion/items_list.html to pinaxcon/templates/registrasion/_items_list.html
...
 
@@ -3,3 +3,3 @@
 
    {% for item in items %}
 
      <li>{{ item.quantity }} &times; {{ item.product }}</li>
 
      <li>{{ item.quantity }} &times; {{ item.product }} {{ suffix }}</li>
 
    {% endfor %}
pinaxcon/templates/registrasion/amend_registration.html
Show inline comments
...
 
@@ -15,3 +15,3 @@
 

	
 
{% include "registrasion/items_list.html" with items=paid %}
 
{% include "registrasion/_items_list.html" with items=paid %}
 

	
...
 
@@ -19,3 +19,3 @@
 

	
 
{% include "registrasion/items_list.html" with items=cancelled %}
 
{% include "registrasion/_items_list.html" with items=cancelled %}
 

	
pinaxcon/templates/registrasion/credit_note.html
Show inline comments
...
 
@@ -10,3 +10,3 @@
 
    <li><strong>Number:</strong> {{ credit_note.id }}
 
    <li><strong>Attention:</strong> {{ credit_note.invoice.user.attendee.attendeeprofilebase.invoice_recipient }}</li>
 
    <li><strong>Attention:</strong> {{ credit_note.invoice.recipient }}</li>
 
    <li><strong>Value:</strong> {{ credit_note.value }}</li>
pinaxcon/templates/registrasion/discount_list.html
Show inline comments
...
 
@@ -3,3 +3,3 @@
 
    {% for discount in discounts %}
 
      <li>{{ discount.quantity }} &times; {{ discount.clause }}</li>
 
      <li>{{ discount.discount.description }}: {{ discount.quantity }} &times; {{ discount.clause }}</li>
 
    {% endfor %}
pinaxcon/templates/registrasion/guided_registration_complete.html
Show inline comments
 
deleted file
pinaxcon/templates/registrasion/product_category.html
Show inline comments
...
 
@@ -22,3 +22,3 @@
 
      <p>You have already paid for the following items:</p>
 
      {% include "registrasion/items_list.html" with items=items %}
 
      {% include "registrasion/_items_list.html" with items=items %}
 
    {% endif %}
...
 
@@ -39,4 +39,6 @@
 
        <input class="btn btn-primary" type="submit" value="Add to cart" />
 
        <a href="{% url "dashboard" %}" class="btn btn-default">Return to dashboard</a>
 
    </div>
 

	
 

	
 
  </form>
pinaxcon/templates/registrasion/report.html
Show inline comments
...
 
@@ -25,3 +25,3 @@
 
    </tr>
 
    {% for line in report.data %}
 
    {% for line in report.rows %}
 
      <tr>
...
 
@@ -29,6 +29,3 @@
 
          <td>
 
            {% if report.link_view and forloop.counter0 == 0 %}
 
              <a href="{% url report.link_view item %}">
 
            {% endif %}
 
            {{ item }}
 
            {{ item|safe }}
 
          </td>
pinaxcon/templates/registrasion/review.html
Show inline comments
 
new file 100644
 
{% extends "registrasion/base.html" %}
 
{% load bootstrap %}
 
{% load registrasion_tags %}
 

	
 
{% block body %}
 

	
 
  <h1>Review your selection</h1>
 

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

	
 
  <h3>Current selection</h3>
 

	
 
  <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 %}
 

	
 
  {% items_purchased as purchased %}
 
  {% if purchased %}
 
    <p>You've already paid for the following items:</p>
 
    {% 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. Even if your ticket includes complimentary tickets to social
 
        events, or t-shirts, you must still add them to your selection.
 
      </strong>
 
    </p>
 

	
 
    {% include "registrasion/_category_list.html" with categories=missing %}
 

	
 
  {% endif %}
 

	
 
  <p>
 
    <strong>You can also change your selection 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 selections, or return to
 
      the dashboard.</p>
 

	
 
  <div class="form-actions">
 
    <a class="btn btn-primary" 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 %}
0 comments (0 inline, 0 general)