From 7b170f05bf98df8e0ebbc024eb46758f188caea5 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Thu, 2 Jan 2025 14:51:48 +0100
Subject: [PATCH] fix: refs #7134 solve comments

---
 cypress.config.js                             |  2 +-
 src/components/common/VnLocation.vue          |  1 -
 src/composables/getRisk.js                    | 21 ++++++++++---------
 src/pages/Customer/Card/CustomerBalance.vue   |  4 ++--
 .../Customer/Card/CustomerFiscalData.vue      |  1 -
 src/pages/Item/Card/ItemBasicData.vue         |  6 ++++++
 src/pages/Item/locale/en.yml                  |  1 +
 src/pages/Item/locale/es.yml                  |  1 +
 src/pages/Supplier/Card/SupplierBalance.vue   |  4 ++--
 .../Supplier/Card/SupplierBalanceFilter.vue   |  1 -
 .../Supplier/Card/SupplierFiscalData.vue      |  2 ++
 .../Supplier/Card/SupplierNewPayment.vue      |  2 --
 .../Supplier/composables/getSupplierRisk.js   | 12 -----------
 13 files changed, 26 insertions(+), 32 deletions(-)
 delete mode 100644 src/pages/Supplier/composables/getSupplierRisk.js

diff --git a/cypress.config.js b/cypress.config.js
index fe4227d79..e9aeb547a 100644
--- a/cypress.config.js
+++ b/cypress.config.js
@@ -12,7 +12,7 @@ module.exports = defineConfig({
         supportFile: 'test/cypress/support/index.js',
         videosFolder: 'test/cypress/videos',
         video: false,
-        specPattern: 'test/cypress/integration/invoiceOut/*.spec.js',
+        specPattern: 'test/cypress/integration/**/*.spec.js',
         experimentalRunAllSpecs: true,
         watchForFileChanges: true,
         reporter: 'cypress-mochawesome-reporter',
diff --git a/src/components/common/VnLocation.vue b/src/components/common/VnLocation.vue
index e1c9cb134..f58222187 100644
--- a/src/components/common/VnLocation.vue
+++ b/src/components/common/VnLocation.vue
@@ -61,7 +61,6 @@ const handleModelValue = (data) => {
 };
 </script>
 <template>
-    {{ modelValue }}
     <VnSelectDialog
         v-model="modelValue"
         option-filter-value="search"
diff --git a/src/composables/getRisk.js b/src/composables/getRisk.js
index 6c7f75ad2..d2519db3a 100644
--- a/src/composables/getRisk.js
+++ b/src/composables/getRisk.js
@@ -1,22 +1,23 @@
 import axios from 'axios';
 
-export async function getClientRisk(_filter) {
+const method = {
+    supplier: 'SupplierRisk',
+    customer: 'ClientrRisk',
+};
+export async function getRisk(module, _filter) {
     const filter = {
         ..._filter,
         include: { relation: 'company', scope: { fields: ['code'] } },
     };
 
-    return await axios(`ClientRisks`, {
+    return await axios(method, {
         params: { filter: JSON.stringify(filter) },
     });
 }
+
+export async function getClientRisk(_filter) {
+    return await getRisk(method.customer, _filter);
+}
 export async function getSupplierRisk(_filter) {
-    const filter = {
-        ..._filter,
-        include: { relation: 'company', scope: { fields: ['code'] } },
-    };
-
-    return await axios(`ClientRisks`, {
-        params: { filter: JSON.stringify(filter) },
-    });
+    return await getRisk(method.supplier, _filter);
 }
diff --git a/src/pages/Customer/Card/CustomerBalance.vue b/src/pages/Customer/Card/CustomerBalance.vue
index d2f4c72a6..58acba63e 100644
--- a/src/pages/Customer/Card/CustomerBalance.vue
+++ b/src/pages/Customer/Card/CustomerBalance.vue
@@ -169,7 +169,7 @@ onBeforeMount(() => {
     companyId.value = companyUser.value;
 });
 
-async function getClientRisks() {
+async function getRisks() {
     const filter = {
         where: { clientFk: route.params.id, companyFk: companyUser.value },
     };
@@ -179,7 +179,7 @@ async function getClientRisks() {
 }
 
 async function getCurrentBalance() {
-    const currentBalance = (await getClientRisks()).find((balance) => {
+    const currentBalance = (await getRisks()).find((balance) => {
         return balance.companyFk === companyId.value;
     });
     return currentBalance && currentBalance.amount;
diff --git a/src/pages/Customer/Card/CustomerFiscalData.vue b/src/pages/Customer/Card/CustomerFiscalData.vue
index f55b5f412..aff7deda4 100644
--- a/src/pages/Customer/Card/CustomerFiscalData.vue
+++ b/src/pages/Customer/Card/CustomerFiscalData.vue
@@ -94,7 +94,6 @@ function handleLocation(data, location) {
             </VnRow>
 
             <VnRow>
-                *{{ data.location }}*
                 <VnLocation
                     :rules="validate('Worker.postcode')"
                     :roles-allowed-to-create="['deliveryAssistant', 'administrative']"
diff --git a/src/pages/Item/Card/ItemBasicData.vue b/src/pages/Item/Card/ItemBasicData.vue
index a1788617f..4c96401f3 100644
--- a/src/pages/Item/Card/ItemBasicData.vue
+++ b/src/pages/Item/Card/ItemBasicData.vue
@@ -203,6 +203,12 @@ const onIntrastatCreated = (response, formData) => {
                     v-model="data.hasKgPrice"
                     :label="t('item.basicData.hasKgPrice')"
                 />
+                <QCheckbox
+                    v-model="data.isCustomInspectionRequired"
+                    :label="t('item.basicData.isCustomInspectionRequired')"
+                />
+            </VnRow>
+            <VnRow class="row q-gutter-md q-mb-md">
                 <div>
                     <QCheckbox
                         v-model="data.isFragile"
diff --git a/src/pages/Item/locale/en.yml b/src/pages/Item/locale/en.yml
index 74feb512b..ac5010a12 100644
--- a/src/pages/Item/locale/en.yml
+++ b/src/pages/Item/locale/en.yml
@@ -158,6 +158,7 @@ item:
         isFragileTooltip: Is shown at website, app that this item cannot travel (wreath, palms, ...)
         isPhotoRequested: Do photo
         isPhotoRequestedTooltip: This item does need a photo
+        isCustomInspectionRequired: Needs physical inspection (PIF)
         description: Description
     fixedPrice:
         itemFk: Item ID
diff --git a/src/pages/Item/locale/es.yml b/src/pages/Item/locale/es.yml
index 3f2a06f1f..96c8cbc9a 100644
--- a/src/pages/Item/locale/es.yml
+++ b/src/pages/Item/locale/es.yml
@@ -160,6 +160,7 @@ item:
         isFragileTooltip: Se muestra en la web, app que este artículo no puede viajar (coronas, palmas, ...)
         isPhotoRequested: Hacer foto
         isPhotoRequestedTooltip: Este artículo necesita una foto
+        isCustomInspectionRequired: Necesita inspección física (PIF)
         description: Descripción
     fixedPrice:
         itemFk: ID Artículo
diff --git a/src/pages/Supplier/Card/SupplierBalance.vue b/src/pages/Supplier/Card/SupplierBalance.vue
index 5f1d81d29..e202e63ba 100644
--- a/src/pages/Supplier/Card/SupplierBalance.vue
+++ b/src/pages/Supplier/Card/SupplierBalance.vue
@@ -124,10 +124,10 @@ onMounted(async () => {
         companyId: companyId.value ?? companyUser.value,
         isConciliated: false,
     });
-    await getSupplierRisks();
+    await getRisks();
 });
 
-async function getSupplierRisks() {
+async function getRisks() {
     const filter = {
         where: { supplierFk: route.params.id, companyFk: companyUser.value },
     };
diff --git a/src/pages/Supplier/Card/SupplierBalanceFilter.vue b/src/pages/Supplier/Card/SupplierBalanceFilter.vue
index 7fb8f72dd..bae0fdcd4 100644
--- a/src/pages/Supplier/Card/SupplierBalanceFilter.vue
+++ b/src/pages/Supplier/Card/SupplierBalanceFilter.vue
@@ -2,7 +2,6 @@
 import { useI18n } from 'vue-i18n';
 import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
-import VnInput from 'src/components/common/VnInput.vue';
 import VnInputDate from 'src/components/common/VnInputDate.vue';
 
 const { t } = useI18n();
diff --git a/src/pages/Supplier/Card/SupplierFiscalData.vue b/src/pages/Supplier/Card/SupplierFiscalData.vue
index 27182785a..44235717f 100644
--- a/src/pages/Supplier/Card/SupplierFiscalData.vue
+++ b/src/pages/Supplier/Card/SupplierFiscalData.vue
@@ -106,6 +106,8 @@ function handleLocation(data, location) {
                     :label="t('supplier.fiscalData.account')"
                     clearable
                     data-cy="supplierFiscalDataAccount"
+                    insertable
+                    :maxlength="10"
                 />
                 <VnSelect
                     :label="t('supplier.fiscalData.sageTaxTypeFk')"
diff --git a/src/pages/Supplier/Card/SupplierNewPayment.vue b/src/pages/Supplier/Card/SupplierNewPayment.vue
index 3b17b151c..28f6e4219 100644
--- a/src/pages/Supplier/Card/SupplierNewPayment.vue
+++ b/src/pages/Supplier/Card/SupplierNewPayment.vue
@@ -2,7 +2,6 @@
 import { onBeforeMount, reactive, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
-import axios from 'axios';
 import { getSupplierRisk } from 'src/composables/getRisk';
 import { useDialogPluginComponent } from 'quasar';
 
@@ -15,7 +14,6 @@ import VnInputDate from 'components/common/VnInputDate.vue';
 import VnInputNumber from 'components/common/VnInputNumber.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
 import VnInput from 'src/components/common/VnInput.vue';
-import VnAccountNumber from 'src/components/common/VnAccountNumber.vue';
 
 const { t } = useI18n();
 const route = useRoute();
diff --git a/src/pages/Supplier/composables/getSupplierRisk.js b/src/pages/Supplier/composables/getSupplierRisk.js
deleted file mode 100644
index ebaf545ee..000000000
--- a/src/pages/Supplier/composables/getSupplierRisk.js
+++ /dev/null
@@ -1,12 +0,0 @@
-import axios from 'axios';
-
-export async function getClientRisk(_filter) {
-    const filter = {
-        ..._filter,
-        include: { relation: 'company', scope: { fields: ['code'] } },
-    };
-
-    return await axios(`ClientRisks`, {
-        params: { filter: JSON.stringify(filter) },
-    });
-}