Changeset 8259 for main/waeup.uniben/trunk/src/waeup/uniben/interswitch

Timestamp:

23 Apr 2012, 14:06:39 (13 years ago)

Author:

Henrik Bettermann

Message:

Implement acceptance fee payments via Interswitch (part 2)

Location:

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

Files:

• browser.py (modified) (7 diffs)
• browser_templates/applicant_goto_interswitch.pt (modified) (2 diffs)
• browser_templates/student_goto_interswitch.pt (modified) (2 diffs)

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

@@ -28 +28 @@
 from waeup.kofa.students.viewlets import RequestCallbackActionButton as RCABStudent
 from waeup.kofa.applicants.viewlets import RequestCallbackActionButton as RCABApplicant
+from waeup.kofa.payments.interfaces import payment_categories
 from waeup.uniben.students.utils import actions_after_student_payment
 from waeup.uniben.applicants.utils import actions_after_applicant_payment
@@ -34 +35 @@
 #    Interswitch test account data:
 #
-#    Card Number: 6274807700000007
-#    Expiry Date: July 2012
-#    PIN: 0000
-
-#    Card Number: 6278050000000007
-#    Expiry Date: July 2012
-#    PIN: 0000
+#   Card Number: 6274807700000007
+#   Expiry Date: July 2012
+#   PIN: 0000
+
+#   Card Number: 6278050000000007
+#   Expiry Date: July 2012
+#   PIN: 0000
+#
+#   PAN,EXPIRY,PIN,CVV2
+#   5060990330000003386,1304,0000,543
+#   5060990330000003394,1304,0000,865
+#   5060990330000003402,1304,0000,012
+#   5060990330000003410,1304,0000,737
+#   5060990330000003428,1304,0000,310
+#   5060990330000003436,1304,0000,173
 
 PRODUCT_ID = '57'
@@ -160 +169 @@
 
 class InterswitchActionButtonStudent(RCABStudent):
-    grok.order(2)
+    grok.order(1)
     grok.context(ICustomStudentOnlinePayment)
     icon = 'actionicon_pay.png'
@@ -173 +182 @@
 
 class InterswitchActionButtonApplicant(RCABApplicant):
-    grok.order(2)
+    grok.order(1)
     grok.context(ICustomApplicantOnlinePayment)
     icon = 'actionicon_pay.png'
@@ -186 +195 @@
 
 # Deprecated
-class InterswitchRequestCallbackActionButtonStudent(RCABStudent):
-    grok.order(3)
+#class InterswitchRequestCallbackActionButtonStudent(RCABStudent):
+#    grok.order(3)
+#    grok.context(ICustomStudentOnlinePayment)
+#    icon = 'actionicon_call.png'
+#    text = _('Request CollegePAY callback')
+
+#    def target_url(self):
+#        if self.context.p_state == 'paid':
+#            return ''
+#        site_redirect_url = self.view.url(self.view.context, 'isw_callback')
+#        args = {
+#            'transRef':self.context.p_id,
+#            'prodID':PRODUCT_ID,
+#            'redirectURL':site_redirect_url}
+#        return QUERY_URL + '?%s' % urllib.urlencode(args)
+
+# Alternative preferred solution
+class InterswitchRequestWebserviceActionButtonStudent(RCABStudent):
+    grok.order(2)
     grok.context(ICustomStudentOnlinePayment)
     icon = 'actionicon_call.png'
-    text = _('Request CollegePAY callback')
-
-    def target_url(self):
-        if self.context.p_state == 'paid':
-            return ''
-        site_redirect_url = self.view.url(self.view.context, 'isw_callback')
-        args = {
-            'transRef':self.context.p_id,
-            'prodID':PRODUCT_ID,
-            'redirectURL':site_redirect_url}
-        return QUERY_URL + '?%s' % urllib.urlencode(args)
-
-# Alternative preferred solution
-class InterswitchRequestWebserviceActionButtonStudent(RCABStudent):
-    grok.order(4)
-    grok.context(ICustomStudentOnlinePayment)
-    icon = 'actionicon_call.png'
-    text = _('Request CollegePAY webservice')
+    text = _('Request CollegePAY Webservice')
     target = 'request_webservice'
 
 class InterswitchRequestWebserviceActionButtonApplicant(RCABApplicant):
