From a33ce5699e0b54a25a2cf6ea3f9e39baeb140122 Mon Sep 17 00:00:00 2001 From: Jon Date: Tue, 18 Jun 2024 15:26:48 +0200 Subject: [PATCH 01/33] feat: refs #7030 translation proposal --- src/components/common/VnBreadcrumbs.vue | 1 + src/i18n/locale/en.yml | 322 ++++++++--------------- src/i18n/locale/es.yml | 329 ++++++++---------------- 3 files changed, 228 insertions(+), 424 deletions(-) diff --git a/src/components/common/VnBreadcrumbs.vue b/src/components/common/VnBreadcrumbs.vue index 337507233..75fd6d499 100644 --- a/src/components/common/VnBreadcrumbs.vue +++ b/src/components/common/VnBreadcrumbs.vue @@ -37,6 +37,7 @@ function getBreadcrumb(param) { locale: t(`globals.pageTitles.${param.meta.title}`), }; + //TODO modificar para que funcione títulos de página if (screen.gt.sm) { breadcrumb.name = param.name; breadcrumb.title = useCamelCase(param.meta.title); diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml index 5ef3a5472..9bf272d61 100644 --- a/src/i18n/locale/en.yml +++ b/src/i18n/locale/en.yml @@ -107,6 +107,119 @@ globals: aliasUsers: Users subRoles: Subroles inheritedRoles: Inherited Roles + customers: Customers + list: List + webPayments: Web Payments + extendedList: Extended list + notifications: Notifications + defaulter: Defaulter + customerCreate: New customer + fiscalData: Fiscal data + billingData: Billing data + consignees: Consignees + notes: Notes + credits: Credits + greuges: Greuges + balance: Balance + recoveries: Recoveries + webAccess: Web access + sms: Sms + creditManagement: Credit management + creditContracts: Credit contracts + creditOpinion: Credit opinion + others: Others + samples: Samples + consumption: Consumption + mandates: Mandates + contacts: Contacts + webPayment: Web payment + fileManagement: File management + unpaid: Unpaid + entries: Entries + buys: Buys + dms: File management + entryCreate: New entry + latestBuys: Latest buys + tickets: Tickets + ticketCreate: New Tickets + boxing: Boxing + sale: Sale + claims: Claims + claimCreate: New claim + lines: Lines + photos: Photos + development: Development + action: Action + invoiceOuts: Invoice out + negativeBases: Negative Bases + globalInvoicing: Global invoicing + invoiceOutCreate: Create invoice out + shelving: Shelving + shelvingList: Shelving List + shelvingCreate: New shelving + invoiceIns: Invoices In + invoiceInCreate: Create invoice in + vat: VAT + dueDay: Due day + intrastat: Intrastat + corrective: Corrective + order: Orders + orderList: List + orderCreate: New order + catalog: Catalog + volume: Volume + workers: Workers + workerCreate: New worker + department: Department + pda: PDA + pbx: Private Branch Exchange + calendar: Calendar + timeControl: Time control + locker: Locker + wagons: Wagons + wagonsList: Wagons List + wagonCreate: Create wagon + wagonEdit: Edit wagon + typesList: Types List + typeCreate: Create type + typeEdit: Edit type + wagonCounter: Trolley counter + roadmap: Roadmap + stops: Stops + routes: Routes + cmrsList: CMRs list + RouteList: List + routeCreate: New route + RouteRoadmap: Roadmaps + RouteRoadmapCreate: Create roadmap + autonomous: Autonomous + suppliers: Suppliers + supplier: Supplier + supplierCreate: New supplier + accounts: Accounts + addresses: Addresses + agencyTerm: Agency agreement + travel: Travels + extraCommunity: Extra community + travelCreate: New travel + history: Log + thermographs: Thermograph + items: Items + diary: Diary + tags: Tags + create: Create + buyRequest: Buy requests + fixedPrice: Fixed prices + wasteBreakdown: Waste breakdown + itemCreate: New item + barcode: Barcodes + tax: Tax + botanical: Botanical + itemTypeCreate: New item type + family: Item Type + lastEntries: Last entries + itemType: Item type + monitors: Monitors created: Created worker: Worker now: Now @@ -149,38 +262,6 @@ dashboard: pageTitles: dashboard: Dashboard customer: - pageTitles: - customers: Customers - list: List - webPayments: Web Payments - extendedList: Extended list - notifications: Notifications - defaulter: Defaulter - customerCreate: New customer - summary: Summary - basicData: Basic data - fiscalData: Fiscal data - billingData: Billing data - consignees: Consignees - notes: Notes - credits: Credits - greuges: Greuges - balance: Balance - recoveries: Recoveries - webAccess: Web access - log: Log - sms: Sms - creditManagement: Credit management - creditContracts: Credit contracts - creditOpinion: Credit opinion - others: Others - samples: Samples - consumption: Consumption - mandates: Mandates - contacts: Contacts - webPayment: Web payment - fileManagement: File management - unpaid: Unpaid list: phone: Phone email: Email @@ -310,17 +391,6 @@ customer: hasCoreVnl: VNL core received hasSepaVnl: VNL B2B received entry: - pageTitles: - entries: Entries - list: List - summary: Summary - basicData: Basic data - buys: Buys - notes: Notes - dms: File management - log: Log - entryCreate: New entry - latestBuys: Latest buys list: newEntry: New entry landed: Landed @@ -432,16 +502,6 @@ entry: packingOut: Package out landing: Landing ticket: - pageTitles: - tickets: Tickets - list: List - ticketCreate: New ticket - summary: Summary - basicData: Basic Data - boxing: Boxing - sms: Sms - notes: Notes - sale: Sale list: nickname: Nickname state: State @@ -516,18 +576,6 @@ ticket: warehouse: Warehouse agency: Agency claim: - pageTitles: - claims: Claims - list: List - claimCreate: New claim - summary: Summary - basicData: Basic Data - lines: Lines - photos: Photos - development: Development - log: Audit logs - notes: Notes - action: Action list: customer: Customer assignedTo: Assigned @@ -591,14 +639,6 @@ claim: noData: 'There are no images/videos, click here or drag and drop the file' dragDrop: Drag and drop it here invoiceOut: - pageTitles: - invoiceOuts: Invoice out - list: List - negativeBases: Negative Bases - globalInvoicing: Global invoicing - invoiceOutCreate: Create invoice out - summary: Summary - basicData: Basic Data list: ref: Reference issued: Issued @@ -666,13 +706,6 @@ invoiceOut: errors: downloadCsvFailed: CSV download failed shelving: - pageTitles: - shelving: Shelving - shelvingList: Shelving List - shelvingCreate: New shelving - summary: Summary - basicData: Basic Data - log: Logs list: parking: Parking priority: Priority @@ -699,17 +732,6 @@ parking: info: You can search by parking code label: Search parking... invoiceIn: - pageTitles: - invoiceIns: Invoices In - list: List - invoiceInCreate: Create invoice in - summary: Summary - basicData: Basic data - vat: VAT - dueDay: Due day - intrastat: Intrastat - corrective: Corrective - log: Logs list: ref: Reference supplier: Supplier @@ -760,15 +782,6 @@ invoiceIn: stems: Stems country: Country order: - pageTitles: - order: Orders - orderList: List - orderCreate: New order - summary: Summary - basicData: Basic Data - catalog: Catalog - volume: Volume - lines: Lines field: salesPersonFk: Sales Person clientFk: Client @@ -827,23 +840,6 @@ department: hasToSendMail: Send check-ins by email departmentRemoved: Department removed worker: - pageTitles: - workers: Workers - list: List - basicData: Basic data - summary: Summary - notifications: Notifications - workerCreate: New worker - department: Department - pda: PDA - notes: Notas - dms: My documentation - pbx: Private Branch Exchange - log: Log - calendar: Calendar - timeControl: Time control - locker: Locker - list: name: Name email: Email @@ -915,15 +911,6 @@ worker: bankEntity: Swift / BIC imageNotFound: Image not found wagon: - pageTitles: - wagons: Wagons - wagonsList: Wagons List - wagonCreate: Create wagon - wagonEdit: Edit wagon - typesList: Types List - typeCreate: Create type - typeEdit: Edit type - wagonCounter: Trolley counter type: name: Name submit: Submit @@ -952,31 +939,7 @@ wagon: minHeightBetweenTrays: 'The minimum height between trays is ' maxWagonHeight: 'The maximum height of the wagon is ' uncompleteTrays: There are incomplete trays -route/roadmap: - pageTitles: - roadmap: Roadmap - summary: Summary - basicData: Basic Data - stops: Stops -roadmap: - pageTitles: - roadmap: Roadmap - summary: Summary - basicData: Basic Data - stops: Stops route: - pageTitles: - routes: Routes - cmrsList: CMRs list - RouteList: List - routeCreate: New route - basicData: Basic Data - summary: Summary - RouteRoadmap: Roadmaps - RouteRoadmapCreate: Create roadmap - tickets: Tickets - log: Log - autonomous: Autonomous cmr: list: results: results @@ -992,22 +955,6 @@ route: viewCmr: View CMR downloadCmrs: Download CMRs supplier: - pageTitles: - suppliers: Suppliers - supplier: Supplier - list: List - supplierCreate: New supplier - summary: Summary - basicData: Basic data - fiscalData: Fiscal data - billingData: Billing data - log: Log - accounts: Accounts - contacts: Contacts - addresses: Addresses - consumption: Consumption - agencyTerm: Agency agreement - dms: File management list: payMethod: Pay method payDeadline: Pay deadline @@ -1099,15 +1046,6 @@ supplier: date: Date reference: Reference travel: - pageTitles: - travel: Travels - list: List - summary: Summary - extraCommunity: Extra community - travelCreate: New travel - basicData: Basic data - history: Log - thermographs: Thermograph summary: confirmed: Confirmed entryId: Entry Id @@ -1154,24 +1092,6 @@ travel: travelFileDescription: 'Travel id { travelId }' file: File item: - pageTitles: - items: Items - list: List - diary: Diary - tags: Tags - create: Create - buyRequest: Buy requests - fixedPrice: Fixed prices - wasteBreakdown: Waste breakdown - itemCreate: New item - barcode: Barcodes - tax: Tax - log: Log - botanical: Botanical - shelving: Shelving - itemTypeCreate: New item type - family: Item Type - lastEntries: Last entries descriptor: item: Item buyer: Buyer @@ -1257,22 +1177,6 @@ item: minSalesQuantity: 'Cantidad mínima de venta' genus: 'Genus' specie: 'Specie' -item/itemType: - pageTitles: - itemType: Item type - basicData: Basic data - summary: Summary -monitor: - pageTitles: - monitors: Monitors - list: List -zone: - pageTitles: - zones: Zones - zonesList: Zones - deliveryList: Delivery days - upcomingList: Upcoming deliveries - components: topbar: {} itemsFilterPanel: diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml index cfadd57b3..f33cc8543 100644 --- a/src/i18n/locale/es.yml +++ b/src/i18n/locale/es.yml @@ -107,6 +107,120 @@ globals: aliasUsers: Usuarios subRoles: Subroles inheritedRoles: Roles heredados + customers: Clientes + customerCreate: Nuevo cliente + list: Listado + webPayments: Pagos Web + extendedList: Listado extendido + notifications: Notificaciones + defaulter: Morosos + createCustomer: Crear cliente + fiscalData: Datos fiscales + billingData: Forma de pago + consignees: Consignatarios + notes: Notas + credits: Créditos + greuges: Greuges + balance: Balance + recoveries: Recobros + webAccess: Acceso web + sms: Sms + creditManagement: Gestión de crédito + creditContracts: Contratos de crédito + creditOpinion: Opinión de crédito + others: Otros + samples: Plantillas + consumption: Consumo + mandates: Mandatos + contacts: Contactos + webPayment: Pago web + fileManagement: Gestión documental + unpaid: Impago + entries: Entradas + buys: Compras + dms: Gestión documental + entryCreate: Nueva entrada + latestBuys: Últimas compras + tickets: Tickets + ticketCreate: Nuevo ticket + boxing: Encajado + sale: Lineas del pedido + claims: Reclamaciones + claimCreate: Crear reclamación + lines: Líneas + development: Trazabilidad + photos: Fotos + action: Acción + invoiceOuts: Fact. emitidas + negativeBases: Bases Negativas + globalInvoicing: Facturación global + invoiceOutCreate: Crear fact. emitida + order: Cesta + orderList: Listado + orderCreate: Nueva orden + catalog: Catálogo + volume: Volumen + shelving: Carros + shelvingList: Listado de carros + shelvingCreate: Nuevo carro + invoiceIns: Fact. recibidas + invoiceInCreate: Crear fact. recibida + vat: IVA + dueDay: Vencimiento + intrastat: Intrastat + corrective: Rectificativa + workers: Trabajadores + workerCreate: Nuevo trabajador + department: Departamentos + pda: PDA + pbx: Centralita + calendar: Calendario + timeControl: Control de horario + locker: Taquilla + wagons: Vagones + wagonsList: Listado vagones + wagonCreate: Crear tipo + wagonEdit: Editar tipo + typesList: Listado tipos + typeCreate: Crear tipo + typeEdit: Editar tipo + wagonCounter: Contador de carros + roadmap: Troncales + stops: Paradas + routes: Rutas + cmrsList: Listado de CMRs + RouteList: Listado + routeCreate: Nueva ruta + RouteRoadmap: Troncales + RouteRoadmapCreate: Crear troncal + autonomous: Autónomos + suppliers: Proveedores + supplier: Proveedor + supplierCreate: Nuevo proveedor + accounts: Cuentas + addresses: Direcciones + agencyTerm: Acuerdo agencia + travel: Envíos + create: Crear + extraCommunity: Extra comunitarios + travelCreate: Nuevo envío + history: Historial + thermographs: Termógrafos + items: Artículos + diary: Histórico + tags: Etiquetas + fixedPrice: Precios fijados + buyRequest: Peticiones de compra + wasteBreakdown: Deglose de mermas + itemCreate: Nuevo artículo + tax: 'IVA' + botanical: 'Botánico' + barcode: 'Código de barras' + itemTypeCreate: Nueva familia + family: Familia + lastEntries: Últimas entradas + itemType: Familia + monitors: Monitores created: Fecha creación worker: Trabajador now: Ahora @@ -147,39 +261,6 @@ dashboard: pageTitles: dashboard: Tablón customer: - pageTitles: - customers: Clientes - customerCreate: Nuevo cliente - list: Listado - webPayments: Pagos Web - extendedList: Listado extendido - notifications: Notificaciones - defaulter: Morosos - createCustomer: Crear cliente - summary: Resumen - basicData: Datos básicos - fiscalData: Datos fiscales - billingData: Forma de pago - consignees: Consignatarios - notes: Notas - credits: Créditos - greuges: Greuges - balance: Balance - recoveries: Recobros - webAccess: Acceso web - log: Historial - sms: Sms - creditManagement: Gestión de crédito - creditContracts: Contratos de crédito - creditOpinion: Opinión de crédito - others: Otros - samples: Plantillas - consumption: Consumo - mandates: Mandatos - contacts: Contactos - webPayment: Pago web - fileManagement: Gestión documental - unpaid: Impago list: phone: Teléfono email: Email @@ -308,17 +389,6 @@ customer: hasCoreVnl: Recibido core VNL hasSepaVnl: Recibido B2B VNL entry: - pageTitles: - entries: Entradas - list: Listado - summary: Resumen - basicData: Datos básicos - buys: Compras - notes: Notas - dms: Gestión documental - log: Historial - entryCreate: Nueva entrada - latestBuys: Últimas compras list: newEntry: Nueva entrada landed: F. entrega @@ -430,16 +500,6 @@ entry: packingOut: Embalaje envíos landing: Llegada ticket: - pageTitles: - tickets: Tickets - list: Listado - ticketCreate: Nuevo ticket - summary: Resumen - basicData: Datos básicos - boxing: Encajado - sms: Sms - notes: Notas - sale: Lineas del pedido list: nickname: Alias state: Estado @@ -514,18 +574,6 @@ ticket: warehouse: Almacén agency: Agencia claim: - pageTitles: - claims: Reclamaciones - list: Listado - claimCreate: Crear reclamación - summary: Resumen - basicData: Datos básicos - lines: Líneas - development: Trazabilidad - photos: Fotos - log: Historial - notes: Notas - action: Acción list: customer: Cliente assignedTo: Asignada a @@ -589,14 +637,6 @@ claim: noData: No hay imágenes/videos haz click aquí o arrastra y suelta el archivo dragDrop: Arrástralo y sueltalo aquí invoiceOut: - pageTitles: - invoiceOuts: Fact. emitidas - list: Listado - negativeBases: Bases Negativas - globalInvoicing: Facturación global - invoiceOutCreate: Crear fact. emitida - summary: Resumen - basicData: Datos básicos list: ref: Referencia issued: Fecha emisión @@ -664,15 +704,6 @@ invoiceOut: errors: downloadCsvFailed: Error al descargar CSV order: - pageTitles: - order: Cesta - orderList: Listado - orderCreate: Nueva orden - summary: Resumen - basicData: Datos básicos - catalog: Catálogo - volume: Volumen - lines: Líneas field: salesPersonFk: Comercial clientFk: Cliente @@ -714,13 +745,6 @@ order: price: Precio amount: Monto shelving: - pageTitles: - shelving: Carros - shelvingList: Listado de carros - shelvingCreate: Nuevo carro - summary: Resumen - basicData: Datos básicos - log: Historial list: parking: Parking priority: Prioridad @@ -746,17 +770,6 @@ parking: info: Puedes buscar por código de parking label: Buscar parking... invoiceIn: - pageTitles: - invoiceIns: Fact. recibidas - list: Listado - invoiceInCreate: Crear fact. recibida - summary: Resumen - basicData: Datos básicos - vat: IVA - dueDay: Vencimiento - intrastat: Intrastat - corrective: Rectificativa - log: Historial list: ref: Referencia supplier: Proveedor @@ -822,22 +835,6 @@ department: hasToSendMail: Enviar fichadas por mail departmentRemoved: Departamento eliminado worker: - pageTitles: - workers: Trabajadores - list: Listado - basicData: Datos básicos - summary: Resumen - notifications: Notificaciones - workerCreate: Nuevo trabajador - department: Departamentos - pda: PDA - notes: Notas - dms: Mi documentación - pbx: Centralita - log: Historial - calendar: Calendario - timeControl: Control de horario - locker: Taquilla list: name: Nombre email: Email @@ -900,15 +897,6 @@ worker: bankEntity: Swift / BIC imageNotFound: No se ha encontrado la imagen wagon: - pageTitles: - wagons: Vagones - wagonsList: Listado vagones - wagonCreate: Crear tipo - wagonEdit: Editar tipo - typesList: Listado tipos - typeCreate: Crear tipo - typeEdit: Editar tipo - wagonCounter: Contador de carros type: name: Nombre submit: Guardar @@ -937,31 +925,7 @@ wagon: minHeightBetweenTrays: 'La distancia mínima entre bandejas es ' maxWagonHeight: 'La altura máxima del vagón es ' uncompleteTrays: Hay bandejas sin completar -route/roadmap: - pageTitles: - roadmap: Troncales - summary: Resumen - basicData: Datos básicos - stops: Paradas -roadmap: - pageTitles: - roadmap: Troncales - summary: Resumen - basicData: Datos básicos - stops: Paradas route: - pageTitles: - routes: Rutas - cmrsList: Listado de CMRs - RouteList: Listado - routeCreate: Nueva ruta - basicData: Datos básicos - summary: Resumen - RouteRoadmap: Troncales - RouteRoadmapCreate: Crear troncal - tickets: Tickets - log: Historial - autonomous: Autónomos cmr: list: results: resultados @@ -977,22 +941,6 @@ route: viewCmr: Ver CMR downloadCmrs: Descargar CMRs supplier: - pageTitles: - suppliers: Proveedores - supplier: Proveedor - list: Listado - supplierCreate: Nuevo proveedor - summary: Resumen - basicData: Datos básicos - fiscalData: Datos fiscales - billingData: Forma de pago - log: Historial - accounts: Cuentas - contacts: Contactos - addresses: Direcciones - consumption: Consumo - agencyTerm: Acuerdo agencia - dms: Gestión documental list: payMethod: Método de pago payDeadline: Plazo de pago @@ -1084,16 +1032,6 @@ supplier: date: Fecha reference: Referencia travel: - pageTitles: - travel: Envíos - list: Listado - create: Crear - summary: Resumen - extraCommunity: Extra comunitarios - travelCreate: Nuevo envío - basicData: Datos básicos - history: Historial - thermographs: Termógrafos summary: confirmed: Confirmado entryId: Id entrada @@ -1140,24 +1078,6 @@ travel: travelFileDescription: 'Id envío { travelId }' file: Fichero item: - pageTitles: - items: Artículos - list: Listado - diary: Histórico - tags: Etiquetas - fixedPrice: Precios fijados - buyRequest: Peticiones de compra - wasteBreakdown: Deglose de mermas - itemCreate: Nuevo artículo - basicData: 'Datos básicos' - tax: 'IVA' - botanical: 'Botánico' - barcode: 'Código de barras' - log: Historial - shelving: Carros - itemTypeCreate: Nueva familia - family: Familia - lastEntries: Últimas entradas descriptor: item: Artículo buyer: Comprador @@ -1243,27 +1163,6 @@ item: achieved: 'Conseguido' concept: 'Concepto' state: 'Estado' -item/itemType: - pageTitles: - itemType: Familia - basicData: Datos básicos - summary: Resumen -zone: - pageTitles: - zones: Zonas - list: Zonas - deliveryList: Días de entrega - upcomingList: Próximos repartos -role: - pageTitles: - zones: Zonas - list: Zonas - deliveryList: Días de entrega - upcomingList: Próximos repartos -monitor: - pageTitles: - monitors: Monitores - list: Listado components: topbar: {} itemsFilterPanel: From 42c58296acea1071ed890092b2acade504d50319 Mon Sep 17 00:00:00 2001 From: Jon Date: Wed, 19 Jun 2024 08:44:40 +0200 Subject: [PATCH 02/33] refafctor: changed titles errors --- src/components/common/VnBreadcrumbs.vue | 1 - src/i18n/locale/en.yml | 8 +++++--- src/i18n/locale/es.yml | 8 +++++--- src/pages/Claim/Card/ClaimSummary.vue | 2 +- src/pages/InvoiceIn/Card/InvoiceInSummary.vue | 8 ++++---- src/pages/Travel/Card/TravelSummary.vue | 8 ++++---- src/pages/Travel/ExtraCommunity.vue | 2 +- src/pages/Travel/ExtraCommunityFilter.vue | 2 +- src/router/index.js | 7 ++----- src/router/modules/item.js | 9 --------- src/stores/useNavigationStore.js | 4 ++-- 11 files changed, 25 insertions(+), 34 deletions(-) diff --git a/src/components/common/VnBreadcrumbs.vue b/src/components/common/VnBreadcrumbs.vue index 75fd6d499..337507233 100644 --- a/src/components/common/VnBreadcrumbs.vue +++ b/src/components/common/VnBreadcrumbs.vue @@ -37,7 +37,6 @@ function getBreadcrumb(param) { locale: t(`globals.pageTitles.${param.meta.title}`), }; - //TODO modificar para que funcione títulos de página if (screen.gt.sm) { breadcrumb.name = param.name; breadcrumb.title = useCamelCase(param.meta.title); diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml index 9bf272d61..3cf929f82 100644 --- a/src/i18n/locale/en.yml +++ b/src/i18n/locale/en.yml @@ -100,8 +100,8 @@ globals: modes: Modes zones: Zones zonesList: Zones - deliveryList: Delivery days - upcomingList: Upcoming deliveries + deliveryDays: Delivery days + upcomingDeliveries: Upcoming deliveries role: Role alias: Alias aliasUsers: Users @@ -220,6 +220,8 @@ globals: lastEntries: Last entries itemType: Item type monitors: Monitors + dashboard: Dashboard + users: Users created: Created worker: Worker now: Now @@ -260,7 +262,7 @@ verifyEmail: verifyEmail: Email verification dashboard: pageTitles: - dashboard: Dashboard + customer: list: phone: Phone diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml index f33cc8543..2b4498ced 100644 --- a/src/i18n/locale/es.yml +++ b/src/i18n/locale/es.yml @@ -100,8 +100,8 @@ globals: modes: Modos zones: Zonas zonesList: Zonas - deliveryList: Días de entrega - upcomingList: Próximos repartos + deliveryDays: Días de entrega + upcomingDeliveries: Próximos repartos role: Role alias: Alias aliasUsers: Usuarios @@ -221,6 +221,8 @@ globals: lastEntries: Últimas entradas itemType: Familia monitors: Monitores + dashboard: Tablón + users: Usuarios created: Fecha creación worker: Trabajador now: Ahora @@ -259,7 +261,7 @@ verifyEmail: verifyEmail: Verificación de correo dashboard: pageTitles: - dashboard: Tablón + customer: list: phone: Teléfono diff --git a/src/pages/Claim/Card/ClaimSummary.vue b/src/pages/Claim/Card/ClaimSummary.vue index 36a26008e..241709bdd 100644 --- a/src/pages/Claim/Card/ClaimSummary.vue +++ b/src/pages/Claim/Card/ClaimSummary.vue @@ -223,7 +223,7 @@ async function changeState(value) { `#/invoice-in/${entityId.value}/${param}`; `#/invoice-in/${entityId.value}/${param}`; `#/invoice-in/${entityId.value}/${param}`; `#/invoice-in/${entityId.value}/${param}`; diff --git a/src/pages/Travel/Card/TravelSummary.vue b/src/pages/Travel/Card/TravelSummary.vue index 91b36f0cf..f0785cff1 100644 --- a/src/pages/Travel/Card/TravelSummary.vue +++ b/src/pages/Travel/Card/TravelSummary.vue @@ -49,7 +49,7 @@ const entriesTableColumns = computed(() => { showValue: false, }, { - label: t('supplier.pageTitles.supplier'), + label: t('globals.pageTitles.supplier'), field: 'supplierName', name: 'supplierName', align: 'left', @@ -247,7 +247,7 @@ const getLink = (param) => `#/travel/${entityId.value}/${param}`; @@ -265,7 +265,7 @@ const getLink = (param) => `#/travel/${entityId.value}/${param}`; @@ -283,7 +283,7 @@ const getLink = (param) => `#/travel/${entityId.value}/${param}`; diff --git a/src/pages/Travel/ExtraCommunity.vue b/src/pages/Travel/ExtraCommunity.vue index 607ecb560..eb410a489 100644 --- a/src/pages/Travel/ExtraCommunity.vue +++ b/src/pages/Travel/ExtraCommunity.vue @@ -132,7 +132,7 @@ const columns = computed(() => [ sortable: true, }, { - label: t('supplier.pageTitles.supplier'), + label: t('globals.pageTitles.supplier'), field: 'cargoSupplierNickname', name: 'cargoSupplierNickname', align: 'left', diff --git a/src/pages/Travel/ExtraCommunityFilter.vue b/src/pages/Travel/ExtraCommunityFilter.vue index 7fe628180..5f9adedfa 100644 --- a/src/pages/Travel/ExtraCommunityFilter.vue +++ b/src/pages/Travel/ExtraCommunityFilter.vue @@ -182,7 +182,7 @@ const decrement = (paramsObj, key) => { 1) { const module = matches[1]; const moduleTitle = module.meta && module.meta.title; - moduleName = toLowerCamel(module.name); if (moduleTitle) { - title = t(`${moduleName}.pageTitles.${moduleTitle}`); + title = t(`globals.pageTitles.${moduleTitle}`); } } @@ -94,7 +91,7 @@ export default route(function (/* { store, ssrContext } */) { if (childPageTitle && matches.length > 2) { if (title != '') title += ': '; - const moduleLocale = `${moduleName}.pageTitles.${childPageTitle}`; + const moduleLocale = `globals.pageTitles.${childPageTitle}`; const pageTitle = te(moduleLocale) ? t(moduleLocale) : t(`globals.pageTitles.${childPageTitle}`); diff --git a/src/router/modules/item.js b/src/router/modules/item.js index 6e8659747..06fe680eb 100644 --- a/src/router/modules/item.js +++ b/src/router/modules/item.js @@ -201,15 +201,6 @@ export default { }, component: () => import('src/pages/Item/Card/ItemLog.vue'), }, - { - path: 'botanical', - name: 'ItemBotanical', - meta: { - title: 'botanical', - icon: 'vn:botanical', - }, - component: () => import('src/pages/Item/Card/ItemBotanical.vue'), - }, ], }, ], diff --git a/src/stores/useNavigationStore.js b/src/stores/useNavigationStore.js index 4dd5ed2ae..51f266800 100644 --- a/src/stores/useNavigationStore.js +++ b/src/stores/useNavigationStore.js @@ -60,7 +60,7 @@ export const useNavigationStore = defineStore('navigationStore', () => { menuChildren = menuChildren.map(({ name, title, icon }) => ({ name, icon, - title: `${module}.pageTitles.${title}`, + title: `globals.pageTitles.${title}`, })); if (meta && meta.roles && role.hasAny(meta.roles) === false) return; @@ -70,7 +70,7 @@ export const useNavigationStore = defineStore('navigationStore', () => { children: menuChildren, }; if (meta) { - item.title = `${module}.pageTitles.${meta.title}`; + item.title = `globals.pageTitles.${meta.title}`; item.icon = meta.icon; } From 5712b4789a9a5ac07b8d355cf40930d66afbe01a Mon Sep 17 00:00:00 2001 From: Jon Date: Wed, 19 Jun 2024 08:47:14 +0200 Subject: [PATCH 03/33] fix: leftMenu test --- test/vitest/__tests__/components/Leftmenu.spec.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/vitest/__tests__/components/Leftmenu.spec.js b/test/vitest/__tests__/components/Leftmenu.spec.js index ea1c51f8d..10d9d66fb 100644 --- a/test/vitest/__tests__/components/Leftmenu.spec.js +++ b/test/vitest/__tests__/components/Leftmenu.spec.js @@ -78,13 +78,13 @@ describe('Leftmenu', () => { { children: null, name: 'CustomerList', - title: 'customer.pageTitles.list', + title: 'globals.pageTitles.list', icon: 'view_list', }, { children: null, name: 'CustomerCreate', - title: 'customer.pageTitles.createCustomer', + title: 'globals.pageTitles.createCustomer', icon: 'vn:addperson', }, ]; From ec6b54cf13c93729d2d337e25159a098417b6de3 Mon Sep 17 00:00:00 2001 From: Jon Date: Wed, 19 Jun 2024 08:55:03 +0200 Subject: [PATCH 04/33] refactor: refs #7030 shelving translation --- src/pages/Shelving/Card/ShelvingSummary.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/Shelving/Card/ShelvingSummary.vue b/src/pages/Shelving/Card/ShelvingSummary.vue index 168552832..05ff55292 100644 --- a/src/pages/Shelving/Card/ShelvingSummary.vue +++ b/src/pages/Shelving/Card/ShelvingSummary.vue @@ -46,7 +46,7 @@ const filter = { class="header header-link" :to="{ name: 'ShelvingBasicData', params: { id: entityId } }" > - {{ t('shelving.pageTitles.basicData') }} + {{ t('globals.pageTitles.basicData') }} From 381a9c6d1d82d3d0c82e88ab674fc53ac5eeaabb Mon Sep 17 00:00:00 2001 From: alexm Date: Thu, 27 Jun 2024 13:56:20 +0200 Subject: [PATCH 05/33] feat: remake vnInputDate and fix: FormModel has changes when error --- src/components/FormModel.vue | 10 +- src/components/common/VnInputDate.vue | 150 +++++++++++++------------- 2 files changed, 78 insertions(+), 82 deletions(-) diff --git a/src/components/FormModel.vue b/src/components/FormModel.vue index f10dee61a..ab9fa921a 100644 --- a/src/components/FormModel.vue +++ b/src/components/FormModel.vue @@ -90,7 +90,7 @@ const $props = defineProps({ }); const emit = defineEmits(['onFetch', 'onDataSaved']); const modelValue = computed( - () => $props.model ?? `formModel_${route?.meta?.title ?? route.name}` + () => $props.model ?? `formModel_${route?.meta?.title ?? route.name}`, ).value; const componentIsRendered = ref(false); const arrayData = useArrayData(modelValue); @@ -137,7 +137,7 @@ onMounted(async () => { JSON.stringify(newVal) !== JSON.stringify(originalData.value); isResetting.value = false; }, - { deep: true } + { deep: true }, ); } }); @@ -145,7 +145,7 @@ onMounted(async () => { if (!$props.url) watch( () => arrayData.store.data, - (val) => updateAndEmit('onFetch', val) + (val) => updateAndEmit('onFetch', val), ); watch(formUrl, async () => { @@ -206,11 +206,11 @@ async function save() { updateAndEmit('onDataSaved', formData.value, response?.data); if ($props.reload) await arrayData.fetch({}); + hasChanges.value = false; } catch (err) { console.error(err); notify('errors.writeRequest', 'negative'); } finally { - hasChanges.value = false; isLoading.value = false; } } @@ -239,7 +239,7 @@ function filter(value, update, filterOptions) { (ref) => { ref.setOptionIndex(-1); ref.moveOptionSelection(1, true); - } + }, ); } diff --git a/src/components/common/VnInputDate.vue b/src/components/common/VnInputDate.vue index 77ab2692d..f2c6cbe60 100644 --- a/src/components/common/VnInputDate.vue +++ b/src/components/common/VnInputDate.vue @@ -1,13 +1,10 @@ From ec5eeaa30831e09f261e8d61b44665599cb1c497 Mon Sep 17 00:00:00 2001 From: Jon Date: Fri, 28 Jun 2024 10:14:24 +0200 Subject: [PATCH 06/33] fix: refs #6151 fixed filters and styles --- src/pages/Order/Card/OrderCard.vue | 9 ++---- src/pages/Order/Card/OrderCatalogFilter.vue | 35 ++++++--------------- src/pages/Order/Card/OrderCatalogItem.vue | 2 +- src/pages/Order/Card/OrderSummary.vue | 24 +++++++++----- src/pages/Order/OrderCatalog.vue | 1 + src/pages/Order/OrderList.vue | 8 +++-- 6 files changed, 38 insertions(+), 41 deletions(-) diff --git a/src/pages/Order/Card/OrderCard.vue b/src/pages/Order/Card/OrderCard.vue index 5b6896656..12b61e913 100644 --- a/src/pages/Order/Card/OrderCard.vue +++ b/src/pages/Order/Card/OrderCard.vue @@ -2,7 +2,6 @@ import VnCard from 'components/common/VnCard.vue'; import OrderDescriptor from 'pages/Order/Card/OrderDescriptor.vue'; import OrderFilter from './OrderFilter.vue'; -import OrderSearchbar from './OrderSearchbar.vue'; diff --git a/src/pages/Order/Card/OrderCatalogFilter.vue b/src/pages/Order/Card/OrderCatalogFilter.vue index fd5300122..c354ec94b 100644 --- a/src/pages/Order/Card/OrderCatalogFilter.vue +++ b/src/pages/Order/Card/OrderCatalogFilter.vue @@ -37,6 +37,10 @@ const selectedOrder = ref(null); const selectedOrderField = ref(null); const moreFields = ref([]); const moreFieldsOrder = ref([]); +const selectedTag = ref(null); +const tagValues = ref([{}]); +const tagOptions = ref([]); + const createValue = (val, done) => { if (val.length > 2) { if (!tagOptions.value.includes(val)) { @@ -95,10 +99,6 @@ function exprBuilder(param, value) { } } -const selectedTag = ref(null); -const tagValues = ref([{}]); -const tagOptions = ref([]); - const applyTagFilter = (params, search) => { if (!tagValues.value?.length) { params.tagGroups = null; @@ -139,39 +139,23 @@ const onOrderChange = (value, params) => { }; const onOrderFieldChange = (value, params) => { - const tagObj = JSON.parse(params.orderBy); // esto donde va - const fields = { - Relevancy: (value) => value + ' DESC, name', - ColorAndPrice: 'showOrder, price', - Name: 'name', - Price: 'price', - }; - let tagField = fields[value]; - if (!tagField) return; - - if (typeof tagField === 'function') tagField = tagField(value); - tagObj.field = tagField; - params.orderBy = JSON.stringify(tagObj); + const tagObj = JSON.parse(params.orderBy); switch (value) { case 'Relevancy': - tagObj.field = value + ' DESC, name'; + tagObj.name = value + ' DESC, name'; params.orderBy = JSON.stringify(tagObj); - console.log('params: ', params); break; case 'ColorAndPrice': - tagObj.field = 'showOrder, price'; + tagObj.name = 'showOrder, price'; params.orderBy = JSON.stringify(tagObj); - console.log('params: ', params); break; case 'Name': - tagObj.field = 'name'; + tagObj.name = 'name'; params.orderBy = JSON.stringify(tagObj); - console.log('params: ', params); break; case 'Price': - tagObj.field = 'price'; + tagObj.name = 'price'; params.orderBy = JSON.stringify(tagObj); - console.log('params: ', params); break; } }; @@ -312,6 +296,7 @@ const useLang = (values) => { v-model="selectedOrder" :options="moreFields" option-label="label" + option-value="way" dense outlined rounded diff --git a/src/pages/Order/Card/OrderCatalogItem.vue b/src/pages/Order/Card/OrderCatalogItem.vue index 34e22915d..8fa0bb5b9 100644 --- a/src/pages/Order/Card/OrderCatalogItem.vue +++ b/src/pages/Order/Card/OrderCatalogItem.vue @@ -27,7 +27,7 @@ const dialog = ref(null);
- +