From a40da6b5d9505e3f4cb0b70d26dd0f0ae239cb23 Mon Sep 17 00:00:00 2001
From: provira <provira@verdnatura.es>
Date: Fri, 3 Jan 2025 12:51:26 +0100
Subject: [PATCH 1/2] fix: refs #8338 fixed VnTable translations

---
 src/components/VnTable/VnTableFilter.vue |  4 ++--
 src/components/ui/VnFilterPanel.vue      |  2 +-
 src/i18n/locale/en.yml                   | 10 ++++++++++
 src/i18n/locale/es.yml                   | 10 ++++++++++
 src/pages/Account/locale/en.yml          | 14 ++++++++++++++
 src/pages/Account/locale/es.yml          | 16 ++++++++++++++++
 src/pages/Entry/locale/en.yml            |  8 ++++++++
 src/pages/Entry/locale/es.yml            |  8 ++++++++
 src/pages/InvoiceOut/locale/en.yml       | 12 ++++++++++++
 src/pages/InvoiceOut/locale/es.yml       | 12 ++++++++++++
 10 files changed, 93 insertions(+), 3 deletions(-)

diff --git a/src/components/VnTable/VnTableFilter.vue b/src/components/VnTable/VnTableFilter.vue
index f23c657cf..f792909a6 100644
--- a/src/components/VnTable/VnTableFilter.vue
+++ b/src/components/VnTable/VnTableFilter.vue
@@ -62,9 +62,9 @@ function columnName(col) {
                 :columns="columns"
             />
         </template>
-        <template #tags="{ tag, formatFn }" v-if="chipLocale">
+        <template #tags="{ tag, formatFn, getLocale }">
             <div class="q-gutter-x-xs">
-                <strong>{{ t(`${chipLocale}.${tag.label}`) }}: </strong>
+                <strong>{{ getLocale(`${tag.label}`) }}: </strong>
                 <span>{{ formatFn(tag.value) }}</span>
             </div>
         </template>
diff --git a/src/components/ui/VnFilterPanel.vue b/src/components/ui/VnFilterPanel.vue
index 46c43356f..aba797678 100644
--- a/src/components/ui/VnFilterPanel.vue
+++ b/src/components/ui/VnFilterPanel.vue
@@ -190,7 +190,7 @@ const getLocale = (label) => {
     const globalLocale = `globals.params.${param}`;
     if (te(globalLocale)) return t(globalLocale);
     else if (te(t(`params.${param}`)));
-    else return t(`${route.meta.moduleName}.params.${param}`);
+    else return t(`${route.meta.moduleName.toLowerCase()}.params.${param}`);
 };
 </script>
 
diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index 33829d98d..023f8da4b 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -456,6 +456,11 @@ entry:
             landing: Landing
             isExcludedFromAvailable: Es inventory
 ticket:
+    params:
+        ticketFk: Ticket ID
+        weekDay: Weekday
+        agencyModeFk: Agency
+        id: Worker
     card:
         customerId: Customer ID
         customerCard: Customer card
@@ -697,6 +702,11 @@ wagon:
         minHeightBetweenTrays: 'The minimum height between trays is '
         maxWagonHeight: 'The maximum height of the wagon is '
         uncompleteTrays: There are incomplete trays
+    params:
+        label: Label
+        plate: Plate
+        volume: Volume
+        name: Name
 
 supplier:
     list:
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index f0cbe3543..139486e03 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -457,6 +457,11 @@ entry:
             landing: Llegada
             isExcludedFromAvailable: Es inventario
 ticket:
+    params:
+        ticketFk: ID de ticket
+        weekDay: Salida
+        agencyModeFk: Agencia
+        id: Comercial
     card:
         customerId: ID cliente
         customerCard: Ficha del cliente
@@ -700,6 +705,11 @@ wagon:
         minHeightBetweenTrays: 'La distancia mínima entre bandejas es '
         maxWagonHeight: 'La altura máxima del vagón es '
         uncompleteTrays: Hay bandejas sin completar
+    params:
+        label: Etiqueta
+        plate: Matrícula
+        volume: Volumen
+        name: Nombre
 supplier:
     list:
         payMethod: Método de pago
diff --git a/src/pages/Account/locale/en.yml b/src/pages/Account/locale/en.yml
index 88a6b11e9..1826250fd 100644
--- a/src/pages/Account/locale/en.yml
+++ b/src/pages/Account/locale/en.yml
@@ -1,4 +1,18 @@
 account:
+    params:
+        id: Id
+        name: Name
+        roleFk: Role
+        nickname: Nickname
+        password: Password
+        active: Active
+        search: Id
+        description: Description
+        alias: Alias
+        model: Model
+        principalId: Role
+        property: Property
+        accessType: Access
     card:
         nickname: User
         role: Role
diff --git a/src/pages/Account/locale/es.yml b/src/pages/Account/locale/es.yml
index ba559f2c3..941a9948f 100644
--- a/src/pages/Account/locale/es.yml
+++ b/src/pages/Account/locale/es.yml
@@ -1,4 +1,20 @@
+accessType: Acceso
+property: Propiedad
 account:
+    params:
+        id: Id
+        name: Nombre
+        roleFk: Rol
+        nickname: Nickname
+        password: Contraseña
+        active: Activo
+        search: Id
+        description: Descripción
+        alias: Alias
+        model: Modelo
+        principalId: Rol
+        property: Propiedad
+        accessType: Acceso
     card:
         nickname: Usuario
         role: Rol
diff --git a/src/pages/Entry/locale/en.yml b/src/pages/Entry/locale/en.yml
index cd5113d84..68cc9caa7 100644
--- a/src/pages/Entry/locale/en.yml
+++ b/src/pages/Entry/locale/en.yml
@@ -19,3 +19,11 @@ myEntries:
     daysAgo: Days ago
 wasteRecalc:
     recalcOk: The wastes were successfully recalculated
+entry:
+    params:
+        toShipped: To
+        fromShipped: From
+        warehouseiNFk: Warehouse
+        daysOnward: Days onward
+        daysAgo: Days ago
+        
\ No newline at end of file
diff --git a/src/pages/Entry/locale/es.yml b/src/pages/Entry/locale/es.yml
index 3007c5d44..cc9a4ff7b 100644
--- a/src/pages/Entry/locale/es.yml
+++ b/src/pages/Entry/locale/es.yml
@@ -22,3 +22,11 @@ myEntries:
     daysAgo: Días atras
 wasteRecalc:
     recalcOk: Se han recalculado las mermas correctamente
+entry:
+    params:
+        toShipped: Hasta
+        fromShipped: Desde
+        warehouseInFk: Alm. entrada
+        daysOnward: Días adelante
+        daysAgo: Días atras
+        
\ No newline at end of file
diff --git a/src/pages/InvoiceOut/locale/en.yml b/src/pages/InvoiceOut/locale/en.yml
index 8cefe8bdc..51502f00d 100644
--- a/src/pages/InvoiceOut/locale/en.yml
+++ b/src/pages/InvoiceOut/locale/en.yml
@@ -24,3 +24,15 @@ negativeBases:
     hasToInvoice: Has to invoice
     verifiedData: Verified data
     commercial: Commercial
+invoiceout:
+    params:
+        company: Company
+        country: Country
+        clientId: Client ID
+        clientSocialName: Client
+        taxableBase: Base
+        ticketFk: Ticket
+        isActive: Active
+        hasToInvoice: Has to invoice
+        hasVerifiedData: Verified data
+        workerName: Worker
\ No newline at end of file
diff --git a/src/pages/InvoiceOut/locale/es.yml b/src/pages/InvoiceOut/locale/es.yml
index 106168a5d..c448f6068 100644
--- a/src/pages/InvoiceOut/locale/es.yml
+++ b/src/pages/InvoiceOut/locale/es.yml
@@ -27,3 +27,15 @@ negativeBases:
     hasToInvoice: Debe facturar
     verifiedData: Datos verificados
     commercial: Comercial
+invoiceout:
+    params:
+        company: Empresa
+        country: País
+        clientId: ID del cliente
+        clientSocialName: Cliente
+        taxableBase: Base
+        ticketFk: Ticket
+        isActive: Activo
+        hasToInvoice: Debe facturar
+        hasVerifiedData: Datos verificados
+        workerName: Comercial
\ No newline at end of file

From 07222f9fb88577594b31fbbfb8c71d543f4ba1b2 Mon Sep 17 00:00:00 2001
From: provira <provira@verdnatura.es>
Date: Tue, 7 Jan 2025 11:43:39 +0100
Subject: [PATCH 2/2] fix: refs #8338 removed chipLocale property/added more
 translations

---
 src/components/VnTable/VnTableFilter.vue |  6 ------
 src/pages/Customer/locale/en.yml         |  9 +++++++++
 src/pages/Customer/locale/es.yml         |  9 +++++++++
 src/pages/Route/Agency/locale/es.yml     |  1 +
 src/pages/Route/locale/es.yml            | 14 ++++++++++++++
 5 files changed, 33 insertions(+), 6 deletions(-)

diff --git a/src/components/VnTable/VnTableFilter.vue b/src/components/VnTable/VnTableFilter.vue
index f792909a6..8632842f4 100644
--- a/src/components/VnTable/VnTableFilter.vue
+++ b/src/components/VnTable/VnTableFilter.vue
@@ -1,6 +1,5 @@
 <script setup>
 import { ref } from 'vue';
-import { useI18n } from 'vue-i18n';
 
 import VnFilterPanel from 'components/ui/VnFilterPanel.vue';
 import VnFilter from 'components/VnTable/VnFilter.vue';
@@ -11,16 +10,11 @@ defineProps({
         type: Array,
         required: true,
     },
-    chipLocale: {
-        type: String,
-        default: null,
-    },
     searchUrl: {
         type: [String, Boolean],
         default: 'table',
     },
 });
