From 6fe518601f38389fba2a53a8004a998f23f8285e Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Fri, 30 Aug 2024 18:03:49 -0300
Subject: [PATCH 1/9] WIP

---
 src/pages/Ecomerce/BasketView.vue    | 96 +++++++++++++++++++++++++++-
 src/pages/Ecomerce/TicketDetails.vue | 36 +++++++----
 2 files changed, 117 insertions(+), 15 deletions(-)

diff --git a/src/pages/Ecomerce/BasketView.vue b/src/pages/Ecomerce/BasketView.vue
index cf6656ea..aebd4c7e 100644
--- a/src/pages/Ecomerce/BasketView.vue
+++ b/src/pages/Ecomerce/BasketView.vue
@@ -1,14 +1,106 @@
 <script setup>
-import { onBeforeMount } from 'vue';
+import { onBeforeMount, ref, inject, onMounted } from 'vue';
 
 import { useAppStore } from 'stores/app';
+import TicketDetails from 'src/pages/Ecomerce/TicketDetails.vue';
+import { storeToRefs } from 'pinia';
+import { useRoute } from 'vue-router';
 
+const jApi = inject('jApi');
 const appStore = useAppStore();
+const route = useRoute();
+const { basketOrderId } = storeToRefs(appStore);
+
+const rows = ref([]);
+const ticket = ref({});
+const orderId = ref(null);
+
+const getOrder = async () => {
+    try {
+        const [data] = await jApi.query(
+            `SELECT o.id, o.sent,
+            ag.description agency, v.code method,
+            ad.nickname, ad.postalCode, ad.city, ad.street
+            FROM myOrder o
+            JOIN vn.agencyMode ag ON ag.id = o.agencyModeFk
+            LEFT JOIN myAddress ad ON ad.id = o.addressFk
+            JOIN vn.deliveryMethod v ON v.id = o.deliveryMethodFk
+            WHERE o.id = #id;`,
+            { id: orderId.value }
+        );
+        const { sent, method, agency, id, nickname, street, postalCode, city } =
+            data;
+        const taxBase = rows.value.reduce(
+            (acc, row) => acc + row.price * row.quantity,
+            0
+        );
+        const formattedData = {
+            id,
+            landed: new Date(sent),
+            agency,
+            method,
+            nickname,
+            street,
+            postalCode,
+            city,
+            taxBase
+        };
+        ticket.value = formattedData;
+    } catch (error) {
+        console.error(error);
+    }
+};
+
+const getItems = async () => {
+    try {
+        const data = await jApi.query(
+            `SELECT bi.id, bi.amount, bi.price, i.longName item,
+            i.tag5, i.value5, i.tag6, i.value6, i.tag7, i.value7,
+            i.image, im.updated
+						FROM myOrderRow bi
+            JOIN vn.item i ON i.id = bi.itemFk
+            LEFT JOIN image im
+            ON im.collectionFk = 'catalog'
+            AND im.name = i.image
+						WHERE orderFk = #id`,
+            { id: orderId.value }
+        );
+        console.log('data', data);
+
+        const formattedData = data.map(i => {
+            const { amount: quantity, ...item } = i;
+
+            const formattedItem = {
+                quantity,
+                ...item
+            };
+            return formattedItem;
+        });
+
+        rows.value = formattedData;
+    } catch (error) {
+        console.error(error);
+    }
+};
 
 onBeforeMount(() => {
     appStore.check();
 });
+
+onMounted(async () => {
+    orderId.value = route.params.id || basketOrderId.value;
+    await getItems();
+    await getOrder();
+});
 </script>
+
 <template>
-    <div>basket view</div>
+    <div>
+        <TicketDetails
+            :rows="rows"
+            :ticket="ticket"
+            is-basket
+            :show-tax="false"
+        />
+    </div>
 </template>
diff --git a/src/pages/Ecomerce/TicketDetails.vue b/src/pages/Ecomerce/TicketDetails.vue
index 776d9b9b..6b66800c 100644
--- a/src/pages/Ecomerce/TicketDetails.vue
+++ b/src/pages/Ecomerce/TicketDetails.vue
@@ -11,6 +11,10 @@ defineProps({
     rows: {
         type: Array,
         default: () => []
+    },
+    showTax: {
+        type: Boolean,
+        default: true
     }
 });
 
@@ -33,15 +37,15 @@ const lineSubtotal = line =>
             <div class="text-subtitle1 text-bold">
                 {{ t('shippingInformation') }}
             </div>
-            <div>
+            <div v-if="ticket.shipped">
                 {{ t('preparation') }}
                 {{ formatDateTitle(ticket.shipped) }}
             </div>
-            <div>
+            <div v-if="ticket.landed">
                 {{ t('delivery') }}
                 {{ formatDateTitle(ticket.landed) }}
             </div>
-            <div>
+            <div v-if="ticket.method && ticket.agency">
                 {{ t(ticket.method != 'PICKUP' ? 'agency' : 'warehouse') }}
                 {{ ticket.agency }}
             </div>
@@ -53,9 +57,10 @@ const lineSubtotal = line =>
             <div>{{ ticket.nickname }}</div>
             <div>{{ ticket.street }}</div>
             <div>
-                {{ ticket.postalCode }} {{ ticket.city }} ({{
-                    ticket.province
-                }})
+                <span v-if="ticket.postalCode || ticket.city">
+                    {{ ticket.postalCode }}, {{ ticket.city }}
+                </span>
+                <span v-if="ticket.province"> ({{ ticket.province }})</span>
             </div>
         </QCardSection>
         <QCardSection
@@ -64,13 +69,13 @@ const lineSubtotal = line =>
             <span class="text-right">
                 {{ t('total') }} {{ currency(ticket.taxBase) }}
             </span>
-            <span class="text-right">
+            <span v-if="showTax" class="text-right">
                 {{ t('totalTax') }} {{ currency(ticket.total) }}
             </span>
         </QCardSection>
         <QSeparator inset />
-        <QList v-for="row in rows" :key="row.itemFk">
-            <QItem>
+        <QList v-for="(row, index) in rows" :key="index">
+            <QItem v-if="row">
                 <QItemSection avatar>
                     <VnImg
                         storage="catalog"
@@ -80,23 +85,28 @@ const lineSubtotal = line =>
                     />
                 </QItemSection>
                 <QItemSection>
-                    <QItemLabel lines="1">
+                    <QItemLabel v-if="row.concept" lines="1">
                         {{ row.concept }}
                     </QItemLabel>
+                    <QItemLabel v-if="row.item" lines="1">
+                        {{ row.item }}
+                    </QItemLabel>
                     <QItemLabel lines="1" caption>
                         {{ row.value5 }} {{ row.value6 }} {{ row.value7 }}
                     </QItemLabel>
                     <QItemLabel lines="1">
-                        {{ row.quantity }} x {{ currency(row.price) }}
+                        {{ row.quantity }} x
+                        {{ currency(row.price) }}
                     </QItemLabel>
                 </QItemSection>
                 <QItemSection side class="total">
                     <QItemLabel>
+                        <span> {{ currency(lineDiscountSubtotal(row)) }}</span>
                         <span class="discount" v-if="row.discount">
-                            {{ currency(lineDiscountSubtotal(row)) }} -
+                            -
                             {{ currency(row.discount) }} =
+                            {{ currency(lineSubtotal(row)) }}
                         </span>
-                        {{ currency(lineSubtotal(row)) }}
                     </QItemLabel>
                 </QItemSection>
             </QItem>
-- 
2.40.1


From 766417bb73caaff3ce69957af98c715ec1a34361 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Sun, 1 Sep 2024 20:58:05 -0300
Subject: [PATCH 2/9] 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 @@
 <script setup>
 import { onBeforeMount, ref, inject, onMounted } from 'vue';
+import { useI18n } from 'vue-i18n';
 
 import { useAppStore } from 'stores/app';
 import TicketDetails from 'src/pages/Ecomerce/TicketDetails.vue';
@@ -7,9 +8,10 @@ import { storeToRefs } from 'pinia';
 import { useRoute } from 'vue-router';
 
 const jApi = inject('jApi');
+const { t } = useI18n();
 const appStore = useAppStore();
 const route = useRoute();
