From 5a1317da7725ef8e02f69fc9d5c5ee08fe0e6f8d Mon Sep 17 00:00:00 2001
From: robert <robert@verdnatura.es>
Date: Thu, 17 Oct 2024 10:58:08 +0200
Subject: [PATCH 1/6] feat: refs #7731 create component vnSelectVies

---
 src/components/common/VnSelectVies.vue        | 77 +++++++++++++++++++
 .../Customer/Card/CustomerFiscalData.vue      |  6 +-
 2 files changed, 81 insertions(+), 2 deletions(-)
 create mode 100644 src/components/common/VnSelectVies.vue

diff --git a/src/components/common/VnSelectVies.vue b/src/components/common/VnSelectVies.vue
new file mode 100644
index 000000000..186ff77b6
--- /dev/null
+++ b/src/components/common/VnSelectVies.vue
@@ -0,0 +1,77 @@
+<script setup>
+import { ref } from 'vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
+import FetchData from 'components/FetchData.vue';
+import { useI18n } from 'vue-i18n';
+
+const { t } = useI18n();
+const model = defineModel({ type: String, required: true });
+const countriesOption = ref([]);
+const countriesOptionCopy = ref([]);
+const lastVal = ref();
+
+function handleBlur() {
+    if (lastVal.value == '') lastVal.value = null;
+    model.value = lastVal.value && lastVal.value.toUpperCase().slice(0, 2);
+}
+
+function filterFn(val, update) {
+    update(
+        () => {
+            if (val === '') {
+                countriesOptionCopy.value = JSON.parse(
+                    JSON.stringify(countriesOption.value)
+                );
+            } else {
+                const exist = countriesOption.value.filter((c) =>
+                    c.code.toLowerCase().includes(val.toLowerCase())
+                );
+                if (exist) return (countriesOptionCopy.value = exist);
+                countriesOptionCopy.value = JSON.parse(JSON.stringify([{ code: val }]));
+            }
+        },
+        (ref) => {
+            if (val !== '' && ref.options.length > 0) {
+                ref.setOptionIndex(-1);
+                ref.moveOptionSelection(1, true);
+            }
+        }
+    );
+}
+</script>
+<template>
+    <FetchData auto-load @on-fetch="(data) => (countriesOption = data)" url="Countries" />
+    <VnSelect
+        :label="t('Vies')"
+        v-model="model"
+        :input-debounce="0"
+        :options="countriesOptionCopy"
+        @blur="() => handleBlur()"
+        @input-value="(evt) => (lastVal = evt)"
+        @filter="filterFn"
+        option-label="code"
+        option-value="code"
+        v-bind="$attrs"
+    >
+        <template #option="scope">
+            <QItem v-bind="scope.itemProps">
+                <QItemSection>
+                    <QItemLabel>{{ scope.opt?.code }}</QItemLabel>
+                    <QItemLabel caption>
+                        {{ scope.opt?.code }},
+                        {{ scope.opt?.name }}
+                    </QItemLabel>
+                </QItemSection>
+            </QItem>
+        </template>
+        <template #after>
+            <QIcon name="info" class="cursor-pointer">
+                <QTooltip>{{ t('globals.allowedFilesText') }}</QTooltip>
+            </QIcon>
+        </template>
+    </VnSelect>
+</template>
+<i18n>
+es:
+    Vies: Vies
+</i18n>
diff --git a/src/pages/Customer/Card/CustomerFiscalData.vue b/src/pages/Customer/Card/CustomerFiscalData.vue
index 1f5775715..7a01be905 100644
--- a/src/pages/Customer/Card/CustomerFiscalData.vue
+++ b/src/pages/Customer/Card/CustomerFiscalData.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { ref } from 'vue';
+import { nextTick, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
 
@@ -8,7 +8,9 @@ import FormModel from 'components/FormModel.vue';
 import VnRow from 'components/ui/VnRow.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
+import VnSelectVies from 'src/components/common/VnSelectVies.vue';
 import VnLocation from 'src/components/common/VnLocation.vue';
+import axios from 'axios';
 
 const { t } = useI18n();
 const route = useRoute();
@@ -98,6 +100,7 @@ function handleLocation(data, location) {
                     :location="data"
                     @update:model-value="(location) => handleLocation(data, location)"
                 />
+                <VnSelectVies v-model="data.viesCode" style="max-width: 30%" />
             </VnRow>
             <VnRow>
                 <QCheckbox :label="t('Active')" v-model="data.isActive" />
@@ -165,7 +168,6 @@ es:
     Active: Activo
     Frozen: Congelado
     Has to invoice: Factura
-    Vies: Vies
     Notify by email: Notificar vía e-mail
     Invoice by address: Facturar por consignatario
     Is equalizated: Recargo de equivalencia
-- 
2.40.1


From 82fce46999b63b159384f6c865bfe0e1148c9fa1 Mon Sep 17 00:00:00 2001
From: robert <robert@verdnatura.es>
Date: Mon, 21 Oct 2024 13:16:06 +0200
Subject: [PATCH 2/6] feat: refs #7731 supplierFiscalData

---
 src/components/common/VnSelectVies.vue        |  8 ++++--
 .../Customer/Card/CustomerFiscalData.vue      | 17 ++----------
 .../Supplier/Card/SupplierFiscalData.vue      | 26 +++----------------
 3 files changed, 12 insertions(+), 39 deletions(-)

diff --git a/src/components/common/VnSelectVies.vue b/src/components/common/VnSelectVies.vue
index 186ff77b6..c42b9a8ad 100644
--- a/src/components/common/VnSelectVies.vue
+++ b/src/components/common/VnSelectVies.vue
@@ -66,12 +66,16 @@ function filterFn(val, update) {
         </template>
         <template #after>
             <QIcon name="info" class="cursor-pointer">
-                <QTooltip>{{ t('globals.allowedFilesText') }}</QTooltip>
+                <QTooltip>{{ t('viesTip') }}</QTooltip>
             </QIcon>
         </template>
     </VnSelect>
 </template>
 <i18n>
 es:
-    Vies: Vies
+    viesTip: El campo puede contener valores que no este en la lista 
+
+en:
+    viesTip: The field may contain value that are not in the list
+
 </i18n>
diff --git a/src/pages/Customer/Card/CustomerFiscalData.vue b/src/pages/Customer/Card/CustomerFiscalData.vue
index 7a01be905..ac5243338 100644
--- a/src/pages/Customer/Card/CustomerFiscalData.vue
+++ b/src/pages/Customer/Card/CustomerFiscalData.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { nextTick, ref } from 'vue';
+import { ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
 
@@ -10,7 +10,6 @@ import VnInput from 'src/components/common/VnInput.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
 import VnSelectVies from 'src/components/common/VnSelectVies.vue';
 import VnLocation from 'src/components/common/VnLocation.vue';
-import axios from 'axios';
 
 const { t } = useI18n();
 const route = useRoute();
@@ -108,14 +107,7 @@ function handleLocation(data, location) {
             </VnRow>
             <VnRow>
                 <QCheckbox :label="t('Has to invoice')" v-model="data.hasToInvoice" />
-                <div>
-                    <QCheckbox :label="t('Vies')" v-model="data.isVies" />
-                    <QIcon name="info" class="cursor-info q-ml-sm" size="sm">
-                        <QTooltip>
-                            {{ t('whenActivatingIt') }}
-                        </QTooltip>
-                    </QIcon>
-                </div>
+                <QCheckbox :label="t('Verified data')" v-model="data.isTaxDataChecked" />
             </VnRow>
 
             <VnRow>
@@ -145,9 +137,6 @@ function handleLocation(data, location) {
                 <QCheckbox
                     :label="t('Electronic invoice')"
                     v-model="data.hasElectronicInvoice"
-                /><QCheckbox
-                    :label="t('Verified data')"
-                    v-model="data.isTaxDataChecked"
                 />
             </VnRow>
         </template>
@@ -175,11 +164,9 @@ es:
     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
     Daily invoice: Facturación diaria
 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/Supplier/Card/SupplierFiscalData.vue b/src/pages/Supplier/Card/SupplierFiscalData.vue
index 169c4d796..774b4036f 100644
--- a/src/pages/Supplier/Card/SupplierFiscalData.vue
+++ b/src/pages/Supplier/Card/SupplierFiscalData.vue
@@ -9,6 +9,7 @@ import VnRow from 'components/ui/VnRow.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
 import VnLocation from 'src/components/common/VnLocation.vue';
+import VnSelectVies from 'src/components/common/VnSelectVies.vue';
 
 const route = useRoute();
 const { t } = useI18n();
@@ -67,6 +68,7 @@ function handleLocation(data, location) {
                 'supplierActivityFk',
                 'healthRegister',
                 'street',
+                'viesCode',
             ],
             include: [
                 {
@@ -170,8 +172,8 @@ function handleLocation(data, location) {
                         country: data.country,
                     }"
                     @update:model-value="(location) => handleLocation(data, location)"
-                >
-                </VnLocation>
+                />
+                <VnSelectVies v-model="data.viesCode" style="max-width: 30%" />
             </VnRow>
             <VnRow>
                 <div class="col flex justify-around">
@@ -179,28 +181,8 @@ function handleLocation(data, location) {
                         v-model="data.isTrucker"
                         :label="t('supplier.fiscalData.isTrucker')"
                     />
-                    <div class="row items-center">
-                        <QCheckbox
-                            v-model="data.isVies"
-                            :label="t('supplier.fiscalData.isVies')"
-                        />
-                        <QIcon name="info" size="xs" class="cursor-pointer q-ml-sm">
-                            <QTooltip>
-                                {{
-                                    t(
-                                        'When activating it, do not enter the country code in the ID field.'
-                                    )
-                                }}
-                            </QTooltip>
-                        </QIcon>
-                    </div>
                 </div>
             </VnRow>
         </template>
     </FormModel>
 </template>
-
-<i18n>
-es:
-    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
-</i18n>
-- 
2.40.1


From 4de85126cd2eb1f4039615b374901c5cda76e8dc Mon Sep 17 00:00:00 2001
From: robert <robert@verdnatura.es>
Date: Tue, 17 Dec 2024 11:02:51 +0100
Subject: [PATCH 3/6] feat: refs #7731

---
 src/components/common/VnSelectVies.vue         | 18 +++++++++---------
 src/pages/Supplier/Card/SupplierFiscalData.vue | 12 +++++-------
 2 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/src/components/common/VnSelectVies.vue b/src/components/common/VnSelectVies.vue
index c42b9a8ad..4ac25bc75 100644
--- a/src/components/common/VnSelectVies.vue
+++ b/src/components/common/VnSelectVies.vue
@@ -22,13 +22,14 @@ function filterFn(val, update) {
                 countriesOptionCopy.value = JSON.parse(
                     JSON.stringify(countriesOption.value)
                 );
-            } else {
-                const exist = countriesOption.value.filter((c) =>
-                    c.code.toLowerCase().includes(val.toLowerCase())
-                );
-                if (exist) return (countriesOptionCopy.value = exist);
-                countriesOptionCopy.value = JSON.parse(JSON.stringify([{ code: val }]));
+                return;
             }
+
+            const exist = countriesOption.value.filter((c) =>
+                c.code.toLowerCase().includes(val.toLowerCase())
+            );
+            if (exist) return (countriesOptionCopy.value = exist);
+            countriesOptionCopy.value = JSON.parse(JSON.stringify([{ code: val }]));
         },
         (ref) => {
             if (val !== '' && ref.options.length > 0) {
@@ -46,8 +47,7 @@ function filterFn(val, update) {
         v-model="model"
         :input-debounce="0"
         :options="countriesOptionCopy"
-        @blur="() => handleBlur()"
-        @input-value="(evt) => (lastVal = evt)"
+        @input-value="(evt) => (lastVal = evt) && handleBlur()"
         @filter="filterFn"
         option-label="code"
         option-value="code"
@@ -73,7 +73,7 @@ function filterFn(val, update) {
 </template>
 <i18n>
 es:
-    viesTip: El campo puede contener valores que no este en la lista 
+    viesTip: El campo puede contener valores que no este en la lista
 
 en:
     viesTip: The field may contain value that are not in the list
diff --git a/src/pages/Supplier/Card/SupplierFiscalData.vue b/src/pages/Supplier/Card/SupplierFiscalData.vue
index abf7a572e..31de4ee75 100644
--- a/src/pages/Supplier/Card/SupplierFiscalData.vue
+++ b/src/pages/Supplier/Card/SupplierFiscalData.vue
@@ -173,15 +173,13 @@ function handleLocation(data, location) {
                     }"
                     @update:model-value="(location) => handleLocation(data, location)"
                 />
-                <VnSelectVies v-model="data.viesCode" style="max-width: 30%" />
             </VnRow>
             <VnRow>
-                <div class="col flex justify-around">
-                    <QCheckbox
-                        v-model="data.isTrucker"
-                        :label="t('supplier.fiscalData.isTrucker')"
-                    />
-                </div>
+                <VnSelectVies v-model="data.viesCode" />
+                <QCheckbox
+                    v-model="data.isTrucker"
+                    :label="t('supplier.fiscalData.isTrucker')"
+                />
             </VnRow>
         </template>
     </FormModel>
-- 
2.40.1


From c884c0994336cac4df6262693f5e5177828e5b3c Mon Sep 17 00:00:00 2001
From: robert <robert@verdnatura.es>
Date: Thu, 23 Jan 2025 09:05:49 +0100
Subject: [PATCH 4/6] feat: refs #7731 resolve conflicts

---
 src/pages/Supplier/Card/SupplierFiscalData.vue | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/pages/Supplier/Card/SupplierFiscalData.vue b/src/pages/Supplier/Card/SupplierFiscalData.vue
index b944cdf69..dfd214d1d 100644
--- a/src/pages/Supplier/Card/SupplierFiscalData.vue
+++ b/src/pages/Supplier/Card/SupplierFiscalData.vue
@@ -69,12 +69,8 @@ function handleLocation(data, location) {
                 'supplierActivityFk',
                 'healthRegister',
                 'street',
-<<<<<<< HEAD
                 'viesCode',
-=======
-                'isVies',
                 'isTrucker',
->>>>>>> d499565ca30fdb6c505e53c85642e15fc02588c6
             ],
             include: [
                 {
-- 
2.40.1