Changeset 11652 for main/waeup.aaue/trunk/src/waeup/aaue/etranzact/browser.py

Timestamp:

14 May 2014, 16:04:54 (10 years ago)

Author:

Henrik Bettermann

Message:

Let CustomPaymentDataWebservice? distinguish between old and new student school fee payments.

File:

• main/waeup.aaue/trunk/src/waeup/aaue/etranzact/browser.py (modified) (4 diffs)

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

@@ -84 +84 @@
                 self.output = ERROR_PART1 + 'Wrong IP address' + ERROR_PART2
                 return
-        if PAYMENT_TYPE not in ('SCHOOL-FEE', 'ACCEPTANCE-FEE', 'APPLICATION-FEE'):
+        if PAYMENT_TYPE not in ('SCHOOL-FEE-RETURNING', 'SCHOOL-FEE-NEW',
+            'ACCEPTANCE-FEE', 'APPLICATION-FEE'):
             self.output = ERROR_PART1 + 'Invalid PAYMENT_TYPE' + ERROR_PART2
             return
@@ -105 +106 @@
             self.output = ERROR_PART1 + 'Invalid PAYEE_ID' + ERROR_PART2
             return
+        student = results[0].student
         amount = results[0].amount_auth
         payment_type = results[0].category
@@ -114 +116 @@
             self.output = ERROR_PART1 + 'PAYEE_ID already used' + ERROR_PART2
             return
-        if PAYMENT_TYPE == 'SCHOOL-FEE' \
-            and not results[0].p_category.startswith('schoolfee'):
-            self.output = ERROR_PART1 + 'Wrong PAYMENT_TYPE' + ERROR_PART2
-            return
+        if PAYMENT_TYPE.startswith('SCHOOL-FEE'):
+            if not results[0].p_category.startswith('schoolfee'):
+                self.output = ERROR_PART1 + 'Wrong PAYMENT_TYPE' + ERROR_PART2
+                return
+            if PAYMENT_TYPE == 'SCHOOL-FEE-RETURNING' and student.state == CLEARED:
+                self.output = ERROR_PART1 + 'Wrong PAYMENT_TYPE' + ERROR_PART2
+                return
+            if PAYMENT_TYPE == 'SCHOOL-FEE-NEW' and student.state != CLEARED:
+                self.output = ERROR_PART1 + 'Wrong PAYMENT_TYPE' + ERROR_PART2
+                return
         if PAYMENT_TYPE == 'ACCEPTANCE-FEE' \
             and not results[0].p_category == 'clearance':
@@ -140 +148 @@
             return
         self.output = (
-            # Version 1
-            #'FULL_NAME=%s&' +
-            #'FACULTY=%s&' +
-            #'DEPARTMENT=%s&' +
-            #'RETURN_TYPE=%s&' +
-            #'PROGRAMME_TYPE=%s&' +
-            #'PAYMENT_TYPE=%s&' +
-            #'ACADEMIC_SESSION=%s&' +
-            #'MATRIC_NO=%s&' +
-            #'FEE_AMOUNT=%s&' +
-            #'TRANSACTION_STATUS=%s'
-
-            # Version 2
             'PayeeName=%s~' +
             'Faculty=%s~' +