Changeset 10812

Timestamp:

29 Nov 2013, 09:22:16 (11 years ago)

Author:

Henrik Bettermann

Message:

Customize CustomExportPDFPaymentSlipPage.

Further customize customer workflow.

Location:

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

Files:

• locales/en/LC_MESSAGES/waeup.kofa.mo (modified) (previous)
• locales/en/LC_MESSAGES/waeup.kofa.po (modified) (3 diffs)
• students/browser.py (modified) (3 diffs)
• students/viewlets.py (modified) (2 diffs)
• students/workflow.py (modified) (3 diffs)

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

@@ -309 +309 @@
 msgstr "Main Contract"
 
-msgid "admitted"
-msgstr "contract approved"
-
 msgid "Start new session"
 msgstr "Start new subscription period"
@@ -321 +318 @@
 msgstr "First Subscription Period"
 
+msgid "Entry Session:"
+msgstr "First Subscription Period:"
+
 msgid "Application Slip"
 msgstr "Subscription Slip"
@@ -330 +330 @@
 msgstr "meter fee paid"
 
+msgid "Add current session payment ticket"
+msgstr "Add subscription period payment ticket"
+
+msgid "Session started."
+msgstr "New subscription period started."
+
+msgid "${a}: Study Course"
+msgstr "${a}: Main Contract"
+
+msgid "Study Course:"
+msgstr "Main Contract:"
+

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

@@ -31 +31 @@
     CourseTicketDisplayFormPage, StudentTriggerTransitionFormPage,
     msave, emit_lock_message, StudyCourseDisplayFormPage,
-    StudyCourseManageFormPage)
+    StudyCourseManageFormPage,
+    ExportPDFPaymentSlipPage,
+    )
 from waeup.kofa.students.interfaces import (
     IStudentsUtils, ICourseTicket)
@@ -72 +74 @@
 
 
-
-
-
-
 class CustomStudyCourseDisplayFormPage(StudyCourseDisplayFormPage):
     """ Page to display the student study course data
@@ -96 +94 @@
                 'certificate', 'entry_session', 'current_session',
                 'service_address')
+
+class CustomExportPDFPaymentSlipPage(ExportPDFPaymentSlipPage):
+    """Deliver a PDF slip of the context.
+    """
+    omit_fields = (
+        'password', 'suspended', 'phone', 'date_of_birth',
+        'adm_code', 'sex', 'suspended_comment', 'current_mode')

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

@@ -19 +19 @@
 from waeup.kofa.students.viewlets import (
     StudentsTab, AdmissionSlipActionButton, StudentManageClearanceLink,
-    StudentManagePersonalLink, StudentManageAccommodationLink)
+    StudentManagePersonalLink, StudentManageAccommodationLink,
+    AddBalancePaymentActionButton,
+    AddPreviousPaymentActionButton)
 
 from kofacustom.ekodisco.interfaces import MessageFactory as _
@@ -42 +44 @@
 class CustomStudentManageAccommodationLink(StudentManageAccommodationLink):
     link = ''
+
+class CustomAddBalancePaymentActionButton(AddBalancePaymentActionButton):
+    target = ''
+
+class CustomAddPreviousPaymentActionButton(AddPreviousPaymentActionButton):
+    target = ''

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

@@ -30 +30 @@
         msg = _('Contract approved'),
         source = CREATED,
-        destination = ADMITTED),
+        destination = CLEARED),
 
     Transition(
@@ -36 +36 @@
         title = _('Reset customer to initial state'),
         msg = _('Reset to initial state'),
-        source = ADMITTED,
+        source = CLEARED,
         destination = CREATED),
 
     Transition(
-        transition_id = 'pay_meter_fee',
-        title = _('Pay meter fee'),
-        msg = _('Meter fee paid'),
-        source = ADMITTED,
+        transition_id = 'pay_first_school_fee',
+        title = _('Pay first meter fee'),
+        msg = _('First meter fee payment made'),
+        source = CLEARED,
         destination = PAID),
 
     Transition(
-        transition_id = 'approve_meter_fee_payment',
+        transition_id = 'approve_first_school_fee',
+        title = _('Approve first meter payment'),
+        msg = _('First meter fee payment approved'),
+        source = CLEARED,
+        destination = PAID),
+
+    # The pg fee payment has proper handlers which suit
+    # customer payments.
+
+    Transition(
+        transition_id = 'pay_pg_fee',
+        title = _('Pay meter fee'),
+        msg = _('Meter fee paid'),
+        source = PAID,
+        destination = PAID),
+
+    Transition(
+        transition_id = 'approve_pg_fee',
         title = _('Approve meter fee payment'),
         msg = _('Meter fee payment approved'),
-        source = ADMITTED,
+        source = PAID,
         destination = PAID),
 
@@ -58 +75 @@
         msg = _("Reset to state 'contract approved'"),
         source = PAID,
-        destination = ADMITTED),
+        destination = CLEARED),
     )