From ad8007fe6b00c473b7f21fc4f18af3062397a19b Mon Sep 17 00:00:00 2001
From: jcasado <jcasado.verdnatura@gmail.com>
Date: Thu, 11 Apr 2024 13:42:37 +0200
Subject: [PATCH 01/18] refs #6641 add checkbox

---
 src/pages/Claim/ClaimFilter.vue | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/src/pages/Claim/ClaimFilter.vue b/src/pages/Claim/ClaimFilter.vue
index ee702ffdd..ef14811d1 100644
--- a/src/pages/Claim/ClaimFilter.vue
+++ b/src/pages/Claim/ClaimFilter.vue
@@ -149,6 +149,15 @@ const states = ref();
                     />
                 </QItemSection>
             </QItem>
+            <QItem>
+                <QItemSection>
+                    <QCheckbox
+                        v-model="params.myTeam"
+                        :label="t('myTeam')"
+                        toggle-indeterminate
+                    />
+                </QItemSection>
+            </QItem>
             <QSeparator />
             <QExpansionItem :label="t('More options')" expand-separator>
                 <!-- <QItem>
@@ -192,6 +201,7 @@ en:
         claimResponsibleFk: Responsible
         claimStateFk: State
         created: Created
+    myTeam: My team
 es:
     params:
         search: Contiene
@@ -211,4 +221,5 @@ es:
     Item: Artículo
     Created: Creada
     More options: Más opciones
+    myTeam: Mi equipo
 </i18n>

From b7ba664e4565bb900e97f559916159d2dbb65f26 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Tue, 23 Apr 2024 09:05:34 -0300
Subject: [PATCH 02/18] WIP

---
 src/css/app.scss                  |   5 +
 src/pages/Item/ItemList.vue       |   6 +
 src/pages/Item/ItemListFilter.vue | 348 ++++++++++++++++++++++++++++++
 3 files changed, 359 insertions(+)
 create mode 100644 src/pages/Item/ItemListFilter.vue

diff --git a/src/css/app.scss b/src/css/app.scss
index 25b484649..9037802ad 100644
--- a/src/css/app.scss
+++ b/src/css/app.scss
@@ -119,6 +119,11 @@ select:-webkit-autofill {
     font-variation-settings: 'FILL' 1;
 }
 
