Changeset 6898 for main/waeup.sirp/trunk/src/waeup

Timestamp:

15 Oct 2011, 05:04:19 (13 years ago)

Author:

Henrik Bettermann

Message:

In the base package we can only create payment tickets with amount = 0. Amount calculation must be done in customization packages.

Location:

main/waeup.sirp/trunk/src/waeup/sirp/students

Files:

• browser.py (modified) (1 diff)
• utils.py (modified) (1 diff)

main/waeup.sirp/trunk/src/waeup/sirp/students/browser.py

@@ -877 +877 @@
             payment.surcharge_3)  = getPaymentDetails(
             data['p_category'],self.context.__parent__)
-        if payment.amount_auth == 0:
-            self.flash('Payment amount could not be determined.')
-            self.redirect(self.url(self.context, u'@@manage'))
-            return
+        #if payment.amount_auth == 0:
+        #    self.flash('Payment amount could not be determined.')
+        #    self.redirect(self.url(self.context, u'@@manage'))
+        #    return
         self.context[payment.p_id] = payment
         self.flash('Payment ticket created.')

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

@@ -21 +21 @@
     return
 
+# To be defined in customization packages
 def getPaymentDetails(category, student):
-    p_session = student['studycourse'].current_session
+    p_session = None
     surcharge_1 = surcharge_2 = surcharge_3 = 0
     p_item = u''
-    if category == 'transfer':
-        amount = 500
-    elif category == 'gown':
-        amount = 500
-    elif category == 'hostel_maintenance':
-        amount = 300
-    elif category == 'schoolfee':
-        surcharge_1 = 1500 # BT amount
-        surcharge_2 = 300 # Interswitch amount
-        amount = getSchoolFee(student, surcharge_1 + surcharge_2)
-        code = student['studycourse'].certificate.code
-        #session_string = academic_sessions_vocab.by_value[p_session + 1].title
-        p_item = code
-        p_session += 1
+    amount = 0
     return amount, p_item, p_session, surcharge_1, surcharge_2, surcharge_3
-
-# To be moved to the FUTMinna customization package
-def getSchoolFee(student, surcharge):
-    study_mode = student['studycourse'].certificate.study_mode
-    entry_mode = student.entry_mode
-    state = student.state
-    #lga = student.lga
-    lga = 'nothing'
-    current_level = student['studycourse'].current_level
-    CLEARED = 'cleared'
-
-    if study_mode.endswith('_ft'):
-        # fresh remedial
-        if current_level == 0 and state == CLEARED:
-            if entry_mode == 'rmd_ft':
-                return 80200 - surcharge
-            else:
-                return 74200 - surcharge
-        # fresh
-        elif state == CLEARED:
-            if study_mode == 'jm_ft':
-                return 72700 - surcharge
-            elif lga == 'foreigner':
-                return 131500 - surcharge
-            else:
-                return 41500 - surcharge
-        # returning
-        elif state == 'returning':
-            if study_mode == 'jm_ft':
-                return 32500 - surcharge
-            elif lga == 'foreigner':
-                return 109500 - surcharge
-            else:
-                return 19500 - surcharge
-        else:
-            return 0
-    else:
-        return 0