From c255342e8fa1902852b17f39bedccfb698471546 Mon Sep 17 00:00:00 2001
From: "Denis Vermylen (dve)" <dve@odoo.com>
Date: Wed, 31 Aug 2016 14:56:40 +0200
Subject: [PATCH] [IMP] payment_*: change payment icon

take the payment icon from the acquirer image field, instead of a static
unchangeable icon. Change the acquirer image on all acquirers data.
---
 addons/payment/data/payment_acquirer_data.xml  | 18 +++++++++---------
 .../data/payment_acquirer_data.xml             |  2 +-
 .../data/payment_acquirer_data.xml             |  2 +-
 .../data/payment_acquirer_data.xml             |  2 +-
 .../data/payment_acquirer_data.xml             |  2 +-
 .../data/payment_acquirer_data.xml             |  2 +-
 .../data/payment_acquirer_data.xml             |  2 +-
 .../data/payment_acquirer_data.xml             |  1 +
 .../data/payment_acquirer_data.xml             |  2 +-
 .../data/payment_acquirer_data.xml             |  2 +-
 addons/website_sale/views/templates.xml        |  2 +-
 11 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/addons/payment/data/payment_acquirer_data.xml b/addons/payment/data/payment_acquirer_data.xml
index 8532a9443ea..fd1362e98c9 100644
--- a/addons/payment/data/payment_acquirer_data.xml
+++ b/addons/payment/data/payment_acquirer_data.xml
@@ -20,7 +20,7 @@
 
     <record id="payment_acquirer_buckaroo" model="payment.acquirer">
         <field name="name">Buckaroo</field>
-        <field name="image" type="base64" file="payment_buckaroo/static/description/icon.png"/>
+        <field name="image" type="base64" file="payment_buckaroo/static/src/img/buckaroo_icon.png"/>
         <field name="view_template_id" ref="default_acquirer_button"/>
         <field name="module_id" ref="base.module_payment_buckaroo"/>
         <field name="description" type="html">
@@ -36,7 +36,7 @@
     <record id="payment_acquirer_ogone" model="payment.acquirer">
         <field name="name">Ingenico</field>
         <field name="view_template_id" ref="default_acquirer_button"/>
-        <field name="image" type="base64" file="payment_ogone/static/description/icon.png"/>
+        <field name="image" type="base64" file="payment_ogone/static/src/img/ogone_icon.png"/>
         <field name="module_id" ref="base.module_payment_ogone"/>
         <field name="description" type="html">
             <p>
@@ -53,7 +53,7 @@
     <record id="payment_acquirer_adyen" model="payment.acquirer">
         <field name="name">Adyen</field>
         <field name="view_template_id" ref="default_acquirer_button"/>
-        <field name="image" type="base64" file="payment_adyen/static/description/icon.png"/>
+        <field name="image" type="base64" file="payment_adyen/static/src/img/adyen_icon.png"/>
         <field name="module_id" ref="base.module_payment_adyen"/>
         <field name="description" type="html">
             <p>
@@ -68,7 +68,7 @@
     <record id="payment_acquirer_authorize" model="payment.acquirer">
         <field name="name">Authorize.net</field>
         <field name="view_template_id" ref="default_acquirer_button"/>
-        <field name="image" type="base64" file="payment_authorize/static/description/icon.png"/>
+        <field name="image" type="base64" file="payment_authorize/static/src/img/authorize_icon.png"/>
         <field name="module_id" ref="base.module_payment_authorize"/>
         <field name="description" type="html">
             <p>
@@ -83,7 +83,7 @@
     <record id="payment_acquirer_transfer" model="payment.acquirer">
         <field name="name">Wire Transfer</field>
         <field name="view_template_id" ref="default_acquirer_button"/>
-        <field name="image" type="base64" file="payment_transfer/static/description/icon.png"/>
+        <field name="image" type="base64" file="payment_transfer/static/src/img/transfer_icon.png"/>
         <field name="module_id" ref="base.module_payment_transfer"/>
         <field name="pending_msg">&lt;i&gt;Pending&lt;/i&gt;... The order will be validated after the payment.</field>
         <field name="description" type="html">
@@ -99,7 +99,7 @@
     <record id="payment_acquirer_sips" model="payment.acquirer">
         <field name="name">Sips</field>
         <field name="view_template_id" ref="default_acquirer_button"/>
-        <field name="image" type="base64" file="payment_sips/static/description/icon.png"/>
+        <field name="image" type="base64" file="payment_sips/static/src/img/sips_icon.png"/>
         <field name="module_id" ref="base.module_payment_sips"/>
         <field name="description" type="html">
             <p>
@@ -114,7 +114,7 @@
     <record id="payment_acquirer_paypal" model="payment.acquirer">
         <field name="name">Paypal</field>
         <field name="view_template_id" ref="default_acquirer_button"/>
