Changeset 2153 for WAeUP_SRP/trunk/skins/waeup_epayment/pay_interswitch.py

Timestamp:

23 Aug 2007, 12:57:22 (17 years ago)

Author:

Henrik Bettermann

Message:

payment conditions fixed

File:

• WAeUP_SRP/trunk/skins/waeup_epayment/pay_interswitch.py (modified) (2 diffs)

WAeUP_SRP/trunk/skins/waeup_epayment/pay_interswitch.py

@@ -39 +39 @@
 info['payment_possible'] = False
 fee_dict = context.getSchoolFee(sbrain)
-if not fee_dict:
+fulltime = sbrain.mode.endswith('_ft')
+#new =  sbrain.entry_session == context.getSessionId()[-2:]
+new = sbrain.review_state == 'cleared_and_validated'
+returning = sbrain.review_state == 'returning'
+if not fee_dict or (not new and fulltime) or not (new or returning):
     return context.interswitch_form(info=info)
-info['payment_possible'] = True
 info['site_id'] = '61'
 info['currency_id'] = '566'
-if sbrain.entry_session == context.getSessionId()[-2:]:
+if new:
     amount = info['amount'] = fee_dict['new']
+elif returning:
+    amount = info['amount'] = fee_dict['returning']
 else:
-    amount = info['amount'] = fee_dict['returning']
-if sbrain.mode.endswith('_ft'):
+    amount = info['amount'] = '0'
+if fulltime:
     pay_item_id = "6100"
     info['type_code'] = sbrain.faculty
@@ -54 +59 @@
     pay_item_id = "6101"
     info['type_code'] = sbrain.course
+info['payment_possible'] = True
 info['type_description'] = fee_dict['description']
 info['pay_bill_to'] = sbrain.name