From b69b937c424a85a9c487369a5afa08c5d174044a Mon Sep 17 00:00:00 2001 From: carlossa Date: Tue, 27 Feb 2024 14:27:09 +0100 Subject: [PATCH 1/2] refs #6908 remove Banner --- src/components/common/VnSmsDialog.vue | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/src/components/common/VnSmsDialog.vue b/src/components/common/VnSmsDialog.vue index 8bb8c3858..59021cef4 100644 --- a/src/components/common/VnSmsDialog.vue +++ b/src/components/common/VnSmsDialog.vue @@ -94,16 +94,6 @@ async function send() { - - - - - - en: - CustomerDefaultLanguage: This customer uses {locale} as their default language templates: pendingPayment: 'Your order is pending of payment. Please, enter the website and make the payment with a credit card. Thank you.' - minAmount: 'A minimum amount of 50€ (VAT excluded) is required for your order + minAmount: 'A minimum amount of 50€ (VAT excluded) is required for your order { orderId } of { shipped } to receive it without additional shipping costs.' orderChanges: 'Order {orderId} of { shipped }: { changes }' en: English @@ -197,7 +186,6 @@ en: pt: Portuguese es: Send SMS: Enviar SMS - CustomerDefaultLanguage: Este cliente utiliza {locale} como idioma por defecto Language: Idioma Phone: Móvil Subject: Asunto @@ -205,7 +193,7 @@ es: templates: pendingPayment: 'Su pedido está pendiente de pago. Por favor, entre en la página web y efectue el pago con tarjeta. Muchas gracias.' - minAmount: 'Es necesario un importe mínimo de 50€ (Sin IVA) en su pedido + minAmount: 'Es necesario un importe mínimo de 50€ (Sin IVA) en su pedido { orderId } del día { shipped } para recibirlo sin portes adicionales.' orderChanges: 'Pedido {orderId} día { shipped }: { changes }' en: Inglés @@ -222,7 +210,7 @@ fr: templates: pendingPayment: 'Votre commande est en attente de paiement. Veuillez vous connecter sur le site web et effectuer le paiement par carte. Merci beaucoup.' - minAmount: 'Un montant minimum de 50€ (TVA non incluse) est requis pour votre commande + minAmount: 'Un montant minimum de 50€ (TVA non incluse) est requis pour votre commande { orderId } du { shipped } afin de la recevoir sans frais de port supplémentaires.' orderChanges: 'Commande { orderId } du { shipped }: { changes }' en: Anglais @@ -239,7 +227,7 @@ pt: templates: pendingPayment: 'Seu pedido está pendente de pagamento. Por favor, acesse o site e faça o pagamento com cartão. Muito obrigado.' - minAmount: 'É necessário um valor mínimo de 50€ (sem IVA) em seu pedido + minAmount: 'É necessário um valor mínimo de 50€ (sem IVA) em seu pedido { orderId } do dia { shipped } para recebê-lo sem custos de envio adicionais.' orderChanges: 'Pedido { orderId } dia { shipped }: { changes }' en: Inglês From 1484b7de3b4402277a879b79ec5787385d4d9521 Mon Sep 17 00:00:00 2001 From: jorgep Date: Tue, 27 Feb 2024 15:41:09 +0100 Subject: [PATCH 2/2] feat: refs #6909 popup onBeforeLeave --- src/components/FormModel.vue | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/src/components/FormModel.vue b/src/components/FormModel.vue index 9fd16088c..5c65650e1 100644 --- a/src/components/FormModel.vue +++ b/src/components/FormModel.vue @@ -1,6 +1,7 @@