Changeset 12734 for main/waeup.ikoba/branches/uli-payments/src/waeup/ikoba/customers

Timestamp:

11 Mar 2015, 17:08:34 (10 years ago)

Author:

uli

Message:

Restructure things a bit.

Location:

main/waeup.ikoba/branches/uli-payments/src/waeup/ikoba/customers

Files:

• browser.py (modified) (3 diffs)
• contracts.py (modified) (1 diff)

main/waeup.ikoba/branches/uli-payments/src/waeup/ikoba/customers/browser.py

@@ -43 +43 @@
 from waeup.ikoba.payments.payment import format_payment_item_values
 from waeup.ikoba.payments.interfaces import (
-    IPaymentGatewayServicesLister, IPaymentGatewayService, IPayer
+    IPaymentGatewayServicesLister, IPaymentGatewayService, IPayer, IPayable
     )
 from waeup.ikoba.widgets.hrefwidget import HREFDisplayWidget
@@ -56 +56 @@
 from waeup.ikoba.customers.catalog import search
 from waeup.ikoba.customers.workflow import PAYMENT_TRANSITIONS
-from waeup.ikoba.customers.contracts import payment_items_from_contract
 
 
@@ -1528 +1527 @@
                 return
             payer = IPayer(self.context)
-            payment_items = payment_items_from_contract(self.context)
-            payment = service.create_payment(payer, payment_items)
-            payment.payable_id = self.context.contract_id
+
+            payable = IPayable(self.context)
+            payment = service.create_payment(payer, payable)
+            service.store(payment)
             payment, view_name = service.next_step(payment.payment_id)
             url = self.url(payment, view_name)

main/waeup.ikoba/branches/uli-payments/src/waeup/ikoba/customers/contracts.py

@@ -286 +286 @@
     @property
     def title(self):
-        return self.context.title
+        return self.context.title or u''
 
     @property