From a7264fe1fc9e306a3b3a8dbcd5a97ba84a394b3b Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Tue, 25 Mar 2025 11:42:53 +0100
Subject: [PATCH 1/7] Migrate image collections

---
 src/pages/Admin/PhotosView.vue | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/pages/Admin/PhotosView.vue b/src/pages/Admin/PhotosView.vue
index b1e32f94..2802e1ce 100644
--- a/src/pages/Admin/PhotosView.vue
+++ b/src/pages/Admin/PhotosView.vue
@@ -7,7 +7,6 @@ import VnForm from 'src/components/common/VnForm.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import useNotify from 'src/composables/useNotify.js';
 
-const jApi = inject('jApi');
 const api = inject('api');
 const { t } = useI18n();
 const { notify } = useNotify();
@@ -45,9 +44,8 @@ const isSubmitable = computed(() =>
 
 const getImageCollections = async () => {
     try {
-        imageCollections.value = await jApi.query(
-            'SELECT name, `desc` FROM imageCollection ORDER BY `desc`'
-        );
+        const { data } = await api.get('imageCollections');
+        imageCollections.value = data;
     } catch (error) {
         console.error('Error getting image collections:', error);
     }

From f7030d1213e736a161f375250f7da5ec11ee3b36 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Tue, 25 Mar 2025 15:11:42 +0100
Subject: [PATCH 2/7] WIP

---
 src/pages/Admin/PhotosView.vue | 46 +++++++++++++++++++++++++---------
 1 file changed, 34 insertions(+), 12 deletions(-)

diff --git a/src/pages/Admin/PhotosView.vue b/src/pages/Admin/PhotosView.vue
index 2802e1ce..d80c61ee 100644
--- a/src/pages/Admin/PhotosView.vue
+++ b/src/pages/Admin/PhotosView.vue
@@ -32,7 +32,7 @@ const statusIcons = {
     }
 };
 const formInitialData = reactive({
-    schema: 'catalog',
+    collectionFk: 'catalog',
     updateMatching: true
 });
 const imageCollections = ref([]);
@@ -51,6 +51,10 @@ const getImageCollections = async () => {
     }
 };
 
