Changeset - 123de1a15d6a
Parent rev.
Child rev.
[Not reviewed]
0 7 0
Tobias - 6 years ago 2018-09-29 05:14:21
tobias@localhost.localdomain
Further FE improvements for checkout process
7 files changed with 101 insertions and 145 deletions:
pinaxcon/templates/registrasion/discount_list.html
1
1
pinaxcon/templates/registrasion/invoice.html
18
27
pinaxcon/templates/registrasion/manual_payment.html
1
1
pinaxcon/templates/registrasion/review.html
6
11
pinaxcon/templates/registrasion/stripe/credit_card_payment.html
4
6
pinaxcon/templates/symposion/dashboard/_categories.html
64
99
static/src/scss/app.scss
7
0 comments (0 inline, 0 general)
pinaxcon/templates/registrasion/discount_list.html
➞
Show inline comments
...
 
@@ -6,3 +6,3 @@
 
  {% for discount_type in discounts_grouped %}
 
  <h3>{{ discount_type.grouper }}</h3>
 
  <strong>{{ discount_type.grouper }}</strong>
 
  <ul>
pinaxcon/templates/registrasion/invoice.html
➞
Show inline comments
...
 
@@ -6,14 +6,9 @@
 
{% block header_title %}{% conference_name %}{% endblock %}
 
{% block header_paragraph %}
 
  <p>Monday 22 January&ndash;Friday 26 January 2018.</p>
 
  <p>University of Technology Sydney, New South Wales, Australia.</p>
 
{% endblock %}
 
{% block header_inset_image %}{% illustration "LCA18_nodate.svg" %}{% endblock %}
 
{% block header_background_image %}{% static "lca2018/images/wp_bg_optimised.jpg" %}{% endblock %}
 
{% block content %}
 

			




	
	
	
		
 
<div class="hidden-print">


			




	
	
	
		
 
{% if invoice.is_unpaid %}


			




	
	
	
		
 
{% block proposals_body %}


			




	
	
	
		
 
{% include "registrasion/_invoice_details.html" %}


			




	
	
	
		
 
<div class="hidden-print mb-4 pb-4">


			




	
	
	
		
 
  {% if invoice.is_unpaid %}


			




	
	
	
		
 
  <p>


			




	
	
	
		
 
    <strong>NOTICE:</strong> The below invoice is automatically generated, and 

			




	
	
	
		
 
    <strong>NOTICE:</strong> The above invoice is automatically generated, and


			




	
	
	
		
 
    will be voided if you amend your selections before payment, or if discounts


			




	...
	
		
 
@@ -27,18 +22,15 @@


			




	
	
	
		
 
    <a href="{{ access_url }}">{{ request.scheme }}://{{ request.get_host }}{{ access_url }}</a>


			




	
	
	
		
 
    You can print that page for your records, or give this URL to your accounts department to pay for this invoice</p>


			




	
	
	
		
 

			




	
	
	
		
 
  <div class="btn-group">


			




	
	
	
		
 
    <a class="btn btn-default" href='{% url "registripe_card" invoice.id invoice.user.attendee.access_code %}'>Pay this invoice by card</a>


			




	
	
	
		
 
    {% if user.is_staff %}


			




	
	
	
		
 
      <a class="btn btn-default" href="{% url "manual_payment" invoice.id %}">Apply manual payment</a>


			




	
	
	
		
 
    {% endif %}


			




	
	
	
		
 
  </div>


			




	
	
	
		
 
{% elif invoice.is_paid %}


			




	
	
	
		
 
    You can print that page for your records, or give this URL to your accounts department to pay for this invoice


			




	
	
	
		
 
  </p>


			




	
	
	
		
 

			




	
	
	
		
 
  <a class="btn btn-primary" href='{% url "registripe_card" invoice.id invoice.user.attendee.access_code %}'>Pay this invoice by card</a>


			




	
	
	
		
 

			




	
	
	
		
 
  {% if user.is_staff %}


			




	
	
	
		
 
  <div class="btn_group">


			




	
	
	
		
 
    {% if user.is_staff %}


			




	
	
	
		
 
    <a class="btn btn-default" href="{% url "manual_payment" invoice.id %}">Apply manual payment/refund</a>


			




	
	
	
		
 
    <a class="btn btn-default" href="{% url "refund" invoice.id %}">Refund by issuing credit note</a>


			




	
	
	
		
 
    {% endif %}


			




	
	
	
		
 
  </div>


			




	
	
	
		
 
  <a class="btn btn-primary" href="{% url "manual_payment" invoice.id %}">Apply manual payment</a>


			




	
	
	
		
 
  {% endif %}


			




	
	
	
		
 

			




	
	
	
		
 
  {% elif invoice.is_paid %}


			




	
	
	
		
 
  {% if user.is_staff %}


			




	
	
	
		
 
  <a class="btn btn-default" href="{% url "manual_payment" invoice.id %}">Apply manual payment/refund</a>


			




	
	
	
		
 
  <a class="btn btn-default" href="{% url "refund" invoice.id %}">Refund by issuing credit note</a>


			




	
	
	
		
 
  {% endif %}


			




	...
	
		
 
