From 660680754ce7e6edebc04f90766569134abf2aa4 Mon Sep 17 00:00:00 2001 From: Ivan Date: Wed, 15 Feb 2023 00:18:37 +0300 Subject: [PATCH 1/2] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=B0=20=D0=B2=D0=BE=D0=B7=D0=BC=D0=BE=D0=B6=D0=BD=D0=BE?= =?UTF-8?q?=D1=81=D1=82=D1=8C=20=D0=BF=D0=B5=D1=80=D0=B5=D1=85=D0=BE=D0=B4?= =?UTF-8?q?=D0=B0=20=D0=BD=D0=B0=20=D0=B4=D0=BE=D1=81=D1=82=D1=83=D0=BF?= =?UTF-8?q?=D0=BD=D1=83=D1=8E=20=D0=BE=D0=BF=D0=BB=D0=B0=D1=82=D1=83=20?= =?UTF-8?q?=D0=B2=20=D0=BA=D0=BE=D1=80=D0=B7=D0=B8=D0=BD=D0=B5,=20=D0=B5?= =?UTF-8?q?=D1=81=D0=BB=D0=B8=20=D0=B4=D1=80=D1=83=D0=B3=D0=B0=D1=8F=20?= =?UTF-8?q?=D0=BD=D0=B5=D0=B4=D0=BE=D1=81=D1=82=D1=83=D0=BF=D0=BD=D0=B0.?= =?UTF-8?q?=20=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=D0=B0?= =?UTF-8?q?=20=D0=BE=D1=88=D0=B8=D0=B1=D0=BA=D0=B0=20location.reload,=20?= =?UTF-8?q?=D0=BF=D1=80=D0=B8=20=D0=BE=D1=84=D0=BE=D1=80=D0=BC=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D0=B8=20=D0=B7=D0=B0=D0=BA=D0=B0=D0=B7=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../js/web/vanilajs/modules/msorder.class.js | 22 ++++++++++++++----- 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/assets/components/minishop2/js/web/vanilajs/modules/msorder.class.js b/assets/components/minishop2/js/web/vanilajs/modules/msorder.class.js index d071fc9a0..606a56b09 100644 --- a/assets/components/minishop2/js/web/vanilajs/modules/msorder.class.js +++ b/assets/components/minishop2/js/web/vanilajs/modules/msorder.class.js @@ -56,6 +56,19 @@ export default class MsOrder { } } + triggerClick() { + if (this.order.querySelector(this.paymentInput + ':checked:disabled')) { + let issetElement = false; + let paymentInputs = this.order.querySelectorAll(this.paymentInput); + paymentInputs.forEach(element => { + if (!issetElement && !element.checked && !element.disabled) { + element.click(); + issetElement = true; + } + }); + } + } + updatePayments(payments) { payments = payments.replace(/[\[\]]/g, '').split(','); let paymentInputs = this.order.querySelectorAll(this.paymentInput); @@ -78,11 +91,7 @@ export default class MsOrder { } } - const checked = paymentInputs.filter(el => el.checked && (el.offsetWidth > 0 || el.offsetHeight > 0)); - const visible = paymentInputs.filter(el => (el.offsetWidth > 0 || el.offsetHeight > 0)); - if (!checked.length) { - visible[0].checked = true; - } + this.triggerClick(); } } @@ -179,8 +188,9 @@ export default class MsOrder { document.location.href = document.location.origin + document.location.pathname + (document.location.search ? document.location.search + '&' : '?') + 'msorder=' + response.data.msorder; + } else { + location.reload(); } - location.reload(); }; this.callbacks.submit.response.error = response => { From 8b0d6f439fc96dd17eb055496ba0bb42001793ab Mon Sep 17 00:00:00 2001 From: Ivan Date: Thu, 16 Feb 2023 06:53:26 +0300 Subject: [PATCH 2/2] =?UTF-8?q?=D0=92=D0=BD=D0=B5=D1=81=D0=B5=D0=BD=D0=B8?= =?UTF-8?q?=D0=B5=20=D0=B8=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD=D0=B8=D0=B9?= =?UTF-8?q?,=20=D1=87=D1=82=D0=BE=D0=B1=D1=8B=20=D0=BD=D0=B5=20=D0=B1?= =?UTF-8?q?=D1=8B=D0=BB=D0=BE=20=D0=BA=D0=BE=D0=BD=D1=84=D0=BB=D0=B8=D0=BA?= =?UTF-8?q?=D1=82=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../minishop2/js/web/vanilajs/modules/msorder.class.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/assets/components/minishop2/js/web/vanilajs/modules/msorder.class.js b/assets/components/minishop2/js/web/vanilajs/modules/msorder.class.js index 606a56b09..4811f3dad 100644 --- a/assets/components/minishop2/js/web/vanilajs/modules/msorder.class.js +++ b/assets/components/minishop2/js/web/vanilajs/modules/msorder.class.js @@ -188,9 +188,8 @@ export default class MsOrder { document.location.href = document.location.origin + document.location.pathname + (document.location.search ? document.location.search + '&' : '?') + 'msorder=' + response.data.msorder; - } else { - location.reload(); } + location.reload(); }; this.callbacks.submit.response.error = response => {