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 9a6ca041..694fe1a1 100644 --- a/src/i18n/ca-ES/index.js +++ b/src/i18n/ca-ES/index.js @@ -40,25 +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', + + // 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: @@ -69,5 +79,8 @@ export default { remove: 'Esborrar', agency: 'Agència', noData: 'Sense dades', - confirm: 'Confirmar' + confirm: 'Confirmar', + delete: 'Esborrar', + 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 bb6a3523..8709c5f2 100644 --- a/src/i18n/en-US/index.js +++ b/src/i18n/en-US/index.js @@ -53,25 +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', + // 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', @@ -82,6 +91,9 @@ export default { agency: 'Agency', noData: 'No data', confirm: 'Confirm', + delete: 'Delete', + confirmDelete: '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 949ab4b6..4001220c 100644 --- a/src/i18n/es-ES/index.js +++ b/src/i18n/es-ES/index.js @@ -59,25 +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', + // 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: @@ -89,6 +98,9 @@ export default { agency: 'Agencia', noData: 'Sin datos', confirm: 'Confirmar', + delete: 'Borrar', + confirmDelete: '¿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 aacc9ca7..7b3f09f8 100644 --- a/src/i18n/fr-FR/index.js +++ b/src/i18n/fr-FR/index.js @@ -40,25 +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', + + // 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: @@ -69,5 +79,7 @@ export default { remove: 'Effacer', agency: 'Agence', noData: 'Aucune donnée', - confirm: 'Confirmer' + confirm: 'Confirmer', + delete: 'Effacer', + confirmDelete: 'Voulez-vous vraiment supprimer la ligne?' }; diff --git a/src/i18n/pt-PT/index.js b/src/i18n/pt-PT/index.js index f4d6b2d0..fe16ce9c 100644 --- a/src/i18n/pt-PT/index.js +++ b/src/i18n/pt-PT/index.js @@ -40,26 +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', + // 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', @@ -69,5 +77,7 @@ export default { remove: 'Eliminar', agency: 'Agência', noData: 'Sem dados', - confirm: 'Confirme' + confirm: 'Confirme', + delete: 'Eliminar', + confirmDelete: 'Tens certeza que queres eliminar esta linha?' }; diff --git a/src/layouts/MainLayout.vue b/src/layouts/MainLayout.vue index 67a94b45..7117c32f 100644 --- a/src/layouts/MainLayout.vue +++ b/src/layouts/MainLayout.vue @@ -95,12 +95,12 @@ const logoutSupplantedUser = async () => { - {{ item.description }} + {{ $t(item.description) }} @@ -112,7 +112,7 @@ const logoutSupplantedUser = async () => { > - {{ subitem.description }} + {{ $t(subitem.description) }} diff --git a/src/lib/filters.js b/src/lib/filters.js index fac5122f..abb27293 100644 --- a/src/lib/filters.js +++ b/src/lib/filters.js @@ -1,7 +1,7 @@ import { i18n } from 'src/boot/i18n'; import { date as qdate, format } from 'quasar'; -const { pad } = format; import { useAppStore } from 'stores/app'; +const { pad } = format; export function currency(val) { return typeof val === 'number' ? val.toFixed(2) + '€' : val; @@ -18,7 +18,6 @@ export function date(val, format = 'YYYY-MM-DD') { export const formatDate = (timeStamp, format = 'YYYY-MM-DD') => { if (!timeStamp) return ''; const appStore = useAppStore(); - return qdate.formatDate(timeStamp, format, appStore.localeDates); }; diff --git a/src/pages/Ecomerce/BasketView.vue b/src/pages/Ecomerce/BasketView.vue index cf6656ea..04a2ef6c 100644 --- a/src/pages/Ecomerce/BasketView.vue +++ b/src/pages/Ecomerce/BasketView.vue @@ -1,14 +1,153 @@ + + + +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 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 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/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 () => { diff --git a/src/pages/Ecomerce/TicketDetails.vue b/src/pages/Ecomerce/TicketDetails.vue index 2f8f5397..71dd99a2 100644 --- a/src/pages/Ecomerce/TicketDetails.vue +++ b/src/pages/Ecomerce/TicketDetails.vue @@ -1,8 +1,12 @@