From 86199d81978f042e2526310661da05bc0b427a07 Mon Sep 17 00:00:00 2001
From: carlosfonseca <carlos.fonseca@mindshore.io>
Date: Mon, 19 Feb 2024 11:27:24 -0500
Subject: [PATCH] Solucion a comentarios 14

---
 src/components/ui/VnNotes.vue                 |  4 +-
 src/filters/index.js                          |  6 ++-
 src/filters/toDateHourMin.js                  | 11 ++++++
 .../{toDateHour.js => toDateHourMinSec.js}    |  2 +-
 src/pages/Customer/Card/CustomerAddress.vue   | 26 ++++++++++++-
 src/pages/Customer/Card/CustomerBalance.vue   | 18 ++++-----
 src/pages/Customer/Card/CustomerCredits.vue   |  4 +-
 .../Customer/Card/CustomerDescriptor.vue      |  9 +----
 .../Customer/Card/CustomerFileManagement.vue  |  4 +-
 .../Customer/Card/CustomerFiscalData.vue      | 39 +++++++++++--------
 src/pages/Customer/Card/CustomerGreuges.vue   |  4 +-
 src/pages/Customer/Card/CustomerMandates.vue  |  6 +--
 src/pages/Customer/Card/CustomerSamples.vue   |  4 +-
 .../Customer/Card/CustomerWebPayment.vue      |  4 +-
 .../components/CustomerCheckIconTooltip.vue   |  2 +-
 .../CustomerCreditContractsInsurance.vue      |  4 +-
 src/pages/Order/Card/OrderSummary.vue         |  8 ++--
 17 files changed, 96 insertions(+), 59 deletions(-)
 create mode 100644 src/filters/toDateHourMin.js
 rename src/filters/{toDateHour.js => toDateHourMinSec.js} (85%)

diff --git a/src/components/ui/VnNotes.vue b/src/components/ui/VnNotes.vue
index fac74837f..ad4e4ecf5 100644
--- a/src/components/ui/VnNotes.vue
+++ b/src/components/ui/VnNotes.vue
@@ -1,6 +1,6 @@
 <script setup>
 import VnAvatar from 'src/components/ui/VnAvatar.vue';
-import { toDateHour } from 'src/filters';
+import { toDateHourMinSec } from 'src/filters';
 import { ref } from 'vue';
 import axios from 'axios';
 import { useI18n } from 'vue-i18n';