-const { basketOrderId } = storeToRefs(appStore);
+const { basketOrderId, isHeaderMounted } = storeToRefs(appStore);
 
 const rows = ref([]);
 const ticket = ref({});
@@ -83,24 +85,71 @@ const getItems = async () => {
     }
 };
 
+const fetchData = async () => {
+    await getItems();
+    await getOrder();
+};
+
 onBeforeMount(() => {
     appStore.check();
 });
 
 onMounted(async () => {
     orderId.value = route.params.id || basketOrderId.value;
-    await getItems();
-    await getOrder();
+    await fetchData();
 });
 </script>
 
 <template>
-    <div>
+    <Teleport v-if="isHeaderMounted" to="#actions">
+        <QBtn
+            icon="settings"
+            :label="t('configureOrder')"
+            :to="{ name: 'checkout', params: { id: orderId } }"
+            rounded
+            no-caps
+        />
+        <QBtn
+            icon="shopping_bag"
+            :label="t('catalog')"
+            :to="{ name: 'catalog' }"
+            rounded
+            no-caps
+        />
+        <QBtn
+            icon="shopping_cart_checkout"
+            :label="t('checkout')"
+            :to="{ name: 'confirm', params: { id: orderId } }"
+            rounded
+            no-caps
+        />
+    </Teleport>
+    <QPage>
         <TicketDetails
             :rows="rows"
             :ticket="ticket"
             is-basket
             :show-tax="false"
+            can-delete-items
+            @on-row-deleted="fetchData"
         />
-    </div>
+    </QPage>
 </template>
