Changeset 5193 for WAeUP_SRP/trunk

Timestamp:

14 May 2010, 11:38:09 (15 years ago)

Author:

Henrik Bettermann

Message:

implement split-request-payment

Location:

WAeUP_SRP/trunk/skins

Files:

• waeup_aaua/getPaymentsFolderInfo.py (modified) (1 diff)
• waeup_aaue/getPaymentsFolderInfo.py (modified) (4 diffs)
• waeup_aaue/interswitch_request_cb2.py (added)
• waeup_aaue/request_interswitch2.py (added)

WAeUP_SRP/trunk/skins/waeup_aaua/getPaymentsFolderInfo.py

@@ -56 +56 @@
 # begin customization
 
-if review_state in ('returning',):
+if review_state in ('returning',) and info['next_session'] != session:
     if session in ('06',):
         info['payment_method'] = "online_payment"

WAeUP_SRP/trunk/skins/waeup_aaue/getPaymentsFolderInfo.py

@@ -56 +56 @@
 # begin customization
 
-if review_state == 'cleared_and_validated':
-    info['payment_method'] = "online_payment"
-#elif review_state == 'cleared_and_validated' and session == '07':
-#    info['payment_method'] = "sc_payment"
-elif review_state == 'returning' and info['next_session'] != session:
-    info['payment_method'] = "online_payment"
+if review_state in ('returning',) and info['next_session'] != session:
+    if session in ('06','07','08'):
+        info['payment_method'] = "online_payment"
+    else:
+        info['payment_method'] = "first_instalment"
+elif review_state in ('cleared_and_validated',):
+    if session in ('06','07','08','09'):
+        info['payment_method'] = "online_payment"
+    else:
+        info['payment_method'] = "first_instalment"
+elif session in ('09','10','11',) and review_state in ('school_fee_paid','courses_registered','courses_validated',):
+    second_instalment_records = aq_payments(Eq('student_id',student_id) & Eq('category','schoolfee2') & Eq('session_id',session) & Eq('status','paid'))
+    if not second_instalment_records:
+        info['payment_method'] = "second_instalment"
+    else:    
+        pass
 info['prod_id'] = '119'
 
@@ -82 +92 @@
         row['title'] = "Invalid Payment, Naira %s, %s" % (payment.amount,
                                                           payment.date.strftime("%d/%m/%y %H:%M:%S"))
+    elif payment.type == 'request' and payment.resp_approved_amount:
+        row['title'] = "%s for Session %s, Naira %s, %s" % (vocabularies.payment_categories.get(payment.category),
+                                                            vocabularies.sessions.get(payment.session_id),
+                                                            payment.resp_approved_amount,
+                                                            payment.date.strftime("%d/%m/%y %H:%M:%S"))
+    elif payment.type == 'request':
+        row['title'] = "%s for Session %s, %s" % (vocabularies.payment_categories.get(payment.category),
+                                                            vocabularies.sessions.get(payment.session_id),
+                                                            payment.date.strftime("%d/%m/%y %H:%M:%S"))                                                            
     else:
         row['title'] = "%s for Session %s, Naira %s, %s" % (vocabularies.payment_categories.get(payment.category),
@@ -100 +119 @@
     row['trans_ref'] = payment.order_id
     if row['is_requeryable']:
-        row['callback_url'] = "%(url)s/interswitch_cb" % row
+        if payment.category == 'schoolfee':
+            row['callback_url'] = "%(url)s/interswitch_cb" % row
+        elif payment.category == 'schoolfee2':
+            row['callback_url'] = "%(url)s/interswitch_cb2" % row             
 #        if payment.category == 'schoolfee':
 #            row['callback_url'] = "%(url)s/interswitch_cb" % row
@@ -112 +134 @@
         row['href'] = href
     elif row['is_requestable']:
-        row['callback_url'] = "%(url)s/interswitch_request_cb" % row
+        if payment.category == 'schoolfee':
+            row['callback_url'] = "%(url)s/interswitch_request_cb" % row
+        elif payment.category == 'schoolfee2':
+            row['callback_url'] = "%(url)s/interswitch_request_cb2" % row      
         #href = '%(query_url)s' % info
         href = "http://testwebpay.interswitchng.com/CollegepayService/TransactionQueryURL.aspx"
         href += '?redirectURL=%(callback_url)s' % row
+        #href += '&productid=%(prod_id)s' % info
         href += '&productid=53'
         href += '&merchantref=ignore'
         href += '&custNumber=%s' % student_id
         href += '&session=%s' % info['next_session_str']
-        href += '&semester=Semester 1'             
+        href += '&semester=Semester 1'
+        if payment.category == 'schoolfee2':    
+            href += '&semester=Semester 2'         
         row['href'] = href        
     if payment.status == 'paid':