diff options
| author | jpr-odoo <jpr@openerp.com> | 2017-11-15 16:41:54 +0530 |
|---|---|---|
| committer | fda-odoo <fda@odoo.com> | 2018-01-24 15:31:51 +0100 |
| commit | 1f712532a3f34e5804cfa60573b54985e4f84f96 (patch) | |
| tree | e455fb27ae546c4f86854158a38bd568734a971a | |
| parent | f62b31caf3011e50e357db7fa6c93612fa412de5 (diff) | |
[FIX] payment: fix card brand type icon position into s2s form if s2s form not in bootstrap_formatting
up the number of brand cards displayed by default too.
5 files changed, 19 insertions, 9 deletions
diff --git a/addons/payment/static/src/css/portal_payment.css b/addons/payment/static/src/css/portal_payment.css index e9db1fd8d28..eeb40dbd3a3 100644 --- a/addons/payment/static/src/css/portal_payment.css +++ b/addons/payment/static/src/css/portal_payment.css @@ -14,6 +14,15 @@ div.card_placeholder { transition: 0.4s cubic-bezier(0.455, 0.03, 0.515, 0.955); pointer-events: none; } +/* if s2s form not in bootstrap_formatting */ +div.o_card_brand_detail { + position: relative; +} + +div.o_card_brand_detail div.card_placeholder { + right: 5px; +} + div.amex { background-image: url("/website_payment/static/src/img/amex.png"); background-repeat: no-repeat; } diff --git a/addons/payment/views/payment_templates.xml b/addons/payment/views/payment_templates.xml index d85ae8a135e..1b6246290fa 100644 --- a/addons/payment/views/payment_templates.xml +++ b/addons/payment/views/payment_templates.xml @@ -41,6 +41,7 @@ <div class="panel panel-default"> <t t-set="acquirers_count" t-value="(len(s2s_acquirers) if s2s_acquirers else 0) + (len(form_acquirers) if form_acquirers else 0)"/> <t t-set="pms_count" t-value="len(pms) if pms else 0"/> + <t t-set="MAX_BRAND_LINE" t-value="3"/> <t t-foreach="s2s_acquirers" t-as="acq"> <div class="panel-body"> <label> @@ -65,13 +66,13 @@ <ul class="pull-right list-inline payment_icon_list"> <t t-set="i" t-value="0"/> <t t-foreach="acq.payment_icon_ids" t-as="pm_icon"> - <li t-att-class="'' if (i < 3) else 'hidden'"> + <li t-att-class="'' if (i < MAX_BRAND_LINE) else 'hidden'"> <span t-field="pm_icon.image_payment_form" t-options='{"widget": "image", "alt-field": "name"}' /> </li> - <li t-if="i==3" style="display:block;"> + <li t-if="i==MAX_BRAND_LINE" style="display:block;"> <span class="pull-right more_option text-info"> - <a href="#" class="o_payment_form_pay_icon_more" data-toggle="tooltip" t-att-title="', '.join([opt.name for opt in acq.payment_icon_ids[3:]])">and more</a> + <a href="#" class="o_payment_form_pay_icon_more" data-toggle="tooltip" t-att-title="', '.join([opt.name for opt in acq.payment_icon_ids[MAX_BRAND_LINE:]])">and more</a> </span> </li> <t t-set="i" t-value="i+1"/> @@ -102,13 +103,13 @@ <ul class="pull-right list-inline payment_icon_list"> <t t-set="i" t-value="0"/> <t t-foreach="acq.payment_icon_ids" t-as="pm_icon"> - <li t-att-class=" '' if (i < 3) else 'hidden'"> + <li t-att-class=" '' if (i < MAX_BRAND_LINE) else 'hidden'"> <span t-field="pm_icon.image_payment_form" t-options='{"widget": "image", "alt-field": "name"}' /> </li> - <li t-if="i==3" style="display:block;"> + <li t-if="i==MAX_BRAND_LINE" style="display:block;"> <span class="pull-right more_option text-info"> - <a href="#" class="o_payment_form_pay_icon_more" data-toggle="tooltip" t-att-title="', '.join([opt.name for opt in acq.payment_icon_ids[3:]])">and more</a> + <a href="#" class="o_payment_form_pay_icon_more" data-toggle="tooltip" t-att-title="', '.join([opt.name for opt in acq.payment_icon_ids[MAX_BRAND_LINE:]])">and more</a> </span> </li> <t t-set="i" t-value="i+1"/> diff --git a/addons/payment_authorize/views/payment_authorize_templates.xml b/addons/payment_authorize/views/payment_authorize_templates.xml index 1e56c309317..dcc88b9df37 100644 --- a/addons/payment_authorize/views/payment_authorize_templates.xml +++ b/addons/payment_authorize/views/payment_authorize_templates.xml @@ -51,7 +51,7 @@ <template id="authorize_s2s_form"> <input type="hidden" name="data_set" data-create-route="/payment/authorize/s2s/create_json_3ds"/> - <div class="mt8"> + <div t-attf-class="mt8 #{'' if bootstrap_formatting else 'o_card_brand_detail'}"> <div t-att-class="'form-group col-md-12' if bootstrap_formatting else 'form-group'"> <input type="tel" name="cc_number" id="cc_number" class="form-control" placeholder="Card number" data-is-required="true"/> <div class="card_placeholder"></div> diff --git a/addons/payment_ogone/views/payment_ogone_templates.xml b/addons/payment_ogone/views/payment_ogone_templates.xml index aec5274981d..28dca693a4a 100644 --- a/addons/payment_ogone/views/payment_ogone_templates.xml +++ b/addons/payment_ogone/views/payment_ogone_templates.xml @@ -40,7 +40,7 @@ <input type="hidden" name="acquirer_id" t-att-value="id"/> <input t-if="return_url" type="hidden" name="return_url" t-att-value="return_url"/> <input t-if="partner_id" type="hidden" name="partner_id" t-att-value="partner_id"/> - <div class="mt8"> + <div t-attf-class="mt8 #{'' if bootstrap_formatting else 'o_card_brand_detail'}"> <div t-att-class="'form-group col-md-12' if bootstrap_formatting else 'form-group'"> <input type="tel" name="cc_number" id="cc_number" class="form-control" placeholder="Card number" data-is-required="true"/> <div class="card_placeholder"></div> diff --git a/addons/payment_stripe/views/payment_stripe_templates.xml b/addons/payment_stripe/views/payment_stripe_templates.xml index 6060bb1f758..2fc054f97ae 100644 --- a/addons/payment_stripe/views/payment_stripe_templates.xml +++ b/addons/payment_stripe/views/payment_stripe_templates.xml @@ -26,7 +26,7 @@ <template id="stripe_s2s_form"> <input type="hidden" name="data_set" data-create-route="/payment/stripe/s2s/create_json_3ds"/> - <div class="mt8"> + <div t-attf-class="mt8 #{'' if bootstrap_formatting else 'o_card_brand_detail'}"> <div t-att-class="'form-group col-md-12' if bootstrap_formatting else 'form-group'"> <input type="tel" name="cc_number" id="cc_number" class="form-control" placeholder="Card number" data-is-required="true"/> <div class="card_placeholder"></div> |