+
+<i18n lang="yaml">
+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
+</i18n>
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 () => {
                 </QStepperNavigation>
             </QStep>
         </QStepper>
-        <pre>{{ orderForm }}</pre>
     </QPage>
 </template>
 
@@ -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
 </i18n>
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 @@
+<template>Confirm view</template>
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 @@
 <script setup>
+import { inject } from 'vue';
 import { useI18n } from 'vue-i18n';
-import { currency, formatDateTitle } from 'src/lib/filters.js';
+
 import VnImg from 'src/components/ui/VnImg.vue';
 
+import { currency, formatDateTitle } from 'src/lib/filters.js';
+import { useVnConfirm } from 'src/composables/useVnConfirm.js';
+
 defineProps({
     ticket: {
         type: Object,
@@ -15,10 +19,17 @@ defineProps({
     showTax: {
         type: Boolean,
         default: true
+    },
+    canDeleteItems: {
+        type: Boolean,
+        default: false
     }
 });
 
+const emit = defineEmits(['onRowDeleted']);
+const jApi = inject('jApi');
 const { t } = useI18n();
+const { openConfirmationModal } = useVnConfirm();
 
 const lineDiscountSubtotal = line => {
     return line.quantity * line.price;
@@ -26,6 +37,22 @@ const lineDiscountSubtotal = line => {
 
 const lineSubtotal = line =>
     lineDiscountSubtotal(line) * ((100 - line.discount) / 100);
+
+const deleteRow = id => {
+    try {
+        jApi.execQuery(
+            `START TRANSACTION;
+            DELETE FROM hedera.myOrderRow WHERE ((id = #id));
+            COMMIT`,
+            {
+                id
+            }
+        );
+        emit('onRowDeleted');
+    } catch (error) {
+        console.error('Error deleting order item:', error);
+    }
+};
 </script>
 
 <template>
@@ -76,6 +103,24 @@ const lineSubtotal = line =>
         <QSeparator inset />
         <QList v-for="(row, index) in rows" :key="index">
             <QItem v-if="row">
+                <QItemSection avatar>
+                    <QBtn
+                        icon="delete"
+                        rounded
+                        no-caps
+                        dense
+                        flat
+                        @click.stop="
+                            openConfirmationModal(null, t('reallyDelete'), () =>
+                                deleteRow(row.id)
+                            )
+                        "
+                    >
+                        <QTooltip>
+                            {{ t('delete') }}
+                        </QTooltip>
+                    </QBtn>
+                </QItemSection>
                 <QItemSection avatar>
                     <VnImg
                         storage="catalog"
diff --git a/src/router/routes.js b/src/router/routes.js
index 8c55a79f..a61776cf 100644
--- a/src/router/routes.js
+++ b/src/router/routes.js
@@ -64,6 +64,11 @@ const routes = [
                 path: '/ecomerce/basket/:id?',
                 component: () => import('pages/Ecomerce/BasketView.vue')
             },
+            {
+                name: 'confirm',
+                path: '/ecomerce/confirm/:id?',
+                component: () => import('pages/Ecomerce/ConfirmView.vue')
+            },
             {
                 name: 'checkout',
                 path: '/ecomerce/checkout/:id?',
-- 
2.40.1


From a1d67ebc6fdd19a52b17f8ae703bf90b240197a4 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Mon, 2 Sep 2024 16:27:54 -0300
Subject: [PATCH 3/9] update branch

---
 src/components/ui/VnConfirm.vue     |  5 ---
 src/i18n/ca-ES/index.js             |  3 ++
 src/i18n/en-US/index.js             |  3 ++
 src/i18n/es-ES/index.js             |  3 ++
 src/i18n/fr-FR/index.js             |  3 ++
 src/i18n/pt-PT/index.js             |  3 ++
 src/lib/filters.js                  | 11 ++---
 src/pages/Ecomerce/CheckoutView.vue | 66 +++++++++++++++++++++--------
 src/stores/app.js                   | 20 ++++++++-
 9 files changed, 85 insertions(+), 32 deletions(-)

diff --git a/src/components/ui/VnConfirm.vue b/src/components/ui/VnConfirm.vue
index 469c17d7..337e6e7e 100644
--- a/src/components/ui/VnConfirm.vue
+++ b/src/components/ui/VnConfirm.vue
@@ -105,23 +105,18 @@ async function confirm() {
 
 <i18n lang="yaml">
 en-US:
-    confirm: Confirm
     wantToContinue: Are you sure you want to continue?
     cancel: Cancel
 es-ES:
-    confirm: Confirmar
     wantToContinue: ¿Seguro que quieres continuar?
     cancel: Cancelar
 ca-ES:
-    confirm: Confirmar
     wantToContinue: Segur que vols continuar?
     cancel: Cancel·lar
 fr-FR:
-    confirm: Confirmer
     wantToContinue: Êtes-vous sûr de vouloir continuer?
     cancel: Annuler
 pt-PT:
-    confirm: Confirme
     wantToContinue: Tem a certeza de que deseja continuar?
     cancel: Cancelar
 </i18n>
diff --git a/src/i18n/ca-ES/index.js b/src/i18n/ca-ES/index.js
index 5a465c44..a22bb3e5 100644
--- a/src/i18n/ca-ES/index.js
+++ b/src/i18n/ca-ES/index.js
@@ -65,8 +65,11 @@ export default {
         'Si us plau carrega una comanda pendent a la cistella o en comença una de nova',
     at: 'a les',
     back: 'Tornar',
+    next: 'Següent',
     remove: 'Esborrar',
     agency: 'Agència',
+    noData: 'Sense dades',
+    confirm: 'Confirmar',
     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 48fa823f..ddcfe77f 100644
--- a/src/i18n/en-US/index.js
+++ b/src/i18n/en-US/index.js
@@ -77,8 +77,11 @@ export default {
     loadAnOrder: 'Please load a pending order to the cart or start a new one',
     at: 'at',
     back: 'Back',
+    next: 'Next',
     remove: 'Remove',
     agency: 'Agency',
+    noData: 'No data',
+    confirm: 'Confirm',
     delete: 'Delete',
     reallyDelete: 'Are you sure you want to delete the line?',
 
diff --git a/src/i18n/es-ES/index.js b/src/i18n/es-ES/index.js
index 26b03a15..4e2d4f30 100644
--- a/src/i18n/es-ES/index.js
+++ b/src/i18n/es-ES/index.js
@@ -84,8 +84,11 @@ export default {
         'Por favor carga un pedido pendiente en la cesta o empieza uno nuevo',
     at: 'a las',
     back: 'Volver',
+    next: 'Siguiente',
     remove: 'Borrar',
     agency: 'Agencia',
+    noData: 'Sin datos',
+    confirm: 'Confirmar',
     delete: 'Borrar',
     reallyDelete: '¿Estás seguro de que quieres borrar la línea?',
 
diff --git a/src/i18n/fr-FR/index.js b/src/i18n/fr-FR/index.js
index aa5bad50..d9a6ebb2 100644
--- a/src/i18n/fr-FR/index.js
+++ b/src/i18n/fr-FR/index.js
@@ -65,8 +65,11 @@ export default {
         'Veuillez télécharger une commande en attente dans le panier ou en démarrer une nouvelle',
     at: 'à',
     back: 'Retour',
+    next: 'Suivant',
     remove: 'Effacer',
     agency: 'Agence',
+    noData: 'Aucune donnée',
+    confirm: 'Confirmer',
     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 514cd7a8..77abcd7d 100644
--- a/src/i18n/pt-PT/index.js
+++ b/src/i18n/pt-PT/index.js
@@ -65,8 +65,11 @@ export default {
     loadAnOrder: 'Carregue um pedido pendente no carrinho ou inicie um novo',
     at: 'às',
     back: 'Voltar',
+    next: 'Seguinte',
     remove: 'Eliminar',
     agency: 'Agência',
+    noData: 'Sem dados',
+    confirm: 'Confirme',
     delete: 'Eliminar',
     reallyDelete: 'Tens certeza que queres eliminar esta linha?'
 };
diff --git a/src/lib/filters.js b/src/lib/filters.js
index d75ede13..abb27293 100644
--- a/src/lib/filters.js
+++ b/src/lib/filters.js
@@ -1,5 +1,6 @@
 import { i18n } from 'src/boot/i18n';
 import { date as qdate, format } from 'quasar';
+import { useAppStore } from 'stores/app';
 const { pad } = format;
 
 export function currency(val) {
@@ -16,14 +17,8 @@ export function date(val, format = 'YYYY-MM-DD') {
 
 export const formatDate = (timeStamp, format = 'YYYY-MM-DD') => {
     if (!timeStamp) return '';
-    const { messages, locale } = i18n.global;
-
-    return qdate.formatDate(timeStamp, format, {
-        days: messages.value[locale.value].date.days,
-        months: messages.value[locale.value].date.months,
-        daysShort: messages.value[locale.value].date.daysShort,
-        monthsShort: messages.value[locale.value].date.monthsShort
-    });
+    const appStore = useAppStore();
+    return qdate.formatDate(timeStamp, format, appStore.localeDates);
 };
 
 /**
diff --git a/src/pages/Ecomerce/CheckoutView.vue b/src/pages/Ecomerce/CheckoutView.vue
index cf1b9f3d..79a1c1c6 100644
--- a/src/pages/Ecomerce/CheckoutView.vue
+++ b/src/pages/Ecomerce/CheckoutView.vue
@@ -8,6 +8,7 @@ import VnSelect from 'src/components/common/VnSelect.vue';
 import { formatDateTitle, formatDate } from 'src/lib/filters.js';
 import useNotify from 'src/composables/useNotify.js';
 import { useAppStore } from 'stores/app';
+import { storeToRefs } from 'pinia';
 
 const jApi = inject('jApi');
 const { t } = useI18n();
@@ -15,6 +16,7 @@ const route = useRoute();
 const router = useRouter();
 const { notify } = useNotify();
 const appStore = useAppStore();
+const { localeDates } = storeToRefs(appStore);
 
 const stepperRef = ref(null);
 
@@ -59,6 +61,7 @@ const steps = {
         },
         {
             name: 'confirm',
+            nextButtonLabel: t('confirm'),
             onBeforeNextStep: async () => {
                 await submit();
             }
@@ -74,7 +77,11 @@ const steps = {
             name: 'date',
             validateStep: () => validateStep('date', t('pleaseSelectADate'))
         },
-        { name: 'address' },
+        {
+            name: 'address',
+            validateStep: () =>
+                validateStep('address', t('pleaseSelectAnAddress'))
+        },
         {
             name: 'pickup',
             validateStep: () =>
@@ -85,6 +92,7 @@ const steps = {
         },
         {
             name: 'confirm',
+            nextButtonLabel: t('confirm'),
             onBeforeNextStep: async () => {
                 await submit();
             }
@@ -277,8 +285,6 @@ 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
@@ -326,7 +332,7 @@ onMounted(async () => {
                     v-if="step.name === 'method'"
                     class="column justify-center items-center"
                 >
-                    <span class="text-h6 text-bold tex q-mb-md text-center">
+                    <span class="text-h6 step-title">
                         {{ t('receiveOrPickOrder') }}
                     </span>
                     <div class="column" style="max-width: max-content">
@@ -347,20 +353,31 @@ onMounted(async () => {
                     v-if="step.name === 'date'"
                     class="flex justify-center items-center"
                 >
-                    <span class="text-h6 text-bold tex q-mb-md text-center">
+                    <span class="text-h6 step-title">
                         {{ t('orderDateDelivery') }}
                     </span>
                     <QDate
                         v-model="orderForm.date"
                         class="margin-auto"
                         color="accent"
+                        :locale="localeDates"
+                        first-day-of-week="1"
                     />
                 </div>
                 <!-- Address step -->
                 <QList
                     v-if="step.name === 'address'"
-                    class="vn-w-xs q-gutter-y-sm"
+                    class="vn-w-xs q-gutter-y-sm column"
                 >
+                    <span class="text-h6 step-title">
+                        {{
+                            t(
+                                orderForm.method === 'PICKUP'
+                                    ? 'addressStepQuestionPickup'
+                                    : 'addressStepQuestion'
+                            )
+                        }}
+                    </span>
                     <QItem
                         v-for="(address, index) in addresses"
                         :key="index"
@@ -386,8 +403,8 @@ onMounted(async () => {
                     v-if="step.name === 'agency'"
                     class="flex justify-center items-center"
                 >
-                    <span class="text-h6 text-bold tex q-mb-md text-center">
-                        {{ t('orderDateDelivery') }}
+                    <span class="text-h6 step-title">
+                        {{ t('howDoYouWantToReceive') }}
                     </span>
                     <VnSelect
                         v-model="orderForm.agency"
@@ -400,7 +417,7 @@ onMounted(async () => {
                     v-if="step.name === 'pickup'"
                     class="flex justify-center items-center"
                 >
-                    <span class="text-h6 text-bold tex q-mb-md text-center">
+                    <span class="text-h6 step-title">
                         {{ t('pickupWarehouse') }}
                     </span>
                     <VnSelect
@@ -415,7 +432,7 @@ onMounted(async () => {
                     v-if="step.name === 'confirm'"
                     class="flex column justify-center items-center"
                 >
-                    <span class="text-h6 text-bold tex q-mb-md text-center">
+                    <span class="text-h6 step-title">
                         {{ t('confirmData') }}
                     </span>
                     <div class="column vn-w-xs full-width">
@@ -431,14 +448,14 @@ onMounted(async () => {
                         flat
                         color="primary"
                         @click="onPreviousStep(stepIndex)"
-                        label="Back"
+                        :label="step.backButtonLabel || t('back')"
                         class="q-ml-sm"
                         :class="{ invisible: currentStep === 'method' }"
                     />
                     <QBtn
                         @click="onNextStep(stepIndex)"
                         color="primary"
-                        label="next"
+                        :label="step.nextButtonLabel || t('next')"
                     />
                 </QStepperNavigation>
             </QStep>
@@ -446,7 +463,14 @@ onMounted(async () => {
     </QPage>
 </template>
 
-<style lang="scss" scoped></style>
+<style lang="scss" scoped>
+.step-title {
+    min-width: 100%;
+    margin-bottom: 16px;
+    text-align: center;
+    font-weight: bold;
+}
+</style>
 
 <i18n lang="yaml">
 en-US:
@@ -468,7 +492,8 @@ 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
+    addressStepQuestion: Where do you want to receive the order?
+    addressStepQuestionPickup: To which address do you want to associate the order? (Optional)
 es-ES:
     receiveOrPickOrder: ¿Quieres recibir o recoger el pedido?
     receiveOrder: Recibir en mi tienda
@@ -488,7 +513,8 @@ 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
+    addressStepQuestion: ¿Dónde quieres recibir el pedido?
+    addressStepQuestionPickup: ¿A qué dirección quieres asociar el pedido? (Opcional)
 ca-ES:
     receiveOrPickOrder: Vols rebre o recollir la comanda?
     receiveOrder: Rebre en mi tenda
@@ -508,7 +534,8 @@ 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
+    addressStepQuestion: On vols rebre la comanda?
+    addressStepQuestionPickup: A què direcció vols associar la comanda? (Opcional)
 fr-FR:
     receiveOrPickOrder: Voulez-vous recevoir ou récuperer l'ordre?
     receiveOrder: Livraison à la boutique
@@ -528,12 +555,14 @@ 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
+    addressStepQuestion: Adresse livraison?
+    addressStepQuestionPickup: À quelle adresse voulez-vous associer la commande? (Optionnel)
 pt-PT:
     receiveOrPickOrder: Queres receber ou levantar a encomenda?
     receiveOrder: Receber na minha loja
     pickupInStore: Levantar no armazém
     orderDateDelivery: Como queres receber a encomenda?
+    howDoYouWantToReceive: Como queres receber a encomenda?
     confirmData: Confirme os dados
     arrival: Chegada
     orderUpdated: Encomenda actualizada
@@ -547,5 +576,6 @@ 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
+    addressStepQuestion: Onde queres receber a encomenda?
+    addressStepQuestionPickup: Para qual endereço deseja associar o pedido? (Opcional)
 </i18n>
diff --git a/src/stores/app.js b/src/stores/app.js
index 51cdd41d..56a2ce2f 100644
--- a/src/stores/app.js
+++ b/src/stores/app.js
@@ -1,6 +1,7 @@
 import { defineStore } from 'pinia';
 import { jApi } from 'boot/axios';
 import useNotify from 'src/composables/useNotify.js';
+import { i18n } from 'src/boot/i18n';
 
 const { notify } = useNotify();
 
@@ -13,7 +14,13 @@ export const useAppStore = defineStore('hedera', {
         rightDrawerOpen: false,
         isHeaderMounted: false,
         menuEssentialLinks: [],
-        basketOrderId: null
+        basketOrderId: null,
+        localeDates: {
+            days: [],
+            months: [],
+            daysShort: [],
+            monthsShort: []
+        }
     }),
 
     actions: {
@@ -48,8 +55,19 @@ export const useAppStore = defineStore('hedera', {
             this.$patch({ imageUrl });
         },
 
+        getLocaleDates() {
+            const { messages, locale } = i18n.global;
+            this.localeDates = {
+                days: messages.value[locale.value].date.days,
+                months: messages.value[locale.value].date.months,
+                daysShort: messages.value[locale.value].date.daysShort,
+                monthsShort: messages.value[locale.value].date.monthsShort
+            };
+        },
+
         async init() {
             this.getBasketOrderId();
+            this.getLocaleDates();
         },
 
         getBasketOrderId() {
-- 
2.40.1


From e94f8c6b23474c06b59090f2060aa6400fbc233b Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Fri, 6 Sep 2024 10:53:28 -0300
Subject: [PATCH 4/9] Add missed code

---
 src/pages/Ecomerce/CheckoutView.vue | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/pages/Ecomerce/CheckoutView.vue b/src/pages/Ecomerce/CheckoutView.vue
index 57227108..946815be 100644
--- a/src/pages/Ecomerce/CheckoutView.vue
+++ b/src/pages/Ecomerce/CheckoutView.vue
@@ -278,6 +278,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
@@ -485,6 +487,7 @@ en-US:
     pickup: Pickup
     addressStepQuestion: Where do you want to receive the order?
     addressStepQuestionPickup: To which address do you want to associate the order? (Optional)
+    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
@@ -506,6 +509,7 @@ es-ES:
     pickup: Recogida
     addressStepQuestion: ¿Dónde quieres recibir el pedido?
     addressStepQuestionPickup: ¿A qué dirección quieres asociar el pedido? (Opcional)
+    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
@@ -527,6 +531,7 @@ ca-ES:
     pickup: Recollida
     addressStepQuestion: On vols rebre la comanda?
     addressStepQuestionPickup: A què direcció vols associar la comanda? (Opcional)
+    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
@@ -548,6 +553,7 @@ fr-FR:
     pickup: Retrait
     addressStepQuestion: Adresse livraison?
     addressStepQuestionPickup: À quelle adresse voulez-vous associer la commande? (Optionnel)
+    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
@@ -569,4 +575,5 @@ pt-PT:
     pickup: Recolhida
     addressStepQuestion: Onde queres receber a encomenda?
     addressStepQuestionPickup: Para qual endereço deseja associar o pedido? (Opcional)
+    rememberReconfiguringImpact: Lembre-se que si voltas a configurar a encomenda os preços ou quantidades de ítens poderíam variar
 </i18n>
-- 
2.40.1


From c53658e6e0b49d1ced33ded203b5783dd8b9b116 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Fri, 6 Sep 2024 11:20:09 -0300
Subject: [PATCH 5/9] Add empty list

---
 src/i18n/ca-ES/index.js              |  3 ++-
 src/i18n/en-US/index.js              |  1 +
 src/i18n/es-ES/index.js              |  1 +
 src/i18n/fr-FR/index.js              |  1 +
 src/i18n/pt-PT/index.js              |  1 +
 src/pages/Ecomerce/TicketDetails.vue | 10 +++++++++-
 6 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/i18n/ca-ES/index.js b/src/i18n/ca-ES/index.js
index a22bb3e5..191007a2 100644
--- a/src/i18n/ca-ES/index.js
+++ b/src/i18n/ca-ES/index.js
@@ -71,5 +71,6 @@ export default {
     noData: 'Sense dades',
     confirm: 'Confirmar',
     delete: 'Esborrar',
-    reallyDelete: 'Estàs segur que vols esborrar la línia?'
+    reallyDelete: 'Estàs segur que vols esborrar la línia?',
+    emptyList: 'Llista buida'
 };
diff --git a/src/i18n/en-US/index.js b/src/i18n/en-US/index.js
index ddcfe77f..4760be93 100644
--- a/src/i18n/en-US/index.js
+++ b/src/i18n/en-US/index.js
@@ -84,6 +84,7 @@ export default {
     confirm: 'Confirm',
     delete: 'Delete',
     reallyDelete: 'Are you sure you want to delete the line?',
+    emptyList: 'Empty list',
 
     orders: 'Orders',
     order: 'Pending order',
diff --git a/src/i18n/es-ES/index.js b/src/i18n/es-ES/index.js
index 4e2d4f30..383b7ea7 100644
--- a/src/i18n/es-ES/index.js
+++ b/src/i18n/es-ES/index.js
@@ -91,6 +91,7 @@ export default {
     confirm: 'Confirmar',
     delete: 'Borrar',
     reallyDelete: '¿Estás seguro de que quieres borrar la línea?',
+    emptyList: 'Lista vacía',
 
     orders: 'Pedidos',
     order: 'Pedido pendiente',
diff --git a/src/i18n/fr-FR/index.js b/src/i18n/fr-FR/index.js
index d9a6ebb2..27de9359 100644
--- a/src/i18n/fr-FR/index.js
+++ b/src/i18n/fr-FR/index.js
@@ -59,6 +59,7 @@ export default {
     adminPhotos: 'Images',
     adminNews: 'Gestion des nouvelles',
     adminNewsDetails: 'Ajouter ou editer nouvelles',
+    emptyList: 'Vider la liste',
     //
     orderLoadedIntoBasket: 'Commande chargée dans le panier!',
     loadAnOrder:
diff --git a/src/i18n/pt-PT/index.js b/src/i18n/pt-PT/index.js
index 77abcd7d..6a3bf5a8 100644
--- a/src/i18n/pt-PT/index.js
+++ b/src/i18n/pt-PT/index.js
@@ -60,6 +60,7 @@ export default {
     adminPhotos: 'Imagens',
     adminNews: 'Gestão de notícias',
     adminNewsDetails: 'Ajouter ou editer nouvelles',
+    emptyList: 'Lista vazia',
     //
     orderLoadedIntoBasket: 'Pedido carregado na cesta!',
     loadAnOrder: 'Carregue um pedido pendente no carrinho ou inicie um novo',
diff --git a/src/pages/Ecomerce/TicketDetails.vue b/src/pages/Ecomerce/TicketDetails.vue
index 132ef740..2b8af07a 100644
--- a/src/pages/Ecomerce/TicketDetails.vue
+++ b/src/pages/Ecomerce/TicketDetails.vue
@@ -101,7 +101,15 @@ const deleteRow = id => {
             </span>
         </QCardSection>
         <QSeparator inset />
-        <QList v-for="(row, index) in rows" :key="index">
+        <div
+            v-if="!rows.length"
+            class="row items-center justify-center q-pa-md"
+            style="margin-top: 32px"
+        >
+            <QIcon class="q-mr-md" name="block" size="sm" />
+            <span>{{ t('emptyList') }}</span>
+        </div>
+        <QList v-else v-for="(row, index) in rows" :key="index">
             <QItem v-if="row">
                 <QItemSection v-if="canDeleteItems" avatar>
                     <QBtn
-- 
2.40.1


From 2bff9304e8c445dcf859a09841abf26b962ce80e Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Fri, 6 Sep 2024 11:31:07 -0300
Subject: [PATCH 6/9] Add title view translation

---
 src/i18n/ca-ES/index.js             | 1 +
 src/i18n/en-US/index.js             | 1 +
 src/i18n/es-ES/index.js             | 1 +
 src/i18n/fr-FR/index.js             | 1 +
 src/i18n/pt-PT/index.js             | 1 +
 src/pages/Ecomerce/BasketView.vue   | 1 -
 src/pages/Ecomerce/InvoicesView.vue | 1 -
 7 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/i18n/ca-ES/index.js b/src/i18n/ca-ES/index.js
index 191007a2..0bfbef03 100644
--- a/src/i18n/ca-ES/index.js
+++ b/src/i18n/ca-ES/index.js
@@ -59,6 +59,7 @@ export default {
     adminPhotos: 'Imatges',
     adminNews: 'Gestió de noticies',
     adminNewsDetails: 'Afegir o editar notícia',
+    basket: 'Cistella de la compra',
     //
     orderLoadedIntoBasket: 'Comanda carregada a la cistella!',
     loadAnOrder:
diff --git a/src/i18n/en-US/index.js b/src/i18n/en-US/index.js
index 4760be93..b43e73de 100644
--- a/src/i18n/en-US/index.js
+++ b/src/i18n/en-US/index.js
@@ -72,6 +72,7 @@ export default {
     adminPhotos: 'Images',
     adminNews: 'News management',
     adminNewsDetails: 'Add or edit new',
+    basket: 'Shopping basket',
     //
     orderLoadedIntoBasket: 'Order loaded into basket!',
     loadAnOrder: 'Please load a pending order to the cart or start a new one',
diff --git a/src/i18n/es-ES/index.js b/src/i18n/es-ES/index.js
index 383b7ea7..693c5454 100644
--- a/src/i18n/es-ES/index.js
+++ b/src/i18n/es-ES/index.js
@@ -78,6 +78,7 @@ export default {
     adminPhotos: 'Imágenes',
     adminNews: 'Gestión de noticias',
     adminNewsDetails: 'Añadir o editar noticia',
+    basket: 'Cesta de la compra',
     //
     orderLoadedIntoBasket: '¡Pedido cargado en la cesta!',
     loadAnOrder:
diff --git a/src/i18n/fr-FR/index.js b/src/i18n/fr-FR/index.js
index 27de9359..23c0a9f1 100644
--- a/src/i18n/fr-FR/index.js
+++ b/src/i18n/fr-FR/index.js
@@ -60,6 +60,7 @@ export default {
     adminNews: 'Gestion des nouvelles',
     adminNewsDetails: 'Ajouter ou editer nouvelles',
     emptyList: 'Vider la liste',
+    basket: 'Panier',
     //
     orderLoadedIntoBasket: 'Commande chargée dans le panier!',
     loadAnOrder:
diff --git a/src/i18n/pt-PT/index.js b/src/i18n/pt-PT/index.js
index 6a3bf5a8..d792b885 100644
--- a/src/i18n/pt-PT/index.js
+++ b/src/i18n/pt-PT/index.js
@@ -61,6 +61,7 @@ export default {
     adminNews: 'Gestão de notícias',
     adminNewsDetails: 'Ajouter ou editer nouvelles',
     emptyList: 'Lista vazia',
+    basket: 'Cesta da compra',
     //
     orderLoadedIntoBasket: 'Pedido carregado na cesta!',
     loadAnOrder: 'Carregue um pedido pendente no carrinho ou inicie um novo',
diff --git a/src/pages/Ecomerce/BasketView.vue b/src/pages/Ecomerce/BasketView.vue
index 3835e6ab..7d996ee0 100644
--- a/src/pages/Ecomerce/BasketView.vue
+++ b/src/pages/Ecomerce/BasketView.vue
@@ -67,7 +67,6 @@ const getItems = async () => {
 						WHERE orderFk = #id`,
             { id: orderId.value }
         );
-        console.log('data', data);
 
         const formattedData = data.map(i => {
             const { amount: quantity, ...item } = i;
diff --git a/src/pages/Ecomerce/InvoicesView.vue b/src/pages/Ecomerce/InvoicesView.vue
index e9032603..cea29636 100644
--- a/src/pages/Ecomerce/InvoicesView.vue
+++ b/src/pages/Ecomerce/InvoicesView.vue
@@ -63,7 +63,6 @@ const fetchInvoices = async () => {
           LIMIT 100`,
         params
     );
-    console.log(invoices.value);
 };
 
 onMounted(async () => {
-- 
2.40.1


From c41d1430f7fcadf90f26d6e9a4932ecfa5412d85 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Sat, 7 Sep 2024 19:34:22 -0300
Subject: [PATCH 7/9] Add menu translations

---
 src/i18n/ca-ES/index.js    | 49 +++++++++++++++++------------
 src/i18n/en-US/index.js    | 48 +++++++++++++++++------------
 src/i18n/es-ES/index.js    | 48 +++++++++++++++++------------
 src/i18n/fr-FR/index.js    | 50 +++++++++++++++++-------------
 src/i18n/pt-PT/index.js    | 50 +++++++++++++++++-------------
 src/layouts/MainLayout.vue |  8 +++--
 src/router/index.js        |  6 ++--
 src/router/routes.js       | 63 ++++++++++++++++++++++++++++++++++++++
 8 files changed, 213 insertions(+), 109 deletions(-)

diff --git a/src/i18n/ca-ES/index.js b/src/i18n/ca-ES/index.js
index 0bfbef03..a80aec1d 100644
--- a/src/i18n/ca-ES/index.js
+++ b/src/i18n/ca-ES/index.js
@@ -40,26 +40,35 @@ export default {
         ]
     },
     of: 'de',
-    // Menu
-    home: 'Inici',
-    catalog: 'Catàleg',
-    pendingOrders: 'Comandes pendents',
-    confirmedOrders: 'Comandes confirmades',
-    invoices: 'Factures',
-    agencyPackages: 'Paquets per agència',
-    accountConfig: 'Configuració',
-    addressesList: 'Adreces',
-    addressDetails: 'Configuració',
-    checkout: 'Configurar encàrrec',
-    controlPanel: 'Panell de control',
-    adminConnections: 'Connexions',
-    adminItems: 'Articles',
-    adminVisits: 'Visites',
-    adminUsers: "Gestió d'usuaris",
-    adminPhotos: 'Imatges',
-    adminNews: 'Gestió de noticies',
-    adminNewsDetails: 'Afegir o editar notícia',
-    basket: 'Cistella de la compra',
+
+    // Sections titles
+    Home: 'Inici',
+    Orders: 'Comandes',
+    Ticket: `Detall de l'encarrec`,
+    'Pending orders': 'Comandes pendents',
+    'Last orders': 'Comandes confirmades',
+    Invoices: 'Factures',
+    Basket: 'Cistella',
+    Catalog: 'Catàleg',
+    Administration: 'Administració',
+    'Control panel': 'Panell de control',
+    Users: 'Usuaris',
+    Connections: 'Connexions',
+    Visits: 'Visites',
+    News: 'Notícies',
+    Photos: 'Imatges',
+    Images: 'Imatges',
+    Items: 'Articles',
+    Agencies: 'Agències',
+    Reports: 'Informes',
+    Configuration: 'Configuració',
+    Shelves: 'Prestatgeries',
+    Account: 'Compte',
+    Addresses: 'Adreces',
+    Confirm: 'Confirmar',
+    Checkout: `Configurar l'encarrec`,
+    'Address details': 'Configuració',
+    'Admin news details': `Afegir o editar notícia`,
     //
     orderLoadedIntoBasket: 'Comanda carregada a la cistella!',
     loadAnOrder:
diff --git a/src/i18n/en-US/index.js b/src/i18n/en-US/index.js
index b43e73de..25be1daf 100644
--- a/src/i18n/en-US/index.js
+++ b/src/i18n/en-US/index.js
@@ -53,26 +53,34 @@ export default {
         ]
     },
 
-    // menu
-    home: 'Home',
-    catalog: 'Catalog',
-    pendingOrders: 'Pending orders',
-    confirmedOrders: 'Confirmed orders',
-    invoices: 'Invoices',
-    agencyPackages: 'Bundles by agency',
-    accountConfig: 'Configuration',
-    addressesList: 'Addresses',
-    addressDetails: 'Configuration',
-    checkout: 'Configure order',
-    controlPanel: 'Control panel',
-    adminConnections: 'Connections',
-    adminItems: 'Items',
-    adminVisits: 'Visits',
-    adminUsers: 'User management',
-    adminPhotos: 'Images',
-    adminNews: 'News management',
-    adminNewsDetails: 'Add or edit new',
-    basket: 'Shopping basket',
+    // Sections titles
+    Home: 'Home',
+    Orders: 'Orders',
+    Ticket: 'Detalle del pedido',
+    'Pending orders': 'Pending orders',
+    'Last orders': 'Confirmed orders',
+    Invoices: 'Invoices',
+    Basket: 'Basket',
+    Catalog: 'Catalog',
+    Administration: 'Administration',
+    'Control panel': 'Control panel',
+    Users: 'Users',
+    Connections: 'Connections',
+    Visits: 'Visits',
+    News: 'News',
+    Photos: 'Images',
+    Images: 'Images',
+    Items: 'Items',
+    Agencies: 'Agencies',
+    Reports: 'Reports',
+    Configuration: 'Configuration',
+    Shelves: 'Shelves',
+    Account: 'Account',
+    Addresses: 'Addresses',
+    Confirm: 'Confirm',
+    Checkout: 'Configure order',
+    'Address details': 'Configuration',
+    'Admin news details': 'Add or edit new',
     //
     orderLoadedIntoBasket: 'Order loaded into basket!',
     loadAnOrder: 'Please load a pending order to the cart or start a new one',
diff --git a/src/i18n/es-ES/index.js b/src/i18n/es-ES/index.js
index 693c5454..800434fb 100644
--- a/src/i18n/es-ES/index.js
+++ b/src/i18n/es-ES/index.js
@@ -59,26 +59,34 @@ export default {
         ]
     },
 
-    // Menu
-    home: 'Inicio',
-    catalog: 'Catálogo',
-    pendingOrders: 'Pedidos pendientes',
-    confirmedOrders: 'Pedidos confirmados',
-    invoices: 'Facturas',
-    agencyPackages: 'Bultos por agencia',
-    accountConfig: 'Configuración',
-    addressesList: 'Direcciones',
-    addressDetails: 'Configuración',
-    checkout: 'Configurar pedido',
-    controlPanel: 'Panel de control',
-    adminConnections: 'Conexiones',
-    adminItems: 'Artículos',
-    adminVisits: 'Visitas',
-    adminUsers: 'Gestión de usuarios',
-    adminPhotos: 'Imágenes',
-    adminNews: 'Gestión de noticias',
-    adminNewsDetails: 'Añadir o editar noticia',
-    basket: 'Cesta de la compra',
+    // Sections titles
+    Home: 'Inicio',
+    Orders: 'Pedidos',
+    Ticket: 'Pedido',
+    'Pending orders': 'Pedidos pendientes',
+    'Last orders': 'Pedidos confirmados',
+    Invoices: 'Facturas',
+    Basket: 'Cesta',
+    Catalog: 'Catálogo',
+    Administration: 'Administración',
+    'Control panel': 'Panel de control',
+    Users: 'Usuarios',
+    Connections: 'Conexiones',
+    Visits: 'Visitas',
+    News: 'Noticias',
+    Photos: 'Imágenes',
+    Images: 'Imágenes',
+    Items: 'Artículos',
+    Agencies: 'Agencias',
+    Reports: 'Informes',
+    Configuration: 'Configuración',
+    Shelves: 'Estanterías',
+    Account: 'Cuenta',
+    Addresses: 'Direcciones',
+    Confirm: 'Confirmar',
+    Checkout: 'Configurar pedido',
+    'Address details': 'Configuración',
+    'Admin news details': 'Añadir o editar noticia',
     //
     orderLoadedIntoBasket: '¡Pedido cargado en la cesta!',
     loadAnOrder:
diff --git a/src/i18n/fr-FR/index.js b/src/i18n/fr-FR/index.js
index 23c0a9f1..233087cf 100644
--- a/src/i18n/fr-FR/index.js
+++ b/src/i18n/fr-FR/index.js
@@ -40,27 +40,35 @@ export default {
         ]
     },
     of: 'de',
-    // Menu
-    home: 'Accueil',
-    catalog: 'Catalogue',
-    pendingOrders: 'Commandes en attente',
-    confirmedOrders: 'Commandes confirmées',
-    invoices: 'Factures',
-    agencyPackages: 'Liste par agence',
-    accountConfig: 'Configuration',
-    addressesList: 'Adresses',
-    addressDetails: 'Configuration',
-    checkout: "Définissez l'ordre",
-    controlPanel: 'Panneau de configuration',
-    adminConnections: 'Connexions',
-    adminItems: 'Articles',
-    adminVisits: 'Visites',
-    adminUsers: 'Gestion des utilisateurs',
-    adminPhotos: 'Images',
-    adminNews: 'Gestion des nouvelles',
-    adminNewsDetails: 'Ajouter ou editer nouvelles',
-    emptyList: 'Vider la liste',
-    basket: 'Panier',
+
+    // Sections titles
+    Home: 'Accueil',
+    Orders: 'Commandes',
+    Ticket: 'Détail de la commande',
+    'Pending orders': 'Commandes en attente',
+    'Last orders': 'Commandes confirmées',
+    Invoices: 'Factures',
+    Basket: 'Panier',
+    Catalog: 'Catalogue',
+    Administration: 'Administration',
+    'Control panel': 'Panneau de configuration',
+    Users: 'Utilisateurs',
+    Connections: 'Connexions',
+    Visits: 'Visites',
+    News: 'Nouvelles',
+    Photos: 'Images',
+    Images: 'Images',
+    Items: 'Articles',
+    Agencies: 'Agences',
+    Reports: 'Rapports',
+    Configuration: 'Configuration',
+    Shelves: 'Étagères',
+    Account: 'Compte',
+    Addresses: 'Adresses',
+    Confirm: 'Confirmer',
+    Checkout: 'Configurer la commande',
+    'Address details': 'Configuration',
+    'Admin news details': 'Ajouter ou éditer une nouvelle',
     //
     orderLoadedIntoBasket: 'Commande chargée dans le panier!',
     loadAnOrder:
diff --git a/src/i18n/pt-PT/index.js b/src/i18n/pt-PT/index.js
index d792b885..83fc12b1 100644
--- a/src/i18n/pt-PT/index.js
+++ b/src/i18n/pt-PT/index.js
@@ -40,28 +40,34 @@ export default {
         ]
     },
     of: 'de',
-
-    // Menu
-    home: 'Principio',
-    catalog: 'Catálogo',
-    pendingOrders: 'Pedidos pendentes',
-    confirmedOrders: 'Pedidos confirmados',
-    invoices: 'Facturas',
-    agencyPackages: 'Bultos por agencia',
-    accountConfig: 'Configuração',
-    addressesList: 'Moradas',
-    addressDetails: 'Configuração',
-    checkout: 'Configurar encomenda',
-    controlPanel: 'Painel de controle',
-    adminConnections: 'Conexões',
-    adminItems: 'Artigos',
-    adminVisits: 'Visitas',
-    adminUsers: 'Gestão de usuários',
-    adminPhotos: 'Imagens',
-    adminNews: 'Gestão de notícias',
-    adminNewsDetails: 'Ajouter ou editer nouvelles',
-    emptyList: 'Lista vazia',
-    basket: 'Cesta da compra',
+    // Sections titles
+    Home: 'Início',
+    Orders: 'Pedidos',
+    Ticket: 'Detalhe do pedido',
+    'Pending orders': 'Pedidos pendentes',
+    'Last orders': 'Pedidos confirmados',
+    Invoices: 'Faturas',
+    Basket: 'Carrinho',
+    Catalog: 'Catálogo',
+    Administration: 'Administração',
+    'Control panel': 'Painel de controle',
+    Users: 'Usuários',
+    Connections: 'Conexões',
+    Visits: 'Visitas',
+    News: 'Notícias',
+    Photos: 'Imagens',
+    Images: 'Imagens',
+    Items: 'Artigos',
+    Agencies: 'Agências',
+    Reports: 'Informes',
+    Configuration: 'Configuração',
+    Shelves: 'Estantes',
+    Account: 'Conta',
+    Addresses: 'Moradas',
+    Confirm: 'Confirme',
+    Checkout: 'Configurar encomenda',
+    'Address details': 'Configuração',
+    'Admin news details': 'Adicionar ou editar notícia',
     //
     orderLoadedIntoBasket: 'Pedido carregado na cesta!',
     loadAnOrder: 'Carregue um pedido pendente no carrinho ou inicie um novo',
diff --git a/src/layouts/MainLayout.vue b/src/layouts/MainLayout.vue
index 67a94b45..0d114df4 100644
--- a/src/layouts/MainLayout.vue
+++ b/src/layouts/MainLayout.vue
@@ -1,5 +1,6 @@
 <script setup>
 import { ref, onMounted } from 'vue';
+import { useI18n } from 'vue-i18n';
 
 import { storeToRefs } from 'pinia';
 import { useRouter } from 'vue-router';
@@ -7,6 +8,7 @@ import { useRouter } from 'vue-router';
 import { useUserStore } from 'stores/user';
 import { useAppStore } from 'stores/app';
 
+const { t } = useI18n();
 const router = useRouter();
 const userStore = useUserStore();
 const appStore = useAppStore();
@@ -95,12 +97,12 @@ const logoutSupplantedUser = async () => {
             <QList v-for="item in menuEssentialLinks" :key="item.id">
                 <QItem v-if="!item.childs" :to="`/${item.path}`">
                     <QItemSection>
-                        <QItemLabel>{{ item.description }}</QItemLabel>
+                        <QItemLabel>{{ t(item.description) }}</QItemLabel>
                     </QItemSection>
                 </QItem>
                 <QExpansionItem
                     v-if="item.childs"
-                    :label="item.description"
+                    :label="t(item.description)"
                     expand-separator
                 >
                     <QList>
@@ -112,7 +114,7 @@ const logoutSupplantedUser = async () => {
                         >
                             <QItemSection>
                                 <QItemLabel>
-                                    {{ subitem.description }}
+                                    {{ t(subitem.description) }}
                                 </QItemLabel>
                             </QItemSection>
                         </QItem>
diff --git a/src/router/index.js b/src/router/index.js
index cb8a7ea0..340fc410 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -22,8 +22,8 @@ export default route(function (/* { store, ssrContext } */) {
     const createHistory = process.env.SERVER
         ? createMemoryHistory
         : process.env.VUE_ROUTER_MODE === 'history'
-            ? createWebHistory
-            : createWebHashHistory;
+          ? createWebHistory
+          : createWebHashHistory;
 
     const Router = createRouter({
         scrollBehavior: () => ({ left: 0, top: 0 }),
@@ -41,7 +41,7 @@ export default route(function (/* { store, ssrContext } */) {
         if (from.name === to.name) return;
         const app = useAppStore();
         app.$patch({
-            title: i18n.global.t(to.name || 'home'),
+            title: i18n.global.t(to.meta.title || 'home'),
             subtitle: null,
             useRightDrawer: false,
             rightDrawerOpen: true
diff --git a/src/router/routes.js b/src/router/routes.js
index a61776cf..efa8fbab 100644
--- a/src/router/routes.js
+++ b/src/router/routes.js
@@ -32,106 +32,169 @@ const routes = [
             {
                 name: 'home',
                 path: '/cms/home',
+                meta: {
+                    title: 'Home'
+                },
                 component: () => import('src/pages/Cms/HomeView.vue')
             },
             {
                 name: 'confirmedOrders',
                 path: '/ecomerce/orders',
+                meta: {
+                    title: 'Last orders'
+                },
                 component: () => import('pages/Ecomerce/OrdersView.vue')
             },
             {
                 name: 'ticket',
                 path: '/ecomerce/ticket/:id',
+                meta: {
+                    title: 'Ticket'
+                },
                 component: () => import('pages/Ecomerce/TicketView.vue')
             },
             {
                 name: 'invoices',
                 path: '/ecomerce/invoices',
+                meta: {
+                    title: 'Invoices'
+                },
                 component: () => import('pages/Ecomerce/InvoicesView.vue')
             },
             {
                 name: 'pendingOrders',
                 path: '/ecomerce/pending',
+                meta: {
+                    title: 'Pending orders'
+                },
                 component: () => import('pages/Ecomerce/PendingOrders.vue')
             },
             {
                 name: 'catalog',
                 path: '/ecomerce/catalog/:category?/:type?',
+                meta: {
+                    title: 'Catalog'
+                },
                 component: () => import('pages/Ecomerce/Catalog.vue')
             },
             {
                 name: 'basket',
                 path: '/ecomerce/basket/:id?',
+                meta: {
+                    title: 'Basket'
+                },
                 component: () => import('pages/Ecomerce/BasketView.vue')
             },
             {
                 name: 'confirm',
                 path: '/ecomerce/confirm/:id?',
+                meta: {
+                    title: 'Confirm'
+                },
                 component: () => import('pages/Ecomerce/ConfirmView.vue')
             },
             {
                 name: 'checkout',
                 path: '/ecomerce/checkout/:id?',
+                meta: {
+                    title: 'Checkout'
+                },
                 component: () => import('pages/Ecomerce/CheckoutView.vue')
             },
             {
                 name: 'agencyPackages',
                 path: '/agencies/packages',
+                meta: {
+                    title: 'Agencies'
+                },
                 component: () => import('src/pages/Agencies/PackagesView.vue')
             },
             {
                 name: 'accountConfig',
                 path: '/account/conf',
+                meta: {
+                    title: 'Account'
+                },
                 component: () => import('pages/Account/AccountConfig.vue')
             },
             {
                 name: 'addressesList',
                 path: '/account/address-list',
+                meta: {
+                    title: 'Addresses'
+                },
                 component: () => import('pages/Account/AddressList.vue')
             },
             {
                 name: 'addressDetails',
                 path: '/account/address/:id?',
+                meta: {
+                    title: 'Address details'
+                },
                 component: () => import('pages/Account/AddressDetails.vue')
             },
             {
                 name: 'controlPanel',
                 path: 'admin/links',
+                meta: {
+                    title: 'Control panel'
+                },
                 component: () => import('pages/Admin/LinksView.vue')
             },
             {
                 name: 'adminUsers',
                 path: 'admin/users',
+                meta: {
+                    title: 'Users'
+                },
                 component: () => import('pages/Admin/UsersView.vue')
             },
             {
                 name: 'adminConnections',
                 path: 'admin/connections',
+                meta: {
+                    title: 'Connections'
+                },
                 component: () => import('pages/Admin/ConnectionsView.vue')
             },
             {
                 name: 'adminVisits',
                 path: 'admin/visits',
+                meta: {
+                    title: 'Visits'
+                },
                 component: () => import('pages/Admin/VisitsView.vue')
             },
             {
                 name: 'adminNews',
                 path: 'news/news',
+                meta: {
+                    title: 'News'
+                },
                 component: () => import('pages/Admin/NewsView.vue')
             },
             {
                 name: 'adminNewsDetails',
                 path: 'news/new/:id?',
+                meta: {
+                    title: 'Admin news details'
+                },
                 component: () => import('pages/Admin/NewsDetails.vue')
             },
             {
                 name: 'adminPhotos',
                 path: 'admin/photos',
+                meta: {
+                    title: 'Photos'
+                },
                 component: () => import('pages/Admin/PhotosView.vue')
             },
             {
                 name: 'adminItems',
                 path: 'admin/items',
+                meta: {
+                    title: 'Items'
+                },
                 component: () => import('pages/Admin/ItemsView.vue')
             }
         ]
-- 
2.40.1


From 38a88bb0cce0baa89c0ddc0689becd8c5eef992b Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 9 Sep 2024 22:18:44 +0200
Subject: [PATCH 8/9] feat: changes

---
 src/i18n/ca-ES/index.js              | 2 +-
 src/i18n/en-US/index.js              | 2 +-
 src/i18n/es-ES/index.js              | 2 +-
 src/i18n/fr-FR/index.js              | 2 +-
 src/i18n/pt-PT/index.js              | 2 +-
 src/layouts/MainLayout.vue           | 8 +++-----
 src/pages/Ecomerce/TicketDetails.vue | 6 ++++--
 7 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/i18n/ca-ES/index.js b/src/i18n/ca-ES/index.js
index a80aec1d..694fe1a1 100644
--- a/src/i18n/ca-ES/index.js
+++ b/src/i18n/ca-ES/index.js
@@ -81,6 +81,6 @@ export default {
     noData: 'Sense dades',
     confirm: 'Confirmar',
     delete: 'Esborrar',
-    reallyDelete: 'Estàs segur que vols esborrar la línia?',
+    confirmDelete: 'Estàs segur que vols esborrar la línia?',
     emptyList: 'Llista buida'
 };
diff --git a/src/i18n/en-US/index.js b/src/i18n/en-US/index.js
index 25be1daf..8709c5f2 100644
--- a/src/i18n/en-US/index.js
+++ b/src/i18n/en-US/index.js
@@ -92,7 +92,7 @@ export default {
     noData: 'No data',
     confirm: 'Confirm',
     delete: 'Delete',
-    reallyDelete: 'Are you sure you want to delete the line?',
+    confirmDelete: 'Are you sure you want to delete the line?',
     emptyList: 'Empty list',
 
     orders: 'Orders',
diff --git a/src/i18n/es-ES/index.js b/src/i18n/es-ES/index.js
index 800434fb..4001220c 100644
--- a/src/i18n/es-ES/index.js
+++ b/src/i18n/es-ES/index.js
@@ -99,7 +99,7 @@ export default {
     noData: 'Sin datos',
     confirm: 'Confirmar',
     delete: 'Borrar',
-    reallyDelete: '¿Estás seguro de que quieres borrar la línea?',
+    confirmDelete: '¿Estás seguro de que quieres borrar la línea?',
     emptyList: 'Lista vacía',
 
     orders: 'Pedidos',
diff --git a/src/i18n/fr-FR/index.js b/src/i18n/fr-FR/index.js
index 233087cf..7b3f09f8 100644
--- a/src/i18n/fr-FR/index.js
+++ b/src/i18n/fr-FR/index.js
@@ -81,5 +81,5 @@ export default {
     noData: 'Aucune donnée',
     confirm: 'Confirmer',
     delete: 'Effacer',
-    reallyDelete: 'Voulez-vous vraiment supprimer la ligne?'
+    confirmDelete: 'Voulez-vous vraiment supprimer la ligne?'
 };
diff --git a/src/i18n/pt-PT/index.js b/src/i18n/pt-PT/index.js
index 83fc12b1..fe16ce9c 100644
--- a/src/i18n/pt-PT/index.js
+++ b/src/i18n/pt-PT/index.js
@@ -79,5 +79,5 @@ export default {
     noData: 'Sem dados',
     confirm: 'Confirme',
     delete: 'Eliminar',
-    reallyDelete: 'Tens certeza que queres eliminar esta linha?'
+    confirmDelete: 'Tens certeza que queres eliminar esta linha?'
 };
diff --git a/src/layouts/MainLayout.vue b/src/layouts/MainLayout.vue
index 0d114df4..7117c32f 100644
--- a/src/layouts/MainLayout.vue
+++ b/src/layouts/MainLayout.vue
@@ -1,6 +1,5 @@
 <script setup>
 import { ref, onMounted } from 'vue';
-import { useI18n } from 'vue-i18n';
 
 import { storeToRefs } from 'pinia';
 import { useRouter } from 'vue-router';
@@ -8,7 +7,6 @@ import { useRouter } from 'vue-router';
 import { useUserStore } from 'stores/user';
 import { useAppStore } from 'stores/app';
 
-const { t } = useI18n();
 const router = useRouter();
 const userStore = useUserStore();
 const appStore = useAppStore();
@@ -97,12 +95,12 @@ const logoutSupplantedUser = async () => {
             <QList v-for="item in menuEssentialLinks" :key="item.id">
                 <QItem v-if="!item.childs" :to="`/${item.path}`">
                     <QItemSection>
-                        <QItemLabel>{{ t(item.description) }}</QItemLabel>
+                        <QItemLabel>{{ $t(item.description) }}</QItemLabel>
                     </QItemSection>
                 </QItem>
                 <QExpansionItem
                     v-if="item.childs"
-                    :label="t(item.description)"
+                    :label="$t(item.description)"
                     expand-separator
                 >
                     <QList>
@@ -114,7 +112,7 @@ const logoutSupplantedUser = async () => {
                         >
                             <QItemSection>
                                 <QItemLabel>
-                                    {{ t(subitem.description) }}
+                                    {{ $t(subitem.description) }}
                                 </QItemLabel>
                             </QItemSection>
                         </QItem>
diff --git a/src/pages/Ecomerce/TicketDetails.vue b/src/pages/Ecomerce/TicketDetails.vue
index 2b8af07a..71dd99a2 100644
--- a/src/pages/Ecomerce/TicketDetails.vue
+++ b/src/pages/Ecomerce/TicketDetails.vue
@@ -119,8 +119,10 @@ const deleteRow = id => {
                         dense
                         flat
                         @click.stop="
-                            openConfirmationModal(null, t('reallyDelete'), () =>
-                                deleteRow(row.id)
+                            openConfirmationModal(
+                                null,
+                                t('confirmDelete'),
+                                () => deleteRow(row.id)
                             )
                         "
                     >
-- 
2.40.1


From 929623949bdccfbd20e3bacf0c41da8942d5141f Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 9 Sep 2024 22:19:05 +0200
Subject: [PATCH 9/9] perf: change code position(clean code)

---
 src/pages/Ecomerce/BasketView.vue | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/pages/Ecomerce/BasketView.vue b/src/pages/Ecomerce/BasketView.vue
index 7d996ee0..04a2ef6c 100644
--- a/src/pages/Ecomerce/BasketView.vue
+++ b/src/pages/Ecomerce/BasketView.vue
@@ -17,6 +17,14 @@ const rows = ref([]);
 const ticket = ref({});
 const orderId = ref(null);
 
+onBeforeMount(() => {
+    appStore.check();
+});
+
+onMounted(async () => {
+    orderId.value = route.params.id || basketOrderId.value;
+    if (orderId.value) await fetchData();
+});
 const getOrder = async () => {
     try {
         const [data] = await jApi.query(
@@ -88,15 +96,6 @@ const fetchData = async () => {
     await getItems();
     await getOrder();
 };
-
-onBeforeMount(() => {
-    appStore.check();
-});
-
-onMounted(async () => {
-    orderId.value = route.params.id || basketOrderId.value;
-    await fetchData();
-});
 </script>
 
 <template>
-- 
2.40.1