From d4064d82c3e628689559fcee82fee7cfeed04d1b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Mon, 18 Nov 2013 12:17:32 +0100 Subject: [PATCH] [CLEAN] payment_acquirer_ogone: misc cleaning in module - test bzr revid: tde@openerp.com-20131118111732-jdko48ebeylwqpyr --- addons/payment_acquirer_ogone/controllers/main.py | 5 +++-- addons/payment_acquirer_ogone/tests/test_ogone.py | 12 +++++++----- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/addons/payment_acquirer_ogone/controllers/main.py b/addons/payment_acquirer_ogone/controllers/main.py index 3c2c5000480..fe2849a77df 100644 --- a/addons/payment_acquirer_ogone/controllers/main.py +++ b/addons/payment_acquirer_ogone/controllers/main.py @@ -49,7 +49,6 @@ class OgoneController(http.Controller): res = Payment.ogone_form_feedback(cr, uid, post, context) print 'result after feedback', res - # return '' return request.redirect(return_url) @website.route([ @@ -60,4 +59,6 @@ class OgoneController(http.Controller): def ogone_form_feedback_other(self, **post): cr, uid, context = request.cr, request.uid, request.context print 'Entering ogone_form_feedback_other', post - return '' + return_url = post.pop('return_url', '/') + print 'return_url', return_url + return request.redirect(return_url) diff --git a/addons/payment_acquirer_ogone/tests/test_ogone.py b/addons/payment_acquirer_ogone/tests/test_ogone.py index f7e85dccb97..d981f21f861 100644 --- a/addons/payment_acquirer_ogone/tests/test_ogone.py +++ b/addons/payment_acquirer_ogone/tests/test_ogone.py @@ -182,7 +182,6 @@ class OgonePayment(PaymentAcquirerCommon): def test_30_ogone_s2s(self): test_ref = 'test_ref_%.15f' % time.time() - print test_ref cr, uid, context = self.cr, self.uid, {} # create a new draft tx @@ -197,19 +196,22 @@ class OgonePayment(PaymentAcquirerCommon): }, context=context ) + # create an alias res = self.payment_transaction.ogone_s2s_create_alias( cr, uid, tx_id, { 'expiry_date_mm': '01', 'expiry_date_yy': '2015', 'holder_name': 'Norbert Poilu', - 'number': '4000000000000006', + 'number': '4000000000000002', 'brand': 'VISA', }, context=context) - print res - print '--------------------' + # check an alias is set, containing at least OPENERP + tx = self.payment_transaction.browse(cr, uid, tx_id, context=context) + self.assertIn('OPENERP', tx.partner_reference, 'ogone: wrong partner reference after creating an alias') + res = self.payment_transaction.ogone_s2s_execute(cr, uid, tx_id, {}, context=context) - print res + # print res # {