Changeset 11161 for main/waeup.kofa/branches/0.2/src/waeup/kofa/applicants

Timestamp:

21 Feb 2014, 11:07:54 (11 years ago)

Author:

uli

Message:

Merge current trunk into 0.2 maintenance branch. Now really

Location:

main/waeup.kofa/branches/0.2

Files:

• . (modified) (1 prop)
• src/waeup/kofa/applicants/browser.py (modified) (1 diff)
• src/waeup/kofa/applicants/payment.py (modified) (1 diff)
• src/waeup/kofa/applicants/tests/test_browser.py (modified) (1 diff)

main/waeup.kofa/branches/0.2/src/waeup/kofa/applicants/browser.py

@@ -556 +556 @@
             msg = _(
                 '\n <strong>Congratulations!</strong>' +
-                ' You have been provisionally admitted into the' +
+                ' You have been offered provisional admission into the' +
                 ' ${c} Academic Session of ${d}.'
                 ' Your student record has been created for you.' +

main/waeup.kofa/branches/0.2/src/waeup/kofa/applicants/payment.py

@@ -111 +111 @@
         return 'N/A'
 
+    @property
+    def email(self):
+        "Email of payer"
+        return self.context.__parent__.email
+
+    @property
+    def phone(self):
+        "Phone number of payer"
+        return self.context.__parent__.phone
+
+    @property
+    def current_mode(self):
+        "Current study mode of payer"
+        return 'N/A'
+
+    @property
+    def current_level(self):
+        "Current level of payer"
+        return 'N/A'
+
 # Applicant online payments must be importable. So we might need a factory.
 class ApplicantOnlinePaymentFactory(grok.GlobalUtility):

main/waeup.kofa/branches/0.2/src/waeup/kofa/applicants/tests/test_browser.py

@@ -574 +574 @@
             'You logged in.' in self.browser.contents)
         self.assertTrue(
-            '<strong>Congratulations!</strong> You have been provisionally'
-            ' admitted into the %s/%s Academic Session of'
+            '<strong>Congratulations!</strong> You have been offered provisional'
+            ' admission into the %s/%s Academic Session of'
             ' Sample University. Your student record has been created for you.'
             % (session_1, session_1 + 1) in self.browser.contents)