From 11eb597fa393725fa20cda2587d8f388cd549960 Mon Sep 17 00:00:00 2001
From: carlosfonseca <carlos.fonseca@mindshore.io>
Date: Thu, 8 Feb 2024 20:24:48 -0500
Subject: [PATCH] Correccion de comentarios2

---
 src/pages/Customer/Card/CustomerBalance.vue           | 11 +++++++----
 src/pages/Customer/Card/CustomerBillingData.vue       |  8 +-------
 src/pages/Customer/Card/CustomerCredits.vue           |  4 ++--
 src/pages/Customer/Card/CustomerFileManagement.vue    |  2 +-
 src/pages/Customer/Card/CustomerFiscalData.vue        |  3 +++
 src/pages/Customer/Card/CustomerGreuges.vue           |  4 ++--
 src/pages/Customer/Card/CustomerSamples.vue           |  2 +-
 src/pages/Customer/Card/CustomerWebAccess.vue         |  4 +++-
 .../Notifications/CustomerNotificationsFilter.vue     |  2 ++
 .../Customer/components/CustomerConsigneeCreate.vue   |  3 +++
 .../Customer/components/CustomerConsigneeEdit.vue     |  4 ++++
 .../components/CustomerFileManagementCreate.vue       |  4 ++++
 .../components/CustomerFileManagementEdit.vue         |  4 ++++
 src/pages/Customer/components/CustomerNewPayment.vue  |  3 ++-
 .../Customer/components/CustomerSamplesCreate.vue     |  3 ++-
 15 files changed, 41 insertions(+), 20 deletions(-)

diff --git a/src/pages/Customer/Card/CustomerBalance.vue b/src/pages/Customer/Card/CustomerBalance.vue
index 9e2cfb6ffb..a718275afb 100644
--- a/src/pages/Customer/Card/CustomerBalance.vue
+++ b/src/pages/Customer/Card/CustomerBalance.vue
@@ -5,9 +5,10 @@ import { useRoute } from 'vue-router';
 
 import { date, QCheckbox, QBtn, useQuasar } from 'quasar';
 
-import { useState } from 'src/composables/useState';
 import { toCurrency } from 'src/filters';
+import { useState } from 'src/composables/useState';
 import { useStateStore } from 'stores/useStateStore';
+import { useValidator } from 'src/composables/useValidator';
 
 import FetchData from 'components/FetchData.vue';
 import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
@@ -15,10 +16,11 @@ import CustomerNewPayment from 'src/pages/Customer/components/CustomerNewPayment
 import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
 
 const { t } = useI18n();
-const route = useRoute();
+const { validate } = useValidator();
 const quasar = useQuasar();
-const stateStore = useStateStore();
+const route = useRoute();
 const state = useState();
+const stateStore = useStateStore();
 const user = state.getUser();
 
 const clientRisks = ref(null);
