Changeset 8262 for main

Timestamp:

24 Apr 2012, 15:27:00 (13 years ago)

Author:

Henrik Bettermann

Message:

The payment receipt is now called payment slip and can be downloaded even if not paid. This is necessary for eTranzact payments.

Location:

main/waeup.kofa/trunk/src/waeup/kofa

Files:

• applicants/browser.py (modified) (2 diffs)
• applicants/tests/test_browser.py (modified) (2 diffs)
• applicants/viewlets.py (modified) (1 diff)
• students/browser.py (modified) (2 diffs)
• students/tests/test_browser.py (modified) (3 diffs)
• students/viewlets.py (modified) (1 diff)

main/waeup.kofa/trunk/src/waeup/kofa/applicants/browser.py

@@ -544 +544 @@
     """
     grok.context(IApplicantOnlinePayment)
-    grok.name('payment_receipt.pdf')
+    grok.name('payment_slip.pdf')
     grok.require('waeup.viewApplication')
     form_fields = grok.AutoFields(IApplicantOnlinePayment)
@@ -561 +561 @@
     def label(self):
         portal_language = getUtility(IKofaUtils).PORTAL_LANGUAGE
-        return translate(_('Online Payment Receipt'),
+        return translate(_('Online Payment Slip'),
             'waeup.kofa', target_language=portal_language) \
             + ' %s' % self.context.p_id
 
     def render(self):
-        if self.context.p_state != 'paid':
-            self.flash(_('Ticket not yet paid.'))
-            self.redirect(self.url(self.context))
-            return
+        #if self.context.p_state != 'paid':
+        #    self.flash(_('Ticket not yet paid.'))
+        #    self.redirect(self.url(self.context))
+        #    return
         applicantview = ApplicantBaseDisplayFormPage(self.context.__parent__,
             self.request)
         students_utils = getUtility(IStudentsUtils)
-        return students_utils.renderPDF(self,'payment_receipt.pdf',
+        return students_utils.renderPDF(self,'payment_slip.pdf',
             self.context.__parent__, applicantview, note=self.note)
 

main/waeup.kofa/trunk/src/waeup/kofa/applicants/tests/test_browser.py

@@ -635 +635 @@
                            self.browser.contents)
         payment_url = self.browser.url
-        # The pdf payment receipt can't yet be opened
-        self.browser.open(payment_url + '/payment_receipt.pdf')
-        self.assertMatches('...Ticket not yet paid...',
-                           self.browser.contents)
+        # The pdf payment slip can't yet be opened
+        #self.browser.open(payment_url + '/payment_receipt.pdf')
+        #self.assertMatches('...Ticket not yet paid...',
+        #                   self.browser.contents)
         # Request callback
         self.browser.open(payment_url)
@@ -649 +649 @@
             "...Transition 'pay' requires 'started' as source state...",
             self.browser.contents)
-        # The payment receipt can be downloaded now
+        # The payment slip can be downloaded now
         self.browser.open(payment_url)
-        self.browser.getLink("Download payment receipt").click()
+        self.browser.getLink("Download payment slip").click()
         self.assertEqual(self.browser.headers['Status'], '200 Ok')
         self.assertEqual(self.browser.headers['Content-Type'],

main/waeup.kofa/trunk/src/waeup/kofa/applicants/viewlets.py

@@ -166 +166 @@
     grok.require('waeup.viewApplication')
     icon = 'actionicon_pdf.png'
-    text = _('Download payment receipt')
-    target = 'payment_receipt.pdf'
+    text = _('Download payment slip')
+    target = 'payment_slip.pdf'
 
     @property
     def target_url(self):
-        if self.context.p_state != 'paid':
-            return ''
+        #if self.context.p_state != 'paid':
+        #    return ''
         return self.view.url(self.view.context, self.target)
 

main/waeup.kofa/trunk/src/waeup/kofa/students/browser.py

@@ -1184 +1184 @@
     """
     grok.context(IStudentOnlinePayment)
