From 34d1b910071ffb74934f79c2b01bbd40aadc9698 Mon Sep 17 00:00:00 2001 From: Muammer Top Date: Thu, 16 Sep 2021 14:48:56 +0300 Subject: [PATCH 1/3] #4551 Phone field mask not working --- .../base-theme/resources/js/phonefield.js | 20 ++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/addons/default/visiosoft/base-theme/resources/js/phonefield.js b/addons/default/visiosoft/base-theme/resources/js/phonefield.js index 0bffd3409..e78d242c0 100644 --- a/addons/default/visiosoft/base-theme/resources/js/phonefield.js +++ b/addons/default/visiosoft/base-theme/resources/js/phonefield.js @@ -6,6 +6,8 @@ function phoneMask(fields) { var iti = intlTelInput(inputQuery, { hiddenInput: inputQuery.getAttribute('name'), class: "form-control", + formatOnDisplay: true, + nationalMode: true, initialCountry: "auto", geoIpLookup: function (success, failure) { $.get("https://ipinfo.io", function () { @@ -14,9 +16,21 @@ function phoneMask(fields) { success(countryCode); }) } - }) + }); + + addMask(iti, inputQuery); + $(inputQuery).on("countrychange", function(event) { + iti.setNumber(""); + addMask(iti, inputQuery); + }); }); + function addMask(iti, inputQuery){ + let selectedCountryData = iti.getSelectedCountryData(); + let newPlaceholder = intlTelInputUtils.getExampleNumber(selectedCountryData.iso2, true, intlTelInputUtils.numberFormat.INTERNATIONAL); + $(inputQuery).inputmask({ mask: newPlaceholder.replace(/[0-9+]/ig,'9'), keepStatic: false }); + } + // var fields_arr = fields.split(','); // $.each(fields_arr, function (index, value) { // maskPhone($(value).attr('name')) @@ -38,8 +52,8 @@ function phoneMask(fields) { // } // } // } - - + + } function controlNumber(inputQuery) { From 3f3f69924f02af22a1aeb418f6e47834708a6daf Mon Sep 17 00:00:00 2001 From: vedatakd Date: Mon, 20 Sep 2021 11:28:28 +0300 Subject: [PATCH 2/3] added excluded --- resources/streams/config/httpcache.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/resources/streams/config/httpcache.php b/resources/streams/config/httpcache.php index af2a2917a..59c5011e5 100644 --- a/resources/streams/config/httpcache.php +++ b/resources/streams/config/httpcache.php @@ -40,6 +40,10 @@ return [ '/profile', '/profile/*', '/ajax/*', + '/cron/*', + '/cron', + '/cart', + '/cart/*', ], /* From 1051e758fc8b3fcb785b34af575dca671e11f643 Mon Sep 17 00:00:00 2001 From: Muammer Top Date: Mon, 20 Sep 2021 17:50:47 +0300 Subject: [PATCH 3/3] #4495 routing guide --- .../visiosoft/defaultadmin-theme/resources/css/theme.css | 4 +++- .../visiosoft/defaultadmin-theme/resources/img/guide.svg | 9 +++++++++ .../resources/views/partials/topbar.twig | 5 ++++- 3 files changed, 16 insertions(+), 2 deletions(-) create mode 100644 addons/default/visiosoft/defaultadmin-theme/resources/img/guide.svg diff --git a/addons/default/visiosoft/defaultadmin-theme/resources/css/theme.css b/addons/default/visiosoft/defaultadmin-theme/resources/css/theme.css index 650f916ba..1157324b0 100644 --- a/addons/default/visiosoft/defaultadmin-theme/resources/css/theme.css +++ b/addons/default/visiosoft/defaultadmin-theme/resources/css/theme.css @@ -2769,4 +2769,6 @@ body { /** bootstrap 4.1 Column Fix**/ .col-4{-ms-flex:0 0 33.333333%;flex:0 0 33.333333%;max-width:33.333333%} -.col-6{-ms-flex:0 0 50%;flex:0 0 50%;max-width:50%} \ No newline at end of file +.col-6{-ms-flex:0 0 50%;flex:0 0 50%;max-width:50%} +.d-flex{display: flex} +.align-items-center{align-items: center} diff --git a/addons/default/visiosoft/defaultadmin-theme/resources/img/guide.svg b/addons/default/visiosoft/defaultadmin-theme/resources/img/guide.svg new file mode 100644 index 000000000..f1914b06d --- /dev/null +++ b/addons/default/visiosoft/defaultadmin-theme/resources/img/guide.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/addons/default/visiosoft/defaultadmin-theme/resources/views/partials/topbar.twig b/addons/default/visiosoft/defaultadmin-theme/resources/views/partials/topbar.twig index e1fa4cce1..2cdb09bd8 100644 --- a/addons/default/visiosoft/defaultadmin-theme/resources/views/partials/topbar.twig +++ b/addons/default/visiosoft/defaultadmin-theme/resources/views/partials/topbar.twig @@ -45,7 +45,7 @@ -