CHANGELOG.md

@@ -5,6 +5,8 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [2420.01]
+
 ## [2418.01]
 
 ## [2416.01] - 2024-04-18

package.json

@@ -1,6 +1,6 @@
 {
     "name": "salix-front",
-    "version": "24.18.0",
+    "version": "24.20.0",
     "description": "Salix frontend",
     "productName": "Salix",
     "author": "Verdnatura",

src/components/CreateBankEntityForm.vue

@@ -3,7 +3,7 @@ import { reactive, ref, onMounted, nextTick } from 'vue';
 import { useI18n } from 'vue-i18n';
 import VnInput from 'src/components/common/VnInput.vue';
 
-import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
 import FetchData from 'components/FetchData.vue';
 import VnRow from 'components/ui/VnRow.vue';
 import FormModelPopup from './FormModelPopup.vue';
@@ -78,7 +78,7 @@ onMounted(async () => {
             </VnRow>
             <VnRow class="row q-gutter-md q-mb-md">
                 <div class="col">
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('country')"
                         v-model="data.countryFk"
                         :options="countriesOptions"

src/components/CreateManualInvoiceForm.vue

@@ -5,7 +5,7 @@ import { useRouter } from 'vue-router';
 
 import FetchData from 'components/FetchData.vue';
 import VnRow from 'components/ui/VnRow.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 FormModelPopup from './FormModelPopup.vue';
 import VnInputDate from './common/VnInputDate.vue';
@@ -73,7 +73,7 @@ const onDataSaved = async (formData, requestResponse) => {
             </span>
             <VnRow class="row q-gutter-md q-mb-md">
                 <div class="col">
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('Ticket')"
                         :options="ticketsOptions"
                         hide-selected
@@ -92,13 +92,13 @@ const onDataSaved = async (formData, requestResponse) => {
                                 </QItemSection>
                             </QItem>
                         </template>
-                    </VnSelectFilter>
+                    </VnSelect>
                 </div>
                 <span class="row items-center" style="max-width: max-content">{{
                     t('Or')
                 }}</span>
                 <div class="col">
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('Client')"
                         :options="clientsOptions"
                         hide-selected
@@ -114,7 +114,7 @@ const onDataSaved = async (formData, requestResponse) => {
             </VnRow>
             <VnRow class="row q-gutter-md q-mb-md">
                 <div class="col">
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('Serial')"
                         :options="invoiceOutSerialsOptions"
                         hide-selected
@@ -125,7 +125,7 @@ const onDataSaved = async (formData, requestResponse) => {
                     />
                 </div>
                 <div class="col">
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('Area')"
                         :options="taxAreasOptions"
                         hide-selected

src/components/CreateNewCityForm.vue

@@ -4,7 +4,7 @@ import { useI18n } from 'vue-i18n';
 
 import FetchData from 'components/FetchData.vue';
 import VnRow from 'components/ui/VnRow.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 FormModelPopup from './FormModelPopup.vue';
 
@@ -48,7 +48,7 @@ const onDataSaved = (dataSaved) => {
                     />
                 </div>
                 <div class="col">
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('Province')"
                         :options="provincesOptions"
                         hide-selected

src/components/CreateNewPostcodeForm.vue

@@ -4,7 +4,7 @@ import { useI18n } from 'vue-i18n';
 
 import FetchData from 'components/FetchData.vue';
 import VnRow from 'components/ui/VnRow.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 CreateNewCityForm from './CreateNewCityForm.vue';
 import CreateNewProvinceForm from './CreateNewProvinceForm.vue';
@@ -138,7 +138,7 @@ const onProvinceCreated = async ({ name }, formData) => {
                     </VnSelectDialog>
                 </div>
                 <div class="col">
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('Country')"
                         :options="countriesOptions"
                         hide-selected

src/components/CreateNewProvinceForm.vue

@@ -4,7 +4,7 @@ import { useI18n } from 'vue-i18n';
 
 import FetchData from 'components/FetchData.vue';
 import VnRow from 'components/ui/VnRow.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 FormModelPopup from './FormModelPopup.vue';
 
@@ -48,7 +48,7 @@ const onDataSaved = (dataSaved) => {
                     />
                 </div>
                 <div class="col">
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('Autonomy')"
                         :options="autonomiesOptions"
                         hide-selected

src/components/CreateThermographForm.vue

@@ -4,7 +4,7 @@ import { useI18n } from 'vue-i18n';
 
 import FetchData from 'components/FetchData.vue';
 import VnRow from 'components/ui/VnRow.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 FormModelPopup from './FormModelPopup.vue';
 
@@ -64,7 +64,7 @@ const onDataSaved = (dataSaved) => {
                 </div>
 
                 <div class="col">
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('Model')"
                         :options="thermographsModels"
                         hide-selected
@@ -78,7 +78,7 @@ const onDataSaved = (dataSaved) => {
             </VnRow>
             <VnRow class="row q-gutter-md q-mb-xl">
                 <div class="col">
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('Warehouse')"
                         :options="warehousesOptions"
                         hide-selected
@@ -89,7 +89,7 @@ const onDataSaved = (dataSaved) => {
                     />
                 </div>
                 <div class="col">
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('Temperature')"
                         :options="temperaturesOptions"
                         hide-selected

src/components/EditPictureForm.vue

@@ -2,7 +2,7 @@
 import { reactive, computed, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 
-import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
 import FetchData from 'components/FetchData.vue';
 import VnRow from 'components/ui/VnRow.vue';
 import VnInput from 'src/components/common/VnInput.vue';
@@ -293,7 +293,7 @@ const makeRequest = async () => {
                     </VnRow>
                     <VnRow class="row q-gutter-md q-mb-md">
                         <div class="col">
-                            <VnSelectFilter
+                            <VnSelect
                                 :label="t('Orientation')"
                                 :options="viewportTypes"
                                 hide-selected

src/components/EditTableCellValueForm.vue

@@ -1,9 +1,12 @@
 <script setup>
-import { ref, reactive } from 'vue';
+import { ref, markRaw } from 'vue';
 import { useI18n } from 'vue-i18n';
 
-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 VnInputDate from 'src/components/common/VnInputDate.vue';
+import VnRow from 'components/ui/VnRow.vue';
+import { QCheckbox } from 'quasar';
 
 import axios from 'axios';
 import useNotify from 'src/composables/useNotify.js';
@@ -28,11 +31,16 @@ const $props = defineProps({
 const { t } = useI18n();
 const { notify } = useNotify();
 
-const formData = reactive({
-    field: null,
-    newValue: null,
-});
+const inputs = {
+    input: markRaw(VnInput),
+    number: markRaw(VnInput),
+    date: markRaw(VnInputDate),
+    checkbox: markRaw(QCheckbox),
+    select: markRaw(VnSelect),
+};
 
+const newValue = ref(null);
+const selectedField = ref(null);
 const closeButton = ref(null);
 const isLoading = ref(false);
 
@@ -47,8 +55,8 @@ const submitData = async () => {
         isLoading.value = true;
         const rowsToEdit = $props.rows.map((row) => ({ id: row.id, itemFk: row.itemFk }));
         const payload = {
-            field: formData.field,
-            newValue: formData.newValue,
+            field: selectedField.value.field,
+            newValue: newValue.value,
             lines: rowsToEdit,
         };
 
@@ -75,19 +83,20 @@ const closeForm = () => {
             <span class="countLines">{{ ` ${rows.length} ` }}</span>
             <span class="title">{{ t('buy(s)') }}</span>
             <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <VnSelectFilter
-                        :label="t('Field to edit')"
-                        :options="fieldsOptions"
-                        hide-selected
-                        option-label="label"
-                        option-value="field"
-                        v-model="formData.field"
-                    />
-                </div>
-                <div class="col">
-                    <VnInput :label="t('Value')" v-model="formData.newValue" />
-                </div>
+                <VnSelect
+                    :label="t('Field to edit')"
+                    :options="fieldsOptions"
+                    hide-selected
+                    option-label="label"
+                    v-model="selectedField"
+                />
+                <component
+                    :is="inputs[selectedField?.component || 'input']"
+                    v-bind="selectedField?.attrs || {}"
+                    v-model="newValue"
+                    :label="t('Value')"
+                    style="width: 200px"
+                />
             </VnRow>
             <div class="q-mt-lg row justify-end">
                 <QBtn

src/components/FilterItemForm.vue

@@ -6,7 +6,7 @@ import { useRoute } from 'vue-router';
 import VnRow from 'components/ui/VnRow.vue';
 import FetchData from 'components/FetchData.vue';
 import VnInput from 'src/components/common/VnInput.vue';
-import VnSelectFilter from 'components/common/VnSelectFilter.vue';
+import VnSelect from 'components/common/VnSelect.vue';
 import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue';
 
 import axios from 'axios';
@@ -160,7 +160,7 @@ const selectItem = ({ id }) => {
                     />
                 </div>
                 <div class="col">
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('entry.buys.producer')"
                         :options="producersOptions"
                         hide-selected
@@ -170,7 +170,7 @@ const selectItem = ({ id }) => {
                     />
                 </div>
                 <div class="col">
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('entry.buys.type')"
                         :options="ItemTypesOptions"
                         hide-selected
@@ -180,7 +180,7 @@ const selectItem = ({ id }) => {
                     />
                 </div>
                 <div class="col">
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('entry.buys.color')"
                         :options="InksOptions"
                         hide-selected

src/components/FilterTravelForm.vue

@@ -5,7 +5,7 @@ import { useI18n } from 'vue-i18n';
 import VnRow from 'components/ui/VnRow.vue';
 import FetchData from 'components/FetchData.vue';
 import VnInputDate from 'src/components/common/VnInputDate.vue';
-import VnSelectFilter from 'components/common/VnSelectFilter.vue';
+import VnSelect from 'components/common/VnSelect.vue';
 import TravelDescriptorProxy from 'src/pages/Travel/Card/TravelDescriptorProxy.vue';
 
 import axios from 'axios';
@@ -146,7 +146,7 @@ const selectTravel = ({ id }) => {
             <h1 class="title">{{ t('Filter travels') }}</h1>
             <VnRow class="row q-gutter-md q-mb-md">
                 <div class="col">
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('entry.basicData.agency')"
                         :options="agenciesOptions"
                         hide-selected
@@ -156,7 +156,7 @@ const selectTravel = ({ id }) => {
                     />
                 </div>
                 <div class="col">
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('entry.basicData.warehouseOut')"
                         :options="warehousesOptions"
                         hide-selected
@@ -166,7 +166,7 @@ const selectTravel = ({ id }) => {
                     />
                 </div>
                 <div class="col">
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('entry.basicData.warehouseIn')"
                         :options="warehousesOptions"
                         hide-selected

src/components/FormModel.vue

@@ -102,7 +102,7 @@ onMounted(async () => {
 });
 
 onBeforeRouteLeave((to, from, next) => {
-    if (hasChanges.value)
+    if (hasChanges.value && $props.observeFormChanges)
         quasar.dialog({
             component: VnConfirm,
             componentProps: {

src/components/FormModelPopup.vue

@@ -76,25 +76,25 @@ defineExpose({
             <p>{{ subtitle }}</p>
             <slot name="form-inputs" :data="data" :validate="validate" />
             <div class="q-mt-lg row justify-end">
-                <QBtn
-                    :label="t('globals.save')"
-                    :title="t('globals.save')"
-                    type="submit"
-                    color="primary"
-                    :disabled="isLoading"
-                    :loading="isLoading"
-                />
                 <QBtn
                     :label="t('globals.cancel')"
                     :title="t('globals.cancel')"
                     type="reset"
                     color="primary"
                     flat
-                    class="q-ml-sm"
                     :disabled="isLoading"
                     :loading="isLoading"
                     v-close-popup
                 />
+                <QBtn
+                    :label="t('globals.save')"
+                    :title="t('globals.save')"
+                    type="submit"
+                    color="primary"
+                    class="q-ml-sm"
+                    :disabled="isLoading"
+                    :loading="isLoading"
+                />
             </div>
         </template>
     </FormModel>

src/components/FormPopup.vue

@@ -56,14 +56,6 @@ const closeForm = () => {
             <p>{{ subtitle }}</p>
             <slot name="form-inputs" />
             <div class="q-mt-lg row justify-end">
-                <QBtn
-                    v-if="defaultSubmitButton"
-                    :label="customSubmitButtonLabel || t('globals.save')"
-                    type="submit"
-                    color="primary"
-                    :disabled="isLoading"
-                    :loading="isLoading"
-                />
                 <QBtn
                     v-if="defaultCancelButton"
                     :label="t('globals.cancel')"
@@ -74,6 +66,14 @@ const closeForm = () => {
                     :loading="isLoading"
                     v-close-popup
                 />
+                <QBtn
+                    v-if="defaultSubmitButton"
+                    :label="customSubmitButtonLabel || t('globals.save')"
+                    type="submit"
+                    color="primary"
+                    :disabled="isLoading"
+                    :loading="isLoading"
+                />
                 <slot name="customButtons" />
             </div>
         </QCard>

src/components/ItemsFilterPanel.vue

@@ -0,0 +1,359 @@
+<script setup>
+import { computed, ref } from 'vue';
+import { useI18n } from 'vue-i18n';
+
+import VnInput from 'components/common/VnInput.vue';
+import FetchData from 'components/FetchData.vue';
+import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
+import VnSelectFilter from 'components/common/VnSelectFilter.vue';
+import VnFilterPanelChip from 'components/ui/VnFilterPanelChip.vue';
+
+import axios from 'axios';
+
+const { t } = useI18n();
+const props = defineProps({
+    dataKey: {
+        type: String,
+        required: true,
+    },
+    customTags: {
+        type: Array,
+        default: () => [],
+    },
+    exprBuilder: {
+        type: Function,
+        default: null,
+    },
+});
+
+const itemCategories = ref([]);
+const selectedCategoryFk = ref(null);
+const selectedTypeFk = ref(null);
+const itemTypesOptions = ref([]);
+const suppliersOptions = ref([]);
+const tagOptions = ref([]);
+const tagValues = ref([]);
+
+const categoryList = computed(() => {
+    return (itemCategories.value || [])
+        .filter((category) => category.display)
+        .map((category) => ({
+            ...category,
+            icon: `vn:${(category.icon || '').split('-')[1]}`,
+        }));
+});
+
+const selectedCategory = computed(() =>
+    (itemCategories.value || []).find(
+        (category) => category?.id === selectedCategoryFk.value
+    )
+);
+
+const selectedType = computed(() => {
+    return (itemTypesOptions.value || []).find(
+        (type) => type?.id === selectedTypeFk.value
+    );
+});
+
+const selectCategory = async (params, categoryId, search) => {
+    if (params.categoryFk === categoryId) {
+        resetCategory(params);
+        search();
+        return;
+    }
+    selectedCategoryFk.value = categoryId;
+    params.categoryFk = categoryId;
+    await fetchItemTypes(categoryId);
+    search();
+};
+
+const resetCategory = (params) => {
+    selectedCategoryFk.value = null;
+    itemTypesOptions.value = null;
+    if (params) {
+        params.categoryFk = null;
+        params.typeFk = null;
+    }
+};
+
+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 fetchItemTypes = async (id) => {
+    try {
+        const filter = {
+            fields: ['id', 'name', 'categoryFk'],
+            where: { categoryFk: id },
+            include: 'category',
+            order: 'name ASC',
+        };
+        const { data } = await axios.get('ItemTypes', {
+            params: { filter: JSON.stringify(filter) },
+        });
+        itemTypesOptions.value = data;
+    } catch (err) {
+        console.error('Error fetching item types', err);
+    }
+};
+
+const getCategoryClass = (category, params) => {
+    if (category.id === params?.categoryFk) {
+        return 'active';
+    }
+};
+
+const getSelectedTagValues = async (tag) => {
+    try {
+        tag.value = null;
+        const filter = {
+            fields: ['value'],
+            order: 'value ASC',
+            limit: 30,
+        };
+
+        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 removeTag = (index, params, search) => {
+    (tagValues.value || []).splice(index, 1);
+    applyTags(params, search);
+};
+</script>
+
+<template>
+    <FetchData
+        url="ItemCategories"
+        limit="30"
+        auto-load
+        @on-fetch="(data) => (itemCategories = data)"
+    />
+    <FetchData
+        url="Suppliers"
+        limit="30"
+        auto-load
+        :filter="{ fields: ['id', 'name', 'nickname'], order: 'name ASC', limit: 30 }"
+        @on-fetch="(data) => (suppliersOptions = data)"
+    />
+    <FetchData
+        url="Tags"
+        :filter="{ fields: ['id', 'name', 'isFree'] }"
+        auto-load
+        limit="30"
+        @on-fetch="(data) => (tagOptions = data)"
+    />
+    <VnFilterPanel
+        :data-key="props.dataKey"
+        :expr-builder="exprBuilder"
+        :custom-tags="customTags"
+    >
+        <template #tags="{ tag, formatFn }">
+            <strong v-if="tag.label === 'categoryFk'">
+                {{ t(selectedCategory?.name || '') }}
+            </strong>
+            <strong v-else-if="tag.label === 'typeFk'">
+                {{ t(selectedType?.name || '') }}
+            </strong>
+            <div v-else class="q-gutter-x-xs">
+                <strong>{{ t(`components.itemsFilterPanel.${tag.label}`) }}: </strong>
+                <span>{{ formatFn(tag.value) }}</span>
+            </div>
+        </template>
+        <template #customTags="{ tags, params }">
+            <template v-for="tag in tags" :key="tag.label">
+                <VnFilterPanelChip
+                    v-for="chip in tag.value"
+                    :key="chip"
+                    removable
+                    @remove="removeTagChip(chip, params, searchFn)"
+                >
+                    <div class="q-gutter-x-xs">
+                        <strong>{{ chip.tagName }}: </strong>
+                        <span>"{{ chip.value }}"</span>
+                    </div>
+                </VnFilterPanelChip>
+            </template>
+        </template>
+        <template #body="{ params, searchFn }">
+            <QItem class="category-filter q-mt-md">
+                <QBtn
+                    dense
+                    flat
+                    round
+                    v-for="category in categoryList"
+                    :key="category.name"
+                    :class="['category', getCategoryClass(category, params)]"
+                    :icon="category.icon"
+                    @click="selectCategory(params, category.id, searchFn)"
+                >
+                    <QTooltip>
+                        {{ t(category.name) }}
+                    </QTooltip>
+                </QBtn>
+            </QItem>
+            <QItem class="q-my-md">
+                <QItemSection>
+                    <VnSelectFilter
+                        :label="t('components.itemsFilterPanel.typeFk')"
+                        v-model="params.typeFk"
+                        :options="itemTypesOptions"
+                        option-value="id"
+                        option-label="name"
+                        dense
+                        outlined
+                        rounded
+                        use-input
+                        :disable="!selectedCategoryFk"
+                        @update:model-value="
+                            (value) => {
+                                selectedTypeFk = value;
+                                searchFn();
+                            }
+                        "
+                    >
+                        <template #option="{ itemProps, opt }">
+                            <QItem v-bind="itemProps">
+                                <QItemSection>
+                                    <QItemLabel>{{ opt.name }}</QItemLabel>
+                                    <QItemLabel caption>
+                                        {{ opt.categoryName }}
+                                    </QItemLabel>
+                                </QItemSection>
+                            </QItem>
+                        </template>
+                    </VnSelectFilter>
+                </QItemSection>
+            </QItem>
+            <QSeparator />
+            <slot name="body" :params="params" :search-fn="searchFn" />
+            <QItem
+                v-for="(value, index) in tagValues"
+                :key="value"
+                class="q-mt-md filter-value"
+            >
+                <QItemSection class="col">
+                    <VnSelectFilter
+                        :label="t('components.itemsFilterPanel.tag')"
+                        v-model="value.selectedTag"
+                        :options="tagOptions"
+                        option-label="name"
+                        dense
+                        outlined
+                        rounded
+                        :emit-value="false"
+                        use-input
+                        :is-clearable="false"
+                        @update:model-value="getSelectedTagValues(value)"
+                    />
+                </QItemSection>
+                <QItemSection class="col">
+                    <VnSelectFilter
+                        v-if="!value?.selectedTag?.isFree && value.valueOptions"
+                        :label="t('components.itemsFilterPanel.value')"
+                        v-model="value.value"
+                        :options="value.valueOptions || []"
+                        option-value="value"
+                        option-label="value"
+                        dense
+                        outlined
+                        rounded
+                        emit-value
+                        use-input
+                        :disable="!value"
+                        :is-clearable="false"
+                        @update:model-value="applyTags(params, searchFn)"
+                    />
+                    <VnInput
+                        v-else
+                        v-model="value.value"
+                        :label="t('components.itemsFilterPanel.value')"
+                        :disable="!value"
+                        is-outlined
+                        :is-clearable="false"
+                        @keyup.enter="applyTags(params, searchFn)"
+                    />
+                </QItemSection>
+                <QIcon
+                    name="delete"
+                    class="fill-icon-on-hover q-px-xs"
+                    color="primary"
+                    size="sm"
+                    @click="removeTag(index, params, searchFn)"
+                />
+            </QItem>
+            <QItem class="q-mt-lg">
+                <QIcon
+                    name="add_circle"
+                    class="fill-icon-on-hover q-px-xs"
+                    color="primary"
+                    size="sm"
+                    @click="tagValues.push({})"
+                />
+            </QItem>
+        </template>
+    </VnFilterPanel>
+</template>
+
+<style lang="scss" scoped>
+.category-filter {
+    display: flex;
+    flex-wrap: wrap;
+    justify-content: center;
+    gap: 12px;
+
+    .category {
+        padding: 8px;
+        width: 60px;
+        height: 60px;
+        font-size: 1.4rem;
+        background-color: var(--vn-accent-color);
+
+        &.active {
+            background-color: $primary;
+        }
+    }
+}
+
+.filter-value {
+    display: flex;
+    align-items: center;
+}
+</style>
+
+<i18n>
+en:
+    params:
+        supplier: Supplier
+        from: From
+        to: To
+        active: Is active
+        visible: Is visible
+        floramondo: Is floramondo
+        salesPersonFk: Buyer
+        categoryFk: Category
+
+es:
+    params:
+        supplier: Proveedor
+        from: Desde
+        to: Hasta
+        active: Activo
+        visible: Visible
+        floramondo: Floramondo
+        salesPersonFk: Comprador
+        categoryFk: Categoría
+</i18n>

src/components/RegularizeStockForm.vue

@@ -2,7 +2,7 @@
 import { reactive, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 
-import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
 import FetchData from 'components/FetchData.vue';
 import VnRow from 'components/ui/VnRow.vue';
 import FormModelPopup from './FormModelPopup.vue';
@@ -54,12 +54,13 @@ const onDataSaved = (data) => {
                     <QInput
                         :label="t('Type the visible quantity')"
                         v-model.number="data.quantity"
+                        autofocus
                     />
                 </div>
             </VnRow>
             <VnRow class="row q-gutter-md q-mb-md">
                 <div class="col">
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('Warehouse')"
                         v-model="data.warehouseFk"
                         :options="warehousesOptions"

src/components/TransferInvoiceForm.vue

@@ -5,7 +5,7 @@ import { useRouter } from 'vue-router';
 
 import VnRow from 'components/ui/VnRow.vue';
 import FetchData from 'components/FetchData.vue';
-import VnSelectFilter from 'components/common/VnSelectFilter.vue';
+import VnSelect from 'components/common/VnSelect.vue';
 import FormPopup from './FormPopup.vue';
 
 import axios from 'axios';
@@ -84,7 +84,7 @@ const transferInvoice = async () => {
         <template #form-inputs>
             <VnRow class="row q-gutter-md q-mb-md">
                 <div class="col">
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('Client')"
                         :options="clientsOptions"
                         hide-selected
@@ -103,10 +103,10 @@ const transferInvoice = async () => {
                                 </QItemSection>
                             </QItem>
                         </template>
-                    </VnSelectFilter>
+                    </VnSelect>
                 </div>
                 <div class="col">
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('Rectificative type')"
                         :options="rectificativeTypeOptions"
                         hide-selected
@@ -119,7 +119,7 @@ const transferInvoice = async () => {
             </VnRow>
             <VnRow class="row q-gutter-md q-mb-md">
                 <div class="col">
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('Class')"
                         :options="siiTypeInvoiceOutsOptions"
                         hide-selected
@@ -138,10 +138,10 @@ const transferInvoice = async () => {
                                 </QItemSection>
                             </QItem>
                         </template>
-                    </VnSelectFilter>
+                    </VnSelect>
                 </div>
                 <div class="col">
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('Type')"
                         :options="invoiceCorrectionTypesOptions"
                         hide-selected

src/components/UserPanel.vue

@@ -7,7 +7,7 @@ import axios from 'axios';
 import { useState } from 'src/composables/useState';
 import { useSession } from 'src/composables/useSession';
 import { localeEquivalence } from 'src/i18n/index';
-import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
 import VnRow from 'components/ui/VnRow.vue';
 import FetchData from 'components/FetchData.vue';
 
@@ -172,24 +172,24 @@ function copyUserToken() {
         <QSeparator inset class="q-mx-lg" />
         <div class="col q-gutter-xs q-pa-md">
             <VnRow>
-                <VnSelectFilter
+                <VnSelect
                     :label="t('components.userPanel.localWarehouse')"
                     v-model="user.localWarehouseFk"
                     :options="warehousesData"
                     option-label="name"
                     option-value="id"
                 />
-                <VnSelectFilter
+                <VnSelect
                     :label="t('components.userPanel.localBank')"
                     hide-selected
                     v-model="user.localBankFk"
                     :options="accountBankData"
                     option-label="bank"
                     option-value="id"
-                ></VnSelectFilter>
+                ></VnSelect>
             </VnRow>
             <VnRow>
-                <VnSelectFilter
+                <VnSelect
                     :label="t('components.userPanel.localCompany')"
                     hide-selected
                     v-model="user.companyFk"
@@ -197,7 +197,7 @@ function copyUserToken() {
                     option-label="code"
                     option-value="id"
                 />
-                <VnSelectFilter
+                <VnSelect
                     :label="t('components.userPanel.userWarehouse')"
                     hide-selected
                     v-model="user.warehouseFk"
@@ -207,7 +207,7 @@ function copyUserToken() {
                 />
             </VnRow>
             <VnRow>
-                <VnSelectFilter
+                <VnSelect
                     :label="t('components.userPanel.userCompany')"
                     hide-selected
                     v-model="user.companyFk"

src/components/common/VnCard.vue

@@ -0,0 +1,78 @@
+<script setup>
+import { onBeforeMount, computed } from 'vue';
+import { useRoute, onBeforeRouteUpdate } from 'vue-router';
+import { useI18n } from 'vue-i18n';
+import { useArrayData } from 'src/composables/useArrayData';
+import { useStateStore } from 'stores/useStateStore';
+import useCardSize from 'src/composables/useCardSize';
+import VnSubToolbar from '../ui/VnSubToolbar.vue';
+import VnSearchbar from 'components/ui/VnSearchbar.vue';
+import LeftMenu from 'components/LeftMenu.vue';
+
+const props = defineProps({
+    dataKey: { type: String, required: true },
+    baseUrl: { type: String, default: undefined },
+    customUrl: { type: String, default: undefined },
+    filter: { type: Object, default: () => {} },
+    descriptor: { type: Object, required: true },
+    searchbarDataKey: { type: String, default: undefined },
+    searchbarUrl: { type: String, default: undefined },
+    searchbarLabel: { type: String, default: '' },
+    searchbarInfo: { type: String, default: '' },
+});
+
+const { t } = useI18n();
+const stateStore = useStateStore();
+const route = useRoute();
+const url = computed(() => {
+    if (props.baseUrl) return `${props.baseUrl}/${route.params.id}`;
+    return props.customUrl;
+});
+
+const arrayData = useArrayData(props.dataKey, {
+    url: url.value,
+    filter: props.filter,
+});
+
+onBeforeMount(async () => {
+    if (!props.baseUrl) arrayData.store.filter.where = { id: route.params.id };
+    await arrayData.fetch({ append: false });
+});
+
+if (props.baseUrl) {
+    onBeforeRouteUpdate(async (to, from) => {
+        if (to.params.id !== from.params.id) {
+            arrayData.store.url = `${props.baseUrl}/${route.params.id}`;
+            await arrayData.fetch({ append: false });
+        }
+    });
+}
+</script>
+<template>
+    <Teleport
+        to="#searchbar"
+        v-if="stateStore.isHeaderMounted() && props.searchbarDataKey"
+    >
+        <VnSearchbar
+            :data-key="props.searchbarDataKey"
+            :url="props.searchbarUrl"
+            :label="t(props.searchbarLabel)"
+            :info="t(props.searchbarInfo)"
+        />
+    </Teleport>
+    <QDrawer v-model="stateStore.leftDrawer" show-if-above :width="256">
+        <QScrollArea class="fit">
+            <component :is="descriptor" />
+            <QSeparator />
+            <LeftMenu source="card" />
+        </QScrollArea>
+    </QDrawer>
+    <QPageContainer>
+        <QPage>
+            <VnSubToolbar />
+            <div :class="[useCardSize(), $attrs.class]">
+                <RouterView />
+            </div>
+        </QPage>
+    </QPageContainer>
+</template>

src/components/common/VnDms.vue

@@ -6,7 +6,7 @@ import axios from 'axios';
 
 import FetchData from 'components/FetchData.vue';
 import VnRow from 'components/ui/VnRow.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 FormModelPopup from 'components/FormModelPopup.vue';
 
@@ -123,7 +123,7 @@ function addDefaultData(data) {
             <div class="q-gutter-y-ms">
                 <VnRow>
                     <VnInput :label="t('globals.reference')" v-model="dms.reference" />
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('globals.company')"
                         v-model="dms.companyFk"
                         :options="companies"
@@ -133,7 +133,7 @@ function addDefaultData(data) {
                     />
                 </VnRow>
                 <VnRow>
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('globals.warehouse')"
                         v-model="dms.warehouseFk"
                         :options="warehouses"
@@ -141,7 +141,7 @@ function addDefaultData(data) {
                         option-label="name"
                         input-debounce="0"
                     />
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('globals.type')"
                         v-model="dms.dmsTypeFk"
                         :options="dmsTypes"

src/components/common/VnDmsList.vue

@@ -187,7 +187,7 @@ const columns = computed(() => [
                     downloadFile(
                         prop.row.id,
                         $props.downloadModel,
-                        null,
+                        undefined,
                         prop.row.download
                     ),
             },

src/components/common/VnLog.vue

@@ -12,7 +12,7 @@ import { useValidator } from 'src/composables/useValidator';
 import VnAvatar from '../ui/VnAvatar.vue';
 import VnJsonValue from '../common/VnJsonValue.vue';
 import FetchData from '../FetchData.vue';
-import VnSelectFilter from './VnSelectFilter.vue';
+import VnSelect from './VnSelect.vue';
 import VnUserLink from '../ui/VnUserLink.vue';
 
 const stateStore = useStateStore();
@@ -659,7 +659,7 @@ setLogTree();
                     </QInput>
                 </QItem>
                 <QItem>
-                    <VnSelectFilter
+                    <VnSelect
                         class="full-width"
                         :label="t('globals.entity')"
                         v-model="selectedFilters.changedModel"
@@ -689,7 +689,7 @@ setLogTree();
                         <QSkeleton type="QInput" class="full-width" />
                     </QItemSection>
                     <QItemSection v-if="workers && userRadio !== null">
-                        <VnSelectFilter
+                        <VnSelect
                             class="full-width"
                             :label="t('globals.user')"
                             v-model="userSelect"
@@ -713,7 +713,7 @@ setLogTree();
                                     </QItemSection>
                                 </QItem>
                             </template>
-                        </VnSelectFilter>
+                        </VnSelect>
                     </QItemSection>
                 </QItem>
                 <QItem class="q-mt-sm">

src/components/common/VnSelectDialog.vue

@@ -1,7 +1,7 @@
 <script setup>
 import { ref, computed } from 'vue';
 
-import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
 
 import { useRole } from 'src/composables/useRole';
 
@@ -52,7 +52,7 @@ const toggleForm = () => {
 </script>
 
 <template>
-    <VnSelectFilter v-model="value" :options="options" v-bind="$attrs">
+    <VnSelect v-model="value" :options="options" v-bind="$attrs">
         <template v-if="isAllowedToCreate" #append>
             <QIcon
                 @click.stop.prevent="toggleForm()"
@@ -72,7 +72,7 @@ const toggleForm = () => {
         <template v-for="(_, slotName) in $slots" #[slotName]="slotData" :key="slotName">
             <slot :name="slotName" v-bind="slotData" :key="slotName" />
         </template>
-    </VnSelectFilter>
+    </VnSelect>
 </template>
 
 <style lang="scss" scoped>

src/components/common/VnSmsDialog.vue

@@ -200,8 +200,8 @@ 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: '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
@@ -215,11 +215,12 @@ fr:
     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
@@ -236,8 +237,8 @@ pt:
         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

src/components/ui/CardDescriptor.vue

@@ -1,5 +1,5 @@
 <script setup>
-import { onBeforeMount, useSlots, watch, computed, ref } from 'vue';
+import { onBeforeMount, watch, computed, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import SkeletonDescriptor from 'components/ui/SkeletonDescriptor.vue';
 import { useArrayData } from 'composables/useArrayData';
@@ -38,7 +38,6 @@ const $props = defineProps({
 });
 
 const state = useState();
-const slots = useSlots();
 const { t } = useI18n();
 const { viewSummary } = useSummaryDialog();
 const arrayData = useArrayData($props.dataKey || $props.module, {
@@ -47,7 +46,7 @@ const arrayData = useArrayData($props.dataKey || $props.module, {
     skip: 0,
 });
 const { store } = arrayData;
-const entity = computed(() =>Array.isArray( store.data) ? store.data[0] : store.data);
+const entity = computed(() => (Array.isArray(store.data) ? store.data[0] : store.data));
 const isLoading = ref(false);
 
 defineExpose({
@@ -55,14 +54,12 @@ defineExpose({
 });
 onBeforeMount(async () => {
     await getData();
-    watch(
-        () => $props.url,
-        async () => await getData()
-    );
+    watch($props, async () => await getData());
 });
 
 async function getData() {
     store.url = $props.url;
+    store.filter = $props.filter ?? {};
     isLoading.value = true;
     try {
         const { data } = await arrayData.fetch({ append: false, updateRouter: false });
@@ -117,7 +114,7 @@ const emit = defineEmits(['onFetch']);
                     icon="more_vert"
                     round
                     size="md"
-                    :class="{ invisible: !slots.menu }"
+                    :class="{ invisible: !$slots.menu }"
                 >
                     <QTooltip>
                         {{ t('components.cardDescriptor.moreOptions') }}

src/components/ui/CardSummary.vue

@@ -15,7 +15,7 @@ const props = defineProps({
         default: null,
     },
     entityId: {
-        type: Number,
+        type: [Number, String],
         default: null,
     },
     dataKey: {
@@ -32,7 +32,7 @@ const arrayData = useArrayData(props.dataKey || route.meta.moduleName, {
     skip: 0,
 });
 const { store } = arrayData;
-const entity = computed(() => Array.isArray(store.data) ? store.data[0] : store.data);
+const entity = computed(() => (Array.isArray(store.data) ? store.data[0] : store.data));
 const isLoading = ref(false);
 
 defineExpose({
@@ -48,9 +48,10 @@ onBeforeMount(async () => {
 
 async function fetch() {
     store.url = props.url;
+    store.filter = props.filter ?? {};
     isLoading.value = true;
     const { data } = await arrayData.fetch({ append: false, updateRouter: false });
-    emit('onFetch', data);
+    emit('onFetch', Array.isArray(data) ? data[0] : data);
     isLoading.value = false;
 }
 </script>

src/components/ui/QCalendarMonthWrapper.vue

@@ -12,12 +12,23 @@ const $props = defineProps({
         type: Boolean,
         default: false,
     },
+    viewCustomization: {
+        type: String,
+        default: '',
+    },
 });
 
 const $q = useQuasar();
 
+// El objetivo de asignar las clases de personalización desde el wrapper es no tener conflictos entre vistas que usen el mismo componente
+const viewCustomizationClasses = {
+    workerCalendar: 'worker-calendar-customizations',
+};
+
 const containerClasses = computed(() => {
     const classes = ['main-container-background'];
+    if (viewCustomizationClasses[$props.viewCustomization])
+        classes.push(viewCustomizationClasses[$props.viewCustomization]);
     if ($props.bordered) classes.push('--bordered');
     if ($props.transparentBackground) classes.push('transparent-background');
     else classes.push($q.dark.isActive ? '--dark' : '--light');
@@ -33,6 +44,47 @@ const containerClasses = computed(() => {
 </template>
 
 <style lang="scss">
+@import '../../css/quasar.variables.scss';
+
+:root {
+    // Cambia los colores del día actual del calendario por los de salix
+    --calendar-border-current-dark: #84d0e2 2px solid;
+    --calendar-border-current: #84d0e2 2px solid;
+    --calendar-current-color-dark: #84d0e2;
+    // Colores de fondo del calendario en dark mode
+    --calendar-outside-background-dark: #222;
+    --calendar-background-dark: #222;
+}
+
+// Clases para modificar el color de fecha seleccionada en componente QCalendarMonth
+.q-dark div .q-calendar-mini .q-calendar-month__day.q-selected .q-calendar__button {
+    background-color: $primary !important;
+    color: white !important;
+}
+
+.q-calendar-mini .q-calendar-month__day.q-selected .q-calendar__button {
+    background-color: $primary !important;
+    color: white !important;
+}
+
+.q-calendar-month__head--weekday {
+    // Transforma los nombres de los días de la semana a mayúsculas
+    text-transform: capitalize;
+}
+
+.transparent-background {
+    --calendar-background-dark: transparent;
+    --calendar-background: transparent;
+    --calendar-outside-background-dark: transparent;
+}
+
+.q-calendar__button {
+    &:hover {
+        background-color: var(--vn-accent-color);
+        cursor: pointer;
+    }
+}
+
 .main-container-background {
     --calendar-current-background-dark: transparent;
 
@@ -45,14 +97,64 @@ const containerClasses = computed(() => {
     }
 
     &.--bordered {
-        border: 1px solid black;
+        border: 1px solid #222;
     }
 }
 
-.transparent-background {
-    --calendar-background-dark: transparent;
-    --calendar-background: transparent;
-    --calendar-outside-background-dark: transparent;
+.worker-calendar-customizations {
+    .q-calendar__button {
+        width: 32px;
+        height: 32px;
+        font-size: 13px;
+
+        &:hover {
+            background-color: var(--vn-accent-color);
+            cursor: pointer;
+        }
+    }
+
+    .q-calendar-month__week--days > div:nth-child(6),
+    .q-calendar-month__week--days > div:nth-child(7) {
+        // Cambia el color de los días sábado y domingo
+        color: #777777;
+    }
+
+    .q-calendar-month__week--wrapper {
+        margin-bottom: 4px;
+    }
+
+    .q-calendar-month__workweek {
+        height: 32px;
+        display: flex;
+        justify-content: center;
+    }
+
+    .q-calendar__button--bordered {
+        color: $info !important;
+    }
+
+    .q-calendar-month__day--content {
+        position: absolute;
+        top: 1;
+        left: 0;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+    }
+
+    .q-outside .calendar-event {
+        display: none;
+    }
+
+    .q-calendar-month__workweek,
+    .q-calendar-month__head--workweek,
+    .q-calendar-month__head--weekday.q-calendar__center.q-calendar__ellipsis {
+        text-transform: capitalize;
+        color: #777;
+        font-weight: bold;
+        font-size: 0.8rem;
+        text-align: center;
+    }
 }
 
 .nav-container {

src/components/ui/VnNotes.vue

@@ -32,7 +32,7 @@ async function insert() {
 <template>
     <QCard class="q-pa-xs q-mb-xl full-width" v-if="$props.addNote">
         <QCardSection horizontal>
-            <VnAvatar :descriptor="false" :worker-id="1" size="md" />
+            <VnAvatar :worker-id="currentUser.id" size="md" />
             <div class="full-width row justify-between q-pa-xs">
                 <VnUserLink :name="t('New note')" :worker-id="currentUser.id" />
                 {{ t('globals.now') }}

src/components/ui/VnPaginate.vue

@@ -77,7 +77,6 @@ const arrayData = useArrayData(props.dataKey, {
     userParams: props.userParams,
     exprBuilder: props.exprBuilder,
 });
-const hasMoreData = ref();
 const store = arrayData.store;
 
 onMounted(() => {
@@ -97,7 +96,7 @@ const addFilter = async (filter, params) => {
 
 async function fetch() {
     await arrayData.fetch({ append: false });
-    if (!arrayData.hasMoreData.value) {
+    if (!store.hasMoreData) {
         isLoading.value = false;
     }
     emit('onFetch', store.data);
@@ -110,8 +109,8 @@ async function paginate() {
 
     isLoading.value = true;
     await arrayData.loadMore();
-    if (!arrayData.hasMoreData.value) {
-        if (store.userParamsChanged) arrayData.hasMoreData.value = true;
+    if (!store.hasMoreData) {
+        if (store.userParamsChanged) store.hasMoreData = true;
         store.userParamsChanged = false;
         endPagination();
         return;
@@ -132,9 +131,7 @@ function endPagination() {
     emit('onPaginate');
 }
 async function onLoad(index, done) {
-    if (!store.data) {
-        return done();
-    }
+    if (!store.data) return done();
 
     if (store.data.length === 0 || !props.url) return done(false);
 
@@ -142,7 +139,7 @@ async function onLoad(index, done) {
 
     await paginate();
     let isDone = false;
-    if (store.userParamsChanged) isDone = !arrayData.hasMoreData.value;
+    if (store.userParamsChanged) isDone = !store.hasMoreData;
     done(isDone);
 }
 
@@ -182,13 +179,12 @@ defineExpose({ fetch, addFilter });
             </QCard>
         </div>
     </div>
-    
     <QInfiniteScroll
         v-if="store.data"
         @load="onLoad"
         :offset="offset"
-        :disable="disableInfiniteScroll || !arrayData.hasMoreData"
         class="full-width"
+        :disable="disableInfiniteScroll || !store.hasMoreData"
         v-bind="$attrs"
     >
         <slot name="body" :rows="store.data"></slot>
@@ -196,7 +192,10 @@ defineExpose({ fetch, addFilter });
             <QSpinner color="orange" size="md" />
         </div>
     </QInfiniteScroll>
-    <div v-if="!isLoading && hasMoreData" class="w-full flex justify-center q-mt-md">
+    <div
+        v-if="!isLoading && store.hasMoreData"
+        class="w-full flex justify-center q-mt-md"
+    >
         <QBtn color="primary" :label="t('Load more data')" @click="paginate()" />
     </div>
 </template>

src/components/ui/VnSearchbar.vue

@@ -131,13 +131,6 @@ async function search() {
                 />
             </template>
             <template #append>
-                <QIcon
-                    v-if="searchText !== ''"
-                    name="close"
-                    @click="searchText = ''"
-                    class="cursor-pointer"
-                />
-
                 <QIcon
                     v-if="props.info && $q.screen.gt.xs"
                     name="info"

src/components/ui/VnSubToolbar.vue

@@ -1,11 +1,27 @@
 <script setup>
-import { onMounted, onUnmounted } from 'vue';
+import { onMounted, onUnmounted, ref } from 'vue';
 import { useStateStore } from 'stores/useStateStore';
-
 const stateStore = useStateStore();
+const actions = ref(null);
+const data = ref(null);
+const opts = { subtree: true, childList: true, attributes: true };
+const hasContent = ref(false);
 
 onMounted(() => {
     stateStore.toggleSubToolbar();
+    actions.value = document.querySelector('#st-actions');
+    data.value = document.querySelector('#st-data');
+
+    if (!actions.value && !data.value) return;
+
+    // Check if there's content to display
+    const observer = new MutationObserver(
+        () =>
+            (hasContent.value =
+                actions.value.childNodes.length + data.value.childNodes.length)
+    );
+    if (actions.value) observer.observe(actions.value, opts);
+    if (data.value) observer.observe(data.value, opts);
 });
 
 onUnmounted(() => {
@@ -14,7 +30,10 @@ onUnmounted(() => {
 </script>
 
 <template>
-    <QToolbar class="bg-vn-section-color justify-end sticky">
+    <QToolbar
+        class="justify-end sticky"
+        v-show="hasContent || $slots['st-actions'] || $slots['st-data']"
+    >
         <slot name="st-data">
             <div id="st-data"></div>
         </slot>

src/composables/getDateQBadgeColor.js

@@ -0,0 +1,11 @@
+export function getDateQBadgeColor(date) {
+    let today = Date.vnNew();
+    today.setHours(0, 0, 0, 0);
+    let timeTicket = new Date(date);
+    timeTicket.setHours(0, 0, 0, 0);
+
+    let comparation = today - timeTicket;
+
+    if (comparation == 0) return 'warning';
+    if (comparation < 0) return 'negative';
+}

src/composables/useArrayData.js

@@ -9,12 +9,9 @@ const arrayDataStore = useArrayDataStore();
 export function useArrayData(key, userOptions) {
     if (!key) throw new Error('ArrayData: A key is required to use this composable');
 
-    if (!arrayDataStore.get(key)) {
-        arrayDataStore.set(key);
-    }
+    if (!arrayDataStore.get(key)) arrayDataStore.set(key);
 
     const store = arrayDataStore.get(key);
-    const hasMoreData = ref(false);
     const route = useRoute();
     let canceller = null;
 
@@ -22,6 +19,7 @@ export function useArrayData(key, userOptions) {
 
     onMounted(() => {
         setOptions();
+        store.skip = 0;
 
         const query = route.query;
         if (query.params) {
@@ -29,9 +27,7 @@ export function useArrayData(key, userOptions) {
         }
     });
 
-    if (key && userOptions) {
-        setOptions();
-    }
+    if (key && userOptions) setOptions();
 
     function setOptions() {
         const allowedOptions = [
@@ -96,8 +92,7 @@ export function useArrayData(key, userOptions) {
         });
 
         const { limit } = filter;
-        hasMoreData.value = limit && response.data.length >= limit;
-        store.hasMoreData = hasMoreData.value;
+        store.hasMoreData = limit && response.data.length >= limit;
 
         if (append) {
             if (!store.data) store.data = [];
@@ -156,9 +151,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;
                     }
@@ -169,7 +165,7 @@ export function useArrayData(key, userOptions) {
     }
 
     async function loadMore() {
-        if (!hasMoreData.value && !store.hasMoreData) return;
+        if (!store.hasMoreData) return;
 
         store.skip = store.limit * page.value;
         page.value += 1;
@@ -211,7 +207,6 @@ export function useArrayData(key, userOptions) {
         destroy,
         loadMore,
         store,
-        hasMoreData,
         totalRows,
         updateStateParams,
         isLoading,

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;
@@ -136,6 +141,19 @@ select:-webkit-autofill {
     background-color: var(--vn-section-color);
 }
 
+.q-checkbox {
+    & .q-checkbox__label {
+        color: var(--vn-text-color);
+    }
+    & .q-checkbox__inner {
+        color: var(--vn-label-color);
+    }
+}
+
+.tr-header {
+    color: var(--vn-label-color);
+}
+
 .q-chip,
 .q-notification__message,
 .q-notification__icon {
@@ -170,13 +188,6 @@ input::-webkit-inner-spin-button {
     -moz-appearance: none;
 }
 
-// Clases para modificar el color de fecha seleccionada en componente QCalendarMonth
-.q-dark div .q-calendar-mini .q-calendar-month__day.q-selected .q-calendar__button {
-    background-color: $primary !important;
-    color: white !important;
-}
-
-.q-calendar-mini .q-calendar-month__day.q-selected .q-calendar__button {
-    background-color: $primary !important;
-    color: white !important;
+.q-scrollarea__content {
+    max-width: 100%;
 }

src/filters/date.js

@@ -91,3 +91,42 @@ export function toDateTimeFormat(date, showSeconds = false) {
         second: showSeconds ? '2-digit' : undefined,
     });
 }
+
+/**
+ * Converts seconds to a formatted string representing hours and minutes (hh:mm).
+ * @param {number} seconds - The number of seconds to convert.
+ * @param {boolean} includeHSuffix - Optional parameter indicating whether to include "h." after the hour.
+ * @returns {string} A string representing the time in the format "hh:mm" with optional "h." suffix.
+ */
+export function secondsToHoursMinutes(seconds, includeHSuffix = true) {
+    if (!seconds) return includeHSuffix ? '00:00 h.' : '00:00';
+
+    const hours = Math.floor(seconds / 3600);
+    const remainingMinutes = seconds % 3600;
+    const minutes = Math.floor(remainingMinutes / 60);
+    const formattedHours = hours < 10 ? '0' + hours : hours;
+    const formattedMinutes = minutes < 10 ? '0' + minutes : minutes;
+
+    // Append "h." if includeHSuffix is true
+    const suffix = includeHSuffix ? ' h.' : '';
+    // Return formatted string
+    return formattedHours + ':' + formattedMinutes + suffix;
+}
+
+export function getTimeDifferenceWithToday(date) {
+    let today = Date.vnNew();
+    today.setHours(0, 0, 0, 0);
+
+    date = new Date(date);
+    date.setHours(0, 0, 0, 0);
+
+    return today - date;
+}
+
+export function isLower(date) {
+    return getTimeDifferenceWithToday(date) > 0;
+}
+
+export function isBigger(date) {
+    return getTimeDifferenceWithToday(date) < 0;
+}

src/i18n/locale/en.yml

@@ -28,6 +28,7 @@ globals:
     reset: Reset
     close: Close
     cancel: Cancel
+    clone: Clone
     confirm: Confirm
     assign: Assign
     back: Back
@@ -83,6 +84,7 @@ globals:
     selectFile: Select a file
     copyClipboard: Copy on clipboard
     salesPerson: SalesPerson
+    send: Send
     code: Code
     pageTitles:
         summary: Summary
@@ -811,6 +813,7 @@ worker:
         pbx: Private Branch Exchange
         log: Log
         calendar: Calendar
+        timeControl: Time control
     list:
         name: Name
         email: Email
@@ -1117,6 +1120,9 @@ item:
         list: List
         diary: Diary
         tags: Tags
+        create: Create
+        buyRequest: Buy requests
+        fixedPrice: Fixed prices
         wasteBreakdown: Waste breakdown
         itemCreate: New item
         log: Log
@@ -1147,6 +1153,15 @@ item:
         stemMultiplier: Multiplier
         producer: Producer
         landed: Landed
+    fixedPrice:
+        itemId: Item ID
+        groupingPrice: Grouping price
+        packingPrice: Packing price
+        hasMinPrice: Has min price
+        minPrice: Min price
+        started: Started
+        ended: Ended
+        warehouse: Warehouse
     create:
         name: Name
         tag: Tag
@@ -1154,8 +1169,68 @@ item:
         type: Type
         intrastat: Intrastat
         origin: Origin
+    buyRequest:
+        ticketId: 'Ticket ID'
+        shipped: 'Shipped'
+        requester: 'Requester'
+        requested: 'Requested'
+        price: 'Price'
+        attender: 'Atender'
+        item: 'Item'
+        achieved: 'Achieved'
+        concept: 'Concept'
+        state: 'State'
+    summary:
+        basicData: 'Basic data'
+        otherData: 'Other data'
+        description: 'Description'
+        tax: 'Tax'
+        tags: 'Tags'
+        botanical: 'Botanical'
+        barcode: 'Barcode'
+        name: 'Nombre'
+        completeName: 'Nombre completo'
+        family: 'Familia'
+        size: 'Medida'
+        origin: 'Origen'
+        stems: 'Tallos'
+        multiplier: 'Multiplicador'
+        buyer: 'Comprador'
+        doPhoto: 'Do photo'
+        intrastatCode: 'Código intrastat'
+        intrastat: 'Intrastat'
+        ref: 'Referencia'
+        relevance: 'Relevancia'
+        weight: 'Peso (gramos)/tallo'
+        units: 'Unidades/caja'
+        expense: 'Gasto'
+        generic: 'Genérico'
+        recycledPlastic: 'Plástico reciclado'
+        nonRecycledPlastic: 'Plástico no reciclado'
+        minSalesQuantity: 'Cantidad mínima de venta'
+        genus: 'Genus'
+        specie: 'Specie'
 components:
     topbar: {}
+    itemsFilterPanel:
+        typeFk: Type
+        tag: Tag
+        value: Value
+        # ItemFixedPriceFilter
+        buyerFk: Buyer
+        warehouseFk: Warehouse
+        started: From
+        ended: To
+        mine: For me
+        hasMinPrice: Minimum price
+        # LatestBuysFilter
+        salesPersonFk: Buyer
+        supplierFk: Supplier
+        from: From
+        to: To
+        active: Is active
+        visible: Is visible
+        floramondo: Is floramondo
     userPanel:
         copyToken: Token copied to clipboard
         settings: Settings

src/i18n/locale/es.yml

@@ -28,6 +28,7 @@ globals:
     reset: Restaurar
     close: Cerrar
     cancel: Cancelar
+    clone: Clonar
     confirm: Confirmar
     assign: Asignar
     back: Volver
@@ -83,6 +84,7 @@ globals:
     selectFile: Seleccione un fichero
     copyClipboard: Copiar en portapapeles
     salesPerson: Comercial
+    send: Enviar
     code: Código
     pageTitles:
         summary: Resumen
@@ -809,6 +811,7 @@ worker:
         pbx: Centralita
         log: Historial
         calendar: Calendario
+        timeControl: Control de horario
     list:
         name: Nombre
         email: Email
@@ -1116,8 +1119,14 @@ item:
         list: Listado
         diary: Histórico
         tags: Etiquetas
+        fixedPrice: Precios fijados
+        buyRequest: Peticiones de compra
         wasteBreakdown: Deglose de mermas
         itemCreate: Nuevo artículo
+        basicData: 'Datos básicos'
+        tax: 'IVA'
+        botanical: 'Botánico'
+        barcode: 'Código de barras'
         log: Historial
     descriptor:
         item: Artículo
@@ -1146,6 +1155,15 @@ item:
         stemMultiplier: Multiplicador
         producer: Productor
         landed: F. entrega
+    fixedPrice:
+        itemId: ID Artículo
+        groupingPrice: Precio grouping
+        packingPrice: Precio packing
+        hasMinPrice: Tiene precio mínimo
+        minPrice: Precio min
+        started: Inicio
+        ended: Fin
+        warehouse: Almacén
     create:
         name: Nombre
         tag: Etiqueta
@@ -1153,8 +1171,68 @@ item:
         type: Tipo
         intrastat: Intrastat
         origin: Origen
+    summary:
+        basicData: 'Datos básicos'
+        otherData: 'Otros datos'
+        description: 'Descripción'
+        tax: 'IVA'
+        tags: 'Etiquetas'
+        botanical: 'Botánico'
+        barcode: 'Código de barras'
+        name: 'Nombre'
+        completeName: 'Nombre completo'
+        family: 'Familia'
+        size: 'Medida'
+        origin: 'Origen'
+        stems: 'Tallos'
+        multiplier: 'Multiplicador'
+        buyer: 'Comprador'
+        doPhoto: 'Hacer foto'
+        intrastatCode: 'Código intrastat'
+        intrastat: 'Intrastat'
+        ref: 'Referencia'
+        relevance: 'Relevancia'
+        weight: 'Peso (gramos)/tallo'
+        units: 'Unidades/caja'
+        expense: 'Gasto'
+        generic: 'Genérico'
+        recycledPlastic: 'Plástico reciclado'
+        nonRecycledPlastic: 'Plástico no reciclado'
+        minSalesQuantity: 'Cantidad mínima de venta'
+        genus: 'Genus'
+        specie: 'Specie'
+    buyRequest:
+        ticketId: 'ID Ticket'
+        shipped: 'F. envío'
+        requester: 'Solicitante'
+        requested: 'Solicitado'
+        price: 'Precio'
+        attender: 'Comprador'
+        item: 'Artículo'
+        achieved: 'Conseguido'
+        concept: 'Concepto'
+        state: 'Estado'
 components:
     topbar: {}
+    itemsFilterPanel:
+        typeFk: Tipo
+        tag: Etiqueta
+        value: Valor
+        # ItemFixedPriceFilter
+        buyerFk: Comprador
+        warehouseFk: Almacén
+        started: Desde
+        ended: Hasta
+        mine: Para mi
+        hasMinPrice: Precio mínimo
+        # LatestBuysFilter
+        salesPersonFk: Comprador
+        supplierFk: Proveedor
+        from: Desde
+        to: Hasta
+        active: Activo
+        visible: Visible
+        floramondo: Floramondo
     userPanel:
         copyToken: Token copiado al portapapeles
         settings: Configuración

src/pages/Claim/Card/ClaimAction.vue

@@ -9,7 +9,7 @@ import { toDate, toPercentage, toCurrency } from 'filters/index';
 import { tMobile } from 'src/composables/tMobile';
 import CrudModel from 'src/components/CrudModel.vue';
 import FetchData from 'src/components/FetchData.vue';
-import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
 import VnConfirm from 'src/components/ui/VnConfirm.vue';
 import TicketDescriptorProxy from 'src/pages/Ticket/Card/TicketDescriptorProxy.vue';
 import { useArrayData } from 'composables/useArrayData';
@@ -302,7 +302,7 @@ async function importToNewRefundTicket() {
                 </template>
                 <template #body-cell-destination="{ row }">
                     <QTd>
-                        <VnSelectFilter
+                        <VnSelect
                             v-model="row.claimDestinationFk"
                             :options="destinationTypes"
                             option-label="description"
@@ -344,7 +344,7 @@ async function importToNewRefundTicket() {
                                     </QItemSection>
                                     <QItemSection side>
                                         <QItemLabel v-if="column.name === 'destination'">
-                                            <VnSelectFilter
+                                            <VnSelect
                                                 v-model="props.row.claimDestinationFk"
                                                 :options="destinationTypes"
                                                 option-label="description"
@@ -418,7 +418,7 @@ async function importToNewRefundTicket() {
                 </QItem>
             </QCardSection>
             <QItemSection>
-                <VnSelectFilter
+                <VnSelect
                     class="q-pa-sm"
                     v-model="claimDestinationFk"
                     :options="destinationTypes"

src/pages/Claim/Card/ClaimCard.vue

@@ -1,46 +1,15 @@
 <script setup>
-import LeftMenu from 'components/LeftMenu.vue';
-import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
-import { useStateStore } from 'stores/useStateStore';
-import { useI18n } from 'vue-i18n';
+import VnCard from 'components/common/VnCard.vue';
 import ClaimDescriptor from './ClaimDescriptor.vue';
-import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
-import useCardSize from 'src/composables/useCardSize';
-
-const stateStore = useStateStore();
-const { t } = useI18n();
 </script>
 <template>
-    <Teleport to="#searchbar" v-if="stateStore.isHeaderMounted()">
-        <VnSearchbar
-            data-key="ClaimList"
-            url="Claims/filter"
-            :label="t('Search claim')"
-            :info="t('You can search by claim id or customer name')"
-        />
-    </Teleport>
-    <QDrawer v-model="stateStore.leftDrawer" show-if-above :width="256">
-        <QScrollArea class="fit">
-            <ClaimDescriptor />
-            <QSeparator />
-            <LeftMenu source="card" />
-        </QScrollArea>
-    </QDrawer>
-    <QPageContainer>
-        <QPage>
-            <VnSubToolbar />
-            <div :class="useCardSize()">
-                <RouterView></RouterView>
-            </div>
-        </QPage>
-    </QPageContainer>
+    <VnCard
+        data-key="Claim"
+        base-url="Claims"
+        :descriptor="ClaimDescriptor"
+        searchbar-data-key="ClaimList"
+        searchbar-url="Claims/filter"
+        searchbar-label="Search claim"
+        searchbar-info="You can search by claim id or customer name"
+    />
 </template>
-
-<i18n>
-es:
-    Search claim: Buscar reclamación
-    You can search by claim id or customer name: Puedes buscar por id de la reclamación o nombre del cliente
-    Details: Detalles
-    Notes: Notas
-    Action: Acción
-</i18n>

src/pages/Claim/Card/ClaimDevelopment.vue

@@ -4,7 +4,7 @@ import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
 import CrudModel from 'components/CrudModel.vue';
 import FetchData from 'components/FetchData.vue';
-import VnSelectFilter from 'components/common/VnSelectFilter.vue';
+import VnSelect from 'components/common/VnSelect.vue';
 import { tMobile } from 'composables/tMobile';
 
 const route = useRoute();
@@ -161,7 +161,7 @@ const columns = computed(() => [
                         auto-width
                         @keyup.ctrl.enter.stop="claimDevelopmentForm.saveChanges()"
                     >
-                        <VnSelectFilter
+                        <VnSelect
                             v-model="row[col.model]"
                             :options="col.options"
                             :option-value="col.optionValue"
@@ -181,7 +181,7 @@ const columns = computed(() => [
                                     </QItemSection>
                                 </QItem>
                             </template>
-                        </VnSelectFilter>
+                        </VnSelect>
                     </QTd>
                 </template>
                 <template #item="props">
@@ -198,7 +198,7 @@ const columns = computed(() => [
                             <QList dense>
                                 <QItem v-for="col in props.cols" :key="col.name">
                                     <QItemSection>
-                                        <VnSelectFilter
+                                        <VnSelect
                                             :label="col.label"
                                             v-model="props.row[col.model]"
                                             :options="col.options"

src/pages/Claim/Card/ClaimLinesImport.vue

@@ -35,6 +35,7 @@ const columns = computed(() => [
         label: t('Quantity'),
         field: (row) => row.quantity,
         sortable: true,
+        default: 0,
     },
     {
         name: 'description',
@@ -75,7 +76,6 @@ async function importLines() {
     const body = sales.map((row) => ({
         claimFk: route.params.id,
         saleFk: row.saleFk,
-        quantity: row.quantity,
     }));
 
     canceller = new AbortController();

src/pages/Claim/ClaimFilter.vue

@@ -4,7 +4,7 @@ import { useI18n } from 'vue-i18n';
 
 import FetchData from 'components/FetchData.vue';
 import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
-import VnSelectFilter from 'components/common/VnSelectFilter.vue';
+import VnSelect from 'components/common/VnSelect.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import VnInputDate from 'components/common/VnInputDate.vue';
 
@@ -64,7 +64,7 @@ const states = ref();
                     <QSkeleton type="QInput" class="full-width" />
                 </QItemSection>
                 <QItemSection v-if="workers">
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('Salesperson')"
                         v-model="params.salesPersonFk"
                         @update:model-value="searchFn()"
@@ -87,7 +87,7 @@ const states = ref();
                     <QSkeleton type="QInput" class="full-width" />
                 </QItemSection>
                 <QItemSection v-if="workers">
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('Attender')"
                         v-model="params.attenderFk"
                         @update:model-value="searchFn()"
@@ -110,7 +110,7 @@ const states = ref();
                     <QSkeleton type="QInput" class="full-width" />
                 </QItemSection>
                 <QItemSection v-if="workers">
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('Responsible')"
                         v-model="params.claimResponsibleFk"
                         @update:model-value="searchFn()"
@@ -133,7 +133,7 @@ const states = ref();
                     <QSkeleton type="QInput" class="full-width" />
                 </QItemSection>
                 <QItemSection v-if="states">
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('State')"
                         v-model="params.claimStateFk"
                         @update:model-value="searchFn()"

src/pages/Claim/locale/es.yml

@@ -0,0 +1,2 @@
+Search claim: Buscar reclamación
+You can search by claim id or customer name: Puedes buscar por id de la reclamación o nombre del cliente

src/pages/Customer/Card/CustomerBalance.vue

@@ -15,7 +15,7 @@ import { usePrintService } from 'src/composables/usePrintService';
 import VnPaginate from 'src/components/ui/VnPaginate.vue';
 import FetchData from 'components/FetchData.vue';
 import VnInput from 'src/components/common/VnInput.vue';
-import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
 import CustomerNewPayment from 'src/pages/Customer/components/CustomerNewPayment.vue';
 import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
 import InvoiceOutDescriptorProxy from 'src/pages/InvoiceOut/Card/InvoiceOutDescriptorProxy.vue';
@@ -316,7 +316,7 @@ const sendEmailAction = () => {
 
     <QDrawer :width="256" show-if-above side="right" v-model="stateStore.rightDrawer">
         <div class="q-mt-xl q-px-md">
-            <VnSelectFilter
+            <VnSelect
                 :label="t('Company')"
                 :options="companiesOptions"
                 @update:model-value="updateCompanyId($event)"

src/pages/Customer/Card/CustomerBillingData.vue

@@ -7,7 +7,7 @@ import FetchData from 'components/FetchData.vue';
 import FormModel from 'components/FormModel.vue';
 import VnRow from 'components/ui/VnRow.vue';
 import VnInput from 'src/components/common/VnInput.vue';
-import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
 import VnSelectDialog from 'src/components/common/VnSelectDialog.vue';
 import CreateBankEntityForm from 'src/components/CreateBankEntityForm.vue';
 
@@ -49,7 +49,7 @@ const getBankEntities = (data, formData) => {
         <template #form="{ data, validate }">
             <VnRow class="row q-gutter-md q-mb-md">
                 <div class="col">
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('Billing data')"
                         :options="payMethods"
                         hide-selected

src/pages/Customer/Card/CustomerCard.vue

@@ -1,43 +1,15 @@
 <script setup>
-import { useI18n } from 'vue-i18n';
-import { useStateStore } from 'stores/useStateStore';
+import VnCard from 'components/common/VnCard.vue';
 import CustomerDescriptor from './CustomerDescriptor.vue';
-import LeftMenu from 'components/LeftMenu.vue';
-import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
-import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
-import useCardSize from 'src/composables/useCardSize';
-
-const stateStore = useStateStore();
-const { t } = useI18n();
 </script>
 <template>
-    <Teleport to="#searchbar" v-if="stateStore.isHeaderMounted()">
-        <VnSearchbar
-            data-key="CustomerList"
-            url="Clients/filter"
-            :label="t('Search customer')"
-            :info="t('You can search by customer id or name')"
-        />
-    </Teleport>
-    <QDrawer v-model="stateStore.leftDrawer" show-if-above :width="256">
-        <QScrollArea class="fit">
-            <CustomerDescriptor />
-            <QSeparator />
-            <LeftMenu source="card" />
-        </QScrollArea>
-    </QDrawer>
-    <QPageContainer>
-        <QPage>
-            <VnSubToolbar />
-            <div :class="useCardSize()">
-                <RouterView></RouterView>
-            </div>
-        </QPage>
-    </QPageContainer>
+    <VnCard
+        data-key="Client"
+        base-url="Clients"
+        :descriptor="CustomerDescriptor"
+        searchbar-data-key="CustomerList"
+        searchbar-url="Clients/filter"
+        searchbar-label="Search customer"
+        searchbar-info="You can search by customer id or name"
+    />
 </template>
-
-<i18n>
-es:
-    Search customer: Buscar cliente
-    You can search by customer id or name: Puedes buscar por id o nombre del cliente
-</i18n>

src/pages/Customer/Card/CustomerFiscalData.vue

@@ -7,7 +7,7 @@ import FetchData from 'components/FetchData.vue';
 import FormModel from 'components/FormModel.vue';
 import VnRow from 'components/ui/VnRow.vue';
 import VnInput from 'src/components/common/VnInput.vue';
-import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
 import VnLocation from 'src/components/common/VnLocation.vue';
 
 const { t } = useI18n();
@@ -69,7 +69,7 @@ function handleLocation(data, location) {
 
             <VnRow class="row q-gutter-md q-mb-md">
                 <div class="col">
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('Sage tax type')"
                         :options="typesTaxes"
                         hide-selected
@@ -79,7 +79,7 @@ function handleLocation(data, location) {
                     />
                 </div>
                 <div class="col">
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('Sage transaction type')"
                         :options="typesTransactions"
                         hide-selected
@@ -97,7 +97,7 @@ function handleLocation(data, location) {
                                 </QItemSection>
                             </QItem>
                         </template>
-                    </VnSelectFilter>
+                    </VnSelect>
                 </div>
             </VnRow>
 

src/pages/Customer/Card/CustomerLog.vue

@@ -8,7 +8,7 @@ import { useStateStore } from 'stores/useStateStore';
 import FetchData from 'components/FetchData.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import VnInputDate from 'src/components/common/VnInputDate.vue';
-import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
 
 const { t } = useI18n();
 const route = useRoute();
@@ -139,7 +139,7 @@ const setInq = (value, status) => {
                     </QIcon>
                 </template>
             </VnInput>
-            <VnSelectFilter
+            <VnSelect
                 :label="t('Entity')"
                 :options="[]"
                 class="q-mt-md"
@@ -179,7 +179,7 @@ const setInq = (value, status) => {
                 />
             </div>
 
-            <VnSelectFilter
+            <VnSelect
                 :label="t('User')"
                 :options="[]"
                 class="q-mt-sm"

src/pages/Customer/CustomerCreate.vue

@@ -5,7 +5,7 @@ import { useI18n } from 'vue-i18n';
 import FetchData from 'components/FetchData.vue';
 import FormModel from 'components/FormModel.vue';
 import VnRow from 'components/ui/VnRow.vue';
-import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
 import VnLocation from 'src/components/common/VnLocation.vue';
 import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 
@@ -53,7 +53,7 @@ function handleLocation(data, location) {
                         <QInput :label="t('Comercial name')" v-model="data.name" />
                     </div>
                     <div class="col">
-                        <VnSelectFilter
+                        <VnSelect
                             :label="t('Salesperson')"
                             :options="workersOptions"
                             hide-selected
@@ -65,7 +65,7 @@ function handleLocation(data, location) {
                 </VnRow>
                 <VnRow class="row q-gutter-md q-mb-md">
                     <div class="col">
-                        <VnSelectFilter
+                        <VnSelect
                             :label="t('Business type')"
                             :options="businessTypesOptions"
                             hide-selected

src/pages/Customer/CustomerFilter.vue

@@ -4,7 +4,7 @@ import { useI18n } from 'vue-i18n';
 
 import FetchData from 'components/FetchData.vue';
 import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
-import VnSelectFilter from 'components/common/VnSelectFilter.vue';
+import VnSelect from 'components/common/VnSelect.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 
 const { t } = useI18n();
@@ -69,7 +69,7 @@ const zones = ref();
                     <QSkeleton type="QInput" class="full-width" />
                 </QItemSection>
                 <QItemSection v-if="workers">
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('Salesperson')"
                         v-model="params.salesPersonFk"
                         @update:model-value="searchFn()"
@@ -92,7 +92,7 @@ const zones = ref();
                     <QSkeleton type="QInput" class="full-width" />
                 </QItemSection>
                 <QItemSection v-if="provinces">
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('Province')"
                         v-model="params.provinceFk"
                         @update:model-value="searchFn()"
@@ -139,7 +139,7 @@ const zones = ref();
                         <QSkeleton type="QInput" class="full-width" />
                     </QItemSection>
                     <QItemSection v-if="zones">
-                        <VnSelectFilter
+                        <VnSelect
                             :label="t('Zone')"
                             v-model="params.zoneFk"
                             @update:model-value="searchFn()"

src/pages/Customer/Defaulter/CustomerDefaulterFilter.vue

@@ -6,7 +6,7 @@ import FetchData from 'components/FetchData.vue';
 import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import VnInputDate from 'src/components/common/VnInputDate.vue';
-import VnSelectFilter from 'components/common/VnSelectFilter.vue';
+import VnSelect from 'components/common/VnSelect.vue';
 
 const { t } = useI18n();
 const props = defineProps({
@@ -48,7 +48,7 @@ const authors = ref();
         <template #body="{ params }">
             <QItem class="q-mb-sm q-mt-sm">
                 <QItemSection v-if="clients">
-                    <VnSelectFilter
+                    <VnSelect
                         :input-debounce="0"
                         :label="t('Client')"
                         :options="clients"
@@ -71,7 +71,7 @@ const authors = ref();
 
             <QItem class="q-mb-sm">
                 <QItemSection v-if="salespersons">
-                    <VnSelectFilter
+                    <VnSelect
                         :input-debounce="0"
                         :label="t('Salesperson')"
                         :options="salespersons"
@@ -94,7 +94,7 @@ const authors = ref();
 
             <QItem class="q-mb-sm">
                 <QItemSection v-if="countries">
-                    <VnSelectFilter
+                    <VnSelect
                         :input-debounce="0"
                         :label="t('Country')"
                         :options="countries"
@@ -139,7 +139,7 @@ const authors = ref();
 
             <QItem class="q-mb-sm">
                 <QItemSection v-if="authors">
-                    <VnSelectFilter
+                    <VnSelect
                         :input-debounce="0"
                         :label="t('Author')"
                         :options="authors"

src/pages/Customer/ExtendedList/CustomerExtendedListFilter.vue

@@ -4,7 +4,7 @@ import { useI18n } from 'vue-i18n';
 
 import FetchData from 'components/FetchData.vue';
 import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
-import VnSelectFilter from 'components/common/VnSelectFilter.vue';
+import VnSelect from 'components/common/VnSelect.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import VnInputDate from 'components/common/VnInputDate.vue';
 import { dateRange } from 'src/filters';
@@ -169,7 +169,7 @@ const shouldRenderColumn = (colName) => {
                         <QSkeleton type="QInput" class="full-width" />
                     </QItemSection>
                     <QItemSection v-if="clients">
-                        <VnSelectFilter
+                        <VnSelect
                             :label="t('Social name')"
                             v-model="params.socialName"
                             @update:model-value="searchFn()"
@@ -201,7 +201,7 @@ const shouldRenderColumn = (colName) => {
                     <QSkeleton type="QInput" class="full-width" />
                 </QItemSection>
                 <QItemSection v-if="workers">
-                    <VnSelectFilter
+                    <VnSelect
                         :label="
                             t('customer.extendedList.tableVisibleColumns.salesPersonFk')
                         "
@@ -270,7 +270,7 @@ const shouldRenderColumn = (colName) => {
             </QItem>
             <QItem v-if="shouldRenderColumn('countryFk')">
                 <QItemSection>
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('customer.extendedList.tableVisibleColumns.countryFk')"
                         v-model="params.countryFk"
                         @update:model-value="searchFn()"
@@ -287,7 +287,7 @@ const shouldRenderColumn = (colName) => {
             </QItem>
             <QItem v-if="shouldRenderColumn('provinceFk')">
                 <QItemSection>
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('customer.extendedList.tableVisibleColumns.provinceFk')"
                         v-model="params.provinceFk"
                         @update:model-value="searchFn()"
@@ -342,7 +342,7 @@ const shouldRenderColumn = (colName) => {
             </QItem>
             <QItem v-if="shouldRenderColumn('businessTypeFk')">
                 <QItemSection>
-                    <VnSelectFilter
+                    <VnSelect
                         :label="
                             t('customer.extendedList.tableVisibleColumns.businessTypeFk')
                         "
@@ -361,7 +361,7 @@ const shouldRenderColumn = (colName) => {
             </QItem>
             <QItem v-if="shouldRenderColumn('payMethodFk')">
                 <QItemSection>
-                    <VnSelectFilter
+                    <VnSelect
                         :label="
                             t('customer.extendedList.tableVisibleColumns.payMethodFk')
                         "
@@ -380,7 +380,7 @@ const shouldRenderColumn = (colName) => {
             </QItem>
             <QItem v-if="shouldRenderColumn('sageTaxTypeFk')">
                 <QItemSection>
-                    <VnSelectFilter
+                    <VnSelect
                         :label="
                             t('customer.extendedList.tableVisibleColumns.sageTaxTypeFk')
                         "
@@ -399,7 +399,7 @@ const shouldRenderColumn = (colName) => {
             </QItem>
             <QItem v-if="shouldRenderColumn('sageTransactionTypeFk')">
                 <QItemSection>
-                    <VnSelectFilter
+                    <VnSelect
                         :label="
                             t(
                                 'customer.extendedList.tableVisibleColumns.sageTransactionTypeFk'

src/pages/Customer/Notifications/CustomerNotificationsFilter.vue

@@ -5,7 +5,7 @@ import { useI18n } from 'vue-i18n';
 import FetchData from 'components/FetchData.vue';
 import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
 import VnInput from 'src/components/common/VnInput.vue';
-import VnSelectFilter from 'components/common/VnSelectFilter.vue';
+import VnSelect from 'components/common/VnSelect.vue';
 
 const { t } = useI18n();
 const props = defineProps({
@@ -52,7 +52,7 @@ const clients = ref();
                     <QSkeleton type="QInput" class="full-width" />
                 </QItemSection>
                 <QItemSection v-if="clients">
-                    <VnSelectFilter
+                    <VnSelect
                         :input-debounce="0"
                         :label="t('Social name')"
                         :options="clients"
@@ -76,7 +76,7 @@ const clients = ref();
                     <QSkeleton type="QInput" class="full-width" />
                 </QItemSection>
                 <QItemSection v-if="cities">
-                    <VnSelectFilter
+                    <VnSelect
                         :input-debounce="0"
                         :label="t('City')"
                         :options="cities"

src/pages/Customer/components/CustomerAddressCreate.vue

@@ -9,7 +9,7 @@ import FetchData from 'components/FetchData.vue';
 import FormModel from 'components/FormModel.vue';
 import VnRow from 'components/ui/VnRow.vue';
 import VnInput from 'src/components/common/VnInput.vue';
-import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
 import VnSelectDialog from 'src/components/common/VnSelectDialog.vue';
 import CustomerCreateNewPostcode from 'src/components/CreateNewPostcodeForm.vue';
 import CustomerNewCustomsAgent from 'src/pages/Customer/components/CustomerNewCustomsAgent.vue';
@@ -101,7 +101,7 @@ function handleLocation(data, location) {
             />
 
             <div class="row justify-between q-gutter-md q-mb-md">
-                <VnSelectFilter
+                <VnSelect
                     :label="t('Agency')"
                     :options="agencyModes"
                     :rules="validate('route.agencyFk')"
@@ -121,7 +121,7 @@ function handleLocation(data, location) {
             </div>
 
             <VnRow class="row q-gutter-md q-mb-md">
-                <VnSelectFilter
+                <VnSelect
                     :label="t('Incoterms')"
                     :options="incoterms"
                     hide-selected

src/pages/Customer/components/CustomerAddressEdit.vue

@@ -9,7 +9,7 @@ import FetchData from 'components/FetchData.vue';
 import FormModel from 'components/FormModel.vue';
 import VnRow from 'components/ui/VnRow.vue';
 import VnInput from 'src/components/common/VnInput.vue';
-import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
 import VnSelectDialog from 'src/components/common/VnSelectDialog.vue';
 import CustomerCreateNewPostcode from 'src/components/CreateNewPostcodeForm.vue';
 import CustomsNewCustomsAgent from 'src/pages/Customer/components/CustomerNewCustomsAgent.vue';
@@ -185,7 +185,7 @@ function handleLocation(data, location) {
                     ></VnLocation>
                 </div>
                 <div class="col">
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('Agency')"
                         :options="agencyModes"
                         :rules="validate('route.agencyFk')"
@@ -205,7 +205,7 @@ function handleLocation(data, location) {
 
             <VnRow class="row q-gutter-md q-mb-md">
                 <div class="col">
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('Incoterms')"
                         :options="incoterms"
                         hide-selected
@@ -237,7 +237,7 @@ function handleLocation(data, location) {
                 v-for="(note, index) in notes"
             >
                 <div class="col">
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('Observation type')"
                         :options="observationTypes"
                         hide-selected

src/pages/Customer/components/CustomerFileManagementCreate.vue

@@ -11,7 +11,7 @@ import useNotify from 'src/composables/useNotify';
 
 import FetchData from 'components/FetchData.vue';
 import VnRow from 'components/ui/VnRow.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';
 
 const { notify } = useNotify();
@@ -152,7 +152,7 @@ const toCustomerFileManagement = () => {
                         />
                     </div>
                     <div class="col">
-                        <VnSelectFilter
+                        <VnSelect
                             :label="t('Company')"
                             :options="optionsCompanies"
                             :rules="validate('entry.companyFk')"
@@ -165,7 +165,7 @@ const toCustomerFileManagement = () => {
 
                 <VnRow class="row q-gutter-md q-mb-md">
                     <div class="col">
-                        <VnSelectFilter
+                        <VnSelect
                             :label="t('Warehouse')"
                             :options="optionsWarehouses"
                             option-label="name"
@@ -174,7 +174,7 @@ const toCustomerFileManagement = () => {
                         />
                     </div>
                     <div class="col">
-                        <VnSelectFilter
+                        <VnSelect
                             :label="t('Type')"
                             :options="optionsDmsTypes"
                             option-label="name"

src/pages/Customer/components/CustomerFileManagementEdit.vue

@@ -10,7 +10,7 @@ import useNotify from 'src/composables/useNotify';
 
 import FetchData from 'components/FetchData.vue';
 import VnRow from 'components/ui/VnRow.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';
 
 const { notify } = useNotify();
@@ -128,7 +128,7 @@ const toCustomerFileManagement = () => {
                         />
                     </div>
                     <div class="col">
-                        <VnSelectFilter
+                        <VnSelect
                             :label="t('Company')"
                             :options="optionsCompanies"
                             :rules="validate('entry.companyFk')"
@@ -141,7 +141,7 @@ const toCustomerFileManagement = () => {
 
                 <VnRow class="row q-gutter-md q-mb-md">
                     <div class="col">
-                        <VnSelectFilter
+                        <VnSelect
                             :label="t('Warehouse')"
                             :options="optionsWarehouses"
                             option-label="name"
@@ -150,7 +150,7 @@ const toCustomerFileManagement = () => {
                         />
                     </div>
                     <div class="col">
-                        <VnSelectFilter
+                        <VnSelect
                             :label="t('Type')"
                             :options="optionsDmsTypes"
                             option-label="name"

src/pages/Customer/components/CustomerGreugeCreate.vue

@@ -8,7 +8,7 @@ import FormModel from 'components/FormModel.vue';
 import VnRow from 'components/ui/VnRow.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import VnInputDate from 'components/common/VnInputDate.vue';
-import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
 
 const { t } = useI18n();
 const route = useRoute();
@@ -74,7 +74,7 @@ const toCustomerGreuges = () => {
                     <VnInput :label="t('Comment')" clearable v-model="data.description" />
                 </div>
                 <div class="col">
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('Type')"
                         :options="greugeTypes"
                         hide-selected

src/pages/Customer/components/CustomerNewPayment.vue

@@ -9,7 +9,7 @@ import FetchData from 'components/FetchData.vue';
 import FormModel from 'components/FormModel.vue';
 import VnRow from 'components/ui/VnRow.vue';
 import VnInputDate from 'components/common/VnInputDate.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';
 
 const { t } = useI18n();
@@ -143,7 +143,7 @@ const onDataSaved = async () => {
                         />
                     </div>
                     <div class="col">
-                        <VnSelectFilter
+                        <VnSelect
                             :label="t('Company')"
                             :options="companyOptions"
                             :required="true"
@@ -158,7 +158,7 @@ const onDataSaved = async () => {
 
                 <VnRow class="row q-gutter-md q-mb-md">
                     <div class="col">
-                        <VnSelectFilter
+                        <VnSelect
                             :label="t('Bank')"
                             :options="bankOptions"
                             :required="true"
@@ -177,7 +177,7 @@ const onDataSaved = async () => {
                                     </QItemSection>
                                 </QItem>
                             </template>
-                        </VnSelectFilter>
+                        </VnSelect>
                     </div>
                     <div class="col">
                         <VnInput

src/pages/Customer/components/CustomerSamplesCreate.vue

@@ -12,7 +12,7 @@ import useNotify from 'src/composables/useNotify';
 
 import FetchData from 'components/FetchData.vue';
 import VnRow from 'components/ui/VnRow.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 VnInputDate from 'src/components/common/VnInputDate.vue';
 import CustomerSamplesPreview from 'src/pages/Customer/components/CustomerSamplesPreview.vue';
@@ -253,7 +253,7 @@ const toCustomerSamples = () => {
         <QCard class="card-width q-pa-lg">
             <QForm>
                 <div class="col">
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('Sample')"
                         :options="optionsSamplesVisible"
                         @update:model-value="setSampleType"
@@ -306,7 +306,7 @@ const toCustomerSamples = () => {
                     v-if="sampleType?.hasCompany || sampleType?.datepickerEnabled"
                 >
                     <div class="col">
-                        <VnSelectFilter
+                        <VnSelect
                             :label="t('Company')"
                             :options="optionsCompanies"
                             :rules="validate('entry.companyFk')"
@@ -319,7 +319,7 @@ const toCustomerSamples = () => {
                         />
                     </div>
                     <div class="col">
-                        <VnSelectFilter
+                        <VnSelect
                             :label="t('Address')"
                             :options="optionsClientsAddressess"
                             hide-selected
@@ -345,7 +345,7 @@ const toCustomerSamples = () => {
                                     <QTooltip>{{ t('Edit address') }}</QTooltip>
                                 </QIcon>
                             </template>
-                        </VnSelectFilter>
+                        </VnSelect>
                     </div>
                 </VnRow>
 

src/pages/Customer/locale/es.yml

@@ -1,3 +1,5 @@
+Search customer: Buscar cliente
+You can search by customer id or name: Puedes buscar por id o nombre del cliente
 customerFilter:
     filter:
         name: Nombre

src/pages/Department/Card/DepartmentBasicData.vue

@@ -7,7 +7,7 @@ import FetchData from 'components/FetchData.vue';
 import FormModel from 'components/FormModel.vue';
 import VnRow from 'components/ui/VnRow.vue';
 import VnInput from 'src/components/common/VnInput.vue';
-import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
 
 const route = useRoute();
 const { t } = useI18n();
@@ -68,7 +68,7 @@ const clientsOptions = ref([]);
             </VnRow>
             <VnRow class="row q-gutter-md q-mb-md">
                 <div class="col">
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('department.bossDepartment')"
                         v-model="data.workerFk"
                         :options="workersOptions"
@@ -80,7 +80,7 @@ const clientsOptions = ref([]);
                     />
                 </div>
                 <div class="col">
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('department.selfConsumptionCustomer')"
                         v-model="data.clientFk"
                         :options="clientsOptions"

src/pages/Department/Card/DepartmentCard.vue

@@ -1,26 +1,13 @@
 <script setup>
-import { useStateStore } from 'stores/useStateStore';
+import VnCard from 'components/common/VnCard.vue';
 import DepartmentDescriptor from 'pages/Department/Card/DepartmentDescriptor.vue';
-import LeftMenu from 'components/LeftMenu.vue';
-import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
-
-const stateStore = useStateStore();
 </script>
 <template>
-    <QDrawer v-model="stateStore.leftDrawer" show-if-above :width="256">
-        <QScrollArea class="fit">
-            <DepartmentDescriptor />
-            <QSeparator />
-            <LeftMenu source="card" />
-        </QScrollArea>
-    </QDrawer>
-    <QPageContainer>
-        <QPage>
-            <VnSubToolbar />
-
-            <div class="q-pa-md column items-center">
-                <RouterView></RouterView>
-            </div>
-        </QPage>
-    </QPageContainer>
+    <VnCard
+        class="q-pa-md column items-center"
+        v-bind="{ ...$attrs }"
+        data-key="Department"
+        base-url="Departments"
+        :descriptor="DepartmentDescriptor"
+    />
 </template>

src/pages/Department/Card/DepartmentSummary.vue

@@ -27,6 +27,7 @@ onMounted(async () => {
 
 <template>
     <CardSummary
+        data-key="DepartmentSummary"
         ref="summary"
         :url="`Departments/${entityId}`"
         class="full-width"

src/pages/Entry/Card/EntryBasicData.vue

@@ -8,7 +8,7 @@ import FetchData from 'components/FetchData.vue';
 import FormModel from 'components/FormModel.vue';
 import VnRow from 'components/ui/VnRow.vue';
 import VnInput from 'src/components/common/VnInput.vue';
-import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
 import VnSelectDialog from 'src/components/common/VnSelectDialog.vue';
 import FilterTravelForm from 'src/components/FilterTravelForm.vue';
 
@@ -69,7 +69,7 @@ const onFilterTravelSelected = (formData, id) => {
         <template #form="{ data }">
             <VnRow class="row q-gutter-md q-mb-md">
                 <div class="col">
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('entry.basicData.supplier')"
                         v-model="data.supplierFk"
                         :options="suppliersOptions"
@@ -89,7 +89,7 @@ const onFilterTravelSelected = (formData, id) => {
                                 </QItemSection>
                             </QItem>
                         </template>
-                    </VnSelectFilter>
+                    </VnSelect>
                 </div>
                 <div class="col">
                     <VnSelectDialog
@@ -141,7 +141,7 @@ const onFilterTravelSelected = (formData, id) => {
                     />
                 </div>
                 <div class="col">
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('entry.basicData.company')"
                         v-model="data.companyFk"
                         :options="companiesOptions"
@@ -155,7 +155,7 @@ const onFilterTravelSelected = (formData, id) => {
             </VnRow>
             <VnRow class="row q-gutter-md q-mb-md">
                 <div class="col">
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('entry.basicData.currency')"
                         v-model="data.currencyFk"
                         :options="currenciesOptions"

src/pages/Entry/Card/EntryBuys.vue

@@ -6,7 +6,7 @@ import { QBtn } from 'quasar';
 
 import VnPaginate from 'src/components/ui/VnPaginate.vue';
 import FetchData from 'src/components/FetchData.vue';
-import VnSelectFilter from 'components/common/VnSelectFilter.vue';
+import VnSelect from 'components/common/VnSelect.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import FetchedTags from 'components/ui/FetchedTags.vue';
 import VnConfirm from 'components/ui/VnConfirm.vue';
@@ -59,7 +59,7 @@ const tableColumnComponents = computed(() => ({
         event: getInputEvents,
     },
     packagingFk: {
-        component: VnSelectFilter,
+        component: VnSelect,
         props: {
             'option-value': 'id',
             'option-label': 'id',

src/pages/Entry/Card/EntryBuysImport.vue

@@ -6,7 +6,7 @@ import { useI18n } from 'vue-i18n';
 import VnInput from 'src/components/common/VnInput.vue';
 import VnRow from 'components/ui/VnRow.vue';
 import FetchData from 'components/FetchData.vue';
-import VnSelectFilter from 'components/common/VnSelectFilter.vue';
+import VnSelect from 'components/common/VnSelect.vue';
 import VnSelectDialog from 'src/components/common/VnSelectDialog.vue';
 import FilterItemForm from 'src/components/FilterItemForm.vue';
 
@@ -269,7 +269,7 @@ const redirectToBuysView = () => {
                         </template>
                         <template #body-cell-packagingFk="{ row, col }">
                             <QTd auto-width>
-                                <VnSelectFilter
+                                <VnSelect
                                     v-model="row[col.field]"
                                     :options="col.options"
                                     :option-value="col.optionValue"

src/pages/Entry/Card/EntryCard.vue

@@ -1,48 +1,15 @@
 <script setup>
-import { useI18n } from 'vue-i18n';
-
-import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
-import LeftMenu from 'components/LeftMenu.vue';
-import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
+import VnCard from 'components/common/VnCard.vue';
 import EntryDescriptor from './EntryDescriptor.vue';
-
-import { useStateStore } from 'stores/useStateStore';
-import useCardSize from 'src/composables/useCardSize';
-
-const { t } = useI18n();
-const stateStore = useStateStore();
 </script>
 <template>
-    <template v-if="stateStore.isHeaderMounted()">
-        <Teleport to="#searchbar">
-            <VnSearchbar
-                data-key="EntryList"
-                url="Entries/filter"
-                :label="t('Search entries')"
-                :info="t('You can search by entry reference')"
-            />
-        </Teleport>
-    </template>
-    <QDrawer v-model="stateStore.leftDrawer" show-if-above :width="256">
-        <QScrollArea class="fit">
-            <EntryDescriptor />
-            <QSeparator />
-            <LeftMenu source="card" />
-        </QScrollArea>
-    </QDrawer>
-    <QPageContainer>
-        <QPage>
-            <VnSubToolbar />
-
-            <div :class="useCardSize()">
-                <RouterView></RouterView>
-            </div>
-        </QPage>
-    </QPageContainer>
+    <VnCard
+        data-key="Entry"
+        base-url="Entries"
+        :descriptor="EntryDescriptor"
+        searchbar-data-key="EntryList"
+        searchbar-url="Entries/filter"
+        searchbar-label="Search entries"
+        searchbar-info="You can search by entry reference"
+    />
 </template>
-
-<i18n>
-es:
-    Search entries: Buscar entradas
-    You can search by entry reference: Puedes buscar por referencia de la entrada
-</i18n>

src/pages/Entry/Card/EntryNotes.vue

@@ -6,7 +6,7 @@ import { useI18n } from 'vue-i18n';
 import FetchData from 'components/FetchData.vue';
 import CrudModel from 'components/CrudModel.vue';
 import VnInput from 'src/components/common/VnInput.vue';
-import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
 
 const { params } = useRoute();
 const { t } = useI18n();
@@ -80,7 +80,7 @@ const columns = computed(() => [
             >
                 <template #body-cell-observationType="{ row, col }">
                     <QTd>
-                        <VnSelectFilter
+                        <VnSelect
                             v-model="row[col.model]"
                             :options="col.options"
                             :option-value="col.optionValue"
@@ -111,7 +111,7 @@ const columns = computed(() => [
                             <QList dense>
                                 <QItem>
                                     <QItemSection>
-                                        <VnSelectFilter
+                                        <VnSelect
                                             v-model="props.row.observationTypeFk"
                                             :options="entryObservationsOptions"
                                             option-value="id"

src/pages/Entry/EntryCreate.vue

@@ -5,7 +5,7 @@ import { useRoute, useRouter } from 'vue-router';
 
 import FormModel from 'components/FormModel.vue';
 import VnRow from 'components/ui/VnRow.vue';
-import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
 import FetchData from 'components/FetchData.vue';
 import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
@@ -80,7 +80,7 @@ const redirectToEntryBasicData = (_, { id }) => {
             <template #form="{ data, validate }">
                 <VnRow class="row q-gutter-md q-mb-md">
                     <div class="col">
-                        <VnSelectFilter
+                        <VnSelect
                             :label="t('Supplier')"
                             class="full-width"
                             v-model="data.supplierFk"
@@ -101,12 +101,12 @@ const redirectToEntryBasicData = (_, { id }) => {
                                     </QItemSection>
                                 </QItem>
                             </template>
-                        </VnSelectFilter>
+                        </VnSelect>
                     </div>
                 </VnRow>
                 <VnRow class="row q-gutter-md q-mb-md">
                     <div class="col">
-                        <VnSelectFilter
+                        <VnSelect
                             :label="t('Travel')"
                             class="full-width"
                             v-model="data.travelFk"
@@ -133,12 +133,12 @@ const redirectToEntryBasicData = (_, { id }) => {
                                     </QItemSection>
                                 </QItem>
                             </template>
-                        </VnSelectFilter>
+                        </VnSelect>
                     </div>
                 </VnRow>
                 <VnRow class="row q-gutter-md q-mb-md">
                     <div class="col">
-                        <VnSelectFilter
+                        <VnSelect
                             :label="t('Company')"
                             class="full-width"
                             v-model="data.companyFk"

src/pages/Entry/EntryFilter.vue

@@ -5,7 +5,7 @@ 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 VnSelect from 'src/components/common/VnSelect.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import FetchData from 'components/FetchData.vue';
 import VnInputDate from 'src/components/common/VnInputDate.vue';
@@ -99,7 +99,7 @@ onMounted(async () => {
             </QItem>
             <QItem>
                 <QItemSection>
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('params.companyFk')"
                         v-model="params.companyFk"
                         @update:model-value="searchFn()"
@@ -115,7 +115,7 @@ onMounted(async () => {
             </QItem>
             <QItem>
                 <QItemSection>
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('params.currencyFk')"
                         v-model="params.currencyFk"
                         @update:model-value="searchFn()"
@@ -131,7 +131,7 @@ onMounted(async () => {
             </QItem>
             <QItem>
                 <QItemSection>
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('params.supplierFk')"
                         v-model="params.supplierFk"
                         @update:model-value="searchFn()"
@@ -152,7 +152,7 @@ onMounted(async () => {
                                 </QItemSection>
                             </QItem>
                         </template>
-                    </VnSelectFilter>
+                    </VnSelect>
                 </QItemSection>
             </QItem>
             <QItem>

src/pages/Entry/EntryLatestBuys.vue

@@ -9,7 +9,7 @@ import EntryDescriptorProxy from './Card/EntryDescriptorProxy.vue';
 import TableVisibleColumns from 'src/components/common/TableVisibleColumns.vue';
 import EditTableCellValueForm from 'src/components/EditTableCellValueForm.vue';
 import VnInput from 'src/components/common/VnInput.vue';
-import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
 import EntryLatestBuysFilter from './EntryLatestBuysFilter.vue';
 import ItemDescriptorProxy from '../Item/Card/ItemDescriptorProxy.vue';
 
@@ -218,7 +218,7 @@ const columns = computed(() => [
         align: 'left',
         sortable: true,
         columnFilter: {
-            component: VnSelectFilter,
+            component: VnSelect,
             type: 'select',
             filterValue: null,
             event: getInputEvents,
@@ -237,7 +237,7 @@ const columns = computed(() => [
         align: 'left',
         sortable: true,
         columnFilter: {
-            component: VnSelectFilter,
+            component: VnSelect,
             type: 'select',
             filterValue: null,
             event: getInputEvents,
@@ -256,7 +256,7 @@ const columns = computed(() => [
         align: 'left',
         sortable: true,
         columnFilter: {
-            component: VnSelectFilter,
+            component: VnSelect,
             type: 'select',
             filterValue: null,
             event: getInputEvents,
@@ -309,7 +309,7 @@ const columns = computed(() => [
         align: 'left',
         sortable: true,
         columnFilter: {
-            component: VnSelectFilter,
+            component: VnSelect,
             type: 'select',
             filterValue: null,
             event: getInputEvents,
@@ -513,7 +513,7 @@ const columns = computed(() => [
         align: 'left',
         sortable: true,
         columnFilter: {
-            component: VnSelectFilter,
+            component: VnSelect,
             type: 'select',
             filterValue: null,
             event: getInputEvents,
@@ -650,7 +650,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
     </QToolbar>
     <QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above>
         <QScrollArea class="fit text-grey-8">
-            <EntryLatestBuysFilter data-key="EntryLatestBuys" :tags="tags" />
+            <EntryLatestBuysFilter data-key="EntryLatestBuys" />
         </QScrollArea>
     </QDrawer>
     <QPage class="column items-center q-pa-md">

src/pages/Entry/EntryLatestBuysFilter.vue

@@ -1,141 +1,26 @@
 <script setup>
-import { computed, ref } from 'vue';
+import { ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 
-import VnInput from 'components/common/VnInput.vue';
 import FetchData from 'components/FetchData.vue';
 import VnInputDate from 'src/components/common/VnInputDate.vue';
-import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
-import VnSelectFilter from 'components/common/VnSelectFilter.vue';
-import VnFilterPanelChip from 'components/ui/VnFilterPanelChip.vue';
-
-import axios from 'axios';
+import VnSelect from 'components/common/VnSelect.vue';
+import ItemsFilterPanel from 'src/components/ItemsFilterPanel.vue';
 
 const { t } = useI18n();
-const props = defineProps({
+
+defineProps({
     dataKey: {
         type: String,
         required: true,
     },
 });
 
-const itemCategories = ref([]);
-const selectedCategoryFk = ref(null);
-const selectedTypeFk = ref(null);
-const itemTypesOptions = ref([]);
 const itemTypeWorkersOptions = ref([]);
 const suppliersOptions = ref([]);
-const tagOptions = ref([]);
-const tagValues = ref([]);
-
-const categoryList = computed(() => {
-    return (itemCategories.value || [])
-        .filter((category) => category.display)
-        .map((category) => ({
-            ...category,
-            icon: `vn:${(category.icon || '').split('-')[1]}`,
-        }));
-});
-
-const selectedCategory = computed(() =>
-    (itemCategories.value || []).find(
-        (category) => category?.id === selectedCategoryFk.value
-    )
-);
-
-const selectedType = computed(() => {
-    return (itemTypesOptions.value || []).find(
-        (type) => type?.id === selectedTypeFk.value
-    );
-});
-
-const selectCategory = async (params, categoryId, search) => {
-    if (params.categoryFk === categoryId) {
-        resetCategory(params);
-        search();
-        return;
-    }
-    selectedCategoryFk.value = categoryId;
-    params.categoryFk = categoryId;
-    await fetchItemTypes(categoryId);
-    search();
-};
-
-const resetCategory = (params) => {
-    selectedCategoryFk.value = null;
-    itemTypesOptions.value = null;
-    if (params) {
-        params.categoryFk = null;
-        params.typeFk = null;
-    }
-};
-
-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 fetchItemTypes = async (id) => {
-    try {
-        const filter = {
-            fields: ['id', 'name', 'categoryFk'],
-            where: { categoryFk: id },
-            include: 'category',
-            order: 'name ASC',
-        };
-        const { data } = await axios.get('ItemTypes', {
-            params: { filter: JSON.stringify(filter) },
-        });
-        itemTypesOptions.value = data;
-    } catch (err) {
-        console.error('Error fetching item types', err);
-    }
-};
-
-const getCategoryClass = (category, params) => {
-    if (category.id === params?.categoryFk) {
-        return 'active';
-    }
-};
-
-const getSelectedTagValues = async (tag) => {
-    try {
-        tag.value = null;
-        const filter = {
-            fields: ['value'],
-            order: 'value ASC',
-            limit: 30,
-        };
-
-        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 removeTag = (index, params, search) => {
-    (tagValues.value || []).splice(index, 1);
-    applyTags(params, search);
-};
 </script>
 
 <template>
-    <FetchData
-        url="ItemCategories"
-        limit="30"
-        auto-load
-        @on-fetch="(data) => (itemCategories = data)"
-    />
     <FetchData
         url="TicketRequests/getItemTypeWorker"
         limit="30"
@@ -150,102 +35,12 @@ const removeTag = (index, params, search) => {
         :filter="{ fields: ['id', 'name', 'nickname'], order: 'name ASC', limit: 30 }"
         @on-fetch="(data) => (suppliersOptions = data)"
     />
-    <FetchData
-        url="Tags"
-        :filter="{ fields: ['id', 'name', 'isFree'] }"
-        auto-load
-        limit="30"
-        @on-fetch="(data) => (tagOptions = data)"
-    />
-    <VnFilterPanel
-        :data-key="props.dataKey"
-        :expr-builder="exprBuilder"
-        :custom-tags="['tags']"
-        @init="onFilterInit"
-        @remove="clearFilter"
-    >
-        <template #tags="{ tag, formatFn }">
-            <strong v-if="tag.label === 'categoryFk'">
-                {{ t(selectedCategory?.name || '') }}
-            </strong>
-            <strong v-else-if="tag.label === 'typeFk'">
-                {{ t(selectedType?.name || '') }}
-            </strong>
-            <div v-else class="q-gutter-x-xs">
-                <strong>{{ t(`params.${tag.label}`) }}: </strong>
-                <span>{{ formatFn(tag.value) }}</span>
-            </div>
-        </template>
-        <template #customTags="{ tags: customTags, params }">
-            <template v-for="tag in customTags" :key="tag.label">
-                <VnFilterPanelChip
-                    v-for="chip in tag.value"
-                    :key="chip"
-                    removable
-                    @remove="removeTagChip(chip, params, searchFn)"
-                >
-                    <div class="q-gutter-x-xs">
-                        <strong>{{ chip.tagName }}: </strong>
-                        <span>"{{ chip.value }}"</span>
-                    </div>
-                </VnFilterPanelChip>
-            </template>
-        </template>
+    <ItemsFilterPanel :data-key="dataKey" :custom-tags="['tags']">
         <template #body="{ params, searchFn }">
-            <QItem class="category-filter q-mt-md">
-                <QBtn
-                    dense
-                    flat
-                    round
-                    v-for="category in categoryList"
-                    :key="category.name"
-                    :class="['category', getCategoryClass(category, params)]"
-                    :icon="category.icon"
-                    @click="selectCategory(params, category.id, searchFn)"
-                >
-                    <QTooltip>
-                        {{ t(category.name) }}
-                    </QTooltip>
-                </QBtn>
-            </QItem>
             <QItem class="q-my-md">
                 <QItemSection>
-                    <VnSelectFilter
-                        :label="t('params.typeFk')"
-                        v-model="params.typeFk"
-                        :options="itemTypesOptions"
-                        option-value="id"
-                        option-label="name"
-                        dense
-                        outlined
-                        rounded
-                        use-input
-                        :disable="!selectedCategoryFk"
-                        @update:model-value="
-                            (value) => {
-                                selectedTypeFk = value;
-                                searchFn();
-                            }
-                        "
-                    >
-                        <template #option="{ itemProps, opt }">
-                            <QItem v-bind="itemProps">
-                                <QItemSection>
-                                    <QItemLabel>{{ opt.name }}</QItemLabel>
-                                    <QItemLabel caption>
-                                        {{ opt.categoryName }}
-                                    </QItemLabel>
-                                </QItemSection>
-                            </QItem>
-                        </template>
-                    </VnSelectFilter>
-                </QItemSection>
-            </QItem>
-            <QSeparator />
-            <QItem class="q-my-md">
-                <QItemSection>
-                    <VnSelectFilter
-                        :label="t('params.salesPersonFk')"
+                    <VnSelect
+                        :label="t('components.itemsFilterPanel.salesPersonFk')"
                         v-model="params.salesPersonFk"
                         :options="itemTypeWorkersOptions"
                         option-value="id"
@@ -260,8 +55,8 @@ const removeTag = (index, params, search) => {
             </QItem>
             <QItem class="q-my-md">
                 <QItemSection>
-                    <VnSelectFilter
-                        :label="t('params.supplier')"
+                    <VnSelect
+                        :label="t('components.itemsFilterPanel.supplierFk')"
                         v-model="params.supplierFk"
                         :options="suppliersOptions"
                         option-value="id"
@@ -282,13 +77,13 @@ const removeTag = (index, params, search) => {
                                 </QItemSection>
                             </QItem>
                         </template>
-                    </VnSelectFilter>
+                    </VnSelect>
                 </QItemSection>
             </QItem>
             <QItem class="q-my-md">
                 <QItemSection>
                     <VnInputDate
-                        :label="t('params.from')"
+                        :label="t('components.itemsFilterPanel.from')"
                         v-model="params.from"
                         is-outlined
                         @update:model-value="searchFn()"
@@ -298,7 +93,7 @@ const removeTag = (index, params, search) => {
             <QItem class="q-my-md">
                 <QItemSection>
                     <VnInputDate
-                        :label="t('params.to')"
+                        :label="t('components.itemsFilterPanel.to')"
                         v-model="params.to"
                         is-outlined
                         @update:model-value="searchFn()"
@@ -308,7 +103,7 @@ const removeTag = (index, params, search) => {
             <QItem>
                 <QItemSection>
                     <QCheckbox
-                        :label="t('params.active')"
+                        :label="t('components.itemsFilterPanel.active')"
                         v-model="params.active"
                         toggle-indeterminate
                         @update:model-value="searchFn()"
@@ -316,7 +111,7 @@ const removeTag = (index, params, search) => {
                 </QItemSection>
                 <QItemSection>
                     <QCheckbox
-                        :label="t('params.visible')"
+                        :label="t('components.itemsFilterPanel.visible')"
                         v-model="params.visible"
                         toggle-indeterminate
                         @update:model-value="searchFn()"
@@ -326,7 +121,7 @@ const removeTag = (index, params, search) => {
             <QItem>
                 <QItemSection>
                     <QCheckbox
-                        :label="t('params.floramondo')"
+                        :label="t('components.itemsFilterPanel.floramondo')"
                         v-model="params.floramondo"
                         toggle-indeterminate
                         @update:model-value="searchFn()"
@@ -340,7 +135,7 @@ const removeTag = (index, params, search) => {
                 class="q-mt-md filter-value"
             >
                 <QItemSection class="col">
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('params.tag')"
                         v-model="value.selectedTag"
                         :options="tagOptions"
@@ -355,7 +150,7 @@ const removeTag = (index, params, search) => {
                     />
                 </QItemSection>
                 <QItemSection class="col">
-                    <VnSelectFilter
+                    <VnSelect
                         v-if="!value?.selectedTag?.isFree && value.valueOptions"
                         :label="t('params.value')"
                         v-model="value.value"
@@ -397,78 +192,5 @@ const removeTag = (index, params, search) => {
                 />
             </QItem>
         </template>
-    </VnFilterPanel>
+    </ItemsFilterPanel>
 </template>
-
-<style lang="scss" scoped>
-.category-filter {
-    display: flex;
-    flex-wrap: wrap;
-    justify-content: center;
-    gap: 12px;
-
-    .category {
-        padding: 8px;
-        width: 60px;
-        height: 60px;
-        font-size: 1.4rem;
-        background-color: var(--vn-accent-color);
-
-        &.active {
-            background-color: $primary;
-        }
-    }
-}
-
-.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>
-en:
-    params:
-        supplier: Supplier
-        from: From
-        to: To
-        active: Is active
-        visible: Is visible
-        floramondo: Is floramondo
-        salesPersonFk: Buyer
-        categoryFk: Category
-        typeFk: Type
-        tag: Tag
-        value: Value
-es:
-    params:
-        supplier: Proveedor
-        from: Desde
-        to: Hasta
-        active: Activo
-        visible: Visible
-        floramondo: Floramondo
-        salesPersonFk: Comprador
-        categoryFk: Categoría
-        typeFk: Tipo
-        tag: Etiqueta
-        value: Valor
-    Plant: Planta
-    Flower: Flor
-    Handmade: Confección
-    Green: Verde
-    Accessories: Complemento
-    Fruit: Fruta
-</i18n>

src/pages/Entry/locale/es.yml

@@ -1,3 +1,5 @@
+Search entries: Buscar entradas
+You can search by entry reference: Puedes buscar por referencia de la entrada
 entryList:
     list:
         inventoryEntry: Es inventario

src/pages/InvoiceIn/Card/InvoiceInBasicData.vue

@@ -7,7 +7,7 @@ import { useArrayData } from 'src/composables/useArrayData';
 import { downloadFile } from 'src/composables/downloadFile';
 
 import FormModel from 'components/FormModel.vue';
-import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
 import FetchData from 'src/components/FetchData.vue';
 
 import axios from 'axios';
@@ -183,7 +183,7 @@ async function upsert() {
         <template #form="{ data }">
             <div class="row q-gutter-md q-mb-md">
                 <div class="col">
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('supplierFk')"
                         v-model="data.supplierFk"
                         option-value="id"
@@ -202,7 +202,7 @@ async function upsert() {
                                 </QItemSection>
                             </QItem>
                         </template>
-                    </VnSelectFilter>
+                    </VnSelect>
                 </div>
                 <div class="col">
                     <QInput
@@ -401,7 +401,7 @@ async function upsert() {
             </div>
             <div class="row q-gutter-md q-mb-md">
                 <div class="col">
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('Currency')"
                         v-model="data.currencyFk"
                         :options="currencies"
@@ -410,7 +410,7 @@ async function upsert() {
                     />
                 </div>
                 <div class="col">
-                    <VnSelectFilter
+                    <VnSelect
                         v-if="companiesRef"
                         :label="t('Company')"
                         v-model="data.companyFk"
@@ -451,7 +451,7 @@ async function upsert() {
                         clearable
                         clear-icon="close"
                     />
-                    <VnSelectFilter
+                    <VnSelect
                         class="full-width q-pa-xs"
                         :label="`${t('Company')}*`"
                         v-model="dms.companyId"
@@ -462,7 +462,7 @@ async function upsert() {
                     />
                 </QItem>
                 <QItem>
-                    <VnSelectFilter
+                    <VnSelect
                         class="full-width q-pa-xs"
                         :label="`${t('Warehouse')}*`"
                         v-model="dms.warehouseId"
@@ -471,7 +471,7 @@ async function upsert() {
                         option-label="name"
                         :rules="[requiredFieldRule]"
                     />
-                    <VnSelectFilter
+                    <VnSelect
                         class="full-width q-pa-xs"
                         :label="`${t('Type')}*`"
                         v-model="dms.dmsTypeId"
@@ -560,7 +560,7 @@ async function upsert() {
                         :label="t('Reference')"
                         v-model="dms.reference"
                     />
-                    <VnSelectFilter
+                    <VnSelect
                         class="full-width q-pa-xs"
                         :label="`${t('Company')}*`"
                         v-model="dms.companyId"
@@ -571,7 +571,7 @@ async function upsert() {
                     />
                 </QItem>
                 <QItem>
-                    <VnSelectFilter
+                    <VnSelect
                         class="full-width q-pa-xs"
                         :label="`${t('Warehouse')}*`"
                         v-model="dms.warehouseId"
@@ -580,7 +580,7 @@ async function upsert() {
                         option-label="name"
                         :rules="[requiredFieldRule]"
                     />
-                    <VnSelectFilter
+                    <VnSelect
                         class="full-width q-pa-xs"
                         :label="`${t('Type')}*`"
                         v-model="dms.dmsTypeId"

src/pages/InvoiceIn/Card/InvoiceInCard.vue

@@ -1,18 +1,6 @@
 <script setup>
-import { useI18n } from 'vue-i18n';
-import { useStateStore } from 'stores/useStateStore';
+import VnCard from 'components/common/VnCard.vue';
 import InvoiceInDescriptor from './InvoiceInDescriptor.vue';
-import LeftMenu from 'components/LeftMenu.vue';
-import VnSearchbar from 'components/ui/VnSearchbar.vue';
-import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
-import { useArrayData } from 'src/composables/useArrayData';
-import { onMounted, watch } from 'vue';
-import { useRoute } from 'vue-router';
-import useCardSize from 'src/composables/useCardSize';
-
-const stateStore = useStateStore();
-const { t } = useI18n();
-const route = useRoute();
 
 const filter = {
     include: [
@@ -21,69 +9,25 @@ const filter = {
             scope: {
                 include: {
                     relation: 'contacts',
-                    scope: {
-                        where: {
-                            email: { neq: null },
-                        },
-                    },
+                    scope: { where: { email: { neq: null } } },
                 },
             },
         },
-        {
-            relation: 'invoiceInDueDay',
-        },
-        {
-            relation: 'company',
-        },
-        {
-            relation: 'currency',
-        },
+        { relation: 'invoiceInDueDay' },
+        { relation: 'company' },
+        { relation: 'currency' },
     ],
 };
-const arrayData = useArrayData('InvoiceIn', {
-    url: `InvoiceIns/${route.params.id}`,
-    filter,
-});
-
-onMounted(async () => await arrayData.fetch({ append: false }));
-watch(
-    () => route.params.id,
-    async (newId, oldId) => {
-        if (newId) {
-            arrayData.store.url = `InvoiceIns/${newId}`;
-            await arrayData.fetch({ append: false });
-        }
-    }
-);
 </script>
 <template>
-    <Teleport to="#searchbar" v-if="stateStore.isHeaderMounted()">
-        <VnSearchbar
-            data-key="InvoiceInList"
-            url="InvoiceIns/filter"
-            :label="t('Search invoice')"
-            :info="t('You can search by invoice reference')"
-        />
-    </Teleport>
-    <QDrawer v-model="stateStore.leftDrawer" show-if-above :width="256">
-        <QScrollArea class="fit">
-            <InvoiceInDescriptor />
-            <QSeparator />
-            <LeftMenu source="card" />
-        </QScrollArea>
-    </QDrawer>
-    <QPageContainer>
-        <QPage>
-            <VnSubToolbar />
-            <div :class="useCardSize()">
-                <RouterView></RouterView>
-            </div>
-        </QPage>
-    </QPageContainer>
+    <VnCard
+        data-key="InvoiceIn"
+        base-url="InvoiceIns"
+        :filter="filter"
+        :descriptor="InvoiceInDescriptor"
+        searchbar-data-key="InvoiceInList"
+        searchbar-url="InvoiceIns/filter"
+        searchbar-label="Search invoice"
+        searchbar-info="You can search by invoice reference"
+    />
 </template>
-
-<i18n>
-    es:
-        Search invoice: Buscar factura recibida
-        You can search by invoice reference: Puedes buscar por referencia de la factura
-    </i18n>

src/pages/InvoiceIn/Card/InvoiceInCorrective.vue

@@ -6,7 +6,7 @@ import { useArrayData } from 'src/composables/useArrayData';
 import { useCapitalize } from 'src/composables/useCapitalize';
 import CrudModel from 'src/components/CrudModel.vue';
 import FetchData from 'src/components/FetchData.vue';
-import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
 
 const router = useRouter();
 const route = useRoute();
@@ -116,7 +116,7 @@ const onSave = (data) => data.deletes && router.push(`/invoice-in/${invoiceId}/s
             >
                 <template #body-cell-type="{ row, col }">
                     <QTd>
-                        <VnSelectFilter
+                        <VnSelect
                             class="q-pb-md"
                             v-model="row[col.model]"
                             :options="col.options"
@@ -128,7 +128,7 @@ const onSave = (data) => data.deletes && router.push(`/invoice-in/${invoiceId}/s
                 </template>
                 <template #body-cell-class="{ row, col }">
                     <QTd>
-                        <VnSelectFilter
+                        <VnSelect
                             class="q-pb-md"
                             v-model="row[col.model]"
                             :options="col.options"
@@ -141,7 +141,7 @@ const onSave = (data) => data.deletes && router.push(`/invoice-in/${invoiceId}/s
                 </template>
                 <template #body-cell-reason="{ row, col }">
                     <QTd>
-                        <VnSelectFilter
+                        <VnSelect
                             class="q-pb-md"
                             v-model="row[col.model]"
                             :options="col.options"

src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue

@@ -15,7 +15,7 @@ import CardDescriptor from 'components/ui/CardDescriptor.vue';
 import FetchData from 'src/components/FetchData.vue';
 import SendEmailDialog from 'components/common/SendEmailDialog.vue';
 import VnConfirm from 'src/components/ui/VnConfirm.vue';
-import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
 import { useCapitalize } from 'src/composables/useCapitalize';
 
 const $props = defineProps({
@@ -480,7 +480,7 @@ const createInvoiceInCorrection = async () => {
                             v-model="entityId"
                             readonly
                         />
-                        <VnSelectFilter
+                        <VnSelect
                             :label="`${useCapitalize(t('globals.class'))}*`"
                             v-model="correctionFormData.invoiceClass"
                             :options="siiTypeInvoiceOuts"
@@ -490,7 +490,7 @@ const createInvoiceInCorrection = async () => {
                         />
                     </QItemSection>
                     <QItemSection>
-                        <VnSelectFilter
+                        <VnSelect
                             :label="`${useCapitalize(t('globals.type'))}*`"
                             v-model="correctionFormData.invoiceType"
                             :options="cplusRectificationTypes"
@@ -498,7 +498,7 @@ const createInvoiceInCorrection = async () => {
                             option-label="description"
                             :rules="[requiredFieldRule]"
                         />
-                        <VnSelectFilter
+                        <VnSelect
                             :label="`${useCapitalize(t('globals.reason'))}*`"
                             v-model="correctionFormData.invoiceReason"
                             :options="invoiceCorrectionTypes"

src/pages/InvoiceIn/Card/InvoiceInDueDay.vue

@@ -7,7 +7,7 @@ import { toDate } from 'src/filters';
 import { useArrayData } from 'src/composables/useArrayData';
 import CrudModel from 'src/components/CrudModel.vue';
 import FetchData from 'src/components/FetchData.vue';
-import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
 import VnCurrency from 'src/components/common/VnCurrency.vue';
 
 const route = useRoute();
@@ -143,7 +143,7 @@ async function insert() {
                 </template>
                 <template #body-cell-bank="{ row, col }">
                     <QTd>
-                        <VnSelectFilter
+                        <VnSelect
                             v-model="row[col.model]"
                             :options="col.options"
                             :option-value="col.optionValue"
@@ -158,7 +158,7 @@ async function insert() {
                                     </QItemSection>
                                 </QItem>
                             </template>
-                        </VnSelectFilter>
+                        </VnSelect>
                     </QTd>
                 </template>
                 <template #body-cell-amount="{ row }">
@@ -240,7 +240,7 @@ async function insert() {
                                     </QInput>
                                 </QItem>
                                 <QItem>
-                                    <VnSelectFilter
+                                    <VnSelect
                                         :label="t('Bank')"
                                         class="full-width"
                                         v-model="props.row['bankFk']"
@@ -257,7 +257,7 @@ async function insert() {
                                                 </QItemSection>
                                             </QItem>
                                         </template>
-                                    </VnSelectFilter>
+                                    </VnSelect>
                                 </QItem>
                                 <QItem>
                                     <QInput

src/pages/InvoiceIn/Card/InvoiceInIntrastat.vue

@@ -5,7 +5,7 @@ import { useI18n } from 'vue-i18n';
 import { toCurrency } from 'src/filters';
 import CrudModel from 'src/components/CrudModel.vue';
 import FetchData from 'src/components/FetchData.vue';
-import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
 
 const { t } = useI18n();
@@ -147,7 +147,7 @@ function getTotal(type) {
                     </template>
                     <template #body-cell-code="{ row, col }">
                         <QTd>
-                            <VnSelectFilter
+                            <VnSelect
                                 v-model="row[col.model]"
                                 :options="col.options"
                                 option-value="id"
@@ -159,12 +159,12 @@ function getTotal(type) {
                                         {{ `${scope.opt.id}: ${scope.opt.description}` }}
                                     </QItem>
                                 </template>
-                            </VnSelectFilter>
+                            </VnSelect>
                         </QTd>
                     </template>
                     <template #body-cell-country="{ row, col }">
                         <QTd>
-                            <VnSelectFilter
+                            <VnSelect
                                 v-model="row[col.model]"
                                 :options="col.options"
                                 option-value="id"
@@ -181,7 +181,7 @@ function getTotal(type) {
                                 <QSeparator />
                                 <QList>
                                     <QItem>
-                                        <VnSelectFilter
+                                        <VnSelect
                                             :label="t('code')"
                                             class="full-width"
                                             v-model="props.row['intrastatFk']"
@@ -197,7 +197,7 @@ function getTotal(type) {
                                                     }}
                                                 </QItem>
                                             </template>
-                                        </VnSelectFilter>
+                                        </VnSelect>
                                     </QItem>
                                     <QItem
                                         v-for="(value, index) of [
@@ -216,7 +216,7 @@ function getTotal(type) {
                                         />
                                     </QItem>
                                     <QItem>
-                                        <VnSelectFilter
+                                        <VnSelect
                                             :label="t('country')"
                                             class="full-width"
                                             v-model="props.row['countryFk']"

src/pages/InvoiceIn/Card/InvoiceInVat.vue

@@ -7,7 +7,7 @@ import axios from 'axios';
 import { useArrayData } from 'src/composables/useArrayData';
 import { toCurrency } from 'src/filters';
 import FetchData from 'src/components/FetchData.vue';
-import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
 import CrudModel from 'src/components/CrudModel.vue';
 import VnCurrency from 'src/components/common/VnCurrency.vue';
 
@@ -196,7 +196,7 @@ async function addExpense() {
             >
                 <template #body-cell-expense="{ row, col }">
                     <QTd auto-width>
-                        <VnSelectFilter
+                        <VnSelect
                             v-model="row[col.model]"
                             :options="col.options"
                             :option-value="col.optionValue"
@@ -225,7 +225,7 @@ async function addExpense() {
                                     </QTooltip>
                                 </QIcon>
                             </template>
-                        </VnSelectFilter>
+                        </VnSelect>
                     </QTd>
                 </template>
                 <template #body-cell-taxablebase="{ row }">
@@ -244,7 +244,7 @@ async function addExpense() {
                 </template>
                 <template #body-cell-sageiva="{ row, col }">
                     <QTd>
-                        <VnSelectFilter
+                        <VnSelect
                             v-model="row[col.model]"
                             :options="col.options"
                             :option-value="col.optionValue"
@@ -263,12 +263,12 @@ async function addExpense() {
                                     </QItemSection>
                                 </QItem>
                             </template>
-                        </VnSelectFilter>
+                        </VnSelect>
                     </QTd>
                 </template>
                 <template #body-cell-sagetransaction="{ row, col }">
                     <QTd>
-                        <VnSelectFilter
+                        <VnSelect
                             v-model="row[col.model]"
                             :options="col.options"
                             :option-value="col.optionValue"
@@ -289,7 +289,7 @@ async function addExpense() {
                                     </QItemSection>
                                 </QItem>
                             </template>
-                        </VnSelectFilter>
+                        </VnSelect>
                     </QTd>
                 </template>
                 <template #body-cell-foreignvalue="{ row }">
@@ -312,7 +312,7 @@ async function addExpense() {
                             <QSeparator />
                             <QList>
                                 <QItem>
-                                    <VnSelectFilter
+                                    <VnSelect
                                         :label="t('Expense')"
                                         class="full-width"
                                         v-model="props.row['expenseFk']"
@@ -326,7 +326,7 @@ async function addExpense() {
                                                 {{ `${scope.opt.id}: ${scope.opt.name}` }}
                                             </QItem>
                                         </template>
-                                    </VnSelectFilter>
+                                    </VnSelect>
                                 </QItem>
                                 <QItem>
                                     <VnCurrency
@@ -344,7 +344,7 @@ async function addExpense() {
                                     />
                                 </QItem>
                                 <QItem>
-                                    <VnSelectFilter
+                                    <VnSelect
                                         :label="t('Sage iva')"
                                         class="full-width"
                                         v-model="props.row['taxTypeSageFk']"
@@ -365,10 +365,10 @@ async function addExpense() {
                                                 </QItemSection>
                                             </QItem>
                                         </template>
-                                    </VnSelectFilter>
+                                    </VnSelect>
                                 </QItem>
                                 <QItem>
-                                    <VnSelectFilter
+                                    <VnSelect
                                         class="full-width"
                                         v-model="props.row['transactionTypeSageFk']"
                                         :options="sageTransactionTypes"
@@ -388,7 +388,7 @@ async function addExpense() {
                                                 </QItemSection>
                                             </QItem>
                                         </template>
-                                    </VnSelectFilter>
+                                    </VnSelect>
                                 </QItem>
                                 <QItem>
                                     {{ toCurrency(taxRate(props.row)) }}

src/pages/InvoiceIn/InvoiceInFilter.vue

@@ -2,12 +2,11 @@
 import { ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 
-import VnSelectFilter from 'components/common/VnSelectFilter.vue';
+import VnSelect from 'components/common/VnSelect.vue';
 import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
 import FetchData from 'components/FetchData.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import VnInputDate from 'components/common/VnInputDate.vue';
-import { useCapitalize } from 'src/composables/useCapitalize';
 import VnCurrency from 'src/components/common/VnCurrency.vue';
 
 const { t } = useI18n();
@@ -41,7 +40,7 @@ const suppliersRef = ref();
         <template #body="{ params, searchFn }">
             <QItem>
                 <QItemSection>
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('params.supplierFk')"
                         v-model="params.supplierFk"
                         :options="suppliers"
@@ -52,7 +51,7 @@ const suppliersRef = ref();
                         outlined
                         rounded
                     >
-                    </VnSelectFilter>
+                    </VnSelect>
                 </QItemSection>
             </QItem>
             <QItem>
@@ -70,19 +69,15 @@ const suppliersRef = ref();
                 </QItemSection>
             </QItem>
             <QItem>
-                    <QItemSection>
-                        <VnInputDate
-                            :label="t('From')"
-                            v-model="params.from"
-                            is-outlined
-                        />
-                    </QItemSection>
-                </QItem>
-                <QItem>
-                    <QItemSection>
-                        <VnInputDate :label="t('To')" v-model="params.to" is-outlined />
-                    </QItemSection>
-                </QItem>
+                <QItemSection>
+                    <VnInputDate :label="t('From')" v-model="params.from" is-outlined />
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnInputDate :label="t('To')" v-model="params.to" is-outlined />
+                </QItemSection>
+            </QItem>
             <QItem>
                 <QItemSection>
                     <VnInput
@@ -114,33 +109,33 @@ const suppliersRef = ref();
             </QItem>
             <QExpansionItem :label="t('More options')" expand-separator>
                 <QItem>
-                <QItemSection>
-                    <VnInput
-                        :label="t('params.fi')"
-                        v-model="params.fi"
-                        is-outlined
-                        lazy-rules
-                    >
-                        <template #prepend>
-                            <QIcon name="badge" size="sm"></QIcon>
-                        </template>
-                    </VnInput>
-                </QItemSection>
-            </QItem>
-            <QItem>
-                <QItemSection>
-                    <VnInput
-                        :label="t('params.serialNumber')"
-                        v-model="params.serialNumber"
-                        is-outlined
-                        lazy-rules
-                    >
-                        <template #prepend>
-                            <QIcon name="badge" size="sm"></QIcon>
-                        </template>
-                    </VnInput>
-                </QItemSection>
-            </QItem>
+                    <QItemSection>
+                        <VnInput
+                            :label="t('params.fi')"
+                            v-model="params.fi"
+                            is-outlined
+                            lazy-rules
+                        >
+                            <template #prepend>
+                                <QIcon name="badge" size="sm"></QIcon>
+                            </template>
+                        </VnInput>
+                    </QItemSection>
+                </QItem>
+                <QItem>
+                    <QItemSection>
+                        <VnInput
+                            :label="t('params.serialNumber')"
+                            v-model="params.serialNumber"
+                            is-outlined
+                            lazy-rules
+                        >
+                            <template #prepend>
+                                <QIcon name="badge" size="sm"></QIcon>
+                            </template>
+                        </VnInput>
+                    </QItemSection>
+                </QItem>
                 <QItem>
                     <QItemSection>
                         <VnInput

src/pages/InvoiceIn/locale/es.yml

@@ -0,0 +1,2 @@
+Search invoice: Buscar factura recibida
+You can search by invoice reference: Puedes buscar por referencia de la factura

src/pages/InvoiceOut/Card/InvoiceOutCard.vue

@@ -1,43 +1,15 @@
 <script setup>
-import { useI18n } from 'vue-i18n';
-import { useStateStore } from 'stores/useStateStore';
 import InvoiceOutDescriptor from './InvoiceOutDescriptor.vue';
-import LeftMenu from 'components/LeftMenu.vue';
-import VnSearchbar from 'components/ui/VnSearchbar.vue';
-import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
-import useCardSize from 'src/composables/useCardSize';
-
-const stateStore = useStateStore();
-const { t } = useI18n();
+import VnCard from 'components/common/VnCard.vue';
 </script>
 <template>
-    <Teleport to="#searchbar" v-if="stateStore.isHeaderMounted()">
-        <VnSearchbar
-            data-key="InvoiceOutList"
-            url="InvoiceOuts/filter"
-            :label="t('Search invoice')"
-            :info="t('You can search by invoice reference')"
-        />
-    </Teleport>
-    <QDrawer v-model="stateStore.leftDrawer" show-if-above :width="256">
-        <QScrollArea class="fit">
-            <InvoiceOutDescriptor />
-            <QSeparator />
-            <LeftMenu source="card" />
-        </QScrollArea>
-    </QDrawer>
-    <QPageContainer>
-        <QPage>
-            <VnSubToolbar />
-            <div :class="useCardSize()">
-                <RouterView></RouterView>
-            </div>
-        </QPage>
-    </QPageContainer>
+    <VnCard
+        data-key="InvoiceOut"
+        base-url="InvoiceOuts"
+        :descriptor="InvoiceOutDescriptor"
+        searchbar-data-key="InvoiceOutList"
+        searchbar-url="InvoiceOuts/filter"
+        searchbar-label="Search invoice"
+        searchbar-info="You can search by invoice reference"
+    />
 </template>
-
-<i18n>
-    es:
-        Search invoice: Buscar factura emitida
-        You can search by invoice reference: Puedes buscar por referencia de la factura
-    </i18n>

src/pages/InvoiceOut/Card/InvoiceOutSummary.vue

@@ -138,7 +138,7 @@ const ticketsColumns = ref([
                 <VnTitle :text="t('invoiceOut.summary.taxBreakdown')" />
                 <QTable :columns="taxColumns" :rows="invoiceOut.taxesBreakdown" flat>
                     <template #header="props">
-                        <QTr :props="props">
+                        <QTr class="tr-header" :props="props">
                             <QTh v-for="col in props.cols" :key="col.name" :props="props">
                                 {{ t(col.label) }}
                             </QTh>
@@ -149,6 +149,18 @@ const ticketsColumns = ref([
             <QCard class="vn-three">
                 <VnTitle :text="t('invoiceOut.summary.tickets')" />
                 <QTable v-if="tickets" :columns="ticketsColumns" :rows="tickets" flat>
+                    <template #header="props">
+                        <QTr :props="props">
+                            <QTh
+                                class="tr-header"
+                                v-for="col in props.cols"
+                                :key="col.name"
+                                :props="props"
+                            >
+                                {{ t(col.label) }}
+                            </QTh>
+                        </QTr>
+                    </template>
                     <template #body-cell-item="{ value }">
                         <QTd>
                             <QBtn flat color="primary">
@@ -159,7 +171,7 @@ const ticketsColumns = ref([
                     </template>
                     <template #body-cell-quantity="{ value, row }">
                         <QTd>
-                            <QBtn flat color="primary" dense>
+                            <QBtn class="no-uppercase" flat color="primary" dense>
                                 {{ value }}
                                 <CustomerDescriptorProxy :id="row.id" />
                             </QBtn>
@@ -170,3 +182,8 @@ const ticketsColumns = ref([
         </template>
     </CardSummary>
 </template>
+<style lang="scss" scoped>
+.no-uppercase {
+    text-transform: none;
+}
+</style>

src/pages/InvoiceOut/InvoiceOutGlobalForm.vue

@@ -4,7 +4,7 @@ import { useI18n } from 'vue-i18n';
 import { storeToRefs } from 'pinia';
 
 import FetchData from 'components/FetchData.vue';
-import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
 import VnInputDate from 'components/common/VnInputDate.vue';
 
 import { useInvoiceOutGlobalStore } from 'src/stores/invoiceOutGlobal.js';
@@ -83,7 +83,7 @@ onMounted(async () => {
                 :dark="true"
                 class="q-mb-sm"
             />
-            <VnSelectFilter
+            <VnSelect
                 v-if="clientsToInvoice === 'one'"
                 :label="t('client')"
                 v-model="formData.clientId"
@@ -105,7 +105,7 @@ onMounted(async () => {
                 :label="t('maxShipped')"
                 is-outlined
             />
-            <VnSelectFilter
+            <VnSelect
                 :label="t('company')"
                 v-model="formData.companyFk"
                 :options="companiesOptions"
@@ -116,7 +116,7 @@ onMounted(async () => {
                 outlined
                 rounded
             />
-            <VnSelectFilter
+            <VnSelect
                 :label="t('printer')"
                 v-model="formData.printer"
                 :options="printersOptions"

src/pages/InvoiceOut/InvoiceOutNegativeBases.vue

@@ -119,8 +119,8 @@ const columns = computed(() => [
     },
     {
         label: t('invoiceOut.negativeBases.comercial'),
-        field: 'workerSocialName',
-        name: 'comercial',
+        field: 'workerName',
+        name: 'worker',
         align: 'left',
     },
 ]);
@@ -181,9 +181,11 @@ const downloadCSV = async () => {
                     <TicketDescriptorProxy :id="row.ticketFk" />
                 </QTd>
             </template>
-            <template #body-cell-comercial="{ row }">
+            <template #body-cell-worker="{ row }">
                 <QTd>
-                    <QBtn flat dense color="blue">{{ row.comercialName }}</QBtn>
+                    <QBtn class="no-uppercase" flat dense color="blue">{{
+                        row.workerName
+                    }}</QBtn>
                     <WorkerDescriptorProxy :id="row.comercialId" />
                 </QTd>
             </template>
@@ -211,6 +213,9 @@ const downloadCSV = async () => {
     border-radius: 4px;
     padding: 6px;
 }
+.no-uppercase {
+    text-transform: none;
+}
 </style>
 
 <i18n>

src/pages/InvoiceOut/locale/es.yml

@@ -0,0 +1,2 @@
+Search invoice: Buscar factura emitida
+You can search by invoice reference: Puedes buscar por referencia de la factura

src/pages/Item/Card/ItemBarcode.vue

@@ -0,0 +1 @@
+<template>Item barcode</template>

src/pages/Item/Card/ItemBotanical.vue

@@ -0,0 +1 @@
+<template>Item Botanical</template>

src/pages/Item/Card/ItemCard.vue

@@ -1,28 +1,7 @@
 <script setup>
-import LeftMenu from 'components/LeftMenu.vue';
-import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
+import VnCard from 'components/common/VnCard.vue';
 import ItemDescriptor from './ItemDescriptor.vue';
-
-import { useStateStore } from 'stores/useStateStore';
-import useCardSize from 'src/composables/useCardSize';
-
-const stateStore = useStateStore();
 </script>
 <template>
-    <QDrawer v-model="stateStore.leftDrawer" show-if-above :width="256">
-        <QScrollArea class="fit">
-            <ItemDescriptor />
-            <QSeparator />
-            <LeftMenu source="card" />
-        </QScrollArea>
-    </QDrawer>
-    <QPageContainer>
-        <QPage>
-            <VnSubToolbar />
-
-            <div :class="useCardSize()">
-                <RouterView></RouterView>
-            </div>
-        </QPage>
-    </QPageContainer>
+    <VnCard data-key="Item" base-url="Items" :descriptor="ItemDescriptor" />
 </template>

src/pages/Item/Card/ItemDescriptor.vue

@@ -9,7 +9,7 @@ import VnLv from 'src/components/ui/VnLv.vue';
 import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
 import VnConfirm from 'components/ui/VnConfirm.vue';
 import RegularizeStockForm from 'components/RegularizeStockForm.vue';
-import EditPictureForm from 'components/EditPictureForm.vue';
+import ItemDescriptorImage from 'src/pages/Item/Card/ItemDescriptorImage.vue';
 
 import { useState } from 'src/composables/useState';
 import useCardDescription from 'src/composables/useCardDescription';
@@ -50,12 +50,10 @@ const entityId = computed(() => {
 });
 const image = ref(null);
 const regularizeStockFormDialog = ref(null);
-const editPhotoFormDialog = ref(null);
 const item = ref(null);
 const available = ref(null);
 const visible = ref(null);
 const _warehouseFk = ref(null);
-const warehouseText = ref(null);
 const salixUrl = ref();
 const warehouseFk = computed({
     get() {
@@ -63,14 +61,9 @@ const warehouseFk = computed({
     },
     set(val) {
         _warehouseFk.value = val;
-        if (val) {
-            updateStock();
-            getWarehouseName(val);
-        }
+        if (val) updateStock();
     },
 });
-const showWarehouseIconTooltip = ref(true);
-const showEditPhotoForm = ref(false);
 
 onMounted(async () => {
     await getItemAvatar();
@@ -90,26 +83,6 @@ const setData = (entity) => {
     data.value = useCardDescription(entity.name, entity.id);
 };
 
-const getWarehouseName = async (warehouseFk) => {
-    try {
-        showWarehouseIconTooltip.value = false;
-
-        const filter = {
-            where: { id: warehouseFk },
-        };
-
-        const { data } = await axios.get('Warehouses/findOne', { filter });
-
-        warehouseText.value = t('item.descriptor.warehouseText', {
-            warehouseName: data.name,
-        });
-
-        showWarehouseIconTooltip.value = true;
-    } catch (err) {
-        console.error('Error finding warehouse');
-    }
-};
-
 const updateStock = async () => {
     try {
         available.value = null;
@@ -135,10 +108,6 @@ const openRegularizeStockForm = () => {
     regularizeStockFormDialog.value.show();
 };
 
-const toggleEditPictureForm = () => {
-    showEditPhotoForm.value = !showEditPhotoForm.value;
-};
-
 const cloneItem = async () => {
     try {
         const { data } = await axios.post(`Items/${entityId.value}/clone`);
@@ -193,79 +162,16 @@ const openCloneDialog = async () => {
             </QItem>
             <QItem v-ripple clickable @click="openCloneDialog()">
                 <QItemSection>
-                    {{ t('Clone') }}
+                    {{ t('globals.clone') }}
                 </QItemSection>
             </QItem>
         </template>
         <template #before>
-            <div class="relative-position">
-                <QImg :src="image" spinner-color="primary" class="photo">
-                    <template #error>
-                        <div
-                            class="absolute-full picture text-center q-pa-md flex flex-center"
-                        >
-                            <div>
-                                <div
-                                    class="text-grey-5"
-                                    style="opacity: 0.4; font-size: 5vh"
-                                >
-                                    <QIcon name="vn:item" />
-                                </div>
-                                <div class="text-grey-5" style="opacity: 0.4">
-                                    {{ t('item.descriptor.item') }}
-                                </div>
-                            </div>
-                        </div>
-                    </template>
-                </QImg>
-                <QBtn
-                    color="primary"
-                    size="lg"
-                    round
-                    class="edit-photo-btn"
-                    @click="toggleEditPictureForm()"
-                >
-                    <QIcon name="edit" size="sm" />
-                    <QDialog ref="editPhotoFormDialog" v-model="showEditPhotoForm">
-                        <EditPictureForm
-                            collection="catalog"
-                            :id="entityId"
-                            @close-form="toggleEditPictureForm()"
-                            @on-photo-uploaded="getItemAvatar()"
-                        />
-                    </QDialog>
-                </QBtn>
-            </div>
-
-            <div
-                class="row justify-between items-center full-width bg-primary"
-                style="height: 54px"
-            >
-                <div class="col column items-center">
-                    <span class="text-uppercase color-vn-white" style="font-size: 11px">
-                        {{ t('item.descriptor.visible') }}
-                    </span>
-                    <span class="text-weight-bold text-h5 color-vn-white">{{
-                        visible
-                    }}</span>
-                </div>
-                <div
-                    class="col column items-center separation-borders"
-                    style="font-size: 11px"
-                >
-                    <span class="text-uppercase color-vn-white">
-                        {{ t('item.descriptor.available') }}
-                    </span>
-                    <span class="text-weight-bold text-h5 color-vn-white">{{
-                        available
-                    }}</span>
-                </div>
-                <div class="col column items-center justify-center">
-                    <QIcon name="info" class="cursor-pointer color-vn-white" size="md">
-                        <QTooltip>{{ warehouseText }}</QTooltip>
-                    </QIcon>
-                </div>
-            </div>
+            <ItemDescriptorImage
+                :entity-id="entityId"
+                :visible="visible"
+                :available="available"
+            />
         </template>
         <template #body="{ entity }">
             <VnLv :label="t('item.descriptor.buyer')">
@@ -307,7 +213,6 @@ const openCloneDialog = async () => {
 <i18n>
 es:
     Regularize stock: Regularizar stock
-    Clone: Clonar
     All it's properties will be copied: Todas sus propiedades serán copiadas
     Do you want to clone this item?: ¿Desea clonar este artículo?
 </i18n>

src/pages/Item/Card/ItemDescriptorImage.vue

@@ -0,0 +1,158 @@
+<script setup>
+import { ref, onMounted } from 'vue';
+import { useI18n } from 'vue-i18n';
+
+import EditPictureForm from 'components/EditPictureForm.vue';
+
+import { useSession } from 'src/composables/useSession';
+import axios from 'axios';
+
+const $props = defineProps({
+    visible: {
+        type: Number,
+        default: null,
+    },
+    available: {
+        type: Number,
+        default: null,
+    },
+    entityId: {
+        type: String,
+        default: null,
+    },
+    showEditButton: {
+        type: Boolean,
+        default: true,
+    },
+});
+
+const { t } = useI18n();
+const { getTokenMultimedia } = useSession();
+
+const image = ref(null);
+const editPhotoFormDialog = ref(null);
+const showEditPhotoForm = ref(false);
+const warehouseName = ref(null);
+
+const getItemAvatar = async () => {
+    const token = getTokenMultimedia();
+    const timeStamp = `timestamp=${Date.now()}`;
+    image.value = `/api/Images/catalog/200x200/${$props.entityId}/download?access_token=${token}&${timeStamp}`;
+};
+
+const toggleEditPictureForm = () => {
+    showEditPhotoForm.value = !showEditPhotoForm.value;
+};
+
+const getItemConfigs = async () => {
+    const { data } = await axios.get('ItemConfigs/findOne');
+    if (!data) return;
+    await getWarehouseName(data.warehouseFk);
+    return data;
+};
+
+const getWarehouseName = async (warehouseFk) => {
+    const filter = {
+        where: { id: warehouseFk },
+    };
+
+    const { data } = await axios.get('Warehouses/findOne', { filter });
+    if (!data) return;
+    warehouseName.value = data.name;
+};
+
+onMounted(async () => {
+    getItemAvatar();
+    getItemConfigs();
+});
+</script>
+
+<template>
+    <div class="relative-position">
+        <QImg :src="image" spinner-color="primary" style="min-height: 256px">
+            <template #error>
+                <div class="absolute-full picture text-center q-pa-md flex flex-center">
+                    <div>
+                        <div class="text-grey-5" style="opacity: 0.4; font-size: 5vh">
+                            <QIcon name="vn:item" />
+                        </div>
+                        <div class="text-grey-5" style="opacity: 0.4">
+                            {{ t('item.descriptor.item') }}
+                        </div>
+                    </div>
+                </div>
+            </template>
+        </QImg>
+        <QBtn
+            v-if="showEditButton"
+            color="primary"
+            size="lg"
+            round
+            class="edit-photo-btn"
+            @click="toggleEditPictureForm()"
+        >
+            <QIcon name="edit" size="sm" />
+            <QDialog ref="editPhotoFormDialog" v-model="showEditPhotoForm">
+                <EditPictureForm
+                    collection="catalog"
+                    :id="entityId"
+                    @close-form="toggleEditPictureForm()"
+                    @on-photo-uploaded="getItemAvatar()"
+                />
+            </QDialog>
+        </QBtn>
+    </div>
+
+    <div
+        class="row justify-between items-center full-width bg-primary"
+        style="height: 54px"
+    >
+        <div class="col column items-center">
+            <span class="text-uppercase color-vn-white" style="font-size: 11px">
+                {{ t('item.descriptor.visible') }}
+            </span>
+            <span class="text-weight-bold text-h5 color-vn-white">{{ visible }}</span>
+        </div>
+        <div class="col column items-center separation-borders" style="font-size: 11px">
+            <span class="text-uppercase color-vn-white">
+                {{ t('item.descriptor.available') }}
+            </span>
+            <span class="text-weight-bold text-h5 color-vn-white">{{ available }}</span>
+        </div>
+        <div class="col column items-center justify-center">
+            <QIcon name="info" class="cursor-pointer color-vn-white" size="md">
+                <QTooltip>{{
+                    t('warehouseText', {
+                        warehouseName: warehouseName,
+                    })
+                }}</QTooltip>
+            </QIcon>
+        </div>
+    </div>
+</template>
+
+<i18n>
+es:
+    Regularize stock: Regularizar stock
+    All it's properties will be copied: Todas sus propiedades serán copiadas
+    Do you want to clone this item?: ¿Desea clonar este artículo?
+    warehouseText: Calculated on the warehouse of { warehouseName }
+
+en:
+    warehouseText: Calculado sobre el almacén de { warehouseName }
+</i18n>
+
+<style lang="scss" scoped>
+.edit-photo-btn {
+    position: absolute;
+    right: 12px;
+    bottom: 12px;
+    z-index: 1;
+    cursor: pointer;
+}
+
+.separation-borders {
+    border-left: 1px solid $white;
+    border-right: 1px solid $white;
+}
+</style>

src/pages/Item/Card/ItemSummary.vue

@@ -1 +1,228 @@
-<template>Item summary</template>
+<script setup>
+import { computed } from 'vue';
+import { useRoute } from 'vue-router';
+import { useI18n } from 'vue-i18n';
+
+import CardSummary from 'components/ui/CardSummary.vue';
+import VnLv from 'src/components/ui/VnLv.vue';
+import ItemDescriptorImage from 'src/pages/Item/Card/ItemDescriptorImage.vue';
+import VnUserLink from 'src/components/ui/VnUserLink.vue';
+
+import { useRole } from 'src/composables/useRole';
+
+const $props = defineProps({
+    id: {
+        type: Number,
+        default: 0,
+    },
+});
+
+const route = useRoute();
+const { t } = useI18n();
+const roleState = useRole();
+
+const entityId = computed(() => $props.id || route.params.id);
+
+const isBuyer = computed(() => {
+    return roleState.hasAny(['buyer']);
+});
+
+const isReplenisher = computed(() => {
+    return roleState.hasAny(['replenisher']);
+});
+
+const isAdministrative = computed(() => {
+    return roleState.hasAny(['administrative']);
+});
+</script>
+
+<template>
+    <CardSummary
+        ref="summary"
+        :url="`Items/${entityId}/getSummary`"
+        :entity-id="entityId"
+        data-key="ItemSummary"
+    >
+        <template #header-left>
+            <router-link
+                v-if="route.name !== 'ItemSummary'"
+                :to="{ name: 'ItemSummary', params: { id: entityId } }"
+                class="header link"
+            >
+                <QIcon name="open_in_new" color="white" size="sm" />
+            </router-link>
+        </template>
+        <template #header="{ entity: { item } }">
+            {{ item.id }} - {{ item.name }}
+        </template>
+        <template #body="{ entity: { item, tags, visible, available, botanical } }">
+            <QCard class="vn-one photo">
+                <ItemDescriptorImage
+                    :entity-id="entityId"
+                    :visible="visible"
+                    :available="available"
+                    :show-edit-button="false"
+                />
+            </QCard>
+            <QCard class="vn-one">
+                <component
+                    :is="isBuyer ? 'router-link' : 'span'"
+                    :to="{ name: 'ItemBasicData', params: { id: entityId } }"
+                    class="header"
+                    :class="{ 'header-link': isBuyer }"
+                >
+                    {{ t('item.summary.basicData') }}
+                    <QIcon v-if="isBuyer" name="open_in_new" />
+                </component>
+                <VnLv :label="t('item.summary.name')" :value="item.name" />
+                <VnLv :label="t('item.summary.completeName')" :value="item.longName" />
+                <VnLv :label="t('item.summary.family')" :value="item.itemType.name" />
+                <VnLv :label="t('item.summary.size')" :value="item.size" />
+                <VnLv :label="t('item.summary.origin')" :value="item.origin.name" />
+                <VnLv :label="t('item.summary.stems')" :value="item.stems" />
+                <VnLv
+                    :label="t('item.summary.multiplier')"
+                    :value="item.stemMultiplier"
+                />
+
+                <VnLv :label="t('item.summary.buyer')">
+                    <template #value>
+                        <VnUserLink
+                            :name="item.itemType.worker.user.name"
+                            :worker-id="item.itemType.worker.id"
+                        />
+                    </template>
+                </VnLv>
+                <VnLv :info="t('Este artículo necesita una foto')">
+                    <template #value>
+                        <QCheckbox
+                            :label="t('item.summary.doPhoto')"
+                            v-model="item.isPhotoRequested"
+                            :disable="true"
+                        />
+                    </template>
+                </VnLv>
+            </QCard>
+            <QCard class="vn-one">
+                <component
+                    :is="isBuyer ? 'router-link' : 'span'"
+                    :to="{ name: 'ItemBasicData', params: { id: entityId } }"
+                    class="header"
+                    :class="{ 'header-link': isBuyer }"
+                >
+                    {{ t('item.summary.otherData') }}
+                    <QIcon v-if="isBuyer" name="open_in_new" />
+                </component>
+                <VnLv
+                    :label="t('item.summary.intrastatCode')"
+                    :value="item.intrastat.id"
+                />
+                <VnLv
+                    :label="t('item.summary.intrastat')"
+                    :value="item.intrastat.description"
+                />
+                <VnLv :label="t('item.summary.ref')" :value="item.comment" />
+                <VnLv :label="t('item.summary.relevance')" :value="item.relevancy" />
+                <VnLv :label="t('item.summary.weight')" :value="item.weightByPiece" />
+                <VnLv :label="t('item.summary.units')" :value="item.packingOut" />
+                <VnLv :label="t('item.summary.expense')" :value="item.expense.name" />
+                <VnLv :label="t('item.summary.generic')" :value="item.genericFk" />
+                <VnLv
+                    :label="t('item.summary.recycledPlastic')"
+                    :value="item.recycledPlastic"
+                />
+                <VnLv
+                    :label="t('item.summary.nonRecycledPlastic')"
+                    :value="item.nonRecycledPlastic"
+                />
+                <VnLv
+                    :label="t('item.summary.minSalesQuantity')"
+                    :value="item.minQuantity"
+                />
+            </QCard>
+            <QCard class="vn-one">
+                <component
+                    :is="isBuyer || isReplenisher ? 'router-link' : 'span'"
+                    :to="{ name: 'ItemTags', params: { id: entityId } }"
+                    class="header"
+                    :class="{ 'header-link': isBuyer || isReplenisher }"
+                >
+                    {{ t('item.summary.tags') }}
+                    <QIcon v-if="isBuyer || isReplenisher" name="open_in_new" />
+                </component>
+                <VnLv
+                    v-for="(tag, index) in tags"
+                    :key="index"
+                    :label="`${tag.priority} ${tag.tag.name}`"
+                    :value="tag.value"
+                />
+            </QCard>
+            <QCard class="vn-one" v-if="item.description">
+                <component
+                    :is="isBuyer ? 'router-link' : 'span'"
+                    :to="{ name: 'ItemBasicData', params: { id: entityId } }"
+                    class="header"
+                    :class="{ 'header-link': isBuyer }"
+                >
+                    {{ t('item.summary.description') }}
+                    <QIcon v-if="isBuyer" name="open_in_new" />
+                </component>
+                <p>
+                    {{ item.description }}
+                </p>
+            </QCard>
+            <QCard class="vn-one">
+                <component
+                    :is="isBuyer || isAdministrative ? 'router-link' : 'span'"
+                    :to="{ name: 'ItemTax', params: { id: entityId } }"
+                    class="header"
+                    :class="{ 'header-link': isBuyer || isAdministrative }"
+                >
+                    {{ t('item.summary.tax') }}
+                    <QIcon v-if="isBuyer || isAdministrative" name="open_in_new" />
+                </component>
+                <VnLv
+                    v-for="(tax, index) in item.taxes"
+                    :key="index"
+                    :label="tax.country.country"
+                    :value="tax.taxClass.description"
+                />
+            </QCard>
+            <QCard class="vn-one">
+                <component
+                    :is="isBuyer ? 'router-link' : 'span'"
+                    :to="{ name: 'ItemBotanical', params: { id: entityId } }"
+                    class="header"
+                    :class="{ 'header-link': isBuyer }"
+                >
+                    {{ t('item.summary.botanical') }}
+                    <QIcon v-if="isBuyer" name="open_in_new" />
+                </component>
+                <VnLv :label="t('item.summary.genus')" :value="botanical?.genus?.name" />
+                <VnLv
+                    :label="t('item.summary.specie')"
+                    :value="botanical?.specie?.name"
+                />
+            </QCard>
+            <QCard class="vn-one">
+                <component
+                    :is="isBuyer || isReplenisher ? 'router-link' : 'span'"
+                    :to="{ name: 'ItemBarcode', params: { id: entityId } }"
+                    class="header"
+                    :class="{ 'header-link': isBuyer || isReplenisher }"
+                >
+                    {{ t('item.summary.barcode') }}
+                    <QIcon v-if="isBuyer || isReplenisher" name="open_in_new" />
+                </component>
+                <p v-for="(barcode, index) in item.itemBarcode" :key="index">
+                    {{ barcode.code }}
+                </p>
+            </QCard>
+        </template>
+    </CardSummary>
+</template>
+
+<i18n>
+en:
+    Este artículo necesita una foto: Este artículo necesita una foto
+</i18n>

src/pages/Item/Card/ItemTax.vue

@@ -0,0 +1 @@
+<template>Item tax</template>

src/pages/Item/ItemCreate.vue

@@ -4,7 +4,7 @@ import { useI18n } from 'vue-i18n';
 import { useRouter } from 'vue-router';
 
 import FetchData from 'components/FetchData.vue';
-import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
 import FormModel from 'components/FormModel.vue';
 import VnRow from 'components/ui/VnRow.vue';
 import VnInput from 'src/components/common/VnInput.vue';
@@ -90,7 +90,7 @@ onBeforeMount(async () => {
                         v-model="data.provisionalName"
                         :label="t('item.create.name')"
                     />
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('item.create.tag')"
                         v-model="data.tag"
                         :options="tagsOptions"
@@ -98,7 +98,7 @@ onBeforeMount(async () => {
                         option-label="name"
                         hide-selected
                     />
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('item.create.priority')"
                         v-model="data.priority"
                         :options="validPriorities"
@@ -108,7 +108,7 @@ onBeforeMount(async () => {
                     />
                 </VnRow>
                 <VnRow class="row q-gutter-md q-mb-md">
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('item.create.type')"
                         v-model="data.typeFk"
                         :options="itemTypesOptions"
@@ -131,8 +131,8 @@ onBeforeMount(async () => {
                                 </QItemLabel>
                             </QItem>
                         </template>
-                    </VnSelectFilter>
-                    <VnSelectFilter
+                    </VnSelect>
+                    <VnSelect
                         :label="t('item.create.intrastat')"
                         v-model="data.intrastatFk"
                         :options="intrastatsOptions"
@@ -152,10 +152,10 @@ onBeforeMount(async () => {
                                 </QItemSection>
                             </QItem>
                         </template>
-                    </VnSelectFilter>
+                    </VnSelect>
                 </VnRow>
                 <VnRow class="row q-gutter-md q-mb-md">
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('item.create.origin')"
                         v-model="data.originFk"
                         :options="originsOptions"

src/pages/Item/ItemFixedPrice.vue

@@ -0,0 +1,605 @@
+<script setup>
+import { onMounted, ref, reactive, computed, onUnmounted, watch } from 'vue';
+import { useI18n } from 'vue-i18n';
+
+import FetchData from 'components/FetchData.vue';
+import FetchedTags from 'components/ui/FetchedTags.vue';
+import VnInput from 'src/components/common/VnInput.vue';
+import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+import VnInputDate from 'src/components/common/VnInputDate.vue';
+import EditTableCellValueForm from 'src/components/EditTableCellValueForm.vue';
+import ItemFixedPriceFilter from './ItemFixedPriceFilter.vue';
+import ItemDescriptorProxy from './Card/ItemDescriptorProxy.vue';
+
+import { useStateStore } from 'stores/useStateStore';
+import { dashIfEmpty } from 'src/filters';
+import { useVnConfirm } from 'composables/useVnConfirm';
+import { useState } from 'src/composables/useState';
+import { toCurrency } from 'filters/index';
+import useNotify from 'src/composables/useNotify.js';
+import axios from 'axios';
+import { useArrayData } from 'composables/useArrayData';
+import { isLower, isBigger } from 'src/filters/date.js';
+
+const stateStore = useStateStore();
+const { t } = useI18n();
+const { openConfirmationModal } = useVnConfirm();
+const state = useState();
+const { notify } = useNotify();
+
+const editTableCellDialogRef = ref(null);
+const user = state.getUser();
+const fixedPrices = ref([]);
+const fixedPricesOriginalData = ref([]);
+const warehousesOptions = ref([]);
+const itemsWithNameOptions = ref([]);
+const rowsSelected = ref([]);
+
+const exprBuilder = (param, value) => {
+    switch (param) {
+        case 'name':
+            return { 'i.name': { like: `%${value}%` } };
+        case 'itemFk':
+        case 'warehouseFk':
+        case 'rate2':
+        case 'rate3':
+            param = `fp.${param}`;
+            return { [param]: value };
+        case 'minPrice':
+            param = `i.${param}`;
+            return { [param]: value };
+    }
+};
+
+const params = reactive({});
+const arrayData = useArrayData('ItemFixedPrices', {
+    url: 'FixedPrices/filter',
+    userParams: params,
+    order: ['itemFk'],
+    exprBuilder: exprBuilder,
+});
+const store = arrayData.store;
+
+const fetchFixedPrices = async () => {
+    await arrayData.fetch({ append: false });
+};
+
+const onFixedPricesFetched = (data) => {
+    fixedPrices.value = data;
+    // el objetivo de guardar una copia de las rows es evitar guardar cambios si la data no cambió al disparar los eventos
+    fixedPricesOriginalData.value = JSON.parse(JSON.stringify(data));
+};
+
+watch(
+    () => store.data,
+    (data) => onFixedPricesFetched(data)
+);
+
+const applyColumnFilter = async (col) => {
+    try {
+        const paramKey = col.columnFilter?.filterParamKey || col.field;
+        params[paramKey] = col.columnFilter.filterValue;
+        await arrayData.addFilter({ params });
+    } catch (err) {
+        console.error('Error applying column filter', err);
+    }
+};
+
+const getColumnInputEvents = (col) => {
+    return col.columnFilter.type === 'select'
+        ? { 'update:modelValue': () => applyColumnFilter(col) }
+        : {
+              'keyup.enter': () => applyColumnFilter(col),
+          };
+};
+
+const defaultColumnFilter = {
+    component: VnInput,
+    type: 'text',
+    filterValue: null,
+    event: getColumnInputEvents,
+    attrs: {
+        dense: true,
+    },
+};
+
+const defaultColumnAttrs = {
+    align: 'left',
+    sortable: true,
+};
+
+const columns = computed(() => [
+    {
+        label: t('item.fixedPrice.itemId'),
+        name: 'itemId',
+        field: 'itemFk',
+        ...defaultColumnAttrs,
+        columnFilter: {
+            ...defaultColumnFilter,
+        },
+    },
+    {
+        label: t('globals.description'),
+        field: 'name',
+        name: 'description',
+        ...defaultColumnAttrs,
+        columnFilter: {
+            ...defaultColumnFilter,
+        },
+    },
+    {
+        label: t('item.fixedPrice.groupingPrice'),
+        field: 'rate2',
+        name: 'groupingPrice',
+        ...defaultColumnAttrs,
+        columnFilter: {
+            ...defaultColumnFilter,
+        },
+        format: (val) => toCurrency(val),
+    },
+    {
+        label: t('item.fixedPrice.packingPrice'),
+        field: 'rate3',
+        name: 'packingPrice',
+        ...defaultColumnAttrs,
+        columnFilter: {
+            ...defaultColumnFilter,
+        },
+        format: (val) => dashIfEmpty(val),
+    },
+
+    {
+        label: t('item.fixedPrice.minPrice'),
+        field: 'minPrice',
+        name: 'minPrice',
+        ...defaultColumnAttrs,
+        columnFilter: {
+            ...defaultColumnFilter,
+        },
+    },
+    {
+        label: t('item.fixedPrice.started'),
+        field: 'started',
+        name: 'started',
+        ...defaultColumnAttrs,
+        columnFilter: null,
+    },
+    {
+        label: t('item.fixedPrice.ended'),
+        field: 'ended',
+        name: 'ended',
+        ...defaultColumnAttrs,
+        columnFilter: null,
+    },
+
+    {
+        label: t('item.fixedPrice.warehouse'),
+        field: 'warehouseFk',
+        name: 'warehouse',
+        ...defaultColumnAttrs,
+        columnFilter: {
+            component: VnSelectFilter,
+            type: 'select',
+            filterValue: null,
+            event: getColumnInputEvents,
+            attrs: {
+                options: warehousesOptions.value,
+                'option-value': 'id',
+                'option-label': 'name',
+                dense: true,
+            },
+        },
+    },
+    { name: 'deleteAction', align: 'center' },
+]);
+
+const editTableFieldsOptions = [
+    {
+        field: 'rate2',
+        label: t('item.fixedPrice.groupingPrice'),
+        component: 'input',
+        attrs: {
+            type: 'number',
+        },
+    },
+    {
+        field: 'rate3',
+        label: t('item.fixedPrice.packingPrice'),
+        component: 'input',
+        attrs: {
+            type: 'number',
+        },
+    },
+    {
+        field: 'minPrice',
+        label: t('item.fixedPrice.minPrice'),
+        component: 'input',
+        attrs: {
+            type: 'number',
+        },
+    },
+    {
+        field: 'hasMinPrice',
+        label: t('item.fixedPrice.hasMinPrice'),
+        component: 'checkbox',
+        attrs: {
+            'false-value': 0,
+            'true-value': 1,
+        },
+    },
+    {
+        field: 'started',
+        label: t('item.fixedPrice.started'),
+        component: 'date',
+    },
+    {
+        field: 'ended',
+        label: t('item.fixedPrice.ended'),
+        component: 'date',
+    },
+    {
+        field: 'warehouseFk',
+        label: t('item.fixedPrice.warehouse'),
+        component: 'select',
+        attrs: {
+            options: [],
+            'option-label': 'name',
+            'option-value': 'id',
+        },
+    },
+];
+
+const getRowUpdateInputEvents = (props, resetMinPrice, inputType = 'text') => {
+    return inputType === 'text'
+        ? {
+              'keyup.enter': () => upsertPrice(props, resetMinPrice),
+              blur: () => upsertPrice(props, resetMinPrice),
+          }
+        : { 'update:modelValue': () => upsertPrice(props, resetMinPrice) };
+};
+
+const validations = (row, rowIndex, col) => {
+    const isNew = !row.id;
+    // Si la row no tiene id significa que fue agregada con addRow y no se ha guardado en la base de datos
+    // Si isNew es falso no se checkea si el valor es igual a la original
+    if (!isNew)
+        if (fixedPricesOriginalData.value[rowIndex][col.field] == row[col.field])
+            return false;
+
+    const requiredFields = ['itemFk', 'started', 'ended', 'rate2', 'rate3'];
+    return requiredFields.every(
+        (field) => row[field] !== null && row[field] !== undefined
+    );
+};
+
+const upsertPrice = async ({ row, col, rowIndex }, resetMinPrice = false) => {
+    if (!validations(row, rowIndex, col)) return;
+
+    try {
+        if (resetMinPrice) row.hasMinPrice = 0;
+
+        const { data } = await axios.patch('FixedPrices/upsertFixedPrice', row);
+        row = data;
+        fixedPricesOriginalData.value[rowIndex][col.field] = row[col.field];
+    } catch (err) {
+        console.error('Error editing price', err);
+    }
+};
+
+const addRow = () => {
+    if (!fixedPrices.value || fixedPrices.value.length === 0) {
+        fixedPrices.value = [];
+
+        const today = Date.vnNew();
+        const millisecsInDay = 86400000;
+        const daysInWeek = 7;
+        const nextWeek = new Date(today.getTime() + daysInWeek * millisecsInDay);
+
+        const newPrice = {
+            started: today,
+            ended: nextWeek,
+            hasMinPrice: 0,
+        };
+
+        fixedPricesOriginalData.value.push({ ...newPrice });
+        fixedPrices.value.push({ ...newPrice });
+        return;
+    }
+
+    const lastItemCopy = JSON.parse(
+        JSON.stringify(fixedPrices.value[fixedPrices.value.length - 1])
+    );
+    const { id, ...restOfItem } = lastItemCopy;
+    fixedPricesOriginalData.value.push(restOfItem);
+    fixedPrices.value.push(restOfItem);
+};
+
+const openEditTableCellDialog = () => {
+    editTableCellDialogRef.value.show();
+};
+
+const onEditCellDataSaved = async () => {
+    rowsSelected.value = [];
+    await fetchFixedPrices();
+};
+
+const onWarehousesFetched = (data) => {
+    warehousesOptions.value = data;
+    // Actualiza las 'options' del elemento con field 'warehouseFk' en 'editTableFieldsOptions'.
+    const warehouseField = editTableFieldsOptions.find(
+        (field) => field.field === 'warehouseFk'
+    );
+    warehouseField.attrs.options = data;
+};
+
+const removePrice = async (id, rowIndex) => {
+    try {
+        await axios.delete(`FixedPrices/${id}`);
+        fixedPrices.value.splice(rowIndex, 1);
+        fixedPricesOriginalData.value.splice(rowIndex, 1);
+        notify(t('globals.dataSaved'), 'positive');
+    } catch (err) {
+        console.error('Error removing price', err);
+    }
+};
+
+const updateMinPrice = async (value, props) => {
+    // El checkbox hasMinPrice se encuentra en la misma columna que el input hasMinPrice
+    // Por lo tanto le mandamos otro objeto con las mismas propiedades pero con el campo 'field' cambiado
+    props.row.hasMinPrice = value;
+    await upsertPrice({
+        row: props.row,
+        col: { field: 'hasMinPrice' },
+        rowIndex: props.rowIndex,
+    });
+};
+
+onMounted(async () => {
+    stateStore.rightDrawer = true;
+    params.warehouseFk = user.value.warehouseFk;
+    await fetchFixedPrices();
+});
+
+onUnmounted(() => (stateStore.rightDrawer = false));
+</script>
+
+<template>
+    <FetchData
+        url="Warehouses"
+        :filter="{ order: ['name'] }"
+        auto-load
+        @on-fetch="(data) => onWarehousesFetched(data)"
+    />
+    <FetchData
+        url="Items/withName"
+        :filter="{ fields: ['id', 'name'], order: 'id DESC' }"
+        auto-load
+        @on-fetch="(data) => (itemsWithNameOptions = data)"
+    />
+    <template v-if="stateStore.isHeaderMounted()">
+        <Teleport to="#actions-append">
+            <div class="row q-gutter-x-sm">
+                <QBtn
+                    flat
+                    @click="stateStore.toggleRightDrawer()"
+                    round
+                    dense
+                    icon="menu"
+                >
+                    <QTooltip bottom anchor="bottom right">
+                        {{ t('globals.collapseMenu') }}
+                    </QTooltip>
+                </QBtn>
+            </div>
+        </Teleport>
+    </template>
+    <QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above>
+        <QScrollArea class="fit text-grey-8">
+            <ItemFixedPriceFilter
+                data-key="ItemFixedPrices"
+                :warehouses-options="warehousesOptions"
+            />
+        </QScrollArea>
+    </QDrawer>
+    <QPage class="column items-center q-pa-md">
+        <QTable
+            :rows="fixedPrices"
+            :columns="columns"
+            row-key="id"
+            selection="multiple"
+            v-model:selected="rowsSelected"
+            :pagination="{ rowsPerPage: 0 }"
+            class="full-width q-mt-md"
+            :no-data-label="t('globals.noResults')"
+        >
+            <template #top-row="{ cols }">
+                <QTr>
+                    <QTd />
+                    <QTd
+                        v-for="(col, index) in cols"
+                        :key="index"
+                        style="max-width: 100px"
+                    >
+                        <component
+                            :is="col.columnFilter.component"
+                            v-if="col.columnFilter"
+                            v-model="col.columnFilter.filterValue"
+                            v-bind="col.columnFilter.attrs"
+                            v-on="col.columnFilter.event(col)"
+                            dense
+                        />
+                    </QTd>
+                </QTr>
+            </template>
+
+            <template #body-cell-itemId="props">
+                <QTd>
+                    <VnSelectFilter
+                        :options="itemsWithNameOptions"
+                        hide-selected
+                        option-label="id"
+                        option-value="id"
+                        v-model="props.row.itemFk"
+                        v-on="getRowUpdateInputEvents(props, true, 'select')"
+                    >
+                        <template #option="scope">
+                            <QItem v-bind="scope.itemProps">
+                                <QItemSection>
+                                    <QItemLabel> #{{ scope.opt?.id }} </QItemLabel>
+                                    <QItemLabel caption>{{ scope.opt?.name }}</QItemLabel>
+                                </QItemSection>
+                            </QItem>
+                        </template>
+                    </VnSelectFilter>
+                </QTd>
+            </template>
+            <template #body-cell-description="{ row }">
+                <QTd class="col">
+                    <span class="link">
+                        {{ row.name }}
+                    </span>
+                    <ItemDescriptorProxy :id="row.itemFk" />
+                    <fetched-tags :item="row" :max-length="6" />
+                </QTd>
+            </template>
+            <template #body-cell-groupingPrice="props">
+                <QTd class="col">
+                    <VnInput
+                        v-model.number="props.row.rate2"
+                        v-on="getRowUpdateInputEvents(props)"
+                    >
+                        <template #append>€</template>
+                    </VnInput>
+                </QTd>
+            </template>
+            <template #body-cell-packingPrice="props">
+                <QTd class="col">
+                    <VnInput
+                        v-model.number="props.row.rate3"
+                        v-on="getRowUpdateInputEvents(props)"
+                    >
+                        <template #append>€</template>
+                    </VnInput>
+                </QTd>
+            </template>
+            <template #body-cell-minPrice="props">
+                <QTd class="col">
+                    <div class="row">
+                        <QCheckbox
+                            class="col"
+                            :model-value="props.row.hasMinPrice"
+                            @update:model-value="updateMinPrice($event, props)"
+                            :false-value="0"
+                            :true-value="1"
+                            :toggle-indeterminate="false"
+                        />
+                        <VnInput
+                            class="col"
+                            :disable="!props.row.hasMinPrice"
+                            v-model.number="props.row.minPrice"
+                            v-on="getRowUpdateInputEvents(props)"
+                            type="number"
+                        />
+                    </div>
+                </QTd>
+            </template>
+            <template #body-cell-started="props">
+                <QTd class="col" style="min-width: 160px">
+                    <VnInputDate
+                        v-model="props.row.started"
+                        v-on="getRowUpdateInputEvents(props, false, 'date')"
+                        v-bind="
+                            isBigger(props.row.started)
+                                ? { 'bg-color': 'warning', 'is-outlined': true }
+                                : {}
+                        "
+                    />
+                </QTd>
+            </template>
+            <template #body-cell-ended="props">
+                <QTd class="col" style="min-width: 150px">
+                    <VnInputDate
+                        v-model="props.row.ended"
+                        v-on="getRowUpdateInputEvents(props, false, 'date')"
+                        v-bind="
+                            isLower(props.row.ended)
+                                ? { 'bg-color': 'warning', 'is-outlined': true }
+                                : {}
+                        "
+                    />
+                </QTd>
+            </template>
+            <template #body-cell-warehouse="props">
+                <QTd class="col">
+                    <VnSelectFilter
+                        :options="warehousesOptions"
+                        hide-selected
+                        option-label="name"
+                        option-value="id"
+                        v-model="props.row.warehouseFk"
+                        v-on="getRowUpdateInputEvents(props, false, 'select')"
+                    />
+                </QTd>
+            </template>
+            <template #body-cell-deleteAction="{ row, rowIndex }">
+                <QTd class="col">
+                    <QIcon
+                        name="delete"
+                        size="sm"
+                        class="cursor-pointer fill-icon-on-hover"
+                        color="primary"
+                        @click.stop="
+                            openConfirmationModal(
+                                t('This row will be removed'),
+                                t('Do you want to clone this item?'),
+                                () => removePrice(row.id, rowIndex)
+                            )
+                        "
+                    >
+                        <QTooltip class="text-no-wrap">
+                            {{ t('Delete') }}
+                        </QTooltip>
+                    </QIcon>
+                </QTd>
+            </template>
+            <template #bottom-row>
+                <QTd align="center">
+                    <QIcon
+                        @click.stop="addRow()"
+                        class="fill-icon-on-hover"
+                        color="primary"
+                        name="add_circle"
+                        size="sm"
+                    >
+                        <QTooltip>
+                            {{ t('Add fixed price') }}
+                        </QTooltip>
+                    </QIcon>
+                </QTd>
+            </template>
+        </QTable>
+        <QPageSticky v-if="rowsSelected.length > 0" :offset="[20, 20]">
+            <QBtn @click="openEditTableCellDialog()" color="primary" fab icon="edit" />
+            <QTooltip>
+                {{ t('Edit fixed price(s)') }}
+            </QTooltip>
+        </QPageSticky>
+        <QDialog ref="editTableCellDialogRef">
+            <EditTableCellValueForm
+                edit-url="FixedPrices/editFixedPrice"
+                :rows="rowsSelected"
+                :fields-options="editTableFieldsOptions"
+                @on-data-saved="onEditCellDataSaved()"
+            />
+        </QDialog>
+    </QPage>
+</template>
+
+<i18n>
+es:
+    Add fixed price: Añadir precio fijado
+    Edit fixed price(s): Editar precio(s) fijado(s)
+    This row will be removed: Esta linea se eliminará
+    Are you sure you want to continue?: ¿Seguro que quieres continuar?
+    Delete: Eliminar
+</i18n>