Changeset 8957 for main/waeup.futminna/trunk/src/waeup

Timestamp:

9 Jul 2012, 11:18:24 (12 years ago)

Author:

Henrik Bettermann

Message:

Merged with waeup.uniben 8954:8955.

Location:

main/waeup.futminna/trunk/src/waeup/futminna

Files:

• . (modified) (1 prop)
• interswitch/browser.py (modified) (2 diffs)

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

@@ -100 +100 @@
     payment.r_card_num = wlist[3]
     payment.r_pay_reference = wlist[5]
+    payment.r_company = u'interswitch'
     if payment.r_code != '00':
         msg = _('Unsuccessful callback: ${a}', mapping = {'a': sr})
@@ -238 +239 @@
         xmldict['institution_acct'] = ''
         xmldict['institution_bank_id'] = ''
-        if student.current_mode.endswith('_ft'):
-            #post-grad full-time students of all faculties
-            if studycourse.current_level in ('700','710','800','810','900','910'):
-                xmldict['institution_acct'] = '1012842833'
-                xmldict['institution_bank_id'] = '117'
-            #all other part-time students depending on faculty
-            elif student.faccode in ('SSC','LAW','MED'):
-                xmldict['institution_acct'] = '0005986938'
-                xmldict['institution_bank_id'] = '31'
-            elif student.faccode in ('ENG','PSC','PHA'):
-                xmldict['institution_acct'] = '0014413973'
-                xmldict['institution_bank_id'] = '129'
-            elif student.faccode in ('LSC','DEN','AGR'):
-                xmldict['institution_acct'] = '1012801319'
-                xmldict['institution_bank_id'] = '117'
-            elif student.faccode in ('ART','EDU','MGS','BMS'):
-                xmldict['institution_acct'] = '6220027556'
-                xmldict['institution_bank_id'] = '51'
-        elif student.current_mode.endswith('_pt'):
-            #post-grad part-time students of all faculties
-            if studycourse.current_level in ('700','710','800','810','900','910'):
-                xmldict['institution_acct'] = '0023708207'
-                xmldict['institution_bank_id'] = '72'
-            #all other part-time students depending on faculty
-            elif student.faccode in ('ENG','LAW','MGS'):
-                xmldict['institution_acct'] = '2019006824'
-                xmldict['institution_bank_id'] = '8'
-            elif student.faccode in ('IPA','PHA','SSC','AGR','EDU'):
-                xmldict['institution_acct'] = '0122012109'
-                xmldict['institution_bank_id'] = '16'
-        xmldict['institution_amt'] = 100 * (self.amount_auth - provider_amt - 150)
+        xmldict['institution_acct'] = '000000000000'
+        xmldict['institution_bank_id'] = '00'
+        xmldict['institution_amt'] = 100 * (self.context.amount_auth - provider_amt - 150)
         xmldict['institution_item_name'] = self.context.p_category
         xmldict['institution_name'] = INSTITUTION_NAME