From 8f4bd3478b869f247ae7ff0fef0ffe409f4cab1e Mon Sep 17 00:00:00 2001
From: carlosfonseca <carlos.fonseca@mindshore.io>
Date: Wed, 20 Dec 2023 10:34:14 -0500
Subject: [PATCH 01/36] Se implementa funcionalidades varias del extended list

---
 src/pages/Customer/CustomerExtendedList.vue   | 201 ++++++++++++++++++
 .../Customer/CustomerExtendedListActions.vue  |  64 ++++++
 2 files changed, 265 insertions(+)
 create mode 100644 src/pages/Customer/CustomerExtendedList.vue
 create mode 100644 src/pages/Customer/CustomerExtendedListActions.vue

diff --git a/src/pages/Customer/CustomerExtendedList.vue b/src/pages/Customer/CustomerExtendedList.vue
new file mode 100644
index 000000000..be3463867
--- /dev/null
+++ b/src/pages/Customer/CustomerExtendedList.vue
@@ -0,0 +1,201 @@
+<script setup>
+import { ref, computed, onBeforeMount } from 'vue';
+import { useI18n } from 'vue-i18n';
+import { useRouter } from 'vue-router';
+
+import { QBtn } from 'quasar';
+
+import { useArrayData } from 'composables/useArrayData';
+import { useStateStore } from 'stores/useStateStore';
+
+import CustomerDescriptorProxy from 'src/pages/Customer/Card/CustomerDescriptorProxy.vue';
+import CustomerExtendedListActions from './CustomerExtendedListActions.vue';
+import CustomerExtendedListFilter from './CustomerExtendedListFilter.vue';
+
+const { t } = useI18n();
+const router = useRouter();
+const stateStore = useStateStore();
+
+const arrayData = ref(null);
+
+onBeforeMount(async () => {
+    arrayData.value = useArrayData('CustomerExtendedList', {
+        url: 'Clients/extendedListFilter',
+        limit: 0,
+    });
+    await arrayData.value.fetch({ append: false });
+    stateStore.rightDrawer = true;
+});
+
+const rows = computed(() => arrayData.value.store.data);
+
+const selectedCustomerId = ref(0);
+
+const tableColumnComponents = {
+    id: {
+        component: QBtn,
+        props: () => ({ flat: true, color: 'blue' }),
+        event: (prop) => selectCustomerId(prop.row.id),
+    },
+    socialName: {
+        component: 'span',
+        props: () => {},
+        event: () => {},
+    },
+    salesPerson: {
+        component: 'span',
+        props: () => {},
+        event: () => {},
+    },
+    phone: {
+        component: 'span',
+        props: () => {},
+        event: () => {},
+    },
+    city: {
+        component: 'span',
+        props: () => {},
+        event: () => {},
+    },
+    email: {
+        component: 'span',
+        props: () => {},
+        event: () => {},
+    },
+    actions: {
+        component: CustomerExtendedListActions,
+        props: (prop) => ({
+            id: prop.row.id,
+        }),
+        event: () => {},
+    },
+};
+
+const columns = computed(() => {
+    return [
+        {
+            align: 'left',
+            field: 'id',
+            label: t('Identifier'),
+            name: 'id',
+        },
+        {
+            align: 'left',
+            field: 'socialName',
+            label: t('Social name'),
+            name: 'socialName',
+        },
+        {
+            align: 'left',
+            field: 'salesPerson',
+            label: t('Salesperson'),
+            name: 'salesPerson',
+        },
+        {
+            align: 'left',
+            field: 'phone',
+            label: t('Phone'),
+            name: 'phone',
+        },
+        {
+            align: 'left',
+            field: 'city',
+            label: t('City'),
+            name: 'city',
+        },
+        {
+            align: 'left',
+            field: 'email',
+            label: t('Email'),
+            name: 'email',
+        },
+        {
+            align: 'right',
+            field: 'actions',
+            label: '',
+            name: 'actions',
+        },
+    ];
+});
+
+const stopEventPropagation = (event, col) => {
+    if (!['ref', 'id', 'supplier'].includes(col.name)) return;
+    event.preventDefault();
+    event.stopPropagation();
+};
+
+const navigateToTravelId = (id) => {
+    router.push({ path: `/customer/${id}` });
+};
+
+const selectCustomerId = (id) => {
+    selectedCustomerId.value = id;
+};
+</script>
+
+<template>
+    <QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above>
+        <QScrollArea class="fit text-grey-8">
+            <CustomerExtendedListFilter data-key="CustomerExtendedList" />
+        </QScrollArea>
+    </QDrawer>
+
+    <QToolbar class="bg-vn-dark">
+        <div id="st-data"></div>
+        <QSpace />
+        <div id="st-actions"></div>
+    </QToolbar>
+
+    <QPage class="column items-center q-pa-md">
+        <QTable
+            :columns="columns"
+            :pagination="{ rowsPerPage: 0 }"
+            :rows="rows"
+            class="full-width q-mt-md"
+            hide-bottom
+            row-key="id"
+        >
+            <template #body="props">
+                <QTr
+                    :props="props"
+                    @click="navigateToTravelId(props.row.id)"
+                    class="cursor-pointer"
+                >
+                    <QTd
+                        v-for="col in props.cols"
+                        :key="col.name"
+                        :props="props"
+                        @click="stopEventPropagation($event, col)"
+                    >
+                        <component
+                            :is="tableColumnComponents[col.name].component"
+                            class="col-content"
+                            v-bind="tableColumnComponents[col.name].props(props)"
+                            @click="tableColumnComponents[col.name].event(props)"
+                        >
+                            {{ col.value }}
+                            <CustomerDescriptorProxy :id="selectedCustomerId" />
+                        </component>
+                    </QTd>
+                </QTr>
+            </template>
+        </QTable>
+    </QPage>
+</template>
+
+<style lang="scss" scoped>
+.col-content {
+    border-radius: 4px;
+    padding: 6px 6px 6px 6px;
+}
+</style>
+
+<i18n>
+es:
+    Identifier: Identificador
+    Social name: Razón social
+    Salesperson: Comercial
+    Phone: Teléfono
+    City: Población
+    Email: Email
+</i18n>
diff --git a/src/pages/Customer/CustomerExtendedListActions.vue b/src/pages/Customer/CustomerExtendedListActions.vue
new file mode 100644
index 000000000..1fec71ffe
--- /dev/null
+++ b/src/pages/Customer/CustomerExtendedListActions.vue
@@ -0,0 +1,64 @@
+<script setup>
+import { useI18n } from 'vue-i18n';
+import { useRouter } from 'vue-router';
+
+import { useQuasar } from 'quasar';
+
+import CustomerSummaryDialog from './Card/CustomerSummaryDialog.vue';
+
+const { t } = useI18n();
+const quasar = useQuasar();
+const router = useRouter();
+
+const $props = defineProps({
+    id: {
+        type: Number,
+        required: true,
+    },
+});
+
+const redirectToCreateView = () => {
+    router.push({
+        name: 'TicketList',
+        query: {
+            params: JSON.stringify({
+                clientFk: $props.id,
+            }),
+        },
+    });
+};
+
+const viewSummary = () => {
+    quasar.dialog({
+        component: CustomerSummaryDialog,
+        componentProps: {
+            id: $props.id,
+        },
+    });
+};
+</script>
+
+<template>
+    <QIcon @click.stop="redirectToCreateView" color="primary" name="vn:ticket" size="sm">
+        <QTooltip>
+            {{ t('Client ticket list') }}
+        </QTooltip>
+    </QIcon>
+    <QIcon
+        @click.stop="viewSummary"
+        class="q-ml-md"
+        color="primary"
+        name="preview"
+        size="sm"
+    >
+        <QTooltip>
+            {{ t('Preview') }}
+        </QTooltip>
+    </QIcon>
+</template>
+
+<i18n>
+es:
+    Client ticket list: Listado de tickets del cliente
+    Preview: Vista previa
+</i18n>

From 37d1239af11da6d9fa8e4cbd665fa528e03c6d6a Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Fri, 22 Dec 2023 08:28:08 -0300
Subject: [PATCH 02/36] Workers WIP

---
 src/components/CreateBankEntityForm.vue |   6 +-
 src/components/ui/VnTree.vue            | 112 ++++++++++++++++++++++++
 src/i18n/en/index.js                    |   9 +-
 src/i18n/es/index.js                    |   9 +-
 src/pages/Worker/WorkerDepartment.vue   |  15 ++++
 src/router/modules/worker.js            |  11 ++-
 6 files changed, 148 insertions(+), 14 deletions(-)
 create mode 100644 src/components/ui/VnTree.vue
 create mode 100644 src/pages/Worker/WorkerDepartment.vue

diff --git a/src/components/CreateBankEntityForm.vue b/src/components/CreateBankEntityForm.vue
index be213239f..6f3d33048 100644
--- a/src/components/CreateBankEntityForm.vue
+++ b/src/components/CreateBankEntityForm.vue
@@ -26,10 +26,6 @@ const closeButton = ref(null);
 const countriesOptions = ref([]);
 const loading = ref(false);
 
-const setCountriesOptions = (data) => {
-    countriesOptions.value = data;
-};
-
 const onDataSaved = (data) => {
     emit('onDataSaved', data);
     closeForm();
@@ -43,7 +39,7 @@ const closeForm = () => {
 <template>
     <FetchData
         url="Countries"
-        @on-fetch="(data) => setCountriesOptions(data)"
+        @on-fetch="(data) => (countriesOptions = data)"
         :filter="countriesFilter"
         auto-load
     />
diff --git a/src/components/ui/VnTree.vue b/src/components/ui/VnTree.vue
new file mode 100644
index 000000000..08541b6df
--- /dev/null
+++ b/src/components/ui/VnTree.vue
@@ -0,0 +1,112 @@
+<script setup>
+import { ref } from 'vue';
+import { useI18n } from 'vue-i18n';
+
+import axios from 'axios';
+
+const { t } = useI18n();
+
+const treeRef = ref(null);
+const expanded = ref([]);
+
+const nodes = ref([{ id: null, name: t('Departments'), sons: true, children: [{}] }]);
+
+const fetchedChildrensSet = ref(new Set());
+
+const onNodeExpanded = (nodeKeysArray) => {
+    // Verificar si el nodo ya fue expandido
+    if (!fetchedChildrensSet.value.has(nodeKeysArray.at(-1))) {
+        fetchedChildrensSet.value.add(nodeKeysArray.at(-1));
+        fetchNodeLeaves(nodeKeysArray.at(-1)); // Llamar a la función para obtener los nodos hijos
+    }
+};
+
+const fetchNodeLeaves = async (nodeKey) => {
+    try {
+        const node = treeRef.value.getNodeByKey(nodeKey);
+        if (!node || node.sons === 0) return;
+
+        const params = { parentId: node.id };
+        const response = await axios.get('/departments/getLeaves', { params });
+
+        // Si hay datos en la respuesta y tiene hijos, agregarlos al nodo actual
+        if (response.data) {
+            node.children = response.data;
+            node.children.forEach((node) => {
+                if (node.sons) node.children = [{}];
+            });
+        }
+    } catch (err) {
+        console.error('Error fetching department leaves');
+        throw new Error();
+    }
+};
+
+const removeNode = () => {};
+
+const createNode = async () => {
+    // const param = null;
+    // const response = axios.post('departments/createChild', param);
+};
+
+// const redirectToDepartmentSummary = () => {
+//     console.log('redirect to department summary:: ');
+// };
+</script>
+
+<template>
+    <QCard class="full-width" style="max-width: 800px">
+        <QTree
+            ref="treeRef"
+            :nodes="nodes"
+            node-key="id"
+            label-key="name"
+            v-model:expanded="expanded"
+            @update:expanded="onNodeExpanded($event)"
+        >
+            <template #default-header="prop">
+                <div class="row justify-between full-width bg-red q-pr-md">
+                    <!-- <pre>{{ prop }}</pre> -->
+                    <span class="text-uppercase">
+                        {{ prop.node.name }}
+                    </span>
+                    <div
+                        class="row bg-green justify-between"
+                        style="max-width: max-content"
+                    >
+                        <QIcon
+                            v-if="prop.node.id"
+                            name="delete"
+                            color="primary"
+                            size="sm"
+                            class="q-pr-xs"
+                            @click.stop="removeNode()"
+                        >
+                            <QTooltip>
+                                {{ t('Remove') }}
+                            </QTooltip>
+                        </QIcon>
+                        <QIcon
+                            name="add"
+                            color="primary"
+                            size="sm"
+                            @click.stop="createNode()"
+                        >
+                            <QTooltip>
+                                {{ t('Create') }}
+                            </QTooltip></QIcon
+                        >
+                    </div>
+                </div>
+            </template>
+        </QTree>
+        <pre>{{ nodes }}</pre>
+    </QCard>
+</template>
+
+<i18n>
+    es:
+        Departments: Departamentos
+        Remove: Quitar
+        Create: Crear
+    </i18n>
diff --git a/src/i18n/en/index.js b/src/i18n/en/index.js
index 4a1eea8f4..66e725f4f 100644
--- a/src/i18n/en/index.js
+++ b/src/i18n/en/index.js
@@ -566,7 +566,7 @@ export default {
             landed: 'Landed',
             hour: 'Hour',
             agency: 'Agency',
-            total: 'Total'
+            total: 'Total',
         },
         form: {
             clientFk: 'Client',
@@ -575,7 +575,7 @@ export default {
             agencyModeFk: 'Agency',
         },
         list: {
-            newOrder: 'New Order'
+            newOrder: 'New Order',
         },
         summary: {
             basket: 'Basket',
@@ -601,8 +601,8 @@ export default {
             description: 'Description',
             quantity: 'Quantity',
             price: 'Price',
-            amount: 'Amount'
-        }
+            amount: 'Amount',
+        },
     },
     worker: {
         pageTitles: {
@@ -612,6 +612,7 @@ export default {
             summary: 'Summary',
             notifications: 'Notifications',
             workerCreate: 'New worker',
+            department: 'Department',
         },
         list: {
             name: 'Name',
diff --git a/src/i18n/es/index.js b/src/i18n/es/index.js
index 3f4ac1c27..66f14a2c1 100644
--- a/src/i18n/es/index.js
+++ b/src/i18n/es/index.js
@@ -475,7 +475,7 @@ export default {
             landed: 'F. entrega',
             hour: 'Hora',
             agency: 'Agencia',
-            total: 'Total'
+            total: 'Total',
         },
         form: {
             clientFk: 'Cliente',
@@ -484,7 +484,7 @@ export default {
             agencyModeFk: 'Agencia',
         },
         list: {
-            newOrder: 'Nuevo Pedido'
+            newOrder: 'Nuevo Pedido',
         },
         summary: {
             basket: 'Cesta',
@@ -510,8 +510,8 @@ export default {
             description: 'Descripción',
             quantity: 'Cantidad',
             price: 'Precio',
-            amount: 'Monto'
-        }
+            amount: 'Monto',
+        },
     },
     shelving: {
         pageTitles: {
@@ -612,6 +612,7 @@ export default {
             summary: 'Resumen',
             notifications: 'Notificaciones',
             workerCreate: 'Nuevo trabajador',
+            department: 'Departamentos',
         },
         list: {
             name: 'Nombre',
diff --git a/src/pages/Worker/WorkerDepartment.vue b/src/pages/Worker/WorkerDepartment.vue
new file mode 100644
index 000000000..3c0e5fdd0
--- /dev/null
+++ b/src/pages/Worker/WorkerDepartment.vue
@@ -0,0 +1,15 @@
+<script setup>
+import VnTree from 'components/ui/VnTree.vue';
+</script>
+
+<template>
+    <QPage class="column items-center q-pa-md">
+        <VnTree />
+    </QPage>
+</template>
+
+<i18n>
+es:
+    Search worker: Buscar trabajador
+    You can search by worker id or name: Puedes buscar por id o nombre del trabajador
+</i18n>
diff --git a/src/router/modules/worker.js b/src/router/modules/worker.js
index dfc994e96..f2332618f 100644
--- a/src/router/modules/worker.js
+++ b/src/router/modules/worker.js
@@ -10,7 +10,7 @@ export default {
     component: RouterView,
     redirect: { name: 'WorkerMain' },
     menus: {
-        main: ['WorkerList'],
+        main: ['WorkerList', 'WorkerDepartment'],
         card: ['WorkerNotificationsManager'],
     },
     children: [
@@ -29,6 +29,15 @@ export default {
                     },
                     component: () => import('src/pages/Worker/WorkerList.vue'),
                 },
+                {
+                    path: 'department',
+                    name: 'WorkerDepartment',
+                    meta: {
+                        title: 'department',
+                        icon: 'vn:greuge',
+                    },
+                    component: () => import('src/pages/Worker/WorkerDepartment.vue'),
+                },
                 {
                     path: 'create',
                     name: 'WorkerCreate',

From c3dcf18596fb0076de37054e3dd87b1edae5e7c2 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Fri, 22 Dec 2023 08:31:02 -0300
Subject: [PATCH 03/36] correct qicons size

---
 src/components/CreateBankEntityForm.vue  | 2 +-
 src/components/CreateNewCityForm.vue     | 2 +-
 src/components/CreateNewPostcodeForm.vue | 2 +-
 src/components/CreateNewProvinceForm.vue | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/components/CreateBankEntityForm.vue b/src/components/CreateBankEntityForm.vue
index be213239f..3de4bed63 100644
--- a/src/components/CreateBankEntityForm.vue
+++ b/src/components/CreateBankEntityForm.vue
@@ -57,7 +57,7 @@ const closeForm = () => {
     >
         <template #form="{ data, validate }">
             <span ref="closeButton" class="close-icon" v-close-popup>
-                <QIcon name="close" size="22px" />
+                <QIcon name="close" size="sm" />
             </span>
             <h1 class="title">{{ t('title') }}</h1>
             <p class="q-mb-md">{{ t('subtitle') }}</p>
diff --git a/src/components/CreateNewCityForm.vue b/src/components/CreateNewCityForm.vue
index b028509e8..f3d6e4509 100644
--- a/src/components/CreateNewCityForm.vue
+++ b/src/components/CreateNewCityForm.vue
@@ -47,7 +47,7 @@ const closeForm = () => {
     >
         <template #form="{ data, validate }">
             <span ref="closeButton" class="close-icon" v-close-popup>
-                <QIcon name="close" size="22px" />
+                <QIcon name="close" size="sm" />
             </span>
             <h1 class="title">{{ t('New city') }}</h1>
             <p>{{ t('Please, ensure you put the correct data!') }}</p>
diff --git a/src/components/CreateNewPostcodeForm.vue b/src/components/CreateNewPostcodeForm.vue
index 0905f6bc3..18582cd49 100644
--- a/src/components/CreateNewPostcodeForm.vue
+++ b/src/components/CreateNewPostcodeForm.vue
@@ -76,7 +76,7 @@ const closeForm = () => {
     >
         <template #form="{ data, validate }">
             <span ref="closeButton" class="close-icon" v-close-popup>
-                <QIcon name="close" size="22px" />
+                <QIcon name="close" size="sm" />
             </span>
             <h1 class="title">{{ t('New postcode') }}</h1>
             <p>{{ t('Please, ensure you put the correct data!') }}</p>
diff --git a/src/components/CreateNewProvinceForm.vue b/src/components/CreateNewProvinceForm.vue
index 1896aec3f..3aea81596 100644
--- a/src/components/CreateNewProvinceForm.vue
+++ b/src/components/CreateNewProvinceForm.vue
@@ -47,7 +47,7 @@ const closeForm = () => {
     >
         <template #form="{ data, validate }">
             <span ref="closeButton" class="close-icon" v-close-popup>
-                <QIcon name="close" size="22px" />
+                <QIcon name="close" size="sm" />
             </span>
             <h1 class="title">{{ t('New province') }}</h1>
             <p>{{ t('Please, ensure you put the correct data!') }}</p>

From 465b595a92237dda69df2ae7084af12aad772b97 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Fri, 22 Dec 2023 08:32:49 -0300
Subject: [PATCH 04/36] correct qicon sizes

---
 src/components/CreateBankEntityForm.vue  | 2 +-
 src/components/CreateNewCityForm.vue     | 2 +-
 src/components/CreateNewPostcodeForm.vue | 2 +-
 src/components/CreateNewProvinceForm.vue | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/components/CreateBankEntityForm.vue b/src/components/CreateBankEntityForm.vue
index be213239f..3de4bed63 100644
--- a/src/components/CreateBankEntityForm.vue
+++ b/src/components/CreateBankEntityForm.vue
@@ -57,7 +57,7 @@ const closeForm = () => {
     >
         <template #form="{ data, validate }">
             <span ref="closeButton" class="close-icon" v-close-popup>
-                <QIcon name="close" size="22px" />
+                <QIcon name="close" size="sm" />
             </span>
             <h1 class="title">{{ t('title') }}</h1>
             <p class="q-mb-md">{{ t('subtitle') }}</p>
diff --git a/src/components/CreateNewCityForm.vue b/src/components/CreateNewCityForm.vue
index b028509e8..f3d6e4509 100644
--- a/src/components/CreateNewCityForm.vue
+++ b/src/components/CreateNewCityForm.vue
@@ -47,7 +47,7 @@ const closeForm = () => {
     >
         <template #form="{ data, validate }">
             <span ref="closeButton" class="close-icon" v-close-popup>
-                <QIcon name="close" size="22px" />
+                <QIcon name="close" size="sm" />
             </span>
             <h1 class="title">{{ t('New city') }}</h1>
             <p>{{ t('Please, ensure you put the correct data!') }}</p>
diff --git a/src/components/CreateNewPostcodeForm.vue b/src/components/CreateNewPostcodeForm.vue
index 0905f6bc3..18582cd49 100644
--- a/src/components/CreateNewPostcodeForm.vue
+++ b/src/components/CreateNewPostcodeForm.vue
@@ -76,7 +76,7 @@ const closeForm = () => {
     >
         <template #form="{ data, validate }">
             <span ref="closeButton" class="close-icon" v-close-popup>
-                <QIcon name="close" size="22px" />
+                <QIcon name="close" size="sm" />
             </span>
             <h1 class="title">{{ t('New postcode') }}</h1>
             <p>{{ t('Please, ensure you put the correct data!') }}</p>
diff --git a/src/components/CreateNewProvinceForm.vue b/src/components/CreateNewProvinceForm.vue
index 1896aec3f..3aea81596 100644
--- a/src/components/CreateNewProvinceForm.vue
+++ b/src/components/CreateNewProvinceForm.vue
@@ -47,7 +47,7 @@ const closeForm = () => {
     >
         <template #form="{ data, validate }">
             <span ref="closeButton" class="close-icon" v-close-popup>
-                <QIcon name="close" size="22px" />
+                <QIcon name="close" size="sm" />
             </span>
             <h1 class="title">{{ t('New province') }}</h1>
             <p>{{ t('Please, ensure you put the correct data!') }}</p>

From 899b9536b6923db42e792a98118751dc4c1e88b6 Mon Sep 17 00:00:00 2001
From: carlosfonseca <carlos.fonseca@mindshore.io>
Date: Fri, 22 Dec 2023 07:41:54 -0500
Subject: [PATCH 05/36] Se crea tabla de notificaciones, tarjeta por
 identificador y filtros

---
 src/i18n/en/index.js                          |   1 +
 src/i18n/es/index.js                          |   1 +
 .../Customer/CustomerExtendedListFilter.vue   |   2 +-
 src/pages/Customer/CustomerNotifications.vue  | 163 ++++++++++++++++++
 .../Customer/CustomerNotificationsFilter.vue  | 144 ++++++++++++++++
 src/router/modules/customer.js                |  17 +-
 6 files changed, 326 insertions(+), 2 deletions(-)
 create mode 100644 src/pages/Customer/CustomerNotifications.vue
 create mode 100644 src/pages/Customer/CustomerNotificationsFilter.vue

diff --git a/src/i18n/en/index.js b/src/i18n/en/index.js
index 4a1eea8f4..132d8b0d4 100644
--- a/src/i18n/en/index.js
+++ b/src/i18n/en/index.js
@@ -112,6 +112,7 @@ export default {
             list: 'List',
             webPayments: 'Web Payments',
             extendedList: 'Extended list',
+            notifications: 'Notifications',
             createCustomer: 'Create customer',
             summary: 'Summary',
             basicData: 'Basic Data',
diff --git a/src/i18n/es/index.js b/src/i18n/es/index.js
index 3f4ac1c27..47963c070 100644
--- a/src/i18n/es/index.js
+++ b/src/i18n/es/index.js
@@ -112,6 +112,7 @@ export default {
             list: 'Listado',
             webPayments: 'Pagos Web',
             extendedList: 'Listado extendido',
+            notifications: 'Notificaciones',
             createCustomer: 'Crear cliente',
             basicData: 'Datos básicos',
             summary: 'Resumen',
diff --git a/src/pages/Customer/CustomerExtendedListFilter.vue b/src/pages/Customer/CustomerExtendedListFilter.vue
index eff0d20aa..ba1c966dc 100644
--- a/src/pages/Customer/CustomerExtendedListFilter.vue
+++ b/src/pages/Customer/CustomerExtendedListFilter.vue
@@ -80,7 +80,7 @@ const workers = ref();
                     <QItemSection v-if="workers">
                         <VnSelectFilter
                             :label="t('Salesperson')"
-                            v-model="params.salesPerson"
+                            v-model="params.salesPersonFk"
                             @update:model-value="searchFn()"
                             :options="workers"
                             option-value="id"
diff --git a/src/pages/Customer/CustomerNotifications.vue b/src/pages/Customer/CustomerNotifications.vue
new file mode 100644
index 000000000..91d137763
--- /dev/null
+++ b/src/pages/Customer/CustomerNotifications.vue
@@ -0,0 +1,163 @@
+<script setup>
+import { ref, computed, onBeforeMount } from 'vue';
+import { useI18n } from 'vue-i18n';
+
+import { QBtn } from 'quasar';
+
+import { useArrayData } from 'composables/useArrayData';
+import { useStateStore } from 'stores/useStateStore';
+
+import CustomerNotificationsFilter from './CustomerNotificationsFilter.vue';
+import CustomerDescriptorProxy from './Card/CustomerDescriptorProxy.vue';
+
+const { t } = useI18n();
+const stateStore = useStateStore();
+
+const arrayData = ref(null);
+
+onBeforeMount(async () => {
+    arrayData.value = useArrayData('CustomerNotifications', {
+        url: 'Clients',
+        limit: 0,
+    });
+    await arrayData.value.fetch({ append: false });
+    stateStore.rightDrawer = true;
+});
+
+const rows = computed(() => arrayData.value.store.data);
+
+const selected = ref([]);
+const selectedCustomerId = ref(0);
+
+const tableColumnComponents = {
+    id: {
+        component: QBtn,
+        props: () => ({ flat: true, color: 'blue' }),
+        event: (prop) => selectCustomerId(prop.row.id),
+    },
+    socialName: {
+        component: 'span',
+        props: () => {},
+        event: () => {},
+    },
+    city: {
+        component: 'span',
+        props: () => {},
+        event: () => {},
+    },
+    phone: {
+        component: 'span',
+        props: () => {},
+        event: () => {},
+    },
+    email: {
+        component: 'span',
+        props: () => {},
+        event: () => {},
+    },
+};
+
+const columns = computed(() => {
+    return [
+        {
+            align: 'left',
+            field: 'id',
+            label: t('Identifier'),
+            name: 'id',
+        },
+        {
+            align: 'left',
+            field: 'socialName',
+            label: t('Social name'),
+            name: 'socialName',
+        },
+        {
+            align: 'left',
+            field: 'city',
+            label: t('City'),
+            name: 'city',
+        },
+        {
+            align: 'left',
+            field: 'phone',
+            label: t('Phone'),
+            name: 'phone',
+        },
+        {
+            align: 'left',
+            field: 'email',
+            label: t('Email'),
+            name: 'email',
+        },
+    ];
+});
+
+const selectCustomerId = (id) => {
+    selectedCustomerId.value = id;
+};
+</script>
+
+<template>
+    <QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above>
+        <QScrollArea class="fit text-grey-8">
+            <CustomerNotificationsFilter data-key="CustomerNotifications" />
+        </QScrollArea>
+    </QDrawer>
+
+    <QToolbar class="bg-vn-dark">
+        <div id="st-data"></div>
+        <QSpace />
+        <div id="st-actions"></div>
+    </QToolbar>
+
+    <QPage class="column items-center q-pa-md">
+        <QTable
+            :columns="columns"
+            :pagination="{ rowsPerPage: 0 }"
+            :rows="rows"
+            class="full-width q-mt-md"
+            hide-bottom
+            row-key="id"
+            selection="multiple"
+            v-model:selected="selected"
+        >
+            <template #top>
+                <div v-if="rows" class="full-width flex justify-end">
+                    {{ `${rows.length} ${t('route.cmr.list.results')}` }}
+                </div>
+            </template>
+            <template #body-cell="props">
+                <QTd :props="props">
+                    <QTr :props="props" class="cursor-pointer">
+                        <component
+                            :is="tableColumnComponents[props.col.name].component"
+                            class="col-content"
+                            v-bind="tableColumnComponents[props.col.name].props(props)"
+                            @click="tableColumnComponents[props.col.name].event(props)"
+                        >
+                            {{ props.value }}
+                            <CustomerDescriptorProxy :id="selectedCustomerId" />
+                        </component>
+                    </QTr>
+                </QTd>
+            </template>
+        </QTable>
+    </QPage>
+</template>
+
+<style lang="scss" scoped>
+.col-content {
+    border-radius: 4px;
+    padding: 6px 6px 6px 6px;
+}
+</style>
+
+<i18n>
+es:
+    Identifier: Identificador
+    Social name: Razón social
+    Salesperson: Comercial
+    Phone: Teléfono
+    City: Población
+    Email: Email
+</i18n>
diff --git a/src/pages/Customer/CustomerNotificationsFilter.vue b/src/pages/Customer/CustomerNotificationsFilter.vue
new file mode 100644
index 000000000..1c4c8f3e2
--- /dev/null
+++ b/src/pages/Customer/CustomerNotificationsFilter.vue
@@ -0,0 +1,144 @@
+<script setup>
+import { ref } from 'vue';
+import { useI18n } from 'vue-i18n';
+
+import FetchData from 'components/FetchData.vue';
+import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
+import VnSelectFilter from 'components/common/VnSelectFilter.vue';
+import VnInput from 'src/components/common/VnInput.vue';
+
+const { t } = useI18n();
+const props = defineProps({
+    dataKey: {
+        type: String,
+        required: true,
+    },
+});
+
+const clients = ref();
+const cities = ref();
+</script>
+
+<template>
+    <FetchData
+        url="Clients"
+        :filter="{ where: { role: 'socialName' } }"
+        @on-fetch="(data) => (clients = data)"
+        auto-load
+    />
+    <FetchData url="Towns" @on-fetch="(data) => (cities = data)" auto-load />
+    <VnFilterPanel :data-key="props.dataKey" :search-button="true">
+        <template #tags="{ tag, formatFn }">
+            <div class="q-gutter-x-xs">
+                <strong>{{ t(`params.${tag.label}`) }}: </strong>
+                <span>{{ formatFn(tag.value) }}</span>
+            </div>
+        </template>
+
+        <template #body="{ params, searchFn }">
+            <QList dense class="list">
+                <QItem class="q-mb-sm q-mt-sm">
+                    <QItemSection>
+                        <VnInput
+                            :label="t('Identifier')"
+                            v-model="params.identifier"
+                            is-outlined
+                        />
+                    </QItemSection>
+                </QItem>
+
+                <QItem class="q-mb-sm">
+                    <QItemSection v-if="!clients">
+                        <QSkeleton type="QInput" class="full-width" />
+                    </QItemSection>
+                    <QItemSection v-if="clients">
+                        <VnSelectFilter
+                            :label="t('Social name')"
+                            v-model="params.socialName"
+                            @update:model-value="searchFn()"
+                            :options="clients"
+                            option-value="socialName"
+                            option-label="socialName"
+                            emit-value
+                            map-options
+                            use-input
+                            hide-selected
+                            dense
+                            outlined
+                            rounded
+                            :input-debounce="0"
+                        />
+                    </QItemSection>
+                </QItem>
+
+                <QItem class="q-mb-sm">
+                    <QItemSection v-if="!cities">
+                        <QSkeleton type="QInput" class="full-width" />
+                    </QItemSection>
+                    <QItemSection v-if="cities">
+                        <VnSelectFilter
+                            :label="t('City')"
+                            v-model="params.city"
+                            @update:model-value="searchFn()"
+                            :options="cities"
+                            option-value="name"
+                            option-label="name"
+                            emit-value
+                            map-options
+                            use-input
+                            hide-selected
+                            dense
+                            outlined
+                            rounded
+                            :input-debounce="0"
+                        />
+                    </QItemSection>
+                </QItem>
+
+                <QItem class="q-mb-sm">
+                    <QItemSection>
+                        <VnInput :label="t('Phone')" v-model="params.phone" is-outlined />
+                    </QItemSection>
+                </QItem>
+
+                <QItem class="q-mb-sm">
+                    <QItemSection>
+                        <VnInput :label="t('Email')" v-model="params.email" is-outlined />
+                    </QItemSection>
+                </QItem>
+                <QSeparator />
+            </QList>
+        </template>
+    </VnFilterPanel>
+</template>
+
+<style scoped>
+.list {
+    width: 256px;
+}
+.list * {
+    max-width: 100%;
+}
+</style>
+
+<i18n>
+en:
+    params:
+        identifier: Identifier
+        socialName: Social name
+        city: City
+        phone: Phone
+        email: Email
+es:
+    params:
+        identifier: Identificador
+        socialName: Razón social
+        city: Población
+        phone: Teléfono
+        email: Email
+    Identifier: Identificador
+    Social name: Razón social
+    City: Población
+    Phone: Teléfono
+    Email: Email
+</i18n>
diff --git a/src/router/modules/customer.js b/src/router/modules/customer.js
index ec81a9c77..04cbf42b3 100644
--- a/src/router/modules/customer.js
+++ b/src/router/modules/customer.js
@@ -10,7 +10,12 @@ export default {
     component: RouterView,
     redirect: { name: 'CustomerMain' },
     menus: {
-        main: ['CustomerList', 'CustomerPayments', 'CustomerExtendedList'],
+        main: [
+            'CustomerList',
+            'CustomerPayments',
+            'CustomerExtendedList',
+            'CustomerNotifications',
+        ],
         card: ['CustomerBasicData'],
     },
     children: [
@@ -56,6 +61,16 @@ export default {
                     component: () =>
                         import('src/pages/Customer/CustomerExtendedList.vue'),
                 },
+                {
+                    path: 'notifications',
+                    name: 'CustomerNotifications',
+                    meta: {
+                        title: 'notifications',
+                        icon: 'notifications',
+                    },
+                    component: () =>
+                        import('src/pages/Customer/CustomerNotifications.vue'),
+                },
             ],
         },
         {

From 2e09fbd9688b907dafe4b1fac3caadc955f5c5c7 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Mon, 25 Dec 2023 20:38:13 -0300
Subject: [PATCH 06/36] Department tree and summary view

---
 src/components/CreateDepartmentChild.vue      | 100 ++++++++++++++
 src/components/ui/VnTree.vue                  |  88 +++++++++---
 src/i18n/en/index.js                          |  20 +++
 src/i18n/es/index.js                          |  20 +++
 .../Department/Card/DepartmentBasicData.vue   |   3 +
 src/pages/Department/Card/DepartmentCard.vue  |  34 +++++
 .../Department/Card/DepartmentDescriptor.vue  | 129 ++++++++++++++++++
 .../Department/Card/DepartmentSummary.vue     | 107 +++++++++++++++
 src/router/modules/department.js              |  46 +++++++
 src/router/modules/index.js                   |   2 +
 src/router/modules/worker.js                  |   1 +
 src/router/routes.js                          |   4 +-
 12 files changed, 532 insertions(+), 22 deletions(-)
 create mode 100644 src/components/CreateDepartmentChild.vue
 create mode 100644 src/pages/Department/Card/DepartmentBasicData.vue
 create mode 100644 src/pages/Department/Card/DepartmentCard.vue
 create mode 100644 src/pages/Department/Card/DepartmentDescriptor.vue
 create mode 100644 src/pages/Department/Card/DepartmentSummary.vue
 create mode 100644 src/router/modules/department.js

diff --git a/src/components/CreateDepartmentChild.vue b/src/components/CreateDepartmentChild.vue
new file mode 100644
index 000000000..8f5b4b874
--- /dev/null
+++ b/src/components/CreateDepartmentChild.vue
@@ -0,0 +1,100 @@
+<script setup>
+import { onMounted, reactive, ref } from 'vue';
+import { useI18n } from 'vue-i18n';
+
+import VnRow from 'components/ui/VnRow.vue';
+import VnInput from 'src/components/common/VnInput.vue';
+import FormModel from 'components/FormModel.vue';
+
+const emit = defineEmits(['onDataSaved']);
+
+const $props = defineProps({
+    parentId: {
+        type: Number,
+        default: null,
+    },
+});
+
+const { t } = useI18n();
+
+const departmentChildData = reactive({
+    name: null,
+});
+
+const closeButton = ref(null);
+const isLoading = ref(false);
+
+const onDataSaved = () => {
+    emit('onDataSaved');
+    closeForm();
+};
+
+const closeForm = () => {
+    if (closeButton.value) closeButton.value.click();
+};
+
+onMounted(() => {
+    if ($props.parentId) departmentChildData.parentId = $props.parentId;
+});
+</script>
+
+<template>
+    <FormModel
+        :form-initial-data="departmentChildData"
+        :observe-form-changes="false"
+        :default-actions="false"
+        url-create="departments/createChild"
+        @on-data-saved="onDataSaved()"
+    >
+        <template #form="{ data }">
+            <span ref="closeButton" class="close-icon" v-close-popup>
+                <QIcon name="close" size="sm" />
+            </span>
+            <h1 class="title">{{ t('New department') }}</h1>
+            <VnRow class="row q-gutter-md q-mb-md" style="min-width: 250px">
+                <div class="col">
+                    <VnInput :label="t('Name')" v-model="data.name" />
+                </div>
+            </VnRow>
+            <div class="q-mt-lg row justify-end">
+                <QBtn
+                    :label="t('globals.cancel')"
+                    type="reset"
+                    color="primary"
+                    flat
+                    class="q-ml-sm"
+                    :disabled="isLoading"
+                    :loading="isLoading"
+                    v-close-popup
+                />
+                <QBtn
+                    :label="t('globals.save')"
+                    type="submit"
+                    color="primary"
+                    :disabled="isLoading"
+                    :loading="isLoading"
+                />
+            </div>
+        </template>
+    </FormModel>
+</template>
+
+<style lang="scss" scoped>
+.close-icon {
+    position: absolute;
+    top: 20px;
+    right: 20px;
+    cursor: pointer;
+}
+.title {
+    font-size: 17px;
+    font-weight: bold;
+    line-height: 20px;
+}
+</style>
+
+<i18n>
+es:
+    Name: Nombre
+    New department: Nuevo departamento
+</i18n>
diff --git a/src/components/ui/VnTree.vue b/src/components/ui/VnTree.vue
index 08541b6df..23faf770f 100644
--- a/src/components/ui/VnTree.vue
+++ b/src/components/ui/VnTree.vue
@@ -1,12 +1,22 @@
 <script setup>
 import { ref } from 'vue';
 import { useI18n } from 'vue-i18n';
+import { useRouter } from 'vue-router';
+import { useQuasar } from 'quasar';
+
+import CreateDepartmentChild from '../CreateDepartmentChild.vue';
 
 import axios from 'axios';
+import useNotify from 'src/composables/useNotify.js';
 
+const quasar = useQuasar();
 const { t } = useI18n();
+const router = useRouter();
+const { notify } = useNotify();
 
 const treeRef = ref(null);
+const showCreateNodeFormVal = ref(false);
+const creationNodeSelectedId = ref(null);
 const expanded = ref([]);
 
 const nodes = ref([{ id: null, name: t('Departments'), sons: true, children: [{}] }]);
@@ -42,16 +52,41 @@ const fetchNodeLeaves = async (nodeKey) => {
     }
 };
 
-const removeNode = () => {};
-
-const createNode = async () => {
-    // const param = null;
-    // const response = axios.post('departments/createChild', param);
+const removeNode = (node) => {
+    quasar
+        .dialog({
+            title: 'Are you sure you want to delete it?',
+            message: 'Delete department',
+            ok: {
+                push: true,
+                color: 'primary',
+            },
+            cancel: true,
+        })
+        .onOk(async () => {
+            try {
+                await axios.post(`/Departments/${node.id}/removeChild`, node.id);
+                notify('department.departmentRemoved', 'positive');
+                await fetchNodeLeaves(node.parentFk);
+            } catch (err) {
+                console.log('Error removing department');
+            }
+        });
 };
 
-// const redirectToDepartmentSummary = () => {
-//     console.log('redirect to department summary:: ');
-// };
+const showCreateNodeForm = (nodeId) => {
+    showCreateNodeFormVal.value = true;
+    creationNodeSelectedId.value = nodeId;
+};
+
+const onNodeCreated = async () => {
+    await fetchNodeLeaves(creationNodeSelectedId.value);
+};
+
+const redirectToDepartmentSummary = (id) => {
+    if (!id) return;
+    router.push({ name: 'DepartmentSummary', params: { id: id } });
+};
 </script>
 
 <template>
@@ -65,22 +100,21 @@ const createNode = async () => {
             @update:expanded="onNodeExpanded($event)"
         >
             <template #default-header="prop">
-                <div class="row justify-between full-width bg-red q-pr-md">
-                    <!-- <pre>{{ prop }}</pre> -->
+                <div
+                    class="row justify-between full-width q-pr-md cursor-pointer"
+                    @click.stop="redirectToDepartmentSummary(prop.node.id)"
+                >
                     <span class="text-uppercase">
                         {{ prop.node.name }}
                     </span>
-                    <div
-                        class="row bg-green justify-between"
-                        style="max-width: max-content"
-                    >
+                    <div class="row justify-between" style="max-width: max-content">
                         <QIcon
                             v-if="prop.node.id"
                             name="delete"
                             color="primary"
                             size="sm"
-                            class="q-pr-xs"
-                            @click.stop="removeNode()"
+                            class="q-pr-xs cursor-pointer"
+                            @click.stop="removeNode(prop.node)"
                         >
                             <QTooltip>
                                 {{ t('Remove') }}
@@ -90,17 +124,27 @@ const createNode = async () => {
                             name="add"
                             color="primary"
                             size="sm"
-                            @click.stop="createNode()"
+                            class="cursor-pointer"
+                            @click.stop="showCreateNodeForm(prop.node.id)"
                         >
                             <QTooltip>
                                 {{ t('Create') }}
-                            </QTooltip></QIcon
-                        >
+                            </QTooltip>
+                        </QIcon>
                     </div>
                 </div>
             </template>
         </QTree>
-        <pre>{{ nodes }}</pre>
+        <QDialog
+            v-model="showCreateNodeFormVal"
+            transition-show="scale"
+            transition-hide="scale"
+        >
+            <CreateDepartmentChild
+                :parent-id="creationNodeSelectedId"
+                @on-data-saved="onNodeCreated()"
+            />
+        </QDialog>
     </QCard>
 </template>
 
@@ -109,4 +153,6 @@ const createNode = async () => {
         Departments: Departamentos
         Remove: Quitar
         Create: Crear
-    </i18n>
+        Are you sure you want to delete it?: ¿Seguro que quieres eliminarlo?
+        Delete department: Eliminar departamento
+</i18n>
diff --git a/src/i18n/en/index.js b/src/i18n/en/index.js
index 66e725f4f..023016f4c 100644
--- a/src/i18n/en/index.js
+++ b/src/i18n/en/index.js
@@ -604,6 +604,26 @@ export default {
             amount: 'Amount',
         },
     },
+    department: {
+        pageTitles: {
+            basicData: 'Basic data',
+            department: 'Department',
+            summary: 'Summary',
+        },
+        basicData: 'Basic data',
+        name: 'Name',
+        code: 'Code',
+        chat: 'Chat',
+        bossDepartment: 'Boss Department',
+        email: 'Email',
+        selfConsumptionCustomer: 'Self-consumption customer',
+        telework: 'Telework',
+        notifyOnErrors: 'Notify on errors',
+        worksInProduction: 'Works in production',
+        hasToRefill: 'Fill in days without physical check-ins',
+        hasToSendMail: 'Send check-ins by email',
+        departmentRemoved: 'Department removed',
+    },
     worker: {
         pageTitles: {
             workers: 'Workers',
diff --git a/src/i18n/es/index.js b/src/i18n/es/index.js
index 66f14a2c1..8eb15af43 100644
--- a/src/i18n/es/index.js
+++ b/src/i18n/es/index.js
@@ -604,6 +604,26 @@ export default {
             country: 'País',
         },
     },
+    department: {
+        pageTitles: {
+            basicData: 'Basic data',
+            department: 'Departamentos',
+            summary: 'Resumen',
+        },
+        basicData: 'Datos básicos',
+        name: 'Nombre',
+        code: 'Código',
+        chat: 'Chat',
+        bossDepartment: 'Jefe de departamento',
+        email: 'Email',
+        selfConsumptionCustomer: 'Cliente autoconsumo',
+        telework: 'Teletrabaja',
+        notifyOnErrors: 'Notificar errores',
+        worksInProduction: 'Pertenece a producción',
+        hasToRefill: 'Completar días sin registros físicos',
+        hasToSendMail: 'Enviar fichadas por mail',
+        departmentRemoved: 'Departamento eliminado',
+    },
     worker: {
         pageTitles: {
             workers: 'Trabajadores',
diff --git a/src/pages/Department/Card/DepartmentBasicData.vue b/src/pages/Department/Card/DepartmentBasicData.vue
new file mode 100644
index 000000000..c4068c60d
--- /dev/null
+++ b/src/pages/Department/Card/DepartmentBasicData.vue
@@ -0,0 +1,3 @@
+<script setup></script>
+
+<template>Department basic data</template>
diff --git a/src/pages/Department/Card/DepartmentCard.vue b/src/pages/Department/Card/DepartmentCard.vue
new file mode 100644
index 000000000..a175d6bb4
--- /dev/null
+++ b/src/pages/Department/Card/DepartmentCard.vue
@@ -0,0 +1,34 @@
+<script setup>
+import { useStateStore } from 'stores/useStateStore';
+import DepartmentDescriptor from 'pages/Department/Card/DepartmentDescriptor.vue';
+import LeftMenu from 'components/LeftMenu.vue';
+
+const stateStore = useStateStore();
+</script>
+<template>
+    <QDrawer v-model="stateStore.leftDrawer" show-if-above :width="256">
+        <QScrollArea class="fit">
+            <DepartmentDescriptor />
+            <QSeparator />
+            <LeftMenu source="card" />
+        </QScrollArea>
+    </QDrawer>
+    <QPageContainer>
+        <QPage>
+            <QToolbar class="bg-vn-dark justify-end">
+                <div id="st-data"></div>
+                <QSpace />
+                <div id="st-actions"></div>
+            </QToolbar>
+            <div class="q-pa-md column items-center">
+                <RouterView></RouterView>
+            </div>
+        </QPage>
+    </QPageContainer>
+</template>
+
+<i18n>
+es:
+    Search worker: Buscar trabajador
+    You can search by worker id or name: Puedes buscar por id o nombre del trabajador
+</i18n>
diff --git a/src/pages/Department/Card/DepartmentDescriptor.vue b/src/pages/Department/Card/DepartmentDescriptor.vue
new file mode 100644
index 000000000..1f7e6dcbb
--- /dev/null
+++ b/src/pages/Department/Card/DepartmentDescriptor.vue
@@ -0,0 +1,129 @@
+<script setup>
+import { computed, ref } from 'vue';
+import { useRoute, useRouter } from 'vue-router';
+import { useI18n } from 'vue-i18n';
+import { useQuasar } from 'quasar';
+
+import VnLv from 'src/components/ui/VnLv.vue';
+import CardDescriptor from 'src/components/ui/CardDescriptor.vue';
+import useCardDescription from 'src/composables/useCardDescription';
+
+import axios from 'axios';
+import useNotify from 'src/composables/useNotify.js';
+
+const $props = defineProps({
+    id: {
+        type: Number,
+        required: false,
+        default: null,
+    },
+    summary: {
+        type: Object,
+        default: null,
+    },
+});
+
+const quasar = useQuasar();
+const route = useRoute();
+const router = useRouter();
+
+const { t } = useI18n();
+const { notify } = useNotify();
+
+const entityId = computed(() => {
+    return $props.id || route.params.id;
+});
+
+const department = ref();
+
+const data = ref(useCardDescription());
+
+const setData = (entity) => {
+    if (!entity) return;
+    data.value = useCardDescription(entity.name, entity.id);
+};
+
+const removeDepartment = () => {
+    console.log('entityId: ', entityId.value);
+    quasar
+        .dialog({
+            title: 'Are you sure you want to delete it?',
+            message: 'Delete department',
+            ok: {
+                push: true,
+                color: 'primary',
+            },
+            cancel: true,
+        })
+        .onOk(async () => {
+            try {
+                await axios.post(
+                    `/Departments/${entityId.value}/removeChild`,
+                    entityId.value
+                );
+                router.push({ name: 'WorkerDepartment' });
+                notify('department.departmentRemoved', 'positive');
+            } catch (err) {
+                console.log('Error removing department');
+            }
+        });
+};
+</script>
+<template>
+    <CardDescriptor
+        module="Department"
+        data-key="departmentData"
+        :url="`Departments/${entityId}`"
+        :title="data.title"
+        :subtitle="data.subtitle"
+        :summary="$props.summary"
+        @on-fetch="
+            (data) => {
+                department = data;
+                setData(data);
+            }
+        "
+    >
+        <template #menu="{}">
+            <QItem v-ripple clickable @click="removeDepartment()">
+                <QItemSection>{{ t('Delete') }}</QItemSection>
+            </QItem>
+        </template>
+        <template #body="{ entity }">
+            <VnLv :label="t('department.chat')" :value="entity.chatName" dash />
+            <VnLv :label="t('department.email')" :value="entity.notificationEmail" dash />
+            <VnLv
+                :label="t('department.selfConsumptionCustomer')"
+                :value="entity.client?.name"
+                dash
+            />
+            <VnLv
+                :label="t('department.bossDepartment')"
+                :value="entity.worker?.user?.name"
+                dash
+            />
+        </template>
+        <template #actions>
+            <QCardActions>
+                <QBtn
+                    size="md"
+                    icon="vn:worker"
+                    color="primary"
+                    :to="{
+                        name: 'WorkerList',
+                        query: {
+                            params: JSON.stringify({ departmentFk: entityId }),
+                        },
+                    }"
+                >
+                    <QTooltip>{{ t('Department workers') }}</QTooltip>
+                </QBtn>
+            </QCardActions>
+        </template>
+    </CardDescriptor>
+</template>
+
+<i18n>
+    es:
+        Department workers: Trabajadores del departamento
+</i18n>
diff --git a/src/pages/Department/Card/DepartmentSummary.vue b/src/pages/Department/Card/DepartmentSummary.vue
new file mode 100644
index 000000000..40bb4c83d
--- /dev/null
+++ b/src/pages/Department/Card/DepartmentSummary.vue
@@ -0,0 +1,107 @@
+<script setup>
+import { ref, onMounted, computed } from 'vue';
+import { useRoute } from 'vue-router';
+import { useI18n } from 'vue-i18n';
+import CardSummary from 'components/ui/CardSummary.vue';
+import { getUrl } from 'src/composables/getUrl';
+import VnLv from 'src/components/ui/VnLv.vue';
+
+const route = useRoute();
+const { t } = useI18n();
+
+const $props = defineProps({
+    id: {
+        type: Number,
+        default: 0,
+    },
+});
+
+const entityId = computed(() => $props.id || route.params.id);
+const departmentUrl = ref();
+
+onMounted(async () => {
+    departmentUrl.value = (await getUrl('')) + `departments/${entityId.value}/`;
+});
+</script>
+
+<template>
+    <CardSummary
+        ref="summary"
+        :url="`Departments/${entityId}`"
+        class="full-width"
+        style="max-width: 900px"
+    >
+        <template #header="{ entity }">
+            <div>{{ entity.name }}</div>
+        </template>
+        <template #body="{ entity: department }">
+            <QCard class="column">
+                <a class="header" :href="department + `basic-data`">
+                    {{ t('Basic data') }}
+                    <QIcon name="open_in_new" color="primary" />
+                </a>
+                <div class="full-width row wrap justify-between content-between">
+                    <div class="column" style="min-width: 50%">
+                        <VnLv
+                            :label="t('department.name')"
+                            :value="department.name"
+                            dash
+                        />
+                        <VnLv
+                            :label="t('department.code')"
+                            :value="department.code"
+                            dash
+                        />
+                        <VnLv
+                            :label="t('department.chat')"
+                            :value="department.chatName"
+                            dash
+                        />
+                        <VnLv
+                            :label="t('department.bossDepartment')"
+                            :value="department.worker?.user?.name"
+                            dash
+                        />
+                        <VnLv
+                            :label="t('department.email')"
+                            :value="department.notificationEmail"
+                            dash
+                        />
+                        <VnLv
+                            :label="t('department.selfConsumptionCustomer')"
+                            :value="department.client?.name"
+                            dash
+                        />
+                    </div>
+                    <div class="column" style="min-width: 50%">
+                        <VnLv
+                            :label="t('department.telework')"
+                            :value="department.isTeleworking"
+                            dash
+                        />
+                        <VnLv
+                            :label="t('department.notifyOnErrors')"
+                            :value="Boolean(department.hasToMistake)"
+                            dash
+                        />
+                        <VnLv
+                            :label="t('department.worksInProduction')"
+                            :value="department.isProduction"
+                            dash
+                        />
+                        <VnLv
+                            :label="t('department.hasToRefill')"
+                            :value="department.hasToRefill"
+                            dash
+                        />
+                        <VnLv
+                            :label="t('department.hasToSendMail')"
+                            :value="department.hasToSendMail"
+                            dash
+                        />
+                    </div>
+                </div>
+            </QCard>
+        </template>
+    </CardSummary>
+</template>
diff --git a/src/router/modules/department.js b/src/router/modules/department.js
new file mode 100644
index 000000000..aaffc3460
--- /dev/null
+++ b/src/router/modules/department.js
@@ -0,0 +1,46 @@
+import { RouterView } from 'vue-router';
+
+export default {
+    path: '/department',
+    name: 'Department',
+    meta: {
+        title: 'department',
+        icon: 'vn:greuge',
+    },
+    component: RouterView,
+    redirect: { name: 'DepartmentCard' },
+    menus: {
+        main: [],
+        card: ['DepartmentBasicData'],
+    },
+    children: [
+        {
+            name: 'DepartmentCard',
+            path: 'department/:id',
+            component: () => import('src/pages/Department/Card/DepartmentCard.vue'),
+            redirect: { name: 'DepartmentSummary' },
+            children: [
+                {
+                    name: 'DepartmentSummary',
+                    path: 'summary',
+                    meta: {
+                        title: 'summary',
+                        icon: 'launch',
+                    },
+                    component: () =>
+                        import('src/pages/Department/Card/DepartmentSummary.vue'),
+                },
+                {
+                    name: 'DepartmentBasicData',
+                    path: 'basic-data',
+                    meta: {
+                        title: 'basicData',
+                        icon: 'vn:settings',
+                    },
+                    component: () =>
+                        import('src/pages/Department/Card/DepartmentBasicData.vue'),
+                },
+            ],
+        },
+    ],
+};
diff --git a/src/router/modules/index.js b/src/router/modules/index.js
index 1eff2c180..68d1d8146 100644
--- a/src/router/modules/index.js
+++ b/src/router/modules/index.js
@@ -10,6 +10,7 @@ import Route from './route';
 import Supplier from './Supplier';
 import Travel from './travel';
 import Order from './order';
+import Department from './department';
 
 export default [
     Customer,
@@ -24,4 +25,5 @@ export default [
     Travel,
     Order,
     invoiceIn,
+    Department,
 ];
diff --git a/src/router/modules/worker.js b/src/router/modules/worker.js
index f2332618f..27a6f19a9 100644
--- a/src/router/modules/worker.js
+++ b/src/router/modules/worker.js
@@ -12,6 +12,7 @@ export default {
     menus: {
         main: ['WorkerList', 'WorkerDepartment'],
         card: ['WorkerNotificationsManager'],
+        departmentCard: ['BasicData'],
     },
     children: [
         {
diff --git a/src/router/routes.js b/src/router/routes.js
index ee8b30d64..32f5aaef6 100644
--- a/src/router/routes.js
+++ b/src/router/routes.js
@@ -8,8 +8,9 @@ import wagon from './modules/wagon';
 import supplier from './modules/Supplier';
 import route from './modules/route';
 import travel from './modules/travel';
+import department from './modules/department';
 import shelving from 'src/router/modules/shelving';
-import order from "src/router/modules/order";
+import order from 'src/router/modules/order';
 
 const routes = [
     {
@@ -61,6 +62,7 @@ const routes = [
             route,
             supplier,
             travel,
+            department,
             {
                 path: '/:catchAll(.*)*',
                 name: 'NotFound',

From 893b1bb4c8471645c8976110d6381f90059acaae Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Tue, 26 Dec 2023 16:15:46 -0300
Subject: [PATCH 07/36] Add department basic data

---
 src/components/FormModel.vue                  |  11 +-
 src/i18n/en/index.js                          |   1 -
 src/i18n/es/index.js                          |   1 -
 .../Department/Card/DepartmentBasicData.vue   | 136 +++++++++++++++++-
 src/pages/Department/Card/DepartmentCard.vue  |   6 -
 5 files changed, 141 insertions(+), 14 deletions(-)

diff --git a/src/components/FormModel.vue b/src/components/FormModel.vue
index 62993ef24..e683ce735 100644
--- a/src/components/FormModel.vue
+++ b/src/components/FormModel.vue
@@ -58,7 +58,7 @@ const $props = defineProps({
     mapper: {
         type: Function,
         default: null,
-    }
+    },
 });
 
 const emit = defineEmits(['onFetch', 'onDataSaved']);
@@ -129,7 +129,7 @@ async function save() {
     isLoading.value = true;
 
     try {
-        const body = $props.mapper ? $props.mapper(formData.value) : formData.value
+        const body = $props.mapper ? $props.mapper(formData.value) : formData.value;
         if ($props.urlCreate) {
             await axios.post($props.urlCreate, body);
             notify('globals.dataCreated', 'positive');
@@ -179,11 +179,14 @@ watch(formUrl, async () => {
 });
 </script>
 <template>
-    <QBanner v-if="$props.observeFormChanges && hasChanges" class="text-white bg-warning">
+    <QBanner
+        v-if="$props.observeFormChanges && hasChanges"
+        class="text-white bg-warning full-width"
+    >
         <QIcon name="warning" size="md" class="q-mr-md" />
         <span>{{ t('globals.changesToSave') }}</span>
     </QBanner>
-    <div class="column items-center">
+    <div class="column items-center full-width">
         <QForm
             v-if="formData"
             @submit="save"
diff --git a/src/i18n/en/index.js b/src/i18n/en/index.js
index 023016f4c..e0b37b17e 100644
--- a/src/i18n/en/index.js
+++ b/src/i18n/en/index.js
@@ -610,7 +610,6 @@ export default {
             department: 'Department',
             summary: 'Summary',
         },
-        basicData: 'Basic data',
         name: 'Name',
         code: 'Code',
         chat: 'Chat',
diff --git a/src/i18n/es/index.js b/src/i18n/es/index.js
index 8eb15af43..6e7364cc7 100644
--- a/src/i18n/es/index.js
+++ b/src/i18n/es/index.js
@@ -610,7 +610,6 @@ export default {
             department: 'Departamentos',
             summary: 'Resumen',
         },
-        basicData: 'Datos básicos',
         name: 'Nombre',
         code: 'Código',
         chat: 'Chat',
diff --git a/src/pages/Department/Card/DepartmentBasicData.vue b/src/pages/Department/Card/DepartmentBasicData.vue
index c4068c60d..3b30a97e6 100644
--- a/src/pages/Department/Card/DepartmentBasicData.vue
+++ b/src/pages/Department/Card/DepartmentBasicData.vue
@@ -1,3 +1,135 @@
-<script setup></script>
+<script setup>
+import { ref } from 'vue';
+import { useRoute } from 'vue-router';
+import { useI18n } from 'vue-i18n';
 
-<template>Department basic data</template>
+import FetchData from 'components/FetchData.vue';
+import FormModel from 'components/FormModel.vue';
+import VnRow from 'components/ui/VnRow.vue';
+import VnInput from 'src/components/common/VnInput.vue';
+import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+
+const route = useRoute();
+const { t } = useI18n();
+
+const workersOptions = ref([]);
+const clientsOptions = ref([]);
+</script>
+<template>
+    <fetch-data
+        url="Workers/search"
+        @on-fetch="(data) => (workersOptions = data)"
+        auto-load
+    />
+    <fetch-data url="Clients" @on-fetch="(data) => (clientsOptions = data)" auto-load />
+    <FormModel
+        :url="`Departments/${route.params.id}`"
+        model="department"
+        auto-load
+        class="full-width"
+    >
+        <template #form="{ data, validate }">
+            <VnRow class="row q-gutter-md q-mb-md">
+                <div class="col">
+                    <VnInput
+                        :label="t('department.name')"
+                        v-model="data.name"
+                        :rules="validate('department.name')"
+                        clearable
+                        autofocus
+                    />
+                </div>
+                <div class="col">
+                    <VnInput
+                        v-model="data.code"
+                        :label="t('department.code')"
+                        :rules="validate('department.code')"
+                        clearable
+                    />
+                </div>
+            </VnRow>
+            <VnRow class="row q-gutter-md q-mb-md">
+                <div class="col">
+                    <VnInput
+                        :label="t('department.chat')"
+                        v-model="data.chatName"
+                        :rules="validate('department.chat')"
+                        clearable
+                    />
+                </div>
+                <div class="col">
+                    <VnInput
+                        v-model="data.notificationEmail"
+                        :label="t('department.email')"
+                        :rules="validate('department.email')"
+                        clearable
+                    />
+                </div>
+            </VnRow>
+            <VnRow class="row q-gutter-md q-mb-md">
+                <div class="col">
+                    <VnSelectFilter
+                        :label="t('department.bossDepartment')"
+                        v-model="data.workerFk"
+                        :options="workersOptions"
+                        option-value="id"
+                        option-label="name"
+                        hide-selected
+                        map-options
+                        :rules="validate('department.workerFk')"
+                    />
+                </div>
+                <div class="col">
+                    <VnSelectFilter
+                        :label="t('department.selfConsumptionCustomer')"
+                        v-model="data.clientFk"
+                        :options="clientsOptions"
+                        option-value="id"
+                        option-label="name"
+                        hide-selected
+                        map-options
+                        :rules="validate('department.clientFk')"
+                    />
+                </div>
+            </VnRow>
+            <VnRow class="row q-gutter-md q-mb-md">
+                <div class="col">
+                    <QCheckbox
+                        :label="t('department.telework')"
+                        v-model="data.isTeleworking"
+                    />
+                </div>
+                <div class="col">
+                    <QCheckbox
+                        :label="t('department.notifyOnErrors')"
+                        v-model="data.hasToMistake"
+                        :false-value="0"
+                        :true-value="1"
+                    />
+                </div>
+            </VnRow>
+            <VnRow class="row q-gutter-md q-mb-md">
+                <div class="col">
+                    <QCheckbox
+                        :label="t('department.worksInProduction')"
+                        v-model="data.isProduction"
+                    />
+                </div>
+                <div class="col">
+                    <QCheckbox
+                        :label="t('department.hasToRefill')"
+                        v-model="data.hasToRefill"
+                    />
+                </div>
+            </VnRow>
+            <VnRow class="row q-gutter-md q-mb-md">
+                <div class="col">
+                    <QCheckbox
+                        :label="t('department.hasToSendMail')"
+                        v-model="data.hasToSendMail"
+                    />
+                </div>
+            </VnRow>
+        </template>
+    </FormModel>
+</template>
diff --git a/src/pages/Department/Card/DepartmentCard.vue b/src/pages/Department/Card/DepartmentCard.vue
index a175d6bb4..885b5e5f1 100644
--- a/src/pages/Department/Card/DepartmentCard.vue
+++ b/src/pages/Department/Card/DepartmentCard.vue
@@ -26,9 +26,3 @@ const stateStore = useStateStore();
         </QPage>
     </QPageContainer>
 </template>
-
-<i18n>
-es:
-    Search worker: Buscar trabajador
-    You can search by worker id or name: Puedes buscar por id o nombre del trabajador
-</i18n>

From 5729204a3b39c5f2e56f33cdd6742ffdd990b897 Mon Sep 17 00:00:00 2001
From: carlosfonseca <carlos.fonseca@mindshore.io>
Date: Thu, 28 Dec 2023 10:25:23 -0500
Subject: [PATCH 08/36] Se crea tabla y filtros de morosos en clientes

---
 src/i18n/en/index.js                          |   9 +-
 src/i18n/es/index.js                          |   9 +-
 .../Customer/Defaulter/CustomerDefaulter.vue  | 253 ++++++++++++++++++
 .../Defaulter/CustomerDefaulterFilter.vue     | 238 ++++++++++++++++
 .../CustomerExtendedList.vue                  |   0
 .../CustomerExtendedListActions.vue           |   2 +-
 .../CustomerExtendedListFilter.vue            |  17 +-
 .../CustomerNotifications.vue                 |   2 +-
 .../CustomerNotificationsFilter.vue           |  50 ++--
 .../{ => Payments}/CustomerPayments.vue       |   2 +-
 .../{ => Payments}/CustomerPaymentsFilter.vue |   0
 src/router/modules/customer.js                |  22 +-
 .../pages/Customer/CustomerPayments.spec.js   |   8 +-
 13 files changed, 552 insertions(+), 60 deletions(-)
 create mode 100644 src/pages/Customer/Defaulter/CustomerDefaulter.vue
 create mode 100644 src/pages/Customer/Defaulter/CustomerDefaulterFilter.vue
 rename src/pages/Customer/{ => ExtendedList}/CustomerExtendedList.vue (100%)
 rename src/pages/Customer/{ => ExtendedList}/CustomerExtendedListActions.vue (94%)
 rename src/pages/Customer/{ => ExtendedList}/CustomerExtendedListFilter.vue (91%)
 rename src/pages/Customer/{ => Notifications}/CustomerNotifications.vue (98%)
 rename src/pages/Customer/{ => Notifications}/CustomerNotificationsFilter.vue (94%)
 rename src/pages/Customer/{ => Payments}/CustomerPayments.vue (99%)
 rename src/pages/Customer/{ => Payments}/CustomerPaymentsFilter.vue (100%)

diff --git a/src/i18n/en/index.js b/src/i18n/en/index.js
index f7234ba57..18a2e4ecf 100644
--- a/src/i18n/en/index.js
+++ b/src/i18n/en/index.js
@@ -113,6 +113,7 @@ export default {
             webPayments: 'Web Payments',
             extendedList: 'Extended list',
             notifications: 'Notifications',
+            defaulter: 'Defaulter',
             createCustomer: 'Create customer',
             summary: 'Summary',
             basicData: 'Basic Data',
@@ -568,7 +569,7 @@ export default {
             landed: 'Landed',
             hour: 'Hour',
             agency: 'Agency',
-            total: 'Total'
+            total: 'Total',
         },
         form: {
             clientFk: 'Client',
@@ -577,7 +578,7 @@ export default {
             agencyModeFk: 'Agency',
         },
         list: {
-            newOrder: 'New Order'
+            newOrder: 'New Order',
         },
         summary: {
             basket: 'Basket',
@@ -603,8 +604,8 @@ export default {
             description: 'Description',
             quantity: 'Quantity',
             price: 'Price',
-            amount: 'Amount'
-        }
+            amount: 'Amount',
+        },
     },
     worker: {
         pageTitles: {
diff --git a/src/i18n/es/index.js b/src/i18n/es/index.js
index f96add139..af8191052 100644
--- a/src/i18n/es/index.js
+++ b/src/i18n/es/index.js
@@ -113,6 +113,7 @@ export default {
             webPayments: 'Pagos Web',
             extendedList: 'Listado extendido',
             notifications: 'Notificaciones',
+            defaulter: 'Morosos',
             createCustomer: 'Crear cliente',
             basicData: 'Datos básicos',
             summary: 'Resumen',
@@ -477,7 +478,7 @@ export default {
             landed: 'F. entrega',
             hour: 'Hora',
             agency: 'Agencia',
-            total: 'Total'
+            total: 'Total',
         },
         form: {
             clientFk: 'Cliente',
@@ -486,7 +487,7 @@ export default {
             agencyModeFk: 'Agencia',
         },
         list: {
-            newOrder: 'Nuevo Pedido'
+            newOrder: 'Nuevo Pedido',
         },
         summary: {
             basket: 'Cesta',
@@ -512,8 +513,8 @@ export default {
             description: 'Descripción',
             quantity: 'Cantidad',
             price: 'Precio',
-            amount: 'Monto'
-        }
+            amount: 'Monto',
+        },
     },
     shelving: {
         pageTitles: {
diff --git a/src/pages/Customer/Defaulter/CustomerDefaulter.vue b/src/pages/Customer/Defaulter/CustomerDefaulter.vue
new file mode 100644
index 000000000..b35980416
--- /dev/null
+++ b/src/pages/Customer/Defaulter/CustomerDefaulter.vue
@@ -0,0 +1,253 @@
+<script setup>
+import { ref, computed, onBeforeMount } from 'vue';
+import { useI18n } from 'vue-i18n';
+
+import { QBtn, QCheckbox } from 'quasar';
+
+import { useArrayData } from 'composables/useArrayData';
+import { useStateStore } from 'stores/useStateStore';
+
+import { toCurrency, toDate } from 'filters/index';
+import CustomerNotificationsFilter from './CustomerDefaulterFilter.vue';
+import CustomerDescriptorProxy from 'src/pages/Customer/Card/CustomerDescriptorProxy.vue';
+import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
+
+const { t } = useI18n();
+const stateStore = useStateStore();
+
+const arrayData = ref(null);
+
+onBeforeMount(async () => {
+    arrayData.value = useArrayData('CustomerDefaulter', {
+        url: 'Defaulters/filter',
+        limit: 0,
+    });
+    await arrayData.value.fetch({ append: false });
+    stateStore.rightDrawer = true;
+});
+
+const rows = computed(() => arrayData.value.store.data);
+
+const selected = ref([]);
+const worderId = ref(0);
+const customerId = ref(0);
+
+const tableColumnComponents = {
+    client: {
+        component: QBtn,
+        props: () => ({ flat: true, color: 'blue' }),
+        event: (prop) => selectClientId(prop.row.clientFk),
+    },
+    isWorker: {
+        component: QCheckbox,
+        props: (prop) => ({
+            disable: true,
+            'model-value': Boolean(prop.value),
+        }),
+        event: () => {},
+    },
+    salesperson: {
+        component: QBtn,
+        props: () => ({ flat: true, color: 'blue' }),
+        event: (prop) => selectSalespersonId(prop.row.salesPersonFk),
+    },
+    country: {
+        component: 'span',
+        props: () => {},
+        event: () => {},
+    },
+    paymentMethod: {
+        component: 'span',
+        props: () => {},
+        event: () => {},
+    },
+    balance: {
+        component: 'span',
+        props: () => {},
+        event: () => {},
+    },
+    author: {
+        component: QBtn,
+        props: () => ({ flat: true, color: 'blue' }),
+        event: (prop) => selectAuthorId(prop.row.workerFk),
+    },
+    lastObservation: {
+        component: 'span',
+        props: () => {},
+        event: () => {},
+    },
+    date: {
+        component: 'span',
+        props: () => {},
+        event: () => {},
+    },
+    credit: {
+        component: 'span',
+        props: () => {},
+        event: () => {},
+    },
+    from: {
+        component: 'span',
+        props: () => {},
+        event: () => {},
+    },
+};
+
+const columns = computed(() => {
+    return [
+        {
+            align: 'left',
+            field: 'clientName',
+            label: t('Client'),
+            name: 'client',
+        },
+        {
+            align: 'left',
+            field: 'isWorker',
+            label: t('Is worker'),
+            name: 'isWorker',
+        },
+        {
+            align: 'left',
+            field: 'salesPersonName',
+            label: t('Salesperson'),
+            name: 'salesperson',
+        },
+        {
+            align: 'left',
+            field: 'country',
+            label: t('Country'),
+            name: 'country',
+        },
+        {
+            align: 'left',
+            field: 'payMethod',
+            label: t('P. Method'),
+            name: 'paymentMethod',
+        },
+        {
+            align: 'left',
+            field: (row) => toCurrency(row.amount),
+            label: t('Balance D.'),
+            name: 'balance',
+        },
+        {
+            align: 'left',
+            field: 'workerName',
+            label: t('Author'),
+            name: 'author',
+        },
+        {
+            align: 'left',
+            field: 'observation',
+            label: t('Last observation'),
+            name: 'lastObservation',
+        },
+        {
+            align: 'left',
+            field: (row) => toDate(row.created),
+            label: t('L. O. Date'),
+            name: 'date',
+        },
+        {
+            align: 'left',
+            field: (row) => toCurrency(row.creditInsurance),
+            label: t('Credit I.'),
+            name: 'credit',
+        },
+        {
+            align: 'left',
+            field: (row) => toDate(row.defaulterSinced),
+            label: t('From'),
+            name: 'from',
+        },
+    ];
+});
+
+const selectClientId = (id) => {
+    worderId.value = 0;
+    customerId.value = id;
+};
+
+const selectSalespersonId = (id) => {
+    customerId.value = 0;
+    worderId.value = id;
+};
+
+const selectAuthorId = (id) => {
+    customerId.value = 0;
+    worderId.value = id;
+};
+</script>
+
+<template>
+    <QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above>
+        <QScrollArea class="fit text-grey-8">
+            <CustomerNotificationsFilter data-key="CustomerDefaulter" />
+        </QScrollArea>
+    </QDrawer>
+
+    <QToolbar class="bg-vn-dark">
+        <div id="st-data"></div>
+        <QSpace />
+        <div id="st-actions"></div>
+    </QToolbar>
+
+    <QPage class="column items-center q-pa-md">
+        <QTable
+            :columns="columns"
+            :pagination="{ rowsPerPage: 0 }"
+            :rows="rows"
+            class="full-width q-mt-md"
+            hide-bottom
+            row-key="id"
+            selection="multiple"
+            v-model:selected="selected"
+        >
+            <template #top>
+                <div v-if="rows" class="full-width flex justify-end">
+                    {{ `${rows.length} ${t('route.cmr.list.results')}` }}
+                </div>
+            </template>
+            <template #body-cell="props">
+                <QTd :props="props">
+                    <QTr :props="props" class="cursor-pointer">
+                        <component
+                            :is="tableColumnComponents[props.col.name].component"
+                            class="col-content"
+                            v-bind="tableColumnComponents[props.col.name].props(props)"
+                            @click="tableColumnComponents[props.col.name].event(props)"
+                        >
+                            {{ props.value }}
+
+                            <WorkerDescriptorProxy v-if="worderId" :id="worderId" />
+                            <CustomerDescriptorProxy v-else :id="customerId" />
+                        </component>
+                    </QTr>
+                </QTd>
+            </template>
+        </QTable>
+    </QPage>
+</template>
+
+<style lang="scss" scoped>
+.col-content {
+    border-radius: 4px;
+    padding: 6px 6px 6px 6px;
+}
+</style>
+
+<i18n>
+es:
+    Client: Cliente
+    Is worker: Es trabajador
+    Salesperson: Comercial
+    Country: País
+    P. Method: F. Pago
+    Balance D.: Saldo V.
+    Author: Autor
+    Last observation: Última observación
+    L. O. Date: Fecha Ú. O.
+    Credit I.: Crédito A.
+    From: Desde
+</i18n>
diff --git a/src/pages/Customer/Defaulter/CustomerDefaulterFilter.vue b/src/pages/Customer/Defaulter/CustomerDefaulterFilter.vue
new file mode 100644
index 000000000..43ceb1bac
--- /dev/null
+++ b/src/pages/Customer/Defaulter/CustomerDefaulterFilter.vue
@@ -0,0 +1,238 @@
+<script setup>
+import { ref } from 'vue';
+import { useI18n } from 'vue-i18n';
+
+import FetchData from 'components/FetchData.vue';
+import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
+import VnInput from 'src/components/common/VnInput.vue';
+import VnInputDate from 'src/components/common/VnInputDate.vue';
+import VnSelectFilter from 'components/common/VnSelectFilter.vue';
+
+const { t } = useI18n();
+const props = defineProps({
+    dataKey: {
+        type: String,
+        required: true,
+    },
+});
+
+const clients = ref();
+const salespersons = ref();
+const countries = ref();
+const authors = ref();
+</script>
+
+<template>
+    <FetchData @on-fetch="(data) => (clients = data)" auto-load url="Clients" />
+    <FetchData
+        :filter="{ where: { role: 'salesPerson' } }"
+        @on-fetch="(data) => (salespersons = data)"
+        auto-load
+        url="Workers/activeWithInheritedRole"
+    />
+    <FetchData @on-fetch="(data) => (countries = data)" auto-load url="Countries" />
+    <FetchData
+        @on-fetch="(data) => (authors = data)"
+        auto-load
+        url="Workers/activeWithInheritedRole"
+    />
+
+    <VnFilterPanel :data-key="props.dataKey" :search-button="true">
+        <template #tags="{ tag, formatFn }">
+            <div class="q-gutter-x-xs">
+                <strong>{{ t(`params.${tag.label}`) }}: </strong>
+                <span>{{ formatFn(tag.value) }}</span>
+            </div>
+        </template>
+
+        <template #body="{ params }">
+            <QList dense class="list">
+                <QItem class="q-mb-sm q-mt-sm">
+                    <QItemSection v-if="clients">
+                        <VnSelectFilter
+                            :input-debounce="0"
+                            :label="t('Client')"
+                            :options="clients"
+                            dense
+                            emit-value
+                            hide-selected
+                            map-options
+                            option-label="name"
+                            option-value="clientTypeFk"
+                            outlined
+                            rounded
+                            use-input
+                            v-model="params.clientFk"
+                        />
+                    </QItemSection>
+                    <QItemSection v-else>
+                        <QSkeleton class="full-width" type="QInput" />
+                    </QItemSection>
+                </QItem>
+
+                <QItem class="q-mb-sm">
+                    <QItemSection v-if="salespersons">
+                        <VnSelectFilter
+                            :input-debounce="0"
+                            :label="t('Salesperson')"
+                            :options="salespersons"
+                            dense
+                            emit-value
+                            hide-selected
+                            map-options
+                            option-label="name"
+                            option-value="id"
+                            outlined
+                            rounded
+                            use-input
+                            v-model="params.salesPersonFk"
+                        />
+                    </QItemSection>
+                    <QItemSection v-else>
+                        <QSkeleton class="full-width" type="QInput" />
+                    </QItemSection>
+                </QItem>
+
+                <QItem class="q-mb-sm">
+                    <QItemSection v-if="countries">
+                        <VnSelectFilter
+                            :input-debounce="0"
+                            :label="t('Country')"
+                            :options="countries"
+                            dense
+                            emit-value
+                            hide-selected
+                            map-options
+                            option-label="country"
+                            option-value="id"
+                            outlined
+                            rounded
+                            use-input
+                            v-model="params.countryFk"
+                        />
+                    </QItemSection>
+                    <QItemSection v-else>
+                        <QSkeleton class="full-width" type="QInput" />
+                    </QItemSection>
+                </QItem>
+
+                <QItem class="q-mb-sm">
+                    <QItemSection>
+                        <VnInput
+                            :label="t('P. Method')"
+                            is-outlined
+                            v-model="params.paymentMethod"
+                        />
+                    </QItemSection>
+                </QItem>
+
+                <QItem class="q-mb-sm">
+                    <QItemSection>
+                        <VnInput
+                            :label="t('Balance D.')"
+                            is-outlined
+                            v-model="params.balance"
+                        />
+                    </QItemSection>
+                </QItem>
+
+                <QItem class="q-mb-sm">
+                    <QItemSection v-if="authors">
+                        <VnSelectFilter
+                            :input-debounce="0"
+                            :label="t('Author')"
+                            :options="authors"
+                            dense
+                            emit-value
+                            hide-selected
+                            map-options
+                            option-label="name"
+                            option-value="id"
+                            outlined
+                            rounded
+                            use-input
+                            v-model="params.workerFk"
+                        />
+                    </QItemSection>
+                    <QItemSection v-else>
+                        <QSkeleton class="full-width" type="QInput" />
+                    </QItemSection>
+                </QItem>
+
+                <QItem class="q-mb-sm">
+                    <QItemSection>
+                        <VnInput
+                            :label="t('L. O. Date')"
+                            is-outlined
+                            v-model="params.date"
+                        />
+                    </QItemSection>
+                </QItem>
+
+                <QItem class="q-mb-sm">
+                    <QItemSection>
+                        <VnInput
+                            :label="t('Credit I.')"
+                            is-outlined
+                            v-model="params.credit"
+                        />
+                    </QItemSection>
+                </QItem>
+
+                <QItem class="q-mb-sm">
+                    <QItemSection>
+                        <VnInputDate
+                            :label="t('From')"
+                            is-outlined
+                            v-model="params.defaulterSinced"
+                        />
+                    </QItemSection>
+                </QItem>
+                <QSeparator />
+            </QList>
+        </template>
+    </VnFilterPanel>
+</template>
+
+<style scoped>
+.list {
+    width: 256px;
+}
+.list * {
+    max-width: 100%;
+}
+</style>
+
+<i18n>
+en:
+    params:
+        clientFk: Client
+        salesPersonFk: Salesperson
+        countryFk: Country
+        paymentMethod: P. Method
+        balance: Balance D.
+        workerFk: Author
+        date: L. O. Date
+        credit: Credit I.
+        defaulterSinced: From
+es:
+    params:
+        clientFk: Cliente
+        salesPersonFk: Comercial
+        countryFk: País
+        paymentMethod: F. Pago
+        balance: Saldo V.
+        workerFk: Autor
+        date: Fecha Ú. O.
+        credit: Crédito A.
+        defaulterSinced: Desde
+    Client: Cliente
+    Salesperson: Comercial
+    Country: País
+    P. Method: F. Pago
+    Balance D.: Saldo V.
+    Author: Autor
+    L. O. Date: Fecha Ú. O.
+    Credit I.: Crédito A.
+    From: Desde
+</i18n>
diff --git a/src/pages/Customer/CustomerExtendedList.vue b/src/pages/Customer/ExtendedList/CustomerExtendedList.vue
similarity index 100%
rename from src/pages/Customer/CustomerExtendedList.vue
rename to src/pages/Customer/ExtendedList/CustomerExtendedList.vue
diff --git a/src/pages/Customer/CustomerExtendedListActions.vue b/src/pages/Customer/ExtendedList/CustomerExtendedListActions.vue
similarity index 94%
rename from src/pages/Customer/CustomerExtendedListActions.vue
rename to src/pages/Customer/ExtendedList/CustomerExtendedListActions.vue
index 1fec71ffe..7e3639522 100644
--- a/src/pages/Customer/CustomerExtendedListActions.vue
+++ b/src/pages/Customer/ExtendedList/CustomerExtendedListActions.vue
@@ -4,7 +4,7 @@ import { useRouter } from 'vue-router';
 
 import { useQuasar } from 'quasar';
 
-import CustomerSummaryDialog from './Card/CustomerSummaryDialog.vue';
+import CustomerSummaryDialog from '../Card/CustomerSummaryDialog.vue';
 
 const { t } = useI18n();
 const quasar = useQuasar();
diff --git a/src/pages/Customer/CustomerExtendedListFilter.vue b/src/pages/Customer/ExtendedList/CustomerExtendedListFilter.vue
similarity index 91%
rename from src/pages/Customer/CustomerExtendedListFilter.vue
rename to src/pages/Customer/ExtendedList/CustomerExtendedListFilter.vue
index ba1c966dc..dbed3141d 100644
--- a/src/pages/Customer/CustomerExtendedListFilter.vue
+++ b/src/pages/Customer/ExtendedList/CustomerExtendedListFilter.vue
@@ -80,7 +80,7 @@ const workers = ref();
                     <QItemSection v-if="workers">
                         <VnSelectFilter
                             :label="t('Salesperson')"
-                            v-model="params.salesPersonFk"
+                            v-model="params.salesPerson"
                             @update:model-value="searchFn()"
                             :options="workers"
                             option-value="id"
@@ -128,22 +128,7 @@ const workers = ref();
 </style>
 
 <i18n>
-en:
-    params:
-        identifier: Identifier
-        socialName: Social name
-        salesPerson: Salesperson
-        phone: Phone
-        city: City
-        email: Email
 es:
-    params:
-        identifier: Identificador
-        socialName: Razón social
-        salesPerson: Comercial
-        phone: Teléfono
-        city: Población
-        email: Email
     Identifier: Identificador
     Social name: Razón social
     Salesperson: Comercial
diff --git a/src/pages/Customer/CustomerNotifications.vue b/src/pages/Customer/Notifications/CustomerNotifications.vue
similarity index 98%
rename from src/pages/Customer/CustomerNotifications.vue
rename to src/pages/Customer/Notifications/CustomerNotifications.vue
index 91d137763..f9ff66a7b 100644
--- a/src/pages/Customer/CustomerNotifications.vue
+++ b/src/pages/Customer/Notifications/CustomerNotifications.vue
@@ -8,7 +8,7 @@ import { useArrayData } from 'composables/useArrayData';
 import { useStateStore } from 'stores/useStateStore';
 
 import CustomerNotificationsFilter from './CustomerNotificationsFilter.vue';
-import CustomerDescriptorProxy from './Card/CustomerDescriptorProxy.vue';
+import CustomerDescriptorProxy from '../Card/CustomerDescriptorProxy.vue';
 
 const { t } = useI18n();
 const stateStore = useStateStore();
diff --git a/src/pages/Customer/CustomerNotificationsFilter.vue b/src/pages/Customer/Notifications/CustomerNotificationsFilter.vue
similarity index 94%
rename from src/pages/Customer/CustomerNotificationsFilter.vue
rename to src/pages/Customer/Notifications/CustomerNotificationsFilter.vue
index 1c4c8f3e2..650158278 100644
--- a/src/pages/Customer/CustomerNotificationsFilter.vue
+++ b/src/pages/Customer/Notifications/CustomerNotificationsFilter.vue
@@ -4,8 +4,8 @@ import { useI18n } from 'vue-i18n';
 
 import FetchData from 'components/FetchData.vue';
 import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
-import VnSelectFilter from 'components/common/VnSelectFilter.vue';
 import VnInput from 'src/components/common/VnInput.vue';
+import VnSelectFilter from 'components/common/VnSelectFilter.vue';
 
 const { t } = useI18n();
 const props = defineProps({
@@ -15,18 +15,18 @@ const props = defineProps({
     },
 });
 
-const clients = ref();
 const cities = ref();
+const clients = ref();
 </script>
 
 <template>
     <FetchData
-        url="Clients"
         :filter="{ where: { role: 'socialName' } }"
         @on-fetch="(data) => (clients = data)"
         auto-load
+        url="Clients"
     />
-    <FetchData url="Towns" @on-fetch="(data) => (cities = data)" auto-load />
+    <FetchData @on-fetch="(data) => (cities = data)" auto-load url="Towns" />
     <VnFilterPanel :data-key="props.dataKey" :search-button="true">
         <template #tags="{ tag, formatFn }">
             <div class="q-gutter-x-xs">
@@ -41,8 +41,8 @@ const cities = ref();
                     <QItemSection>
                         <VnInput
                             :label="t('Identifier')"
-                            v-model="params.identifier"
                             is-outlined
+                            v-model="params.identifier"
                         />
                     </QItemSection>
                 </QItem>
@@ -53,20 +53,20 @@ const cities = ref();
                     </QItemSection>
                     <QItemSection v-if="clients">
                         <VnSelectFilter
+                            :input-debounce="0"
                             :label="t('Social name')"
-                            v-model="params.socialName"
-                            @update:model-value="searchFn()"
                             :options="clients"
-                            option-value="socialName"
-                            option-label="socialName"
-                            emit-value
-                            map-options
-                            use-input
-                            hide-selected
+                            @update:model-value="searchFn()"
                             dense
+                            emit-value
+                            hide-selected
+                            map-options
+                            option-label="socialName"
+                            option-value="socialName"
                             outlined
                             rounded
-                            :input-debounce="0"
+                            use-input
+                            v-model="params.socialName"
                         />
                     </QItemSection>
                 </QItem>
@@ -77,33 +77,33 @@ const cities = ref();
                     </QItemSection>
                     <QItemSection v-if="cities">
                         <VnSelectFilter
+                            :input-debounce="0"
                             :label="t('City')"
-                            v-model="params.city"
-                            @update:model-value="searchFn()"
                             :options="cities"
-                            option-value="name"
-                            option-label="name"
-                            emit-value
-                            map-options
-                            use-input
-                            hide-selected
+                            @update:model-value="searchFn()"
                             dense
+                            emit-value
+                            hide-selected
+                            map-options
+                            option-label="name"
+                            option-value="name"
                             outlined
                             rounded
-                            :input-debounce="0"
+                            use-input
+                            v-model="params.city"
                         />
                     </QItemSection>
                 </QItem>
 
                 <QItem class="q-mb-sm">
                     <QItemSection>
-                        <VnInput :label="t('Phone')" v-model="params.phone" is-outlined />
+                        <VnInput :label="t('Phone')" is-outlined v-model="params.phone" />
                     </QItemSection>
                 </QItem>
 
                 <QItem class="q-mb-sm">
                     <QItemSection>
-                        <VnInput :label="t('Email')" v-model="params.email" is-outlined />
+                        <VnInput :label="t('Email')" is-outlined v-model="params.email" />
                     </QItemSection>
                 </QItem>
                 <QSeparator />
diff --git a/src/pages/Customer/CustomerPayments.vue b/src/pages/Customer/Payments/CustomerPayments.vue
similarity index 99%
rename from src/pages/Customer/CustomerPayments.vue
rename to src/pages/Customer/Payments/CustomerPayments.vue
index 24e5efa39..b4a907665 100644
--- a/src/pages/Customer/CustomerPayments.vue
+++ b/src/pages/Customer/Payments/CustomerPayments.vue
@@ -7,7 +7,7 @@ import { useStateStore } from 'stores/useStateStore';
 import { useArrayData } from 'composables/useArrayData';
 import VnPaginate from 'components/ui/VnPaginate.vue';
 import VnConfirm from 'components/ui/VnConfirm.vue';
-import CustomerDescriptorProxy from './Card/CustomerDescriptorProxy.vue';
+import CustomerDescriptorProxy from '../Card/CustomerDescriptorProxy.vue';
 import { toDate, toCurrency } from 'filters/index';
 import CustomerPaymentsFilter from './CustomerPaymentsFilter.vue';
 
diff --git a/src/pages/Customer/CustomerPaymentsFilter.vue b/src/pages/Customer/Payments/CustomerPaymentsFilter.vue
similarity index 100%
rename from src/pages/Customer/CustomerPaymentsFilter.vue
rename to src/pages/Customer/Payments/CustomerPaymentsFilter.vue
diff --git a/src/router/modules/customer.js b/src/router/modules/customer.js
index 04cbf42b3..51511bcbf 100644
--- a/src/router/modules/customer.js
+++ b/src/router/modules/customer.js
@@ -15,6 +15,7 @@ export default {
             'CustomerPayments',
             'CustomerExtendedList',
             'CustomerNotifications',
+            'CustomerDefaulter',
         ],
         card: ['CustomerBasicData'],
     },
@@ -49,7 +50,8 @@ export default {
                         title: 'webPayments',
                         icon: 'vn:onlinepayment',
                     },
-                    component: () => import('src/pages/Customer/CustomerPayments.vue'),
+                    component: () =>
+                        import('src/pages/Customer/Payments/CustomerPayments.vue'),
                 },
                 {
                     path: 'extendedList',
@@ -59,7 +61,9 @@ export default {
                         icon: 'vn:client',
                     },
                     component: () =>
-                        import('src/pages/Customer/CustomerExtendedList.vue'),
+                        import(
+                            'src/pages/Customer/ExtendedList/CustomerExtendedList.vue'
+                        ),
                 },
                 {
                     path: 'notifications',
@@ -69,7 +73,19 @@ export default {
                         icon: 'notifications',
                     },
                     component: () =>
-                        import('src/pages/Customer/CustomerNotifications.vue'),
+                        import(
+                            'src/pages/Customer/Notifications/CustomerNotifications.vue'
+                        ),
+                },
+                {
+                    path: 'defaulter',
+                    name: 'CustomerDefaulter',
+                    meta: {
+                        title: 'defaulter',
+                        icon: 'vn:risk',
+                    },
+                    component: () =>
+                        import('src/pages/Customer/Defaulter/CustomerDefaulter.vue'),
                 },
             ],
         },
diff --git a/test/vitest/__tests__/pages/Customer/CustomerPayments.spec.js b/test/vitest/__tests__/pages/Customer/CustomerPayments.spec.js
index 5d096f113..13293f596 100644
--- a/test/vitest/__tests__/pages/Customer/CustomerPayments.spec.js
+++ b/test/vitest/__tests__/pages/Customer/CustomerPayments.spec.js
@@ -1,11 +1,10 @@
 import { vi, describe, expect, it, beforeAll, afterEach } from 'vitest';
 import { createWrapper, axios } from 'app/test/vitest/helper';
-import CustomerPayments from 'pages/Customer/CustomerPayments.vue';
+import CustomerPayments from 'src/pages/Customer/Payments/CustomerPayments.vue';
 
 describe('CustomerPayments', () => {
     let vm;
 
-
     beforeAll(() => {
         vm = createWrapper(CustomerPayments, {
             global: {
@@ -13,7 +12,7 @@ describe('CustomerPayments', () => {
                 mocks: {
                     fetch: vi.fn(),
                 },
-            }
+            },
         }).vm;
     });
 
@@ -28,11 +27,10 @@ describe('CustomerPayments', () => {
 
             await vm.confirmTransaction({ id: 1 });
 
-
             expect(vm.quasar.notify).toHaveBeenCalledWith(
                 expect.objectContaining({
                     message: 'Payment confirmed',
-                    type: 'positive'
+                    type: 'positive',
                 })
             );
         });

From 9ede2912f36718c0c1884cfeb2a63a15a9ba80f0 Mon Sep 17 00:00:00 2001
From: carlosfonseca <carlos.fonseca@mindshore.io>
Date: Thu, 28 Dec 2023 10:36:47 -0500
Subject: [PATCH 09/36] Correccion, elimine sin darme cuenta

---
 src/i18n/en/index.js | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/src/i18n/en/index.js b/src/i18n/en/index.js
index 90e5effe4..8d8e4c670 100644
--- a/src/i18n/en/index.js
+++ b/src/i18n/en/index.js
@@ -607,6 +607,25 @@ export default {
             amount: 'Amount',
         },
     },
+    department: {
+        pageTitles: {
+            basicData: 'Basic data',
+            department: 'Department',
+            summary: 'Summary',
+        },
+        name: 'Name',
+        code: 'Code',
+        chat: 'Chat',
+        bossDepartment: 'Boss Department',
+        email: 'Email',
+        selfConsumptionCustomer: 'Self-consumption customer',
+        telework: 'Telework',
+        notifyOnErrors: 'Notify on errors',
+        worksInProduction: 'Works in production',
+        hasToRefill: 'Fill in days without physical check-ins',
+        hasToSendMail: 'Send check-ins by email',
+        departmentRemoved: 'Department removed',
+    },
     worker: {
         pageTitles: {
             workers: 'Workers',

From 1ab31a1e514e8f0eb82aeef73b12cc1c4f303c36 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Fri, 29 Dec 2023 11:08:11 -0300
Subject: [PATCH 10/36] Extended List big modifications and column add column
 filter component

---
 src/components/common/TableVisibleColumns.vue | 140 +++++
 src/i18n/en/index.js                          |  34 ++
 src/i18n/es/index.js                          |  34 ++
 src/pages/Customer/CustomerExtendedList.vue   | 439 ++++++++++++++--
 .../Customer/CustomerExtendedListActions.vue  |  39 +-
 .../Customer/CustomerExtendedListFilter.vue   | 490 ++++++++++++++++--
 6 files changed, 1089 insertions(+), 87 deletions(-)
 create mode 100644 src/components/common/TableVisibleColumns.vue

diff --git a/src/components/common/TableVisibleColumns.vue b/src/components/common/TableVisibleColumns.vue
new file mode 100644
index 000000000..94e3bfbc7
--- /dev/null
+++ b/src/components/common/TableVisibleColumns.vue
@@ -0,0 +1,140 @@
+<script setup>
+import { useI18n } from 'vue-i18n';
+import { ref, computed } from 'vue';
+
+import FetchData from 'components/FetchData.vue';
+
+import { useState } from 'src/composables/useState';
+import axios from 'axios';
+
+const $props = defineProps({
+    allColumns: {
+        type: Array,
+        default: () => [],
+    },
+    tableCode: {
+        type: String,
+        default: '',
+    },
+    labelsTraductionsPath: {
+        type: String,
+        default: '',
+    },
+});
+
+const emit = defineEmits(['onConfigSaved']);
+
+const state = useState();
+const { t } = useI18n();
+const popupProxyRef = ref(null);
+const user = state.getUser();
+const initialUserConfigViewData = ref(null);
+const userConfigFilter = {
+    where: {
+        tableCode: $props.tableCode,
+        userFk: user.id,
+    },
+};
+
+const formattedCols = ref([]);
+
+const areAllChecksMarked = computed(() => {
+    return formattedCols.value.every((col) => col.active);
+});
+
+const setUserConfigViewData = (data) => {
+    initialUserConfigViewData.value = data;
+    if (data.length === 0) return;
+    formattedCols.value = $props.allColumns.map((col) => {
+        // Importante: El name de las columnas de la tabla debe conincidir con el name de las variables que devuelve la view config
+        const obj = {
+            name: col,
+            active: data[0].configuration[col],
+        };
+        return obj;
+    });
+    emitSavedConfig();
+};
+
+const toggleMarkAll = (val) => {
+    formattedCols.value.forEach((col) => (col.active = val));
+};
+
+const saveConfig = async () => {
+    try {
+        const data = {
+            id: initialUserConfigViewData.value[0].id,
+            userFk: 9,
+            tableCode: $props.tableCode,
+            configuration: {},
+        };
+
+        formattedCols.value.forEach((col) => {
+            data.configuration[col.name] = col.active;
+        });
+
+        await axios.patch('UserConfigViews', data);
+        emitSavedConfig();
+        popupProxyRef.value.hide();
+    } catch (err) {
+        console.error('Error saving user view config');
+    }
+};
+const emitSavedConfig = () => {
+    const filteredCols = formattedCols.value.filter((col) => col.active);
+    const mappedCols = filteredCols.map((col) => col.name);
+    emit('onConfigSaved', mappedCols);
+};
+</script>
+<template>
+    <fetch-data
+        v-if="user"
+        url="UserConfigViews"
+        :filter="userConfigFilter"
+        @on-fetch="(data) => setUserConfigViewData(data)"
+        auto-load
+    />
+    <QBtn color="primary" icon="view_column">
+        <QPopupProxy ref="popupProxyRef">
+            <QCard class="column q-pa-md">
+                <QIcon name="info" size="sm" class="info-icon">
+                    <QTooltip>{{ t('Check the columns you want to see') }}</QTooltip>
+                </QIcon>
+                <span class="text-body1 q-mb-sm">{{ t('Visible columns') }}</span>
+                <QCheckbox
+                    :label="t('Tick all')"
+                    :model-value="areAllChecksMarked"
+                    @update:model-value="toggleMarkAll($event)"
+                    class="q-mb-sm"
+                />
+                <div
+                    v-if="allColumns.length !== 0 && formattedCols.length !== 0"
+                    class="checks-layout"
+                >
+                    <QCheckbox
+                        v-for="(col, index) in allColumns"
+                        :key="index"
+                        :label="t(`${$props.labelsTraductionsPath + '.' + col}`)"
+                        v-model="formattedCols[index].active"
+                    />
+                </div>
+                <QBtn class="full-width q-mt-md" color="primary" @click="saveConfig()">{{
+                    t('globals.save')
+                }}</QBtn>
+            </QCard>
+        </QPopupProxy>
+    </QBtn>
+</template>
+
+<style lang="scss" scoped>
+.info-icon {
+    position: absolute;
+    top: 20px;
+    right: 20px;
+}
+
+.checks-layout {
+    display: grid;
+    grid-template-columns: repeat(3, 200px);
+}
+</style>
diff --git a/src/i18n/en/index.js b/src/i18n/en/index.js
index 12505b30e..608a9303e 100644
--- a/src/i18n/en/index.js
+++ b/src/i18n/en/index.js
@@ -206,6 +206,40 @@ export default {
             salesPerson: 'Sales person',
             contactChannel: 'Contact channel',
         },
+        extendedList: {
+            tableVisibleColumns: {
+                id: 'Identifier',
+                name: 'Name',
+                fi: 'Tax number',
+                salesPersonFk: 'Salesperson',
+                credit: 'Credit',
+                creditInsurance: 'Credit insurance',
+                phone: 'Phone',
+                mobile: 'Mobile',
+                street: 'Street',
+                countryFk: 'Country',
+                provinceFk: 'Province',
+                city: 'City',
+                postcode: 'Postcode',
+                email: 'Email',
+                created: 'Created',
+                businessTypeFk: 'Business type',
+                payMethodFk: 'Billing data',
+                sageTaxTypeFk: 'Sage tax type',
+                sageTransactionTypeFk: 'Sage tr. type',
+                isActive: 'Active',
+                isVies: 'Vies',
+                isTaxDataChecked: 'Verified data',
+                isEqualizated: 'Is equalizated',
+                isFreezed: 'Freezed',
+                hasToInvoice: 'Invoice',
+                hasToInvoiceByAddress: 'Invoice by address',
+                isToBeMailed: 'Mailing',
+                hasLcr: 'Received LCR',
+                hasCoreVnl: 'VNL core received',
+                hasSepaVnl: 'VNL B2B received',
+            },
+        },
     },
     ticket: {
         pageTitles: {
diff --git a/src/i18n/es/index.js b/src/i18n/es/index.js
index fe16df8fc..3a5d4c26b 100644
--- a/src/i18n/es/index.js
+++ b/src/i18n/es/index.js
@@ -205,6 +205,40 @@ export default {
             salesPerson: 'Comercial',
             contactChannel: 'Canal de contacto',
         },
+        extendedList: {
+            tableVisibleColumns: {
+                id: 'Identificador',
+                name: 'Nombre',
+                fi: 'NIF / CIF',
+                salesPersonFk: 'Comercial',
+                credit: 'Crédito',
+                creditInsurance: 'Crédito asegurado',
+                phone: 'Teléfono',
+                mobile: 'Móvil',
+                street: 'Dirección fiscal',
+                countryFk: 'País',
+                provinceFk: 'Provincia',
+                city: 'Población',
+                postcode: 'Código postal',
+                email: 'Email',
+                created: 'Fecha creación',
+                businessTypeFk: 'Tipo de negocio',
+                payMethodFk: 'Forma de pago',
+                sageTaxTypeFk: 'Tipo de impuesto Sage',
+                sageTransactionTypeFk: 'Tipo tr. sage',
+                isActive: 'Activo',
+                isVies: 'Vies',
+                isTaxDataChecked: 'Datos comprobados',
+                isEqualizated: 'Recargo de equivalencias',
+                isFreezed: 'Congelado',
+                hasToInvoice: 'Factura',
+                hasToInvoiceByAddress: 'Factura por consigna',
+                isToBeMailed: 'Env. emails',
+                hasLcr: 'Recibido LCR',
+                hasCoreVnl: 'Recibido core VNL',
+                hasSepaVnl: 'Recibido B2B VNL',
+            },
+        },
     },
     ticket: {
         pageTitles: {
diff --git a/src/pages/Customer/CustomerExtendedList.vue b/src/pages/Customer/CustomerExtendedList.vue
index be3463867..a60b79caf 100644
--- a/src/pages/Customer/CustomerExtendedList.vue
+++ b/src/pages/Customer/CustomerExtendedList.vue
@@ -1,16 +1,18 @@
 <script setup>
-import { ref, computed, onBeforeMount } from 'vue';
+import { ref, computed, onBeforeMount, onMounted } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRouter } from 'vue-router';
 
-import { QBtn } from 'quasar';
-
-import { useArrayData } from 'composables/useArrayData';
-import { useStateStore } from 'stores/useStateStore';
-
+import { QBtn, QIcon } from 'quasar';
+import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
 import CustomerDescriptorProxy from 'src/pages/Customer/Card/CustomerDescriptorProxy.vue';
 import CustomerExtendedListActions from './CustomerExtendedListActions.vue';
 import CustomerExtendedListFilter from './CustomerExtendedListFilter.vue';
+import TableVisibleColumns from 'src/components/common/TableVisibleColumns.vue';
+
+import { useArrayData } from 'composables/useArrayData';
+import { useStateStore } from 'stores/useStateStore';
+import { dashIfEmpty, toDate } from 'src/filters';
 
 const { t } = useI18n();
 const router = useRouter();
@@ -27,22 +29,62 @@ onBeforeMount(async () => {
     stateStore.rightDrawer = true;
 });
 
+onMounted(() => {
+    const filteredColumns = columns.value.filter(
+        (col) => col.name !== 'actions' && col.name !== 'customerStatus'
+    );
+    allColumnNames.value = filteredColumns.map((col) => col.name);
+});
+
 const rows = computed(() => arrayData.value.store.data);
 
 const selectedCustomerId = ref(0);
+const selectedSalesPersonId = ref(0);
+const allColumnNames = ref([]);
+const visibleColumns = ref([]);
 
 const tableColumnComponents = {
+    customerStatus: {
+        component: QIcon,
+        props: (prop) => ({
+            name: !prop.row.isActive
+                ? 'vn:disabled'
+                : prop.row.isActive && prop.row.isFreezed
+                ? 'vn:frozen'
+                : '',
+            color: 'primary',
+            size: 'sm',
+        }),
+        event: () => {},
+    },
     id: {
         component: QBtn,
         props: () => ({ flat: true, color: 'blue' }),
-        event: (prop) => selectCustomerId(prop.row.id),
+        event: (prop) => {
+            selectCustomerId(prop.row.id);
+        },
     },
-    socialName: {
+    name: {
         component: 'span',
         props: () => {},
         event: () => {},
     },
-    salesPerson: {
+    fi: {
+        component: 'span',
+        props: () => {},
+        event: () => {},
+    },
+    salesPersonFk: {
+        component: QBtn,
+        props: () => ({ flat: true, color: 'blue' }),
+        event: (prop) => selectSalesPersonId(prop.row.salesPersonFk),
+    },
+    credit: {
+        component: 'span',
+        props: () => {},
+        event: () => {},
+    },
+    creditInsurance: {
         component: 'span',
         props: () => {},
         event: () => {},
@@ -52,16 +94,165 @@ const tableColumnComponents = {
         props: () => {},
         event: () => {},
     },
+    mobile: {
+        component: 'span',
+        props: () => {},
+        event: () => {},
+    },
+    street: {
+        component: 'span',
+        props: () => {},
+        event: () => {},
+    },
+    countryFk: {
+        component: 'span',
+        props: () => {},
+        event: () => {},
+    },
+    provinceFk: {
+        component: 'span',
+        props: () => {},
+        event: () => {},
+    },
     city: {
         component: 'span',
         props: () => {},
         event: () => {},
     },
+    postcode: {
+        component: 'span',
+        props: () => {},
+        event: () => {},
+    },
     email: {
         component: 'span',
         props: () => {},
         event: () => {},
     },
+    created: {
+        component: 'span',
+        props: () => {},
+        event: () => {},
+    },
+    businessTypeFk: {
+        component: 'span',
+        props: () => {},
+        event: () => {},
+    },
+    payMethodFk: {
+        component: 'span',
+        props: () => {},
+        event: () => {},
+    },
+    sageTaxTypeFk: {
+        component: 'span',
+        props: () => {},
+        event: () => {},
+    },
+    sageTransactionTypeFk: {
+        component: 'span',
+        props: () => {},
+        event: () => {},
+    },
+    isActive: {
+        component: QIcon,
+        props: (prop) => ({
+            name: prop.row.isActive ? 'check' : 'close',
+            color: prop.row.isActive ? 'positive' : 'negative',
+            size: 'sm',
+        }),
+        event: () => {},
+    },
+    isVies: {
+        component: QIcon,
+        props: (prop) => ({
+            name: prop.row.isVies ? 'check' : 'close',
+            color: prop.row.isVies ? 'positive' : 'negative',
+            size: 'sm',
+        }),
+        event: () => {},
+    },
+    isTaxDataChecked: {
+        component: QIcon,
+        props: (prop) => ({
+            name: prop.row.isTaxDataChecked ? 'check' : 'close',
+            color: prop.row.isTaxDataChecked ? 'positive' : 'negative',
+            size: 'sm',
+        }),
+        event: () => {},
+    },
+    isEqualizated: {
+        component: QIcon,
+        props: (prop) => ({
+            name: prop.row.isEqualizated ? 'check' : 'close',
+            color: prop.row.isEqualizated ? 'positive' : 'negative',
+            size: 'sm',
+        }),
+        event: () => {},
+    },
+    isFreezed: {
+        component: QIcon,
+        props: (prop) => ({
+            name: prop.row.isFreezed ? 'check' : 'close',
+            color: prop.row.isFreezed ? 'positive' : 'negative',
+            size: 'sm',
+        }),
+        event: () => {},
+    },
+    hasToInvoice: {
+        component: QIcon,
+        props: (prop) => ({
+            name: prop.row.hasToInvoice ? 'check' : 'close',
+            color: prop.row.hasToInvoice ? 'positive' : 'negative',
+            size: 'sm',
+        }),
+        event: () => {},
+    },
+    hasToInvoiceByAddress: {
+        component: QIcon,
+        props: (prop) => ({
+            name: prop.row.hasToInvoiceByAddress ? 'check' : 'close',
+            color: prop.row.hasToInvoiceByAddress ? 'positive' : 'negative',
+            size: 'sm',
+        }),
+        event: () => {},
+    },
+    isToBeMailed: {
+        component: QIcon,
+        props: (prop) => ({
+            name: prop.row.isToBeMailed ? 'check' : 'close',
+            color: prop.row.isToBeMailed ? 'positive' : 'negative',
+            size: 'sm',
+        }),
+        event: () => {},
+    },
+    hasLcr: {
+        component: QIcon,
+        props: (prop) => ({
+            name: prop.row.hasLcr ? 'check' : 'close',
+            color: prop.row.hasLcr ? 'positive' : 'negative',
+            size: 'sm',
+        }),
+        event: () => {},
+    },
+    hasCoreVnl: {
+        component: QIcon,
+        props: (prop) => ({
+            name: prop.row.hasCoreVnl ? 'check' : 'close',
+            color: prop.row.hasCoreVnl ? 'positive' : 'negative',
+            size: 'sm',
+        }),
+        event: () => {},
+    },
+    hasSepaVnl: {
+        component: QIcon,
+        props: (prop) => ({
+            name: prop.row.hasSepaVnl ? 'check' : 'close',
+            color: prop.row.hasSepaVnl ? 'positive' : 'negative',
+            size: 'sm',
+        }),
+        event: () => {},
+    },
     actions: {
         component: CustomerExtendedListActions,
         props: (prop) => ({
@@ -73,42 +264,205 @@ const tableColumnComponents = {
 
 const columns = computed(() => {
     return [
+        {
+            align: 'left',
+            field: '',
+            label: '',
+            name: 'customerStatus',
+            format: () => ' ',
+        },
         {
             align: 'left',
             field: 'id',
-            label: t('Identifier'),
+            label: t('customer.extendedList.tableVisibleColumns.id'),
             name: 'id',
         },
         {
             align: 'left',
-            field: 'socialName',
-            label: t('Social name'),
-            name: 'socialName',
+            field: 'name',
+            label: t('customer.extendedList.tableVisibleColumns.name'),
+            name: 'name',
+        },
+        {
+            align: 'left',
+            field: 'fi',
+            label: t('customer.extendedList.tableVisibleColumns.fi'),
+            name: 'fi',
         },
         {
             align: 'left',
             field: 'salesPerson',
-            label: t('Salesperson'),
-            name: 'salesPerson',
+            label: t('customer.extendedList.tableVisibleColumns.salesPersonFk'),
+            name: 'salesPersonFk',
+        },
+        {
+            align: 'left',
+            field: 'credit',
+            label: t('customer.extendedList.tableVisibleColumns.credit'),
+            name: 'credit',
+        },
+        {
+            align: 'left',
+            field: 'creditInsurance',
+            label: t('customer.extendedList.tableVisibleColumns.creditInsurance'),
+            name: 'creditInsurance',
         },
         {
             align: 'left',
             field: 'phone',
-            label: t('Phone'),
+            label: t('customer.extendedList.tableVisibleColumns.phone'),
             name: 'phone',
         },
+        {
+            align: 'left',
+            field: 'mobile',
+            label: t('customer.extendedList.tableVisibleColumns.mobile'),
+            name: 'mobile',
+        },
+        {
+            align: 'left',
+            field: 'street',
+            label: t('customer.extendedList.tableVisibleColumns.street'),
+            name: 'street',
+        },
+        {
+            align: 'left',
+            field: 'country',
+            label: t('customer.extendedList.tableVisibleColumns.countryFk'),
+            name: 'countryFk',
+        },
+        {
+            align: 'left',
+            field: 'province',
+            label: t('customer.extendedList.tableVisibleColumns.provinceFk'),
+            name: 'provinceFk',
+        },
         {
             align: 'left',
             field: 'city',
-            label: t('City'),
+            label: t('customer.extendedList.tableVisibleColumns.city'),
             name: 'city',
         },
+        {
+            align: 'left',
+            field: 'postcode',
+            label: t('customer.extendedList.tableVisibleColumns.postcode'),
+            name: 'postcode',
+        },
         {
             align: 'left',
             field: 'email',
-            label: t('Email'),
+            label: t('customer.extendedList.tableVisibleColumns.email'),
             name: 'email',
         },
+        {
+            align: 'left',
+            field: 'created',
+            label: t('customer.extendedList.tableVisibleColumns.created'),
+            name: 'created',
+            format: (value) => toDate(value),
+        },
+        {
+            align: 'left',
+            field: 'businessType',
+            label: t('customer.extendedList.tableVisibleColumns.businessTypeFk'),
+            name: 'businessTypeFk',
+        },
+        {
+            align: 'left',
+            field: 'payMethod',
+            label: t('customer.extendedList.tableVisibleColumns.payMethodFk'),
+            name: 'payMethodFk',
+        },
+        {
+            align: 'left',
+            field: 'sageTaxType',
+            label: t('customer.extendedList.tableVisibleColumns.sageTaxTypeFk'),
+            name: 'sageTaxTypeFk',
+        },
+        {
+            align: 'left',
+            field: 'sageTransactionType',
+            label: t('customer.extendedList.tableVisibleColumns.sageTransactionTypeFk'),
+            name: 'sageTransactionTypeFk',
+        },
+        {
+            align: 'left',
+            field: 'isActive',
+            label: t('customer.extendedList.tableVisibleColumns.isActive'),
+            name: 'isActive',
+            format: () => ' ',
+        },
+        {
+            align: 'left',
+            field: 'isVies',
+            label: t('customer.extendedList.tableVisibleColumns.isVies'),
+            name: 'isVies',
+            format: () => ' ',
+        },
+        {
+            align: 'left',
+            field: 'isTaxDataChecked',
+            label: t('customer.extendedList.tableVisibleColumns.isTaxDataChecked'),
+            name: 'isTaxDataChecked',
+            format: () => ' ',
+        },
+        {
+            align: 'left',
+            field: 'isEqualizated',
+            label: t('customer.extendedList.tableVisibleColumns.isEqualizated'),
+            name: 'isEqualizated',
+            format: () => ' ',
+        },
+        {
+            align: 'left',
+            field: 'isFreezed',
+            label: t('customer.extendedList.tableVisibleColumns.isFreezed'),
+            name: 'isFreezed',
+            format: () => ' ',
+        },
+        {
+            align: 'left',
+            field: 'hasToInvoice',
+            label: t('customer.extendedList.tableVisibleColumns.hasToInvoice'),
+            name: 'hasToInvoice',
+            format: () => ' ',
+        },
+        {
+            align: 'left',
+            field: 'hasToInvoiceByAddress',
+            label: t('customer.extendedList.tableVisibleColumns.hasToInvoiceByAddress'),
+            name: 'hasToInvoiceByAddress',
+            format: () => ' ',
+        },
+        {
+            align: 'left',
+            field: 'isToBeMailed',
+            label: t('customer.extendedList.tableVisibleColumns.isToBeMailed'),
+            name: 'isToBeMailed',
+            format: () => ' ',
+        },
+        {
+            align: 'left',
+            field: 'hasLcr',
+            label: t('customer.extendedList.tableVisibleColumns.hasLcr'),
+            name: 'hasLcr',
+            format: () => ' ',
+        },
+        {
+            align: 'left',
+            field: 'hasCoreVnl',
+            label: t('customer.extendedList.tableVisibleColumns.hasCoreVnl'),
+            name: 'hasCoreVnl',
+            format: () => ' ',
+        },
+        {
+            align: 'left',
+            field: 'hasSepaVnl',
+            label: t('customer.extendedList.tableVisibleColumns.hasSepaVnl'),
+            name: 'hasSepaVnl',
+            format: () => ' ',
+        },
         {
             align: 'right',
             field: 'actions',
@@ -119,7 +473,7 @@ const columns = computed(() => {
 });
 
 const stopEventPropagation = (event, col) => {
-    if (!['ref', 'id', 'supplier'].includes(col.name)) return;
+    if (!['id', 'salesPersonFk'].includes(col.name)) return;
     event.preventDefault();
     event.stopPropagation();
 };
@@ -131,17 +485,35 @@ const navigateToTravelId = (id) => {
 const selectCustomerId = (id) => {
     selectedCustomerId.value = id;
 };
+
+const selectSalesPersonId = (id) => {
+    console.log('selectedSalesPersonId:: ', selectedSalesPersonId.value);
+    selectedSalesPersonId.value = id;
+};
 </script>
 
 <template>
     <QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above>
         <QScrollArea class="fit text-grey-8">
-            <CustomerExtendedListFilter data-key="CustomerExtendedList" />
+            <CustomerExtendedListFilter
+                v-if="visibleColumns.length !== 0"
+                data-key="CustomerExtendedList"
+                :visible-columns="visibleColumns"
+            />
         </QScrollArea>
     </QDrawer>
 
     <QToolbar class="bg-vn-dark">
-        <div id="st-data"></div>
+        <div id="st-data">
+            <TableVisibleColumns
+                :all-columns="allColumnNames"
+                table-code="clientsDetail"
+                labels-traductions-path="customer.extendedList.tableVisibleColumns"
+                @on-config-saved="
+                    visibleColumns = ['customerStatus', ...$event, 'actions']
+                "
+            />
+        </div>
         <QSpace />
         <div id="st-actions"></div>
     </QToolbar>
@@ -149,11 +521,11 @@ const selectCustomerId = (id) => {
     <QPage class="column items-center q-pa-md">
         <QTable
             :columns="columns"
-            :pagination="{ rowsPerPage: 0 }"
+            :pagination="{ rowsPerPage: 12 }"
             :rows="rows"
             class="full-width q-mt-md"
-            hide-bottom
             row-key="id"
+            :visible-columns="visibleColumns"
         >
             <template #body="props">
                 <QTr
@@ -173,8 +545,15 @@ const selectCustomerId = (id) => {
                             v-bind="tableColumnComponents[col.name].props(props)"
                             @click="tableColumnComponents[col.name].event(props)"
                         >
-                            {{ col.value }}
-                            <CustomerDescriptorProxy :id="selectedCustomerId" />
+                            {{ dashIfEmpty(col.value) }}
+                            <WorkerDescriptorProxy
+                                v-if="props.row.salesPersonFk"
+                                :id="selectedSalesPersonId"
+                            />
+                            <CustomerDescriptorProxy
+                                v-if="props.row.id"
+                                :id="selectedCustomerId"
+                            />
                         </component>
                     </QTd>
                 </QTr>
@@ -189,13 +568,3 @@ const selectCustomerId = (id) => {
     padding: 6px 6px 6px 6px;
 }
 </style>
-
-<i18n>
-es:
-    Identifier: Identificador
-    Social name: Razón social
-    Salesperson: Comercial
-    Phone: Teléfono
-    City: Población
-    Email: Email
-</i18n>
diff --git a/src/pages/Customer/CustomerExtendedListActions.vue b/src/pages/Customer/CustomerExtendedListActions.vue
index 1fec71ffe..882a71936 100644
--- a/src/pages/Customer/CustomerExtendedListActions.vue
+++ b/src/pages/Customer/CustomerExtendedListActions.vue
@@ -39,22 +39,29 @@ const viewSummary = () => {
 </script>
 
 <template>
-    <QIcon @click.stop="redirectToCreateView" color="primary" name="vn:ticket" size="sm">
-        <QTooltip>
-            {{ t('Client ticket list') }}
-        </QTooltip>
-    </QIcon>
-    <QIcon
-        @click.stop="viewSummary"
-        class="q-ml-md"
-        color="primary"
-        name="preview"
-        size="sm"
-    >
-        <QTooltip>
-            {{ t('Preview') }}
-        </QTooltip>
-    </QIcon>
+    <div>
+        <QIcon
+            @click.stop="redirectToCreateView"
+            color="primary"
+            name="vn:ticket"
+            size="sm"
+        >
+            <QTooltip>
+                {{ t('Client ticket list') }}
+            </QTooltip>
+        </QIcon>
+        <QIcon
+            @click.stop="viewSummary"
+            class="q-ml-md"
+            color="primary"
+            name="preview"
+            size="sm"
+        >
+            <QTooltip>
+                {{ t('Preview') }}
+            </QTooltip>
+        </QIcon>
+    </div>
 </template>
 
 <i18n>
diff --git a/src/pages/Customer/CustomerExtendedListFilter.vue b/src/pages/Customer/CustomerExtendedListFilter.vue
index ba1c966dc..0cf614fca 100644
--- a/src/pages/Customer/CustomerExtendedListFilter.vue
+++ b/src/pages/Customer/CustomerExtendedListFilter.vue
@@ -1,22 +1,40 @@
 <script setup>
-import { ref } from 'vue';
+import { ref, computed } from 'vue';
 import { useI18n } from 'vue-i18n';
 
 import FetchData from 'components/FetchData.vue';
 import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
 import VnSelectFilter from 'components/common/VnSelectFilter.vue';
 import VnInput from 'src/components/common/VnInput.vue';
+import VnInputDate from 'components/common/VnInputDate.vue';
 
-const { t } = useI18n();
 const props = defineProps({
     dataKey: {
         type: String,
         required: true,
     },
+    visibleColumns: {
+        type: Array,
+        required: true,
+    },
 });
 
+const { t } = useI18n();
+
 const clients = ref();
 const workers = ref();
+const countriesOptions = ref([]);
+const provincesOptions = ref([]);
+const paymethodsOptions = ref([]);
+const businessTypesOptions = ref([]);
+const sageTaxTypesOptions = ref([]);
+const sageTransactionTypesOptions = ref([]);
+
+const visibleColumnsSet = computed(() => new Set(props.visibleColumns));
+
+const shouldRenderColumn = (colName) => {
+    return visibleColumnsSet.value.has(colName);
+};
 </script>
 
 <template>
@@ -32,25 +50,75 @@ const workers = ref();
         @on-fetch="(data) => (workers = data)"
         auto-load
     />
+    <FetchData
+        url="Workers/activeWithInheritedRole"
+        :filter="{ where: { role: 'salesPerson' } }"
+        @on-fetch="(data) => (workers = data)"
+        auto-load
+    />
+    <FetchData
+        url="Countries"
+        :filter="{ fields: ['id', 'country'], order: 'country ASC' }"
+        @on-fetch="(data) => (countriesOptions = data)"
+        auto-load
+    />
+    <FetchData
+        ref="provincesFetchDataRef"
+        @on-fetch="(data) => (provincesOptions = data)"
+        auto-load
+        url="Provinces"
+    />
+    <FetchData
+        url="Paymethods"
+        @on-fetch="(data) => (paymethodsOptions = data)"
+        auto-load
+    />
+    <FetchData
+        url="BusinessTypes"
+        @on-fetch="(data) => (businessTypesOptions = data)"
+        auto-load
+    />
+    <FetchData
+        url="SageTaxTypes"
+        auto-load
+        @on-fetch="(data) => (sageTaxTypesOptions = data)"
+    />
+    <FetchData
+        url="sageTransactionTypes"
+        auto-load
+        @on-fetch="(data) => (sageTransactionTypesOptions = data)"
+    />
     <VnFilterPanel :data-key="props.dataKey" :search-button="true">
         <template #tags="{ tag, formatFn }">
             <div class="q-gutter-x-xs">
-                <strong>{{ t(`params.${tag.label}`) }}: </strong>
+                <strong
+                    >{{ t(`customer.extendedList.tableVisibleColumns.${tag.label}`) }}:
+                </strong>
                 <span>{{ formatFn(tag.value) }}</span>
             </div>
         </template>
         <template #body="{ params, searchFn }">
-            <QList dense class="list">
-                <QItem class="q-mb-sm q-mt-sm">
+            <QList dense class="list q-gutter-y-sm q-mt-sm">
+                <QItem v-if="shouldRenderColumn('id')">
                     <QItemSection>
                         <VnInput
-                            :label="t('Identifier')"
-                            v-model="params.identifier"
+                            :label="t('customer.extendedList.tableVisibleColumns.id')"
+                            v-model="params.id"
+                            is-outlined
+                            clearable
+                        />
+                    </QItemSection>
+                </QItem>
+                <QItem v-if="shouldRenderColumn('name')">
+                    <QItemSection>
+                        <VnInput
+                            :label="t('customer.extendedList.tableVisibleColumns.name')"
+                            v-model="params.name"
                             is-outlined
                         />
                     </QItemSection>
                 </QItem>
-                <QItem class="q-mb-sm">
+                <!-- <QItem class="q-mb-sm">
                     <QItemSection v-if="!clients">
                         <QSkeleton type="QInput" class="full-width" />
                     </QItemSection>
@@ -72,14 +140,27 @@ const workers = ref();
                             :input-debounce="0"
                         />
                     </QItemSection>
+                </QItem> -->
+                <QItem v-if="shouldRenderColumn('fi')">
+                    <QItemSection>
+                        <VnInput
+                            :label="t('customer.extendedList.tableVisibleColumns.fi')"
+                            v-model="params.fi"
+                            is-outlined
+                        />
+                    </QItemSection>
                 </QItem>
-                <QItem class="q-mb-sm">
+                <QItem v-if="shouldRenderColumn('salesPersonFk')">
                     <QItemSection v-if="!workers">
                         <QSkeleton type="QInput" class="full-width" />
                     </QItemSection>
                     <QItemSection v-if="workers">
                         <VnSelectFilter
-                            :label="t('Salesperson')"
+                            :label="
+                                t(
+                                    'customer.extendedList.tableVisibleColumns.salesPersonFk'
+                                )
+                            "
                             v-model="params.salesPersonFk"
                             @update:model-value="searchFn()"
                             :options="workers"
@@ -96,19 +177,375 @@ const workers = ref();
                         />
                     </QItemSection>
                 </QItem>
-                <QItem class="q-mb-sm">
+                <QItem v-if="shouldRenderColumn('credit')">
                     <QItemSection>
-                        <VnInput :label="t('Phone')" v-model="params.phone" is-outlined />
+                        <VnInput
+                            :label="t('customer.extendedList.tableVisibleColumns.credit')"
+                            v-model="params.credit"
+                            is-outlined
+                        />
                     </QItemSection>
                 </QItem>
-                <QItem class="q-mb-sm">
+                <QItem v-if="shouldRenderColumn('creditInsurance')">
                     <QItemSection>
-                        <VnInput :label="t('City')" v-model="params.city" is-outlined />
+                        <VnInput
+                            :label="
+                                t(
+                                    'customer.extendedList.tableVisibleColumns.creditInsurance'
+                                )
+                            "
+                            v-model="params.creditInsurance"
+                            is-outlined
+                        />
                     </QItemSection>
                 </QItem>
-                <QItem class="q-mb-sm">
+                <QItem v-if="shouldRenderColumn('phone')">
                     <QItemSection>
-                        <VnInput :label="t('Email')" v-model="params.email" is-outlined />
+                        <VnInput
+                            :label="t('customer.extendedList.tableVisibleColumns.phone')"
+                            v-model="params.phone"
+                            is-outlined
+                        />
+                    </QItemSection>
+                </QItem>
+                <QItem v-if="shouldRenderColumn('mobile')">
+                    <QItemSection>
+                        <VnInput
+                            :label="t('customer.extendedList.tableVisibleColumns.mobile')"
+                            v-model="params.mobile"
+                            is-outlined
+                        />
+                    </QItemSection>
+                </QItem>
+                <QItem v-if="shouldRenderColumn('street')">
+                    <QItemSection>
+                        <VnInput
+                            :label="t('customer.extendedList.tableVisibleColumns.street')"
+                            v-model="params.street"
+                            is-outlined
+                        />
+                    </QItemSection>
+                </QItem>
+                <QItem v-if="shouldRenderColumn('countryFk')">
+                    <QItemSection>
+                        <VnSelectFilter
+                            :label="
+                                t('customer.extendedList.tableVisibleColumns.countryFk')
+                            "
+                            v-model="params.countryFk"
+                            @update:model-value="searchFn()"
+                            :options="countriesOptions"
+                            option-value="id"
+                            option-label="country"
+                            map-options
+                            hide-selected
+                            dense
+                            outlined
+                            rounded
+                        />
+                    </QItemSection>
+                </QItem>
+                <QItem v-if="shouldRenderColumn('provinceFk')">
+                    <QItemSection>
+                        <VnSelectFilter
+                            :label="
+                                t('customer.extendedList.tableVisibleColumns.provinceFk')
+                            "
+                            v-model="params.provinceFk"
+                            @update:model-value="searchFn()"
+                            :options="provincesOptions"
+                            option-value="id"
+                            option-label="name"
+                            map-options
+                            hide-selected
+                            dense
+                            outlined
+                            rounded
+                        />
+                    </QItemSection>
+                </QItem>
+                <QItem v-if="shouldRenderColumn('city')">
+                    <QItemSection>
+                        <VnInput
+                            :label="t('customer.extendedList.tableVisibleColumns.city')"
+                            v-model="params.city"
+                            is-outlined
+                        />
+                    </QItemSection>
+                </QItem>
+                <QItem v-if="shouldRenderColumn('postcode')">
+                    <QItemSection>
+                        <VnInput
+                            :label="
+                                t('customer.extendedList.tableVisibleColumns.postcode')
+                            "
+                            v-model="params.postcode"
+                            is-outlined
+                        />
+                    </QItemSection>
+                </QItem>
+                <QItem v-if="shouldRenderColumn('email')">
+                    <QItemSection>
+                        <VnInput
+                            :label="t('customer.extendedList.tableVisibleColumns.email')"
+                            v-model="params.email"
+                            is-outlined
+                        />
+                    </QItemSection>
+                </QItem>
+
+                <QItem v-if="shouldRenderColumn('created')">
+                    <QItemSection>
+                        <VnInputDate
+                            v-model="params.created"
+                            :label="
+                                t('customer.extendedList.tableVisibleColumns.created')
+                            "
+                            @update:model-value="searchFn()"
+                            is-outlined
+                        />
+                    </QItemSection>
+                </QItem>
+                <QItem v-if="shouldRenderColumn('businessTypeFk')">
+                    <QItemSection>
+                        <VnSelectFilter
+                            :label="
+                                t(
+                                    'customer.extendedList.tableVisibleColumns.businessTypeFk'
+                                )
+                            "
+                            v-model="params.businessTypeFk"
+                            :options="businessTypesOptions"
+                            @update:model-value="searchFn()"
+                            option-value="code"
+                            option-label="description"
+                            map-options
+                            hide-selected
+                            dense
+                            outlined
+                            rounded
+                        />
+                    </QItemSection>
+                </QItem>
+                <QItem v-if="shouldRenderColumn('payMethodFk')">
+                    <QItemSection>
+                        <VnSelectFilter
+                            :label="
+                                t('customer.extendedList.tableVisibleColumns.payMethodFk')
+                            "
+                            v-model="params.payMethodFk"
+                            :options="paymethodsOptions"
+                            @update:model-value="searchFn()"
+                            option-value="id"
+                            option-label="name"
+                            map-options
+                            hide-selected
+                            dense
+                            outlined
+                            rounded
+                        />
+                    </QItemSection>
+                </QItem>
+                <QItem v-if="shouldRenderColumn('sageTaxTypeFk')">
+                    <QItemSection>
+                        <VnSelectFilter
+                            :label="
+                                t(
+                                    'customer.extendedList.tableVisibleColumns.sageTaxTypeFk'
+                                )
+                            "
+                            v-model="params.sageTaxTypeFk"
+                            @update:model-value="searchFn()"
+                            :options="sageTaxTypesOptions"
+                            option-value="id"
+                            option-label="vat"
+                            map-options
+                            hide-selected
+                            dense
+                            outlined
+                            rounded
+                        />
+                    </QItemSection>
+                </QItem>
+                <QItem v-if="shouldRenderColumn('sageTransactionTypeFk')">
+                    <QItemSection>
+                        <VnSelectFilter
+                            :label="
+                                t(
+                                    'customer.extendedList.tableVisibleColumns.sageTransactionTypeFk'
+                                )
+                            "
+                            v-model="params.sageTransactionTypeFk"
+                            @update:model-value="searchFn()"
+                            :options="sageTransactionTypesOptions"
+                            option-value="id"
+                            option-label="transaction"
+                            map-options
+                            hide-selected
+                            dense
+                            outlined
+                            rounded
+                        />
+                    </QItemSection>
+                </QItem>
+                <QItem
+                    v-if="shouldRenderColumn('isActive') || shouldRenderColumn('isVies')"
+                >
+                    <QItemSection v-if="shouldRenderColumn('isActive')">
+                        <QCheckbox
+                            v-model="params.isActive"
+                            @update:model-value="searchFn()"
+                            :label="
+                                t('customer.extendedList.tableVisibleColumns.isActive')
+                            "
+                            toggle-indeterminate
+                            :false-value="undefined"
+                        />
+                    </QItemSection>
+                    <QItemSection v-if="shouldRenderColumn('isVies')">
+                        <QCheckbox
+                            v-model="params.isVies"
+                            @update:model-value="searchFn()"
+                            :label="t('customer.extendedList.tableVisibleColumns.isVies')"
+                            toggle-indeterminate
+                            :false-value="undefined"
+                        />
+                    </QItemSection>
+                </QItem>
+                <QItem
+                    v-if="
+                        shouldRenderColumn('isEqualizated') ||
+                        shouldRenderColumn('isTaxDataChecked')
+                    "
+                >
+                    <QItemSection v-if="shouldRenderColumn('isTaxDataChecked')">
+                        <QCheckbox
+                            v-model="params.isTaxDataChecked"
+                            @update:model-value="searchFn()"
+                            :label="
+                                t(
+                                    'customer.extendedList.tableVisibleColumns.isTaxDataChecked'
+                                )
+                            "
+                            toggle-indeterminate
+                            :false-value="undefined"
+                        />
+                    </QItemSection>
+                    <QItemSection v-if="shouldRenderColumn('isEqualizated')">
+                        <QCheckbox
+                            v-model="params.isEqualizated"
+                            @update:model-value="searchFn()"
+                            :label="
+                                t(
+                                    'customer.extendedList.tableVisibleColumns.isEqualizated'
+                                )
+                            "
+                            toggle-indeterminate
+                            :false-value="undefined"
+                        />
+                    </QItemSection>
+                </QItem>
+                <QItem
+                    v-if="
+                        shouldRenderColumn('hasToInvoice') ||
+                        shouldRenderColumn('isFreezed')
+                    "
+                >
+                    <QItemSection v-if="shouldRenderColumn('isFreezed')">
+                        <QCheckbox
+                            v-model="params.isFreezed"
+                            @update:model-value="searchFn()"
+                            :label="
+                                t('customer.extendedList.tableVisibleColumns.isFreezed')
+                            "
+                            toggle-indeterminate
+                            :false-value="undefined"
+                        />
+                    </QItemSection>
+                    <QItemSection v-if="shouldRenderColumn('hasToInvoice')">
+                        <QCheckbox
+                            v-model="params.hasToInvoice"
+                            @update:model-value="searchFn()"
+                            :label="
+                                t(
+                                    'customer.extendedList.tableVisibleColumns.hasToInvoice'
+                                )
+                            "
+                            toggle-indeterminate
+                            :false-value="undefined"
+                        />
+                    </QItemSection>
+                </QItem>
+                <QItem
+                    v-if="
+                        shouldRenderColumn('isToBeMailed') ||
+                        shouldRenderColumn('hasToInvoiceByAddress')
+                    "
+                >
+                    <QItemSection v-if="shouldRenderColumn('hasToInvoiceByAddress')">
+                        <QCheckbox
+                            v-model="params.hasToInvoiceByAddress"
+                            @update:model-value="searchFn()"
+                            :label="
+                                t(
+                                    'customer.extendedList.tableVisibleColumns.hasToInvoiceByAddress'
+                                )
+                            "
+                            toggle-indeterminate
+                            :false-value="undefined"
+                        />
+                    </QItemSection>
+                    <QItemSection v-if="shouldRenderColumn('isToBeMailed')">
+                        <QCheckbox
+                            v-model="params.isToBeMailed"
+                            @update:model-value="searchFn()"
+                            :label="
+                                t(
+                                    'customer.extendedList.tableVisibleColumns.isToBeMailed'
+                                )
+                            "
+                            toggle-indeterminate
+                            :false-value="undefined"
+                        />
+                    </QItemSection>
+                </QItem>
+                <QItem
+                    v-if="
+                        shouldRenderColumn('hasLcr') || shouldRenderColumn('hasCoreVnl')
+                    "
+                >
+                    <QItemSection v-if="shouldRenderColumn('hasLcr')">
+                        <QCheckbox
+                            v-model="params.hasLcr"
+                            @update:model-value="searchFn()"
+                            :label="t('customer.extendedList.tableVisibleColumns.hasLcr')"
+                            toggle-indeterminate
+                            :false-value="undefined"
+                        />
+                    </QItemSection>
+                    <QItemSection v-if="shouldRenderColumn('hasCoreVnl')">
+                        <QCheckbox
+                            v-model="params.hasCoreVnl"
+                            @update:model-value="searchFn()"
+                            :label="
+                                t('customer.extendedList.tableVisibleColumns.hasCoreVnl')
+                            "
+                            toggle-indeterminate
+                            :false-value="undefined"
+                        />
+                    </QItemSection>
+                </QItem>
+                <QItem v-if="shouldRenderColumn('hasSepaVnl')">
+                    <QItemSection>
+                        <QCheckbox
+                            v-model="params.hasSepaVnl"
+                            @update:model-value="searchFn()"
+                            :label="
+                                t('customer.extendedList.tableVisibleColumns.hasSepaVnl')
+                            "
+                            toggle-indeterminate
+                            :false-value="undefined"
+                        />
                     </QItemSection>
                 </QItem>
 
@@ -128,26 +565,7 @@ const workers = ref();
 </style>
 
 <i18n>
-en:
-    params:
-        identifier: Identifier
-        socialName: Social name
-        salesPerson: Salesperson
-        phone: Phone
-        city: City
-        email: Email
+
 es:
-    params:
-        identifier: Identificador
-        socialName: Razón social
-        salesPerson: Comercial
-        phone: Teléfono
-        city: Población
-        email: Email
-    Identifier: Identificador
     Social name: Razón social
-    Salesperson: Comercial
-    Phone: Teléfono
-    City: Población
-    Email: Email
 </i18n>

From c4c344f07ab91f53f1b3f286d26d8b3b3929174b Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Fri, 29 Dec 2023 14:00:32 -0300
Subject: [PATCH 11/36] Add descriptor and submodules to supplier card left
 menu

---
 src/i18n/en/index.js                          |  11 +-
 src/i18n/es/index.js                          |   9 ++
 src/pages/Supplier/Card/SupplierAccounts.vue  |   1 +
 src/pages/Supplier/Card/SupplierAddresses.vue |   1 +
 .../Supplier/Card/SupplierAgencyTerm.vue      |   1 +
 src/pages/Supplier/Card/SupplierBasicData.vue |   1 +
 .../Supplier/Card/SupplierBillingData.vue     |   1 +
 src/pages/Supplier/Card/SupplierCard.vue      |   6 +-
 .../Supplier/Card/SupplierConsumption.vue     |   1 +
 src/pages/Supplier/Card/SupplierContacts.vue  |   1 +
 .../Supplier/Card/SupplierFiscalData.vue      |   1 +
 src/pages/Supplier/Card/SupplierLog.vue       |   1 +
 src/router/modules/Supplier.js                | 101 +++++++++++++++++-
 13 files changed, 133 insertions(+), 3 deletions(-)
 create mode 100644 src/pages/Supplier/Card/SupplierAccounts.vue
 create mode 100644 src/pages/Supplier/Card/SupplierAddresses.vue
 create mode 100644 src/pages/Supplier/Card/SupplierAgencyTerm.vue
 create mode 100644 src/pages/Supplier/Card/SupplierBasicData.vue
 create mode 100644 src/pages/Supplier/Card/SupplierBillingData.vue
 create mode 100644 src/pages/Supplier/Card/SupplierConsumption.vue
 create mode 100644 src/pages/Supplier/Card/SupplierContacts.vue
 create mode 100644 src/pages/Supplier/Card/SupplierFiscalData.vue
 create mode 100644 src/pages/Supplier/Card/SupplierLog.vue

diff --git a/src/i18n/en/index.js b/src/i18n/en/index.js
index 12505b30e..ea2431821 100644
--- a/src/i18n/en/index.js
+++ b/src/i18n/en/index.js
@@ -558,7 +558,7 @@ export default {
             summary: 'Summary',
             basicData: 'Basic Data',
             catalog: 'Catalog',
-            volume: 'Volume'
+            volume: 'Volume',
         },
         field: {
             salesPersonFk: 'Sales Person',
@@ -769,6 +769,15 @@ export default {
             list: 'List',
             create: 'Create',
             summary: 'Summary',
+            basicData: 'Basic Data',
+            fiscalData: 'Fiscal Data',
+            billingData: 'Billing Data',
+            log: 'Log',
+            accounts: 'Accounts',
+            contacts: 'Contacts',
+            addresses: 'Addresses',
+            consumption: 'Consumption',
+            agencyTerm: 'Agency Agreement',
         },
         list: {
             payMethod: 'Pay method',
diff --git a/src/i18n/es/index.js b/src/i18n/es/index.js
index fe16df8fc..60b813f3a 100644
--- a/src/i18n/es/index.js
+++ b/src/i18n/es/index.js
@@ -769,6 +769,15 @@ export default {
             list: 'Listado',
             create: 'Crear',
             summary: 'Resumen',
+            basicData: 'Datos básicos',
+            fiscalData: 'Datos fiscales',
+            billingData: 'Forma de pago',
+            log: 'Historial',
+            accounts: 'Cuentas',
+            contacts: 'Contactos',
+            addresses: 'Direcciones',
+            consumption: 'Consumo',
+            agencyTerm: 'Acuerdo agencia',
         },
         list: {
             payMethod: 'Método de pago',
diff --git a/src/pages/Supplier/Card/SupplierAccounts.vue b/src/pages/Supplier/Card/SupplierAccounts.vue
new file mode 100644
index 000000000..2b7059ea3
--- /dev/null
+++ b/src/pages/Supplier/Card/SupplierAccounts.vue
@@ -0,0 +1 @@
+<template>Supplier accounts</template>
diff --git a/src/pages/Supplier/Card/SupplierAddresses.vue b/src/pages/Supplier/Card/SupplierAddresses.vue
new file mode 100644
index 000000000..dd82abe78
--- /dev/null
+++ b/src/pages/Supplier/Card/SupplierAddresses.vue
@@ -0,0 +1 @@
+<template>Supplier addresses</template>
diff --git a/src/pages/Supplier/Card/SupplierAgencyTerm.vue b/src/pages/Supplier/Card/SupplierAgencyTerm.vue
new file mode 100644
index 000000000..2a0c341cf
--- /dev/null
+++ b/src/pages/Supplier/Card/SupplierAgencyTerm.vue
@@ -0,0 +1 @@
+<template>Supplier agency term</template>
diff --git a/src/pages/Supplier/Card/SupplierBasicData.vue b/src/pages/Supplier/Card/SupplierBasicData.vue
new file mode 100644
index 000000000..582da48f3
--- /dev/null
+++ b/src/pages/Supplier/Card/SupplierBasicData.vue
@@ -0,0 +1 @@
+<template>Supplier basic data</template>
diff --git a/src/pages/Supplier/Card/SupplierBillingData.vue b/src/pages/Supplier/Card/SupplierBillingData.vue
new file mode 100644
index 000000000..849737fa7
--- /dev/null
+++ b/src/pages/Supplier/Card/SupplierBillingData.vue
@@ -0,0 +1 @@
+<template>Supplier billing data</template>
diff --git a/src/pages/Supplier/Card/SupplierCard.vue b/src/pages/Supplier/Card/SupplierCard.vue
index cf94c9e8d..04115cc3d 100644
--- a/src/pages/Supplier/Card/SupplierCard.vue
+++ b/src/pages/Supplier/Card/SupplierCard.vue
@@ -2,6 +2,8 @@
 import { useI18n } from 'vue-i18n';
 import { useStateStore } from 'stores/useStateStore';
 import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
+import LeftMenu from 'components/LeftMenu.vue';
+import SupplierDescriptor from './SupplierDescriptor.vue';
 
 const stateStore = useStateStore();
 const { t } = useI18n();
@@ -18,7 +20,9 @@ const { t } = useI18n();
     </template>
     <QDrawer v-model="stateStore.leftDrawer" show-if-above :width="256">
         <QScrollArea class="fit">
-            <!-- Aca iría left menu y descriptor -->
+            <SupplierDescriptor />
+            <QSeparator />
+            <LeftMenu source="card" />
         </QScrollArea>
     </QDrawer>
     <QPageContainer>
diff --git a/src/pages/Supplier/Card/SupplierConsumption.vue b/src/pages/Supplier/Card/SupplierConsumption.vue
new file mode 100644
index 000000000..df1dead17
--- /dev/null
+++ b/src/pages/Supplier/Card/SupplierConsumption.vue
@@ -0,0 +1 @@
+<template>Supplier consumption</template>
diff --git a/src/pages/Supplier/Card/SupplierContacts.vue b/src/pages/Supplier/Card/SupplierContacts.vue
new file mode 100644
index 000000000..ca58d4ab7
--- /dev/null
+++ b/src/pages/Supplier/Card/SupplierContacts.vue
@@ -0,0 +1 @@
+<template>Supplier contacts</template>
diff --git a/src/pages/Supplier/Card/SupplierFiscalData.vue b/src/pages/Supplier/Card/SupplierFiscalData.vue
new file mode 100644
index 000000000..dd018ac60
--- /dev/null
+++ b/src/pages/Supplier/Card/SupplierFiscalData.vue
@@ -0,0 +1 @@
+<template>Supplier fiscal data</template>
diff --git a/src/pages/Supplier/Card/SupplierLog.vue b/src/pages/Supplier/Card/SupplierLog.vue
new file mode 100644
index 000000000..2733e958d
--- /dev/null
+++ b/src/pages/Supplier/Card/SupplierLog.vue
@@ -0,0 +1 @@
+<template>Supplier log</template>
diff --git a/src/router/modules/Supplier.js b/src/router/modules/Supplier.js
index 198a9581e..6ce1a7688 100644
--- a/src/router/modules/Supplier.js
+++ b/src/router/modules/Supplier.js
@@ -11,7 +11,17 @@ export default {
     redirect: { name: 'SupplierMain' },
     menus: {
         main: ['SupplierList'],
-        card: [],
+        card: [
+            'SupplierBasicData',
+            'SupplierFiscalData',
+            'SupplierBillingData',
+            'SupplierLog',
+            'SupplierAccounts',
+            'SupplierContacts',
+            'SupplierAddresses',
+            'SupplierConsumption',
+            'SupplierAgencyTerm',
+        ],
     },
     children: [
         {
@@ -55,6 +65,95 @@ export default {
                     component: () =>
                         import('src/pages/Supplier/Card/SupplierSummary.vue'),
                 },
+                {
+                    path: 'basic-data',
+                    name: 'SupplierBasicData',
+                    meta: {
+                        title: 'basicData',
+                        icon: 'vn:settings',
+                    },
+                    component: () =>
+                        import('src/pages/Supplier/Card/SupplierBasicData.vue'),
+                },
+                {
+                    path: 'fiscal-data',
+                    name: 'SupplierFiscalData',
+                    meta: {
+                        title: 'fiscalData',
+                        icon: 'vn:dfiscales',
+                    },
+                    component: () =>
+                        import('src/pages/Supplier/Card/SupplierFiscalData.vue'),
+                },
+                {
+                    path: 'billing-data',
+                    name: 'SupplierBillingData',
+                    meta: {
+                        title: 'billingData',
+                        icon: 'vn:payment',
+                    },
+                    component: () =>
+                        import('src/pages/Supplier/Card/SupplierBillingData.vue'),
+                },
+                {
+                    path: 'log',
+                    name: 'SupplierLog',
+                    meta: {
+                        title: 'log',
+                        icon: 'vn:History',
+                    },
+                    component: () => import('src/pages/Supplier/Card/SupplierLog.vue'),
+                },
+                {
+                    path: 'account',
+                    name: 'SupplierAccounts',
+                    meta: {
+                        title: 'accounts',
+                        icon: 'vn:account',
+                    },
+                    component: () =>
+                        import('src/pages/Supplier/Card/SupplierAccounts.vue'),
+                },
+                {
+                    path: 'contact',
+                    name: 'SupplierContacts',
+                    meta: {
+                        title: 'contacts',
+                        icon: 'contact_phone',
+                    },
+                    component: () =>
+                        import('src/pages/Supplier/Card/SupplierContacts.vue'),
+                },
+                {
+                    path: 'address',
+                    name: 'SupplierAddresses',
+                    meta: {
+                        title: 'addresses',
+                        icon: 'vn:delivery',
+                    },
+                    component: () =>
+                        import('src/pages/Supplier/Card/SupplierAddresses.vue'),
+                },
+                {
+                    path: 'consumption',
+                    name: 'SupplierConsumption',
+                    meta: {
+                        title: 'consumption',
+                        icon: 'show_chart',
+                    },
+                    component: () =>
+                        import('src/pages/Supplier/Card/SupplierConsumption.vue'),
+                },
+                {
+                    path: 'agency-term',
+                    name: 'SupplierAgencyTerm',
+                    meta: {
+                        title: 'agencyTerm',
+                        icon: 'vn:agency-term',
+                    },
+                    component: () =>
+                        import('src/pages/Supplier/Card/SupplierAgencyTerm.vue'),
+                },
             ],
         },
     ],

From 2edaf71e403190c39cdd7c73170f5a5f3e653b12 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Fri, 29 Dec 2023 14:19:44 -0300
Subject: [PATCH 12/36] change suppliers submodules titles casing

---
 src/i18n/en/index.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/i18n/en/index.js b/src/i18n/en/index.js
index ea2431821..9fc3333a3 100644
--- a/src/i18n/en/index.js
+++ b/src/i18n/en/index.js
@@ -769,9 +769,9 @@ export default {
             list: 'List',
             create: 'Create',
             summary: 'Summary',
-            basicData: 'Basic Data',
-            fiscalData: 'Fiscal Data',
-            billingData: 'Billing Data',
+            basicData: 'Basic data',
+            fiscalData: 'Fiscal data',
+            billingData: 'Billing data',
             log: 'Log',
             accounts: 'Accounts',
             contacts: 'Contacts',

From 8b24ac9fe4081db937276dbba55b00f17a109c56 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Fri, 29 Dec 2023 14:43:20 -0300
Subject: [PATCH 13/36] change suppliers submodules titles casing

---
 src/i18n/en/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/en/index.js b/src/i18n/en/index.js
index 9fc3333a3..7f3237050 100644
--- a/src/i18n/en/index.js
+++ b/src/i18n/en/index.js
@@ -777,7 +777,7 @@ export default {
             contacts: 'Contacts',
             addresses: 'Addresses',
             consumption: 'Consumption',
-            agencyTerm: 'Agency Agreement',
+            agencyTerm: 'Agency agreement',
         },
         list: {
             payMethod: 'Pay method',

From 113df44705815331027fab318eb722ab09ae7308 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Fri, 29 Dec 2023 16:54:35 -0300
Subject: [PATCH 14/36] create entries basic structure and add create entry and
 clone travel with entries feature to travel list and travel summary

---
 src/i18n/en/index.js                    |  12 +++
 src/i18n/es/index.js                    |  11 ++
 src/pages/Entry/Card/EntryCard.vue      |  26 +++++
 src/pages/Entry/EntryCreate.vue         | 135 ++++++++++++++++++++++++
 src/pages/Entry/EntryList.vue           |  22 ++++
 src/pages/Entry/EntryMain.vue           |  17 +++
 src/pages/Supplier/SupplierCreate.vue   |  10 --
 src/pages/Travel/Card/TravelSummary.vue |  22 ++--
 src/pages/Travel/TravelList.vue         |   6 +-
 src/router/modules/entry.js             |  61 +++++++++++
 src/router/modules/index.js             |   2 +
 src/router/routes.js                    |   2 +
 src/stores/useNavigationStore.js        |   1 +
 13 files changed, 310 insertions(+), 17 deletions(-)
 create mode 100644 src/pages/Entry/Card/EntryCard.vue
 create mode 100644 src/pages/Entry/EntryCreate.vue
 create mode 100644 src/pages/Entry/EntryList.vue
 create mode 100644 src/pages/Entry/EntryMain.vue
 create mode 100644 src/router/modules/entry.js

diff --git a/src/i18n/en/index.js b/src/i18n/en/index.js
index 7f3237050..878dc03b8 100644
--- a/src/i18n/en/index.js
+++ b/src/i18n/en/index.js
@@ -207,6 +207,18 @@ export default {
             contactChannel: 'Contact channel',
         },
     },
+    entry: {
+        pageTitles: {
+            entries: 'Entries',
+            list: 'List',
+            createEntry: 'New entry',
+            summary: 'Summary',
+            create: 'Create',
+        },
+        list: {
+            newEntry: 'New entry',
+        },
+    },
     ticket: {
         pageTitles: {
             tickets: 'Tickets',
diff --git a/src/i18n/es/index.js b/src/i18n/es/index.js
index 60b813f3a..4d29947a7 100644
--- a/src/i18n/es/index.js
+++ b/src/i18n/es/index.js
@@ -206,6 +206,17 @@ export default {
             contactChannel: 'Canal de contacto',
         },
     },
+    entry: {
+        pageTitles: {
+            entries: 'Entradas',
+            list: 'Listado',
+            summary: 'Resumen',
+            create: 'Crear',
+        },
+        list: {
+            newEntry: 'Nueva entrada',
+        },
+    },
     ticket: {
         pageTitles: {
             tickets: 'Tickets',
diff --git a/src/pages/Entry/Card/EntryCard.vue b/src/pages/Entry/Card/EntryCard.vue
new file mode 100644
index 000000000..5aa50fc94
--- /dev/null
+++ b/src/pages/Entry/Card/EntryCard.vue
@@ -0,0 +1,26 @@
+<script setup>
+import { useStateStore } from 'stores/useStateStore';
+import LeftMenu from 'components/LeftMenu.vue';
+
+const stateStore = useStateStore();
+</script>
+<template>
+    <!-- Entry searchbar -->
+    <QDrawer v-model="stateStore.leftDrawer" show-if-above :width="256">
+        <QScrollArea class="fit">
+            <!-- EntryDescriptor -->
+            <QSeparator />
+            <LeftMenu source="card" />
+        </QScrollArea>
+    </QDrawer>
+    <QPageContainer>
+        <QPage>
+            <QToolbar class="bg-vn-dark justify-end">
+                <div id="st-data"></div>
+                <QSpace />
+                <div id="st-actions"></div>
+            </QToolbar>
+            <div class="q-pa-md"><RouterView></RouterView></div>
+        </QPage>
+    </QPageContainer>
+</template>
diff --git a/src/pages/Entry/EntryCreate.vue b/src/pages/Entry/EntryCreate.vue
new file mode 100644
index 000000000..30b54cb38
--- /dev/null
+++ b/src/pages/Entry/EntryCreate.vue
@@ -0,0 +1,135 @@
+<script setup>
+import { reactive, ref } from 'vue';
+import { useI18n } from 'vue-i18n';
+import { useRoute } from 'vue-router';
+
+import FormModel from 'components/FormModel.vue';
+import VnRow from 'components/ui/VnRow.vue';
+import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+import FetchData from 'components/FetchData.vue';
+
+import { toDate } from 'src/filters';
+
+const { t } = useI18n();
+const route = useRoute();
+
+const newEntryForm = reactive({
+    supplierFk: null,
+    travelFk: route.query?.travelFk || null,
+    companyFk: null,
+});
+
+const suppliersOptions = ref([]);
+const travelsOptionsOptions = ref([]);
+const companiesOptions = ref([]);
+</script>
+
+<template>
+    <FetchData
+        url="Suppliers"
+        :filter="{ fields: ['id', 'nickname'] }"
+        order="nickname"
+        @on-fetch="(data) => (suppliersOptions = data)"
+        auto-load
+    />
+    <FetchData
+        url="Travels/filter"
+        :filter="{ fields: ['id', 'warehouseInName'] }"
+        order="id"
+        @on-fetch="(data) => (travelsOptionsOptions = data)"
+        auto-load
+    />
+    <FetchData
+        ref="companiesRef"
+        url="Companies"
+        :filter="{ fields: ['id', 'code'] }"
+        order="code"
+        @on-fetch="(data) => (companiesOptions = data)"
+        auto-load
+    />
+
+    <!-- Agregar searchbar de entries -->
+
+    <QPage>
+        <QToolbar class="bg-vn-dark justify-end">
+            <div id="st-data"></div>
+            <QSpace />
+            <div id="st-actions"></div>
+        </QToolbar>
+        <FormModel url-create="Entries" model="entry" :form-initial-data="newEntryForm">
+            <template #form="{ data, validate }">
+                <VnRow class="row q-gutter-md q-mb-md">
+                    <VnSelectFilter
+                        :label="t('Supplier *')"
+                        class="full-width"
+                        v-model="data.supplierFk"
+                        :options="suppliersOptions"
+                        option-value="id"
+                        option-label="nickname"
+                        hide-selected
+                        :rules="validate('entry.supplierFk')"
+                    >
+                        <template #option="scope">
+                            <QItem v-bind="scope.itemProps">
+                                <QItemSection>
+                                    <QItemLabel>{{ scope.opt?.nickname }}</QItemLabel>
+                                    <QItemLabel caption>
+                                        #{{ scope.opt?.id }}
+                                    </QItemLabel>
+                                </QItemSection>
+                            </QItem>
+                        </template>
+                    </VnSelectFilter>
+                </VnRow>
+                <VnRow class="row q-gutter-md q-mb-md">
+                    <VnSelectFilter
+                        :label="t('Travel *')"
+                        class="full-width"
+                        v-model="data.travelFk"
+                        :options="travelsOptionsOptions"
+                        option-value="id"
+                        option-label="warehouseInName"
+                        map-options
+                        hide-selected
+                        :rules="validate('entry.travelFk')"
+                    >
+                        <template #option="scope">
+                            <QItem v-bind="scope.itemProps">
+                                <QItemSection>
+                                    <QItemLabel
+                                        >{{ scope.opt?.agencyModeName }} -
+                                        {{ scope.opt?.warehouseInName }} ({{
+                                            toDate(scope.opt?.shipped)
+                                        }}) &#x2192; {{ scope.opt?.warehouseOutName }} ({{
+                                            toDate(scope.opt?.landed)
+                                        }})</QItemLabel
+                                    >
+                                </QItemSection>
+                            </QItem>
+                        </template>
+                    </VnSelectFilter>
+                </VnRow>
+                <VnRow class="row q-gutter-md q-mb-md">
+                    <VnSelectFilter
+                        :label="t('Company *')"
+                        class="full-width"
+                        v-model="data.companyFk"
+                        :options="companiesOptions"
+                        option-value="id"
+                        option-label="code"
+                        map-options
+                        hide-selected
+                        :rules="validate('entry.companyFk')"
+                    />
+                </VnRow>
+            </template>
+        </FormModel>
+    </QPage>
+</template>
+
+<i18n>
+    es:
+        Supplier *: Proveedor *
+        Travel *: Envío *
+        Company *: Empresa *
+    </i18n>
diff --git a/src/pages/Entry/EntryList.vue b/src/pages/Entry/EntryList.vue
new file mode 100644
index 000000000..1baa9e019
--- /dev/null
+++ b/src/pages/Entry/EntryList.vue
@@ -0,0 +1,22 @@
+<script setup>
+import { useI18n } from 'vue-i18n';
+import { useRouter } from 'vue-router';
+
+const router = useRouter();
+const { t } = useI18n();
+
+const redirectToCreateView = () => {
+    router.push({ name: 'EntryCreate' });
+};
+</script>
+
+<template>
+    <QPage class="column items-center q-pa-md">
+        <QPageSticky :offset="[20, 20]">
+            <QBtn fab icon="add" color="primary" @click="redirectToCreateView()" />
+            <QTooltip>
+                {{ t('entry.list.newEntry') }}
+            </QTooltip>
+        </QPageSticky>
+    </QPage>
+</template>
diff --git a/src/pages/Entry/EntryMain.vue b/src/pages/Entry/EntryMain.vue
new file mode 100644
index 000000000..66ce78f23
--- /dev/null
+++ b/src/pages/Entry/EntryMain.vue
@@ -0,0 +1,17 @@
+<script setup>
+import { useStateStore } from 'stores/useStateStore';
+import LeftMenu from 'src/components/LeftMenu.vue';
+
+const stateStore = useStateStore();
+</script>
+
+<template>
+    <QDrawer v-model="stateStore.leftDrawer" show-if-above :width="256">
+        <QScrollArea class="fit text-grey-8">
+            <LeftMenu />
+        </QScrollArea>
+    </QDrawer>
+    <QPageContainer>
+        <RouterView></RouterView>
+    </QPageContainer>
+</template>
diff --git a/src/pages/Supplier/SupplierCreate.vue b/src/pages/Supplier/SupplierCreate.vue
index 3317225d5..d6cfaeb42 100644
--- a/src/pages/Supplier/SupplierCreate.vue
+++ b/src/pages/Supplier/SupplierCreate.vue
@@ -51,13 +51,3 @@ const newSupplierForm = reactive({
         </FormModel>
     </QPage>
 </template>
-
-<style lang="scss" scoped>
-.card {
-    display: flex;
-    justify-content: center;
-    width: 100%;
-    background-color: var(--vn-dark);
-    padding: 40px;
-}
-</style>
diff --git a/src/pages/Travel/Card/TravelSummary.vue b/src/pages/Travel/Card/TravelSummary.vue
index ad4659b11..c8a62ec00 100644
--- a/src/pages/Travel/Card/TravelSummary.vue
+++ b/src/pages/Travel/Card/TravelSummary.vue
@@ -2,15 +2,17 @@
 import { onMounted, ref, computed, onUpdated } from 'vue';
 import { useRoute, useRouter } from 'vue-router';
 import { useI18n } from 'vue-i18n';
+
+import { QCheckbox, QIcon } from 'quasar';
 import CardSummary from 'components/ui/CardSummary.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
-import { getUrl } from 'src/composables/getUrl';
-import { toDate } from 'src/filters';
-import travelService from 'src/services/travel.service';
-import { QCheckbox, QIcon } from 'quasar';
-import { toCurrency } from 'filters/index';
 import VnRow from 'components/ui/VnRow.vue';
 
+import travelService from 'src/services/travel.service';
+import { toDate, toCurrency } from 'src/filters';
+import { getUrl } from 'src/composables/getUrl';
+import axios from 'axios';
+
 onUpdated(() => summaryRef.value.fetch());
 
 const route = useRoute();
@@ -40,9 +42,17 @@ const cloneTravel = () => {
     redirectToCreateView(stringifiedTravelData);
 };
 
+const cloneTravelWithEntries = () => {
+    try {
+        axios.post(`Travels/${$props.id}/cloneWithEntries`);
+    } catch (err) {
+        console.err('Error cloning travel with entries');
+    }
+};
+
 const headerMenuOptions = [
     { name: t('travel.summary.cloneShipping'), action: cloneTravel },
-    { name: t('travel.summary.CloneTravelAndEntries'), action: null },
+    { name: t('travel.summary.CloneTravelAndEntries'), action: cloneTravelWithEntries },
     { name: t('travel.summary.AddEntry'), action: null },
 ];
 
diff --git a/src/pages/Travel/TravelList.vue b/src/pages/Travel/TravelList.vue
index 56d529a7b..889f096aa 100644
--- a/src/pages/Travel/TravelList.vue
+++ b/src/pages/Travel/TravelList.vue
@@ -31,6 +31,10 @@ const redirectToCreateView = (queryParams) => {
     router.push({ name: 'TravelCreate', query: { travelData: queryParams } });
 };
 
+const redirectCreateEntryView = (travelData) => {
+    router.push({ name: 'EntryCreate', query: { travelFk: travelData.id } });
+};
+
 const viewSummary = (id) => {
     quasar.dialog({
         component: TravelSummaryDialog,
@@ -103,7 +107,7 @@ onMounted(async () => {
                             />
                             <QBtn
                                 :label="t('addEntry')"
-                                @click.stop="viewSummary(row.id)"
+                                @click.stop="redirectCreateEntryView(row)"
                                 class="bg-vn-dark"
                                 outline
                                 style="margin-top: 15px"
diff --git a/src/router/modules/entry.js b/src/router/modules/entry.js
new file mode 100644
index 000000000..6a1cd6173
--- /dev/null
+++ b/src/router/modules/entry.js
@@ -0,0 +1,61 @@
+import { RouterView } from 'vue-router';
+
+export default {
+    path: '/entry',
+    name: 'Entry',
+    meta: {
+        title: 'entries',
+        icon: 'vn:entry',
+    },
+    component: RouterView,
+    redirect: { name: 'EntryMain' },
+    menus: {
+        main: ['EntryList'],
+        card: [],
+    },
+    children: [
+        {
+            path: '',
+            name: 'EntryMain',
+            component: () => import('src/pages/Entry/EntryMain.vue'),
+            redirect: { name: 'EntryList' },
+            children: [
+                {
+                    path: 'list',
+                    name: 'EntryList',
+                    meta: {
+                        title: 'list',
+                        icon: 'view_list',
+                    },
+                    component: () => import('src/pages/Entry/EntryList.vue'),
+                },
+                {
+                    path: 'create',
+                    name: 'EntryCreate',
+                    meta: {
+                        title: 'create',
+                    },
+                    component: () => import('src/pages/Entry/EntryCreate.vue'),
+                },
+            ],
+        },
+        // {
+        //     name: 'EntryCard',
+        //     path: ':id',
+        //     component: () => import('src/pages/Entry/Card/EntryCard.vue'),
+        //     redirect: { name: 'EntrySummary' },
+        //     children: [
+        //         {
+        //             name: 'EntrySummary',
+        //             path: 'summary',
+        //             meta: {
+        //                 title: 'summary',
+        //                 icon: 'launch',
+        //             },
+        //             component: () =>
+        //                 import('src/pages/Entry/Card/EntrySummary.vue'),
+        //         },
+        //     ],
+        // },
+    ],
+};
diff --git a/src/router/modules/index.js b/src/router/modules/index.js
index 68d1d8146..cc5034959 100644
--- a/src/router/modules/index.js
+++ b/src/router/modules/index.js
@@ -11,6 +11,7 @@ import Supplier from './Supplier';
 import Travel from './travel';
 import Order from './order';
 import Department from './department';
+import Entry from './entry';
 
 export default [
     Customer,
@@ -26,4 +27,5 @@ export default [
     Order,
     invoiceIn,
     Department,
+    Entry,
 ];
diff --git a/src/router/routes.js b/src/router/routes.js
index 32f5aaef6..6a2fa6a97 100644
--- a/src/router/routes.js
+++ b/src/router/routes.js
@@ -11,6 +11,7 @@ import travel from './modules/travel';
 import department from './modules/department';
 import shelving from 'src/router/modules/shelving';
 import order from 'src/router/modules/order';
+import entry from 'src/router/modules/entry';
 
 const routes = [
     {
@@ -63,6 +64,7 @@ const routes = [
             supplier,
             travel,
             department,
+            entry,
             {
                 path: '/:catchAll(.*)*',
                 name: 'NotFound',
diff --git a/src/stores/useNavigationStore.js b/src/stores/useNavigationStore.js
index 63dce6162..6964c9401 100644
--- a/src/stores/useNavigationStore.js
+++ b/src/stores/useNavigationStore.js
@@ -19,6 +19,7 @@ export const useNavigationStore = defineStore('navigationStore', () => {
         'supplier',
         'travel',
         'invoiceIn',
+        'entry',
     ];
     const pinnedModules = ref([]);
     const role = useRole();

From 9b9ac4dfe11cc2e503865e479988050503c91a1d Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Tue, 2 Jan 2024 08:47:38 -0300
Subject: [PATCH 15/36] PR fixes

---
 src/components/CreateBankEntityForm.vue  | 24 +++---------------------
 src/components/CreateNewCityForm.vue     | 18 ++----------------
 src/components/CreateNewPostcodeForm.vue | 18 ++----------------
 src/components/CreateNewProvinceForm.vue | 18 ++----------------
 src/composables/useArrayData.js          |  4 +---
 src/css/app.scss                         | 13 +++++++++++++
 src/i18n/en/index.js                     |  9 ++++-----
 src/i18n/es/index.js                     |  9 ++++-----
 8 files changed, 31 insertions(+), 82 deletions(-)

diff --git a/src/components/CreateBankEntityForm.vue b/src/components/CreateBankEntityForm.vue
index 3de4bed63..9fb12e95c 100644
--- a/src/components/CreateBankEntityForm.vue
+++ b/src/components/CreateBankEntityForm.vue
@@ -26,10 +26,6 @@ const closeButton = ref(null);
 const countriesOptions = ref([]);
 const loading = ref(false);
 
-const setCountriesOptions = (data) => {
-    countriesOptions.value = data;
-};
-
 const onDataSaved = (data) => {
     emit('onDataSaved', data);
     closeForm();
@@ -43,9 +39,9 @@ const closeForm = () => {
 <template>
     <FetchData
         url="Countries"
-        @on-fetch="(data) => setCountriesOptions(data)"
         :filter="countriesFilter"
         auto-load
+        @on-fetch="(data) => (countriesOptions = data)"
     />
     <FormModel
         :form-initial-data="bankEntityFormData"
@@ -56,10 +52,10 @@ const closeForm = () => {
         @on-data-saved="onDataSaved($event)"
     >
         <template #form="{ data, validate }">
-            <span ref="closeButton" class="close-icon" v-close-popup>
+            <span ref="closeButton" class="popup-form-close-button" v-close-popup>
                 <QIcon name="close" size="sm" />
             </span>
-            <h1 class="title">{{ t('title') }}</h1>
+            <h1 class="popup-form-title">{{ t('title') }}</h1>
             <p class="q-mb-md">{{ t('subtitle') }}</p>
             <VnRow class="row q-gutter-md q-mb-md">
                 <div class="col">
@@ -116,20 +112,6 @@ const closeForm = () => {
     </FormModel>
 </template>
 
-<style lang="scss" scoped>
-.close-icon {
-    position: absolute;
-    top: 20px;
-    right: 20px;
-    cursor: pointer;
-}
-.title {
-    font-size: 17px;
-    font-weight: bold;
-    line-height: 20px;
-}
-</style>
-
 <i18n>
 en:
     title: New bank entity
diff --git a/src/components/CreateNewCityForm.vue b/src/components/CreateNewCityForm.vue
index f3d6e4509..7ff2ee4f0 100644
--- a/src/components/CreateNewCityForm.vue
+++ b/src/components/CreateNewCityForm.vue
@@ -46,10 +46,10 @@ const closeForm = () => {
         @on-data-saved="onDataSaved()"
     >
         <template #form="{ data, validate }">
-            <span ref="closeButton" class="close-icon" v-close-popup>
+            <span ref="closeButton" class="popup-form-close-button" v-close-popup>
                 <QIcon name="close" size="sm" />
             </span>
-            <h1 class="title">{{ t('New city') }}</h1>
+            <h1 class="popup-form-title">{{ t('New city') }}</h1>
             <p>{{ t('Please, ensure you put the correct data!') }}</p>
             <VnRow class="row q-gutter-md q-mb-md">
                 <div class="col">
@@ -94,20 +94,6 @@ const closeForm = () => {
     </FormModel>
 </template>
 
-<style lang="scss" scoped>
-.close-icon {
-    position: absolute;
-    top: 20px;
-    right: 20px;
-    cursor: pointer;
-}
-.title {
-    font-size: 17px;
-    font-weight: bold;
-    line-height: 20px;
-}
-</style>
-
 <i18n>
 es:
     New city: Nueva ciudad
diff --git a/src/components/CreateNewPostcodeForm.vue b/src/components/CreateNewPostcodeForm.vue
index 18582cd49..0991e728b 100644
--- a/src/components/CreateNewPostcodeForm.vue
+++ b/src/components/CreateNewPostcodeForm.vue
@@ -75,10 +75,10 @@ const closeForm = () => {
         @on-data-saved="onDataSaved()"
     >
         <template #form="{ data, validate }">
-            <span ref="closeButton" class="close-icon" v-close-popup>
+            <span ref="closeButton" class="popup-form-close-button" v-close-popup>
                 <QIcon name="close" size="sm" />
             </span>
-            <h1 class="title">{{ t('New postcode') }}</h1>
+            <h1 class="popup-form-title">{{ t('New postcode') }}</h1>
             <p>{{ t('Please, ensure you put the correct data!') }}</p>
             <VnRow class="row q-gutter-md q-mb-md">
                 <div class="col">
@@ -159,20 +159,6 @@ const closeForm = () => {
     </FormModel>
 </template>
 
-<style lang="scss" scoped>
-.close-icon {
-    position: absolute;
-    top: 20px;
-    right: 20px;
-    cursor: pointer;
-}
-.title {
-    font-size: 17px;
-    font-weight: bold;
-    line-height: 20px;
-}
-</style>
-
 <i18n>
 es:
     New postcode: Nuevo código postal
diff --git a/src/components/CreateNewProvinceForm.vue b/src/components/CreateNewProvinceForm.vue
index 3aea81596..c2f78c1f5 100644
--- a/src/components/CreateNewProvinceForm.vue
+++ b/src/components/CreateNewProvinceForm.vue
@@ -46,10 +46,10 @@ const closeForm = () => {
         @on-data-saved="onDataSaved()"
     >
         <template #form="{ data, validate }">
-            <span ref="closeButton" class="close-icon" v-close-popup>
+            <span ref="closeButton" class="popup-form-close-button" v-close-popup>
                 <QIcon name="close" size="sm" />
             </span>
-            <h1 class="title">{{ t('New province') }}</h1>
+            <h1 class="popup-form-title">{{ t('New province') }}</h1>
             <p>{{ t('Please, ensure you put the correct data!') }}</p>
             <VnRow class="row q-gutter-md q-mb-md">
                 <div class="col">
@@ -95,20 +95,6 @@ const closeForm = () => {
     </FormModel>
 </template>
 
-<style lang="scss" scoped>
-.close-icon {
-    position: absolute;
-    top: 20px;
-    right: 20px;
-    cursor: pointer;
-}
-.title {
-    font-size: 17px;
-    font-weight: bold;
-    line-height: 20px;
-}
-</style>
-
 <i18n>
 es:
     New postcode: Nuevo código postal
diff --git a/src/composables/useArrayData.js b/src/composables/useArrayData.js
index 5e80949f3..9f0be6b1d 100644
--- a/src/composables/useArrayData.js
+++ b/src/composables/useArrayData.js
@@ -156,9 +156,7 @@ export function useArrayData(key, userOptions) {
                 delete store.userParams[param];
                 delete params[param];
                 if (store.filter?.where) {
-                    delete store.filter.where[
-                        Object.keys(exprBuilder ? exprBuilder(param) : param)[0]
-                    ];
+                    delete store.filter.where[Object.keys(exprBuilder ? exprBuilder(param) : param)[0]];
                     if (Object.keys(store.filter.where).length === 0) {
                         delete store.filter.where;
                     }
diff --git a/src/css/app.scss b/src/css/app.scss
index 02d4f8946..0f1b4673a 100644
--- a/src/css/app.scss
+++ b/src/css/app.scss
@@ -53,3 +53,16 @@ body.body--dark {
     color: var(--vn-text);
     border-radius: 8px;
 }
+
+.popup-form-title {
+    font-size: 17px;
+    font-weight: bold;
+    line-height: 20px;
+}
+
+.popup-form-close-button {
+    position: absolute;
+    top: 20px;
+    right: 20px;
+    cursor: pointer;
+}
diff --git a/src/i18n/en/index.js b/src/i18n/en/index.js
index 4a1eea8f4..b1efa1457 100644
--- a/src/i18n/en/index.js
+++ b/src/i18n/en/index.js
@@ -49,7 +49,6 @@ export default {
         microsip: 'Open in MicroSIP',
         noSelectedRows: `You don't have any line selected`,
         downloadCSVSuccess: 'CSV downloaded successfully',
-        // labels compartidos entre vistas
         reference: 'Reference',
         agency: 'Agency',
         wareHouseOut: 'Warehouse Out',
@@ -566,7 +565,7 @@ export default {
             landed: 'Landed',
             hour: 'Hour',
             agency: 'Agency',
-            total: 'Total'
+            total: 'Total',
         },
         form: {
             clientFk: 'Client',
@@ -575,7 +574,7 @@ export default {
             agencyModeFk: 'Agency',
         },
         list: {
-            newOrder: 'New Order'
+            newOrder: 'New Order',
         },
         summary: {
             basket: 'Basket',
@@ -601,8 +600,8 @@ export default {
             description: 'Description',
             quantity: 'Quantity',
             price: 'Price',
-            amount: 'Amount'
-        }
+            amount: 'Amount',
+        },
     },
     worker: {
         pageTitles: {
diff --git a/src/i18n/es/index.js b/src/i18n/es/index.js
index 3f4ac1c27..701cb3274 100644
--- a/src/i18n/es/index.js
+++ b/src/i18n/es/index.js
@@ -48,7 +48,6 @@ export default {
         dateFormat: 'es-ES',
         noSelectedRows: `No tienes ninguna línea seleccionada`,
         microsip: 'Abrir en MicroSIP',
-        // labels compartidos entre vistas
         downloadCSVSuccess: 'Descarga de CSV exitosa',
         reference: 'Referencia',
         agency: 'Agencia',
@@ -475,7 +474,7 @@ export default {
             landed: 'F. entrega',
             hour: 'Hora',
             agency: 'Agencia',
-            total: 'Total'
+            total: 'Total',
         },
         form: {
             clientFk: 'Cliente',
@@ -484,7 +483,7 @@ export default {
             agencyModeFk: 'Agencia',
         },
         list: {
-            newOrder: 'Nuevo Pedido'
+            newOrder: 'Nuevo Pedido',
         },
         summary: {
             basket: 'Cesta',
@@ -510,8 +509,8 @@ export default {
             description: 'Descripción',
             quantity: 'Cantidad',
             price: 'Precio',
-            amount: 'Monto'
-        }
+            amount: 'Monto',
+        },
     },
     shelving: {
         pageTitles: {

From 677660f5ccae7d5b1192681a686e1aa78cc630bf Mon Sep 17 00:00:00 2001
From: carlosfonseca <carlos.fonseca@mindshore.io>
Date: Tue, 2 Jan 2024 06:54:15 -0500
Subject: [PATCH 16/36] Se hacen maquetado general de menu izquierdo en summary
 de clientes

---
 src/i18n/en/index.js                          |  15 +-
 src/i18n/es/index.js                          |  15 +-
 src/pages/Customer/Card/CustomerBalance.vue   |   3 +
 .../Customer/Card/CustomerBillingData.vue     |   3 +
 .../Customer/Card/CustomerConsignees.vue      |   3 +
 .../Card/CustomerCreditManagement.vue         |   3 +
 src/pages/Customer/Card/CustomerCredits.vue   |   3 +
 .../Customer/Card/CustomerFiscalData.vue      |   3 +
 src/pages/Customer/Card/CustomerGreuges.vue   |   3 +
 src/pages/Customer/Card/CustomerLog.vue       |   3 +
 src/pages/Customer/Card/CustomerNotes.vue     |   3 +
 src/pages/Customer/Card/CustomerOthers.vue    |   3 +
 .../Customer/Card/CustomerRecoveries.vue      |   3 +
 src/pages/Customer/Card/CustomerSms.vue       |   3 +
 src/pages/Customer/Card/CustomerWebAccess.vue |   3 +
 .../CustomerExtendedListFilter.vue            |   5 -
 src/router/modules/customer.js                | 143 +++++++++++++++++-
 17 files changed, 209 insertions(+), 8 deletions(-)
 create mode 100644 src/pages/Customer/Card/CustomerBalance.vue
 create mode 100644 src/pages/Customer/Card/CustomerBillingData.vue
 create mode 100644 src/pages/Customer/Card/CustomerConsignees.vue
 create mode 100644 src/pages/Customer/Card/CustomerCreditManagement.vue
 create mode 100644 src/pages/Customer/Card/CustomerCredits.vue
 create mode 100644 src/pages/Customer/Card/CustomerFiscalData.vue
 create mode 100644 src/pages/Customer/Card/CustomerGreuges.vue
 create mode 100644 src/pages/Customer/Card/CustomerLog.vue
 create mode 100644 src/pages/Customer/Card/CustomerNotes.vue
 create mode 100644 src/pages/Customer/Card/CustomerOthers.vue
 create mode 100644 src/pages/Customer/Card/CustomerRecoveries.vue
 create mode 100644 src/pages/Customer/Card/CustomerSms.vue
 create mode 100644 src/pages/Customer/Card/CustomerWebAccess.vue

diff --git a/src/i18n/en/index.js b/src/i18n/en/index.js
index 65e8c4cf2..6904353da 100644
--- a/src/i18n/en/index.js
+++ b/src/i18n/en/index.js
@@ -116,7 +116,20 @@ export default {
             defaulter: 'Defaulter',
             createCustomer: 'Create customer',
             summary: 'Summary',
-            basicData: 'Basic Data',
+            basicData: 'Basic data',
+            fiscalData: 'Fiscal data',
+            billingData: 'Billing data',
+            consignees: 'Consignees',
+            notes: 'Notes',
+            credits: 'Credits',
+            greuges: 'Greuges',
+            balance: 'Balance',
+            recoveries: 'Recoveries',
+            webAccess: 'Web access',
+            log: 'Log',
+            sms: 'Sms',
+            creditManagement: 'Credit management',
+            others: 'Other',
         },
         list: {
             phone: 'Phone',
diff --git a/src/i18n/es/index.js b/src/i18n/es/index.js
index ed658c87c..59bf0027b 100644
--- a/src/i18n/es/index.js
+++ b/src/i18n/es/index.js
@@ -115,8 +115,21 @@ export default {
             notifications: 'Notificaciones',
             defaulter: 'Morosos',
             createCustomer: 'Crear cliente',
-            basicData: 'Datos básicos',
             summary: 'Resumen',
+            basicData: 'Datos básicos',
+            fiscalData: 'Datos fiscales',
+            billingData: 'Forma de pago',
+            consignees: 'Consignatarios',
+            notes: 'Notas',
+            credits: 'Créditos',
+            greuges: 'Greuges',
+            balance: 'Balance',
+            recoveries: 'Recobros',
+            webAccess: 'Acceso web',
+            log: 'Historial',
+            sms: 'Sms',
+            creditManagement: 'Gestión de crédito',
+            others: 'Otros',
         },
         list: {
             phone: 'Teléfono',
diff --git a/src/pages/Customer/Card/CustomerBalance.vue b/src/pages/Customer/Card/CustomerBalance.vue
new file mode 100644
index 000000000..9e44f67f5
--- /dev/null
+++ b/src/pages/Customer/Card/CustomerBalance.vue
@@ -0,0 +1,3 @@
+<template>
+    <div class="flex justify-center">Balance</div>
+</template>
diff --git a/src/pages/Customer/Card/CustomerBillingData.vue b/src/pages/Customer/Card/CustomerBillingData.vue
new file mode 100644
index 000000000..c14f3b499
--- /dev/null
+++ b/src/pages/Customer/Card/CustomerBillingData.vue
@@ -0,0 +1,3 @@
+<template>
+    <div class="flex justify-center">Billing data</div>
+</template>
diff --git a/src/pages/Customer/Card/CustomerConsignees.vue b/src/pages/Customer/Card/CustomerConsignees.vue
new file mode 100644
index 000000000..bab2bd1ff
--- /dev/null
+++ b/src/pages/Customer/Card/CustomerConsignees.vue
@@ -0,0 +1,3 @@
+<template>
+    <div class="flex justify-center">Consignees</div>
+</template>
diff --git a/src/pages/Customer/Card/CustomerCreditManagement.vue b/src/pages/Customer/Card/CustomerCreditManagement.vue
new file mode 100644
index 000000000..fe24ddfd0
--- /dev/null
+++ b/src/pages/Customer/Card/CustomerCreditManagement.vue
@@ -0,0 +1,3 @@
+<template>
+    <div class="flex justify-center">Credit management</div>
+</template>
diff --git a/src/pages/Customer/Card/CustomerCredits.vue b/src/pages/Customer/Card/CustomerCredits.vue
new file mode 100644
index 000000000..e8a4c3b48
--- /dev/null
+++ b/src/pages/Customer/Card/CustomerCredits.vue
@@ -0,0 +1,3 @@
+<template>
+    <div class="flex justify-center">Credits</div>
+</template>
diff --git a/src/pages/Customer/Card/CustomerFiscalData.vue b/src/pages/Customer/Card/CustomerFiscalData.vue
new file mode 100644
index 000000000..ced6012b8
--- /dev/null
+++ b/src/pages/Customer/Card/CustomerFiscalData.vue
@@ -0,0 +1,3 @@
+<template>
+    <div class="flex justify-center">Fiscal data</div>
+</template>
diff --git a/src/pages/Customer/Card/CustomerGreuges.vue b/src/pages/Customer/Card/CustomerGreuges.vue
new file mode 100644
index 000000000..d322e04a5
--- /dev/null
+++ b/src/pages/Customer/Card/CustomerGreuges.vue
@@ -0,0 +1,3 @@
+<template>
+    <div class="flex justify-center">Greuges</div>
+</template>
diff --git a/src/pages/Customer/Card/CustomerLog.vue b/src/pages/Customer/Card/CustomerLog.vue
new file mode 100644
index 000000000..fe59bf2dc
--- /dev/null
+++ b/src/pages/Customer/Card/CustomerLog.vue
@@ -0,0 +1,3 @@
+<template>
+    <div class="flex justify-center">Log</div>
+</template>
diff --git a/src/pages/Customer/Card/CustomerNotes.vue b/src/pages/Customer/Card/CustomerNotes.vue
new file mode 100644
index 000000000..65ade2903
--- /dev/null
+++ b/src/pages/Customer/Card/CustomerNotes.vue
@@ -0,0 +1,3 @@
+<template>
+    <div class="flex justify-center">Notes</div>
+</template>
diff --git a/src/pages/Customer/Card/CustomerOthers.vue b/src/pages/Customer/Card/CustomerOthers.vue
new file mode 100644
index 000000000..bd4729cab
--- /dev/null
+++ b/src/pages/Customer/Card/CustomerOthers.vue
@@ -0,0 +1,3 @@
+<template>
+    <div class="flex justify-center">Others</div>
+</template>
diff --git a/src/pages/Customer/Card/CustomerRecoveries.vue b/src/pages/Customer/Card/CustomerRecoveries.vue
new file mode 100644
index 000000000..54274717c
--- /dev/null
+++ b/src/pages/Customer/Card/CustomerRecoveries.vue
@@ -0,0 +1,3 @@
+<template>
+    <div class="flex justify-center">Recoveries</div>
+</template>
diff --git a/src/pages/Customer/Card/CustomerSms.vue b/src/pages/Customer/Card/CustomerSms.vue
new file mode 100644
index 000000000..fa4a34e30
--- /dev/null
+++ b/src/pages/Customer/Card/CustomerSms.vue
@@ -0,0 +1,3 @@
+<template>
+    <div class="flex justify-center">Sms</div>
+</template>
diff --git a/src/pages/Customer/Card/CustomerWebAccess.vue b/src/pages/Customer/Card/CustomerWebAccess.vue
new file mode 100644
index 000000000..95ec77c3d
--- /dev/null
+++ b/src/pages/Customer/Card/CustomerWebAccess.vue
@@ -0,0 +1,3 @@
+<template>
+    <div class="flex justify-center">Web access</div>
+</template>
diff --git a/src/pages/Customer/ExtendedList/CustomerExtendedListFilter.vue b/src/pages/Customer/ExtendedList/CustomerExtendedListFilter.vue
index a4d26a78a..3a9cebc96 100644
--- a/src/pages/Customer/ExtendedList/CustomerExtendedListFilter.vue
+++ b/src/pages/Customer/ExtendedList/CustomerExtendedListFilter.vue
@@ -565,12 +565,7 @@ const shouldRenderColumn = (colName) => {
 </style>
 
 <i18n>
-<<<<<<< HEAD:src/pages/Customer/ExtendedList/CustomerExtendedListFilter.vue
 es:
     Identifier: Identificador
-=======
-
-es:
->>>>>>> dev:src/pages/Customer/CustomerExtendedListFilter.vue
     Social name: Razón social
 </i18n>
diff --git a/src/router/modules/customer.js b/src/router/modules/customer.js
index 51511bcbf..a79ab8a6b 100644
--- a/src/router/modules/customer.js
+++ b/src/router/modules/customer.js
@@ -17,7 +17,22 @@ export default {
             'CustomerNotifications',
             'CustomerDefaulter',
         ],
-        card: ['CustomerBasicData'],
+        card: [
+            'CustomerBasicData',
+            'CustomerFiscalData',
+            'CustomerBillingData',
+            'CustomerConsignees',
+            'CustomerNotes',
+            'CustomerCredits',
+            'CustomerGreuges',
+            'CustomerBalance',
+            'CustomerRecoveries',
+            'CustomerWebAccess',
+            'CustomerLog',
+            'CustomerSms',
+            'CustomerCreditManagement',
+            'CustomerOthers',
+        ],
     },
     children: [
         {
@@ -115,6 +130,132 @@ export default {
                     component: () =>
                         import('src/pages/Customer/Card/CustomerBasicData.vue'),
                 },
+                {
+                    path: 'fiscal-data',
+                    name: 'CustomerFiscalData',
+                    meta: {
+                        title: 'fiscalData',
+                        icon: 'vn:settings',
+                    },
+                    component: () =>
+                        import('src/pages/Customer/Card/CustomerFiscalData.vue'),
+                },
+                {
+                    path: 'billing-data',
+                    name: 'CustomerBillingData',
+                    meta: {
+                        title: 'billingData',
+                        icon: 'vn:settings',
+                    },
+                    component: () =>
+                        import('src/pages/Customer/Card/CustomerBillingData.vue'),
+                },
+                {
+                    path: 'consignees',
+                    name: 'CustomerConsignees',
+                    meta: {
+                        title: 'consignees',
+                        icon: 'vn:settings',
+                    },
+                    component: () =>
+                        import('src/pages/Customer/Card/CustomerConsignees.vue'),
+                },
+                {
+                    path: 'notes',
+                    name: 'CustomerNotes',
+                    meta: {
+                        title: 'notes',
+                        icon: 'vn:settings',
+                    },
+                    component: () => import('src/pages/Customer/Card/CustomerNotes.vue'),
+                },
+                {
+                    path: 'credits',
+                    name: 'CustomerCredits',
+                    meta: {
+                        title: 'credits',
+                        icon: 'vn:settings',
+                    },
+                    component: () =>
+                        import('src/pages/Customer/Card/CustomerCredits.vue'),
+                },
+                {
+                    path: 'greuges',
+                    name: 'CustomerGreuges',
+                    meta: {
+                        title: 'greuges',
+                        icon: 'vn:settings',
+                    },
+                    component: () =>
+                        import('src/pages/Customer/Card/CustomerGreuges.vue'),
+                },
+                {
+                    path: 'balance',
+                    name: 'CustomerBalance',
+                    meta: {
+                        title: 'balance',
+                        icon: 'vn:settings',
+                    },
+                    component: () =>
+                        import('src/pages/Customer/Card/CustomerBalance.vue'),
+                },
+                {
+                    path: 'recoveries',
+                    name: 'CustomerRecoveries',
+                    meta: {
+                        title: 'recoveries',
+                        icon: 'vn:settings',
+                    },
+                    component: () =>
+                        import('src/pages/Customer/Card/CustomerRecoveries.vue'),
+                },
+                {
+                    path: 'web-access',
+                    name: 'CustomerWebAccess',
+                    meta: {
+                        title: 'webAccess',
+                        icon: 'vn:settings',
+                    },
+                    component: () =>
+                        import('src/pages/Customer/Card/CustomerWebAccess.vue'),
+                },
+                {
+                    path: 'log',
+                    name: 'CustomerLog',
+                    meta: {
+                        title: 'log',
+                        icon: 'vn:settings',
+                    },
+                    component: () => import('src/pages/Customer/Card/CustomerLog.vue'),
+                },
+                {
+                    path: 'sms',
+                    name: 'CustomerSms',
+                    meta: {
+                        title: 'sms',
+                        icon: 'vn:settings',
+                    },
+                    component: () => import('src/pages/Customer/Card/CustomerSms.vue'),
+                },
+                {
+                    path: 'credit-management',
+                    name: 'CustomerCreditManagement',
+                    meta: {
+                        title: 'creditManagement',
+                        icon: 'vn:settings',
+                    },
+                    component: () =>
+                        import('src/pages/Customer/Card/CustomerCreditManagement.vue'),
+                },
+                {
+                    path: 'others',
+                    name: 'CustomerOthers',
+                    meta: {
+                        title: 'others',
+                        icon: 'vn:settings',
+                    },
+                    component: () => import('src/pages/Customer/Card/CustomerOthers.vue'),
+                },
             ],
         },
     ],

From bf259b5fadda679d6aafcbe38389b47018f6e4a0 Mon Sep 17 00:00:00 2001
From: carlosfonseca <carlos.fonseca@mindshore.io>
Date: Tue, 2 Jan 2024 08:12:44 -0500
Subject: [PATCH 17/36] Correcciones a branch pr 2

---
 src/pages/Customer/Defaulter/CustomerDefaulter.vue    |  2 +-
 .../Customer/ExtendedList/CustomerExtendedList.vue    |  2 +-
 .../Customer/Notifications/CustomerNotifications.vue  |  2 +-
 src/pages/InvoiceOut/InvoiceOutGlobal.vue             |  2 +-
 src/pages/InvoiceOut/InvoiceOutNegativeBases.vue      |  2 +-
 src/pages/Order/Card/OrderSearchbar.vue               | 11 ++++-------
 src/pages/Travel/ExtraCommunity.vue                   |  2 +-
 7 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/src/pages/Customer/Defaulter/CustomerDefaulter.vue b/src/pages/Customer/Defaulter/CustomerDefaulter.vue
index b35980416..476c612d6 100644
--- a/src/pages/Customer/Defaulter/CustomerDefaulter.vue
+++ b/src/pages/Customer/Defaulter/CustomerDefaulter.vue
@@ -233,7 +233,7 @@ const selectAuthorId = (id) => {
 <style lang="scss" scoped>
 .col-content {
     border-radius: 4px;
-    padding: 6px 6px 6px 6px;
+    padding: 6px;
 }
 </style>
 
diff --git a/src/pages/Customer/ExtendedList/CustomerExtendedList.vue b/src/pages/Customer/ExtendedList/CustomerExtendedList.vue
index a60b79caf..a1aa47791 100644
--- a/src/pages/Customer/ExtendedList/CustomerExtendedList.vue
+++ b/src/pages/Customer/ExtendedList/CustomerExtendedList.vue
@@ -565,6 +565,6 @@ const selectSalesPersonId = (id) => {
 <style lang="scss" scoped>
 .col-content {
     border-radius: 4px;
-    padding: 6px 6px 6px 6px;
+    padding: 6px;
 }
 </style>
diff --git a/src/pages/Customer/Notifications/CustomerNotifications.vue b/src/pages/Customer/Notifications/CustomerNotifications.vue
index f9ff66a7b..e8d779cb5 100644
--- a/src/pages/Customer/Notifications/CustomerNotifications.vue
+++ b/src/pages/Customer/Notifications/CustomerNotifications.vue
@@ -148,7 +148,7 @@ const selectCustomerId = (id) => {
 <style lang="scss" scoped>
 .col-content {
     border-radius: 4px;
-    padding: 6px 6px 6px 6px;
+    padding: 6px;
 }
 </style>
 
diff --git a/src/pages/InvoiceOut/InvoiceOutGlobal.vue b/src/pages/InvoiceOut/InvoiceOutGlobal.vue
index 7284ca04e..ea1978702 100644
--- a/src/pages/InvoiceOut/InvoiceOutGlobal.vue
+++ b/src/pages/InvoiceOut/InvoiceOutGlobal.vue
@@ -175,7 +175,7 @@ onUnmounted(() => {
 
 .col-content {
     border-radius: 4px;
-    padding: 6px 6px 6px 6px;
+    padding: 6px;
 }
 </style>
 
diff --git a/src/pages/InvoiceOut/InvoiceOutNegativeBases.vue b/src/pages/InvoiceOut/InvoiceOutNegativeBases.vue
index 3595a650d..15010c66d 100644
--- a/src/pages/InvoiceOut/InvoiceOutNegativeBases.vue
+++ b/src/pages/InvoiceOut/InvoiceOutNegativeBases.vue
@@ -255,7 +255,7 @@ const selectWorkerId = (id) => {
 <style lang="scss" scoped>
 .col-content {
     border-radius: 4px;
-    padding: 6px 6px 6px 6px;
+    padding: 6px;
 }
 </style>
 
diff --git a/src/pages/Order/Card/OrderSearchbar.vue b/src/pages/Order/Card/OrderSearchbar.vue
index 4d354603b..a768768a5 100644
--- a/src/pages/Order/Card/OrderSearchbar.vue
+++ b/src/pages/Order/Card/OrderSearchbar.vue
@@ -9,17 +9,14 @@ const { t } = useI18n();
     <VnSearchbar
         data-key="OrderList"
         url="Orders/filter"
-        :label="t('search-order')"
-        :info="t('search-order-info')"
+        :label="t('Search order')"
+        :info="t('You can search orders by reference')"
     />
 </template>
 
 <style scoped lang="scss"></style>
 <i18n>
-en:
-    search-order: Search order
-    search-order-info: You can search orders by reference
 es:
-    Search shelving: Buscar orden
-    You can search by shelving reference: Puedes buscar por referencia de la orden
+    Search order: Buscar orden
+    You can search orders by reference: Puedes buscar por referencia de la orden
 </i18n>
diff --git a/src/pages/Travel/ExtraCommunity.vue b/src/pages/Travel/ExtraCommunity.vue
index 245cbc9de..f3cf557c6 100644
--- a/src/pages/Travel/ExtraCommunity.vue
+++ b/src/pages/Travel/ExtraCommunity.vue
@@ -395,7 +395,7 @@ onMounted(async () => {
 <style lang="scss" scoped>
 .col-content {
     border-radius: 4px;
-    padding: 6px 6px 6px 6px;
+    padding: 6px;
 }
 
 .secondary-row {

From b0b8205b5266603ac14affd15edbd234e79bd001 Mon Sep 17 00:00:00 2001
From: carlosfonseca <carlos.fonseca@mindshore.io>
Date: Tue, 2 Jan 2024 10:28:52 -0500
Subject: [PATCH 18/36] Solucion comentario

---
 src/pages/Order/Card/OrderCatalogFilter.vue | 25 +++++++++------------
 1 file changed, 10 insertions(+), 15 deletions(-)

diff --git a/src/pages/Order/Card/OrderCatalogFilter.vue b/src/pages/Order/Card/OrderCatalogFilter.vue
index 46de63abd..814aa49c6 100644
--- a/src/pages/Order/Card/OrderCatalogFilter.vue
+++ b/src/pages/Order/Card/OrderCatalogFilter.vue
@@ -67,24 +67,19 @@ function exprBuilder(param, value) {
             return { [param]: value };
     }
 }
+
+const setCategoryList = (data) => {
+    categoryList.value = (data || [])
+        .filter((category) => category.display)
+        .map((category) => ({
+            ...category,
+            icon: `vn:${(category.icon || '').split('-')[1]}`,
+        }));
+};
 </script>
 
 <template>
-    <FetchData
-        url="ItemCategories"
-        limit="30"
-        auto-load
-        @on-fetch="
-            (data) => {
-                categoryList = (data || [])
-                    .filter((category) => category.display)
-                    .map((category) => ({
-                        ...category,
-                        icon: `vn:${(category.icon || '').split('-')[1]}`,
-                    }));
-            }
-        "
-    />
+    <FetchData url="ItemCategories" limit="30" auto-load @on-fetch="setCategoryList" />
     <VnFilterPanel
         :data-key="props.dataKey"
         :search-button="true"

From 49bb2223438723ac556051fd36015ee4941740ad Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Tue, 2 Jan 2024 12:57:13 -0300
Subject: [PATCH 19/36] create form popup reutilizable component

---
 src/components/CreateBankEntityForm.vue  |  45 ++--------
 src/components/CreateNewCityForm.vue     |  45 ++--------
 src/components/CreateNewPostcodeForm.vue |  52 +++--------
 src/components/CreateNewProvinceForm.vue |  50 ++---------
 src/components/FormModelPopup.vue        | 105 +++++++++++++++++++++++
 src/css/app.scss                         |  13 ---
 6 files changed, 138 insertions(+), 172 deletions(-)
 create mode 100644 src/components/FormModelPopup.vue

diff --git a/src/components/CreateBankEntityForm.vue b/src/components/CreateBankEntityForm.vue
index 9fb12e95c..f4f5fef7d 100644
--- a/src/components/CreateBankEntityForm.vue
+++ b/src/components/CreateBankEntityForm.vue
@@ -4,8 +4,8 @@ import { useI18n } from 'vue-i18n';
 
 import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
 import FetchData from 'components/FetchData.vue';
-import FormModel from 'components/FormModel.vue';
 import VnRow from 'components/ui/VnRow.vue';
+import FormModelPopup from './FormModelPopup.vue';
 
 const emit = defineEmits(['onDataSaved']);
 
@@ -22,17 +22,10 @@ const countriesFilter = {
     fields: ['id', 'country', 'code'],
 };
 
-const closeButton = ref(null);
 const countriesOptions = ref([]);
-const loading = ref(false);
 
 const onDataSaved = (data) => {
     emit('onDataSaved', data);
-    closeForm();
-};
-
-const closeForm = () => {
-    if (closeButton.value) closeButton.value.click();
 };
 </script>
 
@@ -43,20 +36,15 @@ const closeForm = () => {
         auto-load
         @on-fetch="(data) => (countriesOptions = data)"
     />
-    <FormModel
-        :form-initial-data="bankEntityFormData"
-        :observe-form-changes="false"
-        :default-actions="false"
+    <FormModelPopup
         url-create="bankEntities"
         model="bankEntity"
+        :title="t('title')"
+        :subtitle="t('subtitle')"
+        :form-initial-data="bankEntityFormData"
         @on-data-saved="onDataSaved($event)"
     >
-        <template #form="{ data, validate }">
-            <span ref="closeButton" class="popup-form-close-button" v-close-popup>
-                <QIcon name="close" size="sm" />
-            </span>
-            <h1 class="popup-form-title">{{ t('title') }}</h1>
-            <p class="q-mb-md">{{ t('subtitle') }}</p>
+        <template #form-inputs="{ data, validate }">
             <VnRow class="row q-gutter-md q-mb-md">
                 <div class="col">
                     <QInput
@@ -89,27 +77,8 @@ const closeForm = () => {
                     <QInput :label="t('id')" v-model="data.id" />
                 </div>
             </VnRow>
-            <div class="q-mt-lg row justify-end">
-                <QBtn
-                    :label="t('globals.save')"
-                    type="submit"
-                    color="primary"
-                    :disabled="loading"
-                    :loading="loading"
-                />
-                <QBtn
-                    :label="t('globals.cancel')"
-                    type="reset"
-                    color="primary"
-                    flat
-                    class="q-ml-sm"
-                    :disabled="loading"
-                    :loading="loading"
-                    v-close-popup
-                />
-            </div>
         </template>
-    </FormModel>
+    </FormModelPopup>
 </template>
 
 <i18n>
diff --git a/src/components/CreateNewCityForm.vue b/src/components/CreateNewCityForm.vue
index 7ff2ee4f0..ee842e86f 100644
--- a/src/components/CreateNewCityForm.vue
+++ b/src/components/CreateNewCityForm.vue
@@ -6,7 +6,7 @@ import FetchData from 'components/FetchData.vue';
 import VnRow from 'components/ui/VnRow.vue';
 import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
 import VnInput from 'src/components/common/VnInput.vue';
-import FormModel from 'components/FormModel.vue';
+import FormModelPopup from './FormModelPopup.vue';
 
 const emit = defineEmits(['onDataSaved']);
 
@@ -17,17 +17,10 @@ const cityFormData = reactive({
     provinceFk: null,
 });
 
-const closeButton = ref(null);
-const isLoading = ref(false);
 const provincesOptions = ref([]);
 
 const onDataSaved = () => {
     emit('onDataSaved');
-    closeForm();
-};
-
-const closeForm = () => {
-    if (closeButton.value) closeButton.value.click();
 };
 </script>
 
@@ -37,20 +30,15 @@ const closeForm = () => {
         auto-load
         url="Provinces"
     />
-    <FormModel
+    <FormModelPopup
+        :title="t('New city')"
+        :subtitle="t('Please, ensure you put the correct data!')"
         :form-initial-data="cityFormData"
-        :observe-form-changes="false"
-        :default-actions="false"
         url-create="towns"
         model="city"
-        @on-data-saved="onDataSaved()"
+        @on-data-saved="onDataSaved($event)"
     >
-        <template #form="{ data, validate }">
-            <span ref="closeButton" class="popup-form-close-button" v-close-popup>
-                <QIcon name="close" size="sm" />
-            </span>
-            <h1 class="popup-form-title">{{ t('New city') }}</h1>
-            <p>{{ t('Please, ensure you put the correct data!') }}</p>
+        <template #form-inputs="{ data, validate }">
             <VnRow class="row q-gutter-md q-mb-md">
                 <div class="col">
                     <VnInput
@@ -71,27 +59,8 @@ const closeForm = () => {
                     />
                 </div>
             </VnRow>
-            <div class="q-mt-lg row justify-end">
-                <QBtn
-                    :label="t('globals.save')"
-                    type="submit"
-                    color="primary"
-                    :disabled="isLoading"
-                    :loading="isLoading"
-                />
-                <QBtn
-                    :label="t('globals.cancel')"
-                    type="reset"
-                    color="primary"
-                    flat
-                    class="q-ml-sm"
-                    :disabled="isLoading"
-                    :loading="isLoading"
-                    v-close-popup
-                />
-            </div>
         </template>
-    </FormModel>
+    </FormModelPopup>
 </template>
 
 <i18n>
diff --git a/src/components/CreateNewPostcodeForm.vue b/src/components/CreateNewPostcodeForm.vue
index 0991e728b..3504445f8 100644
--- a/src/components/CreateNewPostcodeForm.vue
+++ b/src/components/CreateNewPostcodeForm.vue
@@ -6,10 +6,10 @@ import FetchData from 'components/FetchData.vue';
 import VnRow from 'components/ui/VnRow.vue';
 import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
 import VnInput from 'src/components/common/VnInput.vue';
-import FormModel from 'components/FormModel.vue';
 import CreateNewCityForm from './CreateNewCityForm.vue';
 import CreateNewProvinceForm from './CreateNewProvinceForm.vue';
 import VnSelectCreate from 'components/common/VnSelectCreate.vue';
+import FormModelPopup from './FormModelPopup.vue';
 
 const emit = defineEmits(['onDataSaved']);
 
@@ -24,15 +24,12 @@ const postcodeFormData = reactive({
 
 const townsFetchDataRef = ref(null);
 const provincesFetchDataRef = ref(null);
-const closeButton = ref(null);
 const countriesOptions = ref([]);
-const isLoading = ref(false);
 const provincesOptions = ref([]);
 const townsLocationOptions = ref([]);
 
 const onDataSaved = () => {
     emit('onDataSaved');
-    closeForm();
 };
 
 const onCityCreated = async () => {
@@ -42,10 +39,6 @@ const onCityCreated = async () => {
 const onProvinceCreated = async () => {
     await provincesFetchDataRef.value.fetch();
 };
-
-const closeForm = () => {
-    if (closeButton.value) closeButton.value.click();
-};
 </script>
 
 <template>
@@ -66,20 +59,15 @@ const closeForm = () => {
         auto-load
         url="Countries"
     />
-    <FormModel
-        :form-initial-data="postcodeFormData"
-        :observe-form-changes="false"
-        :default-actions="false"
+    <FormModelPopup
         url-create="postcodes"
         model="postcode"
-        @on-data-saved="onDataSaved()"
+        :title="t('New postcode')"
+        :subtitle="t('Please, ensure you put the correct data!')"
+        :form-initial-data="postcodeFormData"
+        @on-data-saved="onDataSaved($event)"
     >
-        <template #form="{ data, validate }">
-            <span ref="closeButton" class="popup-form-close-button" v-close-popup>
-                <QIcon name="close" size="sm" />
-            </span>
-            <h1 class="popup-form-title">{{ t('New postcode') }}</h1>
-            <p>{{ t('Please, ensure you put the correct data!') }}</p>
+        <template #form-inputs="{ data, validate }">
             <VnRow class="row q-gutter-md q-mb-md">
                 <div class="col">
                     <VnInput
@@ -134,29 +122,9 @@ const closeForm = () => {
                         v-model="data.countryFk"
                         :rules="validate('postcode.countryFk')"
                     />
-                </div>
-            </VnRow>
-            <div class="q-mt-lg row justify-end">
-                <QBtn
-                    :label="t('globals.save')"
-                    type="submit"
-                    color="primary"
-                    :disabled="isLoading"
-                    :loading="isLoading"
-                />
-                <QBtn
-                    :label="t('globals.cancel')"
-                    type="reset"
-                    color="primary"
-                    flat
-                    class="q-ml-sm"
-                    :disabled="isLoading"
-                    :loading="isLoading"
-                    v-close-popup
-                />
-            </div>
-        </template>
-    </FormModel>
+                </div> </VnRow
+        ></template>
+    </FormModelPopup>
 </template>
 
 <i18n>
diff --git a/src/components/CreateNewProvinceForm.vue b/src/components/CreateNewProvinceForm.vue
index c2f78c1f5..0f88952ea 100644
--- a/src/components/CreateNewProvinceForm.vue
+++ b/src/components/CreateNewProvinceForm.vue
@@ -6,7 +6,7 @@ import FetchData from 'components/FetchData.vue';
 import VnRow from 'components/ui/VnRow.vue';
 import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
 import VnInput from 'src/components/common/VnInput.vue';
-import FormModel from 'components/FormModel.vue';
+import FormModelPopup from './FormModelPopup.vue';
 
 const emit = defineEmits(['onDataSaved']);
 
@@ -17,17 +17,10 @@ const provinceFormData = reactive({
     autonomyFk: null,
 });
 
-const closeButton = ref(null);
-const isLoading = ref(false);
 const autonomiesOptions = ref([]);
 
 const onDataSaved = () => {
     emit('onDataSaved');
-    closeForm();
-};
-
-const closeForm = () => {
-    if (closeButton.value) closeButton.value.click();
 };
 </script>
 
@@ -37,20 +30,15 @@ const closeForm = () => {
         auto-load
         url="Autonomies"
     />
-    <FormModel
-        :form-initial-data="provinceFormData"
-        :observe-form-changes="false"
-        :default-actions="false"
+    <FormModelPopup
+        :title="t('New province')"
+        :subtitle="t('Please, ensure you put the correct data!')"
         url-create="provinces"
         model="province"
-        @on-data-saved="onDataSaved()"
+        :form-initial-data="provinceFormData"
+        @on-data-saved="onDataSaved($event)"
     >
-        <template #form="{ data, validate }">
-            <span ref="closeButton" class="popup-form-close-button" v-close-popup>
-                <QIcon name="close" size="sm" />
-            </span>
-            <h1 class="popup-form-title">{{ t('New province') }}</h1>
-            <p>{{ t('Please, ensure you put the correct data!') }}</p>
+        <template #form-inputs="{ data, validate }">
             <VnRow class="row q-gutter-md q-mb-md">
                 <div class="col">
                     <VnInput
@@ -71,33 +59,13 @@ const closeForm = () => {
                     />
                 </div>
             </VnRow>
-
-            <div class="q-mt-lg row justify-end">
-                <QBtn
-                    :label="t('globals.save')"
-                    type="submit"
-                    color="primary"
-                    :disabled="isLoading"
-                    :loading="isLoading"
-                />
-                <QBtn
-                    :label="t('globals.cancel')"
-                    type="reset"
-                    color="primary"
-                    flat
-                    class="q-ml-sm"
-                    :disabled="isLoading"
-                    :loading="isLoading"
-                    v-close-popup
-                />
-            </div>
         </template>
-    </FormModel>
+    </FormModelPopup>
 </template>
 
 <i18n>
 es:
-    New postcode: Nuevo código postal
+    New province: Nueva provincia
     Please, ensure you put the correct data!: ¡Por favor, asegúrese de poner los datos correctos!
     Name: Nombre
     Autonomy: Autonomía
diff --git a/src/components/FormModelPopup.vue b/src/components/FormModelPopup.vue
new file mode 100644
index 000000000..9021adc46
--- /dev/null
+++ b/src/components/FormModelPopup.vue
@@ -0,0 +1,105 @@
+<script setup>
+import { ref } from 'vue';
+import { useI18n } from 'vue-i18n';
+
+import FormModel from 'components/FormModel.vue';
+
+const emit = defineEmits(['onDataSaved']);
+
+const $props = defineProps({
+    title: {
+        type: String,
+        default: '',
+    },
+    subtitle: {
+        type: String,
+        default: '',
+    },
+    url: {
+        type: String,
+        default: '',
+    },
+    model: {
+        type: String,
+        default: '',
+    },
+    filter: {
+        type: Object,
+        default: null,
+    },
+    urlCreate: {
+        type: String,
+        default: null,
+    },
+    formInitialData: {
+        type: Object,
+        default: () => {},
+    },
+});
+
+const { t } = useI18n();
+
+const closeButton = ref(null);
+const isLoading = ref(false);
+
+const onDataSaved = () => {
+    emit('onDataSaved');
+    closeForm();
+};
+
+const closeForm = () => {
+    if (closeButton.value) closeButton.value.click();
+};
+</script>
+
+<template>
+    <FormModel
+        :form-initial-data="formInitialData"
+        :observe-form-changes="false"
+        :default-actions="false"
+        :url-create="urlCreate"
+        :model="model"
+        @on-data-saved="onDataSaved()"
+    >
+        <template #form="{ data, validate }">
+            <span
+                ref="closeButton"
+                class="absolute cursor-pointer"
+                style="top: 20px; right: 20px"
+                v-close-popup
+            >
+                <QIcon name="close" size="sm" />
+            </span>
+            <h1 class="title">{{ title }}</h1>
+            <p>{{ subtitle }}</p>
+            <slot name="form-inputs" :data="data" :validate="validate" />
+            <div class="q-mt-lg row justify-end">
+                <QBtn
+                    :label="t('globals.save')"
+                    type="submit"
+                    color="primary"
+                    :disabled="isLoading"
+                    :loading="isLoading"
+                />
+                <QBtn
+                    :label="t('globals.cancel')"
+                    type="reset"
+                    color="primary"
+                    flat
+                    class="q-ml-sm"
+                    :disabled="isLoading"
+                    :loading="isLoading"
+                    v-close-popup
+                />
+            </div>
+        </template>
+    </FormModel>
+</template>
+
+<style lang="scss" scoped>
+.title {
+    font-size: 17px;
+    font-weight: bold;
+    line-height: 20px;
+}
+</style>
diff --git a/src/css/app.scss b/src/css/app.scss
index 0f1b4673a..02d4f8946 100644
--- a/src/css/app.scss
+++ b/src/css/app.scss
@@ -53,16 +53,3 @@ body.body--dark {
     color: var(--vn-text);
     border-radius: 8px;
 }
-
-.popup-form-title {
-    font-size: 17px;
-    font-weight: bold;
-    line-height: 20px;
-}
-
-.popup-form-close-button {
-    position: absolute;
-    top: 20px;
-    right: 20px;
-    cursor: pointer;
-}

From c29586632c9cceba3d71ac0e3b0a9415bd3c21e5 Mon Sep 17 00:00:00 2001
From: Kevin Martinez <kevin.martinez@mindshore.io>
Date: Tue, 2 Jan 2024 12:29:34 -0400
Subject: [PATCH 20/36] Fix order feedback

---
 src/pages/Order/Card/OrderCatalogFilter.vue   | 11 ++++++----
 src/pages/Order/Card/OrderCatalogItem.vue     |  4 +++-
 .../Order/Card/OrderCatalogItemDialog.vue     |  5 ++---
 src/pages/Order/Card/OrderDescriptor.vue      | 21 +++++++++++--------
 src/pages/Order/Card/OrderSummary.vue         |  2 +-
 5 files changed, 25 insertions(+), 18 deletions(-)

diff --git a/src/pages/Order/Card/OrderCatalogFilter.vue b/src/pages/Order/Card/OrderCatalogFilter.vue
index 814aa49c6..23accb680 100644
--- a/src/pages/Order/Card/OrderCatalogFilter.vue
+++ b/src/pages/Order/Card/OrderCatalogFilter.vue
@@ -76,6 +76,12 @@ const setCategoryList = (data) => {
             icon: `vn:${(category.icon || '').split('-')[1]}`,
         }));
 };
+
+const getCategoryClass = (category, params) => {
+    if (category.id === params?.categoryFk) {
+        return 'active';
+    }
+};
 </script>
 
 <template>
@@ -105,10 +111,7 @@ const setCategoryList = (data) => {
                     <div
                         v-for="category in categoryList"
                         :key="category.name"
-                        :class="[
-                            'category',
-                            category.id === params?.categoryFk && 'active',
-                        ]"
+                        :class="['category', getCategoryClass(category, params)]"
                     >
                         <QIcon
                             :name="category.icon"
diff --git a/src/pages/Order/Card/OrderCatalogItem.vue b/src/pages/Order/Card/OrderCatalogItem.vue
index 6579fc261..e36ba7836 100644
--- a/src/pages/Order/Card/OrderCatalogItem.vue
+++ b/src/pages/Order/Card/OrderCatalogItem.vue
@@ -6,6 +6,8 @@ import OrderCatalogItemDialog from 'pages/Order/Card/OrderCatalogItemDialog.vue'
 import toCurrency from '../../../filters/toCurrency';
 import { ref } from 'vue';
 
+const DEFAULT_PRICE_KG = 0;
+
 const session = useSession();
 const token = session.getToken();
 const { t } = useI18n();
@@ -70,7 +72,7 @@ const dialog = ref(null);
                         </QIcon>
                     </div>
                     <p v-if="item.priceKg" class="price-kg">
-                        {{ t('price-kg') }} {{ toCurrency(item.priceKg) || 1123 }}
+                        {{ t('price-kg') }} {{ toCurrency(item.priceKg) || DEFAULT_PRICE_KG }}
                     </p>
                 </div>
             </div>
diff --git a/src/pages/Order/Card/OrderCatalogItemDialog.vue b/src/pages/Order/Card/OrderCatalogItemDialog.vue
index 8d12824e6..d5464ed1a 100644
--- a/src/pages/Order/Card/OrderCatalogItemDialog.vue
+++ b/src/pages/Order/Card/OrderCatalogItemDialog.vue
@@ -45,8 +45,7 @@ const addToOrder = async () => {
                                 class="link"
                                 @click="
                                     () => {
-                                        item.quantity =
-                                            Number(item.quantity) + item.grouping;
+                                        item.quantity += item.grouping;
                                     }
                                 "
                             >
@@ -56,7 +55,7 @@ const addToOrder = async () => {
                         </td>
                         <td class="text-right">
                             <QInput
-                                v-model="item.quantity"
+                                v-model.number="item.quantity"
                                 type="number"
                                 :step="item.grouping"
                                 min="0"
diff --git a/src/pages/Order/Card/OrderDescriptor.vue b/src/pages/Order/Card/OrderDescriptor.vue
index 09c87f138..727d74322 100644
--- a/src/pages/Order/Card/OrderDescriptor.vue
+++ b/src/pages/Order/Card/OrderDescriptor.vue
@@ -9,7 +9,9 @@ import useCardDescription from 'src/composables/useCardDescription';
 import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
 import CardDescriptor from 'components/ui/CardDescriptor.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
-import OrderDescriptorMenu from "pages/Order/Card/OrderDescriptorMenu.vue";
+import OrderDescriptorMenu from 'pages/Order/Card/OrderDescriptorMenu.vue';
+
+const DEFAULT_ITEMS = 0;
 
 const $props = defineProps({
     id: {
@@ -60,6 +62,10 @@ const setData = (entity) => {
     data.value = useCardDescription(entity.client.name, entity.id);
     state.set('ClaimDescriptor', entity);
 };
+
+const getConfirmationValue = (isConfirmed) => {
+    return t(isConfirmed ? 'order.summary.confirmed' : 'order.summary.notConfirmed');
+};
 </script>
 
 <template>
@@ -79,13 +85,7 @@ const setData = (entity) => {
         <template #body="{ entity }">
             <VnLv
                 :label="t('order.summary.state')"
-                :value="
-                    t(
-                        entity.isConfirmed
-                            ? 'order.summary.confirmed'
-                            : 'order.summary.notConfirmed'
-                    )
-                "
+                :value="getConfirmationValue(entity.isConfirmed)"
             />
             <VnLv :label="t('order.field.salesPersonFk')">
                 <template #value>
@@ -98,7 +98,10 @@ const setData = (entity) => {
             <VnLv :label="t('order.summary.landed')" :value="toDate(entity?.landed)" />
             <VnLv :label="t('order.field.agency')" :value="entity?.agencyMode?.name" />
             <VnLv :label="t('order.summary.alias')" :value="entity?.address?.nickname" />
-            <VnLv :label="t('order.summary.items')" :value="(entity?.rows?.length || 0).toString()" />
+            <VnLv
+                :label="t('order.summary.items')"
+                :value="(entity?.rows?.length || DEFAULT_ITEMS).toString()"
+            />
             <VnLv :label="t('order.summary.total')" :value="toCurrency(entity?.total)" />
         </template>
         <template #actions="{ entity }">
diff --git a/src/pages/Order/Card/OrderSummary.vue b/src/pages/Order/Card/OrderSummary.vue
index 0efffa3fa..0ddae2d16 100644
--- a/src/pages/Order/Card/OrderSummary.vue
+++ b/src/pages/Order/Card/OrderSummary.vue
@@ -78,7 +78,7 @@ const detailsColumns = ref([
                 />
                 <VnLv
                     :label="t('order.summary.confirmed')"
-                    :value="entity?.isConfirmed === 1"
+                    :value="Boolean(entity?.isConfirmed)"
                 />
             </QCard>
             <QCard class="vn-one">

From a5cbc55a7e41cfe72750380e6f0abcb305477b92 Mon Sep 17 00:00:00 2001
From: Kevin Martinez <kevin.martinez@mindshore.io>
Date: Tue, 2 Jan 2024 12:36:09 -0400
Subject: [PATCH 21/36] Fix form model feedback

---
 src/components/FormModel.vue | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/components/FormModel.vue b/src/components/FormModel.vue
index e683ce735..691cf63bd 100644
--- a/src/components/FormModel.vue
+++ b/src/components/FormModel.vue
@@ -97,9 +97,7 @@ const startFormWatcher = () => {
     watch(
         () => formData.value,
         (val) => {
-            if (!isResetting.value && val) {
-                hasChanges.value = true;
-            }
+            hasChanges.value = !isResetting.value && val;
             isResetting.value = false;
         },
         { deep: true }

From 24fdc1ff979e2d19a4eda38a2d155867a9fb7dd0 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Wed, 3 Jan 2024 10:56:13 -0300
Subject: [PATCH 22/36] wip

---
 src/components/common/TableVisibleColumns.vue | 47 +++++++++++++-----
 src/filters/dateRange.js                      |  8 +++
 src/filters/index.js                          |  2 +
 .../CustomerExtendedListFilter.vue            | 49 ++++++++++++++++++-
 src/pages/Travel/ExtraCommunityFilter.vue     |  2 +-
 5 files changed, 94 insertions(+), 14 deletions(-)
 create mode 100644 src/filters/dateRange.js

diff --git a/src/components/common/TableVisibleColumns.vue b/src/components/common/TableVisibleColumns.vue
index 94e3bfbc7..663a7bb93 100644
--- a/src/components/common/TableVisibleColumns.vue
+++ b/src/components/common/TableVisibleColumns.vue
@@ -43,17 +43,17 @@ const areAllChecksMarked = computed(() => {
 });
 
 const setUserConfigViewData = (data) => {
-    initialUserConfigViewData.value = data;
-    if (data.length === 0) return;
-    formattedCols.value = $props.allColumns.map((col) => {
-        // Importante: El name de las columnas de la tabla debe conincidir con el name de las variables que devuelve la view config
-        const obj = {
-            name: col,
-            active: data[0].configuration[col],
-        };
-        return obj;
-    });
-    emitSavedConfig();
+    // initialUserConfigViewData.value = data;
+    // if (data.length === 0) return;
+    // formattedCols.value = $props.allColumns.map((col) => {
+    //     // Importante: El name de las columnas de la tabla debe conincidir con el name de las variables que devuelve la view config
+    //     const obj = {
+    //         name: col,
+    //         active: data[0].configuration[col],
+    //     };
+    //     return obj;
+    // });
+    // emitSavedConfig();
 };
 
 const toggleMarkAll = (val) => {
@@ -80,6 +80,22 @@ const saveConfig = async () => {
         console.error('Error saving user view config');
     }
 };
+
+const setDefaultViewConfig = (data) => {
+    initialUserConfigViewData.value = data;
+    if (data.length === 0) return;
+    formattedCols.value = $props.allColumns.map((col) => {
+        // Importante: El name de las columnas de la tabla debe conincidir con el name de las variables que devuelve la view config
+        const obj = {
+            name: col,
+            active: data[0].columns[col],
+        };
+        return obj;
+    });
+    console.log('formattedCols:: ', formattedCols);
+    emitSavedConfig();
+};
+
 const emitSavedConfig = () => {
     const filteredCols = formattedCols.value.filter((col) => col.active);
     const mappedCols = filteredCols.map((col) => col.name);
@@ -87,12 +103,19 @@ const emitSavedConfig = () => {
 };
 </script>
 <template>
-    <fetch-data
+    <!-- <fetch-data
         v-if="user"
         url="UserConfigViews"
         :filter="userConfigFilter"
         @on-fetch="(data) => setUserConfigViewData(data)"
         auto-load
+    /> -->
+    <fetch-data
+        v-if="user"
+        url="DefaultViewConfigs"
+        :filter="{ where: { tableCode: tableCode } }"
+        @on-fetch="(data) => setDefaultViewConfig(data)"
+        auto-load
     />
     <QBtn color="primary" icon="view_column">
         <QPopupProxy ref="popupProxyRef">
diff --git a/src/filters/dateRange.js b/src/filters/dateRange.js
new file mode 100644
index 000000000..4c0cfe654
--- /dev/null
+++ b/src/filters/dateRange.js
@@ -0,0 +1,8 @@
+export default function dateRange(value) {
+    const minHour = new Date(value);
+    minHour.setHours(0, 0, 0, 0);
+    const maxHour = new Date(value);
+    maxHour.setHours(23, 59, 59, 59);
+
+    return [minHour, maxHour];
+}
diff --git a/src/filters/index.js b/src/filters/index.js
index b0c441641..f0120e663 100644
--- a/src/filters/index.js
+++ b/src/filters/index.js
@@ -7,6 +7,7 @@ import toCurrency from './toCurrency';
 import toPercentage from './toPercentage';
 import toLowerCamel from './toLowerCamel';
 import dashIfEmpty from './dashIfEmpty';
+import dateRange from './dateRange';
 
 export {
     toLowerCase,
@@ -18,4 +19,5 @@ export {
     toCurrency,
     toPercentage,
     dashIfEmpty,
+    dateRange,
 };
diff --git a/src/pages/Customer/ExtendedList/CustomerExtendedListFilter.vue b/src/pages/Customer/ExtendedList/CustomerExtendedListFilter.vue
index 3a9cebc96..7d54aaf0a 100644
--- a/src/pages/Customer/ExtendedList/CustomerExtendedListFilter.vue
+++ b/src/pages/Customer/ExtendedList/CustomerExtendedListFilter.vue
@@ -7,6 +7,7 @@ import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
 import VnSelectFilter from 'components/common/VnSelectFilter.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import VnInputDate from 'components/common/VnInputDate.vue';
+import { dateRange } from 'src/filters';
 
 const props = defineProps({
     dataKey: {
@@ -32,6 +33,48 @@ const sageTransactionTypesOptions = ref([]);
 
 const visibleColumnsSet = computed(() => new Set(props.visibleColumns));
 
+const exprBuilder = (param, value) => {
+    switch (param) {
+        case 'created':
+            return {
+                'c.created': {
+                    between: dateRange(value),
+                },
+            };
+        case 'id':
+        case 'name':
+        case 'socialName':
+        case 'fi':
+        case 'credit':
+        case 'creditInsurance':
+        case 'phone':
+        case 'mobile':
+        case 'street':
+        case 'city':
+        case 'postcode':
+        case 'email':
+        case 'isActive':
+        case 'isVies':
+        case 'isTaxDataChecked':
+        case 'isEqualizated':
+        case 'isFreezed':
+        case 'hasToInvoice':
+        case 'hasToInvoiceByAddress':
+        case 'isToBeMailed':
+        case 'hasSepaVnl':
+        case 'hasLcr':
+        case 'hasCoreVnl':
+        case 'countryFk':
+        case 'provinceFk':
+        case 'salesPersonFk':
+        case 'businessTypeFk':
+        case 'payMethodFk':
+        case 'sageTaxTypeFk':
+        case 'sageTransactionTypeFk':
+            return { [`c.${param}`]: value };
+    }
+};
+
 const shouldRenderColumn = (colName) => {
     return visibleColumnsSet.value.has(colName);
 };
@@ -88,7 +131,11 @@ const shouldRenderColumn = (colName) => {
         auto-load
         @on-fetch="(data) => (sageTransactionTypesOptions = data)"
     />
-    <VnFilterPanel :data-key="props.dataKey" :search-button="true">
+    <VnFilterPanel
+        :data-key="props.dataKey"
+        :search-button="true"
+        :expr-builder="exprBuilder"
+    >
         <template #tags="{ tag, formatFn }">
             <div class="q-gutter-x-xs">
                 <strong
diff --git a/src/pages/Travel/ExtraCommunityFilter.vue b/src/pages/Travel/ExtraCommunityFilter.vue
index 73aa13ccf..260b0fb42 100644
--- a/src/pages/Travel/ExtraCommunityFilter.vue
+++ b/src/pages/Travel/ExtraCommunityFilter.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { reactive, ref } from 'vue';
+import { ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 
 import FetchData from 'components/FetchData.vue';

From a66b88ba8e8c27a7068916747215b5bef50bdb7f Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Wed, 3 Jan 2024 10:59:11 -0300
Subject: [PATCH 23/36] add delete department popup translation

---
 src/components/ui/VnTree.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/ui/VnTree.vue b/src/components/ui/VnTree.vue
index 23faf770f..637b18256 100644
--- a/src/components/ui/VnTree.vue
+++ b/src/components/ui/VnTree.vue
@@ -55,8 +55,8 @@ const fetchNodeLeaves = async (nodeKey) => {
 const removeNode = (node) => {
     quasar
         .dialog({
-            title: 'Are you sure you want to delete it?',
-            message: 'Delete department',
+            title: t('Are you sure you want to delete it?'),
+            message: t('Delete department'),
             ok: {
                 push: true,
                 color: 'primary',

From 54d77c98519feab2ba025d76bb43bf3a3eae063c Mon Sep 17 00:00:00 2001
From: Kevin Martinez <kevin.martinez@mindshore.io>
Date: Wed, 3 Jan 2024 10:02:14 -0400
Subject: [PATCH 24/36] Fix Icon sizing

---
 src/components/common/VnSelectCreate.vue    | 2 +-
 src/components/common/VnSelectFilter.vue    | 2 +-
 src/pages/Route/Cmr/CmrList.vue             | 2 +-
 src/pages/Supplier/Card/SupplierSummary.vue | 2 +-
 src/pages/Travel/Card/TravelSummary.vue     | 2 +-
 src/pages/Wagon/Type/WagonTypeCreate.vue    | 4 ++--
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/components/common/VnSelectCreate.vue b/src/components/common/VnSelectCreate.vue
index 0b5694ec5..bdc3f5cc8 100644
--- a/src/components/common/VnSelectCreate.vue
+++ b/src/components/common/VnSelectCreate.vue
@@ -49,7 +49,7 @@ const toggleForm = () => {
             <QIcon
                 @click.stop.prevent="toggleForm()"
                 name="add"
-                size="19px"
+                size="xs"
                 class="add-icon"
             />
             <QDialog v-model="showForm" transition-show="scale" transition-hide="scale">
diff --git a/src/components/common/VnSelectFilter.vue b/src/components/common/VnSelectFilter.vue
index a0605bbae..6da733c98 100644
--- a/src/components/common/VnSelectFilter.vue
+++ b/src/components/common/VnSelectFilter.vue
@@ -93,7 +93,7 @@ const value = computed({
                 name="close"
                 @click.stop="value = null"
                 class="cursor-pointer"
-                size="18px"
+                size="xs"
             />
         </template>
         <template v-for="(_, slotName) in $slots" #[slotName]="slotData" :key="slotName">
diff --git a/src/pages/Route/Cmr/CmrList.vue b/src/pages/Route/Cmr/CmrList.vue
index e9355eed0..dc5602c1c 100644
--- a/src/pages/Route/Cmr/CmrList.vue
+++ b/src/pages/Route/Cmr/CmrList.vue
@@ -150,7 +150,7 @@ function downloadPdfs() {
                                     <QIcon
                                         name="visibility"
                                         color="primary"
-                                        size="2em"
+                                        size="md"
                                         class="q-mr-sm q-ml-sm"
                                     />
                                     <QTooltip>
diff --git a/src/pages/Supplier/Card/SupplierSummary.vue b/src/pages/Supplier/Card/SupplierSummary.vue
index e9fbffe96..8f09b5510 100644
--- a/src/pages/Supplier/Card/SupplierSummary.vue
+++ b/src/pages/Supplier/Card/SupplierSummary.vue
@@ -53,7 +53,7 @@ const isAdministrative = computed(() => {
     >
         <template #header-left>
             <a v-if="isAdministrative" class="header link" :href="supplierUrl">
-                <QIcon name="open_in_new" color="white" size="25px" />
+                <QIcon name="open_in_new" color="white" size="sm" />
             </a>
         </template>
         <template #header>
diff --git a/src/pages/Travel/Card/TravelSummary.vue b/src/pages/Travel/Card/TravelSummary.vue
index c8a62ec00..3bc5f0584 100644
--- a/src/pages/Travel/Card/TravelSummary.vue
+++ b/src/pages/Travel/Card/TravelSummary.vue
@@ -195,7 +195,7 @@ const openEntryDescriptor = () => {};
     >
         <template #header-left>
             <a class="header link" :href="travelUrl">
-                <QIcon name="open_in_new" color="white" size="25px" />
+                <QIcon name="open_in_new" color="white" size="sm" />
             </a>
         </template>
         <template #header>
diff --git a/src/pages/Wagon/Type/WagonTypeCreate.vue b/src/pages/Wagon/Type/WagonTypeCreate.vue
index aa14e2cbf..bc9c1a40c 100644
--- a/src/pages/Wagon/Type/WagonTypeCreate.vue
+++ b/src/pages/Wagon/Type/WagonTypeCreate.vue
@@ -309,8 +309,8 @@ function exceedMaxHeight(pos) {
                     </div>
                 </div>
                 <div class="q-mb-sm wheels">
-                    <QIcon color="grey-6" name="trip_origin" size="3rem" />
-                    <QIcon color="grey-6" name="trip_origin" size="3rem" />
+                    <QIcon color="grey-6" name="trip_origin" size="xl" />
+                    <QIcon color="grey-6" name="trip_origin" size="xl" />
                 </div>
                 <QDialog
                     v-model="colorPickerActive"

From 2af176a502bff57c95f8e0ef2e0eed37c1458f69 Mon Sep 17 00:00:00 2001
From: Kevin Martinez <kevin.martinez@mindshore.io>
Date: Wed, 3 Jan 2024 10:50:26 -0400
Subject: [PATCH 25/36] Fix catalog filter

---
 src/components/ui/VnFilterPanel.vue         |  3 +-
 src/pages/Order/Card/OrderCatalogFilter.vue | 32 ++++++++++++++++-----
 src/pages/Order/OrderCatalog.vue            |  8 +-----
 3 files changed, 28 insertions(+), 15 deletions(-)

diff --git a/src/components/ui/VnFilterPanel.vue b/src/components/ui/VnFilterPanel.vue
index 6f6183224..a138e0b64 100644
--- a/src/components/ui/VnFilterPanel.vue
+++ b/src/components/ui/VnFilterPanel.vue
@@ -41,7 +41,7 @@ const props = defineProps({
     },
 });
 
-const emit = defineEmits(['refresh', 'clear', 'search', 'init']);
+const emit = defineEmits(['refresh', 'clear', 'search', 'init', 'remove']);
 
 const arrayData = useArrayData(props.dataKey, {
     exprBuilder: props.exprBuilder,
@@ -116,6 +116,7 @@ const tags = computed(() => {
 async function remove(key) {
     userParams.value[key] = null;
     await search();
+    emit('remove', key)
 }
 
 function formatValue(value) {
diff --git a/src/pages/Order/Card/OrderCatalogFilter.vue b/src/pages/Order/Card/OrderCatalogFilter.vue
index 23accb680..0859e14a6 100644
--- a/src/pages/Order/Card/OrderCatalogFilter.vue
+++ b/src/pages/Order/Card/OrderCatalogFilter.vue
@@ -21,16 +21,27 @@ const selectedCategoryFk = ref(null);
 const typeList = ref(null);
 const selectedTypeFk = ref(null);
 
-const selectCategory = (params, category) => {
+const resetCategory = () => {
+    selectedCategoryFk.value = null;
+    typeList.value = null;
+};
+
+const clearFilter = (key) => {
+    if (key === 'categoryFk') {
+        resetCategory();
+    }
+};
+
+const selectCategory = (params, category, search) => {
     if (params.categoryFk === category?.id) {
-        selectedCategoryFk.value = null;
+        resetCategory();
         params.categoryFk = null;
-        typeList.value = null;
     } else {
         selectedCategoryFk.value = category?.id;
         params.categoryFk = category?.id;
         loadTypes(category?.id);
     }
+    search();
 };
 
 const loadTypes = async (categoryFk) => {
@@ -65,6 +76,8 @@ function exprBuilder(param, value) {
         case 'categoryFk':
         case 'typeFk':
             return { [param]: value };
+        case 'search':
+            return { 'i.name': { like: `%${value}%` } };
     }
 }
 
@@ -88,10 +101,10 @@ const getCategoryClass = (category, params) => {
     <FetchData url="ItemCategories" limit="30" auto-load @on-fetch="setCategoryList" />
     <VnFilterPanel
         :data-key="props.dataKey"
-        :search-button="true"
         :hidden-tags="['orderFk', 'orderBy']"
         :expr-builder="exprBuilder"
         @init="onFilterInit"
+        @remove="clearFilter"
     >
         <template #tags="{ tag, formatFn }">
             <strong v-if="tag.label === 'categoryFk'">
@@ -105,7 +118,7 @@ const getCategoryClass = (category, params) => {
                 <span>{{ formatFn(tag.value) }}</span>
             </div>
         </template>
-        <template #body="{ params }">
+        <template #body="{ params, searchFn }">
             <QList dense>
                 <QItem class="category-filter q-mt-md">
                     <div
@@ -116,7 +129,7 @@ const getCategoryClass = (category, params) => {
                         <QIcon
                             :name="category.icon"
                             class="category-icon"
-                            @click="selectCategory(params, category)"
+                            @click="selectCategory(params, category, searchFn)"
                         >
                             <QTooltip>
                                 {{ t(category.name) }}
@@ -138,7 +151,12 @@ const getCategoryClass = (category, params) => {
                             emit-value
                             use-input
                             :disable="!selectedCategoryFk"
-                            @update:model-value="(value) => (selectedTypeFk = value)"
+                            @update:model-value="
+                                (value) => {
+                                    selectedTypeFk = value;
+                                    searchFn();
+                                }
+                            "
                         >
                             <template #option="{ itemProps, opt }">
                                 <QItem v-bind="itemProps">
diff --git a/src/pages/Order/OrderCatalog.vue b/src/pages/Order/OrderCatalog.vue
index ec81c50f1..a257f7627 100644
--- a/src/pages/Order/OrderCatalog.vue
+++ b/src/pages/Order/OrderCatalog.vue
@@ -20,12 +20,6 @@ const catalogParams = {
     orderBy: JSON.stringify({ field: 'relevancy DESC, name', way: 'ASC', isTag: false }),
 };
 
-function exprBuilder(param, value) {
-    switch (param) {
-        case 'search':
-            return { 'i.name': { like: `%${value}%` } };
-    }
-}
 </script>
 
 <template>
@@ -35,8 +29,8 @@ function exprBuilder(param, value) {
             url="Orders/CatalogFilter"
             :limit="50"
             :user-params="catalogParams"
-            :expr-builder="exprBuilder"
             :static-params="['orderFk', 'orderBy']"
+            :redirect="false"
         />
     </Teleport>
     <Teleport v-if="stateStore.isHeaderMounted()" to="#actions-append">

From 142bac7a432de87dc8f809e17ae3f9efa56b7aa2 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Wed, 3 Jan 2024 13:49:08 -0300
Subject: [PATCH 26/36] agregar data por default en tabla extended list

---
 src/components/common/TableVisibleColumns.vue | 142 +++++++++++-------
 1 file changed, 84 insertions(+), 58 deletions(-)

diff --git a/src/components/common/TableVisibleColumns.vue b/src/components/common/TableVisibleColumns.vue
index 663a7bb93..5e077433a 100644
--- a/src/components/common/TableVisibleColumns.vue
+++ b/src/components/common/TableVisibleColumns.vue
@@ -1,8 +1,6 @@
 <script setup>
 import { useI18n } from 'vue-i18n';
-import { ref, computed } from 'vue';
-
-import FetchData from 'components/FetchData.vue';
+import { ref, computed, onMounted } from 'vue';
 
 import { useState } from 'src/composables/useState';
 import axios from 'axios';
@@ -29,12 +27,6 @@ const { t } = useI18n();
 const popupProxyRef = ref(null);
 const user = state.getUser();
 const initialUserConfigViewData = ref(null);
-const userConfigFilter = {
-    where: {
-        tableCode: $props.tableCode,
-        userFk: user.id,
-    },
-};
 
 const formattedCols = ref([]);
 
@@ -43,37 +35,96 @@ const areAllChecksMarked = computed(() => {
 });
 
 const setUserConfigViewData = (data) => {
-    // initialUserConfigViewData.value = data;
-    // if (data.length === 0) return;
-    // formattedCols.value = $props.allColumns.map((col) => {
-    //     // Importante: El name de las columnas de la tabla debe conincidir con el name de las variables que devuelve la view config
-    //     const obj = {
-    //         name: col,
-    //         active: data[0].configuration[col],
-    //     };
-    //     return obj;
-    // });
-    // emitSavedConfig();
+    if (!data) return;
+    formattedCols.value = $props.allColumns.map((col) => {
+        // Importante: El name de las columnas de la tabla debe conincidir con el name de las variables que devuelve la view config
+        const obj = {
+            name: col,
+            active: data[col],
+        };
+        return obj;
+    });
+    emitSavedConfig();
 };
 
 const toggleMarkAll = (val) => {
     formattedCols.value.forEach((col) => (col.active = val));
 };
 
-const saveConfig = async () => {
+const fetchViewConfigData = async () => {
     try {
-        const data = {
-            id: initialUserConfigViewData.value[0].id,
-            userFk: 9,
-            tableCode: $props.tableCode,
-            configuration: {},
+        const userConfigFilter = {
+            where: {
+                tableCode: $props.tableCode,
+                userFk: user.id,
+            },
         };
 
-        formattedCols.value.forEach((col) => {
-            data.configuration[col.name] = col.active;
+        const userViewConfigResponse = await axios.get('UserConfigViews', {
+            params: { filter: userConfigFilter },
         });
 
-        await axios.patch('UserConfigViews', data);
+        if (userViewConfigResponse.data && userViewConfigResponse.data.length > 0) {
+            initialUserConfigViewData.value = userViewConfigResponse.data[0];
+            setUserConfigViewData(userViewConfigResponse.data[0].configuration);
+            return;
+        }
+
+        const defaultConfigFilter = {
+            where: {
+                tableCode: $props.tableCode,
+            },
+        };
+
+        const defaultViewConfigResponse = await axios.get('DefaultViewConfigs', {
+            params: { filter: defaultConfigFilter },
+        });
+
+        if (defaultViewConfigResponse.data && defaultViewConfigResponse.data.length > 0) {
+            setUserConfigViewData(defaultViewConfigResponse.data[0].columns);
+            return;
+        }
+    } catch (err) {
+        console.err('Error fetching config view data');
+    }
+};
+
+const saveConfig = async () => {
+    try {
+        const params = {};
+        const configuration = {};
+
+        formattedCols.value.forEach((col) => {
+            configuration[col.name] = col.active;
+        });
+
+        // Si existe una view config del usuario hacemos un update si no la creamos
+        if (initialUserConfigViewData.value) {
+            params.updates = [
+                {
+                    data: {
+                        configuration: configuration,
+                    },
+                    where: {
+                        id: initialUserConfigViewData.value.id,
+                    },
+                },
+            ];
+        } else {
+            params.creates = [
+                {
+                    userFk: user.value.id,
+                    tableCode: $props.tableCode,
+                    tableConfig: $props.tableCode,
+                    configuration: configuration,
+                },
+            ];
+        }
+
+        const response = await axios.post('UserConfigViews/crud', params);
+        if (response.data && response.data[0]) {
+            initialUserConfigViewData.value = response.data[0];
+        }
         emitSavedConfig();
         popupProxyRef.value.hide();
     } catch (err) {
@@ -81,42 +132,17 @@ const saveConfig = async () => {
     }
 };
 
-const setDefaultViewConfig = (data) => {
-    initialUserConfigViewData.value = data;
-    if (data.length === 0) return;
-    formattedCols.value = $props.allColumns.map((col) => {
-        // Importante: El name de las columnas de la tabla debe conincidir con el name de las variables que devuelve la view config
-        const obj = {
-            name: col,
-            active: data[0].columns[col],
-        };
-        return obj;
-    });
-    console.log('formattedCols:: ', formattedCols);
-    emitSavedConfig();
-};
-
 const emitSavedConfig = () => {
     const filteredCols = formattedCols.value.filter((col) => col.active);
     const mappedCols = filteredCols.map((col) => col.name);
     emit('onConfigSaved', mappedCols);
 };
+
+onMounted(async () => {
+    await fetchViewConfigData();
+});
 </script>
 <template>
-    <!-- <fetch-data
-        v-if="user"
-        url="UserConfigViews"
-        :filter="userConfigFilter"
-        @on-fetch="(data) => setUserConfigViewData(data)"
-        auto-load
-    /> -->
-    <fetch-data
-        v-if="user"
-        url="DefaultViewConfigs"
-        :filter="{ where: { tableCode: tableCode } }"
-        @on-fetch="(data) => setDefaultViewConfig(data)"
-        auto-load
-    />
     <QBtn color="primary" icon="view_column">
         <QPopupProxy ref="popupProxyRef">
             <QCard class="column q-pa-md">

From ead8bb4992ed059be55c6b91696f142cdded94d7 Mon Sep 17 00:00:00 2001
From: carlosfonseca <carlos.fonseca@mindshore.io>
Date: Wed, 3 Jan 2024 14:53:01 -0500
Subject: [PATCH 27/36] Se definen los iconos de las tarjetas en summary y se
 organiza cabeceras de tablas

---
 src/i18n/en/index.js                          |  2 +-
 .../Defaulter/CustomerBalanceDueTotal.vue     | 54 +++++++++++++++++++
 .../Customer/Defaulter/CustomerDefaulter.vue  | 20 ++++---
 .../Notifications/CustomerNotifications.vue   |  5 --
 src/router/modules/customer.js                | 26 ++++-----
 5 files changed, 81 insertions(+), 26 deletions(-)
 create mode 100644 src/pages/Customer/Defaulter/CustomerBalanceDueTotal.vue

diff --git a/src/i18n/en/index.js b/src/i18n/en/index.js
index 49a475b9e..a1811df4e 100644
--- a/src/i18n/en/index.js
+++ b/src/i18n/en/index.js
@@ -130,7 +130,7 @@ export default {
             log: 'Log',
             sms: 'Sms',
             creditManagement: 'Credit management',
-            others: 'Other',
+            others: 'Others',
         },
         list: {
             phone: 'Phone',
diff --git a/src/pages/Customer/Defaulter/CustomerBalanceDueTotal.vue b/src/pages/Customer/Defaulter/CustomerBalanceDueTotal.vue
new file mode 100644
index 000000000..dfbaf8ad4
--- /dev/null
+++ b/src/pages/Customer/Defaulter/CustomerBalanceDueTotal.vue
@@ -0,0 +1,54 @@
+<script setup>
+import { useI18n } from 'vue-i18n';
+
+import { toCurrency } from 'filters/index';
+
+const $props = defineProps({
+    amount: {
+        type: Number,
+        required: true,
+    },
+});
+
+const { t } = useI18n();
+</script>
+
+<template>
+    <div class="card_balance">
+        <h6 class="title_balance">{{ t('Total') }}</h6>
+        <div style="display: flex">
+            <p class="key_balance">{{ t('Balance due') }}:&ensp;</p>
+            <b class="value_balance">
+                {{ toCurrency($props.amount) }}
+            </b>
+        </div>
+    </div>
+</template>
+
+<style lang="scss">
+.card_balance {
+    border: 1px solid black;
+    margin: 7px;
+    padding: 5px 7px;
+}
+.title_balance {
+    color: white;
+    margin-top: 0;
+    margin-bottom: 0;
+    text-align: center;
+}
+.key_balance {
+    color: grey;
+    margin-bottom: 0;
+}
+.value_balance {
+    color: white;
+    margin-bottom: 0;
+}
+</style>
+
+<i18n>
+es:
+    Total: Total
+    Balance due: Saldo vencido
+</i18n>
diff --git a/src/pages/Customer/Defaulter/CustomerDefaulter.vue b/src/pages/Customer/Defaulter/CustomerDefaulter.vue
index b35980416..15bfd84eb 100644
--- a/src/pages/Customer/Defaulter/CustomerDefaulter.vue
+++ b/src/pages/Customer/Defaulter/CustomerDefaulter.vue
@@ -4,11 +4,12 @@ import { useI18n } from 'vue-i18n';
 
 import { QBtn, QCheckbox } from 'quasar';
 
+import { toCurrency, toDate } from 'filters/index';
 import { useArrayData } from 'composables/useArrayData';
 import { useStateStore } from 'stores/useStateStore';
 
-import { toCurrency, toDate } from 'filters/index';
 import CustomerNotificationsFilter from './CustomerDefaulterFilter.vue';
+import CustomerBalanceDueTotal from './CustomerBalanceDueTotal.vue';
 import CustomerDescriptorProxy from 'src/pages/Customer/Card/CustomerDescriptorProxy.vue';
 import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
 
@@ -16,6 +17,7 @@ const { t } = useI18n();
 const stateStore = useStateStore();
 
 const arrayData = ref(null);
+const balanceDueTotal = ref(0);
 
 onBeforeMount(async () => {
     arrayData.value = useArrayData('CustomerDefaulter', {
@@ -23,6 +25,13 @@ onBeforeMount(async () => {
         limit: 0,
     });
     await arrayData.value.fetch({ append: false });
+    balanceDueTotal.value = arrayData.value.store.data.reduce(
+        (accumulator, currentValue) => {
+            return accumulator + (currentValue['amount'] || 0);
+        },
+        0
+    );
+    console.log(balanceDueTotal.value);
     stateStore.rightDrawer = true;
 });
 
@@ -188,7 +197,9 @@ const selectAuthorId = (id) => {
     </QDrawer>
 
     <QToolbar class="bg-vn-dark">
-        <div id="st-data"></div>
+        <div id="st-data">
+            <CustomerBalanceDueTotal :amount="balanceDueTotal" />
+        </div>
         <QSpace />
         <div id="st-actions"></div>
     </QToolbar>
@@ -204,11 +215,6 @@ const selectAuthorId = (id) => {
             selection="multiple"
             v-model:selected="selected"
         >
-            <template #top>
-                <div v-if="rows" class="full-width flex justify-end">
-                    {{ `${rows.length} ${t('route.cmr.list.results')}` }}
-                </div>
-            </template>
             <template #body-cell="props">
                 <QTd :props="props">
                     <QTr :props="props" class="cursor-pointer">
diff --git a/src/pages/Customer/Notifications/CustomerNotifications.vue b/src/pages/Customer/Notifications/CustomerNotifications.vue
index f9ff66a7b..ce194eb06 100644
--- a/src/pages/Customer/Notifications/CustomerNotifications.vue
+++ b/src/pages/Customer/Notifications/CustomerNotifications.vue
@@ -121,11 +121,6 @@ const selectCustomerId = (id) => {
             selection="multiple"
             v-model:selected="selected"
         >
-            <template #top>
-                <div v-if="rows" class="full-width flex justify-end">
-                    {{ `${rows.length} ${t('route.cmr.list.results')}` }}
-                </div>
-            </template>
             <template #body-cell="props">
                 <QTd :props="props">
                     <QTr :props="props" class="cursor-pointer">
diff --git a/src/router/modules/customer.js b/src/router/modules/customer.js
index a79ab8a6b..3c8445f42 100644
--- a/src/router/modules/customer.js
+++ b/src/router/modules/customer.js
@@ -135,7 +135,7 @@ export default {
                     name: 'CustomerFiscalData',
                     meta: {
                         title: 'fiscalData',
-                        icon: 'vn:settings',
+                        icon: 'vn:dfiscales',
                     },
                     component: () =>
                         import('src/pages/Customer/Card/CustomerFiscalData.vue'),
@@ -145,7 +145,7 @@ export default {
                     name: 'CustomerBillingData',
                     meta: {
                         title: 'billingData',
-                        icon: 'vn:settings',
+                        icon: 'vn:payment',
                     },
                     component: () =>
                         import('src/pages/Customer/Card/CustomerBillingData.vue'),
@@ -155,7 +155,7 @@ export default {
                     name: 'CustomerConsignees',
                     meta: {
                         title: 'consignees',
-                        icon: 'vn:settings',
+                        icon: 'vn:delivery',
                     },
                     component: () =>
                         import('src/pages/Customer/Card/CustomerConsignees.vue'),
@@ -165,7 +165,7 @@ export default {
                     name: 'CustomerNotes',
                     meta: {
                         title: 'notes',
-                        icon: 'vn:settings',
+                        icon: 'vn:notes',
                     },
                     component: () => import('src/pages/Customer/Card/CustomerNotes.vue'),
                 },
@@ -174,7 +174,7 @@ export default {
                     name: 'CustomerCredits',
                     meta: {
                         title: 'credits',
-                        icon: 'vn:settings',
+                        icon: 'vn:credit',
                     },
                     component: () =>
                         import('src/pages/Customer/Card/CustomerCredits.vue'),
@@ -184,7 +184,7 @@ export default {
                     name: 'CustomerGreuges',
                     meta: {
                         title: 'greuges',
-                        icon: 'vn:settings',
+                        icon: 'vn:greuge',
                     },
                     component: () =>
                         import('src/pages/Customer/Card/CustomerGreuges.vue'),
@@ -194,7 +194,7 @@ export default {
                     name: 'CustomerBalance',
                     meta: {
                         title: 'balance',
-                        icon: 'vn:settings',
+                        icon: 'vn:invoice',
                     },
                     component: () =>
                         import('src/pages/Customer/Card/CustomerBalance.vue'),
@@ -204,7 +204,7 @@ export default {
                     name: 'CustomerRecoveries',
                     meta: {
                         title: 'recoveries',
-                        icon: 'vn:settings',
+                        icon: 'vn:recovery',
                     },
                     component: () =>
                         import('src/pages/Customer/Card/CustomerRecoveries.vue'),
@@ -214,7 +214,7 @@ export default {
                     name: 'CustomerWebAccess',
                     meta: {
                         title: 'webAccess',
-                        icon: 'vn:settings',
+                        icon: 'vn:web',
                     },
                     component: () =>
                         import('src/pages/Customer/Card/CustomerWebAccess.vue'),
@@ -224,7 +224,7 @@ export default {
                     name: 'CustomerLog',
                     meta: {
                         title: 'log',
-                        icon: 'vn:settings',
+                        icon: 'vn:History',
                     },
                     component: () => import('src/pages/Customer/Card/CustomerLog.vue'),
                 },
@@ -233,7 +233,7 @@ export default {
                     name: 'CustomerSms',
                     meta: {
                         title: 'sms',
-                        icon: 'vn:settings',
+                        icon: 'sms',
                     },
                     component: () => import('src/pages/Customer/Card/CustomerSms.vue'),
                 },
@@ -242,7 +242,7 @@ export default {
                     name: 'CustomerCreditManagement',
                     meta: {
                         title: 'creditManagement',
-                        icon: 'vn:settings',
+                        icon: 'paid',
                     },
                     component: () =>
                         import('src/pages/Customer/Card/CustomerCreditManagement.vue'),
@@ -252,7 +252,7 @@ export default {
                     name: 'CustomerOthers',
                     meta: {
                         title: 'others',
-                        icon: 'vn:settings',
+                        icon: 'pending',
                     },
                     component: () => import('src/pages/Customer/Card/CustomerOthers.vue'),
                 },

From 8fc7a5ea12ae38da6fb1b0d973dbfad03b80f7f7 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Wed, 3 Jan 2024 16:55:48 -0300
Subject: [PATCH 28/36] Aplicar clases a close-icon en el css

---
 src/components/FormModelPopup.vue | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/components/FormModelPopup.vue b/src/components/FormModelPopup.vue
index 9021adc46..c314f6897 100644
--- a/src/components/FormModelPopup.vue
+++ b/src/components/FormModelPopup.vue
@@ -62,12 +62,7 @@ const closeForm = () => {
         @on-data-saved="onDataSaved()"
     >
         <template #form="{ data, validate }">
-            <span
-                ref="closeButton"
-                class="absolute cursor-pointer"
-                style="top: 20px; right: 20px"
-                v-close-popup
-            >
+            <span ref="closeButton" class="close-icon" v-close-popup>
                 <QIcon name="close" size="sm" />
             </span>
             <h1 class="title">{{ title }}</h1>
@@ -102,4 +97,11 @@ const closeForm = () => {
     font-weight: bold;
     line-height: 20px;
 }
+
+.close-icon {
+    position: absolute;
+    top: 20px;
+    right: 20px;
+    cursor: pointer;
+}
 </style>

From de8996d5960d4aaa6a67797098e26b5e7b04c995 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Thu, 4 Jan 2024 09:34:24 -0300
Subject: [PATCH 29/36] Fixes PR

---
 src/components/common/TableVisibleColumns.vue | 123 +++++++++++++-----
 src/components/common/VnInput.vue             |   9 ++
 src/components/common/VnSelectCreate.vue      |  16 ++-
 src/components/common/VnSelectFilter.vue      |   9 ++
 src/components/ui/VnTree.vue                  |   9 +-
 src/filters/dateRange.js                      |   8 ++
 src/filters/index.js                          |   2 +
 .../CustomerExtendedListFilter.vue            |  55 +++++++-
 src/pages/Entry/EntryCreate.vue               |  14 +-
 9 files changed, 191 insertions(+), 54 deletions(-)
 create mode 100644 src/filters/dateRange.js

diff --git a/src/components/common/TableVisibleColumns.vue b/src/components/common/TableVisibleColumns.vue
index 94e3bfbc7..e0b8ad86f 100644
--- a/src/components/common/TableVisibleColumns.vue
+++ b/src/components/common/TableVisibleColumns.vue
@@ -1,11 +1,10 @@
 <script setup>
 import { useI18n } from 'vue-i18n';
-import { ref, computed } from 'vue';
-
-import FetchData from 'components/FetchData.vue';
+import { ref, computed, onMounted } from 'vue';
 
 import { useState } from 'src/composables/useState';
 import axios from 'axios';
+import useNotify from 'src/composables/useNotify.js';
 
 const $props = defineProps({
     allColumns: {
@@ -24,17 +23,12 @@ const $props = defineProps({
 
 const emit = defineEmits(['onConfigSaved']);
 
+const { notify } = useNotify();
 const state = useState();
 const { t } = useI18n();
 const popupProxyRef = ref(null);
 const user = state.getUser();
 const initialUserConfigViewData = ref(null);
-const userConfigFilter = {
-    where: {
-        tableCode: $props.tableCode,
-        userFk: user.id,
-    },
-};
 
 const formattedCols = ref([]);
 
@@ -43,16 +37,12 @@ const areAllChecksMarked = computed(() => {
 });
 
 const setUserConfigViewData = (data) => {
-    initialUserConfigViewData.value = data;
-    if (data.length === 0) return;
-    formattedCols.value = $props.allColumns.map((col) => {
-        // Importante: El name de las columnas de la tabla debe conincidir con el name de las variables que devuelve la view config
-        const obj = {
-            name: col,
-            active: data[0].configuration[col],
-        };
-        return obj;
-    });
+    if (!data) return;
+    // Importante: El name de las columnas de la tabla debe conincidir con el name de las variables que devuelve la view config
+    formattedCols.value = $props.allColumns.map((col) => ({
+        name: col,
+        active: data[col],
+    }));
     emitSavedConfig();
 };
 
@@ -60,40 +50,101 @@ const toggleMarkAll = (val) => {
     formattedCols.value.forEach((col) => (col.active = val));
 };
 
-const saveConfig = async () => {
+const fetchViewConfigData = async () => {
     try {
-        const data = {
-            id: initialUserConfigViewData.value[0].id,
-            userFk: 9,
-            tableCode: $props.tableCode,
-            configuration: {},
+        const userConfigFilter = {
+            where: {
+                tableCode: $props.tableCode,
+                userFk: user.id,
+            },
         };
 
-        formattedCols.value.forEach((col) => {
-            data.configuration[col.name] = col.active;
+        const userViewConfigResponse = await axios.get('UserConfigViews', {
+            params: { filter: userConfigFilter },
         });
 
-        await axios.patch('UserConfigViews', data);
+        if (userViewConfigResponse.data && userViewConfigResponse.data.length > 0) {
+            initialUserConfigViewData.value = userViewConfigResponse.data[0];
+            setUserConfigViewData(userViewConfigResponse.data[0].configuration);
+            return;
+        }
+
+        const defaultConfigFilter = {
+            where: {
+                tableCode: $props.tableCode,
+            },
+        };
+
+        const defaultViewConfigResponse = await axios.get('DefaultViewConfigs', {
+            params: { filter: defaultConfigFilter },
+        });
+
+        if (defaultViewConfigResponse.data && defaultViewConfigResponse.data.length > 0) {
+            setUserConfigViewData(defaultViewConfigResponse.data[0].columns);
+            return;
+        }
+    } catch (err) {
+        console.err('Error fetching config view data');
+    }
+};
+
+const saveConfig = async () => {
+    try {
+        const params = {};
+        const configuration = {};
+
+        formattedCols.value.forEach((col) => {
+            const { name, active } = col;
+            configuration[name] = active;
+        });
+
+        // Si existe una view config del usuario hacemos un update si no la creamos
+        if (initialUserConfigViewData.value) {
+            params.updates = [
+                {
+                    data: {
+                        configuration: configuration,
+                    },
+                    where: {
+                        id: initialUserConfigViewData.value.id,
+                    },
+                },
+            ];
+        } else {
+            params.creates = [
+                {
+                    userFk: user.value.id,
+                    tableCode: $props.tableCode,
+                    tableConfig: $props.tableCode,
+                    configuration: configuration,
+                },
+            ];
+        }
+
+        const response = await axios.post('UserConfigViews/crud', params);
+        if (response.data && response.data[0]) {
+            initialUserConfigViewData.value = response.data[0];
+        }
         emitSavedConfig();
+        notify('globals.dataSaved', 'positive');
+
         popupProxyRef.value.hide();
     } catch (err) {
         console.error('Error saving user view config');
     }
 };
+
 const emitSavedConfig = () => {
     const filteredCols = formattedCols.value.filter((col) => col.active);
     const mappedCols = filteredCols.map((col) => col.name);
     emit('onConfigSaved', mappedCols);
 };
+
+onMounted(async () => {
+    await fetchViewConfigData();
+});
 </script>
 <template>
-    <fetch-data
-        v-if="user"
-        url="UserConfigViews"
-        :filter="userConfigFilter"
-        @on-fetch="(data) => setUserConfigViewData(data)"
-        auto-load
-    />
     <QBtn color="primary" icon="view_column">
         <QPopupProxy ref="popupProxyRef">
             <QCard class="column q-pa-md">
@@ -108,7 +159,7 @@ const emitSavedConfig = () => {
                     class="q-mb-sm"
                 />
                 <div
-                    v-if="allColumns.length !== 0 && formattedCols.length !== 0"
+                    v-if="allColumns.length > 0 && formattedCols.length > 0"
                     class="checks-layout"
                 >
                     <QCheckbox
diff --git a/src/components/common/VnInput.vue b/src/components/common/VnInput.vue
index e3040a698..bfd0dea40 100644
--- a/src/components/common/VnInput.vue
+++ b/src/components/common/VnInput.vue
@@ -12,6 +12,14 @@ const $props = defineProps({
         type: Boolean,
         default: false,
     },
+    label: {
+        type: String,
+        default: '',
+    },
+    required: {
+        type: Boolean,
+        default: false,
+    },
 });
 
 const value = computed({
@@ -39,6 +47,7 @@ const styleAttrs = computed(() => {
         ref="vnInputRef"
         v-model="value"
         v-bind="{ ...$attrs, ...styleAttrs }"
+        :label="required ? label + ' *' : label"
         type="text"
     >
         <template v-if="$slots.prepend" #prepend>
diff --git a/src/components/common/VnSelectCreate.vue b/src/components/common/VnSelectCreate.vue
index 0b5694ec5..54d36ceaa 100644
--- a/src/components/common/VnSelectCreate.vue
+++ b/src/components/common/VnSelectCreate.vue
@@ -20,6 +20,14 @@ const $props = defineProps({
         type: Array,
         default: () => ['developer'],
     },
+    label: {
+        type: String,
+        default: '',
+    },
+    required: {
+        type: Boolean,
+        default: false,
+    },
 });
 
 const role = useRole();
@@ -44,7 +52,13 @@ const toggleForm = () => {
 </script>
 
 <template>
-    <VnSelectFilter v-model="value" :options="options" v-bind="$attrs">
+    <VnSelectFilter
+        v-model="value"
+        :options="options"
+        :label="label"
+        :required="required"
+        v-bind="$attrs"
+    >
         <template v-if="isAllowedToCreate" #append>
             <QIcon
                 @click.stop.prevent="toggleForm()"
diff --git a/src/components/common/VnSelectFilter.vue b/src/components/common/VnSelectFilter.vue
index a0605bbae..759706d11 100644
--- a/src/components/common/VnSelectFilter.vue
+++ b/src/components/common/VnSelectFilter.vue
@@ -23,6 +23,14 @@ const $props = defineProps({
         type: Boolean,
         default: true,
     },
+    label: {
+        type: String,
+        default: '',
+    },
+    required: {
+        type: Boolean,
+        default: false,
+    },
 });
 
 const { optionLabel } = toRefs($props);
@@ -87,6 +95,7 @@ const value = computed({
         hide-selected
         fill-input
         ref="vnSelectRef"
+        :label="required ? label + ' *' : label"
     >
         <template v-if="isClearable" #append>
             <QIcon
diff --git a/src/components/ui/VnTree.vue b/src/components/ui/VnTree.vue
index 637b18256..948a0a8e2 100644
--- a/src/components/ui/VnTree.vue
+++ b/src/components/ui/VnTree.vue
@@ -53,6 +53,7 @@ const fetchNodeLeaves = async (nodeKey) => {
 };
 
 const removeNode = (node) => {
+    const { id, parentFk } = node;
     quasar
         .dialog({
             title: t('Are you sure you want to delete it?'),
@@ -65,9 +66,9 @@ const removeNode = (node) => {
         })
         .onOk(async () => {
             try {
-                await axios.post(`/Departments/${node.id}/removeChild`, node.id);
-                notify('department.departmentRemoved', 'positive');
-                await fetchNodeLeaves(node.parentFk);
+                await axios.post(`/Departments/${id}/removeChild`, id);
+                notify(t('department.departmentRemoved'), 'positive');
+                await fetchNodeLeaves(parentFk);
             } catch (err) {
                 console.log('Error removing department');
             }
@@ -85,7 +86,7 @@ const onNodeCreated = async () => {
 
 const redirectToDepartmentSummary = (id) => {
     if (!id) return;
-    router.push({ name: 'DepartmentSummary', params: { id: id } });
+    router.push({ name: 'DepartmentSummary', params: { id } });
 };
 </script>
 
diff --git a/src/filters/dateRange.js b/src/filters/dateRange.js
new file mode 100644
index 000000000..4c0cfe654
--- /dev/null
+++ b/src/filters/dateRange.js
@@ -0,0 +1,8 @@
+export default function dateRange(value) {
+    const minHour = new Date(value);
+    minHour.setHours(0, 0, 0, 0);
+    const maxHour = new Date(value);
+    maxHour.setHours(23, 59, 59, 59);
+
+    return [minHour, maxHour];
+}
diff --git a/src/filters/index.js b/src/filters/index.js
index b0c441641..f0120e663 100644
--- a/src/filters/index.js
+++ b/src/filters/index.js
@@ -7,6 +7,7 @@ import toCurrency from './toCurrency';
 import toPercentage from './toPercentage';
 import toLowerCamel from './toLowerCamel';
 import dashIfEmpty from './dashIfEmpty';
+import dateRange from './dateRange';
 
 export {
     toLowerCase,
@@ -18,4 +19,5 @@ export {
     toCurrency,
     toPercentage,
     dashIfEmpty,
+    dateRange,
 };
diff --git a/src/pages/Customer/ExtendedList/CustomerExtendedListFilter.vue b/src/pages/Customer/ExtendedList/CustomerExtendedListFilter.vue
index a4d26a78a..46b4e1e7b 100644
--- a/src/pages/Customer/ExtendedList/CustomerExtendedListFilter.vue
+++ b/src/pages/Customer/ExtendedList/CustomerExtendedListFilter.vue
@@ -7,6 +7,7 @@ import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
 import VnSelectFilter from 'components/common/VnSelectFilter.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import VnInputDate from 'components/common/VnInputDate.vue';
+import { dateRange } from 'src/filters';
 
 const props = defineProps({
     dataKey: {
@@ -32,6 +33,48 @@ const sageTransactionTypesOptions = ref([]);
 
 const visibleColumnsSet = computed(() => new Set(props.visibleColumns));
 
+const exprBuilder = (param, value) => {
+    switch (param) {
+        case 'created':
+            return {
+                'c.created': {
+                    between: dateRange(value),
+                },
+            };
+        case 'id':
+        case 'name':
+        case 'socialName':
+        case 'fi':
+        case 'credit':
+        case 'creditInsurance':
+        case 'phone':
+        case 'mobile':
+        case 'street':
+        case 'city':
+        case 'postcode':
+        case 'email':
+        case 'isActive':
+        case 'isVies':
+        case 'isTaxDataChecked':
+        case 'isEqualizated':
+        case 'isFreezed':
+        case 'hasToInvoice':
+        case 'hasToInvoiceByAddress':
+        case 'isToBeMailed':
+        case 'hasSepaVnl':
+        case 'hasLcr':
+        case 'hasCoreVnl':
+        case 'countryFk':
+        case 'provinceFk':
+        case 'salesPersonFk':
+        case 'businessTypeFk':
+        case 'payMethodFk':
+        case 'sageTaxTypeFk':
+        case 'sageTransactionTypeFk':
+            return { [`c.${param}`]: value };
+    }
+};
+
 const shouldRenderColumn = (colName) => {
     return visibleColumnsSet.value.has(colName);
 };
@@ -88,7 +131,11 @@ const shouldRenderColumn = (colName) => {
         auto-load
         @on-fetch="(data) => (sageTransactionTypesOptions = data)"
     />
-    <VnFilterPanel :data-key="props.dataKey" :search-button="true">
+    <VnFilterPanel
+        :data-key="props.dataKey"
+        :search-button="true"
+        :expr-builder="exprBuilder"
+    >
         <template #tags="{ tag, formatFn }">
             <div class="q-gutter-x-xs">
                 <strong
@@ -565,12 +612,6 @@ const shouldRenderColumn = (colName) => {
 </style>
 
 <i18n>
-<<<<<<< HEAD:src/pages/Customer/ExtendedList/CustomerExtendedListFilter.vue
 es:
-    Identifier: Identificador
-=======
-
-es:
->>>>>>> dev:src/pages/Customer/CustomerExtendedListFilter.vue
     Social name: Razón social
 </i18n>
diff --git a/src/pages/Entry/EntryCreate.vue b/src/pages/Entry/EntryCreate.vue
index 30b54cb38..fc725447c 100644
--- a/src/pages/Entry/EntryCreate.vue
+++ b/src/pages/Entry/EntryCreate.vue
@@ -60,13 +60,14 @@ const companiesOptions = ref([]);
             <template #form="{ data, validate }">
                 <VnRow class="row q-gutter-md q-mb-md">
                     <VnSelectFilter
-                        :label="t('Supplier *')"
+                        :label="t('Supplier')"
                         class="full-width"
                         v-model="data.supplierFk"
                         :options="suppliersOptions"
                         option-value="id"
                         option-label="nickname"
                         hide-selected
+                        required
                         :rules="validate('entry.supplierFk')"
                     >
                         <template #option="scope">
@@ -83,7 +84,7 @@ const companiesOptions = ref([]);
                 </VnRow>
                 <VnRow class="row q-gutter-md q-mb-md">
                     <VnSelectFilter
-                        :label="t('Travel *')"
+                        :label="t('Travel')"
                         class="full-width"
                         v-model="data.travelFk"
                         :options="travelsOptionsOptions"
@@ -91,6 +92,7 @@ const companiesOptions = ref([]);
                         option-label="warehouseInName"
                         map-options
                         hide-selected
+                        required
                         :rules="validate('entry.travelFk')"
                     >
                         <template #option="scope">
@@ -111,7 +113,7 @@ const companiesOptions = ref([]);
                 </VnRow>
                 <VnRow class="row q-gutter-md q-mb-md">
                     <VnSelectFilter
-                        :label="t('Company *')"
+                        :label="t('Company')"
                         class="full-width"
                         v-model="data.companyFk"
                         :options="companiesOptions"
@@ -129,7 +131,7 @@ const companiesOptions = ref([]);
 
 <i18n>
     es:
-        Supplier *: Proveedor *
-        Travel *: Envío *
-        Company *: Empresa *
+        Supplier: Proveedor
+        Travel: Envío
+        Company: Empresa
     </i18n>

From cfac9acbe8bef3edfbeb06570423c57ee2b1082e Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Thu, 4 Jan 2024 09:58:37 -0300
Subject: [PATCH 30/36] Small corrections

---
 src/components/common/TableVisibleColumns.vue |  7 +++++++
 src/components/ui/VnTree.vue                  | 12 ++++++------
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/components/common/TableVisibleColumns.vue b/src/components/common/TableVisibleColumns.vue
index e0b8ad86f..7defdb0de 100644
--- a/src/components/common/TableVisibleColumns.vue
+++ b/src/components/common/TableVisibleColumns.vue
@@ -174,6 +174,7 @@ onMounted(async () => {
                 }}</QBtn>
             </QCard>
         </QPopupProxy>
+        <QTooltip>{{ t('Visible columns') }}</QTooltip>
     </QBtn>
 </template>
 
@@ -189,3 +190,9 @@ onMounted(async () => {
     grid-template-columns: repeat(3, 200px);
 }
 </style>
+
+<i18n>
+    es:
+        Check the columns you want to see: Marca las columnas que quieres ver
+        Visible columns: Columnas visibles
+</i18n>
diff --git a/src/components/ui/VnTree.vue b/src/components/ui/VnTree.vue
index 948a0a8e2..c382ef9f2 100644
--- a/src/components/ui/VnTree.vue
+++ b/src/components/ui/VnTree.vue
@@ -100,22 +100,22 @@ const redirectToDepartmentSummary = (id) => {
             v-model:expanded="expanded"
             @update:expanded="onNodeExpanded($event)"
         >
-            <template #default-header="prop">
+            <template #default-header="{ node }">
                 <div
                     class="row justify-between full-width q-pr-md cursor-pointer"
-                    @click.stop="redirectToDepartmentSummary(prop.node.id)"
+                    @click.stop="redirectToDepartmentSummary(node.id)"
                 >
                     <span class="text-uppercase">
-                        {{ prop.node.name }}
+                        {{ node.name }}
                     </span>
                     <div class="row justify-between" style="max-width: max-content">
                         <QIcon
-                            v-if="prop.node.id"
+                            v-if="node.id"
                             name="delete"
                             color="primary"
                             size="sm"
                             class="q-pr-xs cursor-pointer"
-                            @click.stop="removeNode(prop.node)"
+                            @click.stop="removeNode(node)"
                         >
                             <QTooltip>
                                 {{ t('Remove') }}
@@ -126,7 +126,7 @@ const redirectToDepartmentSummary = (id) => {
                             color="primary"
                             size="sm"
                             class="cursor-pointer"
-                            @click.stop="showCreateNodeForm(prop.node.id)"
+                            @click.stop="showCreateNodeForm(node.id)"
                         >
                             <QTooltip>
                                 {{ t('Create') }}

From 64777bb80467fcf7f117f6b718a4ca2153e6d1c7 Mon Sep 17 00:00:00 2001
From: carlosfonseca <carlos.fonseca@mindshore.io>
Date: Thu, 4 Jan 2024 10:23:55 -0500
Subject: [PATCH 31/36] Se hacen correcciones en base a comentarios en el PR

---
 .../Customer/Defaulter/CustomerDefaulter.vue  | 23 ++++++++-----------
 1 file changed, 9 insertions(+), 14 deletions(-)

diff --git a/src/pages/Customer/Defaulter/CustomerDefaulter.vue b/src/pages/Customer/Defaulter/CustomerDefaulter.vue
index 0331acfc0..b9c863e56 100644
--- a/src/pages/Customer/Defaulter/CustomerDefaulter.vue
+++ b/src/pages/Customer/Defaulter/CustomerDefaulter.vue
@@ -38,14 +38,14 @@ onBeforeMount(async () => {
 const rows = computed(() => arrayData.value.store.data);
 
 const selected = ref([]);
-const worderId = ref(0);
+const workerId = ref(0);
 const customerId = ref(0);
 
 const tableColumnComponents = {
     client: {
         component: QBtn,
         props: () => ({ flat: true, color: 'blue' }),
-        event: (prop) => selectClientId(prop.row.clientFk),
+        event: ({ row }) => selectCustomerId(row.clientFk),
     },
     isWorker: {
         component: QCheckbox,
@@ -58,7 +58,7 @@ const tableColumnComponents = {
     salesperson: {
         component: QBtn,
         props: () => ({ flat: true, color: 'blue' }),
-        event: (prop) => selectSalespersonId(prop.row.salesPersonFk),
+        event: ({ row }) => selectWorkerId(row.salesPersonFk),
     },
     country: {
         component: 'span',
@@ -78,7 +78,7 @@ const tableColumnComponents = {
     author: {
         component: QBtn,
         props: () => ({ flat: true, color: 'blue' }),
-        event: (prop) => selectAuthorId(prop.row.workerFk),
+        event: ({ row }) => selectWorkerId(row.workerFk),
     },
     lastObservation: {
         component: 'span',
@@ -173,19 +173,14 @@ const columns = computed(() => {
     ];
 });
 
-const selectClientId = (id) => {
-    worderId.value = 0;
+const selectCustomerId = (id) => {
+    workerId.value = 0;
     customerId.value = id;
 };
 
-const selectSalespersonId = (id) => {
+const selectWorkerId = (id) => {
     customerId.value = 0;
-    worderId.value = id;
-};
-
-const selectAuthorId = (id) => {
-    customerId.value = 0;
-    worderId.value = id;
+    workerId.value = id;
 };
 </script>
 
@@ -226,7 +221,7 @@ const selectAuthorId = (id) => {
                         >
                             {{ props.value }}
 
-                            <WorkerDescriptorProxy v-if="worderId" :id="worderId" />
+                            <WorkerDescriptorProxy v-if="workerId" :id="workerId" />
                             <CustomerDescriptorProxy v-else :id="customerId" />
                         </component>
                     </QTr>

From 6b3bed008537ac531f6fe3fb267f2c8f3c4b8d47 Mon Sep 17 00:00:00 2001
From: carlosfonseca <carlos.fonseca@mindshore.io>
Date: Thu, 4 Jan 2024 11:37:46 -0500
Subject: [PATCH 32/36] Mejoras en las correcciones de codigo

---
 .../Customer/Defaulter/CustomerBalanceDueTotal.vue  | 13 +++++--------
 src/pages/Customer/Defaulter/CustomerDefaulter.vue  | 12 ++++++------
 2 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/src/pages/Customer/Defaulter/CustomerBalanceDueTotal.vue b/src/pages/Customer/Defaulter/CustomerBalanceDueTotal.vue
index c2bfbc2f5..c4a50a10f 100644
--- a/src/pages/Customer/Defaulter/CustomerBalanceDueTotal.vue
+++ b/src/pages/Customer/Defaulter/CustomerBalanceDueTotal.vue
@@ -14,8 +14,8 @@ const { t } = useI18n();
 </script>
 
 <template>
-    <div class="card_balance">
-        <h6 class="title_balance">{{ t('Total') }}</h6>
+    <div class="card_balance q-px-md q-py-sm q-my-sm">
+        <h6 class="title_balance text-center">{{ t('Total') }}</h6>
         <div class="row">
             <p class="key_balance">{{ t('Balance due') }}:&ensp;</p>
             <b class="value_balance">
@@ -28,21 +28,18 @@ const { t } = useI18n();
 <style lang="scss">
 .card_balance {
     border: 1px solid black;
-    margin: 7px;
-    padding: 5px 7px;
 }
 .title_balance {
-    color: white;
+    color: var(--vn-text);
     margin-top: 0;
     margin-bottom: 0;
-    text-align: center;
 }
 .key_balance {
-    color: grey;
+    color: var(--vn-label);
     margin-bottom: 0;
 }
 .value_balance {
-    color: white;
+    color: var(--vn-text);
     margin-bottom: 0;
 }
 </style>
diff --git a/src/pages/Customer/Defaulter/CustomerDefaulter.vue b/src/pages/Customer/Defaulter/CustomerDefaulter.vue
index b9c863e56..e2e14427e 100644
--- a/src/pages/Customer/Defaulter/CustomerDefaulter.vue
+++ b/src/pages/Customer/Defaulter/CustomerDefaulter.vue
@@ -49,9 +49,9 @@ const tableColumnComponents = {
     },
     isWorker: {
         component: QCheckbox,
-        props: (prop) => ({
+        props: ({ value }) => ({
             disable: true,
-            'model-value': Boolean(prop.value),
+            'model-value': Boolean(value),
         }),
         event: () => {},
     },
@@ -136,7 +136,7 @@ const columns = computed(() => {
         },
         {
             align: 'left',
-            field: (row) => toCurrency(row.amount),
+            field: ({ amount }) => toCurrency(amount),
             label: t('Balance D.'),
             name: 'balance',
         },
@@ -154,19 +154,19 @@ const columns = computed(() => {
         },
         {
             align: 'left',
-            field: (row) => toDate(row.created),
+            field: ({ created }) => toDate(created),
             label: t('L. O. Date'),
             name: 'date',
         },
         {
             align: 'left',
-            field: (row) => toCurrency(row.creditInsurance),
+            field: ({ creditInsurance }) => toCurrency(creditInsurance),
             label: t('Credit I.'),
             name: 'credit',
         },
         {
             align: 'left',
-            field: (row) => toDate(row.defaulterSinced),
+            field: ({ defaulterSinced }) => toDate(defaulterSinced),
             label: t('From'),
             name: 'from',
         },

From bd8acbe0842df7a478a28d267663c18d36b598ae Mon Sep 17 00:00:00 2001
From: carlosfonseca <carlos.fonseca@mindshore.io>
Date: Thu, 4 Jan 2024 13:12:58 -0500
Subject: [PATCH 33/36] Correcciones solicitadas

---
 .../Customer/Defaulter/CustomerDefaulter.vue  | 138 +++---
 .../ExtendedList/CustomerExtendedList.vue     | 416 +++++++++---------
 .../Notifications/CustomerNotifications.vue   |  66 ++-
 src/pages/InvoiceOut/InvoiceOutGlobal.vue     |  46 +-
 src/pages/Travel/ExtraCommunity.vue           | 208 +++++----
 5 files changed, 432 insertions(+), 442 deletions(-)

diff --git a/src/pages/Customer/Defaulter/CustomerDefaulter.vue b/src/pages/Customer/Defaulter/CustomerDefaulter.vue
index e2e14427e..d54d5df35 100644
--- a/src/pages/Customer/Defaulter/CustomerDefaulter.vue
+++ b/src/pages/Customer/Defaulter/CustomerDefaulter.vue
@@ -102,76 +102,74 @@ const tableColumnComponents = {
     },
 };
 
-const columns = computed(() => {
-    return [
-        {
-            align: 'left',
-            field: 'clientName',
-            label: t('Client'),
-            name: 'client',
-        },
-        {
-            align: 'left',
-            field: 'isWorker',
-            label: t('Is worker'),
-            name: 'isWorker',
-        },
-        {
-            align: 'left',
-            field: 'salesPersonName',
-            label: t('Salesperson'),
-            name: 'salesperson',
-        },
-        {
-            align: 'left',
-            field: 'country',
-            label: t('Country'),
-            name: 'country',
-        },
-        {
-            align: 'left',
-            field: 'payMethod',
-            label: t('P. Method'),
-            name: 'paymentMethod',
-        },
-        {
-            align: 'left',
-            field: ({ amount }) => toCurrency(amount),
-            label: t('Balance D.'),
-            name: 'balance',
-        },
-        {
-            align: 'left',
-            field: 'workerName',
-            label: t('Author'),
-            name: 'author',
-        },
-        {
-            align: 'left',
-            field: 'observation',
-            label: t('Last observation'),
-            name: 'lastObservation',
-        },
-        {
-            align: 'left',
-            field: ({ created }) => toDate(created),
-            label: t('L. O. Date'),
-            name: 'date',
-        },
-        {
-            align: 'left',
-            field: ({ creditInsurance }) => toCurrency(creditInsurance),
-            label: t('Credit I.'),
-            name: 'credit',
-        },
-        {
-            align: 'left',
-            field: ({ defaulterSinced }) => toDate(defaulterSinced),
-            label: t('From'),
-            name: 'from',
-        },
-    ];
-});
+const columns = computed(() => [
+    {
+        align: 'left',
+        field: 'clientName',
+        label: t('Client'),
+        name: 'client',
+    },
+    {
+        align: 'left',
+        field: 'isWorker',
+        label: t('Is worker'),
+        name: 'isWorker',
+    },
+    {
+        align: 'left',
+        field: 'salesPersonName',
+        label: t('Salesperson'),
+        name: 'salesperson',
+    },
+    {
+        align: 'left',
+        field: 'country',
+        label: t('Country'),
+        name: 'country',
+    },
+    {
+        align: 'left',
+        field: 'payMethod',
+        label: t('P. Method'),
+        name: 'paymentMethod',
+    },
+    {
+        align: 'left',
+        field: ({ amount }) => toCurrency(amount),
+        label: t('Balance D.'),
+        name: 'balance',
+    },
+    {
+        align: 'left',
+        field: 'workerName',
+        label: t('Author'),
+        name: 'author',
+    },
+    {
+        align: 'left',
+        field: 'observation',
+        label: t('Last observation'),
+        name: 'lastObservation',
+    },
+    {
+        align: 'left',
+        field: ({ created }) => toDate(created),
+        label: t('L. O. Date'),
+        name: 'date',
+    },
+    {
+        align: 'left',
+        field: ({ creditInsurance }) => toCurrency(creditInsurance),
+        label: t('Credit I.'),
+        name: 'credit',
+    },
+    {
+        align: 'left',
+        field: ({ defaulterSinced }) => toDate(defaulterSinced),
+        label: t('From'),
+        name: 'from',
+    },
+]);
 
 const selectCustomerId = (id) => {
     workerId.value = 0;
diff --git a/src/pages/Customer/ExtendedList/CustomerExtendedList.vue b/src/pages/Customer/ExtendedList/CustomerExtendedList.vue
index a1aa47791..caee06d60 100644
--- a/src/pages/Customer/ExtendedList/CustomerExtendedList.vue
+++ b/src/pages/Customer/ExtendedList/CustomerExtendedList.vue
@@ -262,215 +262,213 @@ const tableColumnComponents = {
     },
 };
 
-const columns = computed(() => {
-    return [
-        {
-            align: 'left',
-            field: '',
-            label: '',
-            name: 'customerStatus',
-            format: () => ' ',
-        },
-        {
-            align: 'left',
-            field: 'id',
-            label: t('customer.extendedList.tableVisibleColumns.id'),
-            name: 'id',
-        },
-        {
-            align: 'left',
-            field: 'name',
-            label: t('customer.extendedList.tableVisibleColumns.name'),
-            name: 'name',
-        },
-        {
-            align: 'left',
-            field: 'fi',
-            label: t('customer.extendedList.tableVisibleColumns.fi'),
-            name: 'fi',
-        },
-        {
-            align: 'left',
-            field: 'salesPerson',
-            label: t('customer.extendedList.tableVisibleColumns.salesPersonFk'),
-            name: 'salesPersonFk',
-        },
-        {
-            align: 'left',
-            field: 'credit',
-            label: t('customer.extendedList.tableVisibleColumns.credit'),
-            name: 'credit',
-        },
-        {
-            align: 'left',
-            field: 'creditInsurance',
-            label: t('customer.extendedList.tableVisibleColumns.creditInsurance'),
-            name: 'creditInsurance',
-        },
-        {
-            align: 'left',
-            field: 'phone',
-            label: t('customer.extendedList.tableVisibleColumns.phone'),
-            name: 'phone',
-        },
-        {
-            align: 'left',
-            field: 'mobile',
-            label: t('customer.extendedList.tableVisibleColumns.mobile'),
-            name: 'mobile',
-        },
-        {
-            align: 'left',
-            field: 'street',
-            label: t('customer.extendedList.tableVisibleColumns.street'),
-            name: 'street',
-        },
-        {
-            align: 'left',
-            field: 'country',
-            label: t('customer.extendedList.tableVisibleColumns.countryFk'),
-            name: 'countryFk',
-        },
-        {
-            align: 'left',
-            field: 'province',
-            label: t('customer.extendedList.tableVisibleColumns.provinceFk'),
-            name: 'provinceFk',
-        },
-        {
-            align: 'left',
-            field: 'city',
-            label: t('customer.extendedList.tableVisibleColumns.city'),
-            name: 'city',
-        },
-        {
-            align: 'left',
-            field: 'postcode',
-            label: t('customer.extendedList.tableVisibleColumns.postcode'),
-            name: 'postcode',
-        },
-        {
-            align: 'left',
-            field: 'email',
-            label: t('customer.extendedList.tableVisibleColumns.email'),
-            name: 'email',
-        },
-        {
-            align: 'left',
-            field: 'created',
-            label: t('customer.extendedList.tableVisibleColumns.created'),
-            name: 'created',
-            format: (value) => toDate(value),
-        },
-        {
-            align: 'left',
-            field: 'businessType',
-            label: t('customer.extendedList.tableVisibleColumns.businessTypeFk'),
-            name: 'businessTypeFk',
-        },
-        {
-            align: 'left',
-            field: 'payMethod',
-            label: t('customer.extendedList.tableVisibleColumns.payMethodFk'),
-            name: 'payMethodFk',
-        },
-        {
-            align: 'left',
-            field: 'sageTaxType',
-            label: t('customer.extendedList.tableVisibleColumns.sageTaxTypeFk'),
-            name: 'sageTaxTypeFk',
-        },
-        {
-            align: 'left',
-            field: 'sageTransactionType',
-            label: t('customer.extendedList.tableVisibleColumns.sageTransactionTypeFk'),
-            name: 'sageTransactionTypeFk',
-        },
-        {
-            align: 'left',
-            field: 'isActive',
-            label: t('customer.extendedList.tableVisibleColumns.isActive'),
-            name: 'isActive',
-            format: () => ' ',
-        },
-        {
-            align: 'left',
-            field: 'isVies',
-            label: t('customer.extendedList.tableVisibleColumns.isVies'),
-            name: 'isVies',
-            format: () => ' ',
-        },
-        {
-            align: 'left',
-            field: 'isTaxDataChecked',
-            label: t('customer.extendedList.tableVisibleColumns.isTaxDataChecked'),
-            name: 'isTaxDataChecked',
-            format: () => ' ',
-        },
-        {
-            align: 'left',
-            field: 'isEqualizated',
-            label: t('customer.extendedList.tableVisibleColumns.isEqualizated'),
-            name: 'isEqualizated',
-            format: () => ' ',
-        },
-        {
-            align: 'left',
-            field: 'isFreezed',
-            label: t('customer.extendedList.tableVisibleColumns.isFreezed'),
-            name: 'isFreezed',
-            format: () => ' ',
-        },
-        {
-            align: 'left',
-            field: 'hasToInvoice',
-            label: t('customer.extendedList.tableVisibleColumns.hasToInvoice'),
-            name: 'hasToInvoice',
-            format: () => ' ',
-        },
-        {
-            align: 'left',
-            field: 'hasToInvoiceByAddress',
-            label: t('customer.extendedList.tableVisibleColumns.hasToInvoiceByAddress'),
-            name: 'hasToInvoiceByAddress',
-            format: () => ' ',
-        },
-        {
-            align: 'left',
-            field: 'isToBeMailed',
-            label: t('customer.extendedList.tableVisibleColumns.isToBeMailed'),
-            name: 'isToBeMailed',
-            format: () => ' ',
-        },
-        {
-            align: 'left',
-            field: 'hasLcr',
-            label: t('customer.extendedList.tableVisibleColumns.hasLcr'),
-            name: 'hasLcr',
-            format: () => ' ',
-        },
-        {
-            align: 'left',
-            field: 'hasCoreVnl',
-            label: t('customer.extendedList.tableVisibleColumns.hasCoreVnl'),
-            name: 'hasCoreVnl',
-            format: () => ' ',
-        },
-        {
-            align: 'left',
-            field: 'hasSepaVnl',
-            label: t('customer.extendedList.tableVisibleColumns.hasSepaVnl'),
-            name: 'hasSepaVnl',
-            format: () => ' ',
-        },
-        {
-            align: 'right',
-            field: 'actions',
-            label: '',
-            name: 'actions',
-        },
-    ];
-});
+const columns = computed(() => [
+    {
+        align: 'left',
+        field: '',
+        label: '',
+        name: 'customerStatus',
+        format: () => ' ',
+    },
+    {
+        align: 'left',
+        field: 'id',
+        label: t('customer.extendedList.tableVisibleColumns.id'),
+        name: 'id',
+    },
+    {
+        align: 'left',
+        field: 'name',
+        label: t('customer.extendedList.tableVisibleColumns.name'),
+        name: 'name',
+    },
+    {
+        align: 'left',
+        field: 'fi',
+        label: t('customer.extendedList.tableVisibleColumns.fi'),
+        name: 'fi',
+    },
+    {
+        align: 'left',
+        field: 'salesPerson',
+        label: t('customer.extendedList.tableVisibleColumns.salesPersonFk'),
+        name: 'salesPersonFk',
+    },
+    {
+        align: 'left',
+        field: 'credit',
+        label: t('customer.extendedList.tableVisibleColumns.credit'),
+        name: 'credit',
+    },
+    {
+        align: 'left',
+        field: 'creditInsurance',
+        label: t('customer.extendedList.tableVisibleColumns.creditInsurance'),
+        name: 'creditInsurance',
+    },
+    {
+        align: 'left',
+        field: 'phone',
+        label: t('customer.extendedList.tableVisibleColumns.phone'),
+        name: 'phone',
+    },
+    {
+        align: 'left',
+        field: 'mobile',
+        label: t('customer.extendedList.tableVisibleColumns.mobile'),
+        name: 'mobile',
+    },
+    {
+        align: 'left',
+        field: 'street',
+        label: t('customer.extendedList.tableVisibleColumns.street'),
+        name: 'street',
+    },
+    {
+        align: 'left',
+        field: 'country',
+        label: t('customer.extendedList.tableVisibleColumns.countryFk'),
+        name: 'countryFk',
+    },
+    {
+        align: 'left',
+        field: 'province',
+        label: t('customer.extendedList.tableVisibleColumns.provinceFk'),
+        name: 'provinceFk',
+    },
+    {
+        align: 'left',
+        field: 'city',
+        label: t('customer.extendedList.tableVisibleColumns.city'),
+        name: 'city',
+    },
+    {
+        align: 'left',
+        field: 'postcode',
+        label: t('customer.extendedList.tableVisibleColumns.postcode'),
+        name: 'postcode',
+    },
+    {
+        align: 'left',
+        field: 'email',
+        label: t('customer.extendedList.tableVisibleColumns.email'),
+        name: 'email',
+    },
+    {
+        align: 'left',
+        field: 'created',
+        label: t('customer.extendedList.tableVisibleColumns.created'),
+        name: 'created',
+        format: (value) => toDate(value),
+    },
+    {
+        align: 'left',
+        field: 'businessType',
+        label: t('customer.extendedList.tableVisibleColumns.businessTypeFk'),
+        name: 'businessTypeFk',
+    },
+    {
+        align: 'left',
+        field: 'payMethod',
+        label: t('customer.extendedList.tableVisibleColumns.payMethodFk'),
+        name: 'payMethodFk',
+    },
+    {
+        align: 'left',
+        field: 'sageTaxType',
+        label: t('customer.extendedList.tableVisibleColumns.sageTaxTypeFk'),
+        name: 'sageTaxTypeFk',
+    },
+    {
+        align: 'left',
+        field: 'sageTransactionType',
+        label: t('customer.extendedList.tableVisibleColumns.sageTransactionTypeFk'),
+        name: 'sageTransactionTypeFk',
+    },
+    {
+        align: 'left',
+        field: 'isActive',
+        label: t('customer.extendedList.tableVisibleColumns.isActive'),
+        name: 'isActive',
+        format: () => ' ',
+    },
+    {
+        align: 'left',
+        field: 'isVies',
+        label: t('customer.extendedList.tableVisibleColumns.isVies'),
+        name: 'isVies',
+        format: () => ' ',
+    },
+    {
+        align: 'left',
+        field: 'isTaxDataChecked',
+        label: t('customer.extendedList.tableVisibleColumns.isTaxDataChecked'),
+        name: 'isTaxDataChecked',
+        format: () => ' ',
+    },
+    {
+        align: 'left',
+        field: 'isEqualizated',
+        label: t('customer.extendedList.tableVisibleColumns.isEqualizated'),
+        name: 'isEqualizated',
+        format: () => ' ',
+    },
+    {
+        align: 'left',
+        field: 'isFreezed',
+        label: t('customer.extendedList.tableVisibleColumns.isFreezed'),
+        name: 'isFreezed',
+        format: () => ' ',
+    },
+    {
+        align: 'left',
+        field: 'hasToInvoice',
+        label: t('customer.extendedList.tableVisibleColumns.hasToInvoice'),
+        name: 'hasToInvoice',
+        format: () => ' ',
+    },
+    {
+        align: 'left',
+        field: 'hasToInvoiceByAddress',
+        label: t('customer.extendedList.tableVisibleColumns.hasToInvoiceByAddress'),
+        name: 'hasToInvoiceByAddress',
+        format: () => ' ',
+    },
+    {
+        align: 'left',
+        field: 'isToBeMailed',
+        label: t('customer.extendedList.tableVisibleColumns.isToBeMailed'),
+        name: 'isToBeMailed',
+        format: () => ' ',
+    },
+    {
+        align: 'left',
+        field: 'hasLcr',
+        label: t('customer.extendedList.tableVisibleColumns.hasLcr'),
+        name: 'hasLcr',
+        format: () => ' ',
+    },
+    {
+        align: 'left',
+        field: 'hasCoreVnl',
+        label: t('customer.extendedList.tableVisibleColumns.hasCoreVnl'),
+        name: 'hasCoreVnl',
+        format: () => ' ',
+    },
+    {
+        align: 'left',
+        field: 'hasSepaVnl',
+        label: t('customer.extendedList.tableVisibleColumns.hasSepaVnl'),
+        name: 'hasSepaVnl',
+        format: () => ' ',
+    },
+    {
+        align: 'right',
+        field: 'actions',
+        label: '',
+        name: 'actions',
+    },
+]);
 
 const stopEventPropagation = (event, col) => {
     if (!['id', 'salesPersonFk'].includes(col.name)) return;
diff --git a/src/pages/Customer/Notifications/CustomerNotifications.vue b/src/pages/Customer/Notifications/CustomerNotifications.vue
index d93de1c2d..df128cce7 100644
--- a/src/pages/Customer/Notifications/CustomerNotifications.vue
+++ b/src/pages/Customer/Notifications/CustomerNotifications.vue
@@ -57,40 +57,38 @@ const tableColumnComponents = {
     },
 };
 
-const columns = computed(() => {
-    return [
-        {
-            align: 'left',
-            field: 'id',
-            label: t('Identifier'),
-            name: 'id',
-        },
-        {
-            align: 'left',
-            field: 'socialName',
-            label: t('Social name'),
-            name: 'socialName',
-        },
-        {
-            align: 'left',
-            field: 'city',
-            label: t('City'),
-            name: 'city',
-        },
-        {
-            align: 'left',
-            field: 'phone',
-            label: t('Phone'),
-            name: 'phone',
-        },
-        {
-            align: 'left',
-            field: 'email',
-            label: t('Email'),
-            name: 'email',
-        },
-    ];
-});
+const columns = computed(() => [
+    {
+        align: 'left',
+        field: 'id',
+        label: t('Identifier'),
+        name: 'id',
+    },
+    {
+        align: 'left',
+        field: 'socialName',
+        label: t('Social name'),
+        name: 'socialName',
+    },
+    {
+        align: 'left',
+        field: 'city',
+        label: t('City'),
+        name: 'city',
+    },
+    {
+        align: 'left',
+        field: 'phone',
+        label: t('Phone'),
+        name: 'phone',
+    },
+    {
+        align: 'left',
+        field: 'email',
+        label: t('Email'),
+        name: 'email',
+    },
+]);
 
 const selectCustomerId = (id) => {
     selectedCustomerId.value = id;
diff --git a/src/pages/InvoiceOut/InvoiceOutGlobal.vue b/src/pages/InvoiceOut/InvoiceOutGlobal.vue
index ea1978702..7e2b43a76 100644
--- a/src/pages/InvoiceOut/InvoiceOutGlobal.vue
+++ b/src/pages/InvoiceOut/InvoiceOutGlobal.vue
@@ -49,30 +49,28 @@ const tableColumnComponents = {
     },
 };
 
-const columns = computed(() => {
-    return [
-        { label: 'Id', field: 'clientId', name: 'clientId', align: 'left' },
-        {
-            label: t('invoiceOut.globalInvoices.table.client'),
-            field: 'clientName',
-            name: 'clientName',
-            align: 'left',
-        },
-        {
-            label: t('invoiceOut.globalInvoices.table.addressId'),
-            field: 'id',
-            name: 'id',
-            align: 'left',
-        },
-        {
-            label: t('invoiceOut.globalInvoices.table.streetAddress'),
-            field: 'nickname',
-            name: 'nickname',
-            align: 'left',
-        },
-        { label: 'Error', field: 'message', name: 'message', align: 'left' },
-    ];
-});
+const columns = computed(() => [
+    { label: 'Id', field: 'clientId', name: 'clientId', align: 'left' },
+    {
+        label: t('invoiceOut.globalInvoices.table.client'),
+        field: 'clientName',
+        name: 'clientName',
+        align: 'left',
+    },
+    {
+        label: t('invoiceOut.globalInvoices.table.addressId'),
+        field: 'id',
+        name: 'id',
+        align: 'left',
+    },
+    {
+        label: t('invoiceOut.globalInvoices.table.streetAddress'),
+        field: 'nickname',
+        name: 'nickname',
+        align: 'left',
+    },
+    { label: 'Error', field: 'message', name: 'message', align: 'left' },
+]);
 
 const rows = computed(() => {
     if (!errors && !errors.length > 0) return [];
diff --git a/src/pages/Travel/ExtraCommunity.vue b/src/pages/Travel/ExtraCommunity.vue
index f3cf557c6..62292f115 100644
--- a/src/pages/Travel/ExtraCommunity.vue
+++ b/src/pages/Travel/ExtraCommunity.vue
@@ -103,111 +103,109 @@ const tableColumnComponents = {
     },
 };
 
-const columns = computed(() => {
-    return [
-        {
-            label: 'id',
-            field: 'id',
-            name: 'id',
-            align: 'left',
-            showValue: true,
-        },
-        {
-            label: t('supplier.pageTitles.supplier'),
-            field: 'cargoSupplierNickname',
-            name: 'cargoSupplierNickname',
-            align: 'left',
-            showValue: true,
-        },
-        {
-            label: t('globals.agency'),
-            field: 'agencyModeName',
-            name: 'agencyModeName',
-            align: 'left',
-            showValue: true,
-        },
-        {
-            label: t('globals.amount'),
-            name: 'invoiceAmount',
-            field: 'entries',
-            align: 'left',
-            showValue: true,
-            format: (value) =>
-                toCurrency(
-                    value
-                        ? value.reduce((sum, entry) => {
-                              return sum + (entry.invoiceAmount || 0);
-                          }, 0)
-                        : 0
-                ),
-        },
-        {
-            label: t('globals.reference'),
-            field: 'ref',
-            name: 'ref',
-            align: 'left',
-            showValue: false,
-        },
-        {
-            label: t('globals.packages'),
-            field: 'stickers',
-            name: 'stickers',
-            align: 'left',
-            showValue: true,
-        },
-        {
-            label: t('kg'),
-            field: 'kg',
-            name: 'kg',
-            align: 'left',
-            showValue: true,
-        },
-        {
-            label: t('physicKg'),
-            field: 'loadedKg',
-            name: 'loadedKg',
-            align: 'left',
-            showValue: true,
-        },
-        {
-            label: 'KG Vol.',
-            field: 'volumeKg',
-            name: 'volumeKg',
-            align: 'left',
-            showValue: true,
-        },
-        {
-            label: t('globals.wareHouseOut'),
-            field: 'warehouseOutName',
-            name: 'warehouseOutName',
-            align: 'left',
-            showValue: true,
-        },
-        {
-            label: t('shipped'),
-            field: 'shipped',
-            name: 'shipped',
-            align: 'left',
-            format: (value) => toDate(value.substring(0, 10)),
-            showValue: true,
-        },
-        {
-            label: t('globals.wareHouseIn'),
-            field: 'warehouseInName',
-            name: 'warehouseInName',
-            align: 'left',
-            showValue: true,
-        },
-        {
-            label: t('landed'),
-            field: 'landed',
-            name: 'landed',
-            align: 'left',
-            format: (value) => toDate(value.substring(0, 10)),
-            showValue: true,
-        },
-    ];
-});
+const columns = computed(() => [
+    {
+        label: 'id',
+        field: 'id',
+        name: 'id',
+        align: 'left',
+        showValue: true,
+    },
+    {
+        label: t('supplier.pageTitles.supplier'),
+        field: 'cargoSupplierNickname',
+        name: 'cargoSupplierNickname',
+        align: 'left',
+        showValue: true,
+    },
+    {
+        label: t('globals.agency'),
+        field: 'agencyModeName',
+        name: 'agencyModeName',
+        align: 'left',
+        showValue: true,
+    },
+    {
+        label: t('globals.amount'),
+        name: 'invoiceAmount',
+        field: 'entries',
+        align: 'left',
+        showValue: true,
+        format: (value) =>
+            toCurrency(
+                value
+                    ? value.reduce((sum, entry) => {
+                          return sum + (entry.invoiceAmount || 0);
+                      }, 0)
+                    : 0
+            ),
+    },
+    {
+        label: t('globals.reference'),
+        field: 'ref',
+        name: 'ref',
+        align: 'left',
+        showValue: false,
+    },
+    {
+        label: t('globals.packages'),
+        field: 'stickers',
+        name: 'stickers',
+        align: 'left',
+        showValue: true,
+    },
+    {
+        label: t('kg'),
+        field: 'kg',
+        name: 'kg',
+        align: 'left',
+        showValue: true,
+    },
+    {
+        label: t('physicKg'),
+        field: 'loadedKg',
+        name: 'loadedKg',
+        align: 'left',
+        showValue: true,
+    },
+    {
+        label: 'KG Vol.',
+        field: 'volumeKg',
+        name: 'volumeKg',
+        align: 'left',
+        showValue: true,
+    },
+    {
+        label: t('globals.wareHouseOut'),
+        field: 'warehouseOutName',
+        name: 'warehouseOutName',
+        align: 'left',
+        showValue: true,
+    },
+    {
+        label: t('shipped'),
+        field: 'shipped',
+        name: 'shipped',
+        align: 'left',
+        format: (value) => toDate(value.substring(0, 10)),
+        showValue: true,
+    },
+    {
+        label: t('globals.wareHouseIn'),
+        field: 'warehouseInName',
+        name: 'warehouseInName',
+        align: 'left',
+        showValue: true,
+    },
+    {
+        label: t('landed'),
+        field: 'landed',
+        name: 'landed',
+        align: 'left',
+        format: (value) => toDate(value.substring(0, 10)),
+        showValue: true,
+    },
+]);
 
 async function getData() {
     await arrayData.fetch({ append: false });

From e8fa564bc2afe79ef318b5e03f3e20ceabeec5cb Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Thu, 4 Jan 2024 18:13:31 -0300
Subject: [PATCH 34/36] Agregar * a inputs de campos required via css

---
 src/components/common/VnInput.vue        | 17 ++++++++---------
 src/components/common/VnSelectCreate.vue | 16 +---------------
 src/components/common/VnSelectFilter.vue | 17 ++++++++---------
 src/pages/Entry/EntryCreate.vue          |  7 ++++---
 4 files changed, 21 insertions(+), 36 deletions(-)

diff --git a/src/components/common/VnInput.vue b/src/components/common/VnInput.vue
index bfd0dea40..9684dcc32 100644
--- a/src/components/common/VnInput.vue
+++ b/src/components/common/VnInput.vue
@@ -12,14 +12,6 @@ const $props = defineProps({
         type: Boolean,
         default: false,
     },
-    label: {
-        type: String,
-        default: '',
-    },
-    required: {
-        type: Boolean,
-        default: false,
-    },
 });
 
 const value = computed({
@@ -47,8 +39,8 @@ const styleAttrs = computed(() => {
         ref="vnInputRef"
         v-model="value"
         v-bind="{ ...$attrs, ...styleAttrs }"
-        :label="required ? label + ' *' : label"
         type="text"
+        :class="{ required: $attrs.required }"
     >
         <template v-if="$slots.prepend" #prepend>
             <slot name="prepend" />
@@ -58,3 +50,10 @@ const styleAttrs = computed(() => {
         </template>
     </QInput>
 </template>
+
+<style lang="scss">
+/* Estilo para el asterisco en campos requeridos */
+.q-field.required .q-field__label:after {
+    content: ' *';
+}
+</style>
diff --git a/src/components/common/VnSelectCreate.vue b/src/components/common/VnSelectCreate.vue
index cdfb0bfbd..bdc3f5cc8 100644
--- a/src/components/common/VnSelectCreate.vue
+++ b/src/components/common/VnSelectCreate.vue
@@ -20,14 +20,6 @@ const $props = defineProps({
         type: Array,
         default: () => ['developer'],
     },
-    label: {
-        type: String,
-        default: '',
-    },
-    required: {
-        type: Boolean,
-        default: false,
-    },
 });
 
 const role = useRole();
@@ -52,13 +44,7 @@ const toggleForm = () => {
 </script>
 
 <template>
-    <VnSelectFilter
-        v-model="value"
-        :options="options"
-        :label="label"
-        :required="required"
-        v-bind="$attrs"
-    >
+    <VnSelectFilter v-model="value" :options="options" v-bind="$attrs">
         <template v-if="isAllowedToCreate" #append>
             <QIcon
                 @click.stop.prevent="toggleForm()"
diff --git a/src/components/common/VnSelectFilter.vue b/src/components/common/VnSelectFilter.vue
index c223571f3..4256118f9 100644
--- a/src/components/common/VnSelectFilter.vue
+++ b/src/components/common/VnSelectFilter.vue
@@ -23,14 +23,6 @@ const $props = defineProps({
         type: Boolean,
         default: true,
     },
-    label: {
-        type: String,
-        default: '',
-    },
-    required: {
-        type: Boolean,
-        default: false,
-    },
 });
 
 const { optionLabel } = toRefs($props);
@@ -95,7 +87,7 @@ const value = computed({
         hide-selected
         fill-input
         ref="vnSelectRef"
-        :label="required ? label + ' *' : label"
+        :class="{ required: $attrs.required }"
     >
         <template v-if="isClearable" #append>
             <QIcon
@@ -110,3 +102,10 @@ const value = computed({
         </template>
     </QSelect>
 </template>
+
+<style lang="scss">
+/* Estilo para el asterisco en campos requeridos */
+.q-field.required .q-field__label:after {
+    content: ' *';
+}
+</style>
diff --git a/src/pages/Entry/EntryCreate.vue b/src/pages/Entry/EntryCreate.vue
index fc725447c..37cfea1ad 100644
--- a/src/pages/Entry/EntryCreate.vue
+++ b/src/pages/Entry/EntryCreate.vue
@@ -67,7 +67,7 @@ const companiesOptions = ref([]);
                         option-value="id"
                         option-label="nickname"
                         hide-selected
-                        required
+                        :required="true"
                         :rules="validate('entry.supplierFk')"
                     >
                         <template #option="scope">
@@ -92,7 +92,7 @@ const companiesOptions = ref([]);
                         option-label="warehouseInName"
                         map-options
                         hide-selected
-                        required
+                        :required="true"
                         :rules="validate('entry.travelFk')"
                     >
                         <template #option="scope">
@@ -121,6 +121,7 @@ const companiesOptions = ref([]);
                         option-label="code"
                         map-options
                         hide-selected
+                        :required="true"
                         :rules="validate('entry.companyFk')"
                     />
                 </VnRow>
@@ -134,4 +135,4 @@ const companiesOptions = ref([]);
         Supplier: Proveedor
         Travel: Envío
         Company: Empresa
-    </i18n>
+</i18n>

From 8cb6ed136aba46d5617c9958c3ef68b5a22eff79 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Thu, 4 Jan 2024 19:37:46 -0300
Subject: [PATCH 35/36] =?UTF-8?q?mover=20clase=20de=20selector=20de=20css?=
 =?UTF-8?q?=20para=20a=C3=B1adir=20*=20a=20inputs=20requeridos=20a=20archi?=
 =?UTF-8?q?vo=20de=20css=20global?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/common/VnInput.vue        | 7 -------
 src/components/common/VnSelectFilter.vue | 7 -------
 src/css/app.scss                         | 5 +++++
 3 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/src/components/common/VnInput.vue b/src/components/common/VnInput.vue
index 9684dcc32..cdc6dd865 100644
--- a/src/components/common/VnInput.vue
+++ b/src/components/common/VnInput.vue
@@ -50,10 +50,3 @@ const styleAttrs = computed(() => {
         </template>
     </QInput>
 </template>
-
-<style lang="scss">
-/* Estilo para el asterisco en campos requeridos */
-.q-field.required .q-field__label:after {
-    content: ' *';
-}
-</style>
diff --git a/src/components/common/VnSelectFilter.vue b/src/components/common/VnSelectFilter.vue
index 4256118f9..f2fd2a311 100644
--- a/src/components/common/VnSelectFilter.vue
+++ b/src/components/common/VnSelectFilter.vue
@@ -102,10 +102,3 @@ const value = computed({
         </template>
     </QSelect>
 </template>
-
-<style lang="scss">
-/* Estilo para el asterisco en campos requeridos */
-.q-field.required .q-field__label:after {
-    content: ' *';
-}
-</style>
diff --git a/src/css/app.scss b/src/css/app.scss
index 02d4f8946..f0c26d482 100644
--- a/src/css/app.scss
+++ b/src/css/app.scss
@@ -53,3 +53,8 @@ body.body--dark {
     color: var(--vn-text);
     border-radius: 8px;
 }
+
+/* Estilo para el asterisco en campos requeridos */
+.q-field.required .q-field__label:after {
+    content: ' *';
+}

From 27616b9bd456e457341498378968a2f9458177df Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Fri, 5 Jan 2024 10:57:43 -0300
Subject: [PATCH 36/36] improve TableVisibleColumns code

---
 src/components/common/TableVisibleColumns.vue | 50 ++++++++-----------
 1 file changed, 22 insertions(+), 28 deletions(-)

diff --git a/src/components/common/TableVisibleColumns.vue b/src/components/common/TableVisibleColumns.vue
index 7defdb0de..d9a1a2004 100644
--- a/src/components/common/TableVisibleColumns.vue
+++ b/src/components/common/TableVisibleColumns.vue
@@ -50,41 +50,35 @@ const toggleMarkAll = (val) => {
     formattedCols.value.forEach((col) => (col.active = val));
 };
 
+const getConfig = async (url, filter) => {
+    const response = await axios.get(url, {
+        params: { filter: filter },
+    });
+    return response.data && response.data.length > 0 ? response.data[0] : null;
+};
+
 const fetchViewConfigData = async () => {
     try {
         const userConfigFilter = {
-            where: {
-                tableCode: $props.tableCode,
-                userFk: user.id,
-            },
+            where: { tableCode: $props.tableCode, userFk: user.id },
         };
+        const userConfig = await getConfig('UserConfigViews', userConfigFilter);
 
-        const userViewConfigResponse = await axios.get('UserConfigViews', {
-            params: { filter: userConfigFilter },
-        });
-
-        if (userViewConfigResponse.data && userViewConfigResponse.data.length > 0) {
-            initialUserConfigViewData.value = userViewConfigResponse.data[0];
-            setUserConfigViewData(userViewConfigResponse.data[0].configuration);
+        if (userConfig) {
+            initialUserConfigViewData.value = userConfig;
+            setUserConfigViewData(userConfig.configuration);
             return;
         }
 
-        const defaultConfigFilter = {
-            where: {
-                tableCode: $props.tableCode,
-            },
-        };
+        const defaultConfigFilter = { where: { tableCode: $props.tableCode } };
+        const defaultConfig = await getConfig('DefaultViewConfigs', defaultConfigFilter);
 
-        const defaultViewConfigResponse = await axios.get('DefaultViewConfigs', {
-            params: { filter: defaultConfigFilter },
-        });
-
-        if (defaultViewConfigResponse.data && defaultViewConfigResponse.data.length > 0) {
-            setUserConfigViewData(defaultViewConfigResponse.data[0].columns);
+        if (defaultConfig) {
+            setUserConfigViewData(defaultConfig.columns);
             return;
         }
     } catch (err) {
-        console.err('Error fetching config view data');
+        console.err('Error fetching config view data', err);
     }
 };
 
@@ -127,17 +121,17 @@ const saveConfig = async () => {
         }
         emitSavedConfig();
         notify('globals.dataSaved', 'positive');
-
         popupProxyRef.value.hide();
     } catch (err) {
-        console.error('Error saving user view config');
+        console.error('Error saving user view config', err);
     }
 };
 
 const emitSavedConfig = () => {
-    const filteredCols = formattedCols.value.filter((col) => col.active);
-    const mappedCols = filteredCols.map((col) => col.name);
-    emit('onConfigSaved', mappedCols);
+    const activeColumns = formattedCols.value
+        .filter((col) => col.active)
+        .map((col) => col.name);
+    emit('onConfigSaved', activeColumns);
 };
 
 onMounted(async () => {