Changeset 13584 for main/kofacustom.nigeria/trunk/src/kofacustom/nigeria

Timestamp:

11 Jan 2016, 06:09:59 (9 years ago)

Author:

Henrik Bettermann

Message:

Do not change payment date after verification.

Location:

main/kofacustom.nigeria/trunk/src/kofacustom/nigeria/interswitch

Files:

• browser.py (modified) (4 diffs)
• helpers.py (modified) (4 diffs)

main/kofacustom.nigeria/trunk/src/kofacustom/nigeria/interswitch/browser.py

@@ -119 +119 @@
             self.context, self.product_id,
             self.gateway_host, self.gateway_url,
-            self.https, self.mac)
+            self.https, self.mac, False)
         student.writeLogMessage(self, log)
         if not success:
@@ -156 +156 @@
             self.context, self.product_id,
             self.gateway_host, self.gateway_url,
-            self.https, self.mac)
+            self.https, self.mac, False)
         applicant.writeLogMessage(self, log)
         if not success:
@@ -193 +193 @@
             self.context, self.product_id,
             self.gateway_host, self.gateway_url,
-            self.https, self.mac)
+            self.https, self.mac, True)
         student.writeLogMessage(self, log)
         if not success:
@@ -226 +226 @@
             self.context, self.product_id,
             self.gateway_host, self.gateway_url,
-            self.https, self.mac)
+            self.https, self.mac, True)
         applicant.writeLogMessage(self, log)
         if not success:

main/kofacustom.nigeria/trunk/src/kofacustom/nigeria/interswitch/helpers.py

@@ -93 +93 @@
     return parsed_json
 
-def query_interswitch_SOAP(payment, product_id, host, url, https):
+def query_interswitch_SOAP(payment, product_id, host, url, https, verify):
     sr = get_SOAP_response(product_id, payment.p_id, host, url, https)
     if sr.startswith('Connection error'):
@@ -132 +132 @@
         return False, msg, log
     payment.p_state = 'paid'
-    payment.payment_date = datetime.utcnow()
+    if not verify:
+        payment.payment_date = datetime.utcnow()
     msg = _('Successful callback received.')
     log = 'valid callback for %s payment %s: %s' % (
@@ -139 +140 @@
     return True, msg, log
 
-def query_interswitch(payment, product_id, host, url, https, mac):
+def query_interswitch(payment, product_id, host, url, https, mac, verify):
     # If no mac mac key is given, fall back to deprecated SOAP method
     # (Uniben, AAUA, FCEOkene).
     if mac == None:
-        return query_interswitch_SOAP(payment, product_id, host, url, https)
+        return query_interswitch_SOAP(
+            payment, product_id, host, url, https, verify)
     jr = get_JSON_response(product_id, payment.p_id, host, url,
                            https, mac, payment.amount_auth)
@@ -196 +198 @@
         return False, msg, log
     payment.p_state = 'paid'
-    payment.payment_date = datetime.utcnow()
+    if not verify:
+        payment.payment_date = datetime.utcnow()
     msg = _('Successful callback received')
     log = 'valid callback for %s payment %s: %s' % (