From 8a3b5751574ac2f8748cbaf2ac3ce0db9171e7ed Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Fri, 24 May 2024 00:28:18 +0200
Subject: [PATCH 001/228] fix: refs #6346 fix list and create

---
 src/pages/Wagon/Type/WagonTypeCreate.vue | 102 ++++++++++-------------
 src/pages/Wagon/Type/WagonTypeList.vue   |   7 ++
 2 files changed, 51 insertions(+), 58 deletions(-)

diff --git a/src/pages/Wagon/Type/WagonTypeCreate.vue b/src/pages/Wagon/Type/WagonTypeCreate.vue
index bc9c1a40c..640ca75c6 100644
--- a/src/pages/Wagon/Type/WagonTypeCreate.vue
+++ b/src/pages/Wagon/Type/WagonTypeCreate.vue
@@ -4,6 +4,7 @@ import { useRoute, useRouter } from 'vue-router';
 import { useQuasar } from 'quasar';
 
 import VnInput from 'src/components/common/VnInput.vue';
+import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 
 import { useI18n } from 'vue-i18n';
 import axios from 'axios';
@@ -12,8 +13,8 @@ onMounted(() => fetch());
 onUpdated(() => fetch());
 
 const { t } = useI18n();
+const { notify } = useQuasar();
 const route = useRoute();
-const quasar = useQuasar();
 const router = useRouter();
 const $props = defineProps({
     id: {
@@ -29,29 +30,19 @@ const divisible = ref(false);
 const name = ref('');
 const colorPickerActive = ref(false);
 let originalData = { trays: [] };
-let wagonConfig;
+let maxTrays, maxWagonHeight, minHeightBetweenTrays;
 let wagonTypeColors;
 let currentTrayColorPicked;
 
 async function fetch() {
     try {
-        await axios.get('WagonConfigs').then(async (res) => {
-            if (res.data) {
-                wagonConfig = res.data[0];
-            }
-        });
+        ({
+            data: [{ maxTrays, maxWagonHeight, minHeightBetweenTrays }],
+        } = await axios.get('WagonConfigs'));
 
         await axios.get(`WagonTypeColors`).then(async (res) => {
-            if (res.data) {
-                wagonTypeColors = res.data;
-                if (!entityId.value)
-                    wagon.value.push({
-                        id: 0,
-                        position: 0,
-                        color: { ...wagonTypeColors[0] },
-                        action: 'add',
-                    });
-                else {
+            if ((wagonTypeColors = res.data)) {
+                if (entityId.value) {
                     await axios
                         .get(`WagonTypeTrays`, {
                             params: { filter: { where: { typeFk: entityId.value } } },
@@ -76,18 +67,23 @@ async function fetch() {
                                 });
                             }
                         });
-                }
+                } else
+                    wagon.value.push({
+                        id: 0,
+                        position: 0,
+                        color: { ...wagonTypeColors[0] },
+                        action: 'add',
+                    });
             }
         });
 
-        if (entityId.value) {
+        if (entityId.value)
             await axios.get(`WagonTypes/${entityId.value}`).then((res) => {
                 if (res.data) {
                     originalData.name = name.value = res.data.name;
                     originalData.divisible = divisible.value = res.data.divisible;
                 }
             });
-        }
     } catch (e) {
         //
     }
@@ -98,27 +94,24 @@ function addTray() {
         wagon.value.find((tray) => {
             return tray.position == null;
         })
-    ) {
-        quasar.notify({
+    )
+        return notify({
             message: t('wagon.warnings.uncompleteTrays'),
             type: 'warning',
         });
-        return;
-    }
 
-    if (wagon.value.length < wagonConfig.maxTrays) {
+    if (wagon.value.length < maxTrays)
         wagon.value.unshift({
             id: wagon.value.length,
             position: null,
             color: { ...wagonTypeColors[0] },
             action: 'delete',
         });
-    } else {
-        quasar.notify({
+    else
+        notify({
             message: t('wagon.warnings.maxTrays'),
             type: 'warning',
         });
-    }
 }
 
 function deleteTray(trayToDelete) {
@@ -127,9 +120,8 @@ function deleteTray(trayToDelete) {
 }
 
 function reorderIds() {
-    for (let index = wagon.value.length - 1; index >= 0; index--) {
+    for (let index = wagon.value.length - 1; index >= 0; index--)
         wagon.value[index].id = index;
-    }
 }
 
 async function onSubmit() {
@@ -153,7 +145,7 @@ async function onSubmit() {
     }
 }
 
-function onReset() {
+async function onReset() {
     name.value = entityId.value ? originalData.name : null;
     divisible.value = entityId.value ? originalData.divisible : false;
     wagon.value = entityId.value
@@ -169,11 +161,8 @@ function onReset() {
 }
 
 function doAction(tray) {
-    if (tray.action == 'add') {
-        addTray();
-    } else {
-        deleteTray(tray);
-    }
+    if (tray.action == 'add') addTray();
+    else deleteTray(tray);
 }
 
 function showColorPicker(tray) {
@@ -193,10 +182,8 @@ function updateColor(newColor) {
 
 function onPositionBlur(tray) {
     if (tray.position) {
-        if (tray.position == '' || tray.position < 0) {
-            tray.position = null;
-            return;
-        }
+        if (tray.position == '' || tray.position < 0) return (tray.position = null);
+
         tray.position = parseInt(tray.position);
         wagon.value.sort((a, b) => b.position - a.position);
         reorderIds();
@@ -204,18 +191,18 @@ function onPositionBlur(tray) {
             if (exceedMaxHeight(index - 1)) continue;
             if (
                 wagon.value[index - 1].position - wagon.value[index].position >=
-                wagonConfig.minHeightBetweenTrays
-            ) {
+                minHeightBetweenTrays
+            )
                 continue;
-            } else {
+            else {
                 wagon.value[index - 1].position +=
-                    wagonConfig.minHeightBetweenTrays -
+                    minHeightBetweenTrays -
                     (wagon.value[index - 1].position - wagon.value[index].position);
 
-                quasar.notify({
+                notify({
                     message:
                         t('wagon.warnings.minHeightBetweenTrays') +
-                        wagonConfig.minHeightBetweenTrays +
+                        minHeightBetweenTrays +
                         ' cm',
                     type: 'warning',
                 });
@@ -227,20 +214,19 @@ function onPositionBlur(tray) {
 }
 
 function exceedMaxHeight(pos) {
-    if (wagon.value[pos].position > wagonConfig.maxWagonHeight) {
-        wagon.value.splice(pos, 1);
-        quasar.notify({
-            message:
-                t('wagon.warnings.maxWagonHeight') + wagonConfig.maxWagonHeight + ' cm',
-            type: 'warning',
-        });
-        return true;
-    }
-    return false;
+    if (wagon.value[pos].position < maxWagonHeight) return false;
+
+    wagon.value.splice(pos, 1);
+    notify({
+        message: t('wagon.warnings.maxWagonHeight') + maxWagonHeight + ' cm',
+        type: 'warning',
+    });
+    return true;
 }
 </script>
 
 <template>
+    <VnSubToolbar />
     <QPage class="q-pa-sm q-mx-xl">
         <QForm @submit="onSubmit()" @reset="onReset()" class="q-pa-sm">
             <QCard class="q-pa-md">
@@ -264,13 +250,13 @@ function exceedMaxHeight(pos) {
                             <QTooltip :delay="2000">
                                 {{
                                     t('wagon.warnings.minHeightBetweenTrays') +
-                                    wagonConfig.minHeightBetweenTrays +
+                                    minHeightBetweenTrays +
                                     ' cm'
                                 }}
                                 <QSpace />
                                 {{
                                     t('wagon.warnings.maxWagonHeight') +
-                                    wagonConfig.maxWagonHeight +
+                                    maxWagonHeight +
                                     ' cm'
                                 }}
                             </QTooltip>
diff --git a/src/pages/Wagon/Type/WagonTypeList.vue b/src/pages/Wagon/Type/WagonTypeList.vue
index 3ecca1ea3..6744dde04 100644
--- a/src/pages/Wagon/Type/WagonTypeList.vue
+++ b/src/pages/Wagon/Type/WagonTypeList.vue
@@ -56,6 +56,13 @@ async function remove(row) {
                         :id="row.id"
                         @click="navigate(row.id)"
                     >
+                        <template #list-items>
+                            <QCheckbox
+                                :label="t('Divisble')"
+                                :model-value="row.divisible"
+                                disable
+                            />
+                        </template>
                         <template #actions>
                             <QBtn
                                 :label="t('components.smartCard.openCard')"

From 12370b6437ea2b28410762d88fbb871f52f1f0dd Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Tue, 23 Jul 2024 13:22:54 +0200
Subject: [PATCH 002/228] feat: refs #6346 new wagon type section

---
 src/i18n/locale/en.yml                        |   1 +
 src/i18n/locale/es.yml                        |   1 +
 .../Customer/Defaulter/CustomerDefaulter.vue  |   3 +-
 src/pages/Wagon/Type/WagonCreateTray.vue      | 148 +++++++
 src/pages/Wagon/Type/WagonTypeCreate.vue      | 419 ------------------
 src/pages/Wagon/Type/WagonTypeEdit.vue        | 301 +++++++++++++
 src/pages/Wagon/Type/WagonTypeList.vue        |  88 +++-
 src/router/modules/wagon.js                   |   6 +-
 .../wagonType/wagonTypeCreate.spec.js         |  46 +-
 .../wagonType/wagonTypeEdit.spec.js           |  27 ++
 .../pages/Wagons/WagonTypeCreate.spec.js      | 271 -----------
 11 files changed, 551 insertions(+), 760 deletions(-)
 create mode 100644 src/pages/Wagon/Type/WagonCreateTray.vue
 delete mode 100644 src/pages/Wagon/Type/WagonTypeCreate.vue
 create mode 100644 src/pages/Wagon/Type/WagonTypeEdit.vue
 create mode 100644 test/cypress/integration/wagonType/wagonTypeEdit.spec.js
 delete mode 100644 test/vitest/__tests__/pages/Wagons/WagonTypeCreate.spec.js

diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index 8ccdf640f..d82a5dbd1 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -919,6 +919,7 @@ wagon:
         typeCreate: Create type
         typeEdit: Edit type
         wagonCounter: Trolley counter
+        wagonTray: Tray List
     type:
         name: Name
         submit: Submit
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index 452421343..274edf491 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -907,6 +907,7 @@ wagon:
         typeCreate: Crear tipo
         typeEdit: Editar tipo
         wagonCounter: Contador de carros
+        wagonTray: Listado bandejas
     type:
         name: Nombre
         submit: Guardar
diff --git a/src/pages/Customer/Defaulter/CustomerDefaulter.vue b/src/pages/Customer/Defaulter/CustomerDefaulter.vue
index af7ce0a26..854db2801 100644
--- a/src/pages/Customer/Defaulter/CustomerDefaulter.vue
+++ b/src/pages/Customer/Defaulter/CustomerDefaulter.vue
@@ -189,7 +189,7 @@ const columns = computed(() => [
     {
         align: 'left',
         field: 'finished',
-        label: t('Has recover'),
+        label: t('Has recovery'),
         name: 'finished',
     },
 ]);
@@ -408,4 +408,5 @@ es:
     Credit I.: Crédito A.
     Credit insurance: Crédito asegurado
     From: Desde
+    Has recovery: Tiene recobro
 </i18n>
diff --git a/src/pages/Wagon/Type/WagonCreateTray.vue b/src/pages/Wagon/Type/WagonCreateTray.vue
new file mode 100644
index 000000000..19f66b0b3
--- /dev/null
+++ b/src/pages/Wagon/Type/WagonCreateTray.vue
@@ -0,0 +1,148 @@
+<script setup>
+import { ref, watch } from 'vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
+import FormPopup from 'src/components/FormPopup.vue';
+import VnRow from 'src/components/ui/VnRow.vue';
+import VnInput from 'src/components/common/VnInput.vue';
+import FetchData from 'src/components/FetchData.vue';
+import { useI18n } from 'vue-i18n';
+import { useQuasar } from 'quasar';
+import axios from 'axios';
+
+const $props = defineProps({
+    entityId: {
+        type: Number,
+        required: true,
+    },
+    height: {
+        type: Number,
+        default: 0,
+    },
+    color: {
+        type: Array,
+        default: () => [],
+    },
+});
+const entityId = ref($props.entityId);
+const selectedTrayColor = ref();
+const trayHeight = ref();
+const wagonColors = ref([]);
+const wagonColorTranslated = ref();
+const heights = ref();
+const existingTrayHeight = ref($props.height);
+const { t } = useI18n();
+const { notify } = useQuasar();
+
+watch(wagonColors, () => {
+    wagonColorTranslated.value = wagonColors.value.map((color) => {
+        return { ...color, name: t(`colors.${color.name}`) };
+    });
+});
+const emit = defineEmits(['onSubmit']);
+
+async function getTrays() {
+    const data = await axios.get('WagonTypeTrays', undefined, {
+        filter: { wagonTypeFk: entityId.value },
+    });
+    existingTrayHeight.value = data.data.filter(
+        (item) => item.wagonTypeFk == entityId.value
+    );
+    heights.value = existingTrayHeight.value.map((item) => item.height);
+}
+
+function onSubmit() {
+    if (heights.value.includes(parseInt(trayHeight.value))) {
+        notify({
+            message: t(
+                'A tray with the same height already exists, try with a different height'
+            ),
+            type: 'negative',
+        });
+        return;
+    }
+    if (trayHeight.value - heights.value[heights.value.length - 1] < 50) {
+        notify({
+            message: t('The minimum height between trays is 50cm'),
+            type: 'negative',
+        });
+        return;
+    }
+
+    if (trayHeight.value > 200) {
+        notify({
+            message: t(
+                'The maximum height of the wagon is 200cm, try with a lower height'
+            ),
+            type: 'negative',
+        });
+        return;
+    }
+
+    const newTray = {
+        wagonTypeFk: entityId.value,
+        wagonTypeColorFk: selectedTrayColor.value,
+        height: trayHeight.value,
+    };
+
+    emit('onSubmit', newTray);
+}
+getTrays();
+</script>
+
+<template>
+    <FetchData
+        url="WagonTypeColors"
+        @on-fetch="(data) => (wagonColors = data)"
+        auto-load
+    />
+    <FormPopup
+        ref="createTrayFormDialogRef"
+        @on-submit="onSubmit()"
+        :title="t('Add new tray')"
+        :entity-id="selectedEntityId"
+    >
+        <template #form-inputs>
+            <VnRow class="row q-gutter-md q-mb-md">
+                <VnSelect
+                    v-model="selectedTrayColor"
+                    :options="wagonColorTranslated"
+                    option-label="name"
+                    option-value="id"
+                    id="id"
+                    :label="t('Select a tray color')"
+                >
+                    <template #option="scope">
+                        <QItem v-bind="scope.itemProps" clickable>
+                            <QItemSection>
+                                <QItemLabel>{{ scope.opt.name }}</QItemLabel>
+                            </QItemSection>
+                        </QItem>
+                    </template>
+                </VnSelect>
+                <VnInput v-model="trayHeight" :label="t('Height')" type="number" />
+            </VnRow>
+        </template>
+    </FormPopup>
+</template>
+
+<i18n>
+    en:
+        Select a tray: Select a tray
+        colors:
+            white: White
+            red: Red
+            green: Green
+            blue: Blue
+    es:
+        Select a tray color: Seleccione un color
+        Add new tray: Añadir nueva bandeja
+        Height: Altura
+        The minimum height between trays is 50cm: La altura mínima entre bandejas es de 50cm
+        The maximum height of the wagon is 200cm: La altura máxima del vagón es de 200cm
+        A tray with the same height already exists, try with a different height: Ya existe una bandeja con la misma altura, prueba con una diferente
+        colors:
+            white: Blanco
+            red: Rojo
+            green: Verde
+            blue: Azul
+</i18n>
diff --git a/src/pages/Wagon/Type/WagonTypeCreate.vue b/src/pages/Wagon/Type/WagonTypeCreate.vue
deleted file mode 100644
index 640ca75c6..000000000
--- a/src/pages/Wagon/Type/WagonTypeCreate.vue
+++ /dev/null
@@ -1,419 +0,0 @@
-<script setup>
-import { computed, ref, onMounted, onUpdated } from 'vue';
-import { useRoute, useRouter } from 'vue-router';
-import { useQuasar } from 'quasar';
-
-import VnInput from 'src/components/common/VnInput.vue';
-import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
-
-import { useI18n } from 'vue-i18n';
-import axios from 'axios';
-
-onMounted(() => fetch());
-onUpdated(() => fetch());
-
-const { t } = useI18n();
-const { notify } = useQuasar();
-const route = useRoute();
-const router = useRouter();
-const $props = defineProps({
-    id: {
-        type: Number,
-        required: false,
-        default: null,
-    },
-});
-const entityId = computed(() => $props.id || route.params.id);
-
-const wagon = ref([]);
-const divisible = ref(false);
-const name = ref('');
-const colorPickerActive = ref(false);
-let originalData = { trays: [] };
-let maxTrays, maxWagonHeight, minHeightBetweenTrays;
-let wagonTypeColors;
-let currentTrayColorPicked;
-
-async function fetch() {
-    try {
-        ({
-            data: [{ maxTrays, maxWagonHeight, minHeightBetweenTrays }],
-        } = await axios.get('WagonConfigs'));
-
-        await axios.get(`WagonTypeColors`).then(async (res) => {
-            if ((wagonTypeColors = res.data)) {
-                if (entityId.value) {
-                    await axios
-                        .get(`WagonTypeTrays`, {
-                            params: { filter: { where: { typeFk: entityId.value } } },
-                        })
-                        .then(async (res) => {
-                            if (res.data) {
-                                for (let i = 0; i < res.data.length; i++) {
-                                    const tray = res.data[i];
-                                    wagon.value.push({
-                                        id: res.data.length - i - 1,
-                                        position: tray.height,
-                                        color: {
-                                            ...wagonTypeColors.find((color) => {
-                                                return color.id === tray.colorFk;
-                                            }),
-                                        },
-                                        action: tray.height == 0 ? 'add' : 'delete',
-                                    });
-                                }
-                                wagon.value.forEach((value) => {
-                                    originalData.trays.push({ ...value });
-                                });
-                            }
-                        });
-                } else
-                    wagon.value.push({
-                        id: 0,
-                        position: 0,
-                        color: { ...wagonTypeColors[0] },
-                        action: 'add',
-                    });
-            }
-        });
-
-        if (entityId.value)
-            await axios.get(`WagonTypes/${entityId.value}`).then((res) => {
-                if (res.data) {
-                    originalData.name = name.value = res.data.name;
-                    originalData.divisible = divisible.value = res.data.divisible;
-                }
-            });
-    } catch (e) {
-        //
-    }
-}
-
-function addTray() {
-    if (
-        wagon.value.find((tray) => {
-            return tray.position == null;
-        })
-    )
-        return notify({
-            message: t('wagon.warnings.uncompleteTrays'),
-            type: 'warning',
-        });
-
-    if (wagon.value.length < maxTrays)
-        wagon.value.unshift({
-            id: wagon.value.length,
-            position: null,
-            color: { ...wagonTypeColors[0] },
-            action: 'delete',
-        });
-    else
-        notify({
-            message: t('wagon.warnings.maxTrays'),
-            type: 'warning',
-        });
-}
-
-function deleteTray(trayToDelete) {
-    wagon.value = wagon.value.filter((tray) => tray.id !== trayToDelete.id);
-    reorderIds();
-}
-
-function reorderIds() {
-    for (let index = wagon.value.length - 1; index >= 0; index--)
-        wagon.value[index].id = index;
-}
-
-async function onSubmit() {
-    try {
-        const path = entityId.value
-            ? 'WagonTypes/editWagonType'
-            : 'WagonTypes/createWagonType';
-
-        const params = {
-            id: entityId.value,
-            name: name.value,
-            divisible: divisible.value,
-            trays: wagon.value,
-        };
-
-        await axios.patch(path, params).then((res) => {
-            if (res.status == 204) router.push({ path: `/wagon/type/list` });
-        });
-    } catch (error) {
-        //
-    }
-}
-
-async function onReset() {
-    name.value = entityId.value ? originalData.name : null;
-    divisible.value = entityId.value ? originalData.divisible : false;
-    wagon.value = entityId.value
-        ? [...originalData.trays]
-        : [
-              {
-                  id: 0,
-                  position: 0,
-                  color: { ...wagonTypeColors[0] },
-                  action: 'add',
-              },
-          ];
-}
-
-function doAction(tray) {
-    if (tray.action == 'add') addTray();
-    else deleteTray(tray);
-}
-
-function showColorPicker(tray) {
-    colorPickerActive.value = true;
-    currentTrayColorPicked = wagon.value.findIndex((val) => {
-        return val.id === tray.id;
-    });
-}
-
-function updateColor(newColor) {
-    wagon.value[currentTrayColorPicked].color = {
-        ...wagonTypeColors.find((color) => {
-            return color.rgb === newColor;
-        }),
-    };
-}
-
-function onPositionBlur(tray) {
-    if (tray.position) {
-        if (tray.position == '' || tray.position < 0) return (tray.position = null);
-
-        tray.position = parseInt(tray.position);
-        wagon.value.sort((a, b) => b.position - a.position);
-        reorderIds();
-        for (let index = wagon.value.length - 1; index > 0; index--) {
-            if (exceedMaxHeight(index - 1)) continue;
-            if (
-                wagon.value[index - 1].position - wagon.value[index].position >=
-                minHeightBetweenTrays
-            )
-                continue;
-            else {
-                wagon.value[index - 1].position +=
-                    minHeightBetweenTrays -
-                    (wagon.value[index - 1].position - wagon.value[index].position);
-
-                notify({
-                    message:
-                        t('wagon.warnings.minHeightBetweenTrays') +
-                        minHeightBetweenTrays +
-                        ' cm',
-                    type: 'warning',
-                });
-
-                exceedMaxHeight(index - 1);
-            }
-        }
-    }
-}
-
-function exceedMaxHeight(pos) {
-    if (wagon.value[pos].position < maxWagonHeight) return false;
-
-    wagon.value.splice(pos, 1);
-    notify({
-        message: t('wagon.warnings.maxWagonHeight') + maxWagonHeight + ' cm',
-        type: 'warning',
-    });
-    return true;
-}
-</script>
-
-<template>
-    <VnSubToolbar />
-    <QPage class="q-pa-sm q-mx-xl">
-        <QForm @submit="onSubmit()" @reset="onReset()" class="q-pa-sm">
-            <QCard class="q-pa-md">
-                <VnInput
-                    filled
-                    v-model="name"
-                    :label="t('wagon.type.name')"
-                    :rules="[(val) => !!val || t('wagon.warnings.nameNotEmpty')]"
-                />
-                <QCheckbox class="q-mb-sm" v-model="divisible" label="Divisible" />
-                <div class="wagon-tray q-mx-lg" v-for="tray in wagon" :key="tray.id">
-                    <div class="position">
-                        <QInput
-                            autofocus
-                            filled
-                            type="number"
-                            :class="{ isVisible: tray.action == 'add' }"
-                            v-model="tray.position"
-                            @blur="onPositionBlur(tray)"
-                        >
-                            <QTooltip :delay="2000">
-                                {{
-                                    t('wagon.warnings.minHeightBetweenTrays') +
-                                    minHeightBetweenTrays +
-                                    ' cm'
-                                }}
-                                <QSpace />
-                                {{
-                                    t('wagon.warnings.maxWagonHeight') +
-                                    maxWagonHeight +
-                                    ' cm'
-                                }}
-                            </QTooltip>
-                        </QInput>
-                    </div>
-                    <div class="shelving">
-                        <div class="shelving-half">
-                            <div class="shelving-up"></div>
-                            <div
-                                class="shelving-down"
-                                :style="{ backgroundColor: tray.color.rgb }"
-                                @click="showColorPicker(tray)"
-                            ></div>
-                        </div>
-                        <div
-                            class="shelving-divisible"
-                            :class="{ isVisible: !divisible }"
-                        ></div>
-                        <div class="shelving-half">
-                            <div class="shelving-up"></div>
-                            <div
-                                class="shelving-down"
-                                :style="{ backgroundColor: tray.color.rgb }"
-                                @click="showColorPicker(tray)"
-                            ></div>
-                        </div>
-                    </div>
-                    <div class="action-button">
-                        <QBtn
-                            flat
-                            round
-                            color="primary"
-                            :icon="tray.action"
-                            @click="doAction(tray)"
-                        />
-                    </div>
-                </div>
-                <div class="q-mb-sm wheels">
-                    <QIcon color="grey-6" name="trip_origin" size="xl" />
-                    <QIcon color="grey-6" name="trip_origin" size="xl" />
-                </div>
-                <QDialog
-                    v-model="colorPickerActive"
-                    position="right"
-                    :no-backdrop-dismiss="false"
-                >
-                    <QCard>
-                        <QCardSection>
-                            <div class="text-h6">{{ t('wagon.type.trayColor') }}</div>
-                        </QCardSection>
-                        <QCardSection class="row items-center no-wrap">
-                            <QColor
-                                flat
-                                v-model="wagon[currentTrayColorPicked].color.rgb"
-                                no-header
-                                no-footer
-                                default-view="palette"
-                                :palette="
-                                    wagonTypeColors.map((color) => {
-                                        return color.rgb;
-                                    })
-                                "
-                                @change="updateColor($event)"
-                            />
-                            <QBtn flat round icon="close" v-close-popup />
-                        </QCardSection>
-                    </QCard>
-                </QDialog>
-            </QCard>
-            <div class="q-mt-md">
-                <QBtn :label="t('wagon.type.submit')" type="submit" color="primary" />
-                <QBtn
-                    :label="t('wagon.type.reset')"
-                    type="reset"
-                    color="primary"
-                    flat
-                    class="q-ml-sm"
-                />
-            </div>
-        </QForm>
-    </QPage>
-</template>
-
-<style lang="scss" scoped>
-.q-page {
-    display: flex;
-    justify-content: center;
-    align-items: flex-start;
-}
-
-.q-form {
-    width: 70%;
-}
-
-.q-dialog {
-    .q-card {
-        width: 100%;
-    }
-}
-
-.wheels {
-    margin-left: 5%;
-    display: flex;
-    justify-content: space-around;
-}
-
-.wagon-tray {
-    display: flex;
-    height: 6rem;
-
-    .position {
-        width: 20%;
-        border-right: 1rem solid gray;
-        display: flex;
-        align-items: flex-end;
-        justify-content: flex-end;
-        padding-right: 1rem;
-    }
-
-    .shelving {
-        display: flex;
-        width: 75%;
-
-        .shelving-half {
-            width: 50%;
-            height: 100%;
-
-            .shelving-up {
-                height: 80%;
-                width: 100%;
-            }
-
-            .shelving-down {
-                height: 20%;
-                width: 100%;
-            }
-        }
-
-        .shelving-divisible {
-            width: 1%;
-            height: 100%;
-            border-left: 0.5rem dashed grey;
-            border-right: 0.5rem dashed grey;
-        }
-    }
-
-    .action-button {
-        width: 10%;
-        border-left: 1rem solid gray;
-        display: flex;
-        align-items: flex-end;
-        justify-content: flex-start;
-        padding-left: 1rem;
-    }
-
-    .isVisible {
-        display: none;
-    }
-}
-</style>
diff --git a/src/pages/Wagon/Type/WagonTypeEdit.vue b/src/pages/Wagon/Type/WagonTypeEdit.vue
new file mode 100644
index 000000000..25ba05714
--- /dev/null
+++ b/src/pages/Wagon/Type/WagonTypeEdit.vue
@@ -0,0 +1,301 @@
+<script setup>
+import { computed, ref, watch } from 'vue';
+import { useRoute } from 'vue-router';
+import { useQuasar } from 'quasar';
+import VnInput from 'src/components/common/VnInput.vue';
+import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
+import FormModel from 'src/components/FormModel.vue';
+import { useI18n } from 'vue-i18n';
+import axios from 'axios';
+import VnPaginate from 'components/ui/VnPaginate.vue';
+import WagonCreateTray from './WagonCreateTray.vue';
+
+const { t } = useI18n();
+const { notify } = useQuasar();
+const route = useRoute();
+const entityId = computed(() => route.params.id);
+const wagonTrays = ref([]);
+const createTrayFormDialogRef = ref();
+const selectedEntityId = ref();
+
+async function loadTrays() {
+    try {
+        const res = await axios.get('WagonTypeTrays');
+        const filteredTrays = res.data.filter(
+            (tray) => tray.wagonTypeFk === entityId.value
+        );
+        wagonTrays.value = filteredTrays;
+        return;
+    } catch (err) {
+        console.error('Error loading trays:', err);
+    }
+}
+
+async function addTray(newTray) {
+    try {
+        const res = await axios.post(`WagonTypeTrays`, newTray);
+        wagonTrays.value.push(res.data);
+        notify({
+            message: t(`Tray added successfully`),
+            type: 'positive',
+        });
+    } catch (err) {
+        console.log('err: ', err);
+    }
+}
+
+async function deleteTray(trayToDelete) {
+    try {
+        await axios.delete(`WagonTypeTrays/${trayToDelete.id}`);
+        const index = wagonTrays.value.findIndex((tray) => tray.id === trayToDelete.id);
+        if (index !== -1) {
+            wagonTrays.value.splice(index, 1);
+        }
+        notify({
+            message: t('Tray deleted successfully'),
+            type: 'positive',
+        });
+    } catch (err) {
+        console.log('err: ', err);
+    }
+}
+
+const filter = {
+    where: { wagonTypeFk: entityId.value },
+    include: {
+        relation: 'color',
+        scope: {
+            fields: ['rgb'],
+        },
+    },
+};
+
+const formFilter = { where: { wagonTypeFk: entityId.value } };
+
+const showCreateTrayForm = (id) => {
+    selectedEntityId.value = id;
+    createTrayFormDialogRef.value.show();
+};
+
+watch(
+    () => wagonTrays.value,
+    async (newVal, oldVal) => {
+        if (newVal.length !== oldVal.length) {
+            await loadTrays();
+        }
+    },
+    { deep: true }
+);
+</script>
+
+<template>
+    <VnSubToolbar />
+    <QPage class="q-pa-sm q-mx-xl">
+        <FormModel
+            :url="`WagonTypes/ ${entityId}`"
+            :url-update="`WagonTypes/ ${entityId}`"
+            :filter="formFilter"
+            model="WagonType"
+            auto-load
+        >
+            <template #form="{ data }">
+                <QCard class="q-pa-md">
+                    <VnInput
+                        filled
+                        v-model="data.name"
+                        :label="t('wagon.type.name')"
+                        :rules="[(val) => !!val || t('wagon.warnings.nameNotEmpty')]"
+                    />
+                    <QCheckbox
+                        class="q-mb-sm"
+                        v-model="data.divisible"
+                        label="Divisible"
+                    />
+
+                    <VnPaginate
+                        data-key="wagonTypeTray"
+                        url="WagonTypeTrays"
+                        order="id DESC"
+                        :filter="filter"
+                        auto-load
+                        ref="vnPaginateRef"
+                        v-bind="$attrs"
+                        :key="wagonTrays.length"
+                    >
+                        <template #body="{ rows }">
+                            <div v-for="row in rows" :key="row.id">
+                                <div class="shelving"></div>
+                                <div class="action-button">
+                                    <div class="wagon-tray q-mx-lg">
+                                        <div class="position">
+                                            <VnInput
+                                                borderless
+                                                type="number"
+                                                disable
+                                                class="input-tray q-mb-sm"
+                                                :label="t('Height') + ': '"
+                                                v-model="row.height"
+                                            />
+                                        </div>
+                                        <div class="shelving">
+                                            <div class="shelving-half">
+                                                <div class="shelving-up"></div>
+                                                <div
+                                                    class="shelving-down"
+                                                    :style="{
+                                                        backgroundColor: row.color.rgb,
+                                                    }"
+                                                ></div>
+                                            </div>
+                                            <div
+                                                class="shelving-divisible"
+                                                :class="{ isVisible: !data.divisible }"
+                                            ></div>
+                                            <div class="shelving-half">
+                                                <div class="shelving-up"></div>
+                                                <div
+                                                    class="shelving-down"
+                                                    :style="{
+                                                        backgroundColor: row.color.rgb,
+                                                    }"
+                                                ></div>
+                                            </div>
+                                        </div>
+                                        <div class="action-button">
+                                            <QBtn
+                                                v-if="row.height === 0"
+                                                flat
+                                                round
+                                                color="primary"
+                                                :icon="'add'"
+                                                class="btn-tray"
+                                                @click="showCreateTrayForm(entityId)"
+                                            />
+                                            <QBtn
+                                                v-else
+                                                flat
+                                                round
+                                                color="primary"
+                                                :icon="'delete'"
+                                                class="btn-tray"
+                                                @click="deleteTray(row)"
+                                            />
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </template>
+                    </VnPaginate>
+                    <div class="q-mb-sm wheels">
+                        <QIcon color="grey-6" name="trip_origin" size="xl" />
+                        <QIcon color="grey-6" name="trip_origin" size="xl" />
+                    </div>
+                </QCard>
+                <QDialog ref="createTrayFormDialogRef">
+                    <WagonCreateTray :entity-id="entityId" @on-submit="addTray($event)" />
+                </QDialog>
+            </template>
+        </FormModel>
+    </QPage>
+</template>
+
+<style lang="scss" scoped>
+.q-page {
+    display: flex;
+    justify-content: center;
+    align-items: flex-start;
+}
+
+.q-form {
+    width: 70%;
+}
+
+.q-dialog {
+    .q-card {
+        width: 100%;
+    }
+}
+
+.wheels {
+    margin-left: 5%;
+    display: flex;
+    justify-content: space-around;
+}
+
+.wagon-tray {
+    display: flex;
+    height: 6rem;
+
+    .position {
+        width: 26%;
+        border-right: 1rem solid gray;
+        display: flex;
+        align-items: flex-start;
+        justify-content: flex-start;
+        padding-right: 2rem;
+        padding-left: 3rem;
+    }
+
+    .shelving {
+        display: flex;
+        width: 54%;
+
+        .shelving-half {
+            width: 100%;
+            height: 100%;
+
+            .shelving-up {
+                height: 80%;
+                width: 100%;
+            }
+
+            .shelving-down {
+                height: 20%;
+                width: 100%;
+            }
+        }
+
+        .shelving-divisible {
+            width: 1%;
+            height: 100%;
+            border-left: 0.5rem dashed grey;
+            border-right: 0.5rem dashed grey;
+        }
+    }
+
+    .action-button {
+        width: 20%;
+        border-left: 1rem solid gray;
+        align-items: baseline;
+        padding-left: 3rem;
+    }
+
+    .isVisible {
+        display: none;
+    }
+}
+.btn-tray {
+    margin-right: 100%;
+    margin-top: 100%;
+}
+.input-tray {
+    margin-top: 100%;
+    margin-left: 40%;
+}
+</style>
+
+<i18n>
+    en:
+        tray: Tray
+        wagonColor: Wagon color
+        Select a tray: Select a tray
+    es:
+        tray: Bandeja
+        wagonColor: Color de la bandeja
+        Select a tray: Seleccione una bandeja
+        Create new Wagon type: Crear nuevo tipo de vagón
+        Add new tray: Añadir nueva bandeja
+        Height: Altura
+        Tray added successfully: Bandeja añadida correctamente
+        Tray deleted successfully: Bandeja eliminada correctamente
+</i18n>
diff --git a/src/pages/Wagon/Type/WagonTypeList.vue b/src/pages/Wagon/Type/WagonTypeList.vue
index 6744dde04..acd6f14be 100644
--- a/src/pages/Wagon/Type/WagonTypeList.vue
+++ b/src/pages/Wagon/Type/WagonTypeList.vue
@@ -1,4 +1,5 @@
 <script setup>
+import { ref, computed } from 'vue';
 import axios from 'axios';
 import { useQuasar } from 'quasar';
 import VnPaginate from 'src/components/ui/VnPaginate.vue';
@@ -6,36 +7,40 @@ import { useArrayData } from 'src/composables/useArrayData';
 import { useI18n } from 'vue-i18n';
 import { useRouter } from 'vue-router';
 import CardList from 'components/ui/CardList.vue';
+import FormModelPopup from 'src/components/FormModelPopup.vue';
+import VnInput from 'src/components/common/VnInput.vue';
+import VnRow from 'src/components/ui/VnRow.vue';
 
 const quasar = useQuasar();
 const arrayData = useArrayData('WagonTypeList');
 const store = arrayData.store;
-const router = useRouter();
+const dialog = ref();
+const { push } = useRouter();
 const { t } = useI18n();
+const paginate = ref();
 
-function navigate(id) {
-    router.push({ path: `/wagon/type/${id}/edit` });
+const initialData = computed(() => {
+    return {
+        name: null,
+    };
+});
+
+function reloadData() {
+    initialData.value.name = null;
+    paginate.value.fetch();
 }
 
-function create() {
-    router.push({ path: `/wagon/type/create` });
+function navigate(id, name) {
+    push({ path: `/wagon/type/${id}/edit`, query: { name } });
 }
 
 async function remove(row) {
-    try {
-        const id = row.id;
-        await axios
-            .delete(`WagonTypes/deleteWagonType`, { params: { id } })
-            .then(async () => {
-                quasar.notify({
-                    message: t('wagon.type.removeItem'),
-                    type: 'positive',
-                });
-                store.data.splice(store.data.indexOf(row), 1);
-            });
-    } catch (error) {
-        //
-    }
+    await axios.delete(`WagonTypes/${row.id}`);
+    quasar.notify({
+        message: t('wagon.type.removeItem'),
+        type: 'positive',
+    });
+    store.data.splice(store.data.indexOf(row), 1);
 }
 </script>
 
@@ -43,8 +48,9 @@ async function remove(row) {
     <QPage class="column items-center q-pa-md">
         <div class="vn-card-list">
             <VnPaginate
+                ref="paginate"
                 data-key="WagonTypeList"
-                url="/WagonTypes"
+                url="WagonTypes"
                 order="id DESC"
                 auto-load
             >
@@ -54,7 +60,7 @@ async function remove(row) {
                         :key="row.id"
                         :title="(row.name || '').toString()"
                         :id="row.id"
-                        @click="navigate(row.id)"
+                        @click="navigate(row.id, row.name)"
                     >
                         <template #list-items>
                             <QCheckbox
@@ -66,7 +72,7 @@ async function remove(row) {
                         <template #actions>
                             <QBtn
                                 :label="t('components.smartCard.openCard')"
-                                @click.stop="navigate(row.id)"
+                                @click.stop="navigate(row.id, row.name)"
                                 outline
                             />
                             <QBtn
@@ -80,8 +86,42 @@ async function remove(row) {
                 </template>
             </VnPaginate>
         </div>
-        <QPageSticky position="bottom-right" :offset="[18, 18]">
-            <QBtn @click="create" fab icon="add" color="primary" />
+        <QPageSticky :offset="[18, 18]">
+            <QBtn @click.stop="dialog.show()" color="primary" fab icon="add">
+                <QDialog ref="dialog">
+                    <FormModelPopup
+                        :title="t('Create new Wagon type')"
+                        url-create="WagonTypes"
+                        model="WagonType"
+                        :form-initial-data="initialData"
+                        @on-data-saved="reloadData()"
+                        auto-load
+                    >
+                        <template #form-inputs="{ data }">
+                            <VnRow class="row q-gutter-md q-mb-md">
+                                <VnInput
+                                    filled
+                                    v-model="data.name"
+                                    :label="t('Name')"
+                                    :rules="[(val) => !!val || t('nameNotEmpty')]"
+                                />
+                            </VnRow>
+                        </template>
+                    </FormModelPopup>
+                </QDialog>
+            </QBtn>
+            <QTooltip>
+                {{ t('globals.new') }}
+            </QTooltip>
         </QPageSticky>
     </QPage>
 </template>
+
+<i18n>
+en:
+    nameNotEmpty: The name cannot be empty
+es:
+    Create new Wagon type: Crear nuevo tipo de vagón
+    Name: Nombre
+    nameNotEmpty: El nombre no puede estar vacío
+</i18n>
diff --git a/src/router/modules/wagon.js b/src/router/modules/wagon.js
index 6f9a4c819..ecdf7dff0 100644
--- a/src/router/modules/wagon.js
+++ b/src/router/modules/wagon.js
@@ -11,7 +11,7 @@ export default {
     component: RouterView,
     redirect: { name: 'WagonMain' },
     menus: {
-        main: ['WagonList', 'WagonTypeList', 'WagonCounter'],
+        main: ['WagonList', 'WagonTypeList', 'WagonCounter', 'WagonTray'],
         card: [],
     },
     children: [
@@ -81,7 +81,7 @@ export default {
                         title: 'typeCreate',
                         icon: 'create',
                     },
-                    component: () => import('src/pages/Wagon/Type/WagonTypeCreate.vue'),
+                    component: () => import('src/pages/Wagon/Type/WagonTypeList.vue'),
                 },
                 {
                     path: ':id/edit',
@@ -90,7 +90,7 @@ export default {
                         title: 'typeEdit',
                         icon: 'edit',
                     },
-                    component: () => import('src/pages/Wagon/Type/WagonTypeCreate.vue'),
+                    component: () => import('src/pages/Wagon/Type/WagonTypeEdit.vue'),
                 },
             ],
         },
diff --git a/test/cypress/integration/wagonType/wagonTypeCreate.spec.js b/test/cypress/integration/wagonType/wagonTypeCreate.spec.js
index bcf7fe841..05d61c9c5 100644
--- a/test/cypress/integration/wagonType/wagonTypeCreate.spec.js
+++ b/test/cypress/integration/wagonType/wagonTypeCreate.spec.js
@@ -5,50 +5,12 @@ describe('WagonTypeCreate', () => {
         cy.visit('/#/wagon/type/create');
     });
 
-    function chooseColor(color) {
-        cy.get('div.shelving-down').eq(1).click();
-        cy.get('div.q-color-picker__cube').eq(color).click();
-        cy.get('div.q-card__section').find('button').click();
-    }
-
-    function addTray(position) {
-        cy.get('div.action-button').last().find('button').click();
-        cy.focused().type(position);
-        cy.focused().blur();
-    }
-
-    it('should create and delete a new wagon type', () => {
+    it('should create a new wagon type', () => {
+        cy.get('.q-page-sticky > div > .q-btn').click();
         cy.get('input').first().type('Example for testing');
-        cy.get('div.q-checkbox__bg').click();
-        chooseColor(1);
-
-        // Insert invalid position (not minimal height)
-        addTray(20);
-        cy.get('div[role="alert"]').should('exist');
-        chooseColor(2);
-        addTray(150);
-        chooseColor(3);
-        addTray(100);
-
-        // Insert invalid position (max height reached)
-        addTray(210);
-        cy.get('div[role="alert"]').should('exist');
-
-        // Save
         cy.get('button[type="submit"]').click();
-
-        // Check data has been saved successfully
-        cy.get(':nth-child(1) > :nth-child(1) > .justify-between > .flex > .title')
-            .contains('Example for testing')
-            .click();
-        cy.get('input').first().should('have.value', 'Example for testing');
-        cy.get('div.wagon-tray').should('have.length', 4);
-        cy.get('div.position').eq(0).find('input').should('have.value', '150');
-        cy.get('div.position').eq(1).find('input').should('have.value', '100');
-        cy.get('div.position').eq(2).find('input').should('have.value', '50');
-
-        // Delete wagon type created
-        cy.go('back');
+    });
+    it('delete a wagon type', () => {
         cy.get(
             ':nth-child(2) > :nth-child(1) > .card-list-body > .actions > .q-btn--standard'
         ).click();
diff --git a/test/cypress/integration/wagonType/wagonTypeEdit.spec.js b/test/cypress/integration/wagonType/wagonTypeEdit.spec.js
new file mode 100644
index 000000000..6e5816e51
--- /dev/null
+++ b/test/cypress/integration/wagonType/wagonTypeEdit.spec.js
@@ -0,0 +1,27 @@
+describe('WagonTypeEdit', () => {
+    const trayColorRow =
+        '.q-select > .q-field__inner > .q-field__control > .q-field__control-container';
+    beforeEach(() => {
+        cy.viewport(1920, 1080);
+        cy.login('developer');
+        cy.visit('/#/wagon/type/2/edit');
+    });
+
+    it('should edit the name and the divisible field of the wagon type', () => {
+        cy.get('.q-card');
+        cy.get('input').first().type(' changed');
+        cy.get('div.q-checkbox__bg').first().click();
+        cy.get('.q-btn--standard').click();
+    });
+
+    it('should create a tray', () => {
+        cy.get('.action-button > .q-btn > .q-btn__content > .q-icon').click();
+        cy.get('input').last().type('150');
+        cy.get(trayColorRow).type('{downArrow}{downArrow}{enter}');
+    });
+
+    it('should delete a tray', () => {
+        cy.get('.action-button > .q-btn > .q-btn__content > .q-icon').first().click();
+        cy.reload();
+    });
+});
diff --git a/test/vitest/__tests__/pages/Wagons/WagonTypeCreate.spec.js b/test/vitest/__tests__/pages/Wagons/WagonTypeCreate.spec.js
deleted file mode 100644
index 60c199b73..000000000
--- a/test/vitest/__tests__/pages/Wagons/WagonTypeCreate.spec.js
+++ /dev/null
@@ -1,271 +0,0 @@
-import { axios, createWrapper } from 'app/test/vitest/helper';
-import WagonTypeCreate from 'pages/Wagon/Type/WagonTypeCreate.vue';
-import { afterEach, beforeAll, describe, expect, it, vi } from 'vitest';
-
-describe('WagonTypeCreate', () => {
-    let vmCreate, vmEdit;
-    const entityId = 1;
-
-    beforeAll(() => {
-        vmEdit = createWrapper(WagonTypeCreate, {propsData: {
-                id: entityId,
-            }}).vm;
-        vmCreate = createWrapper(WagonTypeCreate).vm;
-        vmEdit.wagonConfig = vmCreate.wagonConfig = {maxTrays: 2 ,minHeightBetweenTrays: 50, maxWagonHeight: 200 };
-        vmEdit.wagonTypeColors = vmCreate.wagonTypeColors = [{id: 1, color:'white', rgb:'#000000'}];
-    });
-
-    afterEach(() => {
-        vi.clearAllMocks();
-    });
-
-    describe('addTray()', () => {
-        it('should throw message if there are uncomplete trays', async () => {
-            vi.spyOn(vmEdit.quasar, 'notify');
-            vmEdit.wagon = [{
-                id: 1,
-                position: null,
-                color: vmEdit.wagonTypeColors[0]
-            }];
-
-            await vmEdit.addTray();
-
-            expect(vmEdit.quasar.notify).toHaveBeenCalledWith(
-                expect.objectContaining({
-                    type: 'warning',
-                })
-            );
-        });
-
-        it('should create a new tray if the limit has not been reached', async () => {
-            vmEdit.wagon = [{
-                id: 1,
-                position: 0,
-                color: vmEdit.wagonTypeColors[0]
-            }];
-
-            await vmEdit.addTray();
-            expect(vmEdit.wagon.length).toEqual(2);
-        });
-
-        it('should throw message if there are uncomplete trays', async () => {
-            vi.spyOn(vmEdit.quasar, 'notify');
-            vmEdit.wagon = [{
-                id: 1,
-                position: 0,
-                color: vmEdit.wagonTypeColors[0]
-            },{
-                id: 2,
-                position: 50,
-                color: vmEdit.wagonTypeColors[0]
-            }];
-
-            await vmEdit.addTray();
-
-            expect(vmEdit.quasar.notify).toHaveBeenCalledWith(
-                expect.objectContaining({
-                    type: 'warning',
-                })
-            );
-        });
-    });
-
-    describe('deleteTray() reorderIds()', () => {
-        it('should delete a tray and reorder the ids', async () => {
-            const trayToDelete = {
-                id: 1,
-                position: 0,
-                color: vmEdit.wagonTypeColors[0]
-            };
-            const trayMaintained = {
-                id: 2,
-                position: 50,
-                color: vmEdit.wagonTypeColors[0]
-            };
-            vmEdit.wagon = [trayToDelete,trayMaintained];
-
-            await vmEdit.deleteTray(trayToDelete);
-
-            expect(vmEdit.wagon.length).toEqual(1);
-            expect(vmEdit.wagon[0].id).toEqual(0);
-            expect(vmEdit.wagon[0].position).toEqual(50);
-
-        });
-    });
-
-    describe('onSubmit()', () => {
-        it('should make a patch to editWagonType if have id', async () => {
-            vi.spyOn(axios, 'patch').mockResolvedValue({ data: true });
-            const wagon = {
-                id: entityId,
-                name: "Mock name",
-                divisible: true,
-                trays: [{
-                    id: 1,
-                    position: 0,
-                    color: vmEdit.wagonTypeColors[0]
-                }]
-            }
-            vmEdit.name = wagon.name;
-            vmEdit.divisible = wagon.divisible;
-            vmEdit.wagon = wagon.trays;
-
-            await vmEdit.onSubmit();
-
-            expect(axios.patch).toHaveBeenCalledWith(
-                `WagonTypes/editWagonType`, wagon
-            );
-        });
-
-        it('should make a patch to createtWagonType if not have id', async () => {
-            vi.spyOn(axios, 'patch').mockResolvedValue({ data: true });
-            const wagon = {
-                name: "Mock name",
-                divisible: true,
-                trays: [{
-                    id: 1,
-                    position: 0,
-                    color: vmCreate.wagonTypeColors[0]
-                }]
-            }
-            vmCreate.name = wagon.name;
-            vmCreate.divisible = wagon.divisible;
-            vmCreate.wagon = wagon.trays;
-
-            await vmCreate.onSubmit();
-
-            expect(axios.patch).toHaveBeenCalledWith(
-                `WagonTypes/createWagonType`, wagon
-            );
-        });
-    });
-
-    describe('onReset()', () => {
-        it('should reset if have id', async () => {
-            vmEdit.name = 'Changed name';
-            vmEdit.divisible = false;
-            vmEdit.wagon = [];
-            vmEdit.originalData = {
-                name: 'Original name',
-                divisible: true,
-                trays: [{
-                    id: 1,
-                    position: 0,
-                    color: vmEdit.wagonTypeColors[0]
-                },{
-                    id: 2,
-                    position: 50,
-                    color: vmEdit.wagonTypeColors[0]
-                }]
-            };
-
-            vmEdit.onReset();
-
-            expect(vmEdit.name).toEqual(vmEdit.originalData.name);
-            expect(vmEdit.divisible).toEqual(vmEdit.originalData.divisible);
-            expect(vmEdit.wagon).toEqual(vmEdit.originalData.trays);
-        });
-
-        it('should reset if not have id', async () => {
-            vmCreate.name = 'Changed name';
-            vmCreate.divisible = false;
-            vmCreate.wagon = [];
-
-            vmCreate.onReset();
-
-            expect(vmCreate.name).toEqual(null);
-            expect(vmCreate.divisible).toEqual(false);
-            expect(vmCreate.wagon.length).toEqual(1);
-        });
-    });
-
-    describe('onPositionBlur()', () => {
-        it('should set position null if position is negative', async () => {
-            const negativeTray = {
-                id: 1,
-                position: -1,
-                color: vmCreate.wagonTypeColors[0]
-            };
-
-            vmCreate.onPositionBlur(negativeTray);
-
-            expect(negativeTray.position).toEqual(null);
-        });
-
-        it('should set position and reorder array', async () => {
-            const trays = [{
-                id: 0,
-                position: 100,
-                color: vmCreate.wagonTypeColors[0]
-            },{
-                id: 1,
-                position: 0,
-                color: vmCreate.wagonTypeColors[0]
-            }];
-            const newTray = {
-                id: 2,
-                position: 50,
-                color: vmCreate.wagonTypeColors[0]
-            };
-            trays.push(newTray);
-            vmCreate.wagon = trays;
-
-            vmCreate.onPositionBlur(newTray);
-
-            expect(vmCreate.wagon[0].position).toEqual(100);
-            expect(vmCreate.wagon[1].position).toEqual(50);
-            expect(vmCreate.wagon[2].position).toEqual(0);
-        });
-
-        it('should throw message if not have min height between trays and should set new adequate positions', async () => {
-            vi.spyOn(vmCreate.quasar, 'notify');
-            const trays = [{
-                id: 0,
-                position: 0,
-                color: vmCreate.wagonTypeColors[0]
-            }];
-            const newTray = {
-                id: 1,
-                position: 20,
-                color: vmCreate.wagonTypeColors[0]
-            };
-            trays.push(newTray);
-            vmCreate.wagon = trays;
-
-            vmCreate.onPositionBlur(newTray);
-
-            expect(vmCreate.wagon[0].position).toEqual(50);
-            expect(vmCreate.wagon[1].position).toEqual(0);
-            expect(vmCreate.quasar.notify).toHaveBeenCalledWith(
-                expect.objectContaining({
-                    type: 'warning',
-                })
-            );
-        });
-
-        it('should throw message if max height has been exceed', async () => {
-            vi.spyOn(vmCreate.quasar, 'notify');
-            const trays = [{
-                id: 0,
-                position: 0,
-                color: vmCreate.wagonTypeColors[0]
-            }];
-            const newTray = {
-                id: 1,
-                position: 210,
-                color: vmCreate.wagonTypeColors[0]
-            };
-            trays.push(newTray);
-            vmCreate.wagon = trays;
-
-            vmCreate.onPositionBlur(newTray);
-
-            expect(vmCreate.wagon.length).toEqual(1);
-            expect(vmCreate.quasar.notify).toHaveBeenCalledWith(
-                expect.objectContaining({
-                    type: 'warning',
-                })
-            );
-        });
-    });
-});

From 3a0204d27bde863207db6d8a621611cd7085dc18 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Wed, 24 Jul 2024 14:58:51 +0200
Subject: [PATCH 003/228] feat: vnLocation changes

---
 src/components/common/VnLocation.vue          | 149 +++++++++++-------
 .../Customer/Card/CustomerFiscalData.vue      |   6 +-
 .../Supplier/Card/SupplierFiscalData.vue      |  10 +-
 .../vnComponent/vnLocation.spec.js            |   2 +-
 4 files changed, 98 insertions(+), 69 deletions(-)

diff --git a/src/components/common/VnLocation.vue b/src/components/common/VnLocation.vue
index 9ed48ca15..fc19e509f 100644
--- a/src/components/common/VnLocation.vue
+++ b/src/components/common/VnLocation.vue
@@ -1,18 +1,23 @@
 <script setup>
-import { ref, toRefs, computed, watch, onMounted } from 'vue';
+import { ref, toRefs, onMounted, nextTick } from 'vue';
 import CreateNewPostcode from 'src/components/CreateNewPostcodeForm.vue';
 import VnSelectDialog from 'components/common/VnSelectDialog.vue';
-import FetchData from 'components/FetchData.vue';
-const emit = defineEmits(['update:modelValue', 'update:options']);
+const emit = defineEmits(['update:selected', 'update:options']);
 import { useI18n } from 'vue-i18n';
+import { useArrayData } from 'src/composables/useArrayData';
 
 const { t } = useI18n();
 const postcodesOptions = ref([]);
-const postcodesRef = ref(null);
+const postcodesOptionsOriginal = ref([]);
+// const postcodesRef = ref(null);
 
 const $props = defineProps({
-    modelValue: {
-        type: [String, Number, Object],
+    postalCodeKey: {
+        type: String,
+        default: 'postalCode',
+    },
+    location: {
+        type: Object,
         default: null,
     },
     options: {
@@ -41,89 +46,115 @@ const $props = defineProps({
     },
 });
 
-const { options } = toRefs($props);
-const myOptions = ref([]);
-const myOptionsOriginal = ref([]);
-
-const value = computed({
-    get() {
-        return $props.modelValue;
-    },
-    set(value) {
-        emit(
-            'update:modelValue',
-            postcodesOptions.value.find((p) => p.code === value)
-        );
-    },
+const selectedId = ref(null);
+const mySelect = ref();
+const modelValue = ref($props.location[$props.postalCodeKey]);
+const arrayData = useArrayData('postcodes', {
+    url: 'Postcodes/filter',
+    limit: 1,
 });
 
-onMounted(() => {
-    locationFilter($props.modelValue);
-});
+function sanitizePostcode(data) {
+    return data.map((postcode) => ({
+        ...postcode,
+        original: postcode,
+        id: sanitizeId(postcode),
+        label: sanitizeLabel(postcode),
+    }));
+}
 
+function sanitizeId(postcode) {
+    return `${postcode.code ?? postcode[$props.postalCodeKey]}_${postcode.provinceFk}_${
+        postcode.countryFk
+    }`;
+}
+onMounted(async () => {
+    await retriveOptions();
+    nextTick(() => mySelect.value.showPopup());
+});
+async function retriveOptions() {
+    let options = [];
+    if (modelValue.value) {
+        await locationFilter(modelValue.value, () => {});
+        options = arrayData.store.data;
+    } else {
+        const { data } = await arrayData.fetch({ updateRouter: false, append: true });
+        options = data;
+    }
+    setOptions(options);
+}
+function findOptionById(postcode) {
+    return postcodesOptions.value.find((p) => p.id === postcode);
+}
 function setOptions(data) {
-    myOptions.value = JSON.parse(JSON.stringify(data));
-    myOptionsOriginal.value = JSON.parse(JSON.stringify(data));
-}
-setOptions(options.value);
-
-watch(options, (newValue) => {
-    setOptions(newValue);
-});
-
-function showLabel(data) {
-    return `${data.code} - ${data.town}(${data.province}), ${data.country}`;
+    postcodesOptions.value = sanitizePostcode(data);
+    if (modelValue.value) {
+        const { [$props.postalCodeKey]: code } = $props.location;
+        selectedId.value =
+            findOptionById(sanitizeId({ ...$props.location, code })) ??
+            sanitizePostcode([$props.location])[0];
+    }
+    postcodesOptionsOriginal.value = JSON.parse(JSON.stringify(postcodesOptions.value));
 }
 
-function locationFilter(search = '') {
-    if (
-        search &&
-        (search.includes('undefined') || search.startsWith(`${$props.modelValue} - `))
-    )
+async function handleInput(value) {
+    if (value) emit('update:selected', findOptionById(value));
+    if (modelValue.value) {
+        modelValue.value = value;
+        arrayData.store.userFilter = {};
+        await retriveOptions();
+        mySelect.value.showPopup();
+    } else postcodesOptions.value = postcodesOptionsOriginal.value;
+}
+function sanitizeLabel(postcode) {
+    return `${postcode.code ?? postcode[$props.postalCodeKey]} - ${postcode.town}(${
+        postcode.province
+    }), ${postcode.country}`;
+}
+
+async function locationFilter(search, update) {
+    if (search.length === 0) {
         return;
+    }
     let where = { search };
-    postcodesRef.value.fetch({ filter: { where }, limit: 30 });
+    arrayData.store.userFilter = { filter: { where } };
+    await arrayData.fetch({ append: false, updateRouter: false });
+
+    update(() => {
+        postcodesOptions.value = sanitizePostcode(arrayData.store.data);
+    });
 }
 
-function handleFetch(data) {
-    postcodesOptions.value = data;
-}
 function onDataSaved(newPostcode) {
     postcodesOptions.value.push(newPostcode);
-    value.value = newPostcode.code;
+    selectedId.value = newPostcode.code ?? newPostcode[$props.postalCodeKey];
 }
 </script>
 <template>
-    <FetchData
-        ref="postcodesRef"
-        url="Postcodes/filter"
-        @on-fetch="(data) => handleFetch(data)"
-    />
     <VnSelectDialog
-        v-if="postcodesRef"
-        :option-label="(opt) => showLabel(opt) ?? 'code'"
-        :option-value="(opt) => opt.code"
-        v-model="value"
+        ref="mySelect"
+        option-label="label"
+        option-value="id"
+        v-model="selectedId"
         :options="postcodesOptions"
         :label="t('Location')"
+        @update:model-value="handleInput"
         :placeholder="t('search_by_postalcode')"
-        @input-value="locationFilter"
-        :default-filter="false"
+        @filter="locationFilter"
         :input-debounce="300"
         :class="{ required: $attrs.required }"
         v-bind="$attrs"
         clearable
+        emit-value
     >
         <template #form>
-            <CreateNewPostcode
-                @on-data-saved="onDataSaved"
-            />
+            <CreateNewPostcode @on-data-saved="onDataSaved" />
         </template>
         <template #option="{ itemProps, opt }">
             <QItem v-bind="itemProps">
                 <QItemSection v-if="opt.code">
                     <QItemLabel>{{ opt.code }}</QItemLabel>
-                    <QItemLabel caption>{{ showLabel(opt) }}</QItemLabel>
+                    <QItemLabel caption>{{ opt.label }}</QItemLabel>
                 </QItemSection>
             </QItem>
         </template>
diff --git a/src/pages/Customer/Card/CustomerFiscalData.vue b/src/pages/Customer/Card/CustomerFiscalData.vue
index a7cdfafc5..d05e4fa01 100644
--- a/src/pages/Customer/Card/CustomerFiscalData.vue
+++ b/src/pages/Customer/Card/CustomerFiscalData.vue
@@ -95,9 +95,9 @@ function handleLocation(data, location) {
                 <VnLocation
                     :rules="validate('Worker.postcode')"
                     :roles-allowed-to-create="['deliveryAssistant']"
-                    :options="postcodesOptions"
-                    v-model="data.postcode"
-                    @update:model-value="(location) => handleLocation(data, location)"
+                    :location="data"
+                    postal-code-key="postcode"
+                    @update:selected="(location) => handleLocation(data, location)"
                 >
                 </VnLocation>
             </VnRow>
diff --git a/src/pages/Supplier/Card/SupplierFiscalData.vue b/src/pages/Supplier/Card/SupplierFiscalData.vue
index 179c6f5e6..61077d48e 100644
--- a/src/pages/Supplier/Card/SupplierFiscalData.vue
+++ b/src/pages/Supplier/Card/SupplierFiscalData.vue
@@ -17,11 +17,10 @@ const sageTaxTypesOptions = ref([]);
 const sageWithholdingsOptions = ref([]);
 const sageTransactionTypesOptions = ref([]);
 const supplierActivitiesOptions = ref([]);
-const postcodesOptions = ref([]);
 
 function handleLocation(data, location) {
-    const { town, code, provinceFk, countryFk } = location ?? {};
-    data.postCode = code;
+    const { town, label, provinceFk, countryFk } = location ?? {};
+    data.postCode = label;
     data.city = town;
     data.provinceFk = provinceFk;
     data.countryFk = countryFk;
@@ -131,9 +130,8 @@ function handleLocation(data, location) {
                 <VnLocation
                     :rules="validate('Worker.postcode')"
                     :roles-allowed-to-create="['deliveryAssistant']"
-                    :options="postcodesOptions"
-                    v-model="data.postCode"
-                    @update:model-value="(location) => handleLocation(data, location)"
+                    :location="data"
+                    @update:selected="(location) => handleLocation(data, location)"
                 >
                 </VnLocation>
             </VnRow>
diff --git a/test/cypress/integration/vnComponent/vnLocation.spec.js b/test/cypress/integration/vnComponent/vnLocation.spec.js
index 6719d8391..c465b152c 100644
--- a/test/cypress/integration/vnComponent/vnLocation.spec.js
+++ b/test/cypress/integration/vnComponent/vnLocation.spec.js
@@ -17,7 +17,7 @@ describe('VnLocation', () => {
             cy.get(inputLocation).click();
             cy.get(inputLocation).clear();
             cy.get(inputLocation).type('al');
-            cy.get(locationOptions).should('have.length.at.least', 3);
+            cy.get(locationOptions).should('have.length.at.least', 4);
         });
         it('input filter location as "ecuador"', function () {
             cy.get(inputLocation).click();

From 4188569908e57aee9b938e976b670779dd7fd733 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Thu, 25 Jul 2024 10:03:20 +0200
Subject: [PATCH 004/228] feat: refs #7500 added VnImg to show files

---
 src/components/common/VnDmsList.vue | 33 +++++++++++++++++++++--------
 src/components/ui/VnImg.vue         | 11 +++++++++-
 2 files changed, 34 insertions(+), 10 deletions(-)

diff --git a/src/components/common/VnDmsList.vue b/src/components/common/VnDmsList.vue
index c42de6690..08c4e4aa4 100644
--- a/src/components/common/VnDmsList.vue
+++ b/src/components/common/VnDmsList.vue
@@ -5,12 +5,14 @@ import { useRoute } from 'vue-router';
 import { useQuasar, QCheckbox, QBtn, QInput } from 'quasar';
 import axios from 'axios';
 
+import VnUserLink from '../ui/VnUserLink.vue';
+import { downloadFile } from 'src/composables/downloadFile';
+import VnImg from 'components/ui/VnImg.vue';
 import VnPaginate from 'components/ui/VnPaginate.vue';
 import VnDms from 'src/components/common/VnDms.vue';
 import VnConfirm from 'components/ui/VnConfirm.vue';
 import VnInputDate from 'components/common/VnInputDate.vue';
-import VnUserLink from '../ui/VnUserLink.vue';
-import { downloadFile } from 'src/composables/downloadFile';
+import { useSession } from 'src/composables/useSession';
 
 const route = useRoute();
 const quasar = useQuasar();
@@ -18,6 +20,7 @@ const { t } = useI18n();
 const rows = ref();
 const dmsRef = ref();
 const formDialog = ref({});
+const token = useSession().getTokenMultimedia();
 
 const $props = defineProps({
     model: {
@@ -89,6 +92,25 @@ const dmsFilter = {
 };
 
 const columns = computed(() => [
+    {
+        align: 'left',
+        field: 'file',
+        label: t('globals.file'),
+        name: 'file',
+        component: VnImg,
+        props: (prop) => ({
+            storage: 'dms',
+            collection: null,
+            size: null,
+            token: prop.token,
+            url:
+                'api/dms/' +
+                prop.row.file.split('.')[0] +
+                '/downloadFile?access_token=' +
+                token,
+            class: 'rounded',
+        }),
+    },
     {
         align: 'left',
         field: 'id',
@@ -141,13 +163,6 @@ const columns = computed(() => [
             'model-value': Boolean(prop.value),
         }),
     },
-    {
-        align: 'left',
-        field: 'file',
-        label: t('globals.file'),
-        name: 'file',
-        component: 'span',
-    },
     {
         align: 'left',
         field: 'worker',
diff --git a/src/components/ui/VnImg.vue b/src/components/ui/VnImg.vue
index 985c9cc53..fc54bddf5 100644
--- a/src/components/ui/VnImg.vue
+++ b/src/components/ui/VnImg.vue
@@ -24,6 +24,11 @@ const $props = defineProps({
         type: Number,
         required: true,
     },
+    url: {
+        type: String,
+        required: false,
+        default: null,
+    },
 });
 const show = ref(false);
 const token = useSession().getTokenMultimedia();
@@ -31,9 +36,13 @@ const timeStamp = ref(`timestamp=${Date.now()}`);
 import noImage from '/no-user.png';
 import { useRole } from 'src/composables/useRole';
 const url = computed(() => {
+    if ($props.url) return $props.url;
     const isEmployee = useRole().isEmployee();
+    const _url = [$props.storage, $props.collection, $props.size, $props.id]
+        .filter((prop) => prop)
+        .join('/');
     return isEmployee
-        ? `/api/${$props.storage}/${$props.collection}/${$props.size}/${$props.id}/download?access_token=${token}&${timeStamp.value}`
+        ? `/api/${_url}/download?access_token=${token}&${timeStamp.value}`
         : noImage;
 });
 const reload = () => {

From 351c2a07dc85a553a976fa37928cc57d4fd631a8 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Thu, 1 Aug 2024 09:15:35 +0200
Subject: [PATCH 005/228] chore: refs #4074 wip replace useRole for useAcl

---
 src/components/ui/VnPaginate.vue                 |  4 ++--
 src/pages/Account/AccountList.vue                |  4 ++--
 src/pages/Customer/Card/CustomerBalance.vue      |  6 +++---
 src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue | 15 +++++++--------
 src/pages/Worker/Card/WorkerLocker.vue           |  6 +++---
 5 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/src/components/ui/VnPaginate.vue b/src/components/ui/VnPaginate.vue
index c27111df4..42fa4f766 100644
--- a/src/components/ui/VnPaginate.vue
+++ b/src/components/ui/VnPaginate.vue
@@ -115,8 +115,8 @@ watch(
 );
 
 watch(
-    () => [props.url, props.filter],
-    ([url, filter]) => fetch({ url, filter })
+    () => [props.url, props.filter, props.userParams],
+    ([url, filter, userParams]) => fetch({ url, filter, userParams })
 );
 
 const addFilter = async (filter, params) => {
diff --git a/src/pages/Account/AccountList.vue b/src/pages/Account/AccountList.vue
index dee019fed..79c77a3c1 100644
--- a/src/pages/Account/AccountList.vue
+++ b/src/pages/Account/AccountList.vue
@@ -13,7 +13,7 @@ import AccountCreate from './AccountCreate.vue';
 
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
 import { useStateStore } from 'stores/useStateStore';
-import { useRole } from 'src/composables/useRole';
+import { useAcl } from 'src/composables/useAcl';
 import { QDialog } from 'quasar';
 
 const stateStore = useStateStore();
@@ -21,7 +21,7 @@ const router = useRouter();
 const { t } = useI18n();
 const { viewSummary } = useSummaryDialog();
 const accountCreateDialogRef = ref(null);
-const showNewUserBtn = computed(() => useRole().hasAny(['itManagement']));
+const showNewUserBtn = computed(() => useAcl().hasAny('Account', '*', 'WRITE'));
 
 const filter = {
     fields: ['id', 'nickname', 'name', 'role'],
diff --git a/src/pages/Customer/Card/CustomerBalance.vue b/src/pages/Customer/Card/CustomerBalance.vue
index 411c44ad3..2dc0c5564 100644
--- a/src/pages/Customer/Card/CustomerBalance.vue
+++ b/src/pages/Customer/Card/CustomerBalance.vue
@@ -2,7 +2,7 @@
 import { computed, onBeforeMount, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
-import { useRole } from 'src/composables/useRole';
+import { useAcl } from 'src/composables/useAcl';
 import axios from 'axios';
 import { useQuasar } from 'quasar';
 
@@ -25,7 +25,7 @@ import InvoiceOutDescriptorProxy from 'src/pages/InvoiceOut/Card/InvoiceOutDescr
 const { openConfirmationModal } = useVnConfirm();
 const { sendEmail } = usePrintService();
 const { t } = useI18n();
-const { hasAny } = useRole();
+const { hasAny } = useAcl();
 
 const session = useSession();
 const tokenMultimedia = session.getTokenMultimedia();
@@ -317,7 +317,7 @@ const showBalancePdf = ({ id }) => {
             >
                 <VnInput
                     v-model="scope.value"
-                    :disable="!hasAny(['administrative'])"
+                    :disable="!hasAny('Receipt','*', 'WRITE')"
                     @keypress.enter="scope.set"
                     autofocus
                 />
diff --git a/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue b/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue
index da24e50fa..17e5133ab 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue
@@ -5,7 +5,7 @@ import { useI18n } from 'vue-i18n';
 import { useQuasar } from 'quasar';
 import axios from 'axios';
 import { toCurrency, toDate } from 'src/filters';
-import { useRole } from 'src/composables/useRole';
+import { useAcl } from 'src/composables/useAcl';
 import { downloadFile } from 'src/composables/downloadFile';
 import { useArrayData } from 'src/composables/useArrayData';
 import { usePrintService } from 'composables/usePrintService';
@@ -24,7 +24,7 @@ const $props = defineProps({ id: { type: Number, default: null } });
 const { push, currentRoute } = useRouter();
 
 const quasar = useQuasar();
-const { hasAny } = useRole();
+const { hasAny } = useAcl();
 const { t } = useI18n();
 const { openReport, sendEmail } = usePrintService();
 const arrayData = useArrayData();
@@ -195,10 +195,9 @@ async function cloneInvoice() {
     push({ path: `/invoice-in/${data.id}/summary` });
 }
 
-const isAdministrative = () => hasAny(['administrative']);
+const canEditProp = (prop) => hasAny('InvoiceIn', prop, 'WRITE');
 
 const isAgricultural = () => {
-    console.error(config);
     if (!config.value) return false;
     return (
         invoiceIn.value?.supplier?.sageFarmerWithholdingFk ===
@@ -284,7 +283,7 @@ const createInvoiceInCorrection = async () => {
             <InvoiceInToBook>
                 <template #content="{ book }">
                     <QItem
-                        v-if="!entity?.isBooked && isAdministrative()"
+                        v-if="!entity?.isBooked && canEditProp('toBook')"
                         v-ripple
                         clickable
                         @click="book(entityId)"
@@ -294,7 +293,7 @@ const createInvoiceInCorrection = async () => {
                 </template>
             </InvoiceInToBook>
             <QItem
-                v-if="entity?.isBooked && isAdministrative()"
+                v-if="entity?.isBooked && canEditProp('toUnBook')"
                 v-ripple
                 clickable
                 @click="triggerMenu('unbook')"
@@ -304,7 +303,7 @@ const createInvoiceInCorrection = async () => {
                 </QItemSection>
             </QItem>
             <QItem
-                v-if="isAdministrative()"
+                v-if="canEditProp('deleteById')"
                 v-ripple
                 clickable
                 @click="triggerMenu('delete')"
@@ -312,7 +311,7 @@ const createInvoiceInCorrection = async () => {
                 <QItemSection>{{ t('Delete invoice') }}</QItemSection>
             </QItem>
             <QItem
-                v-if="isAdministrative()"
+                v-if="canEditProp('clone')"
                 v-ripple
                 clickable
                 @click="triggerMenu('clone')"
diff --git a/src/pages/Worker/Card/WorkerLocker.vue b/src/pages/Worker/Card/WorkerLocker.vue
index f19fc8ae6..ba5c0de97 100644
--- a/src/pages/Worker/Card/WorkerLocker.vue
+++ b/src/pages/Worker/Card/WorkerLocker.vue
@@ -3,13 +3,13 @@ import { ref, computed } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import axios from 'axios';
-import { useRole } from 'src/composables/useRole';
+import { useAcl } from 'src/composables/useAcl';
 import FormModel from 'components/FormModel.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
 import { useArrayData } from 'src/composables/useArrayData';
 import FetchData from 'components/FetchData.vue';
 
-const { hasAny } = useRole();
+const { hasAny } = useAcl();
 const { t } = useI18n();
 const fetchData = ref();
 const originaLockerId = ref();
@@ -57,7 +57,7 @@ const init = async (data) => {
                 option-label="code"
                 option-value="id"
                 hide-selected
-                :readonly="!hasAny(['productionBoss', 'hr'])"
+                :readonly="!hasAny('Worker','__get__locker','READ')"
             />
         </template>
     </FormModel>

From c766110bd90016c3de35ff3d1d33067b0247b940 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Thu, 1 Aug 2024 14:13:37 +0200
Subject: [PATCH 006/228] chore: refs #4074 wip replace useRole for useAcl

---
 src/components/common/VnSelectDialog.vue      |  7 +++
 src/pages/Item/Card/ItemSummary.vue           | 55 ++++++++-----------
 src/pages/Supplier/Card/SupplierSummary.vue   | 13 ++---
 .../Travel/Card/TravelDescriptorMenuItems.vue |  9 +--
 src/pages/Worker/Card/WorkerTimeControl.vue   | 18 +++---
 .../Worker/Card/WorkerTimeReasonForm.vue      |  4 +-
 src/pages/Worker/WorkerList.vue               |  2 +-
 7 files changed, 52 insertions(+), 56 deletions(-)

diff --git a/src/components/common/VnSelectDialog.vue b/src/components/common/VnSelectDialog.vue
index 7f7c29f5d..6f2be4bfe 100644
--- a/src/components/common/VnSelectDialog.vue
+++ b/src/components/common/VnSelectDialog.vue
@@ -1,6 +1,7 @@
 <script setup>
 import { ref, computed } from 'vue';
 import { useRole } from 'src/composables/useRole';
+import { useAcl } from 'src/composables/useAcl';
 
 import VnSelect from 'src/components/common/VnSelect.vue';
 const emit = defineEmits(['update:modelValue']);
@@ -11,6 +12,10 @@ const $props = defineProps({
         type: Array,
         default: () => ['developer'],
     },
+    acls: {
+        type: Array,
+        default: () => [],
+    },
     actionIcon: {
         type: String,
         default: 'add',
@@ -22,9 +27,11 @@ const $props = defineProps({
 });
 
 const role = useRole();
+const acl = useAcl()
 const showForm = ref(false);
 
 const isAllowedToCreate = computed(() => {
+    if ($props.acls.length) console.log(acl.hasAny($props.acls));
     return role.hasAny($props.rolesAllowedToCreate);
 });
 
diff --git a/src/pages/Item/Card/ItemSummary.vue b/src/pages/Item/Card/ItemSummary.vue
index 7af3e0fa0..1571a903e 100644
--- a/src/pages/Item/Card/ItemSummary.vue
+++ b/src/pages/Item/Card/ItemSummary.vue
@@ -9,6 +9,7 @@ import ItemDescriptorImage from 'src/pages/Item/Card/ItemDescriptorImage.vue';
 import VnUserLink from 'src/components/ui/VnUserLink.vue';
 
 import { useRole } from 'src/composables/useRole';
+import { useAcl } from 'src/composables/useAcl';
 
 const $props = defineProps({
     id: {
@@ -19,21 +20,13 @@ const $props = defineProps({
 
 const route = useRoute();
 const { t } = useI18n();
-const roleState = useRole();
 
 const entityId = computed(() => $props.id || route.params.id);
 
-const isBuyer = computed(() => {
-    return roleState.hasAny(['buyer']);
-});
+const canEdit = computed(() => useAcl().hasAny('Item', '*', 'WRITE'));
 
-const isReplenisher = computed(() => {
-    return roleState.hasAny(['replenisher']);
-});
+const isReplenisher = computed(() => useRole().hasAny(['replenisher']));
 
-const isAdministrative = computed(() => {
-    return roleState.hasAny(['administrative']);
-});
 </script>
 
 <template>
@@ -66,13 +59,13 @@ const isAdministrative = computed(() => {
             </QCard>
             <QCard class="vn-one">
                 <component
-                    :is="isBuyer ? 'router-link' : 'span'"
+                    :is="canEdit ? 'router-link' : 'span'"
                     :to="{ name: 'ItemBasicData', params: { id: entityId } }"
                     class="header"
-                    :class="{ 'header-link': isBuyer }"
+                    :class="{ 'header-link': canEdit }"
                 >
                     {{ t('item.summary.basicData') }}
-                    <QIcon v-if="isBuyer" name="open_in_new" />
+                    <QIcon v-if="canEdit" name="open_in_new" />
                 </component>
                 <VnLv :label="t('item.summary.name')" :value="item.name" />
                 <VnLv :label="t('item.summary.completeName')" :value="item.longName" />
@@ -105,13 +98,13 @@ const isAdministrative = computed(() => {
             </QCard>
             <QCard class="vn-one">
                 <component
-                    :is="isBuyer ? 'router-link' : 'span'"
+                    :is="canEdit ? 'router-link' : 'span'"
                     :to="{ name: 'ItemBasicData', params: { id: entityId } }"
                     class="header"
-                    :class="{ 'header-link': isBuyer }"
+                    :class="{ 'header-link': canEdit }"
                 >
                     {{ t('item.summary.otherData') }}
-                    <QIcon v-if="isBuyer" name="open_in_new" />
+                    <QIcon v-if="canEdit" name="open_in_new" />
                 </component>
                 <VnLv
                     :label="t('item.summary.intrastatCode')"
@@ -138,13 +131,13 @@ const isAdministrative = computed(() => {
             </QCard>
             <QCard class="vn-one">
                 <component
-                    :is="isBuyer || isReplenisher ? 'router-link' : 'span'"
+                    :is="canEdit || isReplenisher ? 'router-link' : 'span'"
                     :to="{ name: 'ItemTags', params: { id: entityId } }"
                     class="header"
-                    :class="{ 'header-link': isBuyer || isReplenisher }"
+                    :class="{ 'header-link': canEdit || isReplenisher }"
                 >
                     {{ t('item.summary.tags') }}
-                    <QIcon v-if="isBuyer || isReplenisher" name="open_in_new" />
+                    <QIcon v-if="canEdit || isReplenisher" name="open_in_new" />
                 </component>
                 <VnLv
                     v-for="(tag, index) in tags"
@@ -155,13 +148,13 @@ const isAdministrative = computed(() => {
             </QCard>
             <QCard class="vn-one" v-if="item.description">
                 <component
-                    :is="isBuyer ? 'router-link' : 'span'"
+                    :is="canEdit ? 'router-link' : 'span'"
                     :to="{ name: 'ItemBasicData', params: { id: entityId } }"
                     class="header"
-                    :class="{ 'header-link': isBuyer }"
+                    :class="{ 'header-link': canEdit }"
                 >
                     {{ t('item.summary.description') }}
-                    <QIcon v-if="isBuyer" name="open_in_new" />
+                    <QIcon v-if="canEdit" name="open_in_new" />
                 </component>
                 <p>
                     {{ item.description }}
@@ -169,13 +162,13 @@ const isAdministrative = computed(() => {
             </QCard>
             <QCard class="vn-one">
                 <component
-                    :is="isBuyer || isAdministrative ? 'router-link' : 'span'"
+                    :is="canEdit ? 'router-link' : 'span'"
                     :to="{ name: 'ItemTax', params: { id: entityId } }"
                     class="header"
-                    :class="{ 'header-link': isBuyer || isAdministrative }"
+                    :class="{ 'header-link': canEdit }"
                 >
                     {{ t('item.summary.tax') }}
-                    <QIcon v-if="isBuyer || isAdministrative" name="open_in_new" />
+                    <QIcon v-if="canEdit" name="open_in_new" />
                 </component>
                 <VnLv
                     v-for="(tax, index) in item.taxes"
@@ -186,13 +179,13 @@ const isAdministrative = computed(() => {
             </QCard>
             <QCard class="vn-one">
                 <component
-                    :is="isBuyer ? 'router-link' : 'span'"
+                    :is="canEdit ? 'router-link' : 'span'"
                     :to="{ name: 'ItemBotanical', params: { id: entityId } }"
                     class="header"
-                    :class="{ 'header-link': isBuyer }"
+                    :class="{ 'header-link': canEdit }"
                 >
                     {{ t('item.summary.botanical') }}
-                    <QIcon v-if="isBuyer" name="open_in_new" />
+                    <QIcon v-if="canEdit" name="open_in_new" />
                 </component>
                 <VnLv :label="t('item.summary.genus')" :value="botanical?.genus?.name" />
                 <VnLv
@@ -202,13 +195,13 @@ const isAdministrative = computed(() => {
             </QCard>
             <QCard class="vn-one">
                 <component
-                    :is="isBuyer || isReplenisher ? 'router-link' : 'span'"
+                    :is="canEdit || isReplenisher ? 'router-link' : 'span'"
                     :to="{ name: 'ItemBarcode', params: { id: entityId } }"
                     class="header"
-                    :class="{ 'header-link': isBuyer || isReplenisher }"
+                    :class="{ 'header-link': canEdit || isReplenisher }"
                 >
                     {{ t('item.summary.barcode') }}
-                    <QIcon v-if="isBuyer || isReplenisher" name="open_in_new" />
+                    <QIcon v-if="canEdit || isReplenisher" name="open_in_new" />
                 </component>
                 <p v-for="(barcode, index) in item.itemBarcode" :key="index">
                     {{ barcode.code }}
diff --git a/src/pages/Supplier/Card/SupplierSummary.vue b/src/pages/Supplier/Card/SupplierSummary.vue
index 822586b47..04f763c15 100644
--- a/src/pages/Supplier/Card/SupplierSummary.vue
+++ b/src/pages/Supplier/Card/SupplierSummary.vue
@@ -4,13 +4,12 @@ import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import CardSummary from 'components/ui/CardSummary.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
-import { useRole } from 'src/composables/useRole';
+import { useAcl } from 'src/composables/useAcl';
 import { dashIfEmpty } from 'src/filters';
 import VnUserLink from 'src/components/ui/VnUserLink.vue';
 import VnTitle from 'src/components/common/VnTitle.vue';
 
 const route = useRoute();
-const roleState = useRole();
 const { t } = useI18n();
 
 const $props = defineProps({
@@ -32,13 +31,11 @@ async function setData(data) {
     }
 }
 
-const isAdministrative = computed(() => {
-    return roleState.hasAny(['administrative']);
-});
 
-function getUrl(section) {
-    return isAdministrative.value && `#/supplier/${entityId.value}/${section}`;
-}
+
+const getUrl = (section) => 
+    useAcl().hasAny('Supplier','*','WRITE') ? `#/supplier/${entityId.value}/${section}`:'';
+
 </script>
 
 <template>
diff --git a/src/pages/Travel/Card/TravelDescriptorMenuItems.vue b/src/pages/Travel/Card/TravelDescriptorMenuItems.vue
index bd2561211..47b6f0aa6 100644
--- a/src/pages/Travel/Card/TravelDescriptorMenuItems.vue
+++ b/src/pages/Travel/Card/TravelDescriptorMenuItems.vue
@@ -8,7 +8,7 @@ import VnConfirm from 'components/ui/VnConfirm.vue';
 
 import axios from 'axios';
 import useNotify from 'src/composables/useNotify.js';
-import { useRole } from 'src/composables/useRole';
+import { useAcl } from 'src/composables/useAcl';
 
 const $props = defineProps({
     travel: {
@@ -21,7 +21,6 @@ const { t } = useI18n();
 const router = useRouter();
 const quasar = useQuasar();
 const { notify } = useNotify();
-const role = useRole();
 
 const redirectToCreateView = (queryParams) => {
     router.push({ name: 'TravelCreate', query: { travelData: queryParams } });
@@ -42,9 +41,7 @@ const cloneTravelWithEntries = async () => {
     }
 };
 
-const isBuyer = computed(() => {
-    return role.hasAny(['buyer']);
-});
+const canDelete = computed(() => useAcl().hasAny('Travel','*','WRITE'));
 
 const openDeleteEntryDialog = (id) => {
     quasar
@@ -81,7 +78,7 @@ const deleteTravel = async (id) => {
         </QItemSection>
     </QItem>
     <QItem
-        v-if="isBuyer && travel.totalEntries === 0"
+        v-if="canDelete && travel.totalEntries === 0"
         v-ripple
         clickable
         @click="openDeleteEntryDialog(travel.id)"
diff --git a/src/pages/Worker/Card/WorkerTimeControl.vue b/src/pages/Worker/Card/WorkerTimeControl.vue
index 7bce5983c..1081cba61 100644
--- a/src/pages/Worker/Card/WorkerTimeControl.vue
+++ b/src/pages/Worker/Card/WorkerTimeControl.vue
@@ -13,6 +13,7 @@ import WorkerTimeControlCalendar from 'pages/Worker/Card/WorkerTimeControlCalend
 import useNotify from 'src/composables/useNotify.js';
 import axios from 'axios';
 import { useRole } from 'src/composables/useRole';
+import { useAcl } from 'src/composables/useAcl';
 import { useWeekdayStore } from 'src/stores/useWeekdayStore';
 import { useStateStore } from 'stores/useStateStore';
 import { useState } from 'src/composables/useState';
@@ -26,7 +27,6 @@ import { date } from 'quasar';
 const route = useRoute();
 const { t, locale } = useI18n();
 const { notify } = useNotify();
-const { hasAny } = useRole();
 const _state = useState();
 const user = _state.getUser();
 const stateStore = useStateStore();
@@ -62,9 +62,11 @@ const arrayData = useArrayData('workerData');
 
 const worker = computed(() => arrayData.store?.data);
 
-const isHr = computed(() => hasAny(['hr']));
+const isHr = computed(() => useRole().hasAny(['hr']));
 
-const isHimSelf = computed(() => user.value.id === Number(route.params.id));
+const canSend = computed(() => useAcl().hasAny('WorkerTimeControl', 'sendMail', 'WRITE'));
+
+const isHimself = computed(() => user.value.id === Number(route.params.id));
 
 const columns = computed(() => {
     return weekdayStore.getLocales?.map((day, index) => {
@@ -443,7 +445,7 @@ onMounted(async () => {
         <div>
             <QBtnGroup push class="q-gutter-x-sm" flat>
                 <QBtn
-                    v-if="isHimSelf && state"
+                    v-if="isHimself && state"
                     :label="t('Satisfied')"
                     color="primary"
                     type="submit"
@@ -451,7 +453,7 @@ onMounted(async () => {
                     @click="isSatisfied()"
                 />
                 <QBtn
-                    v-if="isHimSelf && state"
+                    v-if="isHimself && state"
                     :label="t('Not satisfied')"
                     color="primary"
                     type="submit"
@@ -462,14 +464,14 @@ onMounted(async () => {
             </QBtnGroup>
             <QBtnGroup push class="q-gutter-x-sm q-ml-none" flat>
                 <QBtn
-                    v-if="reason && state && (isHimSelf || isHr)"
+                    v-if="reason && state && (isHimself || isHr)"
                     :label="t('Reason')"
                     color="primary"
                     type="submit"
                     @click="showReasonForm()"
                 />
                 <QBtn
-                    v-if="isHr && state !== 'CONFIRMED' && canResend"
+                    v-if="canSend && state !== 'CONFIRMED' && canResend"
                     :label="state ? t('Resend') : t('globals.send')"
                     color="primary"
                     type="submit"
@@ -596,7 +598,7 @@ onMounted(async () => {
             <WorkerTimeReasonForm
                 @on-submit="isUnsatisfied($event)"
                 :reason="reason"
-                :is-him-self="isHimSelf"
+                :is-himself="isHimself"
             />
         </QDialog>
     </QPage>
diff --git a/src/pages/Worker/Card/WorkerTimeReasonForm.vue b/src/pages/Worker/Card/WorkerTimeReasonForm.vue
index 5c1ab9118..23bdba15e 100644
--- a/src/pages/Worker/Card/WorkerTimeReasonForm.vue
+++ b/src/pages/Worker/Card/WorkerTimeReasonForm.vue
@@ -9,7 +9,7 @@ const $props = defineProps({
         type: String,
         default: '',
     },
-    isHimSelf: {
+    isHimself: {
         type: Boolean,
         default: false,
     },
@@ -40,7 +40,7 @@ const closeForm = () => {
                 v-model="reasonFormData"
                 type="textarea"
                 autogrow
-                :disable="!isHimSelf"
+                :disable="!isHimself"
             />
         </template>
     </FormPopup>
diff --git a/src/pages/Worker/WorkerList.vue b/src/pages/Worker/WorkerList.vue
index 0c2656597..45bc41856 100644
--- a/src/pages/Worker/WorkerList.vue
+++ b/src/pages/Worker/WorkerList.vue
@@ -269,7 +269,7 @@ function uppercaseStreetModel(data) {
                         option-label="name"
                         option-value="id"
                         hide-selected
-                        :roles-allowed-to-create="['salesAssistant', 'hr']"
+                        :acls="[]"
                         :disable="data.isFreelance"
                     >
                         <template #form>

From dcc2f4dfde6ba958c59938c316f57327ca8a2a66 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Thu, 1 Aug 2024 14:14:28 +0200
Subject: [PATCH 007/228] chore: refs #4074 admit several acls

---
 src/composables/useAcl.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/composables/useAcl.js b/src/composables/useAcl.js
index 46aaa3c25..be6dbc241 100644
--- a/src/composables/useAcl.js
+++ b/src/composables/useAcl.js
@@ -16,10 +16,11 @@ export function useAcl() {
         state.setAcls(acls);
     }
 
-    function hasAny(model, prop, accessType) {
+    function hasAny(model, props = [], accessType) {
         const acls = state.getAcls().value[model];
+        Array.isArray(props) || (props = [props]);
         if (acls) 
-            return ['*', prop].some((key) => {
+            return ['*', ...props].some((key) => {
                 const acl = acls[key];
                 return acl && (acl['*'] || acl[accessType]);
             });

From 27034d1dc249513d7b33f7fb589f7a9167cbae99 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Thu, 1 Aug 2024 14:46:04 +0200
Subject: [PATCH 008/228] chore: refs #4074 admit several acls

---
 src/composables/useAcl.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/composables/useAcl.js b/src/composables/useAcl.js
index be6dbc241..f746b6677 100644
--- a/src/composables/useAcl.js
+++ b/src/composables/useAcl.js
@@ -16,9 +16,8 @@ export function useAcl() {
         state.setAcls(acls);
     }
 
-    function hasAny(model, props = [], accessType) {
+    function hasAny(model, props, accessType) {
         const acls = state.getAcls().value[model];
-        Array.isArray(props) || (props = [props]);
         if (acls) 
             return ['*', ...props].some((key) => {
                 const acl = acls[key];

From fb496d7fc6af75774a8574f06e16d1a26778d6a4 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Thu, 1 Aug 2024 16:08:40 +0200
Subject: [PATCH 009/228] chore: refs #4074 admit several acls

---
 src/composables/useAcl.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/composables/useAcl.js b/src/composables/useAcl.js
index f746b6677..bebeda039 100644
--- a/src/composables/useAcl.js
+++ b/src/composables/useAcl.js
@@ -18,6 +18,7 @@ export function useAcl() {
 
     function hasAny(model, props, accessType) {
         const acls = state.getAcls().value[model];
+        Array.isArray(props) || (props = [props]);
         if (acls) 
             return ['*', ...props].some((key) => {
                 const acl = acls[key];

From db18e8c937c0f2684232fd162541f6f43acbf1ab Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Thu, 1 Aug 2024 16:10:26 +0200
Subject: [PATCH 010/228] fix: refs #4074 workerCard data-key

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

diff --git a/src/pages/Worker/Card/WorkerCard.vue b/src/pages/Worker/Card/WorkerCard.vue
index 1a5bacf2f..fb9ab9666 100644
--- a/src/pages/Worker/Card/WorkerCard.vue
+++ b/src/pages/Worker/Card/WorkerCard.vue
@@ -5,7 +5,7 @@ import WorkerFilter from '../WorkerFilter.vue';
 </script>
 <template>
     <VnCard
-        data-key="Workers"
+        data-key="Worker"
         base-url="Workers"
         :descriptor="WorkerDescriptor"
         :filter-panel="WorkerFilter"

From 199ed8021211338361b8b9d8f6ed345699d05623 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Thu, 1 Aug 2024 16:39:20 +0200
Subject: [PATCH 011/228] Merge branch 'dev' of
 https://gitea.verdnatura.es/verdnatura/salix-front into 4074-useAcls

---
 src/pages/Account/AccountList.vue | 185 ++++++++++++------------------
 1 file changed, 72 insertions(+), 113 deletions(-)

diff --git a/src/pages/Account/AccountList.vue b/src/pages/Account/AccountList.vue
index 79c77a3c1..ecb027e49 100644
--- a/src/pages/Account/AccountList.vue
+++ b/src/pages/Account/AccountList.vue
@@ -1,33 +1,66 @@
 <script setup>
 import { useI18n } from 'vue-i18n';
-import { useRouter } from 'vue-router';
-import { computed, ref } from 'vue';
-
-import VnPaginate from 'src/components/ui/VnPaginate.vue';
+import { ref, computed } from 'vue';
+import VnTable from 'components/VnTable/VnTable.vue';
 import VnSearchbar from 'components/ui/VnSearchbar.vue';
-import VnLv from 'src/components/ui/VnLv.vue';
-import CardList from 'src/components/ui/CardList.vue';
 import AccountSummary from './Card/AccountSummary.vue';
-import AccountFilter from './AccountFilter.vue';
-import AccountCreate from './AccountCreate.vue';
-
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
-import { useStateStore } from 'stores/useStateStore';
-import { useAcl } from 'src/composables/useAcl';
-import { QDialog } from 'quasar';
 
-const stateStore = useStateStore();
-const router = useRouter();
 const { t } = useI18n();
 const { viewSummary } = useSummaryDialog();
-const accountCreateDialogRef = ref(null);
-const showNewUserBtn = computed(() => useAcl().hasAny('Account', '*', 'WRITE'));
-
-const filter = {
-    fields: ['id', 'nickname', 'name', 'role'],
-    include: { relation: 'role', scope: { fields: ['id', 'name'] } },
-};
+const tableRef = ref();
 
+const columns = computed(() => [
+    {
+        align: 'left',
+        name: 'id',
+        label: t('id'),
+        isId: true,
+        field: 'id',
+        cardVisible: true,
+    },
+    {
+        align: 'left',
+        name: 'username',
+        label: t('nickname'),
+        isTitle: true,
+        component: 'input',
+        columnField: {
+            component: null,
+        },
+        columnFilter: {
+            inWhere: true,
+        },
+        cardVisible: true,
+        create: true,
+    },
+    {
+        align: 'left',
+        name: 'name',
+        label: t('name'),
+        component: 'input',
+        columnField: {
+            component: null,
+        },
+        columnFilter: {
+            inWhere: true,
+        },
+        cardVisible: true,
+        create: true,
+    },
+    {
+        align: 'right',
+        label: '',
+        name: 'tableActions',
+        actions: [
+            {
+                title: t('View Summary'),
+                icon: 'preview',
+                action: (row) => viewSummary(row.id, AccountSummary),
+            },
+        ],
+    },
+]);
 const exprBuilder = (param, value) => {
     switch (param) {
         case 'search':
@@ -46,99 +79,25 @@ const exprBuilder = (param, value) => {
             return { [param]: value };
     }
 };
-
-const getApiUrl = () => new URL(window.location).origin;
-
-const navigate = (event, id) => {
-    if (event.ctrlKey || event.metaKey)
-        return window.open(`${getApiUrl()}/#/account/${id}/summary`);
-    router.push({ path: `/account/${id}` });
-};
-
-const openCreateModal = () => accountCreateDialogRef.value.show();
 </script>
 
 <template>
-    <template v-if="stateStore.isHeaderMounted()">
-        <Teleport to="#searchbar">
-            <VnSearchbar
-                data-key="AccountList"
-                url="VnUsers/preview"
-                :expr-builder="exprBuilder"
-                :label="t('account.search')"
-                :info="t('account.searchInfo')"
-            />
-        </Teleport>
-        <Teleport to="#actions-append">
-            <div class="row q-gutter-x-sm">
-                <QBtn
-                    flat
-                    @click="stateStore.toggleRightDrawer()"
-                    round
-                    dense
-                    icon="menu"
-                >
-                    <QTooltip bottom anchor="bottom right">
-                        {{ t('globals.collapseMenu') }}
-                    </QTooltip>
-                </QBtn>
-            </div>
-        </Teleport>
-    </template>
-    <QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above>
-        <QScrollArea class="fit text-grey-8">
-            <AccountFilter data-key="AccountList" :expr-builder="exprBuilder" />
-        </QScrollArea>
-    </QDrawer>
-    <QPage class="column items-center q-pa-md">
-        <div class="vn-card-list">
-            <VnPaginate
-                :filter="filter"
-                data-key="AccountList"
-                url="VnUsers/preview"
-                auto-load
-            >
-                <template #body="{ rows }">
-                    <CardList
-                        v-for="row of rows"
-                        :id="row.id"
-                        :key="row.id"
-                        :title="row.nickname"
-                        @click="navigate($event, row.id)"
-                    >
-                        <template #list-items>
-                            <VnLv :label="t('account.card.name')" :value="row.nickname">
-                            </VnLv>
-                            <VnLv
-                                :label="t('account.card.nickname')"
-                                :value="row.username"
-                            >
-                            </VnLv>
-                        </template>
-                        <template #actions>
-                            <QBtn
-                                :label="t('components.smartCard.openSummary')"
-                                @click.stop="viewSummary(row.id, AccountSummary)"
-                                color="primary"
-                                style="margin-top: 15px"
-                            />
-                        </template>
-                    </CardList>
-                </template>
-            </VnPaginate>
-        </div>
-        <QDialog
-            ref="accountCreateDialogRef"
-            transition-hide="scale"
-            transition-show="scale"
-        >
-            <AccountCreate />
-        </QDialog>
-        <QPageSticky :offset="[20, 20]" v-if="showNewUserBtn">
-            <QBtn @click="openCreateModal" color="primary" fab icon="add" />
-            <QTooltip class="text-no-wrap">
-                {{ t('account.card.newUser') }}
-            </QTooltip>
-        </QPageSticky>
-    </QPage>
+    <VnSearchbar
+        :label="t('account.search')"
+        data-key="AccountUsers"
+        :expr-builder="exprBuilder"
+        :info="t('account.searchInfo')"
+    />
+
+    <VnTable
+        ref="tableRef"
+        data-key="AccountUsers"
+        url="VnUsers/preview"
+        order="id DESC"
+        :columns="columns"
+        default-mode="table"
+        auto-load
+        redirect="account"
+        :use-model="true"
+    />
 </template>

From 53aec247904b6117a08cdb28438b36d5ef46aaba Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Fri, 2 Aug 2024 09:04:16 +0200
Subject: [PATCH 012/228] chore: refs #4074 drop workerCreate

---
 src/pages/Worker/WorkerCreate.vue | 245 ------------------------------
 src/router/modules/worker.js      |   9 --
 2 files changed, 254 deletions(-)
 delete mode 100644 src/pages/Worker/WorkerCreate.vue

diff --git a/src/pages/Worker/WorkerCreate.vue b/src/pages/Worker/WorkerCreate.vue
deleted file mode 100644
index a1ded2bfd..000000000
--- a/src/pages/Worker/WorkerCreate.vue
+++ /dev/null
@@ -1,245 +0,0 @@
-<script setup>
-import { onBeforeMount, ref } from 'vue';
-import { useI18n } from 'vue-i18n';
-import axios from 'axios';
-import { useUserConfig } from 'src/composables/useUserConfig';
-import VnRow from 'components/ui/VnRow.vue';
-import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
-import VnInputDate from 'components/common/VnInputDate.vue';
-import VnSelect from 'src/components/common/VnSelect.vue';
-import VnLocation from 'src/components/common/VnLocation.vue';
-import VnInput from 'src/components/common/VnInput.vue';
-import VnSelectDialog from 'src/components/common/VnSelectDialog.vue';
-import FetchData from 'components/FetchData.vue';
-import FormModel from 'components/FormModel.vue';
-import CreateBankEntityForm from 'src/components/CreateBankEntityForm.vue';
-import VnRadio from 'src/components/common/VnRadio.vue';
-
-const { t } = useI18n();
-
-const companiesOptions = ref([]);
-const workersOptions = ref([]);
-const payMethodsOptions = ref([]);
-const bankEntitiesOptions = ref([]);
-const formData = ref({ isFreelance: false });
-const defaultPayMethod = ref(0);
-
-function handleLocation(data, location) {
-    const { town, code, provinceFk, countryFk } = location ?? {};
-    data.postcode = code;
-    data.city = town;
-    data.provinceFk = provinceFk;
-    data.countryFk = countryFk;
-}
-
-onBeforeMount(async () => {
-    const userInfo = await useUserConfig().fetch();
-    formData.value.companyFk = userInfo.companyFk;
-
-    const { data } = await axios.get('WorkerConfigs/findOne', {
-        params: { field: ['payMethodFk'] },
-    });
-    defaultPayMethod.value = data.payMethodFk;
-    formData.value.payMethodFk = defaultPayMethod.value;
-});
-</script>
-<template>
-    <FetchData
-        url="Companies"
-        @on-fetch="(data) => (companiesOptions = data)"
-        auto-load
-    />
-    <FetchData
-        url="Workers/search"
-        @on-fetch="(data) => (workersOptions = data)"
-        auto-load
-    />
-    <FetchData
-        url="Paymethods"
-        @on-fetch="(data) => (payMethodsOptions = data)"
-        auto-load
-    />
-    <FetchData
-        url="BankEntities"
-        @on-fetch="(data) => (bankEntitiesOptions = data)"
-        auto-load
-    />
-    <QPage>
-        <VnSubToolbar>
-            <template #st-data>
-                <VnRadio
-                    v-model="formData.isFreelance"
-                    :val="false"
-                    :label="`${t('Internal')}`"
-                    @update:model-value="formData.payMethodFk = defaultPayMethod"
-                />
-                <VnRadio
-                    v-model="formData.isFreelance"
-                    :val="true"
-                    :label="`${t('External')}`"
-                    @update:model-value="delete formData.payMethodFk"
-                />
-            </template>
-        </VnSubToolbar>
-        <FormModel
-            url-create="Workers/new"
-            model="worker"
-            :form-initial-data="formData"
-            @on-data-saved="(__, { id }) => $router.push({ path: `/worker/${id}` })"
-        >
-            <template #form="{ data, validate }">
-                <VnRow>
-                    <VnInput
-                        v-model="data.firstName"
-                        :label="t('worker.create.name')"
-                        :rules="validate('Worker.firstName')"
-                    />
-                    <VnInput
-                        v-model="data.lastNames"
-                        :label="t('worker.create.lastName')"
-                        :rules="validate('Worker.lastNames')"
-                    />
-                    <VnInput
-                        v-model="data.code"
-                        :label="t('worker.create.code')"
-                        :rules="validate('Worker.code')"
-                    />
-                </VnRow>
-                <VnRow>
-                    <VnInput
-                        v-model="data.name"
-                        :label="t('worker.create.webUser')"
-                        :rules="validate('Worker.name')"
-                    />
-                    <VnInput
-                        v-model="data.email"
-                        :label="t('worker.create.personalEmail')"
-                        :rules="validate('Worker.email')"
-                    />
-                </VnRow>
-                <VnRow>
-                    <VnSelect
-                        :label="t('worker.create.company')"
-                        v-model="data.companyFk"
-                        :options="companiesOptions"
-                        option-value="id"
-                        option-label="code"
-                        hide-selected
-                        :rules="validate('Worker.company')"
-                    />
-                    <VnSelect
-                        :label="t('worker.create.boss')"
-                        v-model="data.bossFk"
-                        :options="workersOptions"
-                        option-value="id"
-                        option-label="name"
-                        hide-selected
-                        :rules="validate('Worker.boss')"
-                    >
-                        <template #option="scope">
-                            <QItem v-bind="scope.itemProps">
-                                <QItemSection>
-                                    <QItemLabel>{{ scope.opt.name }}</QItemLabel>
-                                    <QItemLabel caption
-                                        >{{ scope.opt.nickname }},
-                                        {{ scope.opt.code }}
-                                    </QItemLabel>
-                                </QItemSection>
-                            </QItem>
-                        </template>
-                    </VnSelect>
-                </VnRow>
-                <VnRow>
-                    <VnInput
-                        v-model="data.fi"
-                        :label="t('worker.create.fi')"
-                        :rules="validate('Worker.fi')"
-                    />
-                    <VnInputDate
-                        v-model="data.birth"
-                        :label="t('worker.create.birth')"
-                        :rules="validate('Worker.birth')"
-                        :disable="formData.isFreelance"
-                    />
-                    <VnInput
-                        v-model="data.phone"
-                        :label="t('worker.create.phone')"
-                        :rules="validate('Worker.phone')"
-                        :disable="formData.isFreelance"
-                    />
-                </VnRow>
-                <VnRow>
-                    <VnLocation
-                        :rules="validate('Worker.postcode')"
-                        :roles-allowed-to-create="['deliveryAssistant']"
-                        v-model="data.location"
-                        @update:model-value="(location) => handleLocation(data, location)"
-                        :disable="formData.isFreelance"
-                    >
-                    </VnLocation>
-                </VnRow>
-                <VnRow>
-                    <VnInput
-                        :label="t('worker.create.street')"
-                        v-model="data.street"
-                        :rules="validate('Worker.street')"
-                        :disable="formData.isFreelance"
-                    />
-                </VnRow>
-                <VnRow>
-                    <VnSelect
-                        :label="t('worker.create.payMethods')"
-                        v-model="data.payMethodFk"
-                        :options="payMethodsOptions"
-                        option-value="id"
-                        option-label="name"
-                        map-options
-                        hide-selected
-                        :rules="validate('Worker.payMethodFk')"
-                        :disable="formData.isFreelance"
-                        @update:model-value="(val) => !val && delete formData.payMethodFk"
-                    />
-                    <VnInput
-                        v-model="data.iban"
-                        :label="t('worker.create.iban')"
-                        :rules="validate('Worker.iban')"
-                        :disable="formData.isFreelance"
-                    >
-                        <template #append>
-                            <QIcon name="info" class="cursor-info">
-                                <QTooltip>{{ t('components.iban_tooltip') }}</QTooltip>
-                            </QIcon>
-                        </template>
-                    </VnInput>
-                    <VnSelectDialog
-                        :label="t('worker.create.bankEntity')"
-                        v-model="data.bankEntityFk"
-                        :options="bankEntitiesOptions"
-                        option-label="name"
-                        option-value="id"
-                        hide-selected
-                        :roles-allowed-to-create="['salesAssistant', 'hr']"
-                        :rules="validate('Worker.bankEntity')"
-                        :disable="formData.isFreelance"
-                    >
-                        <template #form>
-                            <CreateBankEntityForm
-                                @on-data-saved="(data) => bankEntitiesOptions.push(data)"
-                            />
-                        </template>
-                        <template #option="scope">
-                            <QItem v-bind="scope.itemProps">
-                                <QItemSection v-if="scope.opt">
-                                    <QItemLabel
-                                        >{{ scope.opt.bic }}
-                                        {{ scope.opt.name }}</QItemLabel
-                                    >
-                                </QItemSection>
-                            </QItem>
-                        </template>
-                    </VnSelectDialog>
-                </VnRow>
-            </template>
-        </FormModel>
-    </QPage>
-</template>
diff --git a/src/router/modules/worker.js b/src/router/modules/worker.js
index f80df5e06..b40c411c2 100644
--- a/src/router/modules/worker.js
+++ b/src/router/modules/worker.js
@@ -52,15 +52,6 @@ export default {
                     },
                     component: () => import('src/pages/Worker/WorkerDepartment.vue'),
                 },
-                {
-                    path: 'create',
-                    name: 'WorkerCreate',
-                    meta: {
-                        title: 'workerCreate',
-                        icon: 'add',
-                    },
-                    component: () => import('src/pages/Worker/WorkerCreate.vue'),
-                },
             ],
         },
         {

From 6c3c03722f263203f5707f72ca021533e97dd3d4 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Fri, 2 Aug 2024 09:37:48 +0200
Subject: [PATCH 013/228] feat: refs #4074 useAcl in vnSelectDialog

---
 src/components/common/VnSelectDialog.vue | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/components/common/VnSelectDialog.vue b/src/components/common/VnSelectDialog.vue
index 6f2be4bfe..0ade82bda 100644
--- a/src/components/common/VnSelectDialog.vue
+++ b/src/components/common/VnSelectDialog.vue
@@ -27,17 +27,17 @@ const $props = defineProps({
 });
 
 const role = useRole();
-const acl = useAcl()
+const acl = useAcl();
 const showForm = ref(false);
 
 const isAllowedToCreate = computed(() => {
-    if ($props.acls.length) console.log(acl.hasAny($props.acls));
-    return role.hasAny($props.rolesAllowedToCreate);
+    const hasMissingAcl = $props.acls.some(
+        (x) => !acl.hasAny(x.model, x.props, x.accessType)
+    );
+    const hasRequiredRole = role.hasAny($props.rolesAllowedToCreate);
+    if ($props.acls.length) return !hasMissingAcl;
+    return hasRequiredRole;
 });
-
-const toggleForm = () => {
-    showForm.value = !showForm.value;
-};
 </script>
 
 <template>
@@ -48,7 +48,7 @@ const toggleForm = () => {
     >
         <template v-if="isAllowedToCreate" #append>
             <QIcon
-                @click.stop.prevent="toggleForm()"
+                @click.stop.prevent="showForm = true"
                 :name="actionIcon"
                 :size="actionIcon === 'add' ? 'xs' : 'sm'"
                 :class="['default-icon', { '--add-icon': actionIcon === 'add' }]"

From 51fec906071e3f62300c780ecd48259aa66c2120 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Fri, 2 Aug 2024 12:04:19 +0200
Subject: [PATCH 014/228] feat: refs #4074 useAcl in vnSelectDialog

---
 src/components/CreateNewPostcodeForm.vue                | 2 +-
 src/components/VnSelectProvince.vue                     | 2 +-
 src/pages/Customer/Card/CustomerBillingData.vue         | 2 +-
 src/pages/Customer/Card/CustomerFiscalData.vue          | 2 +-
 src/pages/Customer/CustomerCreate.vue                   | 2 +-
 src/pages/Customer/CustomerList.vue                     | 2 +-
 src/pages/Customer/components/CustomerAddressCreate.vue | 2 +-
 src/pages/Customer/components/CustomerAddressEdit.vue   | 2 +-
 src/pages/Supplier/Card/SupplierAddressesCreate.vue     | 2 +-
 src/pages/Supplier/Card/SupplierFiscalData.vue          | 2 +-
 src/pages/Worker/WorkerList.vue                         | 4 ++--
 11 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/components/CreateNewPostcodeForm.vue b/src/components/CreateNewPostcodeForm.vue
index e6247226e..14f629c42 100644
--- a/src/components/CreateNewPostcodeForm.vue
+++ b/src/components/CreateNewPostcodeForm.vue
@@ -104,7 +104,7 @@ async function setProvince(id, data) {
                     option-label="name"
                     option-value="id"
                     :rules="validate('postcode.city')"
-                    :roles-allowed-to-create="['deliveryAssistant']"
+                    :acls="[{ model: 'Town', props: '*', accessType: 'WRITE' }]"
                     :emit-value="false"
                     clearable
                 >
diff --git a/src/components/VnSelectProvince.vue b/src/components/VnSelectProvince.vue
index ea10ace19..2f08db611 100644
--- a/src/components/VnSelectProvince.vue
+++ b/src/components/VnSelectProvince.vue
@@ -38,7 +38,7 @@ async function onProvinceCreated(_, data) {
         hide-selected
         v-model="provinceFk"
         :rules="validate && validate('postcode.provinceFk')"
-        :roles-allowed-to-create="['deliveryAssistant']"
+        :acls="[{ model: 'Province', props: '*', accessType: 'WRITE' }]"
     >
         <template #option="{ itemProps, opt }">
             <QItem v-bind="itemProps">
diff --git a/src/pages/Customer/Card/CustomerBillingData.vue b/src/pages/Customer/Card/CustomerBillingData.vue
index b01dc4523..495b871df 100644
--- a/src/pages/Customer/Card/CustomerBillingData.vue
+++ b/src/pages/Customer/Card/CustomerBillingData.vue
@@ -70,7 +70,7 @@ const getBankEntities = (data, formData) => {
                 <VnSelectDialog
                     :label="t('Swift / BIC')"
                     :options="bankEntitiesOptions"
-                    :roles-allowed-to-create="['salesAssistant', 'hr']"
+                    :acls="[{ model: 'BankEntity', props: '*', accessType: 'WRITE' }]"
                     :rules="validate('Worker.bankEntity')"
                     hide-selected
                     option-label="name"
diff --git a/src/pages/Customer/Card/CustomerFiscalData.vue b/src/pages/Customer/Card/CustomerFiscalData.vue
index 5cc656bb3..c2adace5e 100644
--- a/src/pages/Customer/Card/CustomerFiscalData.vue
+++ b/src/pages/Customer/Card/CustomerFiscalData.vue
@@ -93,7 +93,7 @@ function handleLocation(data, location) {
             <VnRow>
                 <VnLocation
                     :rules="validate('Worker.postcode')"
-                    :roles-allowed-to-create="['deliveryAssistant']"
+                    :acls="[{ model: 'Town', props: '*', accessType: 'WRITE' }]"
                     v-model="data.postcode"
                     @update:model-value="(location) => handleLocation(data, location)"
                 />
diff --git a/src/pages/Customer/CustomerCreate.vue b/src/pages/Customer/CustomerCreate.vue
index 041c92d17..79da63283 100644
--- a/src/pages/Customer/CustomerCreate.vue
+++ b/src/pages/Customer/CustomerCreate.vue
@@ -86,7 +86,7 @@ function handleLocation(data, location) {
                 <VnRow>
                     <VnLocation
                         :rules="validate('Worker.postcode')"
-                        :roles-allowed-to-create="['deliveryAssistant']"
+                        :acls="[{ model: 'Town', props: '*', accessType: 'WRITE' }]"
                         v-model="data.location"
                         @update:model-value="(location) => handleLocation(data, location)"
                     >
diff --git a/src/pages/Customer/CustomerList.vue b/src/pages/Customer/CustomerList.vue
index 82ad559ad..3c66b1281 100644
--- a/src/pages/Customer/CustomerList.vue
+++ b/src/pages/Customer/CustomerList.vue
@@ -412,7 +412,7 @@ function handleLocation(data, location) {
     >
         <template #more-create-dialog="{ data }">
             <VnLocation
-                :roles-allowed-to-create="['deliveryAssistant']"
+                :acls="[{ model: 'Province', props: '*', accessType: 'WRITE' }]"
                 v-model="data.location"
                 @update:model-value="(location) => handleLocation(data, location)"
             />
diff --git a/src/pages/Customer/components/CustomerAddressCreate.vue b/src/pages/Customer/components/CustomerAddressCreate.vue
index 30e4b21d0..88204cbaa 100644
--- a/src/pages/Customer/components/CustomerAddressCreate.vue
+++ b/src/pages/Customer/components/CustomerAddressCreate.vue
@@ -92,7 +92,7 @@ function handleLocation(data, location) {
 
             <VnLocation
                 :rules="validate('Worker.postcode')"
-                :roles-allowed-to-create="['deliveryAssistant']"
+                :acls="[{ model: 'Town', props: '*', accessType: 'WRITE' }]"
                 v-model="data.location"
                 @update:model-value="(location) => handleLocation(data, location)"
             />
diff --git a/src/pages/Customer/components/CustomerAddressEdit.vue b/src/pages/Customer/components/CustomerAddressEdit.vue
index 7a4c44014..0be7e475a 100644
--- a/src/pages/Customer/components/CustomerAddressEdit.vue
+++ b/src/pages/Customer/components/CustomerAddressEdit.vue
@@ -176,7 +176,7 @@ function handleLocation(data, location) {
                 <div class="col">
                     <VnLocation
                         :rules="validate('Worker.postcode')"
-                        :roles-allowed-to-create="['deliveryAssistant']"
+                        :acls="[{ model: 'Town', props: '*', accessType: 'WRITE' }]"
                         v-model="data.postalCode"
                         @update:model-value="(location) => handleLocation(data, location)"
                     ></VnLocation>
diff --git a/src/pages/Supplier/Card/SupplierAddressesCreate.vue b/src/pages/Supplier/Card/SupplierAddressesCreate.vue
index da6549a24..6e51ee94e 100644
--- a/src/pages/Supplier/Card/SupplierAddressesCreate.vue
+++ b/src/pages/Supplier/Card/SupplierAddressesCreate.vue
@@ -83,7 +83,7 @@ function handleLocation(data, location) {
                 <VnRow>
                     <VnLocation
                         :rules="validate('Worker.postcode')"
-                        :roles-allowed-to-create="['deliveryAssistant']"
+                        :acls="[{ model: 'Town', props: '*', accessType: 'WRITE' }]"
                         v-model="data.location"
                         @update:model-value="(location) => handleLocation(data, location)"
                     >
diff --git a/src/pages/Supplier/Card/SupplierFiscalData.vue b/src/pages/Supplier/Card/SupplierFiscalData.vue
index fd9667112..65c34c4ed 100644
--- a/src/pages/Supplier/Card/SupplierFiscalData.vue
+++ b/src/pages/Supplier/Card/SupplierFiscalData.vue
@@ -129,7 +129,7 @@ function handleLocation(data, location) {
             <VnRow>
                 <VnLocation
                     :rules="validate('Worker.postcode')"
-                    :roles-allowed-to-create="['deliveryAssistant']"
+                    :acls="[{ model: 'Town', props: '*', accessType: 'WRITE' }]"
                     v-model="data.postCode"
                     @update:model-value="(location) => handleLocation(data, location)"
                 >
diff --git a/src/pages/Worker/WorkerList.vue b/src/pages/Worker/WorkerList.vue
index 45bc41856..6a039b269 100644
--- a/src/pages/Worker/WorkerList.vue
+++ b/src/pages/Worker/WorkerList.vue
@@ -221,7 +221,7 @@ function uppercaseStreetModel(data) {
                 </VnRow>
                 <VnRow>
                     <VnLocation
-                        :roles-allowed-to-create="['deliveryAssistant']"
+                        :acls="[{ model: 'Town', props: '*', accessType: 'WRITE' }]"
                         :options="postcodesOptions"
                         v-model="data.location"
                         @update:model-value="(location) => handleLocation(data, location)"
@@ -269,7 +269,7 @@ function uppercaseStreetModel(data) {
                         option-label="name"
                         option-value="id"
                         hide-selected
-                        :acls="[]"
+                        :acls="[{ model: 'BankEntity', props: '*', accessType: 'WRITE' }]"
                         :disable="data.isFreelance"
                     >
                         <template #form>

From 2a4180a1c364cdd88fadbb7ef0a9a597fe8c7cc4 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Fri, 2 Aug 2024 13:20:46 +0200
Subject: [PATCH 015/228] refactor: refs #6346 deleted front error checking

---
 src/pages/Wagon/Type/WagonCreateTray.vue | 30 +-----------------------
 1 file changed, 1 insertion(+), 29 deletions(-)

diff --git a/src/pages/Wagon/Type/WagonCreateTray.vue b/src/pages/Wagon/Type/WagonCreateTray.vue
index 19f66b0b3..c3f8b3847 100644
--- a/src/pages/Wagon/Type/WagonCreateTray.vue
+++ b/src/pages/Wagon/Type/WagonCreateTray.vue
@@ -6,7 +6,6 @@ import VnRow from 'src/components/ui/VnRow.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import FetchData from 'src/components/FetchData.vue';
 import { useI18n } from 'vue-i18n';
-import { useQuasar } from 'quasar';
 import axios from 'axios';
 
 const $props = defineProps({
@@ -31,7 +30,6 @@ const wagonColorTranslated = ref();
 const heights = ref();
 const existingTrayHeight = ref($props.height);
 const { t } = useI18n();
-const { notify } = useQuasar();
 
 watch(wagonColors, () => {
     wagonColorTranslated.value = wagonColors.value.map((color) => {
@@ -51,33 +49,6 @@ async function getTrays() {
 }
 
 function onSubmit() {
-    if (heights.value.includes(parseInt(trayHeight.value))) {
-        notify({
-            message: t(
-                'A tray with the same height already exists, try with a different height'
-            ),
-            type: 'negative',
-        });
-        return;
-    }
-    if (trayHeight.value - heights.value[heights.value.length - 1] < 50) {
-        notify({
-            message: t('The minimum height between trays is 50cm'),
-            type: 'negative',
-        });
-        return;
-    }
-
-    if (trayHeight.value > 200) {
-        notify({
-            message: t(
-                'The maximum height of the wagon is 200cm, try with a lower height'
-            ),
-            type: 'negative',
-        });
-        return;
-    }
-
     const newTray = {
         wagonTypeFk: entityId.value,
         wagonTypeColorFk: selectedTrayColor.value,
@@ -110,6 +81,7 @@ getTrays();
                     option-value="id"
                     id="id"
                     :label="t('Select a tray color')"
+                    :required="true"
                 >
                     <template #option="scope">
                         <QItem v-bind="scope.itemProps" clickable>

From f2be2b430010d647f2547a8a6d8a2b7604b894dd Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Mon, 5 Aug 2024 15:42:57 +0200
Subject: [PATCH 016/228] fea: stockBought add form and formDetail

---
 src/components/VnTable/VnTable.vue            |  14 +-
 src/components/common/VnInputDate.vue         |   2 +-
 src/components/common/VnInputTime.vue         |   2 +-
 src/i18n/locale/en.yml                        |   1 +
 src/pages/Entry/EntryStockBought.vue          | 142 ++++++++++++++++++
 src/pages/Entry/EntryStockBoughtDetail.vue    | 102 +++++++++++++
 src/pages/Route/RouteList.vue                 |   3 +-
 src/router/modules/entry.js                   |  11 +-
 .../integration/entry/stockBought.spec.js     |  36 +++++
 9 files changed, 302 insertions(+), 11 deletions(-)
 create mode 100644 src/pages/Entry/EntryStockBought.vue
 create mode 100644 src/pages/Entry/EntryStockBoughtDetail.vue
 create mode 100644 test/cypress/integration/entry/stockBought.spec.js

diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index 4e40c0ba6..8a20023f2 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -107,7 +107,7 @@ const orders = ref(parseOrder(routeQuery.filter?.order));
 const CrudModelRef = ref({});
 const showForm = ref(false);
 const splittedColumns = ref({ columns: [] });
-const columnsVisibilitySkiped = ref();
+const columnsVisibilitySkipped = ref();
 const tableModes = [
     {
         icon: 'view_column',
@@ -133,7 +133,7 @@ onMounted(() => {
             ? CARD_MODE
             : $props.defaultMode;
     stateStore.rightDrawer = true;
-    columnsVisibilitySkiped.value = [
+    columnsVisibilitySkipped.value = [
         ...splittedColumns.value.columns
             .filter((c) => c.visible == false)
             .map((c) => c.name),
@@ -325,11 +325,11 @@ defineExpose({
     <div class="q-px-md">
         <CrudModel
             v-bind="$attrs"
-            :limit="20"
+            :limit="$attrs.limit ?? 20"
             ref="CrudModelRef"
             @on-fetch="(...args) => emit('onFetch', ...args)"
             :search-url="searchUrl"
-            :disable-infinite-scroll="isTableMode"
+            :disable-infinite-scroll="$attrs['disable-infinite-scroll'] ?? isTableMode"
             @save-changes="reload"
             :has-sub-toolbar="$attrs['hasSubToolbar'] ?? isEditable"
             :auto-load="hasParams || $attrs['auto-load']"
@@ -351,9 +351,8 @@ defineExpose({
                     :grid="!isTableMode"
                     table-header-class="bg-header"
                     card-container-class="grid-three"
-                    flat
                     :style="isTableMode && `max-height: ${tableHeight}`"
-                    virtual-scroll
+                    :virtual-scroll="!isTableMode"
                     @virtual-scroll="
                         (event) =>
                             event.index > rows.length - 2 &&
@@ -361,6 +360,7 @@ defineExpose({
                     "
                     @row-click="(_, row) => rowClickFunction && rowClickFunction(row)"
                     @update:selected="emit('update:selected', $event)"
+                    flat
                 >
                     <template #top-left v-if="!$props.withoutHeader">
                         <slot name="top-left"></slot>
@@ -370,7 +370,7 @@ defineExpose({
                             v-if="isTableMode"
                             v-model="splittedColumns.columns"
                             :table-code="tableCode ?? route.name"
-                            :skip="columnsVisibilitySkiped"
+                            :skip="columnsVisibilitySkipped"
                         />
                         <QBtnToggle
                             v-model="mode"
diff --git a/src/components/common/VnInputDate.vue b/src/components/common/VnInputDate.vue
index 6e57a8a53..76eee86fc 100644
--- a/src/components/common/VnInputDate.vue
+++ b/src/components/common/VnInputDate.vue
@@ -45,7 +45,7 @@ const formattedDate = computed({
         if (value) {
             // parse input
             if (value.includes('/')) {
-                if (value.length == 6) value = value + new Date().getFullYear();
+                if (value.length == 6) value = value + Date.vnNew().getFullYear();
                 if (value.length >= 10) {
                     if (value.at(2) == '/') value = value.split('/').reverse().join('/');
                     value = date.formatDate(
diff --git a/src/components/common/VnInputTime.vue b/src/components/common/VnInputTime.vue
index a59f0e9e8..2c387bf0b 100644
--- a/src/components/common/VnInputTime.vue
+++ b/src/components/common/VnInputTime.vue
@@ -62,7 +62,7 @@ const formattedTime = computed({
 function dateToTime(newDate) {
     return date.formatDate(new Date(newDate), dateFormat);
 }
-const timeField = ref();
+
 watch(
     () => model.value,
     (val) => (formattedTime.value = val),
diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index 78c1fa18d..867f338e4 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -142,6 +142,7 @@ globals:
         dms: File management
         entryCreate: New entry
         latestBuys: Latest buys
+        reserves: Reserves
         tickets: Tickets
         ticketCreate: New Tickets
         boxing: Boxing
diff --git a/src/pages/Entry/EntryStockBought.vue b/src/pages/Entry/EntryStockBought.vue
new file mode 100644
index 000000000..5277cc5e1
--- /dev/null
+++ b/src/pages/Entry/EntryStockBought.vue
@@ -0,0 +1,142 @@
+<script setup>
+import { ref } from 'vue';
+import { useI18n } from 'vue-i18n';
+import { useState } from 'src/composables/useState';
+import { useQuasar } from 'quasar';
+
+import VnTable from 'components/VnTable/VnTable.vue';
+import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
+import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
+import EntryStockBoughtDetail from 'src/pages/Entry/EntryStockBoughtDetail.vue';
+
+const { t } = useI18n();
+const quasar = useQuasar();
+const tableRef = ref();
+const state = useState();
+const user = state.getUser();
+const columns = [
+    {
+        align: 'left',
+        label: 'Id',
+        name: 'id',
+        isTitle: true,
+        isId: true,
+        columnFilter: false,
+        visible: false,
+    },
+    {
+        align: 'left',
+        name: 'workerFk',
+        label: t('Buyer'),
+        columnFilter: false,
+    },
+    {
+        align: 'left',
+        label: t('Reserve'),
+        name: 'reserve',
+        columnFilter: false,
+        create: true,
+        component: 'number',
+    },
+    {
+        align: 'left',
+        name: 'workerFk',
+        label: t('Buyer'),
+        component: 'select',
+        create: true,
+        visible: false,
+        columnFilter: false,
+        attrs: {
+            url: 'Workers/activeWithInheritedRole',
+            fields: ['id', 'name'],
+            where: { role: 'buyer' },
+            optionFilter: 'firstName',
+            optionLabel: 'name',
+            optionValue: 'id',
+            useLike: false,
+        },
+    },
+    {
+        align: 'left',
+        label: t('Bought'),
+        name: 'bought',
+        columnFilter: false,
+    },
+    {
+        align: 'left',
+        label: t('Date'),
+        name: 'dated',
+        component: 'date',
+        visible: false,
+        create: true,
+    },
+    {
+        align: 'left',
+        name: 'tableActions',
+        actions: [
+            {
+                title: t('More'),
+                icon: 'search',
+                isPrimary: true,
+                action: (row) => {
+                    console.log('workerFk: ', row.workerFk);
+                    quasar.dialog({
+                        component: EntryStockBoughtDetail,
+                        componentProps: {
+                            workerFk: row.workerFk,
+                            dated: row.dated,
+                        },
+                        maximized: true,
+                    });
+                },
+            },
+        ],
+    },
+];
+</script>
+<template>
+    <VnSubToolbar />
+    <VnTable
+        ref="tableRef"
+        data-key="StockBoughts"
+        url="StockBoughts/getStockBought"
+        save-url="StockBoughts/crud"
+        order="reserve DESC"
+        :is-editable="true"
+        :disable-option="{ card: true }"
+        :create="{
+            urlCreate: 'StockBoughts',
+            title: t('Reserve some space'),
+            onDataSaved: () => tableRef.reload(),
+            formInitialData: {
+                workerFk: user.id,
+                dated: Date.now(),
+            },
+        }"
+        :columns="columns"
+    >
+        <template #column-workerFk="{ row }">
+            <span class="link" @click.stop>
+                {{ row?.worker?.user?.name }}
+                <WorkerDescriptorProxy :id="row?.workerFk" />
+            </span>
+        </template>
+    </VnTable>
+</template>
+<i18n>
+    en:
+        Buyer: Buyer
+        Reserve: Reserve
+        Bought: Bought
+        More: More
+        Date: Date
+        This buyer has already made a reservation for this date: This buyer has already made a reservation for this date
+    es:
+        Buyer: Comprador
+        Reserve: Reservado
+        Bought: Comprado
+        More: Más
+        Date: Fecha
+        Reserve some space: Reservar espacio
+        This buyer has already made a reservation for this date: Este comprador ya ha hecho una reserva para esta fecha
+</i18n>
diff --git a/src/pages/Entry/EntryStockBoughtDetail.vue b/src/pages/Entry/EntryStockBoughtDetail.vue
new file mode 100644
index 000000000..908f5dd20
--- /dev/null
+++ b/src/pages/Entry/EntryStockBoughtDetail.vue
@@ -0,0 +1,102 @@
+<script setup>
+import { ref } from 'vue';
+import { useI18n } from 'vue-i18n';
+
+import VnTable from 'components/VnTable/VnTable.vue';
+import EntryDescriptorProxy from 'src/pages/Entry/Card/EntryDescriptorProxy.vue';
+import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue';
+
+const { t } = useI18n();
+const tableRef = ref();
+const $props = defineProps({
+    workerFk: {
+        type: Number,
+        required: true,
+    },
+    dated: {
+        type: String,
+        required: true,
+    },
+});
+console.log('$props: ', $props.workerFk, $props.dated);
+const customUrl = `StockBoughts/getStockBoughtDetail?workerFk=${$props.workerFk}`;
+const columns = [
+    {
+        align: 'left',
+        label: 'Entry',
+        name: 'entryFk',
+        isTitle: true,
+        isId: true,
+        columnFilter: false,
+    },
+    {
+        align: 'left',
+        name: 'itemFk',
+        label: t('Item'),
+        columnFilter: false,
+    },
+    {
+        align: 'left',
+        label: t('Name'),
+        name: 'itemName',
+        columnFilter: false,
+        create: true,
+        columnClass: 'expand',
+    },
+    {
+        align: 'left',
+        name: 'volume',
+        label: t('Volume'),
+        columnFilter: false,
+    },
+    {
+        align: 'left',
+        label: t('Packaging'),
+        name: 'packagingFk',
+        columnFilter: false,
+    },
+    {
+        align: 'left',
+        label: 'Packing',
+        name: 'packing',
+        columnFilter: false,
+    },
+];
+</script>
+<template>
+    <QDialog>
+        <VnTable
+            ref="tableRef"
+            data-key="StockBoughtsDetail"
+            :url="customUrl"
+            order="itemName DESC"
+            :columns="columns"
+            :right-search="false"
+            :disable-infinite-scroll="true"
+            :disable-option="{ card: true }"
+            :limit="0"
+            auto-load
+        >
+            <template #column-entryFk="{ row }">
+                <span class="link" @click.stop>
+                    {{ row?.entryFk }}
+                    <EntryDescriptorProxy :id="row.entryFk" />
+                </span>
+            </template>
+            <template #column-itemName="{ row }">
+                <span class="link" @click.stop>
+                    {{ row?.itemName }}
+                    <ItemDescriptorProxy :id="row.itemFk" />
+                </span>
+            </template>
+        </VnTable>
+    </QDialog>
+</template>
+<i18n>
+    es:
+        Buyer: Comprador
+        Reserve: Reservado
+        Bought: Comprado
+        More: Más
+        Date: Fecha
+</i18n>
diff --git a/src/pages/Route/RouteList.vue b/src/pages/Route/RouteList.vue
index b13e8cacd..7d5dd5c68 100644
--- a/src/pages/Route/RouteList.vue
+++ b/src/pages/Route/RouteList.vue
@@ -139,7 +139,7 @@ const columns = computed(() => [
     {
         align: 'center',
         name: 'm3',
-        label: 'volume',
+        label: t('Volume'),
         cardVisible: true,
     },
     {
@@ -379,4 +379,5 @@ es:
     Route is not served: La ruta no está servida
     hourStarted: Hora de inicio
     hourFinished: Hora de fin
+    Volume: Volumen
 </i18n>
diff --git a/src/router/modules/entry.js b/src/router/modules/entry.js
index 0d38ed626..fd5490fbd 100644
--- a/src/router/modules/entry.js
+++ b/src/router/modules/entry.js
@@ -11,7 +11,7 @@ export default {
     component: RouterView,
     redirect: { name: 'EntryMain' },
     menus: {
-        main: ['EntryList', 'MyEntries', 'EntryLatestBuys'],
+        main: ['EntryList', 'MyEntries', 'EntryLatestBuys', 'EntryStockBought'],
         card: ['EntryBasicData', 'EntryBuys', 'EntryNotes', 'EntryDms', 'EntryLog'],
     },
     children: [
@@ -57,6 +57,15 @@ export default {
                     },
                     component: () => import('src/pages/Entry/EntryLatestBuys.vue'),
                 },
+                {
+                    path: 'stock-Bought',
+                    name: 'EntryStockBought',
+                    meta: {
+                        title: 'reserves',
+                        icon: 'deployed_code_history',
+                    },
+                    component: () => import('src/pages/Entry/EntryStockBought.vue'),
+                },
             ],
         },
         {
diff --git a/test/cypress/integration/entry/stockBought.spec.js b/test/cypress/integration/entry/stockBought.spec.js
new file mode 100644
index 000000000..8e4fe225c
--- /dev/null
+++ b/test/cypress/integration/entry/stockBought.spec.js
@@ -0,0 +1,36 @@
+describe('EntryStockBought', () => {
+    const reserveField = 'input[name="reserve"]';
+    beforeEach(() => {
+        cy.viewport(1920, 1080);
+        cy.login('buyer');
+        cy.visit(
+            `/#/entry/stock-Bought?table={"filter":"{}","dated":"2000-12-31T23:00:00.000Z"}`
+        );
+    });
+    it('Should edit the reserved space', () => {
+        cy.get('tBody > tr').its('length').should('eq', 1);
+        cy.get(reserveField).type('10{enter}');
+        cy.get('button[title="Save"]').click();
+        cy.get('.q-notification__message').should('have.text', 'Data saved');
+    });
+    it('Should add a new reserved space for buyerBoss', () => {
+        cy.get('.q-page-sticky > div > .q-btn > .q-btn__content > .q-icon').click();
+        cy.get('input[aria-label="Reserve"]').type('1');
+        cy.get('input[aria-label="Date"]').eq(1).clear();
+        cy.get('input[aria-label="Date"]').eq(1).type('01-01');
+        cy.get('input[aria-label="Buyer"]').type('buyerboss{downarrow}{enter}');
+        cy.get('.q-notification__message').should('have.text', 'Data created');
+        cy.get('tBody > tr').its('length').should('eq', 2);
+    });
+    it('Should check detail for the buyer', () => {
+        cy.get(':nth-child(1) > .sticky > .q-btn > .q-btn__content > .q-icon').click();
+        cy.get('tBody > tr').eq(1).its('length').should('eq', 1);
+    });
+    it('Should check detail for the buyerBoss and had no content', () => {
+        cy.get(':nth-child(2) > .sticky > .q-btn > .q-btn__content > .q-icon').click();
+        cy.get('.q-table__bottom.row.items-center.q-table__bottom--nodata').should(
+            'have.text',
+            'warningNo data available'
+        );
+    });
+});

From de94b3629e6470ba0f8ba9f6b3fad807c6ec01ab Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Mon, 5 Aug 2024 15:44:37 +0200
Subject: [PATCH 017/228] fix: remove console.log

---
 src/pages/Entry/EntryStockBought.vue       | 1 -
 src/pages/Entry/EntryStockBoughtDetail.vue | 1 -
 2 files changed, 2 deletions(-)

diff --git a/src/pages/Entry/EntryStockBought.vue b/src/pages/Entry/EntryStockBought.vue
index 5277cc5e1..e0063bb62 100644
--- a/src/pages/Entry/EntryStockBought.vue
+++ b/src/pages/Entry/EntryStockBought.vue
@@ -79,7 +79,6 @@ const columns = [
                 icon: 'search',
                 isPrimary: true,
                 action: (row) => {
-                    console.log('workerFk: ', row.workerFk);
                     quasar.dialog({
                         component: EntryStockBoughtDetail,
                         componentProps: {
diff --git a/src/pages/Entry/EntryStockBoughtDetail.vue b/src/pages/Entry/EntryStockBoughtDetail.vue
index 908f5dd20..f7e89c691 100644
--- a/src/pages/Entry/EntryStockBoughtDetail.vue
+++ b/src/pages/Entry/EntryStockBoughtDetail.vue
@@ -18,7 +18,6 @@ const $props = defineProps({
         required: true,
     },
 });
-console.log('$props: ', $props.workerFk, $props.dated);
 const customUrl = `StockBoughts/getStockBoughtDetail?workerFk=${$props.workerFk}`;
 const columns = [
     {

From c8ab5b3bfd64fe7a41a09d542705fa881e6e8f32 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Tue, 13 Aug 2024 14:57:09 +0200
Subject: [PATCH 018/228] feat: refs #7663 add setWeight menu opt (wip)

---
 src/pages/Ticket/Card/TicketDescriptorMenu.vue | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/src/pages/Ticket/Card/TicketDescriptorMenu.vue b/src/pages/Ticket/Card/TicketDescriptorMenu.vue
index c7784bc2a..6ffae48ee 100644
--- a/src/pages/Ticket/Card/TicketDescriptorMenu.vue
+++ b/src/pages/Ticket/Card/TicketDescriptorMenu.vue
@@ -44,6 +44,7 @@ const actions = {
                 push({ name: 'TicketSummary', params: { id: clonedTicketId } });
         }
     },
+    setWeight: async () => {},
     remove: async () => {
         try {
             await axios.post(`Tickets/${ticketId}/setDeleted`);
@@ -146,10 +147,15 @@ async function sendSms(body) {
 }
 
 function openConfirmDialog(callback) {
+    const message =
+        callback == 'setWeight'
+            ? t('Es posible que se facture este ticket, desea continuar?')
+            : undefined;
     dialog({
         component: VnConfirm,
         componentProps: {
             promise: actions[callback],
+            message,
         },
     });
 }
@@ -253,6 +259,12 @@ function openConfirmDialog(callback) {
         </QItemSection>
         <QItemSection>{{ t('To clone ticket') }}</QItemSection>
     </QItem>
+    <QItem @click="openConfirmDialog('setWeight')" v-ripple clickable>
+        <QItemSection avatar>
+            <QIcon name="weight" />
+        </QItemSection>
+        <QItemSection>{{ t('Set weight') }}</QItemSection>
+    </QItem>
     <template v-if="!ticket.isDeleted">
         <QSeparator />
         <QItem @click="openConfirmDialog('remove')" v-ripple clickable>
@@ -282,4 +294,6 @@ es:
     To clone ticket: Clonar ticket
     Ticket cloned: Ticked clonado
     It was not able to clone the ticket: No se pudo clonar el ticket
+    Set weight: Establecer peso
+    This ticket may be invoiced, do you want to continue?: Es posible que se facture este ticket, desea continuar?
 </i18n>

From ffd7d98e9cc25cf218b2c577d0c7ef98df7cf59b Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Tue, 13 Aug 2024 17:56:07 +0200
Subject: [PATCH 019/228] feat: travel m3

---
 src/components/VnTable/VnTable.vue         | 20 +++++++++++
 src/pages/Entry/EntryStockBought.vue       | 39 +++++++++++++++++++++-
 src/pages/Entry/EntryStockBoughtDetail.vue |  2 +-
 src/pages/Travel/Card/TravelBasicData.vue  |  3 ++
 4 files changed, 62 insertions(+), 2 deletions(-)

diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index 8a20023f2..dbe5d1622 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -15,6 +15,7 @@ import VnTableChip from 'components/VnTable/VnChip.vue';
 import VnVisibleColumn from 'src/components/VnTable/VnVisibleColumn.vue';
 import VnLv from 'components/ui/VnLv.vue';
 import VnTableOrder from 'src/components/VnTable/VnOrder.vue';
+import item from 'src/router/modules/item';
 
 const $props = defineProps({
     columns: {
@@ -609,6 +610,25 @@ defineExpose({
                             </QCard>
                         </component>
                     </template>
+                    <template #bottom-row="{ cols }">
+                        <QTr>
+                            <QTh
+                                v-for="col of cols.filter((cols) => cols.visible ?? true)"
+                                :key="col.id"
+                                class="text-center"
+                            >
+                                <span v-if="col.summation">
+                                    {{
+                                        rows.reduce(
+                                            (sum, currentRow) =>
+                                                sum + currentRow[col.name],
+                                            0
+                                        )
+                                    }}
+                                </span>
+                            </QTh>
+                        </QTr>
+                    </template>
                 </QTable>
             </template>
         </CrudModel>
diff --git a/src/pages/Entry/EntryStockBought.vue b/src/pages/Entry/EntryStockBought.vue
index e0063bb62..12fc96214 100644
--- a/src/pages/Entry/EntryStockBought.vue
+++ b/src/pages/Entry/EntryStockBought.vue
@@ -5,6 +5,10 @@ import { useState } from 'src/composables/useState';
 import { useQuasar } from 'quasar';
 
 import VnTable from 'components/VnTable/VnTable.vue';
+import VnRow from 'src/components/ui/VnRow.vue';
+import VnInput from 'src/components/common/VnInput.vue';
+import VnLv from 'src/components/ui/VnLv.vue';
+import FetchData from 'src/components/FetchData.vue';
 import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
 import EntryStockBoughtDetail from 'src/pages/Entry/EntryStockBoughtDetail.vue';
@@ -37,6 +41,7 @@ const columns = [
         columnFilter: false,
         create: true,
         component: 'number',
+        summation: true,
     },
     {
         align: 'left',
@@ -61,6 +66,7 @@ const columns = [
         label: t('Bought'),
         name: 'bought',
         columnFilter: false,
+        summation: true,
     },
     {
         align: 'left',
@@ -92,6 +98,21 @@ const columns = [
         ],
     },
 ];
+function getFilter(dated = Date.vnNow()) {
+    console.log('dated: ', new Date(dated * 1000));
+    return {
+        fields: ['id', 'm3'],
+        where: { dated },
+        include: [
+            {
+                relation: 'warehouseIn',
+                where: { code: 'vnh' },
+            },
+        ],
+    };
+}
+const travel = ref();
+const fetchDataRef = ref();
 </script>
 <template>
     <VnSubToolbar />
@@ -109,11 +130,27 @@ const columns = [
             onDataSaved: () => tableRef.reload(),
             formInitialData: {
                 workerFk: user.id,
-                dated: Date.now(),
+                dated: Date.vnNow(),
             },
         }"
         :columns="columns"
+        auto-load
+        @on-fetch="() => fetchDataRef.fetch()"
     >
+        <template #moreFilterPanel="{ params }">
+            <FetchData
+                ref="fetchDataRef"
+                url="Travels"
+                limit="1"
+                auto-load
+                :filter="getFilter(params?.date)"
+                @on-fetch="(data) => (travel = data)"
+            />
+            <VnRow class="q-pa-md" style="align-items: center" v-if="travel?.length">
+                <span>{{ t('Booked trucks: ') + travel[0]?.m3 }}</span>
+                <QBtn style="max-width: 20%" flat icon="edit" />
+            </VnRow>
+        </template>
         <template #column-workerFk="{ row }">
             <span class="link" @click.stop>
                 {{ row?.worker?.user?.name }}
diff --git a/src/pages/Entry/EntryStockBoughtDetail.vue b/src/pages/Entry/EntryStockBoughtDetail.vue
index f7e89c691..9212f1115 100644
--- a/src/pages/Entry/EntryStockBoughtDetail.vue
+++ b/src/pages/Entry/EntryStockBoughtDetail.vue
@@ -38,9 +38,9 @@ const columns = [
         align: 'left',
         label: t('Name'),
         name: 'itemName',
-        columnFilter: false,
         create: true,
         columnClass: 'expand',
+        columnFilter: false,
     },
     {
         align: 'left',
diff --git a/src/pages/Travel/Card/TravelBasicData.vue b/src/pages/Travel/Card/TravelBasicData.vue
index 8a369a0dd..a3620a6ba 100644
--- a/src/pages/Travel/Card/TravelBasicData.vue
+++ b/src/pages/Travel/Card/TravelBasicData.vue
@@ -70,6 +70,9 @@ const agenciesOptions = ref([]);
                     hide-selected
                 />
             </VnRow>
+            <VnRow>
+                <VnInput v-model="data.m3" label="m3" />
+            </VnRow>
             <VnRow>
                 <QCheckbox
                     :label="t('travel.basicData.delivered')"

From 40e46f5a72917d6a5b3201eb862aaa714f04dab2 Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Tue, 13 Aug 2024 18:13:46 +0200
Subject: [PATCH 020/228] fix: refs #7830 customer credit

---
 src/components/FetchData.vue                                | 2 +-
 src/pages/Customer/Card/CustomerCreditContracts.vue         | 3 +++
 src/pages/Customer/Card/CustomerCreditOpinion.vue           | 5 +++++
 .../Customer/components/CustomerCreditContractsCreate.vue   | 6 ++++--
 4 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/components/FetchData.vue b/src/components/FetchData.vue
index 2a0864d3e..3038aa88e 100644
--- a/src/components/FetchData.vue
+++ b/src/components/FetchData.vue
@@ -44,7 +44,7 @@ onMounted(async () => {
 
 async function fetch(fetchFilter = {}) {
     try {
-        const filter = Object.assign(fetchFilter, $props.filter); // eslint-disable-line vue/no-dupe-keys
+        const filter = { ...fetchFilter, ...$props.filter }; // eslint-disable-line vue/no-dupe-keys
         if ($props.where && !fetchFilter.where) filter.where = $props.where;
         if ($props.sortBy) filter.order = $props.sortBy;
         if ($props.limit) filter.limit = $props.limit;
diff --git a/src/pages/Customer/Card/CustomerCreditContracts.vue b/src/pages/Customer/Card/CustomerCreditContracts.vue
index 568adcf0b..1110b9f65 100644
--- a/src/pages/Customer/Card/CustomerCreditContracts.vue
+++ b/src/pages/Customer/Card/CustomerCreditContracts.vue
@@ -53,6 +53,8 @@ const openDialog = (item) => {
             promise: updateData,
         },
     });
+    updateData();
+    showQPageSticky.value = true;
 };
 
 const openViewCredit = (credit) => {
@@ -65,6 +67,7 @@ const openViewCredit = (credit) => {
 };
 
 const updateData = () => {
+    console.log('entrando');
     vnPaginateRef.value?.fetch();
 };
 </script>
diff --git a/src/pages/Customer/Card/CustomerCreditOpinion.vue b/src/pages/Customer/Card/CustomerCreditOpinion.vue
index 9c060b1a5..2b85cbd7d 100644
--- a/src/pages/Customer/Card/CustomerCreditOpinion.vue
+++ b/src/pages/Customer/Card/CustomerCreditOpinion.vue
@@ -71,6 +71,10 @@ watch(
         clientInformasRef.value?.fetch();
     }
 );
+
+const onDataSaved = () => {
+    clientInformasRef.value?.fetch();
+};
 </script>
 
 <template>
@@ -86,6 +90,7 @@ watch(
         :form-initial-data="{}"
         :observe-form-changes="false"
         :url-create="`Clients/${route.params.id}/setRating`"
+        @on-data-saved="onDataSaved"
     >
         <template #form="{ data }">
             <VnRow>
diff --git a/src/pages/Customer/components/CustomerCreditContractsCreate.vue b/src/pages/Customer/components/CustomerCreditContractsCreate.vue
index c4434e870..c25e59e1a 100644
--- a/src/pages/Customer/components/CustomerCreditContractsCreate.vue
+++ b/src/pages/Customer/components/CustomerCreditContractsCreate.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { reactive } from 'vue';
+import { reactive, computed } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute, useRouter } from 'vue-router';
 
@@ -10,10 +10,12 @@ import VnInputDate from 'src/components/common/VnInputDate.vue';
 
 const { t } = useI18n();
 const route = useRoute();
+const routeId = computed(() => route.params.id);
 const router = useRouter();
 
 const initialData = reactive({
-    clientFK: Number(route.params.id),
+    started: Date.vnNew(),
+    clientFk: routeId.value,
 });
 
 const toCustomerCreditContracts = () => {

From c31aa3258ff2f679fcb363d745a73e61a4285d3c Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Tue, 13 Aug 2024 18:15:16 +0200
Subject: [PATCH 021/228] fix: refs #7830 remove console.log

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

diff --git a/src/pages/Customer/Card/CustomerCreditContracts.vue b/src/pages/Customer/Card/CustomerCreditContracts.vue
index 1110b9f65..7b72a4d6d 100644
--- a/src/pages/Customer/Card/CustomerCreditContracts.vue
+++ b/src/pages/Customer/Card/CustomerCreditContracts.vue
@@ -67,7 +67,6 @@ const openViewCredit = (credit) => {
 };
 
 const updateData = () => {
-    console.log('entrando');
     vnPaginateRef.value?.fetch();
 };
 </script>

From 92130b4c9c770c6cc49e1253885f7837bcba29cf Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Wed, 14 Aug 2024 08:09:27 +0200
Subject: [PATCH 022/228] WIP: 59262019 Merge pull request '#7283 finish item
 card sections' (!588) from 7283-itemSectionsMigration into dev

---
 src/components/common/VnLocation.vue | 103 +++------------------------
 1 file changed, 9 insertions(+), 94 deletions(-)

diff --git a/src/components/common/VnLocation.vue b/src/components/common/VnLocation.vue
index 4d429a995..8256ec5b0 100644
--- a/src/components/common/VnLocation.vue
+++ b/src/components/common/VnLocation.vue
@@ -1,124 +1,39 @@
 <script setup>
-import { ref, toRefs, computed, watch, onMounted } from 'vue';
 import CreateNewPostcode from 'src/components/CreateNewPostcodeForm.vue';
 import VnSelectDialog from 'components/common/VnSelectDialog.vue';
-import FetchData from 'components/FetchData.vue';
-const emit = defineEmits(['update:modelValue', 'update:options']);
 import { useI18n } from 'vue-i18n';
-import { useArrayData } from 'src/composables/useArrayData';
 
 const { t } = useI18n();
-const postcodesOptions = ref([]);
-const postcodesRef = ref(null);
-
-const $props = defineProps({
-    modelValue: {
-        type: [String, Number, Object],
-        default: null,
-    },
-    options: {
-        type: Array,
-        default: () => [],
-    },
-    optionLabel: {
-        type: String,
-        default: '',
-    },
-    optionValue: {
-        type: String,
-        default: '',
-    },
-    filterOptions: {
-        type: Array,
-        default: () => [],
-    },
-    isClearable: {
-        type: Boolean,
-        default: true,
-    },
-    defaultFilter: {
-        type: Boolean,
-        default: true,
-    },
-});
-
-const { options } = toRefs($props);
-const myOptions = ref([]);
-const myOptionsOriginal = ref([]);
-
-const value = computed({
-    get() {
-        return $props.modelValue;
-    },
-    set(value) {
-        emit(
-            'update:modelValue',
-            postcodesOptions.value.find((p) => p.code === value)
-        );
-    },
-});
-
-onMounted(() => {
-    locationFilter($props.modelValue);
-});
-
-function setOptions(data) {
-    myOptions.value = JSON.parse(JSON.stringify(data));
-    myOptionsOriginal.value = JSON.parse(JSON.stringify(data));
-}
-setOptions(options.value);
-
-watch(options, (newValue) => {
-    setOptions(newValue);
-});
+const value = defineModel({ type: [String, Number, Object] });
 
 function showLabel(data) {
     return `${data.code} - ${data.town}(${data.province}), ${data.country}`;
 }
-
-function locationFilter(search = '') {
-    if (
-        search &&
-        (search.includes('undefined') || search.startsWith(`${$props.modelValue} - `))
-    )
-        return;
-    let where = { search };
-    postcodesRef.value.fetch({ filter: { where }, limit: 30 });
-}
-
-function handleFetch(data) {
-    postcodesOptions.value = data;
-}
-function onDataSaved(newPostcode) {
-    postcodesOptions.value.push(newPostcode);
-    value.value = newPostcode.code;
-}
 </script>
 <template>
     <VnSelectDialog
-        v-if="postcodesRef"
-        :option-label="(opt) => showLabel(opt) ?? 'code'"
-        :option-value="(opt) => opt.code"
         v-model="value"
-        :options="postcodesOptions"
+        option-value="code"
+        option-filter-value="search"
+        :option-label="(opt) => showLabel(opt)"
+        url="Postcodes/filter"
+        :use-like="false"
         :label="t('Location')"
-        @update:model-value="handleInput"
         :placeholder="t('search_by_postalcode')"
-        @input-value="locationFilter"
-        :default-filter="false"
         :input-debounce="300"
         :class="{ required: $attrs.required }"
         v-bind="$attrs"
         clearable
+        :emit-value="false"
     >
         <template #form>
-            <CreateNewPostcode @on-data-saved="onDataSaved" />
+            <CreateNewPostcode @on-data-saved="(newValue) => (value = newValue)" />
         </template>
         <template #option="{ itemProps, opt }">
             <QItem v-bind="itemProps">
                 <QItemSection v-if="opt.code">
                     <QItemLabel>{{ opt.code }}</QItemLabel>
-                    <QItemLabel caption>{{ opt.label }}</QItemLabel>
+                    <QItemLabel caption>{{ showLabel(opt) }}</QItemLabel>
                 </QItemSection>
             </QItem>
         </template>

From 55b9cd9ff44f29fb95da4958c29d18ea1ae4207d Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Wed, 14 Aug 2024 09:18:24 +0200
Subject: [PATCH 023/228] feat: handle same multiple CP

---
 src/components/common/VnLocation.vue          | 24 ++++++++++++-----
 src/i18n/locale/en.yml                        |  1 +
 src/i18n/locale/es.yml                        |  1 +
 src/pages/Customer/Card/CustomerAddress.vue   | 26 ++++++-------------
 .../Customer/Card/CustomerFiscalData.vue      |  2 +-
 src/pages/Customer/CustomerCreate.vue         |  1 -
 src/pages/Customer/CustomerList.vue           |  1 -
 .../components/CustomerAddressCreate.vue      |  1 -
 .../components/CustomerAddressEdit.vue        |  7 ++++-
 src/pages/Supplier/Card/SupplierAddresses.vue |  8 +++++-
 .../Supplier/Card/SupplierAddressesCreate.vue | 12 ++++++++-
 .../Supplier/Card/SupplierFiscalData.vue      | 24 ++++++++++++++++-
 src/pages/Worker/WorkerCreate.vue             |  1 -
 src/pages/Worker/WorkerList.vue               |  1 -
 src/router/modules/customer.js                |  2 +-
 15 files changed, 77 insertions(+), 35 deletions(-)

diff --git a/src/components/common/VnLocation.vue b/src/components/common/VnLocation.vue
index 8256ec5b0..778932be3 100644
--- a/src/components/common/VnLocation.vue
+++ b/src/components/common/VnLocation.vue
@@ -2,20 +2,32 @@
 import CreateNewPostcode from 'src/components/CreateNewPostcodeForm.vue';
 import VnSelectDialog from 'components/common/VnSelectDialog.vue';
 import { useI18n } from 'vue-i18n';
-
+import { ref } from 'vue';
 const { t } = useI18n();
-const value = defineModel({ type: [String, Number, Object] });
 
+const props = defineProps({
+    location: {
+        type: Object,
+        default: null,
+    },
+});
+const modelValue = ref(
+    props.location
+        ? `${props.location?.postcode} - ${props.location?.city}(${props.location?.province?.name}), ${props.location?.country?.name}`
+        : null
+);
 function showLabel(data) {
     return `${data.code} - ${data.town}(${data.province}), ${data.country}`;
 }
 </script>
 <template>
+    {{ modelValue }}
     <VnSelectDialog
-        v-model="value"
-        option-value="code"
+        v-model="modelValue"
         option-filter-value="search"
-        :option-label="(opt) => showLabel(opt)"
+        :option-label="
+            (opt) => (typeof modelValue === 'string' ? modelValue : showLabel(opt))
+        "
         url="Postcodes/filter"
         :use-like="false"
         :label="t('Location')"
@@ -27,7 +39,7 @@ function showLabel(data) {
         :emit-value="false"
     >
         <template #form>
-            <CreateNewPostcode @on-data-saved="(newValue) => (value = newValue)" />
+            <CreateNewPostcode @on-data-saved="(newValue) => (modelValue = newValue)" />
         </template>
         <template #option="{ itemProps, opt }">
             <QItem v-bind="itemProps">
diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index ee53da80c..f61dda8a4 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -95,6 +95,7 @@ globals:
     to: To
     pageTitles:
         logIn: Login
+        addressEdit: Update address
         summary: Summary
         basicData: Basic data
         log: Logs
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index 86963f3dc..4e71a69fb 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -95,6 +95,7 @@ globals:
     to: Hasta
     pageTitles:
         logIn: Inicio de sesión
+        addressEdit: Modificar consignatario
         summary: Resumen
         basicData: Datos básicos
         log: Historial
diff --git a/src/pages/Customer/Card/CustomerAddress.vue b/src/pages/Customer/Card/CustomerAddress.vue
index 6c8279d84..a97b45a50 100644
--- a/src/pages/Customer/Card/CustomerAddress.vue
+++ b/src/pages/Customer/Card/CustomerAddress.vue
@@ -5,15 +5,12 @@ import { useRoute, useRouter } from 'vue-router';
 
 import axios from 'axios';
 
-import FetchData from 'components/FetchData.vue';
-
 const { t } = useI18n();
 const route = useRoute();
 const router = useRouter();
 
 const addresses = ref([]);
 const client = ref(null);
-const provincesLocation = ref([]);
 
 const addressFilter = {
     fields: [
@@ -41,7 +38,13 @@ const addressFilter = {
         {
             relation: 'province',
             scope: {
-                fields: ['id', 'name'],
+                fields: ['id', 'name', 'countryFk'],
+                include: [
+                    {
+                        relation: 'country',
+                        scope: { fields: ['id', 'name'] },
+                    },
+                ],
             },
         },
     ],
@@ -83,13 +86,6 @@ const getClientData = async (id) => {
     }
 };
 
-const setProvince = (provinceFk) => {
-    const result = provincesLocation.value.filter(
-        (province) => province.id === provinceFk
-    );
-    return result[0]?.name || '';
-};
-
 const isDefaultAddress = (address) => {
     return client?.value?.defaultAddressFk === address.id ? 1 : 0;
 };
@@ -128,12 +124,6 @@ const toCustomerAddressEdit = (addressId) => {
 </script>
 
 <template>
-    <FetchData
-        @on-fetch="(data) => (provincesLocation = data)"
-        auto-load
-        url="Provinces/location"
-    />
-
     <div class="full-width flex justify-center">
         <QCard class="card-width q-pa-lg" v-if="addresses.length">
             <QCardSection>
@@ -177,7 +167,7 @@ const toCustomerAddressEdit = (addressId) => {
                         <div>{{ item.street }}</div>
                         <div>
                             {{ item.postalCode }} - {{ item.city }},
-                            {{ setProvince(item.provinceFk) }}
+                            {{ item.province.name }}
                         </div>
                         <div class="flex">
                             <QCheckbox
diff --git a/src/pages/Customer/Card/CustomerFiscalData.vue b/src/pages/Customer/Card/CustomerFiscalData.vue
index 5cc656bb3..54b8adb70 100644
--- a/src/pages/Customer/Card/CustomerFiscalData.vue
+++ b/src/pages/Customer/Card/CustomerFiscalData.vue
@@ -94,7 +94,7 @@ function handleLocation(data, location) {
                 <VnLocation
                     :rules="validate('Worker.postcode')"
                     :roles-allowed-to-create="['deliveryAssistant']"
-                    v-model="data.postcode"
+                    :location="data"
                     @update:model-value="(location) => handleLocation(data, location)"
                 />
             </VnRow>
diff --git a/src/pages/Customer/CustomerCreate.vue b/src/pages/Customer/CustomerCreate.vue
index 041c92d17..193ed59c9 100644
--- a/src/pages/Customer/CustomerCreate.vue
+++ b/src/pages/Customer/CustomerCreate.vue
@@ -87,7 +87,6 @@ function handleLocation(data, location) {
                     <VnLocation
                         :rules="validate('Worker.postcode')"
                         :roles-allowed-to-create="['deliveryAssistant']"
-                        v-model="data.location"
                         @update:model-value="(location) => handleLocation(data, location)"
                     >
                     </VnLocation>
diff --git a/src/pages/Customer/CustomerList.vue b/src/pages/Customer/CustomerList.vue
index 82ad559ad..1dc0dab43 100644
--- a/src/pages/Customer/CustomerList.vue
+++ b/src/pages/Customer/CustomerList.vue
@@ -413,7 +413,6 @@ function handleLocation(data, location) {
         <template #more-create-dialog="{ data }">
             <VnLocation
                 :roles-allowed-to-create="['deliveryAssistant']"
-                v-model="data.location"
                 @update:model-value="(location) => handleLocation(data, location)"
             />
             <QInput v-model="data.userName" :label="t('Web user')" />
diff --git a/src/pages/Customer/components/CustomerAddressCreate.vue b/src/pages/Customer/components/CustomerAddressCreate.vue
index 30e4b21d0..e37306a94 100644
--- a/src/pages/Customer/components/CustomerAddressCreate.vue
+++ b/src/pages/Customer/components/CustomerAddressCreate.vue
@@ -93,7 +93,6 @@ function handleLocation(data, location) {
             <VnLocation
                 :rules="validate('Worker.postcode')"
                 :roles-allowed-to-create="['deliveryAssistant']"
-                v-model="data.location"
                 @update:model-value="(location) => handleLocation(data, location)"
             />
 
diff --git a/src/pages/Customer/components/CustomerAddressEdit.vue b/src/pages/Customer/components/CustomerAddressEdit.vue
index 7a4c44014..133d2fabc 100644
--- a/src/pages/Customer/components/CustomerAddressEdit.vue
+++ b/src/pages/Customer/components/CustomerAddressEdit.vue
@@ -177,7 +177,12 @@ function handleLocation(data, location) {
                     <VnLocation
                         :rules="validate('Worker.postcode')"
                         :roles-allowed-to-create="['deliveryAssistant']"
-                        v-model="data.postalCode"
+                        :location="{
+                            postcode: data.postalCode,
+                            city: data.city,
+                            province: data.province,
+                            country: data.province.country,
+                        }"
                         @update:model-value="(location) => handleLocation(data, location)"
                     ></VnLocation>
                 </div>
diff --git a/src/pages/Supplier/Card/SupplierAddresses.vue b/src/pages/Supplier/Card/SupplierAddresses.vue
index 735b50625..4b2174d0b 100644
--- a/src/pages/Supplier/Card/SupplierAddresses.vue
+++ b/src/pages/Supplier/Card/SupplierAddresses.vue
@@ -26,7 +26,13 @@ const addressesFilter = {
         {
             relation: 'province',
             scope: {
-                fields: ['id', 'name'],
+                fields: ['id', 'name', 'countryFk'],
+                include: [
+                    {
+                        relation: 'country',
+                        scope: { fields: ['id', 'name'] },
+                    },
+                ],
             },
         },
     ],
diff --git a/src/pages/Supplier/Card/SupplierAddressesCreate.vue b/src/pages/Supplier/Card/SupplierAddressesCreate.vue
index da6549a24..df98b6091 100644
--- a/src/pages/Supplier/Card/SupplierAddressesCreate.vue
+++ b/src/pages/Supplier/Card/SupplierAddressesCreate.vue
@@ -21,6 +21,7 @@ const newAddressForm = reactive({
     provinceFk: null,
     phone: null,
     mobile: null,
+    province: null,
 });
 
 const onDataSaved = () => {
@@ -84,7 +85,16 @@ function handleLocation(data, location) {
                     <VnLocation
                         :rules="validate('Worker.postcode')"
                         :roles-allowed-to-create="['deliveryAssistant']"
-                        v-model="data.location"
+                        :location="
+                            data.postalCode
+                                ? {
+                                      postcode: data.postalCode,
+                                      city: data.city,
+                                      province: data.province,
+                                      country: data.province.country,
+                                  }
+                                : null
+                        "
                         @update:model-value="(location) => handleLocation(data, location)"
                     >
                     </VnLocation>
diff --git a/src/pages/Supplier/Card/SupplierFiscalData.vue b/src/pages/Supplier/Card/SupplierFiscalData.vue
index c638abbdc..c2cb42c6a 100644
--- a/src/pages/Supplier/Card/SupplierFiscalData.vue
+++ b/src/pages/Supplier/Card/SupplierFiscalData.vue
@@ -51,6 +51,23 @@ function handleLocation(data, location) {
         :url="`Suppliers/${route.params.id}`"
         :url-update="`Suppliers/${route.params.id}/updateFiscalData`"
         model="supplier"
+        :filter="{
+            fields: ['id', 'name', 'city', 'postCode', 'countryFk', 'provinceFk'],
+            include: [
+                {
+                    relation: 'province',
+                    scope: {
+                        fields: ['id', 'name'],
+                    },
+                },
+                {
+                    relation: 'country',
+                    scope: {
+                        fields: ['id', 'name'],
+                    },
+                },
+            ],
+        }"
         auto-load
         :clear-store-on-unmount="false"
     >
@@ -130,7 +147,12 @@ function handleLocation(data, location) {
                 <VnLocation
                     :rules="validate('Worker.postcode')"
                     :roles-allowed-to-create="['deliveryAssistant']"
-                    v-model="data.postCode"
+                    :location="{
+                        postcode: data.postCode,
+                        city: data.city,
+                        province: data.province,
+                        country: data.country,
+                    }"
                     @update:model-value="(location) => handleLocation(data, location)"
                 >
                 </VnLocation>
diff --git a/src/pages/Worker/WorkerCreate.vue b/src/pages/Worker/WorkerCreate.vue
index a1ded2bfd..5f96c136d 100644
--- a/src/pages/Worker/WorkerCreate.vue
+++ b/src/pages/Worker/WorkerCreate.vue
@@ -172,7 +172,6 @@ onBeforeMount(async () => {
                     <VnLocation
                         :rules="validate('Worker.postcode')"
                         :roles-allowed-to-create="['deliveryAssistant']"
-                        v-model="data.location"
                         @update:model-value="(location) => handleLocation(data, location)"
                         :disable="formData.isFreelance"
                     >
diff --git a/src/pages/Worker/WorkerList.vue b/src/pages/Worker/WorkerList.vue
index 0c2656597..9d4c3acbf 100644
--- a/src/pages/Worker/WorkerList.vue
+++ b/src/pages/Worker/WorkerList.vue
@@ -223,7 +223,6 @@ function uppercaseStreetModel(data) {
                     <VnLocation
                         :roles-allowed-to-create="['deliveryAssistant']"
                         :options="postcodesOptions"
-                        v-model="data.location"
                         @update:model-value="(location) => handleLocation(data, location)"
                         :disable="data.isFreelance"
                     >
diff --git a/src/router/modules/customer.js b/src/router/modules/customer.js
index 684b83b0f..f364bd862 100644
--- a/src/router/modules/customer.js
+++ b/src/router/modules/customer.js
@@ -174,7 +174,7 @@ export default {
                                     path: 'edit',
                                     name: 'CustomerAddressEdit',
                                     meta: {
-                                        title: 'address-edit',
+                                        title: 'addressEdit',
                                     },
                                     component: () =>
                                         import(

From 8acd008f42e02a80f0c491394f41335705dc3b85 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Wed, 14 Aug 2024 09:47:27 +0200
Subject: [PATCH 024/228] feat: handle newValue

---
 src/components/common/VnLocation.vue | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/components/common/VnLocation.vue b/src/components/common/VnLocation.vue
index 778932be3..2fbe357ba 100644
--- a/src/components/common/VnLocation.vue
+++ b/src/components/common/VnLocation.vue
@@ -4,6 +4,7 @@ import VnSelectDialog from 'components/common/VnSelectDialog.vue';
 import { useI18n } from 'vue-i18n';
 import { ref } from 'vue';
 const { t } = useI18n();
+const emit = defineEmits(['update:model-value', 'update:options']);
 
 const props = defineProps({
     location: {
@@ -39,7 +40,14 @@ function showLabel(data) {
         :emit-value="false"
     >
         <template #form>
-            <CreateNewPostcode @on-data-saved="(newValue) => (modelValue = newValue)" />
+            <CreateNewPostcode
+                @on-data-saved="
+                    (newValue) => {
+                        modelValue = newValue;
+                        emit('update:model-value', newValue);
+                    }
+                "
+            />
         </template>
         <template #option="{ itemProps, opt }">
             <QItem v-bind="itemProps">

From 9eff6b56ea4f78fbc8938dbbf5d22f89a4cd843a Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Wed, 14 Aug 2024 09:48:59 +0200
Subject: [PATCH 025/228] fix: remove print variable

---
 src/components/common/VnLocation.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/components/common/VnLocation.vue b/src/components/common/VnLocation.vue
index 2fbe357ba..e95d5a043 100644
--- a/src/components/common/VnLocation.vue
+++ b/src/components/common/VnLocation.vue
@@ -22,7 +22,6 @@ function showLabel(data) {
 }
 </script>
 <template>
-    {{ modelValue }}
     <VnSelectDialog
         v-model="modelValue"
         option-filter-value="search"

From bd83a959f7895c0c032d41053f1659678a523a54 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Wed, 14 Aug 2024 10:11:52 +0200
Subject: [PATCH 026/228] fix: customer credit opinion

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

diff --git a/src/pages/Customer/Card/CustomerCreditOpinion.vue b/src/pages/Customer/Card/CustomerCreditOpinion.vue
index 2b85cbd7d..c164ab450 100644
--- a/src/pages/Customer/Card/CustomerCreditOpinion.vue
+++ b/src/pages/Customer/Card/CustomerCreditOpinion.vue
@@ -16,7 +16,7 @@ import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.v
 const { t } = useI18n();
 const route = useRoute();
 
-const clientInformasRef = ref(null);
+const clientInformasRef = ref();
 const rows = ref([]);
 
 const filter = {
@@ -71,45 +71,35 @@ watch(
         clientInformasRef.value?.fetch();
     }
 );
-
-const onDataSaved = () => {
-    clientInformasRef.value?.fetch();
-};
 </script>
 
 <template>
     <FetchData
+        ref="clientInformasRef"
+        url="ClientInformas"
         :filter="filter"
         @on-fetch="(data) => (rows = data)"
         auto-load
-        ref="clientInformasRef"
-        url="ClientInformas"
     />
-
     <FormModel
         :form-initial-data="{}"
-        :observe-form-changes="false"
         :url-create="`Clients/${route.params.id}/setRating`"
-        @on-data-saved="onDataSaved"
+        @on-data-saved="clientInformasRef.fetch()"
     >
         <template #form="{ data }">
             <VnRow>
-                <div class="col">
-                    <VnInput
-                        :label="t('Rating')"
-                        clearable
-                        type="number"
-                        v-model.number="data.rating"
-                    />
-                </div>
-                <div class="col">
-                    <VnInput
-                        :label="t('Recommended credit')"
-                        clearable
-                        type="number"
-                        v-model.number="data.recommendedCredit"
-                    />
-                </div>
+                <VnInput
+                    :label="t('Rating')"
+                    clearable
+                    type="number"
+                    v-model.number="data.rating"
+                />
+                <VnInput
+                    :label="t('Recommended credit')"
+                    clearable
+                    type="number"
+                    v-model.number="data.recommendedCredit"
+                />
             </VnRow>
         </template>
     </FormModel>
@@ -125,17 +115,13 @@ const onDataSaved = () => {
             class="card-width q-px-lg"
         >
             <template #body-cell-employee="{ row }">
-                <QTd auto-width @click.stop>
-                    <QBtn color="blue" flat no-caps>{{ row.worker.user.nickname }}</QBtn>
+                <QTd @click.stop>
+                    <span class="link">{{ row.worker.user.nickname }}</span>
                     <WorkerDescriptorProxy :id="row.clientFk" />
                 </QTd>
             </template>
         </QTable>
     </div>
-
-    <h5 class="flex justify-center color-vn-label" v-else>
-        {{ t('globals.noResults') }}
-    </h5>
 </template>
 
 <i18n>

From e45e551526313668bfb315f5649e4dbd2943b9ef Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Fri, 16 Aug 2024 15:16:35 +0200
Subject: [PATCH 027/228] feat: customer consumption

---
 src/components/VnTable/VnTable.vue            |   4 +-
 src/components/ui/CatalogItem.vue             |   5 -
 src/components/ui/VnFilterPanel.vue           |   2 +
 src/composables/useArrayData.js               |  18 +-
 src/css/app.scss                              |   5 +
 src/i18n/locale/en.yml                        |   4 +
 src/i18n/locale/es.yml                        |   4 +
 src/pages/Customer/Card/CustomerCard.vue      |   8 +-
 .../Customer/Card/CustomerConsumption.vue     | 176 +++++++++++++++++-
 .../Card/CustomerConsumptionFilter.vue        |   2 +-
 src/pages/Customer/Card/CustomerSamples.vue   |  88 ++++-----
 src/pages/Login/ResetPassword.vue             |   1 -
 12 files changed, 249 insertions(+), 68 deletions(-)

diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index d6b35d4da..6f22a4dd9 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -67,7 +67,7 @@ const $props = defineProps({
     },
     hasSubToolbar: {
         type: Boolean,
-        default: true,
+        default: null,
     },
     disableOption: {
         type: Object,
@@ -341,7 +341,7 @@ defineExpose({
             :search-url="searchUrl"
             :disable-infinite-scroll="isTableMode"
             @save-changes="reload"
-            :has-sub-toolbar="$attrs['hasSubToolbar'] ?? isEditable"
+            :has-sub-toolbar="$props.hasSubToolbar ?? isEditable"
             :auto-load="hasParams || $attrs['auto-load']"
         >
             <template
diff --git a/src/components/ui/CatalogItem.vue b/src/components/ui/CatalogItem.vue
index ef722483b..545bfbbb4 100644
--- a/src/components/ui/CatalogItem.vue
+++ b/src/components/ui/CatalogItem.vue
@@ -127,11 +127,6 @@ const dialog = ref(null);
     flex-direction: column;
     gap: 4px;
 
-    .subName {
-        color: var(--vn-label-color);
-        text-transform: uppercase;
-    }
-
     p {
         margin-bottom: 0;
     }
diff --git a/src/components/ui/VnFilterPanel.vue b/src/components/ui/VnFilterPanel.vue
index e3019663c..045f45bec 100644
--- a/src/components/ui/VnFilterPanel.vue
+++ b/src/components/ui/VnFilterPanel.vue
@@ -3,6 +3,7 @@ import { onMounted, ref, computed, watch } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useArrayData } from 'composables/useArrayData';
 import { useRoute } from 'vue-router';
+import { date } from 'quasar';
 import toDate from 'filters/toDate';
 import VnFilterPanelChip from 'components/ui/VnFilterPanelChip.vue';
 
@@ -190,6 +191,7 @@ async function remove(key) {
 }
 
 function formatValue(value) {
+    if (value instanceof Date) return date.formatDate(value, 'DD/MM/YYYY');
     if (typeof value === 'boolean') return value ? t('Yes') : t('No');
     if (isNaN(value) && !isNaN(Date.parse(value))) return toDate(value);
 
diff --git a/src/composables/useArrayData.js b/src/composables/useArrayData.js
index 651bcefb0..446816788 100644
--- a/src/composables/useArrayData.js
+++ b/src/composables/useArrayData.js
@@ -86,12 +86,26 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
 
         Object.assign(filter, store.userFilter, exprFilter);
         let where;
-        if (filter?.where || store.filter?.where)
-            where = Object.assign(filter?.where ?? {}, store.filter?.where ?? {});
+        // ARRAY DATA FALLA AL JUNTAR WHERE'S
+        console.log(
+            'userParams?.filter?.where: ',
+            userParams?.filter?.where,
+            filter?.where,
+            store.filter?.where
+        );
+        if ((userParams?.filter?.where, filter?.where || store.filter?.where))
+            where = Object.assign(
+                userParams?.filter?.where ?? {},
+                filter?.where ?? {},
+                store.filter?.where ?? {}
+            );
         Object.assign(filter, store.filter);
         filter.where = where;
+        console.log('where: ', where);
         const params = { filter };
+        console.log('params: ', params);
 
+        delete userParams?.filter;
         Object.assign(params, userParams);
         params.filter.skip = store.skip;
         if (store.order && store.order.length) params.filter.order = store.order;
diff --git a/src/css/app.scss b/src/css/app.scss
index c233b14f0..85a39b480 100644
--- a/src/css/app.scss
+++ b/src/css/app.scss
@@ -268,3 +268,8 @@ input::-webkit-inner-spin-button {
         max-width: 400px;
     }
 }
+
+.subName {
+    color: var(--vn-label-color);
+    text-transform: uppercase;
+}
diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index 7d3682525..69373e23b 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -93,6 +93,10 @@ globals:
     since: Since
     from: From
     to: To
+    quantity: Quantity
+    item: Item
+    ticket: Ticket
+    campaign: Campaign
     pageTitles:
         logIn: Login
         summary: Summary
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index 8157f1803..48b2d3ad4 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -93,6 +93,10 @@ globals:
     since: Desde
     from: Desde
     to: Hasta
+    quantity: Cantidad
+    item: Artículo
+    ticket: Ticket
+    campaign: Campaña
     pageTitles:
         logIn: Inicio de sesión
         summary: Resumen
diff --git a/src/pages/Customer/Card/CustomerCard.vue b/src/pages/Customer/Card/CustomerCard.vue
index 229946ea2..9562be001 100644
--- a/src/pages/Customer/Card/CustomerCard.vue
+++ b/src/pages/Customer/Card/CustomerCard.vue
@@ -1,14 +1,20 @@
 <script setup>
+import { computed } from 'vue';
+import { useRoute } from 'vue-router';
+
 import VnCard from 'components/common/VnCard.vue';
 import CustomerDescriptor from './CustomerDescriptor.vue';
 import CustomerFilter from '../CustomerFilter.vue';
+const route = useRoute();
+
+const routeName = computed(() => route.name);
 </script>
 <template>
     <VnCard
         data-key="Client"
         base-url="Clients"
         :descriptor="CustomerDescriptor"
-        :filter-panel="CustomerFilter"
+        :filter-panel="routeName != 'CustomerConsumption' && CustomerFilter"
         search-data-key="CustomerList"
         :searchbar-props="{
             url: 'Clients/extendedListFilter',
diff --git a/src/pages/Customer/Card/CustomerConsumption.vue b/src/pages/Customer/Card/CustomerConsumption.vue
index 98a3115da..835223488 100644
--- a/src/pages/Customer/Card/CustomerConsumption.vue
+++ b/src/pages/Customer/Card/CustomerConsumption.vue
@@ -1,17 +1,183 @@
 <script setup>
+import { ref, computed, onBeforeMount } from 'vue';
+import axios from 'axios';
 import { useI18n } from 'vue-i18n';
-import CustomerConsumptionFilter from './CustomerConsumptionFilter.vue';
-import { useStateStore } from 'src/stores/useStateStore';
+import { toDate } from 'src/filters/index';
+import { useRoute } from 'vue-router';
+
+import VnTable from 'components/VnTable/VnTable.vue';
+import FetchedTags from 'components/ui/FetchedTags.vue';
+import TicketDescriptorProxy from 'src/pages/Ticket/Card/TicketDescriptorProxy.vue';
+import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue';
+import VnSelect from 'components/common/VnSelect.vue';
+import VnInputDate from 'components/common/VnInputDate.vue';
+
 const { t } = useI18n();
+const route = useRoute();
+const campaignList = ref();
+const columns = computed(() => [
+    {
+        name: 'search',
+        align: 'left',
+        label: t('globals.search'),
+        visible: false,
+    },
+    {
+        name: 'itemFk',
+        align: 'left',
+        label: t('globals.item'),
+        columnClass: 'shrink',
+        columnFilter: {
+            name: 'itemId',
+        },
+    },
+    {
+        name: 'ticketFk',
+        align: 'left',
+        label: t('globals.ticket'),
+        columnFilter: {
+            inWhere: true,
+        },
+    },
+    {
+        name: 'shipped',
+        align: 'left',
+        label: t('globals.shipped'),
+        format: ({ shipped }) => toDate(shipped),
+        columnFilter: false,
+    },
+    {
+        name: 'description',
+        align: 'left',
+        label: t('globals.description'),
+    },
+    {
+        name: 'quantity',
+        label: t('globals.quantity'),
+    },
+    {
+        name: 'grouped',
+        label: t('Group by items'),
+        component: 'checkbox',
+        visible: false,
+        orderBy: false,
+    },
+]);
+
+onBeforeMount(async () => {
+    campaignList.value = (await axios('Campaigns/latest')).data;
+});
+
+const filter = computed(() => {
+    const minDate = Date.vnNew();
+    minDate.setHours(0, 0, 0, 0);
+    minDate.setMonth(minDate.getMonth() - 2);
+
+    const maxDate = Date.vnNew();
+    maxDate.setHours(23, 59, 59, 59);
+
+    return {
+        campaign: campaignList.value[0]?.id,
+        from: minDate,
+        to: maxDate,
+        filter: {
+            where: {
+                clientFk: route.params.id,
+            },
+        },
+    };
+});
 </script>
 
 <template>
-    <Teleport to="#right-panel" v-if="useStateStore().isHeaderMounted()">
-        <CustomerConsumptionFilter data-key="CustomerConsumption" />
-    </Teleport>
+    <VnTable
+        v-if="campaignList"
+        data-key="CustomerConsumption"
+        url="Clients/consumption"
+        :order="['itemTypeFk', 'itemName', 'itemSize', 'description']"
+        :columns="columns"
+        search-url="consumption"
+        :user-params="filter"
+        :default-remove="false"
+        :default-reset="false"
+        :default-save="false"
+        :has-sub-toolbar="true"
+        auto-load
+    >
+        <template #moreBeforeActions>
+            <QBtn
+                color="primary"
+                icon="delete"
+                flat
+                @click="remove(selected)"
+                :disable="!selected?.length"
+                :title="t('globals.remove')"
+            />
+        </template>
+        <template #column-itemFk="{ row }">
+            <span class="link">
+                {{ row.itemFk }}
+                <ItemDescriptorProxy :id="row.itemFk" />
+            </span>
+        </template>
+        <template #column-ticketFk="{ row }">
+            <span class="link">
+                {{ row.ticketFk }}
+                <TicketDescriptorProxy :id="row.ticketFk" />
+            </span>
+        </template>
+        <template #column-description="{ row }">
+            <div>{{ row.concept }}</div>
+            <div v-if="row.subName" class="subName">
+                {{ row.subName }}
+            </div>
+            <FetchedTags :item="row" :max-length="3" />
+        </template>
+        <template #moreFilterPanel="{ params }">
+            <div class="column no-wrap flex-center q-gutter-y-md q-mt-xs q-pr-xl">
+                <VnSelect
+                    v-model="params.campaign"
+                    :options="campaignList"
+                    :label="t('globals.campaign')"
+                    :filled="true"
+                    class="q-px-sm q-pt-none fit"
+                    dense
+                    option-label="code"
+                >
+                    <template #option="scope">
+                        <QItem v-bind="scope.itemProps">
+                            <QItemSection>
+                                <QItemLabel>
+                                    {{ scope.opt?.code }}
+                                    {{
+                                        new Date(scope.opt?.dated).getFullYear()
+                                    }}</QItemLabel
+                                >
+                            </QItemSection>
+                        </QItem>
+                    </template>
+                </VnSelect>
+                <VnInputDate
+                    v-model="params.to"
+                    :label="t('globals.from')"
+                    :filled="true"
+                    class="q-px-xs q-pt-none fit"
+                    dense
+                />
+                <VnInputDate
+                    v-model="params.from"
+                    :label="t('globals.from')"
+                    :filled="true"
+                    class="q-px-xs q-pt-none fit"
+                    dense
+                />
+            </div>
+        </template>
+    </VnTable>
 </template>
 
 <i18n>
 es:
     Enter a new search: Introduce una nueva búsqueda
+    Group by items: Agrupar por artículos
 </i18n>
diff --git a/src/pages/Customer/Card/CustomerConsumptionFilter.vue b/src/pages/Customer/Card/CustomerConsumptionFilter.vue
index 4d2c5ff3c..31289c007 100644
--- a/src/pages/Customer/Card/CustomerConsumptionFilter.vue
+++ b/src/pages/Customer/Card/CustomerConsumptionFilter.vue
@@ -10,7 +10,7 @@ const { t } = useI18n();
 defineProps({ dataKey: { type: String, required: true } });
 </script>
 <template>
-    <VnFilterPanel :data-key="dataKey" :search-button="true">
+    <VnFilterPanel :data-key="dataKey" search-url="consumption">
         <template #tags="{ tag, formatFn }">
             <div class="q-gutter-x-xs">
                 <strong>{{ t(`params.${tag.label}`) }}: </strong>
diff --git a/src/pages/Customer/Card/CustomerSamples.vue b/src/pages/Customer/Card/CustomerSamples.vue
index de998d8d3..e28e290f4 100644
--- a/src/pages/Customer/Card/CustomerSamples.vue
+++ b/src/pages/Customer/Card/CustomerSamples.vue
@@ -26,27 +26,20 @@ const filter = {
     limit: 20,
 };
 
+const basicSpan = {
+    component: 'span',
+    props: () => {},
+    event: () => {},
+};
 const tableColumnComponents = {
-    sent: {
-        component: 'span',
-        props: () => {},
-        event: () => {},
-    },
-    description: {
-        component: 'span',
-        props: () => {},
-        event: () => {},
-    },
+    sent: basicSpan,
+    description: basicSpan,
     worker: {
-        component: QBtn,
-        props: () => ({ flat: true, color: 'blue', noCaps: true }),
-        event: () => {},
-    },
-    company: {
         component: 'span',
-        props: () => {},
+        props: () => ({ class: 'link' }),
         event: () => {},
     },
+    company: basicSpan,
 };
 
 const columns = computed(() => [
@@ -90,41 +83,34 @@ const toCustomerSamplesCreate = () => {
         url="ClientSamples"
     />
 
-    <div class="full-width flex justify-center">
-        <QPage class="card-width q-pa-lg">
-            <QTable
-                :columns="columns"
-                :pagination="{ rowsPerPage: 12 }"
-                :rows="rows"
-                class="full-width q-mt-md"
-                row-key="id"
-                :no-data-label="t('globals.noResults')"
-            >
-                <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
-                                    :id="props.row.userFk"
-                                    v-if="props.col.name === 'worker'"
-                                />
-                            </component>
-                        </QTr>
-                    </QTd>
-                </template>
-            </QTable>
-        </QPage>
-    </div>
+    <QTable
+        :columns="columns"
+        :pagination="{ rowsPerPage: 12 }"
+        :rows="rows"
+        class="full-width q-mt-md"
+        row-key="id"
+        :no-data-label="t('globals.noResults')"
+    >
+        <template #body-cell="props">
+            <QTd auto-width :props="props">
+                <span :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)"
+                        :title="props.value"
+                    >
+                        {{ props.value }}
+                        <WorkerDescriptorProxy
+                            :id="props.row.userFk"
+                            v-if="props.col.name === 'worker'"
+                        />
+                    </component>
+                </span>
+            </QTd>
+        </template>
+    </QTable>
 
     <QPageSticky :offset="[18, 18]">
         <QBtn @click.stop="toCustomerSamplesCreate()" color="primary" fab icon="add" />
diff --git a/src/pages/Login/ResetPassword.vue b/src/pages/Login/ResetPassword.vue
index eff718e97..2751f1ceb 100644
--- a/src/pages/Login/ResetPassword.vue
+++ b/src/pages/Login/ResetPassword.vue
@@ -33,7 +33,6 @@ async function onSubmit() {
     };
 
     try {
-        console.log('newPassword: ', newPassword);
         await axios.post(
             'VnUsers/reset-password',
             { newPassword: newPassword.value },

From f927e9b722e7c470487f4c711ba67aff0fc156f7 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 19 Aug 2024 14:31:52 +0200
Subject: [PATCH 028/228] fix: #6943 fix customerSummaryTable

---
 .../components/CustomerSummaryTable.vue       | 31 +++++++++----------
 .../CustomerSummaryTableActions.vue           | 10 +++++-
 2 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/src/pages/Customer/components/CustomerSummaryTable.vue b/src/pages/Customer/components/CustomerSummaryTable.vue
index dc9969b61..c25870fd8 100644
--- a/src/pages/Customer/components/CustomerSummaryTable.vue
+++ b/src/pages/Customer/components/CustomerSummaryTable.vue
@@ -162,7 +162,8 @@ const navigateToticketSummary = (id) => {
         params: { id },
     });
 };
-const commonColumns = (col) => ['date', 'state', 'total'].includes(col);
+const commonColumns = (col) =>
+    ['date', 'state', 'total', 'route', 'nickname'].includes(col);
 </script>
 
 <template>
@@ -190,13 +191,19 @@ const commonColumns = (col) => ['date', 'state', 'total'].includes(col);
                             v-bind="tableColumnComponents[props.col.name].props(props)"
                         >
                             <template v-if="!commonColumns(props.col.name)">
-                                <span
-                                    :class="{
-                                        link:
-                                            props.col.name === 'route' ||
-                                            props.col.name === 'nickname',
-                                    }"
-                                >
+                                <span>
+                                    {{ props.value }}
+                                </span>
+                            </template>
+                            <template v-if="props.col.name === 'route'">
+                                <span class="link" @click.stop>
+                                    <RouteDescriptorProxy :id="props.row.routeFk" />
+                                    {{ props.value }}
+                                </span>
+                            </template>
+                            <template v-if="props.col.name === 'nickname'">
+                                <span class="link" @click.stop>
+                                    <CustomerDescriptorProxy :id="props.row.clientFk" />
                                     {{ props.value }}
                                 </span>
                             </template>
@@ -220,14 +227,6 @@ const commonColumns = (col) => ['date', 'state', 'total'].includes(col);
                                 </QBadge>
                                 <div v-else>{{ toCurrency(props.value) }}</div>
                             </template>
-                            <CustomerDescriptorProxy
-                                :id="props.row.clientFk"
-                                v-if="props.col.name === 'nickname'"
-                            />
-                            <RouteDescriptorProxy
-                                :id="props.row.routeFk"
-                                v-if="props.col.name === 'route'"
-                            />
                         </component>
                     </QTr>
                 </QTd>
diff --git a/src/pages/Customer/components/CustomerSummaryTableActions.vue b/src/pages/Customer/components/CustomerSummaryTableActions.vue
index 6e9038374..154a37d22 100644
--- a/src/pages/Customer/components/CustomerSummaryTableActions.vue
+++ b/src/pages/Customer/components/CustomerSummaryTableActions.vue
@@ -1,10 +1,12 @@
 <script setup>
 import { useI18n } from 'vue-i18n';
+import { useRouter } from 'vue-router';
 
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
 import TicketSummary from 'src/pages/Ticket/Card/TicketSummary.vue';
 
 const { t } = useI18n();
+const router = useRouter();
 
 defineProps({
     id: {
@@ -18,7 +20,13 @@ const { viewSummary } = useSummaryDialog();
 
 <template>
     <div>
-        <QIcon color="primary" name="vn:lines" size="sm">
+        {{ id }}
+        <QIcon
+            color="primary"
+            name="vn:lines"
+            size="sm"
+            @click.stop="router.push({ params: { id }, name: 'TicketSale' })"
+        >
             <QTooltip>
                 {{ t('Go to lines') }}
             </QTooltip>

From a131cb559dbbc8f012f650bd6cbdd0130042a6d4 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Wed, 21 Aug 2024 13:34:40 +0200
Subject: [PATCH 029/228] feat: add max rule

---
 src/components/common/VnInput.vue | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/components/common/VnInput.vue b/src/components/common/VnInput.vue
index 75d4b8a28..e79a235d5 100644
--- a/src/components/common/VnInput.vue
+++ b/src/components/common/VnInput.vue
@@ -67,9 +67,13 @@ const mixinRules = [
     requiredFieldRule,
     ...($attrs.rules ?? []),
     (val) => {
-        const { min } = vnInputRef.value.$attrs;
+        const { min, max } = vnInputRef.value.$attrs;
         if (!min) return null;
         if (min >= 0) if (Math.floor(val) < min) return t('inputMin', { value: min });
+        if (!max) return null;
+        if (max > 0) {
+            if (Math.floor(val) > max) return t('inputMax', { value: max });
+        }
     },
 ];
 </script>
@@ -116,6 +120,8 @@ const mixinRules = [
 <i18n>
     en:
         inputMin: Must be more than {value}
+        inputMax: Must be less than {value}
     es:
         inputMin: Debe ser mayor a {value}
+        inputMax: Debe ser menor a {value}
 </i18n>

From bc1ea611cede24ec2ac8ad95e17ef10d97862866 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 23 Aug 2024 10:34:54 +0200
Subject: [PATCH 030/228] feat: CustomerConsumptionFilter

---
 .../Card/CustomerConsumptionFilter.vue        | 93 ++++++++++++++++++-
 .../Card/SupplierConsumptionFilter.vue        | 52 +++--------
 2 files changed, 102 insertions(+), 43 deletions(-)

diff --git a/src/pages/Customer/Card/CustomerConsumptionFilter.vue b/src/pages/Customer/Card/CustomerConsumptionFilter.vue
index 4d2c5ff3c..91536e954 100644
--- a/src/pages/Customer/Card/CustomerConsumptionFilter.vue
+++ b/src/pages/Customer/Card/CustomerConsumptionFilter.vue
@@ -5,6 +5,8 @@ import VnInput from 'src/components/common/VnInput.vue';
 import { QItem } from 'quasar';
 import VnSelect from 'src/components/common/VnSelect.vue';
 import { QItemSection } from 'quasar';
+import VnInputDate from 'src/components/common/VnInputDate.vue';
+import { toDate } from 'src/filters';
 
 const { t } = useI18n();
 defineProps({ dataKey: { type: String, required: true } });
@@ -33,6 +35,8 @@ defineProps({ dataKey: { type: String, required: true } });
                     <VnSelect
                         v-model="params.buyerId"
                         url="TicketRequests/getItemTypeWorker"
+                        :fields="['id', 'nickname']"
+                        sort-by="nickname ASC"
                         :label="t('params.buyer')"
                         option-value="id"
                         option-label="nickname"
@@ -48,30 +52,93 @@ defineProps({ dataKey: { type: String, required: true } });
                     <VnSelect
                         v-model="params.typeId"
                         url="ItemTypes"
-                        :label="t('params.type')"
+                        :include="['category']"
+                        :fields="['id', 'name', 'categoryFk']"
+                        sort-by="name ASC"
+                        :label="t('params.typeId')"
                         option-label="name"
                         option-value="id"
                         dense
                         outlined
                         rounded
                     >
+                        <template #option="scope">
+                            <QItem v-bind="scope.itemProps">
+                                <QItemSection>
+                                    <QItemLabel>{{ scope.opt?.name }}</QItemLabel>
+                                    <QItemLabel caption>{{
+                                        scope.opt?.category?.name
+                                    }}</QItemLabel>
+                                </QItemSection>
+                            </QItem>
+                        </template>
                     </VnSelect>
                 </QItemSection>
             </QItem>
             <QItem>
                 <QItemSection>
                     <VnSelect
+                        v-model="params.categoryId"
                         url="ItemCategories"
-                        :label="t('params.category')"
+                        :fields="['id', 'name']"
+                        sort-by="name ASC"
+                        :label="t('params.categoryId')"
                         option-label="name"
                         option-value="id"
-                        v-model="params.categoryId"
                         dense
                         outlined
                         rounded
                     />
                 </QItemSection>
             </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnSelect
+                        v-model="params.campaignId"
+                        url="Campaigns/latest"
+                        sort-by="dated DESC"
+                        :label="t('params.campaignId')"
+                        option-label="code"
+                        option-value="id"
+                        dense
+                        outlined
+                        rounded
+                    >
+                        <template #option="scope">
+                            <QItem v-bind="scope.itemProps">
+                                <QItemSection>
+                                    <QItemLabel>{{
+                                        t(`params.${scope.opt?.code}`)
+                                    }}</QItemLabel>
+                                    <QItemLabel caption>{{
+                                        toDate(scope.opt.dated)
+                                    }}</QItemLabel>
+                                </QItemSection>
+                            </QItem>
+                        </template>
+                    </VnSelect>
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnInputDate
+                        :label="t('params.from')"
+                        v-model="params.from"
+                        @update:model-value="searchFn()"
+                        is-outlined
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnInputDate
+                        :label="t('params.to')"
+                        v-model="params.to"
+                        @update:model-value="searchFn()"
+                        is-outlined
+                    />
+                </QItemSection>
+            </QItem>
         </template>
     </VnFilterPanel>
 </template>
@@ -82,10 +149,30 @@ en:
         buyer: Buyer
         type: Type
         category: Category
+        itemId: Item id
+        buyerId: Buyer
+        typeId: Type
+        categoryId: Category
+        from: From
+        to: To
+        campaignId: Campaña
+        valentinesDay: Valentine's Day
+        mothersDay: Mother's Day
+        allSaints: All Saints' Day
 es:
     params:
         item: Id artículo
         buyer: Comprador
         type: Tipo
         category: Categoría
+        itemId: Id Artículo
+        buyerId: Comprador
+        typeId: Tipo
+        categoryId: Reino
+        from: Desde
+        to: Hasta
+        campaignId: Campaña
+        valentinesDay: Día de San Valentín
+        mothersDay: Día de la Madre
+        allSaints: Día de Todos los Santos
 </i18n>
diff --git a/src/pages/Supplier/Card/SupplierConsumptionFilter.vue b/src/pages/Supplier/Card/SupplierConsumptionFilter.vue
index 3fc61b15e..401bde8fa 100644
--- a/src/pages/Supplier/Card/SupplierConsumptionFilter.vue
+++ b/src/pages/Supplier/Card/SupplierConsumptionFilter.vue
@@ -1,56 +1,21 @@
 <script setup>
-import { ref } from 'vue';
 import { useI18n } from 'vue-i18n';
-
 import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
 import VnInput from 'src/components/common/VnInput.vue';
-import FetchData from 'components/FetchData.vue';
 import VnInputDate from 'src/components/common/VnInputDate.vue';
 
 const { t } = useI18n();
-const props = defineProps({
+defineProps({
     dataKey: {
         type: String,
         required: true,
     },
 });
-
-const buyersOptions = ref([]);
-const itemTypesOptions = ref([]);
-const itemCategoriesOptions = ref([]);
 </script>
 
 <template>
-    <FetchData
-        url="TicketRequests/getItemTypeWorker"
-        :filter="{
-            fields: ['id', 'nickname'],
-            order: 'nickname ASC',
-        }"
-        @on-fetch="(data) => (buyersOptions = data)"
-        auto-load
-    />
-    <FetchData
-        url="ItemTypes"
-        :filter="{
-            fields: ['id', 'name', 'categoryFk'],
-            include: 'category',
-            order: 'name ASC',
-        }"
-        @on-fetch="(data) => (itemTypesOptions = data)"
-        auto-load
-    />
-    <FetchData
-        url="ItemCategories"
-        :filter="{
-            fields: ['id', 'name'],
-            order: 'name ASC',
-        }"
-        @on-fetch="(data) => (itemCategoriesOptions = data)"
-        auto-load
-    />
-    <VnFilterPanel :data-key="props.dataKey" :search-button="true" :redirect="false">
+    <VnFilterPanel :data-key="dataKey" :search-button="true" :redirect="false">
         <template #tags="{ tag, formatFn }">
             <div class="q-gutter-x-xs">
                 <strong>{{ t(`params.${tag.label}`) }}: </strong>
@@ -82,7 +47,9 @@ const itemCategoriesOptions = ref([]);
                         :label="t('params.buyerId')"
                         v-model="params.buyerId"
                         @update:model-value="searchFn()"
-                        :options="buyersOptions"
+                        url="TicketRequests/getItemTypeWorker"
+                        :fields="['id', 'nickname']"
+                        sort-by="nickname ASC"
                         option-value="id"
                         option-label="nickname"
                         hide-selected
@@ -98,7 +65,10 @@ const itemCategoriesOptions = ref([]);
                         :label="t('params.typeId')"
                         v-model="params.typeId"
                         @update:model-value="searchFn()"
-                        :options="itemTypesOptions"
+                        url="ItemTypes"
+                        :include="['category']"
+                        :fields="['id', 'name', 'categoryFk']"
+                        sort-by="name ASC"
                         option-value="id"
                         option-label="name"
                         hide-selected
@@ -125,7 +95,9 @@ const itemCategoriesOptions = ref([]);
                         :label="t('params.categoryId')"
                         v-model="params.categoryId"
                         @update:model-value="searchFn()"
-                        :options="itemCategoriesOptions"
+                        url="ItemCategories"
+                        :fields="['id', 'name']"
+                        sort-by="name ASC"
                         option-value="id"
                         option-label="name"
                         hide-selected

From 0d99c5f609ce7e7a73b995669f028bfddeca4d01 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 23 Aug 2024 15:30:22 +0200
Subject: [PATCH 031/228] feat: CustomerConsumptionFilter

---
 src/composables/usePrintService.js            |   1 +
 .../Customer/Card/CustomerConsumption.vue     | 166 ++++++++++++++++++
 .../Card/CustomerConsumptionFilter.vue        |  15 +-
 3 files changed, 180 insertions(+), 2 deletions(-)

diff --git a/src/composables/usePrintService.js b/src/composables/usePrintService.js
index edf9598b2..ff43c65a1 100644
--- a/src/composables/usePrintService.js
+++ b/src/composables/usePrintService.js
@@ -17,6 +17,7 @@ export function usePrintService() {
     }
 
     function openReport(path, params) {
+        if (typeof params === 'string') params = JSON.parse(params);
         params = Object.assign(
             {
                 access_token: getTokenMultimedia(),
diff --git a/src/pages/Customer/Card/CustomerConsumption.vue b/src/pages/Customer/Card/CustomerConsumption.vue
index 4d3da1116..a8c34991a 100644
--- a/src/pages/Customer/Card/CustomerConsumption.vue
+++ b/src/pages/Customer/Card/CustomerConsumption.vue
@@ -1,15 +1,181 @@
 <script setup>
+import { computed, ref, watch } from 'vue';
+import { useQuasar } from 'quasar';
+import { useI18n } from 'vue-i18n';
 import CustomerConsumptionFilter from './CustomerConsumptionFilter.vue';
 import { useStateStore } from 'src/stores/useStateStore';
+import VnTable from 'components/VnTable/VnTable.vue';
+import VnSubToolbar from 'components/ui/VnSubToolbar.vue';
+import { toDate } from 'src/filters';
+import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue';
+import TicketDescriptorProxy from 'src/pages/Ticket/Card/TicketDescriptorProxy.vue';
+import FetchedTags from 'components/ui/FetchedTags.vue';
+import { useArrayData } from 'src/composables/useArrayData';
+import { useRoute } from 'vue-router';
+import { usePrintService } from 'src/composables/usePrintService';
+import SendEmailDialog from 'src/components/common/SendEmailDialog.vue';
+
+const { openReport, sendEmail } = usePrintService();
+const arrayData = useArrayData('Client');
+const { t } = useI18n();
+const quasar = useQuasar();
+
+const route = useRoute();
+const tableRef = ref();
+const filter = computed(() => ({
+    where: { and: [{ isPackaging: false }, { clientFk: route.params.id }] },
+    limit: 30,
+    skip: 10,
+}));
+
+const showActionBtns = computed(() => handleQueryParams());
+function handleQueryParams() {
+    const query = JSON.parse(route.query.table);
+    return query.from && query.to;
+}
+watch(
+    () => route.query,
+    () => {
+        showActionBtns.value = handleQueryParams();
+    }
+);
+const columns = computed(() => [
+    {
+        align: 'left',
+        name: 'itemFk',
+        label: t('Item'),
+        cardVisible: true,
+        columnFilter: {
+            inWhere: true,
+        },
+    },
+    {
+        align: 'left',
+        name: 'ticketFk',
+        label: t('Ticket'),
+        cardVisible: true,
+        columnFilter: {
+            inWhere: true,
+        },
+    },
+    {
+        align: 'left',
+        name: 'shipped',
+        label: t('Creation date'),
+        format: ({ shipped }) => toDate(shipped),
+        cardVisible: true,
+        columnFilter: {
+            inWhere: true,
+        },
+    },
+
+    {
+        align: 'left',
+        name: 'description',
+        label: t('Description'),
+        class: 'extend',
+        columnFilter: {
+            inWhere: true,
+        },
+    },
+    {
+        align: 'left',
+        name: 'quantity',
+        label: t('Quantity'),
+        cardVisible: true,
+        columnFilter: {
+            inWhere: true,
+        },
+    },
+]);
+function getParams() {
+    const query = JSON.parse(route.query.table);
+    return {
+        from: query.from,
+        to: query.to,
+        recipient: arrayData.store.data.email,
+        recipientId: arrayData.store.data.id,
+    };
+}
+const openReportPdf = () => {
+    openReport(`Clients/${route.params.id}/campaign-metrics-pdf`, getParams());
+};
+
+const openSendEmailDialog = async () => {
+    quasar.dialog({
+        component: SendEmailDialog,
+        componentProps: {
+            data: {
+                address: arrayData.store.data.email,
+            },
+            promise: sendCampaignMetricsEmail,
+        },
+    });
+};
+const sendCampaignMetricsEmail = ({ address }) => {
+    sendEmail(`Suppliers/${route.params.id}/campaign-metrics-email`, {
+        recipient: address,
+        ...getParams().value,
+    });
+};
 </script>
 
 <template>
     <Teleport to="#right-panel" v-if="useStateStore().isHeaderMounted()">
         <CustomerConsumptionFilter data-key="CustomerConsumption" />
     </Teleport>
+    <VnSubToolbar>
+        <template #st-actions>
+            <QBtn
+                color="primary"
+                icon-right="picture_as_pdf"
+                @click="openReportPdf()"
+                :disabled="!showActionBtns"
+            >
+                <QTooltip>{{ t('globals.downloadPdf') }}</QTooltip>
+            </QBtn>
+            <QBtn
+                color="primary"
+                icon-right="email"
+                @click="openSendEmailDialog()"
+                :disabled="!showActionBtns"
+            >
+                <QTooltip>{{ t('globals.downloadPdf') }}</QTooltip>
+            </QBtn>
+        </template>
+    </VnSubToolbar>
+    <VnTable
+        data-key="CustomerConsumption"
+        ref="tableRef"
+        :filter="filter"
+        url="Clients/Consumption"
+        :columns="columns"
+        :right-search="false"
+        :use-model="true"
+        auto-load
+        :order="['itemTypeFk', 'itemName', 'itemSize', 'description']"
+    >
+        <template #column-itemFk="{ row }">
+            <span class="link">
+                {{ row.itemFk }}
+                <ItemDescriptorProxy :id="row.itemFk" />
+            </span>
+            <!-- <FetchedTags :item="row" :max-length="6" /> -->
+        </template>
+        <template #column-description="{ row }">
+            <FetchedTags :item="row" :max-length="6" />
+        </template>
+        <template #column-ticketFk="{ row }">
+            <span class="link">
+                {{ row.ticketFk }}
+                <TicketDescriptorProxy :id="row.ticketFk" />
+            </span> </template
+    ></VnTable>
 </template>
 
 <i18n>
 es:
+    Group by item: Agrupar por artículo
+
     Enter a new search: Introduce una nueva búsqueda
 </i18n>
diff --git a/src/pages/Customer/Card/CustomerConsumptionFilter.vue b/src/pages/Customer/Card/CustomerConsumptionFilter.vue
index 91536e954..0f5148007 100644
--- a/src/pages/Customer/Card/CustomerConsumptionFilter.vue
+++ b/src/pages/Customer/Card/CustomerConsumptionFilter.vue
@@ -12,14 +12,23 @@ const { t } = useI18n();
 defineProps({ dataKey: { type: String, required: true } });
 </script>
 <template>
-    <VnFilterPanel :data-key="dataKey" :search-button="true">
+    <VnFilterPanel :data-key="dataKey" :search-button="true" :redirect="false">
         <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 }">
+        <template #body="{ params, searchFn }">
+            <QItem>
+                <QItemSection
+                    ><QCheckbox
+                        v-model="params.grouped"
+                        :label="t('Group by item')"
+                        @update:model-value="searchFn()"
+                        dense
+                /></QItemSection>
+            </QItem>
             <QItem>
                 <QItemSection>
                     <VnInput
@@ -145,6 +154,7 @@ defineProps({ dataKey: { type: String, required: true } });
 <i18n>
 en:
     params:
+        grouped: Group by item
         item: Item id
         buyer: Buyer
         type: Type
@@ -161,6 +171,7 @@ en:
         allSaints: All Saints' Day
 es:
     params:
+        grouped: Agrupar por artículo
         item: Id artículo
         buyer: Comprador
         type: Tipo

From 56f687ce3603e2383b4066c48b9445132e6fc4e9 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 23 Aug 2024 21:06:15 +0200
Subject: [PATCH 032/228] perf: sendEmail customerConsumption

---
 src/i18n/locale/en.yml                        |  1 +
 src/i18n/locale/es.yml                        |  1 +
 .../Customer/Card/CustomerConsumption.vue     | 38 ++++----
 .../Card/CustomerConsumptionFilter.vue        |  2 +-
 src/pages/Ticket/Card/TicketTransfer.vue      | 29 ++-----
 src/pages/Ticket/Card/TicketTransferForm.vue  | 86 +++++++++++++++++++
 6 files changed, 111 insertions(+), 46 deletions(-)
 create mode 100644 src/pages/Ticket/Card/TicketTransferForm.vue

diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index aa7e83fb3..0c0ede5f7 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -2,6 +2,7 @@ globals:
     lang:
         es: Spanish
         en: English
+    quantity: Quantity
     language: Language
     entity: Entity
     user: User
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index 100bf54ad..e4392627c 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -3,6 +3,7 @@ globals:
         es: Español
         en: Inglés
     language: Idioma
+    quantity: Cantidad
     entity: Entidad
     user: Usuario
     details: Detalles
diff --git a/src/pages/Customer/Card/CustomerConsumption.vue b/src/pages/Customer/Card/CustomerConsumption.vue
index a8c34991a..eddabc154 100644
--- a/src/pages/Customer/Card/CustomerConsumption.vue
+++ b/src/pages/Customer/Card/CustomerConsumption.vue
@@ -1,6 +1,5 @@
 <script setup>
 import { computed, ref, watch } from 'vue';
-import { useQuasar } from 'quasar';
 import { useI18n } from 'vue-i18n';
 import CustomerConsumptionFilter from './CustomerConsumptionFilter.vue';
 import { useStateStore } from 'src/stores/useStateStore';
@@ -13,12 +12,12 @@ import FetchedTags from 'components/ui/FetchedTags.vue';
 import { useArrayData } from 'src/composables/useArrayData';
 import { useRoute } from 'vue-router';
 import { usePrintService } from 'src/composables/usePrintService';
-import SendEmailDialog from 'src/components/common/SendEmailDialog.vue';
+import { useVnConfirm } from 'src/composables/useVnConfirm';
 
+const { openConfirmationModal } = useVnConfirm();
 const { openReport, sendEmail } = usePrintService();
 const arrayData = useArrayData('Client');
 const { t } = useI18n();
-const quasar = useQuasar();
 
 const route = useRoute();
 const tableRef = ref();
@@ -61,7 +60,7 @@ const columns = computed(() => [
     {
         align: 'left',
         name: 'shipped',
-        label: t('Creation date'),
+        label: t('shipped'),
         format: ({ shipped }) => toDate(shipped),
         cardVisible: true,
         columnFilter: {
@@ -72,7 +71,7 @@ const columns = computed(() => [
     {
         align: 'left',
         name: 'description',
-        label: t('Description'),
+        label: t('globals.description'),
         class: 'extend',
         columnFilter: {
             inWhere: true,
@@ -81,7 +80,7 @@ const columns = computed(() => [
     {
         align: 'left',
         name: 'quantity',
-        label: t('Quantity'),
+        label: t('globals.quantity'),
         cardVisible: true,
         columnFilter: {
             inWhere: true,
@@ -102,20 +101,16 @@ const openReportPdf = () => {
 };
 
 const openSendEmailDialog = async () => {
-    quasar.dialog({
-        component: SendEmailDialog,
-        componentProps: {
-            data: {
-                address: arrayData.store.data.email,
-            },
-            promise: sendCampaignMetricsEmail,
-        },
-    });
+    openConfirmationModal(
+        t('The consumption report will be sent'),
+        t('Please, confirm'),
+        () => sendCampaignMetricsEmail({ address: arrayData.store.data.email })
+    );
 };
 const sendCampaignMetricsEmail = ({ address }) => {
-    sendEmail(`Suppliers/${route.params.id}/campaign-metrics-email`, {
+    sendEmail(`Clients/${route.params.id}/campaign-metrics-email`, {
         recipient: address,
-        ...getParams().value,
+        ...getParams(),
     });
 };
 </script>
@@ -140,7 +135,7 @@ const sendCampaignMetricsEmail = ({ address }) => {
                 @click="openSendEmailDialog()"
                 :disabled="!showActionBtns"
             >
-                <QTooltip>{{ t('globals.downloadPdf') }}</QTooltip>
+                <QTooltip>{{ t('Send to email') }}</QTooltip>
             </QBtn>
         </template>
     </VnSubToolbar>
@@ -160,7 +155,6 @@ const sendCampaignMetricsEmail = ({ address }) => {
                 {{ row.itemFk }}
                 <ItemDescriptorProxy :id="row.itemFk" />
             </span>
-            <!-- <FetchedTags :item="row" :max-length="6" /> -->
         </template>
         <template #column-description="{ row }">
             <FetchedTags :item="row" :max-length="6" />
@@ -175,7 +169,9 @@ const sendCampaignMetricsEmail = ({ address }) => {
 
 <i18n>
 es:
-    Group by item: Agrupar por artículo
-
+    Send to email: Enviar por email
+    Search by item id or name: Buscar por id de artículo o nombre
+    The consumption report will be sent: Se enviará el informe de consumo
+    Please, confirm: Por favor, confirma
     Enter a new search: Introduce una nueva búsqueda
 </i18n>
diff --git a/src/pages/Customer/Card/CustomerConsumptionFilter.vue b/src/pages/Customer/Card/CustomerConsumptionFilter.vue
index 0f5148007..52e6cdc79 100644
--- a/src/pages/Customer/Card/CustomerConsumptionFilter.vue
+++ b/src/pages/Customer/Card/CustomerConsumptionFilter.vue
@@ -24,7 +24,7 @@ defineProps({ dataKey: { type: String, required: true } });
                 <QItemSection
                     ><QCheckbox
                         v-model="params.grouped"
-                        :label="t('Group by item')"
+                        :label="t('params.grouped')"
                         @update:model-value="searchFn()"
                         dense
                 /></QItemSection>
diff --git a/src/pages/Ticket/Card/TicketTransfer.vue b/src/pages/Ticket/Card/TicketTransfer.vue
index 9a22c764c..1944b80f4 100644
--- a/src/pages/Ticket/Card/TicketTransfer.vue
+++ b/src/pages/Ticket/Card/TicketTransfer.vue
@@ -4,6 +4,7 @@ import { useI18n } from 'vue-i18n';
 import { useRouter } from 'vue-router';
 
 import VnInput from 'src/components/common/VnInput.vue';
+import TicketTransferForm from './TicketTransferForm.vue';
 
 import { toDateFormat } from 'src/filters/date.js';
 import axios from 'axios';
@@ -135,9 +136,7 @@ onMounted(() => (_transfer.value = $props.transfer));
                 :columns="destinationTicketColumns"
                 :title="t('Destination ticket')"
                 row-key="id"
-                :pagination="{ rowsPerPage: 0 }"
                 class="full-width q-mt-md"
-                :no-data-label="t('globals.noResults')"
             >
                 <template #body-cell-address="{ row }">
                     <QTd @click.stop>
@@ -158,29 +157,11 @@ onMounted(() => (_transfer.value = $props.transfer));
                     </QTd>
                 </template>
 
+                <template #no-data>
+                    <TicketTransferForm v-bind="$props" />
+                </template>
                 <template #bottom>
-                    <QForm class="q-mt-lg full-width">
-                        <VnInput
-                            v-model.number="_transfer.ticketId"
-                            :label="t('Transfer to ticket')"
-                            :clearable="false"
-                        >
-                            <template #append>
-                                <QBtn
-                                    icon="keyboard_arrow_right"
-                                    color="primary"
-                                    @click="transferSales(_transfer.ticketId)"
-                                    style="width: 30px"
-                                />
-                            </template>
-                        </VnInput>
-                        <QBtn
-                            :label="t('New ticket')"
-                            color="primary"
-                            class="full-width q-my-lg"
-                            @click="transferSales()"
-                        />
-                    </QForm>
+                    <TicketTransferForm v-bind="$props" />
                 </template>
             </QTable>
         </QCard>
diff --git a/src/pages/Ticket/Card/TicketTransferForm.vue b/src/pages/Ticket/Card/TicketTransferForm.vue
new file mode 100644
index 000000000..9507429e6
--- /dev/null
+++ b/src/pages/Ticket/Card/TicketTransferForm.vue
@@ -0,0 +1,86 @@
+<script setup>
+import { ref, onMounted } from 'vue';
+import { useI18n } from 'vue-i18n';
+import { useRouter } from 'vue-router';
+
+import VnInput from 'src/components/common/VnInput.vue';
+
+import axios from 'axios';
+
+const $props = defineProps({
+    mana: {
+        type: Number,
+        default: null,
+    },
+    newPrice: {
+        type: Number,
+        default: 0,
+    },
+    transfer: {
+        type: Object,
+        default: () => {},
+    },
+    ticket: {
+        type: Object,
+        default: () => {},
+    },
+});
+
+const emit = defineEmits(['refreshData']);
+
+const router = useRouter();
+const { t } = useI18n();
+
+const _transfer = ref(null);
+
+const transferSales = async (ticketId) => {
+    const params = {
+        ticketId: ticketId,
+        sales: $props.transfer.sales,
+    };
+
+    const { data } = await axios.post(
+        `tickets/${$props.ticket.id}/transferSales`,
+        params
+    );
+
+    if (data && data.id === $props.ticket.id) emit('refreshData');
+    else router.push({ name: 'TicketSale', params: { id: data.id } });
+};
+
+onMounted(() => (_transfer.value = $props.transfer));
+</script>
+
+<template>
+    {{ _transfer }}
+    <QForm class="q-mt-lg full-width">
+        <VnInput
+            v-model.number="_transfer.ticketId"
+            :label="t('Transfer to ticket')"
+            :clearable="false"
+        >
+            <template #append>
+                <QBtn
+                    icon="keyboard_arrow_right"
+                    color="primary"
+                    @click="transferSales(_transfer.ticketId)"
+                    style="width: 30px"
+                />
+            </template>
+        </VnInput>
+        <QBtn
+            :label="t('New ticket')"
+            color="primary"
+            class="full-width q-my-lg"
+            @click="transferSales()"
+        />
+    </QForm>
+</template>
+
+<i18n>
+es:
+    Sales to transfer: Líneas a transferir
+    Destination ticket: Ticket destinatario
+    Transfer to ticket: Transferir a ticket
+    New ticket: Nuevo ticket
+</i18n>

From 6c887c36b10f302d419d794b644e45069111fb9d Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 26 Aug 2024 12:26:21 +0200
Subject: [PATCH 033/228] fix: CustomerDescriptor.bussinessTypeFk

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

diff --git a/src/pages/Customer/Card/CustomerDescriptor.vue b/src/pages/Customer/Card/CustomerDescriptor.vue
index 0e76bcfed..ed68d1ce6 100644
--- a/src/pages/Customer/Card/CustomerDescriptor.vue
+++ b/src/pages/Customer/Card/CustomerDescriptor.vue
@@ -68,7 +68,7 @@ const setData = (entity) => (data.value = useCardDescription(entity?.name, entit
             </VnLv>
             <VnLv
                 :label="t('customer.card.businessTypeFk')"
-                :value="entity.businessTypeFk"
+                :value="entity.businessType.description"
             />
         </template>
         <template #icons="{ entity }">

From 9a48cb07428c23769e72b0074bc55fcfac39c3e1 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 26 Aug 2024 12:26:31 +0200
Subject: [PATCH 034/228] feat: VnImg draggable

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

diff --git a/src/components/ui/VnImg.vue b/src/components/ui/VnImg.vue
index 9585b81d8..7dbc3ac2a 100644
--- a/src/components/ui/VnImg.vue
+++ b/src/components/ui/VnImg.vue
@@ -52,6 +52,7 @@ defineExpose({
 </script>
 <template>
     <QImg
+        :draggable="true"
         :class="{ zoomIn: zoom }"
         :src="getUrl()"
         v-bind="$attrs"
@@ -60,6 +61,7 @@ defineExpose({
     />
     <QDialog v-if="$props.zoom" v-model="show">
         <QImg
+            :draggable="true"
             :src="getUrl(true)"
             v-bind="$attrs"
             spinner-color="primary"

From 10747d7a4ff49d7057e3d49425e5075871dc2958 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Tue, 27 Aug 2024 07:00:28 +0200
Subject: [PATCH 035/228] perf: customerSummaryTable

---
 src/components/VnTable/VnTable.vue            |  16 +-
 src/i18n/locale/en.yml                        |   1 +
 src/i18n/locale/es.yml                        |   2 +
 src/pages/Customer/Card/CustomerSummary.vue   |  32 ++-
 .../components/CustomerSummaryTable.vue       | 249 ++++++++----------
 .../CustomerSummaryTableActions.vue           |  52 ----
 6 files changed, 139 insertions(+), 213 deletions(-)
 delete mode 100644 src/pages/Customer/components/CustomerSummaryTableActions.vue

diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index 6c77d44df..1708f9b6c 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -65,6 +65,10 @@ const $props = defineProps({
         type: Boolean,
         default: false,
     },
+    disableInfiniteScroll: {
+        type: Boolean,
+        default: false,
+    },
     hasSubToolbar: {
         type: Boolean,
         default: true,
@@ -335,11 +339,13 @@ defineExpose({
     <div class="q-px-md">
         <CrudModel
             v-bind="$attrs"
-            :limit="20"
+            :limit="$attrs['limit'] ?? 20"
             ref="CrudModelRef"
             @on-fetch="(...args) => emit('onFetch', ...args)"
             :search-url="searchUrl"
-            :disable-infinite-scroll="isTableMode"
+            :disable-infinite-scroll="
+                $attrs['disableInfiniteScroll'] ? isTableMode : disableInfiniteScroll
+            "
             @save-changes="reload"
             :has-sub-toolbar="$attrs['hasSubToolbar'] ?? isEditable"
             :auto-load="hasParams || $attrs['auto-load']"
@@ -486,11 +492,7 @@ defineExpose({
                                 :icon="btn.icon"
                                 class="q-px-sm"
                                 flat
-                                :class="
-                                    btn.isPrimary
-                                        ? 'text-primary-light'
-                                        : 'color-vn-text '
-                                "
+                                :class="'text-primary-light'"
                                 :style="`visibility: ${
                                     (btn.show && btn.show(row)) ?? true
                                         ? 'visible'
diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index 0c0ede5f7..7bb4dcd64 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -375,6 +375,7 @@ customer:
         averageInvoiced: Average invoiced
         claimRate: Claming rate
         risk: Risk
+        maximumRisk: Solunion's maximum risk
         riskInfo: Invoices minus payments plus orders not yet invoiced
         credit: Credit
         creditInfo: Company's maximum risk
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index e4392627c..bc0934e6d 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -373,6 +373,8 @@ customer:
         priceIncreasingRate: Ratio de incremento de precio
         averageInvoiced: Facturación media
         claimRate: Ratio de reclamaciones
+        maximumRisk: Riesgo máximo asumido por Solunion
+
         risk: Riesgo
         riskInfo: Facturas menos recibos mas pedidos sin facturar
         credit: Crédito
diff --git a/src/pages/Customer/Card/CustomerSummary.vue b/src/pages/Customer/Card/CustomerSummary.vue
index 15bf19b48..cee8b7c0a 100644
--- a/src/pages/Customer/Card/CustomerSummary.vue
+++ b/src/pages/Customer/Card/CustomerSummary.vue
@@ -2,6 +2,8 @@
 import { computed, ref, onMounted } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
+import VnUserLink from 'src/components/ui/VnUserLink.vue';
+
 import { toCurrency, toPercentage, toDate } from 'src/filters';
 import CardSummary from 'components/ui/CardSummary.vue';
 import { getUrl } from 'src/composables/getUrl';
@@ -40,11 +42,11 @@ const balanceDue = computed(() => {
 const balanceDueWarning = computed(() => (balanceDue.value ? 'negative' : ''));
 
 const claimRate = computed(() => {
-    return customer.value.claimsRatio.claimingRate;
+    return customer.value.claimsRatio?.claimingRate ?? 0;
 });
 
 const priceIncreasingRate = computed(() => {
-    return customer.value.claimsRatio.priceIncreasing / 100;
+    return customer.value.claimsRatio?.priceIncreasing ?? 0 / 100;
 });
 
 const debtWarning = computed(() => {
@@ -91,7 +93,13 @@ const creditWarning = computed(() => {
                 <VnLv
                     :label="t('customer.summary.salesPerson')"
                     :value="entity?.salesPersonUser?.name"
-                />
+                >
+                    <template #value>
+                        <VnUserLink
+                            :name="entity.salesPersonUser?.name"
+                            :worker-id="entity.salesPersonFk"
+                        /> </template
+                ></VnLv>
                 <VnLv
                     :label="t('customer.summary.contactChannel')"
                     :value="entity?.contactChannel?.name"
@@ -131,7 +139,7 @@ const creditWarning = computed(() => {
                     :url="`#/customer/${entityId}/fiscal-data`"
                     :text="t('customer.summary.fiscalData')"
                 />
-                <VnRow>
+                <VnRow class="block">
                     <VnLv
                         :label="t('customer.summary.isEqualizated')"
                         :value="entity.isEqualizated"
@@ -140,8 +148,8 @@ const creditWarning = computed(() => {
                         :label="t('customer.summary.isActive')"
                         :value="entity.isActive"
                     />
-                </VnRow>
-                <VnRow>
+                    <!-- </VnRow>
+                <VnRow> -->
                     <VnLv
                         :label="t('customer.summary.verifiedData')"
                         :value="entity.isTaxDataChecked"
@@ -150,8 +158,8 @@ const creditWarning = computed(() => {
                         :label="t('customer.summary.hasToInvoice')"
                         :value="entity.hasToInvoice"
                     />
-                </VnRow>
-                <VnRow>
+                    <!-- </VnRow>
+                <VnRow> -->
                     <VnLv
                         :label="t('customer.summary.notifyByEmail')"
                         :value="entity.isToBeMailed"
@@ -170,7 +178,7 @@ const creditWarning = computed(() => {
                 />
                 <VnLv :label="t('customer.summary.bankAccount')" :value="entity.iban" />
                 <VnLv :label="t('customer.summary.dueDay')" :value="entity.dueDay" />
-                <VnRow class="q-mt-sm" wrap>
+                <VnRow class="q-mt-sm block">
                     <VnLv :label="t('customer.summary.hasLcr')" :value="entity.hasLcr" />
                     <VnLv
                         :label="t('customer.summary.hasCoreVnl')"
@@ -227,7 +235,6 @@ const creditWarning = computed(() => {
                     :value="toCurrency(entity?.mana?.mana)"
                 />
                 <VnLv
-                    v-if="entity.claimsRatio"
                     :label="t('customer.summary.priceIncreasingRate')"
                     :value="toPercentage(priceIncreasingRate)"
                 />
@@ -236,7 +243,6 @@ const creditWarning = computed(() => {
                     :value="toCurrency(entity?.averageInvoiced?.invoiced)"
                 />
                 <VnLv
-                    v-if="entity.claimsRatio"
                     :label="t('customer.summary.claimRate')"
                     :value="toPercentage(claimRate)"
                 />
@@ -262,12 +268,10 @@ const creditWarning = computed(() => {
                 />
 
                 <VnLv
-                    v-if="entity.creditInsurance"
                     :label="t('customer.summary.securedCredit')"
                     :value="toCurrency(entity.creditInsurance)"
                     :info="t('customer.summary.securedCreditInfo')"
                 />
-
                 <VnLv
                     :label="t('customer.summary.balance')"
                     :value="toCurrency(entity.sumRisk) || toCurrency(0)"
@@ -297,7 +301,7 @@ const creditWarning = computed(() => {
                     :value="entity.recommendedCredit"
                 />
             </QCard>
-            <QCard class="vn-one">
+            <QCard>
                 <VnTitle :text="t('Latest tickets')" />
                 <CustomerSummaryTable />
             </QCard>
diff --git a/src/pages/Customer/components/CustomerSummaryTable.vue b/src/pages/Customer/components/CustomerSummaryTable.vue
index c25870fd8..da310934d 100644
--- a/src/pages/Customer/components/CustomerSummaryTable.vue
+++ b/src/pages/Customer/components/CustomerSummaryTable.vue
@@ -1,22 +1,25 @@
 <script setup>
-import { computed, ref } from 'vue';
+import { computed } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute, useRouter } from 'vue-router';
 
-import { QBtn, date } from 'quasar';
+import { date } from 'quasar';
+import { toDateFormat } from 'src/filters/date.js';
 
 import { toCurrency } from 'src/filters';
 
-import FetchData from 'components/FetchData.vue';
-import CustomerSummaryTableActions from './CustomerSummaryTableActions.vue';
-import CustomerDescriptorProxy from 'src/pages/Customer/Card/CustomerDescriptorProxy.vue';
+import { useSummaryDialog } from 'src/composables/useSummaryDialog';
+import TicketSummary from 'src/pages/Ticket/Card/TicketSummary.vue';
+
+import InvoiceOutDescriptorProxy from 'pages/InvoiceOut/Card/InvoiceOutDescriptorProxy.vue';
+// import FetchData from 'components/FetchData.vue';
 import RouteDescriptorProxy from 'src/pages/Route/Card/RouteDescriptorProxy.vue';
+import VnTable from 'src/components/VnTable/VnTable.vue';
 
 const { t } = useI18n();
 const route = useRoute();
 const router = useRouter();
-
-const rows = ref([]);
+const { viewSummary } = useSummaryDialog();
 
 const filter = {
     include: [
@@ -32,57 +35,6 @@ const filter = {
     ],
     where: { clientFk: route.params.id },
     order: ['shipped DESC', 'id'],
-    limit: 10,
-};
-
-const tableColumnComponents = {
-    id: {
-        component: 'span',
-        props: () => {},
-        event: () => {},
-    },
-    nickname: {
-        component: QBtn,
-        props: () => ({ flat: true, color: 'blue', noCaps: true }),
-        event: () => {},
-    },
-    agency: {
-        component: 'span',
-        props: () => {},
-        event: () => {},
-    },
-    route: {
-        component: QBtn,
-        props: () => ({ flat: true, color: 'blue' }),
-        event: () => {},
-    },
-    packages: {
-        component: 'span',
-        props: () => {},
-        event: () => {},
-    },
-    date: {
-        component: 'span',
-        props: () => {},
-        event: () => {},
-    },
-    state: {
-        component: 'span',
-        props: () => {},
-        event: () => {},
-    },
-    total: {
-        component: 'span',
-        props: () => {},
-        event: () => {},
-    },
-    actions: {
-        component: CustomerSummaryTableActions,
-        props: (prop) => ({
-            id: prop.row.id,
-        }),
-        event: () => {},
-    },
 };
 
 const columns = computed(() => [
@@ -94,21 +46,18 @@ const columns = computed(() => [
     },
     {
         align: 'left',
-        field: 'nickname',
         label: t('Nickname'),
         name: 'nickname',
     },
     {
         align: 'left',
-        field: (row) => row?.agencyMode?.name,
+        format: (row) => row.agencyMode.name,
         label: t('Agency'),
-        name: 'agency',
     },
     {
         align: 'left',
-        field: 'routeFk',
+        name: 'routeFk',
         label: t('Route'),
-        name: 'route',
     },
     {
         align: 'left',
@@ -118,13 +67,12 @@ const columns = computed(() => [
     },
     {
         align: 'left',
-        field: (row) => date.formatDate(row?.shipped, 'DD/MM/YYYY'),
+        format: ({ shipped }) => date.formatDate(shipped, 'DD/MM/YYYY'),
         label: t('Date'),
-        name: 'date',
+        name: 'shipped',
     },
     {
         align: 'left',
-        field: (row) => row?.ticketState?.state?.name,
         label: t('State'),
         name: 'state',
     },
@@ -134,11 +82,26 @@ const columns = computed(() => [
         label: t('Total'),
         name: 'total',
     },
+
     {
-        align: 'left',
-        field: 'totalWithVat',
+        align: 'right',
         label: '',
-        name: 'actions',
+        name: 'tableActions',
+        actions: [
+            {
+                title: t('Client ticket list'),
+                icon: 'vn:lines',
+                action: ({ id }) =>
+                    router.push({ params: { id }, name: 'TicketSummary' }),
+                isPrimary: true,
+            },
+            {
+                title: t('Client ticket list'),
+                icon: 'preview',
+                isPrimary: true,
+                action: (row) => viewSummary(row.id, TicketSummary),
+            },
+        ],
     },
 ]);
 
@@ -156,83 +119,89 @@ const setTotalPriceColor = (ticket) => {
     if (total > 0 && total < 50) return 'warning';
 };
 
-const navigateToticketSummary = (id) => {
-    router.push({
-        name: 'TicketSummary',
-        params: { id },
-    });
+const setShippedColor = (date) => {
+    const today = Date.vnNew();
+    today.setHours(0, 0, 0, 0);
+
+    const ticketShipped = new Date(date);
+    ticketShipped.setHours(0, 0, 0, 0);
+
+    const difference = today - ticketShipped;
+
+    if (difference == 0) return 'warning';
+    if (difference < 0) return 'success';
 };
-const commonColumns = (col) =>
-    ['date', 'state', 'total', 'route', 'nickname'].includes(col);
 </script>
 
 <template>
-    <FetchData
+    <VnTable
+        data-key="CustomerTickets"
         :filter="filter"
-        @on-fetch="(data) => (rows = data)"
-        auto-load
         url="Tickets"
-    />
-    <QCard class="vn-one q-py-sm flex justify-between">
-        <QTable
-            :columns="columns"
-            :pagination="{ rowsPerPage: 12 }"
-            :rows="rows"
-            class="full-width"
-            row-key="id"
-        >
-            <template #body-cell="props">
-                <QTd :props="props" @click="navigateToticketSummary(props.row.id)">
-                    <QTr :props="props" class="cursor-pointer">
-                        <component
-                            :is="tableColumnComponents[props.col.name].component"
-                            @click="tableColumnComponents[props.col.name].event(props)"
-                            class="rounded-borders"
-                            v-bind="tableColumnComponents[props.col.name].props(props)"
-                        >
-                            <template v-if="!commonColumns(props.col.name)">
-                                <span>
-                                    {{ props.value }}
-                                </span>
-                            </template>
-                            <template v-if="props.col.name === 'route'">
-                                <span class="link" @click.stop>
-                                    <RouteDescriptorProxy :id="props.row.routeFk" />
-                                    {{ props.value }}
-                                </span>
-                            </template>
-                            <template v-if="props.col.name === 'nickname'">
-                                <span class="link" @click.stop>
-                                    <CustomerDescriptorProxy :id="props.row.clientFk" />
-                                    {{ props.value }}
-                                </span>
-                            </template>
-                            <template v-if="props.col.name === 'date'">
-                                <QBadge class="q-pa-sm" color="warning">
-                                    {{ props.value }}
-                                </QBadge>
-                            </template>
-                            <template v-if="props.col.name === 'state'">
-                                <QBadge :color="setStateColor(props.row)" class="q-pa-sm">
-                                    {{ props.value }}
-                                </QBadge>
-                            </template>
-                            <template v-if="props.col.name === 'total'">
-                                <QBadge
-                                    :color="setTotalPriceColor(props.row)"
-                                    class="q-pa-sm"
-                                    v-if="setTotalPriceColor(props.row)"
-                                >
-                                    {{ toCurrency(props.value) }}
-                                </QBadge>
-                                <div v-else>{{ toCurrency(props.value) }}</div>
-                            </template>
-                        </component>
-                    </QTr>
-                </QTd>
-            </template>
-        </QTable>
-    </QCard>
+        :columns="columns"
+        search-url="tickets"
+        :without-header="true"
+        auto-load
+        order="shipped DESC, id"
+        limit="5"
+    >
+        <template #column-nickname="{ row }">
+            <span class="link">
+                {{ row.nickname }}
+                <TicketDescriptorProxy :id="row.nickname" />
+            </span>
+        </template>
+        <template #column-ticketFk="{ row }">
+            <span class="link">
+                {{ row.ticketFk }}
+                <TicketDescriptorProxy :id="row.ticketFk" />
+            </span>
+        </template>
+
+        <template #column-routeFk="{ row }">
+            <span class="link">
+                {{ row.routeFk }}
+                <RouteDescriptorProxy :id="row.ticketFk" />
+            </span>
+        </template>
+        <template #column-total="{ row }">
+            <QBadge
+                class="q-pa-sm"
+                v-if="setTotalPriceColor(row)"
+                :color="setTotalPriceColor(row)"
+            >
+                <!-- {{ setTotalPriceColor(row) }} -->
+                {{ toCurrency(row.totalWithVat) }}
+            </QBadge>
+            <span v-else> {{ toCurrency(row.totalWithVat) }}</span>
+        </template>
+        <template #column-state="{ row }">
+            <span v-if="row.invoiceOut">
+                <span :class="{ link: row.invoiceOut.ref }">
+                    {{ row.invoiceOut.ref }}
+                    <InvoiceOutDescriptorProxy :id="row.invoiceOut.id" />
+                </span>
+            </span>
+            <QBadge
+                class="q-pa-sm"
+                :color="setStateColor(row)"
+                v-else-if="setStateColor(row)"
+            >
+                {{ row?.ticketState?.state.name }}
+            </QBadge>
+            <span v-else> {{ row?.ticketState?.state.name }}</span>
+        </template>
+        <template #column-shipped="{ row }">
+            <QBadge
+                class="q-pa-sm"
+                :color="setShippedColor(row.shipped)"
+                v-if="setShippedColor(row.shipped)"
+            >
+                {{ toDateFormat(row.shipped) }}
+            </QBadge>
+            <span v-else> {{ toDateFormat(row.shipped) }}</span>
+        </template>
+    </VnTable>
 </template>
 
 <i18n>
diff --git a/src/pages/Customer/components/CustomerSummaryTableActions.vue b/src/pages/Customer/components/CustomerSummaryTableActions.vue
deleted file mode 100644
index 154a37d22..000000000
--- a/src/pages/Customer/components/CustomerSummaryTableActions.vue
+++ /dev/null
@@ -1,52 +0,0 @@
-<script setup>
-import { useI18n } from 'vue-i18n';
-import { useRouter } from 'vue-router';
-
-import { useSummaryDialog } from 'src/composables/useSummaryDialog';
-import TicketSummary from 'src/pages/Ticket/Card/TicketSummary.vue';
-
-const { t } = useI18n();
-const router = useRouter();
-
-defineProps({
-    id: {
-        type: Number,
-        required: true,
-    },
-});
-
-const { viewSummary } = useSummaryDialog();
-</script>
-
-<template>
-    <div>
-        {{ id }}
-        <QIcon
-            color="primary"
-            name="vn:lines"
-            size="sm"
-            @click.stop="router.push({ params: { id }, name: 'TicketSale' })"
-        >
-            <QTooltip>
-                {{ t('Go to lines') }}
-            </QTooltip>
-        </QIcon>
-        <QIcon
-            @click.stop="viewSummary(id, TicketSummary)"
-            class="q-ml-md"
-            color="primary"
-            name="preview"
-            size="sm"
-        >
-            <QTooltip>
-                {{ t('Preview') }}
-            </QTooltip>
-        </QIcon>
-    </div>
-</template>
-
-<i18n>
-es:
-    Go to lines: Ir a lineas
-    Preview: Vista previa
-</i18n>

From db97e8322e5a895c73e8b4e2d8221b86b27cd6f6 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Tue, 27 Aug 2024 07:00:40 +0200
Subject: [PATCH 036/228] feat: change url CustomerList

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

diff --git a/src/pages/Customer/CustomerList.vue b/src/pages/Customer/CustomerList.vue
index 82ad559ad..12580a06f 100644
--- a/src/pages/Customer/CustomerList.vue
+++ b/src/pages/Customer/CustomerList.vue
@@ -359,6 +359,7 @@ const columns = computed(() => [
             {
                 title: t('Client ticket list'),
                 icon: 'preview',
+                isPrimary: true,
                 action: (row) => viewSummary(row.id, CustomerSummary),
             },
         ],
@@ -395,7 +396,7 @@ function handleLocation(data, location) {
     <VnTable
         ref="tableRef"
         data-key="Customer"
-        url="Clients/extendedListFilter"
+        url="Clients/filter"
         :create="{
             urlCreate: 'Clients/createWithUser',
             title: 'Create client',

From 61c7c622f72fd05071115c12ff766874b811c964 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Tue, 27 Aug 2024 07:00:54 +0200
Subject: [PATCH 037/228] perf: update CustommerDescriptor

---
 src/pages/Customer/Card/CustomerDescriptor.vue | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/pages/Customer/Card/CustomerDescriptor.vue b/src/pages/Customer/Card/CustomerDescriptor.vue
index ed68d1ce6..274e0f376 100644
--- a/src/pages/Customer/Card/CustomerDescriptor.vue
+++ b/src/pages/Customer/Card/CustomerDescriptor.vue
@@ -57,7 +57,11 @@ const setData = (entity) => (data.value = useCardDescription(entity?.name, entit
                 :value="toCurrency(entity.creditInsurance)"
             />
 
-            <VnLv :label="t('customer.card.debt')" :value="toCurrency(entity.debt)" />
+            <VnLv
+                :label="t('customer.card.debt')"
+                :value="toCurrency(entity.debt)"
+                :info="t('customer.summary.riskInfo')"
+            />
             <VnLv v-if="entity.salesPersonUser" :label="t('customer.card.salesPerson')">
                 <template #value>
                     <VnUserLink

From 452b084cafcdc7b463c258a0e4b6ef2079d15c5a Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Tue, 27 Aug 2024 12:13:49 +0200
Subject: [PATCH 038/228] feat: change QBadge color

---
 src/pages/Customer/components/CustomerSummaryTable.vue | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/pages/Customer/components/CustomerSummaryTable.vue b/src/pages/Customer/components/CustomerSummaryTable.vue
index da310934d..fd41cdd35 100644
--- a/src/pages/Customer/components/CustomerSummaryTable.vue
+++ b/src/pages/Customer/components/CustomerSummaryTable.vue
@@ -48,15 +48,18 @@ const columns = computed(() => [
         align: 'left',
         label: t('Nickname'),
         name: 'nickname',
+        columnClass: 'expand',
     },
     {
         align: 'left',
         format: (row) => row.agencyMode.name,
+        columnClass: 'expand',
         label: t('Agency'),
     },
     {
         align: 'left',
         name: 'routeFk',
+        columnClass: 'shrink',
         label: t('Route'),
     },
     {
@@ -64,6 +67,7 @@ const columns = computed(() => [
         field: 'packages',
         label: t('Packages'),
         name: 'packages',
+        columnClass: 'shrink',
     },
     {
         align: 'left',
@@ -169,8 +173,8 @@ const setShippedColor = (date) => {
                 class="q-pa-sm"
                 v-if="setTotalPriceColor(row)"
                 :color="setTotalPriceColor(row)"
+                text-color="black"
             >
-                <!-- {{ setTotalPriceColor(row) }} -->
                 {{ toCurrency(row.totalWithVat) }}
             </QBadge>
             <span v-else> {{ toCurrency(row.totalWithVat) }}</span>
@@ -185,6 +189,7 @@ const setShippedColor = (date) => {
             <QBadge
                 class="q-pa-sm"
                 :color="setStateColor(row)"
+                text-color="black"
                 v-else-if="setStateColor(row)"
             >
                 {{ row?.ticketState?.state.name }}
@@ -195,6 +200,7 @@ const setShippedColor = (date) => {
             <QBadge
                 class="q-pa-sm"
                 :color="setShippedColor(row.shipped)"
+                text-color="black"
                 v-if="setShippedColor(row.shipped)"
             >
                 {{ toDateFormat(row.shipped) }}

From b481876e819708f154b3aad6a65cc552a68dd083 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Tue, 27 Aug 2024 12:37:30 +0200
Subject: [PATCH 039/228] fix: CustommerSummaryTable Proxy

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

diff --git a/src/pages/Customer/components/CustomerSummaryTable.vue b/src/pages/Customer/components/CustomerSummaryTable.vue
index fd41cdd35..cd519eb54 100644
--- a/src/pages/Customer/components/CustomerSummaryTable.vue
+++ b/src/pages/Customer/components/CustomerSummaryTable.vue
@@ -15,6 +15,7 @@ import InvoiceOutDescriptorProxy from 'pages/InvoiceOut/Card/InvoiceOutDescripto
 // import FetchData from 'components/FetchData.vue';
 import RouteDescriptorProxy from 'src/pages/Route/Card/RouteDescriptorProxy.vue';
 import VnTable from 'src/components/VnTable/VnTable.vue';
+import CustomerDescriptorProxy from '../Card/CustomerDescriptorProxy.vue';
 
 const { t } = useI18n();
 const route = useRoute();
@@ -141,31 +142,28 @@ const setShippedColor = (date) => {
     <VnTable
         data-key="CustomerTickets"
         :filter="filter"
+        :right-search="false"
+        :column-search="false"
         url="Tickets"
         :columns="columns"
         search-url="tickets"
         :without-header="true"
         auto-load
         order="shipped DESC, id"
+        :disable-option="{ card: true, table: true }"
         limit="5"
     >
         <template #column-nickname="{ row }">
             <span class="link">
                 {{ row.nickname }}
-                <TicketDescriptorProxy :id="row.nickname" />
-            </span>
-        </template>
-        <template #column-ticketFk="{ row }">
-            <span class="link">
-                {{ row.ticketFk }}
-                <TicketDescriptorProxy :id="row.ticketFk" />
+                <CustomerDescriptorProxy :id="row.clientFk" />
             </span>
         </template>
 
         <template #column-routeFk="{ row }">
             <span class="link">
                 {{ row.routeFk }}
-                <RouteDescriptorProxy :id="row.ticketFk" />
+                <RouteDescriptorProxy :id="row.routeFk" />
             </span>
         </template>
         <template #column-total="{ row }">

From 20ddabcc0183971eee3edc3c87771d85b7b4b737 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Tue, 27 Aug 2024 16:30:32 +0200
Subject: [PATCH 040/228] Merge remote-tracking branch
 'origin/7830-customerDesplegables' into 6943_fix_customerSummaryTable

---
 src/i18n/locale/en.yml                        |   1 -
 src/i18n/locale/es.yml                        |   1 -
 .../Customer/Card/CustomerConsumption.vue     | 201 ++++++++++++------
 .../Card/CustomerConsumptionFilter.vue        | 189 ----------------
 4 files changed, 138 insertions(+), 254 deletions(-)
 delete mode 100644 src/pages/Customer/Card/CustomerConsumptionFilter.vue

diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index 048be1d30..5a72fb812 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -95,7 +95,6 @@ globals:
     from: From
     to: To
     notes: Notes
-    quantity: Quantity
     item: Item
     ticket: Ticket
     campaign: Campaign
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index 8c68299da..e5b0d24ee 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -95,7 +95,6 @@ globals:
     from: Desde
     to: Hasta
     notes: Notas
-    quantity: Cantidad
     item: Artículo
     ticket: Ticket
     campaign: Campaña
diff --git a/src/pages/Customer/Card/CustomerConsumption.vue b/src/pages/Customer/Card/CustomerConsumption.vue
index 9ea809cef..6d4da3a28 100644
--- a/src/pages/Customer/Card/CustomerConsumption.vue
+++ b/src/pages/Customer/Card/CustomerConsumption.vue
@@ -1,84 +1,76 @@
 <script setup>
-import { computed, ref, watch } from 'vue';
+import { ref, computed, onBeforeMount } from 'vue';
+import axios from 'axios';
 import { useI18n } from 'vue-i18n';
-import CustomerConsumptionFilter from './CustomerConsumptionFilter.vue';
-import { useStateStore } from 'src/stores/useStateStore';
+import { toDate } from 'src/filters/index';
+import { useRoute } from 'vue-router';
+
 import VnTable from 'components/VnTable/VnTable.vue';
-import VnSubToolbar from 'components/ui/VnSubToolbar.vue';
-import { toDate } from 'src/filters';
-import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue';
-import TicketDescriptorProxy from 'src/pages/Ticket/Card/TicketDescriptorProxy.vue';
 import FetchedTags from 'components/ui/FetchedTags.vue';
 import { useArrayData } from 'src/composables/useArrayData';
-import { useRoute } from 'vue-router';
 import { usePrintService } from 'src/composables/usePrintService';
 import { useVnConfirm } from 'src/composables/useVnConfirm';
 
 const { openConfirmationModal } = useVnConfirm();
 const { openReport, sendEmail } = usePrintService();
+import TicketDescriptorProxy from 'src/pages/Ticket/Card/TicketDescriptorProxy.vue';
+import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue';
+import VnSelect from 'components/common/VnSelect.vue';
+import VnInputDate from 'components/common/VnInputDate.vue';
+
 const arrayData = useArrayData('Client');
 const { t } = useI18n();
-
 const route = useRoute();
-const tableRef = ref();
-const filter = computed(() => ({
-    where: { and: [{ isPackaging: false }, { clientFk: route.params.id }] },
-    limit: 30,
-    skip: 10,
-}));
-
+const campaignList = ref();
 const showActionBtns = computed(() => handleQueryParams());
 function handleQueryParams() {
-    const query = JSON.parse(route.query.table);
+    const query = getQueryParams();
     return query.from && query.to;
 }
-watch(
-    () => route.query,
-    () => {
-        showActionBtns.value = handleQueryParams();
-    }
-);
 const columns = computed(() => [
     {
+        name: 'search',
         align: 'left',
+        label: t('globals.search'),
+        visible: false,
+    },
+    {
         name: 'itemFk',
-        label: t('Item'),
+        align: 'left',
+        label: t('globals.item'),
+        columnClass: 'shrink',
         cardVisible: true,
         columnFilter: {
-            inWhere: true,
+            name: 'itemId',
         },
     },
     {
-        align: 'left',
         name: 'ticketFk',
-        label: t('Ticket'),
+        align: 'left',
+        label: t('globals.ticket'),
         cardVisible: true,
         columnFilter: {
             inWhere: true,
         },
     },
     {
-        align: 'left',
         name: 'shipped',
-        label: t('shipped'),
+        align: 'left',
+        label: t('globals.shipped'),
         format: ({ shipped }) => toDate(shipped),
+        columnFilter: false,
         cardVisible: true,
-        columnFilter: {
-            inWhere: true,
-        },
     },
-
     {
-        align: 'left',
         name: 'description',
+        align: 'left',
         label: t('globals.description'),
-        class: 'extend',
+        columnClass: 'expand',
         columnFilter: {
             inWhere: true,
         },
     },
     {
-        align: 'left',
         name: 'quantity',
         label: t('globals.quantity'),
         cardVisible: true,
@@ -86,9 +78,24 @@ const columns = computed(() => [
             inWhere: true,
         },
     },
+    {
+        name: 'grouped',
+        label: t('Group by items'),
+        component: 'checkbox',
+        visible: false,
+        orderBy: false,
+    },
 ]);
+
+onBeforeMount(async () => {
+    campaignList.value = (await axios('Campaigns/latest')).data;
+});
+
+function getQueryParams() {
+    return JSON.parse(route.query.consumption);
+}
 function getParams() {
-    const query = JSON.parse(route.query.table);
+    const query = getQueryParams();
     return {
         from: query.from,
         to: query.to,
@@ -96,6 +103,25 @@ function getParams() {
         recipientId: arrayData.store.data.id,
     };
 }
+const filter = computed(() => {
+    const minDate = Date.vnNew();
+    minDate.setHours(0, 0, 0, 0);
+    minDate.setMonth(minDate.getMonth() - 2);
+
+    const maxDate = Date.vnNew();
+    maxDate.setHours(23, 59, 59, 59);
+
+    return {
+        campaign: campaignList.value[0]?.id,
+        from: minDate,
+        to: maxDate,
+        filter: {
+            where: {
+                clientFk: route.params.id,
+            },
+        },
+    };
+});
 const openReportPdf = () => {
     openReport(`Clients/${route.params.id}/campaign-metrics-pdf`, getParams());
 };
@@ -116,13 +142,32 @@ const sendCampaignMetricsEmail = ({ address }) => {
 </script>
 
 <template>
-    <Teleport to="#right-panel" v-if="useStateStore().isHeaderMounted()">
-        <CustomerConsumptionFilter data-key="CustomerConsumption" />
-    </Teleport>
-    <VnSubToolbar>
-        <template #st-actions>
+    <VnTable
+        v-if="campaignList"
+        data-key="CustomerConsumption"
+        url="Clients/consumption"
+        :order="['itemTypeFk', 'itemName', 'itemSize', 'description']"
+        :columns="columns"
+        search-url="consumption"
+        :user-params="filter"
+        :default-remove="false"
+        :default-reset="false"
+        :default-save="false"
+        :has-sub-toolbar="true"
+        auto-load
+    >
+        <template #moreBeforeActions>
+            <!-- <QBtn
+                color="primary"
+                icon="delete"
+                flat
+                @click="remove(selected)"
+                :disable="!selected?.length"
+                :title="t('globals.remove')"
+            /> -->
             <QBtn
                 color="primary"
+                flat
                 icon-right="picture_as_pdf"
                 @click="openReportPdf()"
                 :disabled="!showActionBtns"
@@ -131,6 +176,7 @@ const sendCampaignMetricsEmail = ({ address }) => {
             </QBtn>
             <QBtn
                 color="primary"
+                flat
                 icon-right="email"
                 @click="openSendEmailDialog()"
                 :disabled="!showActionBtns"
@@ -138,41 +184,70 @@ const sendCampaignMetricsEmail = ({ address }) => {
                 <QTooltip>{{ t('Send to email') }}</QTooltip>
             </QBtn>
         </template>
-    </VnSubToolbar>
-    <VnTable
-        data-key="CustomerConsumption"
-        ref="tableRef"
-        :filter="filter"
-        url="Clients/Consumption"
-        :columns="columns"
-        :right-search="false"
-        :use-model="true"
-        auto-load
-        :order="['itemTypeFk', 'itemName', 'itemSize', 'description']"
-    >
         <template #column-itemFk="{ row }">
             <span class="link">
                 {{ row.itemFk }}
                 <ItemDescriptorProxy :id="row.itemFk" />
             </span>
         </template>
-        <template #column-description="{ row }">
-            <FetchedTags :item="row" :max-length="6" />
-        </template>
         <template #column-ticketFk="{ row }">
             <span class="link">
                 {{ row.ticketFk }}
                 <TicketDescriptorProxy :id="row.ticketFk" />
-            </span> </template
-    ></VnTable>
+            </span>
+        </template>
+        <template #column-description="{ row }">
+            <div>{{ row.concept }}</div>
+            <div v-if="row.subName" class="subName">
+                {{ row.subName }}
+            </div>
+            <FetchedTags :item="row" :max-length="3" />
+        </template>
+        <template #moreFilterPanel="{ params }">
+            <div class="column no-wrap flex-center q-gutter-y-md q-mt-xs q-pr-xl">
+                <VnSelect
+                    v-model="params.campaign"
+                    :options="campaignList"
+                    :label="t('globals.campaign')"
+                    :filled="true"
+                    class="q-px-sm q-pt-none fit"
+                    dense
+                    option-label="code"
+                >
+                    <template #option="scope">
+                        <QItem v-bind="scope.itemProps">
+                            <QItemSection>
+                                <QItemLabel>
+                                    {{ scope.opt?.code }}
+                                    {{
+                                        new Date(scope.opt?.dated).getFullYear()
+                                    }}</QItemLabel
+                                >
+                            </QItemSection>
+                        </QItem>
+                    </template>
+                </VnSelect>
+                <VnInputDate
+                    v-model="params.to"
+                    :label="t('globals.from')"
+                    :filled="true"
+                    class="q-px-xs q-pt-none fit"
+                    dense
+                />
+                <VnInputDate
+                    v-model="params.from"
+                    :label="t('globals.from')"
+                    :filled="true"
+                    class="q-px-xs q-pt-none fit"
+                    dense
+                />
+            </div>
+        </template>
+    </VnTable>
 </template>
 
 <i18n>
 es:
-    Send to email: Enviar por email
-    Search by item id or name: Buscar por id de artículo o nombre
-    The consumption report will be sent: Se enviará el informe de consumo
-    Please, confirm: Por favor, confirma
     Enter a new search: Introduce una nueva búsqueda
     Group by items: Agrupar por artículos
 </i18n>
diff --git a/src/pages/Customer/Card/CustomerConsumptionFilter.vue b/src/pages/Customer/Card/CustomerConsumptionFilter.vue
deleted file mode 100644
index b960186f4..000000000
--- a/src/pages/Customer/Card/CustomerConsumptionFilter.vue
+++ /dev/null
@@ -1,189 +0,0 @@
-<script setup>
-import { useI18n } from 'vue-i18n';
-import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
-import VnInput from 'src/components/common/VnInput.vue';
-import { QItem } from 'quasar';
-import VnSelect from 'src/components/common/VnSelect.vue';
-import { QItemSection } from 'quasar';
-import VnInputDate from 'src/components/common/VnInputDate.vue';
-import { toDate } from 'src/filters';
-
-const { t } = useI18n();
-defineProps({ dataKey: { type: String, required: true } });
-</script>
-<template>
-    <VnFilterPanel :data-key="dataKey" search-url="consumption" :redirect="false">
-        <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 }">
-            <QItem>
-                <QItemSection
-                    ><QCheckbox
-                        v-model="params.grouped"
-                        :label="t('params.grouped')"
-                        @update:model-value="searchFn()"
-                        dense
-                /></QItemSection>
-            </QItem>
-            <QItem>
-                <QItemSection>
-                    <VnInput
-                        :label="t('params.item')"
-                        v-model="params.itemId"
-                        is-outlined
-                        lazy-rules
-                    />
-                </QItemSection>
-            </QItem>
-            <QItem>
-                <QItemSection>
-                    <VnSelect
-                        v-model="params.buyerId"
-                        url="TicketRequests/getItemTypeWorker"
-                        :fields="['id', 'nickname']"
-                        sort-by="nickname ASC"
-                        :label="t('params.buyer')"
-                        option-value="id"
-                        option-label="nickname"
-                        dense
-                        outlined
-                        rounded
-                    />
-                </QItemSection>
-            </QItem>
-            <QItem>
-                <!--It's required to include the relation category !! There's 413 records in production-->
-                <QItemSection>
-                    <VnSelect
-                        v-model="params.typeId"
-                        url="ItemTypes"
-                        :include="['category']"
-                        :fields="['id', 'name', 'categoryFk']"
-                        sort-by="name ASC"
-                        :label="t('params.typeId')"
-                        option-label="name"
-                        option-value="id"
-                        dense
-                        outlined
-                        rounded
-                    >
-                        <template #option="scope">
-                            <QItem v-bind="scope.itemProps">
-                                <QItemSection>
-                                    <QItemLabel>{{ scope.opt?.name }}</QItemLabel>
-                                    <QItemLabel caption>{{
-                                        scope.opt?.category?.name
-                                    }}</QItemLabel>
-                                </QItemSection>
-                            </QItem>
-                        </template>
-                    </VnSelect>
-                </QItemSection>
-            </QItem>
-            <QItem>
-                <QItemSection>
-                    <VnSelect
-                        v-model="params.categoryId"
-                        url="ItemCategories"
-                        :fields="['id', 'name']"
-                        sort-by="name ASC"
-                        :label="t('params.categoryId')"
-                        option-label="name"
-                        option-value="id"
-                        dense
-                        outlined
-                        rounded
-                    />
-                </QItemSection>
-            </QItem>
-            <QItem>
-                <QItemSection>
-                    <VnSelect
-                        v-model="params.campaignId"
-                        url="Campaigns/latest"
-                        sort-by="dated DESC"
-                        :label="t('params.campaignId')"
-                        option-label="code"
-                        option-value="id"
-                        dense
-                        outlined
-                        rounded
-                    >
-                        <template #option="scope">
-                            <QItem v-bind="scope.itemProps">
-                                <QItemSection>
-                                    <QItemLabel>{{
-                                        t(`params.${scope.opt?.code}`)
-                                    }}</QItemLabel>
-                                    <QItemLabel caption>{{
-                                        toDate(scope.opt.dated)
-                                    }}</QItemLabel>
-                                </QItemSection>
-                            </QItem>
-                        </template>
-                    </VnSelect>
-                </QItemSection>
-            </QItem>
-            <QItem>
-                <QItemSection>
-                    <VnInputDate
-                        :label="t('params.from')"
-                        v-model="params.from"
-                        @update:model-value="searchFn()"
-                        is-outlined
-                    />
-                </QItemSection>
-            </QItem>
-            <QItem>
-                <QItemSection>
-                    <VnInputDate
-                        :label="t('params.to')"
-                        v-model="params.to"
-                        @update:model-value="searchFn()"
-                        is-outlined
-                    />
-                </QItemSection>
-            </QItem>
-        </template>
-    </VnFilterPanel>
-</template>
-<i18n>
-en:
-    params:
-        grouped: Group by item
-        item: Item id
-        buyer: Buyer
-        type: Type
-        category: Category
-        itemId: Item id
-        buyerId: Buyer
-        typeId: Type
-        categoryId: Category
-        from: From
-        to: To
-        campaignId: Campaña
-        valentinesDay: Valentine's Day
-        mothersDay: Mother's Day
-        allSaints: All Saints' Day
-es:
-    params:
-        grouped: Agrupar por artículo
-        item: Id artículo
-        buyer: Comprador
-        type: Tipo
-        category: Categoría
-        itemId: Id Artículo
-        buyerId: Comprador
-        typeId: Tipo
-        categoryId: Reino
-        from: Desde
-        to: Hasta
-        campaignId: Campaña
-        valentinesDay: Día de San Valentín
-        mothersDay: Día de la Madre
-        allSaints: Día de Todos los Santos
-</i18n>

From ca74ad85b44e95894c9505a3ec4b5e5cd1c4d275 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Tue, 27 Aug 2024 20:46:51 +0200
Subject: [PATCH 041/228] fix: Customerconsumption

---
 .../Customer/Card/CustomerConsumption.vue     | 31 +++++++------------
 1 file changed, 11 insertions(+), 20 deletions(-)

diff --git a/src/pages/Customer/Card/CustomerConsumption.vue b/src/pages/Customer/Card/CustomerConsumption.vue
index 6d4da3a28..27c1b746c 100644
--- a/src/pages/Customer/Card/CustomerConsumption.vue
+++ b/src/pages/Customer/Card/CustomerConsumption.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { ref, computed, onBeforeMount } from 'vue';
+import { ref, computed, onBeforeMount, onMounted } from 'vue';
 import axios from 'axios';
 import { useI18n } from 'vue-i18n';
 import { toDate } from 'src/filters/index';
@@ -90,9 +90,12 @@ const columns = computed(() => [
 onBeforeMount(async () => {
     campaignList.value = (await axios('Campaigns/latest')).data;
 });
+// onMounted(() => {
+//     showActionBtns.value = handleQueryParams();
+// });
 
 function getQueryParams() {
-    return JSON.parse(route.query.consumption);
+    return JSON.parse(route.query.consumption ?? '{}');
 }
 function getParams() {
     const query = getQueryParams();
@@ -103,7 +106,7 @@ function getParams() {
         recipientId: arrayData.store.data.id,
     };
 }
-const filter = computed(() => {
+const userParams = computed(() => {
     const minDate = Date.vnNew();
     minDate.setHours(0, 0, 0, 0);
     minDate.setMonth(minDate.getMonth() - 2);
@@ -115,11 +118,6 @@ const filter = computed(() => {
         campaign: campaignList.value[0]?.id,
         from: minDate,
         to: maxDate,
-        filter: {
-            where: {
-                clientFk: route.params.id,
-            },
-        },
     };
 });
 const openReportPdf = () => {
@@ -149,7 +147,8 @@ const sendCampaignMetricsEmail = ({ address }) => {
         :order="['itemTypeFk', 'itemName', 'itemSize', 'description']"
         :columns="columns"
         search-url="consumption"
-        :user-params="filter"
+        :filter="filter"
+        :user-params="userParams"
         :default-remove="false"
         :default-reset="false"
         :default-save="false"
@@ -157,14 +156,6 @@ const sendCampaignMetricsEmail = ({ address }) => {
         auto-load
     >
         <template #moreBeforeActions>
-            <!-- <QBtn
-                color="primary"
-                icon="delete"
-                flat
-                @click="remove(selected)"
-                :disable="!selected?.length"
-                :title="t('globals.remove')"
-            /> -->
             <QBtn
                 color="primary"
                 flat
@@ -228,15 +219,15 @@ const sendCampaignMetricsEmail = ({ address }) => {
                     </template>
                 </VnSelect>
                 <VnInputDate
-                    v-model="params.to"
+                    v-model="params.from"
                     :label="t('globals.from')"
                     :filled="true"
                     class="q-px-xs q-pt-none fit"
                     dense
                 />
                 <VnInputDate
-                    v-model="params.from"
-                    :label="t('globals.from')"
+                    v-model="params.to"
+                    :label="t('globals.to')"
                     :filled="true"
                     class="q-px-xs q-pt-none fit"
                     dense

From e8f660ea3750c1993560142544575836a5601d33 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Wed, 28 Aug 2024 20:32:13 +0200
Subject: [PATCH 042/228] perf: CustomerBasicData

---
 src/pages/Customer/Card/CustomerBasicData.vue | 36 ++++++++++++++-----
 1 file changed, 27 insertions(+), 9 deletions(-)

diff --git a/src/pages/Customer/Card/CustomerBasicData.vue b/src/pages/Customer/Card/CustomerBasicData.vue
index 87a3b08f7..e4c9ab062 100644
--- a/src/pages/Customer/Card/CustomerBasicData.vue
+++ b/src/pages/Customer/Card/CustomerBasicData.vue
@@ -38,7 +38,7 @@ const title = ref();
                     clearable
                     v-model="data.name"
                 />
-                <QSelect
+                <VnSelect
                     :input-debounce="0"
                     :label="t('customer.basicData.businessType')"
                     :options="businessTypes"
@@ -89,15 +89,18 @@ const title = ref();
             </VnRow>
             <VnRow>
                 <VnSelect
-                    url="Workers/activeWithInheritedRole"
-                    :filter="{ where: { role: 'salesPerson' } }"
-                    option-filter="firstName"
+                    url="Workers/search"
                     v-model="data.salesPersonFk"
                     :label="t('customer.basicData.salesPerson')"
+                    :params="{
+                        departmentCodes: ['VT', 'shopping'],
+                    }"
+                    :fields="['id', 'nickname']"
+                    sort-by="nickname ASC"
                     :rules="validate('client.salesPersonFk')"
                     :use-like="false"
-                    :emit-value="false"
-                    @update:model-value="(val) => (title = val?.nickname)"
+                    emit-value
+                    auto-load
                 >
                     <template #prepend>
                         <VnAvatar
@@ -106,8 +109,19 @@ const title = ref();
                             :title="title"
                         />
                     </template>
+                    <template #option="scope">
+                        <QItem v-bind="scope.itemProps">
+                            <QItemSection>
+                                <QItemLabel>{{ scope.opt?.name }}</QItemLabel>
+                                <QItemLabel caption
+                                    >{{ scope.opt?.nickname }},
+                                    {{ scope.opt?.code }}</QItemLabel
+                                >
+                            </QItemSection>
+                        </QItem>
+                    </template>
                 </VnSelect>
-                <QSelect
+                <VnSelect
                     v-model="data.contactChannelFk"
                     :options="contactChannels"
                     option-value="id"
@@ -120,7 +134,9 @@ const title = ref();
                 />
             </VnRow>
             <VnRow>
-                <QSelect
+                <VnSelect
+                    url="Clients"
+                    :where="{ id: { neq: $route.params.id } }"
                     :input-debounce="0"
                     :label="t('customer.basicData.previousClient')"
                     :options="clients"
@@ -129,7 +145,9 @@ const title = ref();
                     map-options
                     option-label="name"
                     option-value="id"
+                    sort-by="name ASC"
                     v-model="data.transferorFk"
+                    :fields="['id', 'name']"
                 >
                     <template #append>
                         <QIcon name="info" class="cursor-pointer">
@@ -140,7 +158,7 @@ const title = ref();
                             }}</QTooltip>
                         </QIcon>
                     </template>
-                </QSelect>
+                </VnSelect>
             </VnRow>
         </template>
     </FormModel>

From 7d526f4aa42305ebf55425036a5f51f6e325ac7b Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Wed, 28 Aug 2024 20:33:22 +0200
Subject: [PATCH 043/228] fix: CusomerSummary to Address

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

diff --git a/src/pages/Customer/Card/CustomerSummary.vue b/src/pages/Customer/Card/CustomerSummary.vue
index cee8b7c0a..e02f63347 100644
--- a/src/pages/Customer/Card/CustomerSummary.vue
+++ b/src/pages/Customer/Card/CustomerSummary.vue
@@ -193,7 +193,7 @@ const creditWarning = computed(() => {
             </QCard>
             <QCard class="vn-one" v-if="entity.defaultAddress">
                 <VnTitle
-                    :url="`#/customer/${entityId}/consignees`"
+                    :url="`#/customer/${entityId}/address`"
                     :text="t('customer.summary.consignee')"
                 />
                 <VnLv

From 375e65aed0c4fff39c47a3db6258b813cccedd6b Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Thu, 29 Aug 2024 12:20:34 +0200
Subject: [PATCH 044/228] fix: CustomerDescriptorAccount

---
 .../Customer/Card/CustomerDescriptor.vue      | 41 +++++++++++--------
 1 file changed, 23 insertions(+), 18 deletions(-)

diff --git a/src/pages/Customer/Card/CustomerDescriptor.vue b/src/pages/Customer/Card/CustomerDescriptor.vue
index 274e0f376..dcd106873 100644
--- a/src/pages/Customer/Card/CustomerDescriptor.vue
+++ b/src/pages/Customer/Card/CustomerDescriptor.vue
@@ -11,6 +11,10 @@ import CardDescriptor from 'components/ui/CardDescriptor.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
 import VnUserLink from 'src/components/ui/VnUserLink.vue';
 import CustomerDescriptorMenu from './CustomerDescriptorMenu.vue';
+import { useState } from 'src/composables/useState';
+const state = useState();
+
+const customer = computed(() => state.get('customer'));
 
 const $props = defineProps({
     id: {
@@ -43,7 +47,7 @@ const setData = (entity) => (data.value = useCardDescription(entity?.name, entit
         :subtitle="data.subtitle"
         @on-fetch="setData"
         :summary="$props.summary"
-        data-key="customerData"
+        data-key="customer"
     >
         <template #menu="{ entity }">
             <CustomerDescriptorMenu :customer="entity" />
@@ -75,21 +79,26 @@ const setData = (entity) => (data.value = useCardDescription(entity?.name, entit
                 :value="entity.businessType.description"
             />
         </template>
-        <template #icons="{ entity }">
-            <QCardActions class="q-gutter-x-md">
+        <template #icons>
+            <QCardActions v-if="customer" class="q-gutter-x-md">
                 <QIcon
-                    v-if="!entity.isActive"
+                    v-if="!customer.isActive"
                     name="vn:disabled"
                     size="xs"
                     color="primary"
                 >
                     <QTooltip>{{ t('customer.card.isDisabled') }}</QTooltip>
                 </QIcon>
-                <QIcon v-if="entity.isFreezed" name="vn:frozen" size="xs" color="primary">
+                <QIcon
+                    v-if="customer.isFreezed"
+                    name="vn:frozen"
+                    size="xs"
+                    color="primary"
+                >
                     <QTooltip>{{ t('customer.card.isFrozen') }}</QTooltip>
                 </QIcon>
                 <QIcon
-                    v-if="!entity.account.active"
+                    v-if="!customer.account.active"
                     color="primary"
                     name="vn:noweb"
                     size="xs"
@@ -97,7 +106,7 @@ const setData = (entity) => (data.value = useCardDescription(entity?.name, entit
                     <QTooltip>{{ t('customer.card.webAccountInactive') }}</QTooltip>
                 </QIcon>
                 <QIcon
-                    v-if="entity.debt > entity.credit"
+                    v-if="customer.debt > customer.credit"
                     name="vn:risk"
                     size="xs"
                     color="primary"
@@ -105,7 +114,7 @@ const setData = (entity) => (data.value = useCardDescription(entity?.name, entit
                     <QTooltip>{{ t('customer.card.hasDebt') }}</QTooltip>
                 </QIcon>
                 <QIcon
-                    v-if="!entity.isTaxDataChecked"
+                    v-if="!customer.isTaxDataChecked"
                     name="vn:no036"
                     size="xs"
                     color="primary"
@@ -113,7 +122,7 @@ const setData = (entity) => (data.value = useCardDescription(entity?.name, entit
                     <QTooltip>{{ t('customer.card.notChecked') }}</QTooltip>
                 </QIcon>
                 <QBtn
-                    v-if="entity.unpaid"
+                    v-if="customer.unpaid"
                     flat
                     size="sm"
                     icon="vn:Client_unpaid"
@@ -125,13 +134,13 @@ const setData = (entity) => (data.value = useCardDescription(entity?.name, entit
                         <br />
                         {{
                             t('unpaidDated', {
-                                dated: toDate(entity.unpaid.dated),
+                                dated: toDate(customer.unpaid.dated),
                             })
                         }}
                         <br />
                         {{
                             t('unpaidAmount', {
-                                amount: toCurrency(entity.unpaid.amount),
+                                amount: toCurrency(customer.unpaid.amount),
                             })
                         }}
                     </QTooltip>
@@ -165,7 +174,7 @@ const setData = (entity) => (data.value = useCardDescription(entity?.name, entit
                 <QBtn
                     :to="{
                         name: 'OrderCreate',
-                        query: { clientId: entity.id },
+                        query: { table: JSON.stringify({ clientFk: entity.id }) },
                     }"
                     size="md"
                     icon="vn:basketadd"
@@ -175,12 +184,8 @@ const setData = (entity) => (data.value = useCardDescription(entity?.name, entit
                 </QBtn>
                 <QBtn
                     :to="{
-                        name: 'AccountList',
-                        query: {
-                            table: JSON.stringify({
-                                filter: { where: { id: entity.id } },
-                            }),
-                        },
+                        name: 'AccountSummary',
+                        params: { id: entity.id },
                     }"
                     size="md"
                     icon="face"

From c727e5f66908db89ff50c5b53a70606d6bc36679 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Thu, 29 Aug 2024 14:23:18 +0200
Subject: [PATCH 045/228] feat: copy customer countryFk

---
 src/components/CreateBankEntityForm.vue         | 9 +++++++--
 src/pages/Customer/Card/CustomerBasicData.vue   | 1 +
 src/pages/Customer/Card/CustomerBillingData.vue | 5 ++---
 src/pages/Customer/Card/CustomerDescriptor.vue  | 2 +-
 src/pages/Customer/CustomerList.vue             | 7 ++++---
 5 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/src/components/CreateBankEntityForm.vue b/src/components/CreateBankEntityForm.vue
index c46ac7752..1117225c7 100644
--- a/src/components/CreateBankEntityForm.vue
+++ b/src/components/CreateBankEntityForm.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { reactive, ref, onMounted, nextTick } from 'vue';
+import { reactive, ref, onMounted, nextTick, computed } from 'vue';
 import { useI18n } from 'vue-i18n';
 import VnInput from 'src/components/common/VnInput.vue';
 
@@ -7,16 +7,21 @@ import VnSelect from 'src/components/common/VnSelect.vue';
 import FetchData from 'components/FetchData.vue';
 import VnRow from 'components/ui/VnRow.vue';
 import FormModelPopup from './FormModelPopup.vue';
+import { useState } from 'src/composables/useState';
 
 defineProps({ showEntityField: { type: Boolean, default: true } });
 
 const emit = defineEmits(['onDataSaved']);
 const { t } = useI18n();
 const bicInputRef = ref(null);
+const state = useState();
+
+const customer = computed(() => state.get('customer'));
+
 const bankEntityFormData = reactive({
     name: null,
     bic: null,
-    countryFk: null,
+    countryFk: customer.value.countryFk,
     id: null,
 });
 
diff --git a/src/pages/Customer/Card/CustomerBasicData.vue b/src/pages/Customer/Card/CustomerBasicData.vue
index e4c9ab062..8cc59ef3c 100644
--- a/src/pages/Customer/Card/CustomerBasicData.vue
+++ b/src/pages/Customer/Card/CustomerBasicData.vue
@@ -25,6 +25,7 @@ const title = ref();
     />
     <FetchData
         url="BusinessTypes"
+        :filter="{ fields: ['code', 'description'], order: 'description ASC ' }"
         @on-fetch="(data) => (businessTypes = data)"
         auto-load
     />
diff --git a/src/pages/Customer/Card/CustomerBillingData.vue b/src/pages/Customer/Card/CustomerBillingData.vue
index b01dc4523..290bde909 100644
--- a/src/pages/Customer/Card/CustomerBillingData.vue
+++ b/src/pages/Customer/Card/CustomerBillingData.vue
@@ -85,9 +85,8 @@ const getBankEntities = (data, formData) => {
                     <template #option="scope">
                         <QItem v-bind="scope.itemProps">
                             <QItemSection v-if="scope.opt">
-                                <QItemLabel
-                                    >{{ scope.opt.bic }} {{ scope.opt.name }}</QItemLabel
-                                >
+                                <QItemLabel>{{ scope.opt.bic }} </QItemLabel>
+                                <QItemLabel caption> {{ scope.opt.name }}</QItemLabel>
                             </QItemSection>
                         </QItem>
                     </template>
diff --git a/src/pages/Customer/Card/CustomerDescriptor.vue b/src/pages/Customer/Card/CustomerDescriptor.vue
index dcd106873..9ae453df0 100644
--- a/src/pages/Customer/Card/CustomerDescriptor.vue
+++ b/src/pages/Customer/Card/CustomerDescriptor.vue
@@ -98,7 +98,7 @@ const setData = (entity) => (data.value = useCardDescription(entity?.name, entit
                     <QTooltip>{{ t('customer.card.isFrozen') }}</QTooltip>
                 </QIcon>
                 <QIcon
-                    v-if="!customer.account.active"
+                    v-if="!customer.account?.active"
                     color="primary"
                     name="vn:noweb"
                     size="xs"
diff --git a/src/pages/Customer/CustomerList.vue b/src/pages/Customer/CustomerList.vue
index 12580a06f..25cac5361 100644
--- a/src/pages/Customer/CustomerList.vue
+++ b/src/pages/Customer/CustomerList.vue
@@ -353,7 +353,7 @@ const columns = computed(() => [
             {
                 title: t('Client ticket list'),
                 icon: 'vn:ticket',
-                action: redirectToCreateView,
+                action: redirectToTicketsList,
                 isPrimary: true,
             },
             {
@@ -367,11 +367,12 @@ const columns = computed(() => [
 ]);
 
 const { viewSummary } = useSummaryDialog();
-const redirectToCreateView = (row) => {
+const redirectToTicketsList = (row) => {
     router.push({
         name: 'TicketList',
+
         query: {
-            params: JSON.stringify({
+            table: JSON.stringify({
                 clientFk: row.id,
             }),
         },

From b66ff783be7e0d354c56a254e78a4d9ee4f468c5 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Thu, 29 Aug 2024 15:29:57 +0200
Subject: [PATCH 046/228] feat: CustomerBalance

---
 src/components/ui/VnUserLink.vue              | 12 +++---
 src/pages/Customer/Card/CustomerBalance.vue   |  7 +---
 src/pages/Customer/CustomerList.vue           | 42 +++++++++++++++++--
 .../components/CustomerSummaryTable.vue       |  4 +-
 4 files changed, 46 insertions(+), 19 deletions(-)

diff --git a/src/components/ui/VnUserLink.vue b/src/components/ui/VnUserLink.vue
index b04ea7476..8fb571c80 100644
--- a/src/components/ui/VnUserLink.vue
+++ b/src/components/ui/VnUserLink.vue
@@ -1,20 +1,18 @@
 <script setup>
 import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
-import { useI18n } from 'vue-i18n';
 
-const $props = defineProps({
+defineProps({
     name: { type: String, default: null },
+    tag: { type: String, default: null },
     workerId: { type: Number, default: null },
     defaultName: { type: Boolean, default: false },
 });
-
-const { t } = useI18n();
 </script>
 <template>
     <slot name="link">
-        <span :class="{ link: $props.workerId }">
-            {{ $props.defaultName ? $props.name ?? t('globals.system') : $props.name }}
+        <span :class="{ link: workerId }">
+            {{ defaultName ? name ?? $t('globals.system') : tag ?? name }}
         </span>
     </slot>
-    <WorkerDescriptorProxy v-if="$props.workerId" :id="$props.workerId" />
+    <WorkerDescriptorProxy v-if="workerId" :id="workerId" />
 </template>
diff --git a/src/pages/Customer/Card/CustomerBalance.vue b/src/pages/Customer/Card/CustomerBalance.vue
index 346e76681..52edecea5 100644
--- a/src/pages/Customer/Card/CustomerBalance.vue
+++ b/src/pages/Customer/Card/CustomerBalance.vue
@@ -95,12 +95,7 @@ const columns = computed(() => [
         label: t('Employee'),
         columnField: {
             component: 'userLink',
-            attrs: ({ row }) => {
-                return {
-                    workerId: row.workerFk,
-                    name: row.userName,
-                };
-            },
+            attrs: ({ row }) => ({ workerId: row.workerFk, tag: row.userName }),
         },
         cardVisible: true,
     },
diff --git a/src/pages/Customer/CustomerList.vue b/src/pages/Customer/CustomerList.vue
index 25cac5361..e0a786174 100644
--- a/src/pages/Customer/CustomerList.vue
+++ b/src/pages/Customer/CustomerList.vue
@@ -2,6 +2,7 @@
 import { ref, computed, markRaw } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRouter } from 'vue-router';
+import VnSelect from 'src/components/common/VnSelect.vue';
 import VnTable from 'components/VnTable/VnTable.vue';
 import VnLocation from 'src/components/common/VnLocation.vue';
 import VnSearchbar from 'components/ui/VnSearchbar.vue';
@@ -69,7 +70,7 @@ const columns = computed(() => [
             optionFilter: 'firstName',
             useLike: false,
         },
-        create: true,
+        create: false,
         columnField: {
             component: null,
         },
@@ -195,6 +196,8 @@ const columns = computed(() => [
         component: 'select',
         attrs: {
             url: 'BusinessTypes',
+            fields: ['code', 'description'],
+            sortBy: 'description ASC ',
             optionLabel: 'description',
             optionValue: 'code',
         },
@@ -357,7 +360,7 @@ const columns = computed(() => [
                 isPrimary: true,
             },
             {
-                title: t('Client ticket list'),
+                title: t('Preview'),
                 icon: 'preview',
                 isPrimary: true,
                 action: (row) => viewSummary(row.id, CustomerSummary),
@@ -400,7 +403,7 @@ function handleLocation(data, location) {
         url="Clients/filter"
         :create="{
             urlCreate: 'Clients/createWithUser',
-            title: 'Create client',
+            title: t('globals.pageTitles.customerCreate'),
             onDataSaved: ({ id }) => tableRef.redirect(id),
             formInitialData: {
                 active: true,
@@ -413,6 +416,39 @@ function handleLocation(data, location) {
         auto-load
     >
         <template #more-create-dialog="{ data }">
+            <VnSelect
+                url="Workers/search"
+                v-model="data.salesPersonFk"
+                :label="t('customer.basicData.salesPerson')"
+                :params="{
+                    departmentCodes: ['VT', 'shopping'],
+                }"
+                :fields="['id', 'nickname']"
+                sort-by="nickname ASC"
+                :use-like="false"
+                emit-value
+                auto-load
+            >
+                <template #prepend>
+                    <VnAvatar
+                        :worker-id="data.salesPersonFk"
+                        color="primary"
+                        :title="title"
+                    />
+                </template>
+                <template #option="scope">
+                    <QItem v-bind="scope.itemProps">
+                        <QItemSection>
+                            <QItemLabel>{{ scope.opt?.name }}</QItemLabel>
+                            <QItemLabel caption
+                                >{{ scope.opt?.nickname }},
+                                {{ scope.opt?.code }}</QItemLabel
+                            >
+                        </QItemSection>
+                    </QItem>
+                </template>
+            </VnSelect>
+
             <VnLocation
                 :roles-allowed-to-create="['deliveryAssistant']"
                 v-model="data.location"
diff --git a/src/pages/Customer/components/CustomerSummaryTable.vue b/src/pages/Customer/components/CustomerSummaryTable.vue
index cd519eb54..25db561c5 100644
--- a/src/pages/Customer/components/CustomerSummaryTable.vue
+++ b/src/pages/Customer/components/CustomerSummaryTable.vue
@@ -12,7 +12,6 @@ import { useSummaryDialog } from 'src/composables/useSummaryDialog';
 import TicketSummary from 'src/pages/Ticket/Card/TicketSummary.vue';
 
 import InvoiceOutDescriptorProxy from 'pages/InvoiceOut/Card/InvoiceOutDescriptorProxy.vue';
-// import FetchData from 'components/FetchData.vue';
 import RouteDescriptorProxy from 'src/pages/Route/Card/RouteDescriptorProxy.vue';
 import VnTable from 'src/components/VnTable/VnTable.vue';
 import CustomerDescriptorProxy from '../Card/CustomerDescriptorProxy.vue';
@@ -96,8 +95,7 @@ const columns = computed(() => [
             {
                 title: t('Client ticket list'),
                 icon: 'vn:lines',
-                action: ({ id }) =>
-                    router.push({ params: { id }, name: 'TicketSummary' }),
+                action: ({ id }) => router.push({ params: { id }, name: 'TicketSale' }),
                 isPrimary: true,
             },
             {

From 8b4fcbd888bd5b5fcc25c05a93cb0fe152976d38 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Thu, 29 Aug 2024 15:30:09 +0200
Subject: [PATCH 047/228] feat: CustomerGreuges

---
 src/pages/Customer/Card/CustomerGreuges.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/pages/Customer/Card/CustomerGreuges.vue b/src/pages/Customer/Card/CustomerGreuges.vue
index 12173727f..2909bcaaf 100644
--- a/src/pages/Customer/Card/CustomerGreuges.vue
+++ b/src/pages/Customer/Card/CustomerGreuges.vue
@@ -52,9 +52,8 @@ const columns = computed(() => [
         component: 'userLink',
         attrs: ({ row }) => {
             return {
-                defaultName: true,
                 workerId: row.user?.id,
-                name: row.user?.name,
+                tag: row.user?.name,
             };
         },
     },
@@ -73,6 +72,7 @@ const columns = computed(() => [
         columnCreate: {
             component: 'select',
             url: 'greugeTypes',
+            sortBy: 'name ASC ',
             limit: 0,
         },
     },
@@ -107,7 +107,7 @@ const setRows = (data) => {
         @on-fetch="(data) => setRows(data)"
         :create="{
             urlCreate: `Greuges`,
-            title: t('New credit'),
+            title: t('New greuge'),
             onDataSaved: () => tableRef.reload(),
             formInitialData: { shipped: new Date(), clientFk: route.params.id },
         }"

From 0314ca83974ded83e367bb47df9c2cfa38eecebb Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 30 Aug 2024 12:41:03 +0200
Subject: [PATCH 048/228] fix: customerSummaryToTicketList button

---
 .../Customer/Card/CustomerDescriptor.vue      |  8 +++++++-
 src/pages/Ticket/Card/TicketSummary.vue       |  3 ++-
 src/pages/Ticket/TicketList.vue               | 20 ++++++++++++++++---
 3 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/src/pages/Customer/Card/CustomerDescriptor.vue b/src/pages/Customer/Card/CustomerDescriptor.vue
index 9ae453df0..4980e5495 100644
--- a/src/pages/Customer/Card/CustomerDescriptor.vue
+++ b/src/pages/Customer/Card/CustomerDescriptor.vue
@@ -152,7 +152,13 @@ const setData = (entity) => (data.value = useCardDescription(entity?.name, entit
                 <QBtn
                     :to="{
                         name: 'TicketList',
-                        query: { table: JSON.stringify({ clientFk: entity.id }) },
+                        query: {
+                            from: undefined,
+                            to: undefined,
+                            table: JSON.stringify({
+                                clientFk: entity.id,
+                            }),
+                        },
                     }"
                     size="md"
                     icon="vn:ticket"
diff --git a/src/pages/Ticket/Card/TicketSummary.vue b/src/pages/Ticket/Card/TicketSummary.vue
index 177384663..feebe85a6 100644
--- a/src/pages/Ticket/Card/TicketSummary.vue
+++ b/src/pages/Ticket/Card/TicketSummary.vue
@@ -162,8 +162,9 @@ async function changeState(value) {
                     :value="ticket.warehouse?.name"
                 />
                 <VnLv
+                    v-if="ticket?.ticketCollections?.length > 0"
                     :label="t('ticket.summary.collection')"
-                    :value="ticket.ticketCollections[0]?.collectionFk"
+                    :value="ticket?.ticketCollections[0]?.collectionFk"
                 >
                     <template #value>
                         <a
diff --git a/src/pages/Ticket/TicketList.vue b/src/pages/Ticket/TicketList.vue
index cbd102317..f3e0e5c06 100644
--- a/src/pages/Ticket/TicketList.vue
+++ b/src/pages/Ticket/TicketList.vue
@@ -14,6 +14,8 @@ import VnRow from 'src/components/ui/VnRow.vue';
 import RightMenu from 'src/components/common/RightMenu.vue';
 import TicketFilter from './TicketFilter.vue';
 
+import { useRoute } from 'vue-router';
+const route = useRoute();
 const { t } = useI18n();
 const { viewSummary } = useSummaryDialog();
 const tableRef = ref();
@@ -27,8 +29,17 @@ const to = Date.vnNew();
 to.setDate(to.getDate() + 1);
 
 const userParams = {
-    from: from.toISOString(),
-    to: to.toISOString(),
+    from: null,
+    to: null,
+};
+// Método para inicializar las variables desde la query string
+const initializeFromQuery = () => {
+    const query = route.query.table ? JSON.parse(route.query.table) : {};
+
+    // Asigna los valores a las variables correspondientes
+    from.value = query.from || from.toISOString();
+    to.value = query.to || to.toISOString();
+    Object.assign(userParams, { from, to });
 };
 
 const columns = computed(() => [
@@ -200,7 +211,10 @@ const getColor = (row) => {
     return row?.classColor ? `bg-${row.classColor}` : 'bg-orange';
 };
 
-onMounted(() => (stateStore.rightDrawer = true));
+onMounted(() => {
+    initializeFromQuery();
+    stateStore.rightDrawer = true;
+});
 </script>
 
 <template>

From d155b40bde5fe32df7bd448b8e655bd16f630739 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 30 Aug 2024 12:41:59 +0200
Subject: [PATCH 049/228] revert: vnUSerLink change

---
 src/components/VnTable/VnTable.vue          | 1 +
 src/components/ui/VnUserLink.vue            | 2 +-
 src/pages/Customer/Card/CustomerGreuges.vue | 5 +++--
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index 510f63360..c63973f20 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -741,6 +741,7 @@ es:
     }
     .q-table__top {
         top: 0;
+        padding: 12px 0;
     }
     tbody {
         .q-checkbox {
diff --git a/src/components/ui/VnUserLink.vue b/src/components/ui/VnUserLink.vue
index 8fb571c80..00c50ee34 100644
--- a/src/components/ui/VnUserLink.vue
+++ b/src/components/ui/VnUserLink.vue
@@ -11,7 +11,7 @@ defineProps({
 <template>
     <slot name="link">
         <span :class="{ link: workerId }">
-            {{ defaultName ? name ?? $t('globals.system') : tag ?? name }}
+            {{ defaultName ? name ?? $t('globals.system') : name }}
         </span>
     </slot>
     <WorkerDescriptorProxy v-if="workerId" :id="workerId" />
diff --git a/src/pages/Customer/Card/CustomerGreuges.vue b/src/pages/Customer/Card/CustomerGreuges.vue
index 2909bcaaf..a670329b5 100644
--- a/src/pages/Customer/Card/CustomerGreuges.vue
+++ b/src/pages/Customer/Card/CustomerGreuges.vue
@@ -47,13 +47,14 @@ const columns = computed(() => [
     },
     {
         align: 'left',
-        name: 'userFk',
+        // name: 'userFk',
         label: t('Created by'),
         component: 'userLink',
         attrs: ({ row }) => {
             return {
+                defaultName: true,
                 workerId: row.user?.id,
-                tag: row.user?.name,
+                name: row.user?.name,
             };
         },
     },

From 4762c9fa53e23b72d11be2a6a117f3d751231b3e Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 30 Aug 2024 13:02:39 +0200
Subject: [PATCH 050/228] perf: disable card option

---
 src/pages/Customer/Card/CustomerBalance.vue    | 1 +
 src/pages/Customer/Card/CustomerGreuges.vue    | 1 +
 src/pages/Customer/Card/CustomerRecoveries.vue | 1 +
 3 files changed, 3 insertions(+)

diff --git a/src/pages/Customer/Card/CustomerBalance.vue b/src/pages/Customer/Card/CustomerBalance.vue
index 52edecea5..4e01b9ac5 100644
--- a/src/pages/Customer/Card/CustomerBalance.vue
+++ b/src/pages/Customer/Card/CustomerBalance.vue
@@ -254,6 +254,7 @@ const showBalancePdf = ({ id }) => {
         :is-editable="false"
         :column-search="false"
         @on-fetch="onFetch"
+        :disable-option="{ card: true }"
         auto-load
     >
         <template #column-balance="{ rowIndex }">
diff --git a/src/pages/Customer/Card/CustomerGreuges.vue b/src/pages/Customer/Card/CustomerGreuges.vue
index a670329b5..8a83d49db 100644
--- a/src/pages/Customer/Card/CustomerGreuges.vue
+++ b/src/pages/Customer/Card/CustomerGreuges.vue
@@ -106,6 +106,7 @@ const setRows = (data) => {
         :use-model="true"
         :column-search="false"
         @on-fetch="(data) => setRows(data)"
+        :disable-option="{ card: true }"
         :create="{
             urlCreate: `Greuges`,
             title: t('New greuge'),
diff --git a/src/pages/Customer/Card/CustomerRecoveries.vue b/src/pages/Customer/Card/CustomerRecoveries.vue
index 8d3d05702..3ea8998e9 100644
--- a/src/pages/Customer/Card/CustomerRecoveries.vue
+++ b/src/pages/Customer/Card/CustomerRecoveries.vue
@@ -89,6 +89,7 @@ function setFinished(id) {
         :columns="columns"
         :use-model="true"
         :right-search="false"
+        :disable-option="{ card: true }"
         :create="{
             urlCreate: 'Recoveries',
             title: 'New recovery',

From 00acd5b0ab3e992a3748b93fc30c29c611e64362 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 30 Aug 2024 14:24:25 +0200
Subject: [PATCH 051/228] feat: CustomerCredit section

---
 src/pages/Customer/Card/CustomerCard.vue      |  2 +-
 .../Customer/Card/CustomerCreditContracts.vue | 23 +++++
 .../Customer/Card/CustomerCreditOpinion.vue   | 91 ++++++++++---------
 .../CustomerCreditContractsCreate.vue         |  1 +
 .../CustomerCreditContractsInsurance.vue      | 78 ++++------------
 5 files changed, 88 insertions(+), 107 deletions(-)

diff --git a/src/pages/Customer/Card/CustomerCard.vue b/src/pages/Customer/Card/CustomerCard.vue
index 9562be001..139917d05 100644
--- a/src/pages/Customer/Card/CustomerCard.vue
+++ b/src/pages/Customer/Card/CustomerCard.vue
@@ -17,7 +17,7 @@ const routeName = computed(() => route.name);
         :filter-panel="routeName != 'CustomerConsumption' && CustomerFilter"
         search-data-key="CustomerList"
         :searchbar-props="{
-            url: 'Clients/extendedListFilter',
+            url: 'Clients/filter',
             label: 'Search customer',
             info: 'You can search by customer id or name',
         }"
diff --git a/src/pages/Customer/Card/CustomerCreditContracts.vue b/src/pages/Customer/Card/CustomerCreditContracts.vue
index 7b72a4d6d..38c08f4ce 100644
--- a/src/pages/Customer/Card/CustomerCreditContracts.vue
+++ b/src/pages/Customer/Card/CustomerCreditContracts.vue
@@ -4,6 +4,7 @@ import { useI18n } from 'vue-i18n';
 import { useRoute, useRouter } from 'vue-router';
 
 import { useQuasar } from 'quasar';
+import VnTable from 'src/components/VnTable/VnTable.vue';
 
 import VnPaginate from 'src/components/ui/VnPaginate.vue';
 import ModalCloseContract from 'src/pages/Customer/components/ModalCloseContract.vue';
@@ -72,6 +73,28 @@ const updateData = () => {
 </script>
 
 <template>
+    <!-- <VnTable
+        ref="tableRef"
+        data-key="Greuges"
+        url="Greuges"
+        search-url="greuges"
+        :filter="filter"
+        :order="['shipped DESC', 'amount']"
+        :columns="columns"
+        :right-search="false"
+        :is-editable="false"
+        :use-model="true"
+        :column-search="false"
+        @on-fetch="(data) => setRows(data)"
+        :disable-option="{ card: true }"
+        :create="{
+            urlCreate: `Greuges`,
+            title: t('New greuge'),
+            onDataSaved: () => tableRef.reload(),
+            formInitialData: { shipped: new Date(), clientFk: route.params.id },
+        }"
+        auto-load
+    ></VnTable> -->
     <div class="full-width flex justify-center">
         <QCard class="card-width q-pa-lg">
             <VnPaginate
diff --git a/src/pages/Customer/Card/CustomerCreditOpinion.vue b/src/pages/Customer/Card/CustomerCreditOpinion.vue
index c164ab450..af1b0138e 100644
--- a/src/pages/Customer/Card/CustomerCreditOpinion.vue
+++ b/src/pages/Customer/Card/CustomerCreditOpinion.vue
@@ -3,9 +3,8 @@ import { computed, ref, watch } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
 
-import { QBtn } from 'quasar';
-
 import { toCurrency, toDateHourMin } from 'src/filters';
+import VnTable from 'src/components/VnTable/VnTable.vue';
 
 import FetchData from 'components/FetchData.vue';
 import FormModel from 'components/FormModel.vue';
@@ -16,8 +15,8 @@ import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.v
 const { t } = useI18n();
 const route = useRoute();
 
-const clientInformasRef = ref();
-const rows = ref([]);
+const tableRef = ref();
+// const rows = ref([]);
 
 const filter = {
     include: [
@@ -37,10 +36,9 @@ const filter = {
 const columns = computed(() => [
     {
         align: 'left',
-        field: 'created',
-        format: (value) => toDateHourMin(value),
+        format: ({ created }) => toDateHourMin(created),
         label: t('Since'),
-        name: 'since',
+        name: 'created',
     },
     {
         align: 'left',
@@ -53,59 +51,63 @@ const columns = computed(() => [
         field: 'rating',
         label: t('Rating'),
         name: 'rating',
+        create: true,
+        columnCreate: {
+            component: 'number',
+            autofocus: true,
+        },
     },
     {
         align: 'right',
         field: 'recommendedCredit',
-        format: (value) => toCurrency(value),
+        format: ({ recommendedCredit }) => toCurrency(recommendedCredit),
         label: t('Recommended credit'),
         name: 'recommendedCredit',
+        create: true,
+        columnCreate: {
+            component: 'number',
+            autofocus: true,
+        },
     },
 ]);
 
-watch(
-    () => route.params.id,
-    (newValue) => {
-        if (!newValue) return;
-        filter.where.clientFk = newValue;
-        clientInformasRef.value?.fetch();
-    }
-);
+// watch(
+//     () => route.params.id,
+//     (newValue) => {
+//         if (!newValue) return;
+//         filter.where.clientFk = newValue;
+//         clientInformasRef.value?.fetch();
+//     }
+// );
 </script>
 
 <template>
-    <FetchData
-        ref="clientInformasRef"
+    <VnTable
+        ref="tableRef"
+        data-key="ClientInformas"
         url="ClientInformas"
         :filter="filter"
-        @on-fetch="(data) => (rows = data)"
+        :order="['created DESC']"
+        :columns="columns"
+        :right-search="false"
+        :is-editable="false"
+        :use-model="true"
+        :column-search="false"
+        :disable-option="{ card: true }"
         auto-load
-    />
-    <FormModel
-        :form-initial-data="{}"
-        :url-create="`Clients/${route.params.id}/setRating`"
-        @on-data-saved="clientInformasRef.fetch()"
+        :create="{
+            urlCreate: `Clients/${route.params.id}/setRating`,
+            title: 'Create rating',
+            onDataSaved: () => tableRef.reload(),
+            formInitialData: {},
+        }"
     >
-        <template #form="{ data }">
-            <VnRow>
-                <VnInput
-                    :label="t('Rating')"
-                    clearable
-                    type="number"
-                    v-model.number="data.rating"
-                />
-                <VnInput
-                    :label="t('Recommended credit')"
-                    clearable
-                    type="number"
-                    v-model.number="data.recommendedCredit"
-                />
-            </VnRow>
+        <template #column-employee="{ row }">
+            <span class="link" @click.stop>{{ row.worker.user.nickname }}</span>
+            <WorkerDescriptorProxy :id="row.clientFk" />
         </template>
-    </FormModel>
-
-    <div class="full-width flex justify-center" v-if="rows.length">
-        <QTable
+    </VnTable>
+    <!-- <QTable
             :columns="columns"
             :pagination="{ rowsPerPage: 0 }"
             :rows="rows"
@@ -120,8 +122,7 @@ watch(
                     <WorkerDescriptorProxy :id="row.clientFk" />
                 </QTd>
             </template>
-        </QTable>
-    </div>
+        </QTable> -->
 </template>
 
 <i18n>
diff --git a/src/pages/Customer/components/CustomerCreditContractsCreate.vue b/src/pages/Customer/components/CustomerCreditContractsCreate.vue
index c25e59e1a..24f3746dc 100644
--- a/src/pages/Customer/components/CustomerCreditContractsCreate.vue
+++ b/src/pages/Customer/components/CustomerCreditContractsCreate.vue
@@ -48,6 +48,7 @@ const toCustomerCreditContracts = () => {
                         clearable
                         type="number"
                         v-model.number="data.credit"
+                        autofocus
                     />
                 </div>
                 <div class="col">
diff --git a/src/pages/Customer/components/CustomerCreditContractsInsurance.vue b/src/pages/Customer/components/CustomerCreditContractsInsurance.vue
index ce880d4b5..70f7cf046 100644
--- a/src/pages/Customer/components/CustomerCreditContractsInsurance.vue
+++ b/src/pages/Customer/components/CustomerCreditContractsInsurance.vue
@@ -1,47 +1,26 @@
 <script setup>
-import { computed, ref } from 'vue';
+import { computed } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
 
-import { toCurrency, toDateHourMinSec } from 'src/filters';
+import { toCurrency, toDate } from 'src/filters';
 
-import FetchData from 'components/FetchData.vue';
+import VnTable from 'src/components/VnTable/VnTable.vue';
 
 const { t } = useI18n();
 const route = useRoute();
 
-const rows = ref([]);
-
 const filter = {
     where: {
         creditClassificationFk: `${route.params.creditId}`,
     },
     limit: 20,
 };
-
-const tableColumnComponents = {
-    created: {
-        component: 'span',
-        props: () => {},
-        event: () => {},
-    },
-    grade: {
-        component: 'span',
-        props: () => {},
-        event: () => {},
-    },
-    credit: {
-        component: 'span',
-        props: () => {},
-        event: () => {},
-    },
-};
-
 const columns = computed(() => [
     {
         align: 'left',
         field: 'created',
-        format: (value) => toDateHourMinSec(value),
+        format: ({ created }) => toDate(created),
         label: t('Created'),
         name: 'created',
     },
@@ -53,8 +32,7 @@ const columns = computed(() => [
     },
     {
         align: 'left',
-        field: 'credit',
-        format: (value) => toCurrency(value),
+        format: ({ credit }) => toCurrency(credit),
         label: t('Credit'),
         name: 'credit',
     },
@@ -62,41 +40,19 @@ const columns = computed(() => [
 </script>
 
 <template>
-    <FetchData
-        :filter="filter"
-        @on-fetch="(data) => (rows = data)"
-        auto-load
+    <VnTable
         url="CreditInsurances"
-    />
-
-    <QPage class="column items-center q-pa-md" v-if="rows.length">
-        <QTable
-            :columns="columns"
-            :pagination="{ rowsPerPage: 12 }"
-            :rows="rows"
-            class="full-width q-mt-md"
-            row-key="id"
-        >
-            <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 }}
-                        </component>
-                    </QTr>
-                </QTd>
-            </template>
-        </QTable>
-    </QPage>
-
-    <h5 class="flex justify-center color-vn-label" v-else>
-        {{ t('globals.noResults') }}
-    </h5>
+        ref="tableRef"
+        data-key="creditInsurances"
+        :filter="filter"
+        :columns="columns"
+        :right-search="false"
+        :is-editable="false"
+        :use-model="true"
+        :column-search="false"
+        :disable-option="{ card: true }"
+        auto-load
+    ></VnTable>
 </template>
 
 <i18n>

From 76a7f8a1b3366d5f5c7f61e7283073c8c6069a65 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Mon, 2 Sep 2024 12:09:48 +0200
Subject: [PATCH 052/228] refactor: refs #7500 refactor vnimg when storage is
 dms

---
 src/components/common/VnDmsList.vue |  8 ++------
 src/components/ui/VnImg.vue         | 15 +++++----------
 2 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/src/components/common/VnDmsList.vue b/src/components/common/VnDmsList.vue
index 08c4e4aa4..c0e8ac43b 100644
--- a/src/components/common/VnDmsList.vue
+++ b/src/components/common/VnDmsList.vue
@@ -102,12 +102,8 @@ const columns = computed(() => [
             storage: 'dms',
             collection: null,
             size: null,
-            token: prop.token,
-            url:
-                'api/dms/' +
-                prop.row.file.split('.')[0] +
-                '/downloadFile?access_token=' +
-                token,
+            id: prop.row.file.split('.')[0],
+            token: token,
             class: 'rounded',
         }),
     },
diff --git a/src/components/ui/VnImg.vue b/src/components/ui/VnImg.vue
index 2e690ffe1..19ac8ce7f 100644
--- a/src/components/ui/VnImg.vue
+++ b/src/components/ui/VnImg.vue
@@ -12,10 +12,12 @@ const $props = defineProps({
     collection: {
         type: String,
         default: 'catalog',
+        required: false,
     },
     resolution: {
         type: String,
         default: '200x200',
+        required: false,
     },
     zoomResolution: {
         type: String,
@@ -29,27 +31,20 @@ const $props = defineProps({
         type: Number,
         required: true,
     },
-    url: {
-        type: String,
-        required: false,
-        default: null,
-    },
 });
 const show = ref(false);
 const token = useSession().getTokenMultimedia();
 const timeStamp = ref(`timestamp=${Date.now()}`);
-if ($props.url) return $props.url;
 const isEmployee = useRole().isEmployee();
-const _url = [$props.storage, $props.collection, $props.size, $props.id]
-    .filter((prop) => prop)
-    .join('/');
 
 const getUrl = (zoom = false) => {
     const curResolution = zoom
         ? $props.zoomResolution || $props.resolution
         : $props.resolution;
+    if ($props.storage === 'dms')
+        return `/api/${$props.storage}/${$props.id}/downloadFile?access_token=${token}`;
     return isEmployee
-        ? `/api/${_url}/download?access_token=${token}&${timeStamp.value}`
+        ? `/api/${$props.storage}/${$props.collection}/${curResolution}/${$props.id}/download?access_token=${token}&${timeStamp.value}`
         : noImage;
 };
 const reload = () => {

From 50cdb053f8836e5c9c92a017098d1a5bb14199ac Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Tue, 3 Sep 2024 17:33:17 +0200
Subject: [PATCH 053/228] feat: refs #7663 fine tunning

---
 src/components/ui/VnConfirm.vue               |  5 +-
 src/i18n/locale/en.yml                        |  1 +
 src/i18n/locale/es.yml                        |  1 +
 .../Ticket/Card/TicketDescriptorMenu.vue      | 47 ++++++++++-
 src/pages/Ticket/Card/TicketSummary.vue       | 84 +++++++++----------
 5 files changed, 87 insertions(+), 51 deletions(-)

diff --git a/src/components/ui/VnConfirm.vue b/src/components/ui/VnConfirm.vue
index fd4860107..4fa374b62 100644
--- a/src/components/ui/VnConfirm.vue
+++ b/src/components/ui/VnConfirm.vue
@@ -31,6 +31,7 @@ const props = defineProps({
 });
 
 defineEmits(['confirm', ...useDialogPluginComponent.emits]);
+defineExpose({ show: () => dialogRef.value.show(), hide: () => dialogRef.value.hide() });
 
 const { dialogRef, onDialogOK } = useDialogPluginComponent();
 
@@ -68,8 +69,10 @@ async function confirm() {
                 <QSpace />
                 <QBtn icon="close" :disable="isLoading" flat round dense v-close-popup />
             </QCardSection>
-            <QCardSection class="row items-center">
+            <QCardSection class="q-pb-none">
                 <span v-if="message !== false" v-html="message" />
+            </QCardSection>
+            <QCardSection class="row items-center q-pt-none">
                 <slot name="customHTML"></slot>
             </QCardSection>
             <QCardActions align="right">
diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index ef5e02b12..4e1c4f406 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -96,6 +96,7 @@ globals:
     to: To
     notes: Notes
     refresh: Refresh
+    weight: Weight
     pageTitles:
         logIn: Login
         summary: Summary
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index 7143bf96f..6415a2930 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -98,6 +98,7 @@ globals:
     to: Hasta
     notes: Notas
     refresh: Actualizar
+    weight: Peso
     pageTitles:
         logIn: Inicio de sesión
         summary: Resumen
diff --git a/src/pages/Ticket/Card/TicketDescriptorMenu.vue b/src/pages/Ticket/Card/TicketDescriptorMenu.vue
index 441b547ed..9491579f8 100644
--- a/src/pages/Ticket/Card/TicketDescriptorMenu.vue
+++ b/src/pages/Ticket/Card/TicketDescriptorMenu.vue
@@ -9,6 +9,8 @@ import SendEmailDialog from 'components/common/SendEmailDialog.vue';
 import VnConfirm from 'components/ui/VnConfirm.vue';
 import VnSmsDialog from 'components/common/VnSmsDialog.vue';
 import toDate from 'filters/toDate';
+import VnInputNumber from 'src/components/common/VnInputNumber.vue';
+import { useArrayData } from 'src/composables/useArrayData';
 
 const props = defineProps({
     ticket: {
@@ -21,9 +23,10 @@ const { push, currentRoute } = useRouter();
 const { dialog, notify } = useQuasar();
 const { t } = useI18n();
 const { openReport, sendEmail } = usePrintService();
-
+const ticketSummary = useArrayData('TicketSummary');
 const ticket = ref(props.ticket);
 const ticketId = currentRoute.value.params.id;
+const weight = ref();
 const actions = {
     clone: async () => {
         const opts = { message: t('Ticket cloned'), type: 'positive' };
@@ -46,7 +49,25 @@ const actions = {
                 push({ name: 'TicketSummary', params: { id: clonedTicketId } });
         }
     },
-    setWeight: async () => {},
+    setWeight: async () => {
+        try {
+            const invoiceIds = (
+                await axios.post(`Tickets/${ticketId}/setWeight`, {
+                    weight: weight.value,
+                })
+            ).data;
+
+            notify({ message: t('Weight set'), type: 'positive' });
+            if (invoiceIds.length)
+                notify({
+                    message: t('invoiceIds', { invoiceIds: invoiceIds.join() }),
+                    type: 'positive',
+                });
+            await ticketSummary.fetch({ updateRouter: false });
+        } catch (e) {
+            notify({ message: e.message, type: 'negative' });
+        }
+    },
     remove: async () => {
         try {
             await axios.post(`Tickets/${ticketId}/setDeleted`);
@@ -261,7 +282,7 @@ function openConfirmDialog(callback) {
         </QItemSection>
         <QItemSection>{{ t('To clone ticket') }}</QItemSection>
     </QItem>
-    <QItem @click="openConfirmDialog('setWeight')" v-ripple clickable>
+    <QItem @click="$refs.weightDialog.show()" v-ripple clickable>
         <QItemSection avatar>
             <QIcon name="weight" />
         </QItemSection>
@@ -276,9 +297,25 @@ function openConfirmDialog(callback) {
             <QItemSection>{{ t('Delete ticket') }}</QItemSection>
         </QItem>
     </template>
+    <VnConfirm
+        ref="weightDialog"
+        :title="t('Set weight')"
+        :message="t('This ticket may be invoiced, do you want to continue?')"
+        :promise="actions.setWeight"
+    >
+        <template #customHTML>
+            <VnInputNumber
+                :label="t('globals.weight')"
+                v-model="weight"
+                class="full-width"
+            />
+        </template>
+    </VnConfirm>
 </template>
-
 <i18n>
+en:
+    invoiceIds: "Invoices have been generated with the following ids: {invoiceIds}"
+
 es:
     Open Delivery Note...: Abrir albarán...
     Send Delivery Note...: Enviar albarán...
@@ -297,5 +334,7 @@ es:
     Ticket cloned: Ticked clonado
     It was not able to clone the ticket: No se pudo clonar el ticket
     Set weight: Establecer peso
+    Weight set: Peso establecido
     This ticket may be invoiced, do you want to continue?: Es posible que se facture este ticket, desea continuar?
+    invoiceIds: "Se han generado las facturas con los siguientes ids: {invoiceIds}"
 </i18n>
diff --git a/src/pages/Ticket/Card/TicketSummary.vue b/src/pages/Ticket/Card/TicketSummary.vue
index 177384663..a7a541e6d 100644
--- a/src/pages/Ticket/Card/TicketSummary.vue
+++ b/src/pages/Ticket/Card/TicketSummary.vue
@@ -31,8 +31,7 @@ const $props = defineProps({
 const entityId = computed(() => $props.id || route.params.id);
 
 const summaryRef = ref();
-const ticket = ref();
-const salesLines = ref(null);
+const ticket = computed(() => summaryRef.value?.entity);
 const editableStates = ref([]);
 const ticketUrl = ref();
 const grafanaUrl = 'https://grafana.verdnatura.es';
@@ -40,12 +39,6 @@ const grafanaUrl = 'https://grafana.verdnatura.es';
 onMounted(async () => {
     ticketUrl.value = (await getUrl('ticket/')) + entityId.value + '/';
 });
-async function setData(data) {
-    if (data) {
-        ticket.value = data;
-        salesLines.value = data.sales;
-    }
-}
 
 function formattedAddress() {
     if (!ticket.value) return '';
@@ -89,7 +82,6 @@ async function changeState(value) {
     <CardSummary
         ref="summaryRef"
         :url="`Tickets/${entityId}/summary`"
-        @on-fetch="(data) => setData(data)"
         data-key="TicketSummary"
     >
         <template #header="{ entity }">
@@ -131,7 +123,7 @@ async function changeState(value) {
                 </QList>
             </QBtnDropdown>
         </template>
-        <template #body>
+        <template #body="{ entity }">
             <QCard class="vn-one">
                 <VnTitle
                     :url="ticketUrl + 'basic-data/step-one'"
@@ -139,57 +131,57 @@ async function changeState(value) {
                 />
                 <VnLv :label="t('ticket.summary.state')">
                     <template #value>
-                        <QChip :color="ticket.ticketState?.state?.classColor ?? 'dark'">
-                            {{ ticket.ticketState?.state?.name }}
+                        <QChip :color="entity.ticketState?.state?.classColor ?? 'dark'">
+                            {{ entity.ticketState?.state?.name }}
                         </QChip>
                     </template>
                 </VnLv>
                 <VnLv :label="t('ticket.summary.salesPerson')">
                     <template #value>
                         <VnUserLink
-                            :name="ticket.client?.salesPersonUser?.name"
-                            :worker-id="ticket.client?.salesPersonFk"
+                            :name="entity.client?.salesPersonUser?.name"
+                            :worker-id="entity.client?.salesPersonFk"
                         />
                     </template>
                 </VnLv>
                 <VnLv
                     :label="t('ticket.summary.agency')"
-                    :value="ticket.agencyMode?.name"
+                    :value="entity.agencyMode?.name"
                 />
-                <VnLv :label="t('ticket.summary.zone')" :value="ticket?.zone?.name" />
+                <VnLv :label="t('ticket.summary.zone')" :value="entity?.zone?.name" />
                 <VnLv
                     :label="t('ticket.summary.warehouse')"
-                    :value="ticket.warehouse?.name"
+                    :value="entity.warehouse?.name"
                 />
                 <VnLv
                     :label="t('ticket.summary.collection')"
-                    :value="ticket.ticketCollections[0]?.collectionFk"
+                    :value="entity.ticketCollections[0]?.collectionFk"
                 >
                     <template #value>
                         <a
-                            :href="`${grafanaUrl}/d/d552ab74-85b4-4e7f-a279-fab7cd9c6124/control-de-expediciones?orgId=1&var-collectionFk=${ticket.ticketCollections[0]?.collectionFk}`"
+                            :href="`${grafanaUrl}/d/d552ab74-85b4-4e7f-a279-fab7cd9c6124/control-de-expediciones?orgId=1&var-collectionFk=${entity.ticketCollections[0]?.collectionFk}`"
                             target="_blank"
                             class="grafana"
                         >
-                            {{ ticket.ticketCollections[0]?.collectionFk }}
+                            {{ entity.ticketCollections[0]?.collectionFk }}
                         </a>
                     </template>
                 </VnLv>
-                <VnLv :label="t('ticket.summary.route')" :value="ticket.routeFk" />
+                <VnLv :label="t('ticket.summary.route')" :value="entity.routeFk" />
                 <VnLv :label="t('ticket.summary.invoice')">
                     <template #value>
-                        <span :class="{ link: ticket.refFk }">
-                            {{ dashIfEmpty(ticket.refFk) }}
+                        <span :class="{ link: entity.refFk }">
+                            {{ dashIfEmpty(entity.refFk) }}
                             <InvoiceOutDescriptorProxy
-                                :id="ticket.invoiceOut.id"
-                                v-if="ticket.refFk"
+                                :id="entity.invoiceOut.id"
+                                v-if="entity.refFk"
                             />
                         </span>
                     </template>
                 </VnLv>
                 <VnLv
                     :label="t('ticket.summary.weight')"
-                    :value="dashIfEmpty(ticket.weight)"
+                    :value="dashIfEmpty(entity.weight)"
                 />
             </QCard>
             <QCard class="vn-one">
@@ -199,35 +191,35 @@ async function changeState(value) {
                 />
                 <VnLv
                     :label="t('ticket.summary.shipped')"
-                    :value="toDate(ticket.shipped)"
+                    :value="toDate(entity.shipped)"
                 />
                 <VnLv
                     :label="t('ticket.summary.landed')"
-                    :value="toDate(ticket.landed)"
+                    :value="toDate(entity.landed)"
                 />
-                <VnLv :label="t('globals.packages')" :value="ticket.packages" />
-                <VnLv :value="ticket.address.phone">
+                <VnLv :label="t('globals.packages')" :value="entity.packages" />
+                <VnLv :value="entity.address.phone">
                     <template #label>
                         {{ t('ticket.summary.consigneePhone') }}
-                        <VnLinkPhone :phone-number="ticket.address.phone" />
+                        <VnLinkPhone :phone-number="entity.address.phone" />
                     </template>
                 </VnLv>
-                <VnLv :value="ticket.address.mobile">
+                <VnLv :value="entity.address.mobile">
                     <template #label>
                         {{ t('ticket.summary.consigneeMobile') }}
-                        <VnLinkPhone :phone-number="ticket.address.mobile" />
+                        <VnLinkPhone :phone-number="entity.address.mobile" />
                     </template>
                 </VnLv>
-                <VnLv :value="ticket.client.phone">
+                <VnLv :value="entity.client.phone">
                     <template #label>
                         {{ t('ticket.summary.clientPhone') }}
-                        <VnLinkPhone :phone-number="ticket.client.phone" />
+                        <VnLinkPhone :phone-number="entity.client.phone" />
                     </template>
                 </VnLv>
-                <VnLv :value="ticket.client.mobile">
+                <VnLv :value="entity.client.mobile">
                     <template #label>
                         {{ t('ticket.summary.clientMobile') }}
-                        <VnLinkPhone :phone-number="ticket.client.mobile" />
+                        <VnLinkPhone :phone-number="entity.client.mobile" />
                     </template>
                 </VnLv>
                 <VnLv
@@ -235,13 +227,13 @@ async function changeState(value) {
                     :value="formattedAddress()"
                 />
             </QCard>
-            <QCard class="vn-one" v-if="ticket.notes.length">
+            <QCard class="vn-one" v-if="entity.notes.length">
                 <VnTitle
                     :url="ticketUrl + 'observation'"
                     :text="t('ticket.pageTitles.notes')"
                 />
                 <VnLv
-                    v-for="note in ticket.notes"
+                    v-for="note in entity.notes"
                     :key="note.id"
                     :label="note.observationType.description"
                     :value="note.description"
@@ -262,15 +254,15 @@ async function changeState(value) {
                 <div class="bodyCard">
                     <VnLv
                         :label="t('ticket.summary.subtotal')"
-                        :value="toCurrency(ticket.totalWithoutVat)"
+                        :value="toCurrency(entity.totalWithoutVat)"
                     />
                     <VnLv
                         :label="t('ticket.summary.vat')"
-                        :value="toCurrency(ticket.totalWithVat - ticket.totalWithoutVat)"
+                        :value="toCurrency(entity.totalWithVat - entity.totalWithoutVat)"
                     />
                     <VnLv
                         :label="t('ticket.summary.total')"
-                        :value="toCurrency(ticket.totalWithVat)"
+                        :value="toCurrency(entity.totalWithVat)"
                     />
                 </div>
             </QCard>
@@ -279,7 +271,7 @@ async function changeState(value) {
                     :url="ticketUrl + 'sale'"
                     :text="t('ticket.summary.saleLines')"
                 />
-                <QTable :rows="ticket.sales" style="text-align: center">
+                <QTable :rows="entity.sales" style="text-align: center">
                     <template #body-cell="{ value }">
                         <QTd>{{ value }}</QTd>
                     </template>
@@ -420,10 +412,10 @@ async function changeState(value) {
             </QCard>
             <QCard
                 class="vn-max"
-                v-if="ticket.packagings.length > 0 || ticket.services.length > 0"
+                v-if="entity.packagings.length || entity.services.length"
             >
                 <VnTitle :url="ticketUrl + 'package'" :text="t('globals.packages')" />
-                <QTable :rows="ticket.packagings" flat>
+                <QTable :rows="entity.packagings" flat>
                     <template #header="props">
                         <QTr :props="props">
                             <QTh auto-width>{{ t('ticket.summary.created') }}</QTh>
@@ -443,7 +435,7 @@ async function changeState(value) {
                     :url="ticketUrl + 'service'"
                     :text="t('ticket.summary.service')"
                 />
-                <QTable :rows="ticket.services" flat>
+                <QTable :rows="entity.services" flat>
                     <template #header="props">
                         <QTr :props="props">
                             <QTh auto-width>{{ t('ticket.summary.quantity') }}</QTh>

From 3dc720e2d0db55c61b7b28df6087d997af241b54 Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Wed, 4 Sep 2024 14:40:36 +0200
Subject: [PATCH 054/228] feat: refs #7404 add m3 and fix detail

---
 src/components/VnTable/VnTable.vue            |  36 ++++-
 src/pages/Entry/EntryList.vue                 |   3 -
 src/pages/Entry/EntryStockBought.vue          | 136 +++++++++++-------
 src/pages/Entry/EntryStockBoughtDetail.vue    |   2 +-
 .../integration/entry/stockBought.spec.js     |   2 +-
 5 files changed, 118 insertions(+), 61 deletions(-)

diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index 26b5c424a..0fd6d1dd1 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -90,6 +90,10 @@ const $props = defineProps({
         type: String,
         default: '90vh',
     },
+    footer: {
+        type: Boolean,
+        default: false,
+    },
 });
 const { t } = useI18n();
 const stateStore = useStateStore();
@@ -108,7 +112,7 @@ const orders = ref(parseOrder(routeQuery.filter?.order));
 const CrudModelRef = ref({});
 const showForm = ref(false);
 const splittedColumns = ref({ columns: [] });
-const columnsVisibilitySkippped = ref();
+const columnsVisibilitySkipped = ref();
 const createForm = ref();
 
 const tableModes = [
@@ -347,11 +351,11 @@ defineExpose({
     <CrudModel
         v-bind="$attrs"
         :class="$attrs['class'] ?? 'q-px-md'"
-        :limit="20"
+        :limit="$attrs.limit ?? 20"
         ref="CrudModelRef"
         @on-fetch="(...args) => emit('onFetch', ...args)"
         :search-url="searchUrl"
-        :disable-infinite-scroll="isTableMode"
+        :disable-infinite-scroll="$attrs['disable-infinite-scroll'] ?? isTableMode"
         @save-changes="reload"
         :has-sub-toolbar="$attrs['hasSubToolbar'] ?? isEditable"
         :auto-load="hasParams || $attrs['auto-load']"
@@ -371,7 +375,7 @@ defineExpose({
                 card-container-class="grid-three"
                 flat
                 :style="isTableMode && `max-height: ${tableHeight}`"
-                virtual-scroll
+                :virtual-scroll="!isTableMode"
                 @virtual-scroll="
                     (event) =>
                         event.index > rows.length - 2 &&
@@ -614,6 +618,28 @@ defineExpose({
                         </QCard>
                     </component>
                 </template>
+                <template #bottom-row="{ cols }" v-if="footer">
+                    <QTr v-if="rows.length" class="bg-header" style="height: 30px">
+                        <QTh
+                            v-for="col of cols.filter((cols) => cols.visible ?? true)"
+                            :key="col?.id"
+                            class="text-center"
+                        >
+                            <div
+                                v-if="col?.summation"
+                                :class="`text-${col?.align ?? 'left'}`"
+                                class="text-bold q-pa-sm"
+                            >
+                                {{
+                                    rows.reduce(
+                                        (sum, currentRow) => sum + currentRow[col.name],
+                                        0
+                                    )
+                                }}
+                            </div>
+                        </QTh>
+                    </QTr>
+                </template>
             </QTable>
         </template>
     </CrudModel>
@@ -672,7 +698,7 @@ es:
 }
 
 .bg-header {
-    background-color: var(--vn-header-color);
+    background-color: var(--vn-accent-color);
     color: var(--vn-text-color);
 }
 
diff --git a/src/pages/Entry/EntryList.vue b/src/pages/Entry/EntryList.vue
index c03c67edb..6f7ff1935 100644
--- a/src/pages/Entry/EntryList.vue
+++ b/src/pages/Entry/EntryList.vue
@@ -9,9 +9,6 @@ import RightMenu from 'src/components/common/RightMenu.vue';
 import { toDate } from 'src/filters';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
 import EntrySummary from './Card/EntrySummary.vue';
-import VnUserLink from 'components/ui/VnUserLink.vue';
-import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
-import CustomerDescriptorProxy from '../Customer/Card/CustomerDescriptorProxy.vue';
 import SupplierDescriptorProxy from 'src/pages/Supplier/Card/SupplierDescriptorProxy.vue';
 import TravelDescriptorProxy from 'src/pages/Travel/Card/TravelDescriptorProxy.vue';
 
diff --git a/src/pages/Entry/EntryStockBought.vue b/src/pages/Entry/EntryStockBought.vue
index 12fc96214..75d356bd2 100644
--- a/src/pages/Entry/EntryStockBought.vue
+++ b/src/pages/Entry/EntryStockBought.vue
@@ -6,24 +6,23 @@ import { useQuasar } from 'quasar';
 
 import VnTable from 'components/VnTable/VnTable.vue';
 import VnRow from 'src/components/ui/VnRow.vue';
-import VnInput from 'src/components/common/VnInput.vue';
-import VnLv from 'src/components/ui/VnLv.vue';
 import FetchData from 'src/components/FetchData.vue';
 import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
 import EntryStockBoughtDetail from 'src/pages/Entry/EntryStockBoughtDetail.vue';
+import { useRouter } from 'vue-router';
 
 const { t } = useI18n();
 const quasar = useQuasar();
 const tableRef = ref();
 const state = useState();
 const user = state.getUser();
+const router = useRouter();
 const columns = [
     {
         align: 'left',
         label: 'Id',
         name: 'id',
-        isTitle: true,
         isId: true,
         columnFilter: false,
         visible: false,
@@ -32,6 +31,7 @@ const columns = [
         align: 'left',
         name: 'workerFk',
         label: t('Buyer'),
+        isTitle: true,
         columnFilter: false,
     },
     {
@@ -42,6 +42,7 @@ const columns = [
         create: true,
         component: 'number',
         summation: true,
+        cardVisible: true,
     },
     {
         align: 'left',
@@ -67,6 +68,7 @@ const columns = [
         name: 'bought',
         columnFilter: false,
         summation: true,
+        cardVisible: true,
     },
     {
         align: 'left',
@@ -89,7 +91,6 @@ const columns = [
                         component: EntryStockBoughtDetail,
                         componentProps: {
                             workerFk: row.workerFk,
-                            dated: row.dated,
                         },
                         maximized: true,
                     });
@@ -98,15 +99,22 @@ const columns = [
         ],
     },
 ];
-function getFilter(dated = Date.vnNow()) {
-    console.log('dated: ', new Date(dated * 1000));
+
+function navigate(id) {
+    router.push({ path: `/travel/${id}/basic-data` });
+}
+
+function getFilter(dated) {
+    const shipped = dated ? new Date(dated) : Date.vnNew();
+    shipped.setHours(0, 0, 0, 0);
     return {
-        fields: ['id', 'm3'],
-        where: { dated },
+        where: {
+            shipped,
+            m3: { neq: null },
+        },
         include: [
             {
                 relation: 'warehouseIn',
-                where: { code: 'vnh' },
             },
         ],
     };
@@ -116,49 +124,74 @@ const fetchDataRef = ref();
 </script>
 <template>
     <VnSubToolbar />
-    <VnTable
-        ref="tableRef"
-        data-key="StockBoughts"
-        url="StockBoughts/getStockBought"
-        save-url="StockBoughts/crud"
-        order="reserve DESC"
-        :is-editable="true"
-        :disable-option="{ card: true }"
-        :create="{
-            urlCreate: 'StockBoughts',
-            title: t('Reserve some space'),
-            onDataSaved: () => tableRef.reload(),
-            formInitialData: {
-                workerFk: user.id,
-                dated: Date.vnNow(),
-            },
-        }"
-        :columns="columns"
-        auto-load
-        @on-fetch="() => fetchDataRef.fetch()"
-    >
-        <template #moreFilterPanel="{ params }">
-            <FetchData
-                ref="fetchDataRef"
-                url="Travels"
-                limit="1"
-                auto-load
-                :filter="getFilter(params?.date)"
-                @on-fetch="(data) => (travel = data)"
-            />
-            <VnRow class="q-pa-md" style="align-items: center" v-if="travel?.length">
-                <span>{{ t('Booked trucks: ') + travel[0]?.m3 }}</span>
-                <QBtn style="max-width: 20%" flat icon="edit" />
-            </VnRow>
-        </template>
-        <template #column-workerFk="{ row }">
-            <span class="link" @click.stop>
-                {{ row?.worker?.user?.name }}
-                <WorkerDescriptorProxy :id="row?.workerFk" />
-            </span>
-        </template>
-    </VnTable>
+    <QPage class="column items-center q-pa-md">
+        <VnTable
+            ref="tableRef"
+            data-key="StockBoughts"
+            url="StockBoughts/getStockBought"
+            save-url="StockBoughts/crud"
+            order="reserve DESC"
+            :is-editable="true"
+            :create="{
+                urlCreate: 'StockBoughts',
+                title: t('Reserve some space'),
+                onDataSaved: () => tableRef.reload(),
+                formInitialData: {
+                    workerFk: user.id,
+                    dated: Date.vnNow(),
+                },
+            }"
+            :columns="columns"
+            auto-load
+            @on-fetch="() => console.log('fetching...', fetchDataRef.fetch())"
+            style="max-width: 40%"
+            :footer="true"
+        >
+            <template #moreFilterPanel="{ params }">
+                <FetchData
+                    ref="fetchDataRef"
+                    url="Travels"
+                    limit="1"
+                    auto-load
+                    :filter="getFilter(params?.dated)"
+                    @on-fetch="(data) => (travel = data)"
+                />
+                <div class="trucks">
+                    <div>
+                        <span style="color: var(--vn-label-color)">
+                            {{ t('Booked trucks') + ': ' }}
+                        </span>
+                    </div>
+                    <div v-if="travel">
+                        <span>
+                            {{ travel[0]?.m3 }}
+                        </span>
+                        <QBtn
+                            style="max-width: 20%"
+                            flat
+                            icon="edit"
+                            @click="navigate(travel[0]?.id)"
+                        />
+                    </div>
+                </div>
+            </template>
+            <template #column-workerFk="{ row }">
+                <span class="link" @click.stop>
+                    {{ row?.worker?.user?.name }}
+                    <WorkerDescriptorProxy :id="row?.workerFk" />
+                </span>
+            </template>
+        </VnTable>
+    </QPage>
 </template>
+<style lang="scss">
+.trucks {
+    text-align: center;
+    margin: 3%;
+    border: 3px solid var(--vn-header-color);
+    padding: 1%;
+}
+</style>
 <i18n>
     en:
         Buyer: Buyer
@@ -168,6 +201,7 @@ const fetchDataRef = ref();
         Date: Date
         This buyer has already made a reservation for this date: This buyer has already made a reservation for this date
     es:
+        Booked trucks: Camiones reservados
         Buyer: Comprador
         Reserve: Reservado
         Bought: Comprado
diff --git a/src/pages/Entry/EntryStockBoughtDetail.vue b/src/pages/Entry/EntryStockBoughtDetail.vue
index 9212f1115..b9420af71 100644
--- a/src/pages/Entry/EntryStockBoughtDetail.vue
+++ b/src/pages/Entry/EntryStockBoughtDetail.vue
@@ -18,7 +18,7 @@ const $props = defineProps({
         required: true,
     },
 });
-const customUrl = `StockBoughts/getStockBoughtDetail?workerFk=${$props.workerFk}`;
+const customUrl = `StockBoughts/getStockBoughtDetail?workerFk=${$props.workerFk}&date=${$props.dated}`;
 const columns = [
     {
         align: 'left',
diff --git a/test/cypress/integration/entry/stockBought.spec.js b/test/cypress/integration/entry/stockBought.spec.js
index 8e4fe225c..10af3ef42 100644
--- a/test/cypress/integration/entry/stockBought.spec.js
+++ b/test/cypress/integration/entry/stockBought.spec.js
@@ -8,7 +8,7 @@ describe('EntryStockBought', () => {
         );
     });
     it('Should edit the reserved space', () => {
-        cy.get('tBody > tr').its('length').should('eq', 1);
+        cy.get('tBody > tr').its('length').should('eq', 2);
         cy.get(reserveField).type('10{enter}');
         cy.get('button[title="Save"]').click();
         cy.get('.q-notification__message').should('have.text', 'Data saved');

From cf3b9b2ef8d7d737b9ba6458963053def389214a Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Wed, 4 Sep 2024 17:55:27 +0200
Subject: [PATCH 055/228] perf: CustomerSummary

---
 src/i18n/locale/en.yml                        | 130 -----------------
 src/i18n/locale/es.yml                        | 130 -----------------
 .../Customer/Card/CustomerDescriptor.vue      |   8 +-
 src/pages/Customer/Card/CustomerSummary.vue   |  11 +-
 .../components/CustomerSummaryTable.vue       |   4 +-
 src/pages/Customer/locale/en.yml              | 131 ++++++++++++++++++
 src/pages/Customer/locale/es.yml              | 131 ++++++++++++++++++
 7 files changed, 277 insertions(+), 268 deletions(-)

diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index 3935cead4..4bfde9ea1 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -309,136 +309,6 @@ resetPassword:
     repeatPassword: Repeat password
     passwordNotMatch: Passwords don't match
     passwordChanged: Password changed
-customer:
-    list:
-        phone: Phone
-        email: Email
-        customerOrders: Display customer orders
-        moreOptions: More options
-    card:
-        customerList: Customer list
-        customerId: Claim ID
-        salesPerson: Sales person
-        credit: Credit
-        risk: Risk
-        securedCredit: Secured credit
-        payMethod: Pay method
-        debt: Debt
-        isFrozen: Customer frozen
-        hasDebt: Customer has debt
-        isDisabled: Customer inactive
-        notChecked: Customer no checked
-        webAccountInactive: Web account inactive
-        noWebAccess: Web access is disabled
-        businessType: Business type
-        passwordRequirements: 'The password must have at least { length } length characters, {nAlpha} alphabetic characters, {nUpper} capital letters, {nDigits} digits and {nPunct} symbols (Ex: $%&.)\n'
-        businessTypeFk: Business type
-    summary:
-        basicData: Basic data
-        fiscalAddress: Fiscal address
-        fiscalData: Fiscal data
-        billingData: Billing data
-        consignee: Default consignee
-        businessData: Business data
-        financialData: Financial data
-        customerId: Customer ID
-        name: Name
-        contact: Contact
-        phone: Phone
-        mobile: Mobile
-        email: Email
-        salesPerson: Sales person
-        contactChannel: Contact channel
-        socialName: Social name
-        fiscalId: Fiscal ID
-        postcode: Postcode
-        province: Province
-        country: Country
-        street: Address
-        isEqualizated: Is equalizated
-        isActive: Is active
-        invoiceByAddress: Invoice by address
-        verifiedData: Verified data
-        hasToInvoice: Has to invoice
-        notifyByEmail: Notify by email
-        vies: VIES
-        payMethod: Pay method
-        bankAccount: Bank account
-        dueDay: Due day
-        hasLcr: Has LCR
-        hasCoreVnl: Has core VNL
-        hasB2BVnl: Has B2B VNL
-        addressName: Address name
-        addressCity: City
-        addressStreet: Street
-        username: Username
-        webAccess: Web access
-        totalGreuge: Total greuge
-        mana: Mana
-        priceIncreasingRate: Price increasing rate
-        averageInvoiced: Average invoiced
-        claimRate: Claming rate
-        risk: Risk
-        maximumRisk: Solunion's maximum risk
-        riskInfo: Invoices minus payments plus orders not yet invoiced
-        credit: Credit
-        creditInfo: Company's maximum risk
-        securedCredit: Secured credit
-        securedCreditInfo: Solunion's maximum risk
-        balance: Balance
-        balanceInfo: Invoices minus payments
-        balanceDue: Balance due
-        balanceDueInfo: Deviated invoices minus payments
-        recoverySince: Recovery since
-        businessType: Business Type
-        city: City
-        descriptorInfo: Invoices minus payments plus orders not yet
-        rating: Rating
-        recommendCredit: Recommended credit
-    basicData:
-        socialName: Fiscal name
-        businessType: Business type
-        contact: Contact
-        youCanSaveMultipleEmails: You can save multiple emails
-        email: Email
-        phone: Phone
-        mobile: Mobile
-        salesPerson: Sales person
-        contactChannel: Contact channel
-        previousClient: Previous client
-    extendedList:
-        tableVisibleColumns:
-            id: Identifier
-            name: Name
-            socialName: Social 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
 entry:
     list:
         newEntry: New entry
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index f319f9430..14064ddcf 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -309,136 +309,6 @@ resetPassword:
     repeatPassword: Repetir contraseña
     passwordNotMatch: Las contraseñas no coinciden
     passwordChanged: Contraseña cambiada
-customer:
-    list:
-        phone: Teléfono
-        email: Email
-        customerOrders: Mostrar órdenes del cliente
-        moreOptions: Más opciones
-    card:
-        customerId: ID cliente
-        salesPerson: Comercial
-        credit: Crédito
-        risk: Riesgo
-        securedCredit: Crédito asegurado
-        payMethod: Método de pago
-        debt: Riesgo
-        isFrozen: Cliente congelado
-        hasDebt: Cliente con riesgo
-        isDisabled: Cliente inactivo
-        notChecked: Cliente no comprobado
-        webAccountInactive: Sin acceso web
-        noWebAccess: El acceso web está desactivado
-        businessType: Tipo de negocio
-        passwordRequirements: 'La contraseña debe tener al menos { length } caracteres de longitud, {nAlpha} caracteres alfabéticos, {nUpper} letras mayúsculas, {nDigits} dígitos y {nPunct} símbolos (Ej: $%&.)'
-        businessTypeFk: Tipo de negocio
-    summary:
-        basicData: Datos básicos
-        fiscalAddress: Dirección fiscal
-        fiscalData: Datos fiscales
-        billingData: Datos de facturación
-        consignee: Consignatario pred.
-        businessData: Datos comerciales
-        financialData: Datos financieros
-        customerId: ID cliente
-        name: Nombre
-        contact: Contacto
-        phone: Teléfono
-        mobile: Móvil
-        email: Email
-        salesPerson: Comercial
-        contactChannel: Canal de contacto
-        socialName: Razón social
-        fiscalId: NIF/CIF
-        postcode: Código postal
-        province: Provincia
-        country: País
-        street: Calle
-        isEqualizated: Recargo de equivalencia
-        isActive: Activo
-        invoiceByAddress: Facturar por consignatario
-        verifiedData: Datos verificados
-        hasToInvoice: Facturar
-        notifyByEmail: Notificar por email
-        vies: VIES
-        payMethod: Método de pago
-        bankAccount: Cuenta bancaria
-        dueDay: Día de pago
-        hasLcr: Recibido LCR
-        hasCoreVnl: Recibido core VNL
-        hasB2BVnl: Recibido B2B VNL
-        addressName: Nombre de la dirección
-        addressCity: Ciudad
-        addressStreet: Calle
-        username: Usuario
-        webAccess: Acceso web
-        totalGreuge: Greuge total
-        mana: Maná
-        priceIncreasingRate: Ratio de incremento de precio
-        averageInvoiced: Facturación media
-        claimRate: Ratio de reclamaciones
-        maximumRisk: Riesgo máximo asumido por Solunion
-
-        risk: Riesgo
-        riskInfo: Facturas menos recibos mas pedidos sin facturar
-        credit: Crédito
-        creditInfo: Riesgo máximo asumido por la empresa
-        securedCredit: Crédito asegurado
-        securedCreditInfo: Riesgo máximo asumido por Solunion
-        balance: Balance
-        balanceInfo: Facturas menos recibos
-        balanceDue: Saldo vencido
-        balanceDueInfo: Facturas fuera de plazo menos recibos
-        recoverySince: Recobro desde
-        businessType: Tipo de negocio
-        city: Población
-        descriptorInfo: Facturas menos recibos mas pedidos sin facturar
-        rating: Clasificación
-        recommendCredit: Crédito recomendado
-    basicData:
-        socialName: Nombre fiscal
-        businessType: Tipo de negocio
-        contact: Contacto
-        youCanSaveMultipleEmails: Puede guardar varios correos electrónicos encadenándolos mediante comas sin espacios{','} ejemplo{':'} user{'@'}dominio{'.'}com, user2{'@'}dominio{'.'}com siendo el primer correo electrónico el principal
-        email: Email
-        phone: Teléfono
-        mobile: Móvil
-        salesPerson: Comercial
-        contactChannel: Canal de contacto
-        previousClient: Cliente anterior
-    extendedList:
-        tableVisibleColumns:
-            id: Identificador
-            name: Nombre
-            socialName: Razón social
-            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
 entry:
     list:
         newEntry: Nueva entrada
diff --git a/src/pages/Customer/Card/CustomerDescriptor.vue b/src/pages/Customer/Card/CustomerDescriptor.vue
index 4980e5495..5cab825a9 100644
--- a/src/pages/Customer/Card/CustomerDescriptor.vue
+++ b/src/pages/Customer/Card/CustomerDescriptor.vue
@@ -3,7 +3,7 @@ import { ref, computed } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 
-import { toCurrency, toDate } from 'src/filters';
+import { dashIfEmpty, toCurrency, toDate } from 'src/filters';
 
 import useCardDescription from 'src/composables/useCardDescription';
 
@@ -66,12 +66,14 @@ const setData = (entity) => (data.value = useCardDescription(entity?.name, entit
                 :value="toCurrency(entity.debt)"
                 :info="t('customer.summary.riskInfo')"
             />
-            <VnLv v-if="entity.salesPersonUser" :label="t('customer.card.salesPerson')">
+            <VnLv :label="t('customer.card.salesPerson')">
                 <template #value>
                     <VnUserLink
-                        :name="entity.salesPersonUser?.name"
+                        v-if="entity.salesPersonUser"
+                        :name="entity.salesPersonUser.name"
                         :worker-id="entity.salesPersonFk"
                     />
+                    <span v-else>{{ dashIfEmpty(entity.salesPersonUser) }}</span>
                 </template>
             </VnLv>
             <VnLv
diff --git a/src/pages/Customer/Card/CustomerSummary.vue b/src/pages/Customer/Card/CustomerSummary.vue
index e02f63347..c0ac562c0 100644
--- a/src/pages/Customer/Card/CustomerSummary.vue
+++ b/src/pages/Customer/Card/CustomerSummary.vue
@@ -60,6 +60,11 @@ const creditWarning = computed(() => {
 
     return tooMuchInsurance || noCreditInsurance ? 'negative' : '';
 });
+const sumRisk = ({ clientRisks }) => {
+    let total = clientRisks.reduce((acc, risk) => acc + risk.amount, 0);
+
+    return total;
+};
 </script>
 
 <template>
@@ -170,7 +175,7 @@ const creditWarning = computed(() => {
             <QCard class="vn-one">
                 <VnTitle
                     :url="`#/customer/${entityId}/billing-data`"
-                    :text="t('customer.summary.billingData')"
+                    :text="t('customer.summary.payMethodFk')"
                 />
                 <VnLv
                     :label="t('customer.summary.payMethod')"
@@ -250,7 +255,7 @@ const creditWarning = computed(() => {
             <QCard class="vn-one" v-if="entity.account">
                 <VnTitle
                     :url="`https://grafana.verdnatura.es/d/40buzE4Vk/comportamiento-pagos-clientes?orgId=1&var-clientFk=${entityId}`"
-                    :text="t('customer.summary.financialData')"
+                    :text="t('customer.summary.payMethodFk')"
                     icon="vn:grafana"
                 />
                 <VnLv
@@ -274,7 +279,7 @@ const creditWarning = computed(() => {
                 />
                 <VnLv
                     :label="t('customer.summary.balance')"
-                    :value="toCurrency(entity.sumRisk) || toCurrency(0)"
+                    :value="toCurrency(sumRisk(entity)) || toCurrency(0)"
                     :info="t('customer.summary.balanceInfo')"
                 />
 
diff --git a/src/pages/Customer/components/CustomerSummaryTable.vue b/src/pages/Customer/components/CustomerSummaryTable.vue
index 25db561c5..e2fb61322 100644
--- a/src/pages/Customer/components/CustomerSummaryTable.vue
+++ b/src/pages/Customer/components/CustomerSummaryTable.vue
@@ -93,13 +93,13 @@ const columns = computed(() => [
         name: 'tableActions',
         actions: [
             {
-                title: t('Client ticket list'),
+                title: t('customer.summary.goToLines'),
                 icon: 'vn:lines',
                 action: ({ id }) => router.push({ params: { id }, name: 'TicketSale' }),
                 isPrimary: true,
             },
             {
-                title: t('Client ticket list'),
+                title: t('components.smartCard.viewSummary'),
                 icon: 'preview',
                 isPrimary: true,
                 action: (row) => viewSummary(row.id, TicketSummary),
diff --git a/src/pages/Customer/locale/en.yml b/src/pages/Customer/locale/en.yml
index 6eb7cfa85..4d5e7dfb1 100644
--- a/src/pages/Customer/locale/en.yml
+++ b/src/pages/Customer/locale/en.yml
@@ -2,3 +2,134 @@ customerFilter:
     filter:
         name: Name
         socialName: Social name
+customer:
+    list:
+        phone: Phone
+        email: Email
+        customerOrders: Display customer orders
+        moreOptions: More options
+    card:
+        customerList: Customer list
+        customerId: Claim ID
+        salesPerson: Sales person
+        credit: Credit
+        risk: Risk
+        securedCredit: Secured credit
+        payMethod: Pay method
+        debt: Debt
+        isFrozen: Customer frozen
+        hasDebt: Customer has debt
+        isDisabled: Customer inactive
+        notChecked: Customer no checked
+        webAccountInactive: Web account inactive
+        noWebAccess: Web access is disabled
+        businessType: Business type
+        passwordRequirements: 'The password must have at least { length } length characters, {nAlpha} alphabetic characters, {nUpper} capital letters, {nDigits} digits and {nPunct} symbols (Ex: $%&.)\n'
+        businessTypeFk: Business type
+    summary:
+        basicData: Basic data
+        fiscalAddress: Fiscal address
+        fiscalData: Fiscal data
+        billingData: Billing data
+        consignee: Default consignee
+        businessData: Business data
+        financialData: Financial data
+        customerId: Customer ID
+        name: Name
+        contact: Contact
+        phone: Phone
+        mobile: Mobile
+        email: Email
+        salesPerson: Sales person
+        contactChannel: Contact channel
+        socialName: Social name
+        fiscalId: Fiscal ID
+        postcode: Postcode
+        province: Province
+        country: Country
+        street: Address
+        isEqualizated: Is equalizated
+        isActive: Is active
+        invoiceByAddress: Invoice by address
+        verifiedData: Verified data
+        hasToInvoice: Has to invoice
+        notifyByEmail: Notify by email
+        vies: VIES
+        payMethod: Pay method
+        bankAccount: Bank account
+        dueDay: Due day
+        hasLcr: Has LCR
+        hasCoreVnl: Has core VNL
+        hasB2BVnl: Has B2B VNL
+        addressName: Address name
+        addressCity: City
+        addressStreet: Street
+        username: Username
+        webAccess: Web access
+        totalGreuge: Total greuge
+        mana: Mana
+        priceIncreasingRate: Price increasing rate
+        averageInvoiced: Average invoiced
+        claimRate: Claming rate
+        risk: Risk
+        maximumRisk: Solunion's maximum risk
+        riskInfo: Invoices minus payments plus orders not yet invoiced
+        credit: Credit
+        creditInfo: Company's maximum risk
+        securedCredit: Secured credit
+        securedCreditInfo: Solunion's maximum risk
+        balance: Balance
+        balanceInfo: Invoices minus payments
+        balanceDue: Balance due
+        balanceDueInfo: Deviated invoices minus payments
+        recoverySince: Recovery since
+        businessType: Business Type
+        city: City
+        descriptorInfo: Invoices minus payments plus orders not yet
+        rating: Rating
+        recommendCredit: Recommended credit
+        goToLines: Go to lines
+    basicData:
+        socialName: Fiscal name
+        businessType: Business type
+        contact: Contact
+        youCanSaveMultipleEmails: You can save multiple emails
+        email: Email
+        phone: Phone
+        mobile: Mobile
+        salesPerson: Sales person
+        contactChannel: Contact channel
+        previousClient: Previous client
+    extendedList:
+        tableVisibleColumns:
+            id: Identifier
+            name: Name
+            socialName: Social 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
diff --git a/src/pages/Customer/locale/es.yml b/src/pages/Customer/locale/es.yml
index 111696f21..4fcbe3fa2 100644
--- a/src/pages/Customer/locale/es.yml
+++ b/src/pages/Customer/locale/es.yml
@@ -4,3 +4,134 @@ customerFilter:
     filter:
         name: Nombre
         socialName: Razón Social
+customer:
+    list:
+        phone: Teléfono
+        email: Email
+        customerOrders: Mostrar órdenes del cliente
+        moreOptions: Más opciones
+    card:
+        customerId: ID cliente
+        salesPerson: Comercial
+        credit: Crédito
+        risk: Riesgo
+        securedCredit: Crédito asegurado
+        payMethod: Método de pago
+        debt: Riesgo
+        isFrozen: Cliente congelado
+        hasDebt: Cliente con riesgo
+        isDisabled: Cliente inactivo
+        notChecked: Cliente no comprobado
+        webAccountInactive: Sin acceso web
+        noWebAccess: El acceso web está desactivado
+        businessType: Tipo de negocio
+        passwordRequirements: 'La contraseña debe tener al menos { length } caracteres de longitud, {nAlpha} caracteres alfabéticos, {nUpper} letras mayúsculas, {nDigits} dígitos y {nPunct} símbolos (Ej: $%&.)'
+        businessTypeFk: Tipo de negocio
+    summary:
+        basicData: Datos básicos
+        fiscalAddress: Dirección fiscal
+        fiscalData: Datos fiscales
+        billingData: Datos de facturación
+        consignee: Consignatario pred.
+        businessData: Datos comerciales
+        financialData: Datos financieros
+        customerId: ID cliente
+        name: Nombre
+        contact: Contacto
+        phone: Teléfono
+        mobile: Móvil
+        email: Email
+        salesPerson: Comercial
+        contactChannel: Canal de contacto
+        socialName: Razón social
+        fiscalId: NIF/CIF
+        postcode: Código postal
+        province: Provincia
+        country: País
+        street: Calle
+        isEqualizated: Recargo de equivalencia
+        isActive: Activo
+        invoiceByAddress: Facturar por consignatario
+        verifiedData: Datos verificados
+        hasToInvoice: Facturar
+        notifyByEmail: Notificar por email
+        vies: VIES
+        payMethod: Método de pago
+        bankAccount: Cuenta bancaria
+        dueDay: Día de pago
+        hasLcr: Recibido LCR
+        hasCoreVnl: Recibido core VNL
+        hasB2BVnl: Recibido B2B VNL
+        addressName: Nombre de la dirección
+        addressCity: Ciudad
+        addressStreet: Calle
+        username: Usuario
+        webAccess: Acceso web
+        totalGreuge: Greuge total
+        mana: Maná
+        priceIncreasingRate: Ratio de incremento de precio
+        averageInvoiced: Facturación media
+        claimRate: Ratio de reclamaciones
+        maximumRisk: Riesgo máximo asumido por Solunion
+        payMethodFk: Forma de pago
+        risk: Riesgo
+        riskInfo: Facturas menos recibos mas pedidos sin facturar
+        credit: Crédito
+        creditInfo: Riesgo máximo asumido por la empresa
+        securedCredit: Crédito asegurado
+        securedCreditInfo: Riesgo máximo asumido por Solunion
+        balance: Balance
+        balanceInfo: Facturas menos recibos
+        balanceDue: Saldo vencido
+        balanceDueInfo: Facturas fuera de plazo menos recibos
+        recoverySince: Recobro desde
+        businessType: Tipo de negocio
+        city: Población
+        descriptorInfo: Facturas menos recibos mas pedidos sin facturar
+        rating: Clasificación
+        recommendCredit: Crédito recomendado
+        goToLines: Ir a líneas
+    basicData:
+        socialName: Nombre fiscal
+        businessType: Tipo de negocio
+        contact: Contacto
+        youCanSaveMultipleEmails: Puede guardar varios correos electrónicos encadenándolos mediante comas sin espacios{','} ejemplo{':'} user{'@'}dominio{'.'}com, user2{'@'}dominio{'.'}com siendo el primer correo electrónico el principal
+        email: Email
+        phone: Teléfono
+        mobile: Móvil
+        salesPerson: Comercial
+        contactChannel: Canal de contacto
+        previousClient: Cliente anterior
+    extendedList:
+        tableVisibleColumns:
+            id: Identificador
+            name: Nombre
+            socialName: Razón social
+            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

From fc5eb20dba0e96fa31733b6e3c0f6244a4f59acb Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Thu, 5 Sep 2024 08:56:38 +0200
Subject: [PATCH 056/228] chore: refs #7663 create test wip

---
 .../ticket/ticketDescriptor.spec.js           | 22 +++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/test/cypress/integration/ticket/ticketDescriptor.spec.js b/test/cypress/integration/ticket/ticketDescriptor.spec.js
index 882aab157..ace3831dd 100644
--- a/test/cypress/integration/ticket/ticketDescriptor.spec.js
+++ b/test/cypress/integration/ticket/ticketDescriptor.spec.js
@@ -1,12 +1,13 @@
 /// <reference types="cypress" />
 describe('Ticket descriptor', () => {
     const toCloneOpt = '[role="menu"] .q-list > :nth-child(5)';
+    const setWeightOpt = '[role="menu"] .q-list > :nth-child(6)';
     const warehouseValue = ':nth-child(1) > :nth-child(6) > .value > span';
     const summaryHeader = '.summaryHeader > div';
+    const weight = 25;
+    const ticketId = 1;
 
     beforeEach(() => {
-        const ticketId = 1;
-
         cy.login('developer');
         cy.visit(`/#/ticket/${ticketId}/summary`);
     });
@@ -24,4 +25,21 @@ describe('Ticket descriptor', () => {
                 cy.wrap(owner.trim()).should('eq', 'Bruce Wayne (1101)');
             });
     });
+
+    it('should set the weight of the ticket', () => {
+        cy.openLeftMenu();
+        cy.openActionsDescriptor();
+        cy.get(setWeightOpt).click();
+        cy.get('.q-dialog input').type(25);
+        cy.clickConfirm();
+
+        cy.get('.q-notification').should('contain', 'Peso establecido');
+
+        cy.intercept('POST', /\/api\/Tickets\/\d+/).as('worker');
+        cy.wait('@worker').then(() =>
+            cy.get(descriptorTitle).should('include.text', 'Jessica')
+        );
+
+        cy.get('@fetchSpy').should('have.been.called');
+    });
 });

From 62cdc1d52733b629cc438567f84eddebdc5d266b Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Thu, 5 Sep 2024 14:56:50 +0200
Subject: [PATCH 057/228] feat: CustomerCreateTicket

---
 .../Customer/Card/CustomerDescriptorMenu.vue  |  23 +-
 src/pages/Ticket/TicketCreateDialog.vue       | 226 ++++++++++++++++++
 2 files changed, 239 insertions(+), 10 deletions(-)
 create mode 100644 src/pages/Ticket/TicketCreateDialog.vue

diff --git a/src/pages/Customer/Card/CustomerDescriptorMenu.vue b/src/pages/Customer/Card/CustomerDescriptorMenu.vue
index 560ee51c8..2d8cceda3 100644
--- a/src/pages/Customer/Card/CustomerDescriptorMenu.vue
+++ b/src/pages/Customer/Card/CustomerDescriptorMenu.vue
@@ -1,6 +1,7 @@
 <script setup>
 import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
+import VnTable from 'src/components/VnTable/VnTable.vue';
 
 import axios from 'axios';
 import { useQuasar } from 'quasar';
@@ -8,6 +9,8 @@ import { useQuasar } from 'quasar';
 import useNotify from 'src/composables/useNotify';
 
 import VnSmsDialog from 'src/components/common/VnSmsDialog.vue';
+import TicketCreateDialog from 'src/pages/Ticket/TicketCreateDialog.vue';
+import { ref } from 'vue';
 
 const $props = defineProps({
     customer: {
@@ -40,20 +43,20 @@ const sendSms = async (payload) => {
         notify(error.message, 'positive');
     }
 };
+const ticketCreateFormDialog = ref(null);
+
+const openTicketCreateForm = () => {
+    ticketCreateFormDialog.value.show();
+};
 </script>
 
 <template>
-    <QItem v-ripple clickable>
+    <QItem v-ripple clickable @click="openTicketCreateForm()">
         <QItemSection>
-            <RouterLink
-                :to="{
-                    name: 'TicketCreate',
-                    query: { clientFk: customer.id },
-                }"
-                class="color-vn-text"
-            >
-                {{ t('Simple ticket') }}
-            </RouterLink>
+            {{ t('globals.pageTitles.createTicket') }}
+            <QDialog ref="ticketCreateFormDialog">
+                <TicketCreateDialog />
+            </QDialog>
         </QItemSection>
     </QItem>
     <QItem v-ripple clickable>
diff --git a/src/pages/Ticket/TicketCreateDialog.vue b/src/pages/Ticket/TicketCreateDialog.vue
new file mode 100644
index 000000000..1493adc53
--- /dev/null
+++ b/src/pages/Ticket/TicketCreateDialog.vue
@@ -0,0 +1,226 @@
+<script setup>
+import { useRoute, useRouter } from 'vue-router';
+import { onBeforeMount, reactive, ref } from 'vue';
+import { useI18n } from 'vue-i18n';
+import { useDialogPluginComponent } from 'quasar';
+
+import FormModelPopup from 'components/FormModelPopup.vue';
+import FetchData from 'components/FetchData.vue';
+import VnRow from 'components/ui/VnRow.vue';
+import VnSelect from 'components/common/VnSelect.vue';
+import VnInputDate from 'components/common/VnInputDate.vue';
+
+import { useState } from 'composables/useState';
+import axios from 'axios';
+
+const { t } = useI18n();
+const route = useRoute();
+const router = useRouter();
+const state = useState();
+const user = state.getUser();
+defineEmits(['confirm', ...useDialogPluginComponent.emits]);
+
+const initialFormState = reactive({
+    clientId: Number(route.query?.clientFk) || null,
+    addressId: null,
+    agencyModeId: null,
+    warehouseId: user.value.warehouseFk,
+    landed: null,
+});
+const clientOptions = ref([]);
+const agenciesOptions = ref([]);
+const addressesOptions = ref([]);
+const warehousesOptions = ref([]);
+const selectedClient = ref(null);
+
+onBeforeMount(async () => {
+    await onClientSelected(initialFormState);
+});
+
+const fetchClient = async (formData) => {
+    try {
+        const filter = {
+            include: {
+                relation: 'defaultAddress',
+                scope: {
+                    fields: ['id', 'agencyModeFk'],
+                },
+            },
+            where: { id: formData.clientId },
+        };
+        const params = { filter: JSON.stringify(filter) };
+        const { data } = await axios.get('Clients', { params });
+        const [client] = data;
+        selectedClient.value = client;
+    } catch (err) {
+        console.error('Error fetching client');
+    }
+};
+
+const fetchAddresses = async (formData) => {
+    try {
+        if (!formData.clientId) return;
+
+        const filter = {
+            fields: ['nickname', 'street', 'city', 'id'],
+            where: { isActive: true },
+            order: 'nickname ASC',
+        };
+        const params = { filter: JSON.stringify(filter) };
+        const { data } = await axios.get(`Clients/${formData.clientId}/addresses`, {
+            params,
+        });
+        addressesOptions.value = data;
+
+        const { defaultAddress } = selectedClient.value;
+        formData.addressId = defaultAddress.id;
+    } catch (err) {
+        console.error(`Error fetching addresses`, err);
+        return err.response;
+    }
+};
+
+const onClientSelected = async (formData) => {
+    await fetchClient(formData);
+    await fetchAddresses(formData);
+};
+
+const fetchAvailableAgencies = async (formData) => {
+    if (!formData.warehouseId || !formData.addressId || !formData.landed) return;
+    let params = {
+        warehouseFk: formData.warehouseId,
+        addressFk: formData.addressId,
+        landed: formData.landed,
+    };
+
+    const { data } = await axios.get('Agencies/getAgenciesWithWarehouse', { params });
+
+    agenciesOptions.value = data;
+
+    const defaultAgency = agenciesOptions.value.find(
+        (agency) =>
+            agency.agencyModeFk === selectedClient.value.defaultAddress.agencyModeFk
+    );
+
+    if (defaultAgency) formData.agencyModeId = defaultAgency.agencyModeFk;
+};
+
+const redirectToTicketList = (_, { id }) => {
+    router.push({ name: 'TicketSummary', params: { id } });
+};
+</script>
+
+<template>
+    <FetchData
+        url="Clients"
+        @on-fetch="(data) => (clientOptions = data)"
+        :filter="{ fields: ['id', 'name', 'defaultAddressFk'], order: 'id' }"
+        auto-load
+    />
+    <FetchData
+        url="Warehouses"
+        @on-fetch="(data) => (warehousesOptions = data)"
+        order="name"
+        auto-load
+    />
+
+    <FormModelPopup
+        :title="t('globals.pageTitles.createTicket')"
+        url-create="Tickets/new"
+        model="ticket"
+        :form-initial-data="initialFormState"
+        @on-data-saved="redirectToTicketList"
+    >
+        <template #form-inputs="{ data }">
+            <VnRow>
+                <div class="col">
+                    <VnSelect
+                        :label="t('ticket.create.client')"
+                        v-model="data.clientId"
+                        :options="clientOptions"
+                        option-value="id"
+                        option-label="name"
+                        hide-selected
+                        @update:model-value="(client) => onClientSelected(data)"
+                    >
+                        <template #option="scope">
+                            <QItem v-bind="scope.itemProps">
+                                <QItemSection>
+                                    <QItemLabel>
+                                        {{ scope.opt.name }}
+                                    </QItemLabel>
+                                    <QItemLabel caption>
+                                        {{ `#${scope.opt.id}` }}
+                                    </QItemLabel>
+                                </QItemSection>
+                            </QItem>
+                        </template>
+                    </VnSelect>
+                </div>
+            </VnRow>
+            <VnRow>
+                <div class="col">
+                    <VnSelect
+                        :label="t('ticket.create.address')"
+                        v-model="data.addressId"
+                        :options="addressesOptions"
+                        option-value="id"
+                        option-label="nickname"
+                        hide-selected
+                        :disable="!data.clientId"
+                        @update:model-value="() => fetchAvailableAgencies(data)"
+                    >
+                        <template #option="scope">
+                            <QItem v-bind="scope.itemProps">
+                                <QItemSection>
+                                    <QItemLabel>
+                                        {{ scope.opt.nickname }}
+                                    </QItemLabel>
+                                    <QItemLabel caption>
+                                        {{ `${scope.opt.street}, ${scope.opt.city}` }}
+                                    </QItemLabel>
+                                </QItemSection>
+                            </QItem>
+                        </template>
+                    </VnSelect>
+                </div>
+            </VnRow>
+            <VnRow>
+                <div class="col">
+                    <VnInputDate
+                        placeholder="dd-mm-aaa"
+                        :label="t('ticket.create.landed')"
+                        v-model="data.landed"
+                        @update:model-value="() => fetchAvailableAgencies(data)"
+                    />
+                </div>
+            </VnRow>
+            <VnRow>
+                <div class="col">
+                    <VnSelect
+                        :label="t('ticket.create.warehouse')"
+                        v-model="data.warehouseId"
+                        :options="warehousesOptions"
+                        option-value="id"
+                        option-label="name"
+                        hide-selected
+                        @update:model-value="() => fetchAvailableAgencies(data)"
+                    />
+                </div>
+            </VnRow>
+            <VnRow>
+                <div class="col">
+                    <VnSelect
+                        :label="t('ticket.create.agency')"
+                        v-model="data.agencyModeId"
+                        :options="agenciesOptions"
+                        option-value="agencyModeFk"
+                        option-label="agencyMode"
+                        hide-selected
+                        :disable="!data.clientId || !data.landed || !data.warehouseId"
+                    />
+                </div>
+            </VnRow>
+        </template>
+    </FormModelPopup>
+</template>

From 6476a8307a75dca74aa7da9722474f8dfacb840e Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Thu, 5 Sep 2024 15:08:59 +0200
Subject: [PATCH 058/228] perf: i18n

---
 src/pages/Customer/locale/en.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/pages/Customer/locale/en.yml b/src/pages/Customer/locale/en.yml
index 4d5e7dfb1..545c3f274 100644
--- a/src/pages/Customer/locale/en.yml
+++ b/src/pages/Customer/locale/en.yml
@@ -71,6 +71,7 @@ customer:
         priceIncreasingRate: Price increasing rate
         averageInvoiced: Average invoiced
         claimRate: Claming rate
+        payMethodFk: Billing data
         risk: Risk
         maximumRisk: Solunion's maximum risk
         riskInfo: Invoices minus payments plus orders not yet invoiced

From b3391ab522b2f8f6a562b8bac31eb7b3d025106c Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Thu, 5 Sep 2024 20:51:33 +0200
Subject: [PATCH 059/228] perf: minor comments

---
 src/components/VnTable/VnTable.vue            | 535 +++++++++---------
 src/composables/useArrayData.js               |  18 +-
 .../Customer/Card/CustomerConsumption.vue     |   5 +-
 .../Customer/Card/CustomerCreditContracts.vue |  23 -
 .../Customer/Card/CustomerCreditOpinion.vue   |  16 +-
 .../Customer/Card/CustomerDescriptorMenu.vue  |   1 -
 src/pages/Customer/Card/CustomerSummary.vue   |  10 +-
 .../CustomerCreditContractsCreate.vue         |   1 -
 8 files changed, 271 insertions(+), 338 deletions(-)

diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index 898e9c193..44b430e86 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -346,302 +346,281 @@ defineExpose({
         </QScrollArea>
     </QDrawer>
     <!-- class in div to fix warn-->
-    <div class="q-px-md">
-        <CrudModel
-            v-bind="$attrs"
-            :class="$attrs['class'] ?? 'q-px-md'"
-            :limit="$attrs['limit'] ?? 20"
-            ref="CrudModelRef"
-            @on-fetch="(...args) => emit('onFetch', ...args)"
-            :search-url="searchUrl"
-            :disable-infinite-scroll="
-                $attrs['disableInfiniteScroll'] ? isTableMode : disableInfiniteScroll
-            "
-            @save-changes="reload"
-            :has-sub-toolbar="$props.hasSubToolbar ?? isEditable"
-            :auto-load="hasParams || $attrs['auto-load']"
-        >
-            <template
-                v-for="(_, slotName) in $slots"
-                #[slotName]="slotData"
-                :key="slotName"
+    <CrudModel
+        v-bind="$attrs"
+        :class="$attrs['class']"
+        :limit="$attrs['limit'] ?? 20"
+        ref="CrudModelRef"
+        @on-fetch="(...args) => emit('onFetch', ...args)"
+        :search-url="searchUrl"
+        :disable-infinite-scroll="
+            $attrs['disableInfiniteScroll'] ? isTableMode : disableInfiniteScroll
+        "
+        @save-changes="reload"
+        :has-sub-toolbar="$props.hasSubToolbar ?? isEditable"
+        :auto-load="hasParams || $attrs['auto-load']"
+    >
+        <template v-for="(_, slotName) in $slots" #[slotName]="slotData" :key="slotName">
+            <slot :name="slotName" v-bind="slotData ?? {}" :key="slotName" />
+        </template>
+        <template #body="{ rows }">
+            <QTable
+                v-bind="table"
+                class="vnTable"
+                :columns="splittedColumns.columns"
+                :rows="rows"
+                v-model:selected="selected"
+                :grid="!isTableMode"
+                table-header-class="bg-header"
+                card-container-class="grid-three"
+                flat
+                :style="isTableMode && `max-height: ${tableHeight}`"
+                virtual-scroll
+                @virtual-scroll="
+                    (event) =>
+                        event.index > rows.length - 2 &&
+                        CrudModelRef.vnPaginateRef.paginate()
+                "
+                @row-click="(_, row) => rowClickFunction && rowClickFunction(row)"
+                @update:selected="emit('update:selected', $event)"
             >
-                <slot :name="slotName" v-bind="slotData ?? {}" :key="slotName" />
-            </template>
-            <template #body="{ rows }">
-                <QTable
-                    v-bind="table"
-                    class="vnTable"
-                    :columns="splittedColumns.columns"
-                    :rows="rows"
-                    v-model:selected="selected"
-                    :grid="!isTableMode"
-                    table-header-class="bg-header"
-                    card-container-class="grid-three"
-                    flat
-                    :style="isTableMode && `max-height: ${tableHeight}`"
-                    virtual-scroll
-                    @virtual-scroll="
-                        (event) =>
-                            event.index > rows.length - 2 &&
-                            CrudModelRef.vnPaginateRef.paginate()
-                    "
-                    @row-click="(_, row) => rowClickFunction && rowClickFunction(row)"
-                    @update:selected="emit('update:selected', $event)"
-                >
-                    <template #top-left v-if="!$props.withoutHeader">
-                        <slot name="top-left"></slot>
-                    </template>
-                    <template #top-right v-if="!$props.withoutHeader">
-                        <VnVisibleColumn
-                            v-if="isTableMode"
-                            v-model="splittedColumns.columns"
-                            :table-code="tableCode ?? route.name"
-                            :skip="columnsVisibilitySkipped"
-                        />
-                        <QBtnToggle
-                            v-model="mode"
-                            toggle-color="primary"
-                            class="bg-vn-section-color"
-                            dense
-                            :options="tableModes.filter((mode) => !mode.disable)"
-                        />
-                        <QBtn
-                            v-if="$props.rightSearch"
-                            icon="filter_alt"
-                            class="bg-vn-section-color q-ml-md"
-                            dense
-                            @click="stateStore.toggleRightDrawer()"
-                        />
-                    </template>
-                    <template #header-cell="{ col }">
-                        <QTh v-if="col.visible ?? true">
-                            <div
-                                class="column self-start q-ml-xs ellipsis"
-                                :class="`text-${col?.align ?? 'left'}`"
-                                :style="$props.columnSearch ? 'height: 75px' : ''"
-                            >
-                                <div
-                                    class="row items-center no-wrap"
-                                    style="height: 30px"
-                                >
-                                    <QTooltip v-if="col.toolTip">{{
-                                        col.toolTip
-                                    }}</QTooltip>
-                                    <VnTableOrder
-                                        v-model="orders[col.orderBy ?? col.name]"
-                                        :name="col.orderBy ?? col.name"
-                                        :label="col?.label"
-                                        :data-key="$attrs['data-key']"
-                                        :search-url="searchUrl"
-                                    />
-                                </div>
-                                <VnTableFilter
-                                    v-if="$props.columnSearch"
-                                    :column="col"
-                                    :show-title="true"
+                <template #top-left v-if="!$props.withoutHeader">
+                    <slot name="top-left"></slot>
+                </template>
+                <template #top-right v-if="!$props.withoutHeader">
+                    <VnVisibleColumn
+                        v-if="isTableMode"
+                        v-model="splittedColumns.columns"
+                        :table-code="tableCode ?? route.name"
+                        :skip="columnsVisibilitySkipped"
+                    />
+                    <QBtnToggle
+                        v-model="mode"
+                        toggle-color="primary"
+                        class="bg-vn-section-color"
+                        dense
+                        :options="tableModes.filter((mode) => !mode.disable)"
+                    />
+                    <QBtn
+                        v-if="$props.rightSearch"
+                        icon="filter_alt"
+                        class="bg-vn-section-color q-ml-md"
+                        dense
+                        @click="stateStore.toggleRightDrawer()"
+                    />
+                </template>
+                <template #header-cell="{ col }">
+                    <QTh v-if="col.visible ?? true">
+                        <div
+                            class="column self-start q-ml-xs ellipsis"
+                            :class="`text-${col?.align ?? 'left'}`"
+                            :style="$props.columnSearch ? 'height: 75px' : ''"
+                        >
+                            <div class="row items-center no-wrap" style="height: 30px">
+                                <QTooltip v-if="col.toolTip">{{ col.toolTip }}</QTooltip>
+                                <VnTableOrder
+                                    v-model="orders[col.orderBy ?? col.name]"
+                                    :name="col.orderBy ?? col.name"
+                                    :label="col?.label"
                                     :data-key="$attrs['data-key']"
-                                    v-model="params[columnName(col)]"
                                     :search-url="searchUrl"
-                                    class="full-width"
                                 />
                             </div>
-                        </QTh>
-                    </template>
-                    <template #header-cell-tableActions>
-                        <QTh auto-width class="sticky" />
-                    </template>
-                    <template #body-cell-tableStatus="{ col, row }">
-                        <QTd auto-width :class="getColAlign(col)">
-                            <VnTableChip
-                                :columns="splittedColumns.columnChips"
+                            <VnTableFilter
+                                v-if="$props.columnSearch"
+                                :column="col"
+                                :show-title="true"
+                                :data-key="$attrs['data-key']"
+                                v-model="params[columnName(col)]"
+                                :search-url="searchUrl"
+                                class="full-width"
+                            />
+                        </div>
+                    </QTh>
+                </template>
+                <template #header-cell-tableActions>
+                    <QTh auto-width class="sticky" />
+                </template>
+                <template #body-cell-tableStatus="{ col, row }">
+                    <QTd auto-width :class="getColAlign(col)">
+                        <VnTableChip :columns="splittedColumns.columnChips" :row="row">
+                            <template #afterChip>
+                                <slot name="afterChip" :row="row"></slot>
+                            </template>
+                        </VnTableChip>
+                    </QTd>
+                </template>
+                <template #body-cell="{ col, row, rowIndex }">
+                    <!-- Columns -->
+                    <QTd
+                        auto-width
+                        class="no-margin q-px-xs"
+                        :class="[getColAlign(col), col.columnClass]"
+                        v-if="col.visible ?? true"
+                        @click.ctrl="
+                            ($event) =>
+                                rowCtrlClickFunction && rowCtrlClickFunction($event, row)
+                        "
+                    >
+                        <slot
+                            :name="`column-${col.name}`"
+                            :col="col"
+                            :row="row"
+                            :row-index="rowIndex"
+                        >
+                            <VnTableColumn
+                                :column="col"
                                 :row="row"
-                            >
-                                <template #afterChip>
-                                    <slot name="afterChip" :row="row"></slot>
-                                </template>
-                            </VnTableChip>
-                        </QTd>
-                    </template>
-                    <template #body-cell="{ col, row, rowIndex }">
-                        <!-- Columns -->
-                        <QTd
-                            auto-width
-                            class="no-margin q-px-xs"
-                            :class="[getColAlign(col), col.columnClass]"
-                            v-if="col.visible ?? true"
-                            @click.ctrl="
-                                ($event) =>
-                                    rowCtrlClickFunction &&
-                                    rowCtrlClickFunction($event, row)
+                                :is-editable="col.isEditable ?? isEditable"
+                                v-model="row[col.name]"
+                                component-prop="columnField"
+                            />
+                        </slot>
+                    </QTd>
+                </template>
+                <template #body-cell-tableActions="{ col, row }">
+                    <QTd
+                        auto-width
+                        :class="getColAlign(col)"
+                        class="sticky no-padding"
+                        @click="stopEventPropagation($event)"
+                    >
+                        <QBtn
+                            v-for="(btn, index) of col.actions"
+                            :key="index"
+                            :title="btn.title"
+                            :icon="btn.icon"
+                            class="q-px-sm"
+                            flat
+                            :class="
+                                btn.isPrimary ? 'text-primary-light' : 'color-vn-text '
+                            "
+                            :style="`visibility: ${
+                                (btn.show && btn.show(row)) ?? true ? 'visible' : 'hidden'
+                            }`"
+                            @click="btn.action(row)"
+                        />
+                    </QTd>
+                </template>
+                <template #item="{ row, colsMap }">
+                    <component
+                        :is="$props.redirect ? 'router-link' : 'span'"
+                        :to="`/${$props.redirect}/` + row.id"
+                    >
+                        <QCard
+                            bordered
+                            flat
+                            class="row no-wrap justify-between cursor-pointer"
+                            @click="
+                                (_, row) => {
+                                    $props.rowClick && $props.rowClick(row);
+                                }
                             "
                         >
-                            <slot
-                                :name="`column-${col.name}`"
-                                :col="col"
-                                :row="row"
-                                :row-index="rowIndex"
-                            >
-                                <VnTableColumn
-                                    :column="col"
-                                    :row="row"
-                                    :is-editable="col.isEditable ?? isEditable"
-                                    v-model="row[col.name]"
-                                    component-prop="columnField"
-                                />
-                            </slot>
-                        </QTd>
-                    </template>
-                    <template #body-cell-tableActions="{ col, row }">
-                        <QTd
-                            auto-width
-                            :class="getColAlign(col)"
-                            class="sticky no-padding"
-                            @click="stopEventPropagation($event)"
-                        >
-                            <QBtn
-                                v-for="(btn, index) of col.actions"
-                                :key="index"
-                                :title="btn.title"
-                                :icon="btn.icon"
-                                class="q-px-sm"
-                                flat
-                                :class="
-                                    btn.isPrimary
-                                        ? 'text-primary-light'
-                                        : 'color-vn-text '
-                                "
-                                :style="`visibility: ${
-                                    (btn.show && btn.show(row)) ?? true
-                                        ? 'visible'
-                                        : 'hidden'
-                                }`"
-                                @click="btn.action(row)"
-                            />
-                        </QTd>
-                    </template>
-                    <template #item="{ row, colsMap }">
-                        <component
-                            :is="$props.redirect ? 'router-link' : 'span'"
-                            :to="`/${$props.redirect}/` + row.id"
-                        >
-                            <QCard
-                                bordered
-                                flat
-                                class="row no-wrap justify-between cursor-pointer"
-                                @click="
-                                    (_, row) => {
-                                        $props.rowClick && $props.rowClick(row);
-                                    }
-                                "
+                            <QCardSection
+                                vertical
+                                class="no-margin no-padding"
+                                :class="colsMap.tableActions ? 'w-80' : 'fit'"
                             >
+                                <!-- Chips -->
                                 <QCardSection
-                                    vertical
-                                    class="no-margin no-padding"
-                                    :class="colsMap.tableActions ? 'w-80' : 'fit'"
+                                    v-if="splittedColumns.chips.length"
+                                    class="no-margin q-px-xs q-py-none"
                                 >
-                                    <!-- Chips -->
-                                    <QCardSection
-                                        v-if="splittedColumns.chips.length"
-                                        class="no-margin q-px-xs q-py-none"
+                                    <VnTableChip
+                                        :columns="splittedColumns.chips"
+                                        :row="row"
                                     >
-                                        <VnTableChip
-                                            :columns="splittedColumns.chips"
-                                            :row="row"
-                                        >
-                                            <template #afterChip>
-                                                <slot name="afterChip" :row="row"></slot>
-                                            </template>
-                                        </VnTableChip>
-                                    </QCardSection>
-                                    <!-- Title -->
-                                    <QCardSection
-                                        v-if="splittedColumns.title"
-                                        class="q-pl-sm q-py-none text-primary-light text-bold text-h6 cardEllipsis"
+                                        <template #afterChip>
+                                            <slot name="afterChip" :row="row"></slot>
+                                        </template>
+                                    </VnTableChip>
+                                </QCardSection>
+                                <!-- Title -->
+                                <QCardSection
+                                    v-if="splittedColumns.title"
+                                    class="q-pl-sm q-py-none text-primary-light text-bold text-h6 cardEllipsis"
+                                >
+                                    <span
+                                        :title="row[splittedColumns.title.name]"
+                                        @click="stopEventPropagation($event)"
+                                        class="cursor-text"
                                     >
-                                        <span
-                                            :title="row[splittedColumns.title.name]"
-                                            @click="stopEventPropagation($event)"
-                                            class="cursor-text"
-                                        >
-                                            {{ row[splittedColumns.title.name] }}
-                                        </span>
-                                    </QCardSection>
-                                    <!-- Fields -->
-                                    <QCardSection
-                                        class="q-pl-sm q-pr-lg q-py-xs"
-                                        :class="$props.cardClass"
+                                        {{ row[splittedColumns.title.name] }}
+                                    </span>
+                                </QCardSection>
+                                <!-- Fields -->
+                                <QCardSection
+                                    class="q-pl-sm q-pr-lg q-py-xs"
+                                    :class="$props.cardClass"
+                                >
+                                    <div
+                                        v-for="(
+                                            col, index
+                                        ) of splittedColumns.cardVisible"
+                                        :key="col.name"
+                                        class="fields"
                                     >
-                                        <div
-                                            v-for="(
-                                                col, index
-                                            ) of splittedColumns.cardVisible"
-                                            :key="col.name"
-                                            class="fields"
+                                        <VnLv
+                                            :label="
+                                                !col.component && col.label
+                                                    ? `${col.label}:`
+                                                    : ''
+                                            "
                                         >
-                                            <VnLv
-                                                :label="
-                                                    !col.component && col.label
-                                                        ? `${col.label}:`
-                                                        : ''
-                                                "
-                                            >
-                                                <template #value>
-                                                    <span
-                                                        @click="
-                                                            stopEventPropagation($event)
-                                                        "
+                                            <template #value>
+                                                <span
+                                                    @click="stopEventPropagation($event)"
+                                                >
+                                                    <slot
+                                                        :name="`column-${col.name}`"
+                                                        :col="col"
+                                                        :row="row"
+                                                        :row-index="index"
                                                     >
-                                                        <slot
-                                                            :name="`column-${col.name}`"
-                                                            :col="col"
+                                                        <VnTableColumn
+                                                            :column="col"
                                                             :row="row"
-                                                            :row-index="index"
-                                                        >
-                                                            <VnTableColumn
-                                                                :column="col"
-                                                                :row="row"
-                                                                :is-editable="false"
-                                                                v-model="row[col.name]"
-                                                                component-prop="columnField"
-                                                                :show-label="true"
-                                                            />
-                                                        </slot>
-                                                    </span>
-                                                </template>
-                                            </VnLv>
-                                        </div>
-                                    </QCardSection>
+                                                            :is-editable="false"
+                                                            v-model="row[col.name]"
+                                                            component-prop="columnField"
+                                                            :show-label="true"
+                                                        />
+                                                    </slot>
+                                                </span>
+                                            </template>
+                                        </VnLv>
+                                    </div>
                                 </QCardSection>
-                                <!-- Actions -->
-                                <QCardSection
-                                    v-if="colsMap.tableActions"
-                                    class="column flex-center w-10 no-margin q-pa-xs q-gutter-y-xs"
-                                    @click="stopEventPropagation($event)"
-                                >
-                                    <QBtn
-                                        v-for="(btn, index) of splittedColumns.actions
-                                            .actions"
-                                        :key="index"
-                                        :title="btn.title"
-                                        :icon="btn.icon"
-                                        class="q-pa-xs"
-                                        flat
-                                        :class="
-                                            btn.isPrimary
-                                                ? 'text-primary-light'
-                                                : 'color-vn-text '
-                                        "
-                                        @click="btn.action(row)"
-                                    />
-                                </QCardSection>
-                            </QCard>
-                        </component>
-                    </template>
-                </QTable>
-            </template>
-        </CrudModel>
-    </div>
+                            </QCardSection>
+                            <!-- Actions -->
+                            <QCardSection
+                                v-if="colsMap.tableActions"
+                                class="column flex-center w-10 no-margin q-pa-xs q-gutter-y-xs"
+                                @click="stopEventPropagation($event)"
+                            >
+                                <QBtn
+                                    v-for="(btn, index) of splittedColumns.actions
+                                        .actions"
+                                    :key="index"
+                                    :title="btn.title"
+                                    :icon="btn.icon"
+                                    class="q-pa-xs"
+                                    flat
+                                    :class="
+                                        btn.isPrimary
+                                            ? 'text-primary-light'
+                                            : 'color-vn-text '
+                                    "
+                                    @click="btn.action(row)"
+                                />
+                            </QCardSection>
+                        </QCard>
+                    </component>
+                </template>
+            </QTable>
+        </template>
+    </CrudModel>
     <QPageSticky v-if="create" :offset="[20, 20]" style="z-index: 2">
         <QBtn @click="showForm = !showForm" color="primary" fab icon="add" shortcut="+" />
         <QTooltip>
diff --git a/src/composables/useArrayData.js b/src/composables/useArrayData.js
index 446816788..32b91b115 100644
--- a/src/composables/useArrayData.js
+++ b/src/composables/useArrayData.js
@@ -86,13 +86,13 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
 
         Object.assign(filter, store.userFilter, exprFilter);
         let where;
-        // ARRAY DATA FALLA AL JUNTAR WHERE'S
-        console.log(
-            'userParams?.filter?.where: ',
-            userParams?.filter?.where,
-            filter?.where,
-            store.filter?.where
-        );
+        //FIXME: ARRAY DATA FALLA AL JUNTAR WHERE'S
+        // console.log(
+        //     'userParams?.filter?.where: ',
+        //     userParams?.filter?.where,
+        //     filter?.where,
+        //     store.filter?.where
+        // );
         if ((userParams?.filter?.where, filter?.where || store.filter?.where))
             where = Object.assign(
                 userParams?.filter?.where ?? {},
@@ -101,9 +101,9 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
             );
         Object.assign(filter, store.filter);
         filter.where = where;
-        console.log('where: ', where);
+        // console.log('where: ', where);
         const params = { filter };
-        console.log('params: ', params);
+        // console.log('params: ', params);
 
         delete userParams?.filter;
         Object.assign(params, userParams);
diff --git a/src/pages/Customer/Card/CustomerConsumption.vue b/src/pages/Customer/Card/CustomerConsumption.vue
index 27c1b746c..35f366e47 100644
--- a/src/pages/Customer/Card/CustomerConsumption.vue
+++ b/src/pages/Customer/Card/CustomerConsumption.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { ref, computed, onBeforeMount, onMounted } from 'vue';
+import { ref, computed, onBeforeMount } from 'vue';
 import axios from 'axios';
 import { useI18n } from 'vue-i18n';
 import { toDate } from 'src/filters/index';
@@ -90,9 +90,6 @@ const columns = computed(() => [
 onBeforeMount(async () => {
     campaignList.value = (await axios('Campaigns/latest')).data;
 });
-// onMounted(() => {
-//     showActionBtns.value = handleQueryParams();
-// });
 
 function getQueryParams() {
     return JSON.parse(route.query.consumption ?? '{}');
diff --git a/src/pages/Customer/Card/CustomerCreditContracts.vue b/src/pages/Customer/Card/CustomerCreditContracts.vue
index 8519e88f3..0ff074793 100644
--- a/src/pages/Customer/Card/CustomerCreditContracts.vue
+++ b/src/pages/Customer/Card/CustomerCreditContracts.vue
@@ -4,7 +4,6 @@ import { useI18n } from 'vue-i18n';
 import { useRoute, useRouter } from 'vue-router';
 
 import { useQuasar } from 'quasar';
-import VnTable from 'src/components/VnTable/VnTable.vue';
 
 import VnPaginate from 'src/components/ui/VnPaginate.vue';
 import ModalCloseContract from 'src/pages/Customer/components/ModalCloseContract.vue';
@@ -73,28 +72,6 @@ const updateData = () => {
 </script>
 
 <template>
-    <!-- <VnTable
-        ref="tableRef"
-        data-key="Greuges"
-        url="Greuges"
-        search-url="greuges"
-        :filter="filter"
-        :order="['shipped DESC', 'amount']"
-        :columns="columns"
-        :right-search="false"
-        :is-editable="false"
-        :use-model="true"
-        :column-search="false"
-        @on-fetch="(data) => setRows(data)"
-        :disable-option="{ card: true }"
-        :create="{
-            urlCreate: `Greuges`,
-            title: t('New greuge'),
-            onDataSaved: () => tableRef.reload(),
-            formInitialData: { shipped: new Date(), clientFk: route.params.id },
-        }"
-        auto-load
-    ></VnTable> -->
     <div class="full-width flex justify-center">
         <QCard class="card-width q-pa-lg">
             <VnPaginate
diff --git a/src/pages/Customer/Card/CustomerCreditOpinion.vue b/src/pages/Customer/Card/CustomerCreditOpinion.vue
index af1b0138e..6a839ff3f 100644
--- a/src/pages/Customer/Card/CustomerCreditOpinion.vue
+++ b/src/pages/Customer/Card/CustomerCreditOpinion.vue
@@ -1,22 +1,17 @@
 <script setup>
-import { computed, ref, watch } from 'vue';
+import { computed, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
 
 import { toCurrency, toDateHourMin } from 'src/filters';
 import VnTable from 'src/components/VnTable/VnTable.vue';
 
-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 WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
 
 const { t } = useI18n();
 const route = useRoute();
 
 const tableRef = ref();
-// const rows = ref([]);
 
 const filter = {
     include: [
@@ -70,15 +65,6 @@ const columns = computed(() => [
         },
     },
 ]);
-
-// watch(
-//     () => route.params.id,
-//     (newValue) => {
-//         if (!newValue) return;
-//         filter.where.clientFk = newValue;
-//         clientInformasRef.value?.fetch();
-//     }
-// );
 </script>
 
 <template>
diff --git a/src/pages/Customer/Card/CustomerDescriptorMenu.vue b/src/pages/Customer/Card/CustomerDescriptorMenu.vue
index 2d8cceda3..88eec33a4 100644
--- a/src/pages/Customer/Card/CustomerDescriptorMenu.vue
+++ b/src/pages/Customer/Card/CustomerDescriptorMenu.vue
@@ -1,7 +1,6 @@
 <script setup>
 import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
-import VnTable from 'src/components/VnTable/VnTable.vue';
 
 import axios from 'axios';
 import { useQuasar } from 'quasar';
diff --git a/src/pages/Customer/Card/CustomerSummary.vue b/src/pages/Customer/Card/CustomerSummary.vue
index 1a1ae0e46..1c511b45d 100644
--- a/src/pages/Customer/Card/CustomerSummary.vue
+++ b/src/pages/Customer/Card/CustomerSummary.vue
@@ -61,7 +61,7 @@ const creditWarning = computed(() => {
     return tooMuchInsurance || noCreditInsurance ? 'negative' : '';
 });
 const sumRisk = ({ clientRisks }) => {
-    let total = clientRisks.reduce((acc, risk) => acc + risk.amount, 0);
+    let total = clientRisks.reduce((acc, { amount }) => acc + amount, 0);
 
     return total;
 };
@@ -153,8 +153,6 @@ const sumRisk = ({ clientRisks }) => {
                         :label="t('customer.summary.isActive')"
                         :value="entity.isActive"
                     />
-                    <!-- </VnRow>
-                <VnRow> -->
                     <VnLv
                         :label="t('customer.summary.verifiedData')"
                         :value="entity.isTaxDataChecked"
@@ -163,8 +161,6 @@ const sumRisk = ({ clientRisks }) => {
                         :label="t('customer.summary.hasToInvoice')"
                         :value="entity.hasToInvoice"
                     />
-                    <!-- </VnRow>
-                <VnRow> -->
                     <VnLv
                         :label="t('customer.summary.notifyByEmail')"
                         :value="entity.isToBeMailed"
@@ -231,7 +227,7 @@ const sumRisk = ({ clientRisks }) => {
             </QCard>
             <QCard class="vn-one" v-if="entity.account">
                 <VnTitle
-                    :url="`https://grafana.verdnatura.es/d/adjlxzv5yjt34d/analisis-de-clientes-7c-crm?orgId=1&var-clientFk=${entityId}`"
+                    :url="`${grafanaUrl}/d/adjlxzv5yjt34d/analisis-de-clientes-7c-crm?orgId=1&var-clientFk=${entityId}`"
                     :text="t('customer.summary.businessData')"
                     icon="vn:grafana"
                 />
@@ -258,7 +254,7 @@ const sumRisk = ({ clientRisks }) => {
             </QCard>
             <QCard class="vn-one" v-if="entity.account">
                 <VnTitle
-                    :url="`https://grafana.verdnatura.es/d/40buzE4Vk/comportamiento-pagos-clientes?orgId=1&var-clientFk=${entityId}`"
+                    :url="`${grafanaUrl}/d/40buzE4Vk/comportamiento-pagos-clientes?orgId=1&var-clientFk=${entityId}`"
                     :text="t('customer.summary.payMethodFk')"
                     icon="vn:grafana"
                 />
diff --git a/src/pages/Customer/components/CustomerCreditContractsCreate.vue b/src/pages/Customer/components/CustomerCreditContractsCreate.vue
index 24f3746dc..c25e59e1a 100644
--- a/src/pages/Customer/components/CustomerCreditContractsCreate.vue
+++ b/src/pages/Customer/components/CustomerCreditContractsCreate.vue
@@ -48,7 +48,6 @@ const toCustomerCreditContracts = () => {
                         clearable
                         type="number"
                         v-model.number="data.credit"
-                        autofocus
                     />
                 </div>
                 <div class="col">

From 1f96f5c09af8fc9df520b1760c2d448066d09054 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Thu, 5 Sep 2024 22:20:57 +0200
Subject: [PATCH 060/228] feat: orderCreateDialog

---
 src/i18n/locale/en.yml                        |   1 +
 src/i18n/locale/es.yml                        |   1 +
 .../Customer/Card/CustomerDescriptor.vue      |  12 -
 .../Customer/Card/CustomerDescriptorMenu.vue  |  15 +-
 src/pages/Order/Card/OrderCreateDialog.vue    | 220 ++++++++++++++++++
 5 files changed, 236 insertions(+), 13 deletions(-)
 create mode 100644 src/pages/Order/Card/OrderCreateDialog.vue

diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index 364cc74c7..82ecc4378 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -126,6 +126,7 @@ globals:
         notifications: Notifications
         defaulter: Defaulter
         customerCreate: New customer
+        createOrder: New order
         fiscalData: Fiscal data
         billingData: Billing data
         consignees: Consignees
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index ac83b499d..85f106d5f 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -123,6 +123,7 @@ globals:
         inheritedRoles: Roles heredados
         customers: Clientes
         customerCreate: Nuevo cliente
+        createOrder: Nuevo pedido
         list: Listado
         webPayments: Pagos Web
         extendedList: Listado extendido
diff --git a/src/pages/Customer/Card/CustomerDescriptor.vue b/src/pages/Customer/Card/CustomerDescriptor.vue
index 5cab825a9..b18f90d20 100644
--- a/src/pages/Customer/Card/CustomerDescriptor.vue
+++ b/src/pages/Customer/Card/CustomerDescriptor.vue
@@ -179,17 +179,6 @@ const setData = (entity) => (data.value = useCardDescription(entity?.name, entit
                 >
                     <QTooltip>{{ t('Customer invoice out list') }}</QTooltip>
                 </QBtn>
-                <QBtn
-                    :to="{
-                        name: 'OrderCreate',
-                        query: { table: JSON.stringify({ clientFk: entity.id }) },
-                    }"
-                    size="md"
-                    icon="vn:basketadd"
-                    color="primary"
-                >
-                    <QTooltip>{{ t('New order') }}</QTooltip>
-                </QBtn>
                 <QBtn
                     :to="{
                         name: 'AccountSummary',
@@ -214,7 +203,6 @@ es:
     Go to module index: Ir al índice del módulo
     Customer ticket list: Listado de tickets del cliente
     Customer invoice out list: Listado de facturas del cliente
-    New order: Nuevo pedido
     Go to user: Ir al usuario
     Customer unpaid: Cliente impago
     Unpaid: Impagado
diff --git a/src/pages/Customer/Card/CustomerDescriptorMenu.vue b/src/pages/Customer/Card/CustomerDescriptorMenu.vue
index 88eec33a4..89b10a4fe 100644
--- a/src/pages/Customer/Card/CustomerDescriptorMenu.vue
+++ b/src/pages/Customer/Card/CustomerDescriptorMenu.vue
@@ -9,6 +9,7 @@ import useNotify from 'src/composables/useNotify';
 
 import VnSmsDialog from 'src/components/common/VnSmsDialog.vue';
 import TicketCreateDialog from 'src/pages/Ticket/TicketCreateDialog.vue';
+import OrderCreateDialog from 'src/pages/Order/Card/OrderCreateDialog.vue';
 import { ref } from 'vue';
 
 const $props = defineProps({
@@ -42,11 +43,15 @@ const sendSms = async (payload) => {
         notify(error.message, 'positive');
     }
 };
-const ticketCreateFormDialog = ref(null);
 
+const ticketCreateFormDialog = ref(null);
 const openTicketCreateForm = () => {
     ticketCreateFormDialog.value.show();
 };
+const orderCreateFormDialog = ref(null);
+const openOrderCreateForm = () => {
+    orderCreateFormDialog.value.show();
+};
 </script>
 
 <template>
@@ -58,6 +63,14 @@ const openTicketCreateForm = () => {
             </QDialog>
         </QItemSection>
     </QItem>
+    <QItem v-ripple clickable @click="openOrderCreateForm()">
+        <QItemSection>
+            {{ t('globals.pageTitles.createOrder') }}
+            <QDialog ref="orderCreateFormDialog">
+                <OrderCreateDialog :client-fk="customer.id" />
+            </QDialog>
+        </QItemSection>
+    </QItem>
     <QItem v-ripple clickable>
         <QItemSection @click="showSmsDialog()">{{ t('Send SMS') }}</QItemSection>
     </QItem>
diff --git a/src/pages/Order/Card/OrderCreateDialog.vue b/src/pages/Order/Card/OrderCreateDialog.vue
new file mode 100644
index 000000000..9d5c9281e
--- /dev/null
+++ b/src/pages/Order/Card/OrderCreateDialog.vue
@@ -0,0 +1,220 @@
+<script setup>
+import { useRoute, useRouter } from 'vue-router';
+import { onMounted, ref } from 'vue';
+import { useI18n } from 'vue-i18n';
+import axios from 'axios';
+import { useState } from 'composables/useState';
+import FormModelPopup from 'components/FormModelPopup.vue';
+import VnRow from 'components/ui/VnRow.vue';
+import VnSelect from 'components/common/VnSelect.vue';
+import VnInputDate from 'components/common/VnInputDate.vue';
+import { useDialogPluginComponent } from 'quasar';
+import { reactive } from 'vue';
+import FetchData from 'components/FetchData.vue';
+
+const { t } = useI18n();
+const route = useRoute();
+const state = useState();
+const ORDER_MODEL = 'order';
+
+const router = useRouter();
+const clientList = ref([]);
+const agencyList = ref([]);
+const addressList = ref([]);
+defineEmits(['confirm', ...useDialogPluginComponent.emits]);
+
+const fetchAddressList = async (addressId) => {
+    try {
+        const { data } = await axios.get('addresses', {
+            params: {
+                filter: JSON.stringify({
+                    fields: ['id', 'nickname', 'street', 'city'],
+                    where: { id: addressId },
+                }),
+            },
+        });
+        addressList.value = data;
+        if (addressList.value?.length === 1) {
+            state.get(ORDER_MODEL).addressId = addressList.value[0].id;
+        }
+    } catch (err) {
+        console.error(`Error fetching addresses`, err);
+        return err.response;
+    }
+};
+
+const fetchAgencyList = async (landed, addressFk) => {
+    if (!landed || !addressFk) {
+        return;
+    }
+    try {
+        const { data } = await axios.get('Agencies/landsThatDay', {
+            params: {
+                addressFk,
+                landed: new Date(landed).toISOString(),
+            },
+        });
+        agencyList.value = data;
+    } catch (err) {
+        console.error(`Error fetching agencies`, err);
+        return err.response;
+    }
+};
+
+// const fetchOrderDetails = (order) => {
+//     fetchAddressList(order?.addressFk);
+//     fetchAgencyList(order?.landed, order?.addressFk);
+// };
+const $props = defineProps({
+    clientFk: {
+        type: Number,
+        default: null,
+    },
+});
+const initialFormState = reactive({
+    active: true,
+    addressId: null,
+    clientFk: $props.clientFk,
+});
+// const orderMapper = (order) => {
+//     return {
+//         addressId: order.addressFk,
+//         agencyModeId: order.agencyModeFk,
+//         landed: new Date(order.landed).toISOString(),
+//     };
+// };
+// const orderFilter = {
+//     include: [
+//         { relation: 'agencyMode', scope: { fields: ['name'] } },
+//         {
+//             relation: 'address',
+//             scope: { fields: ['nickname'] },
+//         },
+//         { relation: 'rows', scope: { fields: ['id'] } },
+//         {
+//             relation: 'client',
+//             scope: {
+//                 fields: [
+//                     'salesPersonFk',
+//                     'name',
+//                     'isActive',
+//                     'isFreezed',
+//                     'isTaxDataChecked',
+//                 ],
+//                 include: {
+//                     relation: 'salesPersonUser',
+//                     scope: { fields: ['id', 'name'] },
+//                 },
+//             },
+//         },
+//     ],
+// };
+
+const onClientChange = async (clientId = $props.clientFk) => {
+    try {
+        const { data } = await axios.get(`Clients/${clientId}`);
+        await fetchAddressList(data.defaultAddressFk);
+    } catch (error) {
+        console.error('Error al cambiar el cliente:', error);
+    }
+};
+
+async function onDataSaved(_, id) {
+    await router.push({ path: `/order/${id}/catalog` });
+}
+onMounted(async () => {
+    await onClientChange();
+});
+</script>
+
+<template>
+    <FetchData
+        url="addresses"
+        @on-fetch="(data) => (clientOptions = data)"
+        :filter="{ fields: ['id', 'name', 'defaultAddressFk'], order: 'id' }"
+        auto-load
+    />
+    <FormModelPopup
+        url-create="Orders/new"
+        :title="t('Create Order')"
+        @on-data-saved="onDataSaved"
+        :model="ORDER_MODEL"
+        :filter="orderFilter"
+        :form-initial-data="initialFormState"
+    >
+        <template #form-inputs="{ data }">
+            <VnRow class="row q-gutter-md q-mb-md">
+                <VnSelect
+                    url="Clients"
+                    :label="t('order.form.clientFk')"
+                    v-model="data.clientFk"
+                    option-value="id"
+                    option-label="name"
+                    :filter="{
+                        fields: ['id', 'name', 'defaultAddressFk'],
+                    }"
+                    hide-selected
+                    @update:model-value="onClientChange"
+                >
+                    <template #option="scope">
+                        <QItem v-bind="scope.itemProps">
+                            <QItemSection>
+                                <QItemLabel>
+                                    {{ `${scope.opt.id}: ${scope.opt.name}` }}
+                                </QItemLabel>
+                            </QItemSection>
+                        </QItem>
+                    </template>
+                </VnSelect>
+                <VnSelect
+                    :label="t('order.form.addressFk')"
+                    v-model="data.addressId"
+                    :options="addressList"
+                    option-value="id"
+                    option-label="street"
+                    hide-selected
+                    :disable="!addressList?.length"
+                >
+                    <template #option="scope">
+                        <QItem v-bind="scope.itemProps">
+                            <QItemSection>
+                                <QItemLabel>
+                                    {{
+                                        `${scope.opt.nickname}: ${scope.opt.street},${scope.opt.city}`
+                                    }}
+                                </QItemLabel>
+                            </QItemSection>
+                        </QItem>
+                    </template>
+                </VnSelect>
+            </VnRow>
+            <VnRow class="row q-gutter-md q-mb-md">
+                <VnInputDate
+                    placeholder="dd-mm-aaa"
+                    :label="t('order.form.landed')"
+                    v-model="data.landed"
+                    @update:model-value="
+                        () => fetchAgencyList(data.landed, data.addressId)
+                    "
+                />
+            </VnRow>
+            <VnRow class="row q-gutter-md q-mb-md">
+                <VnSelect
+                    :label="t('order.form.agencyModeFk')"
+                    v-model="data.agencyModeId"
+                    :options="agencyList"
+                    option-value="agencyModeFk"
+                    option-label="agencyMode"
+                    hide-selected
+                    :disable="!agencyList?.length"
+                >
+                </VnSelect>
+            </VnRow>
+        </template>
+    </FormModelPopup>
+</template>
+
+<i18n>
+    es:
+        No default address found for the client: No hay ninguna dirección asociada a este cliente.
+</i18n>

From cd12343302c9fea5bc5419ac04731d43b75baf2d Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Fri, 6 Sep 2024 07:26:04 +0200
Subject: [PATCH 061/228] feat: refs #7404 add some style to the form and
 reorganize fields

---
 src/components/VnTable/VnColumn.vue        |   3 +
 src/components/VnTable/VnTable.vue         |   8 +-
 src/components/common/VnComponent.vue      |   6 +-
 src/pages/Entry/EntryStockBought.vue       | 119 ++++++++++-----------
 src/pages/Entry/EntryStockBoughtFilter.vue |  57 ++++++++++
 src/pages/Route/Card/RouteSearchbar.vue    |   1 -
 src/pages/Route/RouteList.vue              |   1 -
 7 files changed, 120 insertions(+), 75 deletions(-)
 create mode 100644 src/pages/Entry/EntryStockBoughtFilter.vue

diff --git a/src/components/VnTable/VnColumn.vue b/src/components/VnTable/VnColumn.vue
index ed34e9eee..ad120f02e 100644
--- a/src/components/VnTable/VnColumn.vue
+++ b/src/components/VnTable/VnColumn.vue
@@ -171,6 +171,8 @@ const components = computed(() => $props.components ?? defaultComponents);
             :value="{ row, model }"
             v-model="model"
         />
+
+        {{ console.log('model: ', col) }}
         <VnComponent
             v-if="col.component"
             :prop="col"
@@ -178,6 +180,7 @@ const components = computed(() => $props.components ?? defaultComponents);
             :value="{ row, model }"
             v-model="model"
         />
+
         <span :title="value" v-else>{{ value }}</span>
         <VnComponent
             v-if="col.after"
diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index 0fd6d1dd1..b5d6e8d10 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -15,7 +15,6 @@ import VnTableChip from 'components/VnTable/VnChip.vue';
 import VnVisibleColumn from 'src/components/VnTable/VnVisibleColumn.vue';
 import VnLv from 'components/ui/VnLv.vue';
 import VnTableOrder from 'src/components/VnTable/VnOrder.vue';
-import item from 'src/router/modules/item';
 
 const $props = defineProps({
     columns: {
@@ -410,7 +409,7 @@ defineExpose({
                     />
                 </template>
                 <template #header-cell="{ col }">
-                    <QTh v-if="col.visible ?? true">
+                    <QTh table-header-style="max-width:50%" v-if="col.visible ?? true">
                         <div
                             class="column self-start q-ml-xs ellipsis"
                             :class="`text-${col?.align ?? 'left'}`"
@@ -665,6 +664,7 @@ defineExpose({
                         :column-name="column.name"
                         :label="column.label"
                     >
+                        {{ console.log('data: ', data) }}
                         <VnTableColumn
                             :column="column"
                             :row="{}"
@@ -708,9 +708,7 @@ es:
 
 .q-table--dark .q-table__bottom,
 .q-table--dark thead,
-.q-table--dark tr,
-.q-table--dark th,
-.q-table--dark td {
+.q-table--dark tr {
     border-color: var(--vn-section-color);
 }
 
diff --git a/src/components/common/VnComponent.vue b/src/components/common/VnComponent.vue
index fa99f9892..1ba1506d5 100644
--- a/src/components/common/VnComponent.vue
+++ b/src/components/common/VnComponent.vue
@@ -17,17 +17,16 @@ const $props = defineProps({
     },
 });
 
-let mixed;
 const componentArray = computed(() => {
     if (typeof $props.prop === 'object') return [$props.prop];
     return $props.prop;
 });
 
 function mix(toComponent) {
-    if (mixed) return mixed;
     const { component, attrs, event } = toComponent;
+    console.log('attrs: ', attrs);
     const customComponent = $props.components[component];
-    mixed = {
+    return {
         component: customComponent?.component ?? component,
         attrs: {
             ...toValueAttrs(attrs),
@@ -37,7 +36,6 @@ function mix(toComponent) {
         },
         event: { ...customComponent?.event, ...event },
     };
-    return mixed;
 }
 
 function toValueAttrs(attrs) {
diff --git a/src/pages/Entry/EntryStockBought.vue b/src/pages/Entry/EntryStockBought.vue
index 75d356bd2..8f197be92 100644
--- a/src/pages/Entry/EntryStockBought.vue
+++ b/src/pages/Entry/EntryStockBought.vue
@@ -4,20 +4,18 @@ import { useI18n } from 'vue-i18n';
 import { useState } from 'src/composables/useState';
 import { useQuasar } from 'quasar';
 
-import VnTable from 'components/VnTable/VnTable.vue';
-import VnRow from 'src/components/ui/VnRow.vue';
-import FetchData from 'src/components/FetchData.vue';
 import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
+import RightMenu from 'src/components/common/RightMenu.vue';
+import EntryStockBoughtFilter from './EntryStockBoughtFilter.vue';
+import VnTable from 'components/VnTable/VnTable.vue';
 import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
 import EntryStockBoughtDetail from 'src/pages/Entry/EntryStockBoughtDetail.vue';
-import { useRouter } from 'vue-router';
 
 const { t } = useI18n();
 const quasar = useQuasar();
 const tableRef = ref();
 const state = useState();
 const user = state.getUser();
-const router = useRouter();
 const columns = [
     {
         align: 'left',
@@ -31,8 +29,17 @@ const columns = [
         align: 'left',
         name: 'workerFk',
         label: t('Buyer'),
-        isTitle: true,
-        columnFilter: false,
+        component: 'select',
+        create: true,
+        attrs: {
+            url: 'Workers/activeWithInheritedRole',
+            fields: ['id', 'name'],
+            where: { role: 'buyer' },
+            optionFilter: 'firstName',
+            optionLabel: 'name',
+            optionValue: 'id',
+            useLike: false,
+        },
     },
     {
         align: 'left',
@@ -44,31 +51,13 @@ const columns = [
         summation: true,
         cardVisible: true,
     },
-    {
-        align: 'left',
-        name: 'workerFk',
-        label: t('Buyer'),
-        component: 'select',
-        create: true,
-        visible: false,
-        columnFilter: false,
-        attrs: {
-            url: 'Workers/activeWithInheritedRole',
-            fields: ['id', 'name'],
-            where: { role: 'buyer' },
-            optionFilter: 'firstName',
-            optionLabel: 'name',
-            optionValue: 'id',
-            useLike: false,
-        },
-    },
     {
         align: 'left',
         label: t('Bought'),
         name: 'bought',
-        columnFilter: false,
         summation: true,
         cardVisible: true,
+        columnFilter: false,
     },
     {
         align: 'left',
@@ -92,7 +81,6 @@ const columns = [
                         componentProps: {
                             workerFk: row.workerFk,
                         },
-                        maximized: true,
                     });
                 },
             },
@@ -100,10 +88,6 @@ const columns = [
     },
 ];
 
-function navigate(id) {
-    router.push({ path: `/travel/${id}/basic-data` });
-}
-
 function getFilter(dated) {
     const shipped = dated ? new Date(dated) : Date.vnNew();
     shipped.setHours(0, 0, 0, 0);
@@ -119,11 +103,46 @@ function getFilter(dated) {
         ],
     };
 }
-const travel = ref();
-const fetchDataRef = ref();
+const userParams = ref({
+    dated: Date.vnNew(),
+});
 </script>
 <template>
-    <VnSubToolbar />
+    <VnSubToolbar>
+        <template #st-data="{ params }">
+            <FetchData
+                ref="fetchDataRef"
+                url="Travels"
+                limit="1"
+                auto-load
+                :filter="getFilter(params?.dated)"
+                @on-fetch="(data) => (travel = data)"
+            />
+            <div>
+                <div>
+                    <span style="color: var(--vn-label-color)">
+                        {{ t('Booked trucks') + ': ' }}
+                    </span>
+                </div>
+                <div v-if="travel">
+                    <span>
+                        {{ travel[0]?.m3 }}
+                    </span>
+                    <QBtn
+                        style="max-width: 20%"
+                        flat
+                        icon="edit"
+                        @click="navigate(travel[0]?.id)"
+                    />
+                </div>
+            </div>
+        </template>
+    </VnSubToolbar>
+    <RightMenu>
+        <template #right-panel>
+            <EntryStockBoughtFilter data-key="StockBoughts" />
+        </template>
+    </RightMenu>
     <QPage class="column items-center q-pa-md">
         <VnTable
             ref="tableRef"
@@ -131,6 +150,7 @@ const fetchDataRef = ref();
             url="StockBoughts/getStockBought"
             save-url="StockBoughts/crud"
             order="reserve DESC"
+            :right-search="false"
             :is-editable="true"
             :create="{
                 urlCreate: 'StockBoughts',
@@ -142,39 +162,10 @@ const fetchDataRef = ref();
                 },
             }"
             :columns="columns"
+            :user-params="userParams"
             auto-load
-            @on-fetch="() => console.log('fetching...', fetchDataRef.fetch())"
-            style="max-width: 40%"
             :footer="true"
         >
-            <template #moreFilterPanel="{ params }">
-                <FetchData
-                    ref="fetchDataRef"
-                    url="Travels"
-                    limit="1"
-                    auto-load
-                    :filter="getFilter(params?.dated)"
-                    @on-fetch="(data) => (travel = data)"
-                />
-                <div class="trucks">
-                    <div>
-                        <span style="color: var(--vn-label-color)">
-                            {{ t('Booked trucks') + ': ' }}
-                        </span>
-                    </div>
-                    <div v-if="travel">
-                        <span>
-                            {{ travel[0]?.m3 }}
-                        </span>
-                        <QBtn
-                            style="max-width: 20%"
-                            flat
-                            icon="edit"
-                            @click="navigate(travel[0]?.id)"
-                        />
-                    </div>
-                </div>
-            </template>
             <template #column-workerFk="{ row }">
                 <span class="link" @click.stop>
                     {{ row?.worker?.user?.name }}
diff --git a/src/pages/Entry/EntryStockBoughtFilter.vue b/src/pages/Entry/EntryStockBoughtFilter.vue
new file mode 100644
index 000000000..3393113f2
--- /dev/null
+++ b/src/pages/Entry/EntryStockBoughtFilter.vue
@@ -0,0 +1,57 @@
+<script setup>
+import { ref } from 'vue';
+import { useI18n } from 'vue-i18n';
+import { onMounted } from 'vue';
+import { useStateStore } from 'stores/useStateStore';
+
+import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
+import FetchData from 'components/FetchData.vue';
+import VnInputDate from 'src/components/common/VnInputDate.vue';
+
+const { t } = useI18n();
+const props = defineProps({
+    dataKey: {
+        type: String,
+        required: true,
+    },
+});
+
+const companiesOptions = ref([]);
+const stateStore = useStateStore();
+onMounted(async () => {
+    stateStore.rightDrawer = true;
+});
+</script>
+
+<template>
+    <FetchData
+        ref="buyer"
+        url="Workers/activeWithInheritedRole"
+        :filter="{
+            fields: ['id', 'name'],
+            where: { role: 'buyer' },
+        }"
+        order="name"
+        @on-fetch="(data) => (companiesOptions = 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 }">
+            <QItem class="q-my-sm">
+                <QItemSection>
+                    <VnInputDate v-model="params.dated" :label="t('Date')" is-outlined />
+                </QItemSection>
+            </QItem>
+        </template>
+    </VnFilterPanel>
+</template>
+<i18n>
+    es:
+        Date: Fecha
+</i18n>
diff --git a/src/pages/Route/Card/RouteSearchbar.vue b/src/pages/Route/Card/RouteSearchbar.vue
index 48ad09151..a8e11cef6 100644
--- a/src/pages/Route/Card/RouteSearchbar.vue
+++ b/src/pages/Route/Card/RouteSearchbar.vue
@@ -3,7 +3,6 @@ import VnSearchbar from 'components/ui/VnSearchbar.vue';
 import { useI18n } from 'vue-i18n';
 const { t } = useI18n();
 </script>
-
 <template>
     <VnSearchbar
         data-key="RouteList"
diff --git a/src/pages/Route/RouteList.vue b/src/pages/Route/RouteList.vue
index ef544a68d..7e2358236 100644
--- a/src/pages/Route/RouteList.vue
+++ b/src/pages/Route/RouteList.vue
@@ -409,5 +409,4 @@ es:
     Route is not served: La ruta no está servida
     hourStarted: Hora de inicio
     hourFinished: Hora de fin
-    Volume: Volumen
 </i18n>

From 6f98f249263745e6236b238a9405d71cf5a6d706 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Fri, 6 Sep 2024 11:55:39 +0200
Subject: [PATCH 062/228] chore: refs #7663 add test

---
 .../ticket/ticketDescriptor.spec.js           | 23 +++++++------------
 1 file changed, 8 insertions(+), 15 deletions(-)

diff --git a/test/cypress/integration/ticket/ticketDescriptor.spec.js b/test/cypress/integration/ticket/ticketDescriptor.spec.js
index ace3831dd..516b0f13d 100644
--- a/test/cypress/integration/ticket/ticketDescriptor.spec.js
+++ b/test/cypress/integration/ticket/ticketDescriptor.spec.js
@@ -5,15 +5,14 @@ describe('Ticket descriptor', () => {
     const warehouseValue = ':nth-child(1) > :nth-child(6) > .value > span';
     const summaryHeader = '.summaryHeader > div';
     const weight = 25;
-    const ticketId = 1;
-
+    const weightValue = ':nth-child(10) > .value > span';
     beforeEach(() => {
         cy.login('developer');
-        cy.visit(`/#/ticket/${ticketId}/summary`);
+        cy.viewport(1920, 1080);
     });
 
     it('should clone the ticket without warehouse', () => {
-        cy.openLeftMenu();
+        cy.visit('/#/ticket/1/summary');
         cy.openActionsDescriptor();
         cy.get(toCloneOpt).click();
         cy.clickConfirm();
@@ -27,19 +26,13 @@ describe('Ticket descriptor', () => {
     });
 
     it('should set the weight of the ticket', () => {
-        cy.openLeftMenu();
+        cy.visit('/#/ticket/10/summary');
         cy.openActionsDescriptor();
         cy.get(setWeightOpt).click();
-        cy.get('.q-dialog input').type(25);
+        cy.intercept('POST', /\/api\/Tickets\/\d+\/setWeight/).as('weight');
+        cy.get('.q-dialog input').type(weight);
         cy.clickConfirm();
-
-        cy.get('.q-notification').should('contain', 'Peso establecido');
-
-        cy.intercept('POST', /\/api\/Tickets\/\d+/).as('worker');
-        cy.wait('@worker').then(() =>
-            cy.get(descriptorTitle).should('include.text', 'Jessica')
-        );
-
-        cy.get('@fetchSpy').should('have.been.called');
+        cy.wait('@weight');
+        cy.get(weightValue).contains(weight);
     });
 });

From 3693ba0c995bf3467b760760e93747815a7301da Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Fri, 6 Sep 2024 15:37:33 +0200
Subject: [PATCH 063/228] feat: refs #4074 drop useless code

---
 src/pages/Supplier/Card/SupplierSummary.vue | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/pages/Supplier/Card/SupplierSummary.vue b/src/pages/Supplier/Card/SupplierSummary.vue
index 04f763c15..5791db1eb 100644
--- a/src/pages/Supplier/Card/SupplierSummary.vue
+++ b/src/pages/Supplier/Card/SupplierSummary.vue
@@ -4,7 +4,6 @@ import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import CardSummary from 'components/ui/CardSummary.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
-import { useAcl } from 'src/composables/useAcl';
 import { dashIfEmpty } from 'src/filters';
 import VnUserLink from 'src/components/ui/VnUserLink.vue';
 import VnTitle from 'src/components/common/VnTitle.vue';
@@ -31,11 +30,7 @@ async function setData(data) {
     }
 }
 
-
-
-const getUrl = (section) => 
-    useAcl().hasAny('Supplier','*','WRITE') ? `#/supplier/${entityId.value}/${section}`:'';
-
+const getUrl = (section) => `#/supplier/${entityId.value}/${section}`;
 </script>
 
 <template>

From d0131dd5521ad83d16694ee55805c773c3b74274 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Fri, 6 Sep 2024 15:52:06 +0200
Subject: [PATCH 064/228] fix: refs #4074 drop wrong acl

---
 src/router/modules/ticket.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/router/modules/ticket.js b/src/router/modules/ticket.js
index 4074f089f..698f02554 100644
--- a/src/router/modules/ticket.js
+++ b/src/router/modules/ticket.js
@@ -53,7 +53,6 @@ export default {
                     meta: {
                         title: 'createTicket',
                         icon: 'vn:ticketAdd',
-                        roles: ['developer'],
                     },
                     component: () => import('src/pages/Ticket/TicketCreate.vue'),
                 },

From b87e7ce75025020a72e5039097ee22e8583a51a4 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Fri, 6 Sep 2024 17:01:23 +0200
Subject: [PATCH 065/228] refactor: refs #4074 use VnTitle

---
 src/css/app.scss                    |   4 +
 src/pages/Item/Card/ItemSummary.vue | 125 +++++++++-------------------
 2 files changed, 44 insertions(+), 85 deletions(-)

diff --git a/src/css/app.scss b/src/css/app.scss
index 357c9ecdb..ecffd576c 100644
--- a/src/css/app.scss
+++ b/src/css/app.scss
@@ -37,6 +37,10 @@ a {
 .link {
     color: $color-link;
     cursor: pointer;
+
+    &--white {
+        color: white;
+    }
 }
 
 .tx-color-link {
diff --git a/src/pages/Item/Card/ItemSummary.vue b/src/pages/Item/Card/ItemSummary.vue
index 1571a903e..081eb2afb 100644
--- a/src/pages/Item/Card/ItemSummary.vue
+++ b/src/pages/Item/Card/ItemSummary.vue
@@ -7,9 +7,7 @@ import CardSummary from 'components/ui/CardSummary.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
 import ItemDescriptorImage from 'src/pages/Item/Card/ItemDescriptorImage.vue';
 import VnUserLink from 'src/components/ui/VnUserLink.vue';
-
-import { useRole } from 'src/composables/useRole';
-import { useAcl } from 'src/composables/useAcl';
+import VnTitle from 'src/components/common/VnTitle.vue';
 
 const $props = defineProps({
     id: {
@@ -22,13 +20,7 @@ const route = useRoute();
 const { t } = useI18n();
 
 const entityId = computed(() => $props.id || route.params.id);
-
-const canEdit = computed(() => useAcl().hasAny('Item', '*', 'WRITE'));
-
-const isReplenisher = computed(() => useRole().hasAny(['replenisher']));
-
 </script>
-
 <template>
     <CardSummary
         ref="summary"
@@ -37,13 +29,15 @@ const isReplenisher = computed(() => useRole().hasAny(['replenisher']));
         data-key="ItemSummary"
     >
         <template #header-left>
-            <router-link
-                v-if="route.name !== 'ItemSummary'"
+            <QBtn
+                v-if="$route.name !== 'ItemSummary'"
                 :to="{ name: 'ItemSummary', params: { id: entityId } }"
-                class="header link"
-            >
-                <QIcon name="open_in_new" color="white" size="sm" />
-            </router-link>
+                class="header link--white"
+                icon="open_in_new"
+                flat
+                dense
+                round
+            />
         </template>
         <template #header="{ entity: { item } }">
             {{ item.id }} - {{ item.name }}
@@ -58,15 +52,10 @@ const isReplenisher = computed(() => useRole().hasAny(['replenisher']));
                 />
             </QCard>
             <QCard class="vn-one">
-                <component
-                    :is="canEdit ? 'router-link' : 'span'"
-                    :to="{ name: 'ItemBasicData', params: { id: entityId } }"
-                    class="header"
-                    :class="{ 'header-link': canEdit }"
-                >
-                    {{ t('item.summary.basicData') }}
-                    <QIcon v-if="canEdit" name="open_in_new" />
-                </component>
+                <VnTitle
+                    :url="`#/item/${entityId}/basic-data`"
+                    :text="t('item.summary.basicData')"
+                />
                 <VnLv :label="t('item.summary.name')" :value="item.name" />
                 <VnLv :label="t('item.summary.completeName')" :value="item.longName" />
                 <VnLv :label="t('item.summary.family')" :value="item.itemType.name" />
@@ -97,15 +86,10 @@ const isReplenisher = computed(() => useRole().hasAny(['replenisher']));
                 </VnLv>
             </QCard>
             <QCard class="vn-one">
-                <component
-                    :is="canEdit ? 'router-link' : 'span'"
-                    :to="{ name: 'ItemBasicData', params: { id: entityId } }"
-                    class="header"
-                    :class="{ 'header-link': canEdit }"
-                >
-                    {{ t('item.summary.otherData') }}
-                    <QIcon v-if="canEdit" name="open_in_new" />
-                </component>
+                <VnTitle
+                    :url="`#/item/${entityId}/basic-data`"
+                    :text="t('item.summary.otherData')"
+                />
                 <VnLv
                     :label="t('item.summary.intrastatCode')"
                     :value="item.intrastat.id"
@@ -130,15 +114,10 @@ const isReplenisher = computed(() => useRole().hasAny(['replenisher']));
                 />
             </QCard>
             <QCard class="vn-one">
-                <component
-                    :is="canEdit || isReplenisher ? 'router-link' : 'span'"
-                    :to="{ name: 'ItemTags', params: { id: entityId } }"
-                    class="header"
-                    :class="{ 'header-link': canEdit || isReplenisher }"
-                >
-                    {{ t('item.summary.tags') }}
-                    <QIcon v-if="canEdit || isReplenisher" name="open_in_new" />
-                </component>
+                <VnTitle
+                    :url="`#/item/${entityId}/tags`"
+                    :text="t('item.summary.tags')"
+                />
                 <VnLv
                     v-for="(tag, index) in tags"
                     :key="index"
@@ -147,29 +126,14 @@ const isReplenisher = computed(() => useRole().hasAny(['replenisher']));
                 />
             </QCard>
             <QCard class="vn-one" v-if="item.description">
-                <component
-                    :is="canEdit ? 'router-link' : 'span'"
-                    :to="{ name: 'ItemBasicData', params: { id: entityId } }"
-                    class="header"
-                    :class="{ 'header-link': canEdit }"
-                >
-                    {{ t('item.summary.description') }}
-                    <QIcon v-if="canEdit" name="open_in_new" />
-                </component>
-                <p>
-                    {{ item.description }}
-                </p>
+                <VnTitle
+                    :url="`#/item/${entityId}/basic-data`"
+                    :text="t('item.summary.description')"
+                />
+                <p v-text="item.description" />
             </QCard>
             <QCard class="vn-one">
-                <component
-                    :is="canEdit ? 'router-link' : 'span'"
-                    :to="{ name: 'ItemTax', params: { id: entityId } }"
-                    class="header"
-                    :class="{ 'header-link': canEdit }"
-                >
-                    {{ t('item.summary.tax') }}
-                    <QIcon v-if="canEdit" name="open_in_new" />
-                </component>
+                <VnTitle :url="`#/item/${entityId}/tax`" :text="t('item.summary.tax')" />
                 <VnLv
                     v-for="(tax, index) in item.taxes"
                     :key="index"
@@ -178,15 +142,10 @@ const isReplenisher = computed(() => useRole().hasAny(['replenisher']));
                 />
             </QCard>
             <QCard class="vn-one">
-                <component
-                    :is="canEdit ? 'router-link' : 'span'"
-                    :to="{ name: 'ItemBotanical', params: { id: entityId } }"
-                    class="header"
-                    :class="{ 'header-link': canEdit }"
-                >
-                    {{ t('item.summary.botanical') }}
-                    <QIcon v-if="canEdit" name="open_in_new" />
-                </component>
+                <VnTitle
+                    :url="`#/item/${entityId}/botanical`"
+                    :text="t('item.summary.botanical')"
+                />
                 <VnLv :label="t('item.summary.genus')" :value="botanical?.genus?.name" />
                 <VnLv
                     :label="t('item.summary.specie')"
@@ -194,23 +153,19 @@ const isReplenisher = computed(() => useRole().hasAny(['replenisher']));
                 />
             </QCard>
             <QCard class="vn-one">
-                <component
-                    :is="canEdit || isReplenisher ? 'router-link' : 'span'"
-                    :to="{ name: 'ItemBarcode', params: { id: entityId } }"
-                    class="header"
-                    :class="{ 'header-link': canEdit || isReplenisher }"
-                >
-                    {{ t('item.summary.barcode') }}
-                    <QIcon v-if="canEdit || isReplenisher" name="open_in_new" />
-                </component>
-                <p v-for="(barcode, index) in item.itemBarcode" :key="index">
-                    {{ barcode.code }}
-                </p>
+                <VnTitle
+                    :url="`#/item/${entityId}/barcode`"
+                    :text="t('item.summary.barcode')"
+                />
+                <p
+                    v-for="(barcode, index) in item.itemBarcode"
+                    :key="index"
+                    v-text="barcode.code"
+                />
             </QCard>
         </template>
     </CardSummary>
 </template>
-
 <i18n>
 en:
     Este artículo necesita una foto: Este artículo necesita una foto

From 684215fc4613eb9e24f98775bc713eef916529d5 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Mon, 9 Sep 2024 09:59:22 +0200
Subject: [PATCH 066/228] feat(AccountBasicData): add twoFactorFk

---
 src/pages/Account/Card/AccountBasicData.vue         | 9 ++++++++-
 src/pages/Account/locale/en.yml                     | 1 +
 src/pages/Account/locale/es.yml                     | 1 +
 test/cypress/integration/outLogin/twoFactor.spec.js | 2 +-
 4 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/pages/Account/Card/AccountBasicData.vue b/src/pages/Account/Card/AccountBasicData.vue
index f38299f9e..b223c4bc0 100644
--- a/src/pages/Account/Card/AccountBasicData.vue
+++ b/src/pages/Account/Card/AccountBasicData.vue
@@ -24,7 +24,7 @@ watch(
 <template>
     <FormModel
         ref="formModelRef"
-        :url="`VnUsers/preview`"
+        url="VnUsers/preview"
         :url-update="`VnUsers/${route.params.id}/update-user`"
         :filter="accountFilter"
         model="Accounts"
@@ -43,6 +43,13 @@ watch(
                     option-value="code"
                     option-label="code"
                 />
+                <VnSelect
+                    url="TwoFactorTypes"
+                    v-model="data.twoFactorFk"
+                    :label="t('account.card.twoFactor')"
+                    option-value="code"
+                    option-label="code"
+                />
             </div>
         </template>
     </FormModel>
diff --git a/src/pages/Account/locale/en.yml b/src/pages/Account/locale/en.yml
index 3cf861fb2..fe8707eb8 100644
--- a/src/pages/Account/locale/en.yml
+++ b/src/pages/Account/locale/en.yml
@@ -35,6 +35,7 @@ account:
         willDeactivated: User will be deactivated
         activated: User activated!
         deactivated: User deactivated!
+        twoFactor: Two factor
         actions:
             setPassword: Set password
             disableAccount:
diff --git a/src/pages/Account/locale/es.yml b/src/pages/Account/locale/es.yml
index b53a0153c..112ffe9cc 100644
--- a/src/pages/Account/locale/es.yml
+++ b/src/pages/Account/locale/es.yml
@@ -32,6 +32,7 @@ account:
         activated: ¡Usuario activado!
         deactivated: ¡Usuario desactivado!
         newUser: Nuevo usuario
+        twoFactor: Doble factor
         privileges:
             delegate: Puede delegar privilegios
         actions:
diff --git a/test/cypress/integration/outLogin/twoFactor.spec.js b/test/cypress/integration/outLogin/twoFactor.spec.js
index 4d8561f0f..259ddfc0f 100755
--- a/test/cypress/integration/outLogin/twoFactor.spec.js
+++ b/test/cypress/integration/outLogin/twoFactor.spec.js
@@ -12,7 +12,7 @@ describe('Two Factor', () => {
         cy.request(
             'PATCH',
             `http://localhost:3000/api/VnUsers/${userId}/update-user?access_token=DEFAULT_TOKEN`,
-            { twoFactor: 'email' }
+            { twoFactorFk: 'email' }
         );
     });
 

From c978cca8c5c760f03c67d3cf1693a4f998d3d492 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 9 Sep 2024 11:35:49 +0200
Subject: [PATCH 067/228] refactor: refs #4074 useAcl in navigationStore &
 router

---
 src/components/common/VnSelectDialog.vue |  8 ++------
 src/composables/useAcl.js                | 21 +++++++++++++--------
 src/router/index.js                      | 11 ++++-------
 src/router/modules/account.js            |  6 +++---
 src/stores/useNavigationStore.js         |  6 +++---
 5 files changed, 25 insertions(+), 27 deletions(-)

diff --git a/src/components/common/VnSelectDialog.vue b/src/components/common/VnSelectDialog.vue
index 0ade82bda..7338e752d 100644
--- a/src/components/common/VnSelectDialog.vue
+++ b/src/components/common/VnSelectDialog.vue
@@ -31,12 +31,8 @@ const acl = useAcl();
 const showForm = ref(false);
 
 const isAllowedToCreate = computed(() => {
-    const hasMissingAcl = $props.acls.some(
-        (x) => !acl.hasAny(x.model, x.props, x.accessType)
-    );
-    const hasRequiredRole = role.hasAny($props.rolesAllowedToCreate);
-    if ($props.acls.length) return !hasMissingAcl;
-    return hasRequiredRole;
+    if ($props.acls.length) return acl.hasAny($props.acls);
+    return role.hasAny($props.rolesAllowedToCreate);
 });
 </script>
 
diff --git a/src/composables/useAcl.js b/src/composables/useAcl.js
index bebeda039..539e89622 100644
--- a/src/composables/useAcl.js
+++ b/src/composables/useAcl.js
@@ -16,14 +16,19 @@ export function useAcl() {
         state.setAcls(acls);
     }
 
-    function hasAny(model, props, accessType) {
-        const acls = state.getAcls().value[model];
-        Array.isArray(props) || (props = [props]);
-        if (acls) 
-            return ['*', ...props].some((key) => {
-                const acl = acls[key];
-                return acl && (acl['*'] || acl[accessType]);
-            });
+    function hasAny(acls) {
+        if (!Array.isArray(acls)) acls = [acls];
+        for (const acl of acls) {
+            let { model, props, accessType } = acl;
+            const modelAcls = state.getAcls().value[model];
+            Array.isArray(props) || (props = [props]);
+            if (modelAcls)
+                return ['*', ...props].some((key) => {
+                    const acl = modelAcls[key];
+                    return acl && (acl['*'] || acl[accessType]);
+                });
+        }
+        return false;
     }
 
     return {
diff --git a/src/router/index.js b/src/router/index.js
index 686da2dde..18541c0b2 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -60,15 +60,12 @@ export default route(function (/* { store, ssrContext } */) {
                 await useTokenConfig().fetch();
             }
             const matches = to.matched;
-            const hasRequiredRoles = matches.every((route) => {
+            const hasRequiredAcls = matches.every((route) => {
                 const meta = route.meta;
-                if (meta && meta.roles) return useRole().hasAny(meta.roles);
-                return true;
+                if (!meta?.acls) return true;
+                return useAcl().hasAny(meta.acls);
             });
-
-            if (!hasRequiredRoles) {
-                return next({ path: '/' });
-            }
+            if (!hasRequiredAcls) return next({ path: '/' });
         }
 
         next();
diff --git a/src/router/modules/account.js b/src/router/modules/account.js
index cfec2b95d..bb1c38c8e 100644
--- a/src/router/modules/account.js
+++ b/src/router/modules/account.js
@@ -79,7 +79,7 @@ export default {
                     meta: {
                         title: 'accounts',
                         icon: 'accessibility',
-                        roles: ['itManagement'],
+                        acls: [{ model: 'Account', props: '*', accessType: '*' }],
                     },
                     component: () => import('src/pages/Account/AccountAccounts.vue'),
                 },
@@ -89,7 +89,7 @@ export default {
                     meta: {
                         title: 'ldap',
                         icon: 'account_tree',
-                        roles: ['itManagement'],
+                        acls: [{ model: 'LdapConfig', props: '*', accessType: '*' }],
                     },
                     component: () => import('src/pages/Account/AccountLdap.vue'),
                 },
@@ -99,7 +99,7 @@ export default {
                     meta: {
                         title: 'samba',
                         icon: 'preview',
-                        roles: ['itManagement'],
+                        acls: [{ model: 'SambaConfig', props: '*', accessType: '*' }],
                     },
                     component: () => import('src/pages/Account/AccountSamba.vue'),
                 },
diff --git a/src/stores/useNavigationStore.js b/src/stores/useNavigationStore.js
index 961e80377..784e5063a 100644
--- a/src/stores/useNavigationStore.js
+++ b/src/stores/useNavigationStore.js
@@ -2,7 +2,7 @@ import axios from 'axios';
 import { ref } from 'vue';
 import { defineStore } from 'pinia';
 import { toLowerCamel } from 'src/filters';
-import { useRole } from 'src/composables/useRole';
+import { useAcl } from 'src/composables/useAcl';
 import routes from 'src/router/modules';
 
 export const useNavigationStore = defineStore('navigationStore', () => {
@@ -26,7 +26,7 @@ export const useNavigationStore = defineStore('navigationStore', () => {
         'zone',
     ];
     const pinnedModules = ref([]);
-    const role = useRole();
+    const acl = useAcl();
 
     function getModules() {
         const modulesRoutes = ref([]);
@@ -63,7 +63,7 @@ export const useNavigationStore = defineStore('navigationStore', () => {
                 title: `globals.pageTitles.${title}`,
             }));
 
-        if (meta && meta.roles && role.hasAny(meta.roles) === false) return;
+        if (meta && meta.acls && acl.hasAny(meta.acls) === false) return;
 
         const item = {
             name: route.name,

From 803ce3b909a0f1c515db0ff2350b94061011bf89 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 9 Sep 2024 11:53:59 +0200
Subject: [PATCH 068/228] refactor: refs #4074 rollback

---
 src/router/modules/worker.js | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/router/modules/worker.js b/src/router/modules/worker.js
index 6eebdddac..2a523e7fe 100644
--- a/src/router/modules/worker.js
+++ b/src/router/modules/worker.js
@@ -53,6 +53,15 @@ export default {
                     },
                     component: () => import('src/pages/Worker/WorkerDepartment.vue'),
                 },
+                {
+                    path: 'create',
+                    name: 'WorkerCreate',
+                    meta: {
+                        title: 'workerCreate',
+                        icon: 'add',
+                    },
+                    component: () => import('src/pages/Worker/WorkerCreate.vue'),
+                },
             ],
         },
         {

From 2667d3afaee4e46ebd7b87b62704b82dafb1e0a2 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 9 Sep 2024 12:07:22 +0200
Subject: [PATCH 069/228] feat: show preparation field

---
 src/pages/Ticket/TicketAdvance.vue | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/pages/Ticket/TicketAdvance.vue b/src/pages/Ticket/TicketAdvance.vue
index 45bd8fd39..0ef6b5f46 100644
--- a/src/pages/Ticket/TicketAdvance.vue
+++ b/src/pages/Ticket/TicketAdvance.vue
@@ -133,6 +133,14 @@ const ticketColumns = computed(() => [
         sortable: true,
         columnFilter: null,
     },
+    {
+        label: t('advanceTickets.preparation'),
+        name: 'preparation',
+        field: 'preparation',
+        align: 'left',
+        sortable: true,
+        columnFilter: null,
+    },
     {
         label: t('advanceTickets.liters'),
         name: 'liters',
@@ -624,6 +632,7 @@ onMounted(async () => {
                     </QIcon>
                 </QTd>
             </template>
+
             <template #body-cell-ticketId="{ row }">
                 <QTd>
                     <QBtn flat class="link">

From 6438f36ecaa880f68aedf76b96fc51c5f16d460b Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 9 Sep 2024 12:28:14 +0200
Subject: [PATCH 070/228] refactor: refs #4074 accept array

---
 src/composables/useAcl.js                        | 1 -
 src/pages/Customer/Card/CustomerBalance.vue      | 4 +++-
 src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue | 3 ++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/composables/useAcl.js b/src/composables/useAcl.js
index 539e89622..ede359186 100644
--- a/src/composables/useAcl.js
+++ b/src/composables/useAcl.js
@@ -17,7 +17,6 @@ export function useAcl() {
     }
 
     function hasAny(acls) {
-        if (!Array.isArray(acls)) acls = [acls];
         for (const acl of acls) {
             let { model, props, accessType } = acl;
             const modelAcls = state.getAcls().value[model];
diff --git a/src/pages/Customer/Card/CustomerBalance.vue b/src/pages/Customer/Card/CustomerBalance.vue
index 501ea6d68..95f5f0981 100644
--- a/src/pages/Customer/Card/CustomerBalance.vue
+++ b/src/pages/Customer/Card/CustomerBalance.vue
@@ -284,7 +284,9 @@ const showBalancePdf = ({ id }) => {
             >
                 <VnInput
                     v-model="scope.value"
-                    :disable="!hasAny('Receipt','*', 'WRITE')"
+                    :disable="
+                        !hasAny([{ model: 'Receipt', props: '*', accessType: 'WRITE' }])
+                    "
                     @keypress.enter="scope.set"
                     autofocus
                 />
diff --git a/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue b/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue
index d431e1f96..b7f470b0c 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue
@@ -195,7 +195,8 @@ async function cloneInvoice() {
     push({ path: `/invoice-in/${data.id}/summary` });
 }
 
-const canEditProp = (prop) => hasAny('InvoiceIn', prop, 'WRITE');
+const canEditProp = (props) =>
+    hasAny([{ model: 'InvoiceIn', props, accessType: 'WRITE' }]);
 
 const isAgricultural = () => {
     if (!config.value) return false;

From 381b236a18bc0b3186bbd1e6145d2108200b2f50 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 9 Sep 2024 12:56:37 +0200
Subject: [PATCH 071/228] refactor: refs #4074 use acl & drop useless roles

---
 src/router/modules/claim.js     | 10 ++++++++--
 src/router/modules/invoiceIn.js |  1 -
 src/router/modules/shelving.js  |  1 -
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/router/modules/claim.js b/src/router/modules/claim.js
index cced9e24d..ae794448e 100644
--- a/src/router/modules/claim.js
+++ b/src/router/modules/claim.js
@@ -61,7 +61,7 @@ export default {
                     meta: {
                         title: 'basicData',
                         icon: 'vn:settings',
-                        roles: ['salesPerson'],
+                        acls: [{ model: 'Claim', props: 'findById', accessType: 'READ' }],
                     },
                     component: () => import('src/pages/Claim/Card/ClaimBasicData.vue'),
                 },
@@ -98,7 +98,13 @@ export default {
                     meta: {
                         title: 'development',
                         icon: 'vn:traceability',
-                        roles: ['claimManager'],
+                        acls: [
+                            {
+                                model: 'ClaimDevelopment',
+                                props: '*',
+                                accessType: 'WRITE',
+                            },
+                        ],
                     },
                     component: () => import('src/pages/Claim/Card/ClaimDevelopment.vue'),
                 },
diff --git a/src/router/modules/invoiceIn.js b/src/router/modules/invoiceIn.js
index 906db8a58..c8027ffbf 100644
--- a/src/router/modules/invoiceIn.js
+++ b/src/router/modules/invoiceIn.js
@@ -80,7 +80,6 @@ export default {
                     meta: {
                         title: 'basicData',
                         icon: 'vn:settings',
-                        roles: ['salesPerson'],
                     },
                     component: () =>
                         import('src/pages/InvoiceIn/Card/InvoiceInBasicData.vue'),
diff --git a/src/router/modules/shelving.js b/src/router/modules/shelving.js
index 70145dfb4..b7f50a3b6 100644
--- a/src/router/modules/shelving.js
+++ b/src/router/modules/shelving.js
@@ -76,7 +76,6 @@ export default {
                     meta: {
                         title: 'basicData',
                         icon: 'vn:settings',
-                        roles: ['salesPerson'],
                     },
                     component: () => import('pages/Shelving/Card/ShelvingForm.vue'),
                 },

From 7bc288ad7197ebc5d515bb868b7cb33f8bbb16b2 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 9 Sep 2024 13:15:37 +0200
Subject: [PATCH 072/228] fix: state cell

---
 src/pages/Ticket/TicketAdvance.vue | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/pages/Ticket/TicketAdvance.vue b/src/pages/Ticket/TicketAdvance.vue
index 45bd8fd39..eb5b715ee 100644
--- a/src/pages/Ticket/TicketAdvance.vue
+++ b/src/pages/Ticket/TicketAdvance.vue
@@ -635,6 +635,7 @@ onMounted(async () => {
             <template #body-cell-state="{ row }">
                 <QTd>
                     <QBadge
+                        v-if="row.state"
                         text-color="black"
                         :color="row.classColor"
                         class="q-ma-none"
@@ -642,6 +643,7 @@ onMounted(async () => {
                     >
                         {{ row.state }}
                     </QBadge>
+                    <span v-else> {{ dashIfEmpty(row.state) }}</span>
                 </QTd>
             </template>
             <template #body-cell-import="{ row }">

From 52d8ff8ae2b5017d7f75ca8e1cf6d1dcdeb5bc75 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 9 Sep 2024 13:15:45 +0200
Subject: [PATCH 073/228] fix: isFullMovable checkbox

---
 src/pages/Ticket/TicketAdvanceFilter.vue | 11 +++++------
 src/pages/Ticket/locale/es.yml           |  2 +-
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/pages/Ticket/TicketAdvanceFilter.vue b/src/pages/Ticket/TicketAdvanceFilter.vue
index ed61d9447..209a1a307 100644
--- a/src/pages/Ticket/TicketAdvanceFilter.vue
+++ b/src/pages/Ticket/TicketAdvanceFilter.vue
@@ -55,7 +55,7 @@ onMounted(async () => await getItemPackingTypes());
         :data-key="props.dataKey"
         :search-button="true"
         :hidden-tags="['search']"
-        :un-removable-params="['warehouseFk', 'dateFuture', 'dateToAdvance']"
+        :unremovable-params="['warehouseFk', 'dateFuture', 'dateToAdvance']"
     >
         <template #tags="{ tag, formatFn }">
             <div class="q-gutter-x-xs">
@@ -119,10 +119,9 @@ onMounted(async () => await getItemPackingTypes());
             <QItem>
                 <QItemSection>
                     <QCheckbox
-                        :label="t('params.itemPackingTypes')"
-                        v-model="params.itemPackingTypes"
+                        :label="t('params.isFullMovable')"
+                        v-model="params.isFullMovable"
                         toggle-indeterminate
-                        :false-value="null"
                         @update:model-value="searchFn()"
                     />
                 </QItemSection>
@@ -155,7 +154,7 @@ en:
         dateToAdvance: Destination date
         futureIpt: Origin IPT
         ipt: Destination IPT
-        itemPackingTypes: 100% movable
+        isFullMovable: 100% movable
         warehouseFk: Warehouse
 es:
     Horizontal: Horizontal
@@ -166,6 +165,6 @@ es:
         dateToAdvance: Fecha destino
         futureIpt: IPT Origen
         ipt: IPT destino
-        itemPackingTypes: 100% movible
+        isFullMovable: 100% movible
         warehouseFk: Almacén
 </i18n>
diff --git a/src/pages/Ticket/locale/es.yml b/src/pages/Ticket/locale/es.yml
index 20b4edf16..30c5550be 100644
--- a/src/pages/Ticket/locale/es.yml
+++ b/src/pages/Ticket/locale/es.yml
@@ -105,7 +105,7 @@ advanceTickets:
     futureLines: Líneas
     futureImport: Importe
     advanceTickets: Adelantar tickets con negativos
-    advanceTicketTitle: Advance tickets
+    advanceTicketTitle: Adelantar tickets
     advanceTitleSubtitle: '¿Desea adelantar {selectedTickets} tickets?'
     noDeliveryZone: No hay una zona de reparto disponible para la fecha de envío seleccionada
     moveTicketSuccess: 'Tickets movidos correctamente {ticketsNumber}'

From bd00f86d74e9b52af56b34a126faaba11c6109e6 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 9 Sep 2024 14:09:29 +0200
Subject: [PATCH 074/228] chore: refs #4074 fix tests

---
 .../__tests__/composables/useAcl.spec.js      | 38 +++++++++++++++----
 1 file changed, 30 insertions(+), 8 deletions(-)

diff --git a/test/vitest/__tests__/composables/useAcl.spec.js b/test/vitest/__tests__/composables/useAcl.spec.js
index a2b44b5e7..6cb29984c 100644
--- a/test/vitest/__tests__/composables/useAcl.spec.js
+++ b/test/vitest/__tests__/composables/useAcl.spec.js
@@ -48,40 +48,62 @@ describe('useAcl', () => {
 
     describe('hasAny', () => {
         it('should return false if no roles matched', async () => {
-            expect(acl.hasAny('Worker', 'updateAttributes', 'WRITE')).toBeFalsy();
+            expect(
+                acl.hasAny([
+                    { model: 'Worker', props: 'updateAttributes', accessType: 'WRITE' },
+                ])
+            ).toBeFalsy();
         });
 
         it('should return false if no roles matched', async () => {
-            expect(acl.hasAny('Worker', 'holidays', 'READ')).toBeTruthy();
+            expect(
+                acl.hasAny([{ model: 'Worker', props: 'holidays', accessType: 'READ' }])
+            ).toBeTruthy();
         });
 
         describe('*', () => {
             it('should return true if an acl matched', async () => {
-                expect(acl.hasAny('Address', '*', 'WRITE')).toBeTruthy();
+                expect(
+                    acl.hasAny([{ model: 'Address', props: '*', accessType: 'WRITE' }])
+                ).toBeTruthy();
             });
 
             it('should return false if no acls matched', async () => {
-                expect(acl.hasAny('Worker', '*', 'READ')).toBeFalsy();
+                expect(
+                    acl.hasAny([{ model: 'Worker', props: '*', accessType: 'READ' }])
+                ).toBeFalsy();
             });
         });
 
         describe('$authenticated', () => {
             it('should return false if no acls matched', async () => {
-                expect(acl.hasAny('Url', 'getByUser', '*')).toBeFalsy();
+                expect(
+                    acl.hasAny([{ model: 'Url', props: 'getByUser', accessType: '*' }])
+                ).toBeFalsy();
             });
 
             it('should return true if an acl matched', async () => {
-                expect(acl.hasAny('Url', 'getByUser', 'READ')).toBeTruthy();
+                expect(
+                    acl.hasAny([{ model: 'Url', props: 'getByUser', accessType: 'READ' }])
+                ).toBeTruthy();
             });
         });
 
         describe('$everyone', () => {
             it('should return false if no acls matched', async () => {
-                expect(acl.hasAny('TpvTransaction', 'start', 'READ')).toBeFalsy();
+                expect(
+                    acl.hasAny([
+                        { model: 'TpvTransaction', props: 'start', accessType: 'READ' },
+                    ])
+                ).toBeFalsy();
             });
 
             it('should return false if an acl matched', async () => {
-                expect(acl.hasAny('TpvTransaction', 'start', 'WRITE')).toBeTruthy();
+                expect(
+                    acl.hasAny([
+                        { model: 'TpvTransaction', props: 'start', accessType: 'WRITE' },
+                    ])
+                ).toBeTruthy();
             });
         });
     });

From 67b2cd3a0b81a19109cc958e485d5b6800d0f152 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 9 Sep 2024 14:58:26 +0200
Subject: [PATCH 075/228] feat: stateGroupedFilter

---
 src/pages/Ticket/TicketFuture.vue       | 19 +++++++++++--------
 src/pages/Ticket/TicketFutureFilter.vue | 18 +++++++++---------
 2 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/src/pages/Ticket/TicketFuture.vue b/src/pages/Ticket/TicketFuture.vue
index 14a4a5ac8..2078d0595 100644
--- a/src/pages/Ticket/TicketFuture.vue
+++ b/src/pages/Ticket/TicketFuture.vue
@@ -49,8 +49,8 @@ const exprBuilder = (param, value) => {
 };
 
 const userParams = reactive({
-    futureDated: Date.vnNew().toISOString(),
-    originDated: Date.vnNew().toISOString(),
+    futureScopeDays: Date.vnNew().toISOString(),
+    originScopeDays: Date.vnNew().toISOString(),
     warehouseFk: user.value.warehouseFk,
 });
 
@@ -62,8 +62,8 @@ const arrayData = useArrayData('FutureTickets', {
 const { store } = arrayData;
 
 const params = reactive({
-    futureDated: Date.vnNew(),
-    originDated: Date.vnNew(),
+    futureScopeDays: Date.vnNew(),
+    originScopeDays: Date.vnNew(),
     warehouseFk: user.value.warehouseFk,
 });
 
@@ -172,7 +172,7 @@ const ticketColumns = computed(() => [
         label: t('futureTickets.availableLines'),
         name: 'lines',
         field: 'lines',
-        align: 'left',
+        align: 'center',
         sortable: true,
         columnFilter: {
             component: VnInput,
@@ -234,7 +234,7 @@ const ticketColumns = computed(() => [
     {
         label: t('futureTickets.futureState'),
         name: 'futureState',
-        align: 'left',
+        align: 'right',
         sortable: true,
         columnFilter: null,
         format: (val) => dashIfEmpty(val),
@@ -458,7 +458,7 @@ onMounted(async () => {
                 </QTd>
             </template>
             <template #body-cell-shipped="{ row }">
-                <QTd>
+                <QTd class="shipped">
                     <QBadge
                         text-color="black"
                         :color="getDateQBadgeColor(row.shipped)"
@@ -505,7 +505,7 @@ onMounted(async () => {
                 </QTd>
             </template>
             <template #body-cell-futureShipped="{ row }">
-                <QTd>
+                <QTd class="shipped">
                     <QBadge
                         text-color="black"
                         :color="getDateQBadgeColor(row.futureShipped)"
@@ -532,6 +532,9 @@ onMounted(async () => {
 </template>
 
 <style scoped lang="scss">
+.shipped {
+    min-width: 132px;
+}
 .vertical-separator {
     border-left: 4px solid white !important;
 }
diff --git a/src/pages/Ticket/TicketFutureFilter.vue b/src/pages/Ticket/TicketFutureFilter.vue
index c5e647d64..bb597a525 100644
--- a/src/pages/Ticket/TicketFutureFilter.vue
+++ b/src/pages/Ticket/TicketFutureFilter.vue
@@ -68,7 +68,7 @@ onMounted(async () => {
     <VnFilterPanel
         :data-key="props.dataKey"
         :hidden-tags="['search']"
-        :un-removable-params="['warehouseFk', 'originDated', 'futureDated']"
+        :un-removable-params="['warehouseFk', 'originScopeDays ', 'futureScopeDays']"
     >
         <template #tags="{ tag, formatFn }">
             <div class="q-gutter-x-xs">
@@ -80,8 +80,8 @@ onMounted(async () => {
             <QItem class="q-my-sm">
                 <QItemSection>
                     <VnInputDate
-                        v-model="params.originDated"
-                        :label="t('params.originDated')"
+                        v-model="params.originScopeDays"
+                        :label="t('params.originScopeDays')"
                         is-outlined
                     />
                 </QItemSection>
@@ -89,8 +89,8 @@ onMounted(async () => {
             <QItem class="q-my-sm">
                 <QItemSection>
                     <VnInputDate
-                        v-model="params.futureDated"
-                        :label="t('params.futureDated')"
+                        v-model="params.futureScopeDays"
+                        :label="t('params.futureScopeDays')"
                         is-outlined
                     />
                 </QItemSection>
@@ -214,8 +214,8 @@ onMounted(async () => {
 en:
     iptInfo: IPT
     params:
-        originDated: Origin date
-        futureDated: Destination date
+        originScopeDays: Origin date
+        futureScopeDays: Destination date
         futureIpt: Destination IPT
         ipt: Origin IPT
         warehouseFk: Warehouse
@@ -229,8 +229,8 @@ es:
     Vertical: Vertical
     iptInfo: Encajado
     params:
-        originDated: Fecha origen
-        futureDated: Fecha destino
+        originScopeDays: Fecha origen
+        futureScopeDays: Fecha destino
         futureIpt: IPT destino
         ipt: IPT Origen
         warehouseFk: Almacén

From 26c7dfde35095ad44f64be45d4be8de70fdd6002 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 9 Sep 2024 16:44:43 +0200
Subject: [PATCH 076/228] chore: refs #4074 fix tests

---
 src/components/common/VnSelectDialog.vue         | 4 ++--
 src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/common/VnSelectDialog.vue b/src/components/common/VnSelectDialog.vue
index 7338e752d..219e6dc98 100644
--- a/src/components/common/VnSelectDialog.vue
+++ b/src/components/common/VnSelectDialog.vue
@@ -44,7 +44,7 @@ const isAllowedToCreate = computed(() => {
     >
         <template v-if="isAllowedToCreate" #append>
             <QIcon
-                @click.stop.prevent="showForm = true"
+                @click.stop.prevent="$refs.dialog.show()"
                 :name="actionIcon"
                 :size="actionIcon === 'add' ? 'xs' : 'sm'"
                 :class="['default-icon', { '--add-icon': actionIcon === 'add' }]"
@@ -54,7 +54,7 @@ const isAllowedToCreate = computed(() => {
             >
                 <QTooltip v-if="tooltip">{{ tooltip }}</QTooltip>
             </QIcon>
-            <QDialog v-model="showForm" transition-show="scale" transition-hide="scale">
+            <QDialog ref="dialog" transition-show="scale" transition-hide="scale">
                 <slot name="form" />
             </QDialog>
         </template>
diff --git a/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue b/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue
index b7f470b0c..ee829ccdd 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue
@@ -294,7 +294,7 @@ const createInvoiceInCorrection = async () => {
                 </template>
             </InvoiceInToBook>
             <QItem
-                v-if="entity?.isBooked && canEditProp('toUnBook')"
+                v-if="entity?.isBooked && canEditProp('toUnbook')"
                 v-ripple
                 clickable
                 @click="triggerMenu('unbook')"

From 04aa96b798661a0d8bfe4b1f002eed4966ac1d95 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 9 Sep 2024 17:01:36 +0200
Subject: [PATCH 077/228] chore: refs #4074 fix tests

---
 test/cypress/integration/outLogin/login.spec.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/cypress/integration/outLogin/login.spec.js b/test/cypress/integration/outLogin/login.spec.js
index f8a9f5c64..6757ba7d0 100755
--- a/test/cypress/integration/outLogin/login.spec.js
+++ b/test/cypress/integration/outLogin/login.spec.js
@@ -53,8 +53,8 @@ describe('Login', () => {
     });
 
     it(`should get redirected to dashboard since employee can't create tickets`, () => {
-        cy.visit('/#/ticket/create', { failOnStatusCode: false });
-        cy.url().should('contain', '/#/login?redirect=/ticket/create');
+        cy.visit('/#/account/ldap', { failOnStatusCode: false });
+        cy.url().should('contain', '/#/login?redirect=/account/ldap');
         cy.get('input[aria-label="Username"]').type('employee');
         cy.get('input[aria-label="Password"]').type('nightmare');
         cy.get('button[type="submit"]').click();

From f8cbb0a7629d7ffd9dd6145c12722deb73411162 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 9 Sep 2024 17:10:35 +0200
Subject: [PATCH 078/228] chore: refs #4074 fix tests

---
 src/pages/Worker/Card/WorkerLocker.vue | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/pages/Worker/Card/WorkerLocker.vue b/src/pages/Worker/Card/WorkerLocker.vue
index ba5c0de97..4a19e472c 100644
--- a/src/pages/Worker/Card/WorkerLocker.vue
+++ b/src/pages/Worker/Card/WorkerLocker.vue
@@ -57,7 +57,11 @@ const init = async (data) => {
                 option-label="code"
                 option-value="id"
                 hide-selected
-                :readonly="!hasAny('Worker','__get__locker','READ')"
+                :readonly="
+                    !hasAny([
+                        { model: 'Worker', props: '__get__locker', accessType: 'READ' },
+                    ])
+                "
             />
         </template>
     </FormModel>

From f3471fe5ab683768331a2c6c566156d8954a4c2f Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 9 Sep 2024 17:20:16 +0200
Subject: [PATCH 079/228] fix: refs #4074 await to watch

---
 src/components/ui/VnPaginate.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/ui/VnPaginate.vue b/src/components/ui/VnPaginate.vue
index d51b0fcef..441a8ff48 100644
--- a/src/components/ui/VnPaginate.vue
+++ b/src/components/ui/VnPaginate.vue
@@ -120,7 +120,7 @@ watch(
 
 watch(
     () => [props.url, props.filter, props.userParams],
-    ([url, filter, userParams]) => fetch({ url, filter, userParams })
+    ([url, filter, userParams]) => mounted.value && fetch({ url, filter, userParams })
 );
 
 const addFilter = async (filter, params) => {

From e1adb1a8dd7c30f7cc764b5f00e2ca0846565ac3 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Tue, 10 Sep 2024 08:01:28 +0200
Subject: [PATCH 080/228] refactor: refs #6346 requested changes

---
 src/pages/Wagon/Type/WagonCreateTray.vue | 8 +++-----
 src/pages/Wagon/Type/WagonTypeEdit.vue   | 4 ++++
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/pages/Wagon/Type/WagonCreateTray.vue b/src/pages/Wagon/Type/WagonCreateTray.vue
index c3f8b3847..bb52e747b 100644
--- a/src/pages/Wagon/Type/WagonCreateTray.vue
+++ b/src/pages/Wagon/Type/WagonCreateTray.vue
@@ -39,7 +39,7 @@ watch(wagonColors, () => {
 const emit = defineEmits(['onSubmit']);
 
 async function getTrays() {
-    const data = await axios.get('WagonTypeTrays', undefined, {
+    const { data } = await axios.get('WagonTypeTrays', undefined, {
         filter: { wagonTypeFk: entityId.value },
     });
     existingTrayHeight.value = data.data.filter(
@@ -49,13 +49,11 @@ async function getTrays() {
 }
 
 function onSubmit() {
-    const newTray = {
+    emit('onSubmit', {
         wagonTypeFk: entityId.value,
         wagonTypeColorFk: selectedTrayColor.value,
         height: trayHeight.value,
-    };
-
-    emit('onSubmit', newTray);
+    });
 }
 getTrays();
 </script>
diff --git a/src/pages/Wagon/Type/WagonTypeEdit.vue b/src/pages/Wagon/Type/WagonTypeEdit.vue
index 25ba05714..dc261990f 100644
--- a/src/pages/Wagon/Type/WagonTypeEdit.vue
+++ b/src/pages/Wagon/Type/WagonTypeEdit.vue
@@ -56,6 +56,10 @@ async function deleteTray(trayToDelete) {
             type: 'positive',
         });
     } catch (err) {
+        notify({
+            message: t('Error deleting tray'),
+            type: 'negative',
+        });
         console.log('err: ', err);
     }
 }

From 30ffb2428ea7e549681a3d2d360dfdb7aee1b92e Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Tue, 10 Sep 2024 08:28:48 +0200
Subject: [PATCH 081/228] perf: refs #6346 previous changes

---
 src/pages/Wagon/Type/WagonCreateTray.vue |  4 +--
 src/pages/Wagon/Type/WagonTypeEdit.vue   | 40 +++++++++---------------
 2 files changed, 15 insertions(+), 29 deletions(-)

diff --git a/src/pages/Wagon/Type/WagonCreateTray.vue b/src/pages/Wagon/Type/WagonCreateTray.vue
index bb52e747b..304fa83ac 100644
--- a/src/pages/Wagon/Type/WagonCreateTray.vue
+++ b/src/pages/Wagon/Type/WagonCreateTray.vue
@@ -42,9 +42,7 @@ async function getTrays() {
     const { data } = await axios.get('WagonTypeTrays', undefined, {
         filter: { wagonTypeFk: entityId.value },
     });
-    existingTrayHeight.value = data.data.filter(
-        (item) => item.wagonTypeFk == entityId.value
-    );
+    existingTrayHeight.value = data.filter((item) => item.wagonTypeFk == entityId.value);
     heights.value = existingTrayHeight.value.map((item) => item.height);
 }
 
diff --git a/src/pages/Wagon/Type/WagonTypeEdit.vue b/src/pages/Wagon/Type/WagonTypeEdit.vue
index dc261990f..eb8205d72 100644
--- a/src/pages/Wagon/Type/WagonTypeEdit.vue
+++ b/src/pages/Wagon/Type/WagonTypeEdit.vue
@@ -32,36 +32,24 @@ async function loadTrays() {
 }
 
 async function addTray(newTray) {
-    try {
-        const res = await axios.post(`WagonTypeTrays`, newTray);
-        wagonTrays.value.push(res.data);
-        notify({
-            message: t(`Tray added successfully`),
-            type: 'positive',
-        });
-    } catch (err) {
-        console.log('err: ', err);
-    }
+    const res = await axios.post(`WagonTypeTrays`, newTray);
+    wagonTrays.value.push(res.data);
+    notify({
+        message: t(`Tray added successfully`),
+        type: 'positive',
+    });
 }
 
 async function deleteTray(trayToDelete) {
-    try {
-        await axios.delete(`WagonTypeTrays/${trayToDelete.id}`);
-        const index = wagonTrays.value.findIndex((tray) => tray.id === trayToDelete.id);
-        if (index !== -1) {
-            wagonTrays.value.splice(index, 1);
-        }
-        notify({
-            message: t('Tray deleted successfully'),
-            type: 'positive',
-        });
-    } catch (err) {
-        notify({
-            message: t('Error deleting tray'),
-            type: 'negative',
-        });
-        console.log('err: ', err);
+    await axios.delete(`WagonTypeTrays/${trayToDelete.id}`);
+    const index = wagonTrays.value.findIndex((tray) => tray.id === trayToDelete.id);
+    if (index !== -1) {
+        wagonTrays.value.splice(index, 1);
     }
+    notify({
+        message: t('Tray deleted successfully'),
+        type: 'positive',
+    });
 }
 
 const filter = {

From 3fafb15eb8cd0da28757a9d1a20a5518b021824e Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Tue, 10 Sep 2024 09:18:57 +0200
Subject: [PATCH 082/228] refactor: refs #4074 use fn

---
 src/pages/Item/Card/ItemSummary.vue            | 18 ++++++++----------
 .../cypress/integration/outLogin/login.spec.js |  2 +-
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/src/pages/Item/Card/ItemSummary.vue b/src/pages/Item/Card/ItemSummary.vue
index 081eb2afb..7b6015c30 100644
--- a/src/pages/Item/Card/ItemSummary.vue
+++ b/src/pages/Item/Card/ItemSummary.vue
@@ -20,6 +20,7 @@ const route = useRoute();
 const { t } = useI18n();
 
 const entityId = computed(() => $props.id || route.params.id);
+const getUrl = (id, param) => `#/Item/${id}/${param}`;
 </script>
 <template>
     <CardSummary
@@ -53,7 +54,7 @@ const entityId = computed(() => $props.id || route.params.id);
             </QCard>
             <QCard class="vn-one">
                 <VnTitle
-                    :url="`#/item/${entityId}/basic-data`"
+                    :url="getUrl(entityId, 'basic-data')"
                     :text="t('item.summary.basicData')"
                 />
                 <VnLv :label="t('item.summary.name')" :value="item.name" />
@@ -87,7 +88,7 @@ const entityId = computed(() => $props.id || route.params.id);
             </QCard>
             <QCard class="vn-one">
                 <VnTitle
-                    :url="`#/item/${entityId}/basic-data`"
+                    :url="getUrl(entityId, 'basic-data')"
                     :text="t('item.summary.otherData')"
                 />
                 <VnLv
@@ -114,10 +115,7 @@ const entityId = computed(() => $props.id || route.params.id);
                 />
             </QCard>
             <QCard class="vn-one">
-                <VnTitle
-                    :url="`#/item/${entityId}/tags`"
-                    :text="t('item.summary.tags')"
-                />
+                <VnTitle :url="getUrl(entityId, 'tags')" :text="t('item.summary.tags')" />
                 <VnLv
                     v-for="(tag, index) in tags"
                     :key="index"
@@ -127,13 +125,13 @@ const entityId = computed(() => $props.id || route.params.id);
             </QCard>
             <QCard class="vn-one" v-if="item.description">
                 <VnTitle
-                    :url="`#/item/${entityId}/basic-data`"
+                    :url="getUrl(entityId, 'basic-data')"
                     :text="t('item.summary.description')"
                 />
                 <p v-text="item.description" />
             </QCard>
             <QCard class="vn-one">
-                <VnTitle :url="`#/item/${entityId}/tax`" :text="t('item.summary.tax')" />
+                <VnTitle :url="getUrl(entityId, 'tax')" :text="t('item.summary.tax')" />
                 <VnLv
                     v-for="(tax, index) in item.taxes"
                     :key="index"
@@ -143,7 +141,7 @@ const entityId = computed(() => $props.id || route.params.id);
             </QCard>
             <QCard class="vn-one">
                 <VnTitle
-                    :url="`#/item/${entityId}/botanical`"
+                    :url="getUrl(entityId, 'botanical')"
                     :text="t('item.summary.botanical')"
                 />
                 <VnLv :label="t('item.summary.genus')" :value="botanical?.genus?.name" />
@@ -154,7 +152,7 @@ const entityId = computed(() => $props.id || route.params.id);
             </QCard>
             <QCard class="vn-one">
                 <VnTitle
-                    :url="`#/item/${entityId}/barcode`"
+                    :url="getUrl(entityId, 'barcode')"
                     :text="t('item.summary.barcode')"
                 />
                 <p
diff --git a/test/cypress/integration/outLogin/login.spec.js b/test/cypress/integration/outLogin/login.spec.js
index 6757ba7d0..3db223cdb 100755
--- a/test/cypress/integration/outLogin/login.spec.js
+++ b/test/cypress/integration/outLogin/login.spec.js
@@ -52,7 +52,7 @@ describe('Login', () => {
         cy.url().should('contain', '/login');
     });
 
-    it(`should get redirected to dashboard since employee can't create tickets`, () => {
+    it(`should be redirected to dashboard since the employee is not enabled to see ldap`, () => {
         cy.visit('/#/account/ldap', { failOnStatusCode: false });
         cy.url().should('contain', '/#/login?redirect=/account/ldap');
         cy.get('input[aria-label="Username"]').type('employee');

From 5cc1d0cec42a6c9cdcbf84d0e5a455d209105fcd Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Tue, 10 Sep 2024 10:04:40 +0200
Subject: [PATCH 083/228] chore: refs #7663 drop useless code

---
 src/pages/Ticket/Card/TicketDescriptorMenu.vue | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/pages/Ticket/Card/TicketDescriptorMenu.vue b/src/pages/Ticket/Card/TicketDescriptorMenu.vue
index 9491579f8..4cf4e633f 100644
--- a/src/pages/Ticket/Card/TicketDescriptorMenu.vue
+++ b/src/pages/Ticket/Card/TicketDescriptorMenu.vue
@@ -170,15 +170,10 @@ async function sendSms(body) {
 }
 
 function openConfirmDialog(callback) {
-    const message =
-        callback == 'setWeight'
-            ? t('Es posible que se facture este ticket, desea continuar?')
-            : undefined;
     dialog({
         component: VnConfirm,
         componentProps: {
             promise: actions[callback],
-            message,
         },
     });
 }

From 6d017d8c99aa3cc62ebc6a89d86b4828a4e174f6 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Tue, 10 Sep 2024 10:33:55 +0200
Subject: [PATCH 084/228] build: init version 2440

---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index f25e570a3..eaffd8d85 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "salix-front",
-    "version": "24.36.0",
+    "version": "24.40.0",
     "description": "Salix frontend",
     "productName": "Salix",
     "author": "Verdnatura",
@@ -62,4 +62,4 @@
         "vite": "^5.1.4",
         "vitest": "^0.31.1"
     }
-}
+}
\ No newline at end of file

From 622afca9be3859ef2777b241d2b3c82d5d4034b6 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Tue, 10 Sep 2024 15:17:10 +0200
Subject: [PATCH 085/228] feat: CustomerSample to VnTable

---
 src/components/LeftMenuItem.vue               |  2 +-
 src/components/VnTable/VnTable.vue            |  6 +-
 .../Customer/Card/CustomerBillingData.vue     |  4 +-
 src/pages/Customer/Card/CustomerGreuges.vue   |  1 -
 src/pages/Customer/Card/CustomerSamples.vue   | 80 ++++++-----------
 .../components/CustomerAddressCreate.vue      |  4 +-
 .../components/CustomerAddressEdit.vue        |  8 +-
 .../CustomerFileManagementCreate.vue          | 12 +--
 .../components/CustomerFileManagementEdit.vue | 10 +--
 .../components/CustomerSamplesCreate.vue      | 90 ++++++++-----------
 .../components/CustomerSummaryTable.vue       |  1 +
 src/pages/Dashboard/DashboardMain.vue         |  2 +-
 .../Department/Card/DepartmentBasicData.vue   |  4 +-
 13 files changed, 93 insertions(+), 131 deletions(-)

diff --git a/src/components/LeftMenuItem.vue b/src/components/LeftMenuItem.vue
index 9fe66e278..2a6de5e2e 100644
--- a/src/components/LeftMenuItem.vue
+++ b/src/components/LeftMenuItem.vue
@@ -36,7 +36,7 @@ const itemComputed = computed(() => {
         <QItemSection>
             {{ t(itemComputed.title) }}
             <QTooltip>
-                {{ 'Ctrl + Alt + ' + item.keyBinding.toUpperCase() }}
+                {{ 'Ctrl + Alt + ' + item?.keyBinding?.toUpperCase() }}
             </QTooltip>
         </QItemSection>
         <QItemSection side>
diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index 4ba7d0227..964dafabe 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -363,7 +363,7 @@ function handleOnDataSaved(_, res) {
     <!-- class in div to fix warn-->
     <CrudModel
         v-bind="$attrs"
-        :class="$attrs['class']"
+        :class="$attrs['class'] ?? 'q-px-md'"
         :limit="$attrs['limit'] ?? 20"
         ref="CrudModelRef"
         @on-fetch="(...args) => emit('onFetch', ...args)"
@@ -638,7 +638,7 @@ function handleOnDataSaved(_, res) {
             </QTable>
         </template>
     </CrudModel>
-    <QPageSticky :offset="[20, 20]" style="z-index: 2">
+    <QPageSticky v-if="$props.create" :offset="[20, 20]" style="z-index: 2">
         <QBtn
             @click="
                 () =>
@@ -650,7 +650,7 @@ function handleOnDataSaved(_, res) {
             shortcut="+"
         />
         <QTooltip>
-            {{ createForm.title }}
+            {{ createForm?.title }}
         </QTooltip>
     </QPageSticky>
     <QDialog v-model="showForm" transition-show="scale" transition-hide="scale">
diff --git a/src/pages/Customer/Card/CustomerBillingData.vue b/src/pages/Customer/Card/CustomerBillingData.vue
index 290bde909..e375846c9 100644
--- a/src/pages/Customer/Card/CustomerBillingData.vue
+++ b/src/pages/Customer/Card/CustomerBillingData.vue
@@ -31,8 +31,8 @@ const getBankEntities = (data, formData) => {
 </script>
 
 <template>
-    <fetch-data @on-fetch="(data) => (payMethods = data)" auto-load url="PayMethods" />
-    <fetch-data
+    <FetchData @on-fetch="(data) => (payMethods = data)" auto-load url="PayMethods" />
+    <FetchData
         ref="bankEntitiesRef"
         @on-fetch="(data) => (bankEntitiesOptions = data)"
         :filter="filter"
diff --git a/src/pages/Customer/Card/CustomerGreuges.vue b/src/pages/Customer/Card/CustomerGreuges.vue
index 8a83d49db..1c78392e7 100644
--- a/src/pages/Customer/Card/CustomerGreuges.vue
+++ b/src/pages/Customer/Card/CustomerGreuges.vue
@@ -47,7 +47,6 @@ const columns = computed(() => [
     },
     {
         align: 'left',
-        // name: 'userFk',
         label: t('Created by'),
         component: 'userLink',
         attrs: ({ row }) => {
diff --git a/src/pages/Customer/Card/CustomerSamples.vue b/src/pages/Customer/Card/CustomerSamples.vue
index e28e290f4..49697aab7 100644
--- a/src/pages/Customer/Card/CustomerSamples.vue
+++ b/src/pages/Customer/Card/CustomerSamples.vue
@@ -3,18 +3,18 @@ import { ref, computed } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute, useRouter } from 'vue-router';
 
-import { QBtn } from 'quasar';
+import { QBtn, useQuasar } from 'quasar';
 
-import FetchData from 'components/FetchData.vue';
 import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
 import { toDateTimeFormat } from 'src/filters/date';
+import VnTable from 'src/components/VnTable/VnTable.vue';
+import { dashIfEmpty } from 'src/filters';
+import CustomerSamplesCreate from '../components/CustomerSamplesCreate.vue';
 
 const { t } = useI18n();
 const route = useRoute();
 const router = useRouter();
 
-const rows = ref([]);
-
 const filter = {
     include: [
         { relation: 'type', scope: { fields: ['code', 'description'] } },
@@ -26,91 +26,67 @@ const filter = {
     limit: 20,
 };
 
-const basicSpan = {
-    component: 'span',
-    props: () => {},
-    event: () => {},
-};
-const tableColumnComponents = {
-    sent: basicSpan,
-    description: basicSpan,
-    worker: {
-        component: 'span',
-        props: () => ({ class: 'link' }),
-        event: () => {},
-    },
-    company: basicSpan,
-};
-
 const columns = computed(() => [
     {
         align: 'left',
-        field: 'created',
+        name: 'created',
         label: t('Sent'),
-        name: 'sent',
-        format: (value) => toDateTimeFormat(value),
+        format: ({ created }) => toDateTimeFormat(created),
     },
     {
         align: 'left',
-        field: (value) => value.type.description,
+        format: (row) => row.type.description,
         label: t('Description'),
         name: 'description',
     },
     {
         align: 'left',
-        field: (value) => value.user.name,
         label: t('Worker'),
         name: 'worker',
     },
     {
         align: 'left',
-        field: (value) => value.company?.code,
+        format: ({ company }) => company?.code ?? dashIfEmpty(company),
         label: t('Company'),
         name: 'company',
     },
 ]);
+const quasar = useQuasar();
 
 const toCustomerSamplesCreate = () => {
-    router.push({ name: 'CustomerSamplesCreate' });
+    quasar
+        .dialog({
+            component: CustomerSamplesCreate,
+        })
+        .onOk(() => tableRef.value.reload());
 };
+const tableRef = ref();
 </script>
 
 <template>
-    <FetchData
-        :filter="filter"
-        @on-fetch="(data) => (rows = data)"
+    <VnTable
+        ref="tableRef"
+        data-key="ClientSamples"
         auto-load
+        :filter="filter"
         url="ClientSamples"
-    />
-
-    <QTable
         :columns="columns"
         :pagination="{ rowsPerPage: 12 }"
+        :disable-option="{ card: true }"
         :rows="rows"
         class="full-width q-mt-md"
         row-key="id"
+        :create="false"
         :no-data-label="t('globals.noResults')"
     >
-        <template #body-cell="props">
-            <QTd auto-width :props="props">
-                <span :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)"
-                        :title="props.value"
-                    >
-                        {{ props.value }}
-                        <WorkerDescriptorProxy
-                            :id="props.row.userFk"
-                            v-if="props.col.name === 'worker'"
-                        />
-                    </component>
-                </span>
-            </QTd>
+        <template #column-worker="{ row }">
+            <div v-if="row.user">
+                <span class="link">{{ row.user?.name }}</span
+                ><WorkerDescriptorProxy :id="row.userFk" />
+            </div>
+            <span v-else>{{ dashIfEmpty(row.user) }}</span>
         </template>
-    </QTable>
+    </VnTable>
 
     <QPageSticky :offset="[18, 18]">
         <QBtn @click.stop="toCustomerSamplesCreate()" color="primary" fab icon="add" />
diff --git a/src/pages/Customer/components/CustomerAddressCreate.vue b/src/pages/Customer/components/CustomerAddressCreate.vue
index 30e4b21d0..f93406185 100644
--- a/src/pages/Customer/components/CustomerAddressCreate.vue
+++ b/src/pages/Customer/components/CustomerAddressCreate.vue
@@ -57,12 +57,12 @@ function handleLocation(data, location) {
 </script>
 
 <template>
-    <fetch-data
+    <FetchData
         @on-fetch="(data) => (agencyModes = data)"
         auto-load
         url="AgencyModes/isActive"
     />
-    <fetch-data @on-fetch="(data) => (incoterms = data)" auto-load url="Incoterms" />
+    <FetchData @on-fetch="(data) => (incoterms = data)" auto-load url="Incoterms" />
 
     <FormModel
         :form-initial-data="formInitialData"
diff --git a/src/pages/Customer/components/CustomerAddressEdit.vue b/src/pages/Customer/components/CustomerAddressEdit.vue
index 7a4c44014..ddcb8e2d6 100644
--- a/src/pages/Customer/components/CustomerAddressEdit.vue
+++ b/src/pages/Customer/components/CustomerAddressEdit.vue
@@ -113,18 +113,18 @@ function handleLocation(data, location) {
 </script>
 
 <template>
-    <fetch-data
+    <FetchData
         @on-fetch="(data) => (agencyModes = data)"
         auto-load
         url="AgencyModes/isActive"
     />
-    <fetch-data @on-fetch="(data) => (incoterms = data)" auto-load url="Incoterms" />
-    <fetch-data
+    <FetchData @on-fetch="(data) => (incoterms = data)" auto-load url="Incoterms" />
+    <FetchData
         @on-fetch="(data) => (customsAgents = data)"
         auto-load
         url="CustomsAgents"
     />
-    <fetch-data @on-fetch="getData" auto-load url="ObservationTypes" />
+    <FetchData @on-fetch="getData" auto-load url="ObservationTypes" />
 
     <FormModel
         :observe-form-changes="false"
diff --git a/src/pages/Customer/components/CustomerFileManagementCreate.vue b/src/pages/Customer/components/CustomerFileManagementCreate.vue
index 7c15e0b71..f33a47bcc 100644
--- a/src/pages/Customer/components/CustomerFileManagementCreate.vue
+++ b/src/pages/Customer/components/CustomerFileManagementCreate.vue
@@ -83,35 +83,35 @@ const toCustomerFileManagement = () => {
 </script>
 
 <template>
-    <fetch-data
+    <FetchData
         @on-fetch="(data) => (client = data)"
         auto-load
         :url="`Clients/${route.params.id}/getCard`"
     />
-    <fetch-data
+    <FetchData
         :filter="filterFindOne"
         @on-fetch="(data) => (findOne = data)"
         auto-load
         url="DmsTypes/findOne"
     />
-    <fetch-data
+    <FetchData
         @on-fetch="(data) => (allowedContentTypes = data)"
         auto-load
         url="DmsContainers/allowedContentTypes"
     />
-    <fetch-data
+    <FetchData
         :filter="filterCompanies"
         @on-fetch="(data) => (optionsCompanies = data)"
         auto-load
         url="Companies"
     />
-    <fetch-data
+    <FetchData
         :filter="filterWarehouses"
         @on-fetch="(data) => (optionsWarehouses = data)"
         auto-load
         url="Warehouses"
     />
-    <fetch-data
+    <FetchData
         :filter="filterWarehouses"
         @on-fetch="(data) => (optionsDmsTypes = data)"
         auto-load
diff --git a/src/pages/Customer/components/CustomerFileManagementEdit.vue b/src/pages/Customer/components/CustomerFileManagementEdit.vue
index 80eaa44f9..107f41330 100644
--- a/src/pages/Customer/components/CustomerFileManagementEdit.vue
+++ b/src/pages/Customer/components/CustomerFileManagementEdit.vue
@@ -69,25 +69,25 @@ const toCustomerFileManagement = () => {
 </script>
 
 <template>
-    <fetch-data :url="`Dms/${route.params.dmsId}`" @on-fetch="setCurrentDms" auto-load />
-    <fetch-data
+    <FetchData :url="`Dms/${route.params.dmsId}`" @on-fetch="setCurrentDms" auto-load />
+    <FetchData
         @on-fetch="(data) => (allowedContentTypes = data)"
         auto-load
         url="DmsContainers/allowedContentTypes"
     />
-    <fetch-data
+    <FetchData
         :filter="filterCompanies"
         @on-fetch="(data) => (optionsCompanies = data)"
         auto-load
         url="Companies"
     />
-    <fetch-data
+    <FetchData
         :filter="filterWarehouses"
         @on-fetch="(data) => (optionsWarehouses = data)"
         auto-load
         url="Warehouses"
     />
-    <fetch-data
+    <FetchData
         :filter="filterWarehouses"
         @on-fetch="(data) => (optionsDmsTypes = data)"
         auto-load
diff --git a/src/pages/Customer/components/CustomerSamplesCreate.vue b/src/pages/Customer/components/CustomerSamplesCreate.vue
index 79f4fe449..c7772ab4e 100644
--- a/src/pages/Customer/components/CustomerSamplesCreate.vue
+++ b/src/pages/Customer/components/CustomerSamplesCreate.vue
@@ -5,7 +5,7 @@ import { useRoute, useRouter } from 'vue-router';
 
 import axios from 'axios';
 import { usePrintService } from 'composables/usePrintService';
-import { useQuasar } from 'quasar';
+import { useDialogPluginComponent, useQuasar } from 'quasar';
 
 import { useState } from 'src/composables/useState';
 import { useValidator } from 'src/composables/useValidator';
@@ -18,6 +18,10 @@ import VnInput from 'src/components/common/VnInput.vue';
 import VnInputDate from 'src/components/common/VnInputDate.vue';
 import CustomerSamplesPreview from 'src/pages/Customer/components/CustomerSamplesPreview.vue';
 import { useStateStore } from 'stores/useStateStore';
+import FormPopup from 'src/components/FormPopup.vue';
+defineEmits(['confirm', ...useDialogPluginComponent.emits]);
+
+const { dialogRef, onDialogOK } = useDialogPluginComponent();
 
 const { notify } = useNotify();
 const { t } = useI18n();
@@ -181,6 +185,7 @@ const onDataSaved = async () => {
         const samplesData = await getSamples();
         const path = `${samplesData.model}/${route.params.id}/${samplesData.code}-email`;
         await sendEmail(path, params);
+        onDialogOK(params);
     } catch (error) {
         notify('errors.create', 'negative');
     }
@@ -197,73 +202,54 @@ const toCustomerSamples = () => {
 </script>
 
 <template>
-    <fetch-data
+    <FetchData
         :filter="filterEmailUsers"
         @on-fetch="setEmailUser"
         auto-load
         url="EmailUsers"
     />
-    <fetch-data
+    <FetchData
         :filter="filterClientsAddresses"
         :url="`Clients/${route.params.id}/addresses`"
         @on-fetch="setClientsAddresses"
         auto-load
     />
-    <fetch-data
+    <FetchData
         :filter="filterCompanies"
         @on-fetch="(data) => (optionsCompanies = data)"
         auto-load
         url="Companies"
     />
-    <fetch-data
+    <FetchData
         :filter="filterSamplesVisible"
         @on-fetch="(data) => (optionsSamplesVisible = data)"
         auto-load
         url="Samples/visible"
     />
 
-    <Teleport v-if="stateStore?.isSubToolbarShown()" to="#st-actions">
-        <QBtnGroup push class="q-gutter-x-sm">
-            <QBtn
-                :label="t('globals.cancel')"
-                @click="toCustomerSamples"
-                color="primary"
-                flat
-                icon="close"
-            />
-            <QBtn
-                :disabled="isLoading || !sampleType?.hasPreview"
-                :label="t('Preview')"
-                :loading="isLoading"
-                @click.stop="getPreview()"
-                color="primary"
-                flat
-                icon="preview"
-            />
-            <QBtn
-                :disabled="!hasChanged"
-                :label="t('globals.reset')"
-                :loading="isLoading"
-                @click="setInitialData"
-                color="primary"
-                flat
-                icon="restart_alt"
-                type="reset"
-            />
-            <QBtn
-                :disabled="!hasChanged"
-                :label="t('globals.save')"
-                :loading="isLoading"
-                @click="onSubmit"
-                color="primary"
-                icon="save"
-            />
-        </QBtnGroup>
-    </Teleport>
-
-    <div class="full-width flex justify-center">
-        <QCard class="card-width q-pa-lg">
-            <QForm>
+    <QDialog ref="dialogRef">
+        <FormPopup
+            :default-cancel-button="false"
+            :default-submit-button="false"
+            @on-submit="onSubmit()"
+        >
+            <template #custom-buttons>
+                <QBtn
+                    :disabled="isLoading || !sampleType?.hasPreview"
+                    :label="t('Preview')"
+                    :loading="isLoading"
+                    @click.stop="getPreview()"
+                    color="primary"
+                    flat
+                    icon="preview" /><QBtn
+                    :disabled="!hasChanged"
+                    :label="t('globals.save')"
+                    :loading="isLoading"
+                    @click="onSubmit"
+                    color="primary"
+                    icon="save"
+            /></template>
+            <template #form-inputs>
                 <div class="col">
                     <VnSelect
                         :label="t('Sample')"
@@ -371,15 +357,15 @@ const toCustomerSamples = () => {
                             required="true"
                             v-model="initialData.from"
                         />
-                    </div>
-                </VnRow>
-            </QForm>
-        </QCard>
-    </div>
+                    </div> </VnRow
+            ></template>
+        </FormPopup>
+    </QDialog>
 </template>
 
 <i18n>
 es:
+    New sample: Crear plantilla
     Sample: Plantilla
     Recipient: Destinatario
     Reply to: Responder a
diff --git a/src/pages/Customer/components/CustomerSummaryTable.vue b/src/pages/Customer/components/CustomerSummaryTable.vue
index e2fb61322..87e4cffa7 100644
--- a/src/pages/Customer/components/CustomerSummaryTable.vue
+++ b/src/pages/Customer/components/CustomerSummaryTable.vue
@@ -150,6 +150,7 @@ const setShippedColor = (date) => {
         order="shipped DESC, id"
         :disable-option="{ card: true, table: true }"
         limit="5"
+        class="full-width"
     >
         <template #column-nickname="{ row }">
             <span class="link">
diff --git a/src/pages/Dashboard/DashboardMain.vue b/src/pages/Dashboard/DashboardMain.vue
index a339120e2..56054156a 100644
--- a/src/pages/Dashboard/DashboardMain.vue
+++ b/src/pages/Dashboard/DashboardMain.vue
@@ -60,7 +60,7 @@ const pinnedModules = computed(() => navigation.getPinnedModules());
                                             <QTooltip>
                                                 {{
                                                     'Ctrl + Alt + ' +
-                                                    item.keyBinding.toUpperCase()
+                                                    item?.keyBinding?.toUpperCase()
                                                 }}
                                             </QTooltip>
                                         </div>
diff --git a/src/pages/Department/Card/DepartmentBasicData.vue b/src/pages/Department/Card/DepartmentBasicData.vue
index 4573f7b66..98abfd6b9 100644
--- a/src/pages/Department/Card/DepartmentBasicData.vue
+++ b/src/pages/Department/Card/DepartmentBasicData.vue
@@ -16,12 +16,12 @@ const workersOptions = ref([]);
 const clientsOptions = ref([]);
 </script>
 <template>
-    <fetch-data
+    <FetchData
         url="Workers/search"
         @on-fetch="(data) => (workersOptions = data)"
         auto-load
     />
-    <fetch-data url="Clients" @on-fetch="(data) => (clientsOptions = data)" auto-load />
+    <FetchData url="Clients" @on-fetch="(data) => (clientsOptions = data)" auto-load />
     <FormModel
         :url="`Departments/${route.params.id}`"
         model="department"

From c7e717c61108c59e29d35a2f65796aa5492f05bf Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Wed, 11 Sep 2024 07:55:12 +0200
Subject: [PATCH 086/228] feat: refs #7404 add travel m3 to reserves form

---
 src/components/VnTable/VnColumn.vue           |  3 -
 src/components/common/VnComponent.vue         |  1 -
 src/components/ui/VnFilterPanel.vue           |  1 +
 src/pages/Entry/EntryStockBought.vue          | 84 ++++++++++++++-----
 src/pages/Entry/EntryStockBoughtFilter.vue    | 11 ++-
 .../integration/entry/stockBought.spec.js     |  2 +-
 6 files changed, 76 insertions(+), 26 deletions(-)

diff --git a/src/components/VnTable/VnColumn.vue b/src/components/VnTable/VnColumn.vue
index ad120f02e..ed34e9eee 100644
--- a/src/components/VnTable/VnColumn.vue
+++ b/src/components/VnTable/VnColumn.vue
@@ -171,8 +171,6 @@ const components = computed(() => $props.components ?? defaultComponents);
             :value="{ row, model }"
             v-model="model"
         />
-
-        {{ console.log('model: ', col) }}
         <VnComponent
             v-if="col.component"
             :prop="col"
@@ -180,7 +178,6 @@ const components = computed(() => $props.components ?? defaultComponents);
             :value="{ row, model }"
             v-model="model"
         />
-
         <span :title="value" v-else>{{ value }}</span>
         <VnComponent
             v-if="col.after"
diff --git a/src/components/common/VnComponent.vue b/src/components/common/VnComponent.vue
index 1ba1506d5..bd25c787c 100644
--- a/src/components/common/VnComponent.vue
+++ b/src/components/common/VnComponent.vue
@@ -24,7 +24,6 @@ const componentArray = computed(() => {
 
 function mix(toComponent) {
     const { component, attrs, event } = toComponent;
-    console.log('attrs: ', attrs);
     const customComponent = $props.components[component];
     return {
         component: customComponent?.component ?? component,
diff --git a/src/components/ui/VnFilterPanel.vue b/src/components/ui/VnFilterPanel.vue
index cebdc4bbf..b3bdec0a5 100644
--- a/src/components/ui/VnFilterPanel.vue
+++ b/src/components/ui/VnFilterPanel.vue
@@ -58,6 +58,7 @@ const $props = defineProps({
 });
 
 defineExpose({ search, sanitizer });
+
 const emit = defineEmits([
     'update:modelValue',
     'refresh',
diff --git a/src/pages/Entry/EntryStockBought.vue b/src/pages/Entry/EntryStockBought.vue
index 8f197be92..ad338acb1 100644
--- a/src/pages/Entry/EntryStockBought.vue
+++ b/src/pages/Entry/EntryStockBought.vue
@@ -1,10 +1,13 @@
 <script setup>
-import { ref } from 'vue';
+import { onMounted, ref, watch } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useState } from 'src/composables/useState';
 import { useQuasar } from 'quasar';
 
 import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
+import axios from 'axios';
+import FetchData from 'components/FetchData.vue';
+import VnRow from 'components/ui/VnRow.vue';
 import RightMenu from 'src/components/common/RightMenu.vue';
 import EntryStockBoughtFilter from './EntryStockBoughtFilter.vue';
 import VnTable from 'components/VnTable/VnTable.vue';
@@ -13,7 +16,6 @@ import EntryStockBoughtDetail from 'src/pages/Entry/EntryStockBoughtDetail.vue';
 
 const { t } = useI18n();
 const quasar = useQuasar();
-const tableRef = ref();
 const state = useState();
 const user = state.getUser();
 const columns = [
@@ -88,7 +90,32 @@ const columns = [
     },
 ];
 
+const fetchDataRef = ref();
+const tableRef = ref();
+const travel = ref(null);
+const userParams = ref({
+    dated: Date.vnNew(),
+});
+const filter = ref({
+    where: {
+        shipped: (userParams.value.dated
+            ? new Date(userParams.value.dated)
+            : Date.vnNew()
+        ).setHours(0, 0, 0, 0),
+        m3: { neq: null },
+    },
+    include: [
+        {
+            relation: 'warehouseIn',
+            scope: {
+                where: { code: 'vnh' },
+            },
+        },
+    ],
+});
+
 function getFilter(dated) {
+    console.log('dated: ', dated);
     const shipped = dated ? new Date(dated) : Date.vnNew();
     shipped.setHours(0, 0, 0, 0);
     return {
@@ -99,48 +126,62 @@ function getFilter(dated) {
         include: [
             {
                 relation: 'warehouseIn',
+                scope: {
+                    where: { code: 'vnh' },
+                },
             },
         ],
     };
 }
-const userParams = ref({
-    dated: Date.vnNew(),
-});
+
+const setUserParams = async ({ dated }) => {
+    const shipped = (dated ? new Date(dated) : Date.vnNew()).setHours(0, 0, 0, 0);
+
+    filter.value.where.shipped = shipped;
+    fetchDataRef.value?.fetch();
+};
 </script>
 <template>
     <VnSubToolbar>
-        <template #st-data="{ params }">
+        <template #st-data>
             <FetchData
                 ref="fetchDataRef"
                 url="Travels"
                 limit="1"
                 auto-load
-                :filter="getFilter(params?.dated)"
+                :filter="filter"
                 @on-fetch="(data) => (travel = data)"
             />
-            <div>
-                <div>
-                    <span style="color: var(--vn-label-color)">
-                        {{ t('Booked trucks') + ': ' }}
-                    </span>
-                </div>
-                <div v-if="travel">
+
+            <VnRow>
+                <div v-if="travel" class="q-pa-md">
+                    <QIcon
+                        name="local_airport"
+                        class="fill-icon q-mr-sm"
+                        size="md"
+                        :title="t('Travel')"
+                        color="primary"
+                    />
                     <span>
-                        {{ travel[0]?.m3 }}
+                        {{ t('Booked trucks') + ': ' + travel[0]?.m3 }}
                     </span>
                     <QBtn
                         style="max-width: 20%"
                         flat
                         icon="edit"
                         @click="navigate(travel[0]?.id)"
+                        :title="t('Edit travel')"
                     />
                 </div>
-            </div>
+            </VnRow>
         </template>
     </VnSubToolbar>
     <RightMenu>
         <template #right-panel>
-            <EntryStockBoughtFilter data-key="StockBoughts" />
+            <EntryStockBoughtFilter
+                data-key="StockBoughts"
+                @set-user-params="setUserParams"
+            />
         </template>
     </RightMenu>
     <QPage class="column items-center q-pa-md">
@@ -155,7 +196,10 @@ const userParams = ref({
             :create="{
                 urlCreate: 'StockBoughts',
                 title: t('Reserve some space'),
-                onDataSaved: () => tableRef.reload(),
+                onDataSaved: () => {
+                    tableRef.reload();
+                    fetchDataRef.reload();
+                },
                 formInitialData: {
                     workerFk: user.id,
                     dated: Date.vnNow(),
@@ -163,8 +207,8 @@ const userParams = ref({
             }"
             :columns="columns"
             :user-params="userParams"
-            auto-load
             :footer="true"
+            auto-load
         >
             <template #column-workerFk="{ row }">
                 <span class="link" @click.stop>
@@ -192,6 +236,8 @@ const userParams = ref({
         Date: Date
         This buyer has already made a reservation for this date: This buyer has already made a reservation for this date
     es:
+        Edit travel: Editar envío
+        Travel: Envíos
         Booked trucks: Camiones reservados
         Buyer: Comprador
         Reserve: Reservado
diff --git a/src/pages/Entry/EntryStockBoughtFilter.vue b/src/pages/Entry/EntryStockBoughtFilter.vue
index 3393113f2..aaf9e7a5b 100644
--- a/src/pages/Entry/EntryStockBoughtFilter.vue
+++ b/src/pages/Entry/EntryStockBoughtFilter.vue
@@ -15,9 +15,12 @@ const props = defineProps({
         required: true,
     },
 });
-
 const companiesOptions = ref([]);
 const stateStore = useStateStore();
+const emit = defineEmits(['set-user-params']);
+const setUserParams = (params) => {
+    emit('set-user-params', params);
+};
 onMounted(async () => {
     stateStore.rightDrawer = true;
 });
@@ -35,7 +38,11 @@ onMounted(async () => {
         @on-fetch="(data) => (companiesOptions = data)"
         auto-load
     />
-    <VnFilterPanel :data-key="props.dataKey" :search-button="true">
+    <VnFilterPanel
+        :data-key="props.dataKey"
+        :search-button="true"
+        @set-user-params="setUserParams"
+    >
         <template #tags="{ tag, formatFn }">
             <div class="q-gutter-x-xs">
                 <strong>{{ t(`params.${tag.label}`) }}: </strong>
diff --git a/test/cypress/integration/entry/stockBought.spec.js b/test/cypress/integration/entry/stockBought.spec.js
index 10af3ef42..a18e2bd2e 100644
--- a/test/cypress/integration/entry/stockBought.spec.js
+++ b/test/cypress/integration/entry/stockBought.spec.js
@@ -20,7 +20,7 @@ describe('EntryStockBought', () => {
         cy.get('input[aria-label="Date"]').eq(1).type('01-01');
         cy.get('input[aria-label="Buyer"]').type('buyerboss{downarrow}{enter}');
         cy.get('.q-notification__message').should('have.text', 'Data created');
-        cy.get('tBody > tr').its('length').should('eq', 2);
+        cy.get('tBody > tr').its('length').should('eq', 3);
     });
     it('Should check detail for the buyer', () => {
         cy.get(':nth-child(1) > .sticky > .q-btn > .q-btn__content > .q-icon').click();

From e7fb6a796328f291f7bb3939690ff280852216ae Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Wed, 11 Sep 2024 08:32:59 +0200
Subject: [PATCH 087/228] hotFix: keyBinding toUpperCase if is null

---
 src/components/LeftMenuItem.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/LeftMenuItem.vue b/src/components/LeftMenuItem.vue
index 9fe66e278..2a6de5e2e 100644
--- a/src/components/LeftMenuItem.vue
+++ b/src/components/LeftMenuItem.vue
@@ -36,7 +36,7 @@ const itemComputed = computed(() => {
         <QItemSection>
             {{ t(itemComputed.title) }}
             <QTooltip>
-                {{ 'Ctrl + Alt + ' + item.keyBinding.toUpperCase() }}
+                {{ 'Ctrl + Alt + ' + item?.keyBinding?.toUpperCase() }}
             </QTooltip>
         </QItemSection>
         <QItemSection side>

From 19eb77089365f497ee73860e21724a2dc93d2f85 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Wed, 11 Sep 2024 08:41:16 +0200
Subject: [PATCH 088/228] feat: remove cli warnings

---
 src/components/VnTable/VnTable.vue            |  2 +-
 src/components/common/VnSelectDialog.vue      |  1 -
 src/pages/Customer/Card/CustomerUnpaid.vue    |  5 +-
 .../components/CustomerSamplesCreate.vue      | 56 +++++++------------
 4 files changed, 24 insertions(+), 40 deletions(-)

diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index 964dafabe..0ed3de261 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -303,7 +303,7 @@ defineExpose({
     CrudModelRef,
 });
 
-function handleOnDataSaved(_, res) {
+function handleOnDataSaved(_) {
     if (_.onDataSaved) _.onDataSaved(this);
     else $props.create.onDataSaved(_);
 }
diff --git a/src/components/common/VnSelectDialog.vue b/src/components/common/VnSelectDialog.vue
index 219e6dc98..17f893255 100644
--- a/src/components/common/VnSelectDialog.vue
+++ b/src/components/common/VnSelectDialog.vue
@@ -28,7 +28,6 @@ const $props = defineProps({
 
 const role = useRole();
 const acl = useAcl();
-const showForm = ref(false);
 
 const isAllowedToCreate = computed(() => {
     if ($props.acls.length) return acl.hasAny($props.acls);
diff --git a/src/pages/Customer/Card/CustomerUnpaid.vue b/src/pages/Customer/Card/CustomerUnpaid.vue
index 5b9a6cde2..ad00cbf59 100644
--- a/src/pages/Customer/Card/CustomerUnpaid.vue
+++ b/src/pages/Customer/Card/CustomerUnpaid.vue
@@ -151,7 +151,10 @@ watch(
                             clearable
                             type="number"
                             v-model="amount"
-                        />
+                            autofocus
+                        >
+                            <template #append>€</template></VnInput
+                        >
                     </div>
                 </VnRow>
             </QForm>
diff --git a/src/pages/Customer/components/CustomerSamplesCreate.vue b/src/pages/Customer/components/CustomerSamplesCreate.vue
index c7772ab4e..3c9eb856b 100644
--- a/src/pages/Customer/components/CustomerSamplesCreate.vue
+++ b/src/pages/Customer/components/CustomerSamplesCreate.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { onBeforeMount, reactive, ref } from 'vue';
+import { computed, onBeforeMount, reactive, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute, useRouter } from 'vue-router';
 
@@ -17,9 +17,7 @@ import VnSelect from 'src/components/common/VnSelect.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import VnInputDate from 'src/components/common/VnInputDate.vue';
 import CustomerSamplesPreview from 'src/pages/Customer/components/CustomerSamplesPreview.vue';
-import { useStateStore } from 'stores/useStateStore';
 import FormPopup from 'src/components/FormPopup.vue';
-defineEmits(['confirm', ...useDialogPluginComponent.emits]);
 
 const { dialogRef, onDialogOK } = useDialogPluginComponent();
 
@@ -31,17 +29,17 @@ const route = useRoute();
 const router = useRouter();
 const state = useState();
 const user = state.getUser();
-const stateStore = useStateStore();
 const { sendEmail } = usePrintService();
-const client = ref({});
 const hasChanged = ref(false);
 const isLoading = ref(false);
-const optionsClientsAddressess = ref([]);
-const optionsCompanies = ref([]);
+const addressess = ref([]);
+const companies = ref([]);
 const optionsEmailUsers = ref([]);
 const optionsSamplesVisible = ref([]);
 const sampleType = ref({ hasPreview: false });
-
+const initialData = reactive({});
+const entityId = computed(() => route.params.id);
+const customer = computed(() => state.get('customer'));
 const filterEmailUsers = { where: { userFk: user.value.id } };
 const filterClientsAddresses = {
     include: [
@@ -63,14 +61,13 @@ const filterSamplesVisible = {
     ],
     order: ['description'],
 };
-const initialData = reactive({});
+
+defineEmits(['confirm', ...useDialogPluginComponent.emits]);
 
 onBeforeMount(async () => {
-    const { data } = await axios.get(`Clients/1/getCard`);
-    client.value = data;
-    initialData.clientFk = route.params?.id;
-    initialData.recipient = data.email;
-    initialData.recipientId = data.id;
+    initialData.clientFk = customer.value.id;
+    initialData.recipient = customer.value.email;
+    initialData.recipientId = customer.value.id;
 });
 
 const setEmailUser = (data) => {
@@ -80,7 +77,7 @@ const setEmailUser = (data) => {
 
 const setClientsAddresses = (data) => {
     initialData.addressId = data[0].id;
-    optionsClientsAddressess.value = data;
+    addressess.value = data;
 };
 
 const setSampleType = (sampleId) => {
@@ -93,20 +90,6 @@ const setSampleType = (sampleId) => {
     initialData.companyId = companyFk;
 };
 
-const setInitialData = () => {
-    hasChanged.value = false;
-
-    initialData.addressId = optionsClientsAddressess.value[0].id;
-    initialData.companyFk = null;
-    initialData.from = null;
-    initialData.recipient = client.value.email;
-    initialData.recipientId = client.value.id;
-    initialData.replyTo = optionsEmailUsers.value[0]?.email;
-    initialData.typeFk = '';
-
-    sampleType.value = {};
-};
-
 const validateMessage = () => {
     if (!initialData.recipient) return 'Email cannot be blank';
     if (!sampleType.value) return 'Choose a sample';
@@ -125,14 +108,14 @@ const setParams = (params) => {
 const getPreview = async () => {
     try {
         const params = {
-            recipientId: route.params.id,
+            recipientId: entityId,
         };
         const validationMessage = validateMessage();
         if (validationMessage) return notify(t(validationMessage), 'negative');
 
         setParams(params);
 
-        const path = `${sampleType.value.model}/${route.params.id}/${sampleType.value.code}-html`;
+        const path = `${sampleType.value.model}/${entityId.value}/${sampleType.value.code}-html`;
         const { data } = await axios.get(path, { params });
 
         if (!data) return;
@@ -173,7 +156,6 @@ const getSamples = async () => {
     }
 };
 
-getSamples();
 const onDataSaved = async () => {
     try {
         const params = {
@@ -183,7 +165,7 @@ const onDataSaved = async () => {
         };
         setParams(params);
         const samplesData = await getSamples();
-        const path = `${samplesData.model}/${route.params.id}/${samplesData.code}-email`;
+        const path = `${samplesData.model}/${entityId.value}/${samplesData.code}-email`;
         await sendEmail(path, params);
         onDialogOK(params);
     } catch (error) {
@@ -210,13 +192,13 @@ const toCustomerSamples = () => {
     />
     <FetchData
         :filter="filterClientsAddresses"
-        :url="`Clients/${route.params.id}/addresses`"
+        :url="`Clients/${entityId}/addresses`"
         @on-fetch="setClientsAddresses"
         auto-load
     />
     <FetchData
         :filter="filterCompanies"
-        @on-fetch="(data) => (optionsCompanies = data)"
+        @on-fetch="(data) => (companies = data)"
         auto-load
         url="Companies"
     />
@@ -306,7 +288,7 @@ const toCustomerSamples = () => {
                     <div class="col">
                         <VnSelect
                             :label="t('Company')"
-                            :options="optionsCompanies"
+                            :options="companies"
                             :rules="validate('entry.companyFk')"
                             hide-selected
                             option-label="code"
@@ -319,7 +301,7 @@ const toCustomerSamples = () => {
                     <div class="col">
                         <VnSelect
                             :label="t('Address')"
-                            :options="optionsClientsAddressess"
+                            :options="addressess"
                             hide-selected
                             option-label="nickname"
                             option-value="id"

From 2d8322c6da3f53e322fc0577889f42be32cf7a2f Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Wed, 11 Sep 2024 09:20:54 +0200
Subject: [PATCH 089/228] fix: remove FIXME

---
 src/composables/useArrayData.js | 18 ++----------------
 1 file changed, 2 insertions(+), 16 deletions(-)

diff --git a/src/composables/useArrayData.js b/src/composables/useArrayData.js
index 32b91b115..651bcefb0 100644
--- a/src/composables/useArrayData.js
+++ b/src/composables/useArrayData.js
@@ -86,26 +86,12 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
 
         Object.assign(filter, store.userFilter, exprFilter);
         let where;
-        //FIXME: ARRAY DATA FALLA AL JUNTAR WHERE'S
-        // console.log(
-        //     'userParams?.filter?.where: ',
-        //     userParams?.filter?.where,
-        //     filter?.where,
-        //     store.filter?.where
-        // );
-        if ((userParams?.filter?.where, filter?.where || store.filter?.where))
-            where = Object.assign(
-                userParams?.filter?.where ?? {},
-                filter?.where ?? {},
-                store.filter?.where ?? {}
-            );
+        if (filter?.where || store.filter?.where)
+            where = Object.assign(filter?.where ?? {}, store.filter?.where ?? {});
         Object.assign(filter, store.filter);
         filter.where = where;
-        // console.log('where: ', where);
         const params = { filter };
-        // console.log('params: ', params);
 
-        delete userParams?.filter;
         Object.assign(params, userParams);
         params.filter.skip = store.skip;
         if (store.order && store.order.length) params.filter.order = store.order;

From 8d96539b240bd5cb809f691725df850fb1f39938 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Wed, 11 Sep 2024 13:18:54 +0200
Subject: [PATCH 090/228] perf: solve reload CardSummary component

---
 src/components/common/VnCard.vue            | 2 +-
 src/pages/Customer/Card/CustomerSummary.vue | 8 +-------
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/src/components/common/VnCard.vue b/src/components/common/VnCard.vue
index 5cee06582..7d29da232 100644
--- a/src/components/common/VnCard.vue
+++ b/src/components/common/VnCard.vue
@@ -79,7 +79,7 @@ if (props.baseUrl) {
         <QPage>
             <VnSubToolbar />
             <div :class="[useCardSize(), $attrs.class]">
-                <RouterView :key="route.fullPath" />
+                <RouterView :key="route.path" />
             </div>
         </QPage>
     </QPageContainer>
diff --git a/src/pages/Customer/Card/CustomerSummary.vue b/src/pages/Customer/Card/CustomerSummary.vue
index 1c511b45d..f049426e2 100644
--- a/src/pages/Customer/Card/CustomerSummary.vue
+++ b/src/pages/Customer/Card/CustomerSummary.vue
@@ -1,12 +1,11 @@
 <script setup>
-import { computed, ref, onMounted } from 'vue';
+import { computed, ref } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import VnUserLink from 'src/components/ui/VnUserLink.vue';
 
 import { toCurrency, toPercentage, toDate } from 'src/filters';
 import CardSummary from 'components/ui/CardSummary.vue';
-import { getUrl } from 'src/composables/getUrl';
 import VnLv from 'src/components/ui/VnLv.vue';
 import VnLinkPhone from 'src/components/ui/VnLinkPhone.vue';
 import CustomerSummaryTable from 'src/pages/Customer/components/CustomerSummaryTable.vue';
@@ -25,11 +24,6 @@ const $props = defineProps({
 const entityId = computed(() => $props.id || route.params.id);
 const customer = computed(() => summary.value.entity);
 const summary = ref();
-const clientUrl = ref();
-
-onMounted(async () => {
-    clientUrl.value = (await getUrl('client/')) + entityId.value + '/';
-});
 
 const balanceDue = computed(() => {
     return (

From 4a234dd875c1425bf5bf235d58110b3d4d3fea6f Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Thu, 12 Sep 2024 08:31:57 +0200
Subject: [PATCH 091/228] fix: duplicate code

---
 src/pages/Ticket/TicketList.vue | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/src/pages/Ticket/TicketList.vue b/src/pages/Ticket/TicketList.vue
index 81e185014..bd0bda6e3 100644
--- a/src/pages/Ticket/TicketList.vue
+++ b/src/pages/Ticket/TicketList.vue
@@ -15,7 +15,6 @@ import VnRow from 'src/components/ui/VnRow.vue';
 import RightMenu from 'src/components/common/RightMenu.vue';
 import TicketFilter from './TicketFilter.vue';
 
-import { useRoute } from 'vue-router';
 const route = useRoute();
 const { t } = useI18n();
 const { viewSummary } = useSummaryDialog();
@@ -25,7 +24,6 @@ const addressesOptions = ref([]);
 const agenciesOptions = ref([]);
 const selectedClient = ref();
 const stateStore = useStateStore();
-const route = useRoute();
 const from = Date.vnNew();
 from.setHours(0, 0, 0, 0);
 const to = Date.vnNew();
@@ -46,16 +44,6 @@ const initializeFromQuery = () => {
     Object.assign(userParams, { from, to });
 };
 
-// Método para inicializar las variables desde la query string
-const initializeFromQuery = () => {
-    const query = route.query.table ? JSON.parse(route.query.table) : {};
-
-    // Asigna los valores a las variables correspondientes
-    from.value = query.from || from.toISOString();
-    to.value = query.to || to.toISOString();
-    Object.assign(userParams, { from, to });
-};
-
 const columns = computed(() => [
     {
         align: 'left',

From 6b79d70551f4bdc981c20816d1b014f6d4162fa7 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Thu, 12 Sep 2024 09:14:55 +0200
Subject: [PATCH 092/228] refactor: refs #7828 wip

---
 src/pages/Worker/Card/WorkerTimeControl.vue | 50 +++++++++------------
 1 file changed, 22 insertions(+), 28 deletions(-)

diff --git a/src/pages/Worker/Card/WorkerTimeControl.vue b/src/pages/Worker/Card/WorkerTimeControl.vue
index abf60a078..2f66fbcc1 100644
--- a/src/pages/Worker/Card/WorkerTimeControl.vue
+++ b/src/pages/Worker/Card/WorkerTimeControl.vue
@@ -271,44 +271,38 @@ const fetchWorkerTimeControlMails = async (filter) => {
 
 const fetchWeekData = async () => {
     try {
-        const filter = {
-            where: {
-                workerFk: route.params.id,
-                year: selectedDate.value ? selectedDate.value?.getFullYear() : null,
-                week: selectedWeekNumber.value,
-            },
-        };
-
-        const data = await fetchWorkerTimeControlMails(filter);
-        if (!data.length) {
-            state.value = null;
-        } else {
+        const data = (
+            await axios.get(`WorkerTimeControlMails/${route.params.id}/getWeeklyMail`, {
+                params: {
+                    workerFk: route.params.id,
+                    year: selectedDate.value.getFullYear(),
+                    week: selectedWeekNumber.value,
+                },
+            })
+        ).data;
+        if (!data.length) state.value = null;
+        else {
             const [mail] = data;
             state.value = mail.state;
             reason.value = mail.reason;
         }
 
-        await canBeResend();
+        canResend.value = !!(
+            await axios.get('WorkerTimeControlMails/count', {
+                filter: {
+                    where: {
+                        year: selectedDate.value.getFullYear(),
+                        week: selectedWeekNumber.value,
+                        limit: 1,
+                    },
+                },
+            })
+        ).data.count;
     } catch (err) {
         console.error('Error fetching week data');
     }
 };
 
-const canBeResend = async () => {
-    canResend.value = false;
-
-    const filter = {
-        where: {
-            year: selectedDate.value.getFullYear(),
-            week: selectedWeekNumber.value,
-        },
-        limit: 1,
-    };
-
-    const data = await fetchWorkerTimeControlMails(filter);
-    if (data.length) canResend.value = true;
-};
-
 const setHours = (data) => {
     for (const weekDay of weekDays.value) {
         if (data) {

From 994197568320ff2f98592eae2543dafdd8f9bce0 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Thu, 12 Sep 2024 08:07:53 +0000
Subject: [PATCH 093/228] fix: infiniteScroll

---
 src/components/ui/VnPaginate.vue | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/src/components/ui/VnPaginate.vue b/src/components/ui/VnPaginate.vue
index 441a8ff48..eb9828bc7 100644
--- a/src/components/ui/VnPaginate.vue
+++ b/src/components/ui/VnPaginate.vue
@@ -224,20 +224,27 @@ defineExpose({ fetch, addFilter, paginate });
         v-bind="$attrs"
     >
         <slot name="body" :rows="store.data"></slot>
-        <div v-if="isLoading" class="info-row q-pa-md text-center">
+        <div v-if="isLoading" class="spinner info-row q-pa-md text-center">
             <QSpinner color="primary" size="md" />
         </div>
     </QInfiniteScroll>
 </template>
 
 <style lang="scss" scoped>
-.info-row {
-    width: 100%;
-
-    h5 {
-        margin: 0;
+    .spinner {
+        z-index: 1;
+        align-content: end;
+        position: absolute;
+        bottom: 0;
+        left: 0;
+    }
+    .info-row {
+        width: 100%;
+
+        h5 {
+            margin: 0;
+        }
     }
-}
 </style>
 
 <i18n>

From 3892df250cc87c166eb6b4dd71d0b05b2bcb1527 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Thu, 12 Sep 2024 08:53:46 +0000
Subject: [PATCH 094/228] fix: #5938 grouped filter

---
 src/pages/Ticket/TicketFutureFilter.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pages/Ticket/TicketFutureFilter.vue b/src/pages/Ticket/TicketFutureFilter.vue
index bb597a525..6345f62b3 100644
--- a/src/pages/Ticket/TicketFutureFilter.vue
+++ b/src/pages/Ticket/TicketFutureFilter.vue
@@ -153,7 +153,7 @@ onMounted(async () => {
                         :label="t('params.state')"
                         v-model="params.state"
                         :options="stateOptions"
-                        option-value="code"
+                        option-value="id"
                         option-label="name"
                         @update:model-value="searchFn()"
                         dense
@@ -169,7 +169,7 @@ onMounted(async () => {
                         :label="t('params.futureState')"
                         v-model="params.futureState"
                         :options="stateOptions"
-                        option-value="code"
+                        option-value="id"
                         option-label="name"
                         @update:model-value="searchFn()"
                         dense

From c7adb919121d785ba8f5b1a25b82eedad4421db7 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Thu, 12 Sep 2024 09:56:37 +0000
Subject: [PATCH 095/228] feat: use disableInifiniteScroll property

---
 src/pages/Customer/components/CustomerSummaryTable.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/pages/Customer/components/CustomerSummaryTable.vue b/src/pages/Customer/components/CustomerSummaryTable.vue
index 87e4cffa7..374769a57 100644
--- a/src/pages/Customer/components/CustomerSummaryTable.vue
+++ b/src/pages/Customer/components/CustomerSummaryTable.vue
@@ -151,6 +151,7 @@ const setShippedColor = (date) => {
         :disable-option="{ card: true, table: true }"
         limit="5"
         class="full-width"
+        :disable-infinite-scroll="true"
     >
         <template #column-nickname="{ row }">
             <span class="link">

From c22f8f1069882a17c9ccc1ab85a213549d102396 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Thu, 12 Sep 2024 09:57:31 +0000
Subject: [PATCH 096/228] fix: stop call back event hasMoreData

---
 src/components/VnTable/VnTable.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index 0ed3de261..689be76ee 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -369,7 +369,7 @@ function handleOnDataSaved(_) {
         @on-fetch="(...args) => emit('onFetch', ...args)"
         :search-url="searchUrl"
         :disable-infinite-scroll="
-            $attrs['disableInfiniteScroll'] ? isTableMode : disableInfiniteScroll
+            $attrs['disableInfiniteScroll'] ? isTableMode : !disableInfiniteScroll
         "
         @save-changes="reload"
         :has-sub-toolbar="$props.hasSubToolbar ?? isEditable"

From a3afe790b942e0154cf6b1fc720156d223a62716 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Thu, 12 Sep 2024 12:00:07 +0200
Subject: [PATCH 097/228] fix: CustomerGreuges

---
 src/pages/Customer/Card/CustomerGreuges.vue | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/pages/Customer/Card/CustomerGreuges.vue b/src/pages/Customer/Card/CustomerGreuges.vue
index 1c78392e7..1d8b8585f 100644
--- a/src/pages/Customer/Card/CustomerGreuges.vue
+++ b/src/pages/Customer/Card/CustomerGreuges.vue
@@ -5,10 +5,10 @@ import { useRoute } from 'vue-router';
 import { toCurrency } from 'src/filters';
 import { toDateTimeFormat } from 'src/filters/date';
 import VnTable from 'components/VnTable/VnTable.vue';
-
+import FetchData from 'components/FetchData.vue';
+const entityId = computed(() => route.params.id);
 const { t } = useI18n();
 const route = useRoute();
-const rows = ref([]);
 const totalAmount = ref();
 const tableRef = ref();
 const filter = computed(() => {
@@ -28,7 +28,7 @@ const filter = computed(() => {
             },
         ],
         where: {
-            clientFk: route.params.id,
+            clientFk: entityId,
         },
     };
 });
@@ -84,14 +84,14 @@ const columns = computed(() => [
         create: true,
     },
 ]);
-
-const setRows = (data) => {
-    rows.value = data;
-    totalAmount.value = data.reduce((acc, { amount = 0 }) => acc + amount, 0);
-};
 </script>
 
 <template>
+    <FetchData
+        :url="`Greuges/${entityId}/sumAmount`"
+        auto-load
+        @on-fetch="({ sumAmount }) => (totalAmount = sumAmount)"
+    ></FetchData>
     <VnTable
         ref="tableRef"
         data-key="Greuges"
@@ -104,7 +104,6 @@ const setRows = (data) => {
         :is-editable="false"
         :use-model="true"
         :column-search="false"
-        @on-fetch="(data) => setRows(data)"
         :disable-option="{ card: true }"
         :create="{
             urlCreate: `Greuges`,

From e5056c45c0c15e056e89b773a85cfddd24bce221 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Thu, 12 Sep 2024 12:31:00 +0200
Subject: [PATCH 098/228] fix: refs #7500 fixed showing images wrongly

---
 src/components/common/VnDmsList.vue | 28 +++++++++++++++-------------
 src/components/ui/VnImg.vue         |  3 +--
 2 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/src/components/common/VnDmsList.vue b/src/components/common/VnDmsList.vue
index c0e8ac43b..ea19bf25d 100644
--- a/src/components/common/VnDmsList.vue
+++ b/src/components/common/VnDmsList.vue
@@ -93,19 +93,21 @@ const dmsFilter = {
 
 const columns = computed(() => [
     {
-        align: 'left',
-        field: 'file',
-        label: t('globals.file'),
+        label: '',
         name: 'file',
+        align: 'left',
         component: VnImg,
-        props: (prop) => ({
-            storage: 'dms',
-            collection: null,
-            size: null,
-            id: prop.row.file.split('.')[0],
-            token: token,
-            class: 'rounded',
-        }),
+        props: (prop) => {
+            return {
+                storage: 'dms',
+                collection: null,
+                resolution: null,
+                id: prop.row.file.split('.')[0],
+                token: token,
+                class: 'rounded',
+                ratio: 1,
+            };
+        },
     },
     {
         align: 'left',
@@ -397,10 +399,10 @@ defineExpose({
     </QPageSticky>
 </template>
 <style scoped>
-.q-gutter-y-ms {
+/* .q-gutter-y-ms {
     display: grid;
     row-gap: 20px;
-}
+} */
 .labelColor {
     color: var(--vn-label-color);
 }
diff --git a/src/components/ui/VnImg.vue b/src/components/ui/VnImg.vue
index 19ac8ce7f..834f9afdc 100644
--- a/src/components/ui/VnImg.vue
+++ b/src/components/ui/VnImg.vue
@@ -12,12 +12,10 @@ const $props = defineProps({
     collection: {
         type: String,
         default: 'catalog',
-        required: false,
     },
     resolution: {
         type: String,
         default: '200x200',
-        required: false,
     },
     zoomResolution: {
         type: String,
@@ -68,6 +66,7 @@ defineExpose({
             v-bind="$attrs"
             spinner-color="primary"
             class="img_zoom"
+            :ratio="0"
         />
     </QDialog>
 </template>

From d00a88a3f44e908ed16c708fd7560ce77cc70474 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Thu, 12 Sep 2024 12:34:54 +0200
Subject: [PATCH 099/228] refactor: refs #7500 deleted useless code

---
 src/components/common/VnDmsList.vue | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/components/common/VnDmsList.vue b/src/components/common/VnDmsList.vue
index ea19bf25d..b7ae449f9 100644
--- a/src/components/common/VnDmsList.vue
+++ b/src/components/common/VnDmsList.vue
@@ -399,10 +399,6 @@ defineExpose({
     </QPageSticky>
 </template>
 <style scoped>
-/* .q-gutter-y-ms {
-    display: grid;
-    row-gap: 20px;
-} */
 .labelColor {
     color: var(--vn-label-color);
 }

From 44fd356d63ee78589a3902ba1891ec41dd5d39ad Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Thu, 12 Sep 2024 13:19:31 +0200
Subject: [PATCH 100/228] feat: refs #7828 useAcl & cherry pick mail data
 worker

---
 src/pages/Worker/Card/WorkerTimeControl.vue | 63 +++++++--------------
 1 file changed, 22 insertions(+), 41 deletions(-)

diff --git a/src/pages/Worker/Card/WorkerTimeControl.vue b/src/pages/Worker/Card/WorkerTimeControl.vue
index 2f66fbcc1..3893305a5 100644
--- a/src/pages/Worker/Card/WorkerTimeControl.vue
+++ b/src/pages/Worker/Card/WorkerTimeControl.vue
@@ -12,7 +12,6 @@ import WorkerTimeControlCalendar from 'pages/Worker/Card/WorkerTimeControlCalend
 
 import useNotify from 'src/composables/useNotify.js';
 import axios from 'axios';
-import { useRole } from 'src/composables/useRole';
 import { useAcl } from 'src/composables/useAcl';
 import { useWeekdayStore } from 'src/stores/useWeekdayStore';
 import { useStateStore } from 'stores/useStateStore';
@@ -63,13 +62,16 @@ const selectedCalendarDates = ref([]);
 const selectedDateFormatted = ref(toDateString(defaultDate.value));
 
 const arrayData = useArrayData('workerData');
-
+const acl = useAcl();
 const worker = computed(() => arrayData.store?.data);
-
-const isHr = computed(() => useRole().hasAny(['hr']));
-
-const canSend = computed(() => useAcl().hasAny('WorkerTimeControl', 'sendMail', 'WRITE'));
-
+const canSend = computed(() =>
+    acl.hasAny([{ model: 'WorkerTimeControl', props: 'sendMail', accessType: 'WRITE' }])
+);
+const canUpdate = computed(() =>
+    acl.hasAny([
+        { model: 'WorkerTimeControl', props: 'updateMailState', accessType: 'WRITE' },
+    ])
+);
 const isHimself = computed(() => user.value.id === Number(route.params.id));
 
 const columns = computed(() => {
@@ -257,46 +259,25 @@ const fetchHours = async () => {
     }
 };
 
-const fetchWorkerTimeControlMails = async (filter) => {
-    try {
-        const { data } = await axios.get('WorkerTimeControlMails', {
-            params: { filter: JSON.stringify(filter) },
-        });
-
-        return data;
-    } catch (err) {
-        console.error('Error fetching worker time control mails');
-    }
-};
-
 const fetchWeekData = async () => {
+    const where = {
+        year: selectedDate.value.getFullYear(),
+        week: selectedWeekNumber.value,
+    };
     try {
-        const data = (
-            await axios.get(`WorkerTimeControlMails/${route.params.id}/getWeeklyMail`, {
-                params: {
-                    workerFk: route.params.id,
-                    year: selectedDate.value.getFullYear(),
-                    week: selectedWeekNumber.value,
-                },
+        const mail = (
+            await axios.get(`Workers/${route.params.id}/mail`, {
+                params: { filter: { where } },
             })
-        ).data;
-        if (!data.length) state.value = null;
+        ).data[0];
+        if (!mail) state.value = null;
         else {
-            const [mail] = data;
             state.value = mail.state;
             reason.value = mail.reason;
         }
 
         canResend.value = !!(
-            await axios.get('WorkerTimeControlMails/count', {
-                filter: {
-                    where: {
-                        year: selectedDate.value.getFullYear(),
-                        week: selectedWeekNumber.value,
-                        limit: 1,
-                    },
-                },
-            })
+            await axios.get('WorkerTimeControlMails/count', { params: { where } })
         ).data.count;
     } catch (err) {
         console.error('Error fetching week data');
@@ -443,7 +424,7 @@ onMounted(async () => {
         <div>
             <QBtnGroup push class="q-gutter-x-sm" flat>
                 <QBtn
-                    v-if="isHimself && state"
+                    v-if="canUpdate && state"
                     :label="t('Satisfied')"
                     color="primary"
                     type="submit"
@@ -451,7 +432,7 @@ onMounted(async () => {
                     @click="isSatisfied()"
                 />
                 <QBtn
-                    v-if="isHimself && state"
+                    v-if="canUpdate && state"
                     :label="t('Not satisfied')"
                     color="primary"
                     type="submit"
@@ -462,7 +443,7 @@ onMounted(async () => {
             </QBtnGroup>
             <QBtnGroup push class="q-gutter-x-sm q-ml-none" flat>
                 <QBtn
-                    v-if="reason && state && (isHimself || isHr)"
+                    v-if="reason && state && canUpdate"
                     :label="t('Reason')"
                     color="primary"
                     type="submit"

From cfdfc7f53100d2b2698cd3f36c0ab68639389ab1 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Thu, 12 Sep 2024 13:19:37 +0200
Subject: [PATCH 101/228] fix: CustomerSamples

---
 src/components/VnTable/VnTable.vue            |  7 +-
 src/components/ui/VnPaginate.vue              |  9 ++-
 src/composables/usePrintService.js            |  5 +-
 src/pages/Customer/Card/CustomerBalance.vue   | 80 +++++++------------
 .../components/CustomerSummaryTable.vue       |  1 +
 .../Card/InvoiceOutDescriptorMenu.vue         |  3 +-
 src/pages/Route/RouteList.vue                 | 19 +++--
 src/pages/Ticket/TicketFutureFilter.vue       |  4 +-
 8 files changed, 54 insertions(+), 74 deletions(-)

diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index 0ed3de261..d6008de0b 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -369,7 +369,7 @@ function handleOnDataSaved(_) {
         @on-fetch="(...args) => emit('onFetch', ...args)"
         :search-url="searchUrl"
         :disable-infinite-scroll="
-            $attrs['disableInfiniteScroll'] ? isTableMode : disableInfiniteScroll
+            $attrs['disableInfiniteScroll'] ? isTableMode : !disableInfiniteScroll
         "
         @save-changes="reload"
         :has-sub-toolbar="$props.hasSubToolbar ?? isEditable"
@@ -507,11 +507,8 @@ function handleOnDataSaved(_) {
                             :key="index"
                             :title="btn.title"
                             :icon="btn.icon"
-                            class="q-px-sm"
+                            class="q-px-sm text-primary-light"
                             flat
-                            :class="
-                                btn.isPrimary ? 'text-primary-light' : 'color-vn-text '
-                            "
                             :style="`visibility: ${
                                 (btn.show && btn.show(row)) ?? true ? 'visible' : 'hidden'
                             }`"
diff --git a/src/components/ui/VnPaginate.vue b/src/components/ui/VnPaginate.vue
index 441a8ff48..79a79c383 100644
--- a/src/components/ui/VnPaginate.vue
+++ b/src/components/ui/VnPaginate.vue
@@ -224,13 +224,20 @@ defineExpose({ fetch, addFilter, paginate });
         v-bind="$attrs"
     >
         <slot name="body" :rows="store.data"></slot>
-        <div v-if="isLoading" class="info-row q-pa-md text-center">
+        <div v-if="isLoading" class="spinner info-row q-pa-md text-center">
             <QSpinner color="primary" size="md" />
         </div>
     </QInfiniteScroll>
 </template>
 
 <style lang="scss" scoped>
+.spinner {
+    z-index: 1;
+    align-content: end;
+    position: absolute;
+    bottom: 0;
+    left: 0;
+}
 .info-row {
     width: 100%;
 
diff --git a/src/composables/usePrintService.js b/src/composables/usePrintService.js
index ff43c65a1..68a009d7b 100644
--- a/src/composables/usePrintService.js
+++ b/src/composables/usePrintService.js
@@ -16,7 +16,7 @@ export function usePrintService() {
         );
     }
 
-    function openReport(path, params) {
+    function openReport(path, params, isNewTab = '_self') {
         if (typeof params === 'string') params = JSON.parse(params);
         params = Object.assign(
             {
@@ -26,8 +26,7 @@ export function usePrintService() {
         );
 
         const query = new URLSearchParams(params).toString();
-
-        window.open(`api/${path}?${query}`);
+        window.open(`api/${path}?${query}`, isNewTab);
     }
 
     return {
diff --git a/src/pages/Customer/Card/CustomerBalance.vue b/src/pages/Customer/Card/CustomerBalance.vue
index 70747bb3f..2a1991bbd 100644
--- a/src/pages/Customer/Card/CustomerBalance.vue
+++ b/src/pages/Customer/Card/CustomerBalance.vue
@@ -5,12 +5,12 @@ import { useRoute } from 'vue-router';
 import { useAcl } from 'src/composables/useAcl';
 import axios from 'axios';
 import { useQuasar } from 'quasar';
+import FetchData from 'components/FetchData.vue';
 
 import { toCurrency, toDate, toDateHourMin } from 'src/filters';
 import { useState } from 'composables/useState';
 import { useStateStore } from 'stores/useStateStore';
 import { usePrintService } from 'composables/usePrintService';
-import { useSession } from 'composables/useSession';
 import { useVnConfirm } from 'composables/useVnConfirm';
 
 import VnTable from 'components/VnTable/VnTable.vue';
@@ -22,12 +22,10 @@ import CustomerNewPayment from 'src/pages/Customer/components/CustomerNewPayment
 import InvoiceOutDescriptorProxy from 'src/pages/InvoiceOut/Card/InvoiceOutDescriptorProxy.vue';
 
 const { openConfirmationModal } = useVnConfirm();
-const { sendEmail } = usePrintService();
+const { sendEmail, openReport } = usePrintService();
 const { t } = useI18n();
 const { hasAny } = useAcl();
-
-const session = useSession();
-const tokenMultimedia = session.getTokenMultimedia();
+const currentBalance = ref({});
 const quasar = useQuasar();
 const route = useRoute();
 const state = useState();
@@ -36,7 +34,7 @@ const user = state.getUser();
 
 const clientRisk = ref([]);
 const tableRef = ref();
-const companyId = ref();
+const companyId = ref(user.value.companyFk);
 const companyLastId = ref(user.value.companyFk);
 const balances = ref([]);
 const vnFilterRef = ref({});
@@ -76,14 +74,14 @@ const companyFilterColumn = {
 
 const columns = computed(() => [
     {
-        align: 'left',
+        align: 'right',
         name: 'payed',
         label: t('Date'),
         format: ({ payed }) => toDate(payed),
         cardVisible: true,
     },
     {
-        align: 'left',
+        align: 'right',
         name: 'created',
         label: t('Creation date'),
         format: ({ created }) => toDateHourMin(created),
@@ -91,11 +89,10 @@ const columns = computed(() => [
     },
     {
         align: 'left',
-        name: 'workerFk',
         label: t('Employee'),
         columnField: {
             component: 'userLink',
-            attrs: ({ row }) => ({ workerId: row.workerFk, tag: row.userName }),
+            attrs: ({ row }) => ({ workerId: row.workerFk, name: row.userName }),
         },
         cardVisible: true,
     },
@@ -120,14 +117,14 @@ const columns = computed(() => [
         isId: true,
     },
     {
-        align: 'right',
+        align: 'left',
         name: 'credit',
         label: t('Havings'),
         format: ({ credit }) => credit && toCurrency(credit),
         cardVisible: true,
     },
     {
-        align: 'right',
+        align: 'left',
         name: 'balance',
         label: t('Balance'),
         format: ({ balance }) => toCurrency(balance),
@@ -166,41 +163,15 @@ const columns = computed(() => [
 
 onBeforeMount(() => {
     stateStore.rightDrawer = true;
-    companyId.value = user.value.companyFk;
 });
 
-async function getClientRisk() {
-    const { data } = await axios.get(`clientRisks`, {
-        params: {
-            filter: JSON.stringify({
-                include: { relation: 'company', scope: { fields: ['code'] } },
-                where: { clientFk: route.params.id, companyFk: user.value.companyFk },
-            }),
-        },
-    });
-    clientRisk.value = data;
-    return clientRisk.value;
-}
-
-async function getCurrentBalance() {
-    const currentBalance = (await getClientRisk()).find((balance) => {
-        return balance.companyFk === companyId.value;
-    });
-    return currentBalance && currentBalance.amount;
-}
-
-async function onFetch(data) {
-    balances.value = [];
-    for (const [index, balance] of data.entries()) {
-        if (index === 0) {
-            balance.balance = await getCurrentBalance();
-            continue;
-        }
-        const previousBalance = data[index - 1];
-        balance.balance =
-            previousBalance?.balance - (previousBalance?.debit - previousBalance?.credit);
+async function getCurrentBalance(data) {
+    for (const balance of data) {
+        currentBalance.value[balance.companyFk] = {
+            code: balance.company.code,
+            amount: balance.amount,
+        };
     }
-    balances.value = data;
 }
 
 const showNewPaymentDialog = () => {
@@ -215,19 +186,27 @@ const showNewPaymentDialog = () => {
 };
 
 const showBalancePdf = ({ id }) => {
-    const url = `api/InvoiceOuts/${id}/download?access_token=${tokenMultimedia}`;
-    window.open(url, '_blank');
+    openReport(`InvoiceOuts/${id}/download`, {}, '_blank');
 };
 </script>
 
 <template>
+    <FetchData
+        url="clientRisks"
+        :filter="{
+            include: { relation: 'company', scope: { fields: ['code'] } },
+            where: { clientFk: route.params.id, companyFk: companyId },
+        }"
+        auto-load
+        @on-fetch="getCurrentBalance"
+    ></FetchData>
     <VnSubToolbar class="q-mb-md">
         <template #st-data>
             <div class="column justify-center q-px-md q-py-sm">
                 <span class="text-bold">{{ t('Total by company') }}</span>
-                <div class="row justify-center" v-if="clientRisk?.length">
-                    {{ clientRisk[0].company.code }}:
-                    {{ toCurrency(clientRisk[0].amount) }}
+                <div class="row justify-center">
+                    {{ currentBalance[companyId]?.code }}:
+                    {{ toCurrency(currentBalance[companyId]?.amount) }}
                 </div>
             </div>
         </template>
@@ -253,7 +232,6 @@ const showBalancePdf = ({ id }) => {
         :right-search="false"
         :is-editable="false"
         :column-search="false"
-        @on-fetch="onFetch"
         :disable-option="{ card: true }"
         auto-load
     >
@@ -262,7 +240,7 @@ const showBalancePdf = ({ id }) => {
         </template>
         <template #column-description="{ row }">
             <div class="link" v-if="row.isInvoice">
-                {{ row.description }}
+                {{ t('bill', { ref: row.description }) }}
                 <InvoiceOutDescriptorProxy :id="row.description" />
             </div>
             <span v-else class="q-pa-xs dotted rounded-borders" :title="row.description">
diff --git a/src/pages/Customer/components/CustomerSummaryTable.vue b/src/pages/Customer/components/CustomerSummaryTable.vue
index 87e4cffa7..374769a57 100644
--- a/src/pages/Customer/components/CustomerSummaryTable.vue
+++ b/src/pages/Customer/components/CustomerSummaryTable.vue
@@ -151,6 +151,7 @@ const setShippedColor = (date) => {
         :disable-option="{ card: true, table: true }"
         limit="5"
         class="full-width"
+        :disable-infinite-scroll="true"
     >
         <template #column-nickname="{ row }">
             <span class="link">
diff --git a/src/pages/InvoiceOut/Card/InvoiceOutDescriptorMenu.vue b/src/pages/InvoiceOut/Card/InvoiceOutDescriptorMenu.vue
index 213e25b4a..08b21fb4a 100644
--- a/src/pages/InvoiceOut/Card/InvoiceOutDescriptorMenu.vue
+++ b/src/pages/InvoiceOut/Card/InvoiceOutDescriptorMenu.vue
@@ -41,8 +41,7 @@ const invoiceFormType = ref('pdf');
 const defaultEmailAddress = ref($props.invoiceOutData.client?.email);
 
 const showInvoicePdf = () => {
-    const url = `api/InvoiceOuts/${$props.invoiceOutData.id}/download?access_token=${token}`;
-    window.open(url, '_blank');
+    openReport(`InvoiceOuts/${$props.invoiceOutData.id}/download`, {}, '_blank');
 };
 
 const showInvoiceCsv = () => {
diff --git a/src/pages/Route/RouteList.vue b/src/pages/Route/RouteList.vue
index 7e2358236..1e20df99c 100644
--- a/src/pages/Route/RouteList.vue
+++ b/src/pages/Route/RouteList.vue
@@ -17,7 +17,9 @@ import RouteFilter from 'pages/Route/Card/RouteFilter.vue';
 import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 import VnInputDate from 'components/common/VnInputDate.vue';
 import VnTable from 'components/VnTable/VnTable.vue';
+import { usePrintService } from 'src/composables/usePrintService';
 
+const { openReport } = usePrintService();
 const { t } = useI18n();
 const { viewSummary } = useSummaryDialog();
 const quasar = useQuasar();
@@ -235,18 +237,15 @@ const cloneRoutes = () => {
 const showRouteReport = () => {
     const ids = selectedRows.value.map((row) => row?.id);
     const idString = ids.join(',');
-    let url;
-
-    if (selectedRows.value.length <= 1) {
-        url = `api/Routes/${idString}/driver-route-pdf?access_token=${session.getTokenMultimedia()}`;
-    } else {
-        const params = new URLSearchParams({
-            access_token: session.getTokenMultimedia(),
+    let url = `Routes/${idString}/driver-route-pdf`;
+    let params = {};
+    if (selectedRows.value.length >= 1) {
+        params = {
             id: idString,
-        });
-        url = `api/Routes/downloadZip?${params.toString()}`;
+        };
+        url = `Routes/downloadZip`;
     }
-    window.open(url, '_blank');
+    openReport(url, params, '_blank');
 };
 
 function markAsServed() {
diff --git a/src/pages/Ticket/TicketFutureFilter.vue b/src/pages/Ticket/TicketFutureFilter.vue
index bb597a525..6345f62b3 100644
--- a/src/pages/Ticket/TicketFutureFilter.vue
+++ b/src/pages/Ticket/TicketFutureFilter.vue
@@ -153,7 +153,7 @@ onMounted(async () => {
                         :label="t('params.state')"
                         v-model="params.state"
                         :options="stateOptions"
-                        option-value="code"
+                        option-value="id"
                         option-label="name"
                         @update:model-value="searchFn()"
                         dense
@@ -169,7 +169,7 @@ onMounted(async () => {
                         :label="t('params.futureState')"
                         v-model="params.futureState"
                         :options="stateOptions"
-                        option-value="code"
+                        option-value="id"
                         option-label="name"
                         @update:model-value="searchFn()"
                         dense

From dcb8c5daad7821cc786aa69d5eb0bfdd77db3546 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Thu, 12 Sep 2024 13:27:28 +0200
Subject: [PATCH 102/228] fix: workerDms filter workerFk

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

diff --git a/src/pages/Worker/Card/WorkerDms.vue b/src/pages/Worker/Card/WorkerDms.vue
index a4f7ef5a9..e2b62bc4f 100644
--- a/src/pages/Worker/Card/WorkerDms.vue
+++ b/src/pages/Worker/Card/WorkerDms.vue
@@ -10,6 +10,6 @@ const route = useRoute();
         delete-model="WorkerDms"
         download-model="WorkerDms"
         default-dms-code="hhrrData"
-        filter="worker"
+        filter="wd.workerFk"
     />
 </template>

From 8fc7e3cfb45291a6b0d2ed0427b371413b6ade2e Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Thu, 12 Sep 2024 20:43:50 +0200
Subject: [PATCH 103/228] fix: CustomerSamples

---
 src/pages/Customer/Card/CustomerSamples.vue | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/pages/Customer/Card/CustomerSamples.vue b/src/pages/Customer/Card/CustomerSamples.vue
index 49697aab7..8e2ab92a0 100644
--- a/src/pages/Customer/Card/CustomerSamples.vue
+++ b/src/pages/Customer/Card/CustomerSamples.vue
@@ -1,7 +1,7 @@
 <script setup>
 import { ref, computed } from 'vue';
 import { useI18n } from 'vue-i18n';
-import { useRoute, useRouter } from 'vue-router';
+import { useRoute } from 'vue-router';
 
 import { QBtn, useQuasar } from 'quasar';
 
@@ -13,7 +13,6 @@ import CustomerSamplesCreate from '../components/CustomerSamplesCreate.vue';
 
 const { t } = useI18n();
 const route = useRoute();
-const router = useRouter();
 
 const filter = {
     include: [
@@ -42,7 +41,16 @@ const columns = computed(() => [
     {
         align: 'left',
         label: t('Worker'),
-        name: 'worker',
+        columnField: {
+            component: 'userLink',
+            attrs: ({ row }) => {
+                return {
+                    defaultName: true,
+                    workerId: row?.user?.id,
+                    name: row?.user?.name,
+                };
+            },
+        },
     },
     {
         align: 'left',
@@ -73,7 +81,9 @@ const tableRef = ref();
         :columns="columns"
         :pagination="{ rowsPerPage: 12 }"
         :disable-option="{ card: true }"
+        :right-search="false"
         :rows="rows"
+        :order="['created DESC']"
         class="full-width q-mt-md"
         row-key="id"
         :create="false"

From 24f4af712ec3ab8e680a32b58619f58d649ef33a Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Thu, 12 Sep 2024 20:59:35 +0200
Subject: [PATCH 104/228] fix: CustomerMandates

---
 src/pages/Customer/Card/CustomerMandates.vue | 108 +++++--------------
 1 file changed, 27 insertions(+), 81 deletions(-)

diff --git a/src/pages/Customer/Card/CustomerMandates.vue b/src/pages/Customer/Card/CustomerMandates.vue
index 7af3e5828..248515b4a 100644
--- a/src/pages/Customer/Card/CustomerMandates.vue
+++ b/src/pages/Customer/Card/CustomerMandates.vue
@@ -1,20 +1,19 @@
 <script setup>
-import { computed, ref } from 'vue';
+import { computed } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
 
 import { toDateTimeFormat } from 'src/filters/date';
 
-import FetchData from 'components/FetchData.vue';
+import VnTable from 'src/components/VnTable/VnTable.vue';
+import { dashIfEmpty } from 'src/filters';
 
 const { t } = useI18n();
 const route = useRoute();
 
-const rows = ref([]);
-
 const filter = {
     include: [
-        { relation: 'mandateType', scope: { fields: ['id', 'name'] } },
+        { relation: 'mandateType', scope: { fields: ['id', 'code'] } },
         { relation: 'company', scope: { fields: ['id', 'code'] } },
     ],
     where: { clientFk: route.params.id },
@@ -22,114 +21,61 @@ const filter = {
     limit: 20,
 };
 
-const tableColumnComponents = {
-    id: {
-        component: 'span',
-        props: () => {},
-        event: () => {},
-    },
-    company: {
-        component: 'span',
-        props: () => {},
-        event: () => {},
-    },
-    type: {
-        component: 'span',
-        props: () => {},
-        event: () => {},
-    },
-    registerDate: {
-        component: 'span',
-        props: () => {},
-        event: () => {},
-    },
-    endDate: {
-        component: 'span',
-        props: () => {},
-        event: () => {},
-    },
-};
-
 const columns = computed(() => [
     {
         align: 'left',
-        field: 'id',
-        label: t('Id'),
         name: 'id',
+        label: t('globals.id'),
+        field: 'id',
+        isId: true,
     },
     {
         align: 'left',
-        field: (row) => row.company.code,
-        label: t('Company'),
+        cardVisible: true,
+        format: ({ company }) => company.code,
+        label: t('globals.company'),
         name: 'company',
     },
     {
         align: 'left',
-        field: (row) => row.mandateType.name,
-        label: t('Type'),
+        cardVisible: true,
+        format: ({ mandateType }) => mandateType.code,
+        label: t('globals.type'),
         name: 'type',
     },
     {
         align: 'left',
-        field: 'created',
+        cardVisible: true,
         label: t('Register date'),
-        name: 'registerDate',
-        format: (value) => toDateTimeFormat(value),
+        name: 'created',
+        format: ({ created }) => toDateTimeFormat(created),
     },
     {
-        align: 'left',
-        field: 'finished',
+        align: 'right',
+        cardVisible: true,
+        name: 'finished',
         label: t('End date'),
-        name: 'endDate',
-        format: (value) => (value ? toDateTimeFormat(value) : '-'),
+        format: ({ finished }) => dashIfEmpty(toDateTimeFormat(finished)),
     },
 ]);
 </script>
 
 <template>
-    <FetchData
-        :filter="filter"
-        @on-fetch="(data) => (rows = data)"
-        auto-load
-        url="Mandates"
-    />
-
     <QPage class="column items-center q-pa-md">
-        <QTable
+        <VnTable
+            :filter="filter"
+            auto-load
+            url="Mandates"
             :columns="columns"
-            :pagination="{ rowsPerPage: 12 }"
-            :rows="rows"
             class="full-width q-mt-md"
-            row-key="id"
-            v-if="rows?.length"
-        >
-            <template #body-cell="props">
-                <QTd :props="props">
-                    <QTr :props="props" class="cursor-pointer">
-                        <component
-                            :is="tableColumnComponents[props.col.name].component"
-                            @click="tableColumnComponents[props.col.name].event(props)"
-                            class="rounded-borders q-pa-sm"
-                            v-bind="tableColumnComponents[props.col.name].props(props)"
-                        >
-                            {{ props.value }}
-                        </component>
-                    </QTr>
-                </QTd>
-            </template>
-        </QTable>
-
-        <h5 class="flex justify-center color-vn-label" v-else>
-            {{ t('globals.noResults') }}
-        </h5>
+            :right-search="false"
+            :row-click="false"
+        />
     </QPage>
 </template>
 
 <i18n>
 es:
-    Id: Id
-    Company: Empresa
-    Type: Tipo
     Register date: Fecha alta
     End date: Fecha baja
 </i18n>

From 70d0132710a4f4075216642399edf94f70de4f6b Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Thu, 12 Sep 2024 21:03:19 +0200
Subject: [PATCH 105/228] fix: CustomerWebPayment

---
 src/pages/Customer/Card/CustomerWebPayment.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pages/Customer/Card/CustomerWebPayment.vue b/src/pages/Customer/Card/CustomerWebPayment.vue
index 13ec6b128..482582078 100644
--- a/src/pages/Customer/Card/CustomerWebPayment.vue
+++ b/src/pages/Customer/Card/CustomerWebPayment.vue
@@ -5,7 +5,7 @@ import { useRoute } from 'vue-router';
 
 import axios from 'axios';
 
-import { toCurrency, toDateHourMinSec } from 'src/filters';
+import { toCurrency, toDateHourMin } from 'src/filters';
 
 import CustomerCloseIconTooltip from '../components/CustomerCloseIconTooltip.vue';
 import CustomerCheckIconTooltip from '../components/CustomerCheckIconTooltip.vue';
@@ -74,7 +74,7 @@ const columns = computed(() => [
         field: 'created',
         label: t('Date'),
         name: 'date',
-        format: (value) => toDateHourMinSec(value),
+        format: (value) => toDateHourMin(value),
     },
     {
         align: 'left',

From 39f2deafc4b879426075095e28167642fd8845aa Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Thu, 12 Sep 2024 21:08:41 +0200
Subject: [PATCH 106/228] fix: CustomerCreditOpinion workerDescriptor

---
 src/pages/Customer/Card/CustomerCreditOpinion.vue | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/pages/Customer/Card/CustomerCreditOpinion.vue b/src/pages/Customer/Card/CustomerCreditOpinion.vue
index 6a839ff3f..92fef1d76 100644
--- a/src/pages/Customer/Card/CustomerCreditOpinion.vue
+++ b/src/pages/Customer/Card/CustomerCreditOpinion.vue
@@ -44,7 +44,7 @@ const columns = computed(() => [
     {
         align: 'right',
         field: 'rating',
-        label: t('Rating'),
+        label: t('customer.summary.rating'),
         name: 'rating',
         create: true,
         columnCreate: {
@@ -56,7 +56,7 @@ const columns = computed(() => [
         align: 'right',
         field: 'recommendedCredit',
         format: ({ recommendedCredit }) => toCurrency(recommendedCredit),
-        label: t('Recommended credit'),
+        label: t('customer.summary.recommendCredit'),
         name: 'recommendedCredit',
         create: true,
         columnCreate: {
@@ -89,8 +89,8 @@ const columns = computed(() => [
         }"
     >
         <template #column-employee="{ row }">
-            <span class="link" @click.stop>{{ row.worker.user.nickname }}</span>
-            <WorkerDescriptorProxy :id="row.clientFk" />
+            <span class="link">{{ row.worker.user.nickname }}</span>
+            <WorkerDescriptorProxy :id="row.worker.id" />
         </template>
     </VnTable>
     <!-- <QTable
@@ -113,7 +113,6 @@ const columns = computed(() => [
 
 <i18n>
 es:
-    Rating: Clasificación
     Recommended credit: Crédito recomendado
     Since: Desde
     Employee: Empleado

From 54fc7f6394e2f7bdc2698145c424c948fe0d4fdd Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Thu, 12 Sep 2024 21:10:06 +0200
Subject: [PATCH 107/228] fix: CustomerRecovery transalate label

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

diff --git a/src/pages/Customer/Card/CustomerRecoveries.vue b/src/pages/Customer/Card/CustomerRecoveries.vue
index 3ea8998e9..48576ca20 100644
--- a/src/pages/Customer/Card/CustomerRecoveries.vue
+++ b/src/pages/Customer/Card/CustomerRecoveries.vue
@@ -92,7 +92,7 @@ function setFinished(id) {
         :disable-option="{ card: true }"
         :create="{
             urlCreate: 'Recoveries',
-            title: 'New recovery',
+            title: t('New recovery'),
             onDataSaved: () => tableRef.reload(),
             formInitialData: { clientFk: route.params.id, started: Date.vnNew() },
         }"

From 6e784bb290d0f472f4e1d2c06a8f92dda8f45b59 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Thu, 12 Sep 2024 21:11:51 +0200
Subject: [PATCH 108/228] fix: address-create i18n

---
 src/i18n/locale/en.yml | 1 +
 src/i18n/locale/es.yml | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index d29b864b9..213d302cb 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -133,6 +133,7 @@ globals:
         fiscalData: Fiscal data
         billingData: Billing data
         consignees: Consignees
+        'address-create': New address
         notes: Notes
         credits: Credits
         greuges: Greuges
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index 3d905509d..72d4fb1b1 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -136,6 +136,7 @@ globals:
         fiscalData: Datos fiscales
         billingData: Forma de pago
         consignees: Consignatarios
+        'address-create': Nuevo consignatario
         notes: Notas
         credits: Créditos
         greuges: Greuges

From fa408dc2267405062175a77c3d561b3a0fae4302 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Thu, 12 Sep 2024 21:20:30 +0200
Subject: [PATCH 109/228] fix: CustomerAddress mobile

---
 src/pages/Customer/Card/CustomerAddress.vue | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/pages/Customer/Card/CustomerAddress.vue b/src/pages/Customer/Card/CustomerAddress.vue
index a9e7affef..d76707079 100644
--- a/src/pages/Customer/Card/CustomerAddress.vue
+++ b/src/pages/Customer/Card/CustomerAddress.vue
@@ -179,6 +179,13 @@ const toCustomerAddressEdit = (addressId) => {
                             {{ item.postalCode }} - {{ item.city }},
                             {{ setProvince(item.provinceFk) }}
                         </div>
+                        <div>
+                            {{ item.phone }}
+                            <span v-if="item.mobile"
+                                >,
+                                {{ item.mobile }}
+                            </span>
+                        </div>
                         <div class="flex">
                             <QCheckbox
                                 :label="t('Is equalizated')"

From aca13d91196ed8b0b884a211a2323d013e4c6cd3 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Thu, 12 Sep 2024 21:26:28 +0200
Subject: [PATCH 110/228] fix: CustomerBillingData

---
 .../Customer/Card/CustomerBillingData.vue     | 20 ++++++-------------
 1 file changed, 6 insertions(+), 14 deletions(-)

diff --git a/src/pages/Customer/Card/CustomerBillingData.vue b/src/pages/Customer/Card/CustomerBillingData.vue
index 5eeaea50b..a968d0ec8 100644
--- a/src/pages/Customer/Card/CustomerBillingData.vue
+++ b/src/pages/Customer/Card/CustomerBillingData.vue
@@ -3,7 +3,6 @@ import { ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
 
-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';
@@ -14,8 +13,6 @@ import CreateBankEntityForm from 'src/components/CreateBankEntityForm.vue';
 const { t } = useI18n();
 const route = useRoute();
 
-const payMethods = ref([]);
-const bankEntitiesOptions = ref([]);
 const bankEntitiesRef = ref(null);
 
 const filter = {
@@ -31,15 +28,6 @@ const getBankEntities = (data, formData) => {
 </script>
 
 <template>
-    <FetchData @on-fetch="(data) => (payMethods = data)" auto-load url="PayMethods" />
-    <FetchData
-        ref="bankEntitiesRef"
-        @on-fetch="(data) => (bankEntitiesOptions = data)"
-        :filter="filter"
-        auto-load
-        url="BankEntities"
-    />
-
     <FormModel
         :url-update="`Clients/${route.params.id}`"
         :url="`Clients/${route.params.id}/getCard`"
@@ -49,8 +37,9 @@ const getBankEntities = (data, formData) => {
         <template #form="{ data, validate }">
             <VnRow>
                 <VnSelect
+                    auto-load
+                    url="PayMethods"
                     :label="t('Billing data')"
-                    :options="payMethods"
                     hide-selected
                     option-label="name"
                     option-value="id"
@@ -69,7 +58,10 @@ const getBankEntities = (data, formData) => {
                 </VnInput>
                 <VnSelectDialog
                     :label="t('Swift / BIC')"
-                    :options="bankEntitiesOptions"
+                    ref="bankEntitiesRef"
+                    :filter="filter"
+                    auto-load
+                    url="BankEntities"
                     :acls="[{ model: 'BankEntity', props: '*', accessType: 'WRITE' }]"
                     :rules="validate('Worker.bankEntity')"
                     hide-selected

From 8be1833f9e7bbf6b9d6bc8163b84eb090ecbb1b8 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Fri, 13 Sep 2024 08:49:36 +0200
Subject: [PATCH 111/228] refs #7155 scopeDays

---
 src/pages/Travel/TravelList.vue | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/src/pages/Travel/TravelList.vue b/src/pages/Travel/TravelList.vue
index c7ad908f9..0fba3a8d3 100644
--- a/src/pages/Travel/TravelList.vue
+++ b/src/pages/Travel/TravelList.vue
@@ -11,6 +11,7 @@ import TravelSummary from './Card/TravelSummary.vue';
 import VnSearchbar from 'components/ui/VnSearchbar.vue';
 import { toDate } from 'src/filters';
 import { getDateQBadgeColor } from 'src/composables/getDateQBadgeColor.js';
+import { dateRange } from 'src/filters';
 const { viewSummary } = useSummaryDialog();
 const router = useRouter();
 const { t } = useI18n();
@@ -29,6 +30,18 @@ const cloneTravel = (travelData) => {
     redirectToCreateView(stringifiedTravelData);
 };
 
+const handleScopeDays = (params, days, callback) => {
+    const [from, to] = dateRange(Date.vnNew());
+    if (!days) {
+        Object.assign(params, { from, to, scopeDays: 1 });
+    } else {
+        params.from = from;
+        to.setDate(to.getDate() + days);
+        params.to = to;
+    }
+    if (callback) callback();
+};
+
 const redirectToCreateView = (queryParams) => {
     router.push({ name: 'TravelCreate', query: { travelData: queryParams } });
 };

From a5ea940dd887b8f540e283c70db99aa0a4a42538 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 13 Sep 2024 09:23:15 +0200
Subject: [PATCH 112/228] fix: Customer module find salesPersons out of first
 get

---
 src/pages/Customer/Card/CustomerBasicData.vue | 1 -
 src/pages/Customer/CustomerList.vue           | 1 -
 2 files changed, 2 deletions(-)

diff --git a/src/pages/Customer/Card/CustomerBasicData.vue b/src/pages/Customer/Card/CustomerBasicData.vue
index 91d9edc05..adbd476b0 100644
--- a/src/pages/Customer/Card/CustomerBasicData.vue
+++ b/src/pages/Customer/Card/CustomerBasicData.vue
@@ -99,7 +99,6 @@ const title = ref();
                     :fields="['id', 'nickname']"
                     sort-by="nickname ASC"
                     :rules="validate('client.salesPersonFk')"
-                    :use-like="false"
                     emit-value
                     auto-load
                 >
diff --git a/src/pages/Customer/CustomerList.vue b/src/pages/Customer/CustomerList.vue
index f6758bf4e..270acdb89 100644
--- a/src/pages/Customer/CustomerList.vue
+++ b/src/pages/Customer/CustomerList.vue
@@ -425,7 +425,6 @@ function handleLocation(data, location) {
                 }"
                 :fields="['id', 'nickname']"
                 sort-by="nickname ASC"
-                :use-like="false"
                 emit-value
                 auto-load
             >

From 58be11df046f33259a794effec4bc84b9e0728b0 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Fri, 13 Sep 2024 10:13:03 +0200
Subject: [PATCH 113/228] chore: refs #7828 fix e2e

---
 test/cypress/integration/ticket/ticketDescriptor.spec.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/cypress/integration/ticket/ticketDescriptor.spec.js b/test/cypress/integration/ticket/ticketDescriptor.spec.js
index 516b0f13d..8192b7c7c 100644
--- a/test/cypress/integration/ticket/ticketDescriptor.spec.js
+++ b/test/cypress/integration/ticket/ticketDescriptor.spec.js
@@ -5,7 +5,7 @@ describe('Ticket descriptor', () => {
     const warehouseValue = ':nth-child(1) > :nth-child(6) > .value > span';
     const summaryHeader = '.summaryHeader > div';
     const weight = 25;
-    const weightValue = ':nth-child(10) > .value > span';
+    const weightValue = '.summaryBody.row :nth-child(1) > :nth-child(9) > .value > span';
     beforeEach(() => {
         cy.login('developer');
         cy.viewport(1920, 1080);

From 5796bc9c0a7e0dc27378b1b053eded6c07a53bbb Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 13 Sep 2024 10:32:40 +0200
Subject: [PATCH 114/228] fix: emit:updateModelValue

---
 src/components/common/VnLocation.vue          |  4 +++
 .../vnComponent/vnLocation.spec.js            | 32 ++++++++++++++++++-
 2 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/src/components/common/VnLocation.vue b/src/components/common/VnLocation.vue
index e95d5a043..b6cbfbafd 100644
--- a/src/components/common/VnLocation.vue
+++ b/src/components/common/VnLocation.vue
@@ -20,6 +20,9 @@ const modelValue = ref(
 function showLabel(data) {
     return `${data.code} - ${data.town}(${data.province}), ${data.country}`;
 }
+const handleModelValue = (data) => {
+    emit('update:model-value', data);
+};
 </script>
 <template>
     <VnSelectDialog
@@ -29,6 +32,7 @@ function showLabel(data) {
             (opt) => (typeof modelValue === 'string' ? modelValue : showLabel(opt))
         "
         url="Postcodes/filter"
+        @update:model-value="handleModelValue"
         :use-like="false"
         :label="t('Location')"
         :placeholder="t('search_by_postalcode')"
diff --git a/test/cypress/integration/vnComponent/vnLocation.spec.js b/test/cypress/integration/vnComponent/vnLocation.spec.js
index 614b93a8a..8c187cc7e 100644
--- a/test/cypress/integration/vnComponent/vnLocation.spec.js
+++ b/test/cypress/integration/vnComponent/vnLocation.spec.js
@@ -33,11 +33,40 @@ describe('VnLocation', () => {
             cy.login('developer');
             cy.visit('/#/supplier/567/fiscal-data', { timeout: 7000 });
             cy.waitForElement('.q-form');
-            cy.get(createLocationButton).click();
         });
+        it('Fin by postalCode', () => {
+            const postCode = '46600';
+            const firstOption = '[role="listbox"] .q-item:nth-child(1)';
+
+            cy.get(inputLocation).click();
+            cy.get(inputLocation).clear();
+            cy.get(inputLocation).type(postCode);
+            cy.get(locationOptions).should('have.length.at.least', 2);
+            cy.get(firstOption).click();
+            cy.get('.q-btn-group > .q-btn--standard > .q-btn__content > .q-icon').click();
+            cy.reload();
+            cy.waitForElement('.q-form');
+            // cy.get('[href="#/supplier/567/basic-data"] > .q-item__section--main').click();
+            // cy.get(
+            //     '[href="#/supplier/567/fiscal-data"] > .q-item__section--main'
+            // ).click();
+            cy.get(inputLocation).should(
+                'have.value',
+                '46600 - Valencia(Province one), España'
+            );
+
+            // cy.get('.q-form > .q-card > .vn-row:nth-child(6)')
+            // .find('input')
+            // .invoke('val')
+            // .then((text) => {
+            //     expect(text).to.contain('46600 - Valencia(Province one), España');
+            // });
+        });
+
         it('Create postCode', () => {
             const postCode = '1234475';
             const province = 'Valencia';
+            cy.get(createLocationButton).click();
             cy.get('.q-card > h1').should('have.text', 'New postcode');
             cy.get(dialogInputs).eq(0).clear();
             cy.get(dialogInputs).eq(0).type(postCode);
@@ -54,6 +83,7 @@ describe('VnLocation', () => {
         it('Create city', () => {
             const postCode = '9011';
             const province = 'Saskatchew';
+            cy.get(createLocationButton).click();
             cy.get(dialogInputs).eq(0).type(postCode);
             // city create button
             cy.get(

From a56dc7aa089c2b46d37bb92aa2c7279316f93b07 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 13 Sep 2024 10:33:08 +0200
Subject: [PATCH 115/228] test: fix test

---
 .../integration/vnComponent/vnLocation.spec.js        | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/test/cypress/integration/vnComponent/vnLocation.spec.js b/test/cypress/integration/vnComponent/vnLocation.spec.js
index 8c187cc7e..3533a3c1f 100644
--- a/test/cypress/integration/vnComponent/vnLocation.spec.js
+++ b/test/cypress/integration/vnComponent/vnLocation.spec.js
@@ -46,21 +46,10 @@ describe('VnLocation', () => {
             cy.get('.q-btn-group > .q-btn--standard > .q-btn__content > .q-icon').click();
             cy.reload();
             cy.waitForElement('.q-form');
-            // cy.get('[href="#/supplier/567/basic-data"] > .q-item__section--main').click();
-            // cy.get(
-            //     '[href="#/supplier/567/fiscal-data"] > .q-item__section--main'
-            // ).click();
             cy.get(inputLocation).should(
                 'have.value',
                 '46600 - Valencia(Province one), España'
             );
-
-            // cy.get('.q-form > .q-card > .vn-row:nth-child(6)')
-            // .find('input')
-            // .invoke('val')
-            // .then((text) => {
-            //     expect(text).to.contain('46600 - Valencia(Province one), España');
-            // });
         });
 
         it('Create postCode', () => {

From 48a5c15b9d8a466676c4b069a0e67b41f4b5c14c Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Fri, 13 Sep 2024 10:54:09 +0200
Subject: [PATCH 116/228] feat: refs #7828 create axios instance which no
 manage errors

---
 src/boot/axios.js                           | 8 ++++++--
 src/pages/Worker/Card/WorkerTimeControl.vue | 6 ++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/boot/axios.js b/src/boot/axios.js
index 9b32275bd..99a163cca 100644
--- a/src/boot/axios.js
+++ b/src/boot/axios.js
@@ -5,8 +5,10 @@ import useNotify from 'src/composables/useNotify.js';
 
 const session = useSession();
 const { notify } = useNotify();
+const baseUrl = '/api/';
 
-axios.defaults.baseURL = '/api/';
+axios.defaults.baseURL = baseUrl;
+const axiosNoError = axios.create({ baseURL: baseUrl });
 
 const onRequest = (config) => {
     const token = session.getToken();
@@ -79,5 +81,7 @@ const onResponseError = (error) => {
 
 axios.interceptors.request.use(onRequest, onRequestError);
 axios.interceptors.response.use(onResponse, onResponseError);
+axiosNoError.interceptors.request.use(onRequest);
+axiosNoError.interceptors.response.use(onResponse);
 
-export { onRequest, onResponseError };
+export { onRequest, onResponseError, axiosNoError };
diff --git a/src/pages/Worker/Card/WorkerTimeControl.vue b/src/pages/Worker/Card/WorkerTimeControl.vue
index 3893305a5..9ae91f8ce 100644
--- a/src/pages/Worker/Card/WorkerTimeControl.vue
+++ b/src/pages/Worker/Card/WorkerTimeControl.vue
@@ -2,6 +2,7 @@
 import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
 import { onMounted, ref, computed, onBeforeMount, nextTick, reactive } from 'vue';
+import { axiosNoError } from 'src/boot/axios';
 
 import FetchData from 'components/FetchData.vue';
 import WorkerTimeHourChip from 'pages/Worker/Card/WorkerTimeHourChip.vue';
@@ -266,10 +267,11 @@ const fetchWeekData = async () => {
     };
     try {
         const mail = (
-            await axios.get(`Workers/${route.params.id}/mail`, {
+            await axiosNoError.get(`Workers/${route.params.id}/mail`, {
                 params: { filter: { where } },
             })
         ).data[0];
+
         if (!mail) state.value = null;
         else {
             state.value = mail.state;
@@ -277,7 +279,7 @@ const fetchWeekData = async () => {
         }
 
         canResend.value = !!(
-            await axios.get('WorkerTimeControlMails/count', { params: { where } })
+            await axiosNoError.get('WorkerTimeControlMails/count', { params: { where } })
         ).data.count;
     } catch (err) {
         console.error('Error fetching week data');

From 0f604ea8b5eaf3485a4678326aa5e327f9154a81 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Fri, 13 Sep 2024 11:34:45 +0200
Subject: [PATCH 117/228] fix: refs #7500 fixed e2e test

---
 test/cypress/integration/entry/entryDms.spec.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/cypress/integration/entry/entryDms.spec.js b/test/cypress/integration/entry/entryDms.spec.js
index ed4a3d79c..47dcdba9e 100644
--- a/test/cypress/integration/entry/entryDms.spec.js
+++ b/test/cypress/integration/entry/entryDms.spec.js
@@ -23,7 +23,7 @@ describe('EntryDms', () => {
             expect(value).to.have.length(newFileTd++);
             const newRowSelector = `tbody > :nth-child(${newFileTd})`;
             cy.waitForElement(newRowSelector);
-            cy.validateRow(newRowSelector, [u, u, u, u, 'ENTRADA ID 1']);
+            cy.validateRow(newRowSelector, [u, u, u, u, u, 'ENTRADA ID 1']);
 
             //Edit new dms
             const newDescription = 'entry id 1 modified';
@@ -38,7 +38,7 @@ describe('EntryDms', () => {
             cy.saveCard();
             cy.reload();
 
-            cy.validateRow(newRowSelector, [u, u, u, u, newDescription]);
+            cy.validateRow(newRowSelector, [u, u, u, u, u, newDescription]);
         });
     });
 });

From 842fb9de5fb1773738cca1d4f236a29171320287 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Fri, 13 Sep 2024 12:52:25 +0200
Subject: [PATCH 118/228] refs #7155 scopeDays fix

---
 src/components/VnTable/VnTable.vue |  1 +
 src/pages/Travel/TravelList.vue    | 43 +++++++++++++++++++-----------
 2 files changed, 29 insertions(+), 15 deletions(-)

diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index 0ed3de261..798213c08 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -301,6 +301,7 @@ defineExpose({
     redirect: redirectFn,
     selected,
     CrudModelRef,
+    params,
 });
 
 function handleOnDataSaved(_) {
diff --git a/src/pages/Travel/TravelList.vue b/src/pages/Travel/TravelList.vue
index 0fba3a8d3..a0976e92c 100644
--- a/src/pages/Travel/TravelList.vue
+++ b/src/pages/Travel/TravelList.vue
@@ -12,6 +12,8 @@ import VnSearchbar from 'components/ui/VnSearchbar.vue';
 import { toDate } from 'src/filters';
 import { getDateQBadgeColor } from 'src/composables/getDateQBadgeColor.js';
 import { dateRange } from 'src/filters';
+import VnInputNumber from 'src/components/common/VnInputNumber.vue';
+
 const { viewSummary } = useSummaryDialog();
 const router = useRouter();
 const { t } = useI18n();
@@ -25,22 +27,26 @@ const $props = defineProps({
     },
 });
 const entityId = computed(() => $props.id || route.params.id);
+
+onMounted(async () => {
+    stateStore.rightDrawer = true;
+    handleScopeDays();
+});
+
 const cloneTravel = (travelData) => {
     const stringifiedTravelData = JSON.stringify(travelData);
     redirectToCreateView(stringifiedTravelData);
 };
 
-const handleScopeDays = (params, days, callback) => {
-    const [from, to] = dateRange(Date.vnNew());
-    if (!days) {
-        Object.assign(params, { from, to, scopeDays: 1 });
-    } else {
-        params.from = from;
-        to.setDate(to.getDate() + days);
-        params.to = to;
-    }
-    if (callback) callback();
-};
+function handleScopeDays(days = 7) {
+    days = +days;
+    tableRef.value.params.scopeDays = days;
+    const [landedFrom, landedTo] = dateRange(Date.vnNew());
+    landedTo.setDate(landedTo.getDate() + days);
+
+    tableRef.value.params.landedFrom = landedFrom;
+    tableRef.value.params.landedTo = landedTo;
+}
 
 const redirectToCreateView = (queryParams) => {
     router.push({ name: 'TravelCreate', query: { travelData: queryParams } });
@@ -50,10 +56,6 @@ const redirectCreateEntryView = (travelData) => {
     router.push({ name: 'EntryCreate', query: { travelFk: travelData.id } });
 };
 
-onMounted(async () => {
-    stateStore.rightDrawer = true;
-});
-
 const columns = computed(() => [
     {
         align: 'left',
@@ -254,6 +256,17 @@ const columns = computed(() => [
                 :class="{ 'is-active': row.isReceived }"
             />
         </template>
+        <template #moreFilterPanel="{ params }">
+            <VnInputNumber
+                :label="t('params.scopeDays')"
+                v-model.number="params.scopeDays"
+                @keyup.enter="(evt) => handleScopeDays(evt.target.value)"
+                @remove="handleScopeDays()"
+                class="q-px-xs q-pr-lg"
+                filled
+                dense
+            />
+        </template>
     </VnTable>
 </template>
 

From 6e6af0af8085fb1e82da7f3c3c17620ba2ecf0e7 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 13 Sep 2024 15:16:40 +0200
Subject: [PATCH 119/228] perf: improve style

---
 src/pages/Item/ItemFixedPrice.vue | 110 ++++++++++++------------------
 1 file changed, 44 insertions(+), 66 deletions(-)

diff --git a/src/pages/Item/ItemFixedPrice.vue b/src/pages/Item/ItemFixedPrice.vue
index d91b5189e..bd8c4b78c 100644
--- a/src/pages/Item/ItemFixedPrice.vue
+++ b/src/pages/Item/ItemFixedPrice.vue
@@ -76,16 +76,8 @@ const columns = computed(() => [
         name: 'rate2',
         ...defaultColumnAttrs,
         cardVisible: true,
-        columnField: {
-            class: 'expand',
-            component: 'input',
-            type: 'number',
-        },
-        columnFilter: {
-            class: 'expand',
-            component: 'input',
-            type: 'number',
-        },
+        component: 'input',
+        type: 'number',
     },
     {
         label: t('item.fixedPrice.packingPrice'),
@@ -93,35 +85,18 @@ const columns = computed(() => [
         name: 'rate3',
         ...defaultColumnAttrs,
         cardVisible: true,
-        columnField: {
-            class: 'expand',
-            component: 'input',
-            type: 'number',
-        },
-        columnFilter: {
-            class: 'expand',
-            component: 'input',
-            type: 'number',
-        },
+        component: 'input',
+        type: 'number',
     },
 
     {
         label: t('item.fixedPrice.minPrice'),
         field: 'minPrice',
-        columnClass: 'shrink',
         name: 'minPrice',
         ...defaultColumnAttrs,
         cardVisible: true,
-        columnField: {
-            class: 'expand',
-            component: 'input',
-            type: 'number',
-        },
-        columnFilter: {
-            class: 'expand',
-            component: 'input',
-            type: 'number',
-        },
+        component: 'input',
+        type: 'number',
     },
     {
         label: t('item.fixedPrice.started'),
@@ -162,16 +137,9 @@ const columns = computed(() => [
         name: 'warehouseFk',
         ...defaultColumnAttrs,
         columnClass: 'shrink',
-        columnFilter: {
-            component: 'select',
-        },
-        columnField: {
-            component: 'select',
-            class: 'expand',
-        },
-        attrs: {
-            options: warehousesOptions,
-        },
+        component: 'select',
+
+        options: warehousesOptions,
     },
     {
         align: 'right',
@@ -518,29 +486,35 @@ function handleOnDataSave({ CrudModelRef }) {
                 </span>
                 <span class="subName">{{ row.subName }}</span>
                 <ItemDescriptorProxy :id="row.itemFk" />
-                <FetchedTags style="width: max-content; max-width: 220px" :item="row" />
+                <FetchedTags :item="row" />
             </template>
             <template #column-rate2="props">
-                <VnInput
-                    mask="###.##"
-                    v-model.number="props.row.rate2"
-                    v-on="getRowUpdateInputEvents(props)"
-                >
-                    <template #append>€</template>
-                </VnInput>
+                <QTd class="col">
+                    <VnInput
+                        type="currency"
+                        style="width: 75px"
+                        v-model.number="props.row.rate2"
+                        v-on="getRowUpdateInputEvents(props)"
+                    >
+                        <template #append>€</template>
+                    </VnInput>
+                </QTd>
             </template>
             <template #column-rate3="props">
-                <VnInput
-                    mask="###.##"
-                    v-model.number="props.row.rate3"
-                    v-on="getRowUpdateInputEvents(props)"
-                >
-                    <template #append>€</template>
-                </VnInput>
+                <QTd class="col">
+                    <VnInput
+                        style="width: 75px"
+                        type="currency"
+                        v-model.number="props.row.rate3"
+                        v-on="getRowUpdateInputEvents(props)"
+                    >
+                        <template #append>€</template>
+                    </VnInput>
+                </QTd>
             </template>
             <template #column-minPrice="props">
                 <QTd class="col">
-                    <div class="row" style="width: 115px">
+                    <div class="row">
                         <QCheckbox
                             :model-value="props.row.hasMinPrice"
                             @update:model-value="updateMinPrice($event, props)"
@@ -549,6 +523,8 @@ function handleOnDataSave({ CrudModelRef }) {
                         />
                         <VnInput
                             class="col"
+                            type="currency"
+                            mask="###.##"
                             :disable="props.row.hasMinPrice === 1"
                             v-model.number="props.row.minPrice"
                             v-on="getRowUpdateInputEvents(props)"
@@ -577,15 +553,17 @@ function handleOnDataSave({ CrudModelRef }) {
                 />
             </template>
             <template #column-warehouseFk="props">
-                <VnSelect
-                    style="max-width: 150px"
-                    :options="warehousesOptions"
-                    hide-selected
-                    option-label="name"
-                    option-value="id"
-                    v-model="props.row.warehouseFk"
-                    v-on="getRowUpdateInputEvents(props, false, 'select')"
-                />
+                <QTd class="col">
+                    <VnSelect
+                        style="max-width: 150px"
+                        :options="warehousesOptions"
+                        hide-selected
+                        option-label="name"
+                        option-value="id"
+                        v-model="props.row.warehouseFk"
+                        v-on="getRowUpdateInputEvents(props, false, 'select')"
+                    />
+                </QTd>
             </template>
             <template #column-deleteAction="{ row, rowIndex }">
                 <QIcon

From 401400bdcfc8b03eab00a4e40dc78ad1ea1fe9e7 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 13 Sep 2024 22:52:26 +0200
Subject: [PATCH 120/228] fix: remove FetchData

---
 src/components/common/VnSelect.vue | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/components/common/VnSelect.vue b/src/components/common/VnSelect.vue
index 837a3d9f6..e767fb201 100644
--- a/src/components/common/VnSelect.vue
+++ b/src/components/common/VnSelect.vue
@@ -1,6 +1,7 @@
 <script setup>
-import { ref, toRefs, computed, watch, onMounted } from 'vue';
+import { ref, toRefs, computed, watch, onMounted, useAttrs } from 'vue';
 import { useI18n } from 'vue-i18n';
+import FetchData from 'src/components/FetchData.vue';
 import { useValidator } from 'src/composables/useValidator';
 
 const emit = defineEmits(['update:modelValue', 'update:options', 'remove']);
@@ -225,6 +226,16 @@ const getVal = (val) => ($props.useLike ? { like: `%${val}%` } : val);
 </script>
 
 <template>
+    <FetchData
+        ref="dataRef"
+        :url="$props.url"
+        @on-fetch="(data) => setOptions(data)"
+        :where="where || { [optionValue]: value }"
+        :limit="limit"
+        :sort-by="sortBy"
+        :fields="fields"
+        :params="params"
+    />
     <QSelect
         v-model="value"
         :options="myOptions"

From b6cce74449dfbf28c95ab36832635d41e20011bd Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 13 Sep 2024 23:11:18 +0200
Subject: [PATCH 121/228] fix: merge conflicts

---
 src/components/common/VnInputDate.vue | 53 ++++++++++++++-------------
 src/components/common/VnInputTime.vue |  6 ++-
 src/components/common/VnSelect.vue    | 12 +++---
 3 files changed, 37 insertions(+), 34 deletions(-)

diff --git a/src/components/common/VnInputDate.vue b/src/components/common/VnInputDate.vue
index 96e47d6d7..7113cadf9 100644
--- a/src/components/common/VnInputDate.vue
+++ b/src/components/common/VnInputDate.vue
@@ -2,6 +2,7 @@
 import { onMounted, watch, computed, ref } from 'vue';
 import { date } from 'quasar';
 import { useI18n } from 'vue-i18n';
+import { useAttrs } from 'vue';
 
 const model = defineModel({ type: [String, Date] });
 const $props = defineProps({
@@ -14,29 +15,19 @@ const $props = defineProps({
         default: true,
     },
 });
+import { useValidator } from 'src/composables/useValidator';
+const { validations } = useValidator();
 
 const { t } = useI18n();
-const requiredFieldRule = (val) => !!val || t('globals.fieldRequired');
+const requiredFieldRule = (val) => validations().required($attrs.required, val);
 
 const dateFormat = 'DD/MM/YYYY';
 const isPopupOpen = ref();
 const hover = ref();
 const mask = ref();
+const $attrs = useAttrs();
 
-onMounted(() => {
-    // fix quasar bug
-    mask.value = '##/##/####';
-});
-
-const styleAttrs = computed(() => {
-    return $props.isOutlined
-        ? {
-              dense: true,
-              outlined: true,
-              rounded: true,
-          }
-        : {};
-});
+const mixinRules = [requiredFieldRule, ...($attrs.rules ?? [])];
 
 const formattedDate = computed({
     get() {
@@ -48,15 +39,12 @@ const formattedDate = computed({
         let newDate;
         if (value) {
             // parse input
-            if (value.includes('/')) {
-                if (value.length == 6) value = value + new Date().getFullYear();
-                if (value.length >= 10) {
-                    if (value.at(2) == '/') value = value.split('/').reverse().join('/');
-                    value = date.formatDate(
-                        new Date(value).toISOString(),
-                        'YYYY-MM-DDTHH:mm:ss.SSSZ'
-                    );
-                }
+            if (value.includes('/') && value.length >= 10) {
+                if (value.at(2) == '/') value = value.split('/').reverse().join('/');
+                value = date.formatDate(
+                    new Date(value).toISOString(),
+                    'YYYY-MM-DDTHH:mm:ss.SSSZ'
+                );
             }
             const [year, month, day] = value.split('-').map((e) => parseInt(e));
             newDate = new Date(year, month - 1, day);
@@ -79,12 +67,25 @@ const formattedDate = computed({
 const popupDate = computed(() =>
     model.value ? date.formatDate(new Date(model.value), 'YYYY/MM/DD') : model.value
 );
-
+onMounted(() => {
+    // fix quasar bug
+    mask.value = '##/##/####';
+});
 watch(
     () => model.value,
     (val) => (formattedDate.value = val),
     { immediate: true }
 );
+
+const styleAttrs = computed(() => {
+    return $props.isOutlined
+        ? {
+              dense: true,
+              outlined: true,
+              rounded: true,
+          }
+        : {};
+});
 </script>
 
 <template>
@@ -96,7 +97,7 @@ watch(
             placeholder="dd/mm/aaaa"
             v-bind="{ ...$attrs, ...styleAttrs }"
             :class="{ required: $attrs.required }"
-            :rules="$attrs.required ? [requiredFieldRule] : null"
+            :rules="mixinRules"
             :clearable="false"
             @click="isPopupOpen = true"
         >
diff --git a/src/components/common/VnInputTime.vue b/src/components/common/VnInputTime.vue
index b610dc1e9..27395aa9e 100644
--- a/src/components/common/VnInputTime.vue
+++ b/src/components/common/VnInputTime.vue
@@ -1,8 +1,10 @@
 <script setup>
-import { computed, ref } from 'vue';
+import { computed, ref, useAttrs } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { date } from 'quasar';
-
+import { useValidator } from 'src/composables/useValidator';
+const { validations } = useValidator();
+const $attrs = useAttrs();
 const model = defineModel({ type: String });
 const props = defineProps({
     timeOnly: {
diff --git a/src/components/common/VnSelect.vue b/src/components/common/VnSelect.vue
index e767fb201..ed842103f 100644
--- a/src/components/common/VnSelect.vue
+++ b/src/components/common/VnSelect.vue
@@ -3,7 +3,6 @@ import { ref, toRefs, computed, watch, onMounted, useAttrs } from 'vue';
 import { useI18n } from 'vue-i18n';
 import FetchData from 'src/components/FetchData.vue';
 import { useValidator } from 'src/composables/useValidator';
-
 const emit = defineEmits(['update:modelValue', 'update:options', 'remove']);
 
 const $props = defineProps({
@@ -84,10 +83,11 @@ const $props = defineProps({
         default: false,
     },
 });
-
+const { validations } = useValidator();
+const requiredFieldRule = (val) => validations().required($attrs.required, val);
+const $attrs = useAttrs();
 const { t } = useI18n();
-const requiredFieldRule = (val) => val ?? t('globals.fieldRequired');
-
+const mixinRules = [requiredFieldRule, ...($attrs.rules ?? [])];
 const { optionLabel, optionValue, optionFilter, optionFilterValue, options, modelValue } =
     toRefs($props);
 const myOptions = ref([]);
@@ -100,7 +100,6 @@ const noOneOpt = ref({
     [optionValue.value]: false,
     [optionLabel.value]: noOneText,
 });
-const { validations } = useValidator();
 
 const value = computed({
     get() {
@@ -251,8 +250,9 @@ const getVal = (val) => ($props.useLike ? { like: `%${val}%` } : val);
         ref="vnSelectRef"
         lazy-rules
         :class="{ required: $attrs.required }"
-        :rules="$attrs.required ? [requiredFieldRule] : null"
+        :rules="mixinRules"
         virtual-scroll-slice-size="options.length"
+        hide-bottom-space
     >
         <template v-if="isClearable" #append>
             <QIcon

From 93488a5750b2a3de2c49ddff952defa55a3f3386 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 13 Sep 2024 23:19:16 +0200
Subject: [PATCH 122/228] fix: styles

---
 src/components/common/VnInputDate.vue | 1 +
 src/components/common/VnInputTime.vue | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/components/common/VnInputDate.vue b/src/components/common/VnInputDate.vue
index 7113cadf9..fd8993d6f 100644
--- a/src/components/common/VnInputDate.vue
+++ b/src/components/common/VnInputDate.vue
@@ -100,6 +100,7 @@ const styleAttrs = computed(() => {
             :rules="mixinRules"
             :clearable="false"
             @click="isPopupOpen = true"
+            hide-bottom-space
         >
             <template #append>
                 <QIcon
diff --git a/src/components/common/VnInputTime.vue b/src/components/common/VnInputTime.vue
index 27395aa9e..42ec79479 100644
--- a/src/components/common/VnInputTime.vue
+++ b/src/components/common/VnInputTime.vue
@@ -79,6 +79,7 @@ function dateToTime(newDate) {
             :rules="mixinRules"
             @click="isPopupOpen = false"
             type="time"
+            hide-bottom-space
         >
             <template #append>
                 <QIcon

From deb30ee9551cab217665947ec1fd1df37362536a Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Mon, 16 Sep 2024 08:59:36 +0200
Subject: [PATCH 123/228] feat: refs #7404 travel m3 form

---
 src/components/VnTable/VnOrder.vue            |   2 +-
 src/pages/Entry/EntryStockBought.vue          | 102 +++++++++---------
 src/pages/Entry/EntryStockBoughtDetail.vue    |  66 +++++++-----
 src/pages/Entry/EntryStockBoughtFilter.vue    |  29 +++--
 .../integration/entry/stockBought.spec.js     |  15 ++-
 5 files changed, 116 insertions(+), 98 deletions(-)

diff --git a/src/components/VnTable/VnOrder.vue b/src/components/VnTable/VnOrder.vue
index 98c7ab392..7fdd23b78 100644
--- a/src/components/VnTable/VnOrder.vue
+++ b/src/components/VnTable/VnOrder.vue
@@ -4,7 +4,7 @@ import { useArrayData } from 'composables/useArrayData';
 const model = defineModel({ type: Object });
 const $props = defineProps({
     name: {
-        type: String,
+        type: [String, Boolean],
         default: '',
     },
     label: {
diff --git a/src/pages/Entry/EntryStockBought.vue b/src/pages/Entry/EntryStockBought.vue
index ad338acb1..c8f147b1f 100644
--- a/src/pages/Entry/EntryStockBought.vue
+++ b/src/pages/Entry/EntryStockBought.vue
@@ -1,12 +1,13 @@
 <script setup>
-import { onMounted, ref, watch } from 'vue';
+import { ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useState } from 'src/composables/useState';
 import { useQuasar } from 'quasar';
 
 import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
-import axios from 'axios';
 import FetchData from 'components/FetchData.vue';
+import FormModelPopup from 'components/FormModelPopup.vue';
+import VnInput from 'src/components/common/VnInput.vue';
 import VnRow from 'components/ui/VnRow.vue';
 import RightMenu from 'src/components/common/RightMenu.vue';
 import EntryStockBoughtFilter from './EntryStockBoughtFilter.vue';
@@ -31,7 +32,9 @@ const columns = [
         align: 'left',
         name: 'workerFk',
         label: t('Buyer'),
+        isTitle: true,
         component: 'select',
+        cardVisible: true,
         create: true,
         attrs: {
             url: 'Workers/activeWithInheritedRole',
@@ -82,6 +85,7 @@ const columns = [
                         component: EntryStockBoughtDetail,
                         componentProps: {
                             workerFk: row.workerFk,
+                            dated: userParams.value.dated,
                         },
                     });
                 },
@@ -91,6 +95,7 @@ const columns = [
 ];
 
 const fetchDataRef = ref();
+const travelDialogRef = ref(false);
 const tableRef = ref();
 const travel = ref(null);
 const userParams = ref({
@@ -108,38 +113,21 @@ const filter = ref({
         {
             relation: 'warehouseIn',
             scope: {
-                where: { code: 'vnh' },
+                fields: ['code'],
             },
         },
     ],
 });
 
-function getFilter(dated) {
-    console.log('dated: ', dated);
-    const shipped = dated ? new Date(dated) : Date.vnNew();
-    shipped.setHours(0, 0, 0, 0);
-    return {
-        where: {
-            shipped,
-            m3: { neq: null },
-        },
-        include: [
-            {
-                relation: 'warehouseIn',
-                scope: {
-                    where: { code: 'vnh' },
-                },
-            },
-        ],
-    };
-}
-
 const setUserParams = async ({ dated }) => {
     const shipped = (dated ? new Date(dated) : Date.vnNew()).setHours(0, 0, 0, 0);
-
     filter.value.where.shipped = shipped;
     fetchDataRef.value?.fetch();
 };
+
+function openDialog() {
+    travelDialogRef.value = true;
+}
 </script>
 <template>
     <VnSubToolbar>
@@ -147,35 +135,55 @@ const setUserParams = async ({ dated }) => {
             <FetchData
                 ref="fetchDataRef"
                 url="Travels"
-                limit="1"
                 auto-load
                 :filter="filter"
-                @on-fetch="(data) => (travel = data)"
+                @on-fetch="
+                    (data) => {
+                        travel = data.filter((data) => data.warehouseIn.code === 'VNH');
+                    }
+                "
             />
-
-            <VnRow>
-                <div v-if="travel" class="q-pa-md">
-                    <QIcon
-                        name="local_airport"
-                        class="fill-icon q-mr-sm"
-                        size="md"
-                        :title="t('Travel')"
-                        color="primary"
-                    />
+            <VnRow class="travel">
+                <div v-if="travel">
+                    <span style="color: var(--vn-label-color)">
+                        {{ t('Booked trucks') }}:
+                    </span>
                     <span>
-                        {{ t('Booked trucks') + ': ' + travel[0]?.m3 }}
+                        {{ travel[0]?.m3 }}
                     </span>
                     <QBtn
+                        v-if="travel[0]?.m3"
                         style="max-width: 20%"
                         flat
                         icon="edit"
-                        @click="navigate(travel[0]?.id)"
+                        @click="openDialog()"
                         :title="t('Edit travel')"
+                        color="primary"
                     />
                 </div>
             </VnRow>
         </template>
     </VnSubToolbar>
+    <QDialog v-model="travelDialogRef" :maximized="true" :class="['vn-row', 'wrap']">
+        <FormModelPopup
+            :url-update="`Travels/${travel[0].id}`"
+            model="travel"
+            :title="t('Travel m3')"
+            :form-initial-data="{ id: travel[0].id, m3: travel[0].m3 }"
+            @on-data-saved="fetchDataRef.fetch()"
+        >
+            <template #form-inputs="{ data }">
+                <VnInput
+                    v-model="data.id"
+                    :label="t('id')"
+                    type="number"
+                    disable
+                    readonly
+                />
+                <VnInput v-model="data.m3" :label="t('m3')" type="number" />
+            </template>
+        </FormModelPopup>
+    </QDialog>
     <RightMenu>
         <template #right-panel>
             <EntryStockBoughtFilter
@@ -196,10 +204,7 @@ const setUserParams = async ({ dated }) => {
             :create="{
                 urlCreate: 'StockBoughts',
                 title: t('Reserve some space'),
-                onDataSaved: () => {
-                    tableRef.reload();
-                    fetchDataRef.reload();
-                },
+                onDataSaved: () => tableRef.reload(),
                 formInitialData: {
                     workerFk: user.id,
                     dated: Date.vnNow(),
@@ -214,17 +219,14 @@ const setUserParams = async ({ dated }) => {
                 <span class="link" @click.stop>
                     {{ row?.worker?.user?.name }}
                     <WorkerDescriptorProxy :id="row?.workerFk" />
-                </span>
-            </template>
+                </span> </template
+            >0
         </VnTable>
     </QPage>
 </template>
-<style lang="scss">
-.trucks {
-    text-align: center;
-    margin: 3%;
-    border: 3px solid var(--vn-header-color);
-    padding: 1%;
+<style lang="css" scoped>
+.travel {
+    margin-bottom: 0px;
 }
 </style>
 <i18n>
diff --git a/src/pages/Entry/EntryStockBoughtDetail.vue b/src/pages/Entry/EntryStockBoughtDetail.vue
index b9420af71..6d9227ad2 100644
--- a/src/pages/Entry/EntryStockBoughtDetail.vue
+++ b/src/pages/Entry/EntryStockBoughtDetail.vue
@@ -14,7 +14,7 @@ const $props = defineProps({
         required: true,
     },
     dated: {
-        type: String,
+        type: Date,
         required: true,
     },
 });
@@ -63,34 +63,46 @@ const columns = [
 ];
 </script>
 <template>
-    <QDialog>
-        <VnTable
-            ref="tableRef"
-            data-key="StockBoughtsDetail"
-            :url="customUrl"
-            order="itemName DESC"
-            :columns="columns"
-            :right-search="false"
-            :disable-infinite-scroll="true"
-            :disable-option="{ card: true }"
-            :limit="0"
-            auto-load
-        >
-            <template #column-entryFk="{ row }">
-                <span class="link" @click.stop>
-                    {{ row?.entryFk }}
-                    <EntryDescriptorProxy :id="row.entryFk" />
-                </span>
-            </template>
-            <template #column-itemName="{ row }">
-                <span class="link" @click.stop>
-                    {{ row?.itemName }}
-                    <ItemDescriptorProxy :id="row.itemFk" />
-                </span>
-            </template>
-        </VnTable>
+    <QDialog position="bottom" :maximized="true">
+        <div class="container">
+            <VnTable
+                ref="tableRef"
+                data-key="StockBoughtsDetail"
+                :url="customUrl"
+                order="itemName DESC"
+                :columns="columns"
+                :right-search="false"
+                :disable-infinite-scroll="true"
+                :disable-option="{ card: true }"
+                :limit="0"
+                auto-load
+            >
+                <template #column-entryFk="{ row }">
+                    <span class="link" @click.stop>
+                        {{ row?.entryFk }}
+                        <EntryDescriptorProxy :id="row.entryFk" />
+                    </span>
+                </template>
+                <template #column-itemName="{ row }">
+                    <span class="link" @click.stop>
+                        {{ row?.itemName }}
+                        <ItemDescriptorProxy :id="row.itemFk" />
+                    </span>
+                </template>
+            </VnTable>
+        </div>
     </QDialog>
 </template>
+<style lang="css">
+.q-dialog__inner {
+    max-width: 50vw;
+    overflow: auto;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    margin: auto;
+}
+</style>
 <i18n>
     es:
         Buyer: Comprador
diff --git a/src/pages/Entry/EntryStockBoughtFilter.vue b/src/pages/Entry/EntryStockBoughtFilter.vue
index aaf9e7a5b..7694cfe6c 100644
--- a/src/pages/Entry/EntryStockBoughtFilter.vue
+++ b/src/pages/Entry/EntryStockBoughtFilter.vue
@@ -1,11 +1,9 @@
 <script setup>
-import { ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { onMounted } from 'vue';
 import { useStateStore } from 'stores/useStateStore';
 
 import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
-import FetchData from 'components/FetchData.vue';
 import VnInputDate from 'src/components/common/VnInputDate.vue';
 
 const { t } = useI18n();
@@ -15,7 +13,6 @@ const props = defineProps({
         required: true,
     },
 });
-const companiesOptions = ref([]);
 const stateStore = useStateStore();
 const emit = defineEmits(['set-user-params']);
 const setUserParams = (params) => {
@@ -27,20 +24,10 @@ onMounted(async () => {
 </script>
 
 <template>
-    <FetchData
-        ref="buyer"
-        url="Workers/activeWithInheritedRole"
-        :filter="{
-            fields: ['id', 'name'],
-            where: { role: 'buyer' },
-        }"
-        order="name"
-        @on-fetch="(data) => (companiesOptions = data)"
-        auto-load
-    />
     <VnFilterPanel
         :data-key="props.dataKey"
         :search-button="true"
+        search-url="table"
         @set-user-params="setUserParams"
     >
         <template #tags="{ tag, formatFn }">
@@ -52,13 +39,25 @@ onMounted(async () => {
         <template #body="{ params }">
             <QItem class="q-my-sm">
                 <QItemSection>
-                    <VnInputDate v-model="params.dated" :label="t('Date')" is-outlined />
+                    <VnInputDate
+                        id="date"
+                        v-model="params.dated"
+                        :label="t('Date')"
+                        is-outlined
+                    />
                 </QItemSection>
             </QItem>
         </template>
     </VnFilterPanel>
 </template>
 <i18n>
+    en:
+        params:
+            dated: Date
+            workerFk: Worker
     es:
         Date: Fecha
+        params:
+            dated: Date
+            workerFk: Trabajador
 </i18n>
diff --git a/test/cypress/integration/entry/stockBought.spec.js b/test/cypress/integration/entry/stockBought.spec.js
index a18e2bd2e..b93afa520 100644
--- a/test/cypress/integration/entry/stockBought.spec.js
+++ b/test/cypress/integration/entry/stockBought.spec.js
@@ -1,15 +1,13 @@
 describe('EntryStockBought', () => {
-    const reserveField = 'input[name="reserve"]';
     beforeEach(() => {
         cy.viewport(1920, 1080);
         cy.login('buyer');
-        cy.visit(
-            `/#/entry/stock-Bought?table={"filter":"{}","dated":"2000-12-31T23:00:00.000Z"}`
-        );
+        cy.visit(`/#/entry/stock-Bought`);
     });
     it('Should edit the reserved space', () => {
+        cy.get('.q-field__native.q-placeholder').should('have.value', '01/01/2001');
         cy.get('tBody > tr').its('length').should('eq', 2);
-        cy.get(reserveField).type('10{enter}');
+        cy.get('input[name="reserve"]').type('10{enter}');
         cy.get('button[title="Save"]').click();
         cy.get('.q-notification__message').should('have.text', 'Data saved');
     });
@@ -33,4 +31,11 @@ describe('EntryStockBought', () => {
             'warningNo data available'
         );
     });
+    it('Should edit travel m3 and refresh', () => {
+        cy.get('.vn-row > div > .q-btn > .q-btn__content > .q-icon').click();
+        cy.get('input[aria-label="m3"]').clear();
+        cy.get('input[aria-label="m3"]').type('60');
+        cy.get('.q-mt-lg > .q-btn--standard > .q-btn__content > .block').click();
+        cy.get('.vn-row > div > :nth-child(2)').should('have.text', '60');
+    });
 });

From 263dc29d7a4d4ba22d89fb7715a8f69d968bdfed Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Mon, 16 Sep 2024 12:19:03 +0200
Subject: [PATCH 124/228] fix: refs #7404 remove console.log

---
 src/components/VnTable/VnTable.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index a6a8aec11..b7321fe16 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -692,7 +692,6 @@ function handleOnDataSaved(_) {
                         :column-name="column.name"
                         :label="column.label"
                     >
-                        {{ console.log('data: ', data) }}
                         <VnTableColumn
                             :column="column"
                             :row="{}"

From d384894bf0faed5627933188f2bb9270bcfefecc Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 16 Sep 2024 10:29:36 +0000
Subject: [PATCH 125/228] fix: rule

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

diff --git a/src/pages/Customer/Card/CustomerBasicData.vue b/src/pages/Customer/Card/CustomerBasicData.vue
index adbd476b0..bf2bf4b19 100644
--- a/src/pages/Customer/Card/CustomerBasicData.vue
+++ b/src/pages/Customer/Card/CustomerBasicData.vue
@@ -34,7 +34,7 @@ const title = ref();
             <VnRow>
                 <VnInput
                     :label="t('globals.name')"
-                    :rules="validate('client.socialName')"
+                    :rules="validate('client.name')"
                     autofocus
                     clearable
                     v-model="data.name"

From eb8690a4224a6f79e0d9305af1846404a0c87766 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 16 Sep 2024 10:30:04 +0000
Subject: [PATCH 126/228] fix: remove promise execution

---
 src/pages/Customer/components/CustomerChangePassword.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/pages/Customer/components/CustomerChangePassword.vue b/src/pages/Customer/components/CustomerChangePassword.vue
index 1bfc5e103..d92a10c5c 100644
--- a/src/pages/Customer/components/CustomerChangePassword.vue
+++ b/src/pages/Customer/components/CustomerChangePassword.vue
@@ -46,7 +46,6 @@ const onSubmit = async () => {
     };
     try {
         await axios.patch(`Clients/${$props.id}/setPassword`, payload);
-        await $props.promise();
     } catch (error) {
         notify('errors.create', 'negative');
     } finally {

From ae76bd0b0e524035a3fe92aa73bd2a819bab1c0c Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Mon, 16 Sep 2024 12:58:06 +0200
Subject: [PATCH 127/228] refactor: refs #6346 wagons to VnTable

---
 src/pages/Wagon/Type/WagonTypeList.vue | 105 +++++++-------
 src/pages/Wagon/WagonList.vue          | 184 +++++++++++++++++--------
 2 files changed, 186 insertions(+), 103 deletions(-)

diff --git a/src/pages/Wagon/Type/WagonTypeList.vue b/src/pages/Wagon/Type/WagonTypeList.vue
index 7615dea02..2f0d55fbe 100644
--- a/src/pages/Wagon/Type/WagonTypeList.vue
+++ b/src/pages/Wagon/Type/WagonTypeList.vue
@@ -2,14 +2,13 @@
 import { ref, computed } from 'vue';
 import axios from 'axios';
 import { useQuasar } from 'quasar';
-import VnPaginate from 'src/components/ui/VnPaginate.vue';
 import { useArrayData } from 'src/composables/useArrayData';
 import { useI18n } from 'vue-i18n';
 import { useRouter } from 'vue-router';
-import CardList from 'components/ui/CardList.vue';
 import FormModelPopup from 'src/components/FormModelPopup.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import VnRow from 'src/components/ui/VnRow.vue';
+import VnTable from 'src/components/VnTable/VnTable.vue';
 
 const quasar = useQuasar();
 const arrayData = useArrayData('WagonTypeList');
@@ -17,7 +16,7 @@ const store = arrayData.store;
 const dialog = ref();
 const { push } = useRouter();
 const { t } = useI18n();
-const paginate = ref();
+const tableRef = ref();
 
 const initialData = computed(() => {
     return {
@@ -25,10 +24,46 @@ const initialData = computed(() => {
     };
 });
 
-function reloadData() {
-    initialData.value.name = null;
-    paginate.value.fetch();
-}
+const columns = computed(() => [
+    {
+        align: 'left',
+        name: 'id',
+        label: t('ID'),
+        isId: true,
+        cardVisible: true,
+    },
+    {
+        align: 'left',
+        name: 'name',
+        label: t('Name'),
+        isTitle: true,
+    },
+    {
+        align: 'left',
+        name: 'divisible',
+        label: t('Divisible'),
+        cardVisible: true,
+        component: 'checkbox',
+    },
+    {
+        align: 'right',
+        name: 'tableActions',
+        actions: [
+            {
+                title: t('components.smartCard.openCard'),
+                icon: 'arrow_forward',
+                isPrimary: true,
+                action: (row) => navigate(row.id, row.name),
+            },
+            {
+                title: t('wagon.list.remove'),
+                icon: 'delete',
+                isPrimary: true,
+                action: (row) => remove(row),
+            },
+        ],
+    },
+]);
 
 function navigate(id, name) {
     push({ path: `/wagon/type/${id}/edit`, query: { name } });
@@ -41,51 +76,25 @@ async function remove(row) {
         type: 'positive',
     });
     store.data.splice(store.data.indexOf(row), 1);
+    window.location.reload();
 }
 </script>
 
 <template>
     <QPage class="column items-center q-pa-md">
-        <div class="vn-card-list">
-            <VnPaginate
-                ref="paginate"
-                data-key="WagonTypeList"
-                url="WagonTypes"
-                order="id DESC"
-                auto-load
-            >
-                <template #body="{ rows }">
-                    <CardList
-                        v-for="row of rows"
-                        :key="row.id"
-                        :title="(row.name || '').toString()"
-                        :id="row.id"
-                        @click="navigate(row.id, row.name)"
-                    >
-                        <template #list-items>
-                            <QCheckbox
-                                :label="t('Divisble')"
-                                :model-value="row.divisible"
-                                disable
-                            />
-                        </template>
-                        <template #actions>
-                            <QBtn
-                                :label="t('components.smartCard.openCard')"
-                                @click.stop="navigate(row.id, row.name)"
-                                outline
-                            />
-                            <QBtn
-                                :label="t('wagon.list.remove')"
-                                @click.stop="remove(row)"
-                                color="primary"
-                                style="margin-top: 15px"
-                            />
-                        </template>
-                    </CardList>
-                </template>
-            </VnPaginate>
-        </div>
+        <VnTable
+            ref="tableRef"
+            data-key="WagonTypeList"
+            url="WagonTypes"
+            :columns="columns"
+            auto-load
+            order="id DESC"
+            :right-search="false"
+            :column-search="false"
+            :default-mode="'card'"
+            :disable-option="{ table: true }"
+        >
+        </VnTable>
         <QPageSticky :offset="[18, 18]">
             <QBtn @click.stop="dialog.show()" color="primary" fab icon="add" shortcut="+">
                 <QDialog ref="dialog">
@@ -94,7 +103,7 @@ async function remove(row) {
                         url-create="WagonTypes"
                         model="WagonType"
                         :form-initial-data="initialData"
-                        @on-data-saved="reloadData()"
+                        @on-data-saved="window.location.reload()"
                         auto-load
                     >
                         <template #form-inputs="{ data }">
diff --git a/src/pages/Wagon/WagonList.vue b/src/pages/Wagon/WagonList.vue
index c4824b861..129e803f5 100644
--- a/src/pages/Wagon/WagonList.vue
+++ b/src/pages/Wagon/WagonList.vue
@@ -1,12 +1,13 @@
 <script setup>
 import axios from 'axios';
 import { useQuasar } from 'quasar';
-import VnPaginate from 'src/components/ui/VnPaginate.vue';
 import { useArrayData } from 'src/composables/useArrayData';
 import { useI18n } from 'vue-i18n';
 import { useRouter } from 'vue-router';
-import CardList from 'components/ui/CardList.vue';
-import VnLv from 'components/ui/VnLv.vue';
+import VnTable from 'src/components/VnTable/VnTable.vue';
+import { computed } from 'vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
+import VnInput from 'src/components/common/VnInput.vue';
 
 const quasar = useQuasar();
 const arrayData = useArrayData('WagonList');
@@ -23,14 +24,56 @@ const filter = {
     },
 };
 
+const columns = computed(() => [
+    {
+        align: 'left',
+        name: 'label',
+        label: t('Label'),
+        isTitle: true,
+    },
+    {
+        align: 'left',
+        name: 'plate',
+        label: t('wagon.list.plate'),
+        cardVisible: true,
+    },
+    {
+        align: 'left',
+        name: 'volume',
+        label: t('wagon.list.volume'),
+        cardVisible: true,
+    },
+    {
+        align: 'left',
+        name: 'name',
+        label: t('wagon.list.type'),
+        cardVisible: true,
+        format: (row) => row?.type?.name,
+    },
+    {
+        align: 'right',
+        name: 'tableActions',
+        actions: [
+            {
+                title: t('components.smartCard.openCard'),
+                icon: 'arrow_forward',
+                isPrimary: true,
+                action: (row) => navigate(row.id),
+            },
+            {
+                title: t('wagon.list.remove'),
+                icon: 'delete',
+                isPrimary: true,
+                action: (row) => remove(row),
+            },
+        ],
+    },
+]);
+
 function navigate(id) {
     router.push({ path: `/wagon/${id}/edit` });
 }
 
-function create() {
-    router.push({ path: `/wagon/create` });
-}
-
 async function remove(row) {
     try {
         await axios.delete(`Wagons/${row.id}`).then(async () => {
@@ -39,6 +82,7 @@ async function remove(row) {
                 type: 'positive',
             });
             store.data.splice(store.data.indexOf(row), 1);
+            window.location.reload();
         });
     } catch (error) {
         //
@@ -48,53 +92,83 @@ async function remove(row) {
 
 <template>
     <QPage class="column items-center q-pa-md">
-        <div class="vn-card-list">
-            <VnPaginate
-                data-key="WagonList"
-                url="/Wagons"
-                order="id DESC"
-                :filter="filter"
-                auto-load
-            >
-                <template #body="{ rows }">
-                    <CardList
-                        v-for="row of rows"
-                        :key="row.id"
-                        :title="(row.label || '').toString()"
-                        :id="row.id"
-                        @click="navigate(row.id)"
-                    >
-                        <template #list-items>
-                            <VnLv
-                                :label="t('wagon.list.plate')"
-                                :title-label="t('wagon.list.plate')"
-                                :value="row.plate"
-                            />
-                            <VnLv :label="t('wagon.list.volume')" :value="row?.volume" />
-                            <VnLv
-                                :label="t('wagon.list.type')"
-                                :value="row?.type?.name"
-                            />
-                        </template>
-                        <template #actions>
-                            <QBtn
-                                :label="t('components.smartCard.openCard')"
-                                @click.stop="navigate(row.id)"
-                                outline
-                            />
-                            <QBtn
-                                :label="t('wagon.list.remove')"
-                                @click.stop="remove(row)"
-                                color="primary"
-                                style="margin-top: 15px"
-                            />
-                        </template>
-                    </CardList>
-                </template>
-            </VnPaginate>
-        </div>
-        <QPageSticky position="bottom-right" :offset="[18, 18]">
-            <QBtn @click="create" fab icon="add" color="primary" shortcut="+" />
-        </QPageSticky>
+        <VnTable
+            ref="tableRef"
+            data-key="WagonList"
+            url="Wagons"
+            :filter="filter"
+            :columns="columns"
+            auto-load
+            order="id DESC"
+            :right-search="false"
+            :column-search="false"
+            :default-mode="'card'"
+            :disable-option="{ table: true }"
+            :create="{
+                urlCreate: 'Wagons',
+                title: t('Create new wagon'),
+                onDataSaved: () => {
+                    window.location.reload();
+                },
+                formInitialData: {},
+            }"
+        >
+            <template #more-create-dialog="{ data }">
+                <VnInput
+                    filled
+                    v-model="data.label"
+                    :label="t('wagon.create.label')"
+                    type="number"
+                    min="0"
+                    :rules="[(val) => !!val || t('wagon.warnings.labelNotEmpty')]"
+                />
+                <VnInput
+                    filled
+                    v-model="data.plate"
+                    :label="t('wagon.create.plate')"
+                    :rules="[(val) => !!val || t('wagon.warnings.plateNotEmpty')]"
+                />
+                <VnInput
+                    filled
+                    v-model="data.volume"
+                    :label="t('wagon.create.volume')"
+                    type="number"
+                    min="0"
+                    :rules="[(val) => !!val || t('wagon.warnings.volumeNotEmpty')]"
+                />
+                <VnSelect
+                    url="WagonTypes"
+                    filled
+                    v-model="data.typeFk"
+                    use-input
+                    fill-input
+                    hide-selected
+                    input-debounce="0"
+                    option-label="name"
+                    option-value="id"
+                    emit-value
+                    map-options
+                    :label="t('wagon.create.type')"
+                    :options="filteredWagonTypes"
+                    :rules="[(val) => !!val || t('wagon.warnings.typeNotEmpty')]"
+                    @filter="filterType"
+                >
+                    <template v-if="data.typeFk" #append>
+                        <QIcon
+                            name="cancel"
+                            @click.stop.prevent="data.typeFk = null"
+                            class="cursor-pointer"
+                        />
+                    </template>
+                    <template #no-option>
+                        <QItem>
+                            <QItemSection class="text-grey">
+                                {{ t('wagon.warnings.noData') }}
+                            </QItemSection>
+                        </QItem>
+                    </template>
+                </VnSelect>
+            </template>
+        </VnTable>
     </QPage>
 </template>

From 6ffd985575ad24c3b2c3fcacbfe78f618725a0a6 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 16 Sep 2024 13:33:07 +0200
Subject: [PATCH 128/228] perf: CustomerBasicData.salesPersonFk

---
 src/pages/Customer/Card/CustomerBasicData.vue | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/src/pages/Customer/Card/CustomerBasicData.vue b/src/pages/Customer/Card/CustomerBasicData.vue
index bf2bf4b19..cdd9e68b2 100644
--- a/src/pages/Customer/Card/CustomerBasicData.vue
+++ b/src/pages/Customer/Card/CustomerBasicData.vue
@@ -16,6 +16,21 @@ const { t } = useI18n();
 const businessTypes = ref([]);
 const contactChannels = ref([]);
 const title = ref();
+const handleSalesModelValue = (val) => {
+    if (salesPersonFilter.value.and.length == 0) salesPersonFilter.value.and.push = [];
+
+    salesPersonFilter.value.and[1] = {
+        or: [
+            { name: val },
+            { nickname: { like: '%' + val + '%' } },
+            { code: { like: `${val}%` } },
+        ],
+    };
+};
+
+const salesPersonFilter = ref({
+    and: [{ active: { neq: false } }],
+});
 </script>
 <template>
     <FetchData
@@ -96,9 +111,11 @@ const title = ref();
                     :params="{
                         departmentCodes: ['VT', 'shopping'],
                     }"
+                    :where="salesPersonFilter"
                     :fields="['id', 'nickname']"
                     sort-by="nickname ASC"
                     :rules="validate('client.salesPersonFk')"
+                    @filter="handleSalesModelValue"
                     emit-value
                     auto-load
                 >

From e559ab43d7bbbfb19ad5917255ed271290052cac Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Tue, 17 Sep 2024 13:40:27 +0200
Subject: [PATCH 129/228] fix: refs #7404 remove some style

---
 src/components/VnTable/VnTable.vue         | 2 +-
 src/pages/Entry/EntryStockBought.vue       | 4 ++--
 src/pages/Entry/EntryStockBoughtDetail.vue | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index b7321fe16..648b1fb3b 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -430,7 +430,7 @@ function handleOnDataSaved(_) {
                     />
                 </template>
                 <template #header-cell="{ col }">
-                    <QTh table-header-style="max-width:50%" v-if="col.visible ?? true">
+                    <QTh v-if="col.visible ?? true">
                         <div
                             class="column self-start q-ml-xs ellipsis"
                             :class="`text-${col?.align ?? 'left'}`"
diff --git a/src/pages/Entry/EntryStockBought.vue b/src/pages/Entry/EntryStockBought.vue
index c8f147b1f..5b4d43e06 100644
--- a/src/pages/Entry/EntryStockBought.vue
+++ b/src/pages/Entry/EntryStockBought.vue
@@ -219,8 +219,8 @@ function openDialog() {
                 <span class="link" @click.stop>
                     {{ row?.worker?.user?.name }}
                     <WorkerDescriptorProxy :id="row?.workerFk" />
-                </span> </template
-            >0
+                </span>
+            </template>
         </VnTable>
     </QPage>
 </template>
diff --git a/src/pages/Entry/EntryStockBoughtDetail.vue b/src/pages/Entry/EntryStockBoughtDetail.vue
index 6d9227ad2..744b9d3fe 100644
--- a/src/pages/Entry/EntryStockBoughtDetail.vue
+++ b/src/pages/Entry/EntryStockBoughtDetail.vue
@@ -63,7 +63,7 @@ const columns = [
 ];
 </script>
 <template>
-    <QDialog position="bottom" :maximized="true">
+    <QDialog :maximized="true">
         <div class="container">
             <VnTable
                 ref="tableRef"

From c7bef79c0a211a81d736965dae3a14634a382077 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Tue, 17 Sep 2024 13:48:17 +0200
Subject: [PATCH 130/228] perf: improve

---
 src/pages/Customer/Card/CustomerBasicData.vue | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/pages/Customer/Card/CustomerBasicData.vue b/src/pages/Customer/Card/CustomerBasicData.vue
index cdd9e68b2..3682ecd73 100644
--- a/src/pages/Customer/Card/CustomerBasicData.vue
+++ b/src/pages/Customer/Card/CustomerBasicData.vue
@@ -17,9 +17,7 @@ const businessTypes = ref([]);
 const contactChannels = ref([]);
 const title = ref();
 const handleSalesModelValue = (val) => {
-    if (salesPersonFilter.value.and.length == 0) salesPersonFilter.value.and.push = [];
-
-    salesPersonFilter.value.and[1] = {
+    filter.value.and[1] = {
         or: [
             { name: val },
             { nickname: { like: '%' + val + '%' } },
@@ -28,7 +26,7 @@ const handleSalesModelValue = (val) => {
     };
 };
 
-const salesPersonFilter = ref({
+const filter = ref({
     and: [{ active: { neq: false } }],
 });
 </script>
@@ -111,7 +109,7 @@ const salesPersonFilter = ref({
                     :params="{
                         departmentCodes: ['VT', 'shopping'],
                     }"
-                    :where="salesPersonFilter"
+                    :where="filter"
                     :fields="['id', 'nickname']"
                     sort-by="nickname ASC"
                     :rules="validate('client.salesPersonFk')"

From 4f662375cd34e6e08bfe376b409a6d636611f65b Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Tue, 17 Sep 2024 15:04:58 +0200
Subject: [PATCH 131/228] fix(VnTable): sanitizer value is defined

---
 src/components/VnTable/VnTable.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index 648b1fb3b..55028080c 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -200,7 +200,7 @@ function setUserParams(watchedParams, watchedOrder) {
 
 function sanitizer(params) {
     for (const [key, value] of Object.entries(params)) {
-        if (typeof value == 'object') {
+        if (value && typeof value == 'object') {
             const param = Object.values(value)[0];
             if (typeof param == 'string') params[key] = param.replaceAll('%', '');
         }

From aa6dac39449cc1db11c8130edc488717fc8a487a Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Wed, 18 Sep 2024 07:28:10 +0000
Subject: [PATCH 132/228] fix: SupplierFiscalData VnLocation

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

diff --git a/src/pages/Supplier/Card/SupplierFiscalData.vue b/src/pages/Supplier/Card/SupplierFiscalData.vue
index 60cd6770b..553fc0f94 100644
--- a/src/pages/Supplier/Card/SupplierFiscalData.vue
+++ b/src/pages/Supplier/Card/SupplierFiscalData.vue
@@ -19,8 +19,8 @@ const sageTransactionTypesOptions = ref([]);
 const supplierActivitiesOptions = ref([]);
 
 function handleLocation(data, location) {
-    const { town, label, provinceFk, countryFk } = location ?? {};
-    data.postCode = label;
+    const { town, code, provinceFk, countryFk } = location ?? {};
+    data.postCode = code;
     data.city = town;
     data.provinceFk = provinceFk;
     data.countryFk = countryFk;

From 21a7fafba5c63a3238b248a5b1b6832ba32b5bb3 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Wed, 18 Sep 2024 09:57:21 +0200
Subject: [PATCH 133/228] feat: create VnSelectEnum and add in AccountBasicData
 and ClaimBasicData

---
 src/components/common/VnSelectEnum.vue        | 52 ++++++++++++++
 src/pages/Account/Card/AccountBasicData.vue   |  9 ++-
 src/pages/Claim/Card/ClaimBasicData.vue       | 72 ++++---------------
 .../integration/outLogin/twoFactor.spec.js    |  2 +-
 4 files changed, 71 insertions(+), 64 deletions(-)
 create mode 100644 src/components/common/VnSelectEnum.vue

diff --git a/src/components/common/VnSelectEnum.vue b/src/components/common/VnSelectEnum.vue
new file mode 100644
index 000000000..b9db67c37
--- /dev/null
+++ b/src/components/common/VnSelectEnum.vue
@@ -0,0 +1,52 @@
+<script setup>
+import { onBeforeMount, ref, useAttrs } from 'vue';
+import axios from 'axios';
+import VnSelect from 'components/common/VnSelect.vue';
+
+const { schema, table, column, translation, defaultOptions } = defineProps({
+    schema: {
+        type: String,
+        default: 'vn',
+    },
+    table: {
+        type: String,
+        required: true,
+    },
+    column: {
+        type: String,
+        required: true,
+    },
+    translation: {
+        type: Function,
+        default: null,
+    },
+    defaultOptions: {
+        type: Array,
+        default: () => [],
+    },
+});
+
+const $attrs = useAttrs();
+const options = ref([]);
+onBeforeMount(async () => {
+    options.value = [].concat(defaultOptions);
+    const { data } = await axios.get(`Applications/get-enum-values`, {
+        params: { schema, table, column },
+    });
+
+    for (const value of data)
+        options.value.push({
+            [$attrs['option-value'] ?? 'id']: value,
+            [$attrs['option-label'] ?? 'name']: translation ? translation(value) : value,
+        });
+});
+</script>
+
+<template>
+    <VnSelect
+        v-bind="$attrs"
+        :options="options"
+        :key="options.length"
+        :input-debounce="0"
+    />
+</template>
diff --git a/src/pages/Account/Card/AccountBasicData.vue b/src/pages/Account/Card/AccountBasicData.vue
index b223c4bc0..f1cdaf9df 100644
--- a/src/pages/Account/Card/AccountBasicData.vue
+++ b/src/pages/Account/Card/AccountBasicData.vue
@@ -2,6 +2,7 @@
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import VnSelect from 'src/components/common/VnSelect.vue';
+import VnSelectEnum from 'src/components/common/VnSelectEnum.vue';
 import FormModel from 'components/FormModel.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import { ref, watch } from 'vue';
@@ -43,9 +44,11 @@ watch(
                     option-value="code"
                     option-label="code"
                 />
-                <VnSelect
-                    url="TwoFactorTypes"
-                    v-model="data.twoFactorFk"
+                <VnSelectEnum
+                    schema="account"
+                    table="user"
+                    column="twoFactor"
+                    v-model="data.twoFactor"
                     :label="t('account.card.twoFactor')"
                     option-value="code"
                     option-label="code"
diff --git a/src/pages/Claim/Card/ClaimBasicData.vue b/src/pages/Claim/Card/ClaimBasicData.vue
index b1d3e24cd..63b0b7c0d 100644
--- a/src/pages/Claim/Card/ClaimBasicData.vue
+++ b/src/pages/Claim/Card/ClaimBasicData.vue
@@ -3,58 +3,18 @@ import { ref } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import VnSelect from 'src/components/common/VnSelect.vue';
+import VnSelectEnum from 'src/components/common/VnSelectEnum.vue';
 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 VnInputDate from 'components/common/VnInputDate.vue';
 
-import axios from 'axios';
 import VnAvatar from 'src/components/ui/VnAvatar.vue';
 
 const route = useRoute();
 const { t } = useI18n();
-
-const claimStates = ref([]);
-const claimStatesCopy = ref([]);
-const optionsList = ref([]);
-
 const workersOptions = ref([]);
-
-function setClaimStates(data) {
-    claimStates.value = data;
-    claimStatesCopy.value = data;
-}
-
-async function getEnumValues() {
-    optionsList.value = [{ id: null, description: t('claim.null') }];
-    const { data } = await axios.get(`Applications/get-enum-values`, {
-        params: {
-            schema: 'vn',
-            table: 'claim',
-            column: 'pickup',
-        },
-    });
-    for (let value of data)
-        optionsList.value.push({ id: value, description: t(`claim.${value}`) });
-}
-
-getEnumValues();
-
-const statesFilter = {
-    options: claimStates,
-    filterFn: (options, value) => {
-        const search = value.toLowerCase();
-
-        if (value === '') return claimStatesCopy.value;
-
-        return options.value.filter((row) => {
-            const description = row.description.toLowerCase();
-
-            return description.indexOf(search) > -1;
-        });
-    },
-};
 </script>
 <template>
     <FetchData
@@ -70,7 +30,7 @@ const statesFilter = {
         auto-load
         :reload="true"
     >
-        <template #form="{ data, validate, filter }">
+        <template #form="{ data, validate }">
             <VnRow>
                 <VnInput
                     v-model="data.client.name"
@@ -101,20 +61,14 @@ const statesFilter = {
                         />
                     </template>
                 </VnSelect>
-                <QSelect
+                <VnSelect
                     v-model="data.claimStateFk"
-                    :options="claimStates"
-                    option-value="id"
-                    option-label="description"
-                    emit-value
+                    url="ClaimStates"
                     :label="t('claim.state')"
-                    map-options
-                    use-input
-                    @filter="(value, update) => filter(value, update, statesFilter)"
+                    option-label="description"
                     :rules="validate('claim.claimStateFk')"
                     :input-debounce="0"
-                >
-                </QSelect>
+                />
             </VnRow>
             <VnRow>
                 <QInput
@@ -123,16 +77,14 @@ const statesFilter = {
                     :rules="validate('claim.packages')"
                     type="number"
                 />
-                <QSelect
+                <VnSelectEnum
                     v-model="data.pickup"
-                    :options="optionsList"
-                    option-value="id"
-                    option-label="description"
-                    emit-value
                     :label="t('claim.pickup')"
-                    map-options
-                    use-input
-                    :input-debounce="0"
+                    table="claim"
+                    column="pickup"
+                    option-label="description"
+                    :translation="(value) => t(`claim.${value}`)"
+                    :default-options="[{ id: null, description: t('claim.null') }]"
                 />
             </VnRow>
         </template>
diff --git a/test/cypress/integration/outLogin/twoFactor.spec.js b/test/cypress/integration/outLogin/twoFactor.spec.js
index 259ddfc0f..4d8561f0f 100755
--- a/test/cypress/integration/outLogin/twoFactor.spec.js
+++ b/test/cypress/integration/outLogin/twoFactor.spec.js
@@ -12,7 +12,7 @@ describe('Two Factor', () => {
         cy.request(
             'PATCH',
             `http://localhost:3000/api/VnUsers/${userId}/update-user?access_token=DEFAULT_TOKEN`,
-            { twoFactorFk: 'email' }
+            { twoFactor: 'email' }
         );
     });
 

From 37329a73914ef10f355c9fe7698e9dd58a9a063a Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Wed, 18 Sep 2024 13:30:51 +0200
Subject: [PATCH 134/228] feat: add shortcut add event in some subSections

---
 src/pages/Customer/Card/CustomerContacts.vue        |  9 +++++----
 .../Customer/components/CustomerAddressEdit.vue     |  9 +++++----
 src/pages/Item/Card/ItemTags.vue                    |  9 +++++----
 src/pages/Route/Roadmap/RoadmapStops.vue            |  9 +++++----
 src/pages/Supplier/Card/SupplierAccounts.vue        | 13 ++++++-------
 src/pages/Supplier/Card/SupplierContacts.vue        |  9 +++++----
 src/pages/Worker/WorkerDepartmentTree.vue           |  9 +++++----
 7 files changed, 36 insertions(+), 31 deletions(-)

diff --git a/src/pages/Customer/Card/CustomerContacts.vue b/src/pages/Customer/Card/CustomerContacts.vue
index cd4d553df..c420f650e 100644
--- a/src/pages/Customer/Card/CustomerContacts.vue
+++ b/src/pages/Customer/Card/CustomerContacts.vue
@@ -56,17 +56,18 @@ const customerContactsRef = ref(null);
                             </div>
                         </VnRow>
                         <VnRow>
-                            <QIcon
+                            <QBtn
                                 @click="customerContactsRef.insert()"
                                 class="cursor-pointer"
                                 color="primary"
-                                name="add"
-                                size="sm"
+                                flat
+                                icon="add"
+                                shortcut="+"
                             >
                                 <QTooltip>
                                     {{ t('Add contact') }}
                                 </QTooltip>
-                            </QIcon>
+                            </QBtn>
                         </VnRow>
                     </QCard>
                 </template>
diff --git a/src/pages/Customer/components/CustomerAddressEdit.vue b/src/pages/Customer/components/CustomerAddressEdit.vue
index 2252a96dc..82a190ae1 100644
--- a/src/pages/Customer/components/CustomerAddressEdit.vue
+++ b/src/pages/Customer/components/CustomerAddressEdit.vue
@@ -272,16 +272,17 @@ function handleLocation(data, location) {
                 </div>
             </VnRow>
 
-            <QIcon
+            <QBtn
                 @click.stop="addNote()"
                 class="cursor-pointer add-icon q-mt-md"
-                name="add"
-                size="sm"
+                flat
+                icon="add"
+                shortcut="+"
             >
                 <QTooltip>
                     {{ t('Add note') }}
                 </QTooltip>
-            </QIcon>
+            </QBtn>
         </template>
     </FormModel>
 </template>
diff --git a/src/pages/Item/Card/ItemTags.vue b/src/pages/Item/Card/ItemTags.vue
index 39723ae65..1b5eb28f0 100644
--- a/src/pages/Item/Card/ItemTags.vue
+++ b/src/pages/Item/Card/ItemTags.vue
@@ -168,19 +168,20 @@ const insertTag = (rows) => {
                             </div>
                         </VnRow>
                         <VnRow class="justify-center items-center">
-                            <QIcon
+                            <QBtn
                                 @click="insertTag(rows)"
                                 class="cursor-pointer"
                                 :disable="!validRow"
                                 color="primary"
-                                name="add"
-                                size="sm"
+                                flat
+                                icon="add"
+                                shortcut="+"
                                 style="flex: 0"
                             >
                                 <QTooltip>
                                     {{ t('itemTags.addTag') }}
                                 </QTooltip>
-                            </QIcon>
+                            </QBtn>
                         </VnRow>
                     </QCard>
                 </template>
diff --git a/src/pages/Route/Roadmap/RoadmapStops.vue b/src/pages/Route/Roadmap/RoadmapStops.vue
index 8ff044d2d..d8215ea49 100644
--- a/src/pages/Route/Roadmap/RoadmapStops.vue
+++ b/src/pages/Route/Roadmap/RoadmapStops.vue
@@ -65,9 +65,10 @@ const updateDefaultStop = (data) => {
                         </div>
                     </QCardSection>
                     <QCardSection>
-                        <QIcon
-                            name="add"
-                            size="sm"
+                        <QBtn
+                            flat
+                            icon="add"
+                            shortcut="+"
                             class="cursor-pointer"
                             color="primary"
                             @click="roadmapStopsCrudRef.insert()"
@@ -75,7 +76,7 @@ const updateDefaultStop = (data) => {
                             <QTooltip>
                                 {{ t('Add stop') }}
                             </QTooltip>
-                        </QIcon>
+                        </QBtn>
                     </QCardSection>
                 </QCard>
             </template>
diff --git a/src/pages/Supplier/Card/SupplierAccounts.vue b/src/pages/Supplier/Card/SupplierAccounts.vue
index b0e8b06e8..f8fbba0e4 100644
--- a/src/pages/Supplier/Card/SupplierAccounts.vue
+++ b/src/pages/Supplier/Card/SupplierAccounts.vue
@@ -102,9 +102,7 @@ const setWireTransfer = async () => {
                     <VnInput :label="t('supplier.accounts.iban')" v-model="row.iban">
                         <template #append>
                             <QIcon name="info" class="cursor-info">
-                                <QTooltip>{{
-                                    t('components.iban_tooltip')
-                                }}</QTooltip>
+                                <QTooltip>{{ t('components.iban_tooltip') }}</QTooltip>
                             </QIcon>
                         </template>
                     </VnInput>
@@ -165,9 +163,10 @@ const setWireTransfer = async () => {
                     </div>
                 </VnRow>
                 <VnRow>
-                    <QIcon
-                        name="add"
-                        size="sm"
+                    <QBtn
+                        flat
+                        icon="add"
+                        shortcut="+"
                         class="cursor-pointer"
                         color="primary"
                         @click="supplierAccountRef.insert()"
@@ -175,7 +174,7 @@ const setWireTransfer = async () => {
                         <QTooltip>
                             {{ t('Add account') }}
                         </QTooltip>
-                    </QIcon>
+                    </QBtn>
                 </VnRow>
             </QCard>
         </template>
diff --git a/src/pages/Supplier/Card/SupplierContacts.vue b/src/pages/Supplier/Card/SupplierContacts.vue
index 35e8b98fc..3f2063784 100644
--- a/src/pages/Supplier/Card/SupplierContacts.vue
+++ b/src/pages/Supplier/Card/SupplierContacts.vue
@@ -84,9 +84,10 @@ const insertRow = () => {
                     </VnRow>
                 </QCardSection>
                 <VnRow>
-                    <QIcon
-                        name="add"
-                        size="sm"
+                    <QBtn
+                        flat
+                        icon="add"
+                        shortcut="+"
                         class="cursor-pointer"
                         color="primary"
                         @click="insertRow()"
@@ -94,7 +95,7 @@ const insertRow = () => {
                         <QTooltip>
                             {{ t('Add contact') }}
                         </QTooltip>
-                    </QIcon>
+                    </QBtn>
                 </VnRow>
             </QCard>
         </template>
diff --git a/src/pages/Worker/WorkerDepartmentTree.vue b/src/pages/Worker/WorkerDepartmentTree.vue
index 392539c86..c73cb59b9 100644
--- a/src/pages/Worker/WorkerDepartmentTree.vue
+++ b/src/pages/Worker/WorkerDepartmentTree.vue
@@ -180,17 +180,18 @@ function handleEvent(type, event, node) {
                                 {{ t('Remove') }}
                             </QTooltip>
                         </QIcon>
-                        <QIcon
-                            name="add"
+                        <QBtn
                             color="primary"
-                            size="sm"
+                            flat
+                            icon="add"
+                            shortcut="+"
                             class="cursor-pointer"
                             @click.stop="showCreateNodeForm(node.id)"
                         >
                             <QTooltip>
                                 {{ t('Create') }}
                             </QTooltip>
-                        </QIcon>
+                        </QBtn>
                     </div>
                 </div>
             </template>

From 9db12a8deee76b83076b09cff24965f611753383 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Wed, 18 Sep 2024 13:46:37 +0200
Subject: [PATCH 135/228] fix: wagon reload

---
 src/pages/Wagon/Type/WagonTypeList.vue | 2 +-
 src/pages/Wagon/WagonList.vue          | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/pages/Wagon/Type/WagonTypeList.vue b/src/pages/Wagon/Type/WagonTypeList.vue
index 2f0d55fbe..c0943c58e 100644
--- a/src/pages/Wagon/Type/WagonTypeList.vue
+++ b/src/pages/Wagon/Type/WagonTypeList.vue
@@ -103,7 +103,7 @@ async function remove(row) {
                         url-create="WagonTypes"
                         model="WagonType"
                         :form-initial-data="initialData"
-                        @on-data-saved="window.location.reload()"
+                        @on-data-saved="tableRef.reload()"
                         auto-load
                     >
                         <template #form-inputs="{ data }">
diff --git a/src/pages/Wagon/WagonList.vue b/src/pages/Wagon/WagonList.vue
index 129e803f5..89f9d285a 100644
--- a/src/pages/Wagon/WagonList.vue
+++ b/src/pages/Wagon/WagonList.vue
@@ -5,7 +5,7 @@ import { useArrayData } from 'src/composables/useArrayData';
 import { useI18n } from 'vue-i18n';
 import { useRouter } from 'vue-router';
 import VnTable from 'src/components/VnTable/VnTable.vue';
-import { computed } from 'vue';
+import { computed, ref } from 'vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 
@@ -14,7 +14,7 @@ const arrayData = useArrayData('WagonList');
 const store = arrayData.store;
 const router = useRouter();
 const { t } = useI18n();
-
+const tableRef = ref();
 const filter = {
     include: {
         relation: 'type',
@@ -108,7 +108,7 @@ async function remove(row) {
                 urlCreate: 'Wagons',
                 title: t('Create new wagon'),
                 onDataSaved: () => {
-                    window.location.reload();
+                    tableRef.reload();
                 },
                 formInitialData: {},
             }"

From d76250f56f8d3ab70dff47ac9c2b1ff5b05e1e98 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Wed, 18 Sep 2024 12:27:48 +0000
Subject: [PATCH 136/228] fix: reset VnTable scroll properties

---
 src/components/VnTable/VnTable.vue | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index 689be76ee..9b4341da1 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -69,10 +69,7 @@ const $props = defineProps({
         type: Boolean,
         default: false,
     },
-    disableInfiniteScroll: {
-        type: Boolean,
-        default: false,
-    },
+    
     hasSubToolbar: {
         type: Boolean,
         default: null,
@@ -368,9 +365,7 @@ function handleOnDataSaved(_) {
         ref="CrudModelRef"
         @on-fetch="(...args) => emit('onFetch', ...args)"
         :search-url="searchUrl"
-        :disable-infinite-scroll="
-            $attrs['disableInfiniteScroll'] ? isTableMode : !disableInfiniteScroll
-        "
+        :disable-infinite-scroll="isTableMode"
         @save-changes="reload"
         :has-sub-toolbar="$props.hasSubToolbar ?? isEditable"
         :auto-load="hasParams || $attrs['auto-load']"
@@ -390,7 +385,7 @@ function handleOnDataSaved(_) {
                 card-container-class="grid-three"
                 flat
                 :style="isTableMode && `max-height: ${tableHeight}`"
-                virtual-scroll
+                :virtual-scroll="isTableMode"
                 @virtual-scroll="
                     (event) =>
                         event.index > rows.length - 2 &&

From 5ca38ca825651c4d7ce98bab7082f1d43d34739a Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Wed, 18 Sep 2024 14:48:15 +0200
Subject: [PATCH 137/228] feat: global handler

---
 src/boot/quasar.js     | 6 ++++++
 src/i18n/locale/en.yml | 1 +
 src/i18n/locale/es.yml | 1 +
 3 files changed, 8 insertions(+)

diff --git a/src/boot/quasar.js b/src/boot/quasar.js
index e2035c880..5db6edd24 100644
--- a/src/boot/quasar.js
+++ b/src/boot/quasar.js
@@ -2,9 +2,15 @@ import { boot } from 'quasar/wrappers';
 import qFormMixin from './qformMixin';
 import mainShortcutMixin from './mainShortcutMixin';
 import keyShortcut from './keyShortcut';
+import useNotify from 'src/composables/useNotify.js';
+const { notify } = useNotify();
 
 export default boot(({ app }) => {
     app.mixin(qFormMixin);
     app.mixin(mainShortcutMixin);
     app.directive('shortcut', keyShortcut);
+    app.config.errorHandler = function (err) {
+        console.error(err);
+        notify('globals.error', 'negative', 'error');
+    };
 });
diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index e27dc7bd4..2e2365f7b 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -103,6 +103,7 @@ globals:
     ticket: Ticket
     campaign: Campaign
     weight: Weight
+    error: Ups! Something went wrong
     pageTitles:
         logIn: Login
         addressEdit: Update address
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index ed34c8761..53b487e9f 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -105,6 +105,7 @@ globals:
     ticket: Ticket
     campaign: Campaña
     weight: Peso
+    error: ¡Ups! Algo salió mal
     pageTitles:
         logIn: Inicio de sesión
         addressEdit: Modificar consignatario

From b3f27d9a84970050963f2b7598ae9fc1ad751087 Mon Sep 17 00:00:00 2001
From: jgallego <jgallego@verdnatura.es>
Date: Wed, 18 Sep 2024 17:51:49 +0200
Subject: [PATCH 138/228] feat: translations fixed

---
 src/pages/Route/Roadmap/RoadmapBasicData.vue | 4 ++--
 src/pages/Route/Roadmap/RoadmapFilter.vue    | 8 ++++----
 src/pages/Route/Roadmap/RoadmapSummary.vue   | 4 ++--
 src/pages/Route/RouteRoadmap.vue             | 1 +
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/pages/Route/Roadmap/RoadmapBasicData.vue b/src/pages/Route/Roadmap/RoadmapBasicData.vue
index e1611ed61..eeefaca2c 100644
--- a/src/pages/Route/Roadmap/RoadmapBasicData.vue
+++ b/src/pages/Route/Roadmap/RoadmapBasicData.vue
@@ -103,8 +103,8 @@ es:
     Roadmap: Troncal
     ETD date: Fecha ETD
     ETD hour: Hora ETD
-    Tractor plate: Matrícula tractor
-    Trailer plate: Matrícula trailer
+    Tractor plate: Matrícula tractora
+    Trailer plate: Matrícula remolque
     Carrier: Transportista
     Price: Precio
     Driver name: Nombre del conductor
diff --git a/src/pages/Route/Roadmap/RoadmapFilter.vue b/src/pages/Route/Roadmap/RoadmapFilter.vue
index 04c5c9696..ecf8d39fc 100644
--- a/src/pages/Route/Roadmap/RoadmapFilter.vue
+++ b/src/pages/Route/Roadmap/RoadmapFilter.vue
@@ -164,8 +164,8 @@ en:
         to: To
 es:
     params:
-        tractorPlate: Matrícula del tractor
-        trailerPlate: Matrícula del trailer
+        tractorPlate: Matrícula tractora
+        trailerPlate: Matrícula remolque
         supplierFk: Transportista
         price: Precio
         driverName: Nombre del conductor
@@ -174,8 +174,8 @@ es:
         to: Hasta
     From: Desde
     To: Hasta
-    Tractor Plate: Matrícula del tractor
-    Trailer Plate: Matrícula del trailer
+    Tractor Plate: Matrícula tractora
+    Trailer Plate: Matrícula remolque
     Carrier: Transportista
     Price: Precio
     Driver name: Nombre del conductor
diff --git a/src/pages/Route/Roadmap/RoadmapSummary.vue b/src/pages/Route/Roadmap/RoadmapSummary.vue
index 7f8b7107b..3fb36b4f7 100644
--- a/src/pages/Route/Roadmap/RoadmapSummary.vue
+++ b/src/pages/Route/Roadmap/RoadmapSummary.vue
@@ -149,8 +149,8 @@ const filter = {
 <i18n>
 es:
     Carrier: Transportista
-    Tractor Plate: Matrícula tractor
-    Trailer Plate: Matrícula trailer
+    Tractor Plate: Matrícula tractora
+    Trailer Plate: Matrícula remolque
     Phone: Teléfono
     Worker: Trabajador
     Observations: Observaciones
diff --git a/src/pages/Route/RouteRoadmap.vue b/src/pages/Route/RouteRoadmap.vue
index 306387cbe..d921dab1f 100644
--- a/src/pages/Route/RouteRoadmap.vue
+++ b/src/pages/Route/RouteRoadmap.vue
@@ -237,4 +237,5 @@ es:
     Price: Precio
     Observations: Observaciones
     Preview: Vista previa
+    Select the estimated date of departure (ETD): Selecciona la fecha estimada de salida
 </i18n>

From 1cb2981f97e42d4d678d26800e1a9a28fbefb0ad Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Wed, 18 Sep 2024 16:26:56 +0000
Subject: [PATCH 139/228] feat: apply color when today

---
 src/css/app.scss | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/css/app.scss b/src/css/app.scss
index 3c51dc8af..905934d4c 100644
--- a/src/css/app.scss
+++ b/src/css/app.scss
@@ -268,6 +268,7 @@ input::-webkit-inner-spin-button {
         max-width: 400px;
     }
 }
+
 .edit-photo-btn {
     position: absolute;
     right: 12px;
@@ -280,3 +281,10 @@ input::-webkit-inner-spin-button {
     color: var(--vn-label-color);
     text-transform: uppercase;
 }
+
+.q-date {
+    &__today {
+        border: 2px solid $info;
+        color: $info;
+    }
+}

From 08bec59a37cc97ac321924569f03f56d27a2f492 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Thu, 19 Sep 2024 00:02:45 +0200
Subject: [PATCH 140/228] add_circle

---
 src/components/ItemsFilterPanel.vue         |  7 +++---
 src/pages/Item/Card/ItemBarcode.vue         |  9 ++++----
 src/pages/Order/Card/OrderCatalogFilter.vue |  6 +++--
 src/pages/Ticket/Card/TicketNotes.vue       |  9 ++++----
 src/pages/Ticket/Card/TicketPackage.vue     | 25 ++++++++++++---------
 src/pages/Worker/Card/WorkerTimeControl.vue |  9 ++++----
 6 files changed, 37 insertions(+), 28 deletions(-)

diff --git a/src/components/ItemsFilterPanel.vue b/src/components/ItemsFilterPanel.vue
index 8449f9354..e89d32da4 100644
--- a/src/components/ItemsFilterPanel.vue
+++ b/src/components/ItemsFilterPanel.vue
@@ -297,11 +297,12 @@ const removeTag = (index, params, search) => {
                 />
             </QItem>
             <QItem class="q-mt-lg">
-                <QIcon
-                    name="add_circle"
+                <QBtn
+                    icon="add_circle"
+                    shortcut="+"
+                    flat
                     class="fill-icon-on-hover q-px-xs"
                     color="primary"
-                    size="sm"
                     @click="tagValues.push({})"
                 />
             </QItem>
diff --git a/src/pages/Item/Card/ItemBarcode.vue b/src/pages/Item/Card/ItemBarcode.vue
index b353d67c7..197e9142f 100644
--- a/src/pages/Item/Card/ItemBarcode.vue
+++ b/src/pages/Item/Card/ItemBarcode.vue
@@ -65,17 +65,18 @@ const focusLastInput = () => {
                                 </QTooltip>
                             </QIcon>
                         </div>
-                        <QIcon
+                        <QBtn
                             @click="insertRow()"
                             class="cursor-pointer fill-icon-on-hover"
                             color="primary"
-                            name="add_circle"
-                            size="sm"
+                            icon="add_circle"
+                            shortcut="+"
+                            flat
                         >
                             <QTooltip>
                                 {{ t('Add barcode') }}
                             </QTooltip>
-                        </QIcon>
+                        </QBtn>
                     </QCard>
                 </template>
             </CrudModel>
diff --git a/src/pages/Order/Card/OrderCatalogFilter.vue b/src/pages/Order/Card/OrderCatalogFilter.vue
index 938cc4fe2..354c44747 100644
--- a/src/pages/Order/Card/OrderCatalogFilter.vue
+++ b/src/pages/Order/Card/OrderCatalogFilter.vue
@@ -374,8 +374,10 @@ function addOrder(value, field, params) {
                 />
             </QItem>
             <QItem class="q-mt-lg">
-                <QIcon
-                    name="add_circle"
+                <QBtn
+                    icon="add_circle"
+                    shortcut="+"
+                    flat
                     class="filter-icon"
                     @click="tagValues.push({})"
                 />
diff --git a/src/pages/Ticket/Card/TicketNotes.vue b/src/pages/Ticket/Card/TicketNotes.vue
index cfc0c2431..1b9d98a8b 100644
--- a/src/pages/Ticket/Card/TicketNotes.vue
+++ b/src/pages/Ticket/Card/TicketNotes.vue
@@ -87,17 +87,18 @@ watch(
                         </QIcon>
                     </div>
                     <VnRow v-if="observationTypes.length > rows.length">
-                        <QIcon
-                            name="add_circle"
+                        <QBtn
+                            icon="add_circle"
+                            shortcut="+"
+                            flat
                             class="fill-icon-on-hover q-ml-md"
-                            size="sm"
                             color="primary"
                             @click="ticketNotesCrudRef.insert()"
                         >
                             <QTooltip>
                                 {{ t('ticketNotes.addNote') }}
                             </QTooltip>
-                        </QIcon>
+                        </QBtn>
                     </VnRow>
                 </QCard>
             </template>
diff --git a/src/pages/Ticket/Card/TicketPackage.vue b/src/pages/Ticket/Card/TicketPackage.vue
index a76fce2b6..c071d4f7f 100644
--- a/src/pages/Ticket/Card/TicketPackage.vue
+++ b/src/pages/Ticket/Card/TicketPackage.vue
@@ -114,17 +114,20 @@ watch(
                             </QTooltip>
                         </QIcon>
                     </div>
-                    <QIcon
-                        name="add_circle"
-                        class="fill-icon-on-hover q-ml-md"
-                        size="sm"
-                        color="primary"
-                        @click="ticketPackagingsCrudRef.insert()"
-                    >
-                        <QTooltip>
-                            {{ t('package.addPackage') }}
-                        </QTooltip>
-                    </QIcon>
+                    <VnRow>
+                        <QBtn
+                            icon="add_circle"
+                            shortcut="+"
+                            flat
+                            class="fill-icon-on-hover q-ml-md"
+                            color="primary"
+                            @click="ticketPackagingsCrudRef.insert()"
+                        >
+                            <QTooltip>
+                                {{ t('package.addPackage') }}
+                            </QTooltip>
+                        </QBtn>
+                    </VnRow>
                 </QCard>
             </template>
         </CrudModel>
diff --git a/src/pages/Worker/Card/WorkerTimeControl.vue b/src/pages/Worker/Card/WorkerTimeControl.vue
index 9ae91f8ce..fbfd4b28d 100644
--- a/src/pages/Worker/Card/WorkerTimeControl.vue
+++ b/src/pages/Worker/Card/WorkerTimeControl.vue
@@ -561,15 +561,16 @@ onMounted(async () => {
                             <span class="q-mb-md text-sm text-body1">
                                 {{ secondsToHoursMinutes(day.dayData?.workedHours) }}
                             </span>
-                            <QIcon
-                                name="add_circle"
+                            <QBtn
+                                icon="add_circle"
+                                shortcut="+"
+                                flat
                                 color="primary"
                                 class="fill-icon cursor-pointer"
-                                size="sm"
                                 @click="showWorkerTimeForm(day.dayData?.dated, 'create')"
                             >
                                 <QTooltip>{{ t('Add time') }}</QTooltip>
-                            </QIcon>
+                            </QBtn>
                         </div>
                     </QTd>
                 </QTr>

From 1550d79160421e7faeb177a9897be7a98a506cb6 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Thu, 19 Sep 2024 00:10:28 +0200
Subject: [PATCH 141/228] feat: add shortcut more buttons

---
 src/components/common/VnDmsList.vue                | 9 ++++++++-
 src/pages/Account/Role/Card/SubRoles.vue           | 8 +++++++-
 src/pages/Claim/Card/ClaimLines.vue                | 2 +-
 src/pages/Claim/Card/ClaimPhoto.vue                | 8 +++++++-
 src/pages/Customer/Card/CustomerFileManagement.vue | 1 +
 src/pages/Customer/Card/CustomerSamples.vue        | 8 +++++++-
 src/pages/Entry/Card/EntryNotes.vue                | 8 +++++++-
 src/pages/InvoiceIn/Card/InvoiceInBasicData.vue    | 1 +
 src/pages/InvoiceIn/Card/InvoiceInDueDay.vue       | 2 +-
 src/pages/InvoiceIn/Card/InvoiceInIntrastat.vue    | 1 +
 src/pages/InvoiceIn/Card/InvoiceInVat.vue          | 1 +
 src/pages/Item/ItemRequestFilter.vue               | 1 +
 src/pages/Route/Agency/Card/AgencyWorkcenter.vue   | 2 +-
 src/pages/Route/RouteTickets.vue                   | 2 +-
 src/pages/Ticket/Card/TicketSale.vue               | 3 ++-
 src/pages/Ticket/Card/TicketService.vue            | 8 +++++++-
 src/pages/Travel/ExtraCommunityFilter.vue          | 1 +
 src/pages/Zone/Delivery/ZoneDeliveryList.vue       | 2 +-
 src/pages/Zone/Upcoming/ZoneUpcomingList.vue       | 2 +-
 19 files changed, 57 insertions(+), 13 deletions(-)

diff --git a/src/components/common/VnDmsList.vue b/src/components/common/VnDmsList.vue
index 16e3c641f..52dd6ef79 100644
--- a/src/components/common/VnDmsList.vue
+++ b/src/components/common/VnDmsList.vue
@@ -400,7 +400,14 @@ defineExpose({
         />
     </QDialog>
     <QPageSticky position="bottom-right" :offset="[25, 25]">
-        <QBtn fab color="primary" icon="add" @click="showFormDialog()" class="fill-icon">
+        <QBtn
+            fab
+            color="primary"
+            icon="add"
+            shortcut="+"
+            @click="showFormDialog()"
+            class="fill-icon"
+        >
             <QTooltip>
                 {{ t('Upload file') }}
             </QTooltip>
diff --git a/src/pages/Account/Role/Card/SubRoles.vue b/src/pages/Account/Role/Card/SubRoles.vue
index 7a0088bac..d17f96dd8 100644
--- a/src/pages/Account/Role/Card/SubRoles.vue
+++ b/src/pages/Account/Role/Card/SubRoles.vue
@@ -142,7 +142,13 @@ const redirectToRoleSummary = (id) =>
             <SubRoleCreateForm @on-submit-create-subrole="createSubRole" />
         </QDialog>
         <QPageSticky position="bottom-right" :offset="[18, 18]">
-            <QBtn fab icon="add" color="primary" @click="openCreateSubRoleForm()">
+            <QBtn
+                fab
+                icon="add"
+                shortcut="+"
+                color="primary"
+                @click="openCreateSubRoleForm()"
+            >
                 <QTooltip>{{ t('warehouses.add') }}</QTooltip>
             </QBtn>
         </QPageSticky>
diff --git a/src/pages/Claim/Card/ClaimLines.vue b/src/pages/Claim/Card/ClaimLines.vue
index 77c7dacf1..60c470d22 100644
--- a/src/pages/Claim/Card/ClaimLines.vue
+++ b/src/pages/Claim/Card/ClaimLines.vue
@@ -317,7 +317,7 @@ async function saveWhenHasChanges() {
     </div>
 
     <QPageSticky position="bottom-right" :offset="[25, 25]">
-        <QBtn fab color="primary" icon="add" @click="showImportDialog()" />
+        <QBtn fab color="primary" shortcut="+" icon="add" @click="showImportDialog()" />
     </QPageSticky>
 </template>
 
diff --git a/src/pages/Claim/Card/ClaimPhoto.vue b/src/pages/Claim/Card/ClaimPhoto.vue
index 21f1be6ed..ec619cc7d 100644
--- a/src/pages/Claim/Card/ClaimPhoto.vue
+++ b/src/pages/Claim/Card/ClaimPhoto.vue
@@ -246,7 +246,13 @@ function onDrag() {
     </QDialog>
     <QPageSticky position="bottom-right" :offset="[25, 25]">
         <label for="fileInput">
-            <QBtn fab @click="inputFile.nativeEl.click()" icon="add" color="primary">
+            <QBtn
+                fab
+                @click="inputFile.nativeEl.click()"
+                shortcut="+"
+                icon="add"
+                color="primary"
+            >
                 <QInput
                     ref="inputFile"
                     type="file"
diff --git a/src/pages/Customer/Card/CustomerFileManagement.vue b/src/pages/Customer/Card/CustomerFileManagement.vue
index 43aacf6a0..134d8dbd6 100644
--- a/src/pages/Customer/Card/CustomerFileManagement.vue
+++ b/src/pages/Customer/Card/CustomerFileManagement.vue
@@ -236,6 +236,7 @@ const toCustomerFileManagementCreate = () => {
             @click.stop="toCustomerFileManagementCreate()"
             color="primary"
             fab
+            shortcut="+"
             icon="add"
         />
         <QTooltip>
diff --git a/src/pages/Customer/Card/CustomerSamples.vue b/src/pages/Customer/Card/CustomerSamples.vue
index 8e2ab92a0..f12691112 100644
--- a/src/pages/Customer/Card/CustomerSamples.vue
+++ b/src/pages/Customer/Card/CustomerSamples.vue
@@ -99,7 +99,13 @@ const tableRef = ref();
     </VnTable>
 
     <QPageSticky :offset="[18, 18]">
-        <QBtn @click.stop="toCustomerSamplesCreate()" color="primary" fab icon="add" />
+        <QBtn
+            @click.stop="toCustomerSamplesCreate()"
+            color="primary"
+            fab
+            icon="add"
+            shortcut="+"
+        />
         <QTooltip>
             {{ t('Send sample') }}
         </QTooltip>
diff --git a/src/pages/Entry/Card/EntryNotes.vue b/src/pages/Entry/Card/EntryNotes.vue
index f07d0b233..55cac0437 100644
--- a/src/pages/Entry/Card/EntryNotes.vue
+++ b/src/pages/Entry/Card/EntryNotes.vue
@@ -138,7 +138,13 @@ const columns = computed(() => [
         </template>
     </CrudModel>
     <QPageSticky position="bottom-right" :offset="[25, 25]">
-        <QBtn fab color="primary" icon="add" @click="entryObservationsRef.insert()" />
+        <QBtn
+            fab
+            color="primary"
+            icon="add"
+            shortcut="+"
+            @click="entryObservationsRef.insert()"
+        />
     </QPageSticky>
 </template>
 <i18n>
diff --git a/src/pages/InvoiceIn/Card/InvoiceInBasicData.vue b/src/pages/InvoiceIn/Card/InvoiceInBasicData.vue
index 045517a3f..c9468557f 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInBasicData.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInBasicData.vue
@@ -281,6 +281,7 @@ async function onSubmit() {
                             v-else
                             icon="add_circle"
                             round
+                            shortcut="+"
                             padding="xs"
                             @click="setCreateDms()"
                         >
diff --git a/src/pages/InvoiceIn/Card/InvoiceInDueDay.vue b/src/pages/InvoiceIn/Card/InvoiceInDueDay.vue
index 1593ea1be..e8f73848b 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInDueDay.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInDueDay.vue
@@ -230,7 +230,7 @@ async function insert() {
         </template>
     </CrudModel>
     <QPageSticky position="bottom-right" :offset="[25, 25]">
-        <QBtn color="primary" icon="add" size="lg" round @click="insert" />
+        <QBtn color="primary" icon="add" shortcut="+" size="lg" round @click="insert" />
     </QPageSticky>
 </template>
 <style lang="scss" scoped>
diff --git a/src/pages/InvoiceIn/Card/InvoiceInIntrastat.vue b/src/pages/InvoiceIn/Card/InvoiceInIntrastat.vue
index 717f30b7f..bee50a07d 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInIntrastat.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInIntrastat.vue
@@ -224,6 +224,7 @@ const formatOpt = (row, { model, options }, prop) => {
         <QBtn
             color="primary"
             icon="add"
+            shortcut="+"
             size="lg"
             round
             @click="invoiceInFormRef.insert()"
diff --git a/src/pages/InvoiceIn/Card/InvoiceInVat.vue b/src/pages/InvoiceIn/Card/InvoiceInVat.vue
index d44880937..08834ecb8 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInVat.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInVat.vue
@@ -405,6 +405,7 @@ const formatOpt = (row, { model, options }, prop) => {
             color="primary"
             icon="add"
             size="lg"
+            shortcut="+"
             round
             @click="invoiceInFormRef.insert()"
         >
diff --git a/src/pages/Item/ItemRequestFilter.vue b/src/pages/Item/ItemRequestFilter.vue
index aa07b8d50..0e81ff5a5 100644
--- a/src/pages/Item/ItemRequestFilter.vue
+++ b/src/pages/Item/ItemRequestFilter.vue
@@ -212,6 +212,7 @@ const decrement = (paramsObj, key) => {
                                     flat
                                     dense
                                     size="12px"
+                                    shortcut="+"
                                     @click="add(params, 'scopeDays')"
                                 />
                                 <QBtn
diff --git a/src/pages/Route/Agency/Card/AgencyWorkcenter.vue b/src/pages/Route/Agency/Card/AgencyWorkcenter.vue
index 3531ad288..1f3cab5d0 100644
--- a/src/pages/Route/Agency/Card/AgencyWorkcenter.vue
+++ b/src/pages/Route/Agency/Card/AgencyWorkcenter.vue
@@ -88,7 +88,7 @@ async function deleteWorCenter(id) {
         </VnPaginate>
     </div>
     <QPageSticky :offset="[18, 18]">
-        <QBtn @click.stop="dialog.show()" color="primary" fab icon="add">
+        <QBtn @click.stop="dialog.show()" color="primary" fab shortcut="+" icon="add">
             <QDialog ref="dialog">
                 <FormModelPopup
                     :title="t('Add work center')"
diff --git a/src/pages/Route/RouteTickets.vue b/src/pages/Route/RouteTickets.vue
index 9356f7590..5960636b0 100644
--- a/src/pages/Route/RouteTickets.vue
+++ b/src/pages/Route/RouteTickets.vue
@@ -396,7 +396,7 @@ const openSmsDialog = async () => {
             </VnPaginate>
         </div>
         <QPageSticky :offset="[20, 20]">
-            <QBtn fab icon="add" color="primary" @click="openTicketsDialog">
+            <QBtn fab icon="add" shortcut="+" color="primary" @click="openTicketsDialog">
                 <QTooltip>
                     {{ t('Add ticket') }}
                 </QTooltip>
diff --git a/src/pages/Ticket/Card/TicketSale.vue b/src/pages/Ticket/Card/TicketSale.vue
index 2ea12bb05..f86863f05 100644
--- a/src/pages/Ticket/Card/TicketSale.vue
+++ b/src/pages/Ticket/Card/TicketSale.vue
@@ -735,6 +735,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
                 size="md"
                 round
                 flat
+                shortcut="+"
                 :disable="!isTicketEditable"
                 @click="insertRow()"
             >
@@ -746,7 +747,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
     </QTable>
 
     <QPageSticky :offset="[20, 20]">
-        <QBtn @click="newOrderFromTicket()" color="primary" fab icon="add" />
+        <QBtn @click="newOrderFromTicket()" color="primary" fab icon="add" shortcut="+" />
         <QTooltip class="text-no-wrap">
             {{ t('Add item to basket') }}
         </QTooltip>
diff --git a/src/pages/Ticket/Card/TicketService.vue b/src/pages/Ticket/Card/TicketService.vue
index 63dd454ba..873051676 100644
--- a/src/pages/Ticket/Card/TicketService.vue
+++ b/src/pages/Ticket/Card/TicketService.vue
@@ -184,6 +184,12 @@ const columns = computed(() => [
         </template>
     </CrudModel>
     <QPageSticky position="bottom-right" :offset="[25, 25]">
-        <QBtn fab color="primary" icon="add" @click="ticketServiceCrudRef.insert()" />
+        <QBtn
+            fab
+            color="primary"
+            icon="add"
+            @click="ticketServiceCrudRef.insert()"
+            shortcut="+"
+        />
     </QPageSticky>
 </template>
diff --git a/src/pages/Travel/ExtraCommunityFilter.vue b/src/pages/Travel/ExtraCommunityFilter.vue
index a8bbde75b..75b744168 100644
--- a/src/pages/Travel/ExtraCommunityFilter.vue
+++ b/src/pages/Travel/ExtraCommunityFilter.vue
@@ -112,6 +112,7 @@ warehouses();
                         <template #append>
                             <QBtn
                                 icon="add"
+                                shortcut="+"
                                 flat
                                 dense
                                 size="12px"
diff --git a/src/pages/Zone/Delivery/ZoneDeliveryList.vue b/src/pages/Zone/Delivery/ZoneDeliveryList.vue
index ca87dbd84..975cbdb67 100644
--- a/src/pages/Zone/Delivery/ZoneDeliveryList.vue
+++ b/src/pages/Zone/Delivery/ZoneDeliveryList.vue
@@ -74,7 +74,7 @@ async function remove(row) {
             </VnPaginate>
         </div>
         <QPageSticky position="bottom-right" :offset="[18, 18]">
-            <QBtn @click="create" fab icon="add" color="primary" />
+            <QBtn @click="create" fab icon="add" shortcut="+" color="primary" />
         </QPageSticky>
     </QPage>
 </template>
diff --git a/src/pages/Zone/Upcoming/ZoneUpcomingList.vue b/src/pages/Zone/Upcoming/ZoneUpcomingList.vue
index 89e53132e..5a7f0bb4c 100644
--- a/src/pages/Zone/Upcoming/ZoneUpcomingList.vue
+++ b/src/pages/Zone/Upcoming/ZoneUpcomingList.vue
@@ -74,7 +74,7 @@ async function remove(row) {
             </VnPaginate>
         </div>
         <QPageSticky position="bottom-right" :offset="[18, 18]">
-            <QBtn @click="create" fab icon="add" color="primary" />
+            <QBtn @click="create" fab icon="add" shortcut="+" color="primary" />
         </QPageSticky>
     </QPage>
 </template>

From ccfe61d777f50b004898b64599c5a68d8d93a2a6 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Thu, 19 Sep 2024 01:10:14 +0200
Subject: [PATCH 142/228] feat: vnSelect exprBuilder

---
 src/components/common/VnSelect.vue            |  6 +++++
 src/pages/Customer/Card/CustomerBasicData.vue | 25 +++++++++----------
 2 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/src/components/common/VnSelect.vue b/src/components/common/VnSelect.vue
index ed842103f..cd5608954 100644
--- a/src/components/common/VnSelect.vue
+++ b/src/components/common/VnSelect.vue
@@ -38,6 +38,10 @@ const $props = defineProps({
         type: [Array],
         default: () => [],
     },
+    exprBuilder: {
+        type: Function,
+        default: null,
+    },
     isClearable: {
         type: Boolean,
         default: true,
@@ -179,6 +183,8 @@ async function fetchFilter(val) {
         }, {});
     } else defaultWhere = { [key]: getVal(val) };
     const where = { ...(val ? defaultWhere : {}), ...$props.where };
+    if (typeof $props.exprBuilder === 'function')
+        Object.assign(where, $props.exprBuilder(key, val));
     const fetchOptions = { where, include, limit };
     if (fields) fetchOptions.fields = fields;
     if (sortBy) fetchOptions.order = sortBy;
diff --git a/src/pages/Customer/Card/CustomerBasicData.vue b/src/pages/Customer/Card/CustomerBasicData.vue
index 3682ecd73..6472a47ff 100644
--- a/src/pages/Customer/Card/CustomerBasicData.vue
+++ b/src/pages/Customer/Card/CustomerBasicData.vue
@@ -16,19 +16,19 @@ const { t } = useI18n();
 const businessTypes = ref([]);
 const contactChannels = ref([]);
 const title = ref();
-const handleSalesModelValue = (val) => {
-    filter.value.and[1] = {
-        or: [
-            { name: val },
-            { nickname: { like: '%' + val + '%' } },
-            { code: { like: `${val}%` } },
-        ],
+const handleSalesModelValue = (val) => ({
+    or: [
+        { name: val },
+        { nickname: { like: '%' + val + '%' } },
+        { code: { like: `${val}%` } },
+    ],
+});
+
+const exprBuilder = (param, value) => {
+    return {
+        and: [{ active: { neq: false } }, handleSalesModelValue(value)],
     };
 };
-
-const filter = ref({
-    and: [{ active: { neq: false } }],
-});
 </script>
 <template>
     <FetchData
@@ -109,11 +109,10 @@ const filter = ref({
                     :params="{
                         departmentCodes: ['VT', 'shopping'],
                     }"
-                    :where="filter"
                     :fields="['id', 'nickname']"
                     sort-by="nickname ASC"
                     :rules="validate('client.salesPersonFk')"
-                    @filter="handleSalesModelValue"
+                    :expr-builder="exprBuilder"
                     emit-value
                     auto-load
                 >

From 8fa11263e8f8f1c721b8ddb411b26e64cb572e7d Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Thu, 19 Sep 2024 12:05:08 +0200
Subject: [PATCH 143/228] fix: fix wagon list reload

---
 src/pages/Wagon/WagonList.vue | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/pages/Wagon/WagonList.vue b/src/pages/Wagon/WagonList.vue
index 89f9d285a..02e3b6d16 100644
--- a/src/pages/Wagon/WagonList.vue
+++ b/src/pages/Wagon/WagonList.vue
@@ -107,9 +107,7 @@ async function remove(row) {
             :create="{
                 urlCreate: 'Wagons',
                 title: t('Create new wagon'),
-                onDataSaved: () => {
-                    tableRef.reload();
-                },
+                onDataSaved: () => tableRef.reload(),
                 formInitialData: {},
             }"
         >

From 8b379faa52758aad7301bedb777fa83727965283 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Thu, 19 Sep 2024 12:06:00 +0200
Subject: [PATCH 144/228] perf: imrpove exprBuilder

---
 src/components/common/VnSelect.vue | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/components/common/VnSelect.vue b/src/components/common/VnSelect.vue
index cd5608954..aa629767d 100644
--- a/src/components/common/VnSelect.vue
+++ b/src/components/common/VnSelect.vue
@@ -183,8 +183,7 @@ async function fetchFilter(val) {
         }, {});
     } else defaultWhere = { [key]: getVal(val) };
     const where = { ...(val ? defaultWhere : {}), ...$props.where };
-    if (typeof $props.exprBuilder === 'function')
-        Object.assign(where, $props.exprBuilder(key, val));
+    $props.exprBuilder && Object.assign(where, $props.exprBuilder(key, val));
     const fetchOptions = { where, include, limit };
     if (fields) fetchOptions.fields = fields;
     if (sortBy) fetchOptions.order = sortBy;

From 8e96265106b229292a1ae1bf3347e20ecb083c8a Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Thu, 19 Sep 2024 12:51:49 +0200
Subject: [PATCH 145/228] fix: CustomerFilter

---
 src/pages/Customer/CustomerFilter.vue | 72 ++++++++++-----------------
 src/pages/Customer/CustomerList.vue   | 10 +++-
 2 files changed, 33 insertions(+), 49 deletions(-)

diff --git a/src/pages/Customer/CustomerFilter.vue b/src/pages/Customer/CustomerFilter.vue
index 043bcdadb..6c50cc9df 100644
--- a/src/pages/Customer/CustomerFilter.vue
+++ b/src/pages/Customer/CustomerFilter.vue
@@ -1,35 +1,20 @@
 <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 VnSelect from 'components/common/VnSelect.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 
 const { t } = useI18n();
-const props = defineProps({
+defineProps({
     dataKey: {
         type: String,
         required: true,
     },
 });
-
-const provinces = ref();
-const workers = ref();
-const zones = ref();
 </script>
 
 <template>
-    <FetchData url="Provinces" @on-fetch="(data) => (provinces = data)" auto-load />
-    <FetchData url="Zones" @on-fetch="(data) => (zones = data)" auto-load />
-    <FetchData
-        url="Workers/activeWithInheritedRole"
-        :filter="{ where: { role: 'salesPerson' } }"
-        @on-fetch="(data) => (workers = data)"
-        auto-load
-    />
-    <VnFilterPanel :data-key="props.dataKey" :search-button="true" search-url="table">
+    <VnFilterPanel :data-key="dataKey" :search-button="true" search-url="table">
         <template #tags="{ tag, formatFn }">
             <div class="q-gutter-x-xs">
                 <strong>{{ t(`params.${tag.label}`) }}: </strong>
@@ -65,15 +50,14 @@ const zones = ref();
                 </QItemSection>
             </QItem>
             <QItem class="q-mb-sm">
-                <QItemSection v-if="!workers">
-                    <QSkeleton type="QInput" class="full-width" />
-                </QItemSection>
-                <QItemSection v-if="workers">
+                <QItemSection>
                     <VnSelect
+                        url="Workers/activeWithInheritedRole"
+                        :filter="{ where: { role: 'salesPerson' } }"
+                        auto-load
                         :label="t('Salesperson')"
                         v-model="params.salesPersonFk"
                         @update:model-value="searchFn()"
-                        :options="workers"
                         option-value="id"
                         option-label="name"
                         emit-value
@@ -88,15 +72,12 @@ const zones = ref();
                 </QItemSection>
             </QItem>
             <QItem class="q-mb-sm">
-                <QItemSection v-if="!provinces">
-                    <QSkeleton type="QInput" class="full-width" />
-                </QItemSection>
-                <QItemSection v-if="provinces">
-                    <VnSelect
+                <QItemSection
+                    ><VnSelect
+                        url="Provinces"
                         :label="t('Province')"
                         v-model="params.provinceFk"
                         @update:model-value="searchFn()"
-                        :options="provinces"
                         option-value="id"
                         option-label="name"
                         emit-value
@@ -105,6 +86,7 @@ const zones = ref();
                         dense
                         outlined
                         rounded
+                        auto-load
                         :input-debounce="0"
                     />
                 </QItemSection>
@@ -135,25 +117,21 @@ const zones = ref();
                     </QItemSection>
                 </QItem>
                 <QItem>
-                    <QItemSection v-if="!zones">
-                        <QSkeleton type="QInput" class="full-width" />
-                    </QItemSection>
-                    <QItemSection v-if="zones">
-                        <VnSelect
-                            :label="t('Zone')"
-                            v-model="params.zoneFk"
-                            @update:model-value="searchFn()"
-                            :options="zones"
-                            option-value="id"
-                            option-label="name"
-                            emit-value
-                            map-options
-                            hide-selected
-                            dense
-                            outlined
-                            rounded
-                        />
-                    </QItemSection>
+                    <VnSelect
+                        url="Zones"
+                        :label="t('Zone')"
+                        v-model="params.zoneFk"
+                        @update:model-value="searchFn()"
+                        option-value="id"
+                        option-label="name"
+                        emit-value
+                        map-options
+                        hide-selected
+                        dense
+                        outlined
+                        rounded
+                        auto-load
+                    />
                 </QItem>
                 <QItem>
                     <QItemSection>
diff --git a/src/pages/Customer/CustomerList.vue b/src/pages/Customer/CustomerList.vue
index 270acdb89..0428c0c7b 100644
--- a/src/pages/Customer/CustomerList.vue
+++ b/src/pages/Customer/CustomerList.vue
@@ -8,10 +8,10 @@ import VnLocation from 'src/components/common/VnLocation.vue';
 import VnSearchbar from 'components/ui/VnSearchbar.vue';
 import CustomerSummary from './Card/CustomerSummary.vue';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
-
+import RightMenu from 'src/components/common/RightMenu.vue';
 import VnLinkPhone from 'src/components/ui/VnLinkPhone.vue';
-
 import { toDate } from 'src/filters';
+import CustomerFilter from './CustomerFilter.vue';
 
 const { t } = useI18n();
 const router = useRouter();
@@ -397,6 +397,11 @@ function handleLocation(data, location) {
         :label="t('Search customer')"
         data-key="Customer"
     />
+    <RightMenu>
+        <template #right-panel>
+            <CustomerFilter data-key="Customer" />
+        </template>
+    </RightMenu>
     <VnTable
         ref="tableRef"
         data-key="Customer"
@@ -413,6 +418,7 @@ function handleLocation(data, location) {
         order="id DESC"
         :columns="columns"
         redirect="customer"
+        :right-search="false"
         auto-load
     >
         <template #more-create-dialog="{ data }">

From deff8a1cf407a1660db06d5fe51d7b0ccab43a98 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Fri, 20 Sep 2024 13:58:26 +0200
Subject: [PATCH 146/228] feat: hide menus on small view

---
 src/components/VnTable/VnTable.vue      | 2 +-
 src/components/common/VnSectionMain.vue | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index 3e982919b..a3b64d264 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -147,7 +147,7 @@ onMounted(() => {
         quasar.platform.is.mobile && !$props.disableOption?.card
             ? CARD_MODE
             : $props.defaultMode;
-    stateStore.rightDrawer = true;
+    stateStore.rightDrawer = quasar.screen.gt.xs;
     columnsVisibilitySkipped.value = [
         ...splittedColumns.value.columns
             .filter((c) => c.visible == false)
diff --git a/src/components/common/VnSectionMain.vue b/src/components/common/VnSectionMain.vue
index 9975b1011..15be6ad9a 100644
--- a/src/components/common/VnSectionMain.vue
+++ b/src/components/common/VnSectionMain.vue
@@ -2,6 +2,7 @@
 import { useStateStore } from 'stores/useStateStore';
 import LeftMenu from 'components/LeftMenu.vue';
 import { onMounted } from 'vue';
+import { useQuasar } from 'quasar';
 
 const stateStore = useStateStore();
 const $props = defineProps({
@@ -10,7 +11,9 @@ const $props = defineProps({
         default: true,
     },
 });
-onMounted(() => (stateStore.leftDrawer = $props.leftDrawer));
+onMounted(
+    () => (stateStore.leftDrawer = useQuasar().screen.gt.xs ? $props.leftDrawer : false)
+);
 </script>
 
 <template>

From f84444d894f61c67bc04bc3ac48cb66d0ebe419b Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Sat, 21 Sep 2024 01:22:25 +0200
Subject: [PATCH 147/228] feat: add tooltip CustomerNewCustomAgent

---
 src/pages/Customer/components/CustomerAddressCreate.vue | 1 +
 src/pages/Customer/components/CustomerAddressEdit.vue   | 6 ++++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/pages/Customer/components/CustomerAddressCreate.vue b/src/pages/Customer/components/CustomerAddressCreate.vue
index 7826c3579..659114744 100644
--- a/src/pages/Customer/components/CustomerAddressCreate.vue
+++ b/src/pages/Customer/components/CustomerAddressCreate.vue
@@ -134,6 +134,7 @@ function handleLocation(data, location) {
                     option-label="fiscalName"
                     option-value="id"
                     v-model="data.customsAgentFk"
+                    :tooltip="t('Create a new expense')"
                 >
                     <template #form>
                         <CustomerNewCustomsAgent @on-data-saved="refreshData()" />
diff --git a/src/pages/Customer/components/CustomerAddressEdit.vue b/src/pages/Customer/components/CustomerAddressEdit.vue
index 82a190ae1..606867388 100644
--- a/src/pages/Customer/components/CustomerAddressEdit.vue
+++ b/src/pages/Customer/components/CustomerAddressEdit.vue
@@ -11,7 +11,7 @@ import VnRow from 'components/ui/VnRow.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
 import VnSelectDialog from 'src/components/common/VnSelectDialog.vue';
-import CustomsNewCustomsAgent from 'src/pages/Customer/components/CustomerNewCustomsAgent.vue';
+import CustomerNewCustomsAgent from 'src/pages/Customer/components/CustomerNewCustomsAgent.vue';
 
 const { t } = useI18n();
 const route = useRoute();
@@ -226,9 +226,10 @@ function handleLocation(data, location) {
                         option-label="fiscalName"
                         option-value="id"
                         v-model="data.customsAgentFk"
+                        :tooltip="t('New customs agent')"
                     >
                         <template #form>
-                            <CustomsNewCustomsAgent />
+                            <CustomerNewCustomsAgent />
                         </template>
                     </VnSelectDialog>
                 </div>
@@ -309,6 +310,7 @@ es:
     Mobile: Movíl
     Incoterms: Incoterms
     Customs agent: Agente de aduanas
+    New customs agent: Nuevo agente de aduanas
     Notes: Notas
     Observation type: Tipo de observación
     Description: Descripción

From d81d562edf153aace8e73d847542e0aa131f46c5 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Sat, 21 Sep 2024 01:30:37 +0200
Subject: [PATCH 148/228] feat: goToSupplier

---
 src/pages/Customer/Card/CustomerDescriptor.vue | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/src/pages/Customer/Card/CustomerDescriptor.vue b/src/pages/Customer/Card/CustomerDescriptor.vue
index b18f90d20..43103bd68 100644
--- a/src/pages/Customer/Card/CustomerDescriptor.vue
+++ b/src/pages/Customer/Card/CustomerDescriptor.vue
@@ -190,6 +190,18 @@ const setData = (entity) => (data.value = useCardDescription(entity?.name, entit
                 >
                     <QTooltip>{{ t('Go to user') }}</QTooltip>
                 </QBtn>
+                <QBtn
+                    v-if="entity.supplier"
+                    :to="{
+                        name: 'SupplierSummary',
+                        params: { id: entity.supplier.id },
+                    }"
+                    size="md"
+                    icon="vn:supplier"
+                    color="primary"
+                >
+                    <QTooltip>{{ t('Go to supplier') }}</QTooltip>
+                </QBtn>
             </QCardActions>
         </template>
     </CardDescriptor>
@@ -204,6 +216,7 @@ es:
     Customer ticket list: Listado de tickets del cliente
     Customer invoice out list: Listado de facturas del cliente
     Go to user: Ir al usuario
+    Go to supplier: Ir al proveedor
     Customer unpaid: Cliente impago
     Unpaid: Impagado
     unpaidDated: 'Fecha {dated}'

From 8bbea9c90355695acbf5b9f8fd365a51722fa376 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 23 Sep 2024 09:47:54 +0200
Subject: [PATCH 149/228] feat: change order

---
 src/pages/Customer/Card/CustomerFiscalData.vue | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/pages/Customer/Card/CustomerFiscalData.vue b/src/pages/Customer/Card/CustomerFiscalData.vue
index d8c07a46f..3a62fd954 100644
--- a/src/pages/Customer/Card/CustomerFiscalData.vue
+++ b/src/pages/Customer/Card/CustomerFiscalData.vue
@@ -122,6 +122,13 @@ function handleLocation(data, location) {
                 />
             </VnRow>
 
+            <VnRow>
+                <QCheckbox
+                    :label="t('Electronic invoice')"
+                    v-model="data.hasElectronicInvoice"
+                />
+                <QCheckbox :label="t('Daily invoice')" v-model="data.hasDailyInvoice" />
+            </VnRow>
             <VnRow>
                 <div>
                     <QCheckbox
@@ -136,14 +143,6 @@ function handleLocation(data, location) {
                 </div>
                 <QCheckbox :label="t('Verified data')" v-model="data.isTaxDataChecked" />
             </VnRow>
-
-            <VnRow>
-                <QCheckbox
-                    :label="t('Electronic invoice')"
-                    v-model="data.hasElectronicInvoice"
-                />
-                <QCheckbox :label="t('Daily invoice')" v-model="data.hasDailyInvoice" />
-            </VnRow>
         </template>
     </FormModel>
 </template>

From 17bb144bce5087508a6f4612836b445f09390f9d Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Mon, 23 Sep 2024 10:04:45 +0200
Subject: [PATCH 150/228] fix: refs #7404 translates and some minor style fixes

---
 src/i18n/locale/es.yml                        |   1 +
 src/pages/Entry/EntryStockBought.vue          | 108 +++++++++---------
 src/pages/Entry/EntryStockBoughtDetail.vue    |  23 +++-
 .../integration/entry/stockBought.spec.js     |   2 -
 4 files changed, 75 insertions(+), 59 deletions(-)

diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index 53b487e9f..423775658 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -162,6 +162,7 @@ globals:
         dms: Gestión documental
         entryCreate: Nueva entrada
         latestBuys: Últimas compras
+        reserves: Reservas
         tickets: Tickets
         ticketCreate: Nuevo ticket
         boxing: Encajado
diff --git a/src/pages/Entry/EntryStockBought.vue b/src/pages/Entry/EntryStockBought.vue
index 5b4d43e06..5027ad511 100644
--- a/src/pages/Entry/EntryStockBought.vue
+++ b/src/pages/Entry/EntryStockBought.vue
@@ -54,7 +54,6 @@ const columns = [
         create: true,
         component: 'number',
         summation: true,
-        cardVisible: true,
     },
     {
         align: 'left',
@@ -101,14 +100,9 @@ const travel = ref(null);
 const userParams = ref({
     dated: Date.vnNew(),
 });
+
 const filter = ref({
-    where: {
-        shipped: (userParams.value.dated
-            ? new Date(userParams.value.dated)
-            : Date.vnNew()
-        ).setHours(0, 0, 0, 0),
-        m3: { neq: null },
-    },
+    fields: ['id', 'm3', 'warehouseInFk'],
     include: [
         {
             relation: 'warehouseIn',
@@ -117,6 +111,13 @@ const filter = ref({
             },
         },
     ],
+    where: {
+        shipped: (userParams.value.dated
+            ? new Date(userParams.value.dated)
+            : Date.vnNew()
+        ).setHours(0, 0, 0, 0),
+        m3: { neq: null },
+    },
 });
 
 const setUserParams = async ({ dated }) => {
@@ -139,7 +140,7 @@ function openDialog() {
                 :filter="filter"
                 @on-fetch="
                     (data) => {
-                        travel = data.filter((data) => data.warehouseIn.code === 'VNH');
+                        travel = data.find((data) => data.warehouseIn.code === 'VNH');
                     }
                 "
             />
@@ -149,10 +150,10 @@ function openDialog() {
                         {{ t('Booked trucks') }}:
                     </span>
                     <span>
-                        {{ travel[0]?.m3 }}
+                        {{ travel?.m3 }}
                     </span>
                     <QBtn
-                        v-if="travel[0]?.m3"
+                        v-if="travel?.m3"
                         style="max-width: 20%"
                         flat
                         icon="edit"
@@ -166,10 +167,10 @@ function openDialog() {
     </VnSubToolbar>
     <QDialog v-model="travelDialogRef" :maximized="true" :class="['vn-row', 'wrap']">
         <FormModelPopup
-            :url-update="`Travels/${travel[0].id}`"
+            :url-update="`Travels/${travel?.id}`"
             model="travel"
             :title="t('Travel m3')"
-            :form-initial-data="{ id: travel[0].id, m3: travel[0].m3 }"
+            :form-initial-data="{ id: travel?.id, m3: travel?.m3 }"
             @on-data-saved="fetchDataRef.fetch()"
         >
             <template #form-inputs="{ data }">
@@ -192,51 +193,56 @@ function openDialog() {
             />
         </template>
     </RightMenu>
-    <QPage class="column items-center q-pa-md">
-        <VnTable
-            ref="tableRef"
-            data-key="StockBoughts"
-            url="StockBoughts/getStockBought"
-            save-url="StockBoughts/crud"
-            order="reserve DESC"
-            :right-search="false"
-            :is-editable="true"
-            :create="{
-                urlCreate: 'StockBoughts',
-                title: t('Reserve some space'),
-                onDataSaved: () => tableRef.reload(),
-                formInitialData: {
-                    workerFk: user.id,
-                    dated: Date.vnNow(),
-                },
-            }"
-            :columns="columns"
-            :user-params="userParams"
-            :footer="true"
-            auto-load
-        >
-            <template #column-workerFk="{ row }">
-                <span class="link" @click.stop>
-                    {{ row?.worker?.user?.name }}
-                    <WorkerDescriptorProxy :id="row?.workerFk" />
-                </span>
-            </template>
-        </VnTable>
-    </QPage>
+    <div class="table-container">
+        <QPage class="column items-center q-pa-md">
+            <VnTable
+                ref="tableRef"
+                data-key="StockBoughts"
+                url="StockBoughts/getStockBought"
+                save-url="StockBoughts/crud"
+                order="reserve DESC"
+                :right-search="false"
+                :is-editable="true"
+                :create="{
+                    urlCreate: 'StockBoughts',
+                    title: t('Reserve some space'),
+                    onDataSaved: () => tableRef.reload(),
+                    formInitialData: {
+                        workerFk: user.id,
+                        dated: Date.vnNow(),
+                    },
+                }"
+                :columns="columns"
+                :user-params="userParams"
+                :footer="true"
+                auto-load
+            >
+                <template #column-workerFk="{ row }">
+                    <span class="link" @click.stop>
+                        {{ row?.worker?.user?.name }}
+                        <WorkerDescriptorProxy :id="row?.workerFk" />
+                    </span>
+                </template>
+            </VnTable>
+        </QPage>
+    </div>
 </template>
 <style lang="css" scoped>
 .travel {
     margin-bottom: 0px;
 }
+.table-container {
+    display: flex;
+    justify-content: center;
+}
+.column {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    width: 40%;
+}
 </style>
 <i18n>
-    en:
-        Buyer: Buyer
-        Reserve: Reserve
-        Bought: Bought
-        More: More
-        Date: Date
-        This buyer has already made a reservation for this date: This buyer has already made a reservation for this date
     es:
         Edit travel: Editar envío
         Travel: Envíos
diff --git a/src/pages/Entry/EntryStockBoughtDetail.vue b/src/pages/Entry/EntryStockBoughtDetail.vue
index 744b9d3fe..9489c2362 100644
--- a/src/pages/Entry/EntryStockBoughtDetail.vue
+++ b/src/pages/Entry/EntryStockBoughtDetail.vue
@@ -22,7 +22,7 @@ const customUrl = `StockBoughts/getStockBoughtDetail?workerFk=${$props.workerFk}
 const columns = [
     {
         align: 'left',
-        label: 'Entry',
+        label: t('Entry'),
         name: 'entryFk',
         isTitle: true,
         isId: true,
@@ -41,24 +41,28 @@ const columns = [
         create: true,
         columnClass: 'expand',
         columnFilter: false,
+        cardVisible: true,
     },
     {
         align: 'left',
         name: 'volume',
         label: t('Volume'),
         columnFilter: false,
+        cardVisible: true,
     },
     {
         align: 'left',
         label: t('Packaging'),
         name: 'packagingFk',
         columnFilter: false,
+        cardVisible: true,
     },
     {
         align: 'left',
         label: 'Packing',
         name: 'packing',
         columnFilter: false,
+        cardVisible: true,
     },
 ];
 </script>
@@ -73,18 +77,20 @@ const columns = [
                 :columns="columns"
                 :right-search="false"
                 :disable-infinite-scroll="true"
-                :disable-option="{ card: true }"
                 :limit="0"
                 auto-load
             >
+                <template #top-left>
+                    <QBtn flat icon="Close" v-close-popup />
+                </template>
                 <template #column-entryFk="{ row }">
-                    <span class="link" @click.stop>
+                    <span class="link">
                         {{ row?.entryFk }}
                         <EntryDescriptorProxy :id="row.entryFk" />
                     </span>
                 </template>
                 <template #column-itemName="{ row }">
-                    <span class="link" @click.stop>
+                    <span class="link">
                         {{ row?.itemName }}
                         <ItemDescriptorProxy :id="row.itemFk" />
                     </span>
@@ -93,8 +99,8 @@ const columns = [
         </div>
     </QDialog>
 </template>
-<style lang="css">
-.q-dialog__inner {
+<style lang="css" scoped>
+.container {
     max-width: 50vw;
     overflow: auto;
     display: flex;
@@ -110,4 +116,9 @@ const columns = [
         Bought: Comprado
         More: Más
         Date: Fecha
+        Entry: Entrada
+        Item: Artículo
+        Name: Nombre
+        Volume: Volumen
+        Packaging: Embalage 
 </i18n>
diff --git a/test/cypress/integration/entry/stockBought.spec.js b/test/cypress/integration/entry/stockBought.spec.js
index b93afa520..66e06b79e 100644
--- a/test/cypress/integration/entry/stockBought.spec.js
+++ b/test/cypress/integration/entry/stockBought.spec.js
@@ -6,7 +6,6 @@ describe('EntryStockBought', () => {
     });
     it('Should edit the reserved space', () => {
         cy.get('.q-field__native.q-placeholder').should('have.value', '01/01/2001');
-        cy.get('tBody > tr').its('length').should('eq', 2);
         cy.get('input[name="reserve"]').type('10{enter}');
         cy.get('button[title="Save"]').click();
         cy.get('.q-notification__message').should('have.text', 'Data saved');
@@ -18,7 +17,6 @@ describe('EntryStockBought', () => {
         cy.get('input[aria-label="Date"]').eq(1).type('01-01');
         cy.get('input[aria-label="Buyer"]').type('buyerboss{downarrow}{enter}');
         cy.get('.q-notification__message').should('have.text', 'Data created');
-        cy.get('tBody > tr').its('length').should('eq', 3);
     });
     it('Should check detail for the buyer', () => {
         cy.get(':nth-child(1) > .sticky > .q-btn > .q-btn__content > .q-icon').click();

From 88fd40eae619a06a213e8b47fb76555f88333e83 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 23 Sep 2024 11:05:58 +0200
Subject: [PATCH 151/228] feat: minor changes

---
 .../Customer/Card/CustomerFiscalData.vue      | 19 +++++++++++--------
 src/pages/Customer/locale/es.yml              |  2 +-
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/src/pages/Customer/Card/CustomerFiscalData.vue b/src/pages/Customer/Card/CustomerFiscalData.vue
index 3a62fd954..300d275c0 100644
--- a/src/pages/Customer/Card/CustomerFiscalData.vue
+++ b/src/pages/Customer/Card/CustomerFiscalData.vue
@@ -122,13 +122,6 @@ function handleLocation(data, location) {
                 />
             </VnRow>
 
-            <VnRow>
-                <QCheckbox
-                    :label="t('Electronic invoice')"
-                    v-model="data.hasElectronicInvoice"
-                />
-                <QCheckbox :label="t('Daily invoice')" v-model="data.hasDailyInvoice" />
-            </VnRow>
             <VnRow>
                 <div>
                     <QCheckbox
@@ -141,7 +134,17 @@ function handleLocation(data, location) {
                         </QTooltip>
                     </QIcon>
                 </div>
-                <QCheckbox :label="t('Verified data')" v-model="data.isTaxDataChecked" />
+                <QCheckbox :label="t('Daily invoice')" v-model="data.hasDailyInvoice" />
+            </VnRow>
+
+            <VnRow>
+                <QCheckbox
+                    :label="t('Electronic invoice')"
+                    v-model="data.hasElectronicInvoice"
+                /><QCheckbox
+                    :label="t('Verified data')"
+                    v-model="data.isTaxDataChecked"
+                />
             </VnRow>
         </template>
     </FormModel>
diff --git a/src/pages/Customer/locale/es.yml b/src/pages/Customer/locale/es.yml
index 4fcbe3fa2..451784425 100644
--- a/src/pages/Customer/locale/es.yml
+++ b/src/pages/Customer/locale/es.yml
@@ -58,7 +58,7 @@ customer:
         vies: VIES
         payMethod: Método de pago
         bankAccount: Cuenta bancaria
-        dueDay: Día de pago
+        dueDay: Vencimiento
         hasLcr: Recibido LCR
         hasCoreVnl: Recibido core VNL
         hasB2BVnl: Recibido B2B VNL

From 66cb06910911ea3ae60ee6208a88e0bb23114fa1 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 23 Sep 2024 11:06:08 +0200
Subject: [PATCH 152/228] perf: CustomerBalance

---
 src/composables/usePrintService.js          |  5 +-
 src/pages/Customer/Card/CustomerBalance.vue | 55 ++++++++-------------
 2 files changed, 25 insertions(+), 35 deletions(-)

diff --git a/src/composables/usePrintService.js b/src/composables/usePrintService.js
index 68a009d7b..c6c212ad8 100644
--- a/src/composables/usePrintService.js
+++ b/src/composables/usePrintService.js
@@ -1,15 +1,18 @@
 import { useSession } from './useSession';
 import axios from 'axios';
 import { useQuasar } from 'quasar';
+import { useI18n } from 'vue-i18n';
 
 export function usePrintService() {
     const quasar = useQuasar();
+    const { t } = useI18n();
+
     const { getTokenMultimedia } = useSession();
 
     function sendEmail(path, params) {
         return axios.post(path, params).then(() =>
             quasar.notify({
-                message: 'Notification sent',
+                message: t('globals.notificationSent'),
                 type: 'positive',
                 icon: 'check',
             })
diff --git a/src/pages/Customer/Card/CustomerBalance.vue b/src/pages/Customer/Card/CustomerBalance.vue
index 2a1991bbd..f148194f8 100644
--- a/src/pages/Customer/Card/CustomerBalance.vue
+++ b/src/pages/Customer/Card/CustomerBalance.vue
@@ -16,7 +16,7 @@ import { useVnConfirm } from 'composables/useVnConfirm';
 import VnTable from 'components/VnTable/VnTable.vue';
 import VnInput from 'components/common/VnInput.vue';
 import VnSubToolbar from 'components/ui/VnSubToolbar.vue';
-import VnFilter from 'components/VnTable/VnFilter.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
 
 import CustomerNewPayment from 'src/pages/Customer/components/CustomerNewPayment.vue';
 import InvoiceOutDescriptorProxy from 'src/pages/InvoiceOut/Card/InvoiceOutDescriptorProxy.vue';
@@ -33,9 +33,9 @@ const stateStore = useStateStore();
 const user = state.getUser();
 
 const clientRisk = ref([]);
+const companies = ref([]);
 const tableRef = ref();
 const companyId = ref(user.value.companyFk);
-const companyLastId = ref(user.value.companyFk);
 const balances = ref([]);
 const vnFilterRef = ref({});
 const filter = computed(() => {
@@ -45,33 +45,6 @@ const filter = computed(() => {
     };
 });
 
-const companyFilterColumn = {
-    align: 'left',
-    name: 'companyId',
-    label: t('Company'),
-    component: 'select',
-    attrs: {
-        url: 'Companies',
-        optionLabel: 'code',
-        sortBy: 'code',
-        limit: 0,
-    },
-    columnFilter: {
-        event: {
-            remove: () => (companyId.value = null),
-            'update:modelValue': (newCompanyFk) => {
-                if (!newCompanyFk) return;
-                vnFilterRef.value.addFilter(newCompanyFk);
-                companyLastId.value = newCompanyFk;
-            },
-            blur: () =>
-                !companyId.value &&
-                (companyId.value = companyLastId.value ?? user.value.companyFk),
-        },
-    },
-    visible: false,
-};
-
 const columns = computed(() => [
     {
         align: 'right',
@@ -166,6 +139,11 @@ onBeforeMount(() => {
 });
 
 async function getCurrentBalance(data) {
+    currentBalance.value[companyId.value] = {
+        amount: 0,
+        code: companies.value.find((c) => c.id === companyId.value)?.code,
+    };
+
     for (const balance of data) {
         currentBalance.value[balance.companyFk] = {
             code: balance.company.code,
@@ -192,14 +170,21 @@ const showBalancePdf = ({ id }) => {
 
 <template>
     <FetchData
+        url="Companies"
+        auto-load
+        @on-fetch="(data) => (companies = data)"
+    ></FetchData>
+    <FetchData
+        v-if="companies.length > 0"
         url="clientRisks"
         :filter="{
             include: { relation: 'company', scope: { fields: ['code'] } },
-            where: { clientFk: route.params.id, companyFk: companyId },
+            where: { clientFk: route.params.id },
         }"
         auto-load
         @on-fetch="getCurrentBalance"
     ></FetchData>
+
     <VnSubToolbar class="q-mb-md">
         <template #st-data>
             <div class="column justify-center q-px-md q-py-sm">
@@ -212,13 +197,15 @@ const showBalancePdf = ({ id }) => {
         </template>
         <template #st-actions>
             <div>
-                <VnFilter
+                <VnSelect
+                    :label="t('Company')"
                     ref="vnFilterRef"
                     v-model="companyId"
                     data-key="CustomerBalance"
-                    :column="companyFilterColumn"
-                    search-url="balance"
-                />
+                    :options="companies"
+                    option-label="code"
+                    option-value="id"
+                ></VnSelect>
             </div>
         </template>
     </VnSubToolbar>

From 951b8fc1fa8f011c6d4a0ce3b31088eff93bfc43 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Mon, 23 Sep 2024 11:15:11 +0200
Subject: [PATCH 153/228] warmFix: e2e claimDevelopment

---
 test/cypress/integration/claim/claimDevelopment.spec.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/cypress/integration/claim/claimDevelopment.spec.js b/test/cypress/integration/claim/claimDevelopment.spec.js
index 3b73a24d9..81fc33ecd 100755
--- a/test/cypress/integration/claim/claimDevelopment.spec.js
+++ b/test/cypress/integration/claim/claimDevelopment.spec.js
@@ -37,7 +37,7 @@ describe('ClaimDevelopment', () => {
         cy.wait(['@workers', '@workers']);
         cy.addCard();
 
-        cy.get(thirdRow).should('exist');
+        cy.waitForElement(thirdRow);
 
         const rowData = [
             false,

From 29cc14673aaa90769af9ee3e14f7873fafe55e86 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Mon, 23 Sep 2024 11:15:17 +0200
Subject: [PATCH 154/228] warmFix: e2e claimDevelopment

---
 test/cypress/support/commands.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/cypress/support/commands.js b/test/cypress/support/commands.js
index a9a405313..43788f59f 100755
--- a/test/cypress/support/commands.js
+++ b/test/cypress/support/commands.js
@@ -140,6 +140,7 @@ Cypress.Commands.add('removeCard', () => {
 });
 Cypress.Commands.add('addCard', () => {
     cy.waitForElement('tbody');
+    cy.waitForElement('.q-page-sticky > div > .q-btn');
     cy.get('.q-page-sticky > div > .q-btn').click();
 });
 Cypress.Commands.add('clickConfirm', () => {

From a52cdf8f949af83b8856a1c6f36b755f117f0fb8 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 23 Sep 2024 10:25:11 +0000
Subject: [PATCH 155/228] fix: i18n en preparation label

---
 src/pages/Ticket/locale/en.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/pages/Ticket/locale/en.yml b/src/pages/Ticket/locale/en.yml
index 305228669..06699e00b 100644
--- a/src/pages/Ticket/locale/en.yml
+++ b/src/pages/Ticket/locale/en.yml
@@ -39,6 +39,7 @@ ticketSale:
     agency: Agency
     address: Address
 advanceTickets:
+    preparation: Preparation
     origin: Origin
     destination: Destination
     originAgency: 'Origin agency: {agency}'

From 279a100f8b1bfeb1ed76cd784faec709bde5878c Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 23 Sep 2024 10:25:44 +0000
Subject: [PATCH 156/228] fix: i18n en preparation label

---
 src/pages/Ticket/locale/es.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/pages/Ticket/locale/es.yml b/src/pages/Ticket/locale/es.yml
index 30c5550be..efd7177e9 100644
--- a/src/pages/Ticket/locale/es.yml
+++ b/src/pages/Ticket/locale/es.yml
@@ -86,6 +86,7 @@ weeklyTickets:
     search: Buscar por tickets programados
     searchInfo: Buscar tickets programados por el identificador o el identificador del cliente
 advanceTickets:
+    preparation: Preparation    
     origin: Origen
     destination: Destinatario
     originAgency: 'Agencia origen: {agency}'

From e700f6f4a8cb71c22216fdd11e1a409ea1dbdb37 Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Mon, 23 Sep 2024 13:14:25 +0200
Subject: [PATCH 157/228] feat: refs #7404 style dynamic text color

---
 src/components/VnTable/VnTable.vue         | 16 ++------
 src/components/ui/VnPaginate.vue           |  5 +--
 src/css/quasar.variables.scss              |  1 -
 src/pages/Entry/Card/EntrySummary.vue      | 26 ++++++------
 src/pages/Entry/EntryLatestBuys.vue        | 15 +++----
 src/pages/Entry/EntryLatestBuysFilter.vue  |  2 +
 src/pages/Entry/EntryStockBought.vue       | 46 +++++++++++++++++++++-
 src/pages/Entry/EntryStockBoughtDetail.vue | 10 ++++-
 8 files changed, 83 insertions(+), 38 deletions(-)

diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index a3b64d264..621e2acfc 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -639,18 +639,10 @@ function handleOnDataSaved(_) {
                             :key="col?.id"
                             class="text-center"
                         >
-                            <div
-                                v-if="col?.summation"
-                                :class="`text-${col?.align ?? 'left'}`"
-                                class="text-bold q-pa-sm"
-                            >
-                                {{
-                                    rows.reduce(
-                                        (sum, currentRow) => sum + currentRow[col.name],
-                                        0
-                                    )
-                                }}
-                            </div>
+                            <slot
+                                :name="`column-footer-${col.name}`"
+                                :class="getColAlign(col)"
+                            />
                         </QTh>
                     </QTr>
                 </template>
diff --git a/src/components/ui/VnPaginate.vue b/src/components/ui/VnPaginate.vue
index 79a79c383..37101dafe 100644
--- a/src/components/ui/VnPaginate.vue
+++ b/src/components/ui/VnPaginate.vue
@@ -131,9 +131,8 @@ async function fetch(params) {
     useArrayData(props.dataKey, params);
     arrayData.reset(['filter.skip', 'skip']);
     await arrayData.fetch({ append: false });
-    if (!store.hasMoreData) {
-        isLoading.value = false;
-    }
+    if (!store.hasMoreData) isLoading.value = false;
+
     emit('onFetch', store.data);
     return store.data;
 }
diff --git a/src/css/quasar.variables.scss b/src/css/quasar.variables.scss
index aeac483be..9f7c62848 100644
--- a/src/css/quasar.variables.scss
+++ b/src/css/quasar.variables.scss
@@ -36,7 +36,6 @@ $color-font-secondary: #777;
 .bg-success {
     background-color: $positive;
 }
-
 .bg-notice {
     background-color: $info;
 }
diff --git a/src/pages/Entry/Card/EntrySummary.vue b/src/pages/Entry/Card/EntrySummary.vue
index 379be1d2f..58a5c2e1b 100644
--- a/src/pages/Entry/Card/EntrySummary.vue
+++ b/src/pages/Entry/Card/EntrySummary.vue
@@ -10,6 +10,7 @@ import TravelDescriptorProxy from 'src/pages/Travel/Card/TravelDescriptorProxy.v
 import { toDate, toCurrency } from 'src/filters';
 import { getUrl } from 'src/composables/getUrl';
 import axios from 'axios';
+import FetchedTags from 'src/components/ui/FetchedTags.vue';
 
 const route = useRoute();
 const { t } = useI18n();
@@ -163,7 +164,7 @@ const fetchEntryBuys = async () => {
     >
         <template #header-left>
             <router-link
-                v-if="route.name !== 'EntrySummary'"
+                v-if="route?.name !== 'EntrySummary'"
                 :to="{ name: 'EntrySummary', params: { id: entityId } }"
                 class="header link"
                 :href="entryUrl"
@@ -184,7 +185,10 @@ const fetchEntryBuys = async () => {
                     <QIcon name="open_in_new" />
                 </router-link>
                 <VnLv :label="t('entry.summary.commission')" :value="entry.commission" />
-                <VnLv :label="t('entry.summary.currency')" :value="entry.currency.name" />
+                <VnLv
+                    :label="t('entry.summary.currency')"
+                    :value="entry.currency?.name"
+                />
                 <VnLv :label="t('entry.summary.company')" :value="entry.company.code" />
                 <VnLv :label="t('entry.summary.reference')" :value="entry.reference" />
                 <VnLv
@@ -210,12 +214,12 @@ const fetchEntryBuys = async () => {
                 </VnLv>
                 <VnLv
                     :label="t('entry.summary.travelAgency')"
-                    :value="entry.travel.agency.name"
+                    :value="entry.travel.agency?.name"
                 />
                 <VnLv :label="t('shipped')" :value="toDate(entry.travel.shipped)" />
                 <VnLv
                     :label="t('entry.summary.travelWarehouseOut')"
-                    :value="entry.travel.warehouseOut.name"
+                    :value="entry.travel.warehouseOut?.name"
                 />
                 <QCheckbox
                     :label="t('entry.summary.travelDelivered')"
@@ -225,7 +229,7 @@ const fetchEntryBuys = async () => {
                 <VnLv :label="t('landed')" :value="toDate(entry.travel.landed)" />
                 <VnLv
                     :label="t('entry.summary.travelWarehouseIn')"
-                    :value="entry.travel.warehouseIn.name"
+                    :value="entry.travel.warehouseIn?.name"
                 />
                 <QCheckbox
                     :label="t('entry.summary.travelReceived')"
@@ -281,17 +285,17 @@ const fetchEntryBuys = async () => {
                 >
                     <template #body="{ cols, row, rowIndex }">
                         <QTr no-hover>
-                            <QTd v-for="col in cols" :key="col.name">
+                            <QTd v-for="col in cols" :key="col?.name">
                                 <component
-                                    :is="tableColumnComponents[col.name].component(props)"
-                                    v-bind="tableColumnComponents[col.name].props(props)"
-                                    @click="tableColumnComponents[col.name].event(props)"
+                                    :is="tableColumnComponents[col?.name].component()"
+                                    v-bind="tableColumnComponents[col?.name].props()"
+                                    @click="tableColumnComponents[col?.name].event()"
                                     class="col-content"
                                 >
                                     <template
                                         v-if="
-                                            col.name !== 'observation' &&
-                                            col.name !== 'isConfirmed'
+                                            col?.name !== 'observation' &&
+                                            col?.name !== 'isConfirmed'
                                         "
                                         >{{ col.value }}</template
                                     >
diff --git a/src/pages/Entry/EntryLatestBuys.vue b/src/pages/Entry/EntryLatestBuys.vue
index 7c4354b65..61c430b23 100644
--- a/src/pages/Entry/EntryLatestBuys.vue
+++ b/src/pages/Entry/EntryLatestBuys.vue
@@ -1,16 +1,17 @@
 <script setup>
 import { onMounted, onUnmounted, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
-import RightMenu from 'src/components/common/RightMenu.vue';
-import VnTable from 'components/VnTable/VnTable.vue';
-import EntryLatestBuysFilter from './EntryLatestBuysFilter.vue';
 import { useStateStore } from 'stores/useStateStore';
+import { toDate } from 'src/filters';
+
+import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
+import RightMenu from 'src/components/common/RightMenu.vue';
+import EntryLatestBuysFilter from './EntryLatestBuysFilter.vue';
+import VnTable from 'components/VnTable/VnTable.vue';
+import VnImg from 'src/components/ui/VnImg.vue';
+
 const stateStore = useStateStore();
 const { t } = useI18n();
-import { toDate } from 'src/filters';
-import VnImg from 'src/components/ui/VnImg.vue';
-import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
-
 const columns = [
     {
         align: 'center',
diff --git a/src/pages/Entry/EntryLatestBuysFilter.vue b/src/pages/Entry/EntryLatestBuysFilter.vue
index f147a3c6f..83124c1bf 100644
--- a/src/pages/Entry/EntryLatestBuysFilter.vue
+++ b/src/pages/Entry/EntryLatestBuysFilter.vue
@@ -4,6 +4,7 @@ import { useI18n } from 'vue-i18n';
 
 import FetchData from 'components/FetchData.vue';
 import VnInputDate from 'src/components/common/VnInputDate.vue';
+import VnInput from 'components/common/VnInput.vue';
 import VnSelect from 'components/common/VnSelect.vue';
 import ItemsFilterPanel from 'src/components/ItemsFilterPanel.vue';
 
@@ -18,6 +19,7 @@ defineProps({
 
 const itemTypeWorkersOptions = ref([]);
 const suppliersOptions = ref([]);
+const tagValues = ref([]);
 </script>
 
 <template>
diff --git a/src/pages/Entry/EntryStockBought.vue b/src/pages/Entry/EntryStockBought.vue
index 5027ad511..fa4b1e6b6 100644
--- a/src/pages/Entry/EntryStockBought.vue
+++ b/src/pages/Entry/EntryStockBought.vue
@@ -56,7 +56,7 @@ const columns = [
         summation: true,
     },
     {
-        align: 'left',
+        align: 'center',
         label: t('Bought'),
         name: 'bought',
         summation: true,
@@ -129,6 +129,18 @@ const setUserParams = async ({ dated }) => {
 function openDialog() {
     travelDialogRef.value = true;
 }
+
+function setFooter(data) {
+    const footer = {
+        bought: 0,
+        reserve: 0,
+    };
+    data.forEach((row) => {
+        footer.bought += row?.bought;
+        footer.reserve += row?.reserve;
+    });
+    tableRef.value.footer = footer;
+}
 </script>
 <template>
     <VnSubToolbar>
@@ -203,6 +215,7 @@ function openDialog() {
                 order="reserve DESC"
                 :right-search="false"
                 :is-editable="true"
+                @on-fetch="(data) => setFooter(data)"
                 :create="{
                     urlCreate: 'StockBoughts',
                     title: t('Reserve some space'),
@@ -223,11 +236,31 @@ function openDialog() {
                         <WorkerDescriptorProxy :id="row?.workerFk" />
                     </span>
                 </template>
+                <template #column-bought="{ row }">
+                    <span :class="{ 'text-negative': row.reserve < row.bought }">
+                        {{ row?.bought }}
+                    </span>
+                </template>
+                <template #column-footer-reserve>
+                    <span>
+                        {{ tableRef.footer.reserve }}
+                    </span>
+                </template>
+                <template #column-footer-bought>
+                    <span
+                        :class="{
+                            'text-negative':
+                                tableRef.footer.reserve < tableRef.footer.bought,
+                        }"
+                    >
+                        {{ tableRef.footer.bought }}
+                    </span>
+                </template>
             </VnTable>
         </QPage>
     </div>
 </template>
-<style lang="css" scoped>
+<style lang="scss" scoped>
 .travel {
     margin-bottom: 0px;
 }
@@ -241,6 +274,15 @@ function openDialog() {
     align-items: center;
     width: 40%;
 }
+.text-negative {
+    color: $negative !important;
+}
+.input-container {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    height: 100%;
+}
 </style>
 <i18n>
     es:
diff --git a/src/pages/Entry/EntryStockBoughtDetail.vue b/src/pages/Entry/EntryStockBoughtDetail.vue
index 9489c2362..cdcd28381 100644
--- a/src/pages/Entry/EntryStockBoughtDetail.vue
+++ b/src/pages/Entry/EntryStockBoughtDetail.vue
@@ -81,7 +81,13 @@ const columns = [
                 auto-load
             >
                 <template #top-left>
-                    <QBtn flat icon="Close" v-close-popup />
+                    <QBtn
+                        flat
+                        icon="Close"
+                        color="primary"
+                        class="bg-vn-section-color q-pa-xs"
+                        v-close-popup
+                    />
                 </template>
                 <template #column-entryFk="{ row }">
                     <span class="link">
@@ -103,10 +109,10 @@ const columns = [
 .container {
     max-width: 50vw;
     overflow: auto;
-    display: flex;
     justify-content: center;
     align-items: center;
     margin: auto;
+    background-color: var(--vn-section-color);
 }
 </style>
 <i18n>

From b04564d5a81c1d686e641210f2c7f420ac9b6b15 Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Mon, 23 Sep 2024 13:23:25 +0200
Subject: [PATCH 158/228] fix: refs #7404 style non center pop up

---
 src/components/VnTable/VnTable.vue         | 4 ----
 src/pages/Entry/EntryStockBought.vue       | 6 ------
 src/pages/Entry/EntryStockBoughtDetail.vue | 3 +--
 3 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index 621e2acfc..0f7dd3a02 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -727,10 +727,6 @@ es:
     border-color: var(--vn-section-color);
 }
 
-.q-table__container > div:first-child {
-    background-color: var(--vn-page-color);
-}
-
 .grid-three {
     display: grid;
     grid-template-columns: repeat(auto-fit, minmax(400px, max-content));
diff --git a/src/pages/Entry/EntryStockBought.vue b/src/pages/Entry/EntryStockBought.vue
index fa4b1e6b6..4750a8417 100644
--- a/src/pages/Entry/EntryStockBought.vue
+++ b/src/pages/Entry/EntryStockBought.vue
@@ -277,12 +277,6 @@ function setFooter(data) {
 .text-negative {
     color: $negative !important;
 }
-.input-container {
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    height: 100%;
-}
 </style>
 <i18n>
     es:
diff --git a/src/pages/Entry/EntryStockBoughtDetail.vue b/src/pages/Entry/EntryStockBoughtDetail.vue
index cdcd28381..2c1a5a47e 100644
--- a/src/pages/Entry/EntryStockBoughtDetail.vue
+++ b/src/pages/Entry/EntryStockBoughtDetail.vue
@@ -67,7 +67,7 @@ const columns = [
 ];
 </script>
 <template>
-    <QDialog :maximized="true">
+    <QDialog>
         <div class="container">
             <VnTable
                 ref="tableRef"
@@ -112,7 +112,6 @@ const columns = [
     justify-content: center;
     align-items: center;
     margin: auto;
-    background-color: var(--vn-section-color);
 }
 </style>
 <i18n>

From 6a8ed89a71b85a42acdaef4974cd84e8fa7ae1f1 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 23 Sep 2024 11:41:30 +0000
Subject: [PATCH 159/228] fix: VnLocation test

---
 .../integration/vnComponent/vnLocation.spec.js    | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/test/cypress/integration/vnComponent/vnLocation.spec.js b/test/cypress/integration/vnComponent/vnLocation.spec.js
index 3533a3c1f..1872d3591 100644
--- a/test/cypress/integration/vnComponent/vnLocation.spec.js
+++ b/test/cypress/integration/vnComponent/vnLocation.spec.js
@@ -34,22 +34,25 @@ describe('VnLocation', () => {
             cy.visit('/#/supplier/567/fiscal-data', { timeout: 7000 });
             cy.waitForElement('.q-form');
         });
-        it('Fin by postalCode', () => {
+        it('Find by postalCode', () => {
             const postCode = '46600';
+            const postCodeLabel = '46600, Valencia(Province one), España';
             const firstOption = '[role="listbox"] .q-item:nth-child(1)';
 
             cy.get(inputLocation).click();
             cy.get(inputLocation).clear();
             cy.get(inputLocation).type(postCode);
-            cy.get(locationOptions).should('have.length.at.least', 2);
+            cy.get(locationOptions)
+                .get(':nth-child(1)')
+                .should('have.length.at.least', 2);
+            cy.get(
+                firstOption.concat(' > .q-item__section > .q-item__label--caption')
+            ).should('have.text', postCodeLabel);
             cy.get(firstOption).click();
             cy.get('.q-btn-group > .q-btn--standard > .q-btn__content > .q-icon').click();
             cy.reload();
             cy.waitForElement('.q-form');
-            cy.get(inputLocation).should(
-                'have.value',
-                '46600 - Valencia(Province one), España'
-            );
+            cy.get(inputLocation).should('have.value', postCodeLabel);
         });
 
         it('Create postCode', () => {

From 0829b6d0d298ec5d7f2dad7584c64f8c584ddcc3 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 23 Sep 2024 11:42:47 +0000
Subject: [PATCH 160/228] fix: i18n en preparation label

---
 src/pages/Ticket/locale/es.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/Ticket/locale/es.yml b/src/pages/Ticket/locale/es.yml
index efd7177e9..0a27519ad 100644
--- a/src/pages/Ticket/locale/es.yml
+++ b/src/pages/Ticket/locale/es.yml
@@ -86,7 +86,7 @@ weeklyTickets:
     search: Buscar por tickets programados
     searchInfo: Buscar tickets programados por el identificador o el identificador del cliente
 advanceTickets:
-    preparation: Preparation    
+    preparation: Preparación    
     origin: Origen
     destination: Destinatario
     originAgency: 'Agencia origen: {agency}'

From caddcf45c3b6c3efb085bf3e742debac77f440b9 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 23 Sep 2024 12:43:52 +0000
Subject: [PATCH 161/228] fix: Options VnSelect properties

---
 src/pages/Customer/Card/CustomerBasicData.vue | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/pages/Customer/Card/CustomerBasicData.vue b/src/pages/Customer/Card/CustomerBasicData.vue
index 6472a47ff..4987fc7ba 100644
--- a/src/pages/Customer/Card/CustomerBasicData.vue
+++ b/src/pages/Customer/Card/CustomerBasicData.vue
@@ -111,6 +111,8 @@ const exprBuilder = (param, value) => {
                     }"
                     :fields="['id', 'nickname']"
                     sort-by="nickname ASC"
+                    :option-label="'nickname'"
+                    :option-value="'id'"
                     :rules="validate('client.salesPersonFk')"
                     :expr-builder="exprBuilder"
                     emit-value

From ab0c38810a4bb155672bb05e5e04084279b399dc Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 23 Sep 2024 12:44:37 +0000
Subject: [PATCH 162/228] fix: Options VnSelect properties

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

diff --git a/src/pages/Customer/CustomerList.vue b/src/pages/Customer/CustomerList.vue
index 0428c0c7b..6b6a45e15 100644
--- a/src/pages/Customer/CustomerList.vue
+++ b/src/pages/Customer/CustomerList.vue
@@ -428,7 +428,9 @@ function handleLocation(data, location) {
                 :label="t('customer.basicData.salesPerson')"
                 :params="{
                     departmentCodes: ['VT', 'shopping'],
-                }"
+                }"                
+                :option-label="'nickname'"
+                :option-value="'id'"
                 :fields="['id', 'nickname']"
                 sort-by="nickname ASC"
                 emit-value

From 27a3e36b589930db022428737f9ec17f983a8171 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 23 Sep 2024 14:56:34 +0200
Subject: [PATCH 163/228] fix: comments

---
 src/pages/Customer/Card/CustomerBasicData.vue | 4 ++--
 src/pages/Customer/CustomerList.vue           | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/pages/Customer/Card/CustomerBasicData.vue b/src/pages/Customer/Card/CustomerBasicData.vue
index 4987fc7ba..79ae79ad9 100644
--- a/src/pages/Customer/Card/CustomerBasicData.vue
+++ b/src/pages/Customer/Card/CustomerBasicData.vue
@@ -111,8 +111,8 @@ const exprBuilder = (param, value) => {
                     }"
                     :fields="['id', 'nickname']"
                     sort-by="nickname ASC"
-                    :option-label="'nickname'"
-                    :option-value="'id'"
+                    option-label="nickname"
+                    option-value="id"
                     :rules="validate('client.salesPersonFk')"
                     :expr-builder="exprBuilder"
                     emit-value
diff --git a/src/pages/Customer/CustomerList.vue b/src/pages/Customer/CustomerList.vue
index 6b6a45e15..5e24a1c2d 100644
--- a/src/pages/Customer/CustomerList.vue
+++ b/src/pages/Customer/CustomerList.vue
@@ -428,9 +428,9 @@ function handleLocation(data, location) {
                 :label="t('customer.basicData.salesPerson')"
                 :params="{
                     departmentCodes: ['VT', 'shopping'],
-                }"                
-                :option-label="'nickname'"
-                :option-value="'id'"
+                }"
+                option-label="nickname"
+                option-value="id"
                 :fields="['id', 'nickname']"
                 sort-by="nickname ASC"
                 emit-value

From 3ede256dc554c7739e9cb7106f0f27d31063d48d Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 23 Sep 2024 18:30:14 +0000
Subject: [PATCH 164/228] feat: change label because its more natural

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

diff --git a/src/components/common/VnLocation.vue b/src/components/common/VnLocation.vue
index b6cbfbafd..e5ed14a40 100644
--- a/src/components/common/VnLocation.vue
+++ b/src/components/common/VnLocation.vue
@@ -14,11 +14,11 @@ const props = defineProps({
 });
 const modelValue = ref(
     props.location
-        ? `${props.location?.postcode} - ${props.location?.city}(${props.location?.province?.name}), ${props.location?.country?.name}`
+        ? `${props.location?.postcode}, ${props.location?.city}(${props.location?.province?.name}), ${props.location?.country?.name}`
         : null
 );
 function showLabel(data) {
-    return `${data.code} - ${data.town}(${data.province}), ${data.country}`;
+    return `${data.code}, ${data.town}(${data.province}), ${data.country}`;
 }
 const handleModelValue = (data) => {
     emit('update:model-value', data);

From 876078166081102fc0cfba3cd76601aee361a153 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Tue, 24 Sep 2024 08:15:44 +0200
Subject: [PATCH 165/228] fix: merge in dev

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

diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index a6948494c..a7c4e6378 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -789,11 +789,11 @@ es:
     thead tr:first-child th {
         top: 0;
     }
-    <<<<<<< HEAD .q-table__top {
+    .q-table__top {
         top: 0;
         padding: 12px 0;
     }
-    =======>>>>>>>d13cab0a240a3a10db97a793022ba0f5ded48965 tbody {
+    tbody {
         .q-checkbox {
             display: flex;
             margin-bottom: 9px;

From 2c73ce28c30cd652c2359d9146981d10985aebd1 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Tue, 24 Sep 2024 09:02:35 +0200
Subject: [PATCH 166/228] fix: fixed wagon tests

---
 .../integration/wagon/wagonCreate.spec.js     | 25 ++++++++++++++-----
 .../wagonType/wagonTypeCreate.spec.js         |  2 +-
 .../wagonType/wagonTypeEdit.spec.js           | 14 +++++------
 3 files changed, 27 insertions(+), 14 deletions(-)

diff --git a/test/cypress/integration/wagon/wagonCreate.spec.js b/test/cypress/integration/wagon/wagonCreate.spec.js
index 9aff3a819..57d0f8fec 100644
--- a/test/cypress/integration/wagon/wagonCreate.spec.js
+++ b/test/cypress/integration/wagon/wagonCreate.spec.js
@@ -11,7 +11,9 @@ describe('WagonCreate', () => {
         cy.get('input').eq(1).type('1234ABCD');
         cy.get('input').eq(2).type('100');
         cy.get('input').eq(3).click();
-        cy.get('div[role="listbox"]').find('div.q-item').click();
+        cy.get('.q-select > .q-field__inner > .q-field__control').type(
+            '{downarrow}{enter}'
+        );
 
         // Save
         cy.get('button[type="submit"]').click();
@@ -19,12 +21,23 @@ describe('WagonCreate', () => {
         // Check data has been saved successfully
         cy.waitForElement('.q-card');
 
-        cy.get('.title').should('have.text', '1234');
-        cy.get('[title-label="Plate"] > .value > span').should('have.text', '1234ABCD');
-        cy.get(':nth-child(2) > .value > span').should('have.text', '100');
-        cy.get(':nth-child(3) > .value > span').should('have.text', 'Wagon Type #1');
+        // cy.get('.cursor-text').should('have.text', '1234');
+        // cy.get(':nth-child(1) > .vn-label-value > .label > span').should(
+        //     'have.text',
+        //     '1234ABCD'
+        // );
+        // cy.get(':nth-child(2) > .vn-label-value > .label > span').should(
+        //     'have.text',
+        //     '100'
+        // );
+        // cy.get(':nth-child(3) > .vn-label-value > .label > span').should(
+        //     'have.text',
+        //     'Wagon Type #1'
+        // );
 
         // Delete wagon type created
-        cy.get('.actions > .q-btn--standard').click();
+        cy.get(
+            '[to="/null/2"] > .q-card > .column > [title="Remove"] > .q-btn__content > .q-icon'
+        ).click();
     });
 });
diff --git a/test/cypress/integration/wagonType/wagonTypeCreate.spec.js b/test/cypress/integration/wagonType/wagonTypeCreate.spec.js
index cd7ffa58f..0ad98e597 100644
--- a/test/cypress/integration/wagonType/wagonTypeCreate.spec.js
+++ b/test/cypress/integration/wagonType/wagonTypeCreate.spec.js
@@ -13,7 +13,7 @@ describe('WagonTypeCreate', () => {
     });
     it('delete a wagon type', () => {
         cy.get(
-            ':nth-child(2) > :nth-child(1) > .card-list-body > .actions > .q-btn--standard'
+            '[to="/null/2"] > .q-card > .column > [title="Remove"] > .q-btn__content > .q-icon'
         ).click();
     });
 });
diff --git a/test/cypress/integration/wagonType/wagonTypeEdit.spec.js b/test/cypress/integration/wagonType/wagonTypeEdit.spec.js
index 6e5816e51..36dd83411 100644
--- a/test/cypress/integration/wagonType/wagonTypeEdit.spec.js
+++ b/test/cypress/integration/wagonType/wagonTypeEdit.spec.js
@@ -4,7 +4,7 @@ describe('WagonTypeEdit', () => {
     beforeEach(() => {
         cy.viewport(1920, 1080);
         cy.login('developer');
-        cy.visit('/#/wagon/type/2/edit');
+        cy.visit('/#/wagon/type/1/edit');
     });
 
     it('should edit the name and the divisible field of the wagon type', () => {
@@ -14,14 +14,14 @@ describe('WagonTypeEdit', () => {
         cy.get('.q-btn--standard').click();
     });
 
-    it('should create a tray', () => {
-        cy.get('.action-button > .q-btn > .q-btn__content > .q-icon').click();
-        cy.get('input').last().type('150');
-        cy.get(trayColorRow).type('{downArrow}{downArrow}{enter}');
-    });
-
     it('should delete a tray', () => {
         cy.get('.action-button > .q-btn > .q-btn__content > .q-icon').first().click();
         cy.reload();
     });
+
+    it('should create a tray', () => {
+        cy.get('.action-button > .q-btn > .q-btn__content > .q-icon').last().click();
+        cy.get('input').last().type('150');
+        cy.get(trayColorRow).type('{downArrow}{downArrow}{downArrow}{enter}');
+    });
 });

From 768e15755fb63d645d43e123802cdbb5e0978936 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Tue, 24 Sep 2024 09:18:10 +0200
Subject: [PATCH 167/228] fix: deleted code

---
 .../integration/wagon/wagonCreate.spec.js       | 17 -----------------
 1 file changed, 17 deletions(-)

diff --git a/test/cypress/integration/wagon/wagonCreate.spec.js b/test/cypress/integration/wagon/wagonCreate.spec.js
index 57d0f8fec..881e51f42 100644
--- a/test/cypress/integration/wagon/wagonCreate.spec.js
+++ b/test/cypress/integration/wagon/wagonCreate.spec.js
@@ -18,23 +18,6 @@ describe('WagonCreate', () => {
         // Save
         cy.get('button[type="submit"]').click();
 
-        // Check data has been saved successfully
-        cy.waitForElement('.q-card');
-
-        // cy.get('.cursor-text').should('have.text', '1234');
-        // cy.get(':nth-child(1) > .vn-label-value > .label > span').should(
-        //     'have.text',
-        //     '1234ABCD'
-        // );
-        // cy.get(':nth-child(2) > .vn-label-value > .label > span').should(
-        //     'have.text',
-        //     '100'
-        // );
-        // cy.get(':nth-child(3) > .vn-label-value > .label > span').should(
-        //     'have.text',
-        //     'Wagon Type #1'
-        // );
-
         // Delete wagon type created
         cy.get(
             '[to="/null/2"] > .q-card > .column > [title="Remove"] > .q-btn__content > .q-icon'

From f2ae231efb4f032c58b284d84206dccadce97175 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Tue, 24 Sep 2024 09:35:34 +0200
Subject: [PATCH 168/228] fix: missing code

---
 .../integration/wagon/wagonCreate.spec.js        | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/test/cypress/integration/wagon/wagonCreate.spec.js b/test/cypress/integration/wagon/wagonCreate.spec.js
index 881e51f42..cd248d1bb 100644
--- a/test/cypress/integration/wagon/wagonCreate.spec.js
+++ b/test/cypress/integration/wagon/wagonCreate.spec.js
@@ -18,6 +18,22 @@ describe('WagonCreate', () => {
         // Save
         cy.get('button[type="submit"]').click();
 
+        // Check data has been saved successfully
+        cy.waitForElement('.q-card');
+
+        cy.get(
+            '[to="/null/1"] > .q-card > .no-padding > .q-py-none > .cursor-text'
+        ).should('have.text', '1234');
+        cy.get(
+            '[to="/null/1"] > .q-card > .no-padding > .q-pr-lg > :nth-child(1) > .vn-label-value > .value > :nth-child(1) > .row > span'
+        ).should('have.text', '1234ABCD');
+        cy.get(
+            '[to="/null/1"] > .q-card > .no-padding > .q-pr-lg > :nth-child(2) > .vn-label-value > .value > :nth-child(1) > .row > span'
+        ).should('have.text', '100');
+        cy.get(
+            '[to="/null/1"] > .q-card > .no-padding > .q-pr-lg > :nth-child(3) > .vn-label-value > .value > :nth-child(1) > .row > span'
+        ).should('have.text', 'Wagon Type #1');
+
         // Delete wagon type created
         cy.get(
             '[to="/null/2"] > .q-card > .column > [title="Remove"] > .q-btn__content > .q-icon'

From edb6e9ce61f80f59af84c99a4ba75cb6c366d4ea Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Tue, 24 Sep 2024 09:57:05 +0200
Subject: [PATCH 169/228] feat(TravelList): add daysOnward

---
 src/components/VnTable/VnFilter.vue | 10 ++++++----
 src/components/VnTable/VnTable.vue  | 22 ++++++++++++++++++++--
 src/components/ui/VnFilterPanel.vue | 11 ++++++++---
 src/composables/useArrayData.js     |  3 ++-
 src/i18n/locale/en.yml              |  1 +
 src/i18n/locale/es.yml              |  1 +
 src/pages/Travel/TravelList.vue     | 18 +++++++++++++++++-
 7 files changed, 55 insertions(+), 11 deletions(-)

diff --git a/src/components/VnTable/VnFilter.vue b/src/components/VnTable/VnFilter.vue
index fd3c29fa3..c796b8827 100644
--- a/src/components/VnTable/VnFilter.vue
+++ b/src/components/VnTable/VnFilter.vue
@@ -10,8 +10,6 @@ import VnInputDate from 'components/common/VnInputDate.vue';
 import VnInputTime from 'components/common/VnInputTime.vue';
 import VnTableColumn from 'components/VnTable/VnColumn.vue';
 
-defineExpose({ addFilter });
-
 const $props = defineProps({
     column: {
         type: Object,
@@ -30,6 +28,9 @@ const $props = defineProps({
         default: 'params',
     },
 });
+
+defineExpose({ addFilter, props: $props });
+
 const model = defineModel(undefined, { required: true });
 const arrayData = useArrayData($props.dataKey, { searchUrl: $props.searchUrl });
 const columnFilter = computed(() => $props.column?.columnFilter);
@@ -115,11 +116,12 @@ const components = {
     rawSelect: selectComponent,
 };
 
-async function addFilter(value) {
+async function addFilter(value, name) {
     value ??= undefined;
     if (value && typeof value === 'object') value = model.value;
     value = value === '' ? undefined : value;
-    let field = columnFilter.value?.name ?? $props.column.name;
+    let field = columnFilter.value?.name ?? $props.column.name ?? name;
+    console.log('field: ', field);
 
     if (columnFilter.value?.inWhere) {
         if (columnFilter.value.alias) field = columnFilter.value.alias + '.' + field;
diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index 2c9526ec0..ca6246137 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -97,6 +97,10 @@ const $props = defineProps({
         type: String,
         default: '90vh',
     },
+    translationPrefix: {
+        type: String,
+        default: null,
+    },
 });
 const { t } = useI18n();
 const stateStore = useStateStore();
@@ -117,6 +121,7 @@ const showForm = ref(false);
 const splittedColumns = ref({ columns: [] });
 const columnsVisibilitySkipped = ref();
 const createForm = ref();
+const tableFilterRef = ref([]);
 
 const tableModes = [
     {
@@ -219,7 +224,7 @@ function splitColumns(columns) {
         if (col.cardVisible) splittedColumns.value.cardVisible.push(col);
         if ($props.isEditable && col.disable == null) col.disable = false;
         if ($props.useModel && col.columnFilter != false)
-            col.columnFilter = { ...col.columnFilter, inWhere: true };
+            col.columnFilter = { inWhere: true, ...col.columnFilter };
         splittedColumns.value.columns.push(col);
     }
     // Status column
@@ -320,6 +325,13 @@ function handleOnDataSaved(_, res) {
                 :search-url="searchUrl"
                 :redirect="!!redirect"
                 @set-user-params="setUserParams"
+                :disable-submit-event="true"
+                @remove="
+                    (key) =>
+                        tableFilterRef
+                            .find((f) => f.props?.column.name == key)
+                            ?.addFilter()
+                "
             >
                 <template #body>
                     <div
@@ -330,6 +342,7 @@ function handleOnDataSaved(_, res) {
                         :key="col.id"
                     >
                         <VnTableFilter
+                            ref="tableFilterRef"
                             :column="col"
                             :data-key="$attrs['data-key']"
                             v-model="params[columnName(col)]"
@@ -353,10 +366,15 @@ function handleOnDataSaved(_, res) {
                         :columns="splittedColumns.columns"
                     />
                 </template>
+                <template #tags="{ tag, formatFn }" v-if="translationPrefix">
+                    <div class="q-gutter-x-xs">
+                        <strong>{{ t(`${translationPrefix}.${tag.label}`) }}: </strong>
+                        <span>{{ formatFn(tag.value) }}</span>
+                    </div>
+                </template>
             </VnFilterPanel>
         </QScrollArea>
     </QDrawer>
-    <!-- class in div to fix warn-->
 
     <CrudModel
         v-bind="$attrs"
diff --git a/src/components/ui/VnFilterPanel.vue b/src/components/ui/VnFilterPanel.vue
index cebdc4bbf..c2c6cf45e 100644
--- a/src/components/ui/VnFilterPanel.vue
+++ b/src/components/ui/VnFilterPanel.vue
@@ -112,9 +112,9 @@ watch(
 );
 
 const isLoading = ref(false);
-async function search(evt) {
+async function search() {
     try {
-        if (evt && $props.disableSubmitEvent) return;
+        if ($props.disableSubmitEvent) return;
 
         store.filter.where = {};
         isLoading.value = true;
@@ -165,7 +165,7 @@ const tagsList = computed(() => {
     for (const key of Object.keys(userParams.value)) {
         const value = userParams.value[key];
         if (value == null || ($props.hiddenTags || []).includes(key)) continue;
-        tagList.push({ label: key, value });
+        tagList.push({ label: aliasField(key), value });
     }
     return tagList;
 });
@@ -200,6 +200,11 @@ function sanitizer(params) {
     }
     return params;
 }
+
+function aliasField(field) {
+    const split = field.split('.');
+    return split[1] ?? split[0];
+}
 </script>
 
 <template>
diff --git a/src/composables/useArrayData.js b/src/composables/useArrayData.js
index 651bcefb0..b1c150410 100644
--- a/src/composables/useArrayData.js
+++ b/src/composables/useArrayData.js
@@ -26,7 +26,8 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
             const params = JSON.parse(query[searchUrl]);
             const filter = params?.filter && JSON.parse(params?.filter ?? '{}');
             delete params.filter;
-            store.userParams = { ...params, ...store.userParams };
+
+            store.userParams = { ...store.userParams, ...params };
             store.userFilter = { ...filter, ...store.userFilter };
             if (filter?.order) store.order = filter.order;
         }
diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index 1d1a287c2..bd9f83fbe 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -1109,6 +1109,7 @@ travel:
             warehouseOut: Warehouse out
             totalEntries: Total entries
             totalEntriesTooltip: Total entries
+            daysOnward: Landed days onwards
     summary:
         confirmed: Confirmed
         entryId: Entry Id
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index db717824a..aefa7580a 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -1093,6 +1093,7 @@ travel:
             warehouseOut: Alm.entrada
             totalEntries: ∑
             totalEntriesTooltip: Entradas totales
+            daysOnward: Días de llegada en adelante
     summary:
         confirmed: Confirmado
         entryId: Id entrada
diff --git a/src/pages/Travel/TravelList.vue b/src/pages/Travel/TravelList.vue
index c7ad908f9..b2a4a6baa 100644
--- a/src/pages/Travel/TravelList.vue
+++ b/src/pages/Travel/TravelList.vue
@@ -11,6 +11,7 @@ import TravelSummary from './Card/TravelSummary.vue';
 import VnSearchbar from 'components/ui/VnSearchbar.vue';
 import { toDate } from 'src/filters';
 import { getDateQBadgeColor } from 'src/composables/getDateQBadgeColor.js';
+
 const { viewSummary } = useSummaryDialog();
 const router = useRouter();
 const { t } = useI18n();
@@ -24,11 +25,15 @@ const $props = defineProps({
     },
 });
 const entityId = computed(() => $props.id || route.params.id);
+
+onMounted(async () => {
+    stateStore.rightDrawer = true;
+});
+
 const cloneTravel = (travelData) => {
     const stringifiedTravelData = JSON.stringify(travelData);
     redirectToCreateView(stringifiedTravelData);
 };
-
 const redirectToCreateView = (queryParams) => {
     router.push({ name: 'TravelCreate', query: { travelData: queryParams } });
 };
@@ -158,6 +163,15 @@ const columns = computed(() => [
         cardVisible: true,
         create: true,
     },
+    {
+        align: 'left',
+        name: 'daysOnward',
+        label: t('travel.travelList.tableVisibleColumns.daysOnward'),
+        visible: false,
+        columnFilter: {
+            inWhere: false,
+        },
+    },
     {
         align: 'right',
         label: '',
@@ -204,12 +218,14 @@ const columns = computed(() => [
                 editorFk: entityId,
             },
         }"
+        :user-params="{ daysOnward: 7 }"
         order="landed DESC"
         :columns="columns"
         auto-load
         redirect="travel"
         :is-editable="false"
         :use-model="true"
+        translation-prefix="travel.travelList.tableVisibleColumns"
     >
         <template #column-shipped="{ row }">
             <QBadge

From 3d34d9c6bb7973e2d63c4b5971f31f530cd1e8de Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Tue, 24 Sep 2024 10:54:17 +0200
Subject: [PATCH 170/228] chore: refs #7155 remove console.log

---
 src/components/VnTable/VnFilter.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/components/VnTable/VnFilter.vue b/src/components/VnTable/VnFilter.vue
index c796b8827..b17fd4407 100644
--- a/src/components/VnTable/VnFilter.vue
+++ b/src/components/VnTable/VnFilter.vue
@@ -121,7 +121,6 @@ async function addFilter(value, name) {
     if (value && typeof value === 'object') value = model.value;
     value = value === '' ? undefined : value;
     let field = columnFilter.value?.name ?? $props.column.name ?? name;
-    console.log('field: ', field);
 
     if (columnFilter.value?.inWhere) {
         if (columnFilter.value.alias) field = columnFilter.value.alias + '.' + field;

From 991ad21c777eae42a571e36ea20681733917f907 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Tue, 24 Sep 2024 13:16:34 +0200
Subject: [PATCH 171/228] fix: refs #7155 remove userParams in watcher

---
 src/components/ui/VnPaginate.vue | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/components/ui/VnPaginate.vue b/src/components/ui/VnPaginate.vue
index 37101dafe..c6f57b479 100644
--- a/src/components/ui/VnPaginate.vue
+++ b/src/components/ui/VnPaginate.vue
@@ -119,10 +119,9 @@ watch(
 );
 
 watch(
-    () => [props.url, props.filter, props.userParams],
-    ([url, filter, userParams]) => mounted.value && fetch({ url, filter, userParams })
+    () => [props.url, props.filter],
+    ([url, filter]) => mounted.value && fetch({ url, filter })
 );
-
 const addFilter = async (filter, params) => {
     await arrayData.addFilter({ filter, params });
 };

From d2996f083857201ac3ae2d2348fdef9c081fd13b Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Wed, 25 Sep 2024 12:23:41 +0200
Subject: [PATCH 172/228] fix: refs #6943 prevent null

---
 src/components/CreateBankEntityForm.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/CreateBankEntityForm.vue b/src/components/CreateBankEntityForm.vue
index 1117225c7..0a3c10f57 100644
--- a/src/components/CreateBankEntityForm.vue
+++ b/src/components/CreateBankEntityForm.vue
@@ -21,7 +21,7 @@ const customer = computed(() => state.get('customer'));
 const bankEntityFormData = reactive({
     name: null,
     bic: null,
-    countryFk: customer.value.countryFk,
+    countryFk: customer.value?.countryFk,
     id: null,
 });
 

From 6bd2835c594255000fa23932fb03dcd31ca81e97 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Wed, 25 Sep 2024 13:18:26 +0200
Subject: [PATCH 173/228] chore: refs #7155 typo

---
 src/components/VnTable/VnTable.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index 4ceb72028..10b55f9f5 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -98,7 +98,7 @@ const $props = defineProps({
         type: String,
         default: '90vh',
     },
-    translationPrefix: {
+    chipLocale: {
         type: String,
         default: null,
     },
@@ -372,9 +372,9 @@ function handleOnDataSaved(_) {
                         :columns="splittedColumns.columns"
                     />
                 </template>
-                <template #tags="{ tag, formatFn }" v-if="translationPrefix">
+                <template #tags="{ tag, formatFn }" v-if="chipLocale">
                     <div class="q-gutter-x-xs">
-                        <strong>{{ t(`${translationPrefix}.${tag.label}`) }}: </strong>
+                        <strong>{{ t(`${chipLocale}.${tag.label}`) }}: </strong>
                         <span>{{ formatFn(tag.value) }}</span>
                     </div>
                 </template>

From bcada72f04f69f24981e09cc6b710c95e45ba452 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Wed, 25 Sep 2024 13:24:22 +0200
Subject: [PATCH 174/228] fix: refs #7155 use chip-locale

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

diff --git a/src/pages/Travel/TravelList.vue b/src/pages/Travel/TravelList.vue
index 631ce6fb6..e56f5d2ff 100644
--- a/src/pages/Travel/TravelList.vue
+++ b/src/pages/Travel/TravelList.vue
@@ -220,7 +220,7 @@ const columns = computed(() => [
         redirect="travel"
         :is-editable="false"
         :use-model="true"
-        translation-prefix="travel.travelList.tableVisibleColumns"
+        chip-locale="travel.travelList.tableVisibleColumns"
     >
         <template #column-shipped="{ row }">
             <QBadge

From f00db79d476a366253731ca0817318328994d215 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Thu, 26 Sep 2024 14:14:27 +0200
Subject: [PATCH 175/228] fix(VnTable): header background-color

---
 src/components/VnTable/VnTable.vue | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index 10b55f9f5..9dcbc5542 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -749,6 +749,10 @@ es:
     border-color: var(--vn-section-color);
 }
 
+.q-table__container > div:first-child {
+    background-color: var(--vn-page-color);
+}
+
 .grid-three {
     display: grid;
     grid-template-columns: repeat(auto-fit, minmax(400px, max-content));

From bbf3b6d4b799c256c68608d6015f3f906a9b5851 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Thu, 26 Sep 2024 12:29:03 +0000
Subject: [PATCH 176/228] fix: #6943 show nickname salesPerson

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

diff --git a/src/pages/Customer/Card/CustomerBasicData.vue b/src/pages/Customer/Card/CustomerBasicData.vue
index 79ae79ad9..d31669b43 100644
--- a/src/pages/Customer/Card/CustomerBasicData.vue
+++ b/src/pages/Customer/Card/CustomerBasicData.vue
@@ -18,6 +18,7 @@ const contactChannels = ref([]);
 const title = ref();
 const handleSalesModelValue = (val) => ({
     or: [
+        { id: val },
         { name: val },
         { nickname: { like: '%' + val + '%' } },
         { code: { like: `${val}%` } },

From 353116a7a0a93e5c612344731c527f401a974aa8 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Thu, 26 Sep 2024 15:49:12 +0200
Subject: [PATCH 177/228] fix: split params

---
 src/components/common/VnLog.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/common/VnLog.vue b/src/components/common/VnLog.vue
index ab522cfde..8c71c0997 100644
--- a/src/components/common/VnLog.vue
+++ b/src/components/common/VnLog.vue
@@ -406,6 +406,7 @@ watch(
         :skeleton="false"
         auto-load
         @on-fetch="setLogTree"
+        search-url="logs"
     >
         <template #body>
             <div

From 193670fdcf829cc9589261b426e5ebeea7dcd111 Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Fri, 27 Sep 2024 12:39:30 +0200
Subject: [PATCH 178/228] fix: refs #7404 revert commit prevent production
 access

---
 src/router/modules/entry.js | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/src/router/modules/entry.js b/src/router/modules/entry.js
index 4750a4301..d66ea0e0c 100644
--- a/src/router/modules/entry.js
+++ b/src/router/modules/entry.js
@@ -58,15 +58,6 @@ export default {
                     },
                     component: () => import('src/pages/Entry/EntryLatestBuys.vue'),
                 },
-                {
-                    path: 'stock-Bought',
-                    name: 'EntryStockBought',
-                    meta: {
-                        title: 'reserves',
-                        icon: 'deployed_code_history',
-                    },
-                    component: () => import('src/pages/Entry/EntryStockBought.vue'),
-                },
             ],
         },
         {

From 336f2ba89e793a01765db588ae7bb5e55a82b604 Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Fri, 27 Sep 2024 12:41:00 +0200
Subject: [PATCH 179/228] fix: refs #7404 remove from test

---
 src/pages/Entry/EntryStockBought.vue          | 293 ------------------
 src/pages/Entry/EntryStockBoughtDetail.vue    | 129 --------
 src/pages/Entry/EntryStockBoughtFilter.vue    |  63 ----
 .../integration/entry/stockBought.spec.js     |  39 ---
 4 files changed, 524 deletions(-)
 delete mode 100644 src/pages/Entry/EntryStockBought.vue
 delete mode 100644 src/pages/Entry/EntryStockBoughtDetail.vue
 delete mode 100644 src/pages/Entry/EntryStockBoughtFilter.vue
 delete mode 100644 test/cypress/integration/entry/stockBought.spec.js

diff --git a/src/pages/Entry/EntryStockBought.vue b/src/pages/Entry/EntryStockBought.vue
deleted file mode 100644
index 4750a8417..000000000
--- a/src/pages/Entry/EntryStockBought.vue
+++ /dev/null
@@ -1,293 +0,0 @@
-<script setup>
-import { ref } from 'vue';
-import { useI18n } from 'vue-i18n';
-import { useState } from 'src/composables/useState';
-import { useQuasar } from 'quasar';
-
-import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
-import FetchData from 'components/FetchData.vue';
-import FormModelPopup from 'components/FormModelPopup.vue';
-import VnInput from 'src/components/common/VnInput.vue';
-import VnRow from 'components/ui/VnRow.vue';
-import RightMenu from 'src/components/common/RightMenu.vue';
-import EntryStockBoughtFilter from './EntryStockBoughtFilter.vue';
-import VnTable from 'components/VnTable/VnTable.vue';
-import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
-import EntryStockBoughtDetail from 'src/pages/Entry/EntryStockBoughtDetail.vue';
-
-const { t } = useI18n();
-const quasar = useQuasar();
-const state = useState();
-const user = state.getUser();
-const columns = [
-    {
-        align: 'left',
-        label: 'Id',
-        name: 'id',
-        isId: true,
-        columnFilter: false,
-        visible: false,
-    },
-    {
-        align: 'left',
-        name: 'workerFk',
-        label: t('Buyer'),
-        isTitle: true,
-        component: 'select',
-        cardVisible: true,
-        create: true,
-        attrs: {
-            url: 'Workers/activeWithInheritedRole',
-            fields: ['id', 'name'],
-            where: { role: 'buyer' },
-            optionFilter: 'firstName',
-            optionLabel: 'name',
-            optionValue: 'id',
-            useLike: false,
-        },
-    },
-    {
-        align: 'left',
-        label: t('Reserve'),
-        name: 'reserve',
-        columnFilter: false,
-        create: true,
-        component: 'number',
-        summation: true,
-    },
-    {
-        align: 'center',
-        label: t('Bought'),
-        name: 'bought',
-        summation: true,
-        cardVisible: true,
-        columnFilter: false,
-    },
-    {
-        align: 'left',
-        label: t('Date'),
-        name: 'dated',
-        component: 'date',
-        visible: false,
-        create: true,
-    },
-    {
-        align: 'left',
-        name: 'tableActions',
-        actions: [
-            {
-                title: t('More'),
-                icon: 'search',
-                isPrimary: true,
-                action: (row) => {
-                    quasar.dialog({
-                        component: EntryStockBoughtDetail,
-                        componentProps: {
-                            workerFk: row.workerFk,
-                            dated: userParams.value.dated,
-                        },
-                    });
-                },
-            },
-        ],
-    },
-];
-
-const fetchDataRef = ref();
-const travelDialogRef = ref(false);
-const tableRef = ref();
-const travel = ref(null);
-const userParams = ref({
-    dated: Date.vnNew(),
-});
-
-const filter = ref({
-    fields: ['id', 'm3', 'warehouseInFk'],
-    include: [
-        {
-            relation: 'warehouseIn',
-            scope: {
-                fields: ['code'],
-            },
-        },
-    ],
-    where: {
-        shipped: (userParams.value.dated
-            ? new Date(userParams.value.dated)
-            : Date.vnNew()
-        ).setHours(0, 0, 0, 0),
-        m3: { neq: null },
-    },
-});
-
-const setUserParams = async ({ dated }) => {
-    const shipped = (dated ? new Date(dated) : Date.vnNew()).setHours(0, 0, 0, 0);
-    filter.value.where.shipped = shipped;
-    fetchDataRef.value?.fetch();
-};
-
-function openDialog() {
-    travelDialogRef.value = true;
-}
-
-function setFooter(data) {
-    const footer = {
-        bought: 0,
-        reserve: 0,
-    };
-    data.forEach((row) => {
-        footer.bought += row?.bought;
-        footer.reserve += row?.reserve;
-    });
-    tableRef.value.footer = footer;
-}
-</script>
-<template>
-    <VnSubToolbar>
-        <template #st-data>
-            <FetchData
-                ref="fetchDataRef"
-                url="Travels"
-                auto-load
-                :filter="filter"
-                @on-fetch="
-                    (data) => {
-                        travel = data.find((data) => data.warehouseIn.code === 'VNH');
-                    }
-                "
-            />
-            <VnRow class="travel">
-                <div v-if="travel">
-                    <span style="color: var(--vn-label-color)">
-                        {{ t('Booked trucks') }}:
-                    </span>
-                    <span>
-                        {{ travel?.m3 }}
-                    </span>
-                    <QBtn
-                        v-if="travel?.m3"
-                        style="max-width: 20%"
-                        flat
-                        icon="edit"
-                        @click="openDialog()"
-                        :title="t('Edit travel')"
-                        color="primary"
-                    />
-                </div>
-            </VnRow>
-        </template>
-    </VnSubToolbar>
-    <QDialog v-model="travelDialogRef" :maximized="true" :class="['vn-row', 'wrap']">
-        <FormModelPopup
-            :url-update="`Travels/${travel?.id}`"
-            model="travel"
-            :title="t('Travel m3')"
-            :form-initial-data="{ id: travel?.id, m3: travel?.m3 }"
-            @on-data-saved="fetchDataRef.fetch()"
-        >
-            <template #form-inputs="{ data }">
-                <VnInput
-                    v-model="data.id"
-                    :label="t('id')"
-                    type="number"
-                    disable
-                    readonly
-                />
-                <VnInput v-model="data.m3" :label="t('m3')" type="number" />
-            </template>
-        </FormModelPopup>
-    </QDialog>
-    <RightMenu>
-        <template #right-panel>
-            <EntryStockBoughtFilter
-                data-key="StockBoughts"
-                @set-user-params="setUserParams"
-            />
-        </template>
-    </RightMenu>
-    <div class="table-container">
-        <QPage class="column items-center q-pa-md">
-            <VnTable
-                ref="tableRef"
-                data-key="StockBoughts"
-                url="StockBoughts/getStockBought"
-                save-url="StockBoughts/crud"
-                order="reserve DESC"
-                :right-search="false"
-                :is-editable="true"
-                @on-fetch="(data) => setFooter(data)"
-                :create="{
-                    urlCreate: 'StockBoughts',
-                    title: t('Reserve some space'),
-                    onDataSaved: () => tableRef.reload(),
-                    formInitialData: {
-                        workerFk: user.id,
-                        dated: Date.vnNow(),
-                    },
-                }"
-                :columns="columns"
-                :user-params="userParams"
-                :footer="true"
-                auto-load
-            >
-                <template #column-workerFk="{ row }">
-                    <span class="link" @click.stop>
-                        {{ row?.worker?.user?.name }}
-                        <WorkerDescriptorProxy :id="row?.workerFk" />
-                    </span>
-                </template>
-                <template #column-bought="{ row }">
-                    <span :class="{ 'text-negative': row.reserve < row.bought }">
-                        {{ row?.bought }}
-                    </span>
-                </template>
-                <template #column-footer-reserve>
-                    <span>
-                        {{ tableRef.footer.reserve }}
-                    </span>
-                </template>
-                <template #column-footer-bought>
-                    <span
-                        :class="{
-                            'text-negative':
-                                tableRef.footer.reserve < tableRef.footer.bought,
-                        }"
-                    >
-                        {{ tableRef.footer.bought }}
-                    </span>
-                </template>
-            </VnTable>
-        </QPage>
-    </div>
-</template>
-<style lang="scss" scoped>
-.travel {
-    margin-bottom: 0px;
-}
-.table-container {
-    display: flex;
-    justify-content: center;
-}
-.column {
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    width: 40%;
-}
-.text-negative {
-    color: $negative !important;
-}
-</style>
-<i18n>
-    es:
-        Edit travel: Editar envío
-        Travel: Envíos
-        Booked trucks: Camiones reservados
-        Buyer: Comprador
-        Reserve: Reservado
-        Bought: Comprado
-        More: Más
-        Date: Fecha
-        Reserve some space: Reservar espacio
-        This buyer has already made a reservation for this date: Este comprador ya ha hecho una reserva para esta fecha
-</i18n>
diff --git a/src/pages/Entry/EntryStockBoughtDetail.vue b/src/pages/Entry/EntryStockBoughtDetail.vue
deleted file mode 100644
index 2c1a5a47e..000000000
--- a/src/pages/Entry/EntryStockBoughtDetail.vue
+++ /dev/null
@@ -1,129 +0,0 @@
-<script setup>
-import { ref } from 'vue';
-import { useI18n } from 'vue-i18n';
-
-import VnTable from 'components/VnTable/VnTable.vue';
-import EntryDescriptorProxy from 'src/pages/Entry/Card/EntryDescriptorProxy.vue';
-import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue';
-
-const { t } = useI18n();
-const tableRef = ref();
-const $props = defineProps({
-    workerFk: {
-        type: Number,
-        required: true,
-    },
-    dated: {
-        type: Date,
-        required: true,
-    },
-});
-const customUrl = `StockBoughts/getStockBoughtDetail?workerFk=${$props.workerFk}&date=${$props.dated}`;
-const columns = [
-    {
-        align: 'left',
-        label: t('Entry'),
-        name: 'entryFk',
-        isTitle: true,
-        isId: true,
-        columnFilter: false,
-    },
-    {
-        align: 'left',
-        name: 'itemFk',
-        label: t('Item'),
-        columnFilter: false,
-    },
-    {
-        align: 'left',
-        label: t('Name'),
-        name: 'itemName',
-        create: true,
-        columnClass: 'expand',
-        columnFilter: false,
-        cardVisible: true,
-    },
-    {
-        align: 'left',
-        name: 'volume',
-        label: t('Volume'),
-        columnFilter: false,
-        cardVisible: true,
-    },
-    {
-        align: 'left',
-        label: t('Packaging'),
-        name: 'packagingFk',
-        columnFilter: false,
-        cardVisible: true,
-    },
-    {
-        align: 'left',
-        label: 'Packing',
-        name: 'packing',
-        columnFilter: false,
-        cardVisible: true,
-    },
-];
-</script>
-<template>
-    <QDialog>
-        <div class="container">
-            <VnTable
-                ref="tableRef"
-                data-key="StockBoughtsDetail"
-                :url="customUrl"
-                order="itemName DESC"
-                :columns="columns"
-                :right-search="false"
-                :disable-infinite-scroll="true"
-                :limit="0"
-                auto-load
-            >
-                <template #top-left>
-                    <QBtn
-                        flat
-                        icon="Close"
-                        color="primary"
-                        class="bg-vn-section-color q-pa-xs"
-                        v-close-popup
-                    />
-                </template>
-                <template #column-entryFk="{ row }">
-                    <span class="link">
-                        {{ row?.entryFk }}
-                        <EntryDescriptorProxy :id="row.entryFk" />
-                    </span>
-                </template>
-                <template #column-itemName="{ row }">
-                    <span class="link">
-                        {{ row?.itemName }}
-                        <ItemDescriptorProxy :id="row.itemFk" />
-                    </span>
-                </template>
-            </VnTable>
-        </div>
-    </QDialog>
-</template>
-<style lang="css" scoped>
-.container {
-    max-width: 50vw;
-    overflow: auto;
-    justify-content: center;
-    align-items: center;
-    margin: auto;
-}
-</style>
-<i18n>
-    es:
-        Buyer: Comprador
-        Reserve: Reservado
-        Bought: Comprado
-        More: Más
-        Date: Fecha
-        Entry: Entrada
-        Item: Artículo
-        Name: Nombre
-        Volume: Volumen
-        Packaging: Embalage 
-</i18n>
diff --git a/src/pages/Entry/EntryStockBoughtFilter.vue b/src/pages/Entry/EntryStockBoughtFilter.vue
deleted file mode 100644
index 7694cfe6c..000000000
--- a/src/pages/Entry/EntryStockBoughtFilter.vue
+++ /dev/null
@@ -1,63 +0,0 @@
-<script setup>
-import { useI18n } from 'vue-i18n';
-import { onMounted } from 'vue';
-import { useStateStore } from 'stores/useStateStore';
-
-import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
-import VnInputDate from 'src/components/common/VnInputDate.vue';
-
-const { t } = useI18n();
-const props = defineProps({
-    dataKey: {
-        type: String,
-        required: true,
-    },
-});
-const stateStore = useStateStore();
-const emit = defineEmits(['set-user-params']);
-const setUserParams = (params) => {
-    emit('set-user-params', params);
-};
-onMounted(async () => {
-    stateStore.rightDrawer = true;
-});
-</script>
-
-<template>
-    <VnFilterPanel
-        :data-key="props.dataKey"
-        :search-button="true"
-        search-url="table"
-        @set-user-params="setUserParams"
-    >
-        <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 }">
-            <QItem class="q-my-sm">
-                <QItemSection>
-                    <VnInputDate
-                        id="date"
-                        v-model="params.dated"
-                        :label="t('Date')"
-                        is-outlined
-                    />
-                </QItemSection>
-            </QItem>
-        </template>
-    </VnFilterPanel>
-</template>
-<i18n>
-    en:
-        params:
-            dated: Date
-            workerFk: Worker
-    es:
-        Date: Fecha
-        params:
-            dated: Date
-            workerFk: Trabajador
-</i18n>
diff --git a/test/cypress/integration/entry/stockBought.spec.js b/test/cypress/integration/entry/stockBought.spec.js
deleted file mode 100644
index 66e06b79e..000000000
--- a/test/cypress/integration/entry/stockBought.spec.js
+++ /dev/null
@@ -1,39 +0,0 @@
-describe('EntryStockBought', () => {
-    beforeEach(() => {
-        cy.viewport(1920, 1080);
-        cy.login('buyer');
-        cy.visit(`/#/entry/stock-Bought`);
-    });
-    it('Should edit the reserved space', () => {
-        cy.get('.q-field__native.q-placeholder').should('have.value', '01/01/2001');
-        cy.get('input[name="reserve"]').type('10{enter}');
-        cy.get('button[title="Save"]').click();
-        cy.get('.q-notification__message').should('have.text', 'Data saved');
-    });
-    it('Should add a new reserved space for buyerBoss', () => {
-        cy.get('.q-page-sticky > div > .q-btn > .q-btn__content > .q-icon').click();
-        cy.get('input[aria-label="Reserve"]').type('1');
-        cy.get('input[aria-label="Date"]').eq(1).clear();
-        cy.get('input[aria-label="Date"]').eq(1).type('01-01');
-        cy.get('input[aria-label="Buyer"]').type('buyerboss{downarrow}{enter}');
-        cy.get('.q-notification__message').should('have.text', 'Data created');
-    });
-    it('Should check detail for the buyer', () => {
-        cy.get(':nth-child(1) > .sticky > .q-btn > .q-btn__content > .q-icon').click();
-        cy.get('tBody > tr').eq(1).its('length').should('eq', 1);
-    });
-    it('Should check detail for the buyerBoss and had no content', () => {
-        cy.get(':nth-child(2) > .sticky > .q-btn > .q-btn__content > .q-icon').click();
-        cy.get('.q-table__bottom.row.items-center.q-table__bottom--nodata').should(
-            'have.text',
-            'warningNo data available'
-        );
-    });
-    it('Should edit travel m3 and refresh', () => {
-        cy.get('.vn-row > div > .q-btn > .q-btn__content > .q-icon').click();
-        cy.get('input[aria-label="m3"]').clear();
-        cy.get('input[aria-label="m3"]').type('60');
-        cy.get('.q-mt-lg > .q-btn--standard > .q-btn__content > .block').click();
-        cy.get('.vn-row > div > :nth-child(2)').should('have.text', '60');
-    });
-});

From 2302e22f1115a9b5d057e2a7e47b44d6b630968c Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 30 Sep 2024 15:00:05 +0200
Subject: [PATCH 180/228] fix: solve conflicts from master to test

---
 src/components/VnTable/VnTable.vue            |  4 +-
 src/components/common/VnLocation.vue          | 43 +++++++++++--
 src/i18n/locale/en.yml                        |  2 +-
 src/i18n/locale/es.yml                        |  2 +-
 .../Customer/Card/CustomerFiscalData.vue      |  1 +
 src/pages/Customer/Card/CustomerSummary.vue   |  1 +
 src/pages/Customer/CustomerList.vue           |  3 +-
 .../Customer/Defaulter/CustomerDefaulter.vue  |  7 --
 src/pages/Item/ItemFixedPrice.vue             | 20 +++---
 .../Supplier/Card/SupplierAddressesCreate.vue |  1 +
 src/pages/Ticket/Card/TicketSummary.vue       | 64 +++++++++----------
 src/pages/Worker/WorkerList.vue               |  1 +
 12 files changed, 86 insertions(+), 63 deletions(-)

diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index 9dcbc5542..3ed741ac4 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -310,8 +310,8 @@ defineExpose({
     params,
 });
 
-function handleOnDataSaved(_) {
-    if (_.onDataSaved) _.onDataSaved(this);
+function handleOnDataSaved(_, res) {
+    if (_.onDataSaved) _.onDataSaved({ CrudModelRef: CrudModelRef.value });
     else $props.create.onDataSaved(_);
 }
 </script>
diff --git a/src/components/common/VnLocation.vue b/src/components/common/VnLocation.vue
index e5ed14a40..c1b921915 100644
--- a/src/components/common/VnLocation.vue
+++ b/src/components/common/VnLocation.vue
@@ -12,17 +12,48 @@ const props = defineProps({
         default: null,
     },
 });
+const formatLocation = (obj, properties) => {
+    const parts = properties.map((prop) => {
+        if (typeof prop === 'string') {
+            return obj[prop];
+        } else if (typeof prop === 'function') {
+            return prop(obj);
+        }
+        return null;
+    });
+
+    const filteredParts = parts.filter(
+        (part) => part !== null && part !== undefined && part !== ''
+    );
+
+    return filteredParts.join(', ');
+};
+
+const locationProperties = [
+    'postcode',
+    (obj) =>
+        obj.city
+            ? `${obj.city}${obj.province?.name ? `(${obj.province.name})` : ''}`
+            : null,
+    (obj) => obj.country?.name,
+];
+
 const modelValue = ref(
-    props.location
-        ? `${props.location?.postcode}, ${props.location?.city}(${props.location?.province?.name}), ${props.location?.country?.name}`
-        : null
+    props.location ? formatLocation(props.location, locationProperties) : null
 );
-function showLabel(data) {
-    return `${data.code}, ${data.town}(${data.province}), ${data.country}`;
-}
+
 const handleModelValue = (data) => {
     emit('update:model-value', data);
 };
+
+function showLabel(data) {
+    const dataProperties = [
+        'code',
+        (obj) => (obj.town ? `${obj.town}(${obj.province})` : null),
+        'country',
+    ];
+    return formatLocation(data, dataProperties);
+}
 </script>
 <template>
     <VnSelectDialog
diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index 43fb69e6a..7eb3829fe 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -1076,7 +1076,7 @@ item:
         producer: Producer
         landed: Landed
     fixedPrice:
-        itemId: Item ID
+        itemFk: Item ID
         groupingPrice: Grouping price
         packingPrice: Packing price
         hasMinPrice: Has min price
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index b4e4ce86f..9d5cd53f3 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -1061,7 +1061,7 @@ item:
         producer: Productor
         landed: F. entrega
     fixedPrice:
-        itemId: ID Artículo
+        itemFk: ID Artículo
         groupingPrice: Precio grouping
         packingPrice: Precio packing
         hasMinPrice: Tiene precio mínimo
diff --git a/src/pages/Customer/Card/CustomerFiscalData.vue b/src/pages/Customer/Card/CustomerFiscalData.vue
index 300d275c0..1f5775715 100644
--- a/src/pages/Customer/Card/CustomerFiscalData.vue
+++ b/src/pages/Customer/Card/CustomerFiscalData.vue
@@ -93,6 +93,7 @@ function handleLocation(data, location) {
             <VnRow>
                 <VnLocation
                     :rules="validate('Worker.postcode')"
+                    :roles-allowed-to-create="['deliveryAssistant', 'administrative']"
                     :acls="[{ model: 'Town', props: '*', accessType: 'WRITE' }]"
                     :location="data"
                     @update:model-value="(location) => handleLocation(data, location)"
diff --git a/src/pages/Customer/Card/CustomerSummary.vue b/src/pages/Customer/Card/CustomerSummary.vue
index f049426e2..8b5f0f2c2 100644
--- a/src/pages/Customer/Card/CustomerSummary.vue
+++ b/src/pages/Customer/Card/CustomerSummary.vue
@@ -13,6 +13,7 @@ import VnTitle from 'src/components/common/VnTitle.vue';
 import VnRow from 'src/components/ui/VnRow.vue';
 const route = useRoute();
 const { t } = useI18n();
+const grafanaUrl = 'https://grafana.verdnatura.es';
 
 const $props = defineProps({
     id: {
diff --git a/src/pages/Customer/CustomerList.vue b/src/pages/Customer/CustomerList.vue
index 5e24a1c2d..63f5149e8 100644
--- a/src/pages/Customer/CustomerList.vue
+++ b/src/pages/Customer/CustomerList.vue
@@ -429,10 +429,9 @@ function handleLocation(data, location) {
                 :params="{
                     departmentCodes: ['VT', 'shopping'],
                 }"
-                option-label="nickname"
-                option-value="id"
                 :fields="['id', 'nickname']"
                 sort-by="nickname ASC"
+                :use-like="false"
                 emit-value
                 auto-load
             >
diff --git a/src/pages/Customer/Defaulter/CustomerDefaulter.vue b/src/pages/Customer/Defaulter/CustomerDefaulter.vue
index 11f6362f8..7b9cb67f7 100644
--- a/src/pages/Customer/Defaulter/CustomerDefaulter.vue
+++ b/src/pages/Customer/Defaulter/CustomerDefaulter.vue
@@ -3,7 +3,6 @@ import { ref, computed } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useQuasar } from 'quasar';
 import { toCurrency, toDate, dateRange } 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';
@@ -11,7 +10,6 @@ import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import CustomerDefaulterAddObservation from './CustomerDefaulterAddObservation.vue';
 import DepartmentDescriptorProxy from 'src/pages/Department/Card/DepartmentDescriptorProxy.vue';
-import RightMenu from 'src/components/common/RightMenu.vue';
 import VnTable from 'src/components/VnTable/VnTable.vue';
 
 const { t } = useI18n();
@@ -192,11 +190,6 @@ function exprBuilder(param, value) {
 </script>
 
 <template>
-    <RightMenu>
-        <template #right-panel>
-            <CustomerNotificationsFilter data-key="CustomerDefaulter" />
-        </template>
-    </RightMenu>
     <VnSubToolbar>
         <template #st-data>
             <CustomerBalanceDueTotal :amount="balanceDueTotal" />
diff --git a/src/pages/Item/ItemFixedPrice.vue b/src/pages/Item/ItemFixedPrice.vue
index bd8c4b78c..fddf154a2 100644
--- a/src/pages/Item/ItemFixedPrice.vue
+++ b/src/pages/Item/ItemFixedPrice.vue
@@ -36,23 +36,23 @@ const user = state.getUser();
 const fixedPrices = ref([]);
 const warehousesOptions = ref([]);
 const rowsSelected = ref([]);
-
 const itemFixedPriceFilterRef = ref();
-
 const params = reactive({});
-const defaultColumnAttrs = {
-    align: 'left',
-    sortable: true,
-};
+
 onMounted(async () => {
     stateStore.rightDrawer = true;
     params.warehouseFk = user.value.warehouseFk;
 });
 onUnmounted(() => (stateStore.rightDrawer = false));
+
+const defaultColumnAttrs = {
+    align: 'left',
+    sortable: true,
+};
 const columns = computed(() => [
     {
-        label: t('item.fixedPrice.itemId'),
-        name: 'itemId',
+        label: t('item.fixedPrice.itemFk'),
+        name: 'itemFk',
         ...defaultColumnAttrs,
         isId: true,
         cardVisible: true,
@@ -426,7 +426,7 @@ function handleOnDataSave({ CrudModelRef }) {
             :default-save="false"
             data-key="ItemFixedPrices"
             url="FixedPrices/filter"
-            :order="['itemFk ASC']"
+            :order="['description DESC']"
             save-url="FixedPrices/crud"
             :user-params="{ warehouseFk: user.warehouseFk }"
             ref="tableRef"
@@ -460,7 +460,7 @@ function handleOnDataSave({ CrudModelRef }) {
                 <QCheckbox flat v-model="scope.selected" />
             </template>
 
-            <template #column-itemId="props">
+            <template #column-itemFk="props">
                 <VnSelect
                     style="max-width: 100px"
                     url="Items/withName"
diff --git a/src/pages/Supplier/Card/SupplierAddressesCreate.vue b/src/pages/Supplier/Card/SupplierAddressesCreate.vue
index 290373039..0feceb74a 100644
--- a/src/pages/Supplier/Card/SupplierAddressesCreate.vue
+++ b/src/pages/Supplier/Card/SupplierAddressesCreate.vue
@@ -84,6 +84,7 @@ function handleLocation(data, location) {
                 <VnRow>
                     <VnLocation
                         :rules="validate('Worker.postcode')"
+                        :roles-allowed-to-create="['deliveryAssistant']"
                         :acls="[{ model: 'Town', props: '*', accessType: 'WRITE' }]"
                         :location="
                             data.postalCode
diff --git a/src/pages/Ticket/Card/TicketSummary.vue b/src/pages/Ticket/Card/TicketSummary.vue
index 6af782173..2e85be000 100644
--- a/src/pages/Ticket/Card/TicketSummary.vue
+++ b/src/pages/Ticket/Card/TicketSummary.vue
@@ -1,6 +1,6 @@
 <script setup>
 import { onMounted, ref, computed } from 'vue';
-import { useRoute, useRouter } from 'vue-router';
+import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import axios from 'axios';
 import { dashIfEmpty, toDate, toCurrency } from 'src/filters';
@@ -11,13 +11,15 @@ import InvoiceOutDescriptorProxy from 'pages/InvoiceOut/Card/InvoiceOutDescripto
 import VnLv from 'src/components/ui/VnLv.vue';
 import VnLinkPhone from 'src/components/ui/VnLinkPhone.vue';
 import { getUrl } from 'src/composables/getUrl';
+import useNotify from 'src/composables/useNotify.js';
+import { useArrayData } from 'composables/useArrayData';
 import VnUserLink from 'src/components/ui/VnUserLink.vue';
 import VnTitle from 'src/components/common/VnTitle.vue';
 import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
 
 const route = useRoute();
-const router = useRouter();
-
+const { notify } = useNotify();
 const { t } = useI18n();
 
 const $props = defineProps({
@@ -35,6 +37,8 @@ const ticket = computed(() => summaryRef.value?.entity);
 const editableStates = ref([]);
 const ticketUrl = ref();
 const grafanaUrl = 'https://grafana.verdnatura.es';
+const stateBtnDropdownRef = ref();
+const descriptorData = useArrayData('ticketData');
 
 onMounted(async () => {
     ticketUrl.value = (await getUrl('ticket/')) + entityId.value + '/';
@@ -61,15 +65,19 @@ function isEditable() {
 }
 
 async function changeState(value) {
-    if (!ticket.value.id) return;
-
-    const formData = {
-        ticketFk: ticket.value.id,
-        code: value,
-    };
-
-    await axios.post(`Tickets/state`, formData);
-    router.go(route.fullPath);
+    try {
+        stateBtnDropdownRef.value.hide();
+        const formData = {
+            ticketFk: entityId.value,
+            code: value,
+        };
+        await axios.post(`Tickets/state`, formData);
+        notify('globals.dataSaved', 'positive');
+        summaryRef.value?.fetch();
+        descriptorData.fetch({});
+    } catch (err) {
+        console.error('Error changing ticket state', err);
+    }
 }
 </script>
 
@@ -94,33 +102,21 @@ async function changeState(value) {
         </template>
         <template #header-right>
             <QBtnDropdown
-                side
-                top
+                ref="stateBtnDropdownRef"
                 color="black"
                 text-color="white"
                 :label="t('ticket.summary.changeState')"
                 :disable="!isEditable()"
             >
-                <QList>
-                    <QVirtualScroll
-                        style="max-height: 300px"
-                        :items="editableStates"
-                        separator
-                        v-slot="{ item, index }"
-                    >
-                        <QItem
-                            :key="index"
-                            dense
-                            clickable
-                            v-close-popup
-                            @click="changeState(item.code)"
-                        >
-                            <QItemSection>
-                                <QItemLabel>{{ item.name }}</QItemLabel>
-                            </QItemSection>
-                        </QItem>
-                    </QVirtualScroll>
-                </QList>
+                <VnSelect
+                    :options="editableStates"
+                    hide-selected
+                    option-label="name"
+                    option-value="code"
+                    hide-dropdown-icon
+                    focus-on-mount
+                    @update:model-value="changeState"
+                />
             </QBtnDropdown>
         </template>
         <template #body="{ entity }">
diff --git a/src/pages/Worker/WorkerList.vue b/src/pages/Worker/WorkerList.vue
index 4c9964c0b..6b3b117b6 100644
--- a/src/pages/Worker/WorkerList.vue
+++ b/src/pages/Worker/WorkerList.vue
@@ -262,6 +262,7 @@ async function autofillBic(worker) {
                 </VnRow>
                 <VnRow>
                     <VnLocation
+                        :roles-allowed-to-create="['deliveryAssistant']"
                         :acls="[{ model: 'Town', props: '*', accessType: 'WRITE' }]"
                         :options="postcodesOptions"
                         @update:model-value="(location) => handleLocation(data, location)"

From 2e9a8d920551f645fb7644fa6910cec67666d8f3 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Tue, 1 Oct 2024 11:47:31 +0200
Subject: [PATCH 181/228] fix(WorkerList): add type email

---
 src/pages/Worker/WorkerList.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/pages/Worker/WorkerList.vue b/src/pages/Worker/WorkerList.vue
index 6b3b117b6..f4ae20591 100644
--- a/src/pages/Worker/WorkerList.vue
+++ b/src/pages/Worker/WorkerList.vue
@@ -214,6 +214,7 @@ async function autofillBic(worker) {
                     <VnInput v-model="data.name" :label="t('worker.create.webUser')" />
                     <VnInput
                         v-model="data.email"
+                        type="email"
                         :label="t('worker.create.personalEmail')"
                     />
                 </VnRow>

From 8de5602564d6c46a85e9c10bd2bc6c627d7cb461 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Wed, 2 Oct 2024 15:31:09 +0200
Subject: [PATCH 182/228] chore: refs #8062 add changelog

---
 CHANGELOG.md | 180 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 180 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f1d10b26e..88abb9ae0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,183 @@
+# Version 24.40 - 2024-10-02
+
+### Added 🆕
+
+-   chore: refs #4074 admit several acls by:jorgep
+-   chore: refs #4074 drop workerCreate by:jorgep
+-   chore: refs #4074 fix tests by:jorgep
+-   chore: refs #4074 wip replace useRole for useAcl by:jorgep
+-   chore: refs #7155 remove console.log by:alexm
+-   chore: refs #7155 typo by:alexm
+-   chore: refs #7663 add test by:jorgep
+-   chore: refs #7663 create test wip by:jorgep
+-   chore: refs #7663 drop useless code (origin/7663-setWeight) by:jorgep
+-   chore: refs #7828 fix e2e by:jorgep
+-   feat(AccountBasicData): add twoFactorFk by:alexm
+-   feat: add max rule by:Javier Segarra
+-   feat: add shortcut add event in some subSections by:Javier Segarra
+-   feat: add shortcut more buttons (origin/add_shortcut_add_subSections) by:Javier Segarra
+-   feat: add tooltip CustomerNewCustomAgent by:Javier Segarra
+-   feat: apply color when today by:Javier Segarra
+-   feat: change label because its more natural by:Javier Segarra
+-   feat: change order by:Javier Segarra
+-   feat: change QBadge color by:Javier Segarra
+-   feat: change url CustomerList by:Javier Segarra
+-   feat: copy customer countryFk by:Javier Segarra
+-   feat: create VnSelectEnum and add in AccountBasicData and ClaimBasicData by:alexm
+-   feat: CustomerBalance by:Javier Segarra
+-   feat: CustomerConsumptionFilter by:Javier Segarra
+-   feat: customer consumption (origin/7830-customerDesplegables, 7830-customerDesplegables) by:alexm
+-   feat: CustomerCreateTicket by:Javier Segarra
+-   feat: CustomerCredit section by:Javier Segarra
+-   feat: CustomerGreuges by:Javier Segarra
+-   feat: CustomerSample to VnTable by:Javier Segarra
+-   feat: global handler (origin/fix_global_handler, fix_global_handler) by:alexm
+-   feat: goToSupplier by:Javier Segarra
+-   feat: handle newValue by:Javier Segarra
+-   feat: handle same multiple CP by:Javier Segarra
+-   feat: hide menus on small view (origin/hideMenu) by:jorgep
+-   feat: minor changes by:Javier Segarra
+-   feat: orderCreateDialog by:Javier Segarra
+-   feat: refs #4074 drop useless code by:jorgep
+-   feat: refs #4074 useAcl in vnSelectDialog by:jorgep
+-   feat: refs #6346 new wagon type section by:Jon
+-   feat: refs #7404 add m3 and fix detail by:pablone
+-   feat: refs #7404 add some style to the form and reorganize fields by:pablone
+-   feat: refs #7404 add travel m3 to reserves form by:pablone
+-   feat: refs #7404 style dynamic text color by:pablone
+-   feat: refs #7404 travel m3 form by:pablone
+-   feat: refs #7500 added VnImg to show files by:Jon
+-   feat: refs #7663 add setWeight menu opt (wip) by:jorgep
+-   feat: refs #7663 fine tunning by:jorgep
+-   feat: refs #7828 create axios instance which no manage errors (origin/7828-makeCorrectCalls) by:jorgep
+-   feat: refs #7828 useAcl & cherry pick mail data worker by:jorgep
+-   feat: remove cli warnings by:Javier Segarra
+-   feat: show preparation field by:Javier Segarra
+-   feat: stateGroupedFilter by:Javier Segarra
+-   feat: translations fixed by:jgallego
+-   feat(TravelList): add daysOnward by:alexm
+-   feat: travel m3 by:pablone
+-   feat: use disableInifiniteScroll property by:Javier Segarra
+-   feat: VnImg draggable by:Javier Segarra
+-   feat: vnLocation changes by:Javier Segarra
+-   feat: vnSelect exprBuilder by:Javier Segarra
+-   fix: refs #7404 remove some style by:pablone
+-   fix: refs #7404 style non center pop up (origin/7404-fixFront) by:pablone
+-   fix: refs #7404 translates and some minor style fixes by:pablone
+-   fix: styles by:Javier Segarra
+-   perf: improve style by:Javier Segarra
+
+### Changed 📦
+
+-   perf: CustomerBalance by:Javier Segarra
+-   perf: CustomerBasicData by:Javier Segarra
+-   perf: CustomerBasicData.salesPersonFk by:Javier Segarra
+-   perf: CustomerSummary by:Javier Segarra
+-   perf: customerSummaryTable by:Javier Segarra
+-   perf: disable card option by:Javier Segarra
+-   perf: i18n by:Javier Segarra
+-   perf: improve by:Javier Segarra
+-   perf: improve style by:Javier Segarra
+-   perf: imrpove exprBuilder by:Javier Segarra
+-   perf: minor comments by:Javier Segarra
+-   perf: refs #6346 previous changes by:Jon
+-   perf: sendEmail customerConsumption by:Javier Segarra
+-   perf: solve reload CardSummary component by:Javier Segarra
+-   perf: update CustommerDescriptor by:Javier Segarra
+-   refactor: refs #4074 accept array by:jorgep
+-   refactor: refs #4074 rollback by:jorgep
+-   refactor: refs #4074 use acl & drop useless roles by:jorgep
+-   refactor: refs #4074 useAcl in navigationStore & router by:jorgep
+-   refactor: refs #4074 use fn (origin/4074-useAcls) by:jorgep
+-   refactor: refs #4074 use VnTitle by:jorgep
+-   refactor: refs #6346 deleted front error checking by:Jon
+-   refactor: refs #6346 requested changes by:Jon
+-   refactor: refs #6346 wagons to VnTable by:Jon
+-   refactor: refs #7500 deleted useless code by:Jon
+-   refactor: refs #7500 refactor vnimg when storage is dms by:Jon
+-   refactor: refs #7828 wip by:jorgep
+
+### Fixed 🛠️
+
+-   chore: refs #4074 fix tests by:jorgep
+-   chore: refs #7828 fix e2e by:jorgep
+-   feat: refs #7404 add m3 and fix detail by:pablone
+-   feat: translations fixed by:jgallego
+-   fix: #5938 grouped filter by:Javier Segarra
+-   fix: #6943 fix customerSummaryTable by:Javier Segarra
+-   fix: #6943 show nickname salesPerson by:Javier Segarra
+-   fix: address-create i18n by:Javier Segarra
+-   fix: comments (origin/6943_fix_customer_module, 6943_fix_customer_module) by:Javier Segarra
+-   fix: CusomerSummary to Address by:Javier Segarra
+-   fix: CustomerAddress mobile by:Javier Segarra
+-   fix: CustomerBillingData by:Javier Segarra
+-   fix: Customerconsumption by:Javier Segarra
+-   fix: customer credit opinion by:alexm
+-   fix: CustomerCreditOpinion workerDescriptor by:Javier Segarra
+-   fix: CustomerDescriptorAccount by:Javier Segarra
+-   fix: CustomerDescriptor.bussinessTypeFk by:Javier Segarra
+-   fix: CustomerFilter by:Javier Segarra
+-   fix: CustomerGreuges by:Javier Segarra
+-   fix: CustomerMandates by:Javier Segarra
+-   fix: Customer module find salesPersons out of first get by:Javier Segarra
+-   fix: CustomerRecovery transalate label by:Javier Segarra
+-   fix: CustomerSamples by:Javier Segarra
+-   fix: customerSummaryToTicketList button by:Javier Segarra
+-   fix: CustomerWebPayment by:Javier Segarra
+-   fix: CustommerSummaryTable Proxy by:Javier Segarra
+-   fix: deleted code by:Jon
+-   fix: duplicate code by:alexm
+-   fix: emit:updateModelValue by:Javier Segarra
+-   fix: fixed wagon tests by:Jon
+-   fix: fix wagon list reload by:Jon
+-   fix: i18n en preparation label by:Javier Segarra
+-   fix: infiniteScroll by:Javier Segarra
+-   fix: isFullMovable checkbox by:Javier Segarra
+-   fix: merge conflicts by:Javier Segarra
+-   fix: merge in dev by:alexm
+-   fix: missing code by:Jon
+-   fix: Options VnSelect properties by:Javier Segarra
+-   fix: refs #4074 await to watch by:jorgep
+-   fix: refs #4074 drop wrong acl by:jorgep
+-   fix: refs #4074 workerCard data-key by:jorgep
+-   fix: refs #6346 fix list and create by:pablone
+-   fix: refs #6943 prevent null (origin/6943-warmfix-preventNull) by:jorgep
+-   fix: refs #7155 remove userParams in watcher (7155-travel_daysOnward) by:alexm
+-   fix: refs #7155 use chip-locale (origin/7155-travel_daysOnward_2, 7155-travel_daysOnward_2) by:alexm
+-   fix: refs #7404 remove console.log by:pablone
+-   fix: refs #7404 remove from test by:pablone
+-   fix: refs #7404 remove some style by:pablone
+-   fix: refs #7404 revert commit prevent production access by:pablone
+-   fix: refs #7404 style non center pop up (origin/7404-fixFront) by:pablone
+-   fix: refs #7404 translates and some minor style fixes by:pablone
+-   fix: refs #7500 fixed e2e test by:Jon
+-   fix: refs #7500 fixed showing images wrongly by:Jon
+-   fix: refs #7830 customer credit by:pablone
+-   fix: refs #7830 remove console.log by:pablone
+-   fix: remove console.log by:pablone
+-   fix: remove FetchData by:Javier Segarra
+-   fix: remove FIXME (origin/6943_fix_customerSummaryTable) by:Javier Segarra
+-   fix: remove print variable by:Javier Segarra
+-   fix: remove promise execution by:Javier Segarra
+-   fix: reset VnTable scroll properties by:Javier Segarra
+-   fix: rule by:Javier Segarra
+-   fix: solve conflicts from master to test by:Javier Segarra
+-   fix: split params (origin/warmfix-addSearchUrl) by:jorgep
+-   fix: state cell by:Javier Segarra
+-   fix: stop call back event hasMoreData by:Javier Segarra
+-   fix: styles by:Javier Segarra
+-   fix: SupplierFiscalData VnLocation (origin/fix_supplierFD_location) by:Javier Segarra
+-   fix: VnLocation test by:Javier Segarra
+-   fix(VnTable): header background-color by:alexm
+-   fix(VnTable): sanitizer value is defined by:carlossa
+-   fix: wagon reload (origin/FixWagonRedirect) by:Jon
+-   fix: workerDms filter workerFk by:alexm
+-   fix(WorkerList): add type email by:alexm
+-   Merge remote-tracking branch 'origin/7830-customerDesplegables' into 6943_fix_customerSummaryTable by:Javier Segarra
+-   refs #7155 scopeDays fix (origin/7155-scopeDays) by:carlossa
+-   revert: vnUSerLink change by:Javier Segarra
+-   test: fix test (7677_vnLocation_perf) by:Javier Segarra
+
 # Version 24.38 - 2024-09-17
 
 ### Added 🆕

From 641a25097d874069ece59949e24e32ede213b0fb Mon Sep 17 00:00:00 2001
From: jgallego <jgallego@verdnatura.es>
Date: Thu, 3 Oct 2024 08:30:19 +0200
Subject: [PATCH 183/228] fix: refundInvoice

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

diff --git a/src/components/RefundInvoiceForm.vue b/src/components/RefundInvoiceForm.vue
index c21c892dd..9d9f0cff1 100644
--- a/src/components/RefundInvoiceForm.vue
+++ b/src/components/RefundInvoiceForm.vue
@@ -24,9 +24,9 @@ const { notify } = useNotify();
 
 const rectificativeTypeOptions = ref([]);
 const siiTypeInvoiceOutsOptions = ref([]);
-const inheritWarehouse = ref(true);
 const invoiceParams = reactive({
     id: $props.invoiceOutData?.id,
+    inheritWarehouse: true,
 });
 const invoiceCorrectionTypesOptions = ref([]);
 
@@ -138,7 +138,7 @@ const refund = async () => {
                     <div>
                         <QCheckbox
                             :label="t('Inherit warehouse')"
-                            v-model="inheritWarehouse"
+                            v-model="invoiceParams.inheritWarehouse"
                         />
                         <QIcon name="info" class="cursor-info q-ml-sm" size="sm">
                             <QTooltip>{{ t('Inherit warehouse tooltip') }}</QTooltip>

From df64814c57da5fdc7331df94cec28be2004bf83e Mon Sep 17 00:00:00 2001
From: jgallego <jgallego@verdnatura.es>
Date: Thu, 3 Oct 2024 08:31:13 +0200
Subject: [PATCH 184/228] fix: hotfix refund invoice

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

diff --git a/src/components/RefundInvoiceForm.vue b/src/components/RefundInvoiceForm.vue
index c21c892dd..9d9f0cff1 100644
--- a/src/components/RefundInvoiceForm.vue
+++ b/src/components/RefundInvoiceForm.vue
@@ -24,9 +24,9 @@ const { notify } = useNotify();
 
 const rectificativeTypeOptions = ref([]);
 const siiTypeInvoiceOutsOptions = ref([]);
-const inheritWarehouse = ref(true);
 const invoiceParams = reactive({
     id: $props.invoiceOutData?.id,
+    inheritWarehouse: true,
 });
 const invoiceCorrectionTypesOptions = ref([]);
 
@@ -138,7 +138,7 @@ const refund = async () => {
                     <div>
                         <QCheckbox
                             :label="t('Inherit warehouse')"
-                            v-model="inheritWarehouse"
+                            v-model="invoiceParams.inheritWarehouse"
                         />
                         <QIcon name="info" class="cursor-info q-ml-sm" size="sm">
                             <QTooltip>{{ t('Inherit warehouse tooltip') }}</QTooltip>

From ad8b72660fa80917f02598ad823ad0fe15fea3dd Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Thu, 3 Oct 2024 13:37:21 +0200
Subject: [PATCH 185/228] fix: refs #7353 scopeDays

---
 src/pages/Monitor/Ticket/MonitorTickets.vue | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/pages/Monitor/Ticket/MonitorTickets.vue b/src/pages/Monitor/Ticket/MonitorTickets.vue
index 16d5abffb..d24230c64 100644
--- a/src/pages/Monitor/Ticket/MonitorTickets.vue
+++ b/src/pages/Monitor/Ticket/MonitorTickets.vue
@@ -25,7 +25,11 @@ const stateOpts = ref([]);
 const zoneOpts = ref([]);
 const visibleColumns = ref([]);
 const { viewSummary } = useSummaryDialog();
-const [from, to] = dateRange(Date.vnNew());
+const from = Date.vnNew();
+from.setHours(0, 0, 0, 0);
+const to = new Date(from.getTime());
+to.setDate(to.getDate() + 1);
+to.setHours(23, 59, 59, 999);
 
 function exprBuilder(param, value) {
     switch (param) {

From 530ed4b716b55aa2ddb5365baddadc5694f2281f Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Fri, 4 Oct 2024 08:48:36 +0200
Subject: [PATCH 186/228] refs #7355 fix searchbar

---
 src/pages/Account/AccountList.vue      | 25 +++++++++----------------
 src/pages/Account/Card/AccountCard.vue |  2 +-
 2 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/src/pages/Account/AccountList.vue b/src/pages/Account/AccountList.vue
index d698596b9..d1240f7a6 100644
--- a/src/pages/Account/AccountList.vue
+++ b/src/pages/Account/AccountList.vue
@@ -5,7 +5,8 @@ import VnTable from 'components/VnTable/VnTable.vue';
 import VnSearchbar from 'components/ui/VnSearchbar.vue';
 import AccountSummary from './Card/AccountSummary.vue';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
-
+import AccountFilter from './AccountFilter.vue';
+import RightMenu from 'src/components/common/RightMenu.vue';
 const { t } = useI18n();
 const { viewSummary } = useSummaryDialog();
 const tableRef = ref();
@@ -18,14 +19,6 @@ const columns = computed(() => [
         isId: true,
         field: 'id',
         cardVisible: true,
-        columnFilter: {
-            component: 'select',
-            name: 'search',
-            attrs: {
-                url: 'VnUsers/preview',
-                fields: ['id', 'name'],
-            },
-        },
     },
     {
         align: 'left',
@@ -36,9 +29,6 @@ const columns = computed(() => [
         columnField: {
             component: null,
         },
-        columnFilter: {
-            inWhere: true,
-        },
         cardVisible: true,
         create: true,
     },
@@ -50,9 +40,6 @@ const columns = computed(() => [
         columnField: {
             component: null,
         },
-        columnFilter: {
-            inWhere: true,
-        },
         cardVisible: true,
         create: true,
     },
@@ -105,7 +92,11 @@ const exprBuilder = (param, value) => {
         :label="t('account.search')"
         :info="t('account.searchInfo')"
     />
-
+    <RightMenu>
+        <template #right-panel>
+            <AccountFilter data-key="AccountUsers" />
+        </template>
+    </RightMenu>
     <VnTable
         ref="tableRef"
         data-key="AccountUsers"
@@ -115,6 +106,8 @@ const exprBuilder = (param, value) => {
         default-mode="table"
         redirect="account"
         :use-model="true"
+        :right-search="false"
+        auto-load
     />
 </template>
 
diff --git a/src/pages/Account/Card/AccountCard.vue b/src/pages/Account/Card/AccountCard.vue
index 67fa15898..119a7fd07 100644
--- a/src/pages/Account/Card/AccountCard.vue
+++ b/src/pages/Account/Card/AccountCard.vue
@@ -10,7 +10,7 @@ const { t } = useI18n();
     <VnCard
         data-key="Account"
         :descriptor="AccountDescriptor"
-        search-data-key="AccountUsers"
+        search-data-key="AccountList"
         :searchbar-props="{
             url: 'VnUsers/preview',
             label: t('account.search'),

From 7874db16475955b92f1b8bbe4efd2bf5caa684d6 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Fri, 4 Oct 2024 09:58:23 +0200
Subject: [PATCH 187/228] fix: zone delivery postcodes filter and order catalog
 type filter

---
 src/pages/Order/Card/OrderCatalogFilter.vue | 1 +
 src/pages/Zone/ZoneDeliveryPanel.vue        | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/pages/Order/Card/OrderCatalogFilter.vue b/src/pages/Order/Card/OrderCatalogFilter.vue
index 354c44747..6de43e86a 100644
--- a/src/pages/Order/Card/OrderCatalogFilter.vue
+++ b/src/pages/Order/Card/OrderCatalogFilter.vue
@@ -247,6 +247,7 @@ function addOrder(value, field, params) {
                         rounded
                         emit-value
                         use-input
+                        sort-by="name ASC"
                         :disable="!selectedCategoryFk"
                         @update:model-value="
                             (value) => {
diff --git a/src/pages/Zone/ZoneDeliveryPanel.vue b/src/pages/Zone/ZoneDeliveryPanel.vue
index d6c96b935..088811b01 100644
--- a/src/pages/Zone/ZoneDeliveryPanel.vue
+++ b/src/pages/Zone/ZoneDeliveryPanel.vue
@@ -94,7 +94,7 @@ watch(
                 url="Postcodes/location"
                 :fields="['geoFk', 'code', 'townFk', 'countryFk']"
                 sort-by="code, townFk"
-                option-value="geoFk"
+                option-value="code"
                 option-label="code"
                 option-filter="code"
                 hide-selected

From 195747b5a0e938f3fe89779a4775ddeb79e22f72 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Fri, 4 Oct 2024 12:34:37 +0200
Subject: [PATCH 188/228] feat: added click and transfer tickets and deleted
 useless code

---
 src/pages/Ticket/Card/TicketTransfer.vue     | 38 ++++++--------------
 src/pages/Ticket/Card/TicketTransferForm.vue |  7 ++--
 2 files changed, 14 insertions(+), 31 deletions(-)

diff --git a/src/pages/Ticket/Card/TicketTransfer.vue b/src/pages/Ticket/Card/TicketTransfer.vue
index 1944b80f4..e1a011a84 100644
--- a/src/pages/Ticket/Card/TicketTransfer.vue
+++ b/src/pages/Ticket/Card/TicketTransfer.vue
@@ -1,13 +1,11 @@
 <script setup>
 import { ref, computed, onMounted } from 'vue';
 import { useI18n } from 'vue-i18n';
-import { useRouter } from 'vue-router';
 
 import VnInput from 'src/components/common/VnInput.vue';
 import TicketTransferForm from './TicketTransferForm.vue';
 
 import { toDateFormat } from 'src/filters/date.js';
-import axios from 'axios';
 
 const $props = defineProps({
     mana: {
@@ -28,13 +26,10 @@ const $props = defineProps({
     },
 });
 
-const emit = defineEmits(['refreshData']);
-
-const router = useRouter();
 const { t } = useI18n();
 const QPopupProxyRef = ref(null);
-
-const _transfer = ref(null);
+const transferFormRef = ref(null);
+const _transfer = ref();
 
 const transferLinesColumns = computed(() => [
     {
@@ -85,19 +80,11 @@ const destinationTicketColumns = computed(() => [
     },
 ]);
 
-const transferSales = async (ticketId) => {
-    const params = {
-        ticketId: ticketId,
-        sales: $props.transfer.sales,
-    };
-
-    const { data } = await axios.post(
-        `tickets/${$props.ticket.id}/transferSales`,
-        params
-    );
-
-    if (data && data.id === $props.ticket.id) emit('refreshData');
-    else router.push({ name: 'TicketSale', params: { id: data.id } });
+const handleRowClick = (row) => {
+    const ticketId = row.id;
+    if (transferFormRef.value) {
+        transferFormRef.value.transferSales(ticketId);
+    }
 };
 
 onMounted(() => (_transfer.value = $props.transfer));
@@ -105,9 +92,8 @@ onMounted(() => (_transfer.value = $props.transfer));
 
 <template>
     <QPopupProxy ref="QPopupProxyRef">
-        <QCard class="q-px-md" style="display: flex">
+        <QCard class="q-px-md" style="display: flex; width: 80vw">
             <QTable
-                v-if="transfer.sales"
                 :rows="transfer.sales"
                 :columns="transferLinesColumns"
                 :title="t('Sales to transfer')"
@@ -121,9 +107,6 @@ onMounted(() => (_transfer.value = $props.transfer));
                         <VnInput
                             v-model.number="row.quantity"
                             :clearable="false"
-                            @keyup.enter="changeQuantity(row)"
-                            @blur="changeQuantity(row)"
-                            @focus="edit.oldQuantity = row.quantity"
                             style="max-width: 60px"
                         />
                     </QTd>
@@ -137,6 +120,7 @@ onMounted(() => (_transfer.value = $props.transfer));
                 :title="t('Destination ticket')"
                 row-key="id"
                 class="full-width q-mt-md"
+                @row-click="(_, row) => handleRowClick(row)"
             >
                 <template #body-cell-address="{ row }">
                     <QTd @click.stop>
@@ -158,10 +142,10 @@ onMounted(() => (_transfer.value = $props.transfer));
                 </template>
 
                 <template #no-data>
-                    <TicketTransferForm v-bind="$props" />
+                    <TicketTransferForm ref="transferFormRef" v-bind="$props" />
                 </template>
                 <template #bottom>
-                    <TicketTransferForm v-bind="$props" />
+                    <TicketTransferForm ref="transferFormRef" v-bind="$props" />
                 </template>
             </QTable>
         </QCard>
diff --git a/src/pages/Ticket/Card/TicketTransferForm.vue b/src/pages/Ticket/Card/TicketTransferForm.vue
index 9507429e6..d07a9d2e7 100644
--- a/src/pages/Ticket/Card/TicketTransferForm.vue
+++ b/src/pages/Ticket/Card/TicketTransferForm.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { ref, onMounted } from 'vue';
+import { ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRouter } from 'vue-router';
 
@@ -31,7 +31,7 @@ const emit = defineEmits(['refreshData']);
 const router = useRouter();
 const { t } = useI18n();
 
-const _transfer = ref(null);
+const _transfer = ref($props.transfer);
 
 const transferSales = async (ticketId) => {
     const params = {
@@ -48,11 +48,10 @@ const transferSales = async (ticketId) => {
     else router.push({ name: 'TicketSale', params: { id: data.id } });
 };
 
-onMounted(() => (_transfer.value = $props.transfer));
+defineExpose({ transferSales });
 </script>
 
 <template>
-    {{ _transfer }}
     <QForm class="q-mt-lg full-width">
         <VnInput
             v-model.number="_transfer.ticketId"

From 3a21f6aadb5d3aa50fdff0d85d1c2e81532f5f87 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Fri, 4 Oct 2024 14:22:00 +0200
Subject: [PATCH 189/228] fix: order catalog

---
 src/pages/Order/Card/OrderCatalog.vue         |  1 +
 .../Order/Card/OrderCatalogItemDialog.vue     | 21 +++++++++++++++++--
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/src/pages/Order/Card/OrderCatalog.vue b/src/pages/Order/Card/OrderCatalog.vue
index 68bf9511f..b13e8661d 100644
--- a/src/pages/Order/Card/OrderCatalog.vue
+++ b/src/pages/Order/Card/OrderCatalog.vue
@@ -130,4 +130,5 @@ function extractValueTags(items) {
 <i18n>
 es:
     You can search items by name or id: Puedes buscar items por nombre o id
+    Search items: Buscar items
 </i18n>
diff --git a/src/pages/Order/Card/OrderCatalogItemDialog.vue b/src/pages/Order/Card/OrderCatalogItemDialog.vue
index 46a50c021..09a25fcb8 100644
--- a/src/pages/Order/Card/OrderCatalogItemDialog.vue
+++ b/src/pages/Order/Card/OrderCatalogItemDialog.vue
@@ -20,8 +20,10 @@ const props = defineProps({
 
 const fields = ref((props.prices || []).map((item) => ({ ...item, quantity: 0 })));
 const descriptorData = useArrayData('orderData');
-
+const isLoading = ref(false);
 const addToOrder = async () => {
+    if (isLoading.value) return;
+    isLoading.value = true;
     const items = (fields.value || []).filter((item) => Number(item.quantity) > 0);
     await axios.post('/OrderRows/addToOrder', {
         items,
@@ -30,6 +32,10 @@ const addToOrder = async () => {
     notify(t('globals.dataSaved'), 'positive');
     emit('added');
     descriptorData.fetch({});
+    isLoading.value = false;
+};
+const canAddToOrder = () => {
+    return (fields.value || []).some((item) => Number(item.quantity) > 0);
 };
 </script>
 
@@ -68,7 +74,11 @@ const addToOrder = async () => {
                 </tbody>
             </QMarkupTable>
             <div class="flex justify-center q-mt-lg">
-                <QBtn color="primary" type="submit">
+                <QBtn
+                    color="primary"
+                    type="submit"
+                    :disable="!isLoading && !canAddToOrder()"
+                >
                     {{ t('globals.add') }}
                 </QBtn>
             </div>
@@ -81,3 +91,10 @@ const addToOrder = async () => {
     width: 200px;
 }
 </style>
+
+<i18n>
+es:
+    noAmount: La cantidad no puede ser 0
+en:
+    noAmount: Amount can not be 0
+</i18n>

From c3c252834280561e6814cfb2e392516736fd95a0 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Sat, 5 Oct 2024 00:31:32 +0200
Subject: [PATCH 190/228] feat: #7356 improve NotesSummary

---
 src/pages/Ticket/Card/TicketSummary.vue | 37 +++++++++++++++----------
 1 file changed, 22 insertions(+), 15 deletions(-)

diff --git a/src/pages/Ticket/Card/TicketSummary.vue b/src/pages/Ticket/Card/TicketSummary.vue
index 2e85be000..8f359f649 100644
--- a/src/pages/Ticket/Card/TicketSummary.vue
+++ b/src/pages/Ticket/Card/TicketSummary.vue
@@ -17,6 +17,7 @@ import VnUserLink from 'src/components/ui/VnUserLink.vue';
 import VnTitle from 'src/components/common/VnTitle.vue';
 import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
+import { QVirtualScroll } from 'quasar';
 
 const route = useRoute();
 const { notify } = useNotify();
@@ -229,22 +230,28 @@ async function changeState(value) {
                     :url="ticketUrl + 'observation'"
                     :text="t('ticket.pageTitles.notes')"
                 />
-                <VnLv
-                    v-for="note in entity.notes"
-                    :key="note.id"
-                    :label="note.observationType.description"
-                    :value="note.description"
+                <QVirtualScroll
+                    :items="entity.notes"
+                    v-slot="{ item, index }"
+                    style="max-height: 300px"
+                    separator
+                >
+                    <QItem
+                        :key="index"
+                        class="vn-label-value"
+                        style="
+                            display: inline-block;
+                            padding: unset;
+                            min-height: max-content;
+                        "
+                    >
+                        <span class="label" style="margin-right: 4px">
+                            {{ item.observationType.description }}:</span
+                        >
+
+                        <span>{{ item.description }}</span>
+                    </QItem></QVirtualScroll
                 >
-                    <template #value>
-                        <QInput
-                            v-model="note.description"
-                            filled
-                            type="textarea"
-                            class="notes"
-                            readonly
-                        />
-                    </template>
-                </VnLv>
             </QCard>
             <QCard class="vn-one">
                 <VnTitle :text="t('ticket.summary.summaryAmount')" />

From 04b2a4d9cec12c2d5e7a572e01a699114501b119 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Sat, 5 Oct 2024 00:31:41 +0200
Subject: [PATCH 191/228] perf: clean warnings

---
 src/components/VnTable/VnTable.vue                     | 2 +-
 src/components/common/VnSelectDialog.vue               | 2 +-
 src/pages/InvoiceOut/Card/InvoiceOutDescriptorMenu.vue | 3 ---
 src/pages/Order/Card/OrderCreateDialog.vue             | 4 +---
 src/pages/Ticket/Card/TicketSummary.vue                | 1 -
 5 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index 3ed741ac4..f18892a31 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -310,7 +310,7 @@ defineExpose({
     params,
 });
 
-function handleOnDataSaved(_, res) {
+function handleOnDataSaved(_) {
     if (_.onDataSaved) _.onDataSaved({ CrudModelRef: CrudModelRef.value });
     else $props.create.onDataSaved(_);
 }
diff --git a/src/components/common/VnSelectDialog.vue b/src/components/common/VnSelectDialog.vue
index 17f893255..350aa9272 100644
--- a/src/components/common/VnSelectDialog.vue
+++ b/src/components/common/VnSelectDialog.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { ref, computed } from 'vue';
+import { computed } from 'vue';
 import { useRole } from 'src/composables/useRole';
 import { useAcl } from 'src/composables/useAcl';
 
diff --git a/src/pages/InvoiceOut/Card/InvoiceOutDescriptorMenu.vue b/src/pages/InvoiceOut/Card/InvoiceOutDescriptorMenu.vue
index 08b21fb4a..70d38cb93 100644
--- a/src/pages/InvoiceOut/Card/InvoiceOutDescriptorMenu.vue
+++ b/src/pages/InvoiceOut/Card/InvoiceOutDescriptorMenu.vue
@@ -9,7 +9,6 @@ import RefundInvoiceForm from 'src/components/RefundInvoiceForm.vue';
 import SendEmailDialog from 'components/common/SendEmailDialog.vue';
 
 import useNotify from 'src/composables/useNotify';
-import { useSession } from 'src/composables/useSession';
 import { usePrintService } from 'composables/usePrintService';
 import { useVnConfirm } from 'composables/useVnConfirm';
 import { getUrl } from 'src/composables/getUrl';
@@ -30,8 +29,6 @@ const $props = defineProps({
 
 const { notify } = useNotify();
 const router = useRouter();
-const session = useSession();
-const token = session.getToken();
 const { t } = useI18n();
 const { openReport, sendEmail } = usePrintService();
 const { openConfirmationModal } = useVnConfirm();
diff --git a/src/pages/Order/Card/OrderCreateDialog.vue b/src/pages/Order/Card/OrderCreateDialog.vue
index 9d5c9281e..27b0171f2 100644
--- a/src/pages/Order/Card/OrderCreateDialog.vue
+++ b/src/pages/Order/Card/OrderCreateDialog.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { useRoute, useRouter } from 'vue-router';
+import { useRouter } from 'vue-router';
 import { onMounted, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import axios from 'axios';
@@ -13,12 +13,10 @@ import { reactive } from 'vue';
 import FetchData from 'components/FetchData.vue';
 
 const { t } = useI18n();
-const route = useRoute();
 const state = useState();
 const ORDER_MODEL = 'order';
 
 const router = useRouter();
-const clientList = ref([]);
 const agencyList = ref([]);
 const addressList = ref([]);
 defineEmits(['confirm', ...useDialogPluginComponent.emits]);
diff --git a/src/pages/Ticket/Card/TicketSummary.vue b/src/pages/Ticket/Card/TicketSummary.vue
index 8f359f649..1f2a7ca79 100644
--- a/src/pages/Ticket/Card/TicketSummary.vue
+++ b/src/pages/Ticket/Card/TicketSummary.vue
@@ -17,7 +17,6 @@ import VnUserLink from 'src/components/ui/VnUserLink.vue';
 import VnTitle from 'src/components/common/VnTitle.vue';
 import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
-import { QVirtualScroll } from 'quasar';
 
 const route = useRoute();
 const { notify } = useNotify();

From 34a40dd87c9c24d71f90e94d892678fca5fe4259 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Mon, 7 Oct 2024 08:24:53 +0200
Subject: [PATCH 192/228] fix(VnPaginate): use default value

---
 src/components/ui/VnPaginate.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/ui/VnPaginate.vue b/src/components/ui/VnPaginate.vue
index c6f57b479..80c607214 100644
--- a/src/components/ui/VnPaginate.vue
+++ b/src/components/ui/VnPaginate.vue
@@ -56,7 +56,7 @@ const props = defineProps({
     },
     offset: {
         type: Number,
-        default: 0,
+        default: undefined,
     },
     skeleton: {
         type: Boolean,

From 5d65d3e20cfbe5f96e42978a17f9b9e7d4df2883 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Mon, 7 Oct 2024 09:48:57 +0200
Subject: [PATCH 193/228] refs #6898 hotfix agency

---
 src/pages/Supplier/Card/SupplierAgencyTermCreate.vue | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/pages/Supplier/Card/SupplierAgencyTermCreate.vue b/src/pages/Supplier/Card/SupplierAgencyTermCreate.vue
index a87ea502b..515d157e5 100644
--- a/src/pages/Supplier/Card/SupplierAgencyTermCreate.vue
+++ b/src/pages/Supplier/Card/SupplierAgencyTermCreate.vue
@@ -15,12 +15,12 @@ const route = useRoute();
 const agenciesOptions = ref(null);
 const newAgencyTermForm = reactive({
     agencyFk: null,
-    minimumM3: null,
-    packagePrice: null,
-    kmPrice: null,
-    m3Price: null,
-    routePrice: null,
-    minimumKm: null,
+    minimumM3: 0,
+    packagePrice: 0,
+    kmPrice: 0,
+    m3Price: 0,
+    routePrice: 0,
+    minimumKm: 0,
     supplierFk: route.params.id,
 });
 

From e396cd0cac48bf8bf5761d575758489e69a93102 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Mon, 7 Oct 2024 12:16:32 +0200
Subject: [PATCH 194/228] hotfix: routePrice null

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

diff --git a/src/pages/Supplier/Card/SupplierAgencyTermCreate.vue b/src/pages/Supplier/Card/SupplierAgencyTermCreate.vue
index 515d157e5..038eaa356 100644
--- a/src/pages/Supplier/Card/SupplierAgencyTermCreate.vue
+++ b/src/pages/Supplier/Card/SupplierAgencyTermCreate.vue
@@ -19,7 +19,7 @@ const newAgencyTermForm = reactive({
     packagePrice: 0,
     kmPrice: 0,
     m3Price: 0,
-    routePrice: 0,
+    routePrice: null,
     minimumKm: 0,
     supplierFk: route.params.id,
 });

From 0ed9fdd55da1c3939848129bc0c7b72daa3660b8 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 7 Oct 2024 13:02:40 +0200
Subject: [PATCH 195/228] fix: refs VnImg zoom resolution missing property

---
 src/components/ui/CatalogItem.vue    | 2 +-
 src/pages/Item/ItemList.vue          | 3 +--
 src/pages/Order/Card/OrderLines.vue  | 6 +++++-
 src/pages/Ticket/Card/TicketSale.vue | 2 +-
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/components/ui/CatalogItem.vue b/src/components/ui/CatalogItem.vue
index 545bfbbb4..7dca19770 100644
--- a/src/components/ui/CatalogItem.vue
+++ b/src/components/ui/CatalogItem.vue
@@ -31,7 +31,7 @@ const dialog = ref(null);
     <div class="container order-catalog-item overflow-hidden">
         <QCard class="card shadow-6">
             <div class="img-wrapper">
-                <VnImg :id="item.id" class="image" />
+                <VnImg :id="item.id" class="image" zoom-resolution="1600x900" />
                 <div v-if="item.hex && isCatalog" class="item-color-container">
                     <div
                         class="item-color"
diff --git a/src/pages/Item/ItemList.vue b/src/pages/Item/ItemList.vue
index e3fcceb3a..ae4c9531c 100644
--- a/src/pages/Item/ItemList.vue
+++ b/src/pages/Item/ItemList.vue
@@ -491,9 +491,8 @@ onUnmounted(() => (stateStore.rightDrawer = false));
                         <QTd>
                             <VnImg
                                 size="50x50"
+                                zoom-resolution="1600x900"
                                 :id="row.id"
-                                height="50px"
-                                width="50px"
                                 class="image"
                             />
                         </QTd>
diff --git a/src/pages/Order/Card/OrderLines.vue b/src/pages/Order/Card/OrderLines.vue
index 17a157797..0223aa9c6 100644
--- a/src/pages/Order/Card/OrderLines.vue
+++ b/src/pages/Order/Card/OrderLines.vue
@@ -278,7 +278,11 @@ watch(
     >
         <template #column-image="{ row }">
             <div class="image-wrapper">
-                <VnImg :id="parseInt(row?.item?.image)" class="rounded" />
+                <VnImg
+                    :id="parseInt(row?.item?.image)"
+                    class="rounded"
+                    zoom-resolution="1600x900"
+                />
             </div>
         </template>
         <template #column-id="{ row }">
diff --git a/src/pages/Ticket/Card/TicketSale.vue b/src/pages/Ticket/Card/TicketSale.vue
index f86863f05..f179257f7 100644
--- a/src/pages/Ticket/Card/TicketSale.vue
+++ b/src/pages/Ticket/Card/TicketSale.vue
@@ -591,7 +591,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
         <template #body-cell-picture="{ row }">
             <QTd>
                 <div class="image-wrapper">
-                    <VnImg :id="row.itemFk" class="rounded" />
+                    <VnImg :id="row.itemFk" class="rounded" zoom-resolution="1600x900" />
                 </div>
             </QTd>
         </template>

From 56fff55f71bc97c59d1300144adcfee69f3241cf Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Tue, 8 Oct 2024 09:26:00 +0200
Subject: [PATCH 196/228] fix: unnecessary property

---
 src/pages/Item/Card/ItemTags.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/pages/Item/Card/ItemTags.vue b/src/pages/Item/Card/ItemTags.vue
index 1b5eb28f0..6f31d0cf8 100644
--- a/src/pages/Item/Card/ItemTags.vue
+++ b/src/pages/Item/Card/ItemTags.vue
@@ -171,7 +171,6 @@ const insertTag = (rows) => {
                             <QBtn
                                 @click="insertTag(rows)"
                                 class="cursor-pointer"
-                                :disable="!validRow"
                                 color="primary"
                                 flat
                                 icon="add"

From cfe95df9e84c5841077bdcb480459a19940dfd7c Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Thu, 10 Oct 2024 09:46:07 +0200
Subject: [PATCH 197/228] fix: refs #7524 use dynamic load

---
 src/pages/Ticket/TicketCreateDialog.vue | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/src/pages/Ticket/TicketCreateDialog.vue b/src/pages/Ticket/TicketCreateDialog.vue
index 1493adc53..4138884bf 100644
--- a/src/pages/Ticket/TicketCreateDialog.vue
+++ b/src/pages/Ticket/TicketCreateDialog.vue
@@ -27,7 +27,6 @@ const initialFormState = reactive({
     warehouseId: user.value.warehouseFk,
     landed: null,
 });
-const clientOptions = ref([]);
 const agenciesOptions = ref([]);
 const addressesOptions = ref([]);
 const warehousesOptions = ref([]);
@@ -111,12 +110,6 @@ const redirectToTicketList = (_, { id }) => {
 </script>
 
 <template>
-    <FetchData
-        url="Clients"
-        @on-fetch="(data) => (clientOptions = data)"
-        :filter="{ fields: ['id', 'name', 'defaultAddressFk'], order: 'id' }"
-        auto-load
-    />
     <FetchData
         url="Warehouses"
         @on-fetch="(data) => (warehousesOptions = data)"
@@ -137,7 +130,9 @@ const redirectToTicketList = (_, { id }) => {
                     <VnSelect
                         :label="t('ticket.create.client')"
                         v-model="data.clientId"
-                        :options="clientOptions"
+                        url="Clients"
+                        :fields="['id', 'name', 'defaultAddressFk']"
+                        sort-by="id"
                         option-value="id"
                         option-label="name"
                         hide-selected

From e58818e89116805f718e2b6e0ec1c1f3d7878736 Mon Sep 17 00:00:00 2001
From: Jon Elias <jon@verdnatura.es>
Date: Thu, 10 Oct 2024 08:14:24 +0000
Subject: [PATCH 198/228] fix: Use geoFk for ZoneDeliveryPanel

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

diff --git a/src/pages/Zone/ZoneDeliveryPanel.vue b/src/pages/Zone/ZoneDeliveryPanel.vue
index 088811b01..8057f4ba4 100644
--- a/src/pages/Zone/ZoneDeliveryPanel.vue
+++ b/src/pages/Zone/ZoneDeliveryPanel.vue
@@ -94,9 +94,10 @@ watch(
                 url="Postcodes/location"
                 :fields="['geoFk', 'code', 'townFk', 'countryFk']"
                 sort-by="code, townFk"
-                option-value="code"
+                option-value="geoFk"
                 option-label="code"
                 option-filter="code"
+                option-filter-value="code"
                 hide-selected
                 dense
                 outlined

From 8b68c0afeb3ac857c8fb70a7b92ea4d2f1296836 Mon Sep 17 00:00:00 2001
From: Jon Elias <jon@verdnatura.es>
Date: Thu, 10 Oct 2024 08:30:56 +0000
Subject: [PATCH 199/228] fix: improve geoFk for ZoneDeliveryPanel

---
 src/pages/Zone/ZoneDeliveryPanel.vue | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/pages/Zone/ZoneDeliveryPanel.vue b/src/pages/Zone/ZoneDeliveryPanel.vue
index 8057f4ba4..423095d6e 100644
--- a/src/pages/Zone/ZoneDeliveryPanel.vue
+++ b/src/pages/Zone/ZoneDeliveryPanel.vue
@@ -96,8 +96,7 @@ watch(
                 sort-by="code, townFk"
                 option-value="geoFk"
                 option-label="code"
-                option-filter="code"
-                option-filter-value="code"
+                :filter-options="['code', 'geoFk']"
                 hide-selected
                 dense
                 outlined

From 6a624b12a5a8f37325d08781b48e6cccaec17b97 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Mon, 14 Oct 2024 09:28:51 +0200
Subject: [PATCH 200/228] refs: #6898 hotfix accounts

---
 src/pages/Supplier/Card/SupplierAccounts.vue | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/pages/Supplier/Card/SupplierAccounts.vue b/src/pages/Supplier/Card/SupplierAccounts.vue
index 177466478..bc009d3ad 100644
--- a/src/pages/Supplier/Card/SupplierAccounts.vue
+++ b/src/pages/Supplier/Card/SupplierAccounts.vue
@@ -99,7 +99,11 @@ const setWireTransfer = async () => {
                     :key="index"
                     class="row q-gutter-md q-mb-md"
                 >
-                    <VnInput :label="t('supplier.accounts.iban')" v-model="row.iban">
+                    <VnInput
+                        :label="t('supplier.accounts.iban')"
+                        v-model="row.iban"
+                        :required="true"
+                    >
                         <template #append>
                             <QIcon name="info" class="cursor-info">
                                 <QTooltip>{{ t('components.iban_tooltip') }}</QTooltip>
@@ -113,6 +117,7 @@ const setWireTransfer = async () => {
                         option-label="bic"
                         option-value="id"
                         hide-selected
+                        :required="true"
                         :roles-allowed-to-create="['financial']"
                     >
                         <template #form>

From 85b068eddb3262e762b403a286cdbcdb49895eab Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Mon, 14 Oct 2024 10:21:02 +0200
Subject: [PATCH 201/228] refs #6898 #6899 hotfix lists

---
 src/pages/InvoiceOut/InvoiceOutList.vue | 8 ++++++++
 src/pages/Supplier/SupplierList.vue     | 8 ++++++++
 2 files changed, 16 insertions(+)

diff --git a/src/pages/InvoiceOut/InvoiceOutList.vue b/src/pages/InvoiceOut/InvoiceOutList.vue
index 5157d957b..09de62b27 100644
--- a/src/pages/InvoiceOut/InvoiceOutList.vue
+++ b/src/pages/InvoiceOut/InvoiceOutList.vue
@@ -13,6 +13,8 @@ import { toCurrency, toDate } from 'src/filters/index';
 import { useStateStore } from 'stores/useStateStore';
 import { QBtn } from 'quasar';
 import CustomerDescriptorProxy from '../Customer/Card/CustomerDescriptorProxy.vue';
+import RightMenu from 'src/components/common/RightMenu.vue';
+import InvoiceOutFilter from './InvoiceOutFilter.vue';
 
 const { t } = useI18n();
 const stateStore = useStateStore();
@@ -179,6 +181,11 @@ watchEffect(selectedRows);
         :label="t('searchInvoice')"
         data-key="invoiceOut"
     />
+    <RightMenu>
+        <template #right-panel>
+            <InvoiceOutFilter data-key="invoiceOut" />
+        </template>
+    </RightMenu>
     <VnSubToolbar>
         <template #st-actions>
             <QBtn
@@ -203,6 +210,7 @@ watchEffect(selectedRows);
                 active: true,
             },
         }"
+        :right-search="false"
         v-model:selected="selectedRows"
         order="id DESC"
         :columns="columns"
diff --git a/src/pages/Supplier/SupplierList.vue b/src/pages/Supplier/SupplierList.vue
index ad668f0c0..ea79947a4 100644
--- a/src/pages/Supplier/SupplierList.vue
+++ b/src/pages/Supplier/SupplierList.vue
@@ -3,6 +3,8 @@ import { computed, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import VnTable from 'components/VnTable/VnTable.vue';
 import VnSearchbar from 'components/ui/VnSearchbar.vue';
+import RightMenu from 'src/components/common/RightMenu.vue';
+import SupplierListFilter from './SupplierListFilter.vue';
 
 const { t } = useI18n();
 const tableRef = ref();
@@ -93,6 +95,11 @@ const columns = computed(() => [
 
 <template>
     <VnSearchbar data-key="SuppliersList" :limit="20" :label="t('Search suppliers')" />
+    <RightMenu>
+        <template #right-panel>
+            <SupplierListFilter data-key="SuppliersList" />
+        </template>
+    </RightMenu>
     <VnTable
         ref="tableRef"
         data-key="SuppliersList"
@@ -109,6 +116,7 @@ const columns = computed(() => [
                 return data;
             },
         }"
+        :right-search="false"
         order="id ASC"
         :columns="columns"
         auto-load

From 4b78c1acd001fff12223ba5323a254571ada921d Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 14 Oct 2024 12:00:05 +0200
Subject: [PATCH 202/228] fix: refs #7524 dynamic

---
 src/components/common/VnSelect.vue            |  2 ++
 .../Department/Card/DepartmentBasicData.vue   | 15 ++---------
 src/pages/InvoiceOut/InvoiceOutFilter.vue     | 15 -----------
 src/pages/Item/ItemTypeCreate.vue             | 11 +++-----
 src/pages/ItemType/Card/ItemTypeBasicData.vue | 11 +++-----
 src/pages/Order/Card/OrderCreateDialog.vue    | 13 ++++------
 src/pages/Order/Card/OrderFilter.vue          | 12 ---------
 src/pages/Shelving/Card/ShelvingFilter.vue    | 15 -----------
 src/pages/Ticket/TicketFilter.vue             | 26 ++++++-------------
 9 files changed, 23 insertions(+), 97 deletions(-)

diff --git a/src/components/common/VnSelect.vue b/src/components/common/VnSelect.vue
index aa629767d..952b7dd8c 100644
--- a/src/components/common/VnSelect.vue
+++ b/src/components/common/VnSelect.vue
@@ -227,6 +227,8 @@ function nullishToTrue(value) {
 }
 
 const getVal = (val) => ($props.useLike ? { like: `%${val}%` } : val);
+
+defineExpose({ opts: myOptions });
 </script>
 
 <template>
diff --git a/src/pages/Department/Card/DepartmentBasicData.vue b/src/pages/Department/Card/DepartmentBasicData.vue
index 98abfd6b9..141bb4159 100644
--- a/src/pages/Department/Card/DepartmentBasicData.vue
+++ b/src/pages/Department/Card/DepartmentBasicData.vue
@@ -1,9 +1,7 @@
 <script setup>
-import { ref } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 
-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';
@@ -11,17 +9,8 @@ import VnSelect from 'src/components/common/VnSelect.vue';
 
 const route = useRoute();
 const { t } = useI18n();
-
-const workersOptions = ref([]);
-const clientsOptions = ref([]);
 </script>
 <template>
-    <FetchData
-        url="Workers/search"
-        @on-fetch="(data) => (workersOptions = data)"
-        auto-load
-    />
-    <FetchData url="Clients" @on-fetch="(data) => (clientsOptions = data)" auto-load />
     <FormModel
         :url="`Departments/${route.params.id}`"
         model="department"
@@ -62,7 +51,7 @@ const clientsOptions = ref([]);
                 <VnSelect
                     :label="t('department.bossDepartment')"
                     v-model="data.workerFk"
-                    :options="workersOptions"
+                    url="Workers/search"
                     option-value="id"
                     option-label="name"
                     hide-selected
@@ -72,7 +61,7 @@ const clientsOptions = ref([]);
                 <VnSelect
                     :label="t('department.selfConsumptionCustomer')"
                     v-model="data.clientFk"
-                    :options="clientsOptions"
+                    url="Clients"
                     option-value="id"
                     option-label="name"
                     hide-selected
diff --git a/src/pages/InvoiceOut/InvoiceOutFilter.vue b/src/pages/InvoiceOut/InvoiceOutFilter.vue
index d0d42ea9b..9ce8cc254 100644
--- a/src/pages/InvoiceOut/InvoiceOutFilter.vue
+++ b/src/pages/InvoiceOut/InvoiceOutFilter.vue
@@ -15,25 +15,10 @@ const props = defineProps({
         required: true,
     },
 });
-
-const workers = ref();
-const workersCopy = ref();
 const states = ref();
-
-function setWorkers(data) {
-    workers.value = data;
-    workersCopy.value = data;
-}
 </script>
-
 <template>
     <FetchData url="ClaimStates" @on-fetch="(data) => (states = data)" auto-load />
-    <FetchData
-        url="Workers/activeWithInheritedRole"
-        :filter="{ where: { role: 'salesPerson' } }"
-        @on-fetch="setWorkers"
-        auto-load
-    />
     <VnFilterPanel :data-key="props.dataKey" :search-button="true">
         <template #tags="{ tag, formatFn }">
             <div class="q-gutter-x-xs">
diff --git a/src/pages/Item/ItemTypeCreate.vue b/src/pages/Item/ItemTypeCreate.vue
index b7b06bbe6..290a40389 100644
--- a/src/pages/Item/ItemTypeCreate.vue
+++ b/src/pages/Item/ItemTypeCreate.vue
@@ -15,7 +15,6 @@ const router = useRouter();
 
 const newItemTypeForm = reactive({});
 
-const workersOptions = ref([]);
 const categoriesOptions = ref([]);
 const temperaturesOptions = ref([]);
 
@@ -25,12 +24,6 @@ const redirectToItemTypeBasicData = (_, { id }) => {
 </script>
 
 <template>
-    <FetchData
-        url="Workers"
-        @on-fetch="(data) => (workersOptions = data)"
-        :filter="{ order: 'firstName ASC', fields: ['id', 'firstName'] }"
-        auto-load
-    />
     <FetchData
         url="ItemCategories"
         @on-fetch="(data) => (categoriesOptions = data)"
@@ -61,7 +54,9 @@ const redirectToItemTypeBasicData = (_, { id }) => {
                     <VnSelect
                         v-model="data.workerFk"
                         :label="t('itemType.shared.worker')"
-                        :options="workersOptions"
+                        url="Workers"
+                        sort-by="firstName ASC"
+                        :fields="['id', 'firstName']"
                         option-value="id"
                         option-label="firstName"
                         hide-selected
diff --git a/src/pages/ItemType/Card/ItemTypeBasicData.vue b/src/pages/ItemType/Card/ItemTypeBasicData.vue
index 51e24272d..39076f129 100644
--- a/src/pages/ItemType/Card/ItemTypeBasicData.vue
+++ b/src/pages/ItemType/Card/ItemTypeBasicData.vue
@@ -12,17 +12,10 @@ import VnSelect from 'src/components/common/VnSelect.vue';
 const route = useRoute();
 const { t } = useI18n();
 
-const workersOptions = ref([]);
 const categoriesOptions = ref([]);
 const temperaturesOptions = ref([]);
 </script>
 <template>
-    <FetchData
-        url="Workers"
-        @on-fetch="(data) => (workersOptions = data)"
-        :filter="{ order: 'firstName ASC', fields: ['id', 'firstName'] }"
-        auto-load
-    />
     <FetchData
         url="ItemCategories"
         @on-fetch="(data) => (categoriesOptions = data)"
@@ -50,7 +43,9 @@ const temperaturesOptions = ref([]);
                 <VnSelect
                     v-model="data.workerFk"
                     :label="t('shared.worker')"
-                    :options="workersOptions"
+                    url="Workers"
+                    sort-by="firstName"
+                    :fields="['id', 'firstName']"
                     option-value="id"
                     option-label="firstName"
                     hide-selected
diff --git a/src/pages/Order/Card/OrderCreateDialog.vue b/src/pages/Order/Card/OrderCreateDialog.vue
index 27b0171f2..bcc62aa43 100644
--- a/src/pages/Order/Card/OrderCreateDialog.vue
+++ b/src/pages/Order/Card/OrderCreateDialog.vue
@@ -126,12 +126,6 @@ onMounted(async () => {
 </script>
 
 <template>
-    <FetchData
-        url="addresses"
-        @on-fetch="(data) => (clientOptions = data)"
-        :filter="{ fields: ['id', 'name', 'defaultAddressFk'], order: 'id' }"
-        auto-load
-    />
     <FormModelPopup
         url-create="Orders/new"
         :title="t('Create Order')"
@@ -165,13 +159,16 @@ onMounted(async () => {
                     </template>
                 </VnSelect>
                 <VnSelect
+                    ref="addressRef"
                     :label="t('order.form.addressFk')"
                     v-model="data.addressId"
-                    :options="addressList"
+                    url="addresses"
+                    :fields="['id', 'nickname', 'defaultAddressFk', 'street', 'city']"
+                    sort-by="id"
                     option-value="id"
                     option-label="street"
                     hide-selected
-                    :disable="!addressList?.length"
+                    :disable="!$refs.addressRef?.length"
                 >
                     <template #option="scope">
                         <QItem v-bind="scope.itemProps">
diff --git a/src/pages/Order/Card/OrderFilter.vue b/src/pages/Order/Card/OrderFilter.vue
index be47eed54..917369919 100644
--- a/src/pages/Order/Card/OrderFilter.vue
+++ b/src/pages/Order/Card/OrderFilter.vue
@@ -17,10 +17,6 @@ const props = defineProps({
 
 const agencyFilter = { fields: ['id', 'name'] };
 const agencyList = ref(null);
-const salesPersonFilter = {
-    fields: ['id', 'nickname'],
-};
-const salesPersonList = ref(null);
 const sourceList = ref([]);
 </script>
 
@@ -32,14 +28,6 @@ const sourceList = ref([]);
         auto-load
         @on-fetch="(data) => (agencyList = data)"
     />
-    <FetchData
-        url="Workers/search"
-        :filter="salesPersonFilter"
-        sort-by="nickname ASC"
-        @on-fetch="(data) => (salesPersonList = data)"
-        :params="{ departmentCodes: ['VT'] }"
-        auto-load
-    />
     <FetchData
         url="Orders/getSourceValues"
         :filter="{ fields: ['value'] }"
diff --git a/src/pages/Shelving/Card/ShelvingFilter.vue b/src/pages/Shelving/Card/ShelvingFilter.vue
index 0056ffaec..56cf4f58c 100644
--- a/src/pages/Shelving/Card/ShelvingFilter.vue
+++ b/src/pages/Shelving/Card/ShelvingFilter.vue
@@ -1,7 +1,5 @@
 <script setup>
-import { ref } from 'vue';
 import { useI18n } from 'vue-i18n';
-import FetchData from 'components/FetchData.vue';
 import VnFilterPanel from 'components/ui/VnFilterPanel.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
 
@@ -14,22 +12,9 @@ const props = defineProps({
 });
 
 const emit = defineEmits(['search']);
-
-const workers = ref();
-
-function setWorkers(data) {
-    workers.value = data;
-}
 </script>
 
 <template>
-    <FetchData
-        url="Workers/activeWithInheritedRole"
-        :filter="{ where: { role: 'salesPerson' } }"
-        sort-by="firstName ASC"
-        @on-fetch="setWorkers"
-        auto-load
-    />
     <VnFilterPanel
         :data-key="props.dataKey"
         :search-button="true"
diff --git a/src/pages/Ticket/TicketFilter.vue b/src/pages/Ticket/TicketFilter.vue
index 3b9833ce2..95cac4a47 100644
--- a/src/pages/Ticket/TicketFilter.vue
+++ b/src/pages/Ticket/TicketFilter.vue
@@ -6,6 +6,7 @@ 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 'components/common/VnInputDate.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
 
 const { t } = useI18n();
 const props = defineProps({
@@ -15,7 +16,6 @@ const props = defineProps({
     },
 });
 
-const workers = ref([]);
 const provinces = ref([]);
 const states = ref([]);
 const agencies = ref([]);
@@ -27,12 +27,6 @@ const warehouses = ref([]);
     <FetchData url="States" @on-fetch="(data) => (states = data)" auto-load />
     <FetchData url="AgencyModes" @on-fetch="(data) => (agencies = data)" auto-load />
     <FetchData url="Warehouses" @on-fetch="(data) => (warehouses = data)" auto-load />
-    <FetchData
-        url="Workers/activeWithInheritedRole"
-        :filter="{ where: { role: 'salesPerson' } }"
-        @on-fetch="(data) => (workers = data)"
-        auto-load
-    />
     <VnFilterPanel :data-key="props.dataKey" :search-button="true" search-url="table">
         <template #tags="{ tag, formatFn }">
             <div class="q-gutter-x-xs">
@@ -66,23 +60,19 @@ const warehouses = ref([]);
                 </QItemSection>
             </QItem>
             <QItem>
-                <QItemSection v-if="!workers">
-                    <QSkeleton type="QInput" class="full-width" />
-                </QItemSection>
-                <QItemSection v-if="workers">
-                    <QSelect
+                <QItemSection>
+                    <VnSelect
                         :label="t('Salesperson')"
                         v-model="params.salesPersonFk"
-                        :options="workers"
+                        url="Workers/activeWithInheritedRole"
+                        :where="{ role: 'salesPerson' }"
                         option-value="id"
-                        option-label="name"
-                        emit-value
-                        map-options
-                        use-input
+                        option-label="firstName"
+                        :use-like="false"
+                        sort-by="firstName ASC"
                         dense
                         outlined
                         rounded
-                        :input-debounce="0"
                     />
                 </QItemSection>
             </QItem>

From 0aab17beccda42d419719d702ed969d9df25cc2c Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Mon, 14 Oct 2024 13:08:16 +0200
Subject: [PATCH 203/228] fix: fixed customer descriptor proxy

---
 src/pages/InvoiceOut/Card/InvoiceOutSummary.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/pages/InvoiceOut/Card/InvoiceOutSummary.vue b/src/pages/InvoiceOut/Card/InvoiceOutSummary.vue
index e9d5a2f1f..ca8fb075c 100644
--- a/src/pages/InvoiceOut/Card/InvoiceOutSummary.vue
+++ b/src/pages/InvoiceOut/Card/InvoiceOutSummary.vue
@@ -78,7 +78,7 @@ const ticketsColumns = ref([
         align: 'left',
     },
     {
-        name: 'quantity',
+        name: 'nickname',
         label: t('invoiceOut.summary.nickname'),
         field: (row) => row.nickname,
         sortable: true,
@@ -172,11 +172,11 @@ const ticketsColumns = ref([
                             </QBtn>
                         </QTd>
                     </template>
-                    <template #body-cell-quantity="{ value, row }">
+                    <template #body-cell-nickname="{ value, row }">
                         <QTd>
                             <QBtn class="no-uppercase link" flat dense>
                                 {{ value }}
-                                <CustomerDescriptorProxy :id="row.id" />
+                                <CustomerDescriptorProxy :id="row.clientFk" />
                             </QBtn>
                         </QTd>
                     </template>

From 0f3168456aac154a0e7ab3d81f0f97d19f1af358 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 14 Oct 2024 13:22:59 +0200
Subject: [PATCH 204/228] chore: refs #7524 sort by firstName

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

diff --git a/src/pages/ItemType/Card/ItemTypeBasicData.vue b/src/pages/ItemType/Card/ItemTypeBasicData.vue
index 39076f129..d35fbb17d 100644
--- a/src/pages/ItemType/Card/ItemTypeBasicData.vue
+++ b/src/pages/ItemType/Card/ItemTypeBasicData.vue
@@ -44,7 +44,7 @@ const temperaturesOptions = ref([]);
                     v-model="data.workerFk"
                     :label="t('shared.worker')"
                     url="Workers"
-                    sort-by="firstName"
+                    sort-by="firstName ASC"
                     :fields="['id', 'firstName']"
                     option-value="id"
                     option-label="firstName"

From 2d34921cf5a29addf67aa87bc27b202db77ee4e2 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 14 Oct 2024 15:52:12 +0200
Subject: [PATCH 205/228] fix: refs #7524 paginate

---
 src/pages/InvoiceOut/InvoiceOutNegativeBases.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/pages/InvoiceOut/InvoiceOutNegativeBases.vue b/src/pages/InvoiceOut/InvoiceOutNegativeBases.vue
index 774b42478..53a1f2ec1 100644
--- a/src/pages/InvoiceOut/InvoiceOutNegativeBases.vue
+++ b/src/pages/InvoiceOut/InvoiceOutNegativeBases.vue
@@ -168,7 +168,6 @@ const downloadCSV = async () => {
                 }
             }
         "
-        :limit="0"
         :columns="columns"
         auto-load
         :is-editable="false"

From 2b2ccbc6a105da40fb07f20fc012d4cb87589f9f Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 21 Oct 2024 12:14:54 +0200
Subject: [PATCH 206/228] feat: refs #7524 myTeam filter & default params

---
 src/i18n/locale/en.yml                   |  1 +
 src/i18n/locale/es.yml                   |  1 +
 src/pages/Ticket/TicketAdvance.vue       |  3 +++
 src/pages/Ticket/TicketAdvanceFilter.vue | 19 +++++++++++++++++--
 src/pages/Ticket/locale/es.yml           |  4 ++--
 5 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index 7eb3829fe..17a3e097a 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -296,6 +296,7 @@ globals:
         from: From
         To: To
         stateFk: State
+        myTeam: My team
 errors:
     statusUnauthorized: Access denied
     statusInternalServerError: An internal server error has ocurred
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index 9d5cd53f3..fc61936d2 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -300,6 +300,7 @@ globals:
         from: Desde
         To: Hasta
         stateFk: Estado
+        myTeam: Mi equipo
 errors:
     statusUnauthorized: Acceso denegado
     statusInternalServerError: Ha ocurrido un error interno del servidor
diff --git a/src/pages/Ticket/TicketAdvance.vue b/src/pages/Ticket/TicketAdvance.vue
index 177b3a29b..2cce1dba8 100644
--- a/src/pages/Ticket/TicketAdvance.vue
+++ b/src/pages/Ticket/TicketAdvance.vue
@@ -462,6 +462,9 @@ onMounted(async () => {
     userParams.dateFuture = tomorrow;
     userParams.dateToAdvance = today;
     userParams.warehouseFk = user.value.warehouseFk;
+    userParams.ipt = 'H';
+    userParams.futureIpt = 'H';
+    userParams.isFullMovable = true;
     const filter = { limit: 0 };
     await arrayData.addFilter({ filter, userParams });
 });
diff --git a/src/pages/Ticket/TicketAdvanceFilter.vue b/src/pages/Ticket/TicketAdvanceFilter.vue
index 209a1a307..38a0dd4c2 100644
--- a/src/pages/Ticket/TicketAdvanceFilter.vue
+++ b/src/pages/Ticket/TicketAdvanceFilter.vue
@@ -10,7 +10,7 @@ import VnInputDate from 'src/components/common/VnInputDate.vue';
 import axios from 'axios';
 import { onMounted } from 'vue';
 
-const { t } = useI18n();
+const { t, te } = useI18n();
 const props = defineProps({
     dataKey: {
         type: String,
@@ -42,6 +42,11 @@ const getItemPackingTypes = async () => {
     }
 };
 
+const getLocale = (val) => {
+    const param = `params.${val}`;
+    return te(param) ? t(param) : t(`globals.${param}`);
+};
+
 onMounted(async () => await getItemPackingTypes());
 </script>
 
@@ -59,7 +64,7 @@ onMounted(async () => await getItemPackingTypes());
     >
         <template #tags="{ tag, formatFn }">
             <div class="q-gutter-x-xs">
-                <strong>{{ t(`params.${tag.label}`) }}: </strong>
+                <strong>{{ getLocale(tag.label) }}: </strong>
                 <span>{{ formatFn(tag.value) }}</span>
             </div>
         </template>
@@ -142,6 +147,16 @@ onMounted(async () => await getItemPackingTypes());
                     </VnSelect>
                 </QItemSection>
             </QItem>
+            <QItem>
+                <QItemSection>
+                    <QCheckbox
+                        :label="t('globals.params.myTeam')"
+                        v-model="params.myTeam"
+                        toggle-indeterminate
+                        @update:model-value="searchFn()"
+                    />
+                </QItemSection>
+            </QItem>
         </template>
     </VnFilterPanel>
 </template>
diff --git a/src/pages/Ticket/locale/es.yml b/src/pages/Ticket/locale/es.yml
index 0a27519ad..d4ba1f26a 100644
--- a/src/pages/Ticket/locale/es.yml
+++ b/src/pages/Ticket/locale/es.yml
@@ -86,9 +86,9 @@ weeklyTickets:
     search: Buscar por tickets programados
     searchInfo: Buscar tickets programados por el identificador o el identificador del cliente
 advanceTickets:
-    preparation: Preparación    
+    preparation: Preparación
     origin: Origen
-    destination: Destinatario
+    destination: Destino
     originAgency: 'Agencia origen: {agency}'
     destinationAgency: 'Agencia destino: {agency}'
     ticketId: ID

From a4358ec0edbcebd07fcf427c8a49097913b62dcb Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 21 Oct 2024 12:36:16 +0200
Subject: [PATCH 207/228] chore: refs #7524 refactor order

---
 src/pages/Ticket/TicketAdvanceFilter.vue | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/src/pages/Ticket/TicketAdvanceFilter.vue b/src/pages/Ticket/TicketAdvanceFilter.vue
index 38a0dd4c2..07c745250 100644
--- a/src/pages/Ticket/TicketAdvanceFilter.vue
+++ b/src/pages/Ticket/TicketAdvanceFilter.vue
@@ -129,6 +129,12 @@ onMounted(async () => await getItemPackingTypes());
                         toggle-indeterminate
                         @update:model-value="searchFn()"
                     />
+                    <QCheckbox
+                        :label="t('globals.params.myTeam')"
+                        v-model="params.myTeam"
+                        toggle-indeterminate
+                        @update:model-value="searchFn()"
+                    />
                 </QItemSection>
             </QItem>
             <QItem>
@@ -147,16 +153,6 @@ onMounted(async () => await getItemPackingTypes());
                     </VnSelect>
                 </QItemSection>
             </QItem>
-            <QItem>
-                <QItemSection>
-                    <QCheckbox
-                        :label="t('globals.params.myTeam')"
-                        v-model="params.myTeam"
-                        toggle-indeterminate
-                        @update:model-value="searchFn()"
-                    />
-                </QItemSection>
-            </QItem>
         </template>
     </VnFilterPanel>
 </template>

From 0fbd5f45e1c929aaaa1c1918c346ee9e7fcb56eb Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 21 Oct 2024 14:29:29 +0200
Subject: [PATCH 208/228] fix: refs #7524 select department

---
 src/i18n/locale/en.yml                   |  1 +
 src/i18n/locale/es.yml                   |  1 +
 src/pages/Ticket/TicketAdvanceFilter.vue | 17 ++++++++++++-----
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index 17a3e097a..1c17e92f9 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -297,6 +297,7 @@ globals:
         To: To
         stateFk: State
         myTeam: My team
+        departmentFk: Department
 errors:
     statusUnauthorized: Access denied
     statusInternalServerError: An internal server error has ocurred
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index fc61936d2..5d3d9d859 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -301,6 +301,7 @@ globals:
         To: Hasta
         stateFk: Estado
         myTeam: Mi equipo
+        departmentFk: Departamento
 errors:
     statusUnauthorized: Acceso denegado
     statusInternalServerError: Ha ocurrido un error interno del servidor
diff --git a/src/pages/Ticket/TicketAdvanceFilter.vue b/src/pages/Ticket/TicketAdvanceFilter.vue
index 07c745250..182f715a3 100644
--- a/src/pages/Ticket/TicketAdvanceFilter.vue
+++ b/src/pages/Ticket/TicketAdvanceFilter.vue
@@ -129,11 +129,18 @@ onMounted(async () => await getItemPackingTypes());
                         toggle-indeterminate
                         @update:model-value="searchFn()"
                     />
-                    <QCheckbox
-                        :label="t('globals.params.myTeam')"
-                        v-model="params.myTeam"
-                        toggle-indeterminate
-                        @update:model-value="searchFn()"
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnSelect
+                        :label="t('globals.params.departmentFk')"
+                        v-model="params.departmentFk"
+                        url="Departments"
+                        :fields="['id', 'name']"
+                        dense
+                        outlined
+                        rounded
                     />
                 </QItemSection>
             </QItem>

From f751408de2bfc1e34e6294f294de7365dd699a07 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Tue, 22 Oct 2024 13:22:43 +0200
Subject: [PATCH 209/228] feat: refs #8083 add change state btn

---
 src/components/VnTable/VnTable.vue            |   3 +
 src/components/common/VnBtnSelect.vue         |  19 +
 src/i18n/locale/en.yml                        |   2 +-
 src/i18n/locale/es.yml                        |   2 +-
 src/pages/Claim/Card/ClaimSummary.vue         |   2 +-
 src/pages/Ticket/Card/TicketExpedition.vue    | 338 +++++++-----------
 src/pages/Ticket/Card/TicketSummary.vue       |   2 +-
 .../ticket/ticketExpedition.spec.js           |  28 ++
 test/cypress/support/commands.js              |   8 +
 9 files changed, 190 insertions(+), 214 deletions(-)
 create mode 100644 src/components/common/VnBtnSelect.vue
 create mode 100644 test/cypress/integration/ticket/ticketExpedition.spec.js

diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index f18892a31..9d64591e9 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -127,6 +127,7 @@ const splittedColumns = ref({ columns: [] });
 const columnsVisibilitySkipped = ref();
 const createForm = ref();
 const tableFilterRef = ref([]);
+const tableRef = ref();
 
 const tableModes = [
     {
@@ -308,6 +309,7 @@ defineExpose({
     selected,
     CrudModelRef,
     params,
+    tableRef,
 });
 
 function handleOnDataSaved(_) {
@@ -398,6 +400,7 @@ function handleOnDataSaved(_) {
         </template>
         <template #body="{ rows }">
             <QTable
+                ref="tableRef"
                 v-bind="table"
                 class="vnTable"
                 :columns="splittedColumns.columns"
diff --git a/src/components/common/VnBtnSelect.vue b/src/components/common/VnBtnSelect.vue
new file mode 100644
index 000000000..b0616a6b2
--- /dev/null
+++ b/src/components/common/VnBtnSelect.vue
@@ -0,0 +1,19 @@
+<script setup>
+import VnSelect from './VnSelect.vue';
+
+defineProps({
+    selectProps: { type: Object, required: true },
+    promise: { type: Function, default: () => {} },
+});
+</script>
+<template>
+    <QBtnDropdown v-bind="$attrs" color="primary">
+        <VnSelect
+            v-bind="selectProps"
+            hide-selected
+            hide-dropdown-icon
+            focus-on-mount
+            @update:model-value="promise"
+        />
+    </QBtnDropdown>
+</template>
diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index 7eb3829fe..33ecb4850 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -296,6 +296,7 @@ globals:
         from: From
         To: To
         stateFk: State
+    changeState: Change state
 errors:
     statusUnauthorized: Access denied
     statusInternalServerError: An internal server error has ocurred
@@ -538,7 +539,6 @@ ticket:
         package: Package
         taxClass: Tax class
         services: Services
-        changeState: Change state
         requester: Requester
         atender: Atender
         request: Request
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index 9d5cd53f3..f8a796116 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -300,6 +300,7 @@ globals:
         from: Desde
         To: Hasta
         stateFk: Estado
+    changeState: Cambiar estado
 errors:
     statusUnauthorized: Acceso denegado
     statusInternalServerError: Ha ocurrido un error interno del servidor
@@ -547,7 +548,6 @@ ticket:
         package: Embalaje
         taxClass: Tipo IVA
         services: Servicios
-        changeState: Cambiar estado
         requester: Solicitante
         atender: Comprador
         request: Petición de compra
diff --git a/src/pages/Claim/Card/ClaimSummary.vue b/src/pages/Claim/Card/ClaimSummary.vue
index d77f718c6..edfa52b4b 100644
--- a/src/pages/Claim/Card/ClaimSummary.vue
+++ b/src/pages/Claim/Card/ClaimSummary.vue
@@ -204,7 +204,7 @@ function claimUrl(section) {
                 top
                 color="black"
                 text-color="white"
-                :label="t('ticket.summary.changeState')"
+                :label="t('globals.changeState')"
             >
                 <QList>
                     <QVirtualScroll
diff --git a/src/pages/Ticket/Card/TicketExpedition.vue b/src/pages/Ticket/Card/TicketExpedition.vue
index c4ab63b39..987862c22 100644
--- a/src/pages/Ticket/Card/TicketExpedition.vue
+++ b/src/pages/Ticket/Card/TicketExpedition.vue
@@ -1,39 +1,38 @@
 <script setup>
-import { onMounted, ref, computed, onUnmounted, reactive, watch } from 'vue';
+import { onMounted, ref, computed, onUnmounted, watch } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
 
-import VnInput from 'src/components/common/VnInput.vue';
 import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue';
-import TicketEditManaProxy from './TicketEditMana.vue';
-import TableVisibleColumns from 'src/components/common/TableVisibleColumns.vue';
 import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 import ExpeditionNewTicket from './ExpeditionNewTicket.vue';
 import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
-import VnSelect from 'src/components/common/VnSelect.vue';
 
 import { useStateStore } from 'stores/useStateStore';
-import { toCurrency, toPercentage } from 'src/filters';
 import { useArrayData } from 'composables/useArrayData';
 import { useVnConfirm } from 'composables/useVnConfirm';
 import useNotify from 'src/composables/useNotify.js';
 import { toDateTimeFormat } from 'src/filters/date';
 import axios from 'axios';
+import VnTable from 'src/components/VnTable/VnTable.vue';
+import VnBtnSelect from 'src/components/common/VnBtnSelect.vue';
+import FetchData from 'src/components/FetchData.vue';
 
 const route = useRoute();
 const stateStore = useStateStore();
 const { t } = useI18n();
 const { notify } = useNotify();
 const { openConfirmationModal } = useVnConfirm();
-const editPriceProxyRef = ref(null);
 const newTicketDialogRef = ref(null);
 const logsTableDialogRef = ref(null);
-
+const vnTableRef = ref();
 const expeditionsLogsData = ref([]);
 const selectedExpeditions = ref([]);
 const allColumnNames = ref([]);
-const visibleColumns = ref([]);
 const newTicketWithRoute = ref(false);
+const selectedRows = ref([]);
+const hasSelectedRows = computed(() => selectedRows.value.length > 0);
+const expeditionStateTypes = ref([]);
 
 const exprBuilder = (param, value) => {
     switch (param) {
@@ -54,8 +53,6 @@ const expeditionsArrayData = useArrayData('ticketExpeditions', {
     filter: expeditionsFilter.value,
     exprBuilder: exprBuilder,
 });
-const expeditionsStore = expeditionsArrayData.store;
-const ticketExpeditions = computed(() => expeditionsStore.data);
 
 const ticketArrayData = useArrayData('ticketData');
 const ticketStore = ticketArrayData.store;
@@ -73,129 +70,87 @@ watch(
     { immediate: true }
 );
 
-const params = reactive({});
-
-const applyColumnFilter = async (col) => {
-    try {
-        const paramKey = col.columnFilter?.filterParamKey || col.field;
-        params[paramKey] = col.columnFilter.filterValue;
-        await expeditionsArrayData.addFilter({ filter: expeditionsFilter.value, params });
-    } catch (err) {
-        console.error('Error applying column filter', err);
-    }
-};
-
-const getInputEvents = (col) => {
-    return col.columnFilter.type === 'select'
-        ? { 'update:modelValue': () => applyColumnFilter(col) }
-        : {
-              'keyup.enter': () => applyColumnFilter(col),
-          };
-};
-
 const columns = computed(() => [
     {
+        align: 'left',
         label: t('expedition.id'),
         name: 'id',
-        field: 'id',
-        align: 'left',
-        sortable: true,
+        chip: {
+            condition: () => true,
+        },
+        isId: true,
         columnFilter: {
-            component: VnInput,
-            type: 'text',
-            filterParamKey: 'expeditionFk',
-            filterValue: null,
-            event: getInputEvents,
-            attrs: {
-                dense: true,
-            },
+            inWhere: true,
         },
     },
     {
         label: t('expedition.item'),
-        name: 'item',
+        name: 'packagingItemFk',
         align: 'left',
+        cardVisible: true,
         columnFilter: {
-            component: VnInput,
-            type: 'text',
-            filterParamKey: 'packageItemName',
-            filterValue: null,
-            event: getInputEvents,
-            attrs: {
-                dense: true,
-            },
+            inWhere: true,
         },
     },
     {
         label: t('expedition.name'),
-        name: 'name',
-        field: 'packageItemName',
+        name: 'packageItemName',
         align: 'left',
+        isTitle: true,
         columnFilter: {
-            component: VnSelect,
-            type: 'select',
-            filterValue: null,
-            event: getInputEvents,
-            attrs: {
-                url: 'Items',
-                fields: ['id', 'name'],
-                'sort-by': 'name ASC',
-                'option-value': 'id',
-                'option-label': 'name',
-                dense: true,
-            },
+            inWhere: true,
         },
     },
     {
         label: t('expedition.packageType'),
-        name: 'packageType',
-        field: 'freightItemName',
+        name: 'freightItemName',
         align: 'left',
         columnFilter: {
-            component: VnInput,
-            type: 'text',
-            // filterParamKey: 'expeditionFk',
-            filterValue: null,
-            event: getInputEvents,
-            attrs: {
-                dense: true,
-            },
+            inWhere: true,
         },
     },
     {
         label: t('expedition.counter'),
         name: 'counter',
-        field: 'counter',
         align: 'left',
-        columnFilter: null,
+        columnFilter: {
+            inWhere: true,
+        },
     },
     {
         label: t('expedition.externalId'),
         name: 'externalId',
-        field: 'externalId',
         align: 'left',
-        columnFilter: null,
+        cardVisible: true,
+        columnFilter: {
+            inWhere: true,
+        },
     },
     {
         label: t('expedition.created'),
         name: 'created',
-        field: 'created',
         align: 'left',
-        columnFilter: null,
-        format: (value) => toDateTimeFormat(value),
+        cardVisible: true,
+        format: (row) => toDateTimeFormat(row.created),
     },
     {
         label: t('expedition.state'),
         name: 'state',
-        field: 'state',
         align: 'left',
-        columnFilter: null,
+        cardVisible: true,
+        columnFilter: { inWhere: true },
     },
     {
-        label: '',
-        name: 'history',
-        align: 'left',
-        columnFilter: null,
+        align: 'right',
+        name: 'tableActions',
+        actions: [
+            {
+                title: t('expedition.historyAction'),
+                icon: 'history',
+                isPrimary: true,
+                action: (row) => showLog(row),
+            },
+        ],
     },
 ]);
 
@@ -204,23 +159,29 @@ const logTableColumns = computed(() => [
         label: t('expedition.state'),
         name: 'state',
         field: 'state',
-        align: 'left',
+        align: 'center',
         sortable: true,
     },
     {
         label: t('expedition.name'),
         name: 'name',
-        align: 'name',
+        field: 'name',
+        align: 'center',
         columnFilter: null,
     },
     {
         label: t('expedition.created'),
         name: 'created',
         field: 'created',
-        align: 'left',
-        columnFilter: null,
+        align: 'center',
         format: (value) => toDateTimeFormat(value),
     },
+    {
+        label: t('expedition.isScanned'),
+        name: 'isScanned',
+        field: 'isScanned',
+        align: 'center',
+    },
 ]);
 
 const showNewTicketDialog = (withRoute = false) => {
@@ -255,10 +216,20 @@ const getExpeditionState = async (expedition) => {
             order: ['created DESC'],
         };
 
-        const { data } = await axios.get(`ExpeditionStates/filter`, {
+        const { data: expeditionStates } = await axios.get(`ExpeditionStates/filter`, {
             params: { filter: JSON.stringify(filter) },
         });
-        expeditionsLogsData.value = data;
+        const { data: scannedStates } = await axios.get(`ExpeditionStates`, {
+            params: { filter: JSON.stringify(filter), fields: ['id', 'isScanned'] },
+        });
+
+        expeditionsLogsData.value = expeditionStates.map((state) => {
+            const scannedState = scannedStates.find((s) => s.id === state.id);
+            return {
+                ...state,
+                isScanned: scannedState ? scannedState.isScanned : false,
+            };
+        });
     } catch (error) {
         console.error(error);
     }
@@ -274,22 +245,39 @@ onUnmounted(() => (stateStore.rightDrawer = false));
 </script>
 
 <template>
+    <FetchData
+        url="expeditionStateTypes"
+        @on-fetch="(data) => (expeditionStateTypes = data)"
+        auto-load
+    />
     <VnSubToolbar>
-        <template #st-data>
-            <TableVisibleColumns
-                :all-columns="allColumnNames"
-                table-code="expeditionIndex"
-                labels-traductions-path="expedition"
-                @on-config-saved="visibleColumns = [...$event, 'history']"
-            />
-        </template>
         <template #st-actions>
             <QBtnGroup push class="q-gutter-x-sm" flat>
+                <VnBtnSelect
+                    :disable="!hasSelectedRows"
+                    color="primary"
+                    :label="t('globals.changeState')"
+                    :select-props="{
+                        options: expeditionStateTypes,
+                        optionLabel: 'description',
+                    }"
+                    :promise="
+                        async (stateTypeFk) => {
+                            await vnTableRef.CrudModelRef.saveChanges({
+                                updates: selectedRows.map(({ id }) => ({
+                                    data: { stateTypeFk },
+                                    where: { id },
+                                })),
+                            });
+                            vnTableRef.tableRef.clearSelection();
+                        }
+                    "
+                />
                 <QBtnDropdown
                     ref="btnDropdownRef"
                     color="primary"
                     :label="t('expedition.move')"
-                    :disable="!selectedExpeditions.length"
+                    :disable="!hasSelectedRows"
                 >
                     <template #label>
                         <QTooltip>{{ t('Select lines to see the options') }}</QTooltip>
@@ -322,7 +310,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
                     </QList>
                 </QBtnDropdown>
                 <QBtn
-                    :disable="!selectedExpeditions.length"
+                    :disable="!hasSelectedRows"
                     icon="delete"
                     color="primary"
                     @click="
@@ -332,115 +320,34 @@ onUnmounted(() => (stateStore.rightDrawer = false));
                             deleteExpedition
                         )
                     "
-                />
+                >
+                    <QTooltip>{{ t('expedition.removeExpedition') }}</QTooltip>
+                </QBtn>
             </QBtnGroup>
         </template>
     </VnSubToolbar>
-
-    <QTable
-        :rows="ticketExpeditions"
+    <VnTable
+        ref="vnTableRef"
+        data-key="TicketExpedition"
+        url="Expeditions/filter"
         :columns="columns"
-        row-key="id"
-        :pagination="{ rowsPerPage: 0 }"
-        class="full-width q-mt-md"
-        selection="multiple"
-        v-model:selected="selectedExpeditions"
-        :visible-columns="visibleColumns"
-        :no-data-label="t('globals.noResults')"
+        :filter="expeditionsFilter"
+        v-model:selected="selectedRows"
+        :table="{
+            'row-key': 'id',
+            selection: 'multiple',
+        }"
+        save-url="Expeditions/crud"
+        auto-load
+        order="created DESC"
     >
-        <template #top-row="{ cols }">
-            <QTr>
-                <QTd />
-                <QTd v-for="(col, index) in cols" :key="index" style="max-width: 100px">
-                    <component
-                        :is="col.columnFilter.component"
-                        v-if="col.columnFilter"
-                        v-model="col.columnFilter.filterValue"
-                        v-bind="col.columnFilter.attrs"
-                        v-on="col.columnFilter.event(col)"
-                        dense
-                    />
-                </QTd>
-            </QTr>
-        </template>
-        <template #body-cell-item="{ row }">
-            <QTd auto-width @click.stop>
-                <QBtn flat color="primary">{{ row.packagingItemFk }}</QBtn>
+        <template #column-packagingItemFk="{ row }">
+            <span class="link" @click.stop>
+                {{ row.packagingItemFk }}
                 <ItemDescriptorProxy :id="row.packagingItemFk" />
-            </QTd>
+            </span>
         </template>
-        <template #body-cell-available="{ row }">
-            <QTd @click.stop>
-                <QBadge :color="row.available < 0 ? 'alert' : 'transparent'" dense>
-                    {{ row.available }}
-                </QBadge>
-            </QTd>
-        </template>
-
-        <template #body-cell-price="{ row }">
-            <QTd>
-                <template v-if="isTicketEditable && row.id">
-                    <QBtn flat color="primary" dense @click="onOpenEditPricePopover(row)">
-                        {{ toCurrency(row.price) }}
-                    </QBtn>
-                    <TicketEditManaProxy
-                        ref="editPriceProxyRef"
-                        :mana="mana"
-                        :new-price="getNewPrice"
-                        @save="updatePrice(row)"
-                    >
-                        <VnInput
-                            v-model.number="edit.price"
-                            :label="t('ticketSale.price')"
-                            type="number"
-                        />
-                    </TicketEditManaProxy>
-                </template>
-                <span v-else>{{ toCurrency(row.price) }}</span>
-            </QTd>
-        </template>
-        <template #body-cell-discount="{ row }">
-            <QTd>
-                <template v-if="!isLocked && row.id">
-                    <QBtn
-                        flat
-                        color="primary"
-                        dense
-                        @click="onOpenEditDiscountPopover(row)"
-                    >
-                        {{ toPercentage(row.discount / 100) }}
-                    </QBtn>
-                    <TicketEditManaProxy
-                        :mana="mana"
-                        :new-price="getNewPrice"
-                        @save="changeDiscount(row)"
-                    >
-                        <VnInput
-                            v-model.number="edit.discount"
-                            :label="t('ticketSale.discount')"
-                            type="number"
-                        />
-                    </TicketEditManaProxy>
-                </template>
-                <span v-else>{{ toPercentage(row.discount / 100) }}</span>
-            </QTd>
-        </template>
-        <template #body-cell-history="{ row }">
-            <QTd>
-                <QBtn
-                    @click.stop="showLog(row)"
-                    color="primary"
-                    icon="history"
-                    size="md"
-                    flat
-                >
-                    <QTooltip class="text-no-wrap">
-                        {{ t('expedition.historyAction') }}
-                    </QTooltip>
-                </QBtn>
-            </QTd>
-        </template>
-    </QTable>
+    </VnTable>
     <QDialog ref="newTicketDialogRef" transition-show="scale" transition-hide="scale">
         <ExpeditionNewTicket
             :ticket="ticketData"
@@ -454,12 +361,23 @@ onUnmounted(() => (stateStore.rightDrawer = false));
             data-key="TicketExpeditionLog"
             :rows="expeditionsLogsData"
             :columns="logTableColumns"
-            class="q-pa-sm"
+            class="q-pa-md full-width"
         >
             <template #body-cell-name="{ row }">
-                <QTd auto-width>
-                    <QBtn flat dense color="primary">{{ row.name }}</QBtn>
-                    <WorkerDescriptorProxy :id="row.workerFk" />
+                <QTd style="text-align: center">
+                    <span class="link" @click.stop>
+                        <QBtn flat dense>{{ row.name }}</QBtn>
+                        <WorkerDescriptorProxy :id="row.workerFk" />
+                    </span>
+                </QTd>
+            </template>
+            <template #body-cell-isScanned="{ row }">
+                <QTd style="text-align: center">
+                    <QCheckbox disable v-model="row.isScanned">
+                        {{
+                            row.isScanned === 1 ? t('expedition.yes') : t('expedition.no')
+                        }}
+                    </QCheckbox>
                 </QTd>
             </template>
         </QTable>
diff --git a/src/pages/Ticket/Card/TicketSummary.vue b/src/pages/Ticket/Card/TicketSummary.vue
index 1f2a7ca79..358f74af2 100644
--- a/src/pages/Ticket/Card/TicketSummary.vue
+++ b/src/pages/Ticket/Card/TicketSummary.vue
@@ -105,7 +105,7 @@ async function changeState(value) {
                 ref="stateBtnDropdownRef"
                 color="black"
                 text-color="white"
-                :label="t('ticket.summary.changeState')"
+                :label="t('globals.changeState')"
                 :disable="!isEditable()"
             >
                 <VnSelect
diff --git a/test/cypress/integration/ticket/ticketExpedition.spec.js b/test/cypress/integration/ticket/ticketExpedition.spec.js
new file mode 100644
index 000000000..5eb2c1a2a
--- /dev/null
+++ b/test/cypress/integration/ticket/ticketExpedition.spec.js
@@ -0,0 +1,28 @@
+/// <reference types="cypress" />
+
+describe('Ticket expedtion', () => {
+    const tableContent = '.q-table .q-virtual-scroll__content';
+    const stateTd = 'td:nth-child(9)';
+
+    beforeEach(() => {
+        cy.login('developer');
+        cy.viewport(1920, 1080);
+    });
+
+    it('should change the state', () => {
+        cy.visit('#/ticket/1/expedition');
+        cy.intercept('GET', /\/api\/Expeditions\/filter/).as('expeditions');
+        cy.intercept('POST', /\/api\/Expeditions\/crud/).as('crud');
+
+        cy.wait('@expeditions');
+
+        cy.selectRows([1, 2]);
+        cy.get('#subToolbar [aria-controls]:nth-child(1)').click();
+        cy.get('.q-menu .q-item').contains('Perdida').click();
+        cy.wait('@crud');
+
+        cy.get(`${tableContent} tr:nth-child(-n+2) ${stateTd}`).each(($el) => {
+            cy.wrap($el).contains('Perdida');
+        });
+    });
+});
diff --git a/test/cypress/support/commands.js b/test/cypress/support/commands.js
index 43788f59f..f895d7bb3 100755
--- a/test/cypress/support/commands.js
+++ b/test/cypress/support/commands.js
@@ -152,6 +152,14 @@ Cypress.Commands.add('notificationHas', (selector, text) => {
     cy.get(selector).should('have.text', text);
 });
 
+Cypress.Commands.add('selectRows', (rows) => {
+    rows.forEach((row) => {
+        cy.get('.q-table .q-virtual-scroll__content tr .q-checkbox__inner')
+            .eq(row - 1)
+            .click();
+    });
+});
+
 Cypress.Commands.add('fillRow', (rowSelector, data) => {
     // Usar el selector proporcionado para obtener la fila deseada
     cy.waitForElement('tbody');

From b1a511ff6f7aee7fb218e78f909d7b73a4e98ac3 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Tue, 22 Oct 2024 14:21:03 +0200
Subject: [PATCH 210/228] fix: refs #8083 delete btn & redirect

---
 src/pages/Ticket/Card/TicketExpedition.vue | 47 +++++++---------------
 1 file changed, 14 insertions(+), 33 deletions(-)

diff --git a/src/pages/Ticket/Card/TicketExpedition.vue b/src/pages/Ticket/Card/TicketExpedition.vue
index 987862c22..61cedc1bf 100644
--- a/src/pages/Ticket/Card/TicketExpedition.vue
+++ b/src/pages/Ticket/Card/TicketExpedition.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { onMounted, ref, computed, onUnmounted, watch } from 'vue';
+import { onMounted, ref, computed, onUnmounted } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
 
@@ -34,42 +34,15 @@ const selectedRows = ref([]);
 const hasSelectedRows = computed(() => selectedRows.value.length > 0);
 const expeditionStateTypes = ref([]);
 
-const exprBuilder = (param, value) => {
-    switch (param) {
-        case 'expeditionFk':
-            return { id: value };
-        case 'packageItemName':
-            return { packagingItemFk: value };
-    }
-};
-
 const expeditionsFilter = computed(() => ({
     where: { ticketFk: route.params.id },
     order: ['created DESC'],
 }));
 
-const expeditionsArrayData = useArrayData('ticketExpeditions', {
-    url: 'Expeditions/filter',
-    filter: expeditionsFilter.value,
-    exprBuilder: exprBuilder,
-});
-
 const ticketArrayData = useArrayData('ticketData');
 const ticketStore = ticketArrayData.store;
 const ticketData = computed(() => ticketStore.data);
 
-const refetchExpeditions = async () => {
-    await expeditionsArrayData.applyFilter({
-        filter: expeditionsFilter.value,
-    });
-};
-
-watch(
-    () => route.params.id,
-    async () => await refetchExpeditions(),
-    { immediate: true }
-);
-
 const columns = computed(() => [
     {
         align: 'left',
@@ -191,12 +164,10 @@ const showNewTicketDialog = (withRoute = false) => {
 
 const deleteExpedition = async () => {
     try {
-        const expeditionIds = selectedExpeditions.value.map(
-            (expedition) => expedition.id
-        );
+        const expeditionIds = selectedRows.value.map((expedition) => expedition.id);
         const params = { expeditionIds };
         await axios.post('Expeditions/deleteExpeditions', params);
-        await refetchExpeditions();
+        vnTableRef.value.reload();
         selectedExpeditions.value = [];
         notify(t('expedition.expeditionRemoved'), 'positive');
     } catch (error) {
@@ -330,6 +301,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
         ref="vnTableRef"
         data-key="TicketExpedition"
         url="Expeditions/filter"
+        search-url="expeditions"
         :columns="columns"
         :filter="expeditionsFilter"
         v-model:selected="selectedRows"
@@ -339,7 +311,16 @@ onUnmounted(() => (stateStore.rightDrawer = false));
         }"
         save-url="Expeditions/crud"
         auto-load
-        order="created DESC"
+        :expr-builder="
+            (param, value) => {
+                switch (param) {
+                    case 'expeditionFk':
+                        return { id: value };
+                    case 'packageItemName':
+                        return { packagingItemFk: value };
+                }
+            }
+        "
     >
         <template #column-packagingItemFk="{ row }">
             <span class="link" @click.stop>

From da4c1e9c12fab1a686df8866d3b8c2e3d41f75af Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Tue, 22 Oct 2024 14:36:30 +0200
Subject: [PATCH 211/228] fix: refs #8083 add order

---
 src/pages/Ticket/Card/TicketExpedition.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/pages/Ticket/Card/TicketExpedition.vue b/src/pages/Ticket/Card/TicketExpedition.vue
index 61cedc1bf..307c42645 100644
--- a/src/pages/Ticket/Card/TicketExpedition.vue
+++ b/src/pages/Ticket/Card/TicketExpedition.vue
@@ -321,6 +321,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
                 }
             }
         "
+        order="created DESC"
     >
         <template #column-packagingItemFk="{ row }">
             <span class="link" @click.stop>

From 033d6bddbee60806a5311f48ad5719639db6e844 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Tue, 22 Oct 2024 14:43:43 +0200
Subject: [PATCH 212/228] fix: refs #8083 move expeditions

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

diff --git a/src/pages/Ticket/Card/TicketExpedition.vue b/src/pages/Ticket/Card/TicketExpedition.vue
index 307c42645..93749ebec 100644
--- a/src/pages/Ticket/Card/TicketExpedition.vue
+++ b/src/pages/Ticket/Card/TicketExpedition.vue
@@ -334,7 +334,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
         <ExpeditionNewTicket
             :ticket="ticketData"
             :with-route="newTicketWithRoute"
-            :selected-expeditions="selectedExpeditions"
+            :selected-expeditions="selectedRows"
         />
     </QDialog>
     <QDialog ref="logsTableDialogRef" transition-show="scale" transition-hide="scale">

From 81a55a9e7a9960dcb7f66dac86add05f3d3107f2 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Tue, 22 Oct 2024 14:55:47 +0200
Subject: [PATCH 213/228] chore: test gitea

---
 src/components/VnTable/VnTable.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index 9d64591e9..9209eaf7b 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -794,6 +794,7 @@ es:
         top: 0;
     }
 }
+
 .vnTable {
     thead tr th {
         position: sticky;

From 9673f7be1edf10b9606327415118411a03380670 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Wed, 23 Oct 2024 15:17:06 +0200
Subject: [PATCH 214/228] fix: refs #8083 update rightly

---
 src/pages/Ticket/Card/TicketExpedition.vue | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/pages/Ticket/Card/TicketExpedition.vue b/src/pages/Ticket/Card/TicketExpedition.vue
index 93749ebec..9f592bd89 100644
--- a/src/pages/Ticket/Card/TicketExpedition.vue
+++ b/src/pages/Ticket/Card/TicketExpedition.vue
@@ -231,14 +231,14 @@ onUnmounted(() => (stateStore.rightDrawer = false));
                     :select-props="{
                         options: expeditionStateTypes,
                         optionLabel: 'description',
+                        optionValue: 'code',
                     }"
                     :promise="
-                        async (stateTypeFk) => {
-                            await vnTableRef.CrudModelRef.saveChanges({
-                                updates: selectedRows.map(({ id }) => ({
-                                    data: { stateTypeFk },
-                                    where: { id },
-                                })),
+                        async (stateCode) => {
+                            await axios.post('ExpeditionStates/addExpeditionState', {
+                                expeditions: selectedRows.map(({ id }) => {
+                                    return { expeditionFk: id, stateCode };
+                                }),
                             });
                             vnTableRef.tableRef.clearSelection();
                         }
@@ -309,7 +309,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
             'row-key': 'id',
             selection: 'multiple',
         }"
-        save-url="Expeditions/crud"
+        save-url="ExpeditionStates/crud"
         auto-load
         :expr-builder="
             (param, value) => {

From 126bb3f039160460b528042f30788096c81cd7c2 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Wed, 23 Oct 2024 16:10:14 +0200
Subject: [PATCH 215/228] feat: refs #8083 insert

---
 src/pages/Ticket/Card/TicketExpedition.vue | 24 ++++++++--------------
 src/pages/Ticket/locale/en.yml             |  1 +
 src/pages/Ticket/locale/es.yml             |  1 +
 3 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/src/pages/Ticket/Card/TicketExpedition.vue b/src/pages/Ticket/Card/TicketExpedition.vue
index 9f592bd89..436e9678e 100644
--- a/src/pages/Ticket/Card/TicketExpedition.vue
+++ b/src/pages/Ticket/Card/TicketExpedition.vue
@@ -26,6 +26,7 @@ const { openConfirmationModal } = useVnConfirm();
 const newTicketDialogRef = ref(null);
 const logsTableDialogRef = ref(null);
 const vnTableRef = ref();
+const btnSelectRef = ref();
 const expeditionsLogsData = ref([]);
 const selectedExpeditions = ref([]);
 const allColumnNames = ref([]);
@@ -190,17 +191,11 @@ const getExpeditionState = async (expedition) => {
         const { data: expeditionStates } = await axios.get(`ExpeditionStates/filter`, {
             params: { filter: JSON.stringify(filter) },
         });
-        const { data: scannedStates } = await axios.get(`ExpeditionStates`, {
-            params: { filter: JSON.stringify(filter), fields: ['id', 'isScanned'] },
-        });
 
-        expeditionsLogsData.value = expeditionStates.map((state) => {
-            const scannedState = scannedStates.find((s) => s.id === state.id);
-            return {
-                ...state,
-                isScanned: scannedState ? scannedState.isScanned : false,
-            };
-        });
+        expeditionsLogsData.value = expeditionStates.map((state) => ({
+            ...state,
+            isScanned: !!state.isScanned,
+        }));
     } catch (error) {
         console.error(error);
     }
@@ -225,6 +220,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
         <template #st-actions>
             <QBtnGroup push class="q-gutter-x-sm" flat>
                 <VnBtnSelect
+                    ref="btnSelectRef"
                     :disable="!hasSelectedRows"
                     color="primary"
                     :label="t('globals.changeState')"
@@ -241,6 +237,8 @@ onUnmounted(() => (stateStore.rightDrawer = false));
                                 }),
                             });
                             vnTableRef.tableRef.clearSelection();
+                            vnTableRef.reload();
+                            btnSelectRef.hidePopup();
                         }
                     "
                 />
@@ -355,11 +353,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
             </template>
             <template #body-cell-isScanned="{ row }">
                 <QTd style="text-align: center">
-                    <QCheckbox disable v-model="row.isScanned">
-                        {{
-                            row.isScanned === 1 ? t('expedition.yes') : t('expedition.no')
-                        }}
-                    </QCheckbox>
+                    <QCheckbox disable v-model="row.isScanned" />
                 </QTd>
             </template>
         </QTable>
diff --git a/src/pages/Ticket/locale/en.yml b/src/pages/Ticket/locale/en.yml
index 06699e00b..bae290b5d 100644
--- a/src/pages/Ticket/locale/en.yml
+++ b/src/pages/Ticket/locale/en.yml
@@ -118,6 +118,7 @@ expedition:
     removeExpeditionSubtitle: Are you sure you want to delete this expedition?
     worker: Worker
     move: Move
+    isScanned: Scanned
 basicData:
     next: Next
     back: Back
diff --git a/src/pages/Ticket/locale/es.yml b/src/pages/Ticket/locale/es.yml
index d4ba1f26a..4dca7253c 100644
--- a/src/pages/Ticket/locale/es.yml
+++ b/src/pages/Ticket/locale/es.yml
@@ -207,6 +207,7 @@ expedition:
     removeExpeditionSubtitle: ¿Está seguro de eliminar esta expedición?
     worker: Trabajador
     move: Mover
+    isScanned: Escaneado
 package:
     package: Embalaje
     quantity: Cantidad

From 33ee1ea01bca4c715a70ad6f6c6bf4ff23bcea08 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Wed, 23 Oct 2024 16:11:58 +0200
Subject: [PATCH 216/228] fix: refs #8083 drop useless code

---
 src/pages/Ticket/Card/TicketExpedition.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/pages/Ticket/Card/TicketExpedition.vue b/src/pages/Ticket/Card/TicketExpedition.vue
index 436e9678e..979854ad5 100644
--- a/src/pages/Ticket/Card/TicketExpedition.vue
+++ b/src/pages/Ticket/Card/TicketExpedition.vue
@@ -238,7 +238,6 @@ onUnmounted(() => (stateStore.rightDrawer = false));
                             });
                             vnTableRef.tableRef.clearSelection();
                             vnTableRef.reload();
-                            btnSelectRef.hidePopup();
                         }
                     "
                 />

From 4e31566dddcbd2f1f073be202d3cbdb4cbcc96ef Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Wed, 23 Oct 2024 16:13:04 +0200
Subject: [PATCH 217/228] fix: refs #8083 drop useless code

---
 src/pages/Ticket/Card/TicketExpedition.vue | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/pages/Ticket/Card/TicketExpedition.vue b/src/pages/Ticket/Card/TicketExpedition.vue
index 979854ad5..27f78e728 100644
--- a/src/pages/Ticket/Card/TicketExpedition.vue
+++ b/src/pages/Ticket/Card/TicketExpedition.vue
@@ -26,7 +26,6 @@ const { openConfirmationModal } = useVnConfirm();
 const newTicketDialogRef = ref(null);
 const logsTableDialogRef = ref(null);
 const vnTableRef = ref();
-const btnSelectRef = ref();
 const expeditionsLogsData = ref([]);
 const selectedExpeditions = ref([]);
 const allColumnNames = ref([]);
@@ -220,7 +219,6 @@ onUnmounted(() => (stateStore.rightDrawer = false));
         <template #st-actions>
             <QBtnGroup push class="q-gutter-x-sm" flat>
                 <VnBtnSelect
-                    ref="btnSelectRef"
                     :disable="!hasSelectedRows"
                     color="primary"
                     :label="t('globals.changeState')"

From 1bfede4a554f6565843134396e8663793dad5355 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Wed, 23 Oct 2024 16:13:32 +0200
Subject: [PATCH 218/228] fix: refs #8083 drop useless code

---
 src/pages/Ticket/Card/TicketExpedition.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/pages/Ticket/Card/TicketExpedition.vue b/src/pages/Ticket/Card/TicketExpedition.vue
index 27f78e728..bd63f259c 100644
--- a/src/pages/Ticket/Card/TicketExpedition.vue
+++ b/src/pages/Ticket/Card/TicketExpedition.vue
@@ -304,7 +304,6 @@ onUnmounted(() => (stateStore.rightDrawer = false));
             'row-key': 'id',
             selection: 'multiple',
         }"
-        save-url="ExpeditionStates/crud"
         auto-load
         :expr-builder="
             (param, value) => {

From 6f57d9e4906f7c74b50545a3271574b942efeac4 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Thu, 24 Oct 2024 10:21:25 +0200
Subject: [PATCH 219/228] refactor: refs #7524 use VnTable

---
 src/components/VnTable/VnTable.vue       |   6 +-
 src/pages/Ticket/TicketAdvance.vue       | 605 +++++++++--------------
 src/pages/Ticket/TicketAdvanceFilter.vue |   3 +
 3 files changed, 234 insertions(+), 380 deletions(-)

diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index 9209eaf7b..0afc5e8cf 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -447,7 +447,11 @@ function handleOnDataSaved(_) {
                     />
                 </template>
                 <template #header-cell="{ col }">
-                    <QTh v-if="col.visible ?? true">
+                    <QTh
+                        v-if="col.visible ?? true"
+                        :style="col.headerStyle"
+                        :class="col.headerClass"
+                    >
                         <div
                             class="column self-start q-ml-xs ellipsis"
                             :class="`text-${col?.align ?? 'left'}`"
diff --git a/src/pages/Ticket/TicketAdvance.vue b/src/pages/Ticket/TicketAdvance.vue
index 2cce1dba8..8b109d778 100644
--- a/src/pages/Ticket/TicketAdvance.vue
+++ b/src/pages/Ticket/TicketAdvance.vue
@@ -1,24 +1,20 @@
 <script setup>
-import { onMounted, ref, computed, reactive } from 'vue';
+import { ref, computed, reactive, watch, h } from 'vue';
 import { useI18n } from 'vue-i18n';
-
 import FetchData from 'components/FetchData.vue';
-import VnInput from 'src/components/common/VnInput.vue';
-import VnSelect from 'src/components/common/VnSelect.vue';
 import TicketDescriptorProxy from 'src/pages/Ticket/Card/TicketDescriptorProxy.vue';
 import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
 import VnProgress from 'src/components/common/VnProgressModal.vue';
 import RightMenu from 'src/components/common/RightMenu.vue';
 import TicketAdvanceFilter from './TicketAdvanceFilter.vue';
-
 import { dashIfEmpty, toCurrency } from 'src/filters';
 import { useVnConfirm } from 'composables/useVnConfirm';
-import { useArrayData } from 'composables/useArrayData';
 import useNotify from 'src/composables/useNotify.js';
 import { useState } from 'src/composables/useState';
 import { toDateFormat } from 'src/filters/date.js';
 import axios from 'axios';
+import VnTable from 'src/components/VnTable/VnTable.vue';
 
 const state = useState();
 const { t } = useI18n();
@@ -29,109 +25,58 @@ const user = state.getUser();
 const itemPackingTypesOptions = ref([]);
 const zonesOptions = ref([]);
 const selectedTickets = ref([]);
-
-const exprBuilder = (param, value) => {
-    switch (param) {
-        case 'id':
-        case 'futureId':
-        case 'liters':
-        case 'futureLiters':
-        case 'lines':
-        case 'futureLines':
-        case 'totalWithVat':
-        case 'futureTotalWithVat':
-        case 'futureZone':
-        case 'notMovableLines':
-        case 'futureZoneFk':
-            return { [param]: value };
-        case 'iptColFilter':
-            return { ipt: { like: `%${value}%` } };
-        case 'futureIptColFilter':
-            return { futureIpt: { like: `%${value}%` } };
-    }
-};
-
-const userParams = reactive({});
-
-const arrayData = useArrayData('AdvanceTickets', {
-    url: 'Tickets/getTicketsAdvance',
-    userParams: userParams,
-    exprBuilder: exprBuilder,
-    limit: 0,
+const vnTableRef = ref({});
+const originElRef = ref(null);
+const destinationElRef = ref(null);
+let today = Date.vnNew().toISOString();
+const tomorrow = new Date(today);
+tomorrow.setDate(tomorrow.getDate() + 1);
+const userParams = reactive({
+    dateFuture: tomorrow,
+    dateToAdvance: today,
+    warehouseFk: user.value.warehouseFk,
+    ipt: 'H',
+    futureIpt: 'H',
+    isFullMovable: true,
 });
-const { store } = arrayData;
-const tickets = computed(() =>
-    (store.data || []).map((ticket, index) => ({ ...ticket, index: index }))
-);
-
-const applyColumnFilter = async (col) => {
-    try {
-        const paramKey = col.columnFilter?.filterParamKey || col.field;
-        userParams[paramKey] = col.columnFilter.filterValue;
-        await arrayData.addFilter({ params: userParams });
-    } catch (err) {
-        console.error('Error applying column filter', err);
-    }
-};
-
-const getInputEvents = (col) => {
-    return col.columnFilter.type === 'select'
-        ? { 'update:modelValue': () => applyColumnFilter(col) }
-        : {
-              'keyup.enter': () => applyColumnFilter(col),
-          };
-};
 
 const ticketColumns = computed(() => [
     {
         label: '',
         name: 'icons',
-        align: 'left',
-        columnFilter: null,
+        hidden: true,
+        headerClass: 'horizontal-separator',
     },
     {
-        label: t('advanceTickets.ticketId'),
-        name: 'ticketId',
         align: 'center',
-        sortable: true,
-        columnFilter: {
-            component: VnInput,
-            type: 'text',
-            filterValue: null,
-            filterParamKey: 'id',
-            event: getInputEvents,
-            attrs: {
-                dense: true,
-            },
-        },
+        label: t('advanceTickets.ticketId'),
+        name: 'id',
+        headerClass: 'horizontal-separator',
     },
     {
+        align: 'left',
         label: t('advanceTickets.ipt'),
         name: 'ipt',
-        field: 'ipt',
-        align: 'left',
-        sortable: true,
         columnFilter: {
-            component: VnSelect,
-            filterParamKey: 'iptColFilter',
-            type: 'select',
-            filterValue: null,
-            event: getInputEvents,
+            component: 'select',
             attrs: {
-                options: itemPackingTypesOptions.value,
-                'option-value': 'code',
-                'option-label': 'description',
-                dense: true,
+                url: 'itemPackingTypes',
+                fields: ['code', 'description'],
+                where: { isActive: true },
+                optionValue: 'code',
+                optionLabel: 'description',
+                inWhere: false,
             },
         },
-        format: (val) => dashIfEmpty(val),
+        format: (row, dashIfEmpty) => dashIfEmpty(row.ipt),
+        headerClass: 'horizontal-separator',
     },
     {
+        align: 'left',
         label: t('advanceTickets.state'),
         name: 'state',
-        align: 'left',
-        sortable: true,
-        columnFilter: null,
+        headerClass: 'horizontal-separator',
+        hidden: true,
     },
     {
         label: t('advanceTickets.preparation'),
@@ -139,171 +84,105 @@ const ticketColumns = computed(() => [
         field: 'preparation',
         align: 'left',
         sortable: true,
-        columnFilter: null,
+        headerClass: 'horizontal-separator',
+        columnFilter: false,
     },
     {
-        label: t('advanceTickets.liters'),
-        name: 'liters',
-        field: 'liters',
         align: 'left',
-        sortable: true,
-        columnFilter: {
-            component: VnInput,
-            type: 'text',
-            filterValue: null,
-            event: getInputEvents,
-            attrs: {
-                dense: true,
-            },
-        },
+        label: t('advanceTickets.liters'),
+        headerClass: 'horizontal-separator',
+        name: 'liters',
     },
     {
+        align: 'left',
         label: t('advanceTickets.lines'),
         name: 'lines',
-        field: 'lines',
-        align: 'left',
-        sortable: true,
-        columnFilter: {
-            component: VnInput,
-            type: 'text',
-            filterValue: null,
-            event: getInputEvents,
-            attrs: {
-                dense: true,
-            },
-        },
-        format: (val) => dashIfEmpty(val),
+        headerClass: 'horizontal-separator',
+        format: (row, dashIfEmpty) => dashIfEmpty(row.lines),
     },
     {
+        align: 'left',
         label: t('advanceTickets.import'),
-        field: 'import',
-        name: 'import',
-        align: 'left',
-        sortable: true,
+        name: 'totalWithVat',
+        hidden: true,
+        headerClass: 'horizontal-separator',
+        format: (row) => toCurrency(row.totalWithVat),
     },
     {
+        align: 'left',
         label: t('advanceTickets.futureId'),
         name: 'futureId',
-        align: 'left',
-        sortable: true,
-        columnFilter: {
-            component: VnInput,
-            type: 'text',
-            filterValue: null,
-            filterParamKey: 'futureId',
-            event: getInputEvents,
-            attrs: {
-                dense: true,
-            },
-        },
+        headerClass: 'vertical-separator horizontal-separator',
+        columnClass: 'vertical-separator',
     },
     {
+        align: 'left',
         label: t('advanceTickets.futureIpt'),
         name: 'futureIpt',
-        field: 'futureIpt',
-        align: 'left',
-        sortable: true,
         columnFilter: {
-            component: VnSelect,
-            filterParamKey: 'futureIptColFilter',
-            type: 'select',
-            filterValue: null,
-            event: getInputEvents,
+            component: 'select',
             attrs: {
-                options: itemPackingTypesOptions.value,
-                'option-value': 'code',
-                'option-label': 'description',
-                dense: true,
+                url: 'itemPackingTypes',
+                fields: ['code', 'description'],
+                where: { isActive: true },
+                optionValue: 'code',
+                optionLabel: 'description',
             },
         },
-        format: (val) => dashIfEmpty(val),
+        headerClass: 'horizontal-separator',
+        format: (row, dashIfEmpty) => dashIfEmpty(row.futureIpt),
     },
     {
+        align: 'left',
         label: t('advanceTickets.futureState'),
         name: 'futureState',
-        align: 'left',
-        sortable: true,
-        columnFilter: null,
-        format: (val) => dashIfEmpty(val),
+        headerClass: 'horizontal-separator',
+        hidden: true,
     },
     {
+        align: 'left',
         label: t('advanceTickets.futureLiters'),
+        headerClass: 'horizontal-separator',
         name: 'futureLiters',
-        field: 'futureLiters',
-        align: 'left',
-        sortable: true,
-        columnFilter: {
-            component: VnInput,
-            type: 'text',
-            filterValue: null,
-            event: getInputEvents,
-            attrs: {
-                dense: true,
-            },
-        },
-        format: (val) => dashIfEmpty(val),
     },
     {
+        align: 'left',
         label: t('advanceTickets.futureZone'),
-        name: 'futureZoneName',
-        field: 'futureZoneName',
-        align: 'left',
-        sortable: true,
+        name: 'futureZoneFk',
+        columnClass: 'expand',
         columnFilter: {
-            component: VnSelect,
-            type: 'select',
-            filterValue: null,
-            filterParamKey: 'futureZoneFk',
-            event: getInputEvents,
+            component: 'select',
+            inWhere: true,
             attrs: {
-                options: zonesOptions.value,
-                'option-value': 'id',
-                'option-label': 'name',
-                dense: true,
+                url: 'Zones',
+                fields: ['id', 'name'],
             },
         },
-        format: (val) => dashIfEmpty(val),
+        columnField: {
+            component: null,
+        },
+        headerClass: 'horizontal-separator',
+        format: (row, dashIfEmpty) => dashIfEmpty(row.futureZoneName),
     },
     {
+        align: 'left',
         label: t('advanceTickets.notMovableLines'),
+        headerClass: 'horizontal-separator',
         name: 'notMovableLines',
-        field: 'notMovableLines',
-        align: 'left',
-        sortable: true,
-        columnFilter: {
-            component: VnInput,
-            type: 'text',
-            filterValue: null,
-            event: getInputEvents,
-            attrs: {
-                dense: true,
-            },
-        },
-        format: (val) => dashIfEmpty(val),
     },
     {
+        align: 'left',
         label: t('advanceTickets.futureLines'),
+        headerClass: 'horizontal-separator',
         name: 'futureLines',
-        field: 'futureLines',
-        align: 'left',
-        sortable: true,
-        columnFilter: {
-            component: VnInput,
-            type: 'text',
-            filterValue: null,
-            event: getInputEvents,
-            attrs: {
-                dense: true,
-            },
-        },
-        format: (val) => dashIfEmpty(val),
     },
     {
-        label: t('advanceTickets.futureImport'),
-        name: 'futureImport',
         align: 'left',
-        sortable: true,
-        columnFilter: null,
+        label: t('advanceTickets.futureImport'),
+        name: 'futureTotalWithVat',
+        hidden: true,
+        headerClass: 'horizontal-separator',
+        format: (row) => toCurrency(row.futureTotalWithVat),
     },
 ]);
 
@@ -329,7 +208,7 @@ const requestComponentUpdate = async (ticket, isWithoutNegatives) => {
     const query = `tickets/${ticket.futureId}/componentUpdate`;
     if (!ticket.landed) {
         const newLanded = await getLanded({
-            shipped: userParams.dateToAdvance,
+            shipped: vnTableRef.value.params.dateToAdvance,
             addressFk: ticket.futureAddressFk,
             agencyModeFk: ticket.agencyModeFk ?? ticket.futureAgencyModeFk,
             warehouseFk: ticket.futureWarehouseFk,
@@ -352,7 +231,7 @@ const requestComponentUpdate = async (ticket, isWithoutNegatives) => {
         zoneFk: ticket.zoneFk ?? ticket.futureZoneFk,
         warehouseFk: ticket.futureWarehouseFk,
         companyFk: ticket.futureCompanyFk,
-        shipped: userParams.dateToAdvance,
+        shipped: vnTableRef.value.params.dateToAdvance,
         landed: ticket.landed,
         isDeleted: false,
         isWithoutNegatives,
@@ -387,7 +266,7 @@ const moveTicketsAdvance = async () => {
 
         const params = { tickets: ticketsToMove };
         await axios.post('Tickets/merge', params);
-        arrayData.fetch({ append: false });
+        vnTableRef.value.reload();
         selectedTickets.value = [];
         if (ticketsToMove.length)
             notify(t('advanceTickets.moveTicketSuccess'), 'positive');
@@ -437,7 +316,7 @@ const splitTickets = async () => {
     } catch (error) {
         console.error('Error splitting tickets', error);
     } finally {
-        arrayData.fetch({ append: false });
+        vnTableRef.value.reload();
     }
 };
 
@@ -455,21 +334,52 @@ const handleCloseProgressDialog = () => {
 
 const handleCancelProgress = () => (cancelProgress.value = true);
 
-onMounted(async () => {
-    let today = Date.vnNew().toISOString();
-    const tomorrow = new Date(today);
-    tomorrow.setDate(tomorrow.getDate() + 1);
-    userParams.dateFuture = tomorrow;
-    userParams.dateToAdvance = today;
-    userParams.warehouseFk = user.value.warehouseFk;
-    userParams.ipt = 'H';
-    userParams.futureIpt = 'H';
-    userParams.isFullMovable = true;
-    const filter = { limit: 0 };
-    await arrayData.addFilter({ filter, userParams });
-});
-</script>
+watch(
+    () => vnTableRef.value.tableRef?.$el,
+    ($el) => {
+        if (!$el) return;
+        const head = $el.querySelector('thead');
+        const firstRow = $el.querySelector('thead > tr');
 
+        const newRow = document.createElement('tr');
+        destinationElRef.value = document.createElement('th');
+        originElRef.value = document.createElement('th');
+
+        newRow.classList.add('bg-header');
+        destinationElRef.value.classList.add('text-uppercase', 'color-vn-label');
+        originElRef.value.classList.add('text-uppercase', 'color-vn-label');
+
+        destinationElRef.value.setAttribute('colspan', '7');
+        originElRef.value.setAttribute('colspan', '9');
+
+        destinationElRef.value.textContent = `${t(
+            'advanceTickets.destination'
+        )} ${toDateFormat(vnTableRef.value.params.dateToAdvance)}`;
+        originElRef.value.textContent = `${t('advanceTickets.origin')} ${toDateFormat(
+            vnTableRef.value.params.dateFuture
+        )}`;
+
+        newRow.append(destinationElRef.value, originElRef.value);
+        head.insertBefore(newRow, firstRow);
+    },
+    { once: true, inmmediate: true }
+);
+
+watch(
+    () => vnTableRef.value.params,
+    () => {
+        if (originElRef.value && destinationElRef.value) {
+            destinationElRef.value.textContent = `${t(
+                'advanceTickets.destination'
+            )} ${toDateFormat(vnTableRef.value.params.dateToAdvance)}`;
+            originElRef.value.textContent = `${t('advanceTickets.origin')} ${toDateFormat(
+                vnTableRef.value.params.dateFuture
+            )}`;
+        }
+    },
+    { deep: true }
+);
+</script>
 <template>
     <FetchData
         url="itemPackingTypes"
@@ -490,8 +400,9 @@ onMounted(async () => {
         auto-load
         @on-fetch="(data) => (zonesOptions = data)"
     />
+    <!-- Fix searchbar #8154 -->
     <VnSearchbar
-        data-key="WeeklyTickets"
+        data-key="advanceTickets"
         :label="t('weeklyTickets.search')"
         :info="t('weeklyTickets.searchInfo')"
     />
@@ -538,173 +449,109 @@ onMounted(async () => {
     </VnSubToolbar>
     <RightMenu>
         <template #right-panel>
-            <TicketAdvanceFilter data-key="AdvanceTickets" />
+            <TicketAdvanceFilter data-key="advanceTickets" />
         </template>
     </RightMenu>
     <QPage class="column items-center q-pa-md">
-        <QTable
-            :rows="tickets"
+        <VnTable
+            data-key="advanceTickets"
+            ref="vnTableRef"
+            url="Tickets/getTicketsAdvance"
+            search-url="advanceTickets"
+            :user-params="userParams"
+            :limit="0"
             :columns="ticketColumns"
-            row-key="index"
-            selection="multiple"
+            :table="{
+                'row-key': '$index',
+                selection: 'multiple',
+            }"
             v-model:selected="selectedTickets"
             :pagination="{ rowsPerPage: 0 }"
             :no-data-label="t('globals.noResults')"
-            style="max-width: 99%"
+            :right-search="false"
+            auto-load
+            :disable-option="{ card: true }"
         >
-            <template #header="props">
-                <QTr :props="props">
-                    <QTh
-                        class="horizontal-separator text-uppercase color-vn-label"
-                        colspan="7"
-                        translate
-                    >
-                        {{ t('advanceTickets.destination') }}
-                        {{ toDateFormat(userParams.dateToAdvance) }}
-                    </QTh>
-                    <QTh
-                        class="horizontal-separator text-uppercase color-vn-label"
-                        colspan="9"
-                        translate
-                    >
-                        {{ t('advanceTickets.origin') }}
-                        {{ toDateFormat(userParams.dateFuture) }}
-                    </QTh>
-                </QTr>
-                <QTr>
-                    <QTh>
-                        <QCheckbox v-model="props.selected" />
-                    </QTh>
-                    <QTh
-                        v-for="(col, index) in ticketColumns"
-                        :key="index"
-                        :class="{ 'vertical-separator': col.name === 'futureId' }"
-                    >
-                        {{ col.label }}
-                    </QTh>
-                </QTr>
+            <template #column-icons="{ row }">
+                <QIcon
+                    v-if="row.futureAgency !== row.agency && row.agency"
+                    color="primary"
+                    name="vn:agency-term"
+                    size="xs"
+                >
+                    <QTooltip class="column">
+                        <span>
+                            {{
+                                t('advanceTickets.originAgency', {
+                                    agency: row.futureAgency,
+                                })
+                            }}
+                        </span>
+                        <span>
+                            {{
+                                t('advanceTickets.destinationAgency', {
+                                    agency: row.agency,
+                                })
+                            }}
+                        </span>
+                    </QTooltip>
+                </QIcon>
             </template>
-            <template #top-row="{ cols }">
-                <QTr>
-                    <QTd />
-                    <QTd
-                        v-for="(col, index) in cols"
-                        :key="index"
-                        style="max-width: 100px"
-                    >
-                        <component
-                            :is="col.columnFilter.component"
-                            v-if="col.columnFilter"
-                            v-model="col.columnFilter.filterValue"
-                            v-bind="col.columnFilter.attrs"
-                            v-on="col.columnFilter.event(col)"
-                            dense
-                        />
-                    </QTd>
-                </QTr>
+            <template #column-id="{ row }">
+                <QBtn flat class="link">
+                    {{ row.id }}
+                    <TicketDescriptorProxy :id="row.id" />
+                </QBtn>
             </template>
-            <template #header-cell-availableLines="{ col }">
-                <QTh class="vertical-separator">
-                    {{ col.label }}
-                </QTh>
+            <template #column-state="{ row }">
+                <QBadge
+                    v-if="row.state"
+                    text-color="black"
+                    :color="row.classColor"
+                    class="q-ma-none"
+                    dense
+                >
+                    {{ row.state }}
+                </QBadge>
+                <span v-else> {{ dashIfEmpty(row.state) }}</span>
             </template>
-            <template #body-cell-icons="{ row }">
-                <QTd class="q-gutter-x-xs">
-                    <QIcon
-                        v-if="row.futureAgency !== row.agency && row.agency"
-                        color="primary"
-                        name="vn:agency-term"
-                        size="xs"
-                    >
-                        <QTooltip class="column">
-                            <span>
-                                {{
-                                    t('advanceTickets.originAgency', {
-                                        agency: row.futureAgency,
-                                    })
-                                }}
-                            </span>
-                            <span>
-                                {{
-                                    t('advanceTickets.destinationAgency', {
-                                        agency: row.agency,
-                                    })
-                                }}
-                            </span>
-                        </QTooltip>
-                    </QIcon>
-                </QTd>
+            <template #column-import="{ row }">
+                <QBadge
+                    :text-color="isLessThan50(row.totalWithVat) ? 'black' : 'white'"
+                    :color="totalPriceColor(row.totalWithVat)"
+                    class="q-ma-none"
+                    dense
+                >
+                    {{ toCurrency(row.totalWithVat || 0) }}
+                </QBadge>
             </template>
-
-            <template #body-cell-ticketId="{ row }">
-                <QTd>
-                    <QBtn flat class="link">
-                        {{ row.id }}
-                        <TicketDescriptorProxy :id="row.id" />
-                    </QBtn>
-                </QTd>
+            <template #column-futureId="{ row }">
+                <QBtn flat class="link" dense>
+                    {{ row.futureId }}
+                    <TicketDescriptorProxy :id="row.futureId" />
+                </QBtn>
             </template>
-            <template #body-cell-state="{ row }">
-                <QTd>
-                    <QBadge
-                        v-if="row.state"
-                        text-color="black"
-                        :color="row.classColor"
-                        class="q-ma-none"
-                        dense
-                    >
-                        {{ row.state }}
-                    </QBadge>
-                    <span v-else> {{ dashIfEmpty(row.state) }}</span>
-                </QTd>
+            <template #column-futureState="{ row }">
+                <QBadge
+                    text-color="black"
+                    :color="row.futureClassColor"
+                    class="q-ma-none"
+                    dense
+                >
+                    {{ row.futureState }}
+                </QBadge>
             </template>
-            <template #body-cell-import="{ row }">
-                <QTd>
-                    <QBadge
-                        :text-color="isLessThan50(row.totalWithVat) ? 'black' : 'white'"
-                        :color="totalPriceColor(row.totalWithVat)"
-                        class="q-ma-none"
-                        dense
-                    >
-                        {{ toCurrency(row.totalWithVat || 0) }}
-                    </QBadge>
-                </QTd>
+            <template #column-futureImport="{ row }">
+                <QBadge
+                    :text-color="isLessThan50(row.futureTotalWithVat) ? 'black' : 'white'"
+                    :color="totalPriceColor(row.futureTotalWithVat)"
+                    class="q-ma-none"
+                    dense
+                >
+                    {{ toCurrency(row.futureTotalWithVat || 0) }}
+                </QBadge>
             </template>
-            <template #body-cell-futureId="{ row }">
-                <QTd class="vertical-separator">
-                    <QBtn flat class="link" dense>
-                        {{ row.futureId }}
-                        <TicketDescriptorProxy :id="row.futureId" />
-                    </QBtn>
-                </QTd>
-            </template>
-            <template #body-cell-futureState="{ row }">
-                <QTd>
-                    <QBadge
-                        text-color="black"
-                        :color="row.futureClassColor"
-                        class="q-ma-none"
-                        dense
-                    >
-                        {{ row.futureState }}
-                    </QBadge>
-                </QTd>
-            </template>
-            <template #body-cell-futureImport="{ row }">
-                <QTd>
-                    <QBadge
-                        :text-color="
-                            isLessThan50(row.futureTotalWithVat) ? 'black' : 'white'
-                        "
-                        :color="totalPriceColor(row.futureTotalWithVat)"
-                        class="q-ma-none"
-                        dense
-                    >
-                        {{ toCurrency(row.futureTotalWithVat || 0) }}
-                    </QBadge>
-                </QTd>
-            </template>
-        </QTable>
+        </VnTable>
         <VnProgress
             :progress="progressPercentage"
             :cancelled="cancelProgress"
@@ -723,11 +570,11 @@ onMounted(async () => {
 </template>
 
 <style scoped lang="scss">
-.vertical-separator {
+:deep(.vertical-separator) {
     border-left: 4px solid white !important;
 }
 
-.horizontal-separator {
-    border-bottom: 4px solid white !important;
+:deep(.horizontal-separator) {
+    border-top: 4px solid white !important;
 }
 </style>
diff --git a/src/pages/Ticket/TicketAdvanceFilter.vue b/src/pages/Ticket/TicketAdvanceFilter.vue
index 182f715a3..1d08d1ebf 100644
--- a/src/pages/Ticket/TicketAdvanceFilter.vue
+++ b/src/pages/Ticket/TicketAdvanceFilter.vue
@@ -57,6 +57,7 @@ onMounted(async () => await getItemPackingTypes());
         auto-load
     />
     <VnFilterPanel
+        search-url="advanceTickets"
         :data-key="props.dataKey"
         :search-button="true"
         :hidden-tags="['search']"
@@ -100,6 +101,7 @@ onMounted(async () => await getItemPackingTypes());
                         dense
                         outlined
                         rounded
+                        :use-like="false"
                     >
                     </VnSelect>
                 </QItemSection>
@@ -117,6 +119,7 @@ onMounted(async () => await getItemPackingTypes());
                         dense
                         outlined
                         rounded
+                        :use-like="false"
                     >
                     </VnSelect>
                 </QItemSection>

From d918b76010c5ec8efa76cfec1298ba4c5cf0749b Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Thu, 24 Oct 2024 10:24:28 +0200
Subject: [PATCH 220/228] chore: refs #7524 drop useless code

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

diff --git a/src/pages/Ticket/TicketAdvance.vue b/src/pages/Ticket/TicketAdvance.vue
index 8b109d778..f6fb37e21 100644
--- a/src/pages/Ticket/TicketAdvance.vue
+++ b/src/pages/Ticket/TicketAdvance.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { ref, computed, reactive, watch, h } from 'vue';
+import { ref, computed, reactive, watch } from 'vue';
 import { useI18n } from 'vue-i18n';
 import FetchData from 'components/FetchData.vue';
 import TicketDescriptorProxy from 'src/pages/Ticket/Card/TicketDescriptorProxy.vue';

From b02199eb07e63ac60ece266ab3139fdc74fba6ed Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Thu, 24 Oct 2024 12:03:49 +0200
Subject: [PATCH 221/228] fix: reload window when price is recalculated

---
 src/pages/Ticket/Card/TicketSale.vue            | 1 +
 src/pages/Ticket/Card/TicketSaleMoreActions.vue | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/pages/Ticket/Card/TicketSale.vue b/src/pages/Ticket/Card/TicketSale.vue
index f179257f7..3e89e96bf 100644
--- a/src/pages/Ticket/Card/TicketSale.vue
+++ b/src/pages/Ticket/Card/TicketSale.vue
@@ -476,6 +476,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
                     :ticket-config="ticketConfig"
                     @get-mana="getMana()"
                     @update-discounts="updateDiscount"
+                    @re-calculated-price="resetChanges"
                 />
                 <QBtn
                     color="primary"
diff --git a/src/pages/Ticket/Card/TicketSaleMoreActions.vue b/src/pages/Ticket/Card/TicketSaleMoreActions.vue
index 94db67be2..a35e21f3f 100644
--- a/src/pages/Ticket/Card/TicketSaleMoreActions.vue
+++ b/src/pages/Ticket/Card/TicketSaleMoreActions.vue
@@ -14,7 +14,7 @@ import { toDateFormat } from 'src/filters/date';
 import { useRole } from 'src/composables/useRole';
 import { useVnConfirm } from 'composables/useVnConfirm';
 
-const emit = defineEmits(['updateDiscounts', 'getMana']);
+const emit = defineEmits(['updateDiscounts', 'getMana', 'reCalculatedPrice']);
 
 const props = defineProps({
     disable: {
@@ -105,8 +105,10 @@ const showSmsDialog = (template) => {
 const calculateSalePrice = async () => {
     if (!props.sales) return;
 
+    console.log('CALLED');
     await axios.post(`Sales/recalculatePrice`, props.sales);
     notify(t('globals.dataSaved'), 'positive');
+    emit('reCalculatedPrice', props.sales);
 };
 
 const changeMultipleDiscount = () => {

From c9e82f2caf728a475440d6faf4a0d447edc51129 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Thu, 24 Oct 2024 12:04:54 +0200
Subject: [PATCH 222/228] refactor: deleted log

---
 src/pages/Ticket/Card/TicketSaleMoreActions.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/pages/Ticket/Card/TicketSaleMoreActions.vue b/src/pages/Ticket/Card/TicketSaleMoreActions.vue
index a35e21f3f..43ba39b91 100644
--- a/src/pages/Ticket/Card/TicketSaleMoreActions.vue
+++ b/src/pages/Ticket/Card/TicketSaleMoreActions.vue
@@ -105,7 +105,6 @@ const showSmsDialog = (template) => {
 const calculateSalePrice = async () => {
     if (!props.sales) return;
 
-    console.log('CALLED');
     await axios.post(`Sales/recalculatePrice`, props.sales);
     notify(t('globals.dataSaved'), 'positive');
     emit('reCalculatedPrice', props.sales);

From c9cfb2b1cf38854ca7c7d36217c25776540a8cd5 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Thu, 24 Oct 2024 12:29:46 +0200
Subject: [PATCH 223/228] fix: refs #7524 changes

---
 src/pages/Ticket/TicketAdvance.vue | 57 ++++++++++++------------------
 1 file changed, 22 insertions(+), 35 deletions(-)

diff --git a/src/pages/Ticket/TicketAdvance.vue b/src/pages/Ticket/TicketAdvance.vue
index f6fb37e21..7db2b54b3 100644
--- a/src/pages/Ticket/TicketAdvance.vue
+++ b/src/pages/Ticket/TicketAdvance.vue
@@ -243,36 +243,31 @@ const requestComponentUpdate = async (ticket, isWithoutNegatives) => {
 };
 
 const moveTicketsAdvance = async () => {
-    try {
-        let ticketsToMove = [];
-        for (const ticket of selectedTickets.value) {
-            if (!ticket.id) {
-                try {
-                    const { query, params } = await requestComponentUpdate(ticket, false);
-                    axios.post(query, params);
-                } catch (e) {
-                    console.error('Error moving ticket', e);
-                }
-                continue;
+    let ticketsToMove = [];
+    for (const ticket of selectedTickets.value) {
+        if (!ticket.id) {
+            try {
+                const { query, params } = await requestComponentUpdate(ticket, false);
+                axios.post(query, params);
+            } catch (e) {
+                console.error('Error moving ticket', e);
             }
-            ticketsToMove.push({
-                originId: ticket.futureId,
-                destinationId: ticket.id,
-                originShipped: ticket.futureShipped,
-                destinationShipped: ticket.shipped,
-                workerFk: ticket.workerFk,
-            });
+            continue;
         }
-
-        const params = { tickets: ticketsToMove };
-        await axios.post('Tickets/merge', params);
-        vnTableRef.value.reload();
-        selectedTickets.value = [];
-        if (ticketsToMove.length)
-            notify(t('advanceTickets.moveTicketSuccess'), 'positive');
-    } catch (error) {
-        console.error('Error moving tickets', error);
+        ticketsToMove.push({
+            originId: ticket.futureId,
+            destinationId: ticket.id,
+            originShipped: ticket.futureShipped,
+            destinationShipped: ticket.shipped,
+            workerFk: ticket.workerFk,
+        });
     }
+
+    const params = { tickets: ticketsToMove };
+    await axios.post('Tickets/merge', params);
+    vnTableRef.value.reload();
+    selectedTickets.value = [];
+    if (ticketsToMove.length) notify(t('advanceTickets.moveTicketSuccess'), 'positive');
 };
 
 const progressLength = ref(0);
@@ -313,8 +308,6 @@ const splitTickets = async () => {
                 progressAdd(ticket.futureId);
             }
         }
-    } catch (error) {
-        console.error('Error splitting tickets', error);
     } finally {
         vnTableRef.value.reload();
     }
@@ -400,12 +393,6 @@ watch(
         auto-load
         @on-fetch="(data) => (zonesOptions = data)"
     />
-    <!-- Fix searchbar #8154 -->
-    <VnSearchbar
-        data-key="advanceTickets"
-        :label="t('weeklyTickets.search')"
-        :info="t('weeklyTickets.searchInfo')"
-    />
     <VnSubToolbar>
         <template #st-data>
             <QBtn

From f52b4c9a598dc400c3379f800b2f1157f339159f Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Thu, 24 Oct 2024 13:24:45 +0200
Subject: [PATCH 224/228] fix: refs #7524 vnProgressModal

---
 src/components/common/VnProgressModal.vue | 22 +++++-----------------
 1 file changed, 5 insertions(+), 17 deletions(-)

diff --git a/src/components/common/VnProgressModal.vue b/src/components/common/VnProgressModal.vue
index cfd948d5f..99bf15a7e 100644
--- a/src/components/common/VnProgressModal.vue
+++ b/src/components/common/VnProgressModal.vue
@@ -9,10 +9,6 @@ const $props = defineProps({
         type: Number, //Progress value (1.0 > x > 0.0)
         required: true,
     },
-    showDialog: {
-        type: Boolean,
-        required: true,
-    },
     cancelled: {
         type: Boolean,
         required: false,
@@ -24,25 +20,17 @@ const emit = defineEmits(['cancel', 'close']);
 
 const dialogRef = ref(null);
 
-const _showDialog = computed({
-    get: () => $props.showDialog,
-    set: (value) => {
-        if (value) dialogRef.value.show();
-    },
+const showDialog = defineModel('showDialog', {
+    type: Boolean,
+    default: false,
 });
 
 const _progress = computed(() => $props.progress);
-
 const progressLabel = computed(() => `${Math.round($props.progress * 100)}%`);
-
-const cancel = () => {
-    dialogRef.value.hide();
-    emit('cancel');
-};
 </script>
 
 <template>
-    <QDialog ref="dialogRef" v-model="_showDialog" @hide="onDialogHide">
+    <QDialog ref="dialogRef" v-model="showDialog" @hide="emit('close')">
         <QCard class="full-width dialog">
             <QCardSection class="row">
                 <span class="text-h6">{{ t('Progress') }}</span>
@@ -80,7 +68,7 @@ const cancel = () => {
                     type="button"
                     flat
                     class="text-primary"
-                    @click="cancel()"
+                    v-close-popup
                 >
                     {{ t('globals.cancel') }}
                 </QBtn>

From 823c354ef1a376b988e34a7f2f50f6f210ee34b7 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Thu, 24 Oct 2024 13:27:08 +0200
Subject: [PATCH 225/228] fix: refs #7524 vnProgressModal

---
 src/components/common/VnProgressModal.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/common/VnProgressModal.vue b/src/components/common/VnProgressModal.vue
index 99bf15a7e..23fb8ae70 100644
--- a/src/components/common/VnProgressModal.vue
+++ b/src/components/common/VnProgressModal.vue
@@ -35,7 +35,7 @@ const progressLabel = computed(() => `${Math.round($props.progress * 100)}%`);
             <QCardSection class="row">
                 <span class="text-h6">{{ t('Progress') }}</span>
                 <QSpace />
-                <QBtn icon="close" flat round dense @click="emit('close')" />
+                <QBtn icon="close" flat round dense v-close-popup />
             </QCardSection>
             <QCardSection>
                 <div class="column">

From 4828e32c9eec24cb349bb5c39cae075653d08538 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Thu, 24 Oct 2024 14:26:16 +0200
Subject: [PATCH 226/228] fix: refs #7652 datakey

---
 src/pages/Worker/Card/WorkerDescriptor.vue      | 7 ++++++-
 src/pages/Worker/Card/WorkerDescriptorProxy.vue | 7 ++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/pages/Worker/Card/WorkerDescriptor.vue b/src/pages/Worker/Card/WorkerDescriptor.vue
index 3675d40f8..b9ccedbfc 100644
--- a/src/pages/Worker/Card/WorkerDescriptor.vue
+++ b/src/pages/Worker/Card/WorkerDescriptor.vue
@@ -17,6 +17,11 @@ const $props = defineProps({
         required: false,
         default: null,
     },
+    dataKey: {
+        type: String,
+        required: false,
+        default: 'workerData',
+    },
 });
 const image = ref(null);
 
@@ -70,7 +75,7 @@ const refetch = async () => await cardDescriptorRef.value.getData();
     <CardDescriptor
         ref="cardDescriptorRef"
         module="Worker"
-        data-key="workerData"
+        :data-key="dataKey"
         url="Workers/descriptor"
         :filter="{ where: { id: entityId } }"
         title="user.nickname"
diff --git a/src/pages/Worker/Card/WorkerDescriptorProxy.vue b/src/pages/Worker/Card/WorkerDescriptorProxy.vue
index a142570f9..43deb7821 100644
--- a/src/pages/Worker/Card/WorkerDescriptorProxy.vue
+++ b/src/pages/Worker/Card/WorkerDescriptorProxy.vue
@@ -12,6 +12,11 @@ const $props = defineProps({
 
 <template>
     <QPopupProxy>
-        <WorkerDescriptor v-if="$props.id" :id="$props.id" :summary="WorkerSummary" />
+        <WorkerDescriptor
+            v-if="$props.id"
+            :id="$props.id"
+            :summary="WorkerSummary"
+            data-key="workerDescriptorProxy"
+        />
     </QPopupProxy>
 </template>

From 994237260ed24fef644c6fdc5c4091a52607f89d Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Fri, 25 Oct 2024 06:48:09 +0200
Subject: [PATCH 227/228] refactor: changed name of emitted event

---
 src/pages/Ticket/Card/TicketSale.vue            | 2 +-
 src/pages/Ticket/Card/TicketSaleMoreActions.vue | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/pages/Ticket/Card/TicketSale.vue b/src/pages/Ticket/Card/TicketSale.vue
index 3e89e96bf..798d629c7 100644
--- a/src/pages/Ticket/Card/TicketSale.vue
+++ b/src/pages/Ticket/Card/TicketSale.vue
@@ -476,7 +476,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
                     :ticket-config="ticketConfig"
                     @get-mana="getMana()"
                     @update-discounts="updateDiscount"
-                    @re-calculated-price="resetChanges"
+                    @refresh-table="resetChanges"
                 />
                 <QBtn
                     color="primary"
diff --git a/src/pages/Ticket/Card/TicketSaleMoreActions.vue b/src/pages/Ticket/Card/TicketSaleMoreActions.vue
index 43ba39b91..221cf6fad 100644
--- a/src/pages/Ticket/Card/TicketSaleMoreActions.vue
+++ b/src/pages/Ticket/Card/TicketSaleMoreActions.vue
@@ -14,7 +14,7 @@ import { toDateFormat } from 'src/filters/date';
 import { useRole } from 'src/composables/useRole';
 import { useVnConfirm } from 'composables/useVnConfirm';
 
-const emit = defineEmits(['updateDiscounts', 'getMana', 'reCalculatedPrice']);
+const emit = defineEmits(['updateDiscounts', 'getMana', 'refreshTable']);
 
 const props = defineProps({
     disable: {
@@ -107,7 +107,7 @@ const calculateSalePrice = async () => {
 
     await axios.post(`Sales/recalculatePrice`, props.sales);
     notify(t('globals.dataSaved'), 'positive');
-    emit('reCalculatedPrice', props.sales);
+    emit('refreshTable', props.sales);
 };
 
 const changeMultipleDiscount = () => {

From 5b24aa457074fbf0f153dadfe49c4b15c805e0cb Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Fri, 25 Oct 2024 12:58:23 +0200
Subject: [PATCH 228/228] fix: performance addEventListeners

---
 src/boot/mainShortcutMixin.js       | 38 -----------------------------
 src/boot/quasar.js                  |  2 --
 src/components/VnTable/VnColumn.vue |  2 +-
 src/components/VnTable/VnFilter.vue |  2 +-
 src/layouts/MainLayout.vue          | 37 ++++++++++++++++++++++++++++
 5 files changed, 39 insertions(+), 42 deletions(-)
 delete mode 100644 src/boot/mainShortcutMixin.js

diff --git a/src/boot/mainShortcutMixin.js b/src/boot/mainShortcutMixin.js
deleted file mode 100644
index 8e5f147db..000000000
--- a/src/boot/mainShortcutMixin.js
+++ /dev/null
@@ -1,38 +0,0 @@
-import routes from 'src/router/modules';
-import { useRouter } from 'vue-router';
-
-let isNotified = false;
-
-export default {
-    created: function () {
-        const router = useRouter();
-        const keyBindingMap = routes
-            .filter((route) => route.meta.keyBinding)
-            .reduce((map, route) => {
-                map['Key' + route.meta.keyBinding.toUpperCase()] = route.path;
-                return map;
-            }, {});
-
-        const handleKeyDown = (event) => {
-            const { ctrlKey, altKey, code } = event;
-
-            if (ctrlKey && altKey && keyBindingMap[code] && !isNotified) {
-                event.preventDefault();
-                router.push(keyBindingMap[code]);
-                isNotified = true;
-            }
-        };
-
-        const handleKeyUp = (event) => {
-            const { ctrlKey, altKey } = event;
-
-            // Resetea la bandera cuando se sueltan las teclas ctrl o alt
-            if (!ctrlKey || !altKey) {
-                isNotified = false;
-            }
-        };
-
-        window.addEventListener('keydown', handleKeyDown);
-        window.addEventListener('keyup', handleKeyUp);
-    },
-};
diff --git a/src/boot/quasar.js b/src/boot/quasar.js
index 5db6edd24..f39d1f0be 100644
--- a/src/boot/quasar.js
+++ b/src/boot/quasar.js
@@ -1,13 +1,11 @@
 import { boot } from 'quasar/wrappers';
 import qFormMixin from './qformMixin';
-import mainShortcutMixin from './mainShortcutMixin';
 import keyShortcut from './keyShortcut';
 import useNotify from 'src/composables/useNotify.js';
 const { notify } = useNotify();
 
 export default boot(({ app }) => {
     app.mixin(qFormMixin);
-    app.mixin(mainShortcutMixin);
     app.directive('shortcut', keyShortcut);
     app.config.errorHandler = function (err) {
         console.error(err);
diff --git a/src/components/VnTable/VnColumn.vue b/src/components/VnTable/VnColumn.vue
index ed34e9eee..9e9bfad69 100644
--- a/src/components/VnTable/VnColumn.vue
+++ b/src/components/VnTable/VnColumn.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { markRaw, computed, defineModel } from 'vue';
+import { markRaw, computed } from 'vue';
 import { QIcon, QCheckbox } from 'quasar';
 import { dashIfEmpty } from 'src/filters';
 
diff --git a/src/components/VnTable/VnFilter.vue b/src/components/VnTable/VnFilter.vue
index b17fd4407..9da0b26a4 100644
--- a/src/components/VnTable/VnFilter.vue
+++ b/src/components/VnTable/VnFilter.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { markRaw, computed, defineModel } from 'vue';
+import { markRaw, computed } from 'vue';
 import { QCheckbox } from 'quasar';
 import { useArrayData } from 'composables/useArrayData';
 
diff --git a/src/layouts/MainLayout.vue b/src/layouts/MainLayout.vue
index 51cd20071..754b084fc 100644
--- a/src/layouts/MainLayout.vue
+++ b/src/layouts/MainLayout.vue
@@ -1,7 +1,44 @@
 <script setup>
 import { useQuasar } from 'quasar';
 import Navbar from 'src/components/NavBar.vue';
+import { useRouter } from 'vue-router';
+import routes from 'src/router/modules';
+import { onMounted } from 'vue';
+
 const quasar = useQuasar();
+
+onMounted(() => {
+    let isNotified = false;
+
+    const router = useRouter();
+    const keyBindingMap = routes
+        .filter((route) => route.meta.keyBinding)
+        .reduce((map, route) => {
+            map['Key' + route.meta.keyBinding.toUpperCase()] = route.path;
+            return map;
+        }, {});
+
+    const handleKeyDown = (event) => {
+        const { ctrlKey, altKey, code } = event;
+
+        if (ctrlKey && altKey && keyBindingMap[code] && !isNotified) {
+            event.preventDefault();
+            router.push(keyBindingMap[code]);
+            isNotified = true;
+        }
+    };
+
+    const handleKeyUp = (event) => {
+        const { ctrlKey, altKey } = event;
+
+        if (!ctrlKey || !altKey) {
+            isNotified = false;
+        }
+    };
+
+    window.addEventListener('keydown', handleKeyDown);
+    window.addEventListener('keyup', handleKeyUp);
+});
 </script>
 
 <template>