diff options
| author | Jeremy Kersten <jke@odoo.com> | 2020-07-14 10:40:01 +0000 |
|---|---|---|
| committer | Jeremy Kersten <jke@odoo.com> | 2020-07-22 09:56:03 +0000 |
| commit | 79807d69073593b863e9ee7f9da91a4bdd4dfb16 (patch) | |
| tree | 5d5b903d84cd6fff101e2cc0e8b24d352759d1c6 /addons/website_sale/static | |
| parent | a2a8a91b9f8e6c7c91e59811f6ebfecfb5caa66f (diff) | |
[IMP] base, website_sale: handle required zip/state on eCommerce
task-2172788
closes odoo/odoo#54746
Related: odoo/upgrade#1509
Signed-off-by: Jérémy Kersten (jke) <jke@openerp.com>
Diffstat (limited to 'addons/website_sale/static')
| -rw-r--r-- | addons/website_sale/static/src/js/website_sale.js | 9 | ||||
| -rw-r--r-- | addons/website_sale/static/tests/tours/website_sale_complete_flow.js | 3 |
2 files changed, 10 insertions, 2 deletions
diff --git a/addons/website_sale/static/src/js/website_sale.js b/addons/website_sale/static/src/js/website_sale.js index bae366ac69a..65fa4537a1c 100644 --- a/addons/website_sale/static/src/js/website_sale.js +++ b/addons/website_sale/static/src/js/website_sale.js @@ -347,13 +347,13 @@ publicWidget.registry.WebsiteSale = publicWidget.Widget.extend(VariantMixin, { }, }).then(function (data) { // placeholder phone_code - //$("input[name='phone']").attr('placeholder', data.phone_code !== 0 ? '+'+ data.phone_code : ''); + $("input[name='phone']").attr('placeholder', data.phone_code !== 0 ? '+'+ data.phone_code : ''); // populate states and display var selectStates = $("select[name='state_id']"); // dont reload state at first loading (done in qweb) if (selectStates.data('init')===0 || selectStates.find('option').length===1) { - if (data.states.length) { + if (data.states.length || data.state_required) { selectStates.html(''); _.each(data.states, function (x) { var opt = $('<option>').text(x[1]) @@ -382,6 +382,11 @@ publicWidget.registry.WebsiteSale = publicWidget.Widget.extend(VariantMixin, { $(".checkout_autoformat .div_" + field.split('_')[0]).toggle($.inArray(field, data.fields)>=0); }); } + + $("label[for='zip']").toggleClass('label-optional', !data.zip_required); + $("label[for='state_id']").toggleClass('label-optional', !data.state_required); + $("label[for='zip']").get(0).toggleAttribute('required', !!data.zip_required); + $("label[for='state_id']").get(0).toggleAttribute('required', !!data.state_required); }); }, /** diff --git a/addons/website_sale/static/tests/tours/website_sale_complete_flow.js b/addons/website_sale/static/tests/tours/website_sale_complete_flow.js index d093e821d85..b5426f99a58 100644 --- a/addons/website_sale/static/tests/tours/website_sale_complete_flow.js +++ b/addons/website_sale/static/tests/tours/website_sale_complete_flow.js @@ -55,6 +55,7 @@ odoo.define('website_sale_tour.tour', function (require) { $('input[name="email"]').val('abc@odoo.com'); $('input[name="street"]').val('SO1 Billing Street, 33'); $('input[name="city"]').val('SO1BillingCity'); + $('input[name="zip"]').val('10000'); $('#country_id option:eq(1)').attr('selected', true); }, }, @@ -75,6 +76,7 @@ odoo.define('website_sale_tour.tour', function (require) { $('input[name="phone"]').val('8888888888'); $('input[name="street"]').val('17, SO1 Shipping Road'); $('input[name="city"]').val('SO1ShippingCity'); + $('input[name="zip"]').val('10000'); $('#country_id option:eq(1)').attr('selected', true); }, }, @@ -263,6 +265,7 @@ odoo.define('website_sale_tour.tour', function (require) { $('input[name="phone"]').val('7777777777'); $('input[name="street"]').val('SO2New Shipping Street, 5'); $('input[name="city"]').val('SO2NewShipping'); + $('input[name="zip"]').val('1200'); $('#country_id option:eq(1)').attr('selected', true); }, }, |