@@ -46,5 +38,4 @@


			




	
	
	
		
 
</div>


			




	
	
	
		
 
<hr />


			




	
	
	
		
 

			




	
	
	
		
 
{% include "registrasion/_invoice_details.html" %}


			




	
	
	
		
 

			




	
	
	
		
 

			




        

    


    
    

    

        

                

                    pinaxcon/templates/registrasion/manual_payment.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



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


			




	
	
	
		
 

			




	
	
	
		
 
{% block body %}


			




	
	
	
		
 
{% block proposals_body %}


			




	
	
	
		
 

			




        

    


    
    

    

        

                

                    pinaxcon/templates/registrasion/review.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	...
	
		
 
@@ -42,3 +42,3 @@


			




	
	
	
		
 
  {% if purchased %}


			




	
	
	
		
 
  <div class="mb-4">


			




	
	
	
		
 
  <div class="my-4">


			




	
	
	
		
 
    <h3>Previously purchased</h3>


			




	...
	
		
 
@@ -50,6 +50,6 @@


			




	
	
	
		
 
  <div class="my-4">


			




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


			




	
	
	
		
 
    <h3>Modify your selection</h3>


			




	
	
	
		
 
    <p>


			




	
	
	
		
 
    {% missing_categories as missing %}


			




	
	
	
		
 
    {% if missing %}


			




	
	
	
		
 
        <strong>You have <em>not</em> selected anything from the following


			




	...
	
		
 
@@ -60,11 +60,6 @@


			




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


			




	
	
	
		
 
    </div>


			




	
	
	
		
 
    {% endif %}


			




	
	
	
		
 
      {% endif %}


			




	
	
	
		
 
    </p>


			




	
	
	
		
 
  </div>


			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
  <p>


			




        

    


    
    

    

        

                

                    pinaxcon/templates/registrasion/stripe/credit_card_payment.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	...
	
		
 
@@ -66,8 +66,6 @@


			




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


			




	
	
	
		
 
{% block header_inset_image %}{% illustration "casino.svg" %}{% endblock %}


			




	
	
	
		
 
{% block header_paragraph %}


			




	
	
	
		
 
  Pay for your linux.conf.au attendance with your Visa, Mastercard, or American Express credit or debit card. Card payments are processed by <a href="https://stripe.com">Stripe</a>.


			




	
	
	
		
 
{% endblock %}


			




	
	
	
		
 

			




	
	
	
		
 
{% block content %}


			




	
	
	
		
 

			




	
	
	
		
 
{% block proposals_body %}


			




	
	
	
		
 
<p>Pay for your linux.conf.au attendance with your Visa, Mastercard, or American Express credit or debit card. Card payments are processed by <a href="https://stripe.com">Stripe</a>.</p>


			




	
	
	
		
 

			




	...
	
		
 
@@ -79,3 +77,3 @@


			




	
	
	
		
 

			




	
	
	
		
 
  <p>You have ${{ invoice.balance_due }} remaining to pay on this invoice.</p>


			




	
	
	
		
 
  <p>You have <strong>${{ invoice.balance_due }}</strong> remaining to pay on this invoice.</p>


			




	
	
	
		
 

			




        

    


    
    

    

        

                

                    pinaxcon/templates/symposion/dashboard/_categories.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	...
	
		
 
