Merge branch 'beta' into feature/visits-view

src/pages/Admin/PhotosView.vue

@@ -3,11 +3,10 @@ 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 jApi = inject('jApi');
 const api = inject('api');
 const { t } = useI18n();
 const { notify } = useNotify();
@@ -33,7 +32,7 @@ const statusIcons = {
     }
 };
 const formInitialData = reactive({
-    schema: 'catalog',
+    collectionFk: 'catalog',
     updateMatching: true
 });
 const imageCollections = ref([]);
@@ -45,9 +44,8 @@ const isSubmitable = computed(() =>
 
 const getImageCollections = async () => {
     try {
-        imageCollections.value = await jApi.query(
+        const { data } = await api.get('imageCollections');
-            'SELECT name, `desc` FROM imageCollection ORDER BY `desc`'
+        imageCollections.value = data;
-        );
     } catch (error) {
         console.error('Error getting image collections:', error);
     }
@@ -61,38 +59,36 @@ 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('updateMatching', data.updateMatching);
+        const now = new Date();
-        formData.append('image', file.file);
+        const timestamp = now.getTime();
-        formData.append('name', file.name);
+        const fileName = `${file.name}_${timestamp}`;
-        formData.append('schema', data.schema);
+        formData.append('image', file.file, fileName);
-        formData.append('srv', 'json:image/upload');
+
-        return api({
+        await api.post('images/uploadPhotoAdmin', formData, {
-            method: 'post',
+            params: {
-            url: location.origin,
+                name: fileName,
-            data: formData,
+                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'
     );
@@ -139,16 +135,17 @@ 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
-                    v-model="data.schema"
+                    v-model="data.collectionFk"
                     :label="t('collection')"
                     option-label="desc"
                     option-value="name"
@@ -269,7 +266,7 @@ onMounted(async () => getImageCollections());
                     data-cy="photoUploadSubmitBtn"
                 />
             </template>
-        </VnForm>
+        </FormModel>
     </QPage>
 </template>
 

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,38 @@ const columns = computed(() => [
     }
 ]);
 
-const fetchInvoices = async () => {
+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)
     };
-    invoices.value = await jApi.query(
+    const filter = {
-        `SELECT id, ref, issued, amount, hasPdf
+        where: {
-          FROM myInvoice
+            clientFk,
-          WHERE issued BETWEEN #from AND #to
+            issued: {
-          ORDER BY issued DESC
+                between: [from, to]
-          LIMIT 100`,
+            }
-        params
+        },
-    );
+        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>