Changeset 12714 for main/waeup.ikoba/branches

Timestamp:

10 Mar 2015, 13:16:48 (10 years ago)

Author:

uli

Message:

Some finetuning.

Location:

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

Files:

• browser.py (modified) (3 diffs)
• tests/test_browser.py (modified) (1 diff)

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

@@ -1516 +1516 @@
         return
 
-    @action(_('Select payment method and proceed to payment gateway'
-              ' (final submission)'),
+    @action(_('Select payment method (final submission)'),
             style='primary', warning=WARNING_CON,)
     def confirm(self, **data):
@@ -1524 +1523 @@
                        type='warning')
         else:
-
             service = queryUtility(IPaymentGatewayService, name=self.gw)
             if service is None:
@@ -1532 +1530 @@
             payment_items = payment_items_from_contract(self.context)
             payment = service.create_payment(payer, payment_items)
+            payment.contract_id = self.context.contract_id
             payment, view_name = service.next_step(payment.payment_id)
             url = self.url(payment, view_name)
-            self.flash(_('Payment has been initiated.'))
-            IWorkflowInfo(self.context).fireTransition('await')
+            #IWorkflowInfo(self.context).fireTransition('await')
             self.redirect(url)
             return
-
-        return
+        return
+
+    @action(_('Cancel'))
+    def cancel(self, **data):
+        self.redirect(self.url(self.context, 'edit'))
+        return
+
 
 class ContractTriggerTransitionFormPage(IkobaEditFormPage):

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

@@ -1288 +1288 @@
 
     never_ending_button_text = (
-        'Select payment method and proceed to payment '
-        'gateway (final submission)')
+        'Select payment method (final submission)')
 
     def add_product_option(self, contract):