Changeset 12793

Timestamp:

19 Mar 2015, 11:27:36 (10 years ago)

Author:

Henrik Bettermann

Message:

Render all payment data (depending on interface) on PDFContractReceiptPage.

Location:

main/waeup.ikoba/trunk/src/waeup/ikoba

Files:

• customers/browser.py (modified) (2 diffs)
• customers/tests/test_browser.py (modified) (1 diff)
• customers/utils.py (modified) (1 diff)
• payments/payment.py (modified) (1 diff)

main/waeup.ikoba/trunk/src/waeup/ikoba/customers/browser.py

@@ -34 +34 @@
     STARTED, VERIFIED, REJECTED, EXPIRED, CREATED, REQUESTED,
     APPROVED, PROVISIONALLY, AWAITING)
+from waeup.ikoba.widgets.datewidget import (
+    FriendlyDateWidget, FriendlyDateDisplayWidget,
+    FriendlyDatetimeDisplayWidget)
 from waeup.ikoba.browser.layout import (
     IkobaPage, IkobaEditFormPage, IkobaAddFormPage, IkobaDisplayFormPage,
@@ -1756 +1759 @@
 
     @property
-    def payment(self):
-        return get_payments_from_payable_id(self.context.contract_id)
+    def payment_tuples(self):
+        payment_tuples = []
+        for payment in get_payments_from_payable_id(self.context.contract_id):
+            form_fields = grok.AutoFields(payment.form_fields_interface).omit(
+                'payment_items')
+            form_fields[
+                'creation_date'].custom_widget = FriendlyDatetimeDisplayWidget('le')
+            form_fields[
+                'payment_date'].custom_widget = FriendlyDatetimeDisplayWidget('le')
+            payment_tuples.append((payment, form_fields))
+        return payment_tuples
 
     def render(self):

main/waeup.ikoba/trunk/src/waeup/ikoba/customers/tests/test_browser.py

@@ -1299 +1299 @@
         self.payment.gateway_service = 'demo_creditcard'
         self.payment.state = STATE_PAID
+        self.payment.title = u'My payment'
         self.app['payments'][self.payment.payment_id] = self.payment
 

main/waeup.ikoba/trunk/src/waeup/ikoba/customers/utils.py

@@ -395 +395 @@
 
         # Insert payment data
-        if getattr(view, 'payment', None) is not None:
-            data_header = trans(_('Payment Data'), portal_language)
+        if getattr(view, 'payment_tuples', None) is not None:
+            data_header = trans(_('Payments'), portal_language)
             data.append(Paragraph(data_header, HEADING_STYLE))
-            for payment in getattr(view, 'payment', None):
+            payment_number = 0
+            for payment_tuple in getattr(view, 'payment_tuples', None):
+                payment_number += 1
+                payment = payment_tuple[0]
+                payment_form_fields = payment_tuple[1]
                 if payment.state != STATE_PAID:
                     continue
-                data.append(Paragraph('Payment', HEADLINE1_STYLE))
-                # XXX: Collect and render payment data
+                data.append(Paragraph("Payment %s" % payment_number, HEADLINE1_STYLE))
+                separators = getattr(self, 'SEPARATORS_DICT', {})
+                table = creator.getWidgetsTable(
+                    payment_form_fields, payment, None, lang=portal_language,
+                    separators=separators)
+                data.append(table)
 
         # Insert scanned docs

main/waeup.ikoba/trunk/src/waeup/ikoba/payments/payment.py

@@ -185 +185 @@
     grok.provides(IPayment)
 
+    form_fields_interface = IPayment
+
     @property
     def amount(self):