From 4d91014fc21156eda8d2323ec0de6a893b216073 Mon Sep 17 00:00:00 2001 From: wbuezas Date: Fri, 7 Feb 2025 12:45:28 -0300 Subject: [PATCH 1/5] Fix tests --- src/boot/axios.js | 4 ++-- src/stores/user.js | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/boot/axios.js b/src/boot/axios.js index 1235d58e..07a52ea7 100644 --- a/src/boot/axios.js +++ b/src/boot/axios.js @@ -40,9 +40,9 @@ const onResponseError = error => { Router.push({ name: 'login' }); userStore.destroy(false); - } else if (!userStore.isLoggedIn) { - return Promise.reject(error); } + + return Promise.reject(error); }; export default boot(({ app }) => { diff --git a/src/stores/user.js b/src/stores/user.js index 90aaa688..91278afa 100644 --- a/src/stores/user.js +++ b/src/stores/user.js @@ -336,6 +336,7 @@ export const useUserStore = defineStore('user', () => { logoutSupplantedUser, updateUserLang, init, - $reset + $reset, + onLogin }; }); From 28687c51a2b070bc25ddf0e42be93174debdba03 Mon Sep 17 00:00:00 2001 From: jgallego Date: Fri, 21 Feb 2025 13:51:34 +0100 Subject: [PATCH 2/5] fix: update French translation for 'start order' to improve clarity --- src/pages/Cms/Home.vue | 13 +++++++++++++ src/pages/Cms/HomeView.vue | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/src/pages/Cms/Home.vue b/src/pages/Cms/Home.vue index 77d7ab25..6ad42b89 100644 --- a/src/pages/Cms/Home.vue +++ b/src/pages/Cms/Home.vue @@ -63,3 +63,16 @@ export default { } }; + + +en-US: + startOrder: Start order +es-ES: + startOrder: Empezar pedido +ca-ES: + startOrder: Començar comanda +fr-FR: + startOrder: Lancer une commande +pt-PT: + startOrder: Comece uma encomenda + diff --git a/src/pages/Cms/HomeView.vue b/src/pages/Cms/HomeView.vue index a9931ca9..17494bae 100644 --- a/src/pages/Cms/HomeView.vue +++ b/src/pages/Cms/HomeView.vue @@ -99,7 +99,7 @@ es-ES: ca-ES: startOrder: Començar comanda fr-FR: - startOrder: Lancer commande + startOrder: Lancer une commande pt-PT: startOrder: Comece uma encomenda From 3bc7d1fe457f86f174ce5f7cc5eefb928ed7402f Mon Sep 17 00:00:00 2001 From: Javier Segarra Date: Fri, 21 Feb 2025 14:32:52 +0100 Subject: [PATCH 3/5] perf: remove // --- src/i18n/ca-ES/index.js | 1 - 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 | 1 - 5 files changed, 8 deletions(-) diff --git a/src/i18n/ca-ES/index.js b/src/i18n/ca-ES/index.js index 3a09fc17..456795a5 100644 --- a/src/i18n/ca-ES/index.js +++ b/src/i18n/ca-ES/index.js @@ -104,7 +104,6 @@ export default { Account: 'Compte', Addresses: 'Adreces' }, - // orderLoadedIntoBasket: 'Comanda carregada a la cistella!', loadAnOrder: 'Si us plau carrega una comanda pendent a la cistella o en comença una de nova', diff --git a/src/i18n/en-US/index.js b/src/i18n/en-US/index.js index 668ebcf9..3e21b66d 100644 --- a/src/i18n/en-US/index.js +++ b/src/i18n/en-US/index.js @@ -116,8 +116,6 @@ export default { Account: 'Account', Addresses: 'Addresses' }, - - // orderLoadedIntoBasket: 'Order loaded into basket!', loadAnOrder: 'Please load a pending order to the cart or start a new one', at: 'at', diff --git a/src/i18n/es-ES/index.js b/src/i18n/es-ES/index.js index 6cd7f59d..5034ff70 100644 --- a/src/i18n/es-ES/index.js +++ b/src/i18n/es-ES/index.js @@ -113,8 +113,6 @@ export default { Account: 'Cuenta', Addresses: 'Direcciones' }, - - // orderLoadedIntoBasket: '¡Pedido cargado en la cesta!', loadAnOrder: 'Por favor carga un pedido pendiente en la cesta o empieza uno nuevo', diff --git a/src/i18n/fr-FR/index.js b/src/i18n/fr-FR/index.js index 1550c61f..ca81c36a 100644 --- a/src/i18n/fr-FR/index.js +++ b/src/i18n/fr-FR/index.js @@ -104,8 +104,6 @@ export default { Account: 'Compte', Addresses: 'Adresses' }, - - // orderLoadedIntoBasket: 'Commande chargée dans le panier!', loadAnOrder: 'Veuillez télécharger une commande en attente dans le panier ou en démarrer une nouvelle', diff --git a/src/i18n/pt-PT/index.js b/src/i18n/pt-PT/index.js index ce5a4f5a..39bbe5de 100644 --- a/src/i18n/pt-PT/index.js +++ b/src/i18n/pt-PT/index.js @@ -104,7 +104,6 @@ export default { Account: 'Conta', Addresses: 'Moradas' }, - // orderLoadedIntoBasket: 'Pedido carregado na cesta!', loadAnOrder: 'Carregue um pedido pendente no carrinho ou inicie um novo', at: 'às', From 3ff4d2bf6cdffc7310eee211278ada99761af1d4 Mon Sep 17 00:00:00 2001 From: wbuezas Date: Fri, 21 Feb 2025 14:24:46 -0300 Subject: [PATCH 4/5] Fix start order tooltip --- src/pages/Cms/HomeView.vue | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/pages/Cms/HomeView.vue b/src/pages/Cms/HomeView.vue index 17494bae..442dfbc9 100644 --- a/src/pages/Cms/HomeView.vue +++ b/src/pages/Cms/HomeView.vue @@ -57,7 +57,9 @@ onMounted(async () => await fetchData()); color="accent" to="/ecomerce/catalog" > - {{ $t('startOrder') }} + {{ $t('startOrder') }} + From 62fc4ed82dffd0b8222486b4e2e54eed691bfa40 Mon Sep 17 00:00:00 2001 From: Javier Segarra Date: Sat, 22 Feb 2025 12:30:30 +0000 Subject: [PATCH 5/5] feat: update patch version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 9bc1af14..9f0c7db4 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "hedera-web", - "version": "25.8.1", + "version": "25.8.2", "description": "Verdnatura web page", "license": "GPL-3.0", "productName": "Verdnatura",