Changeset 17191

Timestamp:

1 Dec 2022, 10:00:01 (22 months ago)

Author:

Henrik Bettermann

Message:

More modifications.

Location:

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

Files:

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

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

@@ -129 +129 @@
                    ]]
         if state == STARTED:
-            actions = [[_('Save')],
+            actions = [[_('Save'), _('Save and Make Donation via USSD')],
                 [
                  #_('Add online payment ticket'),
@@ -181 +181 @@
         return
 
-    @action(_('Make Donation via USSD Money Transfer'), style='primary')
+    @action(_('Save and Make Donation via USSD'), style='primary')
     def makeUSSDonation(self, **data):
-        self.redirect(self.url(self.context, '@USSSD'))
+        if self.upload_success is False:  # False is not None!
+            # Error during image upload. Ignore other values.
+            return
+        self.applyData(self.context, **data)
+        self.redirect(self.url(self.context, '@ussdinfo'))
         return
         

main/kofacustom.lpng/trunk/src/kofacustom/lpng/applicants/browser_templates/applicantdisplaypage.pt

@@ -52 +52 @@
 </table>
 
+<br />
+
+<a href="ussdinfo" class="btn btn-primary">Make Donation via USSD</a>
+
 <tal:payments condition="view/display_payments">
   <h3 i18n:domain="waeup.kofa" i18n:translate="">

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

@@ -6 +6 @@
 "Last-Translator: Henrik Bettermann <henrik@waeup.org>\n"
 "Language-Team: \n"
+"Language: en\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: en\n"
-"X-Generator: Poedit 1.6.5\n"
+"X-Generator: Poedit 3.2\n"
 
 msgid "WAeUP.Kofa - Student Management System"
@@ -136 +136 @@
 msgid "login_trouble5"
 msgstr "  "
+
+#: waeup/kofa/utils/utils.py:333
+msgid ""
+"Dear ${a},\n"
+"\n"
+"${b}\n"
+"Student Registration and Information Portal of\n"
+"${c}.\n"
+"\n"
+"Your user name: ${d}\n"
+"Your password: ${e}\n"
+"${f}\n"
+"\n"
+"Please remember your user name and keep\n"
+"your password secret!\n"
+"\n"
+"Please also note that passwords are case-sensitive.\n"
+"\n"
+"Regards\n"
+msgstr ""
+"Dear ${a},\n"
+"\n"
+"You have successfully been registered as an Obi-Dient on the Big Tent "
+"Foundation Registration and Information Porta.l\n"
+"\n"
+"Your user name: ${d}\n"
+"Your password: ${e}\n"
+"${f}\n"
+"\n"
+"Please remember your user name and keep\n"
+"your password secret!\n"
+"\n"
+"Please also note that passwords are case-sensitive.\n"
+"\n"
+"Regards\n"