@@ -9,3 +9,3 @@


			




	
	
	
		
 
{% if user.is_staff %}


			




	
	
	
		
 
<div class="container mb-5">


			




	
	
	
		
 
<div class="container mb-4">


			




	
	
	
		
 
  <div class="row">


			




	...
	
		
 
@@ -23,13 +23,12 @@


			




	
	
	
		
 

			




	
	
	
		
 
<div class="container mb-5">


			




	
	
	
		
 
    <div class="row">


			




	
	
	
		
 
      <div class="col-12 text-primary">


			




	
	
	
		
 
        <h2>{% trans "Attend" %} {% conference_name %}</h2>


			




	
	
	
		
 
      </div>


			




	
	
	
		
 
<div class="container mb-4">


			




	
	
	
		
 
  <div class="row">


			




	
	
	
		
 
    <div class="col-12 text-primary">


			




	
	
	
		
 
      <h2>{% trans "Attend" %} {% conference_name %}</h2>


			




	
	
	
		
 
    </div>


			




	
	
	
		
 
  </div>


			




	
	
	
		
 
</div>


			




	
	
	
		
 

			




	
	
	
		
 
<div class="container">


			




	
	
	
		
 

			




	
	
	
		
 
  <div class="page-row">


			




	
	
	
		
 
<div class="container mb-4">


			




	
	
	
		
 
  <div class="row">


			




	
	
	
		
 
    {% if not user.attendee.completed_registration %}


			




	...
	
		
 
@@ -44,7 +43,9 @@


			




	
	
	
		
 
    </div>


			




	
	
	
		
 
  </div>


			




	
	
	
		
 
</div>


			




	
	
	
		
 
    {% else %}


			




	
	
	
		
 
    <div class="col-xs-12 col-sm-6 col-lg-6">


			




	
	
	
		
 
    <div class="col-md-6 my-3 text-primary d-flex flex-column">


			




	
	
	
		
 
      <div class="panel panel-default">


			




	
	
	
		
 
        <div class="panel-heading">


			




	
	
	
		
 
          <h4>Attendee Profile</h4>


			




	
	
	
		
 
          <h3>Attendee Profile</h3>


			




	
	
	
		
 
        </div>


			




	...
	
		
 
@@ -57,6 +58,6 @@


			




	
	
	
		
 
    </div>


			




	
	
	
		
 
    <div class="col-xs-12 col-sm-6 col-lg-6">


			




	
	
	
		
 
    <div class="col-md-6 my-3 text-primary d-flex flex-column">


			




	
	
	
		
 
      <div class="panel panel-default">


			




	
	
	
		
 
        <div class="panel-heading">


			




	
	
	
		
 
          <h4>Account Management</h4>


			




	
	
	
		
 
          <h3>Account Management</h3>


			




	
	
	
		
 
        </div>


			




	...
	
		
 
@@ -68,97 +69,61 @@


			




	
	
	
		
 
    </div>


			




	
	
	
		
 
  </div>


			




	
	
	
		
 
