From 419d3d2d45b16d268da452d06fbc1aadfeb03707 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Thu, 10 Oct 2024 07:20:33 +0200
Subject: [PATCH 01/10] fix: refs #6896 fixed module problems

---
 src/components/ui/VnFilterPanel.vue          | 12 ++-
 src/components/ui/VnSearchbar.vue            |  2 +
 src/i18n/locale/en.yml                       |  2 +
 src/i18n/locale/es.yml                       |  4 +-
 src/pages/Order/Card/OrderCatalog.vue        |  6 +-
 src/pages/Order/Card/OrderCatalogFilter.vue  | 88 +++++++-------------
 src/pages/Order/Card/OrderDescriptor.vue     | 10 +--
 src/pages/Order/Card/OrderDescriptorMenu.vue |  7 +-
 src/pages/Order/Card/OrderLines.vue          |  3 +-
 src/pages/Order/Card/OrderSummary.vue        | 27 ++++++
 10 files changed, 87 insertions(+), 74 deletions(-)

diff --git a/src/components/ui/VnFilterPanel.vue b/src/components/ui/VnFilterPanel.vue
index 43d634ad9..242c4220d 100644
--- a/src/components/ui/VnFilterPanel.vue
+++ b/src/components/ui/VnFilterPanel.vue
@@ -185,6 +185,9 @@ async function remove(key) {
 }
 
 function formatValue(value) {
+    if (typeof value === 'object') {
+        return value;
+    }
     if (typeof value === 'boolean') return value ? t('Yes') : t('No');
     if (isNaN(value) && !isNaN(Date.parse(value))) return toDate(value);
 
@@ -193,6 +196,13 @@ function formatValue(value) {
 
 function sanitizer(params) {
     for (const [key, value] of Object.entries(params)) {
+        if (key == 'and') {
+            value.forEach((andValue) => {
+                params = { ...params, ...andValue };
+            });
+            delete params[key];
+        }
+
         if (value && typeof value === 'object') {
             const param = Object.values(value)[0];
             if (typeof param == 'string') params[key] = param.replaceAll('%', '');
@@ -211,7 +221,7 @@ function sanitizer(params) {
         icon="search"
         @click="search()"
     ></QBtn>
-    <QForm @submit="search" id="filterPanelForm" @keyup.enter="search()">
+    <QForm @submit="search(true)" id="filterPanelForm" @keyup.enter="search(true)">
         <QList dense>
             <QItem class="q-mt-xs">
                 <QItemSection top>
diff --git a/src/components/ui/VnSearchbar.vue b/src/components/ui/VnSearchbar.vue
index dc6d4751c..fc292e980 100644
--- a/src/components/ui/VnSearchbar.vue
+++ b/src/components/ui/VnSearchbar.vue
@@ -9,6 +9,7 @@ import { useStateStore } from 'src/stores/useStateStore';
 const quasar = useQuasar();
 const { t } = useI18n();
 const state = useStateStore();
+const emit = defineEmits(['on-search']);
 
 const props = defineProps({
     dataKey: {
@@ -118,6 +119,7 @@ async function search() {
         delete filter.params.search;
     }
     await arrayData.applyFilter(filter);
+    emit('on-search', store.data);
 }
 </script>
 <template>
diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index 6235447fe..e24926092 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -705,6 +705,8 @@ order:
         quantity: Quantity
         price: Price
         amount: Amount
+        confirm: Confirm
+        confirmLines: Confirm lines
 department:
     pageTitles:
         basicData: Basic data
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index 6076af5d9..648868fcb 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -679,13 +679,15 @@ order:
         vat: IVA
         state: Estado
         alias: Alias
-        items: Items
+        items: Artículos
         orderTicketList: Tickets del pedido
         details: Detalles
         item: Item
         quantity: Cantidad
         price: Precio
         amount: Monto
+        confirm: Confirmar
+        confirmLines: Confirmar lineas
 shelving:
     list:
         parking: Parking
diff --git a/src/pages/Order/Card/OrderCatalog.vue b/src/pages/Order/Card/OrderCatalog.vue
index b13e8661d..110ea48af 100644
--- a/src/pages/Order/Card/OrderCatalog.vue
+++ b/src/pages/Order/Card/OrderCatalog.vue
@@ -86,11 +86,8 @@ function extractValueTags(items) {
         <div class="full-width">
             <VnPaginate
                 data-key="OrderCatalogList"
-                url="Orders/CatalogFilter"
-                :limit="50"
-                :user-params="catalogParams"
-                @on-fetch="extractTags"
                 :update-router="false"
+                @on-change="extractTags"
             >
                 <template #body="{ rows }">
                     <div class="catalog-list">
@@ -102,6 +99,7 @@ function extractValueTags(items) {
                             :key="row.id"
                             :item="row"
                             is-catalog
+                            class="fill-icon"
                         />
                     </div>
                 </template>
diff --git a/src/pages/Order/Card/OrderCatalogFilter.vue b/src/pages/Order/Card/OrderCatalogFilter.vue
index 6de43e86a..9c713e77e 100644
--- a/src/pages/Order/Card/OrderCatalogFilter.vue
+++ b/src/pages/Order/Card/OrderCatalogFilter.vue
@@ -1,12 +1,11 @@
 <script setup>
-import { computed, ref } from 'vue';
+import { computed, ref, onMounted } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
 import axios from 'axios';
 import FetchData from 'components/FetchData.vue';
 import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
 import VnSelect from 'components/common/VnSelect.vue';
-import VnFilterPanelChip from 'components/ui/VnFilterPanelChip.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import getParamWhere from 'src/filters/getParamWhere';
 
@@ -48,6 +47,15 @@ const orderWayList = ref([
 const orderBySelected = ref('relevancy DESC, name');
 const orderWaySelected = ref('ASC');
 
+const routeQuery = JSON.parse(route?.query.params ?? '{}');
+const params = ref({});
+
+onMounted(() => {
+    const filter = routeQuery.filter;
+    params.value = JSON.parse(filter ?? '{}')?.where ?? {};
+    if (Object.keys(params.value).length > 0) vnFilterPanelRef.value.search();
+});
+
 const createValue = (val, done) => {
     if (val.length > 2) {
         if (!tagOptions.value.includes(val)) {
@@ -61,19 +69,15 @@ const resetCategory = () => {
     typeList.value = null;
 };
 
-const clearFilter = (key) => {
-    if (key === 'categoryFk') {
+const selectCategory = (category, search) => {
+    if (!params.value?.filter) params.value.filter = { where: {} };
+    const where = params.value.filter.where;
+    if (where.categoryFk === category?.id) {
         resetCategory();
-    }
-};
-
-const selectCategory = (params, category, search) => {
-    if (params.categoryFk === category?.id) {
-        resetCategory();
-        params.categoryFk = null;
+        where.categoryFk = null;
     } else {
         selectedCategoryFk.value = category?.id;
-        params.categoryFk = category?.id;
+        where.categoryFk = category?.id;
         loadTypes(category?.id);
     }
     search();
@@ -103,17 +107,6 @@ const selectedType = computed(() => {
     return (typeList.value || []).find((type) => type?.id === selectedTypeFk.value);
 });
 
-function exprBuilder(param, value) {
-    switch (param) {
-        case 'categoryFk':
-        case 'typeFk':
-            return { [param]: value };
-        case 'search':
-            if (/^\d+$/.test(value)) return { 'i.id': value };
-            else return { 'i.name': { like: `%${value}%` } };
-    }
-}
-
 const applyTagFilter = (params, search) => {
     if (!tagValues.value?.length) {
         params.tagGroups = null;
@@ -138,15 +131,6 @@ const applyTagFilter = (params, search) => {
     tagValues.value = [{}];
 };
 
-const removeTagChip = (selection, params, search) => {
-    if (params.tagGroups) {
-        params.tagGroups = (params.tagGroups || []).filter(
-            (value) => value !== selection
-        );
-    }
-    search();
-};
-
 const setCategoryList = (data) => {
     categoryList.value = (data || [])
         .filter((category) => category.display)
@@ -178,12 +162,11 @@ function addOrder(value, field, params) {
     <VnFilterPanel
         ref="vnFilterPanelRef"
         :data-key="props.dataKey"
-        :hidden-tags="['orderFk', 'orderBy']"
-        :un-removable-params="['orderFk', 'orderBy']"
-        :expr-builder="exprBuilder"
-        :custom-tags="['tagGroups']"
-        @remove="clearFilter"
+        v-model="params"
         :redirect="false"
+        :hidden-tags="['orderFk', 'orderBy', 'filter', 'search', 'or', 'and']"
+        :un-removable-params="['orderFk', 'orderBy']"
+        :disable-submit-event="true"
     >
         <template #tags="{ tag, formatFn }">
             <strong v-if="tag.label === 'categoryFk'">
@@ -192,30 +175,17 @@ function addOrder(value, field, params) {
             <strong v-else-if="tag.label === 'typeFk'">
                 {{ t(selectedType?.name || '') }}
             </strong>
+            <div v-else-if="tag.label === 'tagGroups'" class="q-gutter-x-xs">
+                <strong v-if="JSON.parse(tag.value).tagSelection.name"
+                    >{{ JSON.parse(tag.value).tagSelection?.name }}:
+                </strong>
+                <span>{{ JSON.parse(tag.value).values[0].value }}</span>
+            </div>
             <div v-else class="q-gutter-x-xs">
                 <strong>{{ t(`params.${tag.label}`) }}: </strong>
                 <span>{{ formatFn(tag.value) }}</span>
             </div>
         </template>
-        <template #customTags="{ tags: customTags, params, searchFn }">
-            <template v-for="tag in customTags" :key="tag.label">
-                <template v-if="tag.label === 'tagGroups'">
-                    <VnFilterPanelChip
-                        v-for="chip in tag.value"
-                        :key="chip"
-                        removable
-                        @remove="removeTagChip(chip, params, searchFn)"
-                    >
-                        <strong> {{ JSON.parse(chip).tagSelection?.name }}: </strong>
-                        <span>{{
-                            (JSON.parse(chip).values || [])
-                                .map((item) => item.value)
-                                .join(' | ')
-                        }}</span>
-                    </VnFilterPanelChip>
-                </template>
-            </template>
-        </template>
         <template #body="{ params, searchFn }">
             <QItem class="category-filter q-mt-md">
                 <div
@@ -226,7 +196,7 @@ function addOrder(value, field, params) {
                     <QIcon
                         :name="category.icon"
                         class="category-icon"
-                        @click="selectCategory(params, category, searchFn)"
+                        @click="selectCategory(category, searchFn)"
                     >
                         <QTooltip>
                             {{ t(category.name) }}
@@ -320,7 +290,7 @@ function addOrder(value, field, params) {
             >
                 <FetchData
                     v-if="selectedTag"
-                    :url="`Tags/${selectedTag}/filterValue`"
+                    :url="`Tags/${selectedTag.id}/filterValue`"
                     limit="30"
                     auto-load
                     @on-fetch="(data) => (tagOptions = data)"
@@ -343,7 +313,7 @@ function addOrder(value, field, params) {
                     @update:model-value="applyTagFilter(params, searchFn)"
                 />
                 <VnSelect
-                    v-else-if="selectedTag === 1"
+                    v-else-if="selectedTag.id === 1"
                     :label="t('params.value')"
                     v-model="value.value"
                     :options="tagOptions || []"
diff --git a/src/pages/Order/Card/OrderDescriptor.vue b/src/pages/Order/Card/OrderDescriptor.vue
index a035971b0..74c8d8bed 100644
--- a/src/pages/Order/Card/OrderDescriptor.vue
+++ b/src/pages/Order/Card/OrderDescriptor.vue
@@ -71,10 +71,6 @@ const getConfirmationValue = (isConfirmed) => {
 };
 
 const total = ref(null);
-
-function ticketFilter(order) {
-    return JSON.stringify({ id: order.id });
-}
 </script>
 
 <template>
@@ -126,7 +122,11 @@ function ticketFilter(order) {
                     color="primary"
                     :to="{
                         name: 'TicketList',
-                        query: { table: ticketFilter(entity) },
+                        query: {
+                            table: JSON.stringify({
+                                orderFk: entity.id,
+                            }),
+                        },
                     }"
                 >
                     <QTooltip>{{ t('order.summary.orderTicketList') }}</QTooltip>
diff --git a/src/pages/Order/Card/OrderDescriptorMenu.vue b/src/pages/Order/Card/OrderDescriptorMenu.vue
index 2695da4e5..461efa22f 100644
--- a/src/pages/Order/Card/OrderDescriptorMenu.vue
+++ b/src/pages/Order/Card/OrderDescriptorMenu.vue
@@ -23,8 +23,8 @@ function confirmRemove() {
         .dialog({
             component: VnConfirm,
             componentProps: {
-                title: t('globals.confirmDeletion'),
-                message: t('confirmDeletionMessage'),
+                title: t('You are going to delete this order'),
+                message: t('Continue anyway?'),
                 promise: remove,
             },
         })
@@ -57,5 +57,6 @@ en:
 es:
     deleteOrder: Eliminar pedido
     confirmDeletionMessage: Seguro que quieres eliminar este pedido?
-
+    You are going to delete this order: El pedido se eliminará
+    Continue anyway?: ¿Continuar de todos modos?
 </i18n>
diff --git a/src/pages/Order/Card/OrderLines.vue b/src/pages/Order/Card/OrderLines.vue
index 175c956e1..0d00e04ed 100644
--- a/src/pages/Order/Card/OrderLines.vue
+++ b/src/pages/Order/Card/OrderLines.vue
@@ -168,7 +168,7 @@ const columns = computed(() => [
         name: 'tableActions',
         actions: [
             {
-                title: t('Delete'),
+                title: t('Remove item'),
                 icon: 'delete',
                 show: (row) => !row.order.isConfirmed,
                 action: (row) => confirmRemove(row),
@@ -397,4 +397,5 @@ es:
     confirmDeletion: Confirmar eliminación,
     confirmDeletionMessage: Seguro que quieres eliminar este artículo?
     confirm: Confirmar
+    Remove item: Eliminar artículo
 </i18n>
diff --git a/src/pages/Order/Card/OrderSummary.vue b/src/pages/Order/Card/OrderSummary.vue
index 60358f744..9bc89ad28 100644
--- a/src/pages/Order/Card/OrderSummary.vue
+++ b/src/pages/Order/Card/OrderSummary.vue
@@ -2,7 +2,10 @@
 import { computed, ref } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
+import { useQuasar } from 'quasar';
+import axios from 'axios';
 import { dashIfEmpty, toCurrency, toDateHourMinSec } from 'src/filters';
+import { useArrayData } from 'composables/useArrayData';
 import VnLv from 'components/ui/VnLv.vue';
 import CardSummary from 'components/ui/CardSummary.vue';
 import CustomerDescriptorProxy from 'pages/Customer/Card/CustomerDescriptorProxy.vue';
@@ -21,6 +24,9 @@ const $props = defineProps({
 });
 
 const entityId = computed(() => $props.id || route.params.id);
+const summary = ref();
+const quasar = useQuasar();
+const descriptorData = useArrayData('orderData');
 const detailsColumns = ref([
     {
         name: 'item',
@@ -49,6 +55,16 @@ const detailsColumns = ref([
         field: (row) => toCurrency(row?.quantity * row?.price),
     },
 ]);
+
+async function confirmOrder() {
+    await axios.post(`Orders/${route.params.id}/confirm`);
+    quasar.notify({
+        message: t('globals.confirm'),
+        type: 'positive',
+    });
+    summary.value.fetch({});
+    descriptorData.fetch({});
+}
 </script>
 
 <template>
@@ -62,6 +78,17 @@ const detailsColumns = ref([
                 {{ t('order.summary.basket') }} #{{ entity?.id }} -
                 {{ entity?.client?.name }} ({{ entity?.clientFk }})
             </template>
+            <template #header-right>
+                <QBtn
+                    flat
+                    text-color="white"
+                    :disabled="isConfirmed"
+                    :label="t('order.summary.confirm')"
+                    @click="confirmOrder()"
+                >
+                    <QTooltip>{{ t('order.summary.confirmLines') }}</QTooltip>
+                </QBtn>
+            </template>
             <template #body="{ entity }">
                 <QCard class="vn-one">
                     <VnTitle

From d7210837959ca94189a78071a8145d5509af419d Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Thu, 10 Oct 2024 08:43:33 +0200
Subject: [PATCH 02/10] fix: filter panel

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

diff --git a/src/components/ui/VnFilterPanel.vue b/src/components/ui/VnFilterPanel.vue
index 242c4220d..f042c6481 100644
--- a/src/components/ui/VnFilterPanel.vue
+++ b/src/components/ui/VnFilterPanel.vue
@@ -221,7 +221,7 @@ function sanitizer(params) {
         icon="search"
         @click="search()"
     ></QBtn>
-    <QForm @submit="search(true)" id="filterPanelForm" @keyup.enter="search(true)">
+    <QForm @submit="search()" id="filterPanelForm" @keyup.enter="search(true)">
         <QList dense>
             <QItem class="q-mt-xs">
                 <QItemSection top>

From f16707756e99cd64e798e6190bf03845b82520a5 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Wed, 9 Oct 2024 00:40:21 +0200
Subject: [PATCH 03/10] fix: change type vnput

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

diff --git a/src/pages/Ticket/Card/TicketCreateRequest.vue b/src/pages/Ticket/Card/TicketCreateRequest.vue
index ffe009516..d6e757afe 100644
--- a/src/pages/Ticket/Card/TicketCreateRequest.vue
+++ b/src/pages/Ticket/Card/TicketCreateRequest.vue
@@ -56,6 +56,7 @@ const attendersOptions = ref([]);
                     v-model="data.price"
                     :label="t('purchaseRequest.price')"
                     type="number"
+                    step="0.01"
                     min="0"
                 />
             </VnRow>

From 3d5d2673452f4aa1e584fa333f12bcfc83e1f52f Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Thu, 10 Oct 2024 09:29:12 +0200
Subject: [PATCH 04/10] revert: commit

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

diff --git a/src/components/ui/VnFilterPanel.vue b/src/components/ui/VnFilterPanel.vue
index f042c6481..66e9df5f5 100644
--- a/src/components/ui/VnFilterPanel.vue
+++ b/src/components/ui/VnFilterPanel.vue
@@ -221,7 +221,7 @@ function sanitizer(params) {
         icon="search"
         @click="search()"
     ></QBtn>
-    <QForm @submit="search()" id="filterPanelForm" @keyup.enter="search(true)">
+    <QForm @submit="search" id="filterPanelForm" @keyup.enter.prevent="search(true)">
         <QList dense>
             <QItem class="q-mt-xs">
                 <QItemSection top>

From 11bf70d76ce3aa42d7c5ae2d94e4ebeb0a281082 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Fri, 18 Oct 2024 14:12:23 +0200
Subject: [PATCH 05/10] fix: category and tags filters

---
 src/components/ui/VnSearchbar.vue           |   4 +-
 src/pages/Order/Card/OrderCatalogFilter.vue | 111 +++++++++++++++-----
 2 files changed, 88 insertions(+), 27 deletions(-)

diff --git a/src/components/ui/VnSearchbar.vue b/src/components/ui/VnSearchbar.vue
index fc292e980..569e0ed18 100644
--- a/src/components/ui/VnSearchbar.vue
+++ b/src/components/ui/VnSearchbar.vue
@@ -9,7 +9,7 @@ import { useStateStore } from 'src/stores/useStateStore';
 const quasar = useQuasar();
 const { t } = useI18n();
 const state = useStateStore();
-const emit = defineEmits(['on-search']);
+const emit = defineEmits(['onSearch']);
 
 const props = defineProps({
     dataKey: {
@@ -119,7 +119,7 @@ async function search() {
         delete filter.params.search;
     }
     await arrayData.applyFilter(filter);
-    emit('on-search', store.data);
+    emit('onSearch', store.data);
 }
 </script>
 <template>
diff --git a/src/pages/Order/Card/OrderCatalogFilter.vue b/src/pages/Order/Card/OrderCatalogFilter.vue
index 9c713e77e..850212a62 100644
--- a/src/pages/Order/Card/OrderCatalogFilter.vue
+++ b/src/pages/Order/Card/OrderCatalogFilter.vue
@@ -1,12 +1,12 @@
 <script setup>
-import { computed, ref, onMounted } from 'vue';
+import { computed, ref, onMounted, watch } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
 import axios from 'axios';
 import FetchData from 'components/FetchData.vue';
 import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
 import VnSelect from 'components/common/VnSelect.vue';
-import VnInput from 'src/components/common/VnInput.vue';
+// import VnInput from 'src/components/common/VnInput.vue';
 import getParamWhere from 'src/filters/getParamWhere';
 
 const { t } = useI18n();
@@ -48,12 +48,15 @@ const orderBySelected = ref('relevancy DESC, name');
 const orderWaySelected = ref('ASC');
 
 const routeQuery = JSON.parse(route?.query.params ?? '{}');
-const params = ref({});
+const paramsSearch = ref({});
 
 onMounted(() => {
-    const filter = routeQuery.filter;
-    params.value = JSON.parse(filter ?? '{}')?.where ?? {};
-    if (Object.keys(params.value).length > 0) vnFilterPanelRef.value.search();
+    paramsSearch.value = JSON.parse(routeQuery.filter ?? '{}')?.where ?? {};
+    if (Object.keys(paramsSearch.value).length > 0) vnFilterPanelRef.value.search();
+    if (routeQuery.categoryFk && routeQuery.typeFk) {
+        selectedCategoryFk.value = routeQuery.categoryFk;
+        selectedTypeFk.value = routeQuery.typeFk;
+    }
 });
 
 const createValue = (val, done) => {
@@ -70,12 +73,18 @@ const resetCategory = () => {
 };
 
 const selectCategory = (category, search) => {
-    if (!params.value?.filter) params.value.filter = { where: {} };
-    const where = params.value.filter.where;
+    if (!paramsSearch.value?.filter) paramsSearch.value.filter = { where: {} };
+    const where = paramsSearch.value.filter.where;
     if (where.categoryFk === category?.id) {
         resetCategory();
         where.categoryFk = null;
     } else {
+        if (where.categoryFk && where.categoryFk !== category?.id) {
+            paramsSearch.value.typeFk = null;
+            selectedTypeFk.value = null;
+            typeList.value = [];
+        }
+
         selectedCategoryFk.value = category?.id;
         where.categoryFk = category?.id;
         loadTypes(category?.id);
@@ -90,6 +99,10 @@ const loadTypes = async (categoryFk = selectedCategoryFk.value) => {
     typeList.value = data;
 };
 
+watch(selectedTypeFk, (newValue) => {
+    paramsSearch.value.typeFk = newValue;
+});
+
 const selectedCategory = computed(() =>
     (categoryList.value || []).find(
         (category) => category?.id === selectedCategoryFk.value
@@ -107,25 +120,55 @@ const selectedType = computed(() => {
     return (typeList.value || []).find((type) => type?.id === selectedTypeFk.value);
 });
 
+// const applyTagFilter = (params, search) => {
+
+//     if (params.tagGroups) params.tagGroups = null;
+//     if (!tagValues.value?.length) {
+//         params.tagGroups = null;
+//         search();
+//         return;
+//     }
+//     if (!params.tagGroups) {
+//         params.tagGroups = [];
+//     }
+//     params.tagGroups.push(
+//         JSON.stringify({
+//             values: tagValues.value.filter((obj) => Object.keys(obj).length > 0),
+//             tagSelection: {
+//                 ...selectedTag.value,
+//                 orgShowField: selectedTag?.value?.name,
+//             },
+//             tagFk: selectedTag?.value?.tagFk,
+//         })
+//     );
+//     search();
+//     selectedTag.value = null;
+//     tagValues.value = [{}];
+// };
+
 const applyTagFilter = (params, search) => {
     if (!tagValues.value?.length) {
         params.tagGroups = null;
         search();
         return;
     }
+
     if (!params.tagGroups) {
         params.tagGroups = [];
+    } else if (typeof params.tagGroups === 'string') {
+        params.tagGroups = [params.tagGroups];
     }
-    params.tagGroups.push(
-        JSON.stringify({
-            values: tagValues.value.filter((obj) => Object.keys(obj).length > 0),
-            tagSelection: {
-                ...selectedTag.value,
-                orgShowField: selectedTag?.value?.name,
-            },
-            tagFk: selectedTag?.value?.tagFk,
-        })
-    );
+
+    const newTagGroup = JSON.stringify({
+        values: tagValues.value.filter((obj) => Object.keys(obj).length > 0),
+        tagSelection: {
+            ...selectedTag.value,
+            orgShowField: selectedTag?.value?.name,
+        },
+        tagFk: selectedTag?.value?.tagFk,
+    });
+    params.tagGroups.push(newTagGroup);
+
     search();
     selectedTag.value = null;
     tagValues.value = [{}];
@@ -155,6 +198,22 @@ function addOrder(value, field, params) {
     params.orderBy = JSON.stringify(orderBy);
     vnFilterPanelRef.value.search();
 }
+
+const data = ref([]);
+
+function getTagData(value) {
+    if (Array.isArray(value) && value.length >= 1) {
+        const parsedTags = value.map((obj) => JSON.parse(obj));
+
+        if (parsedTags.length === 1) {
+            data.value = parsedTags[0];
+        } else {
+            data.value = parsedTags;
+        }
+    } else {
+        data.value = JSON.parse(value);
+    }
+}
 </script>
 
 <template>
@@ -162,13 +221,14 @@ function addOrder(value, field, params) {
     <VnFilterPanel
         ref="vnFilterPanelRef"
         :data-key="props.dataKey"
-        v-model="params"
+        v-model="paramsSearch"
         :redirect="false"
         :hidden-tags="['orderFk', 'orderBy', 'filter', 'search', 'or', 'and']"
-        :un-removable-params="['orderFk', 'orderBy']"
+        :unremovable-params="['orderFk', 'orderBy']"
         :disable-submit-event="true"
     >
         <template #tags="{ tag, formatFn }">
+            {{ console.log('tag.label: ', tag.label) }}
             <strong v-if="tag.label === 'categoryFk'">
                 {{ t(selectedCategory?.name || '') }}
             </strong>
@@ -176,10 +236,11 @@ function addOrder(value, field, params) {
                 {{ t(selectedType?.name || '') }}
             </strong>
             <div v-else-if="tag.label === 'tagGroups'" class="q-gutter-x-xs">
-                <strong v-if="JSON.parse(tag.value).tagSelection.name"
-                    >{{ JSON.parse(tag.value).tagSelection?.name }}:
-                </strong>
-                <span>{{ JSON.parse(tag.value).values[0].value }}</span>
+                {{ getTagData(tag.value) }}
+                <strong> {{ data.tagSelection?.name }}: </strong>
+                <span>
+                    {{ console.log('data', data.values) }}
+                </span>
             </div>
             <div v-else class="q-gutter-x-xs">
                 <strong>{{ t(`params.${tag.label}`) }}: </strong>
@@ -328,7 +389,7 @@ function addOrder(value, field, params) {
                     @new-value="createValue"
                     @update:model-value="applyTagFilter(params, searchFn)"
                 />
-                <VnInput
+                <QInput
                     v-else
                     :label="t('params.value')"
                     v-model="value.value"

From 1346a2e7fd52f8811ac0b2efbd0c03676becca1f Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Tue, 22 Oct 2024 12:05:44 +0200
Subject: [PATCH 06/10] fix: tag chips

---
 src/pages/Order/Card/OrderCatalogFilter.vue | 113 +++++++++-----------
 1 file changed, 50 insertions(+), 63 deletions(-)

diff --git a/src/pages/Order/Card/OrderCatalogFilter.vue b/src/pages/Order/Card/OrderCatalogFilter.vue
index 850212a62..0fe8c4d64 100644
--- a/src/pages/Order/Card/OrderCatalogFilter.vue
+++ b/src/pages/Order/Card/OrderCatalogFilter.vue
@@ -6,8 +6,8 @@ import axios from 'axios';
 import FetchData from 'components/FetchData.vue';
 import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
 import VnSelect from 'components/common/VnSelect.vue';
-// import VnInput from 'src/components/common/VnInput.vue';
 import getParamWhere from 'src/filters/getParamWhere';
+import VnFilterPanelChip from 'src/components/ui/VnFilterPanelChip.vue';
 
 const { t } = useI18n();
 
@@ -49,6 +49,7 @@ const orderWaySelected = ref('ASC');
 
 const routeQuery = JSON.parse(route?.query.params ?? '{}');
 const paramsSearch = ref({});
+const tagData = ref([]);
 
 onMounted(() => {
     paramsSearch.value = JSON.parse(routeQuery.filter ?? '{}')?.where ?? {};
@@ -120,32 +121,6 @@ const selectedType = computed(() => {
     return (typeList.value || []).find((type) => type?.id === selectedTypeFk.value);
 });
 
-// const applyTagFilter = (params, search) => {
-
-//     if (params.tagGroups) params.tagGroups = null;
-//     if (!tagValues.value?.length) {
-//         params.tagGroups = null;
-//         search();
-//         return;
-//     }
-//     if (!params.tagGroups) {
-//         params.tagGroups = [];
-//     }
-//     params.tagGroups.push(
-//         JSON.stringify({
-//             values: tagValues.value.filter((obj) => Object.keys(obj).length > 0),
-//             tagSelection: {
-//                 ...selectedTag.value,
-//                 orgShowField: selectedTag?.value?.name,
-//             },
-//             tagFk: selectedTag?.value?.tagFk,
-//         })
-//     );
-//     search();
-//     selectedTag.value = null;
-//     tagValues.value = [{}];
-// };
-
 const applyTagFilter = (params, search) => {
     if (!tagValues.value?.length) {
         params.tagGroups = null;
@@ -153,27 +128,46 @@ const applyTagFilter = (params, search) => {
         return;
     }
 
-    if (!params.tagGroups) {
+    if (!params.tagGroups || typeof params.tagGroups === 'string') {
         params.tagGroups = [];
-    } else if (typeof params.tagGroups === 'string') {
-        params.tagGroups = [params.tagGroups];
     }
 
-    const newTagGroup = JSON.stringify({
-        values: tagValues.value.filter((obj) => Object.keys(obj).length > 0),
-        tagSelection: {
-            ...selectedTag.value,
-            orgShowField: selectedTag?.value?.name,
-        },
-        tagFk: selectedTag?.value?.tagFk,
-    });
-    params.tagGroups.push(newTagGroup);
+    params.tagGroups.push(
+        JSON.stringify({
+            values: tagValues.value.filter((obj) => Object.keys(obj).length > 0),
+            tagSelection: {
+                ...selectedTag.value,
+                orgShowField: selectedTag?.value?.name,
+            },
+            tagFk: selectedTag?.value?.tagFk,
+        })
+    );
 
+    tagData.value.push(JSON.parse(params.tagGroups[params.tagGroups.length - 1]));
     search();
     selectedTag.value = null;
     tagValues.value = [{}];
 };
 
+const removeTagChip = (selection, params, search) => {
+    if (typeof params.tagGroups === 'string') {
+        try {
+            params.tagGroups = JSON.parse(params.tagGroups);
+        } catch (error) {
+            console.error('Error parsing tagGroups:', error);
+            params.tagGroups = [];
+        }
+    }
+    console.log('params.tagGroups: ', params.tagGroups);
+    console.log('selection: ', selection);
+
+    if (Array.isArray(params.tagGroups)) {
+        params.tagGroups = params.tagGroups.filter((value) => value !== selection);
+    }
+
+    search();
+};
+
 const setCategoryList = (data) => {
     categoryList.value = (data || [])
         .filter((category) => category.display)
@@ -198,22 +192,6 @@ function addOrder(value, field, params) {
     params.orderBy = JSON.stringify(orderBy);
     vnFilterPanelRef.value.search();
 }
-
-const data = ref([]);
-
-function getTagData(value) {
-    if (Array.isArray(value) && value.length >= 1) {
-        const parsedTags = value.map((obj) => JSON.parse(obj));
-
-        if (parsedTags.length === 1) {
-            data.value = parsedTags[0];
-        } else {
-            data.value = parsedTags;
-        }
-    } else {
-        data.value = JSON.parse(value);
-    }
-}
 </script>
 
 <template>
@@ -224,29 +202,37 @@ function getTagData(value) {
         v-model="paramsSearch"
         :redirect="false"
         :hidden-tags="['orderFk', 'orderBy', 'filter', 'search', 'or', 'and']"
+        :custom-tags="['tagGroups']"
         :unremovable-params="['orderFk', 'orderBy']"
         :disable-submit-event="true"
     >
         <template #tags="{ tag, formatFn }">
-            {{ console.log('tag.label: ', tag.label) }}
             <strong v-if="tag.label === 'categoryFk'">
                 {{ t(selectedCategory?.name || '') }}
             </strong>
             <strong v-else-if="tag.label === 'typeFk'">
                 {{ t(selectedType?.name || '') }}
             </strong>
-            <div v-else-if="tag.label === 'tagGroups'" class="q-gutter-x-xs">
-                {{ getTagData(tag.value) }}
-                <strong> {{ data.tagSelection?.name }}: </strong>
-                <span>
-                    {{ console.log('data', data.values) }}
-                </span>
-            </div>
             <div v-else class="q-gutter-x-xs">
                 <strong>{{ t(`params.${tag.label}`) }}: </strong>
                 <span>{{ formatFn(tag.value) }}</span>
             </div>
         </template>
+        <template #customTags="{ tags: customTags, params, searchFn }">
+            <template v-for="tag in customTags" :key="tag.label">
+                <template v-if="tag.label === 'tagGroups'">
+                    <VnFilterPanelChip
+                        v-for="chip in tagData"
+                        :key="chip"
+                        removable
+                        @remove="removeTagChip(chip, params, searchFn)"
+                    >
+                        <strong>{{ chip.tagSelection?.name }}: </strong>
+                        <span>{{ chip.values[0].value }}</span>
+                    </VnFilterPanelChip>
+                </template>
+            </template>
+        </template>
         <template #body="{ params, searchFn }">
             <QItem class="category-filter q-mt-md">
                 <div
@@ -410,6 +396,7 @@ function getTagData(value) {
                     icon="add_circle"
                     shortcut="+"
                     flat
+                    size="md"
                     class="filter-icon"
                     @click="tagValues.push({})"
                 />

From 37b3affdbfc2c406b72116ac89657218e38f7adc Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Wed, 23 Oct 2024 13:02:28 +0200
Subject: [PATCH 07/10] refactor: revert catalog changes

---
 src/components/ui/VnFilterPanel.vue         |  12 +--
 src/components/ui/VnSearchbar.vue           |   2 -
 src/pages/Order/Card/OrderCatalog.vue       |   5 +-
 src/pages/Order/Card/OrderCatalogFilter.vue | 108 ++++++++------------
 4 files changed, 50 insertions(+), 77 deletions(-)

diff --git a/src/components/ui/VnFilterPanel.vue b/src/components/ui/VnFilterPanel.vue
index 66e9df5f5..43d634ad9 100644
--- a/src/components/ui/VnFilterPanel.vue
+++ b/src/components/ui/VnFilterPanel.vue
@@ -185,9 +185,6 @@ async function remove(key) {
 }
 
 function formatValue(value) {
-    if (typeof value === 'object') {
-        return value;
-    }
     if (typeof value === 'boolean') return value ? t('Yes') : t('No');
     if (isNaN(value) && !isNaN(Date.parse(value))) return toDate(value);
 
@@ -196,13 +193,6 @@ function formatValue(value) {
 
 function sanitizer(params) {
     for (const [key, value] of Object.entries(params)) {
-        if (key == 'and') {
-            value.forEach((andValue) => {
-                params = { ...params, ...andValue };
-            });
-            delete params[key];
-        }
-
         if (value && typeof value === 'object') {
             const param = Object.values(value)[0];
             if (typeof param == 'string') params[key] = param.replaceAll('%', '');
@@ -221,7 +211,7 @@ function sanitizer(params) {
         icon="search"
         @click="search()"
     ></QBtn>
-    <QForm @submit="search" id="filterPanelForm" @keyup.enter.prevent="search(true)">
+    <QForm @submit="search" id="filterPanelForm" @keyup.enter="search()">
         <QList dense>
             <QItem class="q-mt-xs">
                 <QItemSection top>
diff --git a/src/components/ui/VnSearchbar.vue b/src/components/ui/VnSearchbar.vue
index 569e0ed18..dc6d4751c 100644
--- a/src/components/ui/VnSearchbar.vue
+++ b/src/components/ui/VnSearchbar.vue
@@ -9,7 +9,6 @@ import { useStateStore } from 'src/stores/useStateStore';
 const quasar = useQuasar();
 const { t } = useI18n();
 const state = useStateStore();
-const emit = defineEmits(['onSearch']);
 
 const props = defineProps({
     dataKey: {
@@ -119,7 +118,6 @@ async function search() {
         delete filter.params.search;
     }
     await arrayData.applyFilter(filter);
-    emit('onSearch', store.data);
 }
 </script>
 <template>
diff --git a/src/pages/Order/Card/OrderCatalog.vue b/src/pages/Order/Card/OrderCatalog.vue
index 110ea48af..f9bcca94c 100644
--- a/src/pages/Order/Card/OrderCatalog.vue
+++ b/src/pages/Order/Card/OrderCatalog.vue
@@ -86,8 +86,11 @@ function extractValueTags(items) {
         <div class="full-width">
             <VnPaginate
                 data-key="OrderCatalogList"
+                url="Orders/CatalogFilter"
+                :limit="50"
+                :user-params="catalogParams"
+                @on-fetch="extractTags"
                 :update-router="false"
-                @on-change="extractTags"
             >
                 <template #body="{ rows }">
                     <div class="catalog-list">
diff --git a/src/pages/Order/Card/OrderCatalogFilter.vue b/src/pages/Order/Card/OrderCatalogFilter.vue
index 0fe8c4d64..6de43e86a 100644
--- a/src/pages/Order/Card/OrderCatalogFilter.vue
+++ b/src/pages/Order/Card/OrderCatalogFilter.vue
@@ -1,13 +1,14 @@
 <script setup>
-import { computed, ref, onMounted, watch } from 'vue';
+import { computed, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
 import axios from 'axios';
 import FetchData from 'components/FetchData.vue';
 import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
 import VnSelect from 'components/common/VnSelect.vue';
+import VnFilterPanelChip from 'components/ui/VnFilterPanelChip.vue';
+import VnInput from 'src/components/common/VnInput.vue';
 import getParamWhere from 'src/filters/getParamWhere';
-import VnFilterPanelChip from 'src/components/ui/VnFilterPanelChip.vue';
 
 const { t } = useI18n();
 
@@ -47,19 +48,6 @@ const orderWayList = ref([
 const orderBySelected = ref('relevancy DESC, name');
 const orderWaySelected = ref('ASC');
 
-const routeQuery = JSON.parse(route?.query.params ?? '{}');
-const paramsSearch = ref({});
-const tagData = ref([]);
-
-onMounted(() => {
-    paramsSearch.value = JSON.parse(routeQuery.filter ?? '{}')?.where ?? {};
-    if (Object.keys(paramsSearch.value).length > 0) vnFilterPanelRef.value.search();
-    if (routeQuery.categoryFk && routeQuery.typeFk) {
-        selectedCategoryFk.value = routeQuery.categoryFk;
-        selectedTypeFk.value = routeQuery.typeFk;
-    }
-});
-
 const createValue = (val, done) => {
     if (val.length > 2) {
         if (!tagOptions.value.includes(val)) {
@@ -73,21 +61,19 @@ const resetCategory = () => {
     typeList.value = null;
 };
 
-const selectCategory = (category, search) => {
-    if (!paramsSearch.value?.filter) paramsSearch.value.filter = { where: {} };
-    const where = paramsSearch.value.filter.where;
-    if (where.categoryFk === category?.id) {
+const clearFilter = (key) => {
+    if (key === 'categoryFk') {
         resetCategory();
-        where.categoryFk = null;
-    } else {
-        if (where.categoryFk && where.categoryFk !== category?.id) {
-            paramsSearch.value.typeFk = null;
-            selectedTypeFk.value = null;
-            typeList.value = [];
-        }
+    }
+};
 
+const selectCategory = (params, category, search) => {
+    if (params.categoryFk === category?.id) {
+        resetCategory();
+        params.categoryFk = null;
+    } else {
         selectedCategoryFk.value = category?.id;
-        where.categoryFk = category?.id;
+        params.categoryFk = category?.id;
         loadTypes(category?.id);
     }
     search();
@@ -100,10 +86,6 @@ const loadTypes = async (categoryFk = selectedCategoryFk.value) => {
     typeList.value = data;
 };
 
-watch(selectedTypeFk, (newValue) => {
-    paramsSearch.value.typeFk = newValue;
-});
-
 const selectedCategory = computed(() =>
     (categoryList.value || []).find(
         (category) => category?.id === selectedCategoryFk.value
@@ -121,17 +103,26 @@ const selectedType = computed(() => {
     return (typeList.value || []).find((type) => type?.id === selectedTypeFk.value);
 });
 
+function exprBuilder(param, value) {
+    switch (param) {
+        case 'categoryFk':
+        case 'typeFk':
+            return { [param]: value };
+        case 'search':
+            if (/^\d+$/.test(value)) return { 'i.id': value };
+            else return { 'i.name': { like: `%${value}%` } };
+    }
+}
+
 const applyTagFilter = (params, search) => {
     if (!tagValues.value?.length) {
         params.tagGroups = null;
         search();
         return;
     }
-
-    if (!params.tagGroups || typeof params.tagGroups === 'string') {
+    if (!params.tagGroups) {
         params.tagGroups = [];
     }
-
     params.tagGroups.push(
         JSON.stringify({
             values: tagValues.value.filter((obj) => Object.keys(obj).length > 0),
@@ -142,29 +133,17 @@ const applyTagFilter = (params, search) => {
             tagFk: selectedTag?.value?.tagFk,
         })
     );
-
-    tagData.value.push(JSON.parse(params.tagGroups[params.tagGroups.length - 1]));
     search();
     selectedTag.value = null;
     tagValues.value = [{}];
 };
 
 const removeTagChip = (selection, params, search) => {
-    if (typeof params.tagGroups === 'string') {
-        try {
-            params.tagGroups = JSON.parse(params.tagGroups);
-        } catch (error) {
-            console.error('Error parsing tagGroups:', error);
-            params.tagGroups = [];
-        }
+    if (params.tagGroups) {
+        params.tagGroups = (params.tagGroups || []).filter(
+            (value) => value !== selection
+        );
     }
-    console.log('params.tagGroups: ', params.tagGroups);
-    console.log('selection: ', selection);
-
-    if (Array.isArray(params.tagGroups)) {
-        params.tagGroups = params.tagGroups.filter((value) => value !== selection);
-    }
-
     search();
 };
 
@@ -199,12 +178,12 @@ function addOrder(value, field, params) {
     <VnFilterPanel
         ref="vnFilterPanelRef"
         :data-key="props.dataKey"
-        v-model="paramsSearch"
-        :redirect="false"
-        :hidden-tags="['orderFk', 'orderBy', 'filter', 'search', 'or', 'and']"
+        :hidden-tags="['orderFk', 'orderBy']"
+        :un-removable-params="['orderFk', 'orderBy']"
+        :expr-builder="exprBuilder"
         :custom-tags="['tagGroups']"
-        :unremovable-params="['orderFk', 'orderBy']"
-        :disable-submit-event="true"
+        @remove="clearFilter"
+        :redirect="false"
     >
         <template #tags="{ tag, formatFn }">
             <strong v-if="tag.label === 'categoryFk'">
@@ -222,13 +201,17 @@ function addOrder(value, field, params) {
             <template v-for="tag in customTags" :key="tag.label">
                 <template v-if="tag.label === 'tagGroups'">
                     <VnFilterPanelChip
-                        v-for="chip in tagData"
+                        v-for="chip in tag.value"
                         :key="chip"
                         removable
                         @remove="removeTagChip(chip, params, searchFn)"
                     >
-                        <strong>{{ chip.tagSelection?.name }}: </strong>
-                        <span>{{ chip.values[0].value }}</span>
+                        <strong> {{ JSON.parse(chip).tagSelection?.name }}: </strong>
+                        <span>{{
+                            (JSON.parse(chip).values || [])
+                                .map((item) => item.value)
+                                .join(' | ')
+                        }}</span>
                     </VnFilterPanelChip>
                 </template>
             </template>
@@ -243,7 +226,7 @@ function addOrder(value, field, params) {
                     <QIcon
                         :name="category.icon"
                         class="category-icon"
-                        @click="selectCategory(category, searchFn)"
+                        @click="selectCategory(params, category, searchFn)"
                     >
                         <QTooltip>
                             {{ t(category.name) }}
@@ -337,7 +320,7 @@ function addOrder(value, field, params) {
             >
                 <FetchData
                     v-if="selectedTag"
-                    :url="`Tags/${selectedTag.id}/filterValue`"
+                    :url="`Tags/${selectedTag}/filterValue`"
                     limit="30"
                     auto-load
                     @on-fetch="(data) => (tagOptions = data)"
@@ -360,7 +343,7 @@ function addOrder(value, field, params) {
                     @update:model-value="applyTagFilter(params, searchFn)"
                 />
                 <VnSelect
-                    v-else-if="selectedTag.id === 1"
+                    v-else-if="selectedTag === 1"
                     :label="t('params.value')"
                     v-model="value.value"
                     :options="tagOptions || []"
@@ -375,7 +358,7 @@ function addOrder(value, field, params) {
                     @new-value="createValue"
                     @update:model-value="applyTagFilter(params, searchFn)"
                 />
-                <QInput
+                <VnInput
                     v-else
                     :label="t('params.value')"
                     v-model="value.value"
@@ -396,7 +379,6 @@ function addOrder(value, field, params) {
                     icon="add_circle"
                     shortcut="+"
                     flat
-                    size="md"
                     class="filter-icon"
                     @click="tagValues.push({})"
                 />

From 17b1921af6603db83744efc8095c6dbc4eb34141 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Mon, 28 Oct 2024 12:21:26 +0100
Subject: [PATCH 08/10] feat: added composable to confirm orders

---
 src/composables/confirmOrder.js       | 22 +++++++++++++++++++++
 src/pages/Order/Card/OrderLines.vue   | 28 +++++++++++++--------------
 src/pages/Order/Card/OrderSummary.vue | 21 +++++++++-----------
 3 files changed, 44 insertions(+), 27 deletions(-)
 create mode 100644 src/composables/confirmOrder.js

diff --git a/src/composables/confirmOrder.js b/src/composables/confirmOrder.js
new file mode 100644
index 000000000..33e05a1d7
--- /dev/null
+++ b/src/composables/confirmOrder.js
@@ -0,0 +1,22 @@
+import axios from 'axios';
+import { useQuasar } from 'quasar';
+import { useI18n } from 'vue-i18n';
+
+export function confirmOrder() {
+    const quasar = useQuasar();
+    const { t } = useI18n();
+
+    async function confirm(route) {
+        const { data } = await axios.post(`Orders/${route}/confirm`);
+        if (data) {
+            quasar.notify({
+                message: t('globals.confirm'),
+                type: 'positive',
+            });
+            return data;
+        }
+        return null;
+    }
+
+    return { confirm };
+}
diff --git a/src/pages/Order/Card/OrderLines.vue b/src/pages/Order/Card/OrderLines.vue
index ee883b73a..90586dc15 100644
--- a/src/pages/Order/Card/OrderLines.vue
+++ b/src/pages/Order/Card/OrderLines.vue
@@ -6,6 +6,7 @@ import { useQuasar } from 'quasar';
 import axios from 'axios';
 import { useStateStore } from 'stores/useStateStore';
 import { useArrayData } from 'composables/useArrayData';
+import { confirmOrder } from 'composables/confirmOrder';
 import { toCurrency, toDate } from 'src/filters';
 
 import VnConfirm from 'components/ui/VnConfirm.vue';
@@ -31,7 +32,7 @@ const orderSummary = ref({
 });
 const getTotalRef = ref();
 const getVATRef = ref();
-
+const { confirm } = confirmOrder();
 const lineFilter = ref({
     include: [
         {
@@ -204,20 +205,17 @@ async function remove(item) {
     getVATRef.value.fetch();
 }
 
-async function confirmOrder() {
-    await axios.post(`Orders/${route.params.id}/confirm`);
-    quasar.notify({
-        message: t('globals.confirm'),
-        type: 'positive',
-    });
-    router.push({
-        name: 'TicketList',
-        query: {
-            table: JSON.stringify({ clientFk: descriptorData.store.data.clientFk }),
-        },
-    });
+async function handleConfirm() {
+    const result = await confirm(route.params.id);
+    if (result) {
+        router.push({
+            name: 'TicketList',
+            query: {
+                table: JSON.stringify({ clientFk: descriptorData.store.data.clientFk }),
+            },
+        });
+    }
 }
-
 watch(
     () => router.currentRoute.value.params.id,
     () => {
@@ -314,7 +312,7 @@ watch(
         </template>
     </VnTable>
     <QPageSticky :offset="[20, 20]" v-if="!order?.isConfirmed" style="z-index: 2">
-        <QBtn fab icon="check" color="primary" @click="confirmOrder()" />
+        <QBtn fab icon="check" color="primary" @click="handleConfirm()" />
         <QTooltip>
             {{ t('confirm') }}
         </QTooltip>
diff --git a/src/pages/Order/Card/OrderSummary.vue b/src/pages/Order/Card/OrderSummary.vue
index 9bc89ad28..3669fe8d8 100644
--- a/src/pages/Order/Card/OrderSummary.vue
+++ b/src/pages/Order/Card/OrderSummary.vue
@@ -2,10 +2,9 @@
 import { computed, ref } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
-import { useQuasar } from 'quasar';
-import axios from 'axios';
 import { dashIfEmpty, toCurrency, toDateHourMinSec } from 'src/filters';
 import { useArrayData } from 'composables/useArrayData';
+import { confirmOrder } from 'composables/confirmOrder';
 import VnLv from 'components/ui/VnLv.vue';
 import CardSummary from 'components/ui/CardSummary.vue';
 import CustomerDescriptorProxy from 'pages/Customer/Card/CustomerDescriptorProxy.vue';
@@ -25,8 +24,8 @@ const $props = defineProps({
 
 const entityId = computed(() => $props.id || route.params.id);
 const summary = ref();
-const quasar = useQuasar();
 const descriptorData = useArrayData('orderData');
+const { confirm } = confirmOrder();
 const detailsColumns = ref([
     {
         name: 'item',
@@ -56,14 +55,12 @@ const detailsColumns = ref([
     },
 ]);
 
-async function confirmOrder() {
-    await axios.post(`Orders/${route.params.id}/confirm`);
-    quasar.notify({
-        message: t('globals.confirm'),
-        type: 'positive',
-    });
-    summary.value.fetch({});
-    descriptorData.fetch({});
+async function handleConfirm() {
+    const result = await confirm(route.params.id);
+    if (result) {
+        summary.value.fetch({});
+        descriptorData.fetch({});
+    }
 }
 </script>
 
@@ -84,7 +81,7 @@ async function confirmOrder() {
                     text-color="white"
                     :disabled="isConfirmed"
                     :label="t('order.summary.confirm')"
-                    @click="confirmOrder()"
+                    @click="handleConfirm()"
                 >
                     <QTooltip>{{ t('order.summary.confirmLines') }}</QTooltip>
                 </QBtn>

From cab5a165d2acb6c4e5d92859e5ed96611029d938 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Mon, 28 Oct 2024 12:59:25 +0100
Subject: [PATCH 09/10] refactor: changed confirmOrder directory

---
 src/{ => pages/Order}/composables/confirmOrder.js | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename src/{ => pages/Order}/composables/confirmOrder.js (100%)

diff --git a/src/composables/confirmOrder.js b/src/pages/Order/composables/confirmOrder.js
similarity index 100%
rename from src/composables/confirmOrder.js
rename to src/pages/Order/composables/confirmOrder.js

From 5663064dd8ca211f328e96e0bba902685cec0f9a Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Tue, 29 Oct 2024 09:23:49 +0100
Subject: [PATCH 10/10] refactor: modified composable

---
 src/pages/Order/Card/OrderLines.vue         |  7 +++++--
 src/pages/Order/Card/OrderSummary.vue       |  9 +++++++--
 src/pages/Order/composables/confirmOrder.js | 21 ++-------------------
 3 files changed, 14 insertions(+), 23 deletions(-)

diff --git a/src/pages/Order/Card/OrderLines.vue b/src/pages/Order/Card/OrderLines.vue
index 90586dc15..58c5c9551 100644
--- a/src/pages/Order/Card/OrderLines.vue
+++ b/src/pages/Order/Card/OrderLines.vue
@@ -6,7 +6,7 @@ import { useQuasar } from 'quasar';
 import axios from 'axios';
 import { useStateStore } from 'stores/useStateStore';
 import { useArrayData } from 'composables/useArrayData';
-import { confirmOrder } from 'composables/confirmOrder';
+import { confirm } from 'src/pages/Order/composables/confirmOrder';
 import { toCurrency, toDate } from 'src/filters';
 
 import VnConfirm from 'components/ui/VnConfirm.vue';
@@ -32,7 +32,6 @@ const orderSummary = ref({
 });
 const getTotalRef = ref();
 const getVATRef = ref();
-const { confirm } = confirmOrder();
 const lineFilter = ref({
     include: [
         {
@@ -208,6 +207,10 @@ async function remove(item) {
 async function handleConfirm() {
     const result = await confirm(route.params.id);
     if (result) {
+        quasar.notify({
+            message: t('globals.dataSaved'),
+            type: 'positive',
+        });
         router.push({
             name: 'TicketList',
             query: {
diff --git a/src/pages/Order/Card/OrderSummary.vue b/src/pages/Order/Card/OrderSummary.vue
index 3669fe8d8..032af1993 100644
--- a/src/pages/Order/Card/OrderSummary.vue
+++ b/src/pages/Order/Card/OrderSummary.vue
@@ -2,9 +2,10 @@
 import { computed, ref } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
+import { useQuasar } from 'quasar';
 import { dashIfEmpty, toCurrency, toDateHourMinSec } from 'src/filters';
 import { useArrayData } from 'composables/useArrayData';
-import { confirmOrder } from 'composables/confirmOrder';
+import { confirm } from 'src/pages/Order/composables/confirmOrder';
 import VnLv from 'components/ui/VnLv.vue';
 import CardSummary from 'components/ui/CardSummary.vue';
 import CustomerDescriptorProxy from 'pages/Customer/Card/CustomerDescriptorProxy.vue';
@@ -24,8 +25,8 @@ const $props = defineProps({
 
 const entityId = computed(() => $props.id || route.params.id);
 const summary = ref();
+const quasar = useQuasar();
 const descriptorData = useArrayData('orderData');
-const { confirm } = confirmOrder();
 const detailsColumns = ref([
     {
         name: 'item',
@@ -58,6 +59,10 @@ const detailsColumns = ref([
 async function handleConfirm() {
     const result = await confirm(route.params.id);
     if (result) {
+        quasar.notify({
+            message: t('globals.dataSaved'),
+            type: 'positive',
+        });
         summary.value.fetch({});
         descriptorData.fetch({});
     }
diff --git a/src/pages/Order/composables/confirmOrder.js b/src/pages/Order/composables/confirmOrder.js
index 33e05a1d7..b9eb5d7ac 100644
--- a/src/pages/Order/composables/confirmOrder.js
+++ b/src/pages/Order/composables/confirmOrder.js
@@ -1,22 +1,5 @@
 import axios from 'axios';
-import { useQuasar } from 'quasar';
-import { useI18n } from 'vue-i18n';
 
-export function confirmOrder() {
-    const quasar = useQuasar();
-    const { t } = useI18n();
-
-    async function confirm(route) {
-        const { data } = await axios.post(`Orders/${route}/confirm`);
-        if (data) {
-            quasar.notify({
-                message: t('globals.confirm'),
-                type: 'positive',
-            });
-            return data;
-        }
-        return null;
-    }
-
-    return { confirm };
+export async function confirm(routeId) {
+    return await axios.post(`Orders/${routeId}/confirm`);
 }