[IMP] payment,payment_*,website_quote,website_sale: new rendering mechanism compatibility for payment providers

merge *ALL* the dicts

The form rendering used to receive a dict for partner information and a dict for tx information and to transmit another dict to the qweb template; now everything is done in a single dict

3 files changed, 39 insertions, 39 deletions

diff --git a/addons/payment_authorize/models/authorize.py b/addons/payment_authorize/models/authorize.py
index ec39bac344d..af5226a3237 100644
--- a/addons/payment_authorize/models/authorize.py
+++ b/addons/payment_authorize/models/authorize.py
@@ -43,14 +43,14 @@ class PaymentAcquirerAuthorize(models.Model):
         return hmac.new(str(values['x_trans_key']), data, hashlib.md5).hexdigest()
 
     @api.multi
-    def authorize_form_generate_values(self, partner_values, tx_values):
+    def authorize_form_generate_values(self, values):
         self.ensure_one()
         base_url = self.env['ir.config_parameter'].get_param('web.base.url')
-        authorize_tx_values = dict(tx_values)
+        authorize_tx_values = dict(values)
         temp_authorize_tx_values = {
             'x_login': self.authorize_login,
             'x_trans_key': self.authorize_transaction_key,
-            'x_amount': str(tx_values['amount']),
+            'x_amount': str(values['amount']),
             'x_show_form': 'PAYMENT_FORM',
             'x_type': 'AUTH_CAPTURE',
             'x_method': 'CC',
@@ -60,21 +60,21 @@ class PaymentAcquirerAuthorize(models.Model):
             'x_fp_timestamp': str(int(time.time())),
             'x_relay_url': '%s' % urlparse.urljoin(base_url, AuthorizeController._return_url),
             'x_cancel_url': '%s' % urlparse.urljoin(base_url, AuthorizeController._cancel_url),
-            'x_currency_code': tx_values['currency'] and tx_values['currency'].name or '',
-            'address': partner_values['address'],
-            'city': partner_values['city'],
-            'country': partner_values['country'] and partner_values['country'].name or '',
-            'email': partner_values['email'],
-            'zip': partner_values['zip'],
-            'first_name': partner_values['first_name'],
-            'last_name': partner_values['last_name'],
-            'phone': partner_values['phone'],
-            'state': partner_values.get('state') and partner_values['state'].name or '',
+            'x_currency_code': values['currency'] and values['currency'].name or '',
+            'address': values.get('partner_address'),
+            'city': values.get('partner_city'),
+            'country': values.get('partner_country') and values.get('partner_country').name or '',
+            'email': values.get('partner_email'),
+            'zip_code': values.get('partner_zip'),
+            'first_name': values.get('partner_first_name'),
+            'last_name': values.get('partner_last_name'),
+            'phone': values.get('partner_phone'),
+            'state': values.get('partner_state') and values['partner_state'].name or '',
         }
         temp_authorize_tx_values['returndata'] = authorize_tx_values.pop('return_url', '')
         temp_authorize_tx_values['x_fp_hash'] = self._authorize_generate_hashing(temp_authorize_tx_values)
         authorize_tx_values.update(temp_authorize_tx_values)
-        return partner_values, authorize_tx_values
+        return authorize_tx_values
 
     @api.multi
     def authorize_get_form_action_url(self):
diff --git a/addons/payment_authorize/tests/test_authorize.py b/addons/payment_authorize/tests/test_authorize.py
index f038016d579..ed71213fc0c 100644
--- a/addons/payment_authorize/tests/test_authorize.py
+++ b/addons/payment_authorize/tests/test_authorize.py
@@ -78,7 +78,7 @@ class AuthorizeForm(AuthorizeCommon):
         cr, uid, context = self.env.cr, self.env.uid, {}
         res = self.payment_acquirer.render(
             cr, uid, self.authorize_id, 'SO004', 320.0, self.currency_usd.id,
-            partner_id=None, partner_values=self.buyer_values, context=context)
+            values=self.buyer_values, context=context)
         # check form result
         tree = objectify.fromstring(res)
         self.assertEqual(tree.get('action'), 'https://test.authorize.net/gateway/transact.dll', 'Authorize: wrong form POST url')
diff --git a/addons/payment_authorize/views/authorize.xml b/addons/payment_authorize/views/authorize.xml
index 543af8fdedf..e21baa58b8d 100644
--- a/addons/payment_authorize/views/authorize.xml
+++ b/addons/payment_authorize/views/authorize.xml
@@ -4,32 +4,32 @@
 
         <template id="authorize_acquirer_button">
             <form t-if="acquirer" t-att-action="tx_url" method="post" target="_self">
