Merge lp:~openerp-dev/openobject-addons/trunk-payment-buckaroo-dka into lp:openobject-addons

[Thibault Delavallée (OpenERP)]

[ADD] New payment acquirer: Buckaroo.

[lp:~openerp-dev/openobject-addons/trunk-payment-buckaroo-dka]

9087. By Niko (OpenERP) on 2014-02-28

[IMP] Add some video to manisfest ( website, website_blog, website_event, website_ecommerce)

9184. By Darshan Kalola(OpenERP) on 2014-02-27

[IMP]remove unnecessary code.

9185. By Darshan Kalola(OpenERP) on 2014-03-06

[MERGE]sync with trunk.

9186. By Darshan Kalola(OpenERP) on 2014-03-24

[MERGE]sync with trunk.

9187. By Darshan Kalola(OpenERP) on 2014-03-24

[ADD]payment_buckaroo: added websitekey.

9188. By Darshan Kalola(OpenERP) on 2014-03-24

[IMP]payment_buckaroo:added secretkey and improved digital signature.

9189. By Darshan Kalola(OpenERP) on 2014-03-24

[IMP]payment_buckaroo: added buckaroo_return method in controller to handel return url and added _buckaroo_form_get_tx_from_data method in payment transaction.

9190. By Darshan Kalola(OpenERP) on 2014-03-25

[MERGE]sync with trunk.

9191. By Darshan Kalola(OpenERP) on 2014-03-25

[IMP]payment_buckaroo:improved method name.

9192. By Darshan Kalola(OpenERP) on 2014-03-26

[IMP]payment_buckaroo: added _buckaroo_form_validate method.

9193. By Darshan Kalola(OpenERP) on 2014-03-26

[IMP]payment_buckaroo: added _buckaroo_form_get_invalid_parameters method.

9194. By Darshan Kalola(OpenERP) on 2014-03-26

[IMP]payment_buckaroo: Removed unnecessary field.

9195. By Darshan Kalola(OpenERP) on 2014-03-28

[IMP]website_sale : improved payment_transaction method to send post request to payment getway and added exception url and reject url in buckaroo parameter and removed unnecessary code.

9196. By Darshan Kalola(OpenERP) on 2014-03-28

[MERGE]sync with trunk.

9197. By Darshan Kalola(OpenERP) on 2014-03-31

[MERGE]sync with trunk.

9198. By Darshan Kalola(OpenERP) on 2014-04-02

[IMP]removed unnecessary code and typo.

9199. By Darshan Kalola(OpenERP) on 2014-04-03

[IMP]payment_buckaroo:improved code and image.

9200. By Darshan Kalola(OpenERP) on 2014-04-03

[MERGE]sync with trunk.

9201. By Darshan Kalola(OpenERP) on 2014-04-04

[IMP]improved typo.

9202. By Darshan Kalola(OpenERP) on 2014-04-04

[IMP]pyment_buckaroo: inherited selection to add ('buckaroo','Buckaroo')in provider list , changed code accordinglly and rename file.

9203. By Darshan Kalola(OpenERP) on 2014-04-04

[MERGE]sync with trunk.

9204. By Darshan Kalola(OpenERP) on 2014-04-07

[IMP]pyament_buckaroo: added separate variable for buckarro status code.

9205. By Darshan Kalola(OpenERP) on 2014-04-10

[MERGE]sync with trunk.

9206. By Darshan Kalola(OpenERP) on 2014-04-11

[MERGE]sync with trunk.

9207. By Darshan Kalola(OpenERP) on 2014-04-14

[MERGE]sync with trunk.

9208. By Darshan Kalola(OpenERP) on 2014-04-14

[MERGE]sync with trunk.

9209. By Darshan Kalola(OpenERP) on 2014-04-15

[IMP]verify the digital signature comming from buckaroo.

9210. By Darshan Kalola(OpenERP) on 2014-04-23

[MERGE]sync with trunk.

9211. By Darshan Kalola(OpenERP) on 2014-04-25

[MERGE]sync with trunk.

9212. By Darshan Kalola(OpenERP) on 2014-04-25

[IMP]payment_buckaroo: rename fields name env to environment.

[Thibault Delavallée (OpenERP) (tde-openerp)]

Hello,

At first sight seems quite correct. But could you write tests like the one present in paypal or ogone ? They should be disabled by default because there is no valid data in the module; but test them locally using the credentials you have.

Best regards,

[lp:~openerp-dev/openobject-addons/trunk-payment-buckaroo-dka]

9213. By Darshan Kalola(OpenERP) on 2014-04-28

[IMP]payment_buckaroo:added test case to check the module correctly work or not.

9214. By Darshan Kalola(OpenERP) on 2014-04-28

[MERGE]sync with trunk.

9215. By Darshan Kalola(OpenERP) on 2014-04-28

[IMP]disabled test case.

9216. By Darshan Kalola(OpenERP) on 2014-04-29

[IMP]improved spacing.

9217. By Darshan Kalola(OpenERP) on 2014-04-29

[MERGE]sync with trunk.

9218. By Darshan Kalola(OpenERP) on 2014-04-29

[MERGE]sync with trunk.

9219. By Darshan Kalola(OpenERP) on 2014-05-01

[MERGE]sync with trunk.

9220. By Thibault Delavallée (OpenERP) on 2014-05-05

[MERGE] Sync with upstream (trunk)

[Thibault Delavallée (OpenERP) (tde-openerp)]

