From 3f1c0b95faf7d8ff00b10fa93acdbed4047d6b9a Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Wed, 10 Jul 2024 15:03:25 +0200
Subject: [PATCH 01/31] fix: proposal to avoid notify error

---
 src/pages/Customer/Card/CustomerUnpaid.vue               | 2 +-
 src/pages/Customer/Card/CustomerWebAccess.vue            | 2 +-
 src/pages/Customer/components/CustomerChangePassword.vue | 2 +-
 src/pages/Customer/components/CustomerSamplesCreate.vue  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/pages/Customer/Card/CustomerUnpaid.vue b/src/pages/Customer/Card/CustomerUnpaid.vue
index a9d4a3d66..6c61b92a1 100644
--- a/src/pages/Customer/Card/CustomerUnpaid.vue
+++ b/src/pages/Customer/Card/CustomerUnpaid.vue
@@ -92,7 +92,7 @@ const onSubmit = async () => {
         notify('globals.dataSaved', 'positive');
         unpaidClient.value = true;
     } catch (error) {
-        notify('errors.create', 'negative');
+        notify('errors.writeRequest', 'negative');
     } finally {
         isLoading.value = false;
     }
diff --git a/src/pages/Customer/Card/CustomerWebAccess.vue b/src/pages/Customer/Card/CustomerWebAccess.vue
index 33659dd77..4468c52f0 100644
--- a/src/pages/Customer/Card/CustomerWebAccess.vue
+++ b/src/pages/Customer/Card/CustomerWebAccess.vue
@@ -70,7 +70,7 @@ const onSubmit = async () => {
         notify('globals.dataSaved', 'positive');
         if (usersPreviewRef.value) usersPreviewRef.value.fetch();
     } catch (error) {
-        notify('errors.create', 'negative');
+        notify('errors.writeRequest', 'negative');
     } finally {
         isLoading.value = false;
     }
