[FIX] payment_*: fixed return controlers, now using werkzeug redirection

bzr revid: tde@openerp.com-20140124145923-fsyv2tm5z92m1je1
This commit is contained in:
Thibault Delavallée 2014-01-24 15:59:23 +01:00
parent 47d8864dc8
commit a7908b63bd
3 changed files with 10 additions and 7 deletions

View File

@ -1,14 +1,15 @@
# -*- coding: utf-8 -*-
from openerp.addons.web import http
from openerp.addons.web.http import request
try:
import simplejson as json
except ImportError:
import json
import logging
import pprint
import werkzeug
from openerp.addons.web import http
from openerp.addons.web.http import request
_logger = logging.getLogger(__name__)
@ -28,4 +29,4 @@ class AdyenController(http.Controller):
if not return_url:
custom = json.loads(post.pop('merchantReturnData', '{}'))
return_url = custom.pop('return_url', '/')
return request.redirect(return_url)
return werkzeug.utils.redirect(return_url)

View File

@ -1,6 +1,7 @@
# -*- coding: utf-8 -*-
import logging
import pprint
import werkzeug
from openerp.addons.web import http
from openerp.addons.web.http import request
@ -25,4 +26,4 @@ class OgoneController(http.Controller):
_logger.info('Ogone: entering form_feedback with post data %s', pprint.pformat(post)) # debug
cr, uid, context = request.cr, request.uid, request.context
request.registry['payment.transaction'].form_feedback(cr, uid, post, 'ogone', context=context)
return request.redirect(post.pop('return_url', '/'))
return werkzeug.utils.redirect(post.pop('return_url', '/'))

View File

@ -8,6 +8,7 @@ import logging
import pprint
import urllib
import urllib2
import werkzeug
from openerp.addons.web import http
from openerp.addons.web.http import request
@ -66,7 +67,7 @@ class PaypalController(http.Controller):
_logger.info('Beginning Paypal DPN form_feedback with post data %s', pprint.pformat(post)) # debug
return_url = self._get_return_url(**post)
self.paypal_validate_data(**post)
return request.redirect(return_url)
return werkzeug.utils.redirect(return_url)
@http.route('/payment/paypal/cancel', type='http', auth="admin")
def paypal_cancel(self, **post):
@ -74,4 +75,4 @@ class PaypalController(http.Controller):
cr, uid, context = request.cr, request.uid, request.context
_logger.info('Beginning Paypal cancel with post data %s', pprint.pformat(post)) # debug
return_url = self._get_return_url(**post)
return request.redirect(return_url)
return werkzeug.utils.redirect(return_url)