diff --git a/src/i18n/ca-ES/index.js b/src/i18n/ca-ES/index.js index ae946728..8aba51a8 100644 --- a/src/i18n/ca-ES/index.js +++ b/src/i18n/ca-ES/index.js @@ -73,7 +73,7 @@ export default { Reports: 'Informes', Configuration: 'Configuració', Shelves: 'Prestatgeries', - Account: 'Compte', + Account: 'Configuració', Addresses: 'Adreces', OrderSummary: 'Resum de la comanda', Checkout: `Configurar l'encarrec`, diff --git a/src/i18n/en-US/index.js b/src/i18n/en-US/index.js index 4b478c83..38bc9373 100644 --- a/src/i18n/en-US/index.js +++ b/src/i18n/en-US/index.js @@ -85,7 +85,7 @@ export default { Reports: 'Reports', Configuration: 'Configuration', Shelves: 'Shelves', - Account: 'Account', + Account: 'Configuration', Addresses: 'Addresses', OrderSummary: 'Order summary', Checkout: 'Configure order', diff --git a/src/i18n/es-ES/index.js b/src/i18n/es-ES/index.js index e9f609c8..69927961 100644 --- a/src/i18n/es-ES/index.js +++ b/src/i18n/es-ES/index.js @@ -67,11 +67,11 @@ export default { 'Pending orders': 'Pedidos pendientes', 'Last orders': 'Pedidos confirmados', Invoices: 'Facturas', - Basket: 'Cesta', + Basket: 'Cesta de la compra', Catalog: 'Catálogo', Administration: 'Administración', 'Control panel': 'Panel de control', - Users: 'Usuarios', + Users: 'Gestión de usuarios', Connections: 'Conexiones', Visits: 'Visitas', News: 'Gestión de noticias', @@ -82,7 +82,7 @@ export default { Reports: 'Informes', Configuration: 'Configuración', Shelves: 'Estanterías', - Account: 'Cuenta', + Account: 'Configuración', Addresses: 'Direcciones', OrderSummary: 'Resumen del pedido', Checkout: 'Configurar pedido', diff --git a/src/i18n/fr-FR/index.js b/src/i18n/fr-FR/index.js index 43462a49..abf93cbb 100644 --- a/src/i18n/fr-FR/index.js +++ b/src/i18n/fr-FR/index.js @@ -73,7 +73,7 @@ export default { Reports: 'Rapports', Configuration: 'Configuration', Shelves: 'Étagères', - Account: 'Compte', + Account: 'Configuration', Addresses: 'Adresses', OrderSummary: 'Résumé de la commande', Checkout: 'Configurer la commande', diff --git a/src/i18n/pt-PT/index.js b/src/i18n/pt-PT/index.js index 018d54a8..d527af10 100644 --- a/src/i18n/pt-PT/index.js +++ b/src/i18n/pt-PT/index.js @@ -72,7 +72,7 @@ export default { Reports: 'Informes', Configuration: 'Configuração', Shelves: 'Estantes', - Account: 'Conta', + Account: 'Configuração', Addresses: 'Moradas', OrderSummary: 'Resumo da encomenda', Checkout: 'Configurar encomenda', diff --git a/src/pages/Ecomerce/BasketView.vue b/src/pages/Ecomerce/BasketView.vue index d9206d39..3fefc59b 100644 --- a/src/pages/Ecomerce/BasketView.vue +++ b/src/pages/Ecomerce/BasketView.vue @@ -104,21 +104,27 @@ const fetchData = async () => { :to="{ name: 'checkout', params: { id: orderId } }" rounded no-caps - /> + > + {{ t('configureOrder') }} + + > + {{ t('catalog') }} + + > + {{ t('checkout') }} + { const init = async _router => { router = _router; isGuest.value = localStorage.getItem('hederaGuest') || false; - console.log('isGuest.value', isGuest.value); await getToken(); if (!loggedIn.value) { const autoLoginStatus = await tryAutoLogin(); @@ -179,9 +178,6 @@ export const useUserStore = defineStore('user', () => { Math.min(ttl, tokenConfig.value?.renewPeriod) * 1000; const maxDate = created + renewPeriodInSeconds; const now = new Date().getTime(); - console.log('renewPeriodInSeconds', renewPeriodInSeconds); - console.log('maxDate', maxDate); - console.log('now', now); if (isNaN(renewPeriodInSeconds) || now <= maxDate) { isCheckingToken.value = false; @@ -198,8 +194,7 @@ export const useUserStore = defineStore('user', () => { const startInterval = () => { stopRenewer(); - // const renewPeriod = +storage.value.getItem('renewPeriod'); - const renewPeriod = 5; + const renewPeriod = +storage.value.getItem('renewPeriod'); if (!renewPeriod) return; intervalId.value = setInterval( () => checkValidity(), @@ -267,12 +262,8 @@ export const useUserStore = defineStore('user', () => { watch( [mainUser, supplantedUser], - () => { - user.value = supplantedUser.value || mainUser.value; - console.log('mainUser.value', mainUser.value); - console.log('supplantedUser.value', supplantedUser.value); - console.log('user.value', user.value); - }, + () => (user.value = supplantedUser.value || mainUser.value), + { immediate: true } );