Changeset 15553 for main

Timestamp:

19 Aug 2019, 19:32:09 (5 years ago)

Author:

Henrik Bettermann

Message:

Successful applicant payments do trigger 'approve' transition only
if applicant is in state 'started' and either p_category is 'application' or
applicant is special.

Add 'app_balance' payment category.

Location:

main/waeup.kofa/trunk

Files:

• CHANGES.txt (modified) (1 diff)
• src/waeup/kofa/applicants/payment.py (modified) (3 diffs)
• src/waeup/kofa/applicants/tests/test_batching.py (modified) (1 diff)
• src/waeup/kofa/utils/utils.py (modified) (1 diff)

main/waeup.kofa/trunk/CHANGES.txt

@@ -4 +4 @@
 1.6.1.dev0 (unreleased)
 =======================
+
+* Successful applicant payments do trigger 'approve' transition only
+  if applicant is in state 'started' and either p_category is 'application' or
+  applicant is special.
 
 * Allow to add applicants containers with a number instead of entrance year

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

@@ -45 +45 @@
         """Process applicant after payment was approved.
         """
-        if not (self.__parent__.special and self.__parent__.state == PAID):
+        if self.__parent__.state != PAID \
+            and (self.p_category == 'application' or self.__parent__.special):
             wf_info = IWorkflowInfo(self.__parent__)
             try:
@@ -60 +61 @@
         """Process applicant after payment was made.
         """
-        if not (self.__parent__.special and self.__parent__.state == PAID):
+        if self.__parent__.state != PAID \
+            and (self.p_category == 'application' or self.__parent__.special):
             wf_info = IWorkflowInfo(self.__parent__)
             try:
@@ -68 +70 @@
                 return 'danger', msg, log
         log = 'successful payment: %s' % self.p_id
-        msg = _('Payment successfully completed. Kindly submit form for processing.')
+        msg = _('Payment successfully completed. Kindly submit application for processing.')
         flashtype = 'success'
         return flashtype, msg, log

main/waeup.kofa/trunk/src/waeup/kofa/applicants/tests/test_batching.py

@@ -498 +498 @@
             DuplicationError, self.processor.addEntry, payment2,
             dict(applicant_id=self.applicant2.applicant_id, p_id='p456'), self.app)
+        # But we can add a ticket with another p_category.
+        payment2.p_category = 'app_balance'
+        self.processor.addEntry(
+            payment2, dict(applicant_id=self.applicant2.applicant_id, p_id='p456'),
+            self.app)
+        self.assertEqual(len(self.applicant2.keys()),2)
+        self.assertEqual(self.applicant2['p456'].p_id, 'p456')
 
     def test_checkConversion(self):

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

@@ -181 +181 @@
         'gown': 'Gown Hire Fee',
         'application': 'Application Fee',
+        'app_balance': 'Application Fee Balance',
         'transcript': 'Transcript Fee',
         'late_registration': 'Late Course Registration Fee'