Changeset - 2ab4cf10b83a
Parent rev.
Child rev.
[Not reviewed]
2 3 1
Scott Bragg - 8 years ago 2016-06-18 03:00:56
jsbragg@scriptforge.org
Disables registrasion app for production deployment. (#7)

* Disable registraison for production environment
Fixes lca2017/symposion#12
6 files changed with 80 insertions and 492 deletions:
fixtures/registrasion.json
393
fixtures/users.json
20
pinaxcon/settings.py
3
3
pinaxcon/templates/dashboard.html
2
73
pinaxcon/templates/registrasion/dashboard-widget.html
72
pinaxcon/urls.py
3
3
0 comments (0 inline, 0 general)
fixtures/registrasion.json
➞
Show inline comments
 
deleted file
fixtures/users.json
➞
Show inline comments
 
deleted file
pinaxcon/settings.py
➞
Show inline comments
...
 
@@ -154,15 +154,15 @@ INSTALLED_APPS = [
 
    "symposion.teams",
 

			




	
	
	
		
 
    # Registrasion


			




	
	
	
		
 
    "registrasion",


			




	
	
	
		
 
    #"registrasion",


			




	
	
	
		
 

			




	
	
	
		
 
    #admin - required by registrasion ??


			




	
	
	
		
 
    "nested_admin",


			




	
	
	
		
 
    #"nested_admin",


			




	
	
	
		
 

			




	
	
	
		
 
    # project


			




	
	
	
		
 
    "pinaxcon",


			




	
	
	
		
 
    "pinaxcon.proposals",


			




	
	
	
		
 
    "pinaxcon.registrasion",


			




	
	
	
		
 
    #"pinaxcon.registrasion",


			




	
	
	
		
 

			




	
	
	
		
 
    #testing


			




	
	
	
		
 
    "django_nose",


			




        

    


    
    

    

        

                

                    pinaxcon/templates/dashboard.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	...
	
		
 
@@ -4,7 +4,7 @@


			




	
	
	
		
 
{% load proposal_tags %}


			




	
	
	
		
 
{% load review_tags %}


			




	
	
	
		
 
{% load teams_tags %}


			




	
	
	
		
 
{% load registrasion_tags %}


			




	
	
	
		
 
{# {% load registrasion_tags %} #}


			




	
	
	
		
 

			




	
	
	
		
 
{% block head_title %}Dashboard{% endblock %}


			




	
	
	
		
 

			




	...
	
		
 
@@ -94,78 +94,7 @@


			




	
	
	
		
 
        {% 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> Pay your registration


			




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


			




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


			




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


			




	
	
	
		
 
          </div>


			




	
	
	
		
 
    </div>


			




	
	
	
		
 
{# {% include 'registrasion/dashboard-widget.html' %} #}


			




	
	
	
		
 

			




	
	
	
		
 
    <div class="panel panel-default">


			




	
	
	
		
 
        <div class="panel-heading">


			




        

    


    
    

    

        

                

                    pinaxcon/templates/registrasion/dashboard-widget.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
	
		
 
new file 100644

			




	
	
	
		
 
    <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> Pay your registration


			




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


			




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


			




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


			




	
	
	
		
 
          </div>


			




	
	
	
		
 
    </div>


			




        

    


    
    

    

        

                

                    pinaxcon/urls.py
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	...
	
		
 
@@ -28,11 +28,11 @@ urlpatterns = [


			




	
	
	
		
 
    url(r"^", include("pinax.pages.urls")),


			




	
	
	
		
 

			




	
	
	
		
 
    # Required by registrasion


			




	
	
	
		
 
    url(r'^register/', include('registrasion.urls')),


			




	
	
	
		
 
    url(r'^nested_admin/', include('nested_admin.urls')),


			




	
	
	
		
 
#    url(r'^register/', include('registrasion.urls')),


			




	
	
	
		
 
#    url(r'^nested_admin/', include('nested_admin.urls')),


			




	
	
	
		
 

			




	
	
	
		
 
    # Demo payment gateway and related features


			




	
	
	
		
 
    url(r"^register/pinaxcon/", include("pinaxcon.registrasion.urls")),


			




	
	
	
		
 
#    url(r"^register/pinaxcon/", include("pinaxcon.registrasion.urls")),


			




	
	
	
		
 
]


			




	
	
	
		
 

			




	
	
	
		
 
urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)


			




        

    



    


    



    



      

      





    
    0 comments (0 inline, 0 general)
    





    


  

  







    


    

  


    








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