@@ -51,7 +51,7 @@ async function insert() {
                             />
 
                             <slot name="actions">
-                                {{ toDateHour(note.created) }}
+                                {{ toDateHourMinSec(note.created) }}
                             </slot>
                         </QItem>
                     </QCardSection>
diff --git a/src/filters/index.js b/src/filters/index.js
index 478cb0ac8..43bfc2d40 100644
--- a/src/filters/index.js
+++ b/src/filters/index.js
@@ -1,7 +1,8 @@
 import toLowerCase from './toLowerCase';
 import toDate from './toDate';
 import toDateString from './toDateString';
-import toDateHour from './toDateHour';
+import toDateHourMin from './toDateHourMin';
+import toDateHourMinSec from './toDateHourMinSec';
 import toRelativeDate from './toRelativeDate';
 import toCurrency from './toCurrency';
 import toPercentage from './toPercentage';
@@ -16,7 +17,8 @@ export {
     toDate,
     toHour,
     toDateString,
-    toDateHour,
+    toDateHourMin,
+    toDateHourMinSec,
     toRelativeDate,
     toCurrency,
     toPercentage,
diff --git a/src/filters/toDateHourMin.js b/src/filters/toDateHourMin.js
new file mode 100644
index 000000000..2b6995c01
--- /dev/null
+++ b/src/filters/toDateHourMin.js
@@ -0,0 +1,11 @@
+export default function toDateHourMin(date) {
+    const dateHour = new Date(date).toLocaleDateString('es-ES', {
+        timeZone: 'Europe/Madrid',
+        year: 'numeric',
+        month: '2-digit',
+        day: '2-digit',
+        hour: '2-digit',
+        minute: '2-digit',
+    });
+    return dateHour;
+}
diff --git a/src/filters/toDateHour.js b/src/filters/toDateHourMinSec.js
similarity index 85%
rename from src/filters/toDateHour.js
rename to src/filters/toDateHourMinSec.js
index 939352404..cfc9506fb 100644
--- a/src/filters/toDateHour.js
+++ b/src/filters/toDateHourMinSec.js
@@ -1,4 +1,4 @@
-export default function toDateHour(date) {
+export default function toDateHourMinSec(date) {
     const dateHour = new Date(date).toLocaleDateString('es-ES', {
         timeZone: 'Europe/Madrid',
         year: 'numeric',
diff --git a/src/pages/Customer/Card/CustomerAddress.vue b/src/pages/Customer/Card/CustomerAddress.vue
index 98a6e47e6..b080fe457 100644
--- a/src/pages/Customer/Card/CustomerAddress.vue
+++ b/src/pages/Customer/Card/CustomerAddress.vue
@@ -10,6 +10,7 @@ const { t } = useI18n();
 const route = useRoute();
 const router = useRouter();
 
+const client = ref(null);
 const provincesLocation = ref([]);
 
 const addressFilter = {
@@ -51,6 +52,10 @@ const setProvince = (provinceFk) => {
     return result[0]?.name || '';
 };
 
+const isDefaultAddress = (address) => {
+    return client?.value?.defaultAddressFk === address.id ? 1 : 0;
+};
+
 const toCustomerAddressCreate = () => {
     router.push({ name: 'CustomerAddressCreate' });
 };
@@ -67,6 +72,11 @@ const toCustomerAddressEdit = (addressId) => {
 </script>
 
 <template>
+    <FetchData
+        @on-fetch="(data) => (client = data)"
+        auto-load
+        :url="`Clients/${route.params.id}`"
+    />
     <FetchData
         @on-fetch="(data) => (provincesLocation = data)"
         auto-load
@@ -88,11 +98,21 @@ const toCustomerAddressEdit = (addressId) => {
                     :class="{
                         'address-card': true,
                         'q-mb-md': index < rows.length - 1,
+                        'item-disabled': !item.isActive,
                     }"
                     @click="toCustomerAddressEdit(item.id)"
                 >
                     <div class="q-ml-xs q-mr-md flex items-center">
-                        <QIcon name="star" size="md" color="primary" />
+                        <QIcon
+                            :style="{
+                                'font-variation-settings': `'FILL' ${isDefaultAddress(
+                                    item
+                                )}`,
+                            }"
+                            color="primary"
+                            name="star"
+                            size="md"
+                        />
                     </div>
                     <div>
                         <div class="text-weight-bold q-mb-sm">
@@ -161,6 +181,10 @@ const toCustomerAddressEdit = (addressId) => {
         background-color: var(--vn-light-gray);
     }
 }
+
+.item-disabled {
+    opacity: 0.6;
+}
 </style>
 
 <i18n>
diff --git a/src/pages/Customer/Card/CustomerBalance.vue b/src/pages/Customer/Card/CustomerBalance.vue
index 7ed90d20e..00f5cef81 100644
--- a/src/pages/Customer/Card/CustomerBalance.vue
+++ b/src/pages/Customer/Card/CustomerBalance.vue
@@ -6,7 +6,7 @@ import { useRoute } from 'vue-router';
 import axios from 'axios';
 import { QCheckbox, QBtn, useQuasar, QField, QPopupEdit } from 'quasar';
 
-import { toCurrency, toDate, toDateHour } from 'src/filters';
+import { toCurrency, toDate, toDateHourMinSec } from 'src/filters';
 import { useState } from 'src/composables/useState';
 import { useStateStore } from 'stores/useStateStore';
 import { useValidator } from 'src/composables/useValidator';
@@ -106,7 +106,7 @@ const columns = computed(() => [
     {
         align: 'left',
         field: 'created',
-        format: (value) => toDateHour(value),
+        format: (value) => toDateHourMinSec(value),
         label: t('Creation date'),
         name: 'creationDate',
     },
@@ -256,13 +256,13 @@ const saveFieldValue = async (event) => {
                             </div>
 
                             <div v-else>
-                                <QBtn
-                                    :label="props.value"
-                                    flat
-                                    rounded
-                                    class="dotted-border-btn"
-                                    no-caps
-                                />
+                                <QField dense readonly>
+                                    <template #control>
+                                        <div class="self-center full-width no-outline">
+                                            {{ props.row.description }}
+                                        </div>
+                                    </template>
+                                </QField>
                                 <QPopupEdit
                                     :key="props.col.name"
                                     label-cancel="Close"
diff --git a/src/pages/Customer/Card/CustomerCredits.vue b/src/pages/Customer/Card/CustomerCredits.vue
index 24dfb6af3..b59cf5f68 100644
--- a/src/pages/Customer/Card/CustomerCredits.vue
+++ b/src/pages/Customer/Card/CustomerCredits.vue
@@ -5,7 +5,7 @@ import { useRoute, useRouter } from 'vue-router';
 
 import { QBtn } from 'quasar';
 
-import { toCurrency, toDateHour } from 'src/filters';
+import { toCurrency, toDateHourMin } from 'src/filters';
 
 import FetchData from 'components/FetchData.vue';
 import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
@@ -55,7 +55,7 @@ const columns = computed(() => [
         field: 'created',
         label: t('Since'),
         name: 'created',
-        format: (value) => toDateHour(value),
+        format: (value) => toDateHourMin(value),
     },
     {
         align: 'left',
diff --git a/src/pages/Customer/Card/CustomerDescriptor.vue b/src/pages/Customer/Card/CustomerDescriptor.vue
index 31fad0b2f..96e775f33 100644
--- a/src/pages/Customer/Card/CustomerDescriptor.vue
+++ b/src/pages/Customer/Card/CustomerDescriptor.vue
@@ -57,20 +57,15 @@ const setData = (entity) => (data.value = useCardDescription(entity.name, entity
                     />
                 </template>
             </VnLv>
-            <VnLv
-                :label="t('customer.card.credit')"
-                :value="toCurrency(entity.credit)"
-                class="col-11"
-            />
+            <VnLv :label="t('customer.card.credit')" :value="toCurrency(entity.credit)" />
             <VnLv
                 :label="t('customer.card.risk')"
                 :value="toCurrency(entity.debt)"
-                class="col-11"
+                :info="t('customer.summary.descriptorInfo')"
             />
             <VnLv
                 :label="t('customer.card.securedCredit')"
                 :value="toCurrency(entity.creditInsurance)"
-                :info="t('customer.summary.descriptorInfo')"
             />
             <VnLv :label="t('customer.card.payMethod')" :value="entity.payMethod.name" />
             <VnLv :label="t('customer.card.debt')" :value="toCurrency(entity.debt)" />
diff --git a/src/pages/Customer/Card/CustomerFileManagement.vue b/src/pages/Customer/Card/CustomerFileManagement.vue
index ae67acc7a..ba81ed2f1 100644
--- a/src/pages/Customer/Card/CustomerFileManagement.vue
+++ b/src/pages/Customer/Card/CustomerFileManagement.vue
@@ -6,7 +6,7 @@ import { useRoute, useRouter } from 'vue-router';
 import { QBadge, QBtn, QCheckbox } from 'quasar';
 
 import { downloadFile } from 'src/composables/downloadFile';
-import { toDateHour } from 'src/filters';
+import { toDateHourMinSec } from 'src/filters';
 
 import FetchData from 'components/FetchData.vue';
 import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
@@ -163,7 +163,7 @@ const columns = computed(() => [
         field: (value) => value.dms.created,
         label: t('Created'),
         name: 'created',
-        format: (value) => toDateHour(value),
+        format: (value) => toDateHourMinSec(value),
     },
     {
         align: 'right',
diff --git a/src/pages/Customer/Card/CustomerFiscalData.vue b/src/pages/Customer/Card/CustomerFiscalData.vue
index b8b0ba74f..940f04d31 100644
--- a/src/pages/Customer/Card/CustomerFiscalData.vue
+++ b/src/pages/Customer/Card/CustomerFiscalData.vue
@@ -80,9 +80,7 @@ const onPostcodeCreated = async ({ code, provinceFk, townFk, countryFk }, formDa
                     >
                         <template #append>
                             <QIcon name="info" class="cursor-info">
-                                <QTooltip>{{
-                                    t('Only letters, numbers and spaces can be used')
-                                }}</QTooltip>
+                                <QTooltip>{{ t('onlyLetters') }}</QTooltip>
                             </QIcon>
                         </template>
                     </VnInput>
@@ -117,7 +115,18 @@ const onPostcodeCreated = async ({ code, provinceFk, townFk, countryFk }, formDa
                         option-label="vat"
                         option-value="id"
                         v-model="data.sageTransactionTypeFk"
-                    />
+                    >
+                        <template #option="scope">
+                            <QItem v-bind="scope.itemProps">
+                                <QItemSection>
+                                    <QItemLabel>{{ scope.opt.name }}</QItemLabel>
+                                    <QItemLabel caption>
+                                        {{ `${scope.opt.id}: ${scope.opt.transaction}` }}
+                                    </QItemLabel>
+                                </QItemSection>
+                            </QItem>
+                        </template>
+                    </VnSelectFilter>
                 </div>
             </VnRow>
 
@@ -234,11 +243,7 @@ const onPostcodeCreated = async ({ code, provinceFk, townFk, countryFk }, formDa
                     <QCheckbox :label="t('Vies')" v-model="data.isVies" />
                     <QIcon name="info" class="cursor-info q-ml-sm" size="sm">
                         <QTooltip>
-                            {{
-                                t(
-                                    'When activating it, do not enter the country code in the ID field'
-                                )
-                            }}
+                            {{ t('whenActivatingIt') }}
                         </QTooltip>
                     </QIcon>
                 </div>
@@ -267,11 +272,7 @@ const onPostcodeCreated = async ({ code, provinceFk, townFk, countryFk }, formDa
                     />
                     <QIcon class="cursor-info q-ml-sm" name="info" size="sm">
                         <QTooltip>
-                            {{
-                                t(
-                                    "In order to invoice, this field is not contulted, but the consignee's ET. When modifiying this field if the invoice by address option is not checked, the change will be automatically propagated to all addresses, otherwise the user will be asked if he wants to propagate it or not"
-                                )
-                            }}
+                            {{ t('inOrderToInvoice') }}
                         </QTooltip>
                     </QIcon>
                 </div>
@@ -304,7 +305,6 @@ const onPostcodeCreated = async ({ code, provinceFk, townFk, countryFk }, formDa
 <i18n>
 es:
     Social name: Razón social
-    Only letters, numbers and spaces can be used: Sólo se pueden usar letras, números y espacios
     Tax number: NIF / CIF
     Street: Dirección fiscal
     Sage tax type: Tipo de impuesto Sage
@@ -317,12 +317,17 @@ es:
     Frozen: Congelado
     Has to invoice: Factura
     Vies: Vies
-    When activating it, do not enter the country code in the ID field: Al activarlo, no informar el código del país en el campo nif.
     Notify by email: Notificar vía e-mail
     Invoice by address: Facturar por consignatario
     Is equalizated: Recargo de equivalencia
-    In order to invoice, this field is not contulted, but the consignee's ET. When modifiying this field if the invoice by address option is not checked, the change will be automatically propagated to all addresses, otherwise the user will be asked if he wants to propagate it or not: Para facturar no se consulta este campo, sino el RE de consignatario. Al modificar este campo si no esta marcada la casilla Facturar por consignatario, se propagará automaticamente el cambio a todos lo consignatarios, en caso contrario preguntará al usuario si quiere o no propagar.
     Verified data: Datos comprobados
     Incoterms authorization: Autorización incoterms
     Electronic invoice: Factura electrónica
+    onlyLetters: Sólo se pueden usar letras, números y espacios
+    whenActivatingIt: Al activarlo, no informar el código del país en el campo nif
+    inOrderToInvoice: Para facturar no se consulta este campo, sino el RE de consignatario. Al modificar este campo si no esta marcada la casilla Facturar por consignatario, se propagará automaticamente el cambio a todos lo consignatarios, en caso contrario preguntará al usuario si quiere o no propagar
+en:
+    onlyLetters: Only letters, numbers and spaces can be used
+    whenActivatingIt: When activating it, do not enter the country code in the ID field
+    inOrderToInvoice: In order to invoice, this field is not contulted, but the consignee's ET. When modifiying this field if the invoice by address option is not checked, the change will be automatically propagated to all addresses, otherwise the user will be asked if he wants to propagate it or not
 </i18n>
diff --git a/src/pages/Customer/Card/CustomerGreuges.vue b/src/pages/Customer/Card/CustomerGreuges.vue
index 5628c64b3..485e61e79 100644
--- a/src/pages/Customer/Card/CustomerGreuges.vue
+++ b/src/pages/Customer/Card/CustomerGreuges.vue
@@ -5,7 +5,7 @@ import { useRoute, useRouter } from 'vue-router';
 
 import { date, QBtn } from 'quasar';
 
-import { toCurrency, toDateHour } from 'src/filters';
+import { toCurrency, toDateHourMinSec } from 'src/filters';
 
 import FetchData from 'components/FetchData.vue';
 import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
@@ -73,7 +73,7 @@ const columns = computed(() => [
         field: 'shipped',
         label: t('Date'),
         name: 'date',
-        format: (value) => toDateHour(value),
+        format: (value) => toDateHourMinSec(value),
     },
     {
         align: 'left',
diff --git a/src/pages/Customer/Card/CustomerMandates.vue b/src/pages/Customer/Card/CustomerMandates.vue
index 161034894..32ce79480 100644
--- a/src/pages/Customer/Card/CustomerMandates.vue
+++ b/src/pages/Customer/Card/CustomerMandates.vue
@@ -3,7 +3,7 @@ import { computed, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
 
-import { toDateHour } from 'src/filters';
+import { toDateHourMinSec } from 'src/filters';
 
 import FetchData from 'components/FetchData.vue';
 
@@ -74,14 +74,14 @@ const columns = computed(() => [
         field: 'created',
         label: t('Register date'),
         name: 'registerDate',
-        format: (value) => toDateHour(value),
+        format: (value) => toDateHourMinSec(value),
     },
     {
         align: 'left',
         field: 'finished',
         label: t('End date'),
         name: 'endDate',
-        format: (value) => (value ? toDateHour(value) : '-'),
+        format: (value) => (value ? toDateHourMinSec(value) : '-'),
     },
 ]);
 </script>
diff --git a/src/pages/Customer/Card/CustomerSamples.vue b/src/pages/Customer/Card/CustomerSamples.vue
index d8b25e012..e05d0016d 100644
--- a/src/pages/Customer/Card/CustomerSamples.vue
+++ b/src/pages/Customer/Card/CustomerSamples.vue
@@ -7,7 +7,7 @@ import { QBtn } from 'quasar';
 
 import FetchData from 'components/FetchData.vue';
 import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
-import { toDateHour } from 'src/filters';
+import { toDateHourMinSec } from 'src/filters';
 
 const { t } = useI18n();
 const route = useRoute();
@@ -55,7 +55,7 @@ const columns = computed(() => [
         field: 'created',
         label: t('Sent'),
         name: 'sent',
-        format: (value) => toDateHour(value),
+        format: (value) => toDateHourMinSec(value),
     },
     {
         align: 'left',
diff --git a/src/pages/Customer/Card/CustomerWebPayment.vue b/src/pages/Customer/Card/CustomerWebPayment.vue
index 4b5a8b365..0effaaca2 100644
--- a/src/pages/Customer/Card/CustomerWebPayment.vue
+++ b/src/pages/Customer/Card/CustomerWebPayment.vue
@@ -3,7 +3,7 @@ import { computed, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
 
-import { toCurrency, toDateHour } from 'src/filters';
+import { toCurrency, toDateHourMinSec } from 'src/filters';
 
 import FetchData from 'components/FetchData.vue';
 import CustomerCloseIconTooltip from '../components/CustomerCloseIconTooltip.vue';
@@ -74,7 +74,7 @@ const columns = computed(() => [
         field: 'created',
         label: t('Date'),
         name: 'date',
-        format: (value) => toDateHour(value),
+        format: (value) => toDateHourMinSec(value),
     },
     {
         align: 'left',
diff --git a/src/pages/Customer/components/CustomerCheckIconTooltip.vue b/src/pages/Customer/components/CustomerCheckIconTooltip.vue
index 030c07bc5..880f6ad8e 100644
--- a/src/pages/Customer/components/CustomerCheckIconTooltip.vue
+++ b/src/pages/Customer/components/CustomerCheckIconTooltip.vue
@@ -32,7 +32,7 @@ const setClientsConfirmTransaction = async () => {
         <QIcon
             @click.stop="setClientsConfirmTransaction"
             color="primary"
-            name="check"
+            name="done_all"
             size="sm"
         >
             <QTooltip>{{ t('Confirm transaction') }}</QTooltip>
diff --git a/src/pages/Customer/components/CustomerCreditContractsInsurance.vue b/src/pages/Customer/components/CustomerCreditContractsInsurance.vue
index f0a97ec92..ad2686bb6 100644
--- a/src/pages/Customer/components/CustomerCreditContractsInsurance.vue
+++ b/src/pages/Customer/components/CustomerCreditContractsInsurance.vue
@@ -3,7 +3,7 @@ import { computed, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
 
-import { toCurrency, toDateHour } from 'src/filters';
+import { toCurrency, toDateHourMinSec } from 'src/filters';
 
 import FetchData from 'components/FetchData.vue';
 
@@ -41,7 +41,7 @@ const columns = computed(() => [
     {
         align: 'left',
         field: 'created',
-        format: (value) => toDateHour(value),
+        format: (value) => toDateHourMinSec(value),
         label: t('Created'),
         name: 'created',
     },
diff --git a/src/pages/Order/Card/OrderSummary.vue b/src/pages/Order/Card/OrderSummary.vue
index 9b26891a1..be9e3c7a9 100644
--- a/src/pages/Order/Card/OrderSummary.vue
+++ b/src/pages/Order/Card/OrderSummary.vue
@@ -3,7 +3,7 @@ import { computed, ref } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import { useStateStore } from 'stores/useStateStore';
-import { dashIfEmpty, toCurrency, toDateHour } from 'src/filters';
+import { dashIfEmpty, toCurrency, toDateHourMinSec } from 'src/filters';
 import VnLv from 'components/ui/VnLv.vue';
 import CardSummary from 'components/ui/CardSummary.vue';
 import CustomerDescriptorProxy from 'pages/Customer/Card/CustomerDescriptorProxy.vue';
@@ -86,15 +86,15 @@ const detailsColumns = ref([
                 <QCard class="vn-one">
                     <VnLv
                         :label="t('order.summary.created')"
-                        :value="toDateHour(entity?.created)"
+                        :value="toDateHourMinSec(entity?.created)"
                     />
                     <VnLv
                         :label="t('order.summary.confirmed')"
-                        :value="toDateHour(entity?.confirmed)"
+                        :value="toDateHourMinSec(entity?.confirmed)"
                     />
                     <VnLv
                         :label="t('order.summary.landed')"
-                        :value="toDateHour(entity?.landed)"
+                        :value="toDateHourMinSec(entity?.landed)"
                     />
                     <VnLv :label="t('order.summary.phone')">
                         <template #value>