Changeset 15553 for main/waeup.kofa/trunk
- Timestamp:
- 19 Aug 2019, 19:32:09 (5 years ago)
- Location:
- main/waeup.kofa/trunk
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
main/waeup.kofa/trunk/CHANGES.txt
r15548 r15553 4 4 1.6.1.dev0 (unreleased) 5 5 ======================= 6 7 * Successful applicant payments do trigger 'approve' transition only 8 if applicant is in state 'started' and either p_category is 'application' or 9 applicant is special. 6 10 7 11 * Allow to add applicants containers with a number instead of entrance year -
main/waeup.kofa/trunk/src/waeup/kofa/applicants/payment.py
r15395 r15553 45 45 """Process applicant after payment was approved. 46 46 """ 47 if not (self.__parent__.special and self.__parent__.state == PAID): 47 if self.__parent__.state != PAID \ 48 and (self.p_category == 'application' or self.__parent__.special): 48 49 wf_info = IWorkflowInfo(self.__parent__) 49 50 try: … … 60 61 """Process applicant after payment was made. 61 62 """ 62 if not (self.__parent__.special and self.__parent__.state == PAID): 63 if self.__parent__.state != PAID \ 64 and (self.p_category == 'application' or self.__parent__.special): 63 65 wf_info = IWorkflowInfo(self.__parent__) 64 66 try: … … 68 70 return 'danger', msg, log 69 71 log = 'successful payment: %s' % self.p_id 70 msg = _('Payment successfully completed. Kindly submit formfor processing.')72 msg = _('Payment successfully completed. Kindly submit application for processing.') 71 73 flashtype = 'success' 72 74 return flashtype, msg, log -
main/waeup.kofa/trunk/src/waeup/kofa/applicants/tests/test_batching.py
r15285 r15553 498 498 DuplicationError, self.processor.addEntry, payment2, 499 499 dict(applicant_id=self.applicant2.applicant_id, p_id='p456'), self.app) 500 # But we can add a ticket with another p_category. 501 payment2.p_category = 'app_balance' 502 self.processor.addEntry( 503 payment2, dict(applicant_id=self.applicant2.applicant_id, p_id='p456'), 504 self.app) 505 self.assertEqual(len(self.applicant2.keys()),2) 506 self.assertEqual(self.applicant2['p456'].p_id, 'p456') 500 507 501 508 def test_checkConversion(self): -
main/waeup.kofa/trunk/src/waeup/kofa/utils/utils.py
r15476 r15553 181 181 'gown': 'Gown Hire Fee', 182 182 'application': 'Application Fee', 183 'app_balance': 'Application Fee Balance', 183 184 'transcript': 'Transcript Fee', 184 185 'late_registration': 'Late Course Registration Fee'
Note: See TracChangeset for help on using the changeset viewer.