From 3ee8ff78caecb36180e0df12e13277b45442b43e Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Tue, 24 Dec 2024 12:16:37 +0100
Subject: [PATCH 1/8] fix: change url

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

diff --git a/src/pages/Customer/CustomerList.vue b/src/pages/Customer/CustomerList.vue
index 26264941f..a8e5f1714 100644
--- a/src/pages/Customer/CustomerList.vue
+++ b/src/pages/Customer/CustomerList.vue
@@ -404,7 +404,7 @@ function handleLocation(data, location) {
     <VnTable
         ref="tableRef"
         data-key="CustomerList"
-        url="Clients/filter"
+        url="Clients/extendedListFilter"
         :create="{
             urlCreate: 'Clients/createWithUser',
             title: t('globals.pageTitles.customerCreate'),
-- 
2.40.1


From 2c86fb17f14ccdb8383198f22cc1f7bbdee97511 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Tue, 24 Dec 2024 12:16:46 +0100
Subject: [PATCH 2/8] fix: fix some filters

---
 src/pages/Customer/CustomerList.vue | 45 ++++++++++++++++++++++-------
 1 file changed, 34 insertions(+), 11 deletions(-)

diff --git a/src/pages/Customer/CustomerList.vue b/src/pages/Customer/CustomerList.vue
index a8e5f1714..89a0f5986 100644
--- a/src/pages/Customer/CustomerList.vue
+++ b/src/pages/Customer/CustomerList.vue
@@ -2,15 +2,16 @@
 import { ref, computed, markRaw } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRouter } from 'vue-router';
+import { useSummaryDialog } from 'src/composables/useSummaryDialog';
+import { toDate } from 'src/filters';
+
+import RightMenu from 'src/components/common/RightMenu.vue';
+import CustomerSummary from './Card/CustomerSummary.vue';
+import CustomerFilter from './CustomerFilter.vue';
 import VnTable from 'components/VnTable/VnTable.vue';
 import VnLocation from 'src/components/common/VnLocation.vue';
 import VnSearchbar from 'components/ui/VnSearchbar.vue';
-import CustomerSummary from './Card/CustomerSummary.vue';
-import { useSummaryDialog } from 'src/composables/useSummaryDialog';
-import RightMenu from 'src/components/common/RightMenu.vue';
 import VnLinkPhone from 'src/components/ui/VnLinkPhone.vue';
-import { toDate } from 'src/filters';
-import CustomerFilter from './CustomerFilter.vue';
 import VnSelectWorker from 'src/components/common/VnSelectWorker.vue';
 
 const { t } = useI18n();
