Changeset 14616 for main

Timestamp:

9 Mar 2017, 10:42:42 (8 years ago)

Author:

Henrik Bettermann

Message:

Enable balance payments. Add gateway amount to balance amount. No other surcharges.

Location:

main/waeup.kwarapoly/trunk/src/waeup/kwarapoly

Files:

• interswitch/browser.py (modified) (2 diffs)
• students/utils.py (modified) (2 diffs)
• students/viewlets.py (modified) (1 diff)

main/waeup.kwarapoly/trunk/src/waeup/kwarapoly/interswitch/browser.py

@@ -126 +126 @@
         xmldict['institution_acct'] = '0838798044'
         xmldict['institution_bank_id'] = '76'
-        if self.context.p_category == 'schoolfee' \
+        if self.context.p_item == 'Balance':
+            self.pay_item_id = '000'
+            dalash_amt = 0.0
+            provider_amt = 0.0
+            xmldict['institution_acct'] = '0838798044'
+            xmldict['institution_bank_id'] = '76'
+        elif self.context.p_category == 'schoolfee' \
             or self.context.p_category.startswith('carryover'):
             self.pay_item_id = '101'
@@ -201 +207 @@
         # Interswitch amount is not part of the xml data
 
-        if 'maintenance' in self.context.p_category:
+        if 'maintenance' in self.context.p_category \
+            or self.context.p_item == 'Balance':
             xmltext = """<payment_item_detail>
 <item_details detail_ref="%(detail_ref)s" college="%(institution_name)s" department="%(department)s" faculty="%(faculty)s">

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

@@ -28 +28 @@
 from waeup.kofa.fees import FeeTable
 from waeup.kofa.hostels.hostel import NOT_OCCUPIED
+from waeup.kwarapoly.interswitch.browser import GATEWAY_AMT
 from waeup.kwarapoly.interfaces import MessageFactory as _
 
@@ -277 +278 @@
         return None, payment
 
+    def setBalanceDetails(self, category, student,
+            balance_session, balance_level, balance_amount):
+        """Create a balance payment ticket and set the payment data
+        as selected by the student. Kwarapoly: Add Interswitch surcharge
+        """
+        p_item = u'Balance'
+        p_session = balance_session
+        p_level = balance_level
+        p_current = False
+        amount = balance_amount
+        academic_session = self._getSessionConfiguration(p_session)
+        if academic_session == None:
+            return _(u'Session configuration object is not available.'), None
+        if amount in (0.0, None) or amount < 0:
+            return _('Amount must be greater than 0.'), None
+        payment = createObject(u'waeup.StudentOnlinePayment')
+        timestamp = ("%d" % int(time()*10000))[1:]
+        payment.p_id = "p%s" % timestamp
+        payment.p_category = category
+        payment.p_item = p_item
+        payment.p_session = p_session
+        payment.p_level = p_level
+        payment.p_current = p_current
+        payment.amount_auth = amount + GATEWAY_AMT
+        return None, payment
+
     def getAccommodationDetails(self, student):
         """Determine the accommodation data of a student.

main/waeup.kwarapoly/trunk/src/waeup/kwarapoly/students/viewlets.py

@@ -35 +35 @@
         return ''
 
-class AddBalancePaymentActionButton(AddBalancePaymentActionButton):
+#class AddBalancePaymentActionButton(AddBalancePaymentActionButton):
 
-    @property
-    def target_url(self):
-        return ''
+#    @property
+#    def target_url(self):
+#        return ''
 
 class AdmissionNotificationActionButton(ManageActionButton):