From 29c42d7f34fda9131dfe6325085238761d29e96e Mon Sep 17 00:00:00 2001
From: taro <taro@taro.codes>
Date: Tue, 18 Feb 2025 00:32:34 -0300
Subject: [PATCH 01/16] refactor: migrate `fetchUser` API call from PHP to
 Salix

---
 src/stores/user.js | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/stores/user.js b/src/stores/user.js
index 90aaa688..a81b3c2c 100644
--- a/src/stores/user.js
+++ b/src/stores/user.js
@@ -248,11 +248,13 @@ export const useUserStore = defineStore('user', () => {
 
     const fetchUser = async (userType = 'user') => {
         try {
-            const userData = await jApi.getObject(
-                'SELECT id, nickname, name, lang FROM account.myUser'
-            );
-            if (userType === 'user') mainUser.value = userData;
-            else supplantedUser.value = userData;
+            const _token = getToken();
+            const userData = await api.get('VnUsers/getCurrentUserData', {
+              headers: { Authorization: _token }
+            });
+
+            if (userType === 'user') mainUser.value = userData.data;
+            else supplantedUser.value = userData.data;
         } catch (error) {
             console.error('Error fetching user: ', error);
         }

From bf449548c9116521407a37ab5a98c76bf3fe2ae9 Mon Sep 17 00:00:00 2001
From: taro <taro@taro.codes>
Date: Wed, 19 Feb 2025 02:05:42 -0300
Subject: [PATCH 02/16] =?UTF-8?q?address=20comments=20=E2=80=94=20remove?=
 =?UTF-8?q?=20unnecessary=20explicit=20passing=20of=20auth=20token?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/stores/user.js | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/stores/user.js b/src/stores/user.js
index a81b3c2c..7f9d8a54 100644
--- a/src/stores/user.js
+++ b/src/stores/user.js
@@ -248,10 +248,7 @@ export const useUserStore = defineStore('user', () => {
 
     const fetchUser = async (userType = 'user') => {
         try {
-            const _token = getToken();
-            const userData = await api.get('VnUsers/getCurrentUserData', {
-              headers: { Authorization: _token }
-            });
+            const userData = await api.get('VnUsers/getCurrentUserData');
 
             if (userType === 'user') mainUser.value = userData.data;
             else supplantedUser.value = userData.data;

From 93c481aadf43084b994fae3a8f3e160e12ee76e5 Mon Sep 17 00:00:00 2001
From: taro <taro@taro.codes>
Date: Wed, 19 Feb 2025 02:17:09 -0300
Subject: [PATCH 03/16] handle possible error case

---
 src/stores/user.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/stores/user.js b/src/stores/user.js
index 7f9d8a54..992e6e06 100644
--- a/src/stores/user.js
+++ b/src/stores/user.js
@@ -250,6 +250,11 @@ export const useUserStore = defineStore('user', () => {
         try {
             const userData = await api.get('VnUsers/getCurrentUserData');
 
+            if (!userData?.data) {
+                console.error('GET VnUsers/getCurrentUserData returned invalid data', userData);
+                return;
+            }
+
             if (userType === 'user') mainUser.value = userData.data;
             else supplantedUser.value = userData.data;
         } catch (error) {

From e444266db4c2dfef7af86ff4b80f48625fafad1c Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Wed, 19 Feb 2025 13:39:00 -0300
Subject: [PATCH 04/16] My menu query adaptation

---
 src/stores/app.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/stores/app.js b/src/stores/app.js
index d950af10..71b3bb64 100644
--- a/src/stores/app.js
+++ b/src/stores/app.js
@@ -1,5 +1,5 @@
 import { defineStore } from 'pinia';
-import { jApi } from '@/boot/axios';
+import { jApi, api } from '@/boot/axios';
 import useNotify from '@/composables/useNotify.js';
 import { i18n } from '@/boot/i18n';
 import { useQuasar } from 'quasar';
@@ -32,7 +32,10 @@ export const useAppStore = defineStore('hedera', {
     }),
     actions: {
         async getMenuLinks() {
-            const sections = await jApi.query('SELECT * FROM myMenu');
+            const { data: sections } = await api.get('MyMenus/getSections');
+
+            if (!sections) return;
+
             const sectionMap = new Map();
             for (const section of sections) {
                 sectionMap.set(section.id, section);

From 4ad4cb17e85cd19419d344f67abeb6118f1a1322 Mon Sep 17 00:00:00 2001
From: taro <taro@taro.codes>
Date: Thu, 20 Feb 2025 04:57:23 -0300
Subject: [PATCH 05/16] refactor: remove unnecessary verification

---
 src/stores/user.js | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/stores/user.js b/src/stores/user.js
index 992e6e06..7f9d8a54 100644
--- a/src/stores/user.js
+++ b/src/stores/user.js
@@ -250,11 +250,6 @@ export const useUserStore = defineStore('user', () => {
         try {
             const userData = await api.get('VnUsers/getCurrentUserData');
 
-            if (!userData?.data) {
-                console.error('GET VnUsers/getCurrentUserData returned invalid data', userData);
-                return;
-            }
-
             if (userType === 'user') mainUser.value = userData.data;
             else supplantedUser.value = userData.data;
         } catch (error) {

From a64a2a91f6f8708560fddc539ffe05f87e11f02d Mon Sep 17 00:00:00 2001
From: taro <taro@taro.codes>
Date: Mon, 24 Feb 2025 17:59:45 -0300
Subject: [PATCH 06/16] feat(HomeView): use salix for news

---
 src/pages/Cms/HomeView.vue | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/pages/Cms/HomeView.vue b/src/pages/Cms/HomeView.vue
index a9931ca9..3546a4cb 100644
--- a/src/pages/Cms/HomeView.vue
+++ b/src/pages/Cms/HomeView.vue
@@ -1,16 +1,15 @@
 <script setup>
 import { ref, onMounted, inject } from 'vue';
 const jApi = inject('jApi');
+const api = inject('api');
 const news = ref([]);
 const showPreview = ref(false);
 const selectedImageSrc = ref('');
 
 const fetchData = async () => {
-    news.value = await jApi.query(
-        `SELECT title, text, image, id
-        FROM news
-        ORDER BY priority, created DESC`
-    );
+  const newsResponse = await api.get('News');
+
+  news.value = newsResponse.data;
 };
 
 const showImagePreview = src => {

From 1602218f07de0ece618e2aca807b96f841bf42d2 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Wed, 26 Feb 2025 14:34:45 -0300
Subject: [PATCH 07/16] Change query path

---
 src/stores/app.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/stores/app.js b/src/stores/app.js
index 71b3bb64..a7703e4b 100644
--- a/src/stores/app.js
+++ b/src/stores/app.js
@@ -32,7 +32,7 @@ export const useAppStore = defineStore('hedera', {
     }),
     actions: {
         async getMenuLinks() {
-            const { data: sections } = await api.get('MyMenus/getSections');
+            const { data: sections } = await api.get('MyMenus');
 
             if (!sections) return;
 

From 1f39c5ef5de39d294fcc9a764eb6a0267409303b Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Thu, 27 Feb 2025 16:13:37 -0300
Subject: [PATCH 08/16] Refactor address list query

---
 src/pages/Account/AddressList.vue | 40 ++++++++++++++++++++++++-------
 1 file changed, 31 insertions(+), 9 deletions(-)

diff --git a/src/pages/Account/AddressList.vue b/src/pages/Account/AddressList.vue
index a603715c..9c2ce7a3 100644
--- a/src/pages/Account/AddressList.vue
+++ b/src/pages/Account/AddressList.vue
@@ -1,6 +1,6 @@
 <script setup>
 import { useI18n } from 'vue-i18n';
-import { ref, onMounted, inject } from 'vue';
+import { ref, onMounted, inject, watch } from 'vue';
 import { useRouter } from 'vue-router';
 
 import CardList from 'src/components/ui/CardList.vue';
@@ -10,13 +10,15 @@ import useNotify from 'src/composables/useNotify.js';
 import { useVnConfirm } from 'src/composables/useVnConfirm.js';
 import { useAppStore } from 'stores/app';
 import { storeToRefs } from 'pinia';
+import { useUserStore } from 'stores/user';
 
 const router = useRouter();
-const jApi = inject('jApi');
+const api = inject('api');
 const { notify } = useNotify();
 const { t } = useI18n();
 const { openConfirmationModal } = useVnConfirm();
 const appStore = useAppStore();
+const userStore = useUserStore();
 const { isHeaderMounted } = storeToRefs(appStore);
 
 const addresses = ref([]);
@@ -40,12 +42,23 @@ const getDefaultAddress = async () => {
 
 const getActiveAddresses = async () => {
     try {
-        addresses.value = await jApi.query(
-            `SELECT a.id, a.nickname, p.name province, a.postalCode, a.city, a.street, a.isActive
-        FROM myAddress a
-        LEFT JOIN vn.province p ON p.id = a.provinceFk
-        WHERE a.isActive`
-        );
+        const filter = {
+            where: { clientFk: userStore.user.id },
+            fields: [
+                'id',
+                'nickname',
+                'postalCode',
+                'city',
+                'street',
+                'isActive'
+            ]
+        };
+        const { data } = await api.get('Addresses', {
+            params: {
+                filter: JSON.stringify(filter)
+            }
+        });
+        addresses.value = data;
     } catch (error) {
         console.error('Error getting active addresses:', error);
     }
@@ -86,8 +99,17 @@ const removeAddress = async id => {
 
 onMounted(async () => {
     getDefaultAddress();
-    getActiveAddresses();
 });
+
+watch(
+    () => userStore?.user?.id,
+    async userId => {
+        if (userId) {
+            getActiveAddresses();
+        }
+    },
+    { immediate: true }
+);
 </script>
 
 <template>

From 832d8bb14073b808b087b7b7f70e6c68028123f9 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Fri, 28 Feb 2025 16:01:22 -0300
Subject: [PATCH 09/16] Add japi

---
 src/pages/Account/AddressList.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/pages/Account/AddressList.vue b/src/pages/Account/AddressList.vue
index 9c2ce7a3..7985eca2 100644
--- a/src/pages/Account/AddressList.vue
+++ b/src/pages/Account/AddressList.vue
@@ -14,6 +14,7 @@ import { useUserStore } from 'stores/user';
 
 const router = useRouter();
 const api = inject('api');
+const jApi = inject('jApi');
 const { notify } = useNotify();
 const { t } = useI18n();
 const { openConfirmationModal } = useVnConfirm();

From 6aee07061671075996e0df192a801d9b8c0ea69c Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Fri, 28 Feb 2025 17:44:37 -0300
Subject: [PATCH 10/16] Add is active filter

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

diff --git a/src/pages/Account/AddressList.vue b/src/pages/Account/AddressList.vue
index 7985eca2..6116fbd0 100644
--- a/src/pages/Account/AddressList.vue
+++ b/src/pages/Account/AddressList.vue
@@ -44,7 +44,7 @@ const getDefaultAddress = async () => {
 const getActiveAddresses = async () => {
     try {
         const filter = {
-            where: { clientFk: userStore.user.id },
+            where: { clientFk: userStore.user.id, isActive: true },
             fields: [
                 'id',
                 'nickname',

From bd1e9b7037ca6d61ad86dd2a0a1f3a660416dd7f Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Tue, 4 Mar 2025 10:32:12 -0300
Subject: [PATCH 11/16] Address views refactor

---
 quasar.config.js                              |   2 +-
 src/boot/error-handler.js                     |  66 -----
 src/components/common/FormModel.vue           | 232 ++++++++++++++++++
 src/pages/Account/AddressDetails.vue          |  92 ++++---
 src/pages/Account/AddressList.vue             |  20 +-
 .../integration/config/AddresList.spec.js     |  26 +-
 .../integration/{ => flows}/UserFlows.spec.js |   0
 src/test/cypress/support/commands.js          |   3 +-
 8 files changed, 322 insertions(+), 119 deletions(-)
 delete mode 100644 src/boot/error-handler.js
 create mode 100644 src/components/common/FormModel.vue
 rename src/test/cypress/integration/{ => flows}/UserFlows.spec.js (100%)

diff --git a/quasar.config.js b/quasar.config.js
index 84e934d1..a9d50c62 100644
--- a/quasar.config.js
+++ b/quasar.config.js
@@ -23,7 +23,7 @@ module.exports = configure(function (ctx) {
         // app boot file (/src/boot)
         // --> boot files are part of "main.js"
         // https://v2.quasar.dev/quasar-cli-webpack/boot-files
-        boot: ['i18n', 'axios', 'vnDate', 'error-handler', 'app'],
+        boot: ['i18n', 'axios', 'vnDate', 'app'],
 
         // https://v2.quasar.dev/quasar-cli-webpack/quasar-config-js#Property%3A-css
         css: ['app.scss', 'width.scss', 'responsive.scss'],
diff --git a/src/boot/error-handler.js b/src/boot/error-handler.js
deleted file mode 100644
index 1e11c952..00000000
--- a/src/boot/error-handler.js
+++ /dev/null
@@ -1,66 +0,0 @@
-export default async ({ app }) => {
-    /*
-  window.addEventListener('error',
-    e => onWindowError(e));
-  window.addEventListener('unhandledrejection',
-    e => onWindowRejection(e));
-
-  ,onWindowError(event) {
-    errorHandler(event.error);
-  }
-  ,onWindowRejection(event) {
-    errorHandler(event.reason);
-  }
-*/
-    app.config.errorHandler = (err, vm, info) => {
-        errorHandler(err, vm)
-    }
-
-    function errorHandler (err, vm) {
-        let message
-        let tMessage
-        let res = err.response
-
-        // XXX: Compatibility with old JSON service
-        if (err.name === 'JsonException') {
-            res = {
-                status: err.statusCode,
-                data: { error: { message: err.message } }
-            }
-        }
-
-        if (res) {
-            const status = res.status
-
-            if (status >= 400 && status < 500) {
-                switch (status) {
-                    case 401:
-                        tMessage = 'loginFailed'
-                        break
-                    case 403:
-                        tMessage = 'authenticationRequired'
-                        vm.$router.push('/login')
-                        break
-                    case 404:
-                        tMessage = 'notFound'
-                        break
-                    default:
-                        message = res.data.error.message
-                }
-            } else if (status >= 500) {
-                tMessage = 'internalServerError'
-            }
-        } else {
-            tMessage = 'somethingWentWrong'
-            console.error(err)
-        }
-
-        if (tMessage) {
-            message = vm.$t(tMessage)
-        }
-        vm.$q.notify({
-            message,
-            type: 'negative'
-        })
-    }
-}
diff --git a/src/components/common/FormModel.vue b/src/components/common/FormModel.vue
new file mode 100644
index 00000000..7f0bfa2e
--- /dev/null
+++ b/src/components/common/FormModel.vue
@@ -0,0 +1,232 @@
+<script setup>
+import { ref, inject, onMounted, computed, Teleport, watch } from 'vue';
+import { useI18n } from 'vue-i18n';
+
+import { useAppStore } from 'stores/app';
+import { storeToRefs } from 'pinia';
+import useNotify from 'src/composables/useNotify.js';
+
+const props = defineProps({
+    title: {
+        type: String,
+        default: ''
+    },
+    table: {
+        type: String,
+        default: ''
+    },
+    schema: {
+        type: String,
+        default: ''
+    },
+    // Objeto con los datos iniciales del form, si este objeto es definido, no se ejecuta la query fetch
+    formInitialData: {
+        type: Object,
+        default: () => {}
+    },
+    autoLoad: {
+        type: Boolean,
+        default: true
+    },
+    defaultActions: {
+        type: Boolean,
+        default: true
+    },
+    showBottomActions: {
+        type: Boolean,
+        default: false
+    },
+    saveFn: {
+        type: Function,
+        default: null
+    },
+    separationBetweenInputs: {
+        type: String,
+        default: 'xs'
+    },
+    url: {
+        type: String,
+        default: ''
+    },
+    urlUpdate: {
+        type: String,
+        default: null
+    },
+    urlCreate: {
+        type: String,
+        default: null
+    },
+    observeFormChanges: {
+        type: Boolean,
+        default: true,
+        description:
+            'Esto se usa principalmente para permitir guardar sin hacer cambios (Útil para la feature de clonar ya que en este caso queremos poder guardar de primeras)'
+    },
+    mapper: {
+        type: Function,
+        default: null
+    },
+    filter: {
+        type: Object,
+        default: null
+    }
+});
+
+const emit = defineEmits(['onDataSaved', 'onDataFetched']);
+const api = inject('api');
+const { t } = useI18n();
+const { notify } = useNotify();
+const appStore = useAppStore();
+const { isHeaderMounted } = storeToRefs(appStore);
+
+const isLoading = ref(false);
+const formData = ref({});
+const addressFormRef = ref(null);
+const hasChanges = ref(!props.observeFormChanges);
+const isResetting = ref(false);
+const originalData = ref(null);
+
+const separationBetweenInputs = computed(() => {
+    return `q-gutter-y-${props.separationBetweenInputs}`;
+});
+
+const onSubmitSuccess = () => {
+    emit('onDataSaved');
+    notify(t('dataSaved'), 'positive');
+};
+
+onMounted(async () => {
+    if (!props.formInitialData) {
+        if (props.autoLoad && props.url) await fetch();
+        originalData.value = { ...formData.value };
+    } else {
+        formData.value = { ...props.formInitialData };
+        originalData.value = { ...props.formInitialData };
+    }
+
+    if (props.observeFormChanges) {
+        watch(
+            () => formData.value,
+            (newVal, oldVal) => {
+                if (!oldVal) return;
+                hasChanges.value =
+                    !isResetting.value &&
+                    JSON.stringify(newVal) !==
+                        JSON.stringify(originalData.value);
+                isResetting.value = false;
+            },
+            { deep: true }
+        );
+    }
+});
+async function fetch() {
+    try {
+        let { data } = await api.get(props.url, {
+            params: { filter: JSON.stringify(props.filter) }
+        });
+        if (Array.isArray(data)) data = data[0] ?? {};
+        formData.value = { ...data };
+        emit('onDataFetched', formData.value);
+    } catch (e) {
+        throw e;
+    }
+}
+
+async function submit() {
+    console.log('submit: ');
+    if (props.observeFormChanges && !hasChanges.value)
+        return notify('globals.noChanges', 'negative');
+
+    isLoading.value = true;
+    try {
+        const body = props.mapper
+            ? props.mapper(formData.value, originalData.value)
+            : formData.value;
+        const method = props.urlCreate ? 'post' : 'patch';
+        const url = props.urlCreate || props.urlUpdate || props.url;
+
+        let response;
+
+        if (props.saveFn) await props.saveFn(body);
+        else await api[method](url, body);
+
+        onSubmitSuccess();
+        hasChanges.value = false;
+    } finally {
+        isLoading.value = false;
+    }
+}
+
+defineExpose({
+    formData,
+    submit
+});
+</script>
+
+<template>
+    <QCard class="form-container" v-bind="$attrs">
+        <QForm
+            v-if="!isLoading"
+            ref="addressFormRef"
+            class="form"
+            :class="separationBetweenInputs"
+        >
+            <span v-if="title" class="text-h6 text-bold">
+                {{ title }}
+            </span>
+            <slot name="form" :data="formData" />
+            <slot name="extraForm" :data="formData" />
+            <component
+                v-if="isHeaderMounted"
+                :is="showBottomActions ? 'div' : Teleport"
+                to="#actions"
+                class="flex row justify-end q-gutter-x-sm"
+                :class="{ 'q-mt-md': showBottomActions }"
+            >
+                <QBtn
+                    v-if="defaultActions && showBottomActions"
+                    :label="t('cancel')"
+                    :icon="showBottomActions ? undefined : 'check'"
+                    rounded
+                    no-caps
+                    flat
+                    v-close-popup
+                >
+                    <QTooltip>{{ t('cancel') }}</QTooltip>
+                </QBtn>
+                <QBtn
+                    v-if="defaultActions"
+                    :label="t('save')"
+                    :icon="showBottomActions ? undefined : 'check'"
+                    rounded
+                    no-caps
+                    flat
+                    :disabled="!showBottomActions && !hasChanges"
+                    @click="submit()"
+                    data-cy="formModelDefaultSaveButton"
+                >
+                    <QTooltip>{{ t('save') }}</QTooltip>
+                </QBtn>
+                <slot name="actions" :data="formData" />
+            </component>
+        </QForm>
+        <QSpinner v-else color="primary" size="3em" :thickness="2" />
+    </QCard>
+</template>
+
+<style lang="scss" scoped>
+.form-container {
+    width: 100%;
+    height: max-content;
+    padding: 32px;
+    max-width: 544px;
+    display: flex;
+    justify-content: center;
+}
+
+.form {
+    display: flex;
+    flex-direction: column;
+    width: 100%;
+}
+</style>
diff --git a/src/pages/Account/AddressDetails.vue b/src/pages/Account/AddressDetails.vue
index 9e4210d7..31a372d7 100644
--- a/src/pages/Account/AddressDetails.vue
+++ b/src/pages/Account/AddressDetails.vue
@@ -5,32 +5,26 @@ import { useRouter, useRoute } from 'vue-router';
 
 import VnInput from 'src/components/common/VnInput.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
-import VnForm from 'src/components/common/VnForm.vue';
+import FormModel from 'src/components/common/FormModel.vue';
 
+import { useUserStore } from 'stores/user';
 import { useAppStore } from 'stores/app';
 import { storeToRefs } from 'pinia';
 
 const router = useRouter();
 const route = useRoute();
 const { t } = useI18n();
-const jApi = inject('jApi');
+const api = inject('api');
 const appStore = useAppStore();
+const userStore = useUserStore();
 const { isHeaderMounted } = storeToRefs(appStore);
 
 const vnFormRef = ref(null);
 const countriesOptions = ref([]);
 const provincesOptions = ref([]);
-const pks = { id: route.params.id };
 const isEditMode = route.params.id !== '0';
-const fetchAddressDataSql = {
-    query: `
-        SELECT a.id, a.street, a.nickname, a.city, a.postalCode, a.provinceFk, p.countryFk
-        FROM myAddress a
-        LEFT JOIN vn.province p ON p.id = a.provinceFk
-        WHERE a.id = #address
-    `,
-    params: { address: route.params.id }
-};
+const editAddressData = ref(null);
+const showForm = ref(false);
 
 watch(
     () => vnFormRef?.value?.formData?.countryFk,
@@ -40,23 +34,49 @@ watch(
 const goBack = () => router.push({ name: 'addressesList' });
 
 const getCountries = async () => {
-    countriesOptions.value = await jApi.query(
-        `SELECT id, name FROM vn.country
-        ORDER BY name`
-    );
+    const filter = { fields: ['id', 'name'], order: 'name' };
+    const { data } = await api.get('Countries', {
+        params: { filter: JSON.stringify(filter) }
+    });
+    countriesOptions.value = data;
 };
 
 const getProvinces = async countryFk => {
     if (!countryFk) return;
-    provincesOptions.value = await jApi.query(
-        `SELECT id, name FROM vn.province
-        WHERE countryFk = #id
-        ORDER BY name`,
-        { id: countryFk }
-    );
+
+    const filter = {
+        where: { countryFk },
+        fields: ['id', 'name'],
+        order: 'name'
+    };
+    const { data } = await api.get('Provinces', {
+        params: { filter: JSON.stringify(filter) }
+    });
+    provincesOptions.value = data;
 };
 
-onMounted(() => getCountries());
+const getAddressDetails = async () => {
+    const { data } = await api.get(`Addresses/${route.params.id}`);
+    if (!data) return;
+
+    const { nickname, street, city, postalCode, province, provinceFk } = data;
+    editAddressData.value = {
+        nickname,
+        street,
+        city,
+        postalCode,
+        countryFk: province?.countryFk,
+        provinceFk
+    };
+};
+
+onMounted(async () => {
+    if (isEditMode) {
+        await getAddressDetails();
+    }
+    getCountries();
+    showForm.value = true;
+});
 </script>
 
 <template>
@@ -74,19 +94,21 @@ onMounted(() => getCountries());
                 </QTooltip>
             </QBtn>
         </Teleport>
-        <VnForm
+        <FormModel
+            v-if="showForm"
             ref="vnFormRef"
-            :fetch-form-data-sql="fetchAddressDataSql"
-            :columns-to-ignore-update="['countryFk']"
-            :create-model-default="{
-                field: 'clientFk',
-                value: 'account.myUser_getId()'
-            }"
-            :pks="pks"
-            :is-edit-mode="isEditMode"
+            :url-create="
+                !isEditMode
+                    ? `Clients/${userStore?.user?.id}/createAddress`
+                    : ''
+            "
+            :url-update="
+                isEditMode
+                    ? `Clients/${userStore?.user?.id}/updateAddress/${route?.params?.id}`
+                    : ''
+            "
+            :form-initial-data="editAddressData"
             :title="t(isEditMode ? 'editAddress' : 'addAddress')"
-            table="myAddress"
-            schema="hedera"
             @on-data-saved="goBack()"
         >
             <template #form="{ data }">
@@ -125,7 +147,7 @@ onMounted(() => getCountries());
                     data-cy="addressFormProvince"
                 />
             </template>
-        </VnForm>
+        </FormModel>
     </QPage>
 </template>
 
diff --git a/src/pages/Account/AddressList.vue b/src/pages/Account/AddressList.vue
index a603715c..43fe2b0c 100644
--- a/src/pages/Account/AddressList.vue
+++ b/src/pages/Account/AddressList.vue
@@ -10,13 +10,16 @@ import useNotify from 'src/composables/useNotify.js';
 import { useVnConfirm } from 'src/composables/useVnConfirm.js';
 import { useAppStore } from 'stores/app';
 import { storeToRefs } from 'pinia';
+import { useUserStore } from 'stores/user';
 
 const router = useRouter();
 const jApi = inject('jApi');
+const api = inject('api');
 const { notify } = useNotify();
 const { t } = useI18n();
 const { openConfirmationModal } = useVnConfirm();
 const appStore = useAppStore();
+const userStore = useUserStore();
 const { isHeaderMounted } = storeToRefs(appStore);
 
 const addresses = ref([]);
@@ -65,16 +68,13 @@ const changeDefaultAddress = async () => {
     notify(t('defaultAddressModified'), 'positive');
 };
 
-const removeAddress = async id => {
+async function removeAddress(address) {
     try {
-        await jApi.execQuery(
-            `START TRANSACTION;
-            UPDATE hedera.myAddress SET isActive = FALSE
-            WHERE ((id = #id));
-            SELECT isActive FROM hedera.myAddress WHERE ((id = #id));
-            COMMIT`,
+        await api.patch(
+            `/Clients/${userStore?.user?.id}/updateAddress/${address.id}`,
             {
-                id
+                ...address,
+                isActive: false
             }
         );
         getActiveAddresses();
@@ -82,7 +82,7 @@ const removeAddress = async id => {
     } catch (error) {
         console.error('Error removing address:', error);
     }
-};
+}
 
 onMounted(async () => {
     getDefaultAddress();
@@ -145,7 +145,7 @@ onMounted(async () => {
                             openConfirmationModal(
                                 null,
                                 t('confirmDeleteAddress'),
-                                () => removeAddress(address.id)
+                                () => removeAddress(address)
                             )
                         "
                     >
diff --git a/src/test/cypress/integration/config/AddresList.spec.js b/src/test/cypress/integration/config/AddresList.spec.js
index d8a39271..6b5ad682 100644
--- a/src/test/cypress/integration/config/AddresList.spec.js
+++ b/src/test/cypress/integration/config/AddresList.spec.js
@@ -46,15 +46,28 @@ describe('PendingOrders', () => {
             .should('contain', data.postcode);
     };
 
+    it('should fail if we enter a wrong postcode', () => {
+        cy.dataCy('newAddressBtn').should('exist');
+        cy.dataCy('newAddressBtn').click();
+        cy.dataCy('formModelDefaultSaveButton').should('exist');
+        cy.dataCy('formModelDefaultSaveButton').should('be.disabled');
+        const addressFormData = getRandomAddressFormData();
+        fillFormWithData(addressFormData);
+        cy.dataCy('formModelDefaultSaveButton').should('not.be.disabled');
+        cy.dataCy('formModelDefaultSaveButton').click();
+        cy.checkNotify('negative');
+    });
+
     it('should create a new address', () => {
         cy.dataCy('newAddressBtn').should('exist');
         cy.dataCy('newAddressBtn').click();
-        cy.dataCy('formDefaultSaveButton').should('exist');
-        cy.dataCy('formDefaultSaveButton').should('be.disabled');
+        cy.dataCy('formModelDefaultSaveButton').should('exist');
+        cy.dataCy('formModelDefaultSaveButton').should('be.disabled');
         const addressFormData = getRandomAddressFormData();
+        addressFormData.postcode = '46460'; // Usamos un postcode válido
         fillFormWithData(addressFormData);
-        cy.dataCy('formDefaultSaveButton').should('not.be.disabled');
-        cy.dataCy('formDefaultSaveButton').click();
+        cy.dataCy('formModelDefaultSaveButton').should('not.be.disabled');
+        cy.dataCy('formModelDefaultSaveButton').click();
         cy.checkNotify('positive', 'Datos guardados');
         verifyAddressCardData(addressFormData);
     });
@@ -71,9 +84,10 @@ describe('PendingOrders', () => {
         });
         // Fill form with new data
         const addressFormData = getRandomAddressFormData();
+        addressFormData.postcode = '46460'; // Usamos un postcode válido
         fillFormWithData(addressFormData);
-        cy.dataCy('formDefaultSaveButton').should('not.be.disabled');
-        cy.dataCy('formDefaultSaveButton').click();
+        cy.dataCy('formModelDefaultSaveButton').should('not.be.disabled');
+        cy.dataCy('formModelDefaultSaveButton').click();
         cy.checkNotify('positive', 'Datos guardados');
         verifyAddressCardData(addressFormData);
     });
diff --git a/src/test/cypress/integration/UserFlows.spec.js b/src/test/cypress/integration/flows/UserFlows.spec.js
similarity index 100%
rename from src/test/cypress/integration/UserFlows.spec.js
rename to src/test/cypress/integration/flows/UserFlows.spec.js
diff --git a/src/test/cypress/support/commands.js b/src/test/cypress/support/commands.js
index 2d4de848..cb22f86a 100644
--- a/src/test/cypress/support/commands.js
+++ b/src/test/cypress/support/commands.js
@@ -90,5 +90,6 @@ Cypress.Commands.add('setConfirmDialog', () => {
 });
 
 Cypress.Commands.add('checkNotify', (status, content) => {
-    cy.dataCy(`${status}Notify`).should('contain', content);
+    if (content) cy.dataCy(`${status}Notify`).should('contain', content);
+    else cy.dataCy(`${status}Notify`).should('exist');
 });

From 97ec2fabc550e53acf71a3f3eafbde7d3d1bc085 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Wed, 5 Mar 2025 15:37:35 -0300
Subject: [PATCH 12/16] Improvements

---
 package.json                         |   2 +-
 src/components/common/FormModel.vue  |  12 +-
 src/components/common/VnInput.vue    | 171 +++++++++++++++++++++------
 src/components/common/VnSelect.vue   |   2 +-
 src/composables/useRequired.js       |  17 +++
 src/i18n/ca-ES/index.js              |   2 +
 src/i18n/en-US/index.js              |   2 +
 src/i18n/es-ES/index.js              |   2 +
 src/i18n/fr-FR/index.js              |   2 +
 src/i18n/pt-PT/index.js              |   2 +
 src/pages/Account/AddressDetails.vue |   6 +
 11 files changed, 179 insertions(+), 41 deletions(-)
 create mode 100644 src/composables/useRequired.js

diff --git a/package.json b/package.json
index 64004f37..da3b8435 100644
--- a/package.json
+++ b/package.json
@@ -59,7 +59,7 @@
         "salix": "cd ../salix && gulp back",
         "db": "cd ../salix && gulp docker",
         "cy:open": "npm run db && cypress open",
-        "test:e2e": "npm run db && cypress run",
+        "test:e2e": "npm run db && cypress run --headed --config video=false",
         "test:unit": "vitest",
         "build": "rm -rf dist/ ; quasar build",
         "clean": "rm -rf dist/",
diff --git a/src/components/common/FormModel.vue b/src/components/common/FormModel.vue
index 7f0bfa2e..be7ae1c4 100644
--- a/src/components/common/FormModel.vue
+++ b/src/components/common/FormModel.vue
@@ -81,7 +81,7 @@ const { isHeaderMounted } = storeToRefs(appStore);
 
 const isLoading = ref(false);
 const formData = ref({});
-const addressFormRef = ref(null);
+const formModelRef = ref(null);
 const hasChanges = ref(!props.observeFormChanges);
 const isResetting = ref(false);
 const originalData = ref(null);
@@ -119,6 +119,7 @@ onMounted(async () => {
         );
     }
 });
+
 async function fetch() {
     try {
         let { data } = await api.get(props.url, {
@@ -133,9 +134,12 @@ async function fetch() {
 }
 
 async function submit() {
-    console.log('submit: ');
     if (props.observeFormChanges && !hasChanges.value)
-        return notify('globals.noChanges', 'negative');
+        return notify('noChanges', 'negative');
+
+    const isValid = await formModelRef.value.validate();
+    console.log('isValid', isValid);
+    if (!isValid) return;
 
     isLoading.value = true;
     try {
@@ -167,7 +171,7 @@ defineExpose({
     <QCard class="form-container" v-bind="$attrs">
         <QForm
             v-if="!isLoading"
-            ref="addressFormRef"
+            ref="formModelRef"
             class="form"
             :class="separationBetweenInputs"
         >
diff --git a/src/components/common/VnInput.vue b/src/components/common/VnInput.vue
index 508ce132..7dcf1164 100644
--- a/src/components/common/VnInput.vue
+++ b/src/components/common/VnInput.vue
@@ -1,15 +1,20 @@
 <script setup>
-import { computed, ref } from 'vue';
+import { computed, ref, useAttrs, nextTick } from 'vue';
 import { useI18n } from 'vue-i18n';
+import { useRequired } from 'src/composables/useRequired';
 
+const $attrs = useAttrs();
+const { isRequired, requiredFieldRule } = useRequired($attrs);
+const { t } = useI18n();
 const emit = defineEmits([
     'update:modelValue',
     'update:options',
     'keyup.enter',
-    'remove'
+    'remove',
+    'blur'
 ]);
 
-const props = defineProps({
+const $props = defineProps({
     modelValue: {
         type: [String, Number],
         default: null
@@ -25,24 +30,43 @@ const props = defineProps({
     clearable: {
         type: Boolean,
         default: true
+    },
+    emptyToNull: {
+        type: Boolean,
+        default: true
+    },
+    insertable: {
+        type: Boolean,
+        default: false
+    },
+    maxlength: {
+        type: Number,
+        default: null
+    },
+    uppercase: {
+        type: Boolean,
+        default: false
     }
 });
 
-const { t } = useI18n();
-const requiredFieldRule = val => !!val || t('globals.fieldRequired');
 const vnInputRef = ref(null);
 const value = computed({
     get() {
-        return props.modelValue;
+        return $props.modelValue;
     },
     set(value) {
+        if ($props.emptyToNull && value === '') value = null;
         emit('update:modelValue', value);
     }
 });
 const hover = ref(false);
 const styleAttrs = computed(() => {
-    return props.isOutlined
-        ? { dense: true, outlined: true, rounded: true }
+    return $props.isOutlined
+        ? {
+              dense: true,
+              outlined: true,
+              rounded: true
+          }
         : {};
 });
 
@@ -51,66 +75,119 @@ const focus = () => {
 };
 
 defineExpose({
-    focus
+    focus,
+    vnInputRef
 });
 
-const inputRules = [
+const mixinRules = [
+    requiredFieldRule,
+    ...($attrs.rules ?? []),
     val => {
+        const { maxlength } = vnInputRef.value;
+        if (maxlength && +val.length > maxlength)
+            return t(`maxLength`, { value: maxlength });
         const { min, max } = vnInputRef.value.$attrs;
-        if (min >= 0) {
+        if (!min) return null;
+        if (min >= 0)
             if (Math.floor(val) < min) return t('inputMin', { value: min });
-        }
+        if (!max) return null;
         if (max > 0) {
             if (Math.floor(val) > max) return t('inputMax', { value: max });
         }
     }
 ];
+
+const handleKeydown = e => {
+    if (e.key === 'Backspace') return;
+
+    if ($props.insertable && e.key.match(/[0-9]/)) {
+        handleInsertMode(e);
+    }
+};
+
+const handleInsertMode = e => {
+    e.preventDefault();
+    const input = e.target;
+    const cursorPos = input.selectionStart;
+    const { maxlength } = vnInputRef.value;
+    let currentValue = value.value;
+    if (!currentValue) currentValue = e.key;
+    const newValue = e.key;
+    if (newValue && !isNaN(newValue) && cursorPos < maxlength) {
+        value.value =
+            currentValue.substring(0, cursorPos) +
+            newValue +
+            currentValue.substring(cursorPos + 1);
+    }
+    nextTick(() => {
+        input.setSelectionRange(cursorPos + 1, cursorPos + 1);
+    });
+};
+
+const handleUppercase = () => {
+    value.value = value.value?.toUpperCase() || '';
+};
 </script>
 
 <template>
-    <div
-        :rules="$attrs.required ? [requiredFieldRule] : null"
-        @mouseover="hover = true"
-        @mouseleave="hover = false"
-    >
+    <div @mouseover="hover = true" @mouseleave="hover = false">
         <QInput
             ref="vnInputRef"
             v-model="value"
             v-bind="{ ...$attrs, ...styleAttrs }"
             :type="$attrs.type"
-            :class="{ required: $attrs.required }"
+            :class="{ required: isRequired }"
+            @keyup.enter="emit('keyup.enter')"
+            @blur="emit('blur')"
+            @keydown="handleKeydown"
             :clearable="false"
-            :rules="inputRules"
+            :rules="mixinRules"
             :lazy-rules="true"
             hide-bottom-space
-            @keyup.enter="emit('keyup.enter')"
+            :data-cy="$attrs.dataCy ?? $attrs.label + '_input'"
         >
-            <template
-                v-if="$slots.prepend"
-                #prepend
-            >
+            <template #prepend v-if="$slots.prepend">
                 <slot name="prepend" />
             </template>
             <template #append>
-                <slot
-                    v-if="$slots.append && !$attrs.disabled"
-                    name="append"
-                />
                 <QIcon
-                    v-if="hover && value && !$attrs.disabled && props.clearable"
                     name="close"
                     size="xs"
+                    :style="{
+                        visibility:
+                            hover &&
+                            value &&
+                            !$attrs.disabled &&
+                            !$attrs.readonly &&
+                            $props.clearable
+                                ? 'visible'
+                                : 'hidden'
+                    }"
                     @click="
                         () => {
                             value = null;
+                            vnInputRef.focus();
                             emit('remove');
                         }
                     "
-                />
+                ></QIcon>
+
                 <QIcon
-                    v-if="info"
-                    name="info"
+                    name="match_case"
+                    size="xs"
+                    v-if="
+                        !$attrs.disabled && !$attrs.readonly && $props.uppercase
+                    "
+                    @click="handleUppercase"
+                    class="uppercase-icon"
                 >
+                    <QTooltip>
+                        {{ t('Convert to uppercase') }}
+                    </QTooltip>
+                </QIcon>
+
+                <slot name="append" v-if="$slots.append && !$attrs.disabled" />
+                <QIcon v-if="info" name="info">
                     <QTooltip max-width="350px">
                         {{ info }}
                     </QTooltip>
@@ -120,20 +197,44 @@ const inputRules = [
     </div>
 </template>
 
+<style>
+.uppercase-icon {
+    transition:
+        color 0.3s,
+        transform 0.2s;
+    cursor: pointer;
+}
+
+.uppercase-icon:hover {
+    color: #ed9937;
+    transform: scale(1.2);
+}
+</style>
+
 <i18n lang="yaml">
 en-US:
     inputMin: Must be more than {value}
+    maxLength: The value exceeds {value} characters
     inputMax: Must be less than {value}
+    Convert to uppercase: Convert to uppercase
 es-ES:
     inputMin: Debe ser mayor a {value}
+    maxLength: El valor excede los {value} carácteres
     inputMax: Debe ser menor a {value}
+    Convert to uppercase: Convertir a mayúsculas
 ca-ES:
     inputMin: Ha de ser més gran que {value}
-    inputMax: Ha de ser menys que {value}
+    maxLength: El valor excedeix els {value} caràcters
+    inputMax: Ha de ser menor que {value}
+    Convert to uppercase: Convertir a majúscules
 fr-FR:
     inputMin: Doit être supérieur à {value}
-    inputMax: Doit être supérieur à {value}
+    maxLength: La valeur dépasse {value} caractères
+    inputMax: Doit être inférieur à {value}
+    Convert to uppercase: Convertir en majuscules
 pt-PT:
     inputMin: Deve ser maior que {value}
-    inputMax: Deve ser maior que {value}
+    maxLength: O valor excede {value} caracteres
+    inputMax: Deve ser menor que {value}
+    Convert to uppercase: Converter para maiúsculas
 </i18n>
diff --git a/src/components/common/VnSelect.vue b/src/components/common/VnSelect.vue
index c4a3e1df..65dbb2f2 100644
--- a/src/components/common/VnSelect.vue
+++ b/src/components/common/VnSelect.vue
@@ -67,7 +67,7 @@ const $props = defineProps({
 });
 
 const { t } = useI18n();
-const requiredFieldRule = val => val ?? t('globals.fieldRequired');
+const requiredFieldRule = val => val ?? t('fieldRequired');
 
 const { optionLabel, optionValue, options } = toRefs($props);
 const myOptions = ref([]);
diff --git a/src/composables/useRequired.js b/src/composables/useRequired.js
new file mode 100644
index 00000000..a77345b5
--- /dev/null
+++ b/src/composables/useRequired.js
@@ -0,0 +1,17 @@
+import { useI18n } from 'vue-i18n';
+
+export function useRequired($attrs) {
+    const { t } = useI18n();
+
+    const isRequired =
+        typeof $attrs['required'] === 'boolean'
+            ? $attrs['required']
+            : Object.keys($attrs).includes('required');
+    const requiredFieldRule = val =>
+        isRequired ? !!val || t('fieldRequired') : null;
+
+    return {
+        isRequired,
+        requiredFieldRule
+    };
+}
diff --git a/src/i18n/ca-ES/index.js b/src/i18n/ca-ES/index.js
index 456795a5..48d214e0 100644
--- a/src/i18n/ca-ES/index.js
+++ b/src/i18n/ca-ES/index.js
@@ -134,6 +134,8 @@ export default {
     introduceSearchTerm: 'Introdueix un terme de cerca',
     noOrdersFound: `No s'han trobat comandes`,
     send: 'Enviar',
+    fieldRequired: 'Aquest camp és obligatori',
+    noChanges: 'No s’han fet canvis',
     // Image related translations
     'Cant lock cache': 'No es pot bloquejar la memòria cau',
     'Bad file format': 'Format de fitxer no reconegut',
diff --git a/src/i18n/en-US/index.js b/src/i18n/en-US/index.js
index 3e21b66d..80107dd5 100644
--- a/src/i18n/en-US/index.js
+++ b/src/i18n/en-US/index.js
@@ -167,6 +167,8 @@ export default {
     introduceSearchTerm: 'Enter a search term',
     noOrdersFound: 'No orders found',
     send: 'Send',
+    fieldRequired: 'Field required',
+    noChanges: 'No changes',
     // Image related translations
     'Cant lock cache': 'The cache could not be blocked',
     'Bad file format': 'Unrecognized file format',
diff --git a/src/i18n/es-ES/index.js b/src/i18n/es-ES/index.js
index 5034ff70..15639c2d 100644
--- a/src/i18n/es-ES/index.js
+++ b/src/i18n/es-ES/index.js
@@ -166,6 +166,8 @@ export default {
     introduceSearchTerm: 'Introduce un término de búsqueda',
     noOrdersFound: 'No se encontrado pedidos',
     send: 'Enviar',
+    fieldRequired: 'Campo requerido',
+    noChanges: 'No se han hecho cambios',
     // Image related translations
     'Cant lock cache': 'La caché no pudo ser bloqueada',
     'Bad file format': 'Formato de archivo no reconocido',
diff --git a/src/i18n/fr-FR/index.js b/src/i18n/fr-FR/index.js
index d30dee52..2eea9a38 100644
--- a/src/i18n/fr-FR/index.js
+++ b/src/i18n/fr-FR/index.js
@@ -134,6 +134,8 @@ export default {
     introduceSearchTerm: 'Entrez un terme de recherche',
     noOrdersFound: 'Aucune commande trouvée',
     send: 'Envoyer',
+    fieldRequired: 'Champ obligatoire',
+    noChanges: 'Aucun changement',
     // Image related translations
     'Cant lock cache': "Le cache n'a pas pu être verrouillé",
     'Bad file format': 'Format de fichier non reconnu',
diff --git a/src/i18n/pt-PT/index.js b/src/i18n/pt-PT/index.js
index 39bbe5de..460335e0 100644
--- a/src/i18n/pt-PT/index.js
+++ b/src/i18n/pt-PT/index.js
@@ -133,6 +133,8 @@ export default {
     introduceSearchTerm: 'Digite um termo de pesquisa',
     noOrdersFound: 'Nenhum pedido encontrado',
     send: 'Enviar',
+    fieldRequired: 'Campo obrigatório',
+    noChanges: 'Sem alterações',
     // Image related translations
     'Cant lock cache': 'O cache não pôde ser bloqueado',
     'Bad file format': 'Formato de arquivo inválido',
diff --git a/src/pages/Account/AddressDetails.vue b/src/pages/Account/AddressDetails.vue
index 31a372d7..362bc95d 100644
--- a/src/pages/Account/AddressDetails.vue
+++ b/src/pages/Account/AddressDetails.vue
@@ -116,22 +116,26 @@ onMounted(async () => {
                     v-model="data.nickname"
                     :label="t('name')"
                     data-cy="addressFormNickname"
+                    :required="true"
                 />
                 <VnInput
                     v-model="data.street"
                     :label="t('address')"
                     data-cy="addressFormStreet"
+                    :required="true"
                 />
                 <VnInput
                     v-model="data.city"
                     :label="t('city')"
                     data-cy="addressFormCity"
+                    :required="true"
                 />
                 <VnInput
                     v-model="data.postalCode"
                     type="number"
                     :label="t('postalCode')"
                     data-cy="addressFormPostcode"
+                    :required="true"
                 />
                 <VnSelect
                     v-model="data.countryFk"
@@ -139,12 +143,14 @@ onMounted(async () => {
                     :options="countriesOptions"
                     @update:model-value="data.provinceFk = null"
                     data-cy="addressFormCountry"
+                    :required="true"
                 />
                 <VnSelect
                     v-model="data.provinceFk"
                     :label="t('province')"
                     :options="provincesOptions"
                     data-cy="addressFormProvince"
+                    :required="true"
                 />
             </template>
         </FormModel>

From c20695b1eec519316c5574e5567e75cb6e6d4736 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Thu, 6 Mar 2025 10:49:39 -0300
Subject: [PATCH 13/16] Add fetch data

---
 src/components/common/FetchData.vue | 66 +++++++++++++++++++++++++++++
 src/pages/Account/AddressList.vue   | 59 ++++++++++----------------
 2 files changed, 88 insertions(+), 37 deletions(-)
 create mode 100644 src/components/common/FetchData.vue

diff --git a/src/components/common/FetchData.vue b/src/components/common/FetchData.vue
new file mode 100644
index 00000000..26ec77a4
--- /dev/null
+++ b/src/components/common/FetchData.vue
@@ -0,0 +1,66 @@
+<script setup>
+import { onMounted, inject } from 'vue';
+
+const $props = defineProps({
+    autoLoad: {
+        type: Boolean,
+        default: false
+    },
+    url: {
+        type: String,
+        default: ''
+    },
+    filter: {
+        type: Object,
+        default: null
+    },
+    where: {
+        type: Object,
+        default: null
+    },
+    sortBy: {
+        type: String,
+        default: ''
+    },
+    limit: {
+        type: [String, Number],
+        default: ''
+    },
+    params: {
+        type: Object,
+        default: null
+    }
+});
+
+const emit = defineEmits(['onFetch']);
+const api = inject('api');
+
+defineExpose({ fetch });
+
+onMounted(async () => {
+    if ($props.autoLoad) {
+        await fetch();
+    }
+});
+
+async function fetch(fetchFilter = {}) {
+    try {
+        const filter = { ...fetchFilter, ...$props.filter }; // eslint-disable-line vue/no-dupe-keys
+        if ($props.where && !fetchFilter.where) filter.where = $props.where;
+        if ($props.sortBy) filter.order = $props.sortBy;
+        if ($props.limit) filter.limit = $props.limit;
+
+        const { data } = await api.get($props.url, {
+            params: { filter: JSON.stringify(filter), ...$props.params }
+        });
+
+        emit('onFetch', data);
+        return data;
+    } catch (e) {
+        //
+    }
+}
+</script>
+<template>
+    <template></template>
+</template>
diff --git a/src/pages/Account/AddressList.vue b/src/pages/Account/AddressList.vue
index 6116fbd0..4a8305e8 100644
--- a/src/pages/Account/AddressList.vue
+++ b/src/pages/Account/AddressList.vue
@@ -1,10 +1,11 @@
 <script setup>
 import { useI18n } from 'vue-i18n';
-import { ref, onMounted, inject, watch } from 'vue';
+import { ref, onMounted, inject } from 'vue';
 import { useRouter } from 'vue-router';
 
 import CardList from 'src/components/ui/CardList.vue';
 import VnList from 'src/components/ui/VnList.vue';
+import FetchData from 'src/components/common/FetchData.vue';
 
 import useNotify from 'src/composables/useNotify.js';
 import { useVnConfirm } from 'src/composables/useVnConfirm.js';
@@ -13,7 +14,6 @@ import { storeToRefs } from 'pinia';
 import { useUserStore } from 'stores/user';
 
 const router = useRouter();
-const api = inject('api');
 const jApi = inject('jApi');
 const { notify } = useNotify();
 const { t } = useI18n();
@@ -21,6 +21,7 @@ const { openConfirmationModal } = useVnConfirm();
 const appStore = useAppStore();
 const userStore = useUserStore();
 const { isHeaderMounted } = storeToRefs(appStore);
+const fetchAddressesRef = ref(null);
 
 const addresses = ref([]);
 const defaultAddress = ref(null);
@@ -41,30 +42,6 @@ const getDefaultAddress = async () => {
     }
 };
 
-const getActiveAddresses = async () => {
-    try {
-        const filter = {
-            where: { clientFk: userStore.user.id, isActive: true },
-            fields: [
-                'id',
-                'nickname',
-                'postalCode',
-                'city',
-                'street',
-                'isActive'
-            ]
-        };
-        const { data } = await api.get('Addresses', {
-            params: {
-                filter: JSON.stringify(filter)
-            }
-        });
-        addresses.value = data;
-    } catch (error) {
-        console.error('Error getting active addresses:', error);
-    }
-};
-
 const changeDefaultAddress = async () => {
     if (!clientId.value) return;
     await jApi.execQuery(
@@ -91,7 +68,7 @@ const removeAddress = async id => {
                 id
             }
         );
-        getActiveAddresses();
+        fetchAddressesRef.value.fetch();
         notify(t('dataSaved'), 'positive');
     } catch (error) {
         console.error('Error removing address:', error);
@@ -101,19 +78,27 @@ const removeAddress = async id => {
 onMounted(async () => {
     getDefaultAddress();
 });
-
-watch(
-    () => userStore?.user?.id,
-    async userId => {
-        if (userId) {
-            getActiveAddresses();
-        }
-    },
-    { immediate: true }
-);
 </script>
 
 <template>
+    <FetchData
+        v-if="userStore?.user?.id"
+        ref="fetchAddressesRef"
+        url="Addresses"
+        :filter="{
+            where: { clientFk: userStore.user.id, isActive: true },
+            fields: [
+                'id',
+                'nickname',
+                'postalCode',
+                'city',
+                'street',
+                'isActive'
+            ]
+        }"
+        auto-load
+        @on-fetch="data => (addresses = data)"
+    />
     <Teleport v-if="isHeaderMounted" to="#actions">
         <QBtn
             :label="t('addAddress')"

From ae45ef91e112482e5b87c5138800836d7e939da8 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Fri, 7 Mar 2025 11:51:45 -0300
Subject: [PATCH 14/16] Last changes

---
 src/components/common/FormModel.vue  | 31 ++++++++++++----------------
 src/pages/Account/AddressDetails.vue |  1 +
 2 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/src/components/common/FormModel.vue b/src/components/common/FormModel.vue
index be7ae1c4..fc5d1217 100644
--- a/src/components/common/FormModel.vue
+++ b/src/components/common/FormModel.vue
@@ -133,14 +133,15 @@ async function fetch() {
     }
 }
 
-async function submit() {
+const submitForm = async evt => {
+    const isFormValid = await formModelRef.value.validate();
+    if (isFormValid) await save(evt);
+};
+
+async function save() {
     if (props.observeFormChanges && !hasChanges.value)
         return notify('noChanges', 'negative');
 
-    const isValid = await formModelRef.value.validate();
-    console.log('isValid', isValid);
-    if (!isValid) return;
-
     isLoading.value = true;
     try {
         const body = props.mapper
@@ -149,10 +150,9 @@ async function submit() {
         const method = props.urlCreate ? 'post' : 'patch';
         const url = props.urlCreate || props.urlUpdate || props.url;
 
-        let response;
-
-        if (props.saveFn) await props.saveFn(body);
-        else await api[method](url, body);
+        await Promise.resolve(
+            props.saveFn ? props.saveFn(body) : api[method](url, body)
+        );
 
         onSubmitSuccess();
         hasChanges.value = false;
@@ -163,18 +163,13 @@ async function submit() {
 
 defineExpose({
     formData,
-    submit
+    submitForm
 });
 </script>
 
 <template>
     <QCard class="form-container" v-bind="$attrs">
-        <QForm
-            v-if="!isLoading"
-            ref="formModelRef"
-            class="form"
-            :class="separationBetweenInputs"
-        >
+        <QForm ref="formModelRef" class="form" :class="separationBetweenInputs">
             <span v-if="title" class="text-h6 text-bold">
                 {{ title }}
             </span>
@@ -205,8 +200,9 @@ defineExpose({
                     rounded
                     no-caps
                     flat
+                    :loading="isLoading"
                     :disabled="!showBottomActions && !hasChanges"
-                    @click="submit()"
+                    @click="submitForm()"
                     data-cy="formModelDefaultSaveButton"
                 >
                     <QTooltip>{{ t('save') }}</QTooltip>
@@ -214,7 +210,6 @@ defineExpose({
                 <slot name="actions" :data="formData" />
             </component>
         </QForm>
-        <QSpinner v-else color="primary" size="3em" :thickness="2" />
     </QCard>
 </template>
 
diff --git a/src/pages/Account/AddressDetails.vue b/src/pages/Account/AddressDetails.vue
index 362bc95d..caf7265f 100644
--- a/src/pages/Account/AddressDetails.vue
+++ b/src/pages/Account/AddressDetails.vue
@@ -110,6 +110,7 @@ onMounted(async () => {
             :form-initial-data="editAddressData"
             :title="t(isEditMode ? 'editAddress' : 'addAddress')"
             @on-data-saved="goBack()"
+            :show-bottom-actions="false"
         >
             <template #form="{ data }">
                 <VnInput

From 5e3387fb6d1af7ebc97b730e41cbbb6a3db58600 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Fri, 14 Mar 2025 14:41:59 -0300
Subject: [PATCH 15/16] Modify required attr

---
 src/pages/Account/AddressDetails.vue | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/pages/Account/AddressDetails.vue b/src/pages/Account/AddressDetails.vue
index caf7265f..d60684ad 100644
--- a/src/pages/Account/AddressDetails.vue
+++ b/src/pages/Account/AddressDetails.vue
@@ -117,26 +117,26 @@ onMounted(async () => {
                     v-model="data.nickname"
                     :label="t('name')"
                     data-cy="addressFormNickname"
-                    :required="true"
+                    required
                 />
                 <VnInput
                     v-model="data.street"
                     :label="t('address')"
                     data-cy="addressFormStreet"
-                    :required="true"
+                    required
                 />
                 <VnInput
                     v-model="data.city"
                     :label="t('city')"
                     data-cy="addressFormCity"
-                    :required="true"
+                    required
                 />
                 <VnInput
                     v-model="data.postalCode"
                     type="number"
                     :label="t('postalCode')"
                     data-cy="addressFormPostcode"
-                    :required="true"
+                    required
                 />
                 <VnSelect
                     v-model="data.countryFk"
@@ -144,14 +144,14 @@ onMounted(async () => {
                     :options="countriesOptions"
                     @update:model-value="data.provinceFk = null"
                     data-cy="addressFormCountry"
-                    :required="true"
+                    required
                 />
                 <VnSelect
                     v-model="data.provinceFk"
                     :label="t('province')"
                     :options="provincesOptions"
                     data-cy="addressFormProvince"
-                    :required="true"
+                    required
                 />
             </template>
         </FormModel>

From 92dc8998bfb0d7df70d005f7a3c5b5e6ef58b21a Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Wed, 19 Mar 2025 11:50:54 -0300
Subject: [PATCH 16/16] Input change

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

diff --git a/src/components/common/VnInput.vue b/src/components/common/VnInput.vue
index 7dcf1164..f20754ee 100644
--- a/src/components/common/VnInput.vue
+++ b/src/components/common/VnInput.vue
@@ -144,7 +144,7 @@ const handleUppercase = () => {
             :rules="mixinRules"
             :lazy-rules="true"
             hide-bottom-space
-            :data-cy="$attrs.dataCy ?? $attrs.label + '_input'"
+            :data-cy="$attrs['data-cy'] ?? $attrs.label + '_input'"
         >
             <template #prepend v-if="$slots.prepend">
                 <slot name="prepend" />