Changeset 13606

Timestamp:

12 Jan 2016, 17:18:53 (9 years ago)

Author:

Henrik Bettermann

Message:

Each product has its own MAC key.

File:

• main/waeup.aaue/trunk/src/waeup/aaue/interswitch/browser.py (modified) (9 diffs)

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

@@ -47 +47 @@
 URL = '/paydirect/api/v1/gettransaction.json'
 HTTPS = True
-MAC = '9718FA00B0F5070B388A9896ADCED9B2FB02D30F71E12E68BDADC63F6852A3496FF97D8A0F9DA9F753B911A49BB09BB87B55FD02046BD325C74C46C0123CF023'
+MAC_REGULAR = '9718FA00B0F5070B388A9896ADCED9B2FB02D30F71E12E68BDADC63F6852A3496FF97D8A0F9DA9F753B911A49BB09BB87B55FD02046BD325C74C46C0123CF023'
+MAC_PT = '74424F1DFECD6058F153148255CDD55E16724B4F380ADB2C63C5D1D7A5675759010C8153DCB930AAF2D38903CBF7CE32B8A6BA2C16BBC46721DF2E3F3E4548E3'
 
 httplib.HTTPSConnection.debuglevel = 0
@@ -77 +78 @@
     site_name = SITE_NAME
     currency = CURRENCY
-    mac = MAC
 
     def update(self):
@@ -89 +89 @@
             self.product_id = PRODUCT_ID_PT
             self.pay_item_id = '101'
+            self.mac = MAC_PT
         else:
             self.product_id = PRODUCT_ID_REGULAR
             self.pay_item_id = '109'
+            self.mac = MAC_REGULAR
         xmldict = {}
         provider_amt = 1000.0
@@ -136 +138 @@
     currency = CURRENCY
     #pay_item_id = '101'
-    mac = MAC
 
     def update(self):
@@ -161 +162 @@
         if contr_agreement_student(student) == 'first':
             self.product_id = PRODUCT_ID_PT
+            self.mac = MAC_PT
         else:
             self.product_id = PRODUCT_ID_REGULAR
+            self.mac = MAC_REGULAR
 
         # To guarantee that cleared students pay both acceptance fee
@@ -420 +423 @@
     gateway_url = URL
     https = HTTPS
-    mac = MAC
+
+    @property
+    def mac(self):
+        if contr_agreement_applicant(self.context.__parent__) == 'first':
+            return MAC_PT
+        return MAC_REGULAR
 
     @property
@@ -436 +444 @@
     gateway_url = URL
     https = HTTPS
-    mac = MAC
+
+    @property
+    def mac(self):
+        if contr_agreement_applicant(self.context.__parent__) == 'first':
+            return MAC_PT
+        return MAC_REGULAR
 
     @property
@@ -452 +465 @@
     gateway_url = URL
     https = HTTPS
-    mac = MAC
+
+    @property
+    def mac(self):
+        if contr_agreement_student(self.context.student) == 'first':
+            return MAC_PT
+        return MAC_REGULAR
 
     @property
@@ -468 +486 @@
     gateway_url = URL
     https = HTTPS
-    mac = MAC
+
+    @property
+    def mac(self):
+        if contr_agreement_student(self.context.student) == 'first':
+            return MAC_PT
+        return MAC_REGULAR
 
     @property