summaryrefslogtreecommitdiff
path: root/addons/payment
diff options
context:
space:
mode:
authorKevin Baptiste <kba@odoo.com>2019-08-12 07:18:23 +0000
committerYannick Tivisse <yti@odoo.com>2019-11-28 10:05:12 +0000
commitff1c35513aecef5fbc30f7c2f3834450e719714e (patch)
tree8149f14df17095845e735d6cccaf9317a1f97af6 /addons/payment
parent4c030311ada2ad19a2ee81b15544b7aed35b642b (diff)
[IMP] web: update to fontawesome 4.7.0 to 5.11.2
FontAwesome 5 introduced new names for some icons as described on https://fontawesome.com/how-to-use/on-the-web/setup/upgrading-from-version-4#name-changes This commit replaces the old names to the new ones. closes odoo/odoo#35826 Taskid: 2050241 Related: odoo/enterprise#5180 Signed-off-by: Yannick Tivisse (yti) <yti@odoo.com>
Diffstat (limited to 'addons/payment')
-rw-r--r--addons/payment/static/src/js/payment_form.js4
-rw-r--r--addons/payment/static/src/scss/payment_acquirer.scss8
-rw-r--r--addons/payment/static/src/xml/payment_processing.xml2
-rw-r--r--addons/payment/views/payment_templates.xml4
-rw-r--r--addons/payment/views/payment_views.xml4
5 files changed, 13 insertions, 9 deletions
diff --git a/addons/payment/static/src/js/payment_form.js b/addons/payment/static/src/js/payment_form.js
index ce67b467108..ba76ff1bf89 100644
--- a/addons/payment/static/src/js/payment_form.js
+++ b/addons/payment/static/src/js/payment_form.js
@@ -131,7 +131,7 @@ publicWidget.registry.PaymentForm = publicWidget.Widget.extend({
disableButton: function (button) {
$(button).attr('disabled', true);
$(button).children('.fa-lock').removeClass('fa-lock');
- $(button).prepend('<span class="o_loader"><i class="fa fa-refresh fa-spin"></i>&nbsp;</span>');
+ $(button).prepend('<span class="o_loader"><i class="fas fa-sync fa-spin"></i>&nbsp;</span>');
},
enableButton: function (button) {
@@ -386,7 +386,7 @@ publicWidget.registry.PaymentForm = publicWidget.Widget.extend({
// We add a 'processing' icon into the 'add a new payment' button
$(button).attr('disabled', true);
$(button).children('.fa-plus-circle').removeClass('fa-plus-circle');
- $(button).prepend('<span class="o_loader"><i class="fa fa-refresh fa-spin"></i>&nbsp;</span>');
+ $(button).prepend('<span class="o_loader"><i class="fas fa-sync fa-spin"></i>&nbsp;</span>');
// do the call to the route stored in the 'data_set' input of the acquirer form, the data must be called 'create-route'
this._rpc({
diff --git a/addons/payment/static/src/scss/payment_acquirer.scss b/addons/payment/static/src/scss/payment_acquirer.scss
index e73582ec847..6a05a929513 100644
--- a/addons/payment/static/src/scss/payment_acquirer.scss
+++ b/addons/payment/static/src/scss/payment_acquirer.scss
@@ -15,7 +15,9 @@
.o_payment_acquirer_desc {
margin-bottom: 28px;
- i.fa {
+ i.fa,
+ i.far,
+ i.fas {
margin-right: 5px;
&.fa-check {
@@ -47,7 +49,9 @@
list-style-type: none;
padding: 0;
- i.fa {
+ i.fa,
+ i.far,
+ i.fas {
margin-right: 5px;
&.fa-check {
diff --git a/addons/payment/static/src/xml/payment_processing.xml b/addons/payment/static/src/xml/payment_processing.xml
index 866230475c1..657ab12a117 100644
--- a/addons/payment/static/src/xml/payment_processing.xml
+++ b/addons/payment/static/src/xml/payment_processing.xml
@@ -136,7 +136,7 @@
<t t-name="payment.rpc_error">
<div class="text-center">
<p><strong>Server error:</strong> Unable to contact the Odoo server.</p>
- <p>Please wait ... <i class="fa fa-refresh fa-spin"></i></p>
+ <p>Please wait ... <i class="fas fa-sync fa-spin"></i></p>
</div>
</t>
diff --git a/addons/payment/views/payment_templates.xml b/addons/payment/views/payment_templates.xml
index e0e5a57df8e..c0d976187f8 100644
--- a/addons/payment/views/payment_templates.xml
+++ b/addons/payment/views/payment_templates.xml
@@ -11,7 +11,7 @@
Variables description:
- 'submit_txt' the text displayed inside the submit button
- 'submit_class' the css classes to style the submit button
- - 'icon_class' font awesome class (e.g. 'fa-trash', 'fa-lock')
+ - 'icon_class' font awesome class (e.g. 'fa-trash-alt', 'fa-lock')
- 'form_action' the URI to the page that will handle the form values given for server2server
- 'pms' the tokens
- 'checked_pm_id' the payment token that should be checked (for radio buttons)
@@ -133,7 +133,7 @@
</t>
</label>
<button t-if="mode == 'manage'" name="delete_pm" t-att-value="pm.id" class="btn btn-primary btn-sm float-right">
- <i class="fa fa-trash"></i> Delete
+ <i class="far fa-trash-alt"></i> Delete
</button>
</div>
</t>
diff --git a/addons/payment/views/payment_views.xml b/addons/payment/views/payment_views.xml
index d0bf348c0fb..61bf734f887 100644
--- a/addons/payment/views/payment_views.xml
+++ b/addons/payment/views/payment_views.xml
@@ -195,7 +195,7 @@
<sheet>
<div class="oe_button_box" name="button_box">
<button name="action_view_invoices" type="object"
- class="oe_stat_button" icon="fa-money"
+ class="oe_stat_button" icon="fa-money-bill-alt"
attrs="{'invisible': [('invoice_ids_nbr', '=', 0)]}">
<field name="invoice_ids_nbr" widget="statinfo" string="Invoice(s)"/>
</button>
@@ -359,7 +359,7 @@
<sheet>
<div class="oe_button_box" name="button_box">
<button class="oe_stat_button" name="%(action_payment_tx_ids)d"
- type="action" icon="fa-money" string="Payments">
+ type="action" icon="fa-money-bill-alt" string="Payments">
</button>
</div>
<group>