Changeset 12762 for main/waeup.ikoba/trunk/src/waeup/ikoba/customers

Timestamp:

14 Mar 2015, 13:49:29 (10 years ago)

Author:

Henrik Bettermann

Message:

Add PaymentsContainerPage? to search for and list payments (work in progress, completely untested).

Location:

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

Files:

• browser.py (modified) (6 diffs)
• browser_templates/paymentspage.pt (modified) (2 diffs)
• viewlets.py (modified) (1 diff)

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

@@ -50 +50 @@
     payment_states
     )
+from waeup.ikoba.payments.catalog import search as search_payments
 from waeup.ikoba.widgets.hrefwidget import HREFDisplayWidget
 from waeup.ikoba.utils.helpers import (
@@ -59 +60 @@
     IContractSelectProduct,
     )
-from waeup.ikoba.customers.catalog import search
+from waeup.ikoba.customers.catalog import search as search_customers
 from waeup.ikoba.customers.workflow import PAYMENT_TRANSITIONS
 
@@ -160 +161 @@
                            type="danger")
                 return
-        self.hitlist = search(query=self.searchterm,
+        self.hitlist = search_customers(query=self.searchterm,
             searchtype=self.searchtype, view=self)
         if not self.hitlist:
@@ -203 +204 @@
                 return
         if not 'entries' in form:
-            self.hitlist = search(query=self.searchterm,
+            self.hitlist = search_customers(query=self.searchterm,
                 searchtype=self.searchtype, view=self)
             if not self.hitlist:
@@ -218 +219 @@
                 del self.context[entry]
                 deleted.append(entry)
-        self.hitlist = search(query=self.searchterm,
+        self.hitlist = search_customers(query=self.searchterm,
             searchtype=self.searchtype, view=self)
         if len(deleted):
@@ -1729 +1730 @@
 
     def payments(self):
-        values = []
-        payable = None
-        for payment in get_payments_from_payer_id(
-            self.context.customer.customer_id):
-            payable_object = find_payable_from_payable_id(payment.payable_id)
-            if payable_object is not None:
-                payable = IPayable(payable_object)
-            values.append((payment, payable, payable_object))
-        return values
+        return search_payments(
+            query=self.context.customer_id, searchtype='payer_id')

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

@@ -1 +1 @@
 <br />
-<table class="ikoba-data-table dataTableManage">
+<table class="ikoba-data-table dataTable">
   <thead>
   <tr>
@@ -20 +20 @@
       <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">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>

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

@@ -166 +166 @@
     text = _(u'Documents')
 
+
 class CustomerManagePaymentsLink(CustomerManageLink):
     grok.order(5)