From 327afe8311226da71794e546f44584276b8b894f Mon Sep 17 00:00:00 2001
From: provira <provira@verdnatura.es>
Date: Wed, 14 May 2025 12:02:34 +0200
Subject: [PATCH 1/8] feat: refs #8825 add functionality to terminate contract

---
 .../Customer/Card/CustomerCreditOpinion.vue   | 106 +++++++++++++++---
 1 file changed, 88 insertions(+), 18 deletions(-)

diff --git a/src/pages/Customer/Card/CustomerCreditOpinion.vue b/src/pages/Customer/Card/CustomerCreditOpinion.vue
index 51d069744..09d4f5468 100644
--- a/src/pages/Customer/Card/CustomerCreditOpinion.vue
+++ b/src/pages/Customer/Card/CustomerCreditOpinion.vue
@@ -2,9 +2,15 @@
 import { computed, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
+import { useQuasar } from 'quasar';
 
 import { toCurrency, toDateHourMin } from 'src/filters';
 import VnTable from 'src/components/VnTable/VnTable.vue';
+import FormModelPopup from 'src/components/FormModelPopup.vue';
+import VnInput from 'src/components/common/VnInput.vue';
+import VnConfirm from 'components/ui/VnConfirm.vue';
+import VnRow from 'components/ui/VnRow.vue';
+import axios from 'axios';
 
 import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
 
@@ -12,6 +18,8 @@ const { t } = useI18n();
 const route = useRoute();
 
 const tableRef = ref();
+const quasar = useQuasar();
+const mainDialog = ref();
 
 const filter = {
     include: [
@@ -45,26 +53,47 @@ const columns = computed(() => [
         align: 'right',
         field: 'rating',
         label: t('customer.summary.rating'),
-        name: 'rating',
-        create: true,
-        columnCreate: {
-            component: 'number',
-            autofocus: true,
-        },
+        name: 'rating'
     },
     {
         align: 'right',
         field: 'recommendedCredit',
         format: ({ recommendedCredit }) => toCurrency(recommendedCredit),
         label: t('customer.summary.recommendCredit'),
-        name: 'recommendedCredit',
-        create: true,
-        columnCreate: {
-            component: 'number',
-            autofocus: true,
-        },
+        name: 'recommendedCredit'
     },
 ]);
+
+const defaultInitialData = {
+    rating: null,
+    recommendedCredit: null
+};
+
+const createRating = async (data) => {
+    await axios.post(`Clients/${route.params.id}/setRating`, data);
+    tableRef.value?.reload();
+};
+
+const handleSave = async (data) => {
+    if (!data.rating && !data.recommendedCredit) {
+        quasar
+            .dialog({
+                component: VnConfirm,
+                componentProps: {
+                    title: t('terminationTitle'),
+                    message: t('terminationMessage'),
+                },
+            })
+            .onOk(async () => {
+                await createRating({ rating: 0, recommendedCredit: 0 });
+
+            });
+    } else {
+        await createRating(data);
+    }
+};
+
+const defaultConfirmData = {};
 </script>
 
 <template>
@@ -81,23 +110,64 @@ const columns = computed(() => [
         :column-search="false"
         :disable-option="{ card: true }"
         auto-load
-        :create="{
-            urlCreate: `Clients/${route.params.id}/setRating`,
-            title: 'Create rating',
-            onDataSaved: () => tableRef.reload(),
-            formInitialData: {},
-        }"
     >
         <template #column-employee="{ row }">
             <span class="link">{{ row.worker.user.nickname }}</span>
             <WorkerDescriptorProxy :id="row.worker.id" />
         </template>
     </VnTable>
+
+    <QPageSticky :offset="[18, 18]">
+        <QBtn
+            @click.stop="mainDialog.show()"
+            color="primary"
+            fab
+            icon="add"
+            v-shortcut="'+'"
+        >
+            <QTooltip>
+                {{ t('Create rating') }}
+            </QTooltip>
+        </QBtn>
+
+        <QDialog ref="mainDialog">
+            <FormModelPopup
+                :title="t('Create rating')"
+                :save-fn="handleSave"
+                model="ClientInforma"
+                :form-initial-data="defaultInitialData"
+                @on-data-saved="onSave"
+            >
+                <template #form-inputs="{ data, validate }">
+                <VnRow>
+                    <VnInput
+                        v-model.number="data.rating"
+                        type="number"
+                        :label="t('customer.summary.rating')"
+                        :rules="validate('ClientInforma.rating')"
+                    />
+                    <VnInput
+                        v-model.number="data.recommendedCredit"
+                        type="number"
+                        :label="t('customer.summary.recommendCredit')"
+                        :rules="validate('ClientInforma.recommendedCredit')"
+                    />
+                </VnRow>
+                </template>
+            </FormModelPopup>
+        </QDialog>
+    </QPageSticky>
 </template>
 
 <i18n>
+en:
+    terminationTitle: Confirm contract termination
+    terminationMessage: Are you sure you want to terminate the contract? This action will set the rating and recommended credit to 0.
 es:
     Recommended credit: Crédito recomendado
     Since: Desde
     Employee: Empleado
+    Create rating: Crear calificación
+    terminationTitle: Confirmar baja de contrato
+    terminationMessage: ¿Está seguro que desea dar de baja el contrato? Esta acción establecerá la calificación y el crédito recomendado en 0.
 </i18n>

From d87308844b99436cbc8bf6d4fb1b1e2e7292b358 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Thu, 15 May 2025 09:19:37 +0200
Subject: [PATCH 2/8] fix: remove unused router import and update filter syntax
 in VnLog

---
 src/components/common/VnLog.vue               |  5 ++---
 .../Department/Card/DepartmentDescriptor.vue  | 22 +++++++++++++++++++
 2 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/src/components/common/VnLog.vue b/src/components/common/VnLog.vue
index 6e9128a43..1a180aaed 100644
--- a/src/components/common/VnLog.vue
+++ b/src/components/common/VnLog.vue
@@ -1,7 +1,7 @@
 <script setup>
 import { ref, onMounted, onUnmounted, computed } from 'vue';
 import { useI18n } from 'vue-i18n';
-import { useRoute, useRouter } from 'vue-router';
+import { useRoute } from 'vue-router';
 import axios from 'axios';
 import { date } from 'quasar';
 import { useStateStore } from 'stores/useStateStore';
@@ -21,7 +21,6 @@ const stateStore = useStateStore();
 const validationsStore = useValidator();
 const { models } = validationsStore;
 const route = useRoute();
-const router = useRouter();
 const { t } = useI18n();
 const props = defineProps({
     model: {
@@ -273,7 +272,7 @@ onUnmounted(() => {
         :data-key
         :url="dataKey + 's'"
         :user-filter="filter"
-        :filter="{ where: { and: [{ originFk: route.params.id }] } }"
+        :filter="{ where: { originFk: $route.params.id } }"
         :skeleton="false"
         auto-load
         @on-fetch="setLogTree"
diff --git a/src/pages/Worker/Department/Card/DepartmentDescriptor.vue b/src/pages/Worker/Department/Card/DepartmentDescriptor.vue
index 820658593..9f8cbc054 100644
--- a/src/pages/Worker/Department/Card/DepartmentDescriptor.vue
+++ b/src/pages/Worker/Department/Card/DepartmentDescriptor.vue
@@ -46,6 +46,28 @@ const { openConfirmationModal } = useVnConfirm();
         :summary="$props.summary"
         :to-module="{ name: 'WorkerDepartment' }"
         data-key="Department"
+        :filter="{
+            include: [
+                {
+                    relation: 'client',
+                    scope: {
+                        fields: ['id', 'name'],
+                    },
+                },
+                {
+                    relation: 'worker',
+                    scope: {
+                        fields: ['id', 'name'],
+                        include: {
+                            relation: 'user',
+                            scope: {
+                                fields: ['id', 'name'],
+                            },
+                        },
+                    },
+                },
+            ],
+        }"
     >
         <template #menu="{}">
             <QItem

From 567ce5fe991a69ad484b606874650331ec19f7c4 Mon Sep 17 00:00:00 2001
From: provira <provira@verdnatura.es>
Date: Thu, 15 May 2025 13:29:02 +0200
Subject: [PATCH 3/8] feat: refs #8825 use VnTable creation form

---
 .../Customer/Card/CustomerCreditOpinion.vue   | 96 +++++++------------
 1 file changed, 36 insertions(+), 60 deletions(-)

diff --git a/src/pages/Customer/Card/CustomerCreditOpinion.vue b/src/pages/Customer/Card/CustomerCreditOpinion.vue
index 09d4f5468..89241de76 100644
--- a/src/pages/Customer/Card/CustomerCreditOpinion.vue
+++ b/src/pages/Customer/Card/CustomerCreditOpinion.vue
@@ -6,20 +6,18 @@ import { useQuasar } from 'quasar';
 
 import { toCurrency, toDateHourMin } from 'src/filters';
 import VnTable from 'src/components/VnTable/VnTable.vue';
-import FormModelPopup from 'src/components/FormModelPopup.vue';
-import VnInput from 'src/components/common/VnInput.vue';
 import VnConfirm from 'components/ui/VnConfirm.vue';
 import VnRow from 'components/ui/VnRow.vue';
 import axios from 'axios';
 
 import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
+import VnInputNumber from 'src/components/common/VnInputNumber.vue';
 
 const { t } = useI18n();
 const route = useRoute();
+const quasar = useQuasar();
 
 const tableRef = ref();
-const quasar = useQuasar();
-const mainDialog = ref();
 
 const filter = {
     include: [
@@ -75,22 +73,21 @@ const createRating = async (data) => {
 };
 
 const handleSave = async (data) => {
-    if (!data.rating && !data.recommendedCredit) {
-        quasar
-            .dialog({
-                component: VnConfirm,
-                componentProps: {
-                    title: t('terminationTitle'),
-                    message: t('terminationMessage'),
-                },
-            })
-            .onOk(async () => {
-                await createRating({ rating: 0, recommendedCredit: 0 });
-
-            });
-    } else {
+    if (data.rating || data.recommendedCredit) {
         await createRating(data);
+        return;
     }
+
+    quasar.dialog({
+        component: VnConfirm,
+        componentProps: {
+            title: t('terminationTitle'),
+            message: t('terminationMessage'),
+        },
+    })
+    .onOk(async () => {
+        await createRating({ rating: 0, recommendedCredit: 0 });
+    });
 };
 
 const defaultConfirmData = {};
@@ -102,7 +99,6 @@ const defaultConfirmData = {};
         data-key="ClientInformas"
         url="ClientInformas"
         :filter="filter"
-        :order="['created DESC']"
         :columns="columns"
         :right-search="false"
         :is-editable="false"
@@ -110,53 +106,33 @@ const defaultConfirmData = {};
         :column-search="false"
         :disable-option="{ card: true }"
         auto-load
+        :create="{
+            title: 'Create rating',
+            onDataSaved: ()=> tableRef.reload(),
+            formInitialData: defaultInitialData,
+            saveFn: handleSave
+            
+        }"
     >
         <template #column-employee="{ row }">
             <span class="link">{{ row.worker.user.nickname }}</span>
             <WorkerDescriptorProxy :id="row.worker.id" />
         </template>
+        <template #more-create-dialog="{ data,validations }">
+            <VnRow>
+                <VnInputNumber
+                    v-model="data.rating"
+                    :label="t('customer.summary.rating')"
+                    :required="!!data.recommendedCredit"                         
+                />
+                <VnInputNumber
+                    v-model="data.recommendedCredit"
+                    :label="t('customer.summary.recommendCredit')"
+                    :required="!!data.rating" 
+                />
+            </VnRow>
+        </template>
     </VnTable>
-
-    <QPageSticky :offset="[18, 18]">
-        <QBtn
-            @click.stop="mainDialog.show()"
-            color="primary"
-            fab
-            icon="add"
-            v-shortcut="'+'"
-        >
-            <QTooltip>
-                {{ t('Create rating') }}
-            </QTooltip>
-        </QBtn>
-
-        <QDialog ref="mainDialog">
-            <FormModelPopup
-                :title="t('Create rating')"
-                :save-fn="handleSave"
-                model="ClientInforma"
-                :form-initial-data="defaultInitialData"
-                @on-data-saved="onSave"
-            >
-                <template #form-inputs="{ data, validate }">
-                <VnRow>
-                    <VnInput
-                        v-model.number="data.rating"
-                        type="number"
-                        :label="t('customer.summary.rating')"
-                        :rules="validate('ClientInforma.rating')"
-                    />
-                    <VnInput
-                        v-model.number="data.recommendedCredit"
-                        type="number"
-                        :label="t('customer.summary.recommendCredit')"
-                        :rules="validate('ClientInforma.recommendedCredit')"
-                    />
-                </VnRow>
-                </template>
-            </FormModelPopup>
-        </QDialog>
-    </QPageSticky>
 </template>
 
 <i18n>

From c95f4bb38720df3784b478db8880ba06d5d7ff9a Mon Sep 17 00:00:00 2001
From: provira <provira@verdnatura.es>
Date: Thu, 15 May 2025 13:36:43 +0200
Subject: [PATCH 4/8] fix: refs #8825 fix filter not working properly when
 reloading

---
 src/pages/Customer/Card/CustomerCreditOpinion.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/Customer/Card/CustomerCreditOpinion.vue b/src/pages/Customer/Card/CustomerCreditOpinion.vue
index 89241de76..80d084a70 100644
--- a/src/pages/Customer/Card/CustomerCreditOpinion.vue
+++ b/src/pages/Customer/Card/CustomerCreditOpinion.vue
@@ -98,7 +98,7 @@ const defaultConfirmData = {};
         ref="tableRef"
         data-key="ClientInformas"
         url="ClientInformas"
-        :filter="filter"
+        :user-filter="filter"
         :columns="columns"
         :right-search="false"
         :is-editable="false"

From baa902f25e37718422d9bf62a8a0afad45fa508b Mon Sep 17 00:00:00 2001
From: provira <provira@verdnatura.es>
Date: Thu, 15 May 2025 13:49:06 +0200
Subject: [PATCH 5/8] refactor: refs #8825 remove unused code

---
 src/pages/Customer/Card/CustomerCreditOpinion.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/Customer/Card/CustomerCreditOpinion.vue b/src/pages/Customer/Card/CustomerCreditOpinion.vue
index 80d084a70..69e9a7cf2 100644
--- a/src/pages/Customer/Card/CustomerCreditOpinion.vue
+++ b/src/pages/Customer/Card/CustomerCreditOpinion.vue
@@ -118,7 +118,7 @@ const defaultConfirmData = {};
             <span class="link">{{ row.worker.user.nickname }}</span>
             <WorkerDescriptorProxy :id="row.worker.id" />
         </template>
-        <template #more-create-dialog="{ data,validations }">
+        <template #more-create-dialog="{ data }">
             <VnRow>
                 <VnInputNumber
                     v-model="data.rating"

From 41db6ec0432d804ef882615bbdaac6f5c91d9f19 Mon Sep 17 00:00:00 2001
From: provira <provira@verdnatura.es>
Date: Thu, 15 May 2025 14:02:55 +0200
Subject: [PATCH 6/8] refactor: refs #8825 remove unused code (again)

---
 src/pages/Customer/Card/CustomerCreditOpinion.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/pages/Customer/Card/CustomerCreditOpinion.vue b/src/pages/Customer/Card/CustomerCreditOpinion.vue
index 69e9a7cf2..160d95ba1 100644
--- a/src/pages/Customer/Card/CustomerCreditOpinion.vue
+++ b/src/pages/Customer/Card/CustomerCreditOpinion.vue
@@ -90,7 +90,6 @@ const handleSave = async (data) => {
     });
 };
 
-const defaultConfirmData = {};
 </script>
 
 <template>

From 2316b08c2a16c4f5dcbbd5313989b50173eb9092 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Thu, 15 May 2025 14:31:14 +0200
Subject: [PATCH 7/8] test: skip customerFiscalData

---
 src/pages/Customer/Card/CustomerFiscalData.vue             | 1 -
 test/cypress/integration/customer/clientFiscalData.spec.js | 6 +++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/pages/Customer/Card/CustomerFiscalData.vue b/src/pages/Customer/Card/CustomerFiscalData.vue
index cee671eda..1b66936a3 100644
--- a/src/pages/Customer/Card/CustomerFiscalData.vue
+++ b/src/pages/Customer/Card/CustomerFiscalData.vue
@@ -80,7 +80,6 @@ function isRequired({ isTaxDataChecked: taxDataChecked }) {
         @on-data-saved="checkEtChanges"
     >
         <template #form="{ data, validate, validations }">
-            {{ isTaxDataChecked }} {{ data.isTaxDataChecked }}
             <VnRow>
                 <VnInput
                     :label="t('Social name')"
diff --git a/test/cypress/integration/customer/clientFiscalData.spec.js b/test/cypress/integration/customer/clientFiscalData.spec.js
index e80f7762e..81e98a339 100644
--- a/test/cypress/integration/customer/clientFiscalData.spec.js
+++ b/test/cypress/integration/customer/clientFiscalData.spec.js
@@ -7,7 +7,7 @@ function checkSageFields(isRequired = false) {
 describe('Client fiscal data', () => {
     describe('#1008', () => {
         beforeEach(() => {
-            cy.viewport(1280, 720);
+            cy.viewport(1920, 1080);
             cy.login('developer');
             cy.visit('#/customer/1108/fiscal-data');
         });
@@ -27,12 +27,12 @@ describe('Client fiscal data', () => {
     });
     describe('#1007', () => {
         beforeEach(() => {
-            cy.viewport(1280, 720);
+            cy.viewport(1920, 1080);
             cy.login('developer');
             cy.visit('#/customer/1107/fiscal-data');
         });
 
-        it('check as equalizated', () => {
+        it.skip('check as equalizated', () => {
             cy.dataCy('vnCheckboxIs equalizated').click();
             cy.get('.q-btn-group > .q-btn--standard > .q-btn__content').click();
 

From ba864eae0992de0b244c14e771cb380a7c5ceaf6 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Fri, 16 May 2025 08:03:08 +0200
Subject: [PATCH 8/8] fix: update filter parameters in VnLog and clean up
 unused fields in useArrayData

---
 src/components/common/VnLog.vue | 2 +-
 src/composables/useArrayData.js | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/components/common/VnLog.vue b/src/components/common/VnLog.vue
index 1a180aaed..8d9cacac2 100644
--- a/src/components/common/VnLog.vue
+++ b/src/components/common/VnLog.vue
@@ -272,7 +272,7 @@ onUnmounted(() => {
         :data-key
         :url="dataKey + 's'"
         :user-filter="filter"
-        :filter="{ where: { originFk: $route.params.id } }"
+        :user-params="{ originFk: route.params.id }"
         :skeleton="false"
         auto-load
         @on-fetch="setLogTree"
diff --git a/src/composables/useArrayData.js b/src/composables/useArrayData.js
index 9828b35ae..813d4e944 100644
--- a/src/composables/useArrayData.js
+++ b/src/composables/useArrayData.js
@@ -312,6 +312,7 @@ export function useArrayData(key, userOptions) {
         const { params, limit } = getCurrentFilter();
         store.currentFilter = JSON.parse(JSON.stringify(params));
         delete store.currentFilter.filter.include;
+        delete store.currentFilter.filter.fields;
         store.currentFilter.filter = JSON.stringify(store.currentFilter.filter);
         return { params, limit };
     }