Changeset 11624 for main

Timestamp:

6 May 2014, 19:00:28 (10 years ago)

Author:

Henrik Bettermann

Message:

Configure new and returning school fee in session configuration objects.

Location:

main/waeup.aaue/trunk

Files:

• CHANGES.txt (modified) (1 diff)
• src/waeup/aaue/etranzact/tests.py (modified) (1 diff)
• src/waeup/aaue/interfaces.py (modified) (11 diffs)
• src/waeup/aaue/students/tests/test_browser.py (modified) (1 diff)
• src/waeup/aaue/students/tests/test_utils.py (modified) (2 diffs)
• src/waeup/aaue/students/utils.py (modified) (2 diffs)

main/waeup.aaue/trunk/CHANGES.txt

@@ -4 +4 @@
 1.2dev (unreleased)
 ===================
+
+* Configure new and returning school fee in session configuration objects.
 
 * Do not create activation code when paying acceptance (= clearance)

main/waeup.aaue/trunk/src/waeup/aaue/etranzact/tests.py

@@ -51 +51 @@
         # Managers can add online payment tickets
         self.browser.addHeader('Authorization', 'Basic mgr:mgrpw')
-        self.app['configuration']['2004'].school_fee = 1234.0
+        self.app['configuration']['2004'].school_fee_1 = 1234.0
         self.browser.open(self.payments_path)
         IWorkflowState(self.student).setState('cleared')

main/waeup.aaue/trunk/src/waeup/aaue/interfaces.py

@@ -35 +35 @@
     #    title = _(u'School Fee Instalments'),
     #    default = 0.0,
-    #    required = False,
+    #    required = True,
     #    )
 
-    school_fee = schema.Float(
-        title = _(u'School Fee (not FP)'),
+    #school_fee = schema.Float(
+    #    title = _(u'School Fee (not FP)'),
+    #    default = 0.0,
+    #    required = True,
+    #    )
+
+    school_fee_1 = schema.Float(
+        title = _(u'Initial School Fee (not FP)'),
         default = 0.0,
-        required = False,
+        required = True,
+        )
+
+    school_fee_2 = schema.Float(
+        title = _(u'Returning School Fee (not FP)'),
+        default = 0.0,
+        required = True,
         )
 
@@ -47 +59 @@
         title = _(u'Application Fee'),
         default = 0.0,
-        required = False,
+        required = True,
         )
 
@@ -53 +65 @@
         title = _(u'Acceptance Fee'),
         default = 0.0,
-        required = False,
+        required = True,
         )
 
@@ -59 +71 @@
         title = _(u'Booking Fee'),
         default = 0.0,
-        required = False,
+        required = True,
         )
 
@@ -65 +77 @@
         title = _(u'Transcript Fee'),
         default = 0.0,
-        required = False,
+        required = True,
         )
 
@@ -73 +85 @@
         title = _(u'Maintenance Fee (ignored)'),
         default = 0.0,
-        required = False,
+        required = True,
         )
 
@@ -79 +91 @@
         title = _(u'Gown Fee'),
         default = 0.0,
-        required = False,
+        required = True,
         )
 
@@ -85 +97 @@
         title = _(u'Transfer Fee'),
         default = 0.0,
-        required = False,
+        required = True,
         )
 
@@ -91 +103 @@
         title = _(u'UG Penalty Fee'),
         default = 0.0,
-        required = False,
+        required = True,
         )
 
@@ -97 +109 @@
         title = _(u'PG Penalty Fee'),
         default = 0.0,
-        required = False,
+        required = True,
         )
 
@@ -103 +115 @@
         title = _(u'Late Registration Fee'),
         default = 0.0,
-        required = False,
+        required = True,
         )
 

main/waeup.aaue/trunk/src/waeup/aaue/students/tests/test_browser.py

@@ -134 +134 @@
         self.assertMatches('...Amount could not be determined...',
                            self.browser.contents)
-        self.app['configuration']['2004'].school_fee = 6666.0
+        self.app['configuration']['2004'].school_fee_1 = 6666.0
         self.browser.getControl(name="form.p_category").value = ['schoolfee']
         # Accepotance fee must be paid first

main/waeup.aaue/trunk/src/waeup/aaue/students/tests/test_utils.py

@@ -43 +43 @@
         self.app['configuration']['2004'].maint_fee = 180.0
         self.app['configuration']['2004'].clearance_fee = 1234.0
-        self.app['configuration']['2004'].school_fee = 6666.0
+        self.app['configuration']['2004'].school_fee_1 = 6666.0
         utils = getUtility(IStudentsUtils)
 
@@ -49 +49 @@
         configuration.academic_session = 2005
         self.app['configuration'].addSessionConfiguration(configuration)
-        self.app['configuration']['2005'].school_fee = 7777.0
+        self.app['configuration']['2005'].school_fee_2 = 7777.0
 
         error, payment = utils.setPaymentDetails('schoolfee',self.student)

main/waeup.aaue/trunk/src/waeup/aaue/students/utils.py

@@ -164 +164 @@
                     amount = 84000.0
                 else:
-                    amount = academic_session.school_fee
+                    amount = academic_session.school_fee_1
             elif student.state == RETURNING or\
                 (student.is_postgrad and student.state == PAID):
@@ -181 +181 @@
                 except KeyError:
                     return _(u'Session configuration object is not available.'), None
-                amount = academic_session.school_fee
+                amount = academic_session.school_fee_2
             else:
                 return _('Wrong state.'), None