+.fill-icon-on-hover:hover {
+    font-variation-settings: 'FILL' 1;
+    cursor: pointer;
+}
+
 .vn-table-separation-row {
     height: 16px !important;
     background-color: var(--vn-section-color) !important;
diff --git a/src/pages/Item/ItemList.vue b/src/pages/Item/ItemList.vue
index 3e399e29f..9c1ab9df6 100644
--- a/src/pages/Item/ItemList.vue
+++ b/src/pages/Item/ItemList.vue
@@ -12,6 +12,7 @@ import ItemDescriptorProxy from '../Item/Card/ItemDescriptorProxy.vue';
 import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
 import ItemSummary from '../Item/Card/ItemSummary.vue';
 import VnPaginate from 'components/ui/VnPaginate.vue';
+import ItemListFilter from './ItemListFilter.vue';
 
 import { useStateStore } from 'stores/useStateStore';
 import { toDateFormat } from 'src/filters/date.js';
@@ -442,6 +443,11 @@ onUnmounted(() => (stateStore.rightDrawer = false));
         <QSpace />
         <div id="st-actions"></div>
     </QToolbar>
+    <QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above>
+        <QScrollArea class="fit text-grey-8">
+            <ItemListFilter data-key="ItemList" />
+        </QScrollArea>
+    </QDrawer>
     <QPage class="column items-center q-pa-md">
         <VnPaginate
             ref="paginateRef"
diff --git a/src/pages/Item/ItemListFilter.vue b/src/pages/Item/ItemListFilter.vue
new file mode 100644
index 000000000..a99811e2f
--- /dev/null
+++ b/src/pages/Item/ItemListFilter.vue
@@ -0,0 +1,348 @@
+<script setup>
+import { ref, watch, computed } from 'vue';
+import { useI18n } from 'vue-i18n';
+import { onMounted } from 'vue';
+import { useStateStore } from 'stores/useStateStore';
+
+import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
+import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+import VnInput from 'src/components/common/VnInput.vue';
+import FetchData from 'components/FetchData.vue';
+import VnInputDate from 'src/components/common/VnInputDate.vue';
+
+import { useArrayData } from 'composables/useArrayData';
+import axios from 'axios';
+
+const { t } = useI18n();
+
+const props = defineProps({
+    dataKey: {
+        type: String,
+        required: true,
+    },
+});
+
+const stateStore = useStateStore();
+
+const itemTypesRef = ref(null);
+const categoriesOptions = ref([]);
+const itemTypesOptions = ref([]);
+const buyersOptions = ref([]);
+const suppliersOptions = ref([]);
+const tagValues = ref([]);
+
+const arrayData = useArrayData(props.dataKey);
+const itemTypesFilter = computed(() => {
+    return {
+        fields: ['id', 'name', 'categoryFk'],
+        include: 'category',
+        order: 'name ASC',
+        where: { categoryFk: arrayData.store?.userParams?.categoryFk },
+    };
+});
+
+// TODO: checkear este watch que fetchee cuando cambie categoryFk
+watch(itemTypesFilter.value.where.categoryFk, () => itemTypesRef.value.fetch());
+
+const getSelectedTagValues = async (tag) => {
+    try {
+        tag.value = null;
+        const filter = {
+            fields: ['value'],
+            order: 'value ASC',
+        };
+
+        const params = { filter: JSON.stringify(filter) };
+        const { data } = await axios.get(`Tags/${tag.selectedTag.id}/filterValue`, {
+            params,
+        });
+        tag.valueOptions = data;
+    } catch (err) {
+        console.error('Error getting selected tag values');
+    }
+};
+
+// const applyColumnFilter = async (col) => {
+//     try {
+//         params[col.field] = col.columnFilter.filterValue;
+//         await arrayData.addFilter({ params });
+//     } catch (err) {
+//         console.error('Error applying column filter', err);
+//     }
+// };
+
+const applyTags = () => {
+    // params.tags = tagValues.value
+    //     .filter((tag) => tag.selectedTag && tag.value)
+    //     .map((tag) => ({
+    //         tagFk: tag.selectedTag.id,
+    //         tagName: tag.selectedTag.name,
+    //         value: tag.value,
+    //     }));
+    console.log('apply tags');
+    const params = {
+        tags: tagValues.value
+            .filter((tag) => tag.selectedTag && tag.value)
+            .map((tag) => ({
+                tagFk: tag.selectedTag.id,
+                tagName: tag.selectedTag.name,
+                value: tag.value,
+            })),
+    };
+    console.log('params:: ', params);
+    arrayData.addFilter({ params });
+    // search();
+};
+
+const removeTag = (index, params, search) => {
+    (tagValues.value || []).splice(index, 1);
+    // applyTags(params, search);
+};
+
+onMounted(async () => {
+    stateStore.rightDrawer = true;
+});
+</script>
+
+<template>
+    <FetchData
+        url="ItemCategories"
+        :filter="{ fields: ['id', 'name'], order: 'name ASC' }"
+        @on-fetch="(data) => (categoriesOptions = data)"
+        auto-load
+    />
+    <FetchData
+        ref="itemTypesRef"
+        url="ItemTypes"
+        :filter="itemTypesFilter"
+        @on-fetch="(data) => (itemTypesOptions = data)"
+        auto-load
+    />
+    <FetchData
+        url="TicketRequests/getItemTypeWorker"
+        :filter="{ fields: ['id', 'nickname'], order: 'nickname ASC' }"
+        @on-fetch="(data) => (buyersOptions = data)"
+        auto-load
+    />
+    <FetchData
+        url="Suppliers"
+        :filter="{ fields: ['name', 'nickname'], order: 'name ASC' }"
+        @on-fetch="(data) => (suppliersOptions = data)"
+        auto-load
+    />
+    <FetchData
+        url="Tags"
+        :filter="{ fields: ['id', 'name', 'isFree'] }"
+        auto-load
+        @on-fetch="(data) => (tagOptions = data)"
+    />
+    <!-- <pre>categoryFkparam:: {{ itemTypesFilter }}</pre> -->
+    <!-- <pre>{{ tagValues }}</pre> -->
+    <VnFilterPanel :data-key="props.dataKey" :search-button="true">
+        <template #tags="{ tag, formatFn }">
+            <div v-if="tag.label !== 'tags'" class="q-gutter-x-xs">
+                <strong>{{ t(`params.${tag.label}`) }}: </strong>
+                <span>{{ formatFn(tag.value) }}</span>
+            </div>
+            <div v-else class="q-gutter-x-xs">
+                <strong>{{ t('params.tags') }} </strong>
+            </div>
+        </template>
+        <template #body="{ params, searchFn }">
+            <QItem>
+                <QItemSection>
+                    <VnInput
+                        v-model="params.search"
+                        :label="t('params.search')"
+                        is-outlined
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnSelectFilter
+                        :label="t('params.categoryFk')"
+                        v-model="params.categoryFk"
+                        @update:model-value="searchFn()"
+                        :options="categoriesOptions"
+                        option-value="id"
+                        option-label="name"
+                        hide-selected
+                        dense
+                        outlined
+                        rounded
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnSelectFilter
+                        :label="t('params.typeFk')"
+                        v-model="params.typeFk"
+                        @update:model-value="searchFn()"
+                        :options="itemTypesOptions"
+                        option-value="id"
+                        option-label="name"
+                        hide-selected
+                        dense
+                        outlined
+                        rounded
+                    >
+                        <template #option="scope">
+                            <QItem v-bind="scope.itemProps">
+                                <QItemSection>
+                                    <QItemLabel>{{ scope.opt?.name }}</QItemLabel>
+                                    <QItemLabel caption>{{
+                                        scope.opt?.category?.name
+                                    }}</QItemLabel>
+                                </QItemSection>
+                            </QItem>
+                        </template>
+                    </VnSelectFilter>
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnSelectFilter
+                        :label="t('params.buyerFk')"
+                        v-model="params.buyerFk"
+                        @update:model-value="searchFn()"
+                        :options="buyersOptions"
+                        option-value="id"
+                        option-label="nickname"
+                        hide-selected
+                        dense
+                        outlined
+                        rounded
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnSelectFilter
+                        :label="t('params.supplierFk')"
+                        v-model="params.supplierFk"
+                        @update:model-value="searchFn()"
+                        :options="suppliersOptions"
+                        option-value="id"
+                        option-label="name"
+                        hide-selected
+                        dense
+                        outlined
+                        rounded
+                    >
+                        <template #option="scope">
+                            <QItem v-bind="scope.itemProps">
+                                <QItemSection>
+                                    <QItemLabel>{{
+                                        scope.opt?.name + ': ' + scope.opt?.nickname
+                                    }}</QItemLabel>
+                                </QItemSection>
+                            </QItem>
+                        </template>
+                    </VnSelectFilter>
+                </QItemSection>
+            </QItem>
+            <QItem class="row items-center">
+                <QItemLabel>
+                    {{ t('params.tags') }}
+                </QItemLabel>
+                <QIcon
+                    name="add_circle"
+                    class="fill-icon-on-hover q-ml-md"
+                    size="sm"
+                    color="primary"
+                    @click="tagValues.push({})"
+                />
+            </QItem>
+            <QItem
+                v-for="(tag, index) in tagValues"
+                :key="index"
+                class="row items-center"
+            >
+                <QItemSection class="col">
+                    <VnSelectFilter
+                        :label="t('params.tag')"
+                        v-model="tag.selectedTag"
+                        :options="tagOptions"
+                        option-label="name"
+                        dense
+                        outlined
+                        rounded
+                        :emit-value="false"
+                        use-input
+                        :is-clearable="false"
+                        @update:model-value="getSelectedTagValues(tag)"
+                    />
+                </QItemSection>
+                <QItemSection class="col">
+                    <VnSelectFilter
+                        v-if="!tag?.selectedTag?.isFree && tag.valueOptions"
+                        :label="t('params.tag')"
+                        v-model="tag.value"
+                        :options="tag.valueOptions || []"
+                        option-value="value"
+                        option-label="value"
+                        dense
+                        outlined
+                        rounded
+                        emit-value
+                        use-input
+                        :disable="!tag"
+                        :is-clearable="false"
+                        @update:model-value="applyTags()"
+                    />
+                    <VnInput
+                        v-else
+                        v-model="tag.value"
+                        :label="t('params.value')"
+                        :disable="!tag"
+                        is-outlined
+                        :is-clearable="false"
+                        @keyup.enter="applyTags()"
+                    />
+                </QItemSection>
+                <QIcon
+                    name="delete"
+                    class="fill-icon-on-hover q-ml-xs"
+                    size="sm"
+                    color="primary"
+                    @click="removeTag(index, params, searchFn)"
+                />
+            </QItem>
+
+            <!-- <QItem>
+                <QItemSection>
+                    <QCheckbox
+                        :label="t('params.isOrdered')"
+                        v-model="params.isOrdered"
+                        toggle-indeterminate
+                    />
+                </QItemSection>
+            </QItem> -->
+        </template>
+    </VnFilterPanel>
+</template>
+
+<i18n>
+en:
+    params:
+        search: General search
+        categoryFk: Category
+        typeFk: Type
+        buyerFk: Buyer
+        supplierFk: Supplier
+        tags: Tags
+        tag: Tag
+        value: Value
+es:
+    params:
+        search: Búsqueda general
+        categoryFk: Reino
+        typeFk: Tipo
+        buyerFk: Comprador
+        supplierFk: Proveedor
+        tags: Etiquetas
+        tag: Etiqueta
+        value: Valor
+</i18n>

From f3b5bf7f4b1847286738ce6225ec4b70c5fba628 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Tue, 23 Apr 2024 15:34:52 -0300
Subject: [PATCH 03/18] Item list filter

---
 src/composables/useArrayData.js   |   7 +-
 src/pages/Item/ItemList.vue       |   2 +-
 src/pages/Item/ItemListFilter.vue | 230 +++++++++++++++++++++---------
 src/router/modules/item.js        |   1 +
 4 files changed, 171 insertions(+), 69 deletions(-)

diff --git a/src/composables/useArrayData.js b/src/composables/useArrayData.js
index 998ee0576..04d7bfef7 100644
--- a/src/composables/useArrayData.js
+++ b/src/composables/useArrayData.js
@@ -156,9 +156,10 @@ export function useArrayData(key, userOptions) {
                 delete store.userParams[param];
                 delete params[param];
                 if (store.filter?.where) {
-                    delete store.filter.where[
-                        Object.keys(exprBuilder ? exprBuilder(param) : param)[0]
-                    ];
+                    const key = Object.keys(
+                        exprBuilder && exprBuilder(param) ? exprBuilder(param) : param
+                    );
+                    if (key[0]) delete store.filter.where[key[0]];
                     if (Object.keys(store.filter.where).length === 0) {
                         delete store.filter.where;
                     }
diff --git a/src/pages/Item/ItemList.vue b/src/pages/Item/ItemList.vue
index 9c1ab9df6..3b3697612 100644
--- a/src/pages/Item/ItemList.vue
+++ b/src/pages/Item/ItemList.vue
@@ -70,7 +70,7 @@ const exprBuilder = (param, value) => {
     }
 };
 
-const params = reactive({});
+const params = reactive({ isFloramondo: false, isActive: true });
 
 const applyColumnFilter = async (col) => {
     try {
diff --git a/src/pages/Item/ItemListFilter.vue b/src/pages/Item/ItemListFilter.vue
index a99811e2f..ad6167014 100644
--- a/src/pages/Item/ItemListFilter.vue
+++ b/src/pages/Item/ItemListFilter.vue
@@ -4,13 +4,14 @@ import { useI18n } from 'vue-i18n';
 import { onMounted } from 'vue';
 import { useStateStore } from 'stores/useStateStore';
 
+import FetchData from 'components/FetchData.vue';
 import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
 import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
 import VnInput from 'src/components/common/VnInput.vue';
-import FetchData from 'components/FetchData.vue';
-import VnInputDate from 'src/components/common/VnInputDate.vue';
+import { QCheckbox } from 'quasar';
 
 import { useArrayData } from 'composables/useArrayData';
+import { useValidator } from 'src/composables/useValidator';
 import axios from 'axios';
 
 const { t } = useI18n();
@@ -23,6 +24,7 @@ const props = defineProps({
 });
 
 const stateStore = useStateStore();
+const validationsStore = useValidator();
 
 const itemTypesRef = ref(null);
 const categoriesOptions = ref([]);
@@ -30,19 +32,27 @@ const itemTypesOptions = ref([]);
 const buyersOptions = ref([]);
 const suppliersOptions = ref([]);
 const tagValues = ref([]);
+const fieldFiltersValues = ref([]);
+const moreFields = ref([]);
 
 const arrayData = useArrayData(props.dataKey);
-const itemTypesFilter = computed(() => {
-    return {
-        fields: ['id', 'name', 'categoryFk'],
-        include: 'category',
-        order: 'name ASC',
-        where: { categoryFk: arrayData.store?.userParams?.categoryFk },
-    };
-});
+const itemTypesFilter = {
+    fields: ['id', 'name', 'categoryFk'],
+    include: 'category',
+    order: 'name ASC',
+    where: {},
+};
 
-// TODO: checkear este watch que fetchee cuando cambie categoryFk
-watch(itemTypesFilter.value.where.categoryFk, () => itemTypesRef.value.fetch());
+const onCategoryChange = async (categoryFk, search) => {
+    if (!categoryFk) {
+        itemTypesFilter.where.categoryFk = null;
+        delete itemTypesFilter.where.categoryFk;
+    } else {
+        itemTypesFilter.where.categoryFk = categoryFk;
+    }
+    search();
+    await itemTypesRef.value.fetch();
+};
 
 const getSelectedTagValues = async (tag) => {
     try {
@@ -62,45 +72,60 @@ const getSelectedTagValues = async (tag) => {
     }
 };
 
-// const applyColumnFilter = async (col) => {
-//     try {
-//         params[col.field] = col.columnFilter.filterValue;
-//         await arrayData.addFilter({ params });
-//     } catch (err) {
-//         console.error('Error applying column filter', err);
-//     }
-// };
-
-const applyTags = () => {
-    // params.tags = tagValues.value
-    //     .filter((tag) => tag.selectedTag && tag.value)
-    //     .map((tag) => ({
-    //         tagFk: tag.selectedTag.id,
-    //         tagName: tag.selectedTag.name,
-    //         value: tag.value,
-    //     }));
-    console.log('apply tags');
-    const params = {
-        tags: tagValues.value
-            .filter((tag) => tag.selectedTag && tag.value)
-            .map((tag) => ({
-                tagFk: tag.selectedTag.id,
-                tagName: tag.selectedTag.name,
-                value: tag.value,
-            })),
-    };
-    console.log('params:: ', params);
-    arrayData.addFilter({ params });
-    // search();
+const applyTags = (params, search) => {
+    params.tags = tagValues.value
+        .filter((tag) => tag.selectedTag && tag.value)
+        .map((tag) => ({
+            tagFk: tag.selectedTag.id,
+            tagName: tag.selectedTag.name,
+            value: tag.value,
+        }));
+    search();
 };
 
 const removeTag = (index, params, search) => {
     (tagValues.value || []).splice(index, 1);
-    // applyTags(params, search);
+    applyTags(params, search);
+};
+
+const applyFieldFilters = (params) => {
+    fieldFiltersValues.value.forEach((fieldFilter) => {
+        if (
+            fieldFilter.selectedField &&
+            (fieldFilter.value !== null ||
+                fieldFilter.value !== '' ||
+                fieldFilter.value !== undefined)
+        ) {
+            params[fieldFilter.name] = fieldFilter.value;
+        }
+    });
+    arrayData.applyFilter({ params });
+};
+
+const removeFieldFilter = (index, params, search) => {
+    delete params[fieldFiltersValues.value[index].name];
+    (fieldFiltersValues.value || []).splice(index, 1);
+    applyFieldFilters(params, search);
 };
 
 onMounted(async () => {
     stateStore.rightDrawer = true;
+    if (arrayData.store?.userParams?.categoryFk)
+        itemTypesFilter.where.categoryFk = arrayData.store?.userParams?.categoryFk;
+    await itemTypesRef.value.fetch();
+    const { models } = validationsStore;
+    const properties = models.Item?.properties || {};
+
+    const _moreFields = ['id', 'description', 'name', 'isActive'];
+
+    _moreFields.forEach((field) => {
+        let prop = properties[field];
+        moreFields.value.push({
+            name: field,
+            label: prop ? prop.description : field,
+            type: prop ? prop.type : null,
+        });
+    });
 });
 </script>
 
@@ -116,7 +141,6 @@ onMounted(async () => {
         url="ItemTypes"
         :filter="itemTypesFilter"
         @on-fetch="(data) => (itemTypesOptions = data)"
-        auto-load
     />
     <FetchData
         url="TicketRequests/getItemTypeWorker"
@@ -126,7 +150,7 @@ onMounted(async () => {
     />
     <FetchData
         url="Suppliers"
-        :filter="{ fields: ['name', 'nickname'], order: 'name ASC' }"
+        :filter="{ fields: ['id', 'name', 'nickname'], order: 'name ASC' }"
         @on-fetch="(data) => (suppliersOptions = data)"
         auto-load
     />
@@ -136,16 +160,16 @@ onMounted(async () => {
         auto-load
         @on-fetch="(data) => (tagOptions = data)"
     />
-    <!-- <pre>categoryFkparam:: {{ itemTypesFilter }}</pre> -->
-    <!-- <pre>{{ tagValues }}</pre> -->
-    <VnFilterPanel :data-key="props.dataKey" :search-button="true">
+    <pre>{{ itemTypesFilter }}</pre>
+    <VnFilterPanel
+        :data-key="props.dataKey"
+        :search-button="true"
+        :hidden-tags="tagValues.length === 0 ? ['tags'] : []"
+    >
         <template #tags="{ tag, formatFn }">
-            <div v-if="tag.label !== 'tags'" class="q-gutter-x-xs">
-                <strong>{{ t(`params.${tag.label}`) }}: </strong>
-                <span>{{ formatFn(tag.value) }}</span>
-            </div>
-            <div v-else class="q-gutter-x-xs">
-                <strong>{{ t('params.tags') }} </strong>
+            <div>
+                <strong>{{ t(`params.${tag.label}`) }}</strong>
+                <span v-if="tag.label !== 'tags'">: {{ formatFn(tag.value) }}</span>
             </div>
         </template>
         <template #body="{ params, searchFn }">
@@ -163,7 +187,9 @@ onMounted(async () => {
                     <VnSelectFilter
                         :label="t('params.categoryFk')"
                         v-model="params.categoryFk"
-                        @update:model-value="searchFn()"
+                        @update:model-value="
+                            ($event) => onCategoryChange($event, searchFn)
+                        "
                         :options="categoriesOptions"
                         option-value="id"
                         option-label="name"
@@ -243,6 +269,7 @@ onMounted(async () => {
                     </VnSelectFilter>
                 </QItemSection>
             </QItem>
+            <!-- Tags filter -->
             <QItem class="row items-center">
                 <QItemLabel>
                     {{ t('params.tags') }}
@@ -290,7 +317,7 @@ onMounted(async () => {
                         use-input
                         :disable="!tag"
                         :is-clearable="false"
-                        @update:model-value="applyTags()"
+                        @update:model-value="applyTags(params, searchFn)"
                     />
                     <VnInput
                         v-else
@@ -299,7 +326,7 @@ onMounted(async () => {
                         :disable="!tag"
                         is-outlined
                         :is-clearable="false"
-                        @keyup.enter="applyTags()"
+                        @keydown.enter.prevent="applyTags(params, searchFn)"
                     />
                 </QItemSection>
                 <QIcon
@@ -310,16 +337,78 @@ onMounted(async () => {
                     @click="removeTag(index, params, searchFn)"
                 />
             </QItem>
-
-            <!-- <QItem>
-                <QItemSection>
-                    <QCheckbox
-                        :label="t('params.isOrdered')"
-                        v-model="params.isOrdered"
-                        toggle-indeterminate
+            <!-- Filter fields -->
+            <QItem class="row items-center">
+                <QItemLabel>
+                    {{ t('More fields') }}
+                </QItemLabel>
+                <QIcon
+                    name="add_circle"
+                    class="fill-icon-on-hover q-ml-md"
+                    size="sm"
+                    color="primary"
+                    @click="fieldFiltersValues.push({})"
+                />
+            </QItem>
+            <QItem
+                v-for="(fieldFilter, index) in fieldFiltersValues"
+                :key="index"
+                class="row items-center"
+            >
+                <QItemSection class="col">
+                    <VnSelectFilter
+                        :label="t('params.tag')"
+                        v-model="fieldFilter.name"
+                        :options="moreFields"
+                        option-label="label"
+                        dense
+                        outlined
+                        rounded
+                        :emit-value="false"
+                        use-input
+                        :is-clearable="false"
+                        @update:model-value="
+                            ($event) => {
+                                fieldFilter.name = $event.name;
+                                fieldFilter.selectedField = $event;
+                            }
+                        "
                     />
                 </QItemSection>
-            </QItem> -->
+                <QItemSection class="col">
+                    <QCheckbox
+                        v-if="fieldFilter.selectedField?.type === 'boolean'"
+                        v-model="fieldFilter.value"
+                        :label="t('params.value')"
+                        @update:model-value="applyFieldFilters(params, searchFn)"
+                    />
+                    <VnInput
+                        v-else
+                        v-model="fieldFilter.value"
+                        :label="t('params.value')"
+                        :disable="!fieldFilter.selectedField"
+                        is-outlined
+                        @keydown.enter="applyFieldFilters(params, searchFn)"
+                    />
+                </QItemSection>
+                <QIcon
+                    name="delete"
+                    class="fill-icon-on-hover q-ml-xs"
+                    size="sm"
+                    color="primary"
+                    @click="removeFieldFilter(index, params, searchFn)"
+                />
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <QCheckbox
+                        :label="t('params.isFloramondo')"
+                        v-model="params.isFloramondo"
+                        toggle-indeterminate
+                        @update:model-value="searchFn()"
+                    />
+                </QItemSection>
+            </QItem>
         </template>
     </VnFilterPanel>
 </template>
@@ -335,7 +424,13 @@ en:
         tags: Tags
         tag: Tag
         value: Value
+        isFloramondo: Floramondo
+        isActive: Active
+        description: Description
+        name: Name
+        id: ID
 es:
+    More fields: Más campos
     params:
         search: Búsqueda general
         categoryFk: Reino
@@ -345,4 +440,9 @@ es:
         tags: Etiquetas
         tag: Etiqueta
         value: Valor
+        isFloramondo: Floramondo
+        isActive: Activo
+        description: Descripción
+        name: Nombre
+        id: ID
 </i18n>
diff --git a/src/router/modules/item.js b/src/router/modules/item.js
index 41f3ec92a..a9e7090b3 100644
--- a/src/router/modules/item.js
+++ b/src/router/modules/item.js
@@ -6,6 +6,7 @@ export default {
     meta: {
         title: 'items',
         icon: 'vn:item',
+        moduleName: 'Item',
     },
     component: RouterView,
     redirect: { name: 'ItemMain' },

From 82300fd292307a89a5397397db44add3f1ca6b17 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Wed, 24 Apr 2024 11:31:37 +0200
Subject: [PATCH 04/18] refactor: refs #7239 changed french translations

---
 src/components/common/VnSmsDialog.vue | 39 ++++++++++++++++-----------
 1 file changed, 24 insertions(+), 15 deletions(-)

diff --git a/src/components/common/VnSmsDialog.vue b/src/components/common/VnSmsDialog.vue
index 59021cef4..4306beb4c 100644
--- a/src/components/common/VnSmsDialog.vue
+++ b/src/components/common/VnSmsDialog.vue
@@ -21,7 +21,8 @@ const props = defineProps({
     },
     template: {
         type: String,
-        required: true,
+        required: false,
+        default: '',
     },
     locale: {
         type: String,
@@ -49,7 +50,7 @@ updateMessage();
 
 function updateMessage() {
     const params = props.data;
-    const key = `templates['${props.template}']`;
+    const key = props.template ? `templates['${props.template}']` : '';
 
     message.value = t(key, params, { locale: locale.value });
 }
@@ -104,15 +105,14 @@ async function send() {
                     map-options
                     :input-debounce="0"
                     rounded
-                    outlined
                     dense
                 />
             </QCardSection>
             <QCardSection class="q-pb-xs">
-                <VnInput :label="t('Phone')" v-model="phone" is-outlined />
+                <VnInput :label="t('Phone')" v-model="phone" />
             </QCardSection>
             <QCardSection class="q-pb-xs">
-                <VnInput v-model="subject" :label="t('Subject')" is-outlined />
+                <VnInput v-model="subject" :label="t('Subject')" />
             </QCardSection>
             <QCardSection class="q-mb-md" q-input>
                 <QInput
@@ -125,7 +125,6 @@ async function send() {
                     :bottom-slots="true"
                     :rules="[(value) => value.length < maxLength || 'Error!']"
                     stack-label
-                    outlined
                     autofocus
                 >
                     <template #append>
@@ -135,6 +134,11 @@ async function send() {
                             @click="message = ''"
                             class="cursor-pointer"
                         />
+                        <QIcon name="info" class="cursor-pointer">
+                            <QTooltip>
+                                {{ t('messageTooltip') }}
+                            </QTooltip>
+                        </QIcon>
                     </template>
                     <template #counter>
                         <QChip :color="color" dense>
@@ -184,18 +188,20 @@ en:
     es: Spanish
     fr: French
     pt: Portuguese
+    messageTooltip: Special characters like accents counts as multiple
 es:
     Send SMS: Enviar SMS
     Language: Idioma
     Phone: Móvil
     Subject: Asunto
     Message: Mensaje
+    messageTooltip: Carácteres especiales como acentos cuentan como varios
     templates:
         pendingPayment: 'Su pedido está pendiente de pago.
             Por favor, entre en la página web y efectue el pago con tarjeta. Muchas gracias.'
         minAmount: 'Es necesario un importe mínimo de 50€ (Sin IVA) en su pedido
-            { orderId } del día { shipped } para recibirlo sin portes adicionales.'
-        orderChanges: 'Pedido {orderId} día { shipped }: { changes }'
+            { orderId } con llegada { landing } para recibirlo sin portes adicionales.'
+        orderChanges: 'Pedido {orderId} con llegada estimada día { landing }: { changes }'
     en: Inglés
     es: Español
     fr: Francés
@@ -207,12 +213,14 @@ fr:
     Phone: Mobile
     Subject: Affaire
     Message: Message
+    messageTooltip: Les caractères spéciaux comme les accents comptent comme plusieurs
     templates:
-        pendingPayment: 'Votre commande est en attente de paiement.
-            Veuillez vous connecter sur le site web et effectuer le paiement par carte. Merci beaucoup.'
-        minAmount: 'Un montant minimum de 50€ (TVA non incluse) est requis pour votre commande
-            { orderId } du { shipped } afin de la recevoir sans frais de port supplémentaires.'
-        orderChanges: 'Commande { orderId } du { shipped }: { changes }'
+        pendingPayment: 'Verdnatura : Commande en attente de règlement. Veuillez régler votre commande avant 9h.
+            Sinon elle sera décalée en fonction de vos jours de livraison . Merci'
+        minAmount: 'Verdnatura vous rappelle :
+            Montant minimum nécessaire de 50 euros pour recevoir la commande { orderId } livraison { landing }.
+            Merci.'
+        orderChanges: 'Commande {orderId} livraison {landing} indisponible/s. Désolés pour le dérangement.'
     en: Anglais
     es: Espagnol
     fr: Français
@@ -224,12 +232,13 @@ pt:
     Phone: Móvel
     Subject: Assunto
     Message: Mensagem
+    messageTooltip: Caracteres especiais como acentos contam como vários
     templates:
         pendingPayment: 'Seu pedido está pendente de pagamento.
             Por favor, acesse o site e faça o pagamento com cartão. Muito obrigado.'
         minAmount: 'É necessário um valor mínimo de 50€ (sem IVA) em seu pedido
-            { orderId } do dia { shipped } para recebê-lo sem custos de envio adicionais.'
-        orderChanges: 'Pedido { orderId } dia { shipped }: { changes }'
+            { orderId } do dia { landing } para recebê-lo sem custos de envio adicionais.'
+        orderChanges: 'Pedido { orderId } com chegada dia { landing }: { changes }'
     en: Inglês
     es: Espanhol
     fr: Francês

From a6ebe9cf19f2ddd6c05649b8096ad93367c18aae Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Wed, 24 Apr 2024 12:54:38 -0300
Subject: [PATCH 05/18] Item barcode

---
 src/css/app.scss                    |  5 ++
 src/i18n/locale/en.yml              |  1 +
 src/i18n/locale/es.yml              |  1 +
 src/pages/Item/Card/ItemBarcode.vue | 80 +++++++++++++++++++++++++++++
 src/router/modules/item.js          | 12 ++++-
 5 files changed, 98 insertions(+), 1 deletion(-)
 create mode 100644 src/pages/Item/Card/ItemBarcode.vue

diff --git a/src/css/app.scss b/src/css/app.scss
index 25b484649..9037802ad 100644
--- a/src/css/app.scss
+++ b/src/css/app.scss
@@ -119,6 +119,11 @@ select:-webkit-autofill {
     font-variation-settings: 'FILL' 1;
 }
 
+.fill-icon-on-hover:hover {
+    font-variation-settings: 'FILL' 1;
+    cursor: pointer;
+}
+
 .vn-table-separation-row {
     height: 16px !important;
     background-color: var(--vn-section-color) !important;
diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index 3ac3d18a0..338dff60b 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -1119,6 +1119,7 @@ item:
         tags: Tags
         wasteBreakdown: Waste breakdown
         itemCreate: New item
+        barcode: Barcode
     descriptor:
         item: Item
         buyer: Buyer
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index 4ecbcdbc0..7e9c5f669 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -1118,6 +1118,7 @@ item:
         tags: Etiquetas
         wasteBreakdown: Deglose de mermas
         itemCreate: Nuevo artículo
+        barcode: Códigos de barras
     descriptor:
         item: Artículo
         buyer: Comprador
diff --git a/src/pages/Item/Card/ItemBarcode.vue b/src/pages/Item/Card/ItemBarcode.vue
new file mode 100644
index 000000000..6a13a9ea7
--- /dev/null
+++ b/src/pages/Item/Card/ItemBarcode.vue
@@ -0,0 +1,80 @@
+<script setup>
+import { ref, onMounted } from 'vue';
+import { useRoute } from 'vue-router';
+import { useI18n } from 'vue-i18n';
+
+import CrudModel from 'components/CrudModel.vue';
+import VnInput from 'src/components/common/VnInput.vue';
+
+const route = useRoute();
+const { t } = useI18n();
+
+const itemBarcodeRef = ref(null);
+
+onMounted(() => {
+    if (itemBarcodeRef.value) itemBarcodeRef.value.reload();
+});
+</script>
+<template>
+    <div class="full-width flex justify-center">
+        <QPage class="card-width q-pa-lg">
+            <CrudModel
+                :data-required="{ itemFk: route.params.id }"
+                :default-remove="false"
+                :filter="{
+                    fields: ['id', 'itemFk', 'code'],
+                    where: { itemFk: route.params.id },
+                }"
+                data-key="ItemBarcodes"
+                model="ItemBarcodes"
+                ref="itemBarcodeRef"
+                url="ItemBarcodes"
+            >
+                <template #body="{ rows }">
+                    <QCard class="q-px-lg q-py-md">
+                        <div
+                            v-for="(row, index) in rows"
+                            :key="index"
+                            class="q-mb-md full-width row items-center no-wrap"
+                        >
+                            <VnInput
+                                :label="t('Code')"
+                                v-model="row.code"
+                                class="full-width"
+                            />
+                            <QIcon
+                                @click="itemBarcodeRef.remove([row])"
+                                class="cursor-pointer q-ml-md"
+                                color="primary"
+                                name="delete"
+                                size="sm"
+                            >
+                                <QTooltip class="text-no-wrap">
+                                    {{ t('Remove barcode') }}
+                                </QTooltip>
+                            </QIcon>
+                        </div>
+                        <QIcon
+                            @click="itemBarcodeRef.insert()"
+                            class="cursor-pointer fill-icon-on-hover"
+                            color="primary"
+                            name="add_circle"
+                            size="sm"
+                        >
+                            <QTooltip>
+                                {{ t('Add barcode') }}
+                            </QTooltip>
+                        </QIcon>
+                    </QCard>
+                </template>
+            </CrudModel>
+        </QPage>
+    </div>
+</template>
+
+<i18n>
+es:
+    Code: Código
+    Remove barcode: Quitar código de barras
+    Add barcode: Añadir código de barras
+</i18n>
diff --git a/src/router/modules/item.js b/src/router/modules/item.js
index 41f3ec92a..35abbb5c7 100644
--- a/src/router/modules/item.js
+++ b/src/router/modules/item.js
@@ -6,12 +6,13 @@ export default {
     meta: {
         title: 'items',
         icon: 'vn:item',
+        moduleName: 'Item',
     },
     component: RouterView,
     redirect: { name: 'ItemMain' },
     menus: {
         main: ['ItemList', 'WasteBreakdown'],
-        card: ['ItemBasicData'],
+        card: ['ItemBasicData', 'ItemBarcode'],
     },
     children: [
         {
@@ -94,6 +95,15 @@ export default {
                     },
                     component: () => import('src/pages/Item/Card/ItemBasicData.vue'),
                 },
+                {
+                    path: 'barcode',
+                    name: 'ItemBarcode',
+                    meta: {
+                        title: 'barcode',
+                        icon: 'vn:barcode',
+                    },
+                    component: () => import('src/pages/Item/Card/ItemBarcode.vue'),
+                },
             ],
         },
     ],

From 84a9dc831906ab02c253026b22b8073301df3fd6 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Wed, 24 Apr 2024 17:30:53 -0300
Subject: [PATCH 06/18] Fix ItemDescriptor labels

---
 src/pages/Item/Card/ItemDescriptor.vue | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/src/pages/Item/Card/ItemDescriptor.vue b/src/pages/Item/Card/ItemDescriptor.vue
index 981de0632..77b078296 100644
--- a/src/pages/Item/Card/ItemDescriptor.vue
+++ b/src/pages/Item/Card/ItemDescriptor.vue
@@ -271,14 +271,27 @@ const openCloneDialog = async () => {
             <VnLv :label="t('item.descriptor.buyer')">
                 <template #value>
                     <span class="link">
-                        {{ t('item.descriptor.buyer') }}
+                        {{ entity.itemType?.worker?.user?.name }}
                         <WorkerDescriptorProxy :id="entity.itemType?.worker?.id" />
                     </span>
                 </template>
             </VnLv>
-            <VnLv :label="t('item.descriptor.color')" :value="entity.value5"> </VnLv>
-            <VnLv :label="t('item.descriptor.color')" :value="entity.value6" />
-            <VnLv :label="t('item.descriptor.stems')" :value="entity.value7" />
+            <VnLv
+                v-if="entity.value5"
+                :label="t('item.descriptor.color')"
+                :value="entity.value5"
+            >
+            </VnLv>
+            <VnLv
+                v-if="entity.value6"
+                :label="t('item.descriptor.category')"
+                :value="entity.value6"
+            />
+            <VnLv
+                v-if="entity.value7"
+                :label="t('item.descriptor.stems')"
+                :value="entity.value7"
+            />
         </template>
         <template #actions="{}">
             <QCardActions class="row justify-center">

From 969087a34777075715c870943508266ad656ac73 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Wed, 24 Apr 2024 17:48:47 -0300
Subject: [PATCH 07/18] Remove unused things

---
 src/pages/Item/ItemListFilter.vue | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/pages/Item/ItemListFilter.vue b/src/pages/Item/ItemListFilter.vue
index ad6167014..e0993356c 100644
--- a/src/pages/Item/ItemListFilter.vue
+++ b/src/pages/Item/ItemListFilter.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { ref, watch, computed } from 'vue';
+import { ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { onMounted } from 'vue';
 import { useStateStore } from 'stores/useStateStore';
@@ -160,7 +160,6 @@ onMounted(async () => {
         auto-load
         @on-fetch="(data) => (tagOptions = data)"
     />
-    <pre>{{ itemTypesFilter }}</pre>
     <VnFilterPanel
         :data-key="props.dataKey"
         :search-button="true"

From ccc68851728ab8cea17699c581ff7442924419c9 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Thu, 25 Apr 2024 04:41:44 +0000
Subject: [PATCH 08/18] Fix: minor bugs, layout & vnlocation

---
 .../components/CustomerAddressEdit.vue        | 65 ++++++++++---------
 1 file changed, 34 insertions(+), 31 deletions(-)

diff --git a/src/pages/Customer/components/CustomerAddressEdit.vue b/src/pages/Customer/components/CustomerAddressEdit.vue
index 8f4be1342..c3c5c82ae 100644
--- a/src/pages/Customer/components/CustomerAddressEdit.vue
+++ b/src/pages/Customer/components/CustomerAddressEdit.vue
@@ -169,21 +169,9 @@ function handleLocation(data, location) {
                 <div class="col">
                     <VnInput :label="t('Consignee')" clearable v-model="data.nickname" />
                 </div>
-                <div class="col">
-                    <VnInput :label="t('Street')" clearable v-model="data.street" />
-                </div>
             </VnRow>
 
             <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <VnLocation
-                        :rules="validate('Worker.postcode')"
-                        :roles-allowed-to-create="['deliveryAssistant']"
-                        :options="postcodesOptions"
-                        v-model="data.location"
-                        @update:model-value="(location) => handleLocation(data, location)"
-                    ></VnLocation>
-                </div>
                 <div class="col">
                     <VnSelectFilter
                         :label="t('Agency')"
@@ -195,25 +183,6 @@ function handleLocation(data, location) {
                         v-model="data.agencyModeFk"
                     />
                 </div>
-                <div class="col">
-                    <VnInput :label="t('Phone')" clearable v-model="data.phone" />
-                </div>
-                <div class="col">
-                    <VnInput :label="t('Mobile')" clearable v-model="data.mobile" />
-                </div>
-            </VnRow>
-
-            <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <VnSelectFilter
-                        :label="t('Incoterms')"
-                        :options="incoterms"
-                        hide-selected
-                        option-label="name"
-                        option-value="code"
-                        v-model="data.incotermsFk"
-                    />
-                </div>
                 <div class="col">
                     <VnSelectDialog
                         :label="t('Customs agent')"
@@ -230,6 +199,40 @@ function handleLocation(data, location) {
                 </div>
             </VnRow>
 
+            <VnRow class="row q-gutter-md q-mb-md">
+                <div class="col">
+                    <VnLocation
+                        :rules="validate('Worker.postcode')"
+                        :roles-allowed-to-create="['deliveryAssistant']"
+                        :options="postcodesOptions"
+                        v-model="data.postalCode"
+                        @update:model-value="(location) => handleLocation(data, location)"
+                    ></VnLocation>
+                </div>
+                <div class="col">
+                    <VnInput :label="t('Street')" clearable v-model="data.street" />
+                </div>
+            </VnRow>
+
+            <VnRow class="row q-gutter-md q-mb-md">
+                <div class="col">
+                    <VnSelectFilter
+                        :label="t('Incoterms')"
+                        :options="incoterms"
+                        hide-selected
+                        option-label="name"
+                        option-value="code"
+                        v-model="data.incotermsFk"
+                    />
+                </div>
+                <div class="col">
+                    <VnInput :label="t('Phone')" clearable v-model="data.phone" />
+                </div>
+                <div class="col">
+                    <VnInput :label="t('Mobile')" clearable v-model="data.mobile" />
+                </div>
+            </VnRow>
+
             <h4 class="q-mb-xs">{{ t('Notes') }}</h4>
             <VnRow
                 :key="index"

From 6e5ac0eeb9088e8765c267c4d9dc848728515d43 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Thu, 25 Apr 2024 14:44:32 +0200
Subject: [PATCH 09/18] fix: CustomerAdress layout

---
 .../components/CustomerAddressEdit.vue        | 68 +++++++++----------
 1 file changed, 33 insertions(+), 35 deletions(-)

diff --git a/src/pages/Customer/components/CustomerAddressEdit.vue b/src/pages/Customer/components/CustomerAddressEdit.vue
index c3c5c82ae..dd2717694 100644
--- a/src/pages/Customer/components/CustomerAddressEdit.vue
+++ b/src/pages/Customer/components/CustomerAddressEdit.vue
@@ -169,6 +169,21 @@ function handleLocation(data, location) {
                 <div class="col">
                     <VnInput :label="t('Consignee')" clearable v-model="data.nickname" />
                 </div>
+                <div class="col">
+                    <VnInput :label="t('Street')" clearable v-model="data.street" />
+                </div>
+            </VnRow>
+
+            <VnRow class="row q-gutter-md q-mb-md">
+                <div class="col">
+                    <VnLocation
+                        :rules="validate('Worker.postcode')"
+                        :roles-allowed-to-create="['deliveryAssistant']"
+                        :options="postcodesOptions"
+                        v-model="data.postalCode"
+                        @update:model-value="(location) => handleLocation(data, location)"
+                    ></VnLocation>
+                </div>
             </VnRow>
 
             <VnRow class="row q-gutter-md q-mb-md">
@@ -183,6 +198,24 @@ function handleLocation(data, location) {
                         v-model="data.agencyModeFk"
                     />
                 </div>
+                <div class="col">
+                    <VnInput :label="t('Phone')" clearable v-model="data.phone" />
+                </div>
+                <div class="col">
+                    <VnInput :label="t('Mobile')" clearable v-model="data.mobile" />
+                </div>
+            </VnRow>
+            <VnRow class="row q-gutter-md q-mb-md">
+                <div class="col">
+                    <VnSelectFilter
+                        :label="t('Incoterms')"
+                        :options="incoterms"
+                        hide-selected
+                        option-label="name"
+                        option-value="code"
+                        v-model="data.incotermsFk"
+                    />
+                </div>
                 <div class="col">
                     <VnSelectDialog
                         :label="t('Customs agent')"
@@ -198,41 +231,6 @@ function handleLocation(data, location) {
                     </VnSelectDialog>
                 </div>
             </VnRow>
-
-            <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <VnLocation
-                        :rules="validate('Worker.postcode')"
-                        :roles-allowed-to-create="['deliveryAssistant']"
-                        :options="postcodesOptions"
-                        v-model="data.postalCode"
-                        @update:model-value="(location) => handleLocation(data, location)"
-                    ></VnLocation>
-                </div>
-                <div class="col">
-                    <VnInput :label="t('Street')" clearable v-model="data.street" />
-                </div>
-            </VnRow>
-
-            <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <VnSelectFilter
-                        :label="t('Incoterms')"
-                        :options="incoterms"
-                        hide-selected
-                        option-label="name"
-                        option-value="code"
-                        v-model="data.incotermsFk"
-                    />
-                </div>
-                <div class="col">
-                    <VnInput :label="t('Phone')" clearable v-model="data.phone" />
-                </div>
-                <div class="col">
-                    <VnInput :label="t('Mobile')" clearable v-model="data.mobile" />
-                </div>
-            </VnRow>
-
             <h4 class="q-mb-xs">{{ t('Notes') }}</h4>
             <VnRow
                 :key="index"

From 443f4a4443c5a452264313eda5293650ab0a67d6 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Fri, 26 Apr 2024 07:49:28 +0200
Subject: [PATCH 10/18] refactor: refs #7239 changed spanish translations

---
 src/components/common/VnSmsDialog.vue | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/components/common/VnSmsDialog.vue b/src/components/common/VnSmsDialog.vue
index 4306beb4c..833f54942 100644
--- a/src/components/common/VnSmsDialog.vue
+++ b/src/components/common/VnSmsDialog.vue
@@ -199,8 +199,9 @@ es:
     templates:
         pendingPayment: 'Su pedido está pendiente de pago.
             Por favor, entre en la página web y efectue el pago con tarjeta. Muchas gracias.'
-        minAmount: 'Es necesario un importe mínimo de 50€ (Sin IVA) en su pedido
-            { orderId } con llegada { landing } para recibirlo sin portes adicionales.'
+        minAmount: 'Te recordamos que tu pedido {orderId} es inferior a 50€.
+            Te recomendamos amplíes para no generar costes extra provocarán un incremento de tu tarifa.
+            ¡Un saludo!'
         orderChanges: 'Pedido {orderId} con llegada estimada día { landing }: { changes }'
     en: Inglés
     es: Español

From c56b6b2dbc5a2b6983cab7461836de2bd530d8cd Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Fri, 26 Apr 2024 08:22:08 +0200
Subject: [PATCH 11/18] refactor: better syntax

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

diff --git a/src/components/common/VnSmsDialog.vue b/src/components/common/VnSmsDialog.vue
index 833f54942..5b192f95d 100644
--- a/src/components/common/VnSmsDialog.vue
+++ b/src/components/common/VnSmsDialog.vue
@@ -200,7 +200,7 @@ es:
         pendingPayment: 'Su pedido está pendiente de pago.
             Por favor, entre en la página web y efectue el pago con tarjeta. Muchas gracias.'
         minAmount: 'Te recordamos que tu pedido {orderId} es inferior a 50€.
-            Te recomendamos amplíes para no generar costes extra provocarán un incremento de tu tarifa.
+            Te recomendamos amplíes para no generar costes extra, provocarán un incremento de tu tarifa.
             ¡Un saludo!'
         orderChanges: 'Pedido {orderId} con llegada estimada día { landing }: { changes }'
     en: Inglés

From 88e1e577c4f7970a80fee568142539b839b918a6 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Fri, 26 Apr 2024 13:10:29 +0200
Subject: [PATCH 12/18] hotFix: refs #6636 fix ref optionsList

---
 src/pages/Claim/Card/ClaimBasicData.vue | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/pages/Claim/Card/ClaimBasicData.vue b/src/pages/Claim/Card/ClaimBasicData.vue
index 56717c628..47d1ac1c6 100644
--- a/src/pages/Claim/Card/ClaimBasicData.vue
+++ b/src/pages/Claim/Card/ClaimBasicData.vue
@@ -41,6 +41,7 @@ const workers = ref([]);
 const workersCopy = ref([]);
 const claimStates = ref([]);
 const claimStatesCopy = ref([]);
+const optionsList = ref([]);
 
 function setWorkers(data) {
     workers.value = data;
@@ -51,9 +52,9 @@ function setClaimStates(data) {
     claimStates.value = data;
     claimStatesCopy.value = data;
 }
-let optionsList;
+
 async function getEnumValues() {
-    optionsList = [{ id: null, description: t('claim.basicData.null') }];
+    optionsList.value = [{ id: null, description: t('claim.basicData.null') }];
     const { data } = await axios.get(`Applications/get-enum-values`, {
         params: {
             schema: 'vn',
@@ -62,8 +63,9 @@ async function getEnumValues() {
         },
     });
     for (let value of data)
-        optionsList.push({ id: value, description: t(`claim.basicData.${value}`) });
+        optionsList.value.push({ id: value, description: t(`claim.basicData.${value}`) });
 }
+
 getEnumValues();
 
 const workerFilter = {

From 485e916f55d08cd576e00b0f397c61fe57cad02f Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Fri, 26 Apr 2024 09:16:26 -0300
Subject: [PATCH 13/18] Add input focus

---
 src/pages/Item/Card/ItemBarcode.vue | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/src/pages/Item/Card/ItemBarcode.vue b/src/pages/Item/Card/ItemBarcode.vue
index 6a13a9ea7..d0beab350 100644
--- a/src/pages/Item/Card/ItemBarcode.vue
+++ b/src/pages/Item/Card/ItemBarcode.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { ref, onMounted } from 'vue';
+import { ref, onMounted, nextTick } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 
@@ -11,7 +11,20 @@ const { t } = useI18n();
 
 const itemBarcodeRef = ref(null);
 
-onMounted(() => {
+const insertRow = () => {
+    itemBarcodeRef.value.insert();
+    focusLastInput();
+};
+
+const focusLastInput = () => {
+    nextTick(() => {
+        const inputs = document.querySelectorAll('[focusable-input]');
+        const lastInput = inputs[inputs.length - 1];
+        if (lastInput) lastInput.focus();
+    });
+};
+
+onMounted(async () => {
     if (itemBarcodeRef.value) itemBarcodeRef.value.reload();
 });
 </script>
@@ -31,7 +44,7 @@ onMounted(() => {
                 url="ItemBarcodes"
             >
                 <template #body="{ rows }">
-                    <QCard class="q-px-lg q-py-md">
+                    <QCard v-if="rows.length > 0" class="q-px-lg q-py-md">
                         <div
                             v-for="(row, index) in rows"
                             :key="index"
@@ -41,6 +54,7 @@ onMounted(() => {
                                 :label="t('Code')"
                                 v-model="row.code"
                                 class="full-width"
+                                focusable-input
                             />
                             <QIcon
                                 @click="itemBarcodeRef.remove([row])"
@@ -55,7 +69,7 @@ onMounted(() => {
                             </QIcon>
                         </div>
                         <QIcon
-                            @click="itemBarcodeRef.insert()"
+                            @click="insertRow()"
                             class="cursor-pointer fill-icon-on-hover"
                             color="primary"
                             name="add_circle"

From 4792485214be8569bac2e6089a2271840da1920e Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Fri, 26 Apr 2024 13:50:39 -0300
Subject: [PATCH 14/18] Translate more fields label

---
 src/pages/Item/ItemListFilter.vue | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/src/pages/Item/ItemListFilter.vue b/src/pages/Item/ItemListFilter.vue
index e0993356c..49aeac29f 100644
--- a/src/pages/Item/ItemListFilter.vue
+++ b/src/pages/Item/ItemListFilter.vue
@@ -6,7 +6,7 @@ import { useStateStore } from 'stores/useStateStore';
 
 import FetchData from 'components/FetchData.vue';
 import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
-import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import { QCheckbox } from 'quasar';
 
@@ -119,10 +119,12 @@ onMounted(async () => {
     const _moreFields = ['id', 'description', 'name', 'isActive'];
 
     _moreFields.forEach((field) => {
+        console.log(field);
         let prop = properties[field];
+        const label = t(`params.${field}`);
         moreFields.value.push({
             name: field,
-            label: prop ? prop.description : field,
+            label,
             type: prop ? prop.type : null,
         });
     });
@@ -183,7 +185,7 @@ onMounted(async () => {
             </QItem>
             <QItem>
                 <QItemSection>
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('params.categoryFk')"
                         v-model="params.categoryFk"
                         @update:model-value="
@@ -201,7 +203,7 @@ onMounted(async () => {
             </QItem>
             <QItem>
                 <QItemSection>
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('params.typeFk')"
                         v-model="params.typeFk"
                         @update:model-value="searchFn()"
@@ -223,12 +225,12 @@ onMounted(async () => {
                                 </QItemSection>
                             </QItem>
                         </template>
-                    </VnSelectFilter>
+                    </VnSelect>
                 </QItemSection>
             </QItem>
             <QItem>
                 <QItemSection>
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('params.buyerFk')"
                         v-model="params.buyerFk"
                         @update:model-value="searchFn()"
@@ -244,7 +246,7 @@ onMounted(async () => {
             </QItem>
             <QItem>
                 <QItemSection>
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('params.supplierFk')"
                         v-model="params.supplierFk"
                         @update:model-value="searchFn()"
@@ -265,7 +267,7 @@ onMounted(async () => {
                                 </QItemSection>
                             </QItem>
                         </template>
-                    </VnSelectFilter>
+                    </VnSelect>
                 </QItemSection>
             </QItem>
             <!-- Tags filter -->
@@ -287,7 +289,7 @@ onMounted(async () => {
                 class="row items-center"
             >
                 <QItemSection class="col">
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('params.tag')"
                         v-model="tag.selectedTag"
                         :options="tagOptions"
@@ -302,7 +304,7 @@ onMounted(async () => {
                     />
                 </QItemSection>
                 <QItemSection class="col">
-                    <VnSelectFilter
+                    <VnSelect
                         v-if="!tag?.selectedTag?.isFree && tag.valueOptions"
                         :label="t('params.tag')"
                         v-model="tag.value"
@@ -355,7 +357,7 @@ onMounted(async () => {
                 class="row items-center"
             >
                 <QItemSection class="col">
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('params.tag')"
                         v-model="fieldFilter.name"
                         :options="moreFields"
@@ -427,7 +429,7 @@ en:
         isActive: Active
         description: Description
         name: Name
-        id: ID
+        id: Id
 es:
     More fields: Más campos
     params:
@@ -443,5 +445,5 @@ es:
         isActive: Activo
         description: Descripción
         name: Nombre
-        id: ID
+        id: Id
 </i18n>

From ad085974dac83e25e0ef7edc82ef54e91d2c9e55 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Fri, 26 Apr 2024 13:51:20 -0300
Subject: [PATCH 15/18] remove console.log

---
 src/pages/Item/ItemListFilter.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/pages/Item/ItemListFilter.vue b/src/pages/Item/ItemListFilter.vue
index 49aeac29f..f383a1e18 100644
--- a/src/pages/Item/ItemListFilter.vue
+++ b/src/pages/Item/ItemListFilter.vue
@@ -119,7 +119,6 @@ onMounted(async () => {
     const _moreFields = ['id', 'description', 'name', 'isActive'];
 
     _moreFields.forEach((field) => {
-        console.log(field);
         let prop = properties[field];
         const label = t(`params.${field}`);
         moreFields.value.push({

From 4282463e51e8f140be44d5549297ad62ada548a7 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Fri, 26 Apr 2024 14:29:11 -0300
Subject: [PATCH 16/18] Fill filter fields with user params

---
 src/pages/Item/ItemListFilter.vue | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/src/pages/Item/ItemListFilter.vue b/src/pages/Item/ItemListFilter.vue
index f383a1e18..2e89cdbcf 100644
--- a/src/pages/Item/ItemListFilter.vue
+++ b/src/pages/Item/ItemListFilter.vue
@@ -127,6 +127,17 @@ onMounted(async () => {
             type: prop ? prop.type : null,
         });
     });
+
+    // Fill fieldFiltersValues with existent userParams
+    if (arrayData.store?.userParams) {
+        fieldFiltersValues.value = Object.entries(arrayData.store?.userParams)
+            .filter(([key, value]) => value && _moreFields.includes(key))
+            .map(([key, value]) => ({
+                name: key,
+                value,
+                selectedField: moreFields.value.find((field) => field.name === key),
+            }));
+    }
 });
 </script>
 

From ce55109dd31dd19dd579b74391c35f9b1d0cca30 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Fri, 26 Apr 2024 15:41:03 -0300
Subject: [PATCH 17/18] fix more fields label when selected

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

diff --git a/src/pages/Item/ItemListFilter.vue b/src/pages/Item/ItemListFilter.vue
index 2e89cdbcf..98bc74b20 100644
--- a/src/pages/Item/ItemListFilter.vue
+++ b/src/pages/Item/ItemListFilter.vue
@@ -369,7 +369,7 @@ onMounted(async () => {
                 <QItemSection class="col">
                     <VnSelect
                         :label="t('params.tag')"
-                        v-model="fieldFilter.name"
+                        :model-value="fieldFilter.selectedField"
                         :options="moreFields"
                         option-label="label"
                         dense

From 1e1c88e55c6aa9934d6729271e469085fccaf31c Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 26 Apr 2024 21:05:45 +0200
Subject: [PATCH 18/18] fix: reset fieldFilter.value when change model

---
 src/pages/Item/ItemListFilter.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/pages/Item/ItemListFilter.vue b/src/pages/Item/ItemListFilter.vue
index 98bc74b20..a51f9ebb4 100644
--- a/src/pages/Item/ItemListFilter.vue
+++ b/src/pages/Item/ItemListFilter.vue
@@ -381,6 +381,7 @@ onMounted(async () => {
                         @update:model-value="
                             ($event) => {
                                 fieldFilter.name = $event.name;
+                                fieldFilter.value = null;
                                 fieldFilter.selectedField = $event;
                             }
                         "