Changeset 15796 for main/kofacustom.nigeria/trunk/src/kofacustom/nigeria/etranzact

Timestamp:

12 Nov 2019, 08:23:13 (5 years ago)

Author:

Henrik Bettermann

Message:

Payment slip must not be downloadable before adding surcharges.

Location:

main/kofacustom.nigeria/trunk/src/kofacustom/nigeria/etranzact

Files:

• applicantsbrowser.py (modified) (4 diffs)
• payoutletbrowser.py (modified) (8 diffs)
• studentsbrowser.py (modified) (4 diffs)

main/kofacustom.nigeria/trunk/src/kofacustom/nigeria/etranzact/applicantsbrowser.py

@@ -43 +43 @@
     grok.require('waeup.payApplicant')
     icon = 'actionicon_pay.png'
-    text = _('Pay via Etranzact')
+    text = _('Pay via Etranzact WebConnect')
     target = 'goto_etranzact'
 
@@ -61 +61 @@
     grok.require('waeup.payApplicant')
     icon = 'actionicon_call.png'
-    text = _('Requery Etranzact History')
+    text = _('Requery Etranzact WebConnect History')
     target = 'requery_history'
 
@@ -69 +69 @@
             self.context.__parent__.__parent__.year, self.context):
             return ''
-        if self.context.p_state in ('paid', 'waived'):
+        if self.context.p_state in ('paid', 'waived', 'scholarship'):
             return ''
         return self.view.url(self.view.context, self.target)
@@ -185 +185 @@
             self.context.__parent__.__parent__.year, self.context):
             return
-        if self.context.p_state in ('paid', 'waived'):
+        if self.context.p_state in ('paid', 'waived', 'scholarship'):
             self.flash(_('This ticket has already been paid.'), type='danger')
             return

main/kofacustom.nigeria/trunk/src/kofacustom/nigeria/etranzact/payoutletbrowser.py

@@ -31 +31 @@
 from waeup.kofa.students.viewlets import ApprovePaymentActionButton as APABStudent
 from waeup.kofa.applicants.viewlets import ApprovePaymentActionButton as APABApplicant
+from waeup.kofa.students.viewlets import PaymentReceiptActionButton as PRABStudent
+from waeup.kofa.applicants.viewlets import PaymentReceiptActionButton as PRABApplicant
 from kofacustom.nigeria.interswitch.browser import (
     InterswitchActionButtonStudent,
@@ -57 +59 @@
     grok.require('waeup.payApplicant')
     grok.order(3)
-    icon = 'actionicon_call.png'
-    text = _('Enter Etranzact PIN')
+    icon = 'actionicon_pay.png'
+    text = _('Pay via Etranzact PayOutlet')
     target = 'enterpin'
 
@@ -66 +68 @@
             self.context.__parent__.__parent__.year, self.context):
             return ''
-        if self.context.p_state in ('paid', 'waived'):
+        if self.context.p_state in ('paid', 'waived', 'scholarship'):
             return ''
         return self.view.url(self.view.context, self.target)
@@ -74 +76 @@
     grok.require('waeup.payStudent')
     grok.order(3)
-    icon = 'actionicon_call.png'
-    text = _('Enter Etranzact PIN')
+    icon = 'actionicon_pay.png'
+    text = _('Pay via Etranzact PayOutlet')
     target = 'enterpin'
 
@@ -83 +85 @@
             self.context.student.current_session, self.context):
             return ''
-        if self.context.p_state in ('paid', 'waived'):
+        if self.context.p_state in ('paid', 'waived', 'scholarship'):
             return ''
         return self.view.url(self.view.context, self.target)
@@ -96 +98 @@
 
     buttonname = _('Submit to Etranzact')
-    label = _('Requery Etranzact History')
+    label = _('Requery Etranzact PayOutlet History')
     action = 'query_payoutlet_history'
     placeholder = _('Confirmation Number (PIN)')
@@ -123 +125 @@
     grok.template('enterpin')
 
+    buttonname = _('Submit to Etranzact')
+    label = _('Requery Etranzact PayOutlet History')
+    action = 'query_payoutlet_history'
+    placeholder = _('Confirmation Number (PIN)')
+    gateway_amt = GATEWAY_AMT
+
     def update(self):
         if not payoutlet_module_activated(
             self.context.__parent__.__parent__.year, self.context):
             return
-        super(EtranzactEnterPinPageStudent, self).update()
+        super(EtranzactEnterPinPageApplicant, self).update()
         # Already now it becomes an Etranzact payment. We set the net amount
         # and add the gateway amount.
@@ -136 +144 @@
             self.context.r_company = u'etranzact'
         return
+
+class PayoutletPaymentReceiptActionButtonApplicant(PRABApplicant):
+
+    grok.view(EtranzactEnterPinPageApplicant)
+
+    @property
+    def target_url(self):
+        if not self.context.r_company:
+            return ''
+        return self.view.url(self.view.context, self.target)
+
+class PayoutletPaymentReceiptActionButtonStudent(PRABStudent):
+
+    grok.view(EtranzactEnterPinPageStudent)
+
+    @property
+    def target_url(self):
+        if not self.context.r_company:
+            return ''
+        return self.view.url(self.view.context, self.target)
 
 class EtranzactQueryHistoryPageStudent(UtilityView, grok.View):

main/kofacustom.nigeria/trunk/src/kofacustom/nigeria/etranzact/studentsbrowser.py

@@ -52 +52 @@
     grok.require('waeup.payStudent')
     icon = 'actionicon_pay.png'
-    text = _('Pay via Etranzact')
+    text = _('Pay via Etranzact WebConnect')
     target = 'goto_etranzact'
 
@@ -70 +70 @@
     grok.require('waeup.payStudent')
     icon = 'actionicon_call.png'
-    text = _('Requery Etranzact History')
+    text = _('Requery Etranzact WebConnect History')
     target = 'requery_history'
 
@@ -78 +78 @@
             self.context.student.current_session, self.context):
             return ''
-        if self.context.p_state in ('paid', 'waived'):
+        if self.context.p_state in ('paid', 'waived', 'scholarship'):
             return ''
         return self.view.url(self.view.context, self.target)
@@ -194 +194 @@
             self.context.student.current_session, self.context):
             return
-        if self.context.p_state in ('paid', 'waived'):
+        if self.context.p_state in ('paid', 'waived', 'scholarship'):
             self.flash(_('This ticket has already been paid.'), type='danger')
             return