Changeset - 12e4d0a3cb24
Parent rev.
Child rev.
[Not reviewed]
0 6 0
Christopher Neugebauer - 8 years ago 2016-04-01 11:14:39
chrisjrn@gmail.com
flake8
6 files changed with 26 insertions and 17 deletions:
registrasion/models.py
1
registrasion/templatetags/registrasion_tags.py
1
registrasion/tests/test_discount.py
16
4
registrasion/tests/test_refund.py
5
registrasion/views.py
7
6
setup.py
2
1
0 comments (0 inline, 0 general)
registrasion/models.py
➞
Show inline comments
...
 
@@ -6,3 +6,2 @@ import itertools
 
from django.core.exceptions import ValidationError
 
from django.core.exceptions import ObjectDoesNotExist
 
from django.contrib.auth.models import User
registrasion/templatetags/registrasion_tags.py
➞
Show inline comments
...
 
@@ -52,2 +52,3 @@ def items_purchased(context):
 

			




	
	
	
		
 

			




	
	
	
		
 
@register.filter


			




        

    


    
    

    

        

                

                    registrasion/tests/test_discount.py
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	...
	
		
 
@@ -384,3 +384,7 @@ class DiscountTestCase(RegistrationCartTestCase):


			




	
	
	
		
 
        cart.add_to_cart(self.PROD_1, 1)  # Enable the discount


			




	
	
	
		
 
        discounts = discount.available_discounts(self.USER_1, [], [self.PROD_2])


			




	
	
	
		
 
        discounts = discount.available_discounts(


			




	
	
	
		
 
            self.USER_1,


			




	
	
	
		
 
            [],


			




	
	
	
		
 
            [self.PROD_2],


			




	
	
	
		
 
        )


			




	
	
	
		
 
        self.assertEqual(1, len(discounts))


			




	...
	
		
 
@@ -391,3 +395,3 @@ class DiscountTestCase(RegistrationCartTestCase):


			




	
	
	
		
 
        cart = CartController.for_user(self.USER_1)


			




	
	
	
		
 
        cart.add_to_cart(self.PROD_2, 2) # The discount will be exhausted


			




	
	
	
		
 
        cart.add_to_cart(self.PROD_2, 2)  # The discount will be exhausted


			




	
	
	
		
 
        cart.cart.active = False


			




	...
	
		
 
@@ -395,3 +399,7 @@ class DiscountTestCase(RegistrationCartTestCase):


			




	
	
	
		
 

			




	
	
	
		
 
        discounts = discount.available_discounts(self.USER_1, [], [self.PROD_2])


			




	
	
	
		
 
        discounts = discount.available_discounts(


			




	
	
	
		
 
            self.USER_1,


			




	
	
	
		
 
            [],


			




	
	
	
		
 
            [self.PROD_2],


			




	
	
	
		
 
        )


			




	
	
	
		
 
        self.assertEqual(0, len(discounts))


			




	...
	
		
 
@@ -401,3 +409,7 @@ class DiscountTestCase(RegistrationCartTestCase):


			




	
	
	
		
 

			




	
	
	
		
 
        discounts = discount.available_discounts(self.USER_1, [], [self.PROD_2])


			




	
	
	
		
 
        discounts = discount.available_discounts(


			




	
	
	
		
 
            self.USER_1,


			




	
	
	
		
 
            [],


			




	
	
	
		
 
            [self.PROD_2],


			




	
	
	
		
 
        )


			




	
	
	
		
 
        self.assertEqual(1, len(discounts))


			




        

    


    
    

    

        

                

                    registrasion/tests/test_refund.py
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
	
		
 
import datetime


			




	
	
	
		
 
import pytz


			




	
	
	
		
 

			




	
	
	
		
 
from decimal import Decimal


			




	
	
	
		
 
from django.core.exceptions import ValidationError


			




	
	
	
		
 

			




	
	
	
		
 
from registrasion import models as rego


			




	
	
	
		
 
from registrasion.controllers.cart import CartController


			




        

    


    
    

    

        

                

                    registrasion/views.py
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
	
		
 
import symposion.speakers


			




	
	
	
		
 
import sys


			




	...
	
		
 
@@ -36,2 +35,3 @@ GuidedRegistrationSection.__new__.__defaults__ = (


			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
def get_form(name):


			




	...
	
		
 
@@ -42,2 +42,3 @@ def get_form(name):


			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
@login_required


			




	...
	
		
 
@@ -52,3 +53,2 @@ def guided_registration(request, page_id=0):


			




	
	
	
		
 

			




	
	
	
		
 
    dashboard = redirect("dashboard")


			




	
	
	
		
 
    next_step = redirect("guided_registration")


			




	...
	
		
 
@@ -73,3 +73,4 @@ def guided_registration(request, page_id=0):


			




	
	
	
		
 
    if not profile:


			




	
	
	
		
 
        # TODO: if voucherform is invalid, make sure that profileform does not save


			




	
	
	
		
 
        # TODO: if voucherform is invalid, make sure


			




	
	
	
		
 
        # that profileform does not save


			




	
	
	
		
 
        voucher_form, voucher_handled = handle_voucher(request, "voucher")


			




	...
	
		
 
@@ -139,3 +140,2 @@ def guided_registration(request, page_id=0):


			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
    if sections and request.method == "POST":


			




	...
	
		
 
@@ -152,3 +152,3 @@ def guided_registration(request, page_id=0):


			




	
	
	
		
 
        "sections": sections,


			




	
	
	
		
 
        "title" : title,


			




	
	
	
		
 
        "title": title,


			




	
	
	
		
 
        "total_steps": 3,


			




	...
	
		
 
@@ -167,2 +167,3 @@ def edit_profile(request):


			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
def handle_profile(request, prefix):


			




	...
	
		
 
@@ -187,3 +188,2 @@ def handle_profile(request, prefix):


			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
    name_field = ProfileForm.Meta.model.name_field()


			




	...
	
		
 
@@ -208,2 +208,3 @@ def handle_profile(request, prefix):


			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
@login_required


			




        

    


    
    

    

        

                

                    setup.py
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	...
	
		
 
@@ -22,3 +22,4 @@ setup(


			




	
	
	
		
 
    version=registrasion.__version__,


			




	
	
	
		
 
    description="A registration app for the Symposion conference management system.",


			




	
	
	
		
 
    description="A registration app for the Symposion conference management "


			




	
	
	
		
 
                "system.",


			




	
	
	
		
 
    url="http://github.com/chrisjrn/registrasion/",


			




        

    



    


    



    



      

      





    
    0 comments (0 inline, 0 general)
    





    


  

  







    


    

  


    








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