Hello,

Some remarks :
- remove credentials from data now that the branch is about to be merged (set dummy / dummy)
- lint the module (some unused imports, space errors, ...)

One thing to add :
- management of tx_values['return_url'] (see in paypal / adyen / ...). Using custom variables (see chapter about custom variables in buckaroo documentation), put the return url of the shop like other providers, and get it back in the controller instead of having an hardcoded redirection to "/shop/payment/validate/" .

Best regards,

Thibault.

review: Needs Fixing (technical)

[lp:~openerp-dev/openobject-addons/trunk-payment-buckaroo-dka]

9221. By Darshan Kalola(OpenERP) on 2014-05-05

[IMP]remove credential information and remove unneccessary import.

9222. By Darshan Kalola(OpenERP) on 2014-05-05

[IMP]payment_buckaroo:added custome variable for return_url.

9223. By Darshan Kalola(OpenERP) on 2014-05-06

[MERGE]sync with trunk.

9224. By Darshan Kalola(OpenERP) on 2014-05-06

[IMP]remove unnecessary import.

9225. By Thibault Delavallée (OpenERP) on 2014-05-08

[MERGE] Sync with trunk

9226. By Thibault Delavallée (OpenERP) on 2014-05-08

[CLEAN] payment_buckaroo: cleaned a bit the file for the tests, according
to new tests specifications in post-saas-4.

9227. By Darshan Kalola(OpenERP) on 2014-05-08

[IMP]payment_buckaroo:improved digital signature in test case.

9228. By Thibault Delavallée (OpenERP) on 2014-05-09

[MERGE] Sync with trunk

9229. By Darshan Kalola(OpenERP) on 2014-05-12

[MERGE]sync with trunk.

9230. By Darshan Kalola(OpenERP) on 2014-05-14

[MERGE]sync with trunk.

9231. By Darshan Kalola(OpenERP) on 2014-05-14

[MERGE]merged lp:~openerp-dev/openobject-addons/trunk-ecommerce-post-tde and removed unnecessary code which handle the post request as got better solution in trunk-ecommerce-post-tde branch.

9232. By Darshan Kalola(OpenERP) on 2014-05-15

[MERGE]sync with trunk and resolve conflicts from website_sale controller/ in payment_transaction method.

9233. By Darshan Kalola(OpenERP) on 2014-05-21

[MERGE]sync with trunk.

Unmerged revisions

9233. By Darshan Kalola(OpenERP) on 2014-05-21

[MERGE]sync with trunk.

9232. By Darshan Kalola(OpenERP) on 2014-05-15

[MERGE]sync with trunk and resolve conflicts from website_sale controller/ in payment_transaction method.

9231. By Darshan Kalola(OpenERP) on 2014-05-14

[MERGE]merged lp:~openerp-dev/openobject-addons/trunk-ecommerce-post-tde and removed unnecessary code which handle the post request as got better solution in trunk-ecommerce-post-tde branch.

9230. By Darshan Kalola(OpenERP) on 2014-05-14

[MERGE]sync with trunk.

9229. By Darshan Kalola(OpenERP) on 2014-05-12

[MERGE]sync with trunk.

9228. By Thibault Delavallée (OpenERP) on 2014-05-09

[MERGE] Sync with trunk

9227. By Darshan Kalola(OpenERP) on 2014-05-08

[IMP]payment_buckaroo:improved digital signature in test case.

9226. By Thibault Delavallée (OpenERP) on 2014-05-08

[CLEAN] payment_buckaroo: cleaned a bit the file for the tests, according
to new tests specifications in post-saas-4.

9225. By Thibault Delavallée (OpenERP) on 2014-05-08

[MERGE] Sync with trunk

9224. By Darshan Kalola(OpenERP) on 2014-05-06

[IMP]remove unnecessary import.

=== modified file 'payment/models/res_config.py'
--- payment/models/res_config.py	2014-03-05 16:37:37 +0000
+++ payment/models/res_config.py	2014-05-21 05:25:49 +0000
@@ -16,4 +16,7 @@
         'module_payment_adyen': fields.boolean(
             'Manage Payments Using Adyen',
             help='-It installs the module payment_adyen.'),
+        'module_payment_buckaroo': fields.boolean(
+            'Manage Payments Using Buckaroo',
+            help='-It installs the module payment_buckaroo.'),
     }

=== modified file 'payment/views/res_config_view.xml'
--- payment/views/res_config_view.xml	2014-01-23 15:01:35 +0000
+++ payment/views/res_config_view.xml	2014-05-21 05:25:49 +0000
@@ -20,6 +20,10 @@
                         <field name="module_payment_adyen" class="oe_inline"/>
                         <label for="module_payment_adyen"/>
                     </div>
+                    <div>
+                        <field name="module_payment_buckaroo" class="oe_inline"/>
+                        <label for="module_payment_buckaroo"/>
+                    </div>
                 </xpath>
             </field>
         </record>