-        <field name="image" type="base64" file="payment_paypal/static/description/icon.png"/>
+        <field name="image" type="base64" file="payment_paypal/static/src/img/paypal_icon.png"/>
         <field name="module_id" ref="base.module_payment_paypal"/>
         <field name="description" type="html">
             <p>
@@ -130,7 +130,7 @@
     <record id="payment_acquirer_stripe" model="payment.acquirer">
         <field name="name">Stripe</field>
         <field name="view_template_id" ref="default_acquirer_button"/>
-        <field name="image" type="base64" file="payment_stripe/static/description/icon.png"/>
+        <field name="image" type="base64" file="payment_stripe/static/src/img/stripe_icon.png"/>
         <field name="module_id" ref="base.module_payment_stripe"/>
         <field name="description" type="html">
             <p>
@@ -161,7 +161,7 @@
 
     <record id="payment_acquirer_payu" model="payment.acquirer">
         <field name="name">PayUmoney</field>
-        <field name="image" type="base64" file="payment_payumoney/static/description/icon.png"/>
+        <field name="image" type="base64" file="payment_payumoney/static/src/img/payumoney_icon.png"/>
         <field name="view_template_id" ref="default_acquirer_button"/>
         <field name="module_id" ref="base.module_payment_payumoney"/>
         <field name="description" type="html">
diff --git a/addons/payment_adyen/data/payment_acquirer_data.xml b/addons/payment_adyen/data/payment_acquirer_data.xml
index 3d7ef2a1778..44d986b8fee 100644
--- a/addons/payment_adyen/data/payment_acquirer_data.xml
+++ b/addons/payment_adyen/data/payment_acquirer_data.xml
@@ -4,7 +4,7 @@
 
         <record id="payment.payment_acquirer_adyen" model="payment.acquirer">
             <field name="name">Adyen</field>
-            <field name="image" type="base64" file="payment_adyen/static/description/icon.png"/>
+            <field name="image" type="base64" file="payment_adyen/static/src/img/adyen_icon.png"/>
             <field name="provider">adyen</field>
             <field name="company_id" ref="base.main_company"/>
             <field name="view_template_id" ref="adyen_acquirer_button"/>
diff --git a/addons/payment_authorize/data/payment_acquirer_data.xml b/addons/payment_authorize/data/payment_acquirer_data.xml
index 964b9351061..8748535c4b9 100644
--- a/addons/payment_authorize/data/payment_acquirer_data.xml
+++ b/addons/payment_authorize/data/payment_acquirer_data.xml
@@ -4,7 +4,7 @@
 
         <record id="payment.payment_acquirer_authorize" model="payment.acquirer">
             <field name="name">Authorize.Net</field>
-            <field name="image" type="base64" file="payment_authorize/static/description/icon.png"/>
+            <field name="image" type="base64" file="payment_authorize/static/src/img/authorize_icon.png"/>
             <field name="provider">authorize</field>
             <field name="company_id" ref="base.main_company"/>
             <field name="view_template_id" ref="authorize_acquirer_button"/>
diff --git a/addons/payment_buckaroo/data/payment_acquirer_data.xml b/addons/payment_buckaroo/data/payment_acquirer_data.xml
index 8019baf3593..73161cdcd58 100644
--- a/addons/payment_buckaroo/data/payment_acquirer_data.xml
+++ b/addons/payment_buckaroo/data/payment_acquirer_data.xml
@@ -4,7 +4,7 @@
 
         <record id="payment.payment_acquirer_buckaroo" model="payment.acquirer">
             <field name="name">Buckaroo</field>
-            <field name="image" type="base64" file="payment_buckaroo/static/description/icon.png"/>
+            <field name="image" type="base64" file="payment_buckaroo/static/src/img/buckaroo_icon.png"/>
             <field name="provider">buckaroo</field>
             <field name="company_id" ref="base.main_company"/>
             <field name="view_template_id" ref="buckaroo_acquirer_button"/>
diff --git a/addons/payment_ogone/data/payment_acquirer_data.xml b/addons/payment_ogone/data/payment_acquirer_data.xml
index a78ea78107a..35b4313b69f 100644
--- a/addons/payment_ogone/data/payment_acquirer_data.xml
+++ b/addons/payment_ogone/data/payment_acquirer_data.xml
@@ -4,7 +4,7 @@
 
         <record id="payment.payment_acquirer_ogone" model="payment.acquirer">
             <field name="name">Ingenico</field>
-            <field name="image" type="base64" file="payment_ogone/static/description/icon.png"/>
+            <field name="image" type="base64" file="payment_ogone/static/src/img/ogone_icon.png"/>
             <field name="provider">ogone</field>
             <field name="company_id" ref="base.main_company"/>
             <field name="view_template_id" ref="ogone_acquirer_button"/>
diff --git a/addons/payment_paypal/data/payment_acquirer_data.xml b/addons/payment_paypal/data/payment_acquirer_data.xml
index 6ae2dd7df05..13c8caf4391 100644
--- a/addons/payment_paypal/data/payment_acquirer_data.xml
+++ b/addons/payment_paypal/data/payment_acquirer_data.xml
@@ -4,7 +4,7 @@
 
         <record id="payment.payment_acquirer_paypal" model="payment.acquirer">
             <field name="name">Paypal</field>