-    grok.name('payment_receipt.pdf')
+    grok.name('payment_slip.pdf')
     grok.require('waeup.viewStudent')
     form_fields = grok.AutoFields(IStudentOnlinePayment)
@@ -1190 +1190 @@
     form_fields['payment_date'].custom_widget = FriendlyDatetimeDisplayWidget('le')
     prefix = 'form'
-    title = 'Payment Data'
     note = None
 
     @property
+    def title(self):
+        portal_language = getUtility(IKofaUtils).PORTAL_LANGUAGE
+        return translate(_('Payment Data'), 'waeup.kofa',
+            target_language=portal_language)
+
+    @property
     def label(self):
-        return 'Online Payment Receipt %s' % self.context.p_id
+        portal_language = getUtility(IKofaUtils).PORTAL_LANGUAGE
+        return translate(_('Online Payment Slip'),
+            'waeup.kofa', target_language=portal_language) \
+            + ' %s' % self.context.p_id
 
     def render(self):
-        if self.context.p_state != 'paid':
-            self.flash('Ticket not yet paid.')
-            self.redirect(self.url(self.context))
-            return
+        #if self.context.p_state != 'paid':
+        #    self.flash('Ticket not yet paid.')
+        #    self.redirect(self.url(self.context))
+        #    return
         studentview = StudentBaseDisplayFormPage(self.context.getStudent(),
             self.request)
         students_utils = getUtility(IStudentsUtils)
-        return students_utils.renderPDF(self, 'payment_receipt.pdf',
+        return students_utils.renderPDF(self, 'payment_slip.pdf',
             self.context.getStudent(), studentview, note=self.note)
 

main/waeup.kofa/trunk/src/waeup/kofa/students/tests/test_browser.py

@@ -1271 +1271 @@
         payment_url = self.browser.url
 
-        # The pdf payment receipt can't yet be opened
-        self.browser.open(payment_url + '/payment_receipt.pdf')
-        self.assertMatches('...Ticket not yet paid...',
-                           self.browser.contents)
+        # The pdf payment slip can't yet be opened
+        #self.browser.open(payment_url + '/payment_slip.pdf')
+        #self.assertMatches('...Ticket not yet paid...',
+        #                   self.browser.contents)
 
         # The same payment (with same p_item, p_session and p_category)
@@ -1307 +1307 @@
             self.browser.contents)
 
-        # Managers can open the pdf payment receipt
+        # Managers can open the pdf payment slip
         self.browser.open(payment_url)
-        self.browser.getLink("Download payment receipt").click()
+        self.browser.getLink("Download payment slip").click()
         self.assertEqual(self.browser.headers['Status'], '200 Ok')
         self.assertEqual(self.browser.headers['Content-Type'], 'application/pdf')
@@ -1384 +1384 @@
         ac.owner = self.student_id
 
-        # Students can open the pdf payment receipt
-        self.browser.open(payment_url + '/payment_receipt.pdf')
+        # Students can open the pdf payment slip
+        self.browser.open(payment_url + '/payment_slip.pdf')
         self.assertEqual(self.browser.headers['Status'], '200 Ok')
         self.assertEqual(self.browser.headers['Content-Type'], 'application/pdf')

main/waeup.kofa/trunk/src/waeup/kofa/students/viewlets.py

@@ -319 +319 @@
     grok.require('waeup.viewStudent')
     icon = 'actionicon_pdf.png'
-    text = _('Download payment receipt')
-    target = 'payment_receipt.pdf'
-
-    @property
-    def target_url(self):
-        if self.context.p_state != 'paid':
-            return ''
+    text = _('Download payment slip')
+    target = 'payment_slip.pdf'
+
+    @property
+    def target_url(self):
+        #if self.context.p_state != 'paid':
+        #    return ''
         return self.view.url(self.view.context, self.target)