Changeset 17225

Timestamp:

15 Dec 2022, 11:07:25 (21 months ago)

Author:

Henrik Bettermann

Message:

More customizations.

Location:

main/kofacustom.lpng/trunk/src/kofacustom/lpng

Files:

• applicants/browser.py (modified) (3 diffs)
• applicants/browser_templates/applicanteditpage.pt (added)
• locales/en/LC_MESSAGES/waeup.kofa.mo (modified) (previous)
• locales/en/LC_MESSAGES/waeup.kofa.po (modified) (1 diff)

main/kofacustom.lpng/trunk/src/kofacustom/lpng/applicants/browser.py

@@ -141 +141 @@
         if state == STARTED:
             actions = [[_('Save'),
-                        _('Save and Make Donation via USSD')],
+                        _('Save and Make Donation')],
                 [
                  #_('Add online payment ticket'),
@@ -179 +179 @@
             # Error during image upload. Ignore other values.
             return
+        if not self.request.form.get('confirm_passport', False):
+            self.flash(_('Please tick the checkbox above the save buttons.'))
+            return
         self.applyData(self.context, **data)
         self.flash(_('Form has been saved.'))
@@ -185 +188 @@
     @action(_('Add online payment ticket'), style='primary')
     def addPaymentTicket(self, **data):
-        self.redirect(self.url(self.context, '@@addafp'))
+        self.redirect(self.url(self.context, 'addafp'))
         return
 
     @action(_('Make Donation'), style='primary')
     def addBalancePaymentTicket(self, **data):
-        self.redirect(self.url(self.context, '@@addbp'))
-        return
-
-    @action(_('Save and Make Donation via USSD'), style='primary')
-    def makeUSSDonation(self, **data):
+        self.redirect(self.url(self.context, 'addbp'))
+        return
+
+    @action(_('Save and Make Donation'), style='primary')
+    def saveAndDonate(self, **data):
         if self.upload_success is False:  # False is not None!
             # Error during image upload. Ignore other values.
             return
+        if not self.request.form.get('confirm_passport', False):
+            self.flash(_('Please tick the checkbox above the save buttons.'))
+            return
         self.applyData(self.context, **data)
-        self.redirect(self.url(self.context, 'ussdinfo'))
+        self.redirect(self.url(self.context, 'addbp'))
         return
         

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

@@ -116 +116 @@
 "party based on the ideology and ideals of Socio Democracy."
 
+msgid "Payment successfully completed. Kindly submit application for processing."
+msgstr "Payment successfully completed."
+
 #: waeup/kofa/interfaces.py:704
 msgid "Name of University"