-const { t } = useI18n();
 
 const tableFilterRef = ref([]);
 
diff --git a/src/pages/Customer/locale/en.yml b/src/pages/Customer/locale/en.yml
index 18cee7309..1d2497ded 100644
--- a/src/pages/Customer/locale/en.yml
+++ b/src/pages/Customer/locale/en.yml
@@ -94,3 +94,12 @@ customer:
             hasToInvoiceByAddress: Invoice by address
             isToBeMailed: Mailing
             hasSepaVnl: VNL B2B received
+    params:
+        isWorker: Is Worker
+        payMethod: Payment Method
+        workerFk: Author
+        observation: Last Observation
+        created: Last Update Date
+        creditInsurance: Credit Insurance
+        defaulterSinced: Defaulted Since
+        hasRecovery: Has Recovery
\ No newline at end of file
diff --git a/src/pages/Customer/locale/es.yml b/src/pages/Customer/locale/es.yml
index b544f8ad7..1b56f6805 100644
--- a/src/pages/Customer/locale/es.yml
+++ b/src/pages/Customer/locale/es.yml
@@ -96,3 +96,12 @@ customer:
             hasToInvoiceByAddress: Factura por consigna
             isToBeMailed: Env. emails
             hasSepaVnl: Recibido B2B VNL
