[MERGE] forward port of branch saas-6 up to 580389a

1 files changed, 2 insertions, 5 deletions

diff --git a/addons/payment_buckaroo/controllers/main.py b/addons/payment_buckaroo/controllers/main.py
index d6797493936..515d8cf2d1e 100644
--- a/addons/payment_buckaroo/controllers/main.py
+++ b/addons/payment_buckaroo/controllers/main.py
@@ -26,9 +26,6 @@ class BuckarooController(http.Controller):
         """ Buckaroo."""
         _logger.info('Buckaroo: entering form_feedback with post data %s', pprint.pformat(post))  # debug
         request.registry['payment.transaction'].form_feedback(request.cr, SUPERUSER_ID, post, 'buckaroo', context=request.context)
-        return_url = post.pop('return_url', '')
-        if not return_url:
-            data ='' + post.pop('ADD_RETURNDATA', '{}').replace("'", "\"")
-            custom = json.loads(data)
-            return_url = custom.pop('return_url', '/')
+        post = dict((key.upper(), value) for key, value in post.items())
+        return_url = post.get('ADD_RETURNDATA') or '/'
         return werkzeug.utils.redirect(return_url)