Changeset 12825

Timestamp:

24 Mar 2015, 12:45:18 (10 years ago)

Author:

Henrik Bettermann

Message:

Fix template and add test.

Location:

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

Files:

• browser_templates/paymentspage.pt (modified) (1 diff)
• tests/test_browser.py (modified) (1 diff)

main/waeup.ikoba/trunk/src/waeup/ikoba/customers/browser_templates/paymentspage.pt

@@ -10 +10 @@
     <th i18n:translate="">Currency</th>
     <th i18n:translate="">State</th>
-    <th i18n:translate="">Contract</th>
+    <th i18n:translate="">Title</th>
   </tr>
   </thead>
   <tbody>
     <tr tal:repeat="value view/payments">
-      <td tal:content="python: value[0].payment_id[:9]">PAYMENT_ID</td>
-      <td tal:content="python: layout.formatDatetime(value[0].creation_date)">CREATION DATE</td>
-      <td tal:content="python: layout.formatDatetime(value[0].payment_date)">PAYMENT DATE</td>
-      <td tal:content="python: view.gateway_services[value[0].gateway_service].title">SERVICE</td>
-      <td tal:content="python: value[0].amount">AMOUNT</td>
-      <td tal:content="python: value[0].currency">CURRENCY</td>
-      <td tal:content="python: view.payment_states.getTerm(value[0].state).title">STATE</td>
-      <td>
-        <span tal:condition="python: value[1] is not None">
-          <a tal:attributes="href python: view.url(value[2])">
-            <span tal:content="python: value[1].title">PAYABLETITLE</span>
-          </a>
-        </span>
-      </td>
+      <td tal:content="python: value.payment_id[:9]">PAYMENT_ID</td>
+      <td tal:content="python: layout.formatDatetime(value.creation_date)">CREATION DATE</td>
+      <td tal:content="python: layout.formatDatetime(value.payment_date)">PAYMENT DATE</td>
+      <td tal:content="python: view.gateway_services[value.gateway_service].title">SERVICE</td>
+      <td tal:content="python: value.amount">AMOUNT</td>
+      <td tal:content="python: value.currency">CURRENCY</td>
+      <td tal:content="python: view.payment_states.getTerm(value.state).title">STATE</td>
+      <td tal:content="python: value.title">TITLE</td>
     </tr>
   </tbody>

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

@@ -1660 +1660 @@
         radio_ctrl.displayValue = ['Credit Card (Demo Payments)']
         self.browser.getControl(self.never_ending_button_text).click()
+
+
+class PaymentsUITests(CustomersFullSetup):
+    # Tests for contract related views and pages
+
+    def setup_payment(self):
+        payer = IPayer(self.customer)
+        payable = IPayable(self.contract)
+        self.payment = Payment(payer, payable)
+        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
+
+    def add_product_option(self, contract):
+        prodoption = ProductOption()
+        prodoption.title = u'Any product option'
+        prodoption.fee = Decimal('88.8')
+        prodoption.currency = 'EUR'
+        contract.product_options = [prodoption, ]
+
+    def test_view_payments(self):
+        self.add_product_option(self.contract)
+        self.setup_payment()
+        self.browser.addHeader('Authorization', 'Basic mgr:mgrpw')
+        self.browser.open(self.customer_path)
+        self.assertEqual(self.browser.headers['Status'], '200 Ok')
+        self.assertEqual(self.browser.url, self.customer_path)
+        self.browser.open(self.customer_path)
+        self.browser.getLink("Payments", index=1).click()
+        self.assertTrue(
+            '<td>Credit Card (Demo Payments)</td>' in self.browser.contents)