diff --git a/src/pages/Customer/components/CustomerChangePassword.vue b/src/pages/Customer/components/CustomerChangePassword.vue
index 1bfc5e103..632b11dc9 100644
--- a/src/pages/Customer/components/CustomerChangePassword.vue
+++ b/src/pages/Customer/components/CustomerChangePassword.vue
@@ -48,7 +48,7 @@ const onSubmit = async () => {
         await axios.patch(`Clients/${$props.id}/setPassword`, payload);
         await $props.promise();
     } catch (error) {
-        notify('errors.create', 'negative');
+        notify('errors.writeRequest', 'negative');
     } finally {
         isLoading.value = false;
         if (closeButton.value) closeButton.value.click();
diff --git a/src/pages/Customer/components/CustomerSamplesCreate.vue b/src/pages/Customer/components/CustomerSamplesCreate.vue
index be614aa0b..283b8fa97 100644
--- a/src/pages/Customer/components/CustomerSamplesCreate.vue
+++ b/src/pages/Customer/components/CustomerSamplesCreate.vue
@@ -150,7 +150,7 @@ const onSubmit = async () => {
         notify('globals.dataSaved', 'positive');
         onDataSaved(data);
     } catch (error) {
-        notify('errors.create', 'negative');
+        notify('errors.writeRequest', 'negative');
     } finally {
         isLoading.value = false;
     }

From e90b78c4c5867f2afd48b9029c9b443d5291c385 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Fri, 13 Sep 2024 12:27:37 +0200
Subject: [PATCH 02/31] fix: refs #7702 rollback

---
 src/pages/Customer/Card/CustomerWebAccess.vue | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/src/pages/Customer/Card/CustomerWebAccess.vue b/src/pages/Customer/Card/CustomerWebAccess.vue
index 3dc025d9c..f990e720c 100644
--- a/src/pages/Customer/Card/CustomerWebAccess.vue
+++ b/src/pages/Customer/Card/CustomerWebAccess.vue
@@ -4,7 +4,6 @@ import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
 import axios from 'axios';
 import { useQuasar } from 'quasar';
-import useNotify from 'src/composables/useNotify';
 import VnInput from 'src/components/common/VnInput.vue';
 import CustomerChangePassword from 'src/pages/Customer/components/CustomerChangePassword.vue';
 import FormModel from 'components/FormModel.vue';
@@ -13,7 +12,6 @@ const { t } = useI18n();
 const quasar = useQuasar();
 const route = useRoute();
 const canChangePassword = ref(0);
-const { notify } = useNotify();
 
 const filter = computed(() => {
     return {
@@ -32,13 +30,8 @@ const showChangePasswordDialog = () => {
 };
 
 async function hasCustomerRole() {
-    try {
-        canChangePassword.value = (
-            await axios(`Clients/${route.params.id}/hasCustomerRole`)
-        ).data;
-    } catch (e) {
-        notify('errors.writeRequest', 'negative');
-    }
+    const { data } = await axios(`Clients/${route.params.id}/hasCustomerRole`);
+    canChangePassword.value = data;
 }
 </script>
 

From 4bf8e1224d1d8cd0082174fe7830baeeddc45b0c Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Fri, 13 Sep 2024 12:28:07 +0200
Subject: [PATCH 03/31] chore: refs #7702 rollback

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

diff --git a/src/pages/Customer/Card/CustomerWebAccess.vue b/src/pages/Customer/Card/CustomerWebAccess.vue
index f990e720c..8d025a365 100644
--- a/src/pages/Customer/Card/CustomerWebAccess.vue
+++ b/src/pages/Customer/Card/CustomerWebAccess.vue
@@ -4,6 +4,7 @@ import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
 import axios from 'axios';
 import { useQuasar } from 'quasar';
+
 import VnInput from 'src/components/common/VnInput.vue';
 import CustomerChangePassword from 'src/pages/Customer/components/CustomerChangePassword.vue';
 import FormModel from 'components/FormModel.vue';

From 98cdeabe9f91791faa4a623ed9e67237180b0666 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Fri, 13 Sep 2024 18:15:28 +0200
Subject: [PATCH 04/31] feat: refs #7702 vnChangePassword

---
 src/components/common/VnChangePassword.vue    | 112 ++++++++++++++++++
 src/pages/Customer/Card/CustomerWebAccess.vue |  28 ++---
 2 files changed, 124 insertions(+), 16 deletions(-)
 create mode 100644 src/components/common/VnChangePassword.vue

diff --git a/src/components/common/VnChangePassword.vue b/src/components/common/VnChangePassword.vue
new file mode 100644
index 000000000..d7c9ad02f
--- /dev/null
+++ b/src/components/common/VnChangePassword.vue
@@ -0,0 +1,112 @@
+<script setup>
+import { ref } from 'vue';
+import { useI18n } from 'vue-i18n';
+import VnRow from '../ui/VnRow.vue';
+import VnInput from './VnInput.vue';
+import FetchData from '../FetchData.vue';
+import useNotify from 'src/composables/useNotify';
+
+const props = defineProps({ submitFn: { type: Function, default: () => {} } });
+
+const { t } = useI18n();
+const { notify } = useNotify();
+
+const form = ref();
+const changePassDialog = ref();
+const passwords = ref({ newPassword: null, repeatPassword: null });
+const requirements = ref([]);
+
+const validate = async () => {
+    const { newPassword, repeatPassword } = passwords.value;
+    if (newPassword !== repeatPassword) {
+        notify(t("Passwords don't match"), 'negative');
+        return;
+    }
+    try {
+        await props.submitFn(newPassword);
+    } catch (e) {
+        notify('errors.writeRequest', 'negative');
+    } finally {
+        changePassDialog.value.hide();
+    }
+};
+
+defineExpose({ show: () => changePassDialog.value.show() });
+</script>
+<template>
+    <FetchData
+        url="UserPasswords/findOne"
+        auto-load
+        @on-fetch="(data) => (requirements = data)"
+    />
+    <QDialog ref="changePassDialog">
+        <QCard style="width: 350px">
+            <QCardSection>
+                <slot name="header">
+                    <VnRow class="items-center" style="flex-direction: row">
+                        <span class="text-h6" v-text="t('Change password')" />
+                        <QIcon
+                            class="cursor-pointer"
+                            name="close"
+                            size="xs"
+                            style="flex: 0"
+                            v-close-popup
+                        />
+                    </VnRow>
+                </slot>
+            </QCardSection>
+            <QForm ref="form">
+                <QCardSection>
+                    <VnInput
+                        :label="t('New password')"
+                        v-model="passwords.newPassword"
+                        type="password"
+                        :required="true"
+                        :info="
+                            t('passwordRequirements', {
+                                length: requirements.length,
+                                nAlpha: requirements.nAlpha,
+                                nUpper: requirements.nUpper,
+                                nDigits: requirements.nDigits,
+                                nPunct: requirements.nPunct,
+                            })
+                        "
+                        autofocus
+                    />
+
+                    <VnInput
+                        :label="t('Repeat password')"
+                        v-model="passwords.repeatPassword"
+                        type="password"
+                    />
+                </QCardSection>
+            </QForm>
+            <QCardActions>
+                <slot name="actions">
+                    <QBtn
+                        :label="t('globals.cancel')"
+                        class="q-ml-sm"
+                        color="primary"
+                        flat
+                        type="reset"
+                        v-close-popup
+                    />
+                    <QBtn
+                        :label="t('globals.confirm')"
+                        color="primary"
+                        @click="validate"
+                    />
+                </slot>
+            </QCardActions>
+        </QCard>
+    </QDialog>
+</template>
+
+<i18n>
+es:
+    Change password: Cambiar contraseña
+    New password: Nueva contraseña
+    Repeat password: Repetir contraseña
+    You must enter a new password: Debes introducir la nueva contraseña
+    Passwords don't match: Las contraseñas no coinciden
+</i18n>
diff --git a/src/pages/Customer/Card/CustomerWebAccess.vue b/src/pages/Customer/Card/CustomerWebAccess.vue
index 8d025a365..ba906a144 100644
--- a/src/pages/Customer/Card/CustomerWebAccess.vue
+++ b/src/pages/Customer/Card/CustomerWebAccess.vue
@@ -3,14 +3,11 @@ import { computed, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
 import axios from 'axios';
-import { useQuasar } from 'quasar';
-
 import VnInput from 'src/components/common/VnInput.vue';
-import CustomerChangePassword from 'src/pages/Customer/components/CustomerChangePassword.vue';
 import FormModel from 'components/FormModel.vue';
+import VnChangePassword from 'src/components/common/VnChangePassword.vue';
 
 const { t } = useI18n();
-const quasar = useQuasar();
 const route = useRoute();
 const canChangePassword = ref(0);
 
@@ -21,21 +18,11 @@ const filter = computed(() => {
     };
 });
 
-const showChangePasswordDialog = () => {
-    quasar.dialog({
-        component: CustomerChangePassword,
-        componentProps: {
-            id: route.params.id,
-        },
-    });
-};
-
 async function hasCustomerRole() {
     const { data } = await axios(`Clients/${route.params.id}/hasCustomerRole`);
     canChangePassword.value = data;
 }
 </script>
-
 <template>
     <FormModel
         url="VnUsers/preview"
@@ -73,12 +60,21 @@ async function hasCustomerRole() {
                 color="primary"
                 icon="edit"
                 :disable="!canChangePassword"
-                @click="showChangePasswordDialog()"
+                @click="$refs.changePassRef.show"
             />
         </template>
     </FormModel>
+    <VnChangePassword
+        ref="changePassRef"
+        :submit-fn="
+            async (newPass) => {
+                await axios.patch(`Clients/${$route.params.id}/setPassword`, {
+                    newPassword: newPass,
+                });
+            }
+        "
+    />
 </template>
-
 <i18n>
 es:
     Enable web access: Habilitar acceso web

From 9ec2fb4c77edede9e5b80a34a80263a33ac80a1c Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 16 Sep 2024 10:36:56 +0200
Subject: [PATCH 05/31] feat: refs #7702 fine tunning

---
 src/components/common/VnChangePassword.vue | 14 +++++++-
 src/pages/Worker/Card/WorkerDescriptor.vue | 40 ++++++++++------------
 2 files changed, 31 insertions(+), 23 deletions(-)

diff --git a/src/components/common/VnChangePassword.vue b/src/components/common/VnChangePassword.vue
index d7c9ad02f..a36c6bcff 100644
--- a/src/components/common/VnChangePassword.vue
+++ b/src/components/common/VnChangePassword.vue
@@ -7,7 +7,7 @@ import FetchData from '../FetchData.vue';
 import useNotify from 'src/composables/useNotify';
 
 const props = defineProps({ submitFn: { type: Function, default: () => {} } });
-
+const emit = defineEmits(['onSubmit']);
 const { t } = useI18n();
 const { notify } = useNotify();
 
@@ -15,19 +15,27 @@ const form = ref();
 const changePassDialog = ref();
 const passwords = ref({ newPassword: null, repeatPassword: null });
 const requirements = ref([]);
+const isLoading = ref(false);
 
 const validate = async () => {
     const { newPassword, repeatPassword } = passwords.value;
+    if (!newPassword) {
+        notify(t('You must enter a new password'), 'negative');
+        return;
+    }
     if (newPassword !== repeatPassword) {
         notify(t("Passwords don't match"), 'negative');
         return;
     }
     try {
+        isLoading.value = true;
         await props.submitFn(newPassword);
+        emit('onSubmit');
     } catch (e) {
         notify('errors.writeRequest', 'negative');
     } finally {
         changePassDialog.value.hide();
+        isLoading.value = false;
     }
 };
 
@@ -84,6 +92,8 @@ defineExpose({ show: () => changePassDialog.value.show() });
             <QCardActions>
                 <slot name="actions">
                     <QBtn
+                        :disabled="isLoading"
+                        :loading="isLoading"
                         :label="t('globals.cancel')"
                         class="q-ml-sm"
                         color="primary"
@@ -92,6 +102,8 @@ defineExpose({ show: () => changePassDialog.value.show() });
                         v-close-popup
                     />
                     <QBtn
+                        :disabled="isLoading"
+                        :loading="isLoading"
                         :label="t('globals.confirm')"
                         color="primary"
                         @click="validate"
diff --git a/src/pages/Worker/Card/WorkerDescriptor.vue b/src/pages/Worker/Card/WorkerDescriptor.vue
index be30537df..b48859e9b 100644
--- a/src/pages/Worker/Card/WorkerDescriptor.vue
+++ b/src/pages/Worker/Card/WorkerDescriptor.vue
@@ -5,7 +5,7 @@ import { useI18n } from 'vue-i18n';
 import CardDescriptor from 'src/components/ui/CardDescriptor.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
 import VnLinkPhone from 'src/components/ui/VnLinkPhone.vue';
-import WorkerChangePasswordForm from 'src/pages/Worker/Card/WorkerChangePasswordForm.vue';
+import VnChangePassword from 'src/components/common/VnChangePassword.vue';
 import { useState } from 'src/composables/useState';
 import axios from 'axios';
 import VnImg from 'src/components/ui/VnImg.vue';
@@ -24,18 +24,13 @@ const route = useRoute();
 const { t } = useI18n();
 const state = useState();
 const user = state.getUser();
-const changePasswordFormDialog = ref(null);
-const cardDescriptorRef = ref(null);
 const showEditPhotoForm = ref(false);
 const toggleEditPictureForm = () => {
     showEditPhotoForm.value = !showEditPhotoForm.value;
 };
-
 const entityId = computed(() => {
     return $props.id || route.params.id;
 });
-
-const worker = ref();
 const workerExcluded = ref(false);
 
 const getIsExcluded = async () => {
@@ -61,10 +56,10 @@ const handleExcluded = async () => {
 
     workerExcluded.value = !workerExcluded.value;
 };
+
 const handlePhotoUpdated = (evt = false) => {
     image.value.reload(evt);
 };
-const refetch = async () => await cardDescriptorRef.value.getData();
 </script>
 <template>
     <CardDescriptor
@@ -74,15 +69,10 @@ const refetch = async () => await cardDescriptorRef.value.getData();
         url="Workers/descriptor"
         :filter="{ where: { id: entityId } }"
         title="user.nickname"
-        @on-fetch="
-            (data) => {
-                worker = data;
-                getIsExcluded();
-            }
-        "
+        @on-fetch="getIsExcluded"
     >
-        <template #menu="{}">
-            <QItem v-ripple clickable @click="handleExcluded()">
+        <template #menu="{ entity }">
+            <QItem v-ripple clickable @click="handleExcluded">
                 <QItemSection>
                     {{
                         workerExcluded
@@ -92,16 +82,13 @@ const refetch = async () => await cardDescriptorRef.value.getData();
                 </QItemSection>
             </QItem>
             <QItem
-                v-if="!worker.user.emailVerified && user.id != worker.id"
+                v-if="!entity.user.emailVerified && user.id != entity.id"
                 v-ripple
                 clickable
-                @click="$refs.changePasswordFormDialog.show()"
+                @click="$refs.changePassRef.show"
             >
                 <QItemSection>
                     {{ t('Change password') }}
-                    <QDialog ref="changePasswordFormDialog">
-                        <WorkerChangePasswordForm @on-submit="refetch()" :id="entityId" />
-                    </QDialog>
                 </QItemSection>
             </QItem>
         </template>
@@ -163,10 +150,10 @@ const refetch = async () => await cardDescriptorRef.value.getData();
                     <VnLinkPhone :phone-number="entity.phone" />
                 </template>
             </VnLv>
-            <VnLv :value="worker?.sip?.extension">
+            <VnLv :value="entity?.sip?.extension">
                 <template #label>
                     {{ t('worker.summary.sipExtension') }}
-                    <VnLinkPhone :phone-number="worker?.sip?.extension" />
+                    <VnLinkPhone :phone-number="entity?.sip?.extension" />
                 </template>
             </VnLv>
         </template>
@@ -197,6 +184,15 @@ const refetch = async () => await cardDescriptorRef.value.getData();
             </QCardActions>
         </template>
     </CardDescriptor>
+    <VnChangePassword
+        ref="changePassRef"
+        :submit-fn="
+            async (newPass) => {
+                await axios.patch(`Workers/${$route.params.id}/setPassword`, { newPass });
+            }
+        "
+        @on-submit="$refs.cardDescriptorRef?.getData"
+    />
 </template>
 
 <style lang="scss" scoped>

From 91dccd10d370263d0e9c7087efd0b9e8156b2b8d Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 16 Sep 2024 10:39:39 +0200
Subject: [PATCH 06/31] feat: refs #7702 drop old components

---
 .../components/CustomerChangePassword.vue     | 139 ------------------
 .../Worker/Card/WorkerChangePasswordForm.vue  |  99 -------------
 2 files changed, 238 deletions(-)
 delete mode 100644 src/pages/Customer/components/CustomerChangePassword.vue
 delete mode 100644 src/pages/Worker/Card/WorkerChangePasswordForm.vue

diff --git a/src/pages/Customer/components/CustomerChangePassword.vue b/src/pages/Customer/components/CustomerChangePassword.vue
deleted file mode 100644
index 632b11dc9..000000000
--- a/src/pages/Customer/components/CustomerChangePassword.vue
+++ /dev/null
@@ -1,139 +0,0 @@
-<script setup>
-import { ref } from 'vue';
-import { useI18n } from 'vue-i18n';
-
-import axios from 'axios';
-import { useDialogPluginComponent } from 'quasar';
-
-import useNotify from 'src/composables/useNotify';
-
-import VnRow from 'components/ui/VnRow.vue';
-import VnInput from 'src/components/common/VnInput.vue';
-import FetchData from 'src/components/FetchData.vue';
-
-const { dialogRef } = useDialogPluginComponent();
-const { notify } = useNotify();
-const { t } = useI18n();
-
-const $props = defineProps({
-    id: {
-        type: String,
-        required: true,
-    },
-    promise: {
-        type: Function,
-        required: true,
-    },
-});
-const userPasswords = ref({});
-
-const closeButton = ref(null);
-const isLoading = ref(false);
-const newPassword = ref('');
-const requestPassword = ref('');
-
-const onSubmit = async () => {
-    isLoading.value = true;
-
-    if (newPassword.value !== requestPassword.value) {
-        notify(t("Passwords don't match"), 'negative');
-        isLoading.value = false;
-        return;
-    }
-
-    const payload = {
-        newPassword: newPassword.value,
-    };
-    try {
-        await axios.patch(`Clients/${$props.id}/setPassword`, payload);
-        await $props.promise();
-    } catch (error) {
-        notify('errors.writeRequest', 'negative');
-    } finally {
-        isLoading.value = false;
-        if (closeButton.value) closeButton.value.click();
-    }
-};
-</script>
-
-<template>
-    <QDialog ref="dialogRef">
-        <FetchData
-            @on-fetch="(data) => (userPasswords = data[0])"
-            auto-load
-            url="UserPasswords"
-        />
-        <QCard class="q-pa-lg">
-            <QCardSection>
-                <QForm @submit.prevent="onSubmit">
-                    <span
-                        ref="closeButton"
-                        class="row justify-end close-icon"
-                        v-close-popup
-                    >
-                        <QIcon name="close" size="sm" />
-                    </span>
-
-                    <VnRow class="row q-gutter-md q-mb-md" style="flex-direction: column">
-                        <div class="col">
-                            <VnInput
-                                :label="t('New password')"
-                                clearable
-                                v-model="newPassword"
-                                type="password"
-                            >
-                                <template #append>
-                                    <QIcon name="info" class="cursor-info">
-                                        <QTooltip>
-                                            {{
-                                                t('customer.card.passwordRequirements', {
-                                                    ...userPasswords,
-                                                })
-                                            }}
-                                        </QTooltip>
-                                    </QIcon>
-                                </template>
-                            </VnInput>
-                        </div>
-                        <div class="col">
-                            <VnInput
-                                :label="t('Request password')"
-                                clearable
-                                v-model="requestPassword"
-                                type="password"
-                            />
-                        </div>
-                    </VnRow>
-
-                    <div class="q-mt-lg row justify-end">
-                        <QBtn
-                            :disabled="isLoading"
-                            :label="t('globals.cancel')"
-                            :loading="isLoading"
-                            class="q-ml-sm"
-                            color="primary"
-                            flat
-                            type="reset"
-                            v-close-popup
-                        />
-                        <QBtn
-                            :disabled="isLoading"
-                            :label="t('Change password')"
-                            :loading="isLoading"
-                            color="primary"
-                            type="submit"
-                        />
-                    </div>
-                </QForm>
-            </QCardSection>
-        </QCard>
-    </QDialog>
-</template>
-
-<i18n>
-es:
-    New password: Nueva contraseña
-    Request password: Repetir contraseña
-    Change password: Cambiar contraseña
-    Passwords don't match: Las contraseñas no coinciden
-</i18n>
diff --git a/src/pages/Worker/Card/WorkerChangePasswordForm.vue b/src/pages/Worker/Card/WorkerChangePasswordForm.vue
deleted file mode 100644
index 20132f21e..000000000
--- a/src/pages/Worker/Card/WorkerChangePasswordForm.vue
+++ /dev/null
@@ -1,99 +0,0 @@
-<script setup>
-import { ref, reactive, onMounted } from 'vue';
-import { useI18n } from 'vue-i18n';
-
-import VnRow from 'components/ui/VnRow.vue';
-import FormPopup from 'src/components/FormPopup.vue';
-import VnInput from 'src/components/common/VnInput.vue';
-
-import axios from 'axios';
-import useNotify from 'src/composables/useNotify.js';
-
-const $props = defineProps({
-    id: {
-        type: Object,
-        default: () => {},
-    },
-});
-
-const emit = defineEmits(['onSubmit']);
-
-const { t } = useI18n();
-const { notify } = useNotify();
-
-const formData = reactive({
-    newPassword: null,
-    repeatPassword: null,
-});
-
-const passRequirements = ref([]);
-
-const setPassword = async () => {
-    try {
-        if (!formData.newPassword) {
-            notify(t('You must enter a new password'), 'negative');
-            return;
-        }
-
-        if (formData.newPassword != formData.repeatPassword) {
-            notify(t(`Passwords don't match`), 'negative');
-            return;
-        }
-
-        await axios.patch(`Workers/${$props.id}/setPassword`, {
-            newPass: formData.newPassword,
-        });
-        notify(t('Password changed!'), 'positive');
-        emit('onSubmit');
-    } catch (err) {
-        console.error('Error setting password', err);
-    }
-};
-
-const getPassRequirements = async () => {
-    const { data } = await axios.get('UserPasswords/findOne');
-    passRequirements.value = data;
-};
-
-onMounted(async () => await getPassRequirements());
-</script>
-
-<template>
-    <FormPopup :title="t('Reset password')" @on-submit="setPassword()">
-        <template #form-inputs>
-            <VnRow>
-                <VnInput
-                    :label="t('New password')"
-                    v-model="formData.newPassword"
-                    type="password"
-                    :required="true"
-                    :info="
-                        t('passwordRequirements', {
-                            length: passRequirements.length,
-                            nAlpha: passRequirements.nAlpha,
-                            nUpper: passRequirements.nUpper,
-                            nDigits: passRequirements.nDigits,
-                            nPunct: passRequirements.nPunct,
-                        })
-                    "
-                />
-            </VnRow>
-            <VnRow>
-                <VnInput
-                    :label="t('Repeat password')"
-                    v-model="formData.repeatPassword"
-                    type="password"
-                />
-            </VnRow>
-        </template>
-    </FormPopup>
-</template>
-
-<i18n>
-es:
-    Reset password: Restablecer contraseña
-    New password: Nueva contraseña
-    Repeat password: Repetir contraseña
-    You must enter a new password: Debes introducir la nueva contraseña
-    Passwords don't match: Las contraseñas no coinciden
-</i18n>

From b015397822a7c0212751672d5fa7d7a5761bb4ce Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 16 Sep 2024 10:59:32 +0200
Subject: [PATCH 07/31] feat: refs #7702 test wip

---
 .../common/VnChangePassword.spec.js           | 47 +++++++++++++++++++
 1 file changed, 47 insertions(+)
 create mode 100644 test/vitest/__tests__/components/common/VnChangePassword.spec.js

diff --git a/test/vitest/__tests__/components/common/VnChangePassword.spec.js b/test/vitest/__tests__/components/common/VnChangePassword.spec.js
new file mode 100644
index 000000000..a481efa81
--- /dev/null
+++ b/test/vitest/__tests__/components/common/VnChangePassword.spec.js
@@ -0,0 +1,47 @@
+import { createWrapper } from 'app/test/vitest/helper';
+import VnChangePassword from 'src/components/common/VnChangePassword.vue';
+import { vi, afterEach, beforeAll, describe, expect, it } from 'vitest';
+
+describe('VnSmsDialog', () => {
+    let vm;
+
+    beforeAll(() => {
+        vm = createWrapper(VnChangePassword, {
+            propsData: {
+                submitFn: vi.fn(),
+            },
+        }).vm;
+    });
+
+    afterEach(() => {
+        vi.clearAllMocks();
+    });
+
+    it('should notify when new password is empty', async () => {
+        vm.passwords.newPassword = '';
+        vm.passwords.repeatPassword = 'password';
+        vi.spyOn(vm, 'notify');
+        await vm.validate();
+        expect(vm.notify).toHaveBeenCalledWith(
+            expect.arguments({
+                message: 'You must enter a new password',
+                type: 'negative',
+            })
+        );
+    });
+
+    it("should notify when passwords don't match", async () => {
+        vm.passwords.newPassword = 'password1';
+        vm.passwords.repeatPassword = 'password2';
+        vi.spyOn(vm, 'notify');
+        await vm.validate();
+        expect(vm.notify).toHaveBeenCalledWith("Passwords don't match", 'negative');
+    });
+
+    it('should call submitFn and emit onSubmit when passwords match', async () => {
+        vm.passwords.newPassword = 'password';
+        vm.passwords.repeatPassword = 'password';
+        await vm.validate();
+        expect(vm.props.submitFn).toHaveBeenCalledWith('password');
+    });
+});

From 1ff15da8ca4ec1b5e39b2fb1c6cabe016d8eac5f Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 16 Sep 2024 16:33:09 +0200
Subject: [PATCH 08/31] fix: refs #7323 workerList

---
 src/i18n/locale/en.yml            |  5 +++
 src/i18n/locale/es.yml            |  5 +++
 src/pages/Worker/WorkerFilter.vue | 30 ++++++++++-------
 src/pages/Worker/WorkerList.vue   | 53 ++++++++++++++++++++++++++++---
 src/pages/Worker/locale/en.yml    |  5 +++
 src/pages/Worker/locale/es.yml    |  5 +++
 6 files changed, 86 insertions(+), 17 deletions(-)

diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index f99244d42..3b1cb20fa 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -286,6 +286,7 @@ globals:
     myAccount: My account
     noOne: No one
     params:
+        id: ID
         clientFk: Client id
         salesPersonFk: Sales person
         warehouseFk: Warehouse
@@ -293,6 +294,10 @@ globals:
         from: From
         To: To
         stateFk: State
+        departmentFk: Department
+        email: Email
+        SSN: SSN
+        fi: FI
 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 360627fda..31010dfb0 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -290,6 +290,7 @@ globals:
     myAccount: Mi cuenta
     noOne: Nadie
     params:
+        id: Id
         clientFk: Id cliente
         salesPersonFk: Comercial
         warehouseFk: Almacén
@@ -297,6 +298,10 @@ globals:
         from: Desde
         To: Hasta
         stateFk: Estado
+        departmentFk: Departamento
+        email: Correo
+        SSN: NSS
+        fi: NIF
 errors:
     statusUnauthorized: Acceso denegado
     statusInternalServerError: Ha ocurrido un error interno del servidor
diff --git a/src/pages/Worker/WorkerFilter.vue b/src/pages/Worker/WorkerFilter.vue
index 765241341..61120f448 100644
--- a/src/pages/Worker/WorkerFilter.vue
+++ b/src/pages/Worker/WorkerFilter.vue
@@ -7,7 +7,7 @@ import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
 
-const { t } = useI18n();
+const { t, te } = useI18n();
 const props = defineProps({
     dataKey: {
         type: String,
@@ -16,6 +16,11 @@ const props = defineProps({
 });
 
 const departments = ref();
+
+const getLocale = (label) => {
+    const globalLocale = `globals.params.${label}`;
+    return te(globalLocale) ? t(globalLocale) : t(`params.${label}`);
+};
 </script>
 
 <template>
@@ -23,7 +28,7 @@ const departments = ref();
     <VnFilterPanel :data-key="props.dataKey" :search-button="true">
         <template #tags="{ tag, formatFn }">
             <div class="q-gutter-x-xs">
-                <strong>{{ t(`params.${tag.label}`) }}: </strong>
+                <strong>{{ getLocale(tag.label) }}: </strong>
                 <span>{{ formatFn(tag.value) }}</span>
             </div>
         </template>
@@ -64,10 +69,7 @@ const departments = ref();
                 </QItemSection>
             </QItem>
             <QItem>
-                <QItemSection v-if="!departments">
-                    <QSkeleton type="QInput" class="full-width" />
-                </QItemSection>
-                <QItemSection v-if="departments">
+                <QItemSection>
                     <VnSelect
                         :label="t('Department')"
                         v-model="params.departmentFk"
@@ -82,6 +84,16 @@ const departments = ref();
                     />
                 </QItemSection>
             </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnInput :label="t('SSN')" v-model="params.SSN" is-outlined />
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnInput :label="t('Email')" v-model="params.email" is-outlined />
+                </QItemSection>
+            </QItem>
             <QItem>
                 <QItemSection>
                     <VnInput
@@ -99,23 +111,17 @@ const departments = ref();
 en:
     params:
         search: Contains
-        fi: FI
         firstName: First name
         lastName: Last name
         userName: User
         extension: Extension
-        departmentFk: Department
-        id: ID
 es:
     params:
         search: Contiene
-        fi: NIF
         firstName: Nombre
         lastName: Apellidos
         userName: Usuario
         extension: Extensión
-        departmentFk: Departamento
-        id: ID
     FI: NIF
     First Name: Nombre
     Last Name: Apellidos
diff --git a/src/pages/Worker/WorkerList.vue b/src/pages/Worker/WorkerList.vue
index b8ef3f9d8..9b6bb8b69 100644
--- a/src/pages/Worker/WorkerList.vue
+++ b/src/pages/Worker/WorkerList.vue
@@ -39,13 +39,31 @@ const columns = computed(() => [
     },
     {
         align: 'left',
-        name: 'nickname',
+        name: 'firstName',
         label: t('tableColumns.name'),
         isTitle: true,
         columnFilter: {
             name: 'firstName',
         },
     },
+    {
+        align: 'left',
+        name: 'lastName',
+        label: t('tableColumns.lastName'),
+        isTitle: true,
+        columnFilter: {
+            name: 'lastName',
+        },
+    },
+    {
+        align: 'left',
+        name: 'nickname',
+        label: t('tableColumns.userName'),
+        isTitle: true,
+        columnFilter: {
+            name: 'userName',
+        },
+    },
     {
         align: 'left',
         name: 'departmentFk',
@@ -60,16 +78,41 @@ const columns = computed(() => [
         },
         format: (row, dashIfEmpty) => dashIfEmpty(row.department),
     },
+    {
+        align: 'left',
+        name: 'fi',
+        label: t('tableColumns.fi'),
+        isTitle: true,
+        columnFilter: {
+            name: 'fi',
+        },
+    },
+    {
+        align: 'left',
+        name: 'SSN',
+        label: t('tableColumns.SSN'),
+        isTitle: true,
+        columnFilter: {
+            name: 'SSN',
+        },
+    },
     {
         align: 'left',
         name: 'email',
         label: t('tableColumns.email'),
         cardVisible: true,
         columnFilter: {
-            alias: 'mu',
-            inWhere: true,
+            name: 'email',
+        },
+    },
+    {
+        align: 'left',
+        name: 'extension',
+        label: t('tableColumns.extension'),
+        cardVisible: true,
+        columnFilter: {
+            name: 'extension',
         },
-        hidden: true,
     },
     {
         align: 'right',
@@ -180,7 +223,7 @@ async function autofillBic(worker) {
         default-mode="table"
         redirect="worker"
         :right-search="false"
-        auto-load
+        :order="['id DESC']"
     >
         <template #more-create-dialog="{ data }">
             <div class="q-pa-lg full-width">
diff --git a/src/pages/Worker/locale/en.yml b/src/pages/Worker/locale/en.yml
index 96df37919..7081e8fd0 100644
--- a/src/pages/Worker/locale/en.yml
+++ b/src/pages/Worker/locale/en.yml
@@ -2,5 +2,10 @@ passwordRequirements: 'The password must have at least { length } length charact
 tableColumns:
     id: ID
     name: Name
+    lastName: Last Name
+    userName: User Name
     department: Department
     email: Email
+    fi: FI
+    SSN: SSN
+    extension: Extension
diff --git a/src/pages/Worker/locale/es.yml b/src/pages/Worker/locale/es.yml
index 41812345f..61694dc83 100644
--- a/src/pages/Worker/locale/es.yml
+++ b/src/pages/Worker/locale/es.yml
@@ -7,5 +7,10 @@ passwordRequirements: 'La contraseña debe tener al menos { length } caracteres
 tableColumns:
     id: ID
     name: Nombre
+    lastName: Apellidos
+    userName: Nombre de usuario
     department: Departamento
     email: Email
+    fi: NIF
+    SSN: NSS
+    extension: Extensión

From da7d0326c091b4111296cbd9930a4cd2317a5957 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 16 Sep 2024 17:12:48 +0200
Subject: [PATCH 09/31] fix: refs #7323 workerBalance & arrayData setUserParams

---
 src/components/VnTable/VnTable.vue | 2 +-
 src/composables/useArrayData.js    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index d6008de0b..d71c85338 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -646,7 +646,7 @@ function handleOnDataSaved(_) {
             icon="add"
             shortcut="+"
         />
-        <QTooltip>
+        <QTooltip self="top right">
             {{ createForm?.title }}
         </QTooltip>
     </QPageSticky>
diff --git a/src/composables/useArrayData.js b/src/composables/useArrayData.js
index 651bcefb0..90cf45268 100644
--- a/src/composables/useArrayData.js
+++ b/src/composables/useArrayData.js
@@ -113,7 +113,7 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
             for (const row of response.data) store.data.push(row);
         } else {
             store.data = response.data;
-            if (!document.querySelectorAll('[role="dialog"]').length)
+            if (!document.querySelectorAll('[role="dialog"][aria-modal="true"]').length)
                 updateRouter && updateStateParams();
         }
 

From 41c43fde76c35cf4766b4900e73418f9e5ff6fcc Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Tue, 17 Sep 2024 16:08:48 +0200
Subject: [PATCH 10/31] feat: refs #7323 hide log section

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

diff --git a/src/router/modules/worker.js b/src/router/modules/worker.js
index b2716474b..7258881be 100644
--- a/src/router/modules/worker.js
+++ b/src/router/modules/worker.js
@@ -168,6 +168,7 @@ export default {
                     meta: {
                         title: 'log',
                         icon: 'vn:History',
+                        acls: [{ model: 'WorkerLog', props: 'find', accessType: 'READ' }],
                     },
                     component: () => import('src/pages/Worker/Card/WorkerLog.vue'),
                 },

From 6cc8ca6731e0b691d0862dad0953366a8bf32d08 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Fri, 20 Sep 2024 17:38:02 +0200
Subject: [PATCH 11/31] chore: refs #7702 add tests

---
 src/components/common/VnChangePassword.vue    |  6 +++++
 .../common/VnChangePassword.spec.js           | 26 ++++++++++++++-----
 2 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/src/components/common/VnChangePassword.vue b/src/components/common/VnChangePassword.vue
index a36c6bcff..18f538fc3 100644
--- a/src/components/common/VnChangePassword.vue
+++ b/src/components/common/VnChangePassword.vue
@@ -19,6 +19,8 @@ const isLoading = ref(false);
 
 const validate = async () => {
     const { newPassword, repeatPassword } = passwords.value;
+    console.log('Validating passwords:', newPassword, repeatPassword);
+
     if (!newPassword) {
         notify(t('You must enter a new password'), 'negative');
         return;
@@ -29,11 +31,15 @@ const validate = async () => {
     }
     try {
         isLoading.value = true;
+        console.log('Calling submitFn with:', newPassword);
+
         await props.submitFn(newPassword);
         emit('onSubmit');
     } catch (e) {
+        console.error('submitFn failed:', e);
         notify('errors.writeRequest', 'negative');
     } finally {
+        console.log('Entering finally block');
         changePassDialog.value.hide();
         isLoading.value = false;
     }
diff --git a/test/vitest/__tests__/components/common/VnChangePassword.spec.js b/test/vitest/__tests__/components/common/VnChangePassword.spec.js
index a481efa81..e7a3bdcf7 100644
--- a/test/vitest/__tests__/components/common/VnChangePassword.spec.js
+++ b/test/vitest/__tests__/components/common/VnChangePassword.spec.js
@@ -1,11 +1,15 @@
-import { createWrapper } from 'app/test/vitest/helper';
+import { createWrapper, axios } from 'app/test/vitest/helper';
 import VnChangePassword from 'src/components/common/VnChangePassword.vue';
-import { vi, afterEach, beforeAll, describe, expect, it } from 'vitest';
+import { vi, beforeEach, afterEach, beforeAll, describe, expect, it } from 'vitest';
+import { Notify } from 'quasar';
 
 describe('VnSmsDialog', () => {
     let vm;
 
     beforeAll(() => {
+        vi.spyOn(axios, 'get').mockResolvedValue({
+            data: [],
+        });
         vm = createWrapper(VnChangePassword, {
             propsData: {
                 submitFn: vi.fn(),
@@ -13,6 +17,10 @@ describe('VnSmsDialog', () => {
         }).vm;
     });
 
+    beforeEach(() => {
+        Notify.create = vi.fn();
+    });
+
     afterEach(() => {
         vi.clearAllMocks();
     });
@@ -20,10 +28,10 @@ describe('VnSmsDialog', () => {
     it('should notify when new password is empty', async () => {
         vm.passwords.newPassword = '';
         vm.passwords.repeatPassword = 'password';
-        vi.spyOn(vm, 'notify');
+
         await vm.validate();
-        expect(vm.notify).toHaveBeenCalledWith(
-            expect.arguments({
+        expect(Notify.create).toHaveBeenCalledWith(
+            expect.objectContaining({
                 message: 'You must enter a new password',
                 type: 'negative',
             })
@@ -33,9 +41,13 @@ describe('VnSmsDialog', () => {
     it("should notify when passwords don't match", async () => {
         vm.passwords.newPassword = 'password1';
         vm.passwords.repeatPassword = 'password2';
-        vi.spyOn(vm, 'notify');
         await vm.validate();
-        expect(vm.notify).toHaveBeenCalledWith("Passwords don't match", 'negative');
+        expect(Notify.create).toHaveBeenCalledWith(
+            expect.objectContaining({
+                message: `Passwords don't match`,
+                type: 'negative',
+            })
+        );
     });
 
     it('should call submitFn and emit onSubmit when passwords match', async () => {

From 7bbad14f53c74f7ae64b4f610aa7d24eb89da095 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 23 Sep 2024 11:38:27 +0200
Subject: [PATCH 12/31] feat: refs #7323 delete btn

---
 src/components/VnTable/VnTable.vue        |  2 ++
 src/pages/Worker/Card/WorkerBalance.vue   | 22 +++++++++++++++++-----
 src/pages/Worker/Card/WorkerFormation.vue | 20 ++++++++++++++++++++
 src/pages/Worker/Card/WorkerMedical.vue   | 13 +++++++++++++
 4 files changed, 52 insertions(+), 5 deletions(-)

diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index d87c08395..4aa49ce38 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -472,6 +472,7 @@ function handleOnDataSaved(_) {
                         auto-width
                         class="no-margin q-px-xs"
                         :class="[getColAlign(col), col.columnClass]"
+                        :style="col.style"
                         v-if="col.visible ?? true"
                         @click.ctrl="
                             ($event) =>
@@ -500,6 +501,7 @@ function handleOnDataSaved(_) {
                         :class="getColAlign(col)"
                         class="sticky no-padding"
                         @click="stopEventPropagation($event)"
+                        :style="col.style"
                     >
                         <QBtn
                             v-for="(btn, index) of col.actions"
diff --git a/src/pages/Worker/Card/WorkerBalance.vue b/src/pages/Worker/Card/WorkerBalance.vue
index 037a65eaf..88fc7c1df 100644
--- a/src/pages/Worker/Card/WorkerBalance.vue
+++ b/src/pages/Worker/Card/WorkerBalance.vue
@@ -57,9 +57,21 @@ const columns = computed(() => [
         field: 'concept',
         cardVisible: true,
     },
+    {
+        align: 'right',
+        name: 'tableActions',
+        style: 'max-width: 20px; text-align: initial;',
+        actions: [
+            {
+                title: t('delete'),
+                icon: 'delete',
+                action: async (row) => await tableRef.value.CrudModelRef.remove([row]),
+                isPrimary: true,
+            },
+        ],
+    },
 ]);
 </script>
-
 <template>
     <VnTable
         ref="tableRef"
@@ -69,8 +81,8 @@ const columns = computed(() => [
         save-url="WorkerIncomes/crud"
         :create="{
             urlCreate: 'workerIncomes',
-            title: t('Create workerBalance'),
-            onDataSaved: () => tableRef.reload(),
+            title: t('Create balance'),
+            onDataSaved: () => $refs.tableRef.reload(),
             formInitialData: {
                 workerFk: entityId,
             },
@@ -81,10 +93,10 @@ const columns = computed(() => [
         :right-search="false"
         :is-editable="true"
         :use-model="true"
+        :default-remove="false"
     />
 </template>
-
 <i18n>
     es:
-        Create workerBalance: Crear balance
+        Create balance: Crear balance
 </i18n>
diff --git a/src/pages/Worker/Card/WorkerFormation.vue b/src/pages/Worker/Card/WorkerFormation.vue
index 71c5cba5d..c11dd019e 100644
--- a/src/pages/Worker/Card/WorkerFormation.vue
+++ b/src/pages/Worker/Card/WorkerFormation.vue
@@ -96,10 +96,23 @@ const columns = computed(() => [
         label: t('worker.formation.tableVisibleColumns.hasDiploma'),
         create: true,
     },
+    {
+        align: 'right',
+        name: 'tableActions',
+        actions: [
+            {
+                title: t('delete'),
+                icon: 'delete',
+                action: async (row) => await tableRef.value.CrudModelRef.remove([row]),
+                isPrimary: true,
+            },
+        ],
+    },
 ]);
 </script>
 <template>
     <VnTable
+        class="worker-formation"
         ref="tableRef"
         data-key="WorkerFormation"
         :url="`Workers/${entityId}/trainingCourse`"
@@ -120,8 +133,15 @@ const columns = computed(() => [
         :right-search="false"
         :is-editable="true"
         :use-model="true"
+        :default-remove="false"
     />
 </template>
+<style lang="scss" scoped>
+:global(.worker-formation thead > tr > th:nth-child(7)),
+:global(.worker-formation thead > tr > th:nth-child(8)) {
+    max-width: 50px;
+}
+</style>
 <i18n>
 es:
     Create training course: Crear curso de formación
diff --git a/src/pages/Worker/Card/WorkerMedical.vue b/src/pages/Worker/Card/WorkerMedical.vue
index 6bca4ae85..fab1416c9 100644
--- a/src/pages/Worker/Card/WorkerMedical.vue
+++ b/src/pages/Worker/Card/WorkerMedical.vue
@@ -65,6 +65,18 @@ const columns = [
         create: true,
         component: 'input',
     },
+    {
+        align: 'right',
+        name: 'tableActions',
+        actions: [
+            {
+                title: t('delete'),
+                icon: 'delete',
+                action: async (row) => await tableRef.value.CrudModelRef.remove([row]),
+                isPrimary: true,
+            },
+        ],
+    },
 ];
 </script>
 <template>
@@ -87,5 +99,6 @@ const columns = [
         :right-search="false"
         :is-editable="true"
         :use-model="true"
+        :default-remove="false"
     />
 </template>

From f809e0fb317de0c4762cb684bc3bb58f870d8958 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 23 Sep 2024 12:55:39 +0200
Subject: [PATCH 13/31] fix: refs #7323 show prev month week color

---
 src/pages/Worker/Card/WorkerTimeControl.vue | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/pages/Worker/Card/WorkerTimeControl.vue b/src/pages/Worker/Card/WorkerTimeControl.vue
index fbfd4b28d..c6ca9d74a 100644
--- a/src/pages/Worker/Card/WorkerTimeControl.vue
+++ b/src/pages/Worker/Card/WorkerTimeControl.vue
@@ -326,16 +326,21 @@ const updateData = async () => {
 };
 
 const getMailStates = async (date) => {
+    const url = `WorkerTimeControls/${route.params.id}/getMailStates`;
+    const month = date.getMonth() + 1;
+    const prevMonth = month == 1 ? 12 : month - 1;
+    let prevMonthStates = [];
+
     const params = {
-        month: date.getMonth() + 1,
+        month,
         year: date.getFullYear(),
     };
 
-    const { data } = await axios.get(
-        `WorkerTimeControls/${route.params.id}/getMailStates`,
-        { params }
-    );
-    workerTimeControlMails.value = data;
+    const curMonthStates = (await axios.get(url, { params })).data;
+    prevMonthStates = (await axios.get(url, { params: { ...params, month: prevMonth } }))
+        .data;
+
+    workerTimeControlMails.value = curMonthStates.concat(prevMonthStates);
 };
 
 const showWorkerTimeForm = (propValue, formType) => {

From e827d3aabfb3b03b39e01593bb2af12b4f443016 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Thu, 26 Sep 2024 09:47:54 +0200
Subject: [PATCH 14/31] fix: refs #7323 rollback

---
 src/pages/Worker/WorkerFilter.vue |  5 -----
 src/pages/Worker/WorkerList.vue   | 20 +-------------------
 src/pages/Worker/locale/en.yml    |  2 +-
 src/pages/Worker/locale/es.yml    |  2 +-
 4 files changed, 3 insertions(+), 26 deletions(-)

diff --git a/src/pages/Worker/WorkerFilter.vue b/src/pages/Worker/WorkerFilter.vue
index 61120f448..dfb5659fe 100644
--- a/src/pages/Worker/WorkerFilter.vue
+++ b/src/pages/Worker/WorkerFilter.vue
@@ -84,11 +84,6 @@ const getLocale = (label) => {
                     />
                 </QItemSection>
             </QItem>
-            <QItem>
-                <QItemSection>
-                    <VnInput :label="t('SSN')" v-model="params.SSN" is-outlined />
-                </QItemSection>
-            </QItem>
             <QItem>
                 <QItemSection>
                     <VnInput :label="t('Email')" v-model="params.email" is-outlined />
diff --git a/src/pages/Worker/WorkerList.vue b/src/pages/Worker/WorkerList.vue
index a5281b651..3ca0d0c24 100644
--- a/src/pages/Worker/WorkerList.vue
+++ b/src/pages/Worker/WorkerList.vue
@@ -40,7 +40,7 @@ const columns = computed(() => [
     {
         align: 'left',
         name: 'firstName',
-        label: t('tableColumns.name'),
+        label: t('tableColumns.firstName'),
         isTitle: true,
         columnFilter: {
             name: 'firstName',
@@ -78,24 +78,6 @@ const columns = computed(() => [
         },
         format: (row, dashIfEmpty) => dashIfEmpty(row.department),
     },
-    {
-        align: 'left',
-        name: 'fi',
-        label: t('tableColumns.fi'),
-        isTitle: true,
-        columnFilter: {
-            name: 'fi',
-        },
-    },
-    {
-        align: 'left',
-        name: 'SSN',
-        label: t('tableColumns.SSN'),
-        isTitle: true,
-        columnFilter: {
-            name: 'SSN',
-        },
-    },
     {
         align: 'left',
         name: 'email',
diff --git a/src/pages/Worker/locale/en.yml b/src/pages/Worker/locale/en.yml
index 7081e8fd0..865e86e7e 100644
--- a/src/pages/Worker/locale/en.yml
+++ b/src/pages/Worker/locale/en.yml
@@ -1,7 +1,7 @@
 passwordRequirements: 'The password must have at least { length } length characters, {nAlpha} alphabetic characters, {nUpper} capital letters, {nDigits} digits and {nPunct} symbols (Ex: $%&.)\n'
 tableColumns:
     id: ID
-    name: Name
+    firstName: First name
     lastName: Last Name
     userName: User Name
     department: Department
diff --git a/src/pages/Worker/locale/es.yml b/src/pages/Worker/locale/es.yml
index 61694dc83..b3c093ec5 100644
--- a/src/pages/Worker/locale/es.yml
+++ b/src/pages/Worker/locale/es.yml
@@ -6,7 +6,7 @@ External: Externo
 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: $%&.)'
 tableColumns:
     id: ID
-    name: Nombre
+    firstName: Nombre
     lastName: Apellidos
     userName: Nombre de usuario
     department: Departamento

From c2b52473a12da9e856a3baa1889ba6702286c8fe Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Thu, 26 Sep 2024 10:04:16 +0200
Subject: [PATCH 15/31] fix: refs #7323 align tables

---
 src/pages/Monitor/MonitorOrders.vue | 56 +++++++++++++++--------------
 1 file changed, 29 insertions(+), 27 deletions(-)

diff --git a/src/pages/Monitor/MonitorOrders.vue b/src/pages/Monitor/MonitorOrders.vue
index 52d442d0a..853a6edc9 100644
--- a/src/pages/Monitor/MonitorOrders.vue
+++ b/src/pages/Monitor/MonitorOrders.vue
@@ -139,33 +139,35 @@ const openTab = (id) =>
         :disable-option="{ card: true }"
     >
         <template #top-left>
-            <QBtn
-                icon="refresh"
-                size="md"
-                color="primary"
-                dense
-                flat
-                @click="$refs.table.reload()"
-            >
-                <QTooltip>{{ $t('globals.refresh') }}</QTooltip>
-            </QBtn>
-            <QBtn
-                v-if="selectedRows.length"
-                icon="delete"
-                size="md"
-                dense
-                flat
-                color="primary"
-                @click="
-                    openConfirmationModal(
-                        $t('salesOrdersTable.deleteConfirmTitle'),
-                        $t('salesOrdersTable.deleteConfirmMessage'),
-                        removeOrders
-                    )
-                "
-            >
-                <QTooltip>{{ t('salesOrdersTable.delete') }}</QTooltip>
-            </QBtn>
+            <div class="q-mt-sm">
+                <QBtn
+                    icon="refresh"
+                    size="md"
+                    color="primary"
+                    dense
+                    flat
+                    @click="$refs.table.reload()"
+                >
+                    <QTooltip>{{ $t('globals.refresh') }}</QTooltip>
+                </QBtn>
+                <QBtn
+                    v-if="selectedRows.length"
+                    icon="delete"
+                    size="md"
+                    dense
+                    flat
+                    color="primary"
+                    @click="
+                        openConfirmationModal(
+                            $t('salesOrdersTable.deleteConfirmTitle'),
+                            $t('salesOrdersTable.deleteConfirmMessage'),
+                            removeOrders
+                        )
+                    "
+                >
+                    <QTooltip>{{ t('salesOrdersTable.delete') }}</QTooltip>
+                </QBtn>
+            </div>
         </template>
         <template #column-dateSend="{ row }">
             <QTd>

From 18ea23adf16afa52668a4d0750a0024bbe6f0b42 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Thu, 26 Sep 2024 15:03:22 +0200
Subject: [PATCH 16/31] refactor: refs #7323 pr request

---
 src/i18n/locale/en.yml                      | 1 +
 src/i18n/locale/es.yml                      | 2 ++
 src/pages/Monitor/MonitorOrders.vue         | 2 +-
 src/pages/Monitor/locale/en.yml             | 1 -
 src/pages/Monitor/locale/es.yml             | 1 -
 src/pages/Worker/Card/WorkerBalance.vue     | 2 +-
 src/pages/Worker/Card/WorkerTimeControl.vue | 7 +++----
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index 05ce8dcdf..6134f8c9e 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -303,6 +303,7 @@ globals:
         email: Email
         SSN: SSN
         fi: FI
+    deleteConfirmTitle: Delete selected elements
 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 7e299f70a..db9e3b578 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -307,6 +307,8 @@ globals:
         email: Correo
         SSN: NSS
         fi: NIF
+    deleteConfirmTitle: Eliminar los elementos seleccionados
+
 errors:
     statusUnauthorized: Acceso denegado
     statusInternalServerError: Ha ocurrido un error interno del servidor
diff --git a/src/pages/Monitor/MonitorOrders.vue b/src/pages/Monitor/MonitorOrders.vue
index 853a6edc9..fac601735 100644
--- a/src/pages/Monitor/MonitorOrders.vue
+++ b/src/pages/Monitor/MonitorOrders.vue
@@ -159,7 +159,7 @@ const openTab = (id) =>
                     color="primary"
                     @click="
                         openConfirmationModal(
-                            $t('salesOrdersTable.deleteConfirmTitle'),
+                            $t('globals.deleteConfirmTitle'),
                             $t('salesOrdersTable.deleteConfirmMessage'),
                             removeOrders
                         )
diff --git a/src/pages/Monitor/locale/en.yml b/src/pages/Monitor/locale/en.yml
index 4cdd245aa..b8082f02a 100644
--- a/src/pages/Monitor/locale/en.yml
+++ b/src/pages/Monitor/locale/en.yml
@@ -15,7 +15,6 @@ salesOrdersTable:
     dateMake: Make date
     client: Client
     salesPerson: Salesperson
-    deleteConfirmTitle: Delete selected elements
     deleteConfirmMessage: All the selected elements will be deleted. Are you sure you want to continue?
     agency: Agency
     import: Import
diff --git a/src/pages/Monitor/locale/es.yml b/src/pages/Monitor/locale/es.yml
index 8087bb444..4ee5b90a9 100644
--- a/src/pages/Monitor/locale/es.yml
+++ b/src/pages/Monitor/locale/es.yml
@@ -15,7 +15,6 @@ salesOrdersTable:
     dateMake: Fecha de realización
     client: Cliente
     salesPerson: Comercial
-    deleteConfirmTitle: Eliminar los elementos seleccionados
     deleteConfirmMessage: Todos los elementos seleccionados serán eliminados. ¿Seguro que quieres continuar?
     agency: Agencia
     import: Importe
diff --git a/src/pages/Worker/Card/WorkerBalance.vue b/src/pages/Worker/Card/WorkerBalance.vue
index 88fc7c1df..c5367a281 100644
--- a/src/pages/Worker/Card/WorkerBalance.vue
+++ b/src/pages/Worker/Card/WorkerBalance.vue
@@ -82,7 +82,7 @@ const columns = computed(() => [
         :create="{
             urlCreate: 'workerIncomes',
             title: t('Create balance'),
-            onDataSaved: () => $refs.tableRef.reload(),
+            onDataSaved: () => tableRef.reload(),
             formInitialData: {
                 workerFk: entityId,
             },
diff --git a/src/pages/Worker/Card/WorkerTimeControl.vue b/src/pages/Worker/Card/WorkerTimeControl.vue
index c6ca9d74a..39fb536b6 100644
--- a/src/pages/Worker/Card/WorkerTimeControl.vue
+++ b/src/pages/Worker/Card/WorkerTimeControl.vue
@@ -329,16 +329,15 @@ const getMailStates = async (date) => {
     const url = `WorkerTimeControls/${route.params.id}/getMailStates`;
     const month = date.getMonth() + 1;
     const prevMonth = month == 1 ? 12 : month - 1;
-    let prevMonthStates = [];
-
     const params = {
         month,
         year: date.getFullYear(),
     };
 
     const curMonthStates = (await axios.get(url, { params })).data;
-    prevMonthStates = (await axios.get(url, { params: { ...params, month: prevMonth } }))
-        .data;
+    const prevMonthStates = (
+        await axios.get(url, { params: { ...params, month: prevMonth } })
+    ).data;
 
     workerTimeControlMails.value = curMonthStates.concat(prevMonthStates);
 };

From 7eb951ef13b1547f8f373c54868b2b407580c33c Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Thu, 26 Sep 2024 15:28:00 +0200
Subject: [PATCH 17/31] fix: refs #7323 use right locale

---
 src/i18n/locale/en.yml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index 7127ab20c..62023886d 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -810,14 +810,14 @@ worker:
         bankEntity: Swift / BIC
     formation:
         tableVisibleColumns:
-            course: Curso
-            startDate: Fecha Inicio
-            endDate: Fecha Fin
-            center: Centro Formación
-            invoice: Factura
-            amount: Importe
-            remark: Bonficado
-            hasDiploma: Diploma
+            course: Course
+            startDate: Start date
+            endDate: End date
+            center: Training center
+            invoice: Invoice
+            amount: Amount
+            remark: Remark
+            hasDiploma: Has diploma
     medical:
         tableVisibleColumns:
             date: Date

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 18/31] 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 19/31] 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 20/31] 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 530ed4b716b55aa2ddb5365baddadc5694f2281f Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Fri, 4 Oct 2024 08:48:36 +0200
Subject: [PATCH 21/31] 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 22/31] 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 67c2e284ba52d4d5df4338d50b05385bf65916c7 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Fri, 4 Oct 2024 11:45:10 +0200
Subject: [PATCH 23/31] feat: refs #7702 ask old pass

---
 src/components/common/VnChangePassword.vue    | 26 ++++++++++-------
 src/i18n/locale/en.yml                        |  1 +
 src/i18n/locale/es.yml                        |  1 +
 .../Account/Card/AccountDescriptorMenu.vue    | 28 ++++++++++++++++++-
 src/pages/Customer/Card/CustomerWebAccess.vue |  3 +-
 src/pages/Worker/Card/WorkerDescriptor.vue    |  3 +-
 6 files changed, 47 insertions(+), 15 deletions(-)

diff --git a/src/components/common/VnChangePassword.vue b/src/components/common/VnChangePassword.vue
index 18f538fc3..79784f3c5 100644
--- a/src/components/common/VnChangePassword.vue
+++ b/src/components/common/VnChangePassword.vue
@@ -6,7 +6,10 @@ import VnInput from './VnInput.vue';
 import FetchData from '../FetchData.vue';
 import useNotify from 'src/composables/useNotify';
 
-const props = defineProps({ submitFn: { type: Function, default: () => {} } });
+const props = defineProps({
+    submitFn: { type: Function, default: () => {} },
+    askOldPass: { type: Boolean, default: false },
+});
 const emit = defineEmits(['onSubmit']);
 const { t } = useI18n();
 const { notify } = useNotify();
@@ -18,8 +21,7 @@ const requirements = ref([]);
 const isLoading = ref(false);
 
 const validate = async () => {
-    const { newPassword, repeatPassword } = passwords.value;
-    console.log('Validating passwords:', newPassword, repeatPassword);
+    const { newPassword, repeatPassword, oldPassword } = passwords.value;
 
     if (!newPassword) {
         notify(t('You must enter a new password'), 'negative');
@@ -29,17 +31,14 @@ const validate = async () => {
         notify(t("Passwords don't match"), 'negative');
         return;
     }
+
     try {
         isLoading.value = true;
-        console.log('Calling submitFn with:', newPassword);
-
-        await props.submitFn(newPassword);
+        await props.submitFn(newPassword, oldPassword);
         emit('onSubmit');
     } catch (e) {
-        console.error('submitFn failed:', e);
         notify('errors.writeRequest', 'negative');
     } finally {
-        console.log('Entering finally block');
         changePassDialog.value.hide();
         isLoading.value = false;
     }
@@ -58,7 +57,7 @@ defineExpose({ show: () => changePassDialog.value.show() });
             <QCardSection>
                 <slot name="header">
                     <VnRow class="items-center" style="flex-direction: row">
-                        <span class="text-h6" v-text="t('Change password')" />
+                        <span class="text-h6" v-text="t('globals.changePass')" />
                         <QIcon
                             class="cursor-pointer"
                             name="close"
@@ -71,6 +70,14 @@ defineExpose({ show: () => changePassDialog.value.show() });
             </QCardSection>
             <QForm ref="form">
                 <QCardSection>
+                    <VnInput
+                        v-if="props.askOldPass"
+                        :label="t('Old password')"
+                        v-model="passwords.oldPassword"
+                        type="password"
+                        :required="true"
+                        autofocus
+                    />
                     <VnInput
                         :label="t('New password')"
                         v-model="passwords.newPassword"
@@ -122,7 +129,6 @@ defineExpose({ show: () => changePassDialog.value.show() });
 
 <i18n>
 es:
-    Change password: Cambiar contraseña
     New password: Nueva contraseña
     Repeat password: Repetir contraseña
     You must enter a new password: Debes introducir la nueva contraseña
diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index 4c559dfdf..b76c147cd 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -300,6 +300,7 @@ globals:
         from: From
         To: To
         stateFk: State
+    changePass: Change password
 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 7cb17aad3..d0d5bdc0d 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -304,6 +304,7 @@ globals:
         from: Desde
         To: Hasta
         stateFk: Estado
+    changePass: Cambiar contraseña
 errors:
     statusUnauthorized: Acceso denegado
     statusInternalServerError: Ha ocurrido un error interno del servidor
diff --git a/src/pages/Account/Card/AccountDescriptorMenu.vue b/src/pages/Account/Card/AccountDescriptorMenu.vue
index 0e35d25f3..6f1d2ca1f 100644
--- a/src/pages/Account/Card/AccountDescriptorMenu.vue
+++ b/src/pages/Account/Card/AccountDescriptorMenu.vue
@@ -4,9 +4,12 @@ import { computed, ref, toRefs } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useVnConfirm } from 'composables/useVnConfirm';
 import { useRoute } from 'vue-router';
+import { useAcl } from 'src/composables/useAcl';
 import { useArrayData } from 'src/composables/useArrayData';
 import VnConfirm from 'src/components/ui/VnConfirm.vue';
+import VnChangePassword from 'src/components/common/VnChangePassword.vue';
 import useNotify from 'src/composables/useNotify.js';
+
 const $props = defineProps({
     hasAccount: {
         type: Boolean,
@@ -62,6 +65,19 @@ async function sync() {
 }
 </script>
 <template>
+    <VnChangePassword
+        ref="changePassRef"
+        :ask-old-pass="true"
+        :submit-fn="
+            async (newPassword, oldPassword) => {
+                await axios.patch(`Accounts/change-password`, {
+                    userId: entityId,
+                    newPassword,
+                    oldPassword,
+                });
+            }
+        "
+    />
     <VnConfirm
         v-model="showSyncDialog"
         :message="t('account.card.actions.sync.message')"
@@ -92,6 +108,17 @@ async function sync() {
             />
         </template>
     </VnConfirm>
+    <QItem
+        v-if="
+            entityId == account.id &&
+            useAcl().hasAny([{ model: 'Account', props: '*', accessType: 'WRITE' }])
+        "
+        v-ripple
+        clickable
+        @click="$refs.changePassRef.show()"
+    >
+        <QItemSection>{{ t('globals.changePass') }}</QItemSection>
+    </QItem>
     <QItem
         v-if="account.hasAccount"
         v-ripple
@@ -138,6 +165,5 @@ async function sync() {
     <QItem v-ripple clickable @click="showSyncDialog = true">
         <QItemSection>{{ t('account.card.actions.sync.name') }}</QItemSection>
     </QItem>
-
     <QSeparator />
 </template>
diff --git a/src/pages/Customer/Card/CustomerWebAccess.vue b/src/pages/Customer/Card/CustomerWebAccess.vue
index ba906a144..1db32c752 100644
--- a/src/pages/Customer/Card/CustomerWebAccess.vue
+++ b/src/pages/Customer/Card/CustomerWebAccess.vue
@@ -56,7 +56,7 @@ async function hasCustomerRole() {
         </template>
         <template #moreActions>
             <QBtn
-                :label="t('Change password')"
+                :label="t('globals.changePass')"
                 color="primary"
                 icon="edit"
                 :disable="!canChangePassword"
@@ -81,5 +81,4 @@ es:
     User: Usuario
     Recovery email: Correo de recuperacion
     This email is used for user to regain access their account: Este correo electrónico se usa para que el usuario recupere el acceso a su cuenta
-    Change password: Cambiar contraseña
 </i18n>
diff --git a/src/pages/Worker/Card/WorkerDescriptor.vue b/src/pages/Worker/Card/WorkerDescriptor.vue
index 6a70e46f5..1cb42bbfb 100644
--- a/src/pages/Worker/Card/WorkerDescriptor.vue
+++ b/src/pages/Worker/Card/WorkerDescriptor.vue
@@ -88,7 +88,7 @@ const handlePhotoUpdated = (evt = false) => {
                 @click="$refs.changePassRef.show"
             >
                 <QItemSection>
-                    {{ t('Change password') }}
+                    {{ t('globals.changePass') }}
                 </QItemSection>
             </QItem>
         </template>
@@ -209,5 +209,4 @@ const handlePhotoUpdated = (evt = false) => {
 es:
     Click to allow the user to be disabled: Marcar para deshabilitar
     Click to exclude the user from getting disabled: Marcar para no deshabilitar
-    Change password: Cambiar contraseña
 </i18n>

From ae8e4ba4b975b1c6381fabec08de18cbc190f978 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Fri, 4 Oct 2024 11:54:40 +0200
Subject: [PATCH 24/31] chore: refs #7702 fix tests

---
 .../common/VnChangePassword.spec.js           | 21 ++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/test/vitest/__tests__/components/common/VnChangePassword.spec.js b/test/vitest/__tests__/components/common/VnChangePassword.spec.js
index e7a3bdcf7..f5a967bb5 100644
--- a/test/vitest/__tests__/components/common/VnChangePassword.spec.js
+++ b/test/vitest/__tests__/components/common/VnChangePassword.spec.js
@@ -50,10 +50,21 @@ describe('VnSmsDialog', () => {
         );
     });
 
-    it('should call submitFn and emit onSubmit when passwords match', async () => {
-        vm.passwords.newPassword = 'password';
-        vm.passwords.repeatPassword = 'password';
-        await vm.validate();
-        expect(vm.props.submitFn).toHaveBeenCalledWith('password');
+    describe('if passwords match', () => {
+        it('should call submitFn and emit password', async () => {
+            vm.passwords.newPassword = 'password';
+            vm.passwords.repeatPassword = 'password';
+            await vm.validate();
+            expect(vm.props.submitFn).toHaveBeenCalledWith('password', undefined);
+        });
+
+        it('should call submitFn and emit password and old password', async () => {
+            vm.passwords.newPassword = 'password';
+            vm.passwords.repeatPassword = 'password';
+            vm.passwords.oldPassword = 'oldPassword';
+
+            await vm.validate();
+            expect(vm.props.submitFn).toHaveBeenCalledWith('password', 'oldPassword');
+        });
     });
 });

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 25/31] 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 7dc019cfbbc24bd51f0e426bb96867f3c35d71d2 Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Fri, 4 Oct 2024 13:13:57 +0200
Subject: [PATCH 26/31] fix: refs #4988 selector on e2e

---
 src/pages/Route/Agency/Card/AgencyWorkcenter.vue | 13 +++++++------
 .../route/agency/agencyWorkCenter.spec.js        | 16 +++++++---------
 test/cypress/integration/route/routeList.spec.js |  2 +-
 3 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/src/pages/Route/Agency/Card/AgencyWorkcenter.vue b/src/pages/Route/Agency/Card/AgencyWorkcenter.vue
index 1f3cab5d0..86fb94e0a 100644
--- a/src/pages/Route/Agency/Card/AgencyWorkcenter.vue
+++ b/src/pages/Route/Agency/Card/AgencyWorkcenter.vue
@@ -46,13 +46,13 @@ async function deleteWorCenter(id) {
 }
 </script>
 <template>
+    <FetchData
+        url="workCenters"
+        sort-by="name"
+        @on-fetch="(data) => (warehouses = data)"
+        auto-load
+    />
     <div class="centerCard">
-        <FetchData
-            url="workCenters"
-            sort-by="name"
-            @on-fetch="(data) => (warehouses = data)"
-            auto-load
-        />
         <VnPaginate
             ref="paginate"
             data-key="AgencyWorkCenters"
@@ -108,6 +108,7 @@ async function deleteWorCenter(id) {
                                 use-input
                                 input-debounce="0"
                                 :is-clearable="false"
+                                id="pingadera"
                             />
                         </VnRow>
                     </template>
diff --git a/test/cypress/integration/route/agency/agencyWorkCenter.spec.js b/test/cypress/integration/route/agency/agencyWorkCenter.spec.js
index 6d33dbc39..353c5805b 100644
--- a/test/cypress/integration/route/agency/agencyWorkCenter.spec.js
+++ b/test/cypress/integration/route/agency/agencyWorkCenter.spec.js
@@ -4,12 +4,12 @@ describe('AgencyWorkCenter', () => {
         cy.login('developer');
         cy.visit(`/#/agency/11/workCenter`);
     });
+    const createButton = '.q-page-sticky > div > .q-btn > .q-btn__content > .q-icon';
+    const workCenterCombobox = 'input[role="combobox"]';
 
     it('assign workCenter', () => {
-        cy.get('.q-page-sticky > div > .q-btn > .q-btn__content > .q-icon').click();
-        cy.get(
-            '.vn-row > .q-field > .q-field__inner > .q-field__control > .q-field__control-container'
-        ).type('workCenterOne{enter}');
+        cy.get(createButton).click();
+        cy.get(workCenterCombobox).type('workCenterOne{enter}');
         cy.get('.q-notification__message').should('have.text', 'Data created');
     });
 
@@ -22,12 +22,10 @@ describe('AgencyWorkCenter', () => {
     });
 
     it('error on duplicate workCenter', () => {
-        cy.get('.q-page-sticky > div > .q-btn > .q-btn__content > .q-icon').click();
-        cy.get(
-            '.vn-row > .q-field > .q-field__inner > .q-field__control > .q-field__control-container'
-        ).type('workCenterOne{enter}');
+        cy.get(createButton).click();
+        cy.get(workCenterCombobox).type('workCenterOne{enter}');
         cy.get('.q-notification__message').should('have.text', 'Data created');
-        cy.get('.q-page-sticky > div > .q-btn > .q-btn__content > .q-icon').click();
+        cy.get(createButton).click();
         cy.get(
             '.vn-row > .q-field > .q-field__inner > .q-field__control > .q-field__control-container'
         ).type('workCenterOne{enter}');
diff --git a/test/cypress/integration/route/routeList.spec.js b/test/cypress/integration/route/routeList.spec.js
index c9d7147c2..8020d3ea9 100644
--- a/test/cypress/integration/route/routeList.spec.js
+++ b/test/cypress/integration/route/routeList.spec.js
@@ -2,7 +2,7 @@ describe('Route', () => {
     beforeEach(() => {
         cy.viewport(1920, 1080);
         cy.login('developer');
-        cy.visit(`/#/route/list`);
+        cy.visit(`/#/route/extended-list`);
     });
     const getVnSelect =
         '> :nth-child(1) > .column > .q-field > .q-field__inner > .q-field__control > .q-field__control-container';

From 1869e3315ae64a865d5f133ae4152fb6d9475045 Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Fri, 4 Oct 2024 13:14:14 +0200
Subject: [PATCH 27/31] fix: refs #4988 remove id

---
 src/pages/Route/Agency/Card/AgencyWorkcenter.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/pages/Route/Agency/Card/AgencyWorkcenter.vue b/src/pages/Route/Agency/Card/AgencyWorkcenter.vue
index 86fb94e0a..7103ea9ce 100644
--- a/src/pages/Route/Agency/Card/AgencyWorkcenter.vue
+++ b/src/pages/Route/Agency/Card/AgencyWorkcenter.vue
@@ -108,7 +108,6 @@ async function deleteWorCenter(id) {
                                 use-input
                                 input-debounce="0"
                                 :is-clearable="false"
-                                id="pingadera"
                             />
                         </VnRow>
                     </template>

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 28/31] 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 aee23c75e86dae184798c64f8642e84e59993c32 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Fri, 4 Oct 2024 14:31:39 +0200
Subject: [PATCH 29/31] fix: order module

---
 src/pages/Order/Card/OrderCatalog.vue         |  1 +
 src/pages/Order/Card/OrderCatalogFilter.vue   |  1 +
 .../Order/Card/OrderCatalogItemDialog.vue     | 21 +++++++++++++++++--
 3 files changed, 21 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/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/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 30/31] 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 31/31] 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();