-                <input type='hidden' name='x_login' t-att-value='tx_values["x_login"]'/>
-                <input type='hidden' name='x_fp_hash' t-att-value='tx_values["x_fp_hash"]'/>
-                <input type='hidden' name='x_amount' t-att-value='tx_values["x_amount"] or "0.0"'/>
-                <input type='hidden' name='x_show_form' t-att-value="tx_values['x_show_form']"/>
-                <input type='hidden' name='x_type' t-att-value="tx_values['x_type']"/>
-                <input type='hidden' name='x_method' t-att-value="tx_values['x_method']"/>
-                <input type='hidden' name='x_fp_sequence' t-att-value='tx_values["x_fp_sequence"]'/>
-                <input type='hidden' name='x_version' t-att-value="tx_values['x_version']"/>
-                <input type="hidden" name="x_relay_response" t-att-value="tx_values['x_relay_response']"/>
-                <input type="hidden" name="x_relay_url" t-att-value="tx_values['x_relay_url']"/>
-                <input type='hidden' name="x_fp_timestamp" t-att-value="tx_values['x_fp_timestamp']"/>
-                <input type="hidden" name='return_url' t-att-value="tx_values['returndata']"/>
-                <input type="hidden" name='x_cancel_url' t-att-value="tx_values['x_cancel_url']"/>
+                <input type='hidden' name='x_login' t-att-value='x_login'/>
+                <input type='hidden' name='x_fp_hash' t-att-value='x_fp_hash'/>
+                <input type='hidden' name='x_amount' t-att-value='x_amount'/>
+                <input type='hidden' name='x_show_form' t-att-value="x_show_form"/>
+                <input type='hidden' name='x_type' t-att-value="x_type"/>
+                <input type='hidden' name='x_method' t-att-value="x_method"/>
+                <input type='hidden' name='x_fp_sequence' t-att-value='x_fp_sequence'/>
+                <input type='hidden' name='x_version' t-att-value="x_version"/>
+                <input type="hidden" name="x_relay_response" t-att-value="x_relay_response"/>
+                <input type="hidden" name="x_relay_url" t-att-value="x_relay_url"/>
+                <input type='hidden' name="x_fp_timestamp" t-att-value="x_fp_timestamp"/>
+                <input type="hidden" name='return_url' t-att-value="returndata"/>
+                <input type="hidden" name='x_cancel_url' t-att-value="x_cancel_url"/>
                 <!--Order Information -->
-                <input type='hidden' name='x_invoice_num' t-att-value='tx_values["reference"]'/>
-                <input type='hidden' name='x_currency_code' t-att-value='tx_values["x_currency_code"]'/>
+                <input type='hidden' name='x_invoice_num' t-att-value='reference'/>
+                <input type='hidden' name='x_currency_code' t-att-value='x_currency_code'/>
                 <!-- Billing Information-->
-                <input type='hidden' name='x_first_name' t-att-value="tx_values['first_name']"/>
-                <input type='hidden' name='x_last_name' t-att-value="tx_values['last_name']"/>
-                <input type='hidden' name='x_address' t-att-value="tx_values['address']"/>
-                <input type='hidden' name='x_city' t-att-value="tx_values['city']"/>
-                <input type='hidden' name='x_zip' t-att-value="tx_values['zip']"/>
-                <input type='hidden' name='x_country' t-att-value="tx_values['country']"/>
-                <input type='hidden' name='x_phone' t-att-value='tx_values["phone"]'/>
-                <input type='hidden' name='x_email' t-att-value="tx_values['email']"/>
-                <input type='hidden' name='x_state' t-att-value="tx_values['state']"/>
+                <input type='hidden' name='x_first_name' t-att-value="first_name"/>
+                <input type='hidden' name='x_last_name' t-att-value="last_name"/>
+                <input type='hidden' name='x_address' t-att-value="address"/>
+                <input type='hidden' name='x_city' t-att-value="city"/>
+                <input type='hidden' name='x_zip' t-att-value="zip_code"/>
+                <input type='hidden' name='x_country' t-att-value="country"/>
+                <input type='hidden' name='x_phone' t-att-value='phone'/>
+                <input type='hidden' name='x_email' t-att-value="email"/>
+                <input type='hidden' name='x_state' t-att-value="state"/>
                 <!-- Submit-->
                 <button type="submit" width="100px" t-att-class="submit_class">
                     <img t-if="not submit_txt" src="/payment_authorize/static/src/img/authorize_icon.png"/>