-            <field name="image" type="base64" file="payment_paypal/static/description/icon.png"/>
+            <field name="image" type="base64" file="payment_paypal/static/src/img/paypal_icon.png"/>
             <field name="provider">paypal</field>
             <field name="company_id" ref="base.main_company"/>
             <field name="view_template_id" ref="paypal_acquirer_button"/>
diff --git a/addons/payment_payumoney/data/payment_acquirer_data.xml b/addons/payment_payumoney/data/payment_acquirer_data.xml
index 1cd85604e71..e7f5c1c44c7 100644
--- a/addons/payment_payumoney/data/payment_acquirer_data.xml
+++ b/addons/payment_payumoney/data/payment_acquirer_data.xml
@@ -3,7 +3,7 @@
     <data noupdate="1">
         <record id="payment.payment_acquirer_payu" model="payment.acquirer">
             <field name="name">PayUmoney</field>
-            <field name="image" type="base64" file="payment_payumoney/static/description/icon.png"/>
+            <field name="image" type="base64" file="payment_payumoney/static/src/img/payumoney_icon.png"/>
             <field name="provider">payumoney</field>
             <field name="company_id" ref="base.main_company"/>
             <field name="view_template_id" ref="payumoney_acquirer_button"/>
diff --git a/addons/payment_sips/data/payment_acquirer_data.xml b/addons/payment_sips/data/payment_acquirer_data.xml
index e841c411f5b..dff9b3dcbf6 100644
--- a/addons/payment_sips/data/payment_acquirer_data.xml
+++ b/addons/payment_sips/data/payment_acquirer_data.xml
@@ -4,6 +4,7 @@
 
         <record id="payment.payment_acquirer_sips" model="payment.acquirer">
             <field name="name">Sips</field>
+            <field name="image" type="base64" file="payment_sips/static/src/img/sips_icon.png"/>
             <field name="provider">sips</field>
             <field name="company_id" ref="base.main_company"/>
             <field name="view_template_id" ref="payment_sips.sips_acquirer_button"/>
diff --git a/addons/payment_stripe/data/payment_acquirer_data.xml b/addons/payment_stripe/data/payment_acquirer_data.xml
index 49ac0838a35..2613a31d4e2 100644
--- a/addons/payment_stripe/data/payment_acquirer_data.xml
+++ b/addons/payment_stripe/data/payment_acquirer_data.xml
@@ -3,7 +3,7 @@
     <data noupdate="1">
         <record id="payment.payment_acquirer_stripe" model="payment.acquirer">
             <field name="name">Stripe</field>
-            <field name="image" type="base64" file="payment_stripe/static/description/icon.png"/>
+            <field name="image" type="base64" file="payment_stripe/static/src/img/stripe_icon.png"/>
             <field name="provider">stripe</field>
             <field name="company_id" ref="base.main_company"/>
             <field name="view_template_id" ref="stripe_acquirer_button"/>
diff --git a/addons/payment_transfer/data/payment_acquirer_data.xml b/addons/payment_transfer/data/payment_acquirer_data.xml
index 99638198dbb..77ff2e2381d 100644
--- a/addons/payment_transfer/data/payment_acquirer_data.xml
+++ b/addons/payment_transfer/data/payment_acquirer_data.xml
@@ -4,7 +4,7 @@
 
         <record id="payment.payment_acquirer_transfer" model="payment.acquirer">
             <field name="name">Wire Transfer</field>
-            <field name="image" type="base64" file="payment_transfer/static/description/icon.png"/>
+            <field name="image" type="base64" file="payment_transfer/static/src/img/transfer_icon.png"/>
             <field name="provider">transfer</field>
             <field name="company_id" ref="base.main_company"/>
             <field name="view_template_id" ref="transfer_acquirer_button"/>
diff --git a/addons/website_sale/views/templates.xml b/addons/website_sale/views/templates.xml
index 7588a4a5789..3f54c9eb319 100644
--- a/addons/website_sale/views/templates.xml
+++ b/addons/website_sale/views/templates.xml
@@ -1326,7 +1326,7 @@
                                   <li>
                                     <label t-if="acquirer.button">
                                         <input t-att-value="acquirer.id" type="radio" name="acquirer" t-att-checked="acquirers[0] == acquirer" />
-                                        <img class="media-object" style="width: 60px; display: inline-block;" t-att-title="acquirer.name" t-att-src="'/payment_%s/static/src/img/%s_icon.png' % (acquirer.provider, acquirer.provider)" />
+                                        <span t-field="acquirer.image_small" t-att-title="acquirer.name" t-field-options='{"widget": "image", "style":"max-width: 60px; display: inline-block"}'/>
                                         <span t-field="acquirer.name" />
                                         <span t-if="acquirer.fees_active">(processing fees apply)</span>
                                     </label>