-    grok.order(4)
+    grok.order(2)
     grok.context(ICustomApplicantOnlinePayment)
     icon = 'actionicon_call.png'
-    text = _('Request CollegePAY webservice')
+    text = _('Request CollegePAY Webservice')
     target = 'request_webservice'
 
@@ -252 +261 @@
         self.amount = (self.context.amount_auth + self.context.surcharge_1 +
             self.context.surcharge_2 + self.context.surcharge_3)
+        self.category = payment_categories.getTermByToken(
+            self.context.p_category).title
         self.amount_100 = 100 * self.amount
         self.local_date_time = str(self.context.creation_date)
@@ -267 +278 @@
 
     def update(self):
-        if self.context.p_state != 'unpaid':
-            self.flash(_("Payment ticket can't be re-send to CollegePAY."))
-            self.redirect(self.url(self.context, '@@index'))
-            return
+        #if self.context.p_state != 'unpaid':
+        #    self.flash(_("Payment ticket can't be re-send to CollegePAY."))
+        #    self.redirect(self.url(self.context, '@@index'))
+        #    return
         self.applicant = self.context.__parent__
         xmldict = {}
         xmldict['department'] = None
         xmldict['faculty'] = None
+        self.category = payment_categories.getTermByToken(
+            self.context.p_category).title
         self.amount = (self.context.amount_auth + self.context.surcharge_1 +
             self.context.surcharge_2 + self.context.surcharge_3)

main/waeup.uniben/trunk/src/waeup/uniben/interswitch/browser_templates/applicant_goto_interswitch.pt

@@ -50 +50 @@
           Payment Category:</td>
         <td>
-          <span tal:replace="view/context/p_category">PAYMENTCATEGORY</span>
+          <span tal:replace="view/category">PAYMENTCATEGORY</span>
         </td>
       </tr>
@@ -63 +63 @@
   <input type="hidden" name="local_date_time" tal:attributes="value view/local_date_time" />
   <input type="hidden" name="amount" tal:attributes="value view/amount_100" />
-
   <input type="hidden" name="txn_ref" tal:attributes="value view/context/p_id" />
-  <input type="hidden" name="cust_id_desc" tal:attributes="value view/context/p_item" />
-  <input type="hidden" name="pay_item_name" tal:attributes="value view/context/p_category" />
-
+  <input type="hidden" name="pay_item_name" tal:attributes="value view/context/p_item" />
+  <input type="hidden" name="cust_id_desc" tal:attributes="value view/category" />
   <input type="hidden" name="cust_id" tal:attributes="value view/applicant/applicant_id" />
   <input type="hidden" name="cust_name" tal:attributes="value view/applicant/display_fullname" />
-
 
   <input type="hidden" name="payment_params" value="college_split" />

main/waeup.uniben/trunk/src/waeup/uniben/interswitch/browser_templates/student_goto_interswitch.pt

@@ -50 +50 @@
           Payment Category:</td>
         <td>
-          <span tal:replace="view/context/p_category">PAYMENTCATEGORY</span>
+          <span tal:replace="view/category">PAYMENTCATEGORY</span>
         </td>
       </tr>
@@ -63 +63 @@
   <input type="hidden" name="local_date_time" tal:attributes="value view/local_date_time" />
   <input type="hidden" name="amount" tal:attributes="value view/amount_100" />
-
   <input type="hidden" name="txn_ref" tal:attributes="value view/context/p_id" />
-  <input type="hidden" name="cust_id_desc" tal:attributes="value view/context/p_item" />
-  <input type="hidden" name="pay_item_name" tal:attributes="value view/context/p_category" />
-
+  <input type="hidden" name="pay_item_name" tal:attributes="value view/context/p_item" />
+  <input type="hidden" name="cust_id_desc" tal:attributes="value view/category" />
   <input type="hidden" name="cust_id" tal:attributes="value view/student/student_id" />
   <input type="hidden" name="cust_name" tal:attributes="value view/student/display_fullname" />
-
 
   <input type="hidden" name="payment_params" value="college_split" />