+    params:
+        isWorker: Es trabajador
+        payMethod: F. Pago
+        workerFk: Autor
+        observation: Última observación
+        created: Fecha Ú. O.
+        creditInsurance: Crédito A.
+        defaulterSinced: Desde
+        hasRecovery: Tiene recobro
\ No newline at end of file
diff --git a/src/pages/Route/Agency/locale/es.yml b/src/pages/Route/Agency/locale/es.yml
index 2607472bd..5c594a41d 100644
--- a/src/pages/Route/Agency/locale/es.yml
+++ b/src/pages/Route/Agency/locale/es.yml
@@ -10,3 +10,4 @@ agency:
     searchBar:
         info: Puedes buscar por nombre o id
         label: Buscar agencia...
+
diff --git a/src/pages/Route/locale/es.yml b/src/pages/Route/locale/es.yml
index a6ba4f370..b6f42bd5a 100644
--- a/src/pages/Route/locale/es.yml
+++ b/src/pages/Route/locale/es.yml
@@ -1,4 +1,18 @@
 route:
+    params:
+        agencyModeName: Agencia Ruta
+        agencyAgreement: Agencia Acuerdo
+        id: Id
+        name: Troncal
+        etd: ETD
+        tractorPlate: Matrícula
+        price: Precio
+        observations: Observaciones
+        cmrFk: Id CMR
+        hasCmrDms: Gestdoc
+        ticketFk: Id ticket
+        routeFK: Id ruta
+        shipped: Fecha preparación
     Worker: Trabajador
     Agency: Agencia
     Vehicle: Vehículo