Changeset 13030 for main

Timestamp:

4 Jun 2015, 12:11:22 (10 years ago)

Author:

Henrik Bettermann

Message:

Let's disable NCE 1 payments online (undo r13022).

Location:

main/waeup.fceokene/trunk/src/waeup/fceokene

Files:

• students/tests/test_browser.py (modified) (1 diff)
• students/utils.py (modified) (2 diffs)
• utils/utils.py (modified) (1 diff)

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

@@ -387 +387 @@
           'Download admission letter' in self.browser.contents)
         return
+
+    def test_payment_disabled(self):
+        self.certificate.study_mode = 'nce_ft'
+        IWorkflowState(self.student).setState('cleared')
+        self.browser.addHeader('Authorization', 'Basic mgr:mgrpw')
+        self.browser.open(self.payments_path)
+        self.browser.getLink("Add current session payment ticket").click()
+        self.browser.getControl(name="form.p_category").value = ['schoolfee']
+        self.browser.getControl("Create ticket").click()
+        self.assertMatches('...ticket created...',
+                           self.browser.contents)
+        self.app['configuration']['2004'].payment_disabled = ['sf_nce1']
+        self.browser.getLink("Add current session payment ticket").click()
+        self.browser.getControl(name="form.p_category").value = ['schoolfee']
+        self.browser.getControl("Create ticket").click()
+        self.assertMatches('...Payment temporarily disabled...',
+                           self.browser.contents)
+        self.certificate.study_mode = 'ug_ft'
+        self.browser.open(self.payments_path)
+        self.browser.getLink("Add current session payment ticket").click()
+        self.browser.getControl(name="form.p_category").value = ['schoolfee']
+        self.browser.getControl("Create ticket").click()
+        self.assertMatches('...ticket created...',
+                           self.browser.contents)
+        return

main/waeup.fceokene/trunk/src/waeup/fceokene/students/utils.py

@@ -203 +203 @@
                     else:
                         amount = 14825
-                    ################################
-                    # Payment disabled on 29/05/15 #
-                    ################################
-                    amount = 0.0
                 # NCE II
                 elif student.current_level in (100, 110, 120) and \
@@ -391 +387 @@
         return _('(see payment slip)')
 
+    def _isPaymentDisabled(self, p_session, category, student):
+        academic_session = self._getSessionConfiguration(p_session)
+        if category == 'schoolfee':
+            if 'sf_all' in academic_session.payment_disabled:
+                return True
+            if 'sf_nce1' in academic_session.payment_disabled and \
+                student.current_level == 100 and student.state == CLEARED and \
+                student.current_mode == 'nce_ft':
+                return True
+        return False
+
     SEPARATORS_DICT = {
         'form.fst_sit_fname': _(u'First Sitting Record'),

main/waeup.fceokene/trunk/src/waeup/fceokene/utils/utils.py

@@ -50 +50 @@
         }
 
+    DISABLE_PAYMENT_GROUP_DICT = {
+        'sf_all': 'School Fee - All Students',
+        'sf_nce1': 'School Fee - NCE I Fresh Students',
+        }
+
     SELECTABLE_PAYMENT_CATEGORIES = deepcopy(PAYMENT_CATEGORIES)