</div>


			




	
	
	
		
 

			




	
	
	
		
 
<div class="container my-4 py-4 text-primary">


			




	
	
	
		
 
  <div class="row">


			




	
	
	
		
 
    {% items_pending as pending %}


			




	
	
	
		
 
    <div class="col-xs-12 col-sm-12 col-lg-12">


			




	
	
	
		
 
      <div class="panel panel-default">


			




	
	
	
		
 
        <div class="panel-heading">


			




	
	
	
		
 
          <h4>Account</h4>


			




	
	
	
		
 
        </div>


			




	
	
	
		
 
        <div class="panel-body">


			




	
	
	
		
 

			




	
	
	
		
 
          {% if pending %}


			




	
	
	
		
 
          <div class="col-xs-12 col-sm-6 col-lg-6">


			




	
	
	
		
 
            <div class="panel panel-warning">


			




	
	
	
		
 
              <div class="panel-heading">


			




	
	
	
		
 
                <h5>Items pending payment</h5>


			




	
	
	
		
 
              </div>


			




	
	
	
		
 
              <div class="panel-body">


			




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


			




	
	
	
		
 
                <div class="right">


			




	
	
	
		
 
                  <a class="btn btn-lg btn-success pull-right" role="button" href="{% url "checkout" %}">Check out and pay</a>


			




	
	
	
		
 
                </div>


			




	
	
	
		
 
              </div>


			




	
	
	
		
 
            </div>


			




	
	
	
		
 
          </div>


			




	
	
	
		
 
          {% endif %}


			




	
	
	
		
 
    <div class="col-12">


			




	
	
	
		
 
      <h2>Account</h2>


			




	
	
	
		
 
    </div>


			




	
	
	
		
 

			




	
	
	
		
 
    {% if pending %}


			




	
	
	
		
 
    <div class="col-6 my-3 d-flex flex-column">


			




	
	
	
		
 
      <h4>Items pending payment</h4>


			




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


			




	
	
	
		
 
      <a class="btn btn-lg btn-success" role="button" href="{% url "checkout" %}">Check out and pay</a>


			




	
	
	
		
 
    </div>


			




	
	
	
		
 
    {% endif %}


			




	
	
	
		
 

			




	
	
	
		
 
          {% items_purchased as purchased %}


			




	
	
	
		
 
          {% if purchased %}


			




	
	
	
		
 
          <div class="col-xs-12 col-sm-6 col-lg-6">


			




	
	
	
		
 
            <div class="panel panel-success">


			




	
	
	
		
 
              <div class="panel-heading">


			




	
	
	
		
 
                <h5>Paid Items</h5>


			




	
	
	
		
 
              </div>


			




	
	
	
		
 
              <div class="panel-body">


			




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


			




	
	
	
		
 
              </div>


			




	
	
	
		
 
            </div>


			




	
	
	
		
 
          </div>


			




	
	
	
		
 
          {% endif %}


			




	
	
	
		
 
          <div class="col-xs-12 col-sm-6 col-lg-6">


			




	
	
	
		
 
            <div class="panel panel-success">


			




	
	
	
		
 
              <div class="panel-heading">


			




	
	
	
		
 
                <h5>Add/Update Items</h5>


			




	
	
	
		
 
              </div>


			




	
	
	
		
 
              <div class="panel-body">


			




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


			




	
	
	
		
 
              </div>


			




	
	
	
		
 
            </div>


			




	
	
	
		
 
          </div>


			




	
	
	
		
 
    {% items_purchased as purchased %}


			




	
	
	
		
 
    {% if purchased %}


			




	
	
	
		
 
    <div class="col-md-6 my-3 d-flex flex-column">


			




	
	
	
		
 
      <h4>Paid Items</h4>


			




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


			




	
	
	
		
 
    </div>


			




	
	
	
		
 
    {% endif %}


			




	
	
	
		
 

			




	
	
	
		
 
          {% invoices as invoices %}


			




	
	
	
		
 
          {% if invoices %}


			




	
	
	
		
 
          <div class="col-xs-12 col-sm-12 col-lg-12">


			




	
	
	
		
 
            <div class="panel panel-info">


			




	
	
	
		
 
              <div class="panel-heading">


			




	
	
	
		
 
                <h5>Invoices</h5>


			




	
	
	
		
 
              </div>


			




	
	
	
		
 
              <div class="panel-body">


			




	
	
	
		
 
                <ul>


			




	
	
	
		
 
                  {% for invoice in invoices %}


			




	
	
	
		
 
                  {% if invoice.is_void %}


			




	
	
	
		
 
                  <li class="void-invoice" style="display: none;">


			




	
	
	
		
 
                    {% else %}


			




	
	
	
		
 
                    <li>


			




	
	
	
		
 
                      {% endif %}


			




	
	
	
		
 
                      <a href="{% url "invoice" invoice.id %}" >Invoice {{ invoice.id }}</a>


			




	
	
	
		
 
                      - ${{ invoice.value }} ({{ invoice.get_status_display }})


			




	
	
	
		
 
                    </li>


			




	
	
	
		
 
                    {% endfor %}


			




	
	
	
		
 
                  </ul>


			




	
	
	
		
 
                  <button id="toggle-void-invoices" onclick="toggleVoidInvoices();">Show void invoices</button>


			




	
	
	
		
 
                </div>


			




	
	
	
		
 
              </div>


			




	
	
	
		
 
            </div>


			




	
	
	
		
 
            {% endif %}


			




	
	
	
		
 
    <div class="col-md-6 my-3 d-flex flex-column">


			




	
	
	
		
 
      <h4>Add/Update Items</h4>


			




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


			




	
	
	
		
 
    </div>


			




	
	
	
		
 

			




	
	
	
		
 
            {% available_credit as credit %}


			




	
	
	
		
 
            {% if credit %}


			




	
	
	
		
 
            <div class="col-xs-12 col-sm-12 col-lg-12">


			




	
	
	
		
 
              <div class="panel panel-danger">


			




	
	
	
		
 
                <div class="panel-heading">


			




	
	
	
		
 
                  <h5>Credit</h5>


			




	
	
	
		
 
                </div>


			




	
	
	
		
 
                <div class="panel-body">


			




	
	
	
		
 
                  <p>You have ${{ credit }} leftover from refunded invoices. This credit will be automatically applied to new invoices. Contact the conference organisers to for a refund to your original payment source.</p>


			




	
	
	
		
 
                </div>


			




	
	
	
		
 
              </div>


			




	
	
	
		
 
            </div>


			




	
	
	
		
 
            {% endif %}


			




	
	
	
		
 
    {% invoices as invoices %}


			




	
	
	
		
 
    {% if invoices %}


			




	
	
	
		
 
    <div class="col-md-6 my-3 d-flex flex-column">


			




	
	
	
		
 
      <h4>Invoices</h4>


			




	
	
	
		
 
      <ul>


			




	
	
	
		
 
        {% for invoice in invoices %}


			




	
	
	
		
 

			




	
	
	
		
 
          </div>


			




	
	
	
		
 
        </div>


			




	
	
	
		
 
        <li{% if invoice.is_void %} class="void-invoice" style="display: none;"{% endif %}>


			




	
	
	
		
 
          <a href="{% url "invoice" invoice.id %}" >Invoice {{ invoice.id }}</a> - ${{ invoice.value }} ({{ invoice.get_status_display }})


			




	
	
	
		
 
        </li>


			




	
	
	
		
 
        {% endfor %}


			




	
	
	
		
 
      </ul>


			




	
	
	
		
 
      <div class="mt-auto">


			




	
	
	
		
 
        <button id="toggle-void-invoices" onclick="toggleVoidInvoices();" class="btn btn-lg btn-default">Show void invoices</button>


			




	
	
	
		
 
      </div>


			




	
	
	
		
 
    </div>


			




	
	
	
		
 
    {% endif %}


			




	
	
	
		
 

			




	
	
	
		
 
      {% endif %}


			




	
	
	
		
 
    {% available_credit as credit %}


			




	
	
	
		
 
    {% if credit %}


			




	
	
	
		
 
    <div class="col-md-6 my-3 text-primary d-flex flex-column">


			




	
	
	
		
 
      <h4>Credit</h4>


			




	
	
	
		
 
      <p>You have ${{ credit }} leftover from refunded invoices. This credit will be automatically applied to new invoices. Contact the conference organisers to for a refund to your original payment source.</p>


			




	
	
	
		
 
    </div>


			




	
	
	
		
 
    {% endif %}


			




	
	
	
		
 
  </div>


			




	
	
	
		
 
</div>


			




	...
	
		
 
\ No newline at end of file


			




	
	
	
		
 
</div>


			




	
	
	
		
 
{% endif %} {# user.attendee.completed_registration #}


			




        

    


    
    

    

        

                

                    static/src/scss/app.scss
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	...
	
		
 
@@ -433,2 +433,9 @@ a.a-img {


			




	
	
	
		
 
    text-transform: capitalize;


			




	
	
	
		
 
}


			




	
	
	
		
 

			




	
	
	
		
 
@media print


			




	
	
	
		
 
{


			




	
	
	
		
 
    .hidden-print {


			




	
	
	
		
 
        display: none !important


			




	
	
	
		
 
    }


			




	
	
	
		
 
}


			




	...
	
		
 
\ No newline at end of file


			




        

    



    


    



    



      

      





    
    0 comments (0 inline, 0 general)
    





    


  

  







    


    

  


    








    
        Server instance: kapok.sfconservancy.org-7611
    
    
        This site is powered by
            Kallithea 0.6.3,
        which is
        © 2010–2020 by various authors & licensed under GPLv3.
            – Support
        – Privacy Policy