=== added directory 'payment_buckaroo'
=== added file 'payment_buckaroo/__init__.py'
--- payment_buckaroo/__init__.py	1970-01-01 00:00:00 +0000
+++ payment_buckaroo/__init__.py	2014-05-21 05:25:49 +0000
@@ -0,0 +1,23 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2013-Today OpenERP SA (<http://www.openerp.com>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import models
+import controllers

=== added file 'payment_buckaroo/__openerp__.py'
--- payment_buckaroo/__openerp__.py	1970-01-01 00:00:00 +0000
+++ payment_buckaroo/__openerp__.py	2014-05-21 05:25:49 +0000
@@ -0,0 +1,17 @@
+# -*- coding: utf-8 -*-
+
+{
+    'name': 'Payment Buckaroo',
+    'category': 'Hidden',
+    'summary': 'Payment Acquirer: Buckaroo Implementation',
+    'version': '1.0',
+    'description': """Payment Buckaroo""",
+    'author': 'OpenERP SA',
+    'depends': ['payment'],
+    'data': [
+        'views/buckaroo.xml',
+        'views/payment_acquirer.xml',
+        'data/buckaroo.xml',
+    ],
+    'installable': True,
+}

=== added directory 'payment_buckaroo/controllers'
=== added file 'payment_buckaroo/controllers/__init__.py'
--- payment_buckaroo/controllers/__init__.py	1970-01-01 00:00:00 +0000
+++ payment_buckaroo/controllers/__init__.py	2014-05-21 05:25:49 +0000
@@ -0,0 +1,3 @@
+# -*- coding: utf-8 -*-
+
+import main

=== added file 'payment_buckaroo/controllers/main.py'
--- payment_buckaroo/controllers/main.py	1970-01-01 00:00:00 +0000
+++ payment_buckaroo/controllers/main.py	2014-05-21 05:25:49 +0000
@@ -0,0 +1,38 @@
+# -*- coding: utf-8 -*-
+try:
+    import simplejson as json
+except ImportError:
+    import json
+
+import logging
+import pprint
+import werkzeug
+
+from openerp import http, SUPERUSER_ID
+from openerp.http import request
+
+_logger = logging.getLogger(__name__)
+
+
+class BuckarooController(http.Controller):
+    _return_url = '/payment/buckaroo/return'
+    _cancel_url = '/payment/buckaroo/cancel'
+    _exception_url = '/payment/buckaroo/error'
+    _reject_url = '/payment/buckaroo/reject'
+
+    @http.route([
+        '/payment/buckaroo/return',
+        '/payment/buckaroo/cancel',
+        '/payment/buckaroo/error',
+        '/payment/buckaroo/reject',
+    ], type='http', auth='none')
+    def buckaroo_return(self, **post):
+        """ 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', '/')
+        return werkzeug.utils.redirect(return_url)

=== added directory 'payment_buckaroo/data'
=== added file 'payment_buckaroo/data/buckaroo.xml'
--- payment_buckaroo/data/buckaroo.xml	1970-01-01 00:00:00 +0000
+++ payment_buckaroo/data/buckaroo.xml	2014-05-21 05:25:49 +0000
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data noupdate="1">
+
+        <record id="payment_acquirer_buckaroo" model="payment.acquirer">
+            <field name="name">Buckarro</field>
+            <field name="provider">buckaroo</field>
+            <field name="company_id" ref="base.main_company"/>
+            <field name="view_template_id" ref="buckaroo_acquirer_button"/>
+            <field name="environment">test</field>
+            <field name="pre_msg"><![CDATA[
+<p>You will be redirected to the Buckaroo website after cliking on the payment button.</p>]]></field>
+            <field name="brq_websitekey">dummy</field>
+            <field name="brq_secretkey">dummy</field>
+        </record>
+
+    </data>
+</openerp>

=== added directory 'payment_buckaroo/models'
=== added file 'payment_buckaroo/models/__init__.py'
--- payment_buckaroo/models/__init__.py	1970-01-01 00:00:00 +0000
+++ payment_buckaroo/models/__init__.py	2014-05-21 05:25:49 +0000
@@ -0,0 +1,3 @@
+# -*- coding: utf-8 -*-
+
+import buckaroo

=== added file 'payment_buckaroo/models/buckaroo.py'
--- payment_buckaroo/models/buckaroo.py	1970-01-01 00:00:00 +0000
+++ payment_buckaroo/models/buckaroo.py	2014-05-21 05:25:49 +0000
@@ -0,0 +1,191 @@
+# -*- coding: utf-'8' "-*-"
+from hashlib import sha1
+import logging
+import urlparse
+
+from openerp.addons.payment.models.payment_acquirer import ValidationError
+from openerp.addons.payment_buckaroo.controllers.main import BuckarooController
+from openerp.osv import osv, fields
+from openerp.tools.float_utils import float_compare
+
+_logger = logging.getLogger(__name__)
+
+
+class AcquirerBuckaroo(osv.Model):
+    _inherit = 'payment.acquirer'
+
+    def _get_buckaroo_urls(self, cr, uid, environment, context=None):
+        """ Buckaroo URLs
+        """
+        if environment == 'prod':
+            return {
+                'buckaroo_form_url': 'https://checkout.buckaroo.nl/html/',
+            }
+        else:
+            return {
+                'buckaroo_form_url': 'https://testcheckout.buckaroo.nl/html/',
+            }
+
+    def _get_providers(self, cr, uid, context=None):
+        providers = super(AcquirerBuckaroo, self)._get_providers(cr, uid, context=context)
+        providers.append(['buckaroo', 'Buckaroo'])
+        return providers
+
+    _columns = {
+        'brq_websitekey': fields.char('WebsiteKey', required_if_provider='buckaroo'),
+        'brq_secretkey': fields.char('SecretKey', required_if_provider='buckaroo'),
+    }
+
+    def _buckaroo_generate_digital_sign(self, acquirer, inout, values):
+        """ Generate the shasign for incoming or outgoing communications.
+
+        :param browse acquirer: the payment.acquirer browse record. It should
+                                have a shakey in shaky out
+        :param string inout: 'in' (openerp contacting buckaroo) or 'out' (buckaroo
+                             contacting openerp).
+        :param dict values: transaction values
+
+        :return string: shasign
+        """
+        assert inout in ('in', 'out')
+        assert acquirer.provider == 'buckaroo'
+
+        keys = "add_returndata Brq_amount Brq_culture Brq_currency Brq_invoicenumber Brq_return Brq_returncancel Brq_returnerror Brq_returnreject brq_test Brq_websitekey".split()
+
+        def get_value(key):
+            if values.get(key):
+                return values[key]
+            return ''
+
+        if inout == 'out':
+            if 'BRQ_SIGNATURE' in values:
+                del values['BRQ_SIGNATURE']
+            items = sorted((k.upper(), v) for k, v in values.items())
+            sign = ''.join('%s=%s' % (k, v) for k, v in items)
+        else:
+            sign = ''.join('%s=%s' % (k,get_value(k)) for k in keys)
+        #Add the pre-shared secret key at the end of the signature
+        sign = sign + acquirer.brq_secretkey
+        if isinstance(sign, str):
+            sign = urlparse.parse_qsl(sign)
+        shasign = sha1(sign).hexdigest()
+        return shasign
+
+
+    def buckaroo_form_generate_values(self, cr, uid, id, partner_values, tx_values, context=None):
+        base_url = self.pool['ir.config_parameter'].get_param(cr, uid, 'web.base.url')
+        acquirer = self.browse(cr, uid, id, context=context)
+        buckaroo_tx_values = dict(tx_values)
+        buckaroo_tx_values.update({
+            'Brq_websitekey': acquirer.brq_websitekey,
+            'Brq_amount': tx_values['amount'],
+            'Brq_currency': tx_values['currency'] and tx_values['currency'].name or '',
+            'Brq_invoicenumber': tx_values['reference'],
+            'brq_test' : True,
+            'Brq_return': '%s' % urlparse.urljoin(base_url, BuckarooController._return_url),
+            'Brq_returncancel': '%s' % urlparse.urljoin(base_url, BuckarooController._cancel_url),
+            'Brq_returnerror': '%s' % urlparse.urljoin(base_url, BuckarooController._exception_url),
+            'Brq_returnreject': '%s' % urlparse.urljoin(base_url, BuckarooController._reject_url),
+            'Brq_culture': 'en-US',
+        })
+        if buckaroo_tx_values.get('return_url'):
+            buckaroo_tx_values['add_returndata'] = {'return_url': '%s' % buckaroo_tx_values.pop('return_url')}
+        else: 
+            buckaroo_tx_values['add_returndata'] = ''
+        buckaroo_tx_values['Brq_signature'] = self._buckaroo_generate_digital_sign(acquirer, 'in', buckaroo_tx_values)
+        return partner_values, buckaroo_tx_values
+
+    def buckaroo_get_form_action_url(self, cr, uid, id, context=None):
+        acquirer = self.browse(cr, uid, id, context=context)
+        return self._get_buckaroo_urls(cr, uid, acquirer.environment, context=context)['buckaroo_form_url']
+
+class TxBuckaroo(osv.Model):
+    _inherit = 'payment.transaction'
+
+    # buckaroo status
+    _buckaroo_valid_tx_status = [190]
+    _buckaroo_pending_tx_status = [790, 791, 792, 793]
+    _buckaroo_cancel_tx_status = [890, 891]
+    _buckaroo_error_tx_status = [490, 491, 492]
+    _buckaroo_reject_tx_status = [690]
+
+    _columns = {
+         'buckaroo_txnid': fields.char('Transaction ID'),
+    }
+    
+
+    # --------------------------------------------------
+    # FORM RELATED METHODS
+    # --------------------------------------------------
+
+    def _buckaroo_form_get_tx_from_data(self, cr, uid, data, context=None):
+        """ Given a data dict coming from buckaroo, verify it and find the related
+        transaction record. """
+        reference, pay_id, shasign = data.get('BRQ_INVOICENUMBER'), data.get('BRQ_PAYMENT'), data.get('BRQ_SIGNATURE')
+        if not reference or not pay_id or not shasign:
+            error_msg = 'Buckaroo: received data with missing reference (%s) or pay_id (%s) or shashign (%s)' % (reference, pay_id, shasign)
+            _logger.error(error_msg)
+            raise ValidationError(error_msg)
+
+        tx_ids = self.search(cr, uid, [('reference', '=', reference)], context=context)
+        if not tx_ids or len(tx_ids) > 1:
+            error_msg = 'Buckaroo: received data for reference %s' % (reference)
+            if not tx_ids:
+                error_msg += '; no order found'
+            else:
+                error_msg += '; multiple order found'
+            _logger.error(error_msg)
+            raise ValidationError(error_msg)
+        tx = self.pool['payment.transaction'].browse(cr, uid, tx_ids[0], context=context)
+
+        #verify shasign
+        shasign_check = self.pool['payment.acquirer']._buckaroo_generate_digital_sign(tx.acquirer_id, 'out' ,data)
+        if shasign_check.upper() != shasign.upper():
+            error_msg = 'Buckaroo: invalid shasign, received %s, computed %s, for data %s' % (shasign, shasign_check, data)
+            _logger.error(error_msg)
+            raise ValidationError(error_msg)
+
+        return tx 
+
+    def _buckaroo_form_get_invalid_parameters(self, cr, uid, tx, data, context=None):
+        invalid_parameters = []
+
+        if tx.acquirer_reference and data.get('BRQ_TRANSACTIONS') != tx.acquirer_reference:
+            invalid_parameters.append(('Transaction Id', data.get('BRQ_TRANSACTIONS'), tx.acquirer_reference))
+        # check what is buyed
+        if float_compare(float(data.get('BRQ_AMOUNT', '0.0')), tx.amount, 2) != 0:
+            invalid_parameters.append(('Amount', data.get('BRQ_AMOUNT'), '%.2f' % tx.amount))
+        if data.get('BRQ_CURRENCY') != tx.currency_id.name:
+            invalid_parameters.append(('Currency', data.get('BRQ_CURRENCY'), tx.currency_id.name))
+
+        return invalid_parameters
+
+    def _buckaroo_form_validate(self, cr, uid, tx, data, context=None):
+        status_code = int(data.get('BRQ_STATUSCODE','0'))
+        if status_code in self._buckaroo_valid_tx_status:
+            tx.write({
+                'state': 'done',
+                'buckaroo_txnid': data.get('BRQ_TRANSACTIONS'),
+            })
+            return True
+        elif status_code in self._buckaroo_pending_tx_status:
+            tx.write({
+                'state': 'pending',
+                'buckaroo_txnid': data.get('BRQ_TRANSACTIONS'),
+            })
+            return True
+        elif status_code in self._buckaroo_cancel_tx_status:
+            tx.write({
+                'state': 'cancel',
+                'buckaroo_txnid': data.get('BRQ_TRANSACTIONS'),
+            })
+            return True
+        else:
+            error = 'Buckaroo: feedback error'
+            _logger.info(error)
+            tx.write({
+                'state': 'error',
+                'state_message': error,
+                'buckaroo_txnid': data.get('BRQ_TRANSACTIONS'),
+            })
+            return False

=== added directory 'payment_buckaroo/static'
=== added directory 'payment_buckaroo/static/description'
=== added file 'payment_buckaroo/static/description/icon.png'
Binary files payment_buckaroo/static/description/icon.png	1970-01-01 00:00:00 +0000 and payment_buckaroo/static/description/icon.png	2014-05-21 05:25:49 +0000 differ
=== added directory 'payment_buckaroo/static/src'
=== added directory 'payment_buckaroo/static/src/img'
=== added file 'payment_buckaroo/static/src/img/buckaroo_icon.png'
Binary files payment_buckaroo/static/src/img/buckaroo_icon.png	1970-01-01 00:00:00 +0000 and payment_buckaroo/static/src/img/buckaroo_icon.png	2014-05-21 05:25:49 +0000 differ
=== added file 'payment_buckaroo/static/src/img/logo.png'
Binary files payment_buckaroo/static/src/img/logo.png	1970-01-01 00:00:00 +0000 and payment_buckaroo/static/src/img/logo.png	2014-05-21 05:25:49 +0000 differ
=== added directory 'payment_buckaroo/tests'
=== added file 'payment_buckaroo/tests/__init__.py'
--- payment_buckaroo/tests/__init__.py	1970-01-01 00:00:00 +0000
+++ payment_buckaroo/tests/__init__.py	2014-05-21 05:25:49 +0000
@@ -0,0 +1,7 @@
+# -*- coding: utf-8 -*-
+
+from openerp.addons.payment_buckaroo.tests import test_buckaroo
+
+checks = [
+    test_buckaroo,
+]

=== added file 'payment_buckaroo/tests/test_buckaroo.py'
--- payment_buckaroo/tests/test_buckaroo.py	1970-01-01 00:00:00 +0000
+++ payment_buckaroo/tests/test_buckaroo.py	2014-05-21 05:25:49 +0000
@@ -0,0 +1,178 @@
+# -*- coding: utf-8 -*-
+
+from lxml import objectify
+import urlparse
+
+import openerp
+from openerp.addons.payment.models.payment_acquirer import ValidationError
+from openerp.addons.payment.tests.common import PaymentAcquirerCommon
+from openerp.addons.payment_buckaroo.controllers.main import BuckarooController
+from openerp.tools import mute_logger
+
+
[e-mail]_install(False)
[e-mail]_install(False)
+class BuckarooCommon(PaymentAcquirerCommon):
+
+    def setUp(self):
+        super(BuckarooCommon, self).setUp()
+        cr, uid = self.cr, self.uid
+        self.base_url = self.registry('ir.config_parameter').get_param(cr, uid, 'web.base.url')
+
+        # get the buckaroo account
+        model, self.buckaroo_id = self.registry('ir.model.data').get_object_reference(cr, uid, 'payment_buckaroo', 'payment_acquirer_buckaroo')
+
+
[e-mail]_install(False)
[e-mail]_install(False)
+class BuckarooForm(BuckarooCommon):
+
+    def test_10_Buckaroo_form_render(self):
+        cr, uid, context = self.cr, self.uid, {}
+        # be sure not to do stupid things
+        buckaroo = self.payment_acquirer.browse(self.cr, self.uid, self.buckaroo_id, None)
+        self.assertEqual(buckaroo.environment, 'test', 'test without test environment')
+
+        # ----------------------------------------
+        # Test: button direct rendering
+        # ----------------------------------------
+
+        form_values = {
+            'add_returndata': None,
+            'Brq_websitekey': buckaroo.brq_websitekey,
+            'Brq_amount': '2240.0',
+            'Brq_currency': 'EUR',
+            'Brq_invoicenumber': 'SO004',
+            'Brq_signature': '1b8c10074c622d965272a91a9e88b5b3777d2474',  # update me
+            'brq_test': 'True',
+            'Brq_return': '%s' % urlparse.urljoin(self.base_url, BuckarooController._return_url),
+            'Brq_returncancel': '%s' % urlparse.urljoin(self.base_url, BuckarooController._cancel_url),
+            'Brq_returnerror': '%s' % urlparse.urljoin(self.base_url, BuckarooController._exception_url),
+            'Brq_returnreject': '%s' % urlparse.urljoin(self.base_url, BuckarooController._reject_url),
+            'Brq_culture': 'en-US',
+        }
+
+        # render the button
+        res = self.payment_acquirer.render(
+            cr, uid, self.buckaroo_id,
+            'SO004', 2240.0, self.currency_euro_id,
+            partner_id=None,
+            partner_values=self.buyer_values,
+            context=context)
+
+        # check form result
+        tree = objectify.fromstring(res)
+        self.assertEqual(tree.get('action'), 'https://testcheckout.buckaroo.nl/html/', 'Buckaroo: wrong form POST url')
+        for form_input in tree.input:
+            if form_input.get('name') in ['submit']:
+                continue
+            self.assertEqual(
+                form_input.get('value'),
+                form_values[form_input.get('name')],
+                'Buckaroo: wrong value for input %s: received %s instead of %s' % (form_input.get('name'), form_input.get('value'), form_values[form_input.get('name')])
+            )
+
+        # ----------------------------------------
+        # Test2: button using tx + validation
+        # ----------------------------------------
+
+        # create a new draft tx
+        tx_id = self.payment_transaction.create(
+            cr, uid, {
+                'amount': 2240.0,
+                'acquirer_id': self.buckaroo_id,
+                'currency_id': self.currency_euro_id,
+                'reference': 'SO004',
+                'partner_id': self.buyer_id,
+            }, context=context
+        )
+
+        # render the button
+        res = self.payment_acquirer.render(
+            cr, uid, self.buckaroo_id,
+            'should_be_erased', 2240.0, self.currency_euro,
+            tx_id=tx_id,
+            partner_id=None,
+            partner_values=self.buyer_values,
+            context=context)
+
+        # check form result
+        tree = objectify.fromstring(res)
+        self.assertEqual(tree.get('action'), 'https://testcheckout.buckaroo.nl/html/', 'Buckaroo: wrong form POST url')
+        for form_input in tree.input:
+            if form_input.get('name') in ['submit']:
+                continue
+            self.assertEqual(
+                form_input.get('value'),
+                form_values[form_input.get('name')],
+                'Buckaroo: wrong value for form input %s: received %s instead of %s' % (form_input.get('name'), form_input.get('value'), form_values[form_input.get('name')])
+            )
+
+    @mute_logger('openerp.addons.payment_buckaroo.models.buckaroo', 'ValidationError')
+    def test_20_buckaroo_form_management(self):
+        cr, uid, context = self.cr, self.uid, {}
+        # be sure not to do stupid thing
+        buckaroo = self.payment_acquirer.browse(self.cr, self.uid, self.buckaroo_id, None)
+        self.assertEqual(buckaroo.environment, 'test', 'test without test environment')
+
+        # typical data posted by buckaroo after client has successfully paid
+        buckaroo_post_data = {
+            'BRQ_RETURNDATA': u'',
+            'BRQ_AMOUNT': u'2240.00',
+            'BRQ_CURRENCY': u'EUR',
+            'BRQ_CUSTOMER_NAME': u'Jan de Tester',
+            'BRQ_INVOICENUMBER': u'SO004',
+            'BRQ_PAYMENT': u'573311D081B04069BD6336001611DBD4',
+            'BRQ_PAYMENT_METHOD': u'paypal',
+            'BRQ_SERVICE_PAYPAL_PAYERCOUNTRY': u'NL',
+            'BRQ_SERVICE_PAYPAL_PAYEREMAIL': u'[e-mail]',
+            'BRQ_SERVICE_PAYPAL_PAYERFIRSTNAME': u'Jan',
+            'BRQ_SERVICE_PAYPAL_PAYERLASTNAME': u'Tester',
+            'BRQ_SERVICE_PAYPAL_PAYERMIDDLENAME': u'de',
+            'BRQ_SERVICE_PAYPAL_PAYERSTATUS': u'verified',
+            'BRQ_SIGNATURE': u'175d82dd53a02bad393fee32cb1eafa3b6fbbd91',
+            'BRQ_STATUSCODE': u'190',
+            'BRQ_STATUSCODE_DETAIL': u'S001',
+            'BRQ_STATUSMESSAGE': u'Transaction successfully processed',
+            'BRQ_TEST': u'true',
+            'BRQ_TIMESTAMP': u'2014-05-08 12:41:21',
+            'BRQ_TRANSACTIONS': u'D6106678E1D54EEB8093F5B3AC42EA7B',
+            'BRQ_WEBSITEKEY': u'5xTGyGyPyl',
+        }
+
+        # should raise error about unknown tx
+        with self.assertRaises(ValidationError):
+            self.payment_transaction.form_feedback(cr, uid, buckaroo_post_data, 'buckaroo', context=context)
+
+        tx_id = self.payment_transaction.create(
+            cr, uid, {
+                'amount': 2240.0,
+                'acquirer_id': self.buckaroo_id,
+                'currency_id': self.currency_euro_id,
+                'reference': 'SO004',
+                'partner_name': 'Norbert Buyer',
+                'partner_country_id': self.country_france_id,
+            }, context=context
+        )
+        # validate it
+        self.payment_transaction.form_feedback(cr, uid, buckaroo_post_data, 'buckaroo', context=context)
+        # check state
+        tx = self.payment_transaction.browse(cr, uid, tx_id, context=context)
+        self.assertEqual(tx.state, 'done', 'Buckaroo: validation did not put tx into done state')
+        self.assertEqual(tx.buckaroo_txnid, buckaroo_post_data.get('BRQ_TRANSACTIONS'), 'Buckaroo: validation did not update tx payid')
+
+        # reset tx
+        tx.write({'state': 'draft', 'date_validate': False, 'buckaroo_txnid': False})
+
+        # now buckaroo post is ok: try to modify the SHASIGN
+        buckaroo_post_data['BRQ_SIGNATURE'] = '54d928810e343acf5fb0c3ee75fd747ff159ef7a'
+        with self.assertRaises(ValidationError):
+            self.payment_transaction.form_feedback(cr, uid, buckaroo_post_data, 'buckaroo', context=context)
+
+        # simulate an error
+        buckaroo_post_data['BRQ_STATUSCODE'] = 2
+        buckaroo_post_data['BRQ_SIGNATURE'] = '4164b52adb1e6a2221d3d8a39d8c3e18a9ecb90b'
+        self.payment_transaction.form_feedback(cr, uid, buckaroo_post_data, 'buckaroo', context=context)
+        # check state
+        tx = self.payment_transaction.browse(cr, uid, tx_id, context=context)
+        self.assertEqual(tx.state, 'error', 'Buckaroo: erroneous validation did not put tx into error state')

=== added directory 'payment_buckaroo/views'
=== added file 'payment_buckaroo/views/buckaroo.xml'
--- payment_buckaroo/views/buckaroo.xml	1970-01-01 00:00:00 +0000
+++ payment_buckaroo/views/buckaroo.xml	2014-05-21 05:25:49 +0000
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data noupdate="1">
+
+        <template id="buckaroo_acquirer_button">
+            <form t-if="acquirer.brq_websitekey" t-att-action="tx_url" method="post" target="_self">
+                <input type="hidden" name="Brq_websitekey" t-att-value="tx_values['Brq_websitekey']"/>
+                <input type="hidden" name="Brq_amount" t-att-value="tx_values['Brq_amount'] or '0.0'"/>
+                <input type="hidden" name="Brq_currency" t-att-value="tx_values['Brq_currency']"/>
+                <input type="hidden" name="Brq_invoicenumber" t-att-value="tx_values['Brq_invoicenumber']"/>
+                <input type="hidden" name="Brq_signature" t-att-value="tx_values['Brq_signature']"/>
+                <input type="hidden" name="brq_test" t-att-value="tx_values['brq_test']"/>
+                <input type="hidden" name="Brq_culture" t-att-value="tx_values['Brq_culture']"/>
+                <!-- URLs -->
+                <input t-if="tx_values.get('Brq_return')" type='hidden' name='Brq_return'
+                    t-att-value="tx_values.get('Brq_return')"/>
+                <input t-if="tx_values.get('Brq_returncancel')" type='hidden' name='Brq_returncancel'
+                    t-att-value="tx_values.get('Brq_returncancel')"/>
+                <input t-if="tx_values.get('Brq_returnerror')" type='hidden' name='Brq_returnerror'
+                    t-att-value="tx_values.get('Brq_returnerror')"/>
+                <input t-if="tx_values.get('Brq_returnreject')" type='hidden' name='Brq_returnreject'
+                    t-att-value="tx_values.get('Brq_returnreject')"/>
+                <input type='hidden' name='add_returndata' t-att-value="tx_values.get('add_returndata')"/>
+                <!-- submit -->
+                <button type="image" name="submit" width="100px"
+                    t-att-class="submit_class">
+                    <img t-if="not submit_txt" src="/payment_buckaroo/static/src/img/buckaroo_icon.png"/>
+                    <span t-if="submit_txt"><t t-esc="submit_txt"/> <span class="fa fa-long-arrow-right"/></span>
+                </button>
+            </form>
+        </template>
+
+    </data>
+</openerp>

=== added file 'payment_buckaroo/views/payment_acquirer.xml'
--- payment_buckaroo/views/payment_acquirer.xml	1970-01-01 00:00:00 +0000
+++ payment_buckaroo/views/payment_acquirer.xml	2014-05-21 05:25:49 +0000
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+        <record id="acquirer_form_buckaroo" model="ir.ui.view">
+            <field name="name">acquirer.form.buckaroo</field>
+            <field name="model">payment.acquirer</field>
+            <field name="inherit_id" ref="payment.acquirer_form"/>
+            <field name="arch" type="xml">
+                <xpath expr='//group[@name="acquirer_display"]' position='after'>
+                    <group attrs="{'invisible': [('provider', '!=', 'buckaroo')]}">
+                        <field name="brq_websitekey"/>
+                        <field name="brq_secretkey"/>
+                    </group>
+                </xpath>
+            </field>
+        </record>
+
+        <record id="transaction_form_buckaroo" model="ir.ui.view">
+            <field name="name">acquirer.transaction.form.buckaroo</field>
+            <field name="model">payment.transaction</field>
+            <field name="inherit_id" ref="payment.transaction_form"/>
+            <field name="arch" type="xml">
+                <xpath expr='//notebook' position='inside'>
+                    <page string="Buckaroo TX Details">
+                        <group>
+                            <field name="buckaroo_txnid"/>
+                        </group>
+                    </page>
+                </xpath>
+            </field>
+        </record>
+
+    </data>
+</openerp>

=== modified file 'website_sale/controllers/main.py'
--- website_sale/controllers/main.py	2014-05-19 10:12:46 +0000
+++ website_sale/controllers/main.py	2014-05-21 05:25:49 +0000
@@ -489,7 +489,6 @@
         values['acquirers'] = payment_obj.browse(cr, uid, acquirer_ids, context=context)
         render_ctx = dict(context, submit_class='btn btn-primary', submit_txt='Pay Now')
         for acquirer in values['acquirers']:
-            render_ctx['tx_url'] = '/shop/payment/transaction/%s' % acquirer.id
             acquirer.button = payment_obj.render(
                 cr, SUPERUSER_ID, acquirer.id,
                 order.name,
@@ -503,32 +502,35 @@
 
         return request.website.render("website_sale.payment", values)
 
-    @http.route(['/shop/payment/transaction/<int:acquirer_id>'], type='http', methods=['POST'], auth="public", website=True)
-    def payment_transaction(self, acquirer_id, **post):
-        """ Hook method that creates a payment.transaction and redirect to the
-        acquirer, using post values to re-create the post action.
+    @http.route(['/shop/payment/transaction/<int:acquirer_id>'], type='json', auth="public", website=True)
+    def payment_transaction(self, acquirer_id):
+        """ Json method that creates a payment.transaction, used to create a
+        transaction when the user clicks on 'pay now' button. After having
+        created the transaction, the event continues and the user is redirected
+        to the acquirer website.
 
         :param int acquirer_id: id of a payment.acquirer record. If not set the
                                 user is redirected to the checkout page
-        :param dict post: should coutain all post data for the acquirer
         """
-        # @TDEFIXME: don't know why we received those data, but should not be send to the acquirer
-        post.pop('submit.x', None)
-        post.pop('submit.y', None)
         cr, uid, context = request.cr, request.uid, request.context
-        payment_obj = request.registry.get('payment.acquirer')
         transaction_obj = request.registry.get('payment.transaction')
         sale_order_obj = request.registry['sale.order']
         order = request.website.sale_get_order(context=context)
 
         if not order or not order.order_line or acquirer_id is None:
-            return request.redirect("/shop/checkout")
+            return False
 
         assert order.partner_id.id != request.website.partner_id.id
 
         # find an already existing transaction
         tx = request.website.sale_get_transaction()
-        if not tx:
+        if tx:
+            if tx.state == 'draft':  # button cliked but no more info -> rewrite on tx or create a new one ?
+                tx.write({
+                    'acquirer_id': acquirer_id,
+                })
+            tx_id = tx.id
+        else:
             tx_id = transaction_obj.create(cr, SUPERUSER_ID, {
                 'acquirer_id': acquirer_id,
                 'type': 'form',
@@ -540,10 +542,6 @@
                 'sale_order_id': order.id,
             }, context=context)
             request.session['sale_transaction_id'] = tx_id
-        elif tx and tx.state == 'draft':  # button cliked but no more info -> rewrite on tx or create a new one ?
-            tx.write({
-                'acquirer_id': acquirer_id,
-            })
 
         # update quotation
         sale_order_obj.write(
@@ -554,9 +552,7 @@
         # confirm the quotation
         sale_order_obj.action_button_confirm(cr, SUPERUSER_ID, [order.id], context=request.context)
 
-        acquirer_form_post_url = payment_obj.get_form_action_url(cr, uid, acquirer_id, context=context)
-        acquirer_total_url = '%s?%s' % (acquirer_form_post_url, werkzeug.url_encode(post))
-        return request.redirect(acquirer_total_url)
+        return tx_id
 
     @http.route('/shop/payment/get_status/<int:sale_order_id>', type='json', auth="public", website=True)
     def payment_get_status(self, sale_order_id, **post):

=== modified file 'website_sale/static/src/js/website_sale_payment.js'
--- website_sale/static/src/js/website_sale_payment.js	2014-01-24 11:42:24 +0000
+++ website_sale/static/src/js/website_sale_payment.js	2014-05-21 05:25:49 +0000
@@ -9,4 +9,14 @@
         })
         .find("input[name='acquirer']:checked").click();
 
+    // When clicking on payment button: create the tx using json then continue to the acquirer
+    $payment.on("click", "button[name='submit']", function (ev) {
+        var acquirer_id = $(ev.currentTarget).parents('div.oe_sale_acquirer_button').first().data('id');
+        if (! acquirer_id) {
+            return false;
+        }
+        return openerp.jsonRpc('/shop/payment/transaction/' + acquirer_id, 'call', {}).then(function (data) {
+            return true;
+        });
+    });
 });