From: zworkb <svn...@pl...> - 2006-01-13 16:25:39
|
Author: zworkb Date: Fri Jan 13 16:25:24 2006 New Revision: 15650 Modified: PloneMall/core/PloneMallPayment/branches/1.1/PloneMallPayment/CashOnDelivery.py PloneMall/core/PloneMallPayment/branches/1.1/PloneMallPayment/PaymentInformation.py Log: repaired CashOnDelivery Modified: PloneMall/core/PloneMallPayment/branches/1.1/PloneMallPayment/CashOnDelivery.py ============================================================================== --- PloneMall/core/PloneMallPayment/branches/1.1/PloneMallPayment/CashOnDelivery.py (original) +++ PloneMall/core/PloneMallPayment/branches/1.1/PloneMallPayment/CashOnDelivery.py Fri Jan 13 16:25:24 2006 @@ -46,8 +46,7 @@ ''' ''' - - order.notifyEmail() + #order.portal_workflow.doActionFor(order,'finish') return addPaymentInformation(order, self) Modified: PloneMall/core/PloneMallPayment/branches/1.1/PloneMallPayment/PaymentInformation.py ============================================================================== --- PloneMall/core/PloneMallPayment/branches/1.1/PloneMallPayment/PaymentInformation.py (original) +++ PloneMall/core/PloneMallPayment/branches/1.1/PloneMallPayment/PaymentInformation.py Fri Jan 13 16:25:24 2006 @@ -150,9 +150,10 @@ """ """ + self.portal_workflow.doActionFor(self.getOrder(),'finish') + return self.REQUEST.RESPONSE.redirect(self.aq_parent.absolute_url()+ \ + '/afterCheckout') - return self.REQUEST.RESPONSE.redirect('%s/thankyou?order_id=%s' % \ - (self.portal_url(), self.getOrderId())) security.declarePublic('getPaymentMethodName') |