Changeset 16222 for main/kofacustom.iuokada/trunk/src/kofacustom/iuokada/students/utils.py

Timestamp:

1 Sep 2020, 06:11:13 (4 years ago)

Author:

Henrik Bettermann

Message:

Implement Required Combi Payment.

File:

• main/kofacustom.iuokada/trunk/src/kofacustom/iuokada/students/utils.py (modified) (2 diffs)

main/kofacustom.iuokada/trunk/src/kofacustom/iuokada/students/utils.py

@@ -68 +68 @@
             for category in self.REQUIRED_PAYMENTS.keys():
                 for ticket in student['payments'].values():
+                    if ticket.p_category == 'required_combi' and \
+                        ticket.p_session == session and \
+                        ticket.p_state == 'paid':
+                        cats_missing = None
+                        break
                     if ticket.p_state == 'paid' and \
                         ticket.p_category.startswith(category) and \
                         ticket.p_session == session:
                         del cats_missing[category]
-        if cats_missing:
-            return "%s must be paid before Tution Fee." % ', '.join(
-                cats_missing.values())
-        return
+                if not cats_missing:
+                    return
+        return "%s must be paid before Tution Fee. Make either single payments or make a 'Required Combi Payment'." % ', '.join(
+            cats_missing.values())
 
     def setPaymentDetails(self, category, student,
@@ -194 +199 @@
                 p_item += u'%s + ' % categories[cat]
             p_item = p_item.strip(' + ')
+        elif category == 'required_combi':
+            rp = deepcopy(self.REQUIRED_PAYMENTS)
+            for cat in rp:
+                fee_name = cat + '_fee'
+                cat_amount = getattr(academic_session, fee_name, 0.0)
+                if not cat_amount:
+                    return _('%s undefined.' % rp[cat]), None
+                amount += cat_amount
+                p_item += u'%s + ' % rp[cat]
+            p_item = p_item.strip(' + ')
         else:
             fee_name = category + '_fee'