Changeset 9733

Timestamp:

27 Nov 2012, 18:56:08 (12 years ago)

Author:

Henrik Bettermann

Message:

Extend webservice and return reg_number too.

Location:

main/waeup.kofa/trunk/src/waeup/kofa

Files:

• applicants/payment.py (modified) (1 diff)
• payments/interfaces.py (modified) (1 diff)
• students/payments.py (modified) (1 diff)
• students/tests/test_browser.py (modified) (1 diff)
• webservices.py (modified) (2 diffs)

main/waeup.kofa/trunk/src/waeup/kofa/applicants/payment.py

@@ -94 +94 @@
 
     @property
-    def reg_or_matric_number(self):
-        "Matric number or reg number of payee"
+    def reg_number(self):
+        "Reg number of payee"
         return self.context.__parent__.reg_number
 
     @property
+    def matric_number(self):
+        return ''
+
+    @property
     def faculty(self):
-        "Faculty of payee"
         return ''
 
     @property
     def department(self):
-        "Department of payee"
         return ''
 

main/waeup.kofa/trunk/src/waeup/kofa/payments/interfaces.py

@@ -134 +134 @@
     display_fullname = Attribute('Name of  payee')
     id = Attribute('Id of payee')
-    reg_or_matric_number = Attribute('Matric number or reg number of payee')
+    reg_number = Attribute('Reg number of payee')
+    matric_number = Attribute('Matric number of payee')
     faculty = Attribute('Faculty of payee')
     department = Attribute('Department of payee')

main/waeup.kofa/trunk/src/waeup/kofa/students/payments.py

@@ -158 +158 @@
 
     @property
-    def reg_or_matric_number(self):
+    def matric_number(self):
         "Matric number or reg number of payee"
         return self.context.student.matric_number
+
+    @property
+    def reg_number(self):
+        "Reg number or reg number of payee"
+        return self.context.student.reg_number
 
     @property

main/waeup.kofa/trunk/src/waeup/kofa/students/tests/test_browser.py

@@ -2663 +2663 @@
             'FULL_NAME=Anna Tester&FACULTY=fac1&DEPARTMENT=dep1'
             '&PAYMENT_ITEM=My Certificate&PAYMENT_CATEGORY=School Fee'
-            '&ACADEMIC_SESSION=2004/2005&MATRIC_NUMBER=234&FEE_AMOUNT=0.0')
+            '&ACADEMIC_SESSION=2004/2005&MATRIC_NUMBER=234&REG_NUMBER=123'
+            '&FEE_AMOUNT=0.0')
         self.browser.open('http://localhost/app/paymentrequest?NONSENSE=nonsense')
         self.assertEqual(self.browser.contents, '-1')

main/waeup.kofa/trunk/src/waeup/kofa/webservices.py

@@ -54 +54 @@
             owner = IPaymentWebservice(results[0])
             full_name = owner.display_fullname
-            matric_number = owner.reg_or_matric_number
+            reg_number = owner.reg_number
+            matric_number = owner.matric_number
             faculty = owner.faculty
             department = owner.department
@@ -73 +74 @@
             'ACADEMIC_SESSION=%s&' +
             'MATRIC_NUMBER=%s&' +
+            'REG_NUMBER=%s&' +
             'FEE_AMOUNT=%s') % (full_name, faculty,
             department, payment_item, payment_category,
-            academic_session, matric_number, amount)
+            academic_session, matric_number, reg_number, amount)
         return