Merge branch 'dev' into 5447-travelExtraCommunity

package.json

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

src/boot/qformMixin.js

@@ -1,21 +1,48 @@
 import { getCurrentInstance } from 'vue';
 
-const filterAvailableInput = element => element.classList.contains('q-field__native') && !element.disabled
+const filterAvailableInput = (element) => {
-const filterAvailableText = element => element.__vueParentComponent.type.name === 'QInput' && element.__vueParentComponent?.attrs?.class !== 'vn-input-date';
+    return element.classList.contains('q-field__native') && !element.disabled;
-
+};
+const filterAvailableText = (element) => {
+    return (
+        element.__vueParentComponent.type.name === 'QInput' &&
+        element.__vueParentComponent?.attrs?.class !== 'vn-input-date'
+    );
+};
 
 export default {
     mounted: function () {
         const vm = getCurrentInstance();
-        if (vm.type.name === 'QForm')
+        if (vm.type.name === 'QForm') {
-            if (!['searchbarForm','filterPanelForm'].includes(this.$el?.id)) {
+            if (!['searchbarForm', 'filterPanelForm'].includes(this.$el?.id)) {
                 // AUTOFOCUS
                 const elementsArray = Array.from(this.$el.elements);
-                const firstInputElement = elementsArray.filter(filterAvailableInput).find(filterAvailableText);
+                const availableInputs = elementsArray.filter(filterAvailableInput);
+                const firstInputElement = availableInputs.find(filterAvailableText);
 
                 if (firstInputElement) {
                     firstInputElement.focus();
                 }
+                const that = this;
+                this.$el.addEventListener('keyup', function (evt) {
+                    if (evt.key === 'Enter') {
+                        const input = evt.target;
+                        console.log('input', input);
+                        if (input.type == 'textarea' && evt.shiftKey) {
+                            evt.preventDefault();
+                            let { selectionStart, selectionEnd } = input;
+                            input.value =
+                                input.value.substring(0, selectionStart) +
+                                '\n' +
+                                input.value.substring(selectionEnd);
+                            selectionStart = selectionEnd = selectionStart + 1;
+                            return;
+                        }
+                        evt.preventDefault();
+                        that.onSubmit();
+                    }
+                });
             }
+        }
     },
 };

src/components/EditPictureForm.vue

@@ -155,7 +155,7 @@ const rotateRight = () => {
     editor.value.rotate(-90);
 };
 
-const onUploadAccept = () => {
+const onSubmit = () => {
     try {
         if (!newPhoto.files && !newPhoto.url) {
             notify(t('Select an image'), 'negative');
@@ -206,7 +206,7 @@ const makeRequest = async () => {
         @on-fetch="(data) => (allowedContentTypes = data.join(', '))"
         auto-load
     />
-    <QForm @submit="onUploadAccept()" class="all-pointer-events">
+    <QForm @submit="onSubmit()" class="all-pointer-events">
         <QCard class="q-pa-lg">
             <span ref="closeButton" class="close-icon" v-close-popup>
                 <QIcon name="close" size="sm" />

src/components/EditTableCellValueForm.vue

@@ -50,7 +50,7 @@ const onDataSaved = () => {
     closeForm();
 };
 
-const submitData = async () => {
+const onSubmit = async () => {
     try {
         isLoading.value = true;
         const rowsToEdit = $props.rows.map((row) => ({ id: row.id, itemFk: row.itemFk }));
@@ -74,7 +74,7 @@ const closeForm = () => {
 </script>
 
 <template>
-    <QForm @submit="submitData()" class="all-pointer-events">
+    <QForm @submit="onSubmit()" class="all-pointer-events">
         <QCard class="q-pa-lg">
             <span ref="closeButton" class="close-icon" v-close-popup>
                 <QIcon name="close" size="sm" />

src/components/FilterItemForm.vue

@@ -83,7 +83,7 @@ const tableColumns = computed(() => [
     },
 ]);
 
-const fetchResults = async () => {
+const onSubmit = async () => {
     try {
         let filter = itemFilter;
         const params = itemFilterParams;
@@ -145,7 +145,7 @@ const selectItem = ({ id }) => {
         @on-fetch="(data) => (InksOptions = data)"
         auto-load
     />
-    <QForm @submit="fetchResults()" class="all-pointer-events">
+    <QForm @submit="onSubmit()" class="all-pointer-events">
         <QCard class="column" style="padding: 32px; z-index: 100">
             <span ref="closeButton" class="close-icon" v-close-popup>
                 <QIcon name="close" size="sm" />

src/components/FilterTravelForm.vue

@@ -85,7 +85,7 @@ const tableColumns = computed(() => [
     },
 ]);
 
-const fetchResults = async () => {
+const onSubmit = async () => {
     try {
         let filter = travelFilter;
         const params = travelFilterParams;
@@ -138,7 +138,7 @@ const selectTravel = ({ id }) => {
         @on-fetch="(data) => (warehousesOptions = data)"
         auto-load
     />
-    <QForm @submit="fetchResults()" class="all-pointer-events">
+    <QForm @submit="onSubmit()" class="all-pointer-events">
         <QCard class="column" style="padding: 32px; z-index: 100">
             <span ref="closeButton" class="close-icon" v-close-popup>
                 <QIcon name="close" size="sm" />

src/components/FormModel.vue

@@ -117,7 +117,7 @@ onMounted(async () => {
     state.set($props.model, $props.formInitialData);
 
     if ($props.autoLoad && !$props.formInitialData && $props.url) await fetch();
-    else if (arrayData.store.data) updateAndEmit(arrayData.store.data, 'onFetch');
+    else if (arrayData.store.data) updateAndEmit('onFetch', arrayData.store.data);
 
     if ($props.observeFormChanges) {
         watch(
@@ -137,7 +137,7 @@ onMounted(async () => {
 if (!$props.url)
     watch(
         () => arrayData.store.data,
-        (val) => updateAndEmit(val, 'onFetch')
+        (val) => updateAndEmit('onFetch', val)
     );
 
 watch(formUrl, async () => {
@@ -172,8 +172,8 @@ async function fetch() {
         });
         if (Array.isArray(data)) data = data[0] ?? {};
 
-        updateAndEmit(data, 'onFetch');
+        updateAndEmit('onFetch', data);
-    } catch (error) {
+    } catch (e) {
         state.set($props.model, {});
         originalData.value = {};
     }
@@ -196,7 +196,7 @@ async function save() {
 
         if ($props.urlCreate) notify('globals.dataCreated', 'positive');
 
-        updateAndEmit(response?.data, 'onDataSaved');
+        updateAndEmit('onDataSaved', formData.value, response?.data);
     } catch (err) {
         console.error(err);
         notify('errors.writeRequest', 'negative');
@@ -212,7 +212,7 @@ async function saveAndGo() {
 }
 
 function reset() {
-    updateAndEmit(originalData.value, 'onFetch');
+    updateAndEmit('onFetch', originalData.value);
     if ($props.observeFormChanges) {
         hasChanges.value = false;
         isResetting.value = true;
@@ -234,12 +234,12 @@ function filter(value, update, filterOptions) {
     );
 }
 
-function updateAndEmit(val, evt) {
+function updateAndEmit(evt, val, res) {
     state.set($props.model, val);
     originalData.value = val && JSON.parse(JSON.stringify(val));
     if (!$props.url) arrayData.store.data = val;
 
-    emit(evt, state.get($props.model));
+    emit(evt, state.get($props.model), res);
 }
 
 defineExpose({ save, isLoading, hasChanges });

src/components/FormModelPopup.vue

@@ -4,7 +4,7 @@ import { useI18n } from 'vue-i18n';
 
 import FormModel from 'components/FormModel.vue';
 
-const emit = defineEmits(['onDataSaved']);
+const emit = defineEmits(['onDataSaved', 'onDataCanceled']);
 
 defineProps({
     title: {
@@ -15,26 +15,6 @@ defineProps({
         type: String,
         default: '',
     },
-    url: {
-        type: String,
-        default: '',
-    },
-    model: {
-        type: String,
-        default: '',
-    },
-    filter: {
-        type: Object,
-        default: null,
-    },
-    urlCreate: {
-        type: String,
-        default: null,
-    },
-    formInitialData: {
-        type: Object,
-        default: () => {},
-    },
 });
 
 const { t } = useI18n();
@@ -43,8 +23,8 @@ const formModelRef = ref(null);
 const closeButton = ref(null);
 
 const onDataSaved = (formData, requestResponse) => {
-    emit('onDataSaved', formData, requestResponse);
     closeForm();
+    emit('onDataSaved', formData, requestResponse);
 };
 
 const isLoading = computed(() => formModelRef.value?.isLoading);
@@ -61,11 +41,9 @@ defineExpose({
 <template>
     <FormModel
         ref="formModelRef"
-        :form-initial-data="formInitialData"
         :observe-form-changes="false"
         :default-actions="false"
-        :url-create="urlCreate"
+        v-bind="$attrs"
-        :model="model"
         @on-data-saved="onDataSaved"
     >
         <template #form="{ data, validate }">
@@ -84,6 +62,7 @@ defineExpose({
                     flat
                     :disabled="isLoading"
                     :loading="isLoading"
+                    @click="emit('onDataCanceled')"
                     v-close-popup
                 />
                 <QBtn

src/components/FormPopup.vue

@@ -74,7 +74,7 @@ const closeForm = () => {
                     :disabled="isLoading"
                     :loading="isLoading"
                 />
-                <slot name="customButtons" />
+                <slot name="custom-buttons" />
             </div>
         </QCard>
     </QForm>

src/components/UserPanel.vue

@@ -1,5 +1,5 @@
 <script setup>
-import { onMounted, computed } from 'vue';
+import { onMounted, computed, ref } from 'vue';
 import { Dark, Quasar } from 'quasar';
 import { useI18n } from 'vue-i18n';
 import { useRouter } from 'vue-router';
@@ -10,13 +10,12 @@ import { localeEquivalence } from 'src/i18n/index';
 import VnSelect from 'src/components/common/VnSelect.vue';
 import VnRow from 'components/ui/VnRow.vue';
 import FetchData from 'components/FetchData.vue';
+import { useClipboard } from 'src/composables/useClipboard';
 
 const state = useState();
 const session = useSession();
 const router = useRouter();
 const { t, locale } = useI18n();
-import { useClipboard } from 'src/composables/useClipboard';
-import { ref } from 'vue';
 const { copyText } = useClipboard();
 const userLocale = computed({
     get() {
@@ -91,6 +90,15 @@ function logout() {
 function copyUserToken() {
     copyText(session.getToken(), { label: 'components.userPanel.copyToken' });
 }
+
+function localUserData() {
+    state.setUser(user.value);
+}
+
+function saveUserData(param, value) {
+    axios.post('UserConfigs/setUserConfig', { [param]: value });
+    localUserData();
+}
 </script>
 
 <template>
@@ -180,6 +188,7 @@ function copyUserToken() {
                     option-value="id"
                     input-debounce="0"
                     hide-selected
+                    @update:model-value="localUserData"
                 />
                 <VnSelect
                     :label="t('components.userPanel.localBank')"
@@ -189,6 +198,7 @@ function copyUserToken() {
                     option-value="id"
                     input-debounce="0"
                     hide-selected
+                    @update:model-value="localUserData"
                 >
                     <template #option="{ itemProps, opt }">
                         <QItem v-bind="itemProps">
@@ -210,6 +220,7 @@ function copyUserToken() {
                     option-label="code"
                     option-value="id"
                     input-debounce="0"
+                    @update:model-value="localUserData"
                 />
                 <VnSelect
                     :label="t('components.userPanel.userWarehouse')"
@@ -219,6 +230,7 @@ function copyUserToken() {
                     option-label="name"
                     option-value="id"
                     input-debounce="0"
+                    @update:model-value="(v) => saveUserData('warehouseFk', v)"
                 />
             </VnRow>
             <VnRow>
@@ -232,6 +244,7 @@ function copyUserToken() {
                     style="flex: 0"
                     dense
                     input-debounce="0"
+                    @update:model-value="(v) => saveUserData('companyFk', v)"
                 />
             </VnRow>
         </div>

src/components/common/RightMenu.vue

@@ -9,19 +9,18 @@ const rightPanel = ref(null);
 
 onMounted(() => {
     rightPanel.value = document.querySelector('#right-panel');
-    if (rightPanel.value.childNodes.length) hasContent.value = true;
+    if (!rightPanel.value) return;
 
     // Check if there's content to display
     const observer = new MutationObserver(() => {
         hasContent.value = rightPanel.value.childNodes.length;
     });
 
-    if (rightPanel.value)
+    observer.observe(rightPanel.value, {
-        observer.observe(rightPanel.value, {
+        subtree: true,
-            subtree: true,
+        childList: true,
-            childList: true,
+        attributes: true,
-            attributes: true,
+    });
-        });
 
     if (!slots['right-panel'] && !hasContent.value) stateStore.rightDrawer = false;
 });
@@ -30,7 +29,7 @@ const { t } = useI18n();
 const stateStore = useStateStore();
 </script>
 <template>
-    <Teleport to="#actions-append">
+    <Teleport to="#actions-append" v-if="stateStore.isHeaderMounted()">
         <div class="row q-gutter-x-sm">
             <QBtn
                 v-if="hasContent || $slots['right-panel']"

src/components/common/VnCard.vue

@@ -22,6 +22,7 @@ const props = defineProps({
     searchbarInfo: { type: String, default: '' },
     searchCustomRouteRedirect: { type: String, default: undefined },
     searchRedirect: { type: Boolean, default: true },
+    searchMakeFetch: { type: Boolean, default: true },
 });
 
 const stateStore = useStateStore();
@@ -56,33 +57,34 @@ watchEffect(() => {
 });
 </script>
 <template>
-    <template v-if="stateStore.isHeaderMounted()">
+    <QDrawer
-        <Teleport to="#searchbar" v-if="props.searchDataKey">
+        v-model="stateStore.leftDrawer"
-            <slot name="searchbar">
+        show-if-above
-                <VnSearchbar
+        :width="256"
-                    :data-key="props.searchDataKey"
+        v-if="stateStore.isHeaderMounted()"
-                    :url="props.searchUrl"
+    >
-                    :label="props.searchbarLabel"
+        <QScrollArea class="fit">
-                    :info="props.searchbarInfo"
+            <component :is="descriptor" />
-                    :custom-route-redirect-name="searchCustomRouteRedirect"
+            <QSeparator />
-                    :redirect="searchRedirect"
+            <LeftMenu source="card" />
-                />
+        </QScrollArea>
-            </slot>
+    </QDrawer>
-        </Teleport>
+    <slot name="searchbar" v-if="props.searchDataKey">
-        <slot v-else name="searchbar" />
+        <VnSearchbar
-        <QDrawer v-model="stateStore.leftDrawer" show-if-above :width="256">
+            :data-key="props.searchDataKey"
-            <QScrollArea class="fit">
+            :url="props.searchUrl"
-                <component :is="descriptor" />
+            :label="props.searchbarLabel"
-                <QSeparator />
+            :info="props.searchbarInfo"
-                <LeftMenu source="card" />
+            :custom-route-redirect-name="searchCustomRouteRedirect"
-            </QScrollArea>
+            :redirect="searchRedirect"
-        </QDrawer>
+        />
-        <RightMenu>
+    </slot>
-            <template #right-panel v-if="props.filterPanel">
+    <slot v-else name="searchbar" />
-                <component :is="props.filterPanel" :data-key="props.searchDataKey" />
+    <RightMenu>
-            </template>
+        <template #right-panel v-if="props.filterPanel">
-        </RightMenu>
+            <component :is="props.filterPanel" :data-key="props.searchDataKey" />
-    </template>
+        </template>
+    </RightMenu>
     <QPageContainer>
         <QPage>
             <VnSubToolbar />

src/components/common/VnInput.vue

@@ -80,7 +80,7 @@ const inputRules = [
                 <QIcon
                     name="close"
                     size="xs"
-                    v-if="$slots.append && hover && value && !$attrs.disabled"
+                    v-if="hover && value && !$attrs.disabled"
                     @click="value = null"
                 ></QIcon>
             </template>

src/components/common/VnInputTime.vue

@@ -2,7 +2,6 @@
 import { computed, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import isValidDate from 'filters/isValidDate';
-import VnInput from 'components/common/VnInput.vue';
 
 const props = defineProps({
     modelValue: {

src/components/common/VnLog.vue

@@ -622,145 +622,140 @@ setLogTree();
             </QList>
         </div>
     </div>
-    <QDrawer v-model="stateStore.rightDrawer" show-if-above side="right" :width="300">
+    <Teleport to="#right-panel" v-if="stateStore.isHeaderMounted()">
-        <QScrollArea class="fit text-grey-8">
+        <QList dense>
-            <QList dense>
+            <QSeparator />
-                <QSeparator />
+            <QItem class="q-mt-sm">
-                <QItem class="q-mt-sm">
+                <QInput
-                    <QInput
+                    :label="t('globals.search')"
-                        :label="t('globals.search')"
+                    v-model="searchInput"
-                        v-model="searchInput"
+                    class="full-width"
-                        class="full-width"
+                    clearable
-                        clearable
+                    clear-icon="close"
-                        clear-icon="close"
+                    @keyup.enter="() => selectFilter('search')"
-                        @keyup.enter="() => selectFilter('search')"
+                    @focusout="() => selectFilter('search')"
-                        @focusout="() => selectFilter('search')"
+                    @clear="() => selectFilter('search')"
-                        @clear="() => selectFilter('search')"
+                >
-                    >
+                    <template #append>
-                        <template #append>
+                        <QIcon name="info" class="cursor-pointer">
-                            <QIcon name="info" class="cursor-pointer">
+                            <QTooltip>{{ t('tooltips.search') }}</QTooltip>
-                                <QTooltip>{{ t('tooltips.search') }}</QTooltip>
+                        </QIcon>
-                            </QIcon>
+                    </template>
-                        </template>
+                </QInput>
-                    </QInput>
+            </QItem>
-                </QItem>
+            <QItem>
-                <QItem>
+                <VnSelect
+                    class="full-width"
+                    :label="t('globals.entity')"
+                    v-model="selectedFilters.changedModel"
+                    option-label="locale"
+                    option-value="value"
+                    :options="actions"
+                    @update:model-value="selectFilter('action')"
+                    hide-selected
+                />
+            </QItem>
+            <QItem class="q-mt-sm">
+                <QOptionGroup
+                    size="sm"
+                    v-model="userRadio"
+                    :options="userTypes"
+                    color="primary"
+                    @update:model-value="selectFilter('userRadio')"
+                    right-label
+                >
+                    <template #label="{ label }">
+                        {{ t(`Users.${label}`) }}
+                    </template>
+                </QOptionGroup>
+            </QItem>
+            <QItem class="q-mt-sm">
+                <QItemSection v-if="!workers">
+                    <QSkeleton type="QInput" class="full-width" />
+                </QItemSection>
+                <QItemSection v-if="workers && userRadio !== null">
                     <VnSelect
                         class="full-width"
-                        :label="t('globals.entity')"
+                        :label="t('globals.user')"
-                        v-model="selectedFilters.changedModel"
+                        v-model="userSelect"
-                        option-label="locale"
+                        option-label="name"
-                        option-value="value"
+                        option-value="id"
-                        :options="actions"
+                        :options="workers"
-                        @update:model-value="selectFilter('action')"
+                        @update:model-value="selectFilter('userSelect')"
                         hide-selected
-                    />
-                </QItem>
-                <QItem class="q-mt-sm">
-                    <QOptionGroup
-                        size="sm"
-                        v-model="userRadio"
-                        :options="userTypes"
-                        color="primary"
-                        @update:model-value="selectFilter('userRadio')"
-                        right-label
                     >
-                        <template #label="{ label }">
+                        <template #option="{ opt, itemProps }">
-                            {{ t(`Users.${label}`) }}
+                            <QItem v-bind="itemProps" class="q-pa-xs row items-center">
+                                <QItemSection class="col-3 items-center">
+                                    <VnAvatar :worker-id="opt.id" />
+                                </QItemSection>
+                                <QItemSection class="col-9 justify-center">
+                                    <span>{{ opt.name }}</span>
+                                    <span class="text-grey">{{ opt.nickname }}</span>
+                                </QItemSection>
+                            </QItem>
                         </template>
-                    </QOptionGroup>
+                    </VnSelect>
-                </QItem>
+                </QItemSection>
-                <QItem class="q-mt-sm">
+            </QItem>
-                    <QItemSection v-if="!workers">
+            <QItem class="q-mt-sm">
-                        <QSkeleton type="QInput" class="full-width" />
+                <QInput
-                    </QItemSection>
+                    :label="t('globals.changes')"
-                    <QItemSection v-if="workers && userRadio !== null">
+                    v-model="changeInput"
-                        <VnSelect
+                    class="full-width"
-                            class="full-width"
+                    clearable
-                            :label="t('globals.user')"
+                    clear-icon="close"
-                            v-model="userSelect"
+                    @keyup.enter="selectFilter('change')"
-                            option-label="name"
+                    @focusout="selectFilter('change')"
-                            option-value="id"
+                    @clear="selectFilter('change')"
-                            :options="workers"
-                            @update:model-value="selectFilter('userSelect')"
-                            hide-selected
-                        >
-                            <template #option="{ opt, itemProps }">
-                                <QItem
-                                    v-bind="itemProps"
-                                    class="q-pa-xs row items-center"
-                                >
-                                    <QItemSection class="col-3 items-center">
-                                        <VnAvatar :worker-id="opt.id" />
-                                    </QItemSection>
-                                    <QItemSection class="col-9 justify-center">
-                                        <span>{{ opt.name }}</span>
-                                        <span class="text-grey">{{ opt.nickname }}</span>
-                                    </QItemSection>
-                                </QItem>
-                            </template>
-                        </VnSelect>
-                    </QItemSection>
-                </QItem>
-                <QItem class="q-mt-sm">
-                    <QInput
-                        :label="t('globals.changes')"
-                        v-model="changeInput"
-                        class="full-width"
-                        clearable
-                        clear-icon="close"
-                        @keyup.enter="selectFilter('change')"
-                        @focusout="selectFilter('change')"
-                        @clear="selectFilter('change')"
-                    >
-                        <template #append>
-                            <QIcon name="info" class="cursor-pointer">
-                                <QTooltip max-width="250px">{{
-                                    t('tooltips.changes')
-                                }}</QTooltip>
-                            </QIcon>
-                        </template>
-                    </QInput>
-                </QItem>
-                <QItem
-                    :class="index == 'create' ? 'q-mt-md' : 'q-mt-xs'"
-                    v-for="(checkboxOption, index) in checkboxOptions"
-                    :key="index"
                 >
-                    <QCheckbox
+                    <template #append>
-                        size="sm"
+                        <QIcon name="info" class="cursor-pointer">
-                        v-model="checkboxOption.selected"
+                            <QTooltip max-width="250px">{{
-                        :label="t(`actions.${checkboxOption.label}`)"
+                                t('tooltips.changes')
-                        @update:model-value="selectFilter"
+                            }}</QTooltip>
-                    />
+                        </QIcon>
-                </QItem>
+                    </template>
-                <QItem class="q-mt-sm">
+                </QInput>
-                    <QInput
+            </QItem>
-                        class="full-width"
+            <QItem
-                        :label="t('globals.date')"
+                :class="index == 'create' ? 'q-mt-md' : 'q-mt-xs'"
-                        @click="dateFromDialog = true"
+                v-for="(checkboxOption, index) in checkboxOptions"
-                        @focus="(evt) => evt.target.blur()"
+                :key="index"
-                        @clear="selectFilter('date', 'to')"
+            >
-                        v-model="dateFrom"
+                <QCheckbox
-                        clearable
+                    size="sm"
-                        clear-icon="close"
+                    v-model="checkboxOption.selected"
-                    />
+                    :label="t(`actions.${checkboxOption.label}`)"
-                </QItem>
+                    @update:model-value="selectFilter"
-                <QItem class="q-mt-sm">
+                />
-                    <QInput
+            </QItem>
-                        class="full-width"
+            <QItem class="q-mt-sm">
-                        :label="t('to')"
+                <QInput
-                        @click="dateToDialog = true"
+                    class="full-width"
-                        @focus="(evt) => evt.target.blur()"
+                    :label="t('globals.date')"
-                        @clear="selectFilter('date', 'from')"
+                    @click="dateFromDialog = true"
-                        v-model="dateTo"
+                    @focus="(evt) => evt.target.blur()"
-                        clearable
+                    @clear="selectFilter('date', 'to')"
-                        clear-icon="close"
+                    v-model="dateFrom"
-                    />
+                    clearable
-                </QItem>
+                    clear-icon="close"
-            </QList>
+                />
-        </QScrollArea>
+            </QItem>
-    </QDrawer>
+            <QItem class="q-mt-sm">
+                <QInput
+                    class="full-width"
+                    :label="t('to')"
+                    @click="dateToDialog = true"
+                    @focus="(evt) => evt.target.blur()"
+                    @clear="selectFilter('date', 'from')"
+                    v-model="dateTo"
+                    clearable
+                    clear-icon="close"
+                />
+            </QItem>
+        </QList>
+    </Teleport>
     <QDialog v-model="dateFromDialog">
         <QDate
             :years-in-month-view="false"

src/components/common/VnWeekdayPicker.vue

@@ -0,0 +1,37 @@
+<script setup>
+import { computed } from 'vue';
+
+import { useWeekdayStore } from 'src/stores/useWeekdayStore';
+
+const props = defineProps({
+    wdays: {
+        type: Array,
+        default: () => [],
+    },
+});
+
+const emit = defineEmits(['update:wdays']);
+
+const weekdayStore = useWeekdayStore();
+
+const selectedWDays = computed({
+    get: () => props.wdays,
+    set: (value) => emit('update:wdays', value),
+});
+
+const toggleDay = (index) => (selectedWDays.value[index] = !selectedWDays.value[index]);
+</script>
+
+<template>
+    <div class="q-gutter-x-sm" style="width: max-content">
+        <QBtn
+            v-for="(weekday, index) in weekdayStore.getLocalesMap"
+            :key="index"
+            :label="weekday.localeChar"
+            rounded
+            style="max-width: 36px"
+            :color="selectedWDays[weekday.index] ? 'primary' : ''"
+            @click="toggleDay(weekday.index)"
+        />
+    </div>
+</template>

src/components/ui/QCalendarMonthWrapper.vue

@@ -147,7 +147,7 @@ const containerClasses = computed(() => {
     .q-calendar-month__head--workweek,
     .q-calendar-month__head--weekday.q-calendar__center.q-calendar__ellipsis {
         text-transform: capitalize;
-        color: var(---color-font-secondary);
+        color: $color-font-secondary;
         font-weight: bold;
         font-size: 0.8rem;
         text-align: center;

src/components/ui/VnNotes.vue

@@ -20,7 +20,12 @@ const state = useState();
 const currentUser = ref(state.getUser());
 const newNote = ref('');
 const vnPaginateRef = ref();
-
+function handleKeyUp(event) {
+      if (event.key === 'Enter') {
+        event.preventDefault();
+        if (!event.shiftKey) insert();
+    }
+}
 async function insert() {
     const body = $props.body;
     Object.assign(body, { text: newNote.value });
@@ -48,12 +53,12 @@ async function insert() {
                 size="lg"
                 autogrow
                 autofocus
-                @keyup.ctrl.enter.stop="insert"
+                @keyup="handleKeyUp"
                 clearable
             >
-                <template #append
+                <template #append>
-                    ><QBtn
+                    <QBtn
-                        :title="t('Save (ctrl + Enter)')"
+                        :title="t('Save (Enter)')"
                         icon="save"
                         color="primary"
                         flat
@@ -130,6 +135,6 @@ async function insert() {
     es:
         Add note here...: Añadir nota aquí...
         New note: Nueva nota
-        Save (ctrl + Enter): Guardar (Ctrl + Intro)
+        Save (Enter): Guardar (Intro)
 
 </i18n>

src/components/ui/VnSearchbar.vue

@@ -5,9 +5,11 @@ import { useArrayData } from 'composables/useArrayData';
 import VnInput from 'src/components/common/VnInput.vue';
 import useRedirect from 'src/composables/useRedirect';
 import { useI18n } from 'vue-i18n';
+import { useStateStore } from 'src/stores/useStateStore';
 
 const quasar = useQuasar();
 const { t } = useI18n();
+const state = useStateStore();
 
 const props = defineProps({
     dataKey: {
@@ -65,6 +67,10 @@ const props = defineProps({
         type: String,
         default: '',
     },
+    makeFetch: {
+        type: Boolean,
+        default: true,
+    },
 });
 
 let arrayData = useArrayData(props.dataKey, { ...props });
@@ -92,12 +98,14 @@ async function search() {
         ([key, value]) => value && (props.staticParams || []).includes(key)
     );
     store.skip = 0;
-    await arrayData.applyFilter({
+
-        params: {
+    if (props.makeFetch)
-            ...Object.fromEntries(staticParams),
+        await arrayData.applyFilter({
-            search: searchText.value,
+            params: {
-        },
+                ...Object.fromEntries(staticParams),
-    });
+                search: searchText.value,
+            },
+        });
 
     if (!props.redirect) return;
 
@@ -107,36 +115,37 @@ async function search() {
     });
 }
 </script>
-
 <template>
-    <QForm @submit="search" id="searchbarForm">
+    <Teleport to="#searchbar" v-if="state.isHeaderMounted()">
-        <VnInput
+        <QForm @submit="search" id="searchbarForm">
-            id="searchbar"
+            <VnInput
-            v-model="searchText"
+                id="searchbar"
-            :placeholder="t(props.label)"
+                v-model="searchText"
-            dense
+                :placeholder="t(props.label)"
-            standout
+                dense
-            autofocus
+                standout
-        >
+                autofocus
-            <template #prepend>
+            >
-                <QIcon
+                <template #prepend>
-                    v-if="!quasar.platform.is.mobile"
+                    <QIcon
-                    class="cursor-pointer"
+                        v-if="!quasar.platform.is.mobile"
-                    name="search"
+                        class="cursor-pointer"
-                    @click="search"
+                        name="search"
-                />
+                        @click="search"
-            </template>
+                    />
-            <template #append>
+                </template>
-                <QIcon
+                <template #append>
-                    v-if="props.info && $q.screen.gt.xs"
+                    <QIcon
-                    name="info"
+                        v-if="props.info && $q.screen.gt.xs"
-                    class="cursor-info"
+                        name="info"
-                >
+                        class="cursor-info"
-                    <QTooltip>{{ t(props.info) }}</QTooltip>
+                    >
-                </QIcon>
+                        <QTooltip>{{ t(props.info) }}</QTooltip>
-            </template>
+                    </QIcon>
-        </VnInput>
+                </template>
-    </QForm>
+            </VnInput>
+        </QForm>
+    </Teleport>
 </template>
 
 <style lang="scss" scoped>

src/composables/useArrayData.js

@@ -6,7 +6,7 @@ import { buildFilter } from 'filters/filterPanel';
 
 const arrayDataStore = useArrayDataStore();
 
-export function useArrayData(key, userOptions) {
+export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
     if (!key) throw new Error('ArrayData: A key is required to use this composable');
 
     if (!arrayDataStore.get(key)) arrayDataStore.set(key);

src/composables/useState.js

@@ -11,6 +11,8 @@ const user = ref({
     companyFk: null,
     warehouseFk: null,
 });
+if (sessionStorage.getItem('user'))
+    user.value = JSON.parse(sessionStorage.getItem('user'));
 
 const roles = ref([]);
 const tokenConfig = ref({});
@@ -25,7 +27,10 @@ export function useState() {
     }
 
     function setUser(data) {
-        user.value = data;
+        const currentUser = { ...JSON.parse(sessionStorage.getItem('user')), ...data };
+        sessionStorage.setItem('user', JSON.stringify(currentUser));
+        user.value = currentUser;
+        return currentUser;
     }
 
     function getRoles() {

src/filters/dashOrCurrency.js

@@ -0,0 +1,6 @@
+import toCurrency from './toCurrency';
+
+export default function (value) {
+    if (value == null || value === '') return () => '-';
+    return () => toCurrency(value);
+}

src/filters/index.js

@@ -10,6 +10,7 @@ import toLowerCamel from './toLowerCamel';
 import dashIfEmpty from './dashIfEmpty';
 import dateRange from './dateRange';
 import toHour from './toHour';
+import dashOrCurrency from './dashOrCurrency';
 
 export {
     toLowerCase,
@@ -17,6 +18,7 @@ export {
     toDate,
     toHour,
     toDateString,
+    dashOrCurrency,
     toDateHourMin,
     toDateHourMinSec,
     toRelativeDate,

src/i18n/locale/en.yml

@@ -103,6 +103,8 @@ globals:
         deliveryList: Delivery days
         upcomingList: Upcoming deliveries
         role: Role
+        alias: Alias
+        aliasUsers: Users
         subRoles: Subroles
         inheritedRoles: Inherited Roles
     created: Created

src/i18n/locale/es.yml

@@ -103,6 +103,8 @@ globals:
         deliveryList: Días de entrega
         upcomingList: Próximos repartos
         role: Role
+        alias: Alias
+        aliasUsers: Usuarios
         subRoles: Subroles
         inheritedRoles: Roles heredados
     created: Fecha creación

src/pages/Account/AccountAcls.vue

@@ -0,0 +1,151 @@
+<script setup>
+import { useI18n } from 'vue-i18n';
+import { ref } from 'vue';
+import FetchData from 'components/FetchData.vue';
+
+import VnPaginate from 'components/ui/VnPaginate.vue';
+import VnSearchbar from 'components/ui/VnSearchbar.vue';
+import CardList from 'src/components/ui/CardList.vue';
+import VnLv from 'src/components/ui/VnLv.vue';
+import AclFilter from './Acls/AclFilter.vue';
+
+import { useVnConfirm } from 'composables/useVnConfirm';
+import { useStateStore } from 'stores/useStateStore';
+import axios from 'axios';
+import useNotify from 'src/composables/useNotify.js';
+import AclFormView from './Acls/AclFormView.vue';
+
+defineProps({
+    id: {
+        type: Number,
+        default: 0,
+    },
+});
+
+const { notify } = useNotify();
+const { t } = useI18n();
+const stateStore = useStateStore();
+const { openConfirmationModal } = useVnConfirm();
+
+const paginateRef = ref();
+const formDialog = ref(false);
+const rolesOptions = ref([]);
+
+const exprBuilder = (param, value) => {
+    switch (param) {
+        case 'search':
+            return { model: { like: `%${value}%` } };
+        default:
+            return { [param]: value };
+    }
+};
+
+const deleteAcl = async (id) => {
+    try {
+        await axios.delete(`ACLs/${id}`);
+        paginateRef.value.fetch();
+        notify('ACL removed', 'positive');
+    } catch (error) {
+        console.error('Error deleting Acl: ', error);
+    }
+};
+function showFormDialog(data) {
+    formDialog.value = {
+        show: true,
+        formInitialData: { ...data },
+    };
+}
+</script>
+
+<template>
+    <FetchData
+        url="VnRoles"
+        :filter="{ fields: ['name'], order: 'name ASC' }"
+        @on-fetch="(data) => (rolesOptions = data)"
+        auto-load
+    />
+    <template v-if="stateStore.isHeaderMounted()">
+        <Teleport to="#searchbar">
+            <VnSearchbar
+                data-key="AccountAcls"
+                url="ACLs"
+                :expr-builder="exprBuilder"
+                :label="t('acls.search')"
+                :info="t('acls.searchInfo')"
+            />
+        </Teleport>
+    </template>
+    <QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above>
+        <QScrollArea class="fit text-grey-8">
+            <AclFilter data-key="AccountAcls" />
+        </QScrollArea>
+    </QDrawer>
+
+    <QPage class="flex justify-center q-pa-md">
+        <div class="vn-card-list">
+            <VnPaginate
+                ref="paginateRef"
+                data-key="AccountAcls"
+                url="ACLs"
+                :expr-builder="exprBuilder"
+            >
+                <template #body="{ rows }">
+                    <CardList
+                        v-for="row of rows"
+                        :id="row.id"
+                        :key="row.id"
+                        :title="`${row.model}.${row.property}`"
+                        @click="showFormDialog(row)"
+                    >
+                        <template #list-items>
+                            <VnLv :label="t('acls.role')" :value="row.principalId" />
+                            <VnLv :label="t('acls.accessType')" :value="row.accessType" />
+                            <VnLv
+                                :label="t('acls.permissions')"
+                                :value="row.permission"
+                            />
+                        </template>
+                        <template #actions>
+                            <QBtn
+                                :label="t('globals.delete')"
+                                @click.stop="
+                                    openConfirmationModal(
+                                        t('ACL will be removed'),
+                                        t('Are you sure you want to continue?'),
+                                        () => deleteAcl(row.id)
+                                    )
+                                "
+                                color="primary"
+                                style="margin-top: 15px"
+                            />
+                        </template>
+                    </CardList>
+                </template>
+            </VnPaginate>
+        </div>
+        <QDialog
+            v-model="formDialog.show"
+            transition-show="scale"
+            transition-hide="scale"
+        >
+            <AclFormView
+                :form-initial-data="formDialog.formInitialData"
+                @on-data-change="paginateRef.fetch()"
+                :roles-options="rolesOptions"
+            />
+        </QDialog>
+        <QPageSticky position="bottom-right" :offset="[18, 18]">
+            <QBtn fab icon="add" color="primary" @click="showFormDialog()">
+                <QTooltip class="text-no-wrap">{{ t('New ACL') }}</QTooltip>
+            </QBtn>
+        </QPageSticky>
+    </QPage>
+</template>
+
+<i18n>
+es:
+    New ACL: Nuevo ACL
+    ACL removed: ACL eliminado
+    ACL will be removed: El ACL será eliminado
+    Are you sure you want to continue?: ¿Seguro que quieres continuar?
+</i18n>

src/pages/Account/AccountAliasList.vue

@@ -0,0 +1,105 @@
+<script setup>
+import { useRouter } from 'vue-router';
+import { useI18n } from 'vue-i18n';
+import { ref } from 'vue';
+
+import VnPaginate from 'components/ui/VnPaginate.vue';
+import VnSearchbar from 'components/ui/VnSearchbar.vue';
+import CardList from 'src/components/ui/CardList.vue';
+import VnLv from 'src/components/ui/VnLv.vue';
+import AliasSummary from './Alias/Card/AliasSummary.vue';
+import AliasCreateForm from './Alias/AliasCreateForm.vue';
+
+import { useSummaryDialog } from 'src/composables/useSummaryDialog';
+import { useStateStore } from 'stores/useStateStore';
+
+defineProps({
+    id: {
+        type: Number,
+        default: 0,
+    },
+});
+
+const { t } = useI18n();
+const { viewSummary } = useSummaryDialog();
+const router = useRouter();
+const stateStore = useStateStore();
+const aliasCreateDialogRef = ref(null);
+
+const exprBuilder = (param, value) => {
+    switch (param) {
+        case 'search':
+            return /^\d+$/.test(value)
+                ? { id: value }
+                : { alias: { like: `%${value}%` } };
+    }
+};
+
+const navigate = (id) => router.push({ name: 'AliasSummary', params: { id } });
+
+const openCreateModal = () => aliasCreateDialogRef.value.show();
+</script>
+
+<template>
+    <template v-if="stateStore.isHeaderMounted()">
+        <Teleport to="#searchbar">
+            <VnSearchbar
+                data-key="AccountAliasList"
+                url="MailAliases"
+                :expr-builder="exprBuilder"
+                :label="t('mailAlias.search')"
+                :info="t('mailAlias.searchInfo')"
+            />
+        </Teleport>
+    </template>
+    <QPage class="flex justify-center q-pa-md">
+        <div class="vn-card-list">
+            <VnPaginate
+                ref="paginateRef"
+                data-key="AccountAliasList"
+                url="MailAliases"
+                :expr-builder="exprBuilder"
+            >
+                <template #body="{ rows }">
+                    <CardList
+                        v-for="row of rows"
+                        :id="row.id"
+                        :key="row.id"
+                        :title="row.alias"
+                        @click="navigate(row.id)"
+                    >
+                        <template #list-items>
+                            <VnLv :label="t('mailAlias.alias')" :value="row.alias">
+                            </VnLv>
+                            <VnLv
+                                :label="t('mailAlias.description')"
+                                :value="row.description"
+                            >
+                            </VnLv>
+                        </template>
+                        <template #actions>
+                            <QBtn
+                                :label="t('components.smartCard.openSummary')"
+                                @click.stop="viewSummary(row.id, AliasSummary)"
+                                color="primary"
+                                style="margin-top: 15px"
+                            />
+                        </template>
+                    </CardList>
+                </template>
+            </VnPaginate>
+        </div>
+        <QDialog
+            ref="aliasCreateDialogRef"
+            transition-show="scale"
+            transition-hide="scale"
+        >
+            <AliasCreateForm />
+        </QDialog>
+        <QPageSticky position="bottom-right" :offset="[18, 18]">
+            <QBtn fab icon="add" color="primary" @click="openCreateModal()">
+                <QTooltip class="text-no-wrap">{{ t('mailAlias.newAlias') }}</QTooltip>
+            </QBtn>
+        </QPageSticky>
+    </QPage>
+</template>

src/pages/Account/AccountList.vue

@@ -1 +1 @@
-<template>account list view</template>
+<template>Account list</template>

src/pages/Account/Acls/AclFilter.vue

@@ -0,0 +1,128 @@
+<script setup>
+import { ref, onBeforeMount } from 'vue';
+import { useI18n } from 'vue-i18n';
+
+import FetchData from 'components/FetchData.vue';
+import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
+import VnSelect from 'components/common/VnSelect.vue';
+import VnInput from 'src/components/common/VnInput.vue';
+
+import { useValidator } from 'src/composables/useValidator';
+
+const props = defineProps({
+    dataKey: {
+        type: String,
+        required: true,
+    },
+});
+
+const { t } = useI18n();
+const validationsStore = useValidator();
+const { models } = validationsStore;
+
+const validations = ref([]);
+const accessTypes = [{ name: '*' }, { name: 'READ' }, { name: 'WRITE' }];
+const permissions = [{ name: 'ALLOW' }, { name: 'DENY' }];
+const rolesOptions = ref([]);
+
+onBeforeMount(() => {
+    for (let model in models) validations.value.push({ name: model });
+});
+</script>
+
+<template>
+    <FetchData
+        url="VnRoles"
+        :filter="{ fields: ['name'], order: 'name ASC' }"
+        @on-fetch="(data) => (rolesOptions = data)"
+        auto-load
+    />
+    <VnFilterPanel
+        :data-key="props.dataKey"
+        :search-button="true"
+        :hidden-tags="['search']"
+    >
+        <template #tags="{ tag, formatFn }">
+            <div class="q-gutter-x-xs">
+                <strong>{{ t(`acls.aclFilter.${tag.label}`) }}: </strong>
+                <span>{{ formatFn(tag.value) }}</span>
+            </div>
+        </template>
+        <template #body="{ params, searchFn }">
+            <QItem class="q-mb-sm">
+                <QItemSection>
+                    <VnSelect
+                        :label="t('acls.aclFilter.principalId')"
+                        v-model="params.principalId"
+                        @update:model-value="searchFn()"
+                        :options="rolesOptions"
+                        option-value="name"
+                        option-label="name"
+                        use-input
+                        dense
+                        outlined
+                        rounded
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem class="q-mb-sm">
+                <QItemSection>
+                    <VnSelect
+                        :label="t('acls.aclFilter.model')"
+                        v-model="params.model"
+                        @update:model-value="searchFn()"
+                        :options="validations"
+                        option-value="name"
+                        option-label="name"
+                        use-input
+                        dense
+                        outlined
+                        rounded
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem class="q-mb-sm">
+                <QItemSection>
+                    <VnInput
+                        :label="t('acls.aclFilter.property')"
+                        v-model="params.property"
+                        lazy-rules
+                        is-outlined
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem class="q-mb-sm">
+                <QItemSection>
+                    <VnSelect
+                        :label="t('acls.aclFilter.accessType')"
+                        v-model="params.accessType"
+                        @update:model-value="searchFn()"
+                        :options="accessTypes"
+                        option-value="name"
+                        option-label="name"
+                        use-input
+                        dense
+                        outlined
+                        rounded
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem class="q-mb-sm">
+                <QItemSection>
+                    <VnSelect
+                        :label="t('acls.aclFilter.permission')"
+                        v-model="params.permission"
+                        @update:model-value="searchFn()"
+                        :options="permissions"
+                        option-value="name"
+                        option-label="name"
+                        use-input
+                        dense
+                        outlined
+                        rounded
+                    />
+                </QItemSection>
+            </QItem>
+        </template>
+    </VnFilterPanel>
+</template>

src/pages/Account/Acls/AclFormView.vue

@@ -0,0 +1,126 @@
+<script setup>
+import { useI18n } from 'vue-i18n';
+import { ref, onBeforeMount, onMounted } from 'vue';
+
+import VnSelect from 'src/components/common/VnSelect.vue';
+import VnInput from 'src/components/common/VnInput.vue';
+import FormModelPopup from 'components/FormModelPopup.vue';
+
+import { useValidator } from 'src/composables/useValidator';
+import { useArrayData } from 'src/composables/useArrayData';
+
+const emit = defineEmits(['onDataChange']);
+const { t } = useI18n();
+const validationsStore = useValidator();
+const { models } = validationsStore;
+const arrayData = useArrayData('aclCreate');
+const { store } = arrayData;
+
+const accessTypes = [{ name: '*' }, { name: 'READ' }, { name: 'WRITE' }];
+const permissions = [{ name: 'ALLOW' }, { name: 'DENY' }];
+const validations = ref([]);
+
+const url = ref();
+const urlCreate = ref('ACLs');
+const urlUpdate = ref();
+const action = ref('New');
+
+const $props = defineProps({
+    formInitialData: {
+        type: Object,
+        default: () => {
+            return {
+                property: '*',
+                principalType: 'ROLE',
+                accessType: 'READ',
+                permission: 'ALLOW',
+            };
+        },
+    },
+    rolesOptions: {
+        type: Array,
+        required: true,
+    },
+});
+
+onBeforeMount(() => {
+    for (let model in models) validations.value.push({ name: model });
+});
+
+onMounted(() => {
+    store.data = $props.formInitialData;
+    if ($props.formInitialData.id) {
+        urlCreate.value = null;
+        urlUpdate.value = 'ACLs';
+        action.value = 'Edit';
+    }
+});
+</script>
+
+<template>
+    <FormModelPopup
+        v-if="urlCreate || urlUpdate"
+        :title="t(`${action} ACL`)"
+        :url="url"
+        :url-update="urlUpdate"
+        :url-create="urlCreate"
+        :form-initial-data="formInitialData"
+        auto-load
+        model="aclCreate"
+        @on-data-saved="emit('onDataChange')"
+        @on-data-canceled="emit('onDataChange')"
+    >
+        <template #form-inputs="{ data }">
+            <div class="column q-gutter-y-md">
+                <VnSelect
+                    :label="t('acls.aclFilter.principalId')"
+                    v-model="data.principalId"
+                    :options="$props.rolesOptions"
+                    option-value="name"
+                    option-label="name"
+                    use-input
+                    rounded
+                />
+                <VnSelect
+                    :label="t('acls.aclFilter.model')"
+                    v-model="data.model"
+                    :options="validations"
+                    option-value="name"
+                    option-label="name"
+                    use-input
+                    rounded
+                />
+
+                <VnInput
+                    :label="t('acls.aclFilter.property')"
+                    v-model="data.property"
+                    lazy-rules
+                >
+                    <template #append>
+                        <QIcon name="info" class="cursor-pointer">
+                            <QTooltip>{{ t('acls.tooltip') }}</QTooltip>
+                        </QIcon>
+                    </template></VnInput
+                >
+                <VnSelect
+                    :label="t('acls.aclFilter.accessType')"
+                    v-model="data.accessType"
+                    :options="accessTypes"
+                    option-value="name"
+                    option-label="name"
+                    use-input
+                    rounded
+                />
+                <VnSelect
+                    :label="t('acls.aclFilter.permission')"
+                    v-model="data.permission"
+                    :options="permissions"
+                    option-value="name"
+                    option-label="name"
+                    use-input
+                    rounded
+                />
+            </div>
+        </template>
+    </FormModelPopup>
+</template>

src/pages/Account/Alias/AliasCreateForm.vue

@@ -0,0 +1,57 @@
+<script setup>
+import { useRouter } from 'vue-router';
+import { useI18n } from 'vue-i18n';
+
+import FormModelPopup from 'components/FormModelPopup.vue';
+import VnRow from 'components/ui/VnRow.vue';
+import VnInput from 'src/components/common/VnInput.vue';
+
+import { useArrayData } from 'src/composables/useArrayData';
+
+const router = useRouter();
+const { t } = useI18n();
+const arrayData = useArrayData('AliasCreate');
+const { store } = arrayData;
+
+const defaultInitialData = {
+    alias: null,
+    description: null,
+};
+
+const onDataSaved = ({ id }) => {
+    router.push({ name: 'AliasBasicData', params: { id } });
+    store.data = null;
+};
+</script>
+
+<template>
+    <FormModelPopup
+        :title="t('Create alias')"
+        ref="formModelPopupRef"
+        url-create="MailAliases"
+        model="AliasCreate"
+        :form-initial-data="defaultInitialData"
+        @on-data-saved="onDataSaved"
+    >
+        <template #form-inputs="{ data }">
+            <VnRow class="row q-gutter-md q-mb-md">
+                <div class="col">
+                    <VnInput v-model="data.alias" :label="t('mailAlias.name')" />
+                </div>
+            </VnRow>
+            <VnRow class="row q-gutter-md q-mb-md">
+                <div class="col">
+                    <VnInput
+                        v-model="data.description"
+                        :label="t('mailAlias.description')"
+                    />
+                </div>
+            </VnRow>
+        </template>
+    </FormModelPopup>
+</template>
+
+<i18n>
+    es:
+        Create alias: Crear alias
+</i18n>

src/pages/Account/Alias/Card/AliasBasicData.vue

@@ -0,0 +1,22 @@
+<script setup>
+import { useRoute } from 'vue-router';
+import { useI18n } from 'vue-i18n';
+
+import FormModel from 'components/FormModel.vue';
+import VnInput from 'src/components/common/VnInput.vue';
+
+const route = useRoute();
+const { t } = useI18n();
+</script>
+
+<template>
+    <FormModel model="Alias">
+        <template #form="{ data }">
+            <div class="column q-gutter-y-md">
+                <VnInput v-model="data.alias" :label="t('mailAlias.name')" />
+                <VnInput v-model="data.description" :label="t('mailAlias.description')" />
+                <QCheckbox :label="t('mailAlias.isPublic')" v-model="data.isPublic" />
+            </div>
+        </template>
+    </FormModel>
+</template>

src/pages/Account/Alias/Card/AliasCard.vue

@@ -0,0 +1,33 @@
+<script setup>
+import { useI18n } from 'vue-i18n';
+import { useRoute } from 'vue-router';
+import { computed } from 'vue';
+
+import VnCard from 'components/common/VnCard.vue';
+import AliasDescriptor from './AliasDescriptor.vue';
+
+const { t } = useI18n();
+const route = useRoute();
+
+const routeName = computed(() => route.name);
+const customRouteRedirectName = computed(() => {
+    return routeName.value;
+});
+const searchBarDataKeys = {
+    AliasBasicData: 'AliasBasicData',
+    AliasUsers: 'AliasUsers',
+};
+</script>
+
+<template>
+    <VnCard
+        data-key="Alias"
+        base-url="MailAliases"
+        :descriptor="AliasDescriptor"
+        :search-data-key="searchBarDataKeys[routeName]"
+        :search-custom-route-redirect="customRouteRedirectName"
+        :search-redirect="!!customRouteRedirectName"
+        :searchbar-label="t('mailAlias.search')"
+        :searchbar-info="t('mailAlias.searchInfo')"
+    />
+</template>

src/pages/Account/Alias/Card/AliasDescriptor.vue

@@ -0,0 +1,88 @@
+<script setup>
+import { ref, computed } from 'vue';
+import { useRoute, useRouter } from 'vue-router';
+import { useI18n } from 'vue-i18n';
+import { useQuasar } from 'quasar';
+
+import CardDescriptor from 'components/ui/CardDescriptor.vue';
+import VnLv from 'src/components/ui/VnLv.vue';
+
+import useCardDescription from 'src/composables/useCardDescription';
+import axios from 'axios';
+import useNotify from 'src/composables/useNotify.js';
+
+const $props = defineProps({
+    id: {
+        type: Number,
+        required: false,
+        default: null,
+    },
+});
+
+const { t } = useI18n();
+const route = useRoute();
+const quasar = useQuasar();
+const router = useRouter();
+const { notify } = useNotify();
+
+const entityId = computed(() => {
+    return $props.id || route.params.id;
+});
+
+const data = ref(useCardDescription());
+const setData = (entity) => (data.value = useCardDescription(entity.alias, entity.id));
+
+const removeAlias = () => {
+    quasar
+        .dialog({
+            title: t('Alias will be removed'),
+            message: t('Are you sure you want to continue?'),
+            ok: {
+                push: true,
+                color: 'primary',
+            },
+            cancel: true,
+        })
+        .onOk(async () => {
+            try {
+                await axios.delete(`MailAliases/${entityId.value}`);
+                notify(t('Alias removed'), 'positive');
+                router.push({ name: 'AccountAlias' });
+            } catch (err) {
+                console.error('Error removing alias');
+            }
+        });
+};
+</script>
+
+<template>
+    <CardDescriptor
+        ref="descriptor"
+        :url="`MailAliases/${entityId}`"
+        module="Alias"
+        @on-fetch="setData"
+        data-key="aliasData"
+        :title="data.title"
+        :subtitle="data.subtitle"
+    >
+        <template #menu>
+            <QItem v-ripple clickable @click="removeAlias()">
+                <QItemSection>{{ t('Delete') }}</QItemSection>
+            </QItem>
+        </template>
+        <template #body="{ entity }">
+            <VnLv :label="t('mailAlias.description')" :value="entity.description" />
+        </template>
+    </CardDescriptor>
+</template>
+
+<i18n>
+    en:
+        accountRate: Claming rate
+    es:
+        accountRate: Ratio de reclamación
+        Delete: Eliminar
+        Alias will be removed: El alias será eliminado
+        Are you sure you want to continue?: ¿Seguro que quieres continuar?
+        Alias removed: Alias eliminado
+</i18n>

src/pages/Account/Alias/Card/AliasSummary.vue

@@ -0,0 +1,49 @@
+<script setup>
+import { ref, 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 { useArrayData } from 'src/composables/useArrayData';
+
+const route = useRoute();
+const { t } = useI18n();
+
+const $props = defineProps({
+    id: {
+        type: Number,
+        default: 0,
+    },
+});
+
+const { store } = useArrayData('Alias');
+const alias = ref(store.data);
+const entityId = computed(() => $props.id || route.params.id);
+</script>
+
+<template>
+    <CardSummary
+        ref="summary"
+        :url="`MailAliases/${entityId}`"
+        @on-fetch="(data) => (alias = data)"
+    >
+        <template #header> {{ alias.id }} - {{ alias.alias }} </template>
+        <template #body>
+            <QCard class="vn-one">
+                <QCardSection class="q-pa-none">
+                    <router-link
+                        :to="{ name: 'AliasBasicData', params: { id: entityId } }"
+                        class="header header-link"
+                    >
+                        {{ t('globals.summary.basicData') }}
+                        <QIcon name="open_in_new" />
+                    </router-link>
+                </QCardSection>
+                <VnLv :label="t('mailAlias.id')" :value="alias.id" />
+                <VnLv :label="t('mailAlias.description')" :value="alias.description" />
+            </QCard>
+        </template>
+    </CardSummary>
+</template>

src/pages/Account/Alias/Card/AliasUsers.vue

@@ -0,0 +1,122 @@
+<script setup>
+import { useRoute } from 'vue-router';
+import { computed, ref, watch } from 'vue';
+import { useI18n } from 'vue-i18n';
+
+import VnPaginate from 'components/ui/VnPaginate.vue';
+
+import { useVnConfirm } from 'composables/useVnConfirm';
+import { useArrayData } from 'composables/useArrayData';
+import useNotify from 'src/composables/useNotify.js';
+import axios from 'axios';
+
+const { t } = useI18n();
+const { notify } = useNotify();
+const route = useRoute();
+const { openConfirmationModal } = useVnConfirm();
+
+const paginateRef = ref(null);
+
+const arrayData = useArrayData('AliasUsers');
+const { store } = arrayData;
+
+const data = computed(() => {
+    const dataCopy = JSON.parse(JSON.stringify(store.data));
+    return dataCopy.sort((a, b) => a.user?.name.localeCompare(b.user?.name));
+});
+
+const filter = {
+    include: {
+        relation: 'user',
+        scope: {
+            fields: ['id', 'name'],
+        },
+    },
+};
+
+const urlPath = computed(() => `MailAliases/${route.params.id}/accounts`);
+
+const columns = computed(() => [
+    {
+        name: 'alias',
+    },
+    {
+        name: 'action',
+    },
+]);
+
+const deleteAlias = async (row) => {
+    try {
+        await axios.delete(`${urlPath.value}/${row.id}`);
+        notify(t('User removed'), 'positive');
+        fetchAliases();
+    } catch (error) {
+        console.error(error);
+    }
+};
+
+watch(
+    () => route.params.id,
+    () => {
+        store.url = urlPath.value;
+        store.filter = filter;
+        fetchAliases();
+    }
+);
+
+const fetchAliases = () => paginateRef.value.fetch();
+</script>
+
+<template>
+    <QPage class="column items-center q-pa-md">
+        <div class="full-width" style="max-width: 400px">
+            <VnPaginate
+                ref="paginateRef"
+                data-key="AliasUsers"
+                :filter="filter"
+                :url="urlPath"
+                :limit="0"
+                auto-load
+            >
+                <template #body>
+                    <QTable :rows="data" :columns="columns" hide-header>
+                        <template #body="{ row }">
+                            <QTr>
+                                <QTd>
+                                    <span>{{ row.user?.name }}</span>
+                                </QTd>
+                                <QTd style="width: 50px !important">
+                                    <QIcon
+                                        name="delete"
+                                        size="sm"
+                                        class="cursor-pointer"
+                                        color="primary"
+                                        @click="
+                                            openConfirmationModal(
+                                                t('User will be removed from alias'),
+                                                t('Are you sure you want to continue?'),
+                                                () => deleteAlias(row)
+                                            )
+                                        "
+                                    >
+                                        <QTooltip>
+                                            {{ t('Delete') }}
+                                        </QTooltip>
+                                    </QIcon>
+                                </QTd>
+                            </QTr>
+                        </template>
+                    </QTable>
+                </template>
+            </VnPaginate>
+        </div>
+    </QPage>
+</template>
+
+<i18n>
+es:
+    User will be removed from alias: El usuario será borrado del alias
+    Are you sure you want to continue?: ¿Seguro que quieres continuar?
+    User removed: Usuario borrado
+    Delete: Eliminar
+</i18n>

src/pages/Account/Card/AccountInheritedRoles.vue

@@ -1,256 +0,0 @@
-<script setup>
-import { ref, computed } from 'vue';
-import { useI18n } from 'vue-i18n';
-import { useRoute } from 'vue-router';
-import CrudModel from 'components/CrudModel.vue';
-import FetchData from 'components/FetchData.vue';
-import VnSelect from 'components/common/VnSelect.vue';
-import { tMobile } from 'composables/tMobile';
-
-const route = useRoute();
-
-const { t } = useI18n();
-
-const accountDevelopmentForm = ref();
-const accountReasons = ref([]);
-const accountResults = ref([]);
-const accountResponsibles = ref([]);
-const accountRedeliveries = ref([]);
-const workers = ref([]);
-const selected = ref([]);
-const saveButtonRef = ref();
-
-const developmentsFilter = {
-    fields: [
-        'id',
-        'accountFk',
-        'accountReasonFk',
-        'accountResultFk',
-        'accountResponsibleFk',
-        'workerFk',
-        'accountRedeliveryFk',
-    ],
-    where: {
-        accountFk: route.params.id,
-    },
-};
-
-const columns = computed(() => [
-    {
-        name: 'accountReason',
-        label: t('Reason'),
-        field: (row) => row.accountReasonFk,
-        sortable: true,
-        options: accountReasons.value,
-        required: true,
-        model: 'accountReasonFk',
-        optionValue: 'id',
-        optionLabel: 'description',
-        tabIndex: 1,
-        align: 'left',
-    },
-    {
-        name: 'accountResult',
-        label: t('Result'),
-        field: (row) => row.accountResultFk,
-        sortable: true,
-        options: accountResults.value,
-        required: true,
-        model: 'accountResultFk',
-        optionValue: 'id',
-        optionLabel: 'description',
-        tabIndex: 2,
-        align: 'left',
-    },
-    {
-        name: 'accountResponsible',
-        label: t('Responsible'),
-        field: (row) => row.accountResponsibleFk,
-        sortable: true,
-        options: accountResponsibles.value,
-        required: true,
-        model: 'accountResponsibleFk',
-        optionValue: 'id',
-        optionLabel: 'description',
-        tabIndex: 3,
-        align: 'left',
-    },
-    {
-        name: 'worker',
-        label: t('Worker'),
-        field: (row) => row.workerFk,
-        sortable: true,
-        options: workers.value,
-        model: 'workerFk',
-        optionValue: 'id',
-        optionLabel: 'nickname',
-        tabIndex: 4,
-        align: 'left',
-    },
-    {
-        name: 'accountRedelivery',
-        label: t('Redelivery'),
-        field: (row) => row.accountRedeliveryFk,
-        sortable: true,
-        options: accountRedeliveries.value,
-        required: true,
-        model: 'accountRedeliveryFk',
-        optionValue: 'id',
-        optionLabel: 'description',
-        tabIndex: 5,
-        align: 'left',
-    },
-]);
-</script>
-<template>
-    <FetchData
-        url="AccountReasons"
-        order="description"
-        @on-fetch="(data) => (accountReasons = data)"
-        auto-load
-    />
-    <FetchData
-        url="AccountResults"
-        order="description"
-        @on-fetch="(data) => (accountResults = data)"
-        auto-load
-    />
-    <FetchData
-        url="AccountResponsibles"
-        order="description"
-        @on-fetch="(data) => (accountResponsibles = data)"
-        auto-load
-    />
-    <FetchData
-        url="AccountRedeliveries"
-        order="description"
-        @on-fetch="(data) => (accountRedeliveries = data)"
-        auto-load
-    />
-    <FetchData
-        url="Workers/search"
-        :where="{ active: 1 }"
-        order="name ASC"
-        @on-fetch="(data) => (workers = data)"
-        auto-load
-    />
-    <CrudModel
-        data-key="AccountDevelopments"
-        url="AccountDevelopments"
-        model="accountDevelopment"
-        :filter="developmentsFilter"
-        ref="accountDevelopmentForm"
-        :data-required="{ accountFk: route.params.id }"
-        v-model:selected="selected"
-        auto-load
-        @save-changes="$router.push(`/account/${route.params.id}/action`)"
-        :default-save="false"
-    >
-        <template #body="{ rows }">
-            <QTable
-                :columns="columns"
-                :rows="rows"
-                row-key="$index"
-                selection="multiple"
-                v-model:selected="selected"
-                :grid="$q.screen.lt.md"
-                table-header-class="text-left"
-            >
-                <template #body-cell="{ row, col }">
-                    <QTd
-                        auto-width
-                        @keyup.ctrl.enter.stop="accountDevelopmentForm.saveChanges()"
-                    >
-                        <VnSelect
-                            v-model="row[col.model]"
-                            :options="col.options"
-                            :option-value="col.optionValue"
-                            :option-label="col.optionLabel"
-                            :autofocus="col.tabIndex == 1"
-                            input-debounce="0"
-                            hide-selected
-                        >
-                            <template #option="scope" v-if="col.name == 'worker'">
-                                <QItem v-bind="scope.itemProps">
-                                    <QItemSection>
-                                        <QItemLabel>{{ scope.opt?.name }}</QItemLabel>
-                                        <QItemLabel caption>
-                                            {{ scope.opt?.nickname }}
-                                            {{ scope.opt?.code }}
-                                        </QItemLabel>
-                                    </QItemSection>
-                                </QItem>
-                            </template>
-                        </VnSelect>
-                    </QTd>
-                </template>
-                <template #item="props">
-                    <div class="q-pa-xs col-xs-12 col-sm-6 grid-style-transition">
-                        <QCard
-                            bordered
-                            flat
-                            @keyup.ctrl.enter.stop="accountDevelopmentForm?.saveChanges()"
-                        >
-                            <QCardSection>
-                                <QCheckbox v-model="props.selected" dense />
-                            </QCardSection>
-                            <QSeparator />
-                            <QList dense>
-                                <QItem v-for="col in props.cols" :key="col.name">
-                                    <QItemSection>
-                                        <VnSelect
-                                            :label="col.label"
-                                            v-model="props.row[col.model]"
-                                            :options="col.options"
-                                            :option-value="col.optionValue"
-                                            :option-label="col.optionLabel"
-                                            dense
-                                            input-debounce="0"
-                                            :autofocus="col.tabIndex == 1"
-                                            hide-selected
-                                        />
-                                    </QItemSection>
-                                </QItem>
-                            </QList>
-                        </QCard>
-                    </div>
-                </template>
-            </QTable>
-        </template>
-        <template #moreAfterActions>
-            <QBtn
-                :label="tMobile('globals.save')"
-                ref="saveButtonRef"
-                color="primary"
-                icon="save"
-                :disable="!accountDevelopmentForm?.hasChanges"
-                @click="accountDevelopmentForm?.onSubmit"
-                :title="t('globals.save')"
-            />
-        </template>
-    </CrudModel>
-    <QPageSticky position="bottom-right" :offset="[25, 25]">
-        <QBtn
-            fab
-            color="primary"
-            icon="add"
-            @keydown.tab.prevent="saveButtonRef.$el.focus()"
-            @click="accountDevelopmentForm.insert()"
-        />
-    </QPageSticky>
-</template>
-
-<style lang="scss" scoped>
-.grid-style-transition {
-    transition: transform 0.28s, background-color 0.28s;
-}
-</style>
-
-<i18n>
-es:
-    Reason: Motivo
-    Result: Consecuencia
-    Responsible: Responsable
-    Worker: Trabajador
-    Redelivery: Devolución
-</i18n>

src/pages/Account/Role/Card/RoleBasicData.vue

@@ -4,7 +4,6 @@ import { useI18n } from 'vue-i18n';
 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';
 const route = useRoute();
 const { t } = useI18n();
 </script>
@@ -24,6 +23,11 @@ const { t } = useI18n();
                     />
                 </div>
             </VnRow>
+            <VnRow class="row q-gutter-md q-mb-md">
+                <div class="col">
+                    <QCheckbox :label="t('mailAlias.isPublic')" v-model="data.isPublic" />
+                </div>
+            </VnRow>
         </template>
     </FormModel>
 </template>

src/pages/Account/Role/Card/RoleDescriptor.vue

@@ -2,7 +2,6 @@
 import { ref, computed } from 'vue';
 import { useRoute, useRouter } from 'vue-router';
 import { useI18n } from 'vue-i18n';
-import { useState } from 'src/composables/useState';
 import CardDescriptor from 'components/ui/CardDescriptor.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
 import useCardDescription from 'src/composables/useCardDescription';
@@ -64,7 +63,7 @@ const removeRole = () => {
         ref="descriptor"
         :url="`VnRoles`"
         :filter="filter"
-        module="Account"
+        module="Role"
         @on-fetch="setData"
         data-key="accountData"
         :title="data.title"

src/pages/Account/locale/en.yml

@@ -15,6 +15,7 @@ account:
         privileges: Privileges
         mailAlias: Mail Alias
         mailForwarding: Mail Forwarding
+        aliasUsers: Users
     card:
         name: Name
         nickname: User
@@ -45,6 +46,18 @@ role:
     searchInfo: Search role by id or name
     name: Name
     description: Description
+    id: Id
+mailAlias:
+    pageTitles:
+        aliasUsers: Users
+    search: Search mail alias
+    searchInfo: Search alias by id or name
+    alias: Alias
+    description: Description
+    id: Id
+    newAlias: New alias
+    name: Name
+    isPublic: Public
 ldap:
     enableSync: Enable synchronization
     server: Server
@@ -65,3 +78,16 @@ samba:
     verifyCertificate: Verify certificate
     testConnection: Test connection
     success: Samba connection established!
+acls:
+    role: Role
+    accessType: Access type
+    permissions: Permission
+    search: Search acls
+    searchInfo: Search acls by model name
+    tooltip: Use * to match all properties
+    aclFilter:
+        principalId: Role
+        model: Model
+        property: Property
+        accessType: Access type
+        permission: Permission

src/pages/Account/locale/es.yml

@@ -15,6 +15,7 @@ account:
         privileges: Privilegios
         mailAlias: Alias de correo
         mailForwarding: Reenvío de correo
+        aliasUsers: Usuarios
     card:
         nickname: Usuario
         name: Nombre
@@ -56,6 +57,18 @@ role:
     searchInfo: Buscar rol por id o nombre
     name: Nombre
     description: Descripción
+    id: Id
+mailAlias:
+    pageTitles:
+        aliasUsers: Usuarios
+    search: Buscar alias de correo
+    searchInfo: Buscar alias por id o nombre
+    alias: Alias
+    description: Descripción
+    id: Id
+    newAlias: Nuevo alias
+    name: Nombre
+    isPublic: Público
 ldap:
     enableSync: Habilitar sincronización
     server: Servidor
@@ -76,3 +89,16 @@ samba:
     Verify certificate: Verificar certificado
     testConnection: Probar conexión
     success: ¡Conexión con Samba establecida!
+acls:
+    role: Rol
+    accessType: Tipo de acceso
+    permissions: Permiso
+    search: Buscar acls
+    searchInfo: Buscar acls por nombre
+    tooltip: Usa * para marcar todas las propiedades
+    aclFilter:
+        principalId: Rol
+        model: Modelo
+        property: Propiedad
+        accessType: Tipo de acceso
+        permission: Permiso

src/pages/Agency/AgencyList.vue

@@ -2,13 +2,11 @@
 import VnPaginate from 'src/components/ui/VnPaginate.vue';
 import CardList from 'src/components/ui/CardList.vue';
 import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
-import { useStateStore } from 'stores/useStateStore';
 import { useRouter } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 
 const { t } = useI18n();
 const router = useRouter();
-const stateStore = useStateStore();
 function navigate(id) {
     router.push({ path: `/agency/${id}` });
 }
@@ -22,16 +20,12 @@ function exprBuilder(param, value) {
 }
 </script>
 <template>
-    <template v-if="stateStore.isHeaderMounted()">
+    <VnSearchbar
-        <Teleport to="#searchbar">
+        :info="t('You can search by name')"
-            <VnSearchbar
+        :label="t('Search agency')"
-                :info="t('You can search by name')"
+        data-key="AgencyList"
-                :label="t('Search agency')"
+        url="Agencies"
-                data-key="AgencyList"
+    />
-                url="Agencies"
-            />
-        </Teleport>
-    </template>
     <QPage class="column items-center q-pa-md">
         <div class="vn-card-list">
             <VnPaginate

src/pages/Claim/Card/ClaimBasicData.vue

@@ -158,8 +158,7 @@ const statesFilter = {
                     map-options
                     use-input
                     :input-debounce="0"
-                >
+                />
-                </QSelect>
             </VnRow>
         </template>
     </FormModel>

src/pages/Claim/ClaimList.vue

@@ -1,7 +1,6 @@
 <script setup>
 import { useI18n } from 'vue-i18n';
 import { useRouter } from 'vue-router';
-import { useStateStore } from 'stores/useStateStore';
 import { toDate } from 'filters/index';
 import VnPaginate from 'src/components/ui/VnPaginate.vue';
 import VnSearchbar from 'components/ui/VnSearchbar.vue';
@@ -12,8 +11,8 @@ import CustomerDescriptorProxy from 'src/pages/Customer/Card/CustomerDescriptorP
 import VnUserLink from 'src/components/ui/VnUserLink.vue';
 import ClaimSummary from './Card/ClaimSummary.vue';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
+import RightMenu from 'src/components/common/RightMenu.vue';
 
-const stateStore = useStateStore();
 const router = useRouter();
 const { t } = useI18n();
 const { viewSummary } = useSummaryDialog();
@@ -37,35 +36,16 @@ function navigate(event, id) {
 </script>
 
 <template>
-    <template v-if="stateStore.isHeaderMounted()">
+    <VnSearchbar
-        <Teleport to="#searchbar">
+        data-key="ClaimList"
-            <VnSearchbar
+        :label="t('Search claim')"
-                data-key="ClaimList"
+        :info="t('You can search by claim id or customer name')"
-                :label="t('Search claim')"
+    />
-                :info="t('You can search by claim id or customer name')"
+    <RightMenu>
-            />
+        <template #right-panel>
-        </Teleport>
-        <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">
             <ClaimFilter data-key="ClaimList" />
-        </QScrollArea>
+        </template>
-    </QDrawer>
+    </RightMenu>
     <QPage class="column items-center q-pa-md">
         <div class="vn-card-list">
             <VnPaginate

src/pages/Customer/CustomerList.vue

@@ -1,7 +1,6 @@
 <script setup>
 import { useI18n } from 'vue-i18n';
 import { useRouter } from 'vue-router';
-import { useStateStore } from 'stores/useStateStore';
 import VnPaginate from 'src/components/ui/VnPaginate.vue';
 import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
 import CustomerFilter from './CustomerFilter.vue';
@@ -10,8 +9,8 @@ import CardList from 'src/components/ui/CardList.vue';
 import VnLinkPhone from 'src/components/ui/VnLinkPhone.vue';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
 import CustomerSummary from './Card/CustomerSummary.vue';
+import RightMenu from 'src/components/common/RightMenu.vue';
 
-const stateStore = useStateStore();
 const router = useRouter();
 const { t } = useI18n();
 const { viewSummary } = useSummaryDialog();
@@ -26,35 +25,16 @@ const redirectToCreateView = () => {
 </script>
 
 <template>
-    <template v-if="stateStore.isHeaderMounted()">
+    <VnSearchbar
-        <Teleport to="#searchbar">
+        :info="t('You can search by customer id or name')"
-            <VnSearchbar
+        :label="t('Search customer')"
-                :info="t('You can search by customer id or name')"
+        data-key="CustomerList"
-                :label="t('Search customer')"
+    />
-                data-key="CustomerList"
+    <RightMenu>
-            />
+        <template #right-panel>
-        </Teleport>
-        <Teleport to="#actions-append">
-            <div class="row q-gutter-x-sm">
-                <QBtn
-                    @click="stateStore.toggleRightDrawer()"
-                    dense
-                    flat
-                    icon="menu"
-                    round
-                >
-                    <QTooltip bottom anchor="bottom right">
-                        {{ t('globals.collapseMenu') }}
-                    </QTooltip>
-                </QBtn>
-            </div>
-        </Teleport>
-    </template>
-    <QDrawer :width="256" show-if-above side="right" v-model="stateStore.rightDrawer">
-        <QScrollArea class="fit text-grey-8">
             <CustomerFilter data-key="CustomerList" />
-        </QScrollArea>
+        </template>
-    </QDrawer>
+    </RightMenu>
     <QPage class="column items-center q-pa-md">
         <div class="vn-card-list">
             <VnPaginate

src/pages/Customer/Defaulter/CustomerDefaulter.vue

@@ -1,10 +1,7 @@
 <script setup>
 import { ref, computed } from 'vue';
 import { useI18n } from 'vue-i18n';
-
 import { QBtn, QCheckbox, useQuasar } from 'quasar';
-import { useStateStore } from 'stores/useStateStore';
-
 import { toCurrency, toDate, dateRange } from 'filters/index';
 import VnPaginate from 'src/components/ui/VnPaginate.vue';
 import CustomerNotificationsFilter from './CustomerDefaulterFilter.vue';
@@ -15,7 +12,7 @@ import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import CustomerDefaulterAddObservation from './CustomerDefaulterAddObservation.vue';
 import axios from 'axios';
-const stateStore = useStateStore();
+import RightMenu from 'src/components/common/RightMenu.vue';
 
 const { t } = useI18n();
 const quasar = useQuasar();
@@ -266,30 +263,11 @@ function exprBuilder(param, value) {
 </script>
 
 <template>
-    <template v-if="stateStore.isHeaderMounted()">
+    <RightMenu>
-        <Teleport to="#actions-append">
+        <template #right-panel>
-            <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">
             <CustomerNotificationsFilter data-key="CustomerDefaulter" />
-        </QScrollArea>
+        </template>
-    </QDrawer>
+    </RightMenu>
-
     <VnSubToolbar>
         <template #st-data>
             <CustomerBalanceDueTotal :amount="balanceDueTotal" />

src/pages/Customer/ExtendedList/CustomerExtendedList.vue

@@ -14,6 +14,7 @@ import VnPaginate from 'src/components/ui/VnPaginate.vue';
 import { useArrayData } from 'composables/useArrayData';
 import { useStateStore } from 'stores/useStateStore';
 import { toDate } from 'src/filters';
+import RightMenu from 'src/components/common/RightMenu.vue';
 
 const { t } = useI18n();
 const router = useRouter();
@@ -494,32 +495,15 @@ const selectSalesPersonId = (id) => (selectedSalesPersonId.value = id);
 </script>
 
 <template>
-    <template v-if="stateStore.isHeaderMounted()">
+    <RightMenu>
-        <Teleport to="#actions-append">
+        <template #right-panel>
-            <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">
             <CustomerExtendedListFilter
                 v-if="visibleColumns.length !== 0"
                 data-key="CustomerExtendedList"
                 :visible-columns="visibleColumns"
             />
-        </QScrollArea>
+        </template>
-    </QDrawer>
+    </RightMenu>
     <VnSubToolbar>
         <template #st-data>
             <TableVisibleColumns
@@ -532,7 +516,6 @@ const selectSalesPersonId = (id) => (selectedSalesPersonId.value = id);
             />
         </template>
     </VnSubToolbar>
-
     <QPage class="column items-center q-pa-md">
         <VnPaginate
             data-key="CustomerExtendedList"

src/pages/Customer/Notifications/CustomerNotifications.vue

@@ -5,11 +5,10 @@ import { QBtn } from 'quasar';
 import CustomerNotificationsFilter from './CustomerNotificationsFilter.vue';
 import CustomerDescriptorProxy from '../Card/CustomerDescriptorProxy.vue';
 import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
-import { useStateStore } from 'stores/useStateStore';
 import VnPaginate from 'src/components/ui/VnPaginate.vue';
 import CustomerNotificationsCampaignConsumption from './CustomerNotificationsCampaignConsumption.vue';
+import RightMenu from 'src/components/common/RightMenu.vue';
 
-const stateStore = useStateStore();
 const { t } = useI18n();
 const selected = ref([]);
 const selectedCustomerId = ref(0);
@@ -81,29 +80,11 @@ const selectCustomerId = (id) => {
 </script>
 
 <template>
-    <template v-if="stateStore.isHeaderMounted()">
+    <RightMenu>
-        <Teleport to="#actions-append">
+        <template #right-panel>
-            <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">
             <CustomerNotificationsFilter data-key="CustomerNotifications" />
-        </QScrollArea>
+        </template>
-    </QDrawer>
+    </RightMenu>
     <VnSubToolbar class="justify-end">
         <template #st-data>
             <CustomerNotificationsCampaignConsumption

src/pages/Customer/Payments/CustomerPayments.vue

@@ -3,15 +3,14 @@ import axios from 'axios';
 import { ref, computed } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useQuasar } from 'quasar';
-import { useStateStore } from 'stores/useStateStore';
 import { useArrayData } from 'composables/useArrayData';
 import VnPaginate from 'components/ui/VnPaginate.vue';
 import VnConfirm from 'components/ui/VnConfirm.vue';
 import CustomerDescriptorProxy from '../Card/CustomerDescriptorProxy.vue';
 import { toDate, toCurrency } from 'filters/index';
 import CustomerPaymentsFilter from './CustomerPaymentsFilter.vue';
+import RightMenu from 'src/components/common/RightMenu.vue';
 
-const stateStore = useStateStore();
 const quasar = useQuasar();
 const { t } = useI18n();
 const arrayData = useArrayData('CustomerTransactions');
@@ -93,28 +92,11 @@ function stateColor(row) {
 </script>
 
 <template>
-    <template v-if="stateStore.isHeaderMounted()">
+    <RightMenu>
-        <Teleport to="#actions-append">
+        <template #right-panel>
-            <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">
             <CustomerPaymentsFilter data-key="CustomerTransactions" />
-        </QScrollArea>
+        </template>
-    </QDrawer>
+    </RightMenu>
     <QPage class="column items-center q-pa-md customer-payments">
         <div class="vn-card-list">
             <QToolbar class="q-pa-none justify-end">

src/pages/Department/Card/DepartmentDescriptor.vue

@@ -2,7 +2,6 @@
 import { computed, ref } from 'vue';
 import { useRoute, useRouter } from 'vue-router';
 import { useI18n } from 'vue-i18n';
-import { useQuasar } from 'quasar';
 import { useVnConfirm } from 'composables/useVnConfirm';
 import VnLv from 'src/components/ui/VnLv.vue';
 import CardDescriptor from 'src/components/ui/CardDescriptor.vue';
@@ -23,7 +22,6 @@ const $props = defineProps({
     },
 });
 
-const quasar = useQuasar();
 const route = useRoute();
 const router = useRouter();
 

src/pages/Entry/Card/EntryBuysImport.vue

@@ -174,7 +174,7 @@ const redirectToBuysView = () => {
         @on-fetch="(data) => (packagingsOptions = data)"
         auto-load
     />
-    <QForm>
+    <QForm @submit="onSubmit()">
         <Teleport to="#st-actions" v-if="stateStore?.isSubToolbarShown()">
             <div>
                 <QBtnGroup push class="q-gutter-x-sm">
@@ -222,7 +222,7 @@ const redirectToBuysView = () => {
                 <VnRow class="row q-gutter-md q-mb-md">
                     <VnInput
                         :label="t('entry.buys.reference')"
-                       v-model="importData.ref"
+                        v-model="importData.ref"
                     />
                 </VnRow>
                 <VnRow class="row q-gutter-md q-mb-md">

src/pages/Entry/EntryLatestBuys.vue

@@ -19,6 +19,7 @@ import { toDate, toCurrency } from 'src/filters';
 import { useSession } from 'composables/useSession';
 import { dashIfEmpty } from 'src/filters';
 import { useArrayData } from 'composables/useArrayData';
+import RightMenu from 'src/components/common/RightMenu.vue';
 
 const router = useRouter();
 const { getTokenMultimedia } = useSession();
@@ -646,14 +647,12 @@ onUnmounted(() => (stateStore.rightDrawer = false));
                 @on-config-saved="visibleColumns = ['picture', ...$event]"
             />
         </template>
-        <QSpace />
-        <div id="st-actions"></div>
     </VnSubToolbar>
-    <QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above>
+    <RightMenu>
-        <QScrollArea class="fit text-grey-8">
+        <template #right-panel>
             <EntryLatestBuysFilter data-key="EntryLatestBuys" />
-        </QScrollArea>
+        </template>
-    </QDrawer>
+    </RightMenu>
     <QPage class="column items-center q-pa-md">
         <QTable
             :rows="rows"

src/pages/Entry/EntryList.vue

@@ -11,6 +11,7 @@ import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
 import { useStateStore } from 'stores/useStateStore';
 import { toDate } from 'src/filters/index';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
+import RightMenu from 'src/components/common/RightMenu.vue';
 
 const stateStore = useStateStore();
 const router = useRouter();
@@ -29,23 +30,18 @@ onMounted(async () => {
     stateStore.rightDrawer = true;
 });
 </script>
-
 <template>
-    <template v-if="stateStore.isHeaderMounted()">
+    <VnSearchbar
-        <Teleport to="#searchbar">
+        data-key="EntryList"
-            <VnSearchbar
+        url="Entries/filter"
-                data-key="EntryList"
+        :label="t('Search entries')"
-                url="Entries/filter"
+        :info="t('You can search by entry reference')"
-                :label="t('Search entries')"
+    />
-                :info="t('You can search by entry reference')"
+    <RightMenu>
-            />
+        <template #right-panel>
-        </Teleport>
-    </template>
-    <QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above>
-        <QScrollArea class="fit text-grey-8">
             <EntryFilter data-key="EntryList" />
-        </QScrollArea>
+        </template>
-    </QDrawer>
+    </RightMenu>
     <QPage class="column items-center q-pa-md">
         <div class="vn-card-list">
             <VnPaginate

src/pages/InvoiceIn/Card/InvoiceInBasicData.vue

@@ -19,7 +19,7 @@ const { t } = useI18n();
 const dms = ref({});
 const route = useRoute();
 const editDownloadDisabled = ref(false);
-const invoiceIn = computed(() => useArrayData(route.meta.moduleName).store.data);
+const invoiceIn = computed(() => useArrayData().store.data);
 const userConfig = ref(null);
 const invoiceId = computed(() => +route.params.id);
 
@@ -81,7 +81,7 @@ async function setCreateDms() {
     createDmsRef.value.show();
 }
 
-async function upsert() {
+async function onSubmit() {
     try {
         const isEdit = !!dms.value.id;
         const errors = {
@@ -318,224 +318,236 @@ async function upsert() {
         </template>
     </FormModel>
     <QDialog ref="editDmsRef">
-        <QCard>
+        <QForm @submit="onSubmit()" class="all-pointer-events">
-            <QCardSection class="q-pb-none">
+            <QCard class="q-pa-sm">
-                <QItem class="q-px-none">
+                <QCardSection class="row items-center q-pb-none">
-                    <span class="text-primary text-h6 full-width">
+                    <span class="text-primary text-h6">
                         <QIcon name="edit" class="q-mr-xs" />
                         {{ t('Edit document') }}
                     </span>
+                    <QSpace />
                     <QBtn icon="close" flat round dense v-close-popup />
-                </QItem>
+                </QCardSection>
-            </QCardSection>
+                <QCardSection class="q-py-none">
-            <QCardSection class="q-py-none">
+                    <QItem>
-                <QItem>
+                        <VnInput
-                    <VnInput
+                            class="full-width q-pa-xs"
-                        class="full-width q-pa-xs"
+                            :label="t('Reference')"
-                        :label="t('Reference')"
+                            v-model="dms.reference"
-                        v-model="dms.reference"
+                            clearable
-                        clearable
+                            clear-icon="close"
-                        clear-icon="close"
+                        />
+                        <VnSelect
+                            class="full-width q-pa-xs"
+                            :label="t('Company')"
+                            v-model="dms.companyId"
+                            :options="companies"
+                            option-value="id"
+                            option-label="code"
+                            :required="true"
+                        />
+                    </QItem>
+                    <QItem>
+                        <VnSelect
+                            class="full-width q-pa-xs"
+                            :label="t('Warehouse')"
+                            v-model="dms.warehouseId"
+                            :options="warehouses"
+                            option-value="id"
+                            option-label="name"
+                            :required="true"
+                        />
+                        <VnSelect
+                            class="full-width q-pa-xs"
+                            :label="t('Type')"
+                            v-model="dms.dmsTypeId"
+                            :options="dmsTypes"
+                            option-value="id"
+                            option-label="name"
+                            :required="true"
+                        />
+                    </QItem>
+                    <QItem>
+                        <VnInput
+                            :label="t('Description')"
+                            v-model="dms.description"
+                            :required="true"
+                            type="textarea"
+                            class="full-width q-pa-xs"
+                            size="lg"
+                            autogrow
+                            clearable
+                            clear-icon="close"
+                        />
+                    </QItem>
+                    <QItem>
+                        <QFile
+                            ref="inputFileRef"
+                            class="full-width q-pa-xs"
+                            :label="t('File')"
+                            v-model="dms.files"
+                            multiple
+                            :accept="allowedContentTypes.join(',')"
+                            clearable
+                            clear-icon="close"
+                        >
+                            <template #append>
+                                <QBtn
+                                    icon="attach_file_add"
+                                    flat
+                                    round
+                                    padding="xs"
+                                    @click="inputFileRef.pickFiles()"
+                                >
+                                    <QTooltip>
+                                        {{ t('globals.selectFile') }}
+                                    </QTooltip>
+                                </QBtn>
+                                <QBtn icon="info" flat round padding="xs">
+                                    <QTooltip max-width="30rem">
+                                        {{
+                                            `${t(
+                                                'Allowed content types'
+                                            )}: ${allowedContentTypes.join(', ')}`
+                                        }}
+                                    </QTooltip>
+                                </QBtn>
+                            </template>
+                        </QFile>
+                    </QItem>
+                    <QItem>
+                        <QCheckbox
+                            :label="t('Generate identifier for original file')"
+                            v-model="dms.hasFile"
+                        />
+                    </QItem>
+                </QCardSection>
+                <QCardActions class="justify-end">
+                    <QBtn
+                        flat
+                        :label="t('globals.close')"
+                        color="primary"
+                        v-close-popup
                     />
-                    <VnSelect
+                    <QBtn :label="t('globals.save')" color="primary" @click="onSubmit" />
-                        class="full-width q-pa-xs"
+                </QCardActions>
-                        :label="t('Company')"
+            </QCard>
-                        v-model="dms.companyId"
+        </QForm>
-                        :options="companies"
-                        option-value="id"
-                        option-label="code"
-                        :required="true"
-                    />
-                </QItem>
-                <QItem>
-                    <VnSelect
-                        class="full-width q-pa-xs"
-                        :label="t('Warehouse')"
-                        v-model="dms.warehouseId"
-                        :options="warehouses"
-                        option-value="id"
-                        option-label="name"
-                        :required="true"
-                    />
-                    <VnSelect
-                        class="full-width q-pa-xs"
-                        :label="t('Type')"
-                        v-model="dms.dmsTypeId"
-                        :options="dmsTypes"
-                        option-value="id"
-                        option-label="name"
-                        :required="true"
-                    />
-                </QItem>
-                <QItem>
-                    <VnInput
-                        :label="t('Description')"
-                        v-model="dms.description"
-                        :required="true"
-                        type="textarea"
-                        class="full-width q-pa-xs"
-                        size="lg"
-                        autogrow
-                        clearable
-                        clear-icon="close"
-                    />
-                </QItem>
-                <QItem>
-                    <QFile
-                        ref="inputFileRef"
-                        class="full-width q-pa-xs"
-                        :label="t('File')"
-                        v-model="dms.files"
-                        multiple
-                        :accept="allowedContentTypes.join(',')"
-                        clearable
-                        clear-icon="close"
-                    >
-                        <template #append>
-                            <QBtn
-                                icon="attach_file_add"
-                                flat
-                                round
-                                padding="xs"
-                                @click="inputFileRef.pickFiles()"
-                            >
-                                <QTooltip>
-                                    {{ t('globals.selectFile') }}
-                                </QTooltip>
-                            </QBtn>
-                            <QBtn icon="info" flat round padding="xs">
-                                <QTooltip max-width="30rem">
-                                    {{
-                                        `${t(
-                                            'Allowed content types'
-                                        )}: ${allowedContentTypes.join(', ')}`
-                                    }}
-                                </QTooltip>
-                            </QBtn>
-                        </template>
-                    </QFile>
-                </QItem>
-                <QItem>
-                    <QCheckbox
-                        :label="t('Generate identifier for original file')"
-                        v-model="dms.hasFile"
-                    />
-                </QItem>
-            </QCardSection>
-            <QCardActions class="justify-end">
-                <QBtn flat :label="t('globals.close')" color="primary" v-close-popup />
-                <QBtn :label="t('globals.save')" color="primary" @click="upsert" />
-            </QCardActions>
-        </QCard>
     </QDialog>
     <QDialog ref="createDmsRef">
-        <QCard>
+        <QForm @submit="onSubmit()" class="all-pointer-events">
-            <QCardSection class="q-pb-none">
+            <QCard class="q-pa-sm">
-                <QItem>
+                <QCardSection class="row items-center q-pb-none">
-                    <span class="text-primary text-h6 full-width">
+                    <span class="text-primary text-h6">
                         <QIcon name="edit" class="q-mr-xs" />
                         {{ t('Create document') }}
                     </span>
-                    <QBtn icon="close" flat round dense v-close-popup align="right" />
+                    <QSpace />
-                </QItem>
+                    <QBtn icon="close" flat round dense v-close-popup />
-            </QCardSection>
+                </QCardSection>
-            <QCardSection class="q-pb-none">
+                <QCardSection class="q-pb-none">
-                <QItem>
+                    <QItem>
-                    <VnInput
+                        <VnInput
-                        class="full-width q-pa-xs"
+                            class="full-width q-pa-xs"
-                        :label="t('Reference')"
+                            :label="t('Reference')"
-                        v-model="dms.reference"
+                            v-model="dms.reference"
+                        />
+                        <VnSelect
+                            class="full-width q-pa-xs"
+                            :label="`${t('Company')}*`"
+                            v-model="dms.companyId"
+                            :options="companies"
+                            option-value="id"
+                            option-label="code"
+                            :required="true"
+                        />
+                    </QItem>
+                    <QItem>
+                        <VnSelect
+                            class="full-width q-pa-xs"
+                            :label="`${t('Warehouse')}*`"
+                            v-model="dms.warehouseId"
+                            :options="warehouses"
+                            option-value="id"
+                            option-label="name"
+                            :required="true"
+                        />
+                        <VnSelect
+                            class="full-width q-pa-xs"
+                            :label="`${t('Type')}*`"
+                            v-model="dms.dmsTypeId"
+                            :options="dmsTypes"
+                            option-value="id"
+                            option-label="name"
+                            :required="true"
+                        />
+                    </QItem>
+                    <QItem>
+                        <VnInput
+                            class="full-width q-pa-xs"
+                            type="textarea"
+                            size="lg"
+                            autogrow
+                            :label="`${t('Description')}*`"
+                            v-model="dms.description"
+                            clearable
+                            clear-icon="close"
+                            :rules="[(val) => val.length || t('Required field')]"
+                        />
+                    </QItem>
+                    <QItem>
+                        <QFile
+                            ref="inputFileRef"
+                            class="full-width q-pa-xs"
+                            :label="t('File')"
+                            v-model="dms.files"
+                            multiple
+                            :accept="allowedContentTypes.join(',')"
+                            clearable
+                            clear-icon="close"
+                        >
+                            <template #append>
+                                <QBtn
+                                    icon="attach_file_add"
+                                    flat
+                                    round
+                                    padding="xs"
+                                    @click="inputFileRef.pickFiles()"
+                                >
+                                    <QTooltip>
+                                        {{ t('globals.selectFile') }}
+                                    </QTooltip>
+                                </QBtn>
+                                <QBtn icon="info" flat round padding="xs">
+                                    <QTooltip max-width="30rem">
+                                        {{
+                                            `${t(
+                                                'Allowed content types'
+                                            )}: ${allowedContentTypes.join(', ')}`
+                                        }}
+                                    </QTooltip>
+                                </QBtn>
+                            </template>
+                        </QFile>
+                    </QItem>
+                    <QItem>
+                        <QCheckbox
+                            :label="t('Generate identifier for original file')"
+                            v-model="dms.hasFile"
+                        />
+                    </QItem>
+                </QCardSection>
+                <QCardActions align="right">
+                    <QBtn
+                        flat
+                        :label="t('globals.close')"
+                        color="primary"
+                        v-close-popup
                     />
-                    <VnSelect
+                    <QBtn :label="t('globals.save')" color="primary" @click="onSubmit" />
-                        class="full-width q-pa-xs"
+                </QCardActions>
-                        :label="`${t('Company')}*`"
+            </QCard>
-                        v-model="dms.companyId"
+        </QForm>
-                        :options="companies"
-                        option-value="id"
-                        option-label="code"
-                        :required="true"
-                    />
-                </QItem>
-                <QItem>
-                    <VnSelect
-                        class="full-width q-pa-xs"
-                        :label="`${t('Warehouse')}*`"
-                        v-model="dms.warehouseId"
-                        :options="warehouses"
-                        option-value="id"
-                        option-label="name"
-                        :required="true"
-                    />
-                    <VnSelect
-                        class="full-width q-pa-xs"
-                        :label="`${t('Type')}*`"
-                        v-model="dms.dmsTypeId"
-                        :options="dmsTypes"
-                        option-value="id"
-                        option-label="name"
-                        :required="true"
-                    />
-                </QItem>
-                <QItem>
-                    <VnInput
-                        class="full-width q-pa-xs"
-                        type="textarea"
-                        size="lg"
-                        autogrow
-                        :label="`${t('Description')}*`"
-                        v-model="dms.description"
-                        clearable
-                        clear-icon="close"
-                        :rules="[(val) => val.length || t('Required field')]"
-                    />
-                </QItem>
-                <QItem>
-                    <QFile
-                        ref="inputFileRef"
-                        class="full-width q-pa-xs"
-                        :label="t('File')"
-                        v-model="dms.files"
-                        multiple
-                        :accept="allowedContentTypes.join(',')"
-                        clearable
-                        clear-icon="close"
-                    >
-                        <template #append>
-                            <QBtn
-                                icon="attach_file_add"
-                                flat
-                                round
-                                padding="xs"
-                                @click="inputFileRef.pickFiles()"
-                            >
-                                <QTooltip>
-                                    {{ t('globals.selectFile') }}
-                                </QTooltip>
-                            </QBtn>
-                            <QBtn icon="info" flat round padding="xs">
-                                <QTooltip max-width="30rem">
-                                    {{
-                                        `${t(
-                                            'Allowed content types'
-                                        )}: ${allowedContentTypes.join(', ')}`
-                                    }}
-                                </QTooltip>
-                            </QBtn>
-                        </template>
-                    </QFile>
-                </QItem>
-                <QItem>
-                    <QCheckbox
-                        :label="t('Generate identifier for original file')"
-                        v-model="dms.hasFile"
-                    />
-                </QItem>
-            </QCardSection>
-            <QCardActions align="right">
-                <QBtn flat :label="t('globals.close')" color="primary" v-close-popup />
-                <QBtn :label="t('globals.save')" color="primary" @click="upsert" />
-            </QCardActions>
-        </QCard>
     </QDialog>
 </template>
 <style lang="scss" scoped>

src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue

@@ -487,9 +487,6 @@ const createInvoiceInCorrection = async () => {
 .q-dialog {
     .q-card {
         max-width: 45em;
-        .q-item__section > .q-input {
-            padding-bottom: 1.4em;
-        }
     }
 }
 

src/pages/InvoiceIn/Card/InvoiceInDueDay.vue

@@ -13,7 +13,7 @@ import { toCurrency } from 'src/filters';
 
 const route = useRoute();
 const { t } = useI18n();
-const arrayData = useArrayData(route.meta.moduleName);
+const arrayData = useArrayData();
 const invoiceIn = computed(() => arrayData.store.data);
 
 const rowsSelected = ref([]);

src/pages/InvoiceIn/Card/InvoiceInIntrastat.vue

@@ -11,9 +11,7 @@ import { useArrayData } from 'src/composables/useArrayData';
 const { t } = useI18n();
 
 const route = useRoute();
-const currency = computed(
+const currency = computed(() => useArrayData().store.data?.currency?.code);
-    () => useArrayData(route.meta.moduleName).store.data?.currency?.code
-);
 const invoceInIntrastat = ref([]);
 const rowsSelected = ref([]);
 const countries = ref([]);

src/pages/InvoiceIn/Card/InvoiceInSummary.vue

@@ -16,7 +16,7 @@ const { t } = useI18n();
 const route = useRoute();
 
 const entityId = computed(() => props.id || +route.params.id);
-const invoiceIn = computed(() => useArrayData(route.meta.moduleName).store.data);
+const invoiceIn = computed(() => useArrayData().store.data);
 const currency = computed(() => invoiceIn.value?.currency?.code);
 const invoiceInUrl = ref();
 const amountsNotMatch = ref(null);

src/pages/InvoiceIn/Card/InvoiceInVat.vue

@@ -11,13 +11,12 @@ import VnSelect from 'src/components/common/VnSelect.vue';
 import CrudModel from 'src/components/CrudModel.vue';
 import VnCurrency from 'src/components/common/VnCurrency.vue';
 
-const router = useRoute();
 const { t } = useI18n();
 const quasar = useQuasar();
 
-const arrayData = useArrayData(router.meta.moduleName);
+const arrayData = useArrayData();
 const invoiceIn = computed(() => arrayData.store.data);
-const invoiceId = +router.params.id;
+const invoiceId = +useRoute().params.id;
 const currency = computed(() => invoiceIn.value?.currency?.code);
 const expenses = ref([]);
 const sageTaxTypes = ref([]);

src/pages/InvoiceIn/InvoiceInCreate.vue

@@ -29,7 +29,7 @@ const newInvoiceIn = reactive({
 const suppliersOptions = ref([]);
 const companiesOptions = ref([]);
 
-const redirectToInvoiceInBasicData = ({ id }) => {
+const redirectToInvoiceInBasicData = (__, { id }) => {
     router.push({ name: 'InvoiceInBasicData', params: { id } });
 };
 </script>

src/pages/InvoiceIn/InvoiceInList.vue

@@ -14,6 +14,7 @@ import { getUrl } from 'src/composables/getUrl';
 import InvoiceInSummary from './Card/InvoiceInSummary.vue';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
 import SupplierDescriptorProxy from 'src/pages/Supplier/Card/SupplierDescriptorProxy.vue';
+import RightMenu from 'src/components/common/RightMenu.vue';
 
 const stateStore = useStateStore();
 const router = useRouter();
@@ -33,35 +34,16 @@ function navigate(id) {
 </script>
 
 <template>
-    <template v-if="stateStore.isHeaderMounted()">
+    <VnSearchbar
-        <Teleport to="#searchbar">
+        data-key="InvoiceInList"
-            <VnSearchbar
+        :label="t('Search invoice')"
-                data-key="InvoiceInList"
+        :info="t('You can search by invoice reference')"
-                :label="t('Search invoice')"
+    />
-                :info="t('You can search by invoice reference')"
+    <RightMenu>
-            />
+        <template #right-panel>
-        </Teleport>
-        <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">
             <InvoiceInFilter data-key="InvoiceInList" />
-        </QScrollArea>
+        </template>
-    </QDrawer>
+    </RightMenu>
     <QPage class="column items-center q-pa-md">
         <div class="vn-card-list">
             <VnPaginate

src/pages/InvoiceIn/InvoiceInToBook.vue

@@ -1,5 +1,4 @@
 <script setup>
-import { useRoute } from 'vue-router';
 import axios from 'axios';
 import { useQuasar } from 'quasar';
 import { useI18n } from 'vue-i18n';
@@ -10,7 +9,7 @@ const { t } = useI18n();
 
 defineExpose({ checkToBook });
 
-const { store } = useArrayData(useRoute().meta.moduleName);
+const { store } = useArrayData();
 
 async function checkToBook(id) {
     let directBooking = true;

src/pages/InvoiceOut/InvoiceOutGlobal.vue

@@ -7,6 +7,7 @@ import { useInvoiceOutGlobalStore } from 'src/stores/invoiceOutGlobal.js';
 import { storeToRefs } from 'pinia';
 import { QBadge, QBtn } from 'quasar';
 import CustomerDescriptor from 'src/pages/Customer/Card/CustomerDescriptor.vue';
+import RightMenu from 'src/components/common/RightMenu.vue';
 
 const stateStore = useStateStore();
 const { t } = useI18n();
@@ -103,12 +104,11 @@ onUnmounted(() => {
 </script>
 
 <template>
-    <QDrawer v-model="stateStore.rightDrawer" :width="256" side="right" show-if-above>
+    <RightMenu>
-        <QScrollArea class="fit text-grey-8">
+        <template #right-panel>
             <InvoiceOutGlobalForm />
-        </QScrollArea>
+        </template>
-    </QDrawer>
+    </RightMenu>
-
     <QPage class="column items-center q-pa-md">
         <QCard v-if="status" class="card">
             <QCardSection class="card-section">

src/pages/InvoiceOut/InvoiceOutList.vue

@@ -17,6 +17,7 @@ import { toDate, toCurrency } from 'src/filters/index';
 import { useStateStore } from 'stores/useStateStore';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
 import { useSession } from 'src/composables/useSession';
+import RightMenu from 'src/components/common/RightMenu.vue';
 
 const { t } = useI18n();
 const router = useRouter();
@@ -93,35 +94,16 @@ const openCreateInvoiceModal = () => {
 </script>
 
 <template>
-    <template v-if="stateStore.isHeaderMounted()">
+    <VnSearchbar
-        <Teleport to="#searchbar">
+        :info="t('youCanSearchByInvoiceReference')"
-            <VnSearchbar
+        :label="t('searchInvoice')"
-                :info="t('youCanSearchByInvoiceReference')"
+        data-key="InvoiceOutList"
-                :label="t('searchInvoice')"
+    />
-                data-key="InvoiceOutList"
+    <RightMenu>
-            />
+        <template #right-panel>
-        </Teleport>
-        <Teleport to="#actions-append">
-            <div class="row q-gutter-x-sm">
-                <QBtn
-                    @click="stateStore.toggleRightDrawer()"
-                    dense
-                    flat
-                    icon="menu"
-                    round
-                >
-                    <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">
             <InvoiceOutFilter data-key="InvoiceOutList" />
-        </QScrollArea>
+        </template>
-    </QDrawer>
+    </RightMenu>
     <QPage>
         <VnPaginate
             auto-load

src/pages/InvoiceOut/InvoiceOutNegativeBases.vue

@@ -1,59 +1,43 @@
 <script setup>
-import { ref, computed, onBeforeMount, onMounted, nextTick } from 'vue';
+import { computed, onBeforeMount } from 'vue';
 import { useI18n } from 'vue-i18n';
-
 import CustomerDescriptorProxy from 'src/pages/Customer/Card/CustomerDescriptorProxy.vue';
 import InvoiceOutNegativeFilter from './InvoiceOutNegativeBasesFilter.vue';
 import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
 import TicketDescriptorProxy from 'src/pages/Ticket/Card/TicketDescriptorProxy.vue';
-
 import { toCurrency } from 'src/filters';
 import { useInvoiceOutGlobalStore } from 'src/stores/invoiceOutGlobal.js';
 import { useStateStore } from 'stores/useStateStore';
 import { useArrayData } from 'composables/useArrayData';
+import RightMenu from 'src/components/common/RightMenu.vue';
 
 const invoiceOutGlobalStore = useInvoiceOutGlobalStore();
 const stateStore = useStateStore();
 const { t } = useI18n();
 
-const arrayData = ref(null);
+const arrayData = useArrayData('InvoiceOutNegative', {
-
+    url: 'InvoiceOuts/negativeBases',
-function exprBuilder(param, value) {
+    limit: 0,
-    switch (param) {
+    userParams: {
-        case 'from':
-        case 'to':
-            return;
-        default:
-            return { [param]: value };
-    }
-}
-
-onBeforeMount(async () => {
-    const defaultParams = {
         from: Date.vnFirstDayOfMonth().toISOString(),
         to: Date.vnLastDayOfMonth().toISOString(),
-    };
+    },
-    arrayData.value = useArrayData('InvoiceOutNegative', {
+    exprBuilder: (param, value) => {
-        url: 'InvoiceOuts/negativeBases',
+        switch (param) {
-        limit: 0,
+            case 'from':
-        userParams: defaultParams,
+            case 'to':
-        exprBuilder: exprBuilder,
+                return;
-    });
+            default:
-    await arrayData.value.fetch({ append: false });
+                return { [param]: value };
-
+        }
-    stateStore.rightDrawer = true;
+    },
 });
 
-const componentIsRendered = ref(false);
+onBeforeMount(async () => {
-
+    await arrayData.fetch({ append: false });
-onMounted(() =>
+    stateStore.rightDrawer = true;
-    nextTick(() => {
+});
-        componentIsRendered.value = true;
-    })
-);
-
-const rows = computed(() => arrayData.value.store.data);
 
 const columns = computed(() => [
     {
@@ -144,28 +128,23 @@ const downloadCSV = async () => {
     );
 };
 </script>
-
 <template>
-    <template v-if="stateStore.isHeaderMounted()">
+    <VnSubToolbar>
-        <Teleport
+        <template #st-actions>
-            to="#st-actions"
-            v-if="stateStore?.isSubToolbarShown() && componentIsRendered"
-        >
             <QBtn color="primary" icon-right="download" no-caps @click="downloadCSV()">
                 <QTooltip>{{ t('Download as CSV') }}</QTooltip>
             </QBtn>
-        </Teleport>
+        </template>
-    </template>
+    </VnSubToolbar>
-    <QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above>
+    <RightMenu>
-        <QScrollArea class="fit text-grey-8">
+        <template #right-panel>
             <InvoiceOutNegativeFilter data-key="InvoiceOutNegative" />
-        </QScrollArea>
+        </template>
-    </QDrawer>
+    </RightMenu>
-    <VnSubToolbar />
     <QPage class="column items-center q-pa-md">
         <QTable
             :columns="columns"
-            :rows="rows"
+            :rows="arrayData.store.data"
             row-key="clientId"
             class="full-width q-mt-md"
         >

src/pages/Item/ItemFixedPrice.vue

@@ -20,6 +20,7 @@ import useNotify from 'src/composables/useNotify.js';
 import axios from 'axios';
 import { useArrayData } from 'composables/useArrayData';
 import { isLower, isBigger } from 'src/filters/date.js';
+import RightMenu from 'src/components/common/RightMenu.vue';
 
 const stateStore = useStateStore();
 const { t } = useI18n();
@@ -376,31 +377,14 @@ onUnmounted(() => (stateStore.rightDrawer = false));
         auto-load
         @on-fetch="(data) => (itemsWithNameOptions = data)"
     />
-    <template v-if="stateStore.isHeaderMounted()">
+    <RightMenu>
-        <Teleport to="#actions-append">
+        <template #right-panel>
-            <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>
+        </template>
-    </QDrawer>
+    </RightMenu>
     <QPage class="column items-center q-pa-md">
         <QTable
             :rows="fixedPrices"

src/pages/Item/ItemList.vue

@@ -21,6 +21,8 @@ import { dashIfEmpty } from 'src/filters';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
 import { useVnConfirm } from 'composables/useVnConfirm';
 import axios from 'axios';
+import RightMenu from 'src/components/common/RightMenu.vue';
+import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 
 const router = useRouter();
 const { getTokenMultimedia } = useSession();
@@ -430,24 +432,21 @@ onUnmounted(() => (stateStore.rightDrawer = false));
         auto-load
         @on-fetch="(data) => (buyersOptions = data)"
     />
-
+    <VnSubToolbar>
-    <QToolbar class="bg-vn-dark justify-end">
+        <template #st-data>
-        <div id="st-data">
             <TableVisibleColumns
                 :all-columns="allColumnNames"
                 table-code="itemsIndex"
                 labels-traductions-path="item.list"
                 @on-config-saved="visibleColumns = ['picture', ...$event, 'actions']"
             />
-        </div>
+        </template>
-        <QSpace />
+    </VnSubToolbar>
-        <div id="st-actions"></div>
+    <RightMenu>
-    </QToolbar>
+        <template #right-panel>
-    <QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above>
-        <QScrollArea class="fit text-grey-8">
             <ItemListFilter data-key="ItemList" />
-        </QScrollArea>
+        </template>
-    </QDrawer>
+    </RightMenu>
     <QPage class="column items-center q-pa-md">
         <VnPaginate
             ref="paginateRef"

src/pages/Item/ItemRequest.vue

@@ -17,6 +17,7 @@ import { toCurrency } from 'filters/index';
 import useNotify from 'src/composables/useNotify.js';
 import { getDateQBadgeColor } from 'src/composables/getDateQBadgeColor.js';
 import axios from 'axios';
+import RightMenu from 'src/components/common/RightMenu.vue';
 
 const { t } = useI18n();
 const { notify } = useNotify();
@@ -214,39 +215,18 @@ onBeforeMount(() => {
         @on-fetch="(data) => (workersOptions = data)"
         auto-load
     />
-    <template v-if="stateStore.isHeaderMounted()">
+    <VnSearchbar
-        <Teleport to="#searchbar">
+        data-key="ItemRequests"
-            <VnSearchbar
+        url="TicketRequests/filter"
-                data-key="ItemRequests"
+        :label="t('globals.search')"
-                url="TicketRequests/filter"
+        :info="t('You can search by Id or alias')"
-                :label="t('globals.search')"
+        :redirect="false"
-                :info="t('You can search by Id or alias')"
+    />
-                :redirect="false"
+    <RightMenu>
-            />
+        <template #right-panel>
-        </Teleport>
-    </template>
-    <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">
             <ItemRequestFilter data-key="ItemRequests" />
-        </QScrollArea>
+        </template>
-    </QDrawer>
+    </RightMenu>
     <QPage class="column items-center q-pa-md">
         <QTable
             :rows="itemRequestsOptions"

src/pages/Item/ItemTypeList.vue

@@ -8,10 +8,9 @@ import CardList from 'src/components/ui/CardList.vue';
 import ItemTypeSummary from 'src/pages/ItemType/Card/ItemTypeSummary.vue';
 import ItemTypeFilter from 'src/pages/ItemType/ItemTypeFilter.vue';
 import ItemTypeSearchbar from '../ItemType/ItemTypeSearchbar.vue';
-import { useStateStore } from 'stores/useStateStore';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
+import RightMenu from 'src/components/common/RightMenu.vue';
 
-const stateStore = useStateStore();
 const router = useRouter();
 const { t } = useI18n();
 const { viewSummary } = useSummaryDialog();
@@ -60,31 +59,12 @@ const exprBuilder = (param, value) => {
 </script>
 
 <template>
-    <template v-if="stateStore.isHeaderMounted()">
+    <ItemTypeSearchbar />
-        <Teleport to="#searchbar">
+    <RightMenu>
-            <ItemTypeSearchbar />
+        <template #right-panel>
-        </Teleport>
-        <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">
             <ItemTypeFilter data-key="ItemTypeList" />
-        </QScrollArea>
+        </template>
-    </QDrawer>
+    </RightMenu>
     <QPage class="column items-center q-pa-md">
         <div class="vn-card-list">
             <VnPaginate

src/pages/Order/Card/OrderCatalogItemDialog.vue

@@ -33,7 +33,7 @@ const addToOrder = async () => {
 
 <template>
     <div class="container order-catalog-item q-pb-md">
-        <QForm @submit.prevent="addToOrder">
+        <QForm @submit="addToOrder">
             <QMarkupTable class="shadow-0">
                 <tbody>
                     <tr v-for="item in fields" :key="item.warehouse">

src/pages/Order/OrderList.vue

@@ -13,6 +13,7 @@ import OrderSearchbar from 'pages/Order/Card/OrderSearchbar.vue';
 import OrderFilter from 'pages/Order/Card/OrderFilter.vue';
 import OrderSummary from 'pages/Order/Card/OrderSummary.vue';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
+import RightMenu from 'src/components/common/RightMenu.vue';
 
 const stateStore = useStateStore();
 const router = useRouter();
@@ -26,33 +27,13 @@ function navigate(id) {
     router.push({ path: `/order/${id}` });
 }
 </script>
-
 <template>
-    <template v-if="stateStore.isHeaderMounted()">
+    <OrderSearchbar />
-        <Teleport to="#searchbar">
+    <RightMenu>
-            <OrderSearchbar />
+        <template #right-panel>
-        </Teleport>
-        <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">
             <OrderFilter data-key="OrderList" />
-        </QScrollArea>
+        </template>
-    </QDrawer>
+    </RightMenu>
     <QPage class="column items-center q-pa-md">
         <div class="vn-card-list">
             <VnPaginate

src/pages/Parking/ParkingList.vue

@@ -10,6 +10,7 @@ import CardList from 'components/ui/CardList.vue';
 import VnLv from 'components/ui/VnLv.vue';
 import ParkingFilter from './ParkingFilter.vue';
 import ParkingSummary from './Card/ParkingSummary.vue';
+import RightMenu from 'src/components/common/RightMenu.vue';
 
 const stateStore = useStateStore();
 const { push } = useRouter();
@@ -37,35 +38,18 @@ function exprBuilder(param, value) {
 </script>
 
 <template>
-    <template v-if="stateStore.isHeaderMounted()">
+    <template>
-        <Teleport to="#searchbar">
+        <VnSearchbar
-            <VnSearchbar
+            data-key="ParkingList"
-                data-key="ParkingList"
+            :label="t('Search parking')"
-                :label="t('Search parking')"
+            :info="t('You can search by parking code')"
-                :info="t('You can search by parking code')"
+        />
-            />
-        </Teleport>
-        <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>
+    <RightMenu>
-        <QScrollArea class="fit text-grey-8">
+        <template #right-panel>
             <ParkingFilter data-key="ParkingList" />
-        </QScrollArea>
+        </template>
-    </QDrawer>
+    </RightMenu>
     <QPage class="column items-center q-pa-md">
         <div class="vn-card-list">
             <VnPaginate

src/pages/Route/Card/RouteForm.vue

@@ -11,13 +11,10 @@ import VnInputDate from 'components/common/VnInputDate.vue';
 import VnInput from 'components/common/VnInput.vue';
 import axios from 'axios';
 import VnInputTime from 'components/common/VnInputTime.vue';
-import RouteSearchbar from 'pages/Route/Card/RouteSearchbar.vue';
-import { useStateStore } from 'stores/useStateStore';
 
 const { t } = useI18n();
 const route = useRoute();
 const router = useRouter();
-const stateStore = useStateStore();
 const shelvingId = ref(route.params?.id || null);
 const isNew = Boolean(!shelvingId.value);
 const defaultInitialData = {

src/pages/Route/Cmr/CmrList.vue

@@ -2,15 +2,14 @@
 import { computed, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { Notify } from 'quasar';
-import { useStateStore } from 'stores/useStateStore';
 import VnPaginate from 'components/ui/VnPaginate.vue';
 import { useSession } from 'src/composables/useSession';
 import { toDate } from 'filters/index';
 import CmrFilter from './CmrFilter.vue';
 import TicketDescriptorProxy from 'pages/Ticket/Card/TicketDescriptorProxy.vue';
 import CustomerDescriptorProxy from 'pages/Customer/Card/CustomerDescriptorProxy.vue';
+import RightMenu from 'src/components/common/RightMenu.vue';
 
-const stateStore = useStateStore();
 const { t } = useI18n();
 const { getTokenMultimedia } = useSession();
 const token = getTokenMultimedia();
@@ -91,24 +90,11 @@ function downloadPdfs() {
 }
 </script>
 <template>
-      <template v-if="stateStore.isHeaderMounted()">
+    <RightMenu>
-
+        <template #right-panel>
-        <Teleport to="#actions-append">
+            <CmrFilter data-key="CmrList" />
-            <div class="row q-gutter-x-sm">
+        </template>
-                <QBtn
+    </RightMenu>
-                    flat
-                    @click="stateStore.toggleRightDrawer()"
-                    round
-                    dense
-                    icon="menu"
-                >
-                    <QTooltip bottom anchor="bottom right">
-                        {{ t('globals.collapseMenu') }}
-                    </QTooltip>
-                </QBtn>
-            </div>
-        </Teleport>
-    </template>
     <div class="column items-center">
         <div class="list">
             <VnPaginate
@@ -182,15 +168,10 @@ function downloadPdfs() {
         </div>
         <QPageSticky :offset="[20, 20]">
             <QBtn @click="downloadPdfs" fab icon="cloud_download" color="primary" />
+            <QTooltip>
+                {{ t('route.cmr.list.downloadCmrs') }}
+            </QTooltip>
         </QPageSticky>
-        <QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above>
-            <QScrollArea class="fit text-grey-8">
-                <CmrFilter data-key="CmrList" />
-                <QTooltip>
-                    {{ t('route.cmr.list.downloadCmrs') }}
-                </QTooltip>
-            </QScrollArea>
-        </QDrawer>
     </div>
 </template>
 

src/pages/Route/RouteAutonomous.vue

@@ -17,6 +17,7 @@ import { useSummaryDialog } from 'composables/useSummaryDialog';
 import VnDms from 'components/common/VnDms.vue';
 import { useState } from 'composables/useState';
 import axios from 'axios';
+import RightMenu from 'src/components/common/RightMenu.vue';
 
 const stateStore = useStateStore();
 const { t } = useI18n();
@@ -172,35 +173,16 @@ function navigateToRouteSummary(event, row) {
 </script>
 
 <template>
-    <template v-if="stateStore.isHeaderMounted()">
+    <VnSearchbar
-        <Teleport to="#searchbar">
+        data-key="RouteAutonomousList"
-            <VnSearchbar
+        :label="t('Search autonomous')"
-                data-key="RouteAutonomousList"
+        :info="t('You can search by autonomous reference')"
-                :label="t('Search autonomous')"
+    />
-                :info="t('You can search by autonomous reference')"
+    <RightMenu>
-            />
+        <template #right-panel>
-        </Teleport>
-        <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">
             <RouteAutonomousFilter data-key="RouteAutonomousList" />
-        </QScrollArea>
+        </template>
-    </QDrawer>
+    </RightMenu>
     <QPage class="column items-center">
         <div class="route-list">
             <div class="q-pa-md">

src/pages/Route/RouteList.vue

@@ -21,6 +21,7 @@ import { useSummaryDialog } from 'src/composables/useSummaryDialog';
 import RouteListTicketsDialog from 'pages/Route/Card/RouteListTicketsDialog.vue';
 import { useQuasar } from 'quasar';
 import { useArrayData } from 'composables/useArrayData';
+import RightMenu from 'src/components/common/RightMenu.vue';
 
 const stateStore = useStateStore();
 const { t } = useI18n();
@@ -186,26 +187,12 @@ onUnmounted(() => (stateStore.rightDrawer = false));
 </script>
 
 <template>
-    <template v-if="stateStore.isHeaderMounted()">
+    <RouteSearchbar />
-        <Teleport to="#searchbar">
+    <RightMenu>
-            <RouteSearchbar />
+        <template #right-panel>
-        </Teleport>
+            <RouteFilter data-key="RouteList" />
-        <Teleport to="#actions-append">
+        </template>
-            <div class="row q-gutter-x-sm">
+    </RightMenu>
-                <QBtn
-                    flat
-                    @click="stateStore.toggleRightDrawer()"
-                    round
-                    dense
-                    icon="menu"
-                >
-                    <QTooltip bottom anchor="bottom right">
-                        {{ t('globals.collapseMenu') }}
-                    </QTooltip>
-                </QBtn>
-            </div>
-        </Teleport>
-    </template>
     <QDialog v-model="confirmationDialog">
         <QCard style="min-width: 350px">
             <QCardSection>
@@ -227,11 +214,6 @@ onUnmounted(() => (stateStore.rightDrawer = false));
             </QCardActions>
         </QCard>
     </QDialog>
-    <QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above>
-        <QScrollArea class="fit text-grey-8">
-            <RouteFilter data-key="RouteList" />
-        </QScrollArea>
-    </QDrawer>
     <FetchData
         url="Workers/activeWithInheritedRole"
         @on-fetch="(data) => (workers = data)"

src/pages/Route/RouteRoadmap.vue

@@ -16,6 +16,7 @@ import VnInputDate from 'components/common/VnInputDate.vue';
 import { useSummaryDialog } from 'composables/useSummaryDialog';
 import RoadmapSummary from 'pages/Route/Roadmap/RoadmapSummary.vue';
 import { useRouter } from 'vue-router';
+import RightMenu from 'src/components/common/RightMenu.vue';
 
 const stateStore = useStateStore();
 const { t } = useI18n();
@@ -133,35 +134,16 @@ function navigateToRoadmapSummary(event, row) {
 </script>
 
 <template>
-    <template v-if="stateStore.isHeaderMounted()">
+    <VnSearchbar
-        <Teleport to="#searchbar">
+        data-key="RoadmapList"
-            <VnSearchbar
+        :label="t('Search roadmaps')"
-                data-key="RoadmapList"
+        :info="t('You can search by roadmap reference')"
-                :label="t('Search roadmaps')"
+    />
-                :info="t('You can search by roadmap reference')"
+    <RightMenu>
-            />
+        <template #right-panel>
-        </Teleport>
-        <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">
             <RoadmapFilter data-key="RoadmapList" />
-        </QScrollArea>
+        </template>
-    </QDrawer>
+    </RightMenu>
     <QDialog v-model="isCloneDialogOpen">
         <QCard style="min-width: 350px">
             <QCardSection>

src/pages/Route/RouteTickets.vue

@@ -15,14 +15,11 @@ import VnConfirm from 'components/ui/VnConfirm.vue';
 import FetchData from 'components/FetchData.vue';
 import { openBuscaman } from 'src/utils/buscaman';
 import SendSmsDialog from 'components/common/SendSmsDialog.vue';
-import RouteSearchbar from 'pages/Route/Card/RouteSearchbar.vue';
-import { useStateStore } from 'stores/useStateStore';
 
 const { t } = useI18n();
 const quasar = useQuasar();
 const route = useRoute();
 
-const stateStore = useStateStore();
 const selectedRows = ref([]);
 const columns = computed(() => [
     {

src/pages/Shelving/ShelvingList.vue

@@ -10,6 +10,7 @@ import ShelvingFilter from 'pages/Shelving/Card/ShelvingFilter.vue';
 import ShelvingSummary from 'pages/Shelving/Card/ShelvingSummary.vue';
 import ShelvingSearchbar from 'pages/Shelving/Card/ShelvingSearchbar.vue';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
+import RightMenu from 'src/components/common/RightMenu.vue';
 
 const stateStore = useStateStore();
 const router = useRouter();
@@ -39,31 +40,12 @@ function exprBuilder(param, value) {
 </script>
 
 <template>
-    <template v-if="stateStore.isHeaderMounted()">
+    <ShelvingSearchbar />
-        <Teleport to="#searchbar">
+    <RightMenu>
-            <ShelvingSearchbar />
+        <template #right-panel>
-        </Teleport>
-        <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">
             <ShelvingFilter data-key="ShelvingList" />
-        </QScrollArea>
+        </template>
-    </QDrawer>
+    </RightMenu>
     <QPage class="column items-center q-pa-md">
         <div class="vn-card-list">
             <VnPaginate

src/pages/Supplier/SupplierList.vue

@@ -7,10 +7,9 @@ import CardList from 'src/components/ui/CardList.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
 import SupplierSummary from './Card/SupplierSummary.vue';
 import SupplierListFilter from './SupplierListFilter.vue';
-import { useStateStore } from 'stores/useStateStore';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
+import RightMenu from 'src/components/common/RightMenu.vue';
 
-const stateStore = useStateStore();
 const router = useRouter();
 const { t } = useI18n();
 const { viewSummary } = useSummaryDialog();
@@ -25,22 +24,13 @@ const redirectToCreateView = () => {
 </script>
 
 <template>
-    <template v-if="stateStore.isHeaderMounted()">
+    <VnSearchbar data-key="SuppliersList" :limit="20" :label="t('Search suppliers')" />
-        <Teleport to="#searchbar">
+    <RightMenu>
-            <VnSearchbar
+        <template #right-panel>
-                data-key="SuppliersList"
+            <SupplierListFilter data-key="SuppliersList" />
-                :limit="20"
+        </template>
-                :label="t('Search suppliers')"
+    </RightMenu>
-            />
-        </Teleport>
-    </template>
-
     <QPage class="column items-center q-pa-md">
-        <QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above>
-            <QScrollArea class="fit text-grey-8">
-                <SupplierListFilter data-key="SuppliersList" />
-            </QScrollArea>
-        </QDrawer>
         <div class="vn-card-list">
             <VnPaginate data-key="SuppliersList" url="Suppliers/filter">
                 <template #body="{ rows }">

src/pages/Ticket/TicketList.vue

@@ -11,6 +11,7 @@ import TicketFilter from './TicketFilter.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
 import CardList from 'src/components/ui/CardList.vue';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
+import RightMenu from 'src/components/common/RightMenu.vue';
 
 const router = useRouter();
 const { t } = useI18n();
@@ -35,35 +36,16 @@ function navigate(id) {
 </script>
 
 <template>
-    <template v-if="stateStore.isHeaderMounted()">
+    <VnSearchbar
-        <Teleport to="#searchbar">
+        data-key="TicketList"
-            <VnSearchbar
+        :label="t('Search ticket')"
-                data-key="TicketList"
+        :info="t('You can search by ticket id or alias')"
-                :label="t('Search ticket')"
+    />
-                :info="t('You can search by ticket id or alias')"
+    <RightMenu>
-            />
+        <template #right-panel>
-        </Teleport>
-        <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">
-        <QScrollArea class="fit text-grey-8">
             <TicketFilter data-key="TicketList" />
-        </QScrollArea>
+        </template>
-    </QDrawer>
+    </RightMenu>
     <QPage class="column items-center q-pa-md">
         <div class="vn-card-list">
             <VnPaginate

src/pages/Travel/ExtraCommunity.vue

@@ -18,6 +18,7 @@ import { toDate } from 'src/filters';
 import { usePrintService } from 'composables/usePrintService';
 import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 import axios from 'axios';
+import RightMenu from 'src/components/common/RightMenu.vue';
 
 const router = useRouter();
 const stateStore = useStateStore();
@@ -421,15 +422,16 @@ const handleDragScroll = (event) => {
 </script>
 
 <template>
-    <template v-if="stateStore.isHeaderMounted()">
+    <VnSearchbar
-        <Teleport to="#searchbar">
+        data-key="ExtraCommunity"
-            <VnSearchbar
+        :limit="20"
-                data-key="ExtraCommunity"
+        :label="t('searchExtraCommunity')"
-                :limit="20"
+    />
-                :label="t('searchExtraCommunity')"
+    <RightMenu>
-            />
+        <template #right-panel>
-        </Teleport>
+            <ExtraCommunityFilter data-key="ExtraCommunity" />
-    </template>
+        </template>
+    </RightMenu>
     <VnSubToolbar class="justify-end">
         <template #st-actions>
             <QBtn
@@ -444,11 +446,6 @@ const handleDragScroll = (event) => {
             </QBtn>
         </template>
     </VnSubToolbar>
-    <QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above>
-        <QScrollArea class="fit text-grey-8">
-            <ExtraCommunityFilter data-key="ExtraCommunity" />
-        </QScrollArea>
-    </QDrawer>
     <QPage class="column items-center q-pa-md">
         <QTable
             :rows="rows"

src/pages/Travel/TravelList.vue

@@ -14,6 +14,7 @@ import { useStateStore } from 'stores/useStateStore';
 import { toDate } from 'src/filters/index';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
 import { getDateQBadgeColor } from 'src/composables/getDateQBadgeColor.js';
+import RightMenu from 'src/components/common/RightMenu.vue';
 
 const router = useRouter();
 const { t } = useI18n();
@@ -49,15 +50,6 @@ onMounted(async () => {
 </script>
 
 <template>
-    <template v-if="stateStore.isHeaderMounted()">
-        <Teleport to="#searchbar">
-            <VnSearchbar
-                data-key="TravelList"
-                :limit="20"
-                :label="t('searchByIdOrReference')"
-            />
-        </Teleport>
-    </template>
     <FetchData
         url="Warehouses"
         :filter="{ fields: ['id', 'name'] }"
@@ -65,11 +57,12 @@ onMounted(async () => {
         @on-fetch="(data) => (warehouses = data)"
         auto-load
     />
-    <QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above>
+    <VnSearchbar data-key="TravelList" :limit="20" :label="t('searchByIdOrReference')" />
-        <QScrollArea class="fit text-grey-8">
+    <RightMenu>
+        <template #right-panel>
             <TravelFilter data-key="TravelList" />
-        </QScrollArea>
+        </template>
-    </QDrawer>
+    </RightMenu>
     <QPage class="column items-center q-pa-md">
         <div class="vn-card-list">
             <VnPaginate

src/pages/Worker/Card/WorkerCalendarItem.vue

@@ -136,13 +136,6 @@ const getEventByTimestamp = ({ year, month, day }) => {
     return props.events[stamp] || null;
 };
 
-const isFestive = (timestamp) => {
-    const event = getEventByTimestamp(timestamp);
-    if (!event) return false;
-
-    const { isFestive } = event;
-    return isFestive;
-};
 const getEventAttrs = (timestamp) => {
     const event = getEventByTimestamp(timestamp);
     if (!event) return {};

src/pages/Worker/WorkerList.vue

@@ -1,7 +1,6 @@
 <script setup>
 import { useI18n } from 'vue-i18n';
 import { useRouter } from 'vue-router';
-import { useStateStore } from 'stores/useStateStore';
 import VnPaginate from 'src/components/ui/VnPaginate.vue';
 import WorkerSummary from './Card/WorkerSummary.vue';
 import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
@@ -9,8 +8,8 @@ import WorkerFilter from './WorkerFilter.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
 import CardList from 'src/components/ui/CardList.vue';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
+import RightMenu from 'src/components/common/RightMenu.vue';
 
-const stateStore = useStateStore();
 const router = useRouter();
 const { t } = useI18n();
 const { viewSummary } = useSummaryDialog();
@@ -23,37 +22,17 @@ const redirectToCreateView = () => {
     router.push({ name: 'WorkerCreate' });
 };
 </script>
-
 <template>
-    <template v-if="stateStore.isHeaderMounted()">
+    <VnSearchbar
-        <Teleport to="#searchbar">
+        data-key="WorkerList"
-            <VnSearchbar
+        :label="t('Search worker')"
-                data-key="WorkerList"
+        :info="t('You can search by worker id or name')"
-                :label="t('Search worker')"
+    />
-                :info="t('You can search by worker id or name')"
+    <RightMenu>
-            />
+        <template #right-panel>
-        </Teleport>
-        <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">
             <WorkerFilter data-key="WorkerList" />
-        </QScrollArea>
+        </template>
-    </QDrawer>
+    </RightMenu>
     <QPage class="column items-center q-pa-md">
         <div class="vn-card-list">
             <VnPaginate

src/pages/Zone/Card/ZoneCard.vue

@@ -14,10 +14,12 @@ const customRouteRedirectName = computed(() => {
     if (routeName.value === 'ZoneLocations') return null;
     return routeName.value;
 });
+const searchbarMakeFetch = computed(() => routeName.value !== 'ZoneEvents');
 const searchBarDataKeys = {
     ZoneWarehouses: 'ZoneWarehouses',
     ZoneSummary: 'ZoneSummary',
     ZoneLocations: 'ZoneLocations',
+    ZoneEvents: 'ZoneEvents',
 };
 </script>
 <template>
@@ -27,6 +29,7 @@ const searchBarDataKeys = {
         :search-data-key="searchBarDataKeys[routeName]"
         :search-custom-route-redirect="customRouteRedirectName"
         :search-redirect="!!customRouteRedirectName"
+        :search-make-fetch="searchbarMakeFetch"
         :searchbar-label="t('list.searchZone')"
         :searchbar-info="t('list.searchInfo')"
     />

src/pages/Zone/Card/ZoneEventExclusionForm.vue

@@ -0,0 +1,207 @@
+<script setup>
+import { ref, computed, onMounted } from 'vue';
+import { useI18n } from 'vue-i18n';
+import { useRoute } from 'vue-router';
+
+import VnRow from 'components/ui/VnRow.vue';
+import FormPopup from 'components/FormPopup.vue';
+import ZoneLocationsTree from './ZoneLocationsTree.vue';
+import VnInputDate from 'src/components/common/VnInputDate.vue';
+
+import { useArrayData } from 'src/composables/useArrayData';
+import { useVnConfirm } from 'composables/useVnConfirm';
+import axios from 'axios';
+
+const props = defineProps({
+    date: {
+        type: Date,
+        required: true,
+        default: null,
+    },
+    event: {
+        type: Object,
+        default: null,
+    },
+    isNewMode: {
+        type: Boolean,
+        default: true,
+    },
+    eventType: {
+        type: String,
+        default: '',
+    },
+    geoIds: {
+        type: Array,
+        default: () => [],
+    },
+});
+
+const emit = defineEmits(['onSubmit', 'closeForm']);
+
+const route = useRoute();
+const { t } = useI18n();
+const { openConfirmationModal } = useVnConfirm();
+
+const isNew = computed(() => props.isNewMode);
+const dated = ref(null);
+const tickedNodes = ref();
+
+const _excludeType = ref('all');
+const excludeType = computed({
+    get: () => _excludeType.value,
+    set: (val) => {
+        _excludeType.value = val;
+    },
+});
+
+const arrayData = useArrayData('ZoneEvents');
+
+const exclusionGeoCreate = async () => {
+    try {
+        if (isNew.value) {
+            const params = {
+                zoneFk: parseInt(route.params.id),
+                date: dated.value,
+                geoIds: tickedNodes.value,
+            };
+            await axios.post('Zones/exclusionGeo', params);
+        } else {
+            const params = {
+                zoneExclusionFk: props.event?.zoneExclusionFk,
+                geoIds: tickedNodes.value,
+            };
+            await axios.post('Zones/updateExclusionGeo', params);
+        }
+        await refetchEvents();
+    } catch (err) {
+        console.error('Error creating exclusion geo: ', err);
+    }
+};
+
+const exclusionCreate = async () => {
+    try {
+        if (isNew.value)
+            await axios.post(`Zones/${route.params.id}/exclusions`, [
+                { dated: dated.value },
+            ]);
+        else
+            await axios.put(`Zones/${route.params.id}/exclusions/${props.event?.id}`, {
+                dated: dated.value,
+            });
+
+        await refetchEvents();
+    } catch (err) {
+        console.error('Error creating exclusion: ', err);
+    }
+};
+
+const onSubmit = async () => {
+    if (excludeType.value === 'all') exclusionCreate();
+    else exclusionGeoCreate();
+};
+
+const deleteEvent = async () => {
+    try {
+        if (!props.event) return;
+        const exclusionId = props.event?.zoneExclusionFk || props.event?.id;
+        await axios.delete(`Zones/${route.params.id}/exclusions/${exclusionId}`);
+        await refetchEvents();
+    } catch (err) {
+        console.error('Error deleting event: ', err);
+    }
+};
+
+const closeForm = () => emit('closeForm');
+
+const refetchEvents = async () => {
+    await arrayData.refresh({ append: false });
+    closeForm();
+};
+
+onMounted(() => {
+    if (props.event) {
+        dated.value = props.event?.dated;
+        excludeType.value =
+            props.eventType === 'geoExclusion' ? 'specificLocations' : 'all';
+        tickedNodes.value = props.geoIds || [];
+    } else if (props.date) dated.value = props.date;
+});
+</script>
+
+<template>
+    <FormPopup
+        :title="
+            isNew
+                ? t('eventsExclusionForm.addExclusion')
+                : t('eventsExclusionForm.editExclusion')
+        "
+        @on-submit="onSubmit()"
+        :default-cancel-button="false"
+        :default-submit-button="false"
+    >
+        <template #form-inputs>
+            <VnRow class="row q-gutter-md q-mb-lg">
+                <VnInputDate :label="t('eventsInclusionForm.day')" v-model="dated" />
+            </VnRow>
+            <div class="column q-gutter-y-sm q-mb-md">
+                <QRadio
+                    v-model="excludeType"
+                    dense
+                    val="all"
+                    :label="t('eventsExclusionForm.all')"
+                />
+                <QRadio
+                    v-model="excludeType"
+                    dense
+                    val="specificLocations"
+                    :label="t('eventsExclusionForm.specificLocations')"
+                />
+            </div>
+            <div
+                v-if="excludeType === 'specificLocations'"
+                style="min-height: 60vh; overflow-y: scroll"
+            >
+                <ZoneLocationsTree
+                    :root-label="t('eventsExclusionForm.rootTreeLabel')"
+                    v-model:tickedNodes="tickedNodes"
+                    show-search-bar
+                    show-default-checkboxes
+                >
+                    <template #content="{ node }">
+                        <span>{{ node.name }}</span>
+                    </template>
+                </ZoneLocationsTree>
+            </div>
+        </template>
+        <template #custom-buttons>
+            <QBtn
+                :label="t('globals.cancel')"
+                color="primary"
+                flat
+                class="q-mr-sm"
+                v-close-popup
+            />
+            <QBtn
+                v-if="
+                    !isNew && (eventType === 'exclusion' || eventType === 'geoExclusion')
+                "
+                :label="t('globals.delete')"
+                color="primary"
+                flat
+                class="q-mr-sm"
+                @click="
+                    openConfirmationModal(
+                        t('eventsPanel.deleteTitle'),
+                        t('eventsPanel.deleteSubtitle'),
+                        () => deleteEvent()
+                    )
+                "
+            />
+            <QBtn
+                :label="isNew ? t('globals.add') : t('globals.save')"
+                type="submit"
+                color="primary"
+            />
+        </template>
+    </FormPopup>
+</template>

src/pages/Zone/Card/ZoneEventInclusionForm.vue

@@ -0,0 +1,240 @@
+<script setup>
+import { ref, computed, onMounted } from 'vue';
+import { useI18n } from 'vue-i18n';
+import { useRoute } from 'vue-router';
+
+import VnRow from 'components/ui/VnRow.vue';
+import FormPopup from 'components/FormPopup.vue';
+import VnInputDate from 'src/components/common/VnInputDate.vue';
+import VnWeekdayPicker from 'src/components/common/VnWeekdayPicker.vue';
+import VnInputTime from 'components/common/VnInputTime.vue';
+import VnInput from 'src/components/common/VnInput.vue';
+
+import { useArrayData } from 'src/composables/useArrayData';
+import { useWeekdayStore } from 'src/stores/useWeekdayStore';
+import { useVnConfirm } from 'composables/useVnConfirm';
+import axios from 'axios';
+
+const props = defineProps({
+    date: {
+        type: Date,
+        required: true,
+        default: null,
+    },
+    event: {
+        type: Object,
+        default: null,
+    },
+    isNewMode: {
+        type: Boolean,
+        default: true,
+    },
+    eventType: {
+        type: Boolean,
+        default: true,
+    },
+});
+
+const emit = defineEmits(['onSubmit', 'closeForm']);
+
+const route = useRoute();
+const { t } = useI18n();
+const weekdayStore = useWeekdayStore();
+const { openConfirmationModal } = useVnConfirm();
+
+const isNew = computed(() => props.isNewMode);
+const eventInclusionFormData = ref({ wdays: [] });
+
+const _inclusionType = ref('indefinitely');
+const inclusionType = computed({
+    get: () => _inclusionType.value,
+    set: (val) => {
+        _inclusionType.value = val;
+        eventInclusionFormData.value.type = val;
+    },
+});
+
+const arrayData = useArrayData('ZoneEvents');
+
+const createEvent = async () => {
+    try {
+        eventInclusionFormData.value.weekDays = weekdayStore.toSet(
+            eventInclusionFormData.value.wdays
+        );
+
+        if (inclusionType.value == 'day') eventInclusionFormData.value.weekDays = '';
+        else eventInclusionFormData.value.dated = null;
+
+        if (inclusionType.value != 'range') {
+            eventInclusionFormData.value.started = null;
+            eventInclusionFormData.value.ended = null;
+        }
+
+        if (isNew.value)
+            await axios.post(
+                `Zones/${route.params.id}/events`,
+                eventInclusionFormData.value
+            );
+        else
+            await axios.put(
+                `Zones/${route.params.id}/events/${props.event?.id}`,
+                eventInclusionFormData.value
+            );
+
+        await refetchEvents();
+        emit('onSubmit');
+    } catch (err) {
+        console.error('Error creating event', err);
+    }
+};
+
+const deleteEvent = async () => {
+    try {
+        if (!props.event) return;
+        await axios.delete(`Zones/${route.params.id}/events/${props.event?.id}`);
+        await refetchEvents();
+    } catch (err) {
+        console.error('Error deleting event: ', err);
+    }
+};
+
+const closeForm = () => {
+    emit('closeForm');
+};
+
+const refetchEvents = async () => {
+    await arrayData.refresh({ append: false });
+    closeForm();
+};
+
+onMounted(() => {
+    if (props.event) {
+        eventInclusionFormData.value = { ...props.event };
+        inclusionType.value = props.event?.type || 'day';
+    } else if (props.date) {
+        eventInclusionFormData.value.dated = props.date;
+        inclusionType.value = 'day';
+    } else inclusionType.value = 'indefinitely';
+});
+</script>
+
+<template>
+    <FormPopup
+        :title="
+            isNew ? t('eventsInclusionForm.addEvent') : t('eventsInclusionForm.editEvent')
+        "
+        @on-submit="createEvent()"
+        :default-cancel-button="false"
+        :default-submit-button="false"
+    >
+        <template #form-inputs>
+            <div class="column q-gutter-y-sm q-mb-md">
+                <QRadio
+                    v-model="inclusionType"
+                    dense
+                    val="day"
+                    :label="t('eventsInclusionForm.oneDay')"
+                />
+                <QRadio
+                    v-model="inclusionType"
+                    dense
+                    val="indefinitely"
+                    :label="t('eventsInclusionForm.indefinitely')"
+                />
+                <QRadio
+                    v-model="inclusionType"
+                    dense
+                    val="range"
+                    :label="t('eventsInclusionForm.rangeOfDates')"
+                    class="q-mb-sm"
+                />
+            </div>
+            <VnRow class="row q-gutter-md q-mb-md">
+                <div class="col flex justify-center">
+                    <VnInputDate
+                        v-if="inclusionType === 'day'"
+                        :label="t('eventsInclusionForm.day')"
+                        v-model="eventInclusionFormData.dated"
+                        class="full-width"
+                    />
+                    <VnWeekdayPicker
+                        v-else
+                        v-model:wdays="eventInclusionFormData.wdays"
+                    />
+                </div>
+            </VnRow>
+            <VnRow v-if="inclusionType === 'range'" class="row q-gutter-md q-mb-md">
+                <VnInputDate
+                    :label="t('eventsInclusionForm.from')"
+                    v-model="eventInclusionFormData.started"
+                />
+                <VnInputDate
+                    :label="t('eventsInclusionForm.to')"
+                    v-model="eventInclusionFormData.ended"
+                />
+            </VnRow>
+            <VnRow class="row q-gutter-md q-mb-md">
+                <VnInputTime
+                    v-model="eventInclusionFormData.hour"
+                    :label="t('eventsInclusionForm.closing')"
+                />
+                <VnInput
+                    v-model="eventInclusionFormData.travelingDays"
+                    :label="t('eventsInclusionForm.travelingDays')"
+                    type="number"
+                    min="0"
+                />
+            </VnRow>
+            <VnRow class="row q-gutter-md q-mb-md">
+                <VnInput
+                    v-model="eventInclusionFormData.price"
+                    :label="t('eventsInclusionForm.price')"
+                    type="number"
+                    min="0"
+                />
+                <VnInput
+                    v-model="eventInclusionFormData.bonus"
+                    :label="t('eventsInclusionForm.bonus')"
+                    type="number"
+                    min="0"
+                />
+            </VnRow>
+            <VnRow class="row q-gutter-md q-mb-md">
+                <VnInput
+                    v-model="eventInclusionFormData.m3Max"
+                    :label="t('eventsInclusionForm.m3Max')"
+                    type="number"
+                    min="0"
+                />
+            </VnRow>
+        </template>
+        <template #custom-buttons>
+            <QBtn
+                :label="t('globals.cancel')"
+                color="primary"
+                flat
+                class="q-mr-sm"
+                v-close-popup
+            />
+            <QBtn
+                v-if="!isNew && eventType === 'event'"
+                :label="t('globals.delete')"
+                color="primary"
+                flat
+                class="q-mr-sm"
+                @click="
+                    openConfirmationModal(
+                        t('eventsPanel.deleteTitle'),
+                        t('eventsPanel.deleteSubtitle'),
+                        () => deleteEvent()
+                    )
+                "
+            />
+            <QBtn
+                :label="isNew ? t('globals.save') : t('globals.add')"
+                type="submit"
+                color="primary"
+            />
+        </template>
+    </FormPopup>
+</template>

src/pages/Zone/Card/ZoneEvents.vue

@@ -0,0 +1,111 @@
+<script setup>
+import { ref, onUnmounted } from 'vue';
+import { useI18n } from 'vue-i18n';
+
+import ZoneEventsPanel from './ZoneEventsPanel.vue';
+import ZoneCalendarGrid from '../ZoneCalendarGrid.vue';
+import ZoneEventInclusionForm from './ZoneEventInclusionForm.vue';
+import ZoneEventExclusionForm from './ZoneEventExclusionForm.vue';
+
+import { useStateStore } from 'stores/useStateStore';
+import { reactive } from 'vue';
+
+const { t } = useI18n();
+const stateStore = useStateStore();
+
+const firstDay = ref(null);
+const lastDay = ref(null);
+
+const events = ref([]);
+const formModeName = ref('include');
+const showZoneEventForm = ref(false);
+const zoneEventsFormProps = reactive({
+    isNewMode: true,
+    date: null,
+});
+
+const openForm = (data) => {
+    const { date = null, isNewMode, event, eventType, geoIds = [] } = data;
+    zoneEventsFormProps.date = date;
+    zoneEventsFormProps.isNewMode = isNewMode;
+    zoneEventsFormProps.event = event;
+    zoneEventsFormProps.eventType = eventType;
+    if (geoIds.length) zoneEventsFormProps.geoIds = geoIds;
+
+    showZoneEventForm.value = true;
+};
+
+const onZoneEventFormClose = () => {
+    showZoneEventForm.value = false;
+    zoneEventsFormProps.value = {};
+};
+
+onUnmounted(() => (stateStore.rightDrawer = false));
+</script>
+
+<template>
+    <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">
+            <ZoneEventsPanel
+                :first-day="firstDay"
+                :last-day="lastDay"
+                :events="events"
+                v-model:formModeName="formModeName"
+                @open-zone-form="openForm"
+            />
+        </QScrollArea>
+    </QDrawer>
+    <QPage class="q-pa-md flex justify-center">
+        <ZoneCalendarGrid
+            v-model:events="events"
+            v-model:firstDay="firstDay"
+            v-model:lastDay="lastDay"
+            data-key="ZoneEvents"
+            @on-date-selected="openForm"
+        />
+        <QDialog v-model="showZoneEventForm" @hide="onZoneEventFormClose()">
+            <ZoneEventInclusionForm
+                v-if="formModeName === 'include'"
+                v-bind="zoneEventsFormProps"
+                @close-form="onZoneEventFormClose()"
+            />
+            <ZoneEventExclusionForm
+                v-else
+                v-bind="zoneEventsFormProps"
+                @close-form="onZoneEventFormClose()"
+            />
+        </QDialog>
+        <QPageSticky :offset="[20, 20]">
+            <QBtn
+                @click="
+                    openForm({
+                        isNewMode: true,
+                    })
+                "
+                color="primary"
+                fab
+                icon="add"
+            />
+            <QTooltip class="text-no-wrap">
+                {{ t('eventsInclusionForm.addEvent') }}
+            </QTooltip>
+        </QPageSticky>
+    </QPage>
+</template>

src/pages/Zone/Card/ZoneEventsPanel.vue

@@ -0,0 +1,221 @@
+<script setup>
+import { onMounted, watch, computed } from 'vue';
+import { useI18n } from 'vue-i18n';
+import { useRoute } from 'vue-router';
+
+import { useArrayData } from 'src/composables/useArrayData';
+import axios from 'axios';
+import { toDateFormat, toTimeFormat } from 'src/filters/date.js';
+import { dashOrCurrency } from 'filters/index';
+import { dashIfEmpty } from 'src/filters';
+import { useWeekdayStore } from 'src/stores/useWeekdayStore';
+import { useVnConfirm } from 'composables/useVnConfirm';
+
+const props = defineProps({
+    firstDay: {
+        type: Date,
+        required: true,
+        default: null,
+    },
+    lastDay: {
+        type: Date,
+        required: true,
+        default: null,
+    },
+    events: {
+        type: Array,
+        required: true,
+        default: () => [],
+    },
+    formModeName: {
+        type: String,
+        required: true,
+        default: 'include',
+    },
+});
+
+const emit = defineEmits(['openZoneForm', 'update:formModeName']);
+
+const { t } = useI18n();
+const route = useRoute();
+const weekdayStore = useWeekdayStore();
+const { openConfirmationModal } = useVnConfirm();
+
+const formName = computed({
+    get: () => props.formModeName,
+    set: (value) => emit('update:formModeName', value),
+});
+
+const params = computed(() => ({
+    zoneFk: route.params.id,
+    started: props.firstDay,
+    ended: props.lastDay,
+}));
+const arrayData = useArrayData('ZoneEvents', {
+    params: params,
+    url: `Zones/getEventsFiltered`,
+});
+
+const fetchData = async () => {
+    try {
+        if (!params.value.zoneFk || !params.value.started || !params.value.ended) return;
+
+        await arrayData.applyFilter({
+            params: params.value,
+        });
+    } catch (err) {
+        console.error('Error fetching events: ', err);
+    }
+};
+
+watch(
+    params,
+    async () => {
+        await fetchData();
+    },
+    { immediate: true, deep: true }
+);
+
+const formatWdays = (event) => {
+    if (!event.weekDays) return;
+
+    let abrWdays = event.weekDays
+        .split(',')
+        .map((wday) => weekdayStore.getLocalesMap[wday].localeAbr);
+
+    return abrWdays.length < 7 ? abrWdays.join(', ') : t('eventsPanel.everyday');
+};
+
+const deleteEvent = async (id) => {
+    try {
+        if (!id) return;
+        await axios.delete(`Zones/${route.params.id}/events/${id}`);
+        await fetchData();
+    } catch (err) {
+        console.error('Error deleting event: ', err);
+    }
+};
+
+const openInclusionForm = (event) => {
+    formName.value = 'include';
+    emit('openZoneForm', {
+        date: event.dated,
+        event,
+        isNewMode: false,
+        eventType: 'event',
+    });
+};
+
+onMounted(async () => {
+    weekdayStore.initStore();
+});
+</script>
+
+<template>
+    <QForm @submit="onSubmit()">
+        <div class="column q-pa-md q-gutter-y-sm">
+            <span class="color-vn-label text-subtitle1">{{
+                t('eventsPanel.editMode')
+            }}</span>
+            <QRadio
+                v-model="formName"
+                dense
+                val="include"
+                :label="t('eventsPanel.include')"
+            />
+            <QRadio
+                v-model="formName"
+                dense
+                val="exclude"
+                :label="t('eventsPanel.exclude')"
+                class="q-mb-sm"
+            />
+        </div>
+        <span class="color-vn-label text-subtitle1 q-px-md">{{
+            t('eventsPanel.events')
+        }}</span>
+        <QList>
+            <QItem v-for="(event, index) in events" :key="index" class="event-card">
+                <QItemSection left @click="openInclusionForm(event)">
+                    <div v-if="event.type == 'day'" class="q-mb-xs">
+                        {{ toDateFormat(event.dated) }}
+                    </div>
+                    <div v-if="event.type != 'day'" class="q-mb-xs">
+                        <span v-if="event.weekDays">
+                            {{ formatWdays(event) }}
+                        </span>
+                        <span v-if="event.type == 'range'">
+                            ({{ toDateFormat(event.started) }} -
+                            {{ toDateFormat(event.ended) }})
+                        </span>
+                    </div>
+                    <span class="color-vn-label">
+                        {{ t('eventsPanel.closing') }}:
+                        <span class="color-vn-text q-ml-xs">
+                            {{ dashIfEmpty(toTimeFormat(event.hour)) }}
+                        </span>
+                    </span>
+                    <span class="color-vn-label">
+                        {{ t('eventsPanel.travelingDays') }}:
+                        <span class="color-vn-text">
+                            {{ dashIfEmpty(event.travelingDays) }}
+                        </span>
+                    </span>
+                    <span class="color-vn-label">
+                        {{ t('eventsPanel.price') }}:
+                        <span class="color-vn-text">
+                            {{ dashOrCurrency(event.price)() }}</span
+                        >
+                    </span>
+                    <span class="color-vn-label">
+                        {{ t('eventsPanel.bonus') }}:
+                        <span class="color-vn-text">
+                            {{ dashOrCurrency(event.bonus)() }}</span
+                        >
+                    </span>
+                    <span class="color-vn-label">
+                        {{ t('eventsPanel.m3Max') }}:
+                        <span class="color-vn-text"> {{ dashIfEmpty(event.m3Max) }}</span>
+                    </span>
+                </QItemSection>
+                <QItemSection side @click="openInclusionForm(event)">
+                    <QBtn
+                        icon="delete"
+                        flat
+                        dense
+                        size="md"
+                        color="primary"
+                        @click.stop="
+                            openConfirmationModal(
+                                t('eventsPanel.deleteTitle'),
+                                t('eventsPanel.deleteSubtitle'),
+                                () => deleteEvent(event.id)
+                            )
+                        "
+                    >
+                        <QTooltip>{{ t('eventsPanel.delete') }}</QTooltip>
+                    </QBtn>
+                </QItemSection>
+            </QItem>
+            <span
+                v-if="!events.length"
+                class="flex justify-center text-h5 color-vn-label"
+            >
+                {{ t('globals.noResults') }}
+            </span>
+        </QList>
+    </QForm>
+</template>
+
+<style scoped lang="scss">
+.event-card {
+    display: flex;
+    border-bottom: $border-thin-light;
+    margin: 0;
+
+    &:hover {
+        background-color: var(--vn-accent-color);
+        cursor: pointer;
+    }
+}
+</style>

src/pages/Zone/Card/ZoneLocations.vue

@@ -24,7 +24,8 @@ const onSelected = async (val, node) => {
     <QPage class="column items-center q-pa-md">
         <QCard class="full-width q-pa-md" style="max-width: 800px">
             <ZoneLocationsTree :root-label="t('zoneLocations.locations')">
-                <template #checkbox="{ node }">
+                <template #content="{ node }">
+                    <span v-if="!node.id">{{ node.name }}</span>
                     <QCheckbox
                         v-if="node.id"
                         v-model="node.selected"

src/pages/Zone/Card/ZoneLocationsTree.vue

@@ -1,12 +1,34 @@
 <script setup>
-import { onMounted, ref, computed, watch } from 'vue';
+import { onMounted, ref, computed, watch, onUnmounted } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
 
+import VnInput from 'src/components/common/VnInput.vue';
+
 import { useState } from 'src/composables/useState';
 import axios from 'axios';
 import { useArrayData } from 'composables/useArrayData';
-import { onUnmounted } from 'vue';
+
+const props = defineProps({
+    rootLabel: {
+        type: String,
+        default: 'Locations',
+    },
+    tickedNodes: {
+        type: Array,
+        default: () => [],
+    },
+    showSearchBar: {
+        type: Boolean,
+        default: false,
+    },
+    showDefaultCheckboxes: {
+        type: Boolean,
+        default: false,
+    },
+});
+
+const emit = defineEmits(['update:tickedNodes']);
 
 const { t } = useI18n();
 const route = useRoute();
@@ -22,9 +44,21 @@ const { store } = arrayData;
 const storeData = computed(() => store.data);
 
 const nodes = ref([
-    { id: null, name: t('zoneLocations.locations'), sons: true, childs: [{}] },
+    {
+        id: null,
+        name: props.rootLabel,
+        sons: true,
+        tickable: false,
+        noTick: true,
+        children: [{}],
+    },
 ]);
 
+const _tickedNodes = computed({
+    get: () => props.tickedNodes,
+    set: (value) => emit('update:tickedNodes', value),
+});
+
 const previousExpandedNodes = ref(new Set());
 
 const onNodeExpanded = async (nodeKeysArray) => {
@@ -107,17 +141,19 @@ watch(storeData, async (val) => {
             formatNodeSelected(n);
         });
     } else {
-        for (let n of state.get('Tree')) {
+        for (let n of state.get('Tree')) await fetchNodeLeaves(n);
-            await fetchNodeLeaves(n);
-        }
         expanded.value = [null, ...fetchedNodeKeys];
     }
     previousExpandedNodes.value = new Set(expanded.value);
 });
 
+const reFetch = async () => {
+    await arrayData.fetch({ append: false });
+};
+
 onMounted(async () => {
-    if (store.userParams?.search) {
+    if (store.userParams?.search && !props.showSearchBar) {
-        await arrayData.fetch({ append: false });
+        await reFetch();
         return;
     }
     const stateTree = state.get('Tree');
@@ -140,6 +176,7 @@ onMounted(async () => {
         }
     }, 1000);
 
+    expanded.value.unshift(null);
     previousExpandedNodes.value = new Set(expanded.value);
 });
 
@@ -149,14 +186,26 @@ onUnmounted(() => {
 </script>
 
 <template>
+    <VnInput
+        v-if="showSearchBar"
+        v-model="store.userParams.search"
+        :placeholder="t('globals.search')"
+        @keydown.enter.prevent="reFetch()"
+    >
+        <template #prepend>
+            <QIcon class="cursor-pointer" name="search" />
+        </template>
+    </VnInput>
     <QTree
         ref="treeRef"
         :nodes="nodes"
         node-key="id"
         label-key="name"
         children-key="childs"
+        :tick-strategy="props.showDefaultCheckboxes ? 'strict' : 'none'"
         v-model:expanded="expanded"
         @update:expanded="onNodeExpanded($event)"
+        v-model:ticked="_tickedNodes"
         :default-expand-all="true"
     >
         <template #default-header="{ node }">
@@ -164,8 +213,7 @@ onUnmounted(() => {
                 :id="node.id"
                 class="qtr row justify-between full-width q-pr-md cursor-pointer"
             >
-                <span v-if="!node.id">{{ node.name }}</span>
+                <slot name="content" :node="node" />
-                <slot name="checkbox" :node="node" />
             </div>
         </template>
     </QTree>

src/pages/Zone/ZoneCalendar.vue

@@ -2,6 +2,7 @@
 import { ref, computed } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { date } from 'quasar';
+import { useRoute } from 'vue-router';
 
 import ZoneClosingTable from './ZoneClosingTable.vue';
 import QCalendarMonthWrapper from 'src/components/ui/QCalendarMonthWrapper.vue';
@@ -38,7 +39,10 @@ const props = defineProps({
     },
 });
 
+const emit = defineEmits(['onDateSelected']);
+
 const { locale } = useI18n();
+const route = useRoute();
 
 const calendarRef = ref(null);
 const weekdayStore = useWeekdayStore();
@@ -52,7 +56,11 @@ const todayTimestamp = computed(() => {
 });
 const _monthDate = computed(() => date.formatDate(props.monthDate, 'YYYY-MM-DD'));
 
+const isZoneDeliveryView = computed(() => route.name === 'ZoneDeliveryDays');
+
 const onEventSelection = async ({ year, month, day }) => {
+    if (!isZoneDeliveryView.value) return;
+
     const date = new Date(year, month - 1, day);
     const stamp = date.getTime();
     const events = props.daysMap[stamp];
@@ -81,6 +89,13 @@ const getEventByTimestamp = ({ year, month, day }) => {
     );
 };
 
+const getEventType = ({ year, month, day }) => {
+    const stamp = new Date(year, month - 1, day).getTime();
+    if (props.exclusions[stamp]) return 'exclusion';
+    if (props.geoExclusions[stamp]) return 'geoExclusion';
+    return 'event';
+};
+
 const getEventAttrs = ({ year, month, day }) => {
     const stamp = new Date(year, month - 1, day).getTime();
 
@@ -104,6 +119,28 @@ const isToday = (timestamp) => {
 const calendarHeaderTitle = computed(() => {
     return `${weekdayStore.getLocaleMonths[props.month - 1].locale} ${props.year}`;
 });
+
+const handleDateClick = (timestamp) => {
+    if (isZoneDeliveryView.value) return;
+
+    const event = getEventByTimestamp(timestamp);
+    const { year, month, day } = timestamp;
+    const date = new Date(year, month - 1, day);
+    const stamp = date.getTime();
+    const eventType = getEventType(timestamp);
+
+    let geoIds = [];
+    if (eventType === 'geoExclusion')
+        geoIds = props.geoExclusions[stamp].map((geoExclusion) => geoExclusion.geoFk);
+
+    emit('onDateSelected', {
+        date,
+        isNewMode: !event,
+        event: event && event.length > 0 ? event[0] : null,
+        eventType,
+        geoIds,
+    });
+};
 </script>
 
 <template>
@@ -128,6 +165,7 @@ const calendarHeaderTitle = computed(() => {
                 short-weekday-label
                 :locale="locale"
                 :now="today"
+                @click-date="handleDateClick($event.scope.timestamp)"
                 mini-mode
             >
                 <template #day="{ scope: { timestamp } }">
@@ -135,7 +173,11 @@ const calendarHeaderTitle = computed(() => {
                     <QBtn
                         v-if="getEventByTimestamp(timestamp)"
                         v-bind="{ ...getEventAttrs(timestamp) }"
-                        @click="onEventSelection(timestamp)"
+                        @click="
+                            isZoneDeliveryView
+                                ? onEventSelection(timestamp)
+                                : handleDateClick(timestamp)
+                        "
                         rounded
                         dense
                         flat
@@ -144,7 +186,7 @@ const calendarHeaderTitle = computed(() => {
                             '--today': isToday(timestamp),
                         }"
                     >
-                        <QPopupProxy>
+                        <QPopupProxy v-if="isZoneDeliveryView">
                             <ZoneClosingTable
                                 v-if="zoneClosingData && zoneClosingData.length"
                                 :rows="zoneClosingData"

src/pages/Zone/ZoneCalendarGrid.vue

@@ -0,0 +1,250 @@
+<script setup>
+import { computed, onMounted, ref, watch, onUnmounted, nextTick } from 'vue';
+
+import ZoneCalendar from './ZoneCalendar.vue';
+
+import { useStateStore } from 'stores/useStateStore';
+import { useWeekdayStore } from 'src/stores/useWeekdayStore';
+import { useArrayData } from 'src/composables/useArrayData';
+
+const props = defineProps({
+    dataKey: {
+        type: String,
+        required: true,
+    },
+});
+
+const emit = defineEmits([
+    'update:firstDay',
+    'update:lastDay',
+    'update:events',
+    'onDateSelected',
+]);
+
+const stateStore = useStateStore();
+const weekdayStore = useWeekdayStore();
+
+const nMonths = ref(4);
+const _date = ref(Date.vnNew());
+const _data = ref(null);
+const firstDay = ref(null);
+const lastDay = ref(null);
+const months = ref([]);
+const days = ref({});
+const exclusions = ref({});
+const geoExclusions = ref({});
+const events = ref([]);
+
+const arrayData = useArrayData(props.dataKey);
+const { store } = arrayData;
+
+const refreshEvents = () => {
+    days.value = {};
+    if (!data.value) return;
+
+    let day = new Date(firstDay.value.getTime());
+
+    while (day <= lastDay.value) {
+        let stamp = day.getTime();
+        let wday = day.getDay();
+        let dayEvents = [];
+        let _exclusions = exclusions.value[stamp] || [];
+
+        if (events.value) {
+            for (let event of events.value) {
+                let match;
+                switch (event.type) {
+                    case 'day':
+                        match = event.dated == stamp;
+                        break;
+                    default:
+                        match =
+                            event.wdays[wday] &&
+                            (!event.started || stamp >= event.started) &&
+                            (!event.ended || stamp <= event.ended);
+                        break;
+                }
+                if (match && !_exclusions.find((e) => e.zoneFk == event.zoneFk)) {
+                    dayEvents.push(event);
+                }
+            }
+        }
+        if (dayEvents.length) days.value[stamp] = dayEvents;
+
+        day.setDate(day.getDate() + 1);
+    }
+    emit('update:events', events.value);
+};
+
+const date = computed({
+    get: () => _date.value,
+    set: (value) => {
+        _date.value = value;
+        let stamp = value.getTime();
+
+        firstDay.value = new Date(stamp);
+        firstDay.value.setDate(1);
+
+        lastDay.value = new Date(stamp);
+        lastDay.value.setMonth(lastDay.value.getMonth() + nMonths.value);
+        lastDay.value.setDate(0);
+
+        months.value = [];
+        for (let i = 0; i < nMonths.value; i++) {
+            let monthDate = new Date(stamp);
+            monthDate.setMonth(value.getMonth() + i);
+            months.value.push(monthDate);
+        }
+
+        emit('update:firstDay', firstDay.value);
+        emit('update:lastDay', lastDay.value);
+        refreshEvents();
+    },
+});
+
+const data = computed({
+    get: () => {
+        return _data.value;
+    },
+    set: (value) => {
+        _data.value = value;
+
+        value = value || {};
+
+        events.value = value.events;
+        function toStamp(date) {
+            return date && new Date(date).setHours(0, 0, 0, 0);
+        }
+
+        exclusions.value = {};
+        let _exclusions = value.exclusions;
+
+        if (_exclusions) {
+            for (let exclusion of _exclusions) {
+                let stamp = toStamp(exclusion.dated);
+                if (!exclusions[stamp]) exclusions.value[stamp] = [];
+                exclusions.value[stamp].push(exclusion);
+            }
+        }
+
+        geoExclusions.value = {};
+        let _geoExclusions = value.geoExclusions;
+        if (_geoExclusions) {
+            for (let geoExclusion of _geoExclusions) {
+                let stamp = toStamp(geoExclusion.dated);
+                if (!geoExclusions.value[stamp]) geoExclusions.value[stamp] = [];
+                geoExclusions.value[stamp].push(geoExclusion);
+            }
+        }
+
+        let _events = value.events;
+        if (_events) {
+            for (let event of _events) {
+                event.dated = toStamp(event.dated);
+                event.ended = toStamp(event.ended);
+                event.started = toStamp(event.started);
+                event.wdays = weekdayStore.fromSet(event.weekDays || '');
+            }
+        }
+
+        refreshEvents();
+    },
+});
+
+watch(
+    () => store.data,
+    (value) => {
+        data.value = value;
+    },
+    { immediate: true }
+);
+
+const getMonthNameAndYear = (date) => {
+    const monthName = weekdayStore.getLocaleMonths[date.getMonth()].locale;
+    const year = date.getFullYear();
+    return `${monthName} ${year}`;
+};
+
+const headerTitle = computed(() => {
+    if (!months.value?.length) return;
+
+    const firstMonth = getMonthNameAndYear(months.value[0]);
+    const lastMonth = getMonthNameAndYear(months.value[months.value.length - 1]);
+
+    return `${firstMonth} - ${lastMonth}`;
+});
+
+const step = (direction) => {
+    const _date = new Date(date.value);
+    _date.setMonth(_date.getMonth() + nMonths.value * direction);
+    date.value = _date;
+};
+
+const onDateSelected = (data) => emit('onDateSelected', data);
+
+onMounted(async () => {
+    let initialDate = Date.vnNew();
+    initialDate.setDate(1);
+    initialDate.setHours(0, 0, 0, 0);
+    date.value = initialDate;
+    weekdayStore.initStore();
+    await nextTick();
+    stateStore.rightDrawer = true;
+});
+
+onUnmounted(() => arrayData.destroy());
+</script>
+
+<template>
+    <QCard style="height: max-content">
+        <div class="calendars-header">
+            <QBtn
+                icon="arrow_left"
+                size="sm"
+                flat
+                class="full-height"
+                @click="step(-1)"
+            />
+            <span>{{ headerTitle }}</span>
+            <QBtn
+                icon="arrow_right"
+                size="sm"
+                flat
+                class="full-height"
+                @click="step(1)"
+            />
+        </div>
+        <div class="calendars-container">
+            <ZoneCalendar
+                v-for="(month, index) in months"
+                :key="index"
+                :month="month.getMonth() + 1"
+                :year="month.getFullYear()"
+                :month-date="month"
+                :geo-exclusions="geoExclusions"
+                :exclusions="exclusions"
+                :days-map="days"
+                @on-date-selected="onDateSelected"
+            />
+        </div>
+    </QCard>
+</template>
+
+<style lang="scss" scoped>
+.calendars-header {
+    height: 45px;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    background-color: $primary;
+    font-weight: bold;
+    font-size: 16px;
+}
+
+.calendars-container {
+    max-width: 800px;
+    display: flex;
+    flex-wrap: wrap;
+    justify-content: space-evenly;
+}
+</style>

src/pages/Zone/ZoneDeliveryDays.vue

@@ -1,257 +1,26 @@
 <script setup>
-import { computed, onMounted, ref, watch, onUnmounted } from 'vue';
+import { ref } from 'vue';
-import { useI18n } from 'vue-i18n';
-
 import ZoneDeliveryPanel from './ZoneDeliveryPanel.vue';
-import ZoneDeliveryCalendar from './ZoneDeliveryCalendar.vue';
+import ZoneCalendarGrid from './ZoneCalendarGrid.vue';
+import RightMenu from 'src/components/common/RightMenu.vue';
 
-import { useStateStore } from 'stores/useStateStore';
-import { useWeekdayStore } from 'src/stores/useWeekdayStore';
-import { useArrayData } from 'src/composables/useArrayData';
-
-const { t } = useI18n();
-const stateStore = useStateStore();
-const weekdayStore = useWeekdayStore();
-
-const nMonths = ref(4);
-const _date = ref(Date.vnNew());
-const _data = ref(null);
 const firstDay = ref(null);
 const lastDay = ref(null);
-const months = ref([]);
-const days = ref({});
-const exclusions = ref({});
-const geoExclusions = ref({});
 const events = ref([]);
-const arrayData = useArrayData('ZoneDeliveryDays', {
-    url: 'Zones/getEvents',
-});
-const { store } = arrayData;
-
-const refreshEvents = () => {
-    days.value = {};
-    if (!data.value) return;
-
-    let day = new Date(firstDay.value.getTime());
-
-    while (day <= lastDay.value) {
-        let stamp = day.getTime();
-        let wday = day.getDay();
-        let dayEvents = [];
-        let _exclusions = exclusions.value[stamp] || [];
-
-        if (events.value) {
-            for (let event of events.value) {
-                let match;
-                switch (event.type) {
-                    case 'day':
-                        match = event.dated == stamp;
-                        break;
-                    default:
-                        match =
-                            event.wdays[wday] &&
-                            (!event.started || stamp >= event.started) &&
-                            (!event.ended || stamp <= event.ended);
-                        break;
-                }
-                if (match && !_exclusions.find((e) => e.zoneFk == event.zoneFk)) {
-                    dayEvents.push(event);
-                }
-            }
-        }
-        if (dayEvents.length) days.value[stamp] = dayEvents;
-
-        day.setDate(day.getDate() + 1);
-    }
-};
-
-const date = computed({
-    get: () => _date.value,
-    set: (value) => {
-        _date.value = value;
-        let stamp = value.getTime();
-
-        firstDay.value = new Date(stamp);
-        firstDay.value.setDate(1);
-
-        lastDay.value = new Date(stamp);
-        lastDay.value.setMonth(lastDay.value.getMonth() + nMonths.value);
-        lastDay.value.setDate(0);
-
-        months.value = [];
-        for (let i = 0; i < nMonths.value; i++) {
-            let monthDate = new Date(stamp);
-            monthDate.setMonth(value.getMonth() + i);
-            months.value.push(monthDate);
-        }
-        refreshEvents();
-    },
-});
-
-const data = computed({
-    get: () => {
-        return _data.value;
-    },
-    set: (value) => {
-        _data.value = value;
-
-        value = value || {};
-
-        events.value = value.events;
-        function toStamp(date) {
-            return date && new Date(date).setHours(0, 0, 0, 0);
-        }
-
-        exclusions.value = {};
-        let _exclusions = value.exclusions;
-
-        if (_exclusions) {
-            for (let exclusion of _exclusions) {
-                let stamp = toStamp(exclusion.dated);
-                if (!exclusions[stamp]) exclusions.value[stamp] = [];
-                exclusions.value[stamp].push(exclusion);
-            }
-        }
-
-        geoExclusions.value = {};
-        let _geoExclusions = value.geoExclusions;
-
-        if (_geoExclusions) {
-            for (let geoExclusion of _geoExclusions) {
-                let stamp = toStamp(geoExclusion.dated);
-                if (!geoExclusions[stamp]) geoExclusions.value[stamp] = [];
-                geoExclusions.value[stamp].push(geoExclusion);
-            }
-        }
-
-        let _events = value.events;
-        if (_events) {
-            for (let event of _events) {
-                event.dated = toStamp(event.dated);
-                event.ended = toStamp(event.ended);
-                event.started = toStamp(event.started);
-                event.wdays = weekdayStore.fromSet(event.weekDays || '');
-            }
-        }
-
-        refreshEvents();
-    },
-});
-
-watch(
-    () => store.data,
-    (value) => {
-        data.value = value;
-    },
-    { immediate: true }
-);
-
-const getMonthNameAndYear = (date) => {
-    const monthName = weekdayStore.getLocaleMonths[date.getMonth()].locale;
-    const year = date.getFullYear();
-    return `${monthName} ${year}`;
-};
-
-const headerTitle = computed(() => {
-    if (!months.value?.length) return;
-
-    const firstMonth = getMonthNameAndYear(months.value[0]);
-    const lastMonth = getMonthNameAndYear(months.value[months.value.length - 1]);
-
-    return `${firstMonth} - ${lastMonth}`;
-});
-
-const step = (direction) => {
-    const _date = new Date(date.value);
-    _date.setMonth(_date.getMonth() + nMonths.value * direction);
-    date.value = _date;
-};
-
-onMounted(async () => {
-    stateStore.rightDrawer = true;
-    let initialDate = Date.vnNew();
-    initialDate.setDate(1);
-    initialDate.setHours(0, 0, 0, 0);
-    date.value = initialDate;
-    weekdayStore.initStore();
-});
-
-onUnmounted(() => arrayData.destroy());
 </script>
 
 <template>
-    <template v-if="stateStore.isHeaderMounted()">
+    <RightMenu>
-        <Teleport to="#actions-append">
+        <template #right-panel>
-            <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">
             <ZoneDeliveryPanel />
-        </QScrollArea>
+        </template>
-    </QDrawer>
+    </RightMenu>
     <QPage class="q-pa-md flex justify-center">
-        <QCard style="height: max-content">
+        <ZoneCalendarGrid
-            <div class="calendars-header">
+            v-model:events="events"
-                <QBtn
+            v-model:firstDay="firstDay"
-                    icon="arrow_left"
+            v-model:lastDay="lastDay"
-                    size="sm"
+            data-key="ZoneDeliveryDays"
-                    flat
+        />
-                    class="full-height"
-                    @click="step(-1)"
-                />
-                <span>{{ headerTitle }}</span>
-                <QBtn
-                    icon="arrow_right"
-                    size="sm"
-                    flat
-                    class="full-height"
-                    @click="step(1)"
-                />
-            </div>
-            <div class="calendars-container">
-                <ZoneDeliveryCalendar
-                    v-for="(month, index) in months"
-                    :key="index"
-                    :month="month.getMonth() + 1"
-                    :year="month.getFullYear()"
-                    :month-date="month"
-                    :geo-exclusions="geoExclusions"
-                    :exclusions="exclusions"
-                    :days-map="days"
-                />
-            </div>
-        </QCard>
     </QPage>
 </template>
-
-<style lang="scss" scoped>
-.calendars-header {
-    height: 45px;
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    background-color: $primary;
-    font-weight: bold;
-    font-size: 16px;
-}
-
-.calendars-container {
-    max-width: 800px;
-    display: flex;
-    flex-wrap: wrap;
-    justify-content: space-evenly;
-}
-</style>

src/pages/Zone/ZoneDeliveryPanel.vue

@@ -2,7 +2,6 @@
 import { onMounted, ref, reactive } from 'vue';
 import { useI18n } from 'vue-i18n';
 
-import FetchData from 'components/FetchData.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
 
 import { useArrayData } from 'src/composables/useArrayData';

src/pages/Zone/ZoneList.vue

@@ -13,6 +13,8 @@ import { useVnConfirm } from 'composables/useVnConfirm';
 import useNotify from 'src/composables/useNotify.js';
 import { useStateStore } from 'stores/useStateStore';
 import axios from 'axios';
+import RightMenu from 'src/components/common/RightMenu.vue';
+import ZoneFilterPanel from './ZoneFilterPanel.vue';
 
 const stateStore = useStateStore();
 const { t } = useI18n();
@@ -85,6 +87,11 @@ onMounted(() => (stateStore.rightDrawer = true));
 </script>
 
 <template>
+    <RightMenu>
+        <template #right-panel>
+            <ZoneFilterPanel data-key="ZoneList" :expr-builder="exprBuilder" />
+        </template>
+    </RightMenu>
     <QPage class="column items-center q-pa-md">
         <div class="vn-card-list">
             <VnPaginate

src/pages/Zone/ZoneMain.vue

@@ -1,14 +1,11 @@
 <script setup>
 import { useI18n } from 'vue-i18n';
-import { useRoute } from 'vue-router';
 import { useStateStore } from 'stores/useStateStore';
 import LeftMenu from 'src/components/LeftMenu.vue';
 import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
-import ZoneFilterPanel from './ZoneFilterPanel.vue';
 
 const { t } = useI18n();
 const stateStore = useStateStore();
-const route = useRoute();
 
 const exprBuilder = (param, value) => {
     switch (param) {
@@ -41,32 +38,17 @@ const exprBuilder = (param, value) => {
 </script>
 
 <template>
-    <template v-if="stateStore.isHeaderMounted()">
+    <VnSearchbar
-        <Teleport to="#searchbar">
+        data-key="ZoneList"
-            <VnSearchbar
+        url="Zones"
-                data-key="ZoneList"
+        :filter="{
-                url="Zones"
+            include: { relation: 'agencyMode', scope: { fields: ['name'] } },
-                :filter="{
+        }"
-                    include: { relation: 'agencyMode', scope: { fields: ['name'] } },
+        :expr-builder="exprBuilder"
-                }"
+        :label="t('list.searchZone')"
-                :expr-builder="exprBuilder"
+        :info="t('list.searchInfo')"
-                :label="t('list.searchZone')"
+        custom-route-redirect-name="ZoneSummary"
-                :info="t('list.searchInfo')"
+    />
-                custom-route-redirect-name="ZoneSummary"
-            />
-        </Teleport>
-    </template>
-    <QDrawer
-        v-if="route.name === 'ZoneList'"
-        v-model="stateStore.rightDrawer"
-        side="right"
-        :width="256"
-        show-if-above
-    >
-        <QScrollArea class="fit text-grey-8">
-            <ZoneFilterPanel data-key="ZoneList" :expr-builder="exprBuilder" />
-        </QScrollArea>
-    </QDrawer>
     <QDrawer v-model="stateStore.leftDrawer" show-if-above :width="256">
         <QScrollArea class="fit text-grey-8">
             <LeftMenu />

src/pages/Zone/locale/en.yml

@@ -7,6 +7,7 @@ zone:
         deliveryDays: Delivery days
         upcomingDeliveries: Upcoming deliveries
         warehouses: Warehouses
+        calendar: Calendar
 list:
     clone: Clone
     id: Id
@@ -66,6 +67,41 @@ warehouses:
     deleteSubtitle: Are you sure you want to continue?
     warehouse: Warehouse
     add: Add
+eventsPanel:
+    editMode: Edit mode
+    include: Include
+    exclude: Exclude
+    events: Events
+    closing: Closing
+    travelingDays: Traveling days
+    price: Price
+    bonus: Bonus
+    m3Max: Max m³
+    everyday: Everyday
+    delete: Delete
+    deleteTitle: This item will be deleted
+    deleteSubtitle: Are you sure you want to continue?
+eventsExclusionForm:
+    addExclusion: Add exclusion
+    editExclusion: Edit exclusion
+    day: Day
+    all: All
+    specificLocations: Specific locations
+    rootTreeLabel: Locations where it is not distributed
+eventsInclusionForm:
+    addEvent: Add event
+    editEvent: Edit event
+    oneDay: One day
+    indefinitely: Indefinitely
+    rangeOfDates: Range of dates
+    day: Day
+    closing: Closing
+    travelingDays: Traveling days
+    price: Price
+    bonus: Bonus
+    m3Max: Max m³
+    from: From
+    to: To
 upcomingDeliveries:
     province: Province
     closing: Closing

src/pages/Zone/locale/es.yml

@@ -7,6 +7,7 @@ zone:
         deliveryDays: Días de entrega
         upcomingDeliveries: Próximos repartos
         warehouses: Almacenes
+        calendar: Calendario
 list:
     clone: Clonar
     id: Id
@@ -68,6 +69,41 @@ warehouses:
     deleteSubtitle: ¿Seguro que quieres continuar?
     warehouse: Almacén
     add: Añadir
+eventsPanel:
+    editMode: Modo edición
+    include: Incluir
+    exclude: Excluir
+    events: Eventos
+    closing: Cierre
+    travelingDays: Días de viaje
+    price: Precio
+    bonus: Bonificación
+    m3Max: Meidida máxima
+    everyday: Todos los días
+    delete: Eliminar
+    deleteTitle: Este elemento será eliminado
+    deleteSubtitle: ¿Seguro que quieres continuar?
+eventsExclusionForm:
+    addExclusion: Añadir exclusión
+    editExclusion: Editar exclusión
+    day: Día
+    all: Todo
+    specificLocations: Localizaciones concretas
+    rootTreeLabel: Localizaciones en las que no se reparte
+eventsInclusionForm:
+    addEvent: Añadir evento
+    editEvent: Editar evento
+    oneDay: Un día
+    indefinitely: Indefinido
+    rangeOfDates: Rango de fechas
+    day: Día
+    closing: Cierre
+    travelingDays: Días de viaje
+    price: Precio
+    bonus: Bonificación
+    m3Max: Medida máxima
+    from: Desde
+    to: Hasta
 upcomingDeliveries:
     province: Provincia
     closing: Cierre