@@ -225,7 +227,7 @@ const updateCompanyId = (id) => {
                             {{ props.value }}
                         </template>
                         <WorkerDescriptorProxy
-                            :id="props.row.clientFk"
+                            :id="props.row.workerFk"
                             v-if="props.col.name === 'userName'"
                         />
                     </component>
@@ -244,6 +246,7 @@ const updateCompanyId = (id) => {
                 option-label="code"
                 option-value="id"
                 v-model="companyId"
+                :rules="validate('entry.companyFk')"
             />
         </div>
 
diff --git a/src/pages/Customer/Card/CustomerBillingData.vue b/src/pages/Customer/Card/CustomerBillingData.vue
index 2cf18de43f..00ad407fe9 100644
--- a/src/pages/Customer/Card/CustomerBillingData.vue
+++ b/src/pages/Customer/Card/CustomerBillingData.vue
@@ -69,13 +69,7 @@ const getBankEntities = () => {
 
             <VnRow class="row q-gutter-md q-mb-md">
                 <div class="col">
-                    <VnInput :label="t('IBAN')" clearable v-model="data.iban">
-                        <template #append>
-                            <QIcon name="info" class="cursor-info">
-                                <QTooltip>{{ t('components.iban_tooltip') }}</QTooltip>
-                            </QIcon>
-                        </template>
-                    </VnInput>
+                    <VnInput :label="t('IBAN')" clearable v-model="data.iban" />
                 </div>
                 <div class="col">
                     <VnSelectCreate
diff --git a/src/pages/Customer/Card/CustomerCredits.vue b/src/pages/Customer/Card/CustomerCredits.vue
index 5e39c5728e..e59c3edf9c 100644
--- a/src/pages/Customer/Card/CustomerCredits.vue
+++ b/src/pages/Customer/Card/CustomerCredits.vue
@@ -55,7 +55,7 @@ const columns = computed(() => [
         field: 'created',
         label: t('Since'),
         name: 'created',
-        format: (value) => date.formatDate(value, 'DD/MM/YYYY hh:mm:ss'),
+        format: (value) => date.formatDate(value, 'DD/MM/YYYY hh:mm'),
     },
     {
         align: 'left',
@@ -105,7 +105,7 @@ const toCustomerCreditCreate = () => {
                         >
                             {{ props.value }}
                             <WorkerDescriptorProxy
-                                :id="props.row.clientFk"
+                                :id="props.row.workerFk"
                                 v-if="props.col.name === 'employee'"
                             />
                         </component>
diff --git a/src/pages/Customer/Card/CustomerFileManagement.vue b/src/pages/Customer/Card/CustomerFileManagement.vue
index 47b561596a..c845493ae5 100644
--- a/src/pages/Customer/Card/CustomerFileManagement.vue
+++ b/src/pages/Customer/Card/CustomerFileManagement.vue
@@ -215,7 +215,7 @@ const toCustomerFileManagementCreate = () => {
                                 {{ props.value }}
                             </template>
                             <WorkerDescriptorProxy
-                                :id="props.row.clientFk"
+                                :id="props.row.dms.workerFk"
                                 v-if="props.col.name === 'employee'"
                             />
                         </component>
diff --git a/src/pages/Customer/Card/CustomerFiscalData.vue b/src/pages/Customer/Card/CustomerFiscalData.vue
index ee78274f3e..b8b0ba74f4 100644
--- a/src/pages/Customer/Card/CustomerFiscalData.vue
+++ b/src/pages/Customer/Card/CustomerFiscalData.vue
@@ -160,6 +160,7 @@ const onPostcodeCreated = async ({ code, provinceFk, townFk, countryFk }, formDa
                     <VnSelectFilter
                         :label="t('City')"
                         :options="citiesLocationOptions"
+                        :rules="validate('postcode.city')"
                         hide-selected
                         option-label="name"
                         option-value="name"
@@ -186,6 +187,7 @@ const onPostcodeCreated = async ({ code, provinceFk, townFk, countryFk }, formDa
                     <VnSelectFilter
                         :label="t('Province')"
                         :options="provincesLocationOptions"
+                        :rules="validate('city.provinceFk')"
                         hide-selected
                         option-label="name"
                         option-value="id"
@@ -206,6 +208,7 @@ const onPostcodeCreated = async ({ code, provinceFk, townFk, countryFk }, formDa
                     <VnSelectFilter
                         :label="t('Country')"
                         :options="countriesOptions"
+                        :rules="validate('bankEntity.countryFk')"
                         hide-selected
                         option-label="country"
                         option-value="id"
diff --git a/src/pages/Customer/Card/CustomerGreuges.vue b/src/pages/Customer/Card/CustomerGreuges.vue
index 4328f43124..487f4b3827 100644
--- a/src/pages/Customer/Card/CustomerGreuges.vue
+++ b/src/pages/Customer/Card/CustomerGreuges.vue
@@ -73,7 +73,7 @@ const columns = computed(() => [
         field: 'shipped',
         label: t('Date'),
         name: 'date',
-        format: (value) => date.formatDate(value, 'DD/MM/YYYY hh:mm:ss'),
+        format: (value) => date.formatDate(value, 'DD/MM/YYYY hh:mm'),
     },
     {
         align: 'left',
@@ -144,7 +144,7 @@ const toCustomerGreugeCreate = () => {
                         >
                             {{ props.value }}
                             <WorkerDescriptorProxy
-                                :id="props.row.clientFk"
+                                :id="props.row.userFk"
                                 v-if="props.col.name === 'createdBy'"
                             />
                         </component>
diff --git a/src/pages/Customer/Card/CustomerSamples.vue b/src/pages/Customer/Card/CustomerSamples.vue
index ca5d63dcbd..fba6402edd 100644
--- a/src/pages/Customer/Card/CustomerSamples.vue
+++ b/src/pages/Customer/Card/CustomerSamples.vue
@@ -109,7 +109,7 @@ const toCustomerSamplesCreate = () => {
                         >
                             {{ props.value }}
                             <WorkerDescriptorProxy
-                                :id="props.row.clientFk"
+                                :id="props.row.userFk"
                                 v-if="props.col.name === 'worker'"
                             />
                         </component>
diff --git a/src/pages/Customer/Card/CustomerWebAccess.vue b/src/pages/Customer/Card/CustomerWebAccess.vue
index b666780a29..80f294e259 100644
--- a/src/pages/Customer/Card/CustomerWebAccess.vue
+++ b/src/pages/Customer/Card/CustomerWebAccess.vue
@@ -20,7 +20,7 @@ const filter = { where: { id: `${route.params.id}` } };
         :url="'VnUsers/preview'"
         model="client"
     >
-        <template #form="{ data }">
+        <template #form="{ data, validate }">
             <div v-if="data?.length">
                 <div
                     v-for="(item, index) in data"
@@ -45,7 +45,9 @@ const filter = { where: { id: `${route.params.id}` } };
                         <div class="col">
                             <VnInput
                                 :label="t('Recovery email')"
+                                :rules="validate('client.email')"
                                 clearable
+                                type="email"
                                 v-model="item.email"
                             >
                                 <template #append>
diff --git a/src/pages/Customer/Notifications/CustomerNotificationsFilter.vue b/src/pages/Customer/Notifications/CustomerNotificationsFilter.vue
index 4e866435f4..dc43acb2c4 100644
--- a/src/pages/Customer/Notifications/CustomerNotificationsFilter.vue
+++ b/src/pages/Customer/Notifications/CustomerNotificationsFilter.vue
@@ -110,8 +110,10 @@ const clients = ref();
                 <QItemSection>
                     <VnInput
                         :label="t('Email')"
+                        :rules="validate('client.email')"
                         clearable
                         is-outlined
+                        type="email"
                         v-model="params.email"
                     />
                 </QItemSection>
diff --git a/src/pages/Customer/components/CustomerConsigneeCreate.vue b/src/pages/Customer/components/CustomerConsigneeCreate.vue
index 7061e50df2..c5daa78e4c 100644
--- a/src/pages/Customer/components/CustomerConsigneeCreate.vue
+++ b/src/pages/Customer/components/CustomerConsigneeCreate.vue
@@ -152,6 +152,7 @@ const toCustomerConsignees = () => {
                     <VnSelectFilter
                         :label="t('City')"
                         :options="citiesLocationOptions"
+                        :rules="validate('postcode.city')"
                         hide-selected
                         option-label="name"
                         option-value="name"
@@ -178,6 +179,7 @@ const toCustomerConsignees = () => {
                     <VnSelectFilter
                         :label="t('Province')"
                         :options="provincesLocationOptions"
+                        :rules="validate('city.provinceFk')"
                         hide-selected
                         option-label="name"
                         option-value="id"
@@ -198,6 +200,7 @@ const toCustomerConsignees = () => {
                     <VnSelectFilter
                         :label="t('Agency')"
                         :options="agencyModes"
+                        :rules="validate('route.agencyFk')"
                         hide-selected
                         option-label="name"
                         option-value="id"
diff --git a/src/pages/Customer/components/CustomerConsigneeEdit.vue b/src/pages/Customer/components/CustomerConsigneeEdit.vue
index 1411afb331..d4c76eb089 100644
--- a/src/pages/Customer/components/CustomerConsigneeEdit.vue
+++ b/src/pages/Customer/components/CustomerConsigneeEdit.vue
@@ -207,6 +207,7 @@ const onDataSaved = () => {
                     <VnSelectFilter
                         :label="t('City')"
                         :options="citiesLocationOptions"
+                        :rules="validate('postcode.city')"
                         hide-selected
                         option-label="name"
                         option-value="name"
@@ -233,6 +234,7 @@ const onDataSaved = () => {
                     <VnSelectFilter
                         :label="t('Province')"
                         :options="provincesLocationOptions"
+                        :rules="validate('city.provinceFk')"
                         hide-selected
                         option-label="name"
                         option-value="id"
@@ -253,6 +255,7 @@ const onDataSaved = () => {
                     <VnSelectFilter
                         :label="t('Agency')"
                         :options="agencyModes"
+                        :rules="validate('route.agencyFk')"
                         hide-selected
                         option-label="name"
                         option-value="id"
@@ -316,6 +319,7 @@ const onDataSaved = () => {
                 <div class="col">
                     <VnInput
                         :label="t('Description')"
+                        :rules="validate('route.description')"
                         clearable
                         v-model="note.description"
                     />
diff --git a/src/pages/Customer/components/CustomerFileManagementCreate.vue b/src/pages/Customer/components/CustomerFileManagementCreate.vue
index c2db63b304..27fb7baa28 100644
--- a/src/pages/Customer/components/CustomerFileManagementCreate.vue
+++ b/src/pages/Customer/components/CustomerFileManagementCreate.vue
@@ -6,6 +6,7 @@ import { useRoute, useRouter } from 'vue-router';
 import axios from 'axios';
 
 import { useState } from 'src/composables/useState';
+import { useValidator } from 'src/composables/useValidator';
 import useNotify from 'src/composables/useNotify';
 
 import FetchData from 'components/FetchData.vue';
@@ -15,6 +16,7 @@ import VnInput from 'src/components/common/VnInput.vue';
 
 const { notify } = useNotify();
 const { t } = useI18n();
+const { validate } = useValidator();
 const route = useRoute();
 const router = useRouter();
 const state = useState();
@@ -125,6 +127,7 @@ const inputFileRef = ref();
                         <VnSelectFilter
                             :label="t('Company')"
                             :options="optionsCompanies"
+                            :rules="validate('entry.companyFk')"
                             option-label="code"
                             option-value="id"
                             v-model="dms.companyId"
@@ -157,6 +160,7 @@ const inputFileRef = ref();
                     <div class="col">
                         <VnInput
                             :label="t('Description')"
+                            :rules="validate('route.description')"
                             clearable
                             type="textarea"
                             v-model="dms.description"
diff --git a/src/pages/Customer/components/CustomerFileManagementEdit.vue b/src/pages/Customer/components/CustomerFileManagementEdit.vue
index 0ae78b7d49..bcae35a330 100644
--- a/src/pages/Customer/components/CustomerFileManagementEdit.vue
+++ b/src/pages/Customer/components/CustomerFileManagementEdit.vue
@@ -5,6 +5,7 @@ import { useRoute, useRouter } from 'vue-router';
 
 import axios from 'axios';
 
+import { useValidator } from 'src/composables/useValidator';
 import useNotify from 'src/composables/useNotify';
 
 import FetchData from 'components/FetchData.vue';
@@ -14,6 +15,7 @@ import VnInput from 'src/components/common/VnInput.vue';
 
 const { notify } = useNotify();
 const { t } = useI18n();
+const { validate } = useValidator();
 const route = useRoute();
 const router = useRouter();
 
@@ -103,6 +105,7 @@ const inputFileRef = ref();
                         <VnSelectFilter
                             :label="t('Company')"
                             :options="optionsCompanies"
+                            :rules="validate('entry.companyFk')"
                             option-label="code"
                             option-value="id"
                             v-model="dms.companyId"
@@ -135,6 +138,7 @@ const inputFileRef = ref();
                     <div class="col">
                         <VnInput
                             :label="t('Description')"
+                            :rules="validate('route.description')"
                             clearable
                             type="textarea"
                             v-model="dms.description"
diff --git a/src/pages/Customer/components/CustomerNewPayment.vue b/src/pages/Customer/components/CustomerNewPayment.vue
index 84c9afb2bc..7df8c27a99 100644
--- a/src/pages/Customer/components/CustomerNewPayment.vue
+++ b/src/pages/Customer/components/CustomerNewPayment.vue
@@ -131,7 +131,7 @@ const onDataSaved = async () => {
             :url-create="urlCreate"
             @on-data-saved="onDataSaved()"
         >
-            <template #form="{ data }">
+            <template #form="{ data, validate }">
                 <span ref="closeButton" class="row justify-end close-icon" v-close-popup>
                     <QIcon name="close" size="sm" />
                 </span>
@@ -153,6 +153,7 @@ const onDataSaved = async () => {
                             :label="t('Company')"
                             :options="companyOptions"
                             :required="true"
+                            :rules="validate('entry.companyFk')"
                             hide-selected
                             option-label="code"
                             option-value="id"
diff --git a/src/pages/Customer/components/CustomerSamplesCreate.vue b/src/pages/Customer/components/CustomerSamplesCreate.vue
index 1a6eecf40a..309326105d 100644
--- a/src/pages/Customer/components/CustomerSamplesCreate.vue
+++ b/src/pages/Customer/components/CustomerSamplesCreate.vue
@@ -123,7 +123,7 @@ const onDataSaved = async ({
         model="client"
         url-create="ClientSamples"
     >
-        <template #form="{ data }">
+        <template #form="{ data, validate }">
             <VnRow class="row q-gutter-md q-mb-md">
                 <div class="col">
                     <VnSelectFilter
@@ -182,6 +182,7 @@ const onDataSaved = async ({
                     <VnSelectFilter
                         :label="t('Company')"
                         :options="optionsCompanies"
+                        :rules="validate('entry.companyFk')"
                         hide-selected
                         option-label="code"
                         option-value="id"