From 211da859bd20cdab9a041bc821ea60b7fb073ae2 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Fri, 25 Oct 2024 08:57:16 -0300
Subject: [PATCH 01/20] fix: catalog view category and type filter

---
 src/components/ui/VnFilterPanel.vue         | 33 +++++++++++++++++--
 src/filters/getParamWhere.js                | 12 +++++--
 src/pages/Order/Card/OrderCatalog.vue       | 35 +++++++++++++++++----
 src/pages/Order/Card/OrderCatalogFilter.vue | 26 +++++++++++----
 4 files changed, 89 insertions(+), 17 deletions(-)

diff --git a/src/components/ui/VnFilterPanel.vue b/src/components/ui/VnFilterPanel.vue
index 43d634ad9..5bdaf150c 100644
--- a/src/components/ui/VnFilterPanel.vue
+++ b/src/components/ui/VnFilterPanel.vue
@@ -57,7 +57,6 @@ const $props = defineProps({
     },
 });
 
-defineExpose({ search, sanitizer });
 const emit = defineEmits([
     'update:modelValue',
     'refresh',
@@ -170,9 +169,30 @@ const tagsList = computed(() => {
     return tagList;
 });
 
+const formatTags = (tags) => {
+    const formattedTags = [];
+    tags.forEach((tag) => {
+        if (tag.label === 'and') {
+            tag.value.forEach((item) => {
+                for (const key in item) {
+                    formattedTags.push({ label: key, value: item[key] });
+                }
+            });
+        } else {
+            formattedTags.push(tag);
+        }
+    });
+    return formattedTags;
+};
+
 const tags = computed(() => {
-    return tagsList.value.filter((tag) => !($props.customTags || []).includes(tag.label));
+    const filteredTags = tagsList.value.filter(
+        (tag) => !($props.customTags || []).includes(tag.label)
+    );
+    console.log('formatTags: ', formatTags(filteredTags));
+    return formatTags(filteredTags);
 });
+
 const customTags = computed(() =>
     tagsList.value.filter((tag) => ($props.customTags || []).includes(tag.label))
 );
@@ -193,13 +213,20 @@ function formatValue(value) {
 
 function sanitizer(params) {
     for (const [key, value] of Object.entries(params)) {
-        if (value && typeof value === 'object') {
+        if (key === 'and' && Array.isArray(value)) {
+            value.forEach((item) => {
+                Object.assign(params, item);
+            });
+            delete params[key];
+        } else if (value && typeof value === 'object') {
             const param = Object.values(value)[0];
             if (typeof param == 'string') params[key] = param.replaceAll('%', '');
         }
     }
     return params;
 }
+
+defineExpose({ search, sanitizer, userParams });
 </script>
 
 <template>
diff --git a/src/filters/getParamWhere.js b/src/filters/getParamWhere.js
index 48cd9c479..22dd69af1 100644
--- a/src/filters/getParamWhere.js
+++ b/src/filters/getParamWhere.js
@@ -10,11 +10,19 @@ function parseJSON(str, fallback) {
 export default function (route, param) {
     // catch route query params
     const params = parseJSON(route?.query?.params, {});
-
     // extract and parse filter from params
     const { filter: filterStr = '{}' } = params;
+
     const where = parseJSON(filterStr, {})?.where;
-    if (where && where[param] !== undefined) {
+
+    if (where && !param) {
+        return where;
+    } else if (where && where.and) {
+        const foundParam = where.and.find((p) => p[param]);
+        if (foundParam) {
+            return foundParam[param];
+        }
+    } else if (where && where[param]) {
         return where[param];
     }
     return null;
diff --git a/src/pages/Order/Card/OrderCatalog.vue b/src/pages/Order/Card/OrderCatalog.vue
index f9bcca94c..9fee29d7d 100644
--- a/src/pages/Order/Card/OrderCatalog.vue
+++ b/src/pages/Order/Card/OrderCatalog.vue
@@ -1,13 +1,14 @@
 <script setup>
 import { useStateStore } from 'stores/useStateStore';
 import { useRoute, useRouter } from 'vue-router';
-import { onMounted, onUnmounted, ref } from 'vue';
+import { onBeforeMount, onMounted, onUnmounted, ref, computed } from 'vue';
 import axios from 'axios';
 import { useI18n } from 'vue-i18n';
 import VnPaginate from 'components/ui/VnPaginate.vue';
 import CatalogItem from 'components/ui/CatalogItem.vue';
 import OrderCatalogFilter from 'pages/Order/Card/OrderCatalogFilter.vue';
 import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
+import getParamWhere from 'src/filters/getParamWhere';
 
 const route = useRoute();
 const router = useRouter();
@@ -15,17 +16,36 @@ const stateStore = useStateStore();
 const { t } = useI18n();
 const tags = ref([]);
 
+let catalogParams = {
+    orderFk: route.params.id,
+    orderBy: JSON.stringify({ field: 'relevancy DESC, name', way: 'ASC', isTag: false }),
+};
+
+onBeforeMount(() => {
+    const whereParams = getParamWhere(route);
+    if (whereParams) {
+        const formattedWhereParams = {};
+        if (whereParams.and) {
+            whereParams.and.forEach((item) => {
+                Object.assign(formattedWhereParams, item);
+            });
+        } else {
+            Object.assign(formattedWhereParams, whereParams);
+        }
+
+        catalogParams = {
+            ...catalogParams,
+            ...formattedWhereParams,
+        };
+    }
+});
+
 onMounted(() => {
     stateStore.rightDrawer = true;
     checkOrderConfirmation();
 });
 onUnmounted(() => (stateStore.rightDrawer = false));
 
-const catalogParams = {
-    orderFk: route.params.id,
-    orderBy: JSON.stringify({ field: 'relevancy DESC, name', way: 'ASC', isTag: false }),
-};
-
 async function checkOrderConfirmation() {
     const response = await axios.get(`Orders/${route.params.id}`);
     if (response.data.isConfirmed === 1) {
@@ -61,6 +81,7 @@ function extractValueTags(items) {
     );
     tagValue.value = resultValueTags;
 }
+const autoLoad = computed(() => !!catalogParams.categoryFk);
 </script>
 
 <template>
@@ -79,6 +100,7 @@ function extractValueTags(items) {
                 data-key="OrderCatalogList"
                 :tag-value="tagValue"
                 :tags="tags"
+                :initial-catalog-params="catalogParams"
             />
         </QScrollArea>
     </QDrawer>
@@ -91,6 +113,7 @@ function extractValueTags(items) {
                 :user-params="catalogParams"
                 @on-fetch="extractTags"
                 :update-router="false"
+                :auto-load="autoLoad"
             >
                 <template #body="{ rows }">
                     <div class="catalog-list">
diff --git a/src/pages/Order/Card/OrderCatalogFilter.vue b/src/pages/Order/Card/OrderCatalogFilter.vue
index 6de43e86a..cc3f45391 100644
--- a/src/pages/Order/Card/OrderCatalogFilter.vue
+++ b/src/pages/Order/Card/OrderCatalogFilter.vue
@@ -1,5 +1,5 @@
 <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';
@@ -26,9 +26,13 @@ const props = defineProps({
         type: Array,
         required: true,
     },
+    initialCatalogParams: {
+        type: Object,
+        default: () => ({}),
+    },
 });
 const categoryList = ref(null);
-const selectedCategoryFk = ref(getParamWhere(route, 'categoryFk'));
+const selectedCategoryFk = ref(null);
 const typeList = ref([]);
 const selectedTypeFk = ref(null);
 const selectedTag = ref(null);
@@ -74,6 +78,8 @@ const selectCategory = (params, category, search) => {
     } else {
         selectedCategoryFk.value = category?.id;
         params.categoryFk = category?.id;
+        params.typeFk = null;
+        selectedTypeFk.value = null;
         loadTypes(category?.id);
     }
     search();
@@ -86,11 +92,11 @@ const loadTypes = async (categoryFk = selectedCategoryFk.value) => {
     typeList.value = data;
 };
 
-const selectedCategory = computed(() =>
-    (categoryList.value || []).find(
+const selectedCategory = computed(() => {
+    return (categoryList.value || []).find(
         (category) => category?.id === selectedCategoryFk.value
-    )
-);
+    );
+});
 function filterFn(val, update) {
     update(() => {
         const needle = val.toLowerCase();
@@ -171,6 +177,11 @@ function addOrder(value, field, params) {
     params.orderBy = JSON.stringify(orderBy);
     vnFilterPanelRef.value.search();
 }
+
+onMounted(() => {
+    selectedCategoryFk.value = getParamWhere(route, 'categoryFk');
+    selectedTypeFk.value = getParamWhere(route, 'typeFk');
+});
 </script>
 
 <template>
@@ -206,6 +217,8 @@ function addOrder(value, field, params) {
                         removable
                         @remove="removeTagChip(chip, params, searchFn)"
                     >
+                        <pre>{{ chip }}</pre>
+
                         <strong> {{ JSON.parse(chip).tagSelection?.name }}: </strong>
                         <span>{{
                             (JSON.parse(chip).values || [])
@@ -384,6 +397,7 @@ function addOrder(value, field, params) {
                 />
             </QItem>
             <QSeparator />
+            <pre>{{ params }}</pre>
         </template>
     </VnFilterPanel>
 </template>

From c93f152060a9cb37360e35069e39a32ebbeca1c1 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Sun, 27 Oct 2024 15:27:53 -0300
Subject: [PATCH 02/20] fix: order catalog fixes

---
 src/pages/Order/Card/OrderCatalog.vue       |  22 ++-
 src/pages/Order/Card/OrderCatalogFilter.vue | 164 +++++++++-----------
 2 files changed, 94 insertions(+), 92 deletions(-)

diff --git a/src/pages/Order/Card/OrderCatalog.vue b/src/pages/Order/Card/OrderCatalog.vue
index 9fee29d7d..a266fc3d4 100644
--- a/src/pages/Order/Card/OrderCatalog.vue
+++ b/src/pages/Order/Card/OrderCatalog.vue
@@ -1,7 +1,7 @@
 <script setup>
 import { useStateStore } from 'stores/useStateStore';
 import { useRoute, useRouter } from 'vue-router';
-import { onBeforeMount, onMounted, onUnmounted, ref, computed } from 'vue';
+import { onBeforeMount, onMounted, onUnmounted, ref, computed, watch } from 'vue';
 import axios from 'axios';
 import { useI18n } from 'vue-i18n';
 import VnPaginate from 'components/ui/VnPaginate.vue';
@@ -9,11 +9,15 @@ import CatalogItem from 'components/ui/CatalogItem.vue';
 import OrderCatalogFilter from 'pages/Order/Card/OrderCatalogFilter.vue';
 import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
 import getParamWhere from 'src/filters/getParamWhere';
+import { useArrayData } from 'composables/useArrayData';
 
 const route = useRoute();
 const router = useRouter();
 const stateStore = useStateStore();
 const { t } = useI18n();
+const arrayData = useArrayData('OrderCatalogList');
+const store = arrayData.store;
+const showFilter = ref(null);
 const tags = ref([]);
 
 let catalogParams = {
@@ -37,6 +41,8 @@ onBeforeMount(() => {
             ...catalogParams,
             ...formattedWhereParams,
         };
+    } else {
+        showFilter.value = true;
     }
 });
 
@@ -44,6 +50,7 @@ onMounted(() => {
     stateStore.rightDrawer = true;
     checkOrderConfirmation();
 });
+
 onUnmounted(() => (stateStore.rightDrawer = false));
 
 async function checkOrderConfirmation() {
@@ -54,6 +61,7 @@ async function checkOrderConfirmation() {
 }
 
 function extractTags(items) {
+    if (!items || !items.length) return;
     const resultTags = [];
     (items || []).forEach((item) => {
         (item.tags || []).forEach((tag) => {
@@ -82,6 +90,14 @@ function extractValueTags(items) {
     tagValue.value = resultValueTags;
 }
 const autoLoad = computed(() => !!catalogParams.categoryFk);
+
+watch(
+    () => store.data,
+    (val) => {
+        extractTags(val);
+    },
+    { immediate: true }
+);
 </script>
 
 <template>
@@ -95,7 +111,7 @@ const autoLoad = computed(() => !!catalogParams.categoryFk);
         :info="t('You can search items by name or id')"
     />
     <QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above>
-        <QScrollArea class="fit text-grey-8">
+        <QScrollArea v-if="showFilter" class="fit text-grey-8">
             <OrderCatalogFilter
                 data-key="OrderCatalogList"
                 :tag-value="tagValue"
@@ -111,7 +127,7 @@ const autoLoad = computed(() => !!catalogParams.categoryFk);
                 url="Orders/CatalogFilter"
                 :limit="50"
                 :user-params="catalogParams"
-                @on-fetch="extractTags"
+                @on-fetch="showFilter = true"
                 :update-router="false"
                 :auto-load="autoLoad"
             >
diff --git a/src/pages/Order/Card/OrderCatalogFilter.vue b/src/pages/Order/Card/OrderCatalogFilter.vue
index cc3f45391..5612399d7 100644
--- a/src/pages/Order/Card/OrderCatalogFilter.vue
+++ b/src/pages/Order/Card/OrderCatalogFilter.vue
@@ -26,11 +26,8 @@ const props = defineProps({
         type: Array,
         required: true,
     },
-    initialCatalogParams: {
-        type: Object,
-        default: () => ({}),
-    },
 });
+
 const categoryList = ref(null);
 const selectedCategoryFk = ref(null);
 const typeList = ref([]);
@@ -52,14 +49,6 @@ const orderWayList = ref([
 const orderBySelected = ref('relevancy DESC, name');
 const orderWaySelected = ref('ASC');
 
-const createValue = (val, done) => {
-    if (val.length > 2) {
-        if (!tagOptions.value.includes(val)) {
-            done(tagOptions.value, 'add-unique');
-        }
-        tagValues.value.push({ value: val });
-    }
-};
 const resetCategory = () => {
     selectedCategoryFk.value = null;
     typeList.value = null;
@@ -97,14 +86,7 @@ const selectedCategory = computed(() => {
         (category) => category?.id === selectedCategoryFk.value
     );
 });
-function filterFn(val, update) {
-    update(() => {
-        const needle = val.toLowerCase();
-        tagOptions.value = props.tagValue.filter(
-            (v) => v.toLowerCase().indexOf(needle) > -1
-        );
-    });
-}
+
 const selectedType = computed(() => {
     return (typeList.value || []).find((type) => type?.id === selectedTypeFk.value);
 });
@@ -120,36 +102,36 @@ function exprBuilder(param, value) {
     }
 }
 
-const applyTagFilter = (params, search) => {
+const applyTags = (params, search) => {
     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,
-        })
-    );
+
+    const tagGroups = {
+        values: [...tagValues.value],
+        tagFk: selectedTag?.value?.id,
+        tagSelection: {
+            name: selectedTag?.value?.name,
+        },
+    };
+
+    params.tagGroups = tagGroups;
     search();
-    selectedTag.value = null;
-    tagValues.value = [{}];
 };
 
-const removeTagChip = (selection, params, search) => {
-    if (params.tagGroups) {
-        params.tagGroups = (params.tagGroups || []).filter(
-            (value) => value !== selection
-        );
+const removeTagGroupParam = (params, search, valIndex = null) => {
+    if (!params.tagGroups) return;
+
+    if (!valIndex) {
+        params.tagGroups = null;
+        tagValues.value = [{}];
+    } else {
+        (tagValues.value || []).splice(valIndex, 1);
+        params.tagGroups.values.splice(valIndex, 1);
     }
+
     search();
 };
 
@@ -178,9 +160,37 @@ function addOrder(value, field, params) {
     vnFilterPanelRef.value.search();
 }
 
+const getSelectedTagValues = async (tag) => {
+    try {
+        if (!tag?.id) return;
+        const filter = {
+            fields: ['value'],
+            order: 'value ASC',
+            limit: 30,
+        };
+
+        const url = `Tags/${tag?.id}/filterValue`;
+        console.log('url', url);
+        const params = { filter: JSON.stringify(filter) };
+        const { data } = await axios.get(url, {
+            params,
+        });
+        tagOptions.value = data;
+    } catch (err) {
+        console.error('Error getting selected tag values');
+    }
+};
+
 onMounted(() => {
     selectedCategoryFk.value = getParamWhere(route, 'categoryFk');
     selectedTypeFk.value = getParamWhere(route, 'typeFk');
+    if (route.query.params && JSON.parse(route.query.params).tagGroups) {
+        const tagGroups = JSON.parse(route.query.params).tagGroups;
+        tagValues.value = [...tagGroups.values];
+        selectedTag.value = (props.tags || []).find(
+            (tag) => tag.name === tagGroups.tagSelection.name
+        );
+    }
 });
 </script>
 
@@ -212,19 +222,19 @@ onMounted(() => {
             <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)"
+                        @remove="removeTagGroupParam(params, searchFn)"
                     >
-                        <pre>{{ chip }}</pre>
-
-                        <strong> {{ JSON.parse(chip).tagSelection?.name }}: </strong>
-                        <span>{{
-                            (JSON.parse(chip).values || [])
-                                .map((item) => item.value)
-                                .join(' | ')
-                        }}</span>
+                        <strong class="q-mr-xs">
+                            {{ tag.value?.tagSelection?.name }}:
+                        </strong>
+                        <span>
+                            {{
+                                (tag.value?.values || [])
+                                    .map((item) => `"${item.value}"`)
+                                    .join(', ')
+                            }}
+                        </span>
                     </VnFilterPanelChip>
                 </template>
             </template>
@@ -323,6 +333,7 @@ onMounted(() => {
                         rounded
                         :emit-value="false"
                         use-input
+                        @update:model-value="($event) => getSelectedTagValues($event)"
                     />
                 </QItemSection>
             </QItem>
@@ -331,16 +342,9 @@ onMounted(() => {
                 :key="value"
                 class="q-mt-md filter-value"
             >
-                <FetchData
-                    v-if="selectedTag"
-                    :url="`Tags/${selectedTag}/filterValue`"
-                    limit="30"
-                    auto-load
-                    @on-fetch="(data) => (tagOptions = data)"
-                />
                 <VnSelect
-                    v-if="!selectedTag"
-                    :label="t('params.value')"
+                    v-if="!selectedTag?.isFree && tagOptions"
+                    :label="t('components.itemsFilterPanel.value')"
                     v-model="value.value"
                     :options="tagOptions || []"
                     option-value="value"
@@ -350,41 +354,23 @@ onMounted(() => {
                     rounded
                     emit-value
                     use-input
-                    class="filter-input"
-                    @new-value="createValue"
-                    @filter="filterFn"
-                    @update:model-value="applyTagFilter(params, searchFn)"
-                />
-                <VnSelect
-                    v-else-if="selectedTag === 1"
-                    :label="t('params.value')"
-                    v-model="value.value"
-                    :options="tagOptions || []"
-                    option-value="value"
-                    option-label="value"
-                    dense
-                    outlined
-                    rounded
-                    emit-value
-                    use-input
-                    class="filter-input"
-                    @new-value="createValue"
-                    @update:model-value="applyTagFilter(params, searchFn)"
+                    :disable="!value"
+                    :is-clearable="false"
+                    @update:model-value="applyTags(params, searchFn)"
                 />
                 <VnInput
                     v-else
-                    :label="t('params.value')"
                     v-model="value.value"
-                    dense
-                    outlined
-                    rounded
-                    class="filter-input"
-                    @keyup.enter="applyTagFilter(params, searchFn)"
+                    :label="t('components.itemsFilterPanel.value')"
+                    :disable="!value"
+                    is-outlined
+                    :is-clearable="false"
+                    @keyup.enter="applyTags(params, searchFn)"
                 />
                 <QIcon
                     name="delete"
                     class="filter-icon"
-                    @click="(tagValues || []).splice(index, 1)"
+                    @click="removeTagGroupParam(params, searchFn, index)"
                 />
             </QItem>
             <QItem class="q-mt-lg">
@@ -393,11 +379,11 @@ onMounted(() => {
                     shortcut="+"
                     flat
                     class="filter-icon"
+                    size="md"
                     @click="tagValues.push({})"
                 />
             </QItem>
             <QSeparator />
-            <pre>{{ params }}</pre>
         </template>
     </VnFilterPanel>
 </template>

From d627c1f698d5bab8a5368b65d049b17d2bd3f2ae Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Sun, 3 Nov 2024 10:29:03 -0300
Subject: [PATCH 03/20] fix: order catalog

---
 src/components/common/VnSelect.vue            |   2 +-
 src/components/ui/VnFilterPanel.vue           |   1 -
 .../Order/Card/CatalogFilterValueDialog.vue   | 150 +++++++++++
 src/pages/Order/Card/OrderCatalogFilter.vue   | 234 ++++++------------
 4 files changed, 231 insertions(+), 156 deletions(-)
 create mode 100644 src/pages/Order/Card/CatalogFilterValueDialog.vue

diff --git a/src/components/common/VnSelect.vue b/src/components/common/VnSelect.vue
index b0aa648c1..1b3c94bfc 100644
--- a/src/components/common/VnSelect.vue
+++ b/src/components/common/VnSelect.vue
@@ -120,7 +120,7 @@ watch(options, (newValue) => {
 });
 
 watch(modelValue, async (newValue) => {
-    if (!myOptions.value.some((option) => option[optionValue.value] == newValue))
+    if (!myOptions?.value?.some((option) => option[optionValue.value] == newValue))
         await fetchFilter(newValue);
 
     if ($props.noOne) myOptions.value.unshift(noOneOpt.value);
diff --git a/src/components/ui/VnFilterPanel.vue b/src/components/ui/VnFilterPanel.vue
index 5bdaf150c..a8aca49dd 100644
--- a/src/components/ui/VnFilterPanel.vue
+++ b/src/components/ui/VnFilterPanel.vue
@@ -189,7 +189,6 @@ const tags = computed(() => {
     const filteredTags = tagsList.value.filter(
         (tag) => !($props.customTags || []).includes(tag.label)
     );
-    console.log('formatTags: ', formatTags(filteredTags));
     return formatTags(filteredTags);
 });
 
diff --git a/src/pages/Order/Card/CatalogFilterValueDialog.vue b/src/pages/Order/Card/CatalogFilterValueDialog.vue
new file mode 100644
index 000000000..8e4a9315a
--- /dev/null
+++ b/src/pages/Order/Card/CatalogFilterValueDialog.vue
@@ -0,0 +1,150 @@
+<script setup>
+import { ref } from 'vue';
+import { useI18n } from 'vue-i18n';
+import axios from 'axios';
+import VnSelect from 'components/common/VnSelect.vue';
+import VnInput from 'src/components/common/VnInput.vue';
+
+const props = defineProps({
+    tags: {
+        type: Array,
+        default: () => [],
+    },
+});
+
+const emit = defineEmits(['applyTags']);
+const { t } = useI18n();
+
+const tagValues = ref([{}]);
+const tagOptions = ref([]);
+const selectedTag = ref(null);
+
+const applyTags = () => {
+    if (tagValues.value.some((tag) => !tag.value)) return;
+    const tagInfo = {
+        values: [...tagValues.value],
+        tagFk: selectedTag?.value?.id,
+        tagSelection: {
+            name: selectedTag?.value?.name,
+        },
+    };
+    emit('applyTags', tagInfo);
+};
+
+const removeTagGroupParam = (valIndex = null) => {
+    if (!valIndex) {
+        tagValues.value = [{}];
+    } else {
+        (tagValues.value || []).splice(valIndex, 1);
+    }
+};
+
+const getSelectedTagValues = async (tag) => {
+    try {
+        if (!tag?.id) return;
+        const filter = {
+            fields: ['value'],
+            order: 'value ASC',
+            limit: 30,
+        };
+
+        const url = `Tags/${tag?.id}/filterValue`;
+        const params = { filter: JSON.stringify(filter) };
+        const { data } = await axios.get(url, {
+            params,
+        });
+        tagOptions.value = data;
+    } catch (err) {
+        console.error('Error getting selected tag values');
+    }
+};
+</script>
+
+<template>
+    <QForm @submit="applyTags(tagValues)" class="all-pointer-events">
+        <QCard class="q-pa-sm column q-pa-lg">
+            <VnSelect
+                :label="t('params.tag')"
+                v-model="selectedTag"
+                :options="props.tags || []"
+                option-value="id"
+                option-label="name"
+                dense
+                outlined
+                class="q-mb-md"
+                rounded
+                :emit-value="false"
+                use-input
+                @update:model-value="($event) => getSelectedTagValues($event)"
+            />
+            <div
+                v-for="(value, index) in tagValues"
+                :key="value"
+                class="filter-value column align-left"
+            >
+                <div class="col row q-mb-md">
+                    <VnSelect
+                        v-if="!selectedTag?.isFree && tagOptions"
+                        :label="t('components.itemsFilterPanel.value')"
+                        v-model="value.value"
+                        :options="tagOptions || []"
+                        option-value="value"
+                        option-label="value"
+                        dense
+                        outlined
+                        rounded
+                        emit-value
+                        use-input
+                        :disable="!value"
+                        :is-clearable="false"
+                        class="col"
+                    />
+                    <VnInput
+                        v-else
+                        v-model="value.value"
+                        :label="t('components.itemsFilterPanel.value')"
+                        :disable="!value"
+                        is-outlined
+                        :is-clearable="false"
+                        class="col"
+                    />
+                    <QIcon
+                        name="delete"
+                        class="filter-icon col-2"
+                        @click="removeTagGroupParam(index)"
+                    />
+                </div>
+            </div>
+            <QBtn
+                icon="add_circle"
+                shortcut="+"
+                flat
+                class="filter-icon q-mb-md"
+                size="md"
+                dense
+                @click="tagValues.push({})"
+            />
+            <QBtn color="primary" type="submit">
+                {{ t('search') }}
+            </QBtn>
+        </QCard>
+    </QForm>
+</template>
+
+<style scoped lang="scss">
+.filter-icon {
+    font-size: 24px;
+    color: $primary;
+    padding: 0 4px;
+    cursor: pointer;
+}
+</style>
+
+<i18n>
+en:
+    params:
+        tag: Tag
+es:
+    params:
+        tag: Etiqueta
+</i18n>
diff --git a/src/pages/Order/Card/OrderCatalogFilter.vue b/src/pages/Order/Card/OrderCatalogFilter.vue
index 5612399d7..28c54c120 100644
--- a/src/pages/Order/Card/OrderCatalogFilter.vue
+++ b/src/pages/Order/Card/OrderCatalogFilter.vue
@@ -9,6 +9,7 @@ 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 CatalogFilterValueDialog from 'src/pages/Order/Card/CatalogFilterValueDialog.vue';
 
 const { t } = useI18n();
 
@@ -28,13 +29,13 @@ const props = defineProps({
     },
 });
 
+const showValueFilterDialog = ref(false);
 const categoryList = ref(null);
 const selectedCategoryFk = ref(null);
 const typeList = ref([]);
 const selectedTypeFk = ref(null);
-const selectedTag = ref(null);
-const tagValues = ref([{}]);
-const tagOptions = ref([]);
+const generalSearchParam = ref(null);
+
 const vnFilterPanelRef = ref();
 const orderByList = ref([
     { id: 'relevancy DESC, name', name: t('params.relevancy'), priority: 999 },
@@ -49,20 +50,17 @@ const orderWayList = ref([
 const orderBySelected = ref('relevancy DESC, name');
 const orderWaySelected = ref('ASC');
 
-const resetCategory = () => {
+const resetCategory = (params, search) => {
     selectedCategoryFk.value = null;
     typeList.value = null;
-};
-
-const clearFilter = (key) => {
-    if (key === 'categoryFk') {
-        resetCategory();
-    }
+    params.categoryFk = null;
+    params.typeFk = null;
+    search();
 };
 
 const selectCategory = (params, category, search) => {
     if (params.categoryFk === category?.id) {
-        resetCategory();
+        resetCategory(params, search);
         params.categoryFk = null;
     } else {
         selectedCategoryFk.value = category?.id;
@@ -102,37 +100,28 @@ function exprBuilder(param, value) {
     }
 }
 
-const applyTags = (params, search) => {
-    if (!tagValues.value?.length) {
+const applyTags = (tagInfo, params, search) => {
+    if (!tagInfo || !tagInfo.values.length) {
         params.tagGroups = null;
         search();
+        toggleValueFilterDialog();
         return;
     }
 
-    const tagGroups = {
-        values: [...tagValues.value],
-        tagFk: selectedTag?.value?.id,
-        tagSelection: {
-            name: selectedTag?.value?.name,
-        },
-    };
-
-    params.tagGroups = tagGroups;
+    if (!params.tagGroups) params.tagGroups = [];
+    params.tagGroups.push(tagInfo);
     search();
+    toggleValueFilterDialog();
 };
 
 const removeTagGroupParam = (params, search, valIndex = null) => {
-    if (!params.tagGroups) return;
-
     if (!valIndex) {
         params.tagGroups = null;
-        tagValues.value = [{}];
+        search();
     } else {
-        (tagValues.value || []).splice(valIndex, 1);
-        params.tagGroups.values.splice(valIndex, 1);
+        params.tagGroups.splice(valIndex, 1);
+        search();
     }
-
-    search();
 };
 
 const setCategoryList = (data) => {
@@ -160,37 +149,13 @@ function addOrder(value, field, params) {
     vnFilterPanelRef.value.search();
 }
 
-const getSelectedTagValues = async (tag) => {
-    try {
-        if (!tag?.id) return;
-        const filter = {
-            fields: ['value'],
-            order: 'value ASC',
-            limit: 30,
-        };
-
-        const url = `Tags/${tag?.id}/filterValue`;
-        console.log('url', url);
-        const params = { filter: JSON.stringify(filter) };
-        const { data } = await axios.get(url, {
-            params,
-        });
-        tagOptions.value = data;
-    } catch (err) {
-        console.error('Error getting selected tag values');
-    }
+const toggleValueFilterDialog = () => {
+    showValueFilterDialog.value = !showValueFilterDialog.value;
 };
 
 onMounted(() => {
     selectedCategoryFk.value = getParamWhere(route, 'categoryFk');
     selectedTypeFk.value = getParamWhere(route, 'typeFk');
-    if (route.query.params && JSON.parse(route.query.params).tagGroups) {
-        const tagGroups = JSON.parse(route.query.params).tagGroups;
-        tagValues.value = [...tagGroups.values];
-        selectedTag.value = (props.tags || []).find(
-            (tag) => tag.name === tagGroups.tagSelection.name
-        );
-    }
 });
 </script>
 
@@ -202,15 +167,11 @@ onMounted(() => {
         :hidden-tags="['orderFk', 'orderBy']"
         :un-removable-params="['orderFk', 'orderBy']"
         :expr-builder="exprBuilder"
-        :custom-tags="['tagGroups']"
-        @remove="clearFilter"
+        :custom-tags="['tagGroups', 'categoryFk']"
         :redirect="false"
     >
         <template #tags="{ tag, formatFn }">
-            <strong v-if="tag.label === 'categoryFk'">
-                {{ t(selectedCategory?.name || '') }}
-            </strong>
-            <strong v-else-if="tag.label === 'typeFk'">
+            <strong v-if="tag.label === 'typeFk'">
                 {{ t(selectedType?.name || '') }}
             </strong>
             <div v-else class="q-gutter-x-xs">
@@ -219,24 +180,33 @@ onMounted(() => {
             </div>
         </template>
         <template #customTags="{ tags: customTags, params, searchFn }">
-            <template v-for="tag in customTags" :key="tag.label">
-                <template v-if="tag.label === 'tagGroups'">
-                    <VnFilterPanelChip
-                        removable
-                        @remove="removeTagGroupParam(params, searchFn)"
-                    >
-                        <strong class="q-mr-xs">
-                            {{ tag.value?.tagSelection?.name }}:
-                        </strong>
-                        <span>
-                            {{
-                                (tag.value?.values || [])
-                                    .map((item) => `"${item.value}"`)
-                                    .join(', ')
-                            }}
-                        </span>
-                    </VnFilterPanelChip>
-                </template>
+            <template v-for="customTag in customTags" :key="customTag.label">
+                <VnFilterPanelChip
+                    v-for="(tag, valIndex) in Array.isArray(customTag.value)
+                        ? customTag.value
+                        : 1"
+                    :key="valIndex"
+                    removable
+                    @remove="
+                        customTag.label === 'categoryFk'
+                            ? resetCategory(params, searchFn)
+                            : removeTagGroupParam(params, searchFn, valIndex)
+                    "
+                >
+                    <strong v-if="customTag.label === 'categoryFk'">
+                        {{ t(selectedCategory?.name || '') }}
+                    </strong>
+                    <strong v-if="tag?.tagSelection?.name" class="q-mr-xs">
+                        {{ tag.tagSelection.name }}:
+                    </strong>
+                    <span>
+                        {{
+                            (tag?.values || [])
+                                .map((item) => `"${item.value}"`)
+                                .join(', ')
+                        }}
+                    </span>
+                </VnFilterPanelChip>
             </template>
         </template>
         <template #body="{ params, searchFn }">
@@ -320,70 +290,43 @@ onMounted(() => {
                 </QItemSection>
             </QItem>
             <QSeparator />
-            <QItem class="q-mt-md">
-                <QItemSection>
-                    <VnSelect
-                        :label="t('params.tag')"
-                        v-model="selectedTag"
-                        :options="props.tags || []"
-                        option-value="id"
-                        option-label="name"
-                        dense
-                        outlined
-                        rounded
-                        :emit-value="false"
-                        use-input
-                        @update:model-value="($event) => getSelectedTagValues($event)"
-                    />
-                </QItemSection>
-            </QItem>
-            <QItem
-                v-for="(value, index) in tagValues"
-                :key="value"
-                class="q-mt-md filter-value"
-            >
-                <VnSelect
-                    v-if="!selectedTag?.isFree && tagOptions"
-                    :label="t('components.itemsFilterPanel.value')"
-                    v-model="value.value"
-                    :options="tagOptions || []"
-                    option-value="value"
-                    option-label="value"
-                    dense
-                    outlined
-                    rounded
-                    emit-value
-                    use-input
-                    :disable="!value"
-                    :is-clearable="false"
-                    @update:model-value="applyTags(params, searchFn)"
-                />
+
+            <QItem class="q-mt-lg">
                 <VnInput
-                    v-else
-                    v-model="value.value"
                     :label="t('components.itemsFilterPanel.value')"
-                    :disable="!value"
                     is-outlined
                     :is-clearable="false"
-                    @keyup.enter="applyTags(params, searchFn)"
-                />
-                <QIcon
-                    name="delete"
-                    class="filter-icon"
-                    @click="removeTagGroupParam(params, searchFn, index)"
-                />
-            </QItem>
-            <QItem class="q-mt-lg">
-                <QBtn
-                    icon="add_circle"
-                    shortcut="+"
-                    flat
-                    class="filter-icon"
-                    size="md"
-                    @click="tagValues.push({})"
-                />
+                    v-model="generalSearchParam"
+                    @keyup.enter="
+                        applyTags(
+                            { values: [{ value: generalSearchParam }] },
+                            params,
+                            searchFn
+                        )
+                    "
+                >
+                    <template #prepend>
+                        <QIcon name="search" />
+                    </template>
+                    <template #append>
+                        <QBtn
+                            icon="add_circle"
+                            shortcut="+"
+                            flat
+                            color="primary"
+                            size="md"
+                            @click="toggleValueFilterDialog()"
+                        />
+                    </template>
+                </VnInput>
             </QItem>
             <QSeparator />
+            <QDialog v-model="showValueFilterDialog">
+                <CatalogFilterValueDialog
+                    :tags="tags"
+                    @apply-tags="($event) => applyTags($event, params, searchFn)"
+                />
+            </QDialog>
         </template>
     </VnFilterPanel>
 </template>
@@ -416,23 +359,6 @@ onMounted(() => {
         cursor: pointer;
     }
 }
-
-.filter-icon {
-    font-size: 24px;
-    color: $primary;
-    padding: 0 4px;
-    cursor: pointer;
-}
-
-.filter-input {
-    flex-shrink: 1;
-    min-width: 0;
-}
-
-.filter-value {
-    display: flex;
-    align-items: center;
-}
 </style>
 
 <i18n>

From 498a52a3e5a78c4e8c8f7c58a3cc4b655ca33cac Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Thu, 7 Nov 2024 19:07:03 -0300
Subject: [PATCH 04/20] refactor: small change

---
 src/pages/Order/Card/CatalogFilterValueDialog.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/Order/Card/CatalogFilterValueDialog.vue b/src/pages/Order/Card/CatalogFilterValueDialog.vue
index 8e4a9315a..ada0c2889 100644
--- a/src/pages/Order/Card/CatalogFilterValueDialog.vue
+++ b/src/pages/Order/Card/CatalogFilterValueDialog.vue
@@ -66,7 +66,7 @@ const getSelectedTagValues = async (tag) => {
             <VnSelect
                 :label="t('params.tag')"
                 v-model="selectedTag"
-                :options="props.tags || []"
+                :options="props.tags"
                 option-value="id"
                 option-label="name"
                 dense

From 52a2250acc721f80a9a5e5d85dd4b9bad99ea1df Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Thu, 7 Nov 2024 19:16:06 -0300
Subject: [PATCH 05/20] refactor: apply QPopupProxy

---
 src/pages/Order/Card/OrderCatalogFilter.vue | 22 ++++++++-------------
 1 file changed, 8 insertions(+), 14 deletions(-)

diff --git a/src/pages/Order/Card/OrderCatalogFilter.vue b/src/pages/Order/Card/OrderCatalogFilter.vue
index 28c54c120..27023262e 100644
--- a/src/pages/Order/Card/OrderCatalogFilter.vue
+++ b/src/pages/Order/Card/OrderCatalogFilter.vue
@@ -29,7 +29,6 @@ const props = defineProps({
     },
 });
 
-const showValueFilterDialog = ref(false);
 const categoryList = ref(null);
 const selectedCategoryFk = ref(null);
 const typeList = ref([]);
@@ -104,14 +103,12 @@ const applyTags = (tagInfo, params, search) => {
     if (!tagInfo || !tagInfo.values.length) {
         params.tagGroups = null;
         search();
-        toggleValueFilterDialog();
         return;
     }
 
     if (!params.tagGroups) params.tagGroups = [];
     params.tagGroups.push(tagInfo);
     search();
-    toggleValueFilterDialog();
 };
 
 const removeTagGroupParam = (params, search, valIndex = null) => {
@@ -149,10 +146,6 @@ function addOrder(value, field, params) {
     vnFilterPanelRef.value.search();
 }
 
-const toggleValueFilterDialog = () => {
-    showValueFilterDialog.value = !showValueFilterDialog.value;
-};
-
 onMounted(() => {
     selectedCategoryFk.value = getParamWhere(route, 'categoryFk');
     selectedTypeFk.value = getParamWhere(route, 'typeFk');
@@ -315,18 +308,19 @@ onMounted(() => {
                             flat
                             color="primary"
                             size="md"
-                            @click="toggleValueFilterDialog()"
                         />
+                        <QPopupProxy>
+                            <CatalogFilterValueDialog
+                                :tags="tags"
+                                @apply-tags="
+                                    ($event) => applyTags($event, params, searchFn)
+                                "
+                            />
+                        </QPopupProxy>
                     </template>
                 </VnInput>
             </QItem>
             <QSeparator />
-            <QDialog v-model="showValueFilterDialog">
-                <CatalogFilterValueDialog
-                    :tags="tags"
-                    @apply-tags="($event) => applyTags($event, params, searchFn)"
-                />
-            </QDialog>
         </template>
     </VnFilterPanel>
 </template>

From 8bff7fc1d617bf1e5d2c06115248232fe673cd4c Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Thu, 7 Nov 2024 21:09:39 -0300
Subject: [PATCH 06/20] fix: reset category

---
 src/pages/Order/Card/OrderCatalogFilter.vue | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/pages/Order/Card/OrderCatalogFilter.vue b/src/pages/Order/Card/OrderCatalogFilter.vue
index 27023262e..532c79322 100644
--- a/src/pages/Order/Card/OrderCatalogFilter.vue
+++ b/src/pages/Order/Card/OrderCatalogFilter.vue
@@ -10,10 +10,8 @@ import VnFilterPanelChip from 'components/ui/VnFilterPanelChip.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import getParamWhere from 'src/filters/getParamWhere';
 import CatalogFilterValueDialog from 'src/pages/Order/Card/CatalogFilterValueDialog.vue';
+import { useArrayData } from 'composables/useArrayData';
 
-const { t } = useI18n();
-
-const route = useRoute();
 const props = defineProps({
     dataKey: {
         type: String,
@@ -29,6 +27,11 @@ const props = defineProps({
     },
 });
 
+const { t } = useI18n();
+const route = useRoute();
+
+const arrayData = useArrayData(props.dataKey);
+
 const categoryList = ref(null);
 const selectedCategoryFk = ref(null);
 const typeList = ref([]);
@@ -54,7 +57,8 @@ const resetCategory = (params, search) => {
     typeList.value = null;
     params.categoryFk = null;
     params.typeFk = null;
-    search();
+    arrayData.store.userFilter = null;
+    removeTagGroupParam(params, search);
 };
 
 const selectCategory = (params, category, search) => {

From 3825dc385134071cea196a2f640bbd43609b1eee Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 8 Nov 2024 11:54:04 +0100
Subject: [PATCH 07/20] feat: disabled buttons

---
 .../Order/Card/CatalogFilterValueDialog.vue   | 43 ++++++++++++-------
 src/pages/Order/Card/OrderCatalogFilter.vue   | 13 ++++--
 2 files changed, 37 insertions(+), 19 deletions(-)

diff --git a/src/pages/Order/Card/CatalogFilterValueDialog.vue b/src/pages/Order/Card/CatalogFilterValueDialog.vue
index ada0c2889..28e235f6a 100644
--- a/src/pages/Order/Card/CatalogFilterValueDialog.vue
+++ b/src/pages/Order/Card/CatalogFilterValueDialog.vue
@@ -63,6 +63,15 @@ const getSelectedTagValues = async (tag) => {
 <template>
     <QForm @submit="applyTags(tagValues)" class="all-pointer-events">
         <QCard class="q-pa-sm column q-pa-lg">
+            <QBtn
+                round
+                color="primary"
+                style="position: absolute; z-index: 1; right: 0; top: 0"
+                icon="search"
+                type="submit"
+            >
+            </QBtn>
+
             <VnSelect
                 :label="t('params.tag')"
                 v-model="selectedTag"
@@ -77,6 +86,16 @@ const getSelectedTagValues = async (tag) => {
                 use-input
                 @update:model-value="($event) => getSelectedTagValues($event)"
             />
+            <QBtn
+                icon="add_circle"
+                shortcut="+"
+                flat
+                class="filter-icon q-mb-md"
+                size="md"
+                dense
+                :disabled="!selectedTag || !tagValues[0].value"
+                @click="tagValues.unshift({})"
+            />
             <div
                 v-for="(value, index) in tagValues"
                 :key="value"
@@ -95,7 +114,7 @@ const getSelectedTagValues = async (tag) => {
                         rounded
                         emit-value
                         use-input
-                        :disable="!value"
+                        :disable="!value || !selectedTag"
                         :is-clearable="false"
                         class="col"
                     />
@@ -108,25 +127,19 @@ const getSelectedTagValues = async (tag) => {
                         :is-clearable="false"
                         class="col"
                     />
-                    <QIcon
-                        name="delete"
+                    <QBtn
+                        icon="delete"
+                        size="md"
+                        outlined
+                        dense
+                        rounded
+                        flat
                         class="filter-icon col-2"
+                        :disabled="!value.value"
                         @click="removeTagGroupParam(index)"
                     />
                 </div>
             </div>
-            <QBtn
-                icon="add_circle"
-                shortcut="+"
-                flat
-                class="filter-icon q-mb-md"
-                size="md"
-                dense
-                @click="tagValues.push({})"
-            />
-            <QBtn color="primary" type="submit">
-                {{ t('search') }}
-            </QBtn>
         </QCard>
     </QForm>
 </template>
diff --git a/src/pages/Order/Card/OrderCatalogFilter.vue b/src/pages/Order/Card/OrderCatalogFilter.vue
index 532c79322..f684db03e 100644
--- a/src/pages/Order/Card/OrderCatalogFilter.vue
+++ b/src/pages/Order/Card/OrderCatalogFilter.vue
@@ -35,6 +35,7 @@ const arrayData = useArrayData(props.dataKey);
 const categoryList = ref(null);
 const selectedCategoryFk = ref(null);
 const typeList = ref([]);
+const tagsValues = ref([]);
 const selectedTypeFk = ref(null);
 const generalSearchParam = ref(null);
 
@@ -289,9 +290,12 @@ onMounted(() => {
             <QSeparator />
 
             <QItem class="q-mt-lg">
-                <VnInput
+                <VnSelect
                     :label="t('components.itemsFilterPanel.value')"
-                    is-outlined
+                    :options="props.tagValue"
+                    dense
+                    outlined
+                    rounded
                     :is-clearable="false"
                     v-model="generalSearchParam"
                     @keyup.enter="
@@ -305,7 +309,7 @@ onMounted(() => {
                     <template #prepend>
                         <QIcon name="search" />
                     </template>
-                    <template #append>
+                    <template #after>
                         <QBtn
                             icon="add_circle"
                             shortcut="+"
@@ -315,6 +319,7 @@ onMounted(() => {
                         />
                         <QPopupProxy>
                             <CatalogFilterValueDialog
+                                style="display: inline-block"
                                 :tags="tags"
                                 @apply-tags="
                                     ($event) => applyTags($event, params, searchFn)
@@ -322,7 +327,7 @@ onMounted(() => {
                             />
                         </QPopupProxy>
                     </template>
-                </VnInput>
+                </VnSelect>
             </QItem>
             <QSeparator />
         </template>

From c1d623622def8b6c576322c7b6c2da673b6fed93 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Fri, 8 Nov 2024 10:11:15 -0300
Subject: [PATCH 08/20] refactor: remove unused variable

---
 src/pages/Order/Card/OrderCatalogFilter.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/pages/Order/Card/OrderCatalogFilter.vue b/src/pages/Order/Card/OrderCatalogFilter.vue
index f684db03e..e4868006c 100644
--- a/src/pages/Order/Card/OrderCatalogFilter.vue
+++ b/src/pages/Order/Card/OrderCatalogFilter.vue
@@ -35,7 +35,6 @@ const arrayData = useArrayData(props.dataKey);
 const categoryList = ref(null);
 const selectedCategoryFk = ref(null);
 const typeList = ref([]);
-const tagsValues = ref([]);
 const selectedTypeFk = ref(null);
 const generalSearchParam = ref(null);
 

From ade90afd0391a303ea1e15b675f1ebfe01af2d98 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Fri, 8 Nov 2024 10:13:35 -0300
Subject: [PATCH 09/20] refactor: change keyup.enter for update:model-value

---
 src/pages/Order/Card/OrderCatalogFilter.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/Order/Card/OrderCatalogFilter.vue b/src/pages/Order/Card/OrderCatalogFilter.vue
index e4868006c..758639f69 100644
--- a/src/pages/Order/Card/OrderCatalogFilter.vue
+++ b/src/pages/Order/Card/OrderCatalogFilter.vue
@@ -297,7 +297,7 @@ onMounted(() => {
                     rounded
                     :is-clearable="false"
                     v-model="generalSearchParam"
-                    @keyup.enter="
+                    @update:model-value="
                         applyTags(
                             { values: [{ value: generalSearchParam }] },
                             params,

From 8c78991163b32267f417f658c1a1a74ea1ed2b71 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Tue, 12 Nov 2024 08:23:49 +0100
Subject: [PATCH 10/20] fix(EntryStockBought): min width

---
 src/pages/Entry/EntryStockBought.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/pages/Entry/EntryStockBought.vue b/src/pages/Entry/EntryStockBought.vue
index 2b5ec53f5..7ae6901d3 100644
--- a/src/pages/Entry/EntryStockBought.vue
+++ b/src/pages/Entry/EntryStockBought.vue
@@ -281,6 +281,7 @@ function round(value) {
     display: flex;
     flex-direction: column;
     align-items: center;
+    min-width: 35%;
 }
 .text-negative {
     color: $negative !important;
@@ -297,5 +298,5 @@ function round(value) {
         Date: Fecha
         View more details: Ver más detalles
         Reserve some space: Reservar espacio
-        This buyer has already made a reservation for this date: Este comprador ya ha hecho una reserva para esta fecha 
+        This buyer has already made a reservation for this date: Este comprador ya ha hecho una reserva para esta fecha
 </i18n>

From 700fb7481b9ccac435ad57ce2ddbd0768fc0de48 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Tue, 12 Nov 2024 10:15:31 +0100
Subject: [PATCH 11/20] fix(CustomerBalance): getClientRisk

---
 src/pages/Customer/Card/CustomerBalance.vue   | 120 +++++++++++-------
 .../Customer/composables/getClientRisk.js     |  12 ++
 2 files changed, 87 insertions(+), 45 deletions(-)
 create mode 100644 src/pages/Customer/composables/getClientRisk.js

diff --git a/src/pages/Customer/Card/CustomerBalance.vue b/src/pages/Customer/Card/CustomerBalance.vue
index f148194f8..f6fc3eed2 100644
--- a/src/pages/Customer/Card/CustomerBalance.vue
+++ b/src/pages/Customer/Card/CustomerBalance.vue
@@ -5,7 +5,7 @@ import { useRoute } from 'vue-router';
 import { useAcl } from 'src/composables/useAcl';
 import axios from 'axios';
 import { useQuasar } from 'quasar';
-import FetchData from 'components/FetchData.vue';
+import { getClientRisk } from '../composables/getClientRisk';
 
 import { toCurrency, toDate, toDateHourMin } from 'src/filters';
 import { useState } from 'composables/useState';
@@ -16,7 +16,7 @@ import { useVnConfirm } from 'composables/useVnConfirm';
 import VnTable from 'components/VnTable/VnTable.vue';
 import VnInput from 'components/common/VnInput.vue';
 import VnSubToolbar from 'components/ui/VnSubToolbar.vue';
-import VnSelect from 'src/components/common/VnSelect.vue';
+import VnFilter from 'components/VnTable/VnFilter.vue';
 
 import CustomerNewPayment from 'src/pages/Customer/components/CustomerNewPayment.vue';
 import InvoiceOutDescriptorProxy from 'src/pages/InvoiceOut/Card/InvoiceOutDescriptorProxy.vue';
@@ -25,7 +25,7 @@ const { openConfirmationModal } = useVnConfirm();
 const { sendEmail, openReport } = usePrintService();
 const { t } = useI18n();
 const { hasAny } = useAcl();
-const currentBalance = ref({});
+
 const quasar = useQuasar();
 const route = useRoute();
 const state = useState();
@@ -33,28 +33,53 @@ const stateStore = useStateStore();
 const user = state.getUser();
 
 const clientRisk = ref([]);
-const companies = ref([]);
 const tableRef = ref();
-const companyId = ref(user.value.companyFk);
+const companyId = ref();
+const companyUser = ref(user.value.companyFk);
 const balances = ref([]);
 const vnFilterRef = ref({});
 const filter = computed(() => {
     return {
         clientId: route.params.id,
-        companyId: companyId.value ?? user.value.companyFk,
+        companyId: companyId.value ?? companyUser.value,
     };
 });
 
+const companyFilterColumn = {
+    align: 'left',
+    name: 'companyId',
+    label: t('Company'),
+    component: 'select',
+    attrs: {
+        url: 'Companies',
+        optionLabel: 'code',
+        optionValue: 'id',
+        sortBy: 'code',
+    },
+    columnFilter: {
+        event: {
+            remove: () => (companyId.value = null),
+            'update:modelValue': (newCompanyFk) => {
+                if (!newCompanyFk) return;
+                vnFilterRef.value.addFilter(newCompanyFk);
+                companyUser.value = newCompanyFk;
+            },
+            blur: () => !companyId.value && (companyId.value = companyUser.value),
+        },
+    },
+    visible: false,
+};
+
 const columns = computed(() => [
     {
-        align: 'right',
+        align: 'left',
         name: 'payed',
         label: t('Date'),
         format: ({ payed }) => toDate(payed),
         cardVisible: true,
     },
     {
-        align: 'right',
+        align: 'left',
         name: 'created',
         label: t('Creation date'),
         format: ({ created }) => toDateHourMin(created),
@@ -65,7 +90,12 @@ const columns = computed(() => [
         label: t('Employee'),
         columnField: {
             component: 'userLink',
-            attrs: ({ row }) => ({ workerId: row.workerFk, name: row.userName }),
+            attrs: ({ row }) => {
+                return {
+                    workerId: row.workerFk,
+                    name: row.userName,
+                };
+            },
         },
         cardVisible: true,
     },
@@ -77,13 +107,13 @@ const columns = computed(() => [
         class: 'extend',
     },
     {
-        align: 'right',
+        align: 'left',
         name: 'bankFk',
         label: t('Bank'),
         cardVisible: true,
     },
     {
-        align: 'right',
+        align: 'left',
         name: 'debit',
         label: t('Debit'),
         format: ({ debit }) => debit && toCurrency(debit),
@@ -136,20 +166,37 @@ const columns = computed(() => [
 
 onBeforeMount(() => {
     stateStore.rightDrawer = true;
+    companyId.value = companyUser.value;
 });
 
-async function getCurrentBalance(data) {
-    currentBalance.value[companyId.value] = {
-        amount: 0,
-        code: companies.value.find((c) => c.id === companyId.value)?.code,
+async function getClientRisks() {
+    const filter = {
+        where: { clientFk: route.params.id, companyFk: companyUser.value },
     };
+    const { data } = await getClientRisk(filter);
+    clientRisk.value = data;
+    return clientRisk.value;
+}
 
-    for (const balance of data) {
-        currentBalance.value[balance.companyFk] = {
-            code: balance.company.code,
-            amount: balance.amount,
-        };
+async function getCurrentBalance() {
+    const currentBalance = (await getClientRisks()).find((balance) => {
+        return balance.companyFk === companyId.value;
+    });
+    return currentBalance && currentBalance.amount;
+}
+
+async function onFetch(data) {
+    balances.value = [];
+    for (const [index, balance] of data.entries()) {
+        if (index === 0) {
+            balance.balance = await getCurrentBalance();
+            continue;
+        }
+        const previousBalance = data[index - 1];
+        balance.balance =
+            previousBalance?.balance - (previousBalance?.debit - previousBalance?.credit);
     }
+    balances.value = data;
 }
 
 const showNewPaymentDialog = () => {
@@ -169,43 +216,25 @@ const showBalancePdf = ({ id }) => {
 </script>
 
 <template>
-    <FetchData
-        url="Companies"
-        auto-load
-        @on-fetch="(data) => (companies = data)"
-    ></FetchData>
-    <FetchData
-        v-if="companies.length > 0"
-        url="clientRisks"
-        :filter="{
-            include: { relation: 'company', scope: { fields: ['code'] } },
-            where: { clientFk: route.params.id },
-        }"
-        auto-load
-        @on-fetch="getCurrentBalance"
-    ></FetchData>
-
     <VnSubToolbar class="q-mb-md">
         <template #st-data>
             <div class="column justify-center q-px-md q-py-sm">
                 <span class="text-bold">{{ t('Total by company') }}</span>
-                <div class="row justify-center">
-                    {{ currentBalance[companyId]?.code }}:
-                    {{ toCurrency(currentBalance[companyId]?.amount) }}
+                <div class="row justify-center" v-if="clientRisk?.length">
+                    {{ clientRisk[0].company.code }}:
+                    {{ toCurrency(clientRisk[0].amount) }}
                 </div>
             </div>
         </template>
         <template #st-actions>
             <div>
-                <VnSelect
-                    :label="t('Company')"
+                <VnFilter
                     ref="vnFilterRef"
                     v-model="companyId"
                     data-key="CustomerBalance"
-                    :options="companies"
-                    option-label="code"
-                    option-value="id"
-                ></VnSelect>
+                    :column="companyFilterColumn"
+                    search-url="balance"
+                />
             </div>
         </template>
     </VnSubToolbar>
@@ -219,6 +248,7 @@ const showBalancePdf = ({ id }) => {
         :right-search="false"
         :is-editable="false"
         :column-search="false"
+        @on-fetch="onFetch"
         :disable-option="{ card: true }"
         auto-load
     >
diff --git a/src/pages/Customer/composables/getClientRisk.js b/src/pages/Customer/composables/getClientRisk.js
new file mode 100644
index 000000000..ebaf545ee
--- /dev/null
+++ b/src/pages/Customer/composables/getClientRisk.js
@@ -0,0 +1,12 @@
+import axios from 'axios';
+
+export async function getClientRisk(_filter) {
+    const filter = {
+        ..._filter,
+        include: { relation: 'company', scope: { fields: ['code'] } },
+    };
+
+    return await axios(`ClientRisks`, {
+        params: { filter: JSON.stringify(filter) },
+    });
+}

From efd66ea02af6ce995b2e08f15552bad4cfb3a0d5 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Tue, 12 Nov 2024 11:08:45 +0100
Subject: [PATCH 12/20] feat: refs #6919 sync entry data

---
 src/pages/Entry/Card/EntryBasicData.vue  |  3 +-
 src/pages/Entry/Card/EntryCard.vue       | 45 +++++++++++++++++
 src/pages/Entry/Card/EntryDescriptor.vue | 62 ++----------------------
 3 files changed, 50 insertions(+), 60 deletions(-)

diff --git a/src/pages/Entry/Card/EntryBasicData.vue b/src/pages/Entry/Card/EntryBasicData.vue
index 3288616fb..07f4426ba 100644
--- a/src/pages/Entry/Card/EntryBasicData.vue
+++ b/src/pages/Entry/Card/EntryBasicData.vue
@@ -44,9 +44,8 @@ const onFilterTravelSelected = (formData, id) => {
         auto-load
     />
     <FormModel
-        :url="`Entries/${route.params.id}`"
         :url-update="`Entries/${route.params.id}`"
-        model="entry"
+        model="Entry"
         auto-load
         :clear-store-on-unmount="false"
     >
diff --git a/src/pages/Entry/Card/EntryCard.vue b/src/pages/Entry/Card/EntryCard.vue
index 436f5b9cd..f05f76b50 100644
--- a/src/pages/Entry/Card/EntryCard.vue
+++ b/src/pages/Entry/Card/EntryCard.vue
@@ -2,11 +2,56 @@
 import VnCard from 'components/common/VnCard.vue';
 import EntryDescriptor from './EntryDescriptor.vue';
 import EntryFilter from '../EntryFilter.vue';
+
+const filter = {
+    include: [
+        {
+            relation: 'travel',
+            scope: {
+                fields: [
+                    'id',
+                    'landed',
+                    'shipped',
+                    'agencyModeFk',
+                    'warehouseOutFk',
+                    'daysInForward',
+                ],
+                include: [
+                    {
+                        relation: 'agency',
+                        scope: {
+                            fields: ['name'],
+                        },
+                    },
+                    {
+                        relation: 'warehouseOut',
+                        scope: {
+                            fields: ['name'],
+                        },
+                    },
+                    {
+                        relation: 'warehouseIn',
+                        scope: {
+                            fields: ['name'],
+                        },
+                    },
+                ],
+            },
+        },
+        {
+            relation: 'supplier',
+            scope: {
+                fields: ['id', 'nickname'],
+            },
+        },
+    ],
+};
 </script>
 <template>
     <VnCard
         data-key="Entry"
         base-url="Entries"
+        :filter="filter"
         :descriptor="EntryDescriptor"
         :filter-panel="EntryFilter"
         search-data-key="EntryList"
diff --git a/src/pages/Entry/Card/EntryDescriptor.vue b/src/pages/Entry/Card/EntryDescriptor.vue
index d66185aa9..37b0aa62d 100644
--- a/src/pages/Entry/Card/EntryDescriptor.vue
+++ b/src/pages/Entry/Card/EntryDescriptor.vue
@@ -1,11 +1,10 @@
 <script setup>
-import { ref, computed, watch, onMounted } from 'vue';
+import { ref, computed, onMounted } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 
 import CardDescriptor from 'components/ui/CardDescriptor.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
-import useCardDescription from 'src/composables/useCardDescription';
 
 import { toDate } from 'src/filters';
 import { usePrintService } from 'composables/usePrintService';
@@ -25,50 +24,6 @@ const { openReport } = usePrintService();
 const entryDescriptorRef = ref(null);
 const url = ref();
 
-const entryFilter = {
-    include: [
-        {
-            relation: 'travel',
-            scope: {
-                fields: [
-                    'id',
-                    'landed',
-                    'shipped',
-                    'agencyModeFk',
-                    'warehouseOutFk',
-                    'daysInForward',
-                ],
-                include: [
-                    {
-                        relation: 'agency',
-                        scope: {
-                            fields: ['name'],
-                        },
-                    },
-                    {
-                        relation: 'warehouseOut',
-                        scope: {
-                            fields: ['name'],
-                        },
-                    },
-                    {
-                        relation: 'warehouseIn',
-                        scope: {
-                            fields: ['name'],
-                        },
-                    },
-                ],
-            },
-        },
-        {
-            relation: 'supplier',
-            scope: {
-                fields: ['id', 'nickname'],
-            },
-        },
-    ],
-};
-
 const entityId = computed(() => {
     return $props.id || route.params.id;
 });
@@ -76,10 +31,6 @@ onMounted(async () => {
     url.value = await getUrl('');
 });
 
-const data = ref(useCardDescription());
-const setData = (entity) =>
-    (data.value = useCardDescription(entity.supplier?.nickname, entity.id));
-
 const getEntryRedirectionFilter = (entry) => {
     let entryTravel = entry && entry.travel;
 
@@ -104,8 +55,6 @@ const getEntryRedirectionFilter = (entry) => {
 const showEntryReport = () => {
     openReport(`Entries/${route.params.id}/entry-order-pdf`);
 };
-
-watch;
 </script>
 
 <template>
@@ -113,11 +62,8 @@ watch;
         ref="entryDescriptorRef"
         module="Entry"
         :url="`Entries/${entityId}`"
-        :filter="entryFilter"
-        :title="data.title"
-        :subtitle="data.subtitle"
-        @on-fetch="setData"
-        data-key="entry"
+        title="supplier.nickname"
+        data-key="Entry"
     >
         <template #menu="{ entity }">
             <QItem v-ripple clickable @click="showEntryReport(entity)">
@@ -165,7 +111,7 @@ watch;
         <template #actions="{ entity }">
             <QCardActions>
                 <QBtn
-                    :to="`/supplier/${entity.supplier.id}`"
+                    :to="`/supplier/${entity.supplier?.id}`"
                     size="md"
                     icon="vn:supplier"
                     color="primary"

From b4d76536617094d00959fa7ca68960172ce6eba6 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Tue, 12 Nov 2024 11:15:34 +0100
Subject: [PATCH 13/20] refactor: refs #6919 export filter

---
 src/pages/Entry/Card/EntryCard.vue       | 45 +-----------------------
 src/pages/Entry/Card/EntryDescriptor.vue |  2 ++
 src/pages/Entry/Card/EntryFilter.js      | 43 ++++++++++++++++++++++
 3 files changed, 46 insertions(+), 44 deletions(-)
 create mode 100644 src/pages/Entry/Card/EntryFilter.js

diff --git a/src/pages/Entry/Card/EntryCard.vue b/src/pages/Entry/Card/EntryCard.vue
index f05f76b50..3f2596338 100644
--- a/src/pages/Entry/Card/EntryCard.vue
+++ b/src/pages/Entry/Card/EntryCard.vue
@@ -2,50 +2,7 @@
 import VnCard from 'components/common/VnCard.vue';
 import EntryDescriptor from './EntryDescriptor.vue';
 import EntryFilter from '../EntryFilter.vue';
-
-const filter = {
-    include: [
-        {
-            relation: 'travel',
-            scope: {
-                fields: [
-                    'id',
-                    'landed',
-                    'shipped',
-                    'agencyModeFk',
-                    'warehouseOutFk',
-                    'daysInForward',
-                ],
-                include: [
-                    {
-                        relation: 'agency',
-                        scope: {
-                            fields: ['name'],
-                        },
-                    },
-                    {
-                        relation: 'warehouseOut',
-                        scope: {
-                            fields: ['name'],
-                        },
-                    },
-                    {
-                        relation: 'warehouseIn',
-                        scope: {
-                            fields: ['name'],
-                        },
-                    },
-                ],
-            },
-        },
-        {
-            relation: 'supplier',
-            scope: {
-                fields: ['id', 'nickname'],
-            },
-        },
-    ],
-};
+import filter from './EntryFilter.js';
 </script>
 <template>
     <VnCard
diff --git a/src/pages/Entry/Card/EntryDescriptor.vue b/src/pages/Entry/Card/EntryDescriptor.vue
index 37b0aa62d..794f791ae 100644
--- a/src/pages/Entry/Card/EntryDescriptor.vue
+++ b/src/pages/Entry/Card/EntryDescriptor.vue
@@ -9,6 +9,7 @@ import VnLv from 'src/components/ui/VnLv.vue';
 import { toDate } from 'src/filters';
 import { usePrintService } from 'composables/usePrintService';
 import { getUrl } from 'src/composables/getUrl';
+import filter from './EntryFilter.js';
 
 const $props = defineProps({
     id: {
@@ -62,6 +63,7 @@ const showEntryReport = () => {
         ref="entryDescriptorRef"
         module="Entry"
         :url="`Entries/${entityId}`"
+        :filter="filter"
         title="supplier.nickname"
         data-key="Entry"
     >
diff --git a/src/pages/Entry/Card/EntryFilter.js b/src/pages/Entry/Card/EntryFilter.js
new file mode 100644
index 000000000..3ff62cf27
--- /dev/null
+++ b/src/pages/Entry/Card/EntryFilter.js
@@ -0,0 +1,43 @@
+export default {
+    include: [
+        {
+            relation: 'travel',
+            scope: {
+                fields: [
+                    'id',
+                    'landed',
+                    'shipped',
+                    'agencyModeFk',
+                    'warehouseOutFk',
+                    'daysInForward',
+                ],
+                include: [
+                    {
+                        relation: 'agency',
+                        scope: {
+                            fields: ['name'],
+                        },
+                    },
+                    {
+                        relation: 'warehouseOut',
+                        scope: {
+                            fields: ['name'],
+                        },
+                    },
+                    {
+                        relation: 'warehouseIn',
+                        scope: {
+                            fields: ['name'],
+                        },
+                    },
+                ],
+            },
+        },
+        {
+            relation: 'supplier',
+            scope: {
+                fields: ['id', 'nickname'],
+            },
+        },
+    ],
+};

From 6355993c14e01955c45ebd32b4f7185cae092fc8 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Tue, 12 Nov 2024 11:00:05 +0000
Subject: [PATCH 14/20] fix: mobile is more relevant than phone

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

diff --git a/src/pages/Customer/Card/CustomerDescriptorMenu.vue b/src/pages/Customer/Card/CustomerDescriptorMenu.vue
index 89b10a4fe..178bba7db 100644
--- a/src/pages/Customer/Card/CustomerDescriptorMenu.vue
+++ b/src/pages/Customer/Card/CustomerDescriptorMenu.vue
@@ -28,7 +28,7 @@ const showSmsDialog = () => {
     quasar.dialog({
         component: VnSmsDialog,
         componentProps: {
-            phone: $props.customer.phone || $props.customer.mobile,
+            phone: $props.customer.mobile || $props.customer.phone,
             promise: sendSms,
         },
     });

From fefa61ea5c94b806815c01d9aabd17b967d889f1 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Tue, 12 Nov 2024 12:07:02 +0100
Subject: [PATCH 15/20] fix: fix termo

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

diff --git a/src/pages/Travel/Card/TravelThermographsForm.vue b/src/pages/Travel/Card/TravelThermographsForm.vue
index 5e3ecdc3e..f56ef1eda 100644
--- a/src/pages/Travel/Card/TravelThermographsForm.vue
+++ b/src/pages/Travel/Card/TravelThermographsForm.vue
@@ -207,6 +207,7 @@ const onThermographCreated = async (data) => {
                         option-label="thermographFk"
                         :disable="viewAction === 'edit'"
                         :tooltip="t('New thermograph')"
+                        :roles-allowed-to-create="['logistic']"
                     >
                         <template #form>
                             <CreateThermographForm

From 2afddeb0636638842bb51d219a71325a6b84aa46 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Tue, 12 Nov 2024 12:41:10 +0100
Subject: [PATCH 16/20] fix: refs #7354 zip filter

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

diff --git a/src/pages/Zone/ZoneDeliveryPanel.vue b/src/pages/Zone/ZoneDeliveryPanel.vue
index 423095d6e..7667f60dc 100644
--- a/src/pages/Zone/ZoneDeliveryPanel.vue
+++ b/src/pages/Zone/ZoneDeliveryPanel.vue
@@ -96,7 +96,7 @@ watch(
                 sort-by="code, townFk"
                 option-value="geoFk"
                 option-label="code"
-                :filter-options="['code', 'geoFk']"
+                :filter-options="['code']"
                 hide-selected
                 dense
                 outlined

From 26af102804d12e3ecb0903e1586ad6bc35c5281b Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Tue, 12 Nov 2024 12:47:30 +0100
Subject: [PATCH 17/20] fix(CreateThermographForm):  remove limit

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

diff --git a/src/components/CreateThermographForm.vue b/src/components/CreateThermographForm.vue
index 0b7e4c5c6..54844ee8f 100644
--- a/src/components/CreateThermographForm.vue
+++ b/src/components/CreateThermographForm.vue
@@ -38,7 +38,7 @@ const onDataSaved = (dataSaved) => {
         @on-fetch="(data) => (warehousesOptions = data)"
         auto-load
         url="Warehouses"
-        :filter="{ fields: ['id', 'name'], order: 'name ASC', limit: 30 }"
+        :filter="{ fields: ['id', 'name'], order: 'name ASC' }"
     />
     <FetchData
         @on-fetch="(data) => (temperaturesOptions = data)"

From 18f544f8dcc548376c0e918f0a88132e89cfda14 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Tue, 12 Nov 2024 13:23:28 +0100
Subject: [PATCH 18/20] fix: refs #7354 redirect to ticket

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

diff --git a/src/pages/Customer/components/CustomerSummaryTable.vue b/src/pages/Customer/components/CustomerSummaryTable.vue
index e9bb36be7..9d23ba9f3 100644
--- a/src/pages/Customer/components/CustomerSummaryTable.vue
+++ b/src/pages/Customer/components/CustomerSummaryTable.vue
@@ -184,6 +184,7 @@ const getItemPackagingType = (ticketSales) => {
         :disable-option="{ card: true, table: true }"
         class="full-width"
         :disable-infinite-scroll="true"
+        redirect="ticket"
     >
         <template #column-nickname="{ row }">
             <span class="link">

From 3f15c3cce00f7005237e4a79005ccbe3fad545f6 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Tue, 12 Nov 2024 14:35:55 +0100
Subject: [PATCH 19/20] feat(VnSelect): order data equal salix

---
 src/components/common/VnSelect.vue |  3 ++
 src/utils/dataByOrder.js           | 53 ++++++++++++++++++++++++++++++
 2 files changed, 56 insertions(+)
 create mode 100644 src/utils/dataByOrder.js

diff --git a/src/components/common/VnSelect.vue b/src/components/common/VnSelect.vue
index 32dbbd641..4622f1cb0 100644
--- a/src/components/common/VnSelect.vue
+++ b/src/components/common/VnSelect.vue
@@ -3,6 +3,8 @@ import { ref, toRefs, computed, watch, onMounted, useAttrs } from 'vue';
 import { useI18n } from 'vue-i18n';
 import FetchData from 'src/components/FetchData.vue';
 import { useRequired } from 'src/composables/useRequired';
+import dataByOrder from 'src/utils/dataByOrder';
+
 const emit = defineEmits(['update:modelValue', 'update:options', 'remove']);
 const $attrs = useAttrs();
 const { t } = useI18n();
@@ -138,6 +140,7 @@ function findKeyInOptions() {
 }
 
 function setOptions(data) {
+    data = dataByOrder(data, $props.sortBy);
     myOptions.value = JSON.parse(JSON.stringify(data));
     myOptionsOriginal.value = JSON.parse(JSON.stringify(data));
     emit('update:options', data);
diff --git a/src/utils/dataByOrder.js b/src/utils/dataByOrder.js
new file mode 100644
index 000000000..72b55ac11
--- /dev/null
+++ b/src/utils/dataByOrder.js
@@ -0,0 +1,53 @@
+function orderData(data, order) {
+    if (typeof order === 'string') order = [order];
+    if (Array.isArray(order)) {
+        let orderComp = [];
+
+        for (let field of order) {
+            let split = field.split(/\s+/);
+            orderComp.push({
+                field: split[0],
+                way: split[1] === 'DESC' ? -1 : 1,
+            });
+        }
+
+        return data.sort((a, b) => sortFunc(a, b, orderComp));
+    } else if (typeof order === 'function') return data.sort(data);
+    return data;
+}
+
+function sortFunc(a, b, order) {
+    for (let i of order) {
+        let compRes = compareFunc(a[i.field], b[i.field]) * i.way;
+        if (compRes !== 0) return compRes;
+    }
+
+    return 0;
+}
+
+function compareFunc(a, b) {
+    if (a === b) return 0;
+    let aType = typeof a;
+    if (aType === typeof b) {
+        switch (aType) {
+            case 'string':
+                return a.localeCompare(b);
+            case 'number':
+                return a - b;
+            case 'boolean':
+                return a ? 1 : -1;
+            case 'object':
+                if (a instanceof Date && b instanceof Date)
+                    return a.getTime() - b.getTime();
+        }
+    }
+
+    if (a === undefined) return -1;
+    if (b === undefined) return 1;
+    if (a === null) return -1;
+    if (b === null) return 1;
+
+    return a > b ? 1 : -1;
+}
+
+export default orderData;

From 8269037faad5288ce36146f99e03c372724292c6 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Wed, 13 Nov 2024 07:21:42 +0100
Subject: [PATCH 20/20] chore: perf

---
 src/utils/dataByOrder.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/utils/dataByOrder.js b/src/utils/dataByOrder.js
index 72b55ac11..1bdedb8a1 100644
--- a/src/utils/dataByOrder.js
+++ b/src/utils/dataByOrder.js
@@ -1,4 +1,5 @@
 function orderData(data, order) {
+    if (typeof order === 'function') return data.sort(data);
     if (typeof order === 'string') order = [order];
     if (Array.isArray(order)) {
         let orderComp = [];
@@ -12,13 +13,13 @@ function orderData(data, order) {
         }
 
         return data.sort((a, b) => sortFunc(a, b, orderComp));
-    } else if (typeof order === 'function') return data.sort(data);
+    }
     return data;
 }
 
 function sortFunc(a, b, order) {
-    for (let i of order) {
-        let compRes = compareFunc(a[i.field], b[i.field]) * i.way;
+    for (let { field, way } of order) {
+        let compRes = compareFunc(a[field], b[field]) * way;
         if (compRes !== 0) return compRes;
     }