Changeset 17963

Timestamp:

26 Nov 2024, 02:34:19 (7 weeks ago)

Author:

Henrik Bettermann

Message:

Let JUPEB students pay by instalments.

Location:

main/waeup.uniben/trunk/src/waeup/uniben

Files:

• remita/browser.py (modified) (1 diff)
• students/payments.py (modified) (1 diff)
• students/tests/test_browser.py (modified) (1 diff)
• students/utils.py (modified) (2 diffs)
• utils/utils.py (modified) (4 diffs)

main/waeup.uniben/trunk/src/waeup/uniben/remita/browser.py

@@ -153 +153 @@
         reduced_inst_amt = 0.0
         lab_amt = 0.0
-        if self.context.p_category == 'schoolfee' and \
+        if self.context.p_category in ('schoolfee', 'schoolfee_1') and \
             not self.context.p_item == 'Balance':
             provider_amt = self.dynamic_provider_amt(self.context.student)

main/waeup.uniben/trunk/src/waeup/uniben/students/payments.py

@@ -62 +62 @@
         log = 'successful %s payment: %s' % (self.p_category, self.p_id)
         msg = _('Payment successfully completed')
-        if self.p_category in ('schoolfee',):
+        if self.p_category in ('schoolfee', 'schoolfee_1'):
             msg += _('. Please proceed to library clearance, register your '
                    'courses online and proceed to your '

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

@@ -810 +810 @@
         return
 
+    def test_set_payment_details_jupeb(self):
+        # JUPEB students can pay by instalments
+        utils = getUtility(IStudentsUtils)
+        self.certificate.study_mode = 'found'
+        IWorkflowState(self.student).setState('cleared')
+        error, payment = utils.setPaymentDetails(
+            'schoolfee', self.student, None, None, None)
+        self.assertEqual(payment.p_level, 100)
+        self.assertEqual(payment.p_session, 2004)
+        self.assertEqual(payment.amount_auth, 220000.0)
+        self.assertEqual(payment.p_item, u'CERT1')
+        self.assertEqual(error, None)
+        error, payment = utils.setPaymentDetails(
+            'schoolfee_1', self.student, None, None, None)
+        self.assertEqual(payment.p_level, 100)
+        self.assertEqual(payment.p_session, 2004)
+        self.assertEqual(payment.amount_auth, 110000.0)
+        self.assertEqual(payment.p_item, u'CERT1')
+        self.assertEqual(error, None)
+        return
+        error, payment = utils.setPaymentDetails(
+            'secondinstall', self.student, None, None, None)
+        self.assertEqual(payment.p_level, 100)
+        self.assertEqual(payment.p_session, 2004)
+        self.assertEqual(payment.amount_auth, 110000.0)
+        self.assertEqual(payment.p_item, u'CERT1')
+        self.assertEqual(error, None)
+
     def test_edit_level_by_co(self):
         # Create clearance officer

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

@@ -493 +493 @@
             else:
                 amount = 60000.0
+
+        elif student.state == CLEARED \
+                and student.is_jupeb and category in ('schoolfee', 'schoolfee_1',
+                                                      'secondinstall'):
+            try:
+                certificate = student['studycourse'].certificate
+                p_item = certificate.code
+            except (AttributeError, TypeError):
+                return _('Study course data are incomplete.'), None
+            amount = 220000.0
+            if category in ('schoolfee_1', 'secondinstall'):
+                amount /= 2
+
         elif category == 'schoolfee':
             try:
@@ -580 +593 @@
             if student.is_staff:
                 amount /= 2
-
         else:
             fee_name = category + '_fee'

main/waeup.uniben/trunk/src/waeup/uniben/utils/utils.py

@@ -74 +74 @@
     PAYMENT_CATEGORIES = {
         'schoolfee': 'School Fee',
+        'schoolfee_1': 'School Fee (1st instalment)',
+        'secondinstall':'School Fee (2nd instalment)',
         'clearance': 'Acceptance Fee',
         'bed_allocation': 'Bed Allocation Fee',
@@ -126 +128 @@
     REPORTABLE_PAYMENT_CATEGORIES = {
         'schoolfee': 'School Fee',
+        'schoolfee_1': 'School Fee (1st instalment)',
+        'secondinstall':'School Fee (2nd instalment)',
         'clearance': 'Acceptance Fee',
         'bed_allocation': 'Bed Allocation Fee',
@@ -133 +137 @@
 
     def selectable_payment_categories(self, student):
-        return self.SELECTABLE_PAYMENT_CATEGORIES
+        spc = deepcopy(self.SELECTABLE_PAYMENT_CATEGORIES)
+        if student.is_jupeb:
+            spc[schoolfee_1] =  'School Fee (1st instalment)'
+            spc[secondinstal] = 'School Fee (2nd instalment)'
+        return spc
 
     PREVIOUS_PAYMENT_CATEGORIES = deepcopy(SELECTABLE_PAYMENT_CATEGORIES)
@@ -147 +155 @@
         'sf_return': 'School Fee - Returning',
         'maint_all': 'Accomm. Fee - All',
-        'cl_all':    'Accept. Fee- All',
+        'cl_all':    'Accept. Fee - All',
         'cl_jupeb':  'Accept. Fee - JUPEB',
         'cl_allexj': 'Accept. Fee - All except JUPEB',