+const buildUploadUrl = (id, collection) => {
+    return `images/upload?id=${encodeURIComponent(id)}&collection=${encodeURIComponent(collection)}`;
+};
+
 const onSubmit = async data => {
     if (!addedFiles.value.length) {
         notify(t('noFilesToUpload'), 'warning');
@@ -59,20 +63,37 @@ const onSubmit = async data => {
     const filteredFiles = addedFiles.value.filter(
         file => file.uploadStatus === 'pending'
     );
-    const promises = filteredFiles.map((file, index) => {
+    const promises = filteredFiles.map(async (file, index) => {
         const fileIndex = filteredFiles[index].index;
         addedFiles.value[fileIndex].uploadStatus = 'uploading';
 
+        // const formData = new FormData();
+        // formData.append('file', file.file);
+
+        // const entityId = imageCollections.value.find(
+        //     collection => collection.name === data.collectionFk
+        // ).model;
+
+        // const url = buildUploadUrl(entityId, data.collectionFk);
+        // console.log('url', url);
+        // return api({
+        //     method: 'post',
+        //     url: url,
+        //     data: formData,
+        //     headers: {
+        //         'Content-Type': 'multipart/form-data'
+        //     }
+        // });
+
         const formData = new FormData();
-        formData.append('updateMatching', data.updateMatching);
-        formData.append('image', file.file);
-        formData.append('name', file.name);
-        formData.append('schema', data.schema);
-        formData.append('srv', 'json:image/upload');
-        return api({
-            method: 'post',
-            url: location.origin,
-            data: formData,
+        const now = Date.vnNew();
+        const timestamp = now.getTime();
+        console.log('file', file);
+        const fileName = `${file.file?.name}_${timestamp}`;
+        formData.append('blob', file.file, fileName);
+
+        await axios.post('Images/upload', formData, {
+            params: newPhoto,
             headers: {
                 'Content-Type': 'multipart/form-data'
             }
@@ -102,6 +123,7 @@ const onSubmit = async data => {
 };
 
 const onFilesAdded = files => {
+    console.log('files', files);
     const initialFilesLength = addedFiles.value.length;
     files.forEach((file, index) => {
         const [name] = file.name.split('.');
@@ -146,7 +168,7 @@ onMounted(async () => getImageCollections());
         >
             <template #form="{ data }">
                 <VnSelect
-                    v-model="data.schema"
+                    v-model="data.collectionFk"
                     :label="t('collection')"
                     option-label="desc"
                     option-value="name"

From a6b6599977b33a86ae0322fdc8e7cb6e9088d3c8 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Thu, 27 Mar 2025 09:37:04 +0100
Subject: [PATCH 3/7] Photos view migration

---
 src/pages/Admin/PhotosView.vue | 48 +++++++++-------------------------
 1 file changed, 13 insertions(+), 35 deletions(-)

diff --git a/src/pages/Admin/PhotosView.vue b/src/pages/Admin/PhotosView.vue
index d80c61ee..a66e3fc8 100644
--- a/src/pages/Admin/PhotosView.vue
+++ b/src/pages/Admin/PhotosView.vue
@@ -3,9 +3,9 @@ import { useI18n } from 'vue-i18n';
 import { ref, onMounted, inject, reactive, computed } from 'vue';
 
 import VnSelect from 'src/components/common/VnSelect.vue';
-import VnForm from 'src/components/common/VnForm.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import useNotify from 'src/composables/useNotify.js';
+import FormModel from 'src/components/common/FormModel.vue';
 
 const api = inject('api');
 const { t } = useI18n();
@@ -51,10 +51,6 @@ const getImageCollections = async () => {
     }
 };
 
-const buildUploadUrl = (id, collection) => {
-    return `images/upload?id=${encodeURIComponent(id)}&collection=${encodeURIComponent(collection)}`;
-};
-
 const onSubmit = async data => {
     if (!addedFiles.value.length) {
         notify(t('noFilesToUpload'), 'warning');
@@ -66,52 +62,33 @@ const onSubmit = async data => {
     const promises = filteredFiles.map(async (file, index) => {
         const fileIndex = filteredFiles[index].index;
         addedFiles.value[fileIndex].uploadStatus = 'uploading';
-
-        // const formData = new FormData();
-        // formData.append('file', file.file);
-
-        // const entityId = imageCollections.value.find(
-        //     collection => collection.name === data.collectionFk
-        // ).model;
-
-        // const url = buildUploadUrl(entityId, data.collectionFk);
-        // console.log('url', url);
-        // return api({
-        //     method: 'post',
-        //     url: url,
-        //     data: formData,
-        //     headers: {
-        //         'Content-Type': 'multipart/form-data'
-        //     }
-        // });
-
         const formData = new FormData();
-        const now = Date.vnNew();
+        const now = new Date();
         const timestamp = now.getTime();
-        console.log('file', file);
-        const fileName = `${file.file?.name}_${timestamp}`;
-        formData.append('blob', file.file, fileName);
+        const fileName = `${file.name}_${timestamp}`;
+        formData.append('image', file.file, fileName);
 
-        await axios.post('Images/upload', formData, {
-            params: newPhoto,
+        await api.post('photos/upload', formData, {
+            params: {
+                name: fileName,
+                collection: data.collectionFk,
+                updateMatching: data.updateMatching
+            },
             headers: {
                 'Content-Type': 'multipart/form-data'
             }
         });
     });
-
     const results = await Promise.allSettled(promises);
     results.forEach((result, index) => {
         const fileIndex = filteredFiles[index].index;
         addedFiles.value[fileIndex].uploadStatus = result.status;
-
         if (result.status === 'rejected') {
             addedFiles.value[fileIndex].errorMessage = t(
                 result.reason?.response?.data?.data?.message
             );
         }
     });
-
     const allSuccessful = results.every(
         result => result.status === 'fulfilled'
     );
@@ -159,12 +136,13 @@ onMounted(async () => getImageCollections());
 
 <template>
     <QPage class="vn-w-sm">
-        <VnForm
+        <FormModel
             ref="vnFormRef"
             :default-actions="false"
             :form-initial-data="formInitialData"
             separation-between-inputs="md"
             show-bottom-actions
+            :save-fn="onSubmit"
         >
             <template #form="{ data }">
                 <VnSelect
@@ -289,7 +267,7 @@ onMounted(async () => getImageCollections());
                     data-cy="photoUploadSubmitBtn"
                 />
             </template>
-        </VnForm>
+        </FormModel>
     </QPage>
 </template>
 

From 5881f12306c28526ae5eb820617041df07110be8 Mon Sep 17 00:00:00 2001
From: Guido <guidoolguin@hotmail.com>
Date: Mon, 31 Mar 2025 16:03:57 -0300
Subject: [PATCH 4/7] feat(invoices):  migrar de jApi a endpoint REST API

- Reemplazar consulta SQL directa por llamada a endpoint
---
 src/pages/Ecomerce/InvoicesView.vue | 35 ++++++++++++++++++++---------
 1 file changed, 24 insertions(+), 11 deletions(-)

diff --git a/src/pages/Ecomerce/InvoicesView.vue b/src/pages/Ecomerce/InvoicesView.vue
index 76599998..70f84a09 100644
--- a/src/pages/Ecomerce/InvoicesView.vue
+++ b/src/pages/Ecomerce/InvoicesView.vue
@@ -8,9 +8,10 @@ import { currency, formatDate } from 'src/lib/filters.js';
 import { usePrintService } from 'src/composables/usePrintService';
 import { useAppStore } from 'stores/app';
 import { storeToRefs } from 'pinia';
+import { onUserId } from 'src/utils/onUserId';
 
 const { t } = useI18n();
-const jApi = inject('jApi');
+const api = inject('api');
 const { openReport } = usePrintService();
 const appStore = useAppStore();
 const { isHeaderMounted } = storeToRefs(appStore);
@@ -50,27 +51,39 @@ const columns = computed(() => [
     }
 ]);
 
-const fetchInvoices = async () => {
+const fetchInvoices = async clientFk => {
     const params = {
         from: new Date(currentYear.value, 0),
         to: new Date(currentYear.value, 11, 31, 23, 59, 59)
     };
-    invoices.value = await jApi.query(
-        `SELECT id, ref, issued, amount, hasPdf
-          FROM myInvoice
-          WHERE issued BETWEEN #from AND #to
-          ORDER BY issued DESC
-          LIMIT 100`,
-        params
-    );
+    const filter = {
+        where: {
+            clientFk,
+            issued: {
+                between: [params.from, params.to]
+            }
+        },
+        order: ['issued DESC'],
+        fields: ['id', 'ref', 'issued', 'amount', 'hasPdf'],
+        limit: 100
+    };
+
+    const { data } = await api.get('InvoiceOuts', {
+        params: {
+            filter: JSON.stringify(filter)
+        }
+    });
+
+    invoices.value = data;
 };
 
 onMounted(async () => {
-    await fetchInvoices();
     for (let year = currentYear.value - 5; year <= currentYear.value; year++) {
         years.value.push(year);
     }
 });
+
+onUserId(fetchInvoices);
 </script>
 
 <template>

From 3f356f4143e854a98776df837359c0eeacb1c610 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Tue, 1 Apr 2025 09:49:31 +0200
Subject: [PATCH 5/7] Remove console.log

---
 src/pages/Admin/PhotosView.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/pages/Admin/PhotosView.vue b/src/pages/Admin/PhotosView.vue
index a66e3fc8..5d437551 100644
--- a/src/pages/Admin/PhotosView.vue
+++ b/src/pages/Admin/PhotosView.vue
@@ -100,7 +100,6 @@ const onSubmit = async data => {
 };
 
 const onFilesAdded = files => {
-    console.log('files', files);
     const initialFilesLength = addedFiles.value.length;
     files.forEach((file, index) => {
         const [name] = file.name.split('.');

From 17ce649a11e068d65cf6c66de3f26fcfa0a5594e Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Tue, 1 Apr 2025 11:31:56 +0200
Subject: [PATCH 6/7] Change route

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

diff --git a/src/pages/Admin/PhotosView.vue b/src/pages/Admin/PhotosView.vue
index 5d437551..257adef7 100644
--- a/src/pages/Admin/PhotosView.vue
+++ b/src/pages/Admin/PhotosView.vue
@@ -68,7 +68,7 @@ const onSubmit = async data => {
         const fileName = `${file.name}_${timestamp}`;
         formData.append('image', file.file, fileName);
 
-        await api.post('photos/upload', formData, {
+        await api.post('images/uploadPhotoAdmin', formData, {
             params: {
                 name: fileName,
                 collection: data.collectionFk,

From 4ef5e8f97b228d935a0e3ac1db5314ae41ba65e9 Mon Sep 17 00:00:00 2001
From: Guido <guidoolguin@hotmail.com>
Date: Tue, 1 Apr 2025 11:39:31 -0300
Subject: [PATCH 7/7] =?UTF-8?q?fix(invoices):=20Refactorizaci=C3=B3n=20del?=
 =?UTF-8?q?=20manejo=20de=20fechas=20en=20la=20funci=C3=B3n=20fetchInvoice?=
 =?UTF-8?q?s?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Se actualizó la función fetchInvoices para desestructurar los parámetros de fecha de un objeto y mejorar la legibilidad.
---
 src/pages/Ecomerce/InvoicesView.vue | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/pages/Ecomerce/InvoicesView.vue b/src/pages/Ecomerce/InvoicesView.vue
index 70f84a09..b89e28fa 100644
--- a/src/pages/Ecomerce/InvoicesView.vue
+++ b/src/pages/Ecomerce/InvoicesView.vue
@@ -52,7 +52,7 @@ const columns = computed(() => [
 ]);
 
 const fetchInvoices = async clientFk => {
-    const params = {
+    const { from, to } = {
         from: new Date(currentYear.value, 0),
         to: new Date(currentYear.value, 11, 31, 23, 59, 59)
     };
@@ -60,7 +60,7 @@ const fetchInvoices = async clientFk => {
         where: {
             clientFk,
             issued: {
-                between: [params.from, params.to]
+                between: [from, to]
             }
         },
         order: ['issued DESC'],
@@ -73,7 +73,6 @@ const fetchInvoices = async clientFk => {
             filter: JSON.stringify(filter)
         }
     });
-
     invoices.value = data;
 };