From 766417bb73caaff3ce69957af98c715ec1a34361 Mon Sep 17 00:00:00 2001 From: wbuezas Date: Sun, 1 Sep 2024 20:58:05 -0300 Subject: [PATCH] Basket --- src/components/ui/CardList.vue | 1 + src/i18n/ca-ES/index.js | 4 +- src/i18n/en-US/index.js | 2 + src/i18n/es-ES/index.js | 2 + src/i18n/fr-FR/index.js | 4 +- src/i18n/pt-PT/index.js | 4 +- src/pages/Ecomerce/BasketView.vue | 59 +++++++++++++++++++++++++--- src/pages/Ecomerce/CheckoutView.vue | 8 +++- src/pages/Ecomerce/ConfirmView.vue | 1 + src/pages/Ecomerce/TicketDetails.vue | 47 +++++++++++++++++++++- src/router/routes.js | 5 +++ 11 files changed, 127 insertions(+), 10 deletions(-) create mode 100644 src/pages/Ecomerce/ConfirmView.vue diff --git a/src/components/ui/CardList.vue b/src/components/ui/CardList.vue index eef1c06b..b8d5c6c6 100644 --- a/src/components/ui/CardList.vue +++ b/src/components/ui/CardList.vue @@ -44,6 +44,7 @@ const handleClick = () => { display: flex; flex-direction: column; overflow: hidden; + width: 100%; * { white-space: nowrap; diff --git a/src/i18n/ca-ES/index.js b/src/i18n/ca-ES/index.js index 08df48aa..5a465c44 100644 --- a/src/i18n/ca-ES/index.js +++ b/src/i18n/ca-ES/index.js @@ -66,5 +66,7 @@ export default { at: 'a les', back: 'Tornar', remove: 'Esborrar', - agency: 'Agència' + agency: 'Agència', + delete: 'Esborrar', + reallyDelete: 'Estàs segur que vols esborrar la línia?' }; diff --git a/src/i18n/en-US/index.js b/src/i18n/en-US/index.js index 8c0c1efa..48fa823f 100644 --- a/src/i18n/en-US/index.js +++ b/src/i18n/en-US/index.js @@ -79,6 +79,8 @@ export default { back: 'Back', remove: 'Remove', agency: 'Agency', + delete: 'Delete', + reallyDelete: 'Are you sure you want to delete the line?', orders: 'Orders', order: 'Pending order', diff --git a/src/i18n/es-ES/index.js b/src/i18n/es-ES/index.js index d44d1934..26b03a15 100644 --- a/src/i18n/es-ES/index.js +++ b/src/i18n/es-ES/index.js @@ -86,6 +86,8 @@ export default { back: 'Volver', remove: 'Borrar', agency: 'Agencia', + delete: 'Borrar', + reallyDelete: '¿Estás seguro de que quieres borrar la línea?', orders: 'Pedidos', order: 'Pedido pendiente', diff --git a/src/i18n/fr-FR/index.js b/src/i18n/fr-FR/index.js index 3eeb41cf..aa5bad50 100644 --- a/src/i18n/fr-FR/index.js +++ b/src/i18n/fr-FR/index.js @@ -66,5 +66,7 @@ export default { at: 'à', back: 'Retour', remove: 'Effacer', - agency: 'Agence' + agency: 'Agence', + delete: 'Effacer', + reallyDelete: 'Voulez-vous vraiment supprimer la ligne?' }; diff --git a/src/i18n/pt-PT/index.js b/src/i18n/pt-PT/index.js index e3d55688..514cd7a8 100644 --- a/src/i18n/pt-PT/index.js +++ b/src/i18n/pt-PT/index.js @@ -66,5 +66,7 @@ export default { at: 'às', back: 'Voltar', remove: 'Eliminar', - agency: 'Agência' + agency: 'Agência', + delete: 'Eliminar', + reallyDelete: 'Tens certeza que queres eliminar esta linha?' }; diff --git a/src/pages/Ecomerce/BasketView.vue b/src/pages/Ecomerce/BasketView.vue index aebd4c7e..3835e6ab 100644 --- a/src/pages/Ecomerce/BasketView.vue +++ b/src/pages/Ecomerce/BasketView.vue @@ -1,5 +1,6 @@ + + +en-US: + configureOrder: Configure order + checkout: Checkout +es-ES: + configureOrder: Configurar pedido + checkout: Finalizar pedido +ca-ES: + configureOrder: Configurar encàrrec + checkout: Finalitzar comanda +fr-FR: + configureOrder: Définissez l'ordre + checkout: Finir la commande +pt-PT: + configureOrder: Configurar encomenda + checkout: Finalizar encomenda + diff --git a/src/pages/Ecomerce/CheckoutView.vue b/src/pages/Ecomerce/CheckoutView.vue index 4ab0bb6d..cf1b9f3d 100644 --- a/src/pages/Ecomerce/CheckoutView.vue +++ b/src/pages/Ecomerce/CheckoutView.vue @@ -277,6 +277,8 @@ onMounted(async () => { today.value.setHours(0, 0, 0, 0); if (route.params.id) { + notify(t('rememberReconfiguringImpact'), 'warning'); + const [order] = await jApi.query( `SELECT m.code deliveryMethod, o.sent, o.agencyModeFk, o.addressFk FROM myOrder o @@ -441,7 +443,6 @@ onMounted(async () => { -
{{ orderForm }}
@@ -467,6 +468,7 @@ en-US: pleaseSelectAWarehouse: Please select a store warehouse: Warehouse pickup: Pickup + rememberReconfiguringImpact: Remember that if you reconfigure your order prices or quantities of your items may change es-ES: receiveOrPickOrder: ¿Quieres recibir o recoger el pedido? receiveOrder: Recibir en mi tienda @@ -486,6 +488,7 @@ es-ES: pleaseSelectAWarehouse: Por favor elige un almacén warehouse: Almacén pickup: Recogida + rememberReconfiguringImpact: Recuerda que si vuelves a configurar el pedido los precios o cantidades de tus artículos podrían cambiar ca-ES: receiveOrPickOrder: Vols rebre o recollir la comanda? receiveOrder: Rebre en mi tenda @@ -505,6 +508,7 @@ ca-ES: pleaseSelectAWarehouse: Si us plau tria un magatzem warehouse: Magatzem pickup: Recollida + rememberReconfiguringImpact: Recorda que si tornes a configurar la comanda els preus o quantitats dels teus articles podrien canviar fr-FR: receiveOrPickOrder: Voulez-vous recevoir ou récuperer l'ordre? receiveOrder: Livraison à la boutique @@ -524,6 +528,7 @@ fr-FR: pleaseSelectAWarehouse: Veuillez choisir un entrepôt warehouse: Entrepôt pickup: Retrait + rememberReconfiguringImpact: Rappelez-vous que si jamais vous commandez des prix fixés ou les quantités de vos articles pourraient changer pt-PT: receiveOrPickOrder: Queres receber ou levantar a encomenda? receiveOrder: Receber na minha loja @@ -542,4 +547,5 @@ pt-PT: pleaseSelectAWarehouse: Por favor, escolha um armazém warehouse: Armazém pickup: Recolhida + rememberReconfiguringImpact: Lembre-se que si voltas a configurar a encomenda os preços ou quantidades de ítens poderíam variar diff --git a/src/pages/Ecomerce/ConfirmView.vue b/src/pages/Ecomerce/ConfirmView.vue new file mode 100644 index 00000000..3ce10ec5 --- /dev/null +++ b/src/pages/Ecomerce/ConfirmView.vue @@ -0,0 +1 @@ + diff --git a/src/pages/Ecomerce/TicketDetails.vue b/src/pages/Ecomerce/TicketDetails.vue index 6b66800c..e6f3a130 100644 --- a/src/pages/Ecomerce/TicketDetails.vue +++ b/src/pages/Ecomerce/TicketDetails.vue @@ -1,8 +1,12 @@