From 9b9ac4dfe11cc2e503865e479988050503c91a1d Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Tue, 2 Jan 2024 08:47:38 -0300
Subject: [PATCH] PR fixes

---
 src/components/CreateBankEntityForm.vue  | 24 +++---------------------
 src/components/CreateNewCityForm.vue     | 18 ++----------------
 src/components/CreateNewPostcodeForm.vue | 18 ++----------------
 src/components/CreateNewProvinceForm.vue | 18 ++----------------
 src/composables/useArrayData.js          |  4 +---
 src/css/app.scss                         | 13 +++++++++++++
 src/i18n/en/index.js                     |  9 ++++-----
 src/i18n/es/index.js                     |  9 ++++-----
 8 files changed, 31 insertions(+), 82 deletions(-)

diff --git a/src/components/CreateBankEntityForm.vue b/src/components/CreateBankEntityForm.vue
index 3de4bed63..9fb12e95c 100644
--- a/src/components/CreateBankEntityForm.vue
+++ b/src/components/CreateBankEntityForm.vue
@@ -26,10 +26,6 @@ const closeButton = ref(null);
 const countriesOptions = ref([]);
 const loading = ref(false);
 
-const setCountriesOptions = (data) => {
-    countriesOptions.value = data;
-};
-
 const onDataSaved = (data) => {
     emit('onDataSaved', data);
     closeForm();
@@ -43,9 +39,9 @@ const closeForm = () => {
 <template>
     <FetchData
         url="Countries"
-        @on-fetch="(data) => setCountriesOptions(data)"
         :filter="countriesFilter"
         auto-load
+        @on-fetch="(data) => (countriesOptions = data)"
     />
     <FormModel
         :form-initial-data="bankEntityFormData"
@@ -56,10 +52,10 @@ const closeForm = () => {
         @on-data-saved="onDataSaved($event)"
     >
         <template #form="{ data, validate }">
-            <span ref="closeButton" class="close-icon" v-close-popup>
+            <span ref="closeButton" class="popup-form-close-button" v-close-popup>
                 <QIcon name="close" size="sm" />
             </span>
-            <h1 class="title">{{ t('title') }}</h1>
+            <h1 class="popup-form-title">{{ t('title') }}</h1>
             <p class="q-mb-md">{{ t('subtitle') }}</p>
             <VnRow class="row q-gutter-md q-mb-md">
                 <div class="col">
@@ -116,20 +112,6 @@ const closeForm = () => {
     </FormModel>
 </template>
 
-<style lang="scss" scoped>
-.close-icon {
-    position: absolute;
-    top: 20px;
-    right: 20px;
-    cursor: pointer;
-}
-.title {
-    font-size: 17px;
-    font-weight: bold;
-    line-height: 20px;
-}
-</style>
-
 <i18n>
 en:
     title: New bank entity
diff --git a/src/components/CreateNewCityForm.vue b/src/components/CreateNewCityForm.vue
index f3d6e4509..7ff2ee4f0 100644
--- a/src/components/CreateNewCityForm.vue
+++ b/src/components/CreateNewCityForm.vue
@@ -46,10 +46,10 @@ const closeForm = () => {
         @on-data-saved="onDataSaved()"
     >
         <template #form="{ data, validate }">
-            <span ref="closeButton" class="close-icon" v-close-popup>
+            <span ref="closeButton" class="popup-form-close-button" v-close-popup>
                 <QIcon name="close" size="sm" />
             </span>
-            <h1 class="title">{{ t('New city') }}</h1>
+            <h1 class="popup-form-title">{{ t('New city') }}</h1>
             <p>{{ t('Please, ensure you put the correct data!') }}</p>
             <VnRow class="row q-gutter-md q-mb-md">
                 <div class="col">
@@ -94,20 +94,6 @@ const closeForm = () => {
     </FormModel>
 </template>
 
-<style lang="scss" scoped>
-.close-icon {
-    position: absolute;
-    top: 20px;
-    right: 20px;
-    cursor: pointer;
-}
-.title {
-    font-size: 17px;
-    font-weight: bold;
-    line-height: 20px;
-}
-</style>
-
 <i18n>
 es:
     New city: Nueva ciudad
diff --git a/src/components/CreateNewPostcodeForm.vue b/src/components/CreateNewPostcodeForm.vue
index 18582cd49..0991e728b 100644
--- a/src/components/CreateNewPostcodeForm.vue
+++ b/src/components/CreateNewPostcodeForm.vue
@@ -75,10 +75,10 @@ const closeForm = () => {
         @on-data-saved="onDataSaved()"
     >
         <template #form="{ data, validate }">
-            <span ref="closeButton" class="close-icon" v-close-popup>
+            <span ref="closeButton" class="popup-form-close-button" v-close-popup>
                 <QIcon name="close" size="sm" />
             </span>
-            <h1 class="title">{{ t('New postcode') }}</h1>
+            <h1 class="popup-form-title">{{ t('New postcode') }}</h1>
             <p>{{ t('Please, ensure you put the correct data!') }}</p>
             <VnRow class="row q-gutter-md q-mb-md">
                 <div class="col">
@@ -159,20 +159,6 @@ const closeForm = () => {
     </FormModel>
 </template>
 
-<style lang="scss" scoped>
-.close-icon {
-    position: absolute;
-    top: 20px;
-    right: 20px;
-    cursor: pointer;
-}
-.title {
-    font-size: 17px;
-    font-weight: bold;
-    line-height: 20px;
-}
-</style>
-
 <i18n>
 es:
     New postcode: Nuevo código postal
diff --git a/src/components/CreateNewProvinceForm.vue b/src/components/CreateNewProvinceForm.vue
index 3aea81596..c2f78c1f5 100644
--- a/src/components/CreateNewProvinceForm.vue
+++ b/src/components/CreateNewProvinceForm.vue
@@ -46,10 +46,10 @@ const closeForm = () => {
         @on-data-saved="onDataSaved()"
     >
         <template #form="{ data, validate }">
-            <span ref="closeButton" class="close-icon" v-close-popup>
+            <span ref="closeButton" class="popup-form-close-button" v-close-popup>
                 <QIcon name="close" size="sm" />
             </span>
-            <h1 class="title">{{ t('New province') }}</h1>
+            <h1 class="popup-form-title">{{ t('New province') }}</h1>
             <p>{{ t('Please, ensure you put the correct data!') }}</p>
             <VnRow class="row q-gutter-md q-mb-md">
                 <div class="col">
@@ -95,20 +95,6 @@ const closeForm = () => {
     </FormModel>
 </template>
 
-<style lang="scss" scoped>
-.close-icon {
-    position: absolute;
-    top: 20px;
-    right: 20px;
-    cursor: pointer;
-}
-.title {
-    font-size: 17px;
-    font-weight: bold;
-    line-height: 20px;
-}
-</style>
-
 <i18n>
 es:
     New postcode: Nuevo código postal
diff --git a/src/composables/useArrayData.js b/src/composables/useArrayData.js
index 5e80949f3..9f0be6b1d 100644
--- a/src/composables/useArrayData.js
+++ b/src/composables/useArrayData.js
@@ -156,9 +156,7 @@ export function useArrayData(key, userOptions) {
                 delete store.userParams[param];
                 delete params[param];
                 if (store.filter?.where) {
-                    delete store.filter.where[
-                        Object.keys(exprBuilder ? exprBuilder(param) : param)[0]
-                    ];
+                    delete store.filter.where[Object.keys(exprBuilder ? exprBuilder(param) : param)[0]];
                     if (Object.keys(store.filter.where).length === 0) {
                         delete store.filter.where;
                     }
diff --git a/src/css/app.scss b/src/css/app.scss
index 02d4f8946..0f1b4673a 100644
--- a/src/css/app.scss
+++ b/src/css/app.scss
@@ -53,3 +53,16 @@ body.body--dark {
     color: var(--vn-text);
     border-radius: 8px;
 }
+
+.popup-form-title {
+    font-size: 17px;
+    font-weight: bold;
+    line-height: 20px;
+}
+
+.popup-form-close-button {
+    position: absolute;
+    top: 20px;
+    right: 20px;
+    cursor: pointer;
+}
diff --git a/src/i18n/en/index.js b/src/i18n/en/index.js
index 4a1eea8f4..b1efa1457 100644
--- a/src/i18n/en/index.js
+++ b/src/i18n/en/index.js
@@ -49,7 +49,6 @@ export default {
         microsip: 'Open in MicroSIP',
         noSelectedRows: `You don't have any line selected`,
         downloadCSVSuccess: 'CSV downloaded successfully',
-        // labels compartidos entre vistas
         reference: 'Reference',
         agency: 'Agency',
         wareHouseOut: 'Warehouse Out',
@@ -566,7 +565,7 @@ export default {
             landed: 'Landed',
             hour: 'Hour',
             agency: 'Agency',
-            total: 'Total'
+            total: 'Total',
         },
         form: {
             clientFk: 'Client',
@@ -575,7 +574,7 @@ export default {
             agencyModeFk: 'Agency',
         },
         list: {
-            newOrder: 'New Order'
+            newOrder: 'New Order',
         },
         summary: {
             basket: 'Basket',
@@ -601,8 +600,8 @@ export default {
             description: 'Description',
             quantity: 'Quantity',
             price: 'Price',
-            amount: 'Amount'
-        }
+            amount: 'Amount',
+        },
     },
     worker: {
         pageTitles: {
diff --git a/src/i18n/es/index.js b/src/i18n/es/index.js
index 3f4ac1c27..701cb3274 100644
--- a/src/i18n/es/index.js
+++ b/src/i18n/es/index.js
@@ -48,7 +48,6 @@ export default {
         dateFormat: 'es-ES',
         noSelectedRows: `No tienes ninguna línea seleccionada`,
         microsip: 'Abrir en MicroSIP',
-        // labels compartidos entre vistas
         downloadCSVSuccess: 'Descarga de CSV exitosa',
         reference: 'Referencia',
         agency: 'Agencia',
@@ -475,7 +474,7 @@ export default {
             landed: 'F. entrega',
             hour: 'Hora',
             agency: 'Agencia',
-            total: 'Total'
+            total: 'Total',
         },
         form: {
             clientFk: 'Cliente',
@@ -484,7 +483,7 @@ export default {
             agencyModeFk: 'Agencia',
         },
         list: {
-            newOrder: 'Nuevo Pedido'
+            newOrder: 'Nuevo Pedido',
         },
         summary: {
             basket: 'Cesta',
@@ -510,8 +509,8 @@ export default {
             description: 'Descripción',
             quantity: 'Cantidad',
             price: 'Precio',
-            amount: 'Monto'
-        }
+            amount: 'Monto',
+        },
     },
     shelving: {
         pageTitles: {