Changeset 10806 for main/kofacustom.ekodisco/trunk/src/kofacustom

Timestamp:

28 Nov 2013, 17:33:07 (11 years ago)

Author:

Henrik Bettermann

Message:

Configure meter charge payment.

Customize workflow.

Location:

main/kofacustom.ekodisco/trunk/src/kofacustom/ekodisco

Files:

• browser/pages.py (modified) (3 diffs)
• locales/en/LC_MESSAGES/waeup.kofa.mo (modified) (previous)
• locales/en/LC_MESSAGES/waeup.kofa.po (modified) (2 diffs)
• students/utils.py (modified) (1 diff)
• students/workflow.py (added)
• utils/utils.py (modified) (1 diff)

main/kofacustom.ekodisco/trunk/src/kofacustom/ekodisco/browser/pages.py

@@ -56 +56 @@
     """
     form_fields = grok.AutoFields(ICertificate).select(
-        'title', 'code', 'application_category')
+        'title', 'code', 'application_category', 'school_fee_1')
 
 class CustomCertificatePage(CertificatePage):
@@ -62 +62 @@
     """
     form_fields = grok.AutoFields(ICertificate).select(
-        'title', 'code', 'application_category')
+        'title', 'code', 'application_category', 'school_fee_1')
 
 class CustomCertificateManageFormPage(CertificateManageFormPage):
@@ -69 +69 @@
 
     form_fields = grok.AutoFields(ICertificate).select(
-        'title', 'application_category')
+        'title', 'application_category', 'school_fee_1')

main/kofacustom.ekodisco/trunk/src/kofacustom/ekodisco/locales/en/LC_MESSAGES/waeup.kofa.po

@@ -310 +310 @@
 
 msgid "admitted"
-msgstr "approved"
+msgstr "contract approved"
 
 msgid "Start new session"
@@ -324 +324 @@
 msgstr "Subscription Slip"
 
+msgid "Initial School Fee"
+msgstr "Annual Meter Charge"
+
+msgid "school fee paid"
+msgstr "meter fee paid"
+

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

@@ -30 +30 @@
     # refix
     STUDENT_ID_PREFIX = u'X'
+
+    def setPaymentDetails(self, category, student,
+            previous_session, previous_level):
+        """Create Payment object and set the payment data of a student for
+        the payment category specified.
+
+        """
+        p_item = u''
+        amount = 0.0
+        if previous_session:
+            if previous_session < student['studycourse'].entry_session:
+                return _('The previous session must not fall below '
+                         'your entry session.'), None
+            if category == 'schoolfee':
+                # School fee is always paid for the following session
+                if previous_session > student['studycourse'].current_session:
+                    return _('This is not a previous session.'), None
+            else:
+                if previous_session > student['studycourse'].current_session - 1:
+                    return _('This is not a previous session.'), None
+            p_session = previous_session
+            p_level = previous_level
+            p_current = False
+        else:
+            p_session = student['studycourse'].current_session
+            p_level = student['studycourse'].current_level
+            p_current = True
+        academic_session = self._getSessionConfiguration(p_session)
+        if academic_session == None:
+            return _(u'Session configuration object is not available.'), None
+        # Determine fee.
+        if category == 'schoolfee':
+            try:
+                certificate = student['studycourse'].certificate
+                p_item = certificate.code
+            except (AttributeError, TypeError):
+                return _('Contract data are incomplete.'), None
+            amount = getattr(certificate, 'school_fee_1', 0.0)
+        if amount in (0.0, None):
+            return _('Amount could not be determined.'), None
+        for key in student['payments'].keys():
+            ticket = student['payments'][key]
+            if ticket.p_state == 'paid' and\
+               ticket.p_category == category and \
+               ticket.p_item == p_item and \
+               ticket.p_session == p_session:
+                  return _('This type of payment has already been made.'), None
+        payment = createObject(u'waeup.StudentOnlinePayment')
+        timestamp = ("%d" % int(time()*10000))[1:]
+        payment.p_id = "p%s" % timestamp
+        payment.p_category = category
+        payment.p_item = p_item
+        payment.p_session = p_session
+        payment.p_level = p_level
+        payment.p_current = p_current
+        payment.amount_auth = amount
+        return None, payment

main/kofacustom.ekodisco/trunk/src/kofacustom/ekodisco/utils/utils.py

@@ -39 +39 @@
 
     PAYMENT_CATEGORIES = {
-        'electricity': 'Electricity',
+        'schoolfee': 'Meter Charge',
         'application': 'Not applicable',
-        'schoolfee': 'Not applicable',
         }