@@ -193,6 +194,9 @@ const columns = computed(() => [
         name: 'businessTypeFk',
         create: true,
         component: 'select',
+        columnFilter: {
+            inWhere: true,
+        },
         attrs: {
             url: 'BusinessTypes',
             fields: ['code', 'description'],
@@ -221,7 +225,7 @@ const columns = computed(() => [
     {
         align: 'left',
         label: t('customer.extendedList.tableVisibleColumns.sageTaxTypeFk'),
-        name: 'sageTaxTypeFk',
+        name: 'CodigoIva',
         columnFilter: {
             component: 'select',
             attrs: {
@@ -236,7 +240,7 @@ const columns = computed(() => [
     {
         align: 'left',
         label: t('customer.extendedList.tableVisibleColumns.sageTransactionTypeFk'),
-        name: 'sageTransactionTypeFk',
+        name: 'CodigoTransaccion',
         columnFilter: {
             component: 'select',
             attrs: {
@@ -405,6 +409,7 @@ function handleLocation(data, location) {
         ref="tableRef"
         data-key="CustomerList"
         url="Clients/extendedListFilter"
+        order="id DESC"
         :create="{
             urlCreate: 'Clients/createWithUser',
             title: t('globals.pageTitles.customerCreate'),
@@ -414,10 +419,9 @@ function handleLocation(data, location) {
                 isEqualizated: false,
             },
         }"
-        order="id DESC"
         :columns="columns"
-        redirect="customer"
         :right-search="false"
+        redirect="customer"
     >
         <template #more-create-dialog="{ data }">
             <VnSelectWorker
@@ -430,7 +434,26 @@ function handleLocation(data, location) {
                 :id-value="data.salesPersonFk"
                 emit-value
                 auto-load
-            />
+            >
+                <template #prepend>
+                    <VnAvatar
+                        :worker-id="data.salesPersonFk"
+                        color="primary"
+                        :title="title"
+                    />
+                </template>
+                <template #option="scope">
+                    <QItem v-bind="scope.itemProps">
+                        <QItemSection>
+                            <QItemLabel>{{ scope.opt?.name }}</QItemLabel>
+                            <QItemLabel caption
+                                >{{ scope.opt?.nickname }},
+                                {{ scope.opt?.code }}</QItemLabel
+                            >
+                        </QItemSection>
+                    </QItem>
+                </template>
+            </VnSelectWorker>
             <VnLocation
                 :acls="[{ model: 'Province', props: '*', accessType: 'WRITE' }]"
                 v-model="data.location"
@@ -451,7 +474,7 @@ function handleLocation(data, location) {
 </template>
 <i18n>
 es:
-    Web user: Usuario Web
+    Web user: Usuario web
 </i18n>
 <style lang="scss" scoped>
 .col-content {
-- 
2.40.1


From 13cd59c6bb6f24a9358b70cf6ee26b5723f8708a Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 27 Jan 2025 13:52:37 +0100
Subject: [PATCH 3/8] fix: socialName filter

---
 src/pages/Customer/CustomerList.vue | 63 ++++++++++++++++-------------
 1 file changed, 36 insertions(+), 27 deletions(-)

diff --git a/src/pages/Customer/CustomerList.vue b/src/pages/Customer/CustomerList.vue
index 89a0f5986..0adfdb5f7 100644
--- a/src/pages/Customer/CustomerList.vue
+++ b/src/pages/Customer/CustomerList.vue
@@ -39,8 +39,8 @@ const columns = computed(() => [
     },
     {
         align: 'left',
-        label: t('globals.name'),
         name: 'name',
+        label: t('globals.name'),
         isTitle: true,
         create: true,
         columnClass: 'expand',
@@ -52,17 +52,26 @@ const columns = computed(() => [
         isTitle: true,
         create: true,
         columnClass: 'expand',
+        columnFilter: {
+            component: 'select',
+            attrs: {
+                url: 'Clients',
+                fields: ['socialName'],
+                optionLabel: 'socialName',
+                optionValue: 'socialName',
+            },
+        },
     },
     {
         align: 'left',
-        label: t('customer.extendedList.tableVisibleColumns.fi'),
         name: 'fi',
+        label: t('customer.extendedList.tableVisibleColumns.fi'),
         create: true,
     },
     {
         align: 'left',
-        label: t('customer.extendedList.tableVisibleColumns.salesPersonFk'),
         name: 'salesPersonFk',
+        label: t('customer.extendedList.tableVisibleColumns.salesPersonFk'),
         component: 'select',
         attrs: {
             url: 'Workers/activeWithInheritedRole',
@@ -78,8 +87,8 @@ const columns = computed(() => [
     },
     {
         align: 'left',
-        label: t('customer.summary.credit'),
         name: 'credit',
+        label: t('customer.summary.credit'),
         columnFilter: {
             component: 'number',
             inWhere: true,
@@ -87,8 +96,8 @@ const columns = computed(() => [
     },
     {
         align: 'left',
-        label: t('customer.extendedList.tableVisibleColumns.creditInsurance'),
         name: 'creditInsurance',
+        label: t('customer.extendedList.tableVisibleColumns.creditInsurance'),
         columnFilter: {
             component: 'number',
             inWhere: true,
@@ -96,8 +105,8 @@ const columns = computed(() => [
     },
     {
         align: 'left',
-        label: t('customer.extendedList.tableVisibleColumns.phone'),
         name: 'phone',
+        label: t('customer.extendedList.tableVisibleColumns.phone'),
         cardVisible: true,
         columnFilter: {
             component: 'number',
@@ -116,8 +125,8 @@ const columns = computed(() => [
     },
     {
         align: 'left',
-        label: t('customer.summary.mobile'),
         name: 'mobile',
+        label: t('customer.summary.mobile'),
         cardVisible: true,
         columnFilter: {
             component: 'number',
@@ -126,8 +135,8 @@ const columns = computed(() => [
     },
     {
         align: 'left',
-        label: t('customer.extendedList.tableVisibleColumns.street'),
         name: 'street',
+        label: t('customer.extendedList.tableVisibleColumns.street'),
         create: true,
         columnFilter: {
             inWhere: true,
@@ -136,8 +145,8 @@ const columns = computed(() => [
     },
     {
         align: 'left',
-        label: t('customer.extendedList.tableVisibleColumns.countryFk'),
         name: 'countryFk',
+        label: t('customer.extendedList.tableVisibleColumns.countryFk'),
         columnFilter: {
             component: 'select',
             inWhere: true,
@@ -150,8 +159,8 @@ const columns = computed(() => [
     },
     {
         align: 'left',
-        label: t('customer.extendedList.tableVisibleColumns.provinceFk'),
         name: 'provinceFk',
+        label: t('customer.extendedList.tableVisibleColumns.provinceFk'),
         component: 'select',
         attrs: {
             url: 'Provinces',
@@ -163,24 +172,24 @@ const columns = computed(() => [
     },
     {
         align: 'left',
-        label: t('customer.summary.city'),
         name: 'city',
+        label: t('customer.summary.city'),
     },
     {
         align: 'left',
-        label: t('customer.summary.postcode'),
         name: 'postcode',
+        label: t('customer.summary.postcode'),
     },
     {
         align: 'left',
-        label: t('globals.params.email'),
         name: 'email',
+        label: t('globals.params.email'),
         cardVisible: true,
     },
     {
         align: 'left',
-        label: t('customer.extendedList.tableVisibleColumns.created'),
         name: 'created',
+        label: t('customer.extendedList.tableVisibleColumns.created'),
         format: ({ created }) => toDate(created),
         columnFilter: {
             component: 'date',
@@ -190,8 +199,8 @@ const columns = computed(() => [
     },
     {
         align: 'left',
-        label: t('customer.extendedList.tableVisibleColumns.businessTypeFk'),
         name: 'businessTypeFk',
+        label: t('customer.extendedList.tableVisibleColumns.businessTypeFk'),
         create: true,
         component: 'select',
         columnFilter: {
@@ -211,8 +220,8 @@ const columns = computed(() => [
     },
     {
         align: 'left',
-        label: t('customer.summary.payMethodFk'),
         name: 'payMethodFk',
+        label: t('customer.summary.payMethodFk'),
         columnFilter: {
             component: 'select',
             attrs: {
@@ -254,8 +263,8 @@ const columns = computed(() => [
     },
     {
         align: 'left',
-        label: t('customer.summary.isActive'),
         name: 'isActive',
+        label: t('customer.summary.isActive'),
         chip: {
             color: null,
             condition: (value) => !value,
@@ -267,24 +276,24 @@ const columns = computed(() => [
     },
     {
         align: 'left',
-        label: t('globals.isVies'),
         name: 'isVies',
+        label: t('globals.isVies'),
         columnFilter: {
             inWhere: true,
         },
     },
     {
         align: 'left',
-        label: t('customer.extendedList.tableVisibleColumns.isTaxDataChecked'),
         name: 'isTaxDataChecked',
+        label: t('customer.extendedList.tableVisibleColumns.isTaxDataChecked'),
         columnFilter: {
             inWhere: true,
         },
     },
     {
         align: 'left',
-        label: t('customer.summary.isEqualizated'),
         name: 'isEqualizated',
+        label: t('customer.summary.isEqualizated'),
         create: true,
         columnFilter: {
             inWhere: true,
@@ -292,8 +301,8 @@ const columns = computed(() => [
     },
     {
         align: 'left',
-        label: t('customer.extendedList.tableVisibleColumns.isFreezed'),
         name: 'isFreezed',
+        label: t('customer.extendedList.tableVisibleColumns.isFreezed'),
         chip: {
             color: null,
             condition: (value) => value,
@@ -305,48 +314,48 @@ const columns = computed(() => [
     },
     {
         align: 'left',
-        label: t('customer.extendedList.tableVisibleColumns.hasToInvoice'),
         name: 'hasToInvoice',
+        label: t('customer.extendedList.tableVisibleColumns.hasToInvoice'),
         columnFilter: {
             inWhere: true,
         },
     },
     {
         align: 'left',
-        label: t('customer.extendedList.tableVisibleColumns.hasToInvoiceByAddress'),
         name: 'hasToInvoiceByAddress',
+        label: t('customer.extendedList.tableVisibleColumns.hasToInvoiceByAddress'),
         columnFilter: {
             inWhere: true,
         },
     },
     {
         align: 'left',
-        label: t('customer.extendedList.tableVisibleColumns.isToBeMailed'),
         name: 'isToBeMailed',
+        label: t('customer.extendedList.tableVisibleColumns.isToBeMailed'),
         columnFilter: {
             inWhere: true,
         },
     },
     {
         align: 'left',
-        label: t('customer.summary.hasLcr'),
         name: 'hasLcr',
+        label: t('customer.summary.hasLcr'),
         columnFilter: {
             inWhere: true,
         },
     },
     {
         align: 'left',
-        label: t('customer.summary.hasCoreVnl'),
         name: 'hasCoreVnl',
+        label: t('customer.summary.hasCoreVnl'),
         columnFilter: {
             inWhere: true,
         },
     },
     {
         align: 'left',
-        label: t('customer.extendedList.tableVisibleColumns.hasSepaVnl'),
         name: 'hasSepaVnl',
+        label: t('customer.extendedList.tableVisibleColumns.hasSepaVnl'),
         columnFilter: {
             inWhere: true,
         },
-- 
2.40.1


From d1ba6e580f5f0ddc79a870904b990af2ae894dab Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 27 Jan 2025 13:52:44 +0100
Subject: [PATCH 4/8] fix: params

---
 src/pages/Customer/CustomerFilter.vue | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/src/pages/Customer/CustomerFilter.vue b/src/pages/Customer/CustomerFilter.vue
index 96f670542..008cb49b5 100644
--- a/src/pages/Customer/CustomerFilter.vue
+++ b/src/pages/Customer/CustomerFilter.vue
@@ -166,15 +166,33 @@ en:
         fi: FI
         salesPersonFk: Salesperson
         provinceFk: Province
+        isActive: Is active
         city: City
         phone: Phone
         email: Email
+        isToBeMailed: Mailed
+        isEqualizated: Equailized
+        businessTypeFk: Business type
+        sti:
+            CodigoIva: Sage Tax Type
+        stt:
+            CodigoTransaccion: Sage Tax Type
+        payMethodFk: Billing data
         zoneFk: Zone
         postcode: Postcode
 es:
     params:
         search: Contiene
         fi: NIF
+        isActive: Activo
+        isToBeMailed: A enviar
+        isEqualizated:  Recargo de equivalencia
+        businessTypeFk: Tipop de negocio
+        sti:
+            CodigoIva: Tipo de impuesto Sage
+        stt:
+            CodigoTransaccion: Tipo de impuesto Sage
+        payMethodFk: Forma de pago
         salesPersonFk: Comercial
         provinceFk: Provincia
         city: Ciudad
-- 
2.40.1


From 9dd216269a00e4719d9b80112a9c014e6ee79954 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 27 Jan 2025 14:03:38 +0100
Subject: [PATCH 5/8] fix: vnSelectWorker fix template

---
 src/pages/Customer/CustomerList.vue | 22 ----------------------
 1 file changed, 22 deletions(-)

diff --git a/src/pages/Customer/CustomerList.vue b/src/pages/Customer/CustomerList.vue
index 0adfdb5f7..de08c6531 100644
--- a/src/pages/Customer/CustomerList.vue
+++ b/src/pages/Customer/CustomerList.vue
@@ -436,32 +436,10 @@ function handleLocation(data, location) {
             <VnSelectWorker
                 :label="t('customer.summary.salesPerson')"
                 v-model="data.salesPersonFk"
-                :params="{
-                    departmentCodes: ['VT', 'shopping'],
-                }"
                 :has-avatar="true"
-                :id-value="data.salesPersonFk"
                 emit-value
                 auto-load
             >
-                <template #prepend>
-                    <VnAvatar
-                        :worker-id="data.salesPersonFk"
-                        color="primary"
-                        :title="title"
-                    />
-                </template>
-                <template #option="scope">
-                    <QItem v-bind="scope.itemProps">
-                        <QItemSection>
-                            <QItemLabel>{{ scope.opt?.name }}</QItemLabel>
-                            <QItemLabel caption
-                                >{{ scope.opt?.nickname }},
-                                {{ scope.opt?.code }}</QItemLabel
-                            >
-                        </QItemSection>
-                    </QItem>
-                </template>
             </VnSelectWorker>
             <VnLocation
                 :acls="[{ model: 'Province', props: '*', accessType: 'WRITE' }]"
-- 
2.40.1


From 0916afbe37f12327bec9524fd05296fb1ac16e55 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 27 Jan 2025 14:04:37 +0100
Subject: [PATCH 6/8] fix: changel i18n

---
 src/pages/Customer/CustomerFilter.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/pages/Customer/CustomerFilter.vue b/src/pages/Customer/CustomerFilter.vue
index 008cb49b5..921198c80 100644
--- a/src/pages/Customer/CustomerFilter.vue
+++ b/src/pages/Customer/CustomerFilter.vue
@@ -1,3 +1,4 @@
+
 <script setup>
 import { useI18n } from 'vue-i18n';
 import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
@@ -187,7 +188,7 @@ es:
         isActive: Activo
         isToBeMailed: A enviar
         isEqualizated:  Recargo de equivalencia
-        businessTypeFk: Tipop de negocio
+        businessTypeFk: Tipo de negocio
         sti:
             CodigoIva: Tipo de impuesto Sage
         stt:
-- 
2.40.1


From b266c44d34003cc02c1b6f3c10dd0ecd2d07bece Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 27 Jan 2025 14:30:59 +0100
Subject: [PATCH 7/8] fix: sage params

---
 src/pages/Customer/CustomerFilter.vue | 12 ++++--------
 src/pages/Customer/CustomerList.vue   |  8 ++------
 2 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/src/pages/Customer/CustomerFilter.vue b/src/pages/Customer/CustomerFilter.vue
index c8e8bb2ff..eae97d1be 100644
--- a/src/pages/Customer/CustomerFilter.vue
+++ b/src/pages/Customer/CustomerFilter.vue
@@ -177,10 +177,8 @@ en:
         isToBeMailed: Mailed
         isEqualizated: Equailized
         businessTypeFk: Business type
-        sti:
-            CodigoIva: Sage Tax Type
-        stt:
-            CodigoTransaccion: Sage Tax Type
+        sageTaxTypeFk: Sage Tax Type
+        sageTransactionTypeFk: Sage Tax Type
         payMethodFk: Billing data
         zoneFk: Zone
         socialName : Social name
@@ -194,10 +192,8 @@ es:
         isToBeMailed: A enviar
         isEqualizated:  Recargo de equivalencia
         businessTypeFk: Tipo de negocio
-        sti:
-            CodigoIva: Tipo de impuesto Sage
-        stt:
-            CodigoTransaccion: Tipo de impuesto Sage
+        sageTaxTypeFk: Tipo de impuesto Sage
+        sageTransactionTypeFk: Tipo de impuesto Sage
         payMethodFk: Forma de pago
         salesPersonFk: Comercial
         provinceFk: Provincia
diff --git a/src/pages/Customer/CustomerList.vue b/src/pages/Customer/CustomerList.vue
index 19c3aa3af..1e7ed080e 100644
--- a/src/pages/Customer/CustomerList.vue
+++ b/src/pages/Customer/CustomerList.vue
@@ -236,30 +236,26 @@ const columns = computed(() => [
     {
         align: 'left',
         label: t('customer.extendedList.tableVisibleColumns.sageTaxTypeFk'),
-        name: 'CodigoIva',
+        name: 'sageTaxTypeFk',
         columnFilter: {
             component: 'select',
             attrs: {
                 optionLabel: 'vat',
                 url: 'SageTaxTypes',
             },
-            alias: 'sti',
-            inWhere: true,
         },
         format: (row, dashIfEmpty) => dashIfEmpty(row.sageTaxType),
     },
     {
         align: 'left',
         label: t('customer.extendedList.tableVisibleColumns.sageTransactionTypeFk'),
-        name: 'CodigoTransaccion',
+        name: 'sageTransactionTypeFk',
         columnFilter: {
             component: 'select',
             attrs: {
                 optionLabel: 'transaction',
                 url: 'SageTransactionTypes',
             },
-            alias: 'stt',
-            inWhere: true,
         },
         format: (row, dashIfEmpty) => dashIfEmpty(row.sageTransactionType),
     },
-- 
2.40.1


From ba3f6a79e6a3b93bfbaa0d8b3f678aac9faec741 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 27 Jan 2025 14:31:54 +0100
Subject: [PATCH 8/8] style: customerList

---
 src/pages/Customer/CustomerList.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/pages/Customer/CustomerList.vue b/src/pages/Customer/CustomerList.vue
index 1e7ed080e..7efa5e7e5 100644
--- a/src/pages/Customer/CustomerList.vue
+++ b/src/pages/Customer/CustomerList.vue
@@ -56,7 +56,8 @@ const columns = computed(() => [
                 url: 'Clients',
                 fields: ['socialName'],
                 optionLabel: 'socialName',
-                optionValue: 'socialName', uppercase: false,
+                optionValue: 'socialName',
+                uppercase: false,
             },
         },
         attrs: {
-- 
2.40.1