src/components/VnTable/VnChip.vue

@@ -35,7 +35,9 @@ function stopEventPropagation(event) {
             dense
             square
         >
-            <span v-if="!col.chip.icon">{{ row[col.name] }}</span>
+            <span v-if="!col.chip.icon">
+                {{ col.format ? col.format(row) : row[col.name] }}
+            </span>
             <QIcon v-else :name="col.chip.icon" color="primary-light" />
         </QChip>
     </span>

src/components/VnTable/VnColumn.vue

@@ -147,7 +147,7 @@ const col = computed(() => {
     }
     if (
         (newColumn.name.startsWith('is') || newColumn.name.startsWith('has')) &&
-        !newColumn.component
+        newColumn.component == null
     )
         newColumn.component = 'checkbox';
     if ($props.default && !newColumn.component) newColumn.component = $props.default;

src/components/VnTable/VnFilter.vue

@@ -75,6 +75,7 @@ const components = {
         attrs: {
             ...defaultAttrs,
             clearable: true,
+            type: 'number',
         },
         forceAttrs,
     },

src/components/VnTable/VnOrder.vue

@@ -1,7 +1,7 @@
 <script setup>
 import { ref } from 'vue';
 import { useArrayData } from 'composables/useArrayData';
-const model = defineModel({ type: Object, required: true });
+const model = defineModel({ type: Object });
 const $props = defineProps({
     name: {
         type: String,
@@ -56,7 +56,7 @@ defineExpose({ orderBy });
         <span :title="label">{{ label }}</span>
         <QChip
             v-if="name"
-            :label="!vertical && model?.index"
+            :label="!vertical ? model?.index : ''"
             :icon="
                 (model?.index || hover) && !vertical
                     ? model?.direction == 'DESC'

src/components/VnTable/VnTable.vue

@@ -37,6 +37,10 @@ const $props = defineProps({
         type: [Function, Boolean],
         default: null,
     },
+    rowCtrlClick: {
+        type: [Function, Boolean],
+        default: null,
+    },
     redirect: {
         type: String,
         default: null,
@@ -92,9 +96,9 @@ const route = useRoute();
 const router = useRouter();
 const quasar = useQuasar();
 
-const DEFAULT_MODE = 'card';
+const CARD_MODE = 'card';
 const TABLE_MODE = 'table';
-const mode = ref(DEFAULT_MODE);
+const mode = ref(CARD_MODE);
 const selected = ref([]);
 const hasParams = ref(false);
 const routeQuery = JSON.parse(route?.query[$props.searchUrl] ?? '{}');
@@ -114,7 +118,7 @@ const tableModes = [
     {
         icon: 'grid_view',
         title: t('grid view'),
-        value: DEFAULT_MODE,
+        value: CARD_MODE,
         disable: $props.disableOption?.card,
     },
 ];
@@ -124,7 +128,10 @@ onBeforeMount(() => {
 });
 
 onMounted(() => {
-    mode.value = quasar.platform.is.mobile ? DEFAULT_MODE : $props.defaultMode;
+    mode.value =
+        quasar.platform.is.mobile && !$props.disableOption?.card
+            ? CARD_MODE
+            : $props.defaultMode;
     stateStore.rightDrawer = true;
     columnsVisibilitySkiped.value = [
         ...splittedColumns.value.columns
@@ -171,13 +178,17 @@ function splitColumns(columns) {
     };
 
     for (const col of columns) {
-        if (col.name == 'tableActions') splittedColumns.value.actions = col;
+        if (col.name == 'tableActions') {
+            col.orderBy = false;
+            splittedColumns.value.actions = col;
+        }
         if (col.chip) splittedColumns.value.chips.push(col);
         if (col.isTitle) splittedColumns.value.title = col;
         if (col.create) splittedColumns.value.create.push(col);
         if (col.cardVisible) splittedColumns.value.cardVisible.push(col);
         if ($props.isEditable && col.disable == null) col.disable = false;
-        if ($props.useModel) col.columnFilter = { ...col.columnFilter, inWhere: true };
+        if ($props.useModel && col.columnFilter != false)
+            col.columnFilter = { ...col.columnFilter, inWhere: true };
         splittedColumns.value.columns.push(col);
     }
     // Status column
@@ -202,6 +213,16 @@ const rowClickFunction = computed(() => {
     return () => {};
 });
 
+const rowCtrlClickFunction = computed(() => {
+    if ($props.rowCtrlClick != undefined) return $props.rowCtrlClick;
+    if ($props.redirect)
+        return (evt, { id }) => {
+            stopEventPropagation(evt);
+            window.open(`/#/${$props.redirect}/${id}`, '_blank');
+        };
+    return () => {};
+});
+
 function redirectFn(id) {
     router.push({ path: `/${$props.redirect}/${id}` });
 }
@@ -212,6 +233,7 @@ function stopEventPropagation(event) {
 }
 
 function reload(params) {
+    selected.value = [];
     CrudModelRef.value.reload(params);
 }
 
@@ -263,7 +285,9 @@ defineExpose({
                 <template #body>
                     <div
                         class="row no-wrap flex-center"
-                        v-for="col of splittedColumns.columns"
+                        v-for="col of splittedColumns.columns.filter(
+                            (c) => c.columnFilter ?? true
+                        )"
                         :key="col.id"
                     >
                         <VnTableFilter
@@ -273,6 +297,10 @@ defineExpose({
                             :search-url="searchUrl"
                         />
                         <VnTableOrder
+                            v-if="
+                                col?.columnFilter !== false &&
+                                col?.name !== 'tableActions'
+                            "
                             v-model="orders[col.name]"
                             :name="col.orderBy ?? col.name"
                             :data-key="$attrs['data-key']"
@@ -361,7 +389,7 @@ defineExpose({
                         />
                     </template>
                     <template #header-cell="{ col }">
-                        <QTh v-if="col.visible ?? true" auto-width>
+                        <QTh v-if="col.visible ?? true">
                             <div
                                 class="column self-start q-ml-xs ellipsis"
                                 :class="`text-${col?.align ?? 'left'}`"
@@ -386,6 +414,7 @@ defineExpose({
                                     :data-key="$attrs['data-key']"
                                     v-model="params[columnName(col)]"
                                     :search-url="searchUrl"
+                                    class="full-width"
                                 />
                             </div>
                         </QTh>
@@ -410,8 +439,13 @@ defineExpose({
                         <QTd
                             auto-width
                             class="no-margin q-px-xs"
-                            :class="[getColAlign(col), col.class, col.columnField?.class]"
+                            :class="[getColAlign(col), col.columnClass]"
                             v-if="col.visible ?? true"
+                            @click.ctrl="
+                                ($event) =>
+                                    rowCtrlClickFunction &&
+                                    rowCtrlClickFunction($event, row)
+                            "
                         >
                             <slot :name="`column-${col.name}`" :col="col" :row="row">
                                 <VnTableColumn
@@ -433,6 +467,7 @@ defineExpose({
                         >
                             <QBtn
                                 v-for="(btn, index) of col.actions"
+                                v-show="btn.show ? btn.show(row) : true"
                                 :key="index"
                                 :title="btn.title"
                                 :icon="btn.icon"

src/components/common/VnComponent.vue

@@ -17,15 +17,17 @@ const $props = defineProps({
     },
 });
 
+let mixed;
 const componentArray = computed(() => {
     if (typeof $props.prop === 'object') return [$props.prop];
     return $props.prop;
 });
 
 function mix(toComponent) {
+    if (mixed) return mixed;
     const { component, attrs, event } = toComponent;
     const customComponent = $props.components[component];
-    return {
+    mixed = {
         component: customComponent?.component ?? component,
         attrs: {
             ...toValueAttrs(attrs),
@@ -35,6 +37,7 @@ function mix(toComponent) {
         },
         event: event ?? customComponent?.event,
     };
+    return mixed;
 }
 
 function toValueAttrs(attrs) {

src/components/common/VnSectionMain.vue

@@ -1,8 +1,16 @@
 <script setup>
 import { useStateStore } from 'stores/useStateStore';
 import LeftMenu from 'components/LeftMenu.vue';
+import { onMounted } from 'vue';
 
 const stateStore = useStateStore();
+const $props = defineProps({
+    leftDrawer: {
+        type: Boolean,
+        default: true,
+    },
+});
+onMounted(() => (stateStore.leftDrawer = $props.leftDrawer));
 </script>
 
 <template>

src/components/common/VnSelect.vue

@@ -27,7 +27,7 @@ const $props = defineProps({
     },
     url: {
         type: String,
-        default: '',
+        default: null,
     },
     filterOptions: {
         type: [Array],
@@ -113,7 +113,7 @@ function setOptions(data) {
 }
 
 function filter(val, options) {
-    const search = val.toString().toLowerCase();
+    const search = val?.toString()?.toLowerCase();
 
     if (!search) return options;
 

src/components/ui/VnRow.vue

@@ -1,18 +1,28 @@
+<script setup>
+defineProps({ wrap: { type: Boolean, default: false } });
+</script>
 <template>
-    <div class="vn-row q-gutter-md q-mb-md">
+    <div class="vn-row q-gutter-md q-mb-md" :class="{ wrap }">
-        <slot></slot>
+        <slot />
     </div>
 </template>
-<style lang="scss" scopped>
+<style lang="scss" scoped>
 .vn-row {
     display: flex;
-    > * {
+    &.wrap {
+        flex-wrap: wrap;
+    }
+    &:not(.wrap) {
+        > :slotted(*) {
             flex: 1;
         }
     }
+}
 @media screen and (max-width: 800px) {
     .vn-row {
+        &:not(.wrap) {
             flex-direction: column;
         }
     }
+}
 </style>

src/css/app.scss

@@ -233,13 +233,7 @@ input::-webkit-inner-spin-button {
 }
 
 .q-table {
-    thead,
+    th,
-    tbody {
-        th {
-            .q-select {
-                max-width: 120px;
-            }
-        }
     td {
         padding: 1px 10px 1px 10px;
         max-width: 100px;
@@ -252,8 +246,10 @@ input::-webkit-inner-spin-button {
         white-space: nowrap;
         text-overflow: ellipsis;
     }
+    .shrink {
+        max-width: 75px;
+    }
     .expand {
         max-width: 400px;
     }
 }
-}

src/pages/Claim/ClaimList.vue

@@ -44,7 +44,7 @@ const columns = computed(() => [
                 fields: ['id', 'name'],
             },
         },
-        class: 'expand',
+        columnClass: 'expand',
     },
     {
         align: 'left',

src/pages/Claim/ClaimMain.vue

@@ -1,17 +0,0 @@
-<script setup>
-import { useStateStore } from 'stores/useStateStore';
-import LeftMenu from 'components/LeftMenu.vue';
-
-const stateStore = useStateStore();
-</script>
-
-<template>
-    <QDrawer v-model="stateStore.leftDrawer" show-if-above :width="256">
-        <QScrollArea class="fit text-grey-8">
-            <LeftMenu />
-        </QScrollArea>
-    </QDrawer>
-    <QPageContainer>
-        <RouterView></RouterView>
-    </QPageContainer>
-</template>

src/pages/Customer/Card/CustomerConsumption.vue

@@ -1,13 +1,14 @@
 <script setup>
 import { useI18n } from 'vue-i18n';
-
+import CustomerConsumptionFilter from './CustomerConsumptionFilter.vue';
+import { useStateStore } from 'src/stores/useStateStore';
 const { t } = useI18n();
 </script>
 
 <template>
-    <h5 class="flex justify-center color-vn-label">
+    <Teleport to="#right-panel" v-if="useStateStore().isHeaderMounted()">
-        {{ t('Enter a new search') }}
+        <CustomerConsumptionFilter data-key="CustomerConsumption" />
-    </h5>
+    </Teleport>
 </template>
 
 <i18n>

src/pages/Customer/Card/CustomerConsumptionFilter.vue

@@ -0,0 +1,91 @@
+<script setup>
+import { useI18n } from 'vue-i18n';
+import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
+import VnInput from 'src/components/common/VnInput.vue';
+import { QItem } from 'quasar';
+import VnSelect from 'src/components/common/VnSelect.vue';
+import { QItemSection } from 'quasar';
+
+const { t } = useI18n();
+defineProps({ dataKey: { type: String, required: true } });
+</script>
+<template>
+    <VnFilterPanel :data-key="dataKey" :search-button="true">
+        <template #tags="{ tag, formatFn }">
+            <div class="q-gutter-x-xs">
+                <strong>{{ t(`params.${tag.label}`) }}: </strong>
+                <span>{{ formatFn(tag.value) }}</span>
+            </div>
+        </template>
+        <template #body="{ params }">
+            <QItem>
+                <QItemSection>
+                    <VnInput
+                        :label="t('params.item')"
+                        v-model="params.itemId"
+                        is-outlined
+                        lazy-rules
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnSelect
+                        v-model="params.buyerId"
+                        url="TicketRequests/getItemTypeWorker"
+                        :label="t('params.buyer')"
+                        option-value="id"
+                        option-label="nickname"
+                        dense
+                        outlined
+                        rounded
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <!--It's required to include the relation category !! There's 413 records in production-->
+                <QItemSection>
+                    <VnSelect
+                        v-model="params.typeId"
+                        url="ItemTypes"
+                        :label="t('params.type')"
+                        option-label="name"
+                        option-value="id"
+                        dense
+                        outlined
+                        rounded
+                    >
+                    </VnSelect>
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnSelect
+                        url="ItemCategories"
+                        :label="t('params.category')"
+                        option-label="name"
+                        option-value="id"
+                        v-model="params.categoryId"
+                        dense
+                        outlined
+                        rounded
+                    />
+                </QItemSection>
+            </QItem>
+        </template>
+    </VnFilterPanel>
+</template>
+<i18n>
+en:
+    params:
+        item: Item id
+        buyer: Buyer
+        type: Type
+        category: Category
+es:
+    params:
+        item: Id artículo
+        buyer: Comprador
+        type: Tipo
+        category: Categoría
+</i18n>

src/pages/Customer/Card/CustomerCredits.vue

@@ -1,20 +1,14 @@
 <script setup>
-import { computed, ref } from 'vue';
+import { computed } from 'vue';
 import { useI18n } from 'vue-i18n';
-import { useRoute, useRouter } from 'vue-router';
+import { useRoute } from 'vue-router';
-
 import { QBtn } from 'quasar';
-
 import { toCurrency, toDateHourMin } from 'src/filters';
-
+import VnTable from 'components/VnTable/VnTable.vue';
-import FetchData from 'components/FetchData.vue';
+import VnUserLink from 'src/components/ui/VnUserLink.vue';
-import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
 
 const { t } = useI18n();
 const route = useRoute();
-const router = useRouter();
-
-const rows = ref([]);
 
 const filter = {
     include: [
@@ -26,113 +20,63 @@ const filter = {
             },
         },
     ],
-    where: { clientFk: route.params.id },
+    where: { clientFk: +route.params.id },
     order: ['created DESC'],
     limit: 20,
 };
 
-const tableColumnComponents = {
-    created: {
-        component: 'span',
-        props: () => {},
-        event: () => {},
-    },
-    employee: {
-        component: QBtn,
-        props: () => ({ flat: true, color: 'blue', noCaps: true }),
-        event: () => {},
-    },
-    amount: {
-        component: 'span',
-        props: () => {},
-        event: () => {},
-    },
-};
-
 const columns = computed(() => [
     {
         align: 'left',
-        field: 'created',
-        label: t('Since'),
         name: 'created',
-        format: (value) => toDateHourMin(value),
+        label: t('Since'),
+        format: ({ created }) => toDateHourMin(created),
     },
     {
         align: 'left',
-        field: (value) => value.worker.user.name,
         label: t('Employee'),
         name: 'employee',
     },
     {
         align: 'left',
-        field: 'amount',
         label: t('Credit'),
         name: 'amount',
-        format: (value) => toCurrency(value),
+        format: ({ amount }) => toCurrency(amount),
     },
 ]);
-
-const toCustomerCreditCreate = () => {
-    router.push({ name: 'CustomerCreditCreate' });
-};
 </script>
-
 <template>
-    <FetchData
+    <!-- Column titles are missing -->
-        :filter="filter"
+    <VnTable
-        @on-fetch="(data) => (rows = data)"
+        ref="tableRef"
-        auto-load
+        data-key="ClientCredit"
         url="ClientCredits"
-    />
+        :filter="filter"
-
-    <div class="full-width flex justify-center">
-        <QCard class="card-width q-pa-lg">
-            <QTable
         :columns="columns"
-                :pagination="{ rowsPerPage: 12 }"
+        default-mode="table"
-                :rows="rows"
+        auto-load
-                class="full-width q-mt-md"
+        :right-search="false"
-                row-key="id"
+        :is-editable="false"
-                v-if="rows?.length"
+        :use-model="true"
+        :column-search="false"
+        :disable-option="{ card: true }"
     >
-                <template #body-cell="props">
+        <template #column-employee="{ row }">
-                    <QTd :props="props">
+            <VnUserLink :name="row?.worker?.user?.name" :worker-id="row.worker?.id" />
-                        <QTr :props="props" class="cursor-pointer">
-                            <component
-                                :is="tableColumnComponents[props.col.name].component"
-                                @click="
-                                    tableColumnComponents[props.col.name].event(props)
-                                "
-                                class="rounded-borders q-pa-sm"
-                                v-bind="
-                                    tableColumnComponents[props.col.name].props(props)
-                                "
-                            >
-                                {{ props.value }}
-                                <WorkerDescriptorProxy
-                                    :id="props.row.workerFk"
-                                    v-if="props.col.name === 'employee'"
-                                />
-                            </component>
-                        </QTr>
-                    </QTd>
         </template>
-            </QTable>
+    </VnTable>
-
-            <h5 class="flex justify-center color-vn-label" v-else>
-                {{ t('globals.noResults') }}
-            </h5>
-        </QCard>
-    </div>
-
     <QPageSticky :offset="[18, 18]">
-        <QBtn @click.stop="toCustomerCreditCreate()" color="primary" fab icon="add" />
+        <QBtn
+            @click.stop="$router.push({ name: 'CustomerCreditCreate' })"
+            color="primary"
+            fab
+            icon="add"
+        />
         <QTooltip>
             {{ t('New credit') }}
         </QTooltip>
     </QPageSticky>
 </template>
-
 <i18n>
 es:
     Since: Desde

src/pages/Customer/Card/CustomerSummary.vue

@@ -9,7 +9,7 @@ import VnLv from 'src/components/ui/VnLv.vue';
 import VnLinkPhone from 'src/components/ui/VnLinkPhone.vue';
 import CustomerSummaryTable from 'src/pages/Customer/components/CustomerSummaryTable.vue';
 import VnTitle from 'src/components/common/VnTitle.vue';
-
+import VnRow from 'src/components/ui/VnRow.vue';
 const route = useRoute();
 const { t } = useI18n();
 
@@ -131,41 +131,33 @@ const creditWarning = computed(() => {
                     :url="`#/customer/${entityId}/fiscal-data`"
                     :text="t('customer.summary.fiscalData')"
                 />
-                <QCheckbox
+                <VnRow>
+                    <VnLv
                         :label="t('customer.summary.isEqualizated')"
-                    v-model="entity.isEqualizated"
+                        :value="entity.isEqualizated"
-                    :disable="true"
                     />
-                <QCheckbox
+                    <VnLv
                         :label="t('customer.summary.isActive')"
-                    v-model="entity.isActive"
+                        :value="entity.isActive"
-                    :disable="true"
                     />
-                <QCheckbox
+                </VnRow>
-                    :label="t('customer.summary.invoiceByAddress')"
+                <VnRow>
-                    v-model="entity.hasToInvoiceByAddress"
+                    <VnLv
-                    :disable="true"
-                />
-                <QCheckbox
                         :label="t('customer.summary.verifiedData')"
-                    v-model="entity.isTaxDataChecked"
+                        :value="entity.isTaxDataChecked"
-                    :disable="true"
                     />
-                <QCheckbox
+                    <VnLv
                         :label="t('customer.summary.hasToInvoice')"
-                    v-model="entity.hasToInvoice"
+                        :value="entity.hasToInvoice"
-                    :disable="true"
                     />
-                <QCheckbox
+                </VnRow>
+                <VnRow>
+                    <VnLv
                         :label="t('customer.summary.notifyByEmail')"
-                    v-model="entity.isToBeMailed"
+                        :value="entity.isToBeMailed"
-                    :disable="true"
-                />
-                <QCheckbox
-                    :label="t('customer.summary.vies')"
-                    v-model="entity.isVies"
-                    :disable="true"
                     />
+                    <VnLv :label="t('customer.summary.vies')" :value="entity.isVies" />
+                </VnRow>
             </QCard>
             <QCard class="vn-one">
                 <VnTitle
@@ -178,23 +170,18 @@ const creditWarning = computed(() => {
                 />
                 <VnLv :label="t('customer.summary.bankAccount')" :value="entity.iban" />
                 <VnLv :label="t('customer.summary.dueDay')" :value="entity.dueDay" />
-                <QCheckbox
+                <VnRow class="q-mt-sm" wrap>
-                    style="padding: 0"
+                    <VnLv :label="t('customer.summary.hasLcr')" :value="entity.hasLcr" />
-                    :label="t('customer.summary.hasLcr')"
+                    <VnLv
-                    v-model="entity.hasLcr"
-                    :disable="true"
-                />
-                <QCheckbox
                         :label="t('customer.summary.hasCoreVnl')"
-                    v-model="entity.hasCoreVnl"
+                        :value="entity.hasCoreVnl"
-                    :disable="true"
                     />
 
-                <QCheckbox
+                    <VnLv
                         :label="t('customer.summary.hasB2BVnl')"
-                    v-model="entity.hasSepaVnl"
+                        :value="entity.hasSepaVnl"
-                    :disable="true"
                     />
+                </VnRow>
             </QCard>
             <QCard class="vn-one" v-if="entity.defaultAddress">
                 <VnTitle

src/pages/Customer/CustomerList.vue

@@ -42,9 +42,7 @@ const columns = computed(() => [
         name: 'name',
         isTitle: true,
         create: true,
-        columnField: {
+        columnClass: 'expand',
-            class: 'expand',
-        },
     },
     {
         align: 'left',
@@ -52,9 +50,7 @@ const columns = computed(() => [
         label: t('customer.extendedList.tableVisibleColumns.socialName'),
         isTitle: true,
         create: true,
-        columnField: {
+        columnClass: 'expand',
-            class: 'expand',
-        },
     },
     {
         align: 'left',
@@ -136,9 +132,7 @@ const columns = computed(() => [
         columnFilter: {
             inWhere: true,
         },
-        columnField: {
+        columnClass: 'expand',
-            class: 'expand',
-        },
     },
     {
         align: 'left',

src/pages/Customer/CustomerMain.vue

@@ -1,17 +0,0 @@
-<script setup>
-import { useStateStore } from 'stores/useStateStore';
-import LeftMenu from 'components/LeftMenu.vue';
-
-const stateStore = useStateStore();
-</script>
-
-<template>
-    <QDrawer v-model="stateStore.leftDrawer" show-if-above :width="256">
-        <QScrollArea class="fit text-grey-8">
-            <LeftMenu />
-        </QScrollArea>
-    </QDrawer>
-    <QPageContainer>
-        <RouterView></RouterView>
-    </QPageContainer>
-</template>

src/pages/Customer/Defaulter/CustomerDefaulter.vue

@@ -1,9 +1,8 @@
 <script setup>
 import { ref, computed } from 'vue';
 import { useI18n } from 'vue-i18n';
-import { QBtn, QCheckbox, useQuasar } from 'quasar';
+import { useQuasar } from 'quasar';
 import { toCurrency, toDate, dateRange } from 'filters/index';
-import VnPaginate from 'src/components/ui/VnPaginate.vue';
 import CustomerNotificationsFilter from './CustomerDefaulterFilter.vue';
 import CustomerBalanceDueTotal from './CustomerBalanceDueTotal.vue';
 import CustomerDescriptorProxy from 'src/pages/Customer/Card/CustomerDescriptorProxy.vue';
@@ -11,8 +10,9 @@ import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.v
 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';
+import DepartmentDescriptorProxy from 'src/pages/Department/Card/DepartmentDescriptorProxy.vue';
 import RightMenu from 'src/components/common/RightMenu.vue';
+import VnTable from 'src/components/VnTable/VnTable.vue';
 
 const { t } = useI18n();
 const quasar = useQuasar();
@@ -21,175 +21,139 @@ const dataRef = ref(null);
 const balanceDueTotal = ref(0);
 const selected = ref([]);
 
-const tableColumnComponents = {
-    clientFk: {
-        component: QBtn,
-        props: () => ({ flat: true, class: 'link', noCaps: true }),
-        event: () => {},
-    },
-    isWorker: {
-        component: QCheckbox,
-        props: (prop) => ({
-            disable: true,
-            'model-value': Boolean(prop.value),
-        }),
-        event: () => {},
-    },
-    salesPerson: {
-        component: QBtn,
-        props: () => ({ flat: true, class: 'link', noCaps: true }),
-        event: () => {},
-    },
-    departmentName: {
-        component: 'span',
-        props: () => {},
-        event: () => {},
-    },
-    country: {
-        component: 'span',
-        props: () => {},
-        event: () => {},
-    },
-    payMethod: {
-        component: 'span',
-        props: () => {},
-        event: () => {},
-    },
-    balance: {
-        component: 'span',
-        props: () => {},
-        event: () => {},
-    },
-    author: {
-        component: QBtn,
-        props: () => ({ flat: true, class: 'link', noCaps: true }),
-        event: () => {},
-    },
-    lastObservation: {
-        component: 'span',
-        props: () => {},
-        event: () => {},
-    },
-    date: {
-        component: 'span',
-        props: () => {},
-        event: () => {},
-    },
-    credit: {
-        component: 'span',
-        props: () => {},
-        event: () => {},
-    },
-    from: {
-        component: 'span',
-        props: () => {},
-        event: () => {},
-    },
-    finished: {
-        component: QCheckbox,
-
-        props: (prop) => ({
-            disable: true,
-            'model-value': prop.value,
-        }),
-        event: () => {},
-    },
-};
-
 const columns = computed(() => [
     {
         align: 'left',
-        field: 'clientName',
-        label: t('Client'),
         name: 'clientFk',
-        sortable: true,
+        label: t('Client'),
+        columnFilter: {
+            component: 'select',
+            attrs: {
+                url: 'Clients',
+                fields: ['id', 'name'],
+            },
+        },
     },
     {
         align: 'left',
-        field: ({ isWorker }) => Boolean(isWorker),
-        label: t('Is worker'),
         name: 'isWorker',
+        label: t('Is worker'),
     },
     {
         align: 'left',
-        field: 'salesPersonName',
+        name: 'salesPersonFk',
         label: t('Salesperson'),
-        name: 'salesPerson',
+        columnFilter: {
-        sortable: true,
+            component: 'select',
+            attrs: {
+                url: 'Workers/activeWithInheritedRole',
+                fields: ['id', 'name'],
+                where: { role: 'salesPerson' },
+                useLike: false,
+                optionValue: 'id',
+                optionLabel: 'name',
+                optionFilter: 'firstName',
+            },
+        },
     },
     {
         align: 'left',
-        field: 'departmentName',
+        name: 'departmentFk',
         label: t('Department'),
-        name: 'departmentName',
+        columnFilter: {
-        sortable: true,
+            component: 'select',
+            attrs: {
+                url: 'Departments',
+                fields: ['id', 'name'],
+            },
+        },
     },
     {
         align: 'left',
-        field: 'country',
+        name: 'countryFk',
         label: t('Country'),
-        name: 'country',
+        format: ({ country }) => country,
-        sortable: true,
+        columnFilter: {
+            component: 'select',
+            attrs: {
+                url: 'Countries',
+                fields: ['id', 'name'],
+            },
+        },
     },
     {
         align: 'left',
-        field: 'payMethod',
-        label: t('P. Method'),
         name: 'payMethod',
-        sortable: true,
+        label: t('P. Method'),
-        tooltip: t('Pay method'),
+        columnFilter: {
+            component: 'select',
+            attrs: {
+                url: 'Paymethods',
+            },
+        },
     },
     {
         align: 'left',
-        field: ({ amount }) => toCurrency(amount),
+        name: 'amount',
         label: t('Balance D.'),
-        name: 'balance',
+        format: ({ amount }) => toCurrency(amount),
-        sortable: true,
-        tooltip: t('Balance due'),
     },
     {
         align: 'left',
-        field: 'workerName',
+        name: 'workerFk',
         label: t('Author'),
-        name: 'author',
-        sortable: true,
         tooltip: t('Worker who made the last observation'),
+        columnFilter: {
+            component: 'select',
+            attrs: {
+                url: 'Workers/activeWithInheritedRole',
+                fields: ['id', 'name'],
+                useLike: false,
+                optionValue: 'id',
+                optionLabel: 'name',
+                optionFilter: 'firstName',
+            },
+        },
     },
     {
         align: 'left',
-        field: 'observation',
+        name: 'observation',
         label: t('Last observation'),
-        name: 'lastObservation',
+        columnClass: 'expand',
-        sortable: true,
     },
     {
         align: 'left',
-        field: ({ created }) => toDate(created),
+        name: 'created',
         label: t('L. O. Date'),
-        name: 'date',
+        format: ({ created }) => toDate(created),
-        sortable: true,
         tooltip: t('Last observation date'),
+        columnFilter: {
+            component: 'date',
+        },
     },
     {
         align: 'left',
-        field: ({ creditInsurance }) => toCurrency(creditInsurance),
+        name: 'creditInsurance',
+        format: ({ creditInsurance }) => toCurrency(creditInsurance),
         label: t('Credit I.'),
-        name: 'credit',
-        sortable: true,
         tooltip: t('Credit insurance'),
+        columnFilter: {
+            component: 'number',
+        },
     },
     {
         align: 'left',
-        field: ({ defaulterSinced }) => toDate(defaulterSinced),
+        name: 'defaulterSinced',
+        format: ({ defaulterSinced }) => toDate(defaulterSinced),
         label: t('From'),
-        name: 'from',
+        columnFilter: {
-        sortable: true,
+            component: 'date',
+        },
     },
     {
         align: 'left',
-        field: 'finished',
         label: t('Has recovery'),
-        name: 'finished',
+        name: 'hasRecovery',
     },
 ]);
 
@@ -198,22 +162,12 @@ const viewAddObservation = (rowsSelected) => {
         component: CustomerDefaulterAddObservation,
         componentProps: {
             clients: rowsSelected,
-            promise: async () => await dataRef.value.fetch(),
+            promise: async () => await dataRef.value.reload(),
         },
     });
 };
 
 const onFetch = async (data) => {
-    const recoveryData = await axios.get('Recoveries');
-    const recoveries = recoveryData.data.map(({ clientFk, finished }) => ({
-        clientFk,
-        finished,
-    }));
-
-    data.forEach((item) => {
-        const recovery = recoveries.find(({ clientFk }) => clientFk === item.clientFk);
-        item.finished = recovery?.finished === null;
-    });
     balanceDueTotal.value = data.reduce((acc, { amount = 0 }) => acc + amount, 0);
 };
 
@@ -229,7 +183,7 @@ function exprBuilder(param, value) {
         case 'payMethod':
         case 'salesPersonFk':
             return { [`d.${param}`]: value };
-        case 'date':
+        case 'created':
             return { 'd.created': { between: dateRange(value) } };
         case 'defaulterSinced':
             return { 'd.defaulterSinced': { between: dateRange(value) } };
@@ -246,7 +200,8 @@ function exprBuilder(param, value) {
     <VnSubToolbar>
         <template #st-data>
             <CustomerBalanceDueTotal :amount="balanceDueTotal" />
-            <div class="flex items-center q-ml-lg">
+        </template>
+        <template #st-actions>
             <QBtn
                 color="primary"
                 icon="vn:notes"
@@ -255,114 +210,54 @@ function exprBuilder(param, value) {
             >
                 <QTooltip>{{ t('Add observation') }}</QTooltip>
             </QBtn>
-            </div>
         </template>
     </VnSubToolbar>
-    <QPage class="column items-center q-pa-md">
+    <VnTable
-        <VnPaginate
         ref="dataRef"
-            @on-fetch="onFetch"
         data-key="CustomerDefaulter"
-            :filter="filter"
-            :expr-builder="exprBuilder"
-            auto-load
         url="Defaulters/filter"
-        >
+        :expr-builder="exprBuilder"
-            <template #body="{ rows }">
-                <div class="q-pa-md">
-                    <QTable
         :columns="columns"
-                        :rows="rows"
+        @on-fetch="onFetch"
-                        class="full-width"
+        :use-model="true"
-                        row-key="clientFk"
+        :table="{
-                        selection="multiple"
+            'row-key': 'clientFk',
+            selection: 'multiple',
+        }"
         v-model:selected="selected"
+        :disable-option="{ card: true }"
+        auto-load
+        :order="['amount DESC']"
     >
-                        <template #header="props">
+        <template #column-clientFk="{ row }">
-                            <QTr :props="props" class="bg" style="min-height: 200px">
+            <span class="link" @click.stop>
-                                <QTh>
+                {{ row.clientName }}
-                                    <QCheckbox v-model="props.selected" />
+                <CustomerDescriptorProxy :id="row.clientFk" />
-                                </QTh>
+            </span>
-                                <QTh
-                                    v-for="col in props.cols"
-                                    :key="col.name"
-                                    :props="props"
-                                >
-                                    {{ t(col.label) }}
-                                    <QTooltip v-if="col.tooltip">{{
-                                        col.tooltip
-                                    }}</QTooltip>
-                                </QTh>
-                            </QTr>
         </template>
-
+        <template #column-observation="{ row }">
-                        <template #body-cell="props">
+            <VnInput type="textarea" v-model="row.observation" readonly dense rows="2" />
-                            <QTd :props="props">
-                                <QTr :props="props" class="cursor-pointer">
-                                    <component
-                                        :is="
-                                            tableColumnComponents[props.col.name]
-                                                .component
-                                        "
-                                        class="col-content"
-                                        v-bind="
-                                            tableColumnComponents[props.col.name].props(
-                                                props
-                                            )
-                                        "
-                                        @click="
-                                            tableColumnComponents[props.col.name].event(
-                                                props
-                                            )
-                                        "
-                                    >
-                                        <template v-if="typeof props.value !== 'boolean'">
-                                            <div
-                                                v-if="
-                                                    props.col.name === 'lastObservation'
-                                                "
-                                            >
-                                                <VnInput
-                                                    type="textarea"
-                                                    v-model="props.value"
-                                                    readonly
-                                                    dense
-                                                    rows="2"
-                                                />
-                                            </div>
-                                            <div v-else>{{ props.value }}</div>
         </template>
-
+        <template #column-salesPersonFk="{ row }">
-                                        <WorkerDescriptorProxy
+            <span class="link" @click.stop>
-                                            :id="props.row.salesPersonFk"
+                {{ row.salesPersonName }}
-                                            v-if="props.col.name === 'salesPerson'"
+                <WorkerDescriptorProxy :id="row.salesPersonFk" />
-                                        />
+            </span>
-                                        <WorkerDescriptorProxy
-                                            :id="props.row.workerFk"
-                                            v-if="props.col.name === 'author'"
-                                        />
-                                        <CustomerDescriptorProxy
-                                            :id="props.row.clientFk"
-                                            v-if="props.col.name === 'client'"
-                                        />
-                                    </component>
-                                </QTr>
-                            </QTd>
         </template>
-                    </QTable>
+        <template #column-departmentFk="{ row }">
-                </div>
+            <span class="link" @click.stop>
+                {{ row.departmentName }}
+                <DepartmentDescriptorProxy :id="row.departmentFk" />
+            </span>
         </template>
-        </VnPaginate>
+        <template #column-workerFk="{ row }">
-    </QPage>
+            <span class="link" @click.stop>
+                {{ row.workerName }}
+                <WorkerDescriptorProxy :id="row.workerFk" />
+            </span>
+        </template>
+    </VnTable>
 </template>
-
-<style lang="scss" scoped>
-.col-content {
-    border-radius: 4px;
-    padding: 6px;
-}
-</style>
-
 <i18n>
 es:
     Add observation:  Añadir observación

src/pages/Customer/Notifications/CustomerNotifications.vue

@@ -1,92 +1,92 @@
 <script setup>
 import { ref, computed } from 'vue';
 import { useI18n } from 'vue-i18n';
-import { QBtn } from 'quasar';
-import CustomerNotificationsFilter from './CustomerNotificationsFilter.vue';
 import CustomerDescriptorProxy from '../Card/CustomerDescriptorProxy.vue';
 import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
-import VnPaginate from 'src/components/ui/VnPaginate.vue';
 import CustomerNotificationsCampaignConsumption from './CustomerNotificationsCampaignConsumption.vue';
-import RightMenu from 'src/components/common/RightMenu.vue';
+import VnTable from 'src/components/VnTable/VnTable.vue';
 
 const { t } = useI18n();
+const dataKey = 'CustomerNotifications';
 const selected = ref([]);
-const selectedCustomerId = ref(0);
-
-const tableColumnComponents = {
-    id: {
-        component: QBtn,
-        props: () => ({ flat: true, color: 'blue' }),
-        event: (prop) => selectCustomerId(prop.row.id),
-    },
-    socialName: {
-        component: 'span',
-        props: () => {},
-        event: () => {},
-    },
-    city: {
-        component: 'span',
-        props: () => {},
-        event: () => {},
-    },
-    phone: {
-        component: 'span',
-        props: () => {},
-        event: () => {},
-    },
-    email: {
-        component: 'span',
-        props: () => {},
-        event: () => {},
-    },
-};
-
 const columns = computed(() => [
     {
         align: 'left',
-        field: 'id',
         label: t('Identifier'),
         name: 'id',
+        columnClass: 'shrink',
     },
     {
         align: 'left',
-        field: 'socialName',
         label: t('Social name'),
         name: 'socialName',
+        columnFilter: {
+            component: 'select',
+            attrs: {
+                url: 'Clients',
+                fields: ['id', 'socialName'],
+                optionLabel: 'socialName',
+            },
+        },
+        columnClass: 'expand',
+        isTitle: true,
     },
     {
         align: 'left',
-        field: 'city',
         label: t('City'),
         name: 'city',
+        columnFilter: {
+            component: 'select',
+            attrs: {
+                url: 'Towns',
+            },
+        },
+        cardVisible: true,
     },
     {
         align: 'left',
-        field: 'phone',
         label: t('Phone'),
         name: 'phone',
+        cardVisible: true,
     },
     {
         align: 'left',
-        field: 'email',
         label: t('Email'),
         name: 'email',
+        cardVisible: true,
+    },
+    {
+        align: 'left',
+        name: 'fi',
+        label: t('Fi'),
+        visible: false,
+    },
+    {
+        align: 'left',
+        name: 'postcode',
+        label: t('Postcode'),
+        visible: false,
+    },
+    {
+        align: 'left',
+        label: t('customer.extendedList.tableVisibleColumns.salesPersonFk'),
+        name: 'salesPersonFk',
+        component: 'select',
+        attrs: {
+            url: 'Workers/activeWithInheritedRole',
+            fields: ['id', 'name'],
+            where: { role: 'salesPerson' },
+            optionFilter: 'firstName',
+            useLike: false,
+        },
+        visible: false,
     },
 ]);
-
-const selectCustomerId = (id) => {
-    selectedCustomerId.value = id;
-};
 </script>
 
 <template>
-    <RightMenu>
-        <template #right-panel>
-            <CustomerNotificationsFilter data-key="CustomerNotifications" />
-        </template>
-    </RightMenu>
     <VnSubToolbar class="justify-end">
-        <template #st-data>
+        <template #st-actions>
             <CustomerNotificationsCampaignConsumption
                 :selected-rows="selected.length > 0"
                 :clients="selected"
@@ -94,51 +94,26 @@ const selectCustomerId = (id) => {
             />
         </template>
     </VnSubToolbar>
-    <QPage class="column items-center q-pa-md">
+    <VnTable
-        <VnPaginate data-key="CustomerNotifications" url="Clients" auto-load>
+        :data-key="dataKey"
-            <template #body="{ rows }">
+        url="Clients"
-                <div class="q-pa-md">
+        :table="{
-                    <QTable
+            'row-key': 'id',
-                        :columns="columns"
+            selection: 'multiple',
-                        :rows="rows"
+        }"
-                        class="full-width q-mt-md"
-                        row-key="id"
-                        selection="multiple"
         v-model:selected="selected"
+        :right-search="true"
+        :columns="columns"
+        :use-model="true"
+        auto-load
     >
-                        <template #body-cell="props">
+        <template #column-id="{ row }">
-                            <QTd :props="props">
+            <span class="link">
-                                <QTr :props="props" class="cursor-pointer">
+                {{ row.id }}
-                                    <component
+                <CustomerDescriptorProxy :id="row.id" />
-                                        :is="
+            </span>
-                                            tableColumnComponents[props.col.name]
-                                                .component
-                                        "
-                                        class="col-content"
-                                        v-bind="
-                                            tableColumnComponents[props.col.name].props(
-                                                props
-                                            )
-                                        "
-                                        @click="
-                                            tableColumnComponents[props.col.name].event(
-                                                props
-                                            )
-                                        "
-                                    >
-                                        {{ props.value }}
-                                        <CustomerDescriptorProxy
-                                            :id="selectedCustomerId"
-                                        />
-                                    </component>
-                                </QTr>
-                            </QTd>
         </template>
-                    </QTable>
+    </VnTable>
-                </div>
-            </template>
-        </VnPaginate>
-    </QPage>
 </template>
 
 <style lang="scss" scoped>

src/pages/Customer/Notifications/CustomerNotificationsFilter.vue

@@ -1,145 +0,0 @@
-<script setup>
-import { ref } from 'vue';
-import { useI18n } from 'vue-i18n';
-
-import FetchData from 'components/FetchData.vue';
-import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
-import VnInput from 'src/components/common/VnInput.vue';
-import VnSelect from 'components/common/VnSelect.vue';
-
-const { t } = useI18n();
-const props = defineProps({
-    dataKey: {
-        type: String,
-        required: true,
-    },
-});
-
-const cities = ref();
-const clients = ref();
-</script>
-
-<template>
-    <FetchData
-        :filter="{ where: { role: 'socialName' } }"
-        @on-fetch="(data) => (clients = data)"
-        auto-load
-        url="Clients"
-    />
-    <FetchData @on-fetch="(data) => (cities = data)" auto-load url="Towns" />
-    <VnFilterPanel :data-key="props.dataKey" :search-button="true">
-        <template #tags="{ tag, formatFn }">
-            <div class="q-gutter-x-xs">
-                <strong>{{ t(`params.${tag.label}`) }}: </strong>
-                <span>{{ formatFn(tag.value) }}</span>
-            </div>
-        </template>
-
-        <template #body="{ params, searchFn }">
-            <QItem class="q-mb-sm q-mt-sm">
-                <QItemSection>
-                    <VnInput
-                        :label="t('Identifier')"
-                        clearable
-                        is-outlined
-                        v-model="params.identifier"
-                    />
-                </QItemSection>
-            </QItem>
-
-            <QItem class="q-mb-sm">
-                <QItemSection v-if="!clients">
-                    <QSkeleton type="QInput" class="full-width" />
-                </QItemSection>
-                <QItemSection v-if="clients">
-                    <VnSelect
-                        :input-debounce="0"
-                        :label="t('Social name')"
-                        :options="clients"
-                        @update:model-value="searchFn()"
-                        dense
-                        emit-value
-                        hide-selected
-                        map-options
-                        option-label="socialName"
-                        option-value="socialName"
-                        outlined
-                        rounded
-                        use-input
-                        v-model="params.socialName"
-                    />
-                </QItemSection>
-            </QItem>
-
-            <QItem class="q-mb-sm">
-                <QItemSection v-if="!cities">
-                    <QSkeleton type="QInput" class="full-width" />
-                </QItemSection>
-                <QItemSection v-if="cities">
-                    <VnSelect
-                        :input-debounce="0"
-                        :label="t('City')"
-                        :options="cities"
-                        @update:model-value="searchFn()"
-                        dense
-                        emit-value
-                        hide-selected
-                        map-options
-                        option-label="name"
-                        option-value="name"
-                        outlined
-                        rounded
-                        use-input
-                        v-model="params.city"
-                    />
-                </QItemSection>
-            </QItem>
-
-            <QItem class="q-mb-sm">
-                <QItemSection>
-                    <VnInput
-                        :label="t('Phone')"
-                        clearable
-                        is-outlined
-                        v-model="params.phone"
-                    />
-                </QItemSection>
-            </QItem>
-
-            <QItem class="q-mb-sm">
-                <QItemSection>
-                    <VnInput
-                        :label="t('Email')"
-                        clearable
-                        is-outlined
-                        type="email"
-                        v-model="params.email"
-                    />
-                </QItemSection>
-            </QItem>
-            <QSeparator />
-        </template>
-    </VnFilterPanel>
-</template>
-
-<i18n>
-en:
-    params:
-        identifier: Identifier
-        socialName: Social name
-        city: City
-        phone: Phone
-        email: Email
-es:
-    params:
-        identifier: Identificador
-        socialName: Razón social
-        city: Población
-        phone: Teléfono
-        email: Email
-    Identifier: Identificador
-    Social name: Razón social
-    City: Población
-    Phone: Teléfono
-    Email: Email
-</i18n>

src/pages/Customer/Payments/CustomerPayments.vue

@@ -1,19 +1,18 @@
 <script setup>
 import axios from 'axios';
-import { ref, computed } from 'vue';
+import { computed } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useQuasar } from 'quasar';
-import { useArrayData } from 'composables/useArrayData';
+import { toDate, toCurrency } from 'filters/index';
-import VnPaginate from 'components/ui/VnPaginate.vue';
+
+import VnTable from 'src/components/VnTable/VnTable.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 quasar = useQuasar();
 const { t } = useI18n();
-const arrayData = useArrayData('CustomerTransactions');
 
 async function confirm(transaction) {
     quasar
@@ -36,59 +35,73 @@ async function confirmTransaction({ id }) {
     });
 }
 
-const grid = ref(false);
 const columns = computed(() => [
     {
         name: 'id',
         label: t('Transaction ID'),
-        field: (row) => row.id,
+        isTitle: true,
-        sortable: true,
-    },
-    {
-        name: 'customerId',
-        label: t('Customer ID'),
-        field: (row) => row.clientFk,
-        align: 'right',
-        sortable: true,
-    },
-    {
-        name: 'customer',
-        label: t('Customer Name'),
-        field: (row) => row.customerName,
-    },
-    {
-        name: 'state',
-        label: t('State'),
-        field: (row) => row.isConfirmed,
-        format: (value) => (value ? t('Confirmed') : t('Unconfirmed')),
         align: 'left',
-        sortable: true,
+        columnFilter: {
+            inWhere: true,
+            alias: 't',
+        },
+        columnClass: 'shrink',
     },
     {
-        name: 'dated',
+        align: 'left',
+        name: 'clientFk',
+        label: t('Customer'),
+        columnFilter: {
+            component: 'select',
+            attrs: {
+                url: 'Clients',
+                fields: ['id', 'name'],
+            },
+        },
+        columnClass: 'expand',
+        cardVisible: true,
+    },
+    {
+        name: 'isConfirmed',
+        label: t('State'),
+        align: 'left',
+        format: ({ isConfirmed }) => (isConfirmed ? t('Confirmed') : t('Unconfirmed')),
+        chip: {
+            condition: () => true,
+            color: ({ isConfirmed }) => (isConfirmed ? 'bg-positive' : 'bg-primary'),
+        },
+        visible: false,
+    },
+    {
+        name: 'created',
         label: t('Dated'),
-        field: (row) => toDate(row.created),
+        format: ({ created }) => toDate(created),
-        sortable: true,
+        columnFilter: false,
+        cardVisible: true,
     },
     {
         name: 'amount',
         label: t('Amount'),
-        field: (row) => row.amount,
+        format: ({ amount }) => toCurrency(amount),
-        format: (value) => toCurrency(value),
+        columnFilter: {
-        sortable: true,
+            component: 'number',
+        },
+        cardVisible: true,
     },
     {
-        name: 'actions',
+        align: 'right',
-        label: t('Actions'),
+        name: 'tableActions',
-        grid: false,
+        actions: [
+            {
+                title: t('Confirm transaction'),
+                icon: 'check',
+                action: (row) => confirm(row),
+                show: ({ isConfirmed }) => !isConfirmed,
+                isPrimary: true,
+            },
+        ],
     },
 ]);
-const isLoading = computed(() => arrayData.isLoading.value);
-
-function stateColor(row) {
-    if (row.isConfirmed) return 'positive';
-    return 'primary';
-}
 </script>
 
 <template>
@@ -97,158 +110,22 @@ function stateColor(row) {
             <CustomerPaymentsFilter data-key="CustomerTransactions" />
         </template>
     </RightMenu>
-    <QPage class="column items-center q-pa-md customer-payments">
+    <VnTable
-        <div class="vn-card-list">
-            <QToolbar class="q-pa-none justify-end">
-                <QBtn
-                    @click="arrayData.refresh()"
-                    :loading="isLoading"
-                    icon="refresh"
-                    color="primary"
-                    class="q-mr-sm"
-                    round
-                    dense
-                />
-                <QBtn @click="grid = !grid" icon="list" color="primary" round dense>
-                    <QTooltip>{{ t('Change view') }}</QTooltip>
-                </QBtn>
-            </QToolbar>
-            <VnPaginate
         data-key="CustomerTransactions"
         url="Clients/transactions"
         order="created DESC"
-                :limit="20"
-                :offset="50"
-                :auto-load="!!$route?.query.params"
-            >
-                <template #body="{ rows }">
-                    <QTable
-                        :dense="$q.screen.lt.md"
         :columns="columns"
-                        :rows="rows"
+        :right-search="false"
-                        row-key="id"
+        auto-load
-                        :grid="grid || $q.screen.lt.sm"
-                        class="q-mt-xs custom-table"
     >
-                        <template #body-cell-actions="{ row }">
+        <template #column-clientFk="{ row }">
-                            <QTd auto-width class="text-center">
-                                <QBtn
-                                    v-if="!row.isConfirmed"
-                                    icon="check"
-                                    @click="confirm(row)"
-                                    color="primary"
-                                    size="md"
-                                    round
-                                    flat
-                                    dense
-                                >
-                                    <QTooltip>{{ t('Confirm transaction') }}</QTooltip>
-                                </QBtn>
-                            </QTd>
-                        </template>
-                        <template #body-cell-id="{ row }">
-                            <QTd auto-width align="right">
-                                <span>
-                                    {{ row.id }}
-                                </span>
-                            </QTd>
-                        </template>
-                        <template #body-cell-customerId="{ row }">
-                            <QTd align="right">
             <span class="link">
-                                    {{ row.clientFk }}
+                {{ row.clientFk }} -
+                {{ row.customerName }}
                 <CustomerDescriptorProxy :id="row.clientFk" />
             </span>
-                            </QTd>
         </template>
-                        <template #body-cell-customer="{ row }">
+    </VnTable>
-                            <QTd auto-width align="left" :title="row.customerName">
-                                <span>
-                                    {{ row.customerName }}
-                                </span>
-                            </QTd>
-                        </template>
-                        <template #body-cell-state="{ row }">
-                            <QTd auto-width class="text-center">
-                                <QBadge text-color="black" :color="stateColor(row)">
-                                    {{
-                                        row.isConfirmed
-                                            ? t('Confirmed')
-                                            : t('Unconfirmed')
-                                    }}
-                                </QBadge>
-                            </QTd>
-                        </template>
-                        <template #item="{ cols, row }">
-                            <div class="q-mb-md col-12">
-                                <QCard class="q-pa-none">
-                                    <QItem class="q-pa-none items-start">
-                                        <QItemSection class="q-pa-none">
-                                            <QList>
-                                                <template
-                                                    v-for="col of cols"
-                                                    :key="col.name"
-                                                >
-                                                    <QItem
-                                                        v-if="col.grid !== false"
-                                                        class="q-pa-none"
-                                                    >
-                                                        <QItemSection>
-                                                            <QItemLabel caption>
-                                                                {{ col.label }}
-                                                            </QItemLabel>
-                                                            <QItemLabel
-                                                                v-if="col.name == 'state'"
-                                                            >
-                                                                <QBadge
-                                                                    text-color="black"
-                                                                    :color="
-                                                                        stateColor(row)
-                                                                    "
-                                                                >
-                                                                    {{ col.value }}
-                                                                </QBadge>
-                                                            </QItemLabel>
-                                                            <QItemLabel
-                                                                v-if="col.name != 'state'"
-                                                            >
-                                                                {{ col.value }}
-                                                            </QItemLabel>
-                                                        </QItemSection>
-                                                    </QItem>
-                                                </template>
-                                            </QList>
-                                        </QItemSection>
-                                        <template v-if="!row.isConfirmed">
-                                            <QSeparator vertical />
-                                            <QCardActions
-                                                vertical
-                                                class="justify-between"
-                                            >
-                                                <QBtn
-                                                    icon="check"
-                                                    @click="confirm(row)"
-                                                    color="primary"
-                                                    size="md"
-                                                    round
-                                                    flat
-                                                    dense
-                                                >
-                                                    <QTooltip>
-                                                        {{ t('Confirm transaction') }}
-                                                    </QTooltip>
-                                                </QBtn>
-                                            </QCardActions>
-                                        </template>
-                                    </QItem>
-                                </QCard>
-                            </div>
-                        </template>
-                    </QTable>
-                </template>
-            </VnPaginate>
-        </div>
-    </QPage>
 </template>
 
 <style lang="scss">
@@ -269,14 +146,11 @@ es:
     Web Payments: Pagos Web
     Confirm transaction: Confirmar transacción
     Transaction ID: ID transacción
-    Customer ID: ID cliente
+    Customer: cliente
-    Customer Name: Nombre cliente
     State: Estado
     Dated: Fecha
     Amount: Importe
-    Actions: Acciones
     Confirmed: Confirmada
     Unconfirmed: Sin confirmar
-    Change view: Cambiar vista
     Payment confirmed: Pago confirmado
 </i18n>

src/pages/Customer/components/CustomerNewPayment.vue

@@ -11,10 +11,12 @@ import VnRow from 'components/ui/VnRow.vue';
 import VnInputDate from 'components/common/VnInputDate.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
 import VnInput from 'src/components/common/VnInput.vue';
-
+import { useState } from 'src/composables/useState';
 const { t } = useI18n();
 const route = useRoute();
 const { dialogRef } = useDialogPluginComponent();
+const state = useState();
+const user = state.getUser();
 
 const $props = defineProps({
     companyId: {
@@ -55,12 +57,12 @@ const filterClientFindOne = {
         id: route.params.id,
     },
 };
-
 const initialData = reactive({
     amountPaid: $props.totalCredit,
     clientFk: route.params.id,
     companyFk: $props.companyId,
     email: clientFindOne.value.email,
+    bankFk: user.value.localBankFk,
 });
 
 onBeforeMount(() => {

src/pages/Entry/EntryLatestBuys.vue

@@ -1,5 +1,5 @@
 <script setup>
-import { onMounted, onUnmounted } from 'vue';
+import { onMounted, onUnmounted, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import RightMenu from 'src/components/common/RightMenu.vue';
 import VnTable from 'components/VnTable/VnTable.vue';
@@ -15,12 +15,13 @@ const columns = [
     {
         align: 'center',
         label: t('entry.latestBuys.tableVisibleColumns.image'),
-        name: 'image',
+        name: 'itemFk',
         columnField: {
             component: VnImg,
             attrs: (id) => {
                 return {
                     id,
+                    size: '50x50',
                     width: '50px',
                 };
             },
@@ -169,6 +170,7 @@ const columns = [
         format: (row, dashIfEmpty) => dashIfEmpty(toDate(row.landing)),
     },
 ];
+const tableRef = ref();
 
 onMounted(async () => {
     stateStore.rightDrawer = true;
@@ -191,6 +193,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
         order="id DESC"
         :columns="columns"
         redirect="entry"
+        :row-click="({ entryFk }) => tableRef.redirect(entryFk)"
         auto-load
         :right-search="false"
     />

src/pages/Entry/EntryMain.vue

@@ -1,18 +0,0 @@
-<script setup>
-import LeftMenu from 'src/components/LeftMenu.vue';
-
-import { useStateStore } from 'stores/useStateStore';
-
-const stateStore = useStateStore();
-</script>
-
-<template>
-    <QDrawer v-model="stateStore.leftDrawer" show-if-above :width="256">
-        <QScrollArea class="fit text-grey-8">
-            <LeftMenu />
-        </QScrollArea>
-    </QDrawer>
-    <QPageContainer>
-        <RouterView></RouterView>
-    </QPageContainer>
-</template>

src/pages/InvoiceIn/InvoiceInMain.vue

@@ -1,17 +0,0 @@
-<script setup>
-import { useStateStore } from 'stores/useStateStore';
-import LeftMenu from 'src/components/LeftMenu.vue';
-
-const stateStore = useStateStore();
-</script>
-
-<template>
-    <QDrawer v-model="stateStore.leftDrawer" show-if-above :width="256">
-        <QScrollArea class="fit text-grey-8">
-            <LeftMenu />
-        </QScrollArea>
-    </QDrawer>
-    <QPageContainer>
-        <RouterView></RouterView>
-    </QPageContainer>
-</template>

src/pages/InvoiceOut/InvoiceOutMain.vue

@@ -1,17 +0,0 @@
-<script setup>
-import { useStateStore } from 'stores/useStateStore';
-import LeftMenu from 'src/components/LeftMenu.vue';
-
-const stateStore = useStateStore();
-</script>
-
-<template>
-    <QDrawer v-model="stateStore.leftDrawer" show-if-above :width="256">
-        <QScrollArea class="fit text-grey-8">
-            <LeftMenu />
-        </QScrollArea>
-    </QDrawer>
-    <QPageContainer>
-        <RouterView></RouterView>
-    </QPageContainer>
-</template>

src/pages/Item/ItemMain.vue

@@ -1,18 +0,0 @@
-<script setup>
-import LeftMenu from 'src/components/LeftMenu.vue';
-
-import { useStateStore } from 'stores/useStateStore';
-
-const stateStore = useStateStore();
-</script>
-
-<template>
-    <QDrawer v-model="stateStore.leftDrawer" show-if-above :width="256">
-        <QScrollArea class="fit text-grey-8">
-            <LeftMenu />
-        </QScrollArea>
-    </QDrawer>
-    <QPageContainer>
-        <RouterView></RouterView>
-    </QPageContainer>
-</template>

src/pages/Monitor/MonitorMain.vue

@@ -1,18 +0,0 @@
-<script setup>
-import LeftMenu from 'src/components/LeftMenu.vue';
-
-import { useStateStore } from 'stores/useStateStore';
-
-const stateStore = useStateStore();
-</script>
-
-<template>
-    <QDrawer v-model="stateStore.leftDrawer" show-if-above :width="256">
-        <QScrollArea class="fit text-grey-8">
-            <LeftMenu />
-        </QScrollArea>
-    </QDrawer>
-    <QPageContainer>
-        <RouterView></RouterView>
-    </QPageContainer>
-</template>

src/pages/Order/OrderMain.vue

@@ -1,17 +0,0 @@
-<script setup>
-import { useStateStore } from 'stores/useStateStore';
-import LeftMenu from 'src/components/LeftMenu.vue';
-
-const stateStore = useStateStore();
-</script>
-
-<template>
-    <QDrawer v-model="stateStore.leftDrawer" show-if-above :width="256">
-        <QScrollArea class="fit text-grey-8">
-            <LeftMenu />
-        </QScrollArea>
-    </QDrawer>
-    <QPageContainer>
-        <RouterView></RouterView>
-    </QPageContainer>
-</template>

src/pages/Route/Cmr/CmrList.vue

@@ -3,7 +3,7 @@ import { onBeforeMount, onMounted, computed, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { Notify } from 'quasar';
 import { useSession } from 'src/composables/useSession';
-import { toDate } from 'filters/index';
+import { toDate, toDateHourMin } from 'filters/index';
 import { useStateStore } from 'src/stores/useStateStore';
 
 import axios from 'axios';
@@ -30,53 +30,69 @@ const columns = computed(() => [
         isId: true,
     },
     {
-        align: 'left',
+        align: 'center',
         name: 'hasCmrDms',
         label: t('route.cmr.list.hasCmrDms'),
         component: 'checkbox',
         cardVisible: true,
     },
     {
+        align: 'left',
         label: t('route.cmr.list.ticketFk'),
         name: 'ticketFk',
     },
     {
+        align: 'left',
         label: t('route.cmr.list.routeFk'),
         name: 'routeFk',
     },
     {
+        align: 'left',
         label: t('route.cmr.list.clientFk'),
         name: 'clientFk',
     },
     {
-        align: 'left',
+        align: 'right',
         label: t('route.cmr.list.country'),
-        name: 'country',
+        name: 'countryFk',
         cardVisible: true,
-    },
-    {
-        align: 'center',
-        label: t('route.cmr.list.shipped'),
-        name: 'shipped',
-        cardVisible: true,
-        component: 'date',
-        columnFilter: {
-            alias: 'c',
-            inWhere: true,
-        },
-        format: ({ date }) => toDate(date),
-    },
-    {
-        align: 'center',
-        name: 'warehouseFk',
-        label: t('globals.warehouse'),
-        component: 'select',
         attrs: {
-            options: warehouses.value,
+            url: 'countries',
+            fields: ['id', 'name'],
+            optionLabel: 'name',
+            optionValue: 'id',
         },
+        columnFilter: {
+            inWhere: true,
+            component: 'select',
+        },
+        format: ({ countryName }) => countryName,
     },
     {
         align: 'right',
+        label: t('route.cmr.list.shipped'),
+        name: 'shipped',
+        cardVisible: true,
+        columnFilter: {
+            component: 'date',
+            inWhere: true,
+        },
+        format: ({ shipped }) => toDateHourMin(shipped),
+    },
+    {
+        align: 'right',
+        name: 'warehouseFk',
+        label: t('globals.warehouse'),
+        columnFilter: {
+            component: 'select',
+        },
+        attrs: {
+            options: warehouses.value,
+        },
+        format: ({ warehouseName }) => warehouseName,
+    },
+    {
+        align: 'center',
         name: 'tableActions',
         actions: [
             {
@@ -153,7 +169,7 @@ function downloadPdfs() {
         </template>
         <template #column-clientFk="{ row }">
             <span class="link" @click.stop>
-                {{ row.ticketFk }}
+                {{ row.clientFk }}
                 <CustomerDescriptorProxy :id="row.clientFk" />
             </span>
         </template>

src/pages/Route/RouteAutonomous.vue

@@ -36,23 +36,20 @@ const tableRef = ref();
 const columns = computed(() => [
     {
         align: 'left',
-        name: 'id',
+        name: 'routeFk',
         label: 'Id',
         chip: {
             condition: () => true,
         },
         isId: true,
+        columnFilter: false,
     },
     {
         align: 'left',
         name: 'created',
         label: t('Date'),
-        component: 'date',
+        columnFilter: false,
-        columnFilter: {
+        format: ({ created }) => toDate(created),
-            alias: 'c',
-            inWhere: true,
-        },
-        format: ({ date }) => toDate(date),
     },
     {
         align: 'left',
@@ -66,40 +63,63 @@ const columns = computed(() => [
         label: t('Agency agreement'),
         cardVisible: true,
     },
+    {
+        align: 'left',
+        name: 'to',
+        label: t('To'),
+        visible: false,
+        cardVisible: true,
+        create: true,
+        component: 'date',
+        format: ({ date }) => toDate(date),
+    },
+    {
+        align: 'left',
+        name: 'from',
+        label: t('From'),
+        visible: false,
+        cardVisible: true,
+        create: true,
+        component: 'date',
+        format: ({ date }) => toDate(date),
+    },
     {
         align: 'left',
         name: 'packages',
         label: t('Packages'),
+        columnFilter: false,
     },
     {
         align: 'left',
         name: 'm3',
         label: 'm³',
         cardVisible: true,
-        columnFilter: {
+        columnFilter: false,
-            inWhere: true,
-        },
     },
     {
         align: 'left',
         name: 'kmTotal',
         label: t('Km'),
         cardVisible: true,
+        columnFilter: false,
     },
     {
         align: 'left',
         name: 'price',
         label: t('Price'),
+        columnFilter: false,
     },
     {
         align: 'left',
         name: 'invoiceInFk',
         label: t('Received'),
+        columnFilter: false,
     },
     {
         align: 'left',
         name: 'supplierName',
         label: t('Autonomous'),
+        columnFilter: false,
     },
     {
         align: 'right',

src/pages/Route/RouteList.vue

@@ -24,7 +24,6 @@ const selectedRows = ref([]);
 const tableRef = ref([]);
 const confirmationDialog = ref(false);
 const startingDate = ref(null);
-const refreshKey = ref(0);
 const router = useRouter();
 const routeFilter = {
     include: [
@@ -45,9 +44,7 @@ const columns = computed(() => [
             condition: () => true,
         },
         isId: true,
-        columnFilter: {
+        columnFilter: false,
-            name: 'search',
-        },
     },
     {
         align: 'left',
@@ -65,6 +62,9 @@ const columns = computed(() => [
                 label: 'workerUserName',
             },
         },
+        columnFilter: {
+            inWhere: true,
+        },
         useLike: false,
         cardVisible: true,
         format: (row, dashIfEmpty) => dashIfEmpty(row.travelRef),
@@ -102,18 +102,38 @@ const columns = computed(() => [
                 label: 'vehiclePlateNumber',
             },
         },
+        columnFilter: {
+            inWhere: true,
+        },
     },
     {
         align: 'left',
         name: 'created',
         label: t('Date'),
+        columnFilter: false,
         cardVisible: true,
         create: true,
         component: 'date',
-        columnFilter: {
+        format: ({ date }) => toDate(date),
-            alias: 'c',
-            inWhere: true,
     },
+    {
+        align: 'left',
+        name: 'to',
+        label: t('To'),
+        visible: false,
+        cardVisible: true,
+        create: true,
+        component: 'date',
+        format: ({ date }) => toDate(date),
+    },
+    {
+        align: 'left',
+        name: 'from',
+        label: t('From'),
+        visible: false,
+        cardVisible: true,
+        create: true,
+        component: 'date',
         format: ({ date }) => toDate(date),
     },
     {
@@ -136,18 +156,21 @@ const columns = computed(() => [
         name: 'started',
         label: t('hourStarted'),
         component: 'time',
+        columnFilter: false,
     },
     {
         align: 'left',
         name: 'finished',
         label: t('hourFinished'),
         component: 'time',
+        columnFilter: false,
     },
     {
         align: 'left',
         name: 'isOk',
         label: t('Served'),
         component: 'checkbox',
+        columnFilter: false,
     },
     {
         align: 'right',
@@ -183,8 +206,8 @@ const cloneRoutes = () => {
         created: startingDate.value,
         ids: selectedRows.value.map((row) => row?.id),
     });
-    tableRef.value.reload();
     startingDate.value = null;
+    tableRef.value.reload();
 };
 
 const showRouteReport = () => {
@@ -220,7 +243,7 @@ const openTicketsDialog = (id) => {
                 id,
             },
         })
-        .onOk(() => refreshKey.value++);
+        .onOk(() => tableRef.value.reload());
 };
 </script>
 
@@ -249,6 +272,7 @@ const openTicketsDialog = (id) => {
     </QDialog>
     <VnSubToolbar />
     <VnTable
+        class="route-list"
         ref="tableRef"
         data-key="RouteList"
         url="Routes/filter"
@@ -266,7 +290,6 @@ const openTicketsDialog = (id) => {
         }"
         save-url="Routes/crud"
         :disable-option="{ card: true }"
-        :use-model="true"
         table-height="85vh"
         v-model:selected="selectedRows"
         :table="{
@@ -332,6 +355,8 @@ en:
     hourStarted: Started hour
     hourFinished: Finished hour
 es:
+    From: Desde
+    To: Hasta
     Worker: Trabajador
     Agency: Agencia
     Vehicle: Vehículo

src/pages/Route/RouteMain.vue

@@ -1,19 +0,0 @@
-<script setup>
-import { useStateStore } from 'stores/useStateStore';
-import LeftMenu from 'src/components/LeftMenu.vue';
-import { onMounted } from 'vue';
-import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
-const stateStore = useStateStore();
-onMounted(() => (stateStore.leftDrawer = false));
-</script>
-
-<template>
-    <QDrawer v-model="stateStore.leftDrawer" show-if-above :width="256">
-        <QScrollArea class="fit text-grey-8">
-            <LeftMenu />
-        </QScrollArea>
-    </QDrawer>
-    <QPageContainer>
-        <RouterView></RouterView>
-    </QPageContainer>
-</template>

src/pages/Route/RouteRoadmap.vue

@@ -2,7 +2,7 @@
 import { useI18n } from 'vue-i18n';
 import { computed, ref } from 'vue';
 import { dashIfEmpty } from 'src/filters';
-import { toDate } from 'filters/index';
+import { toDate, toDateHourMin } from 'filters/index';
 import { useQuasar } from 'quasar';
 import { useSummaryDialog } from 'composables/useSummaryDialog';
 import toCurrency from 'filters/toCurrency';
@@ -43,10 +43,9 @@ const columns = computed(() => [
         label: t('ETD'),
         component: 'date',
         columnFilter: {
-            alias: 'c',
             inWhere: true,
         },
-        format: ({ date }) => toDate(date),
+        format: ({ created }) => toDate(created),
         cardVisible: true,
     },
     {
@@ -200,6 +199,12 @@ function confirmRemove() {
         }"
         :disable-option="{ card: true }"
     >
+        <template #column-etd="{ row }">
+            {{ toDateHourMin(row.etd) }}
+        </template>
+        <template #column-supplierFk="{ row }">
+            {{ row.supplierFk }}
+        </template>
         <template #more-create-dialog="{ data }">
             <VnInputDate v-model="data.etd" />
             <VnInputTime v-model="data.etd" />

src/pages/Shelving/ShelvingMain.vue

@@ -1,17 +0,0 @@
-<script setup>
-import { useStateStore } from 'stores/useStateStore';
-import LeftMenu from 'src/components/LeftMenu.vue';
-
-const stateStore = useStateStore();
-</script>
-
-<template>
-    <QDrawer v-model="stateStore.leftDrawer" show-if-above :width="256">
-        <QScrollArea class="fit text-grey-8">
-            <LeftMenu />
-        </QScrollArea>
-    </QDrawer>
-    <QPageContainer>
-        <RouterView></RouterView>
-    </QPageContainer>
-</template>

src/pages/Supplier/Card/SupplierSummary.vue

@@ -152,7 +152,7 @@ function getUrl(section) {
                 />
                 <VnLv
                     :label="t('supplier.summary.country')"
-                    :value="supplier.country?.country"
+                    :value="supplier.country?.name"
                     dash
                 />
             </QCard>

src/pages/Supplier/SupplierList.vue

@@ -3,8 +3,6 @@ import { computed, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import VnTable from 'components/VnTable/VnTable.vue';
 import VnSearchbar from 'components/ui/VnSearchbar.vue';
-import RightMenu from 'components/common/RightMenu.vue';
-import SupplierListFilter from './SupplierListFilter.vue';
 
 const { t } = useI18n();
 const tableRef = ref();
@@ -21,75 +19,70 @@ const columns = computed(() => [
         label: t('supplier.list.tableVisibleColumns.name'),
         name: 'socialName',
         create: true,
-        component: 'input',
+        columnFilter: {
-        columnField: {
+            name: 'nickname',
-            component: null,
         },
     },
     {
         align: 'left',
         label: t('supplier.list.tableVisibleColumns.nif'),
         name: 'nif',
-        component: 'input',
-        columnField: {
-            component: null,
-        },
     },
     {
         align: 'left',
         label: t('supplier.list.tableVisibleColumns.nickname'),
         name: 'alias',
-        component: 'input',
+        columnFilter: {
-        columnField: {
+            name: 'nickname',
-            component: null,
         },
     },
     {
         align: 'left',
         label: t('supplier.list.tableVisibleColumns.account'),
         name: 'account',
-        component: 'input',
+        columnFilter: false,
-        columnField: {
-            component: null,
-        },
     },
     {
         align: 'left',
         label: t('supplier.list.tableVisibleColumns.payMethod'),
         name: 'payMethod',
-        component: 'select',
+        columnFilter: false,
-        attrs: {
-            url: 'payMethods',
-            fields: ['id', 'name'],
-        },
-        columnField: {
-            component: null,
-        },
     },
     {
         align: 'left',
         label: t('supplier.list.tableVisibleColumns.payDay'),
-        name: 'payDat',
+        name: 'payDay',
-        component: 'input',
+        columnFilter: false,
-        columnField: {
-            component: null,
     },
+    {
+        align: 'left',
+        name: 'countryFk',
+        label: t('customer.extendedList.tableVisibleColumns.countryFk'),
+        component: 'select',
+        attrs: {
+            url: 'Countries',
+        },
+        visible: false,
+    },
+    {
+        align: 'left',
+        label: t('customer.extendedList.tableVisibleColumns.provinceFk'),
+        name: 'provinceFk',
+        component: 'select',
+        attrs: {
+            url: 'Provinces',
+        },
+        visible: false,
     },
 ]);
 </script>
 
 <template>
     <VnSearchbar data-key="SuppliersList" :limit="20" :label="t('Search suppliers')" />
-    <RightMenu>
-        <template #right-panel>
-            <SupplierListFilter data-key="SuppliersList" />
-        </template>
-    </RightMenu>
     <VnTable
         ref="tableRef"
         data-key="SuppliersList"
         url="Suppliers/filter"
-        save-url="Suppliers/crud"
         redirect="supplier"
         :create="{
             urlCreate: 'Suppliers/newSupplier',
@@ -100,8 +93,6 @@ const columns = computed(() => [
         order="id ASC"
         :columns="columns"
         auto-load
-        :right-search="false"
-        :use-model="true"
     />
 </template>
 

src/pages/Supplier/SupplierMain.vue

@@ -1,17 +0,0 @@
-<script setup>
-import { useStateStore } from 'stores/useStateStore';
-import LeftMenu from 'src/components/LeftMenu.vue';
-
-const stateStore = useStateStore();
-</script>
-
-<template>
-    <QDrawer v-model="stateStore.leftDrawer" show-if-above :width="256">
-        <QScrollArea class="fit text-grey-8">
-            <LeftMenu />
-        </QScrollArea>
-    </QDrawer>
-    <QPageContainer>
-        <RouterView></RouterView>
-    </QPageContainer>
-</template>

src/pages/Ticket/TicketMain.vue

@@ -1,17 +0,0 @@
-<script setup>
-import { useStateStore } from 'stores/useStateStore';
-import LeftMenu from 'components/LeftMenu.vue';
-
-const stateStore = useStateStore();
-</script>
-
-<template>
-    <QDrawer v-model="stateStore.leftDrawer" show-if-above :width="256">
-        <QScrollArea class="fit text-grey-8">
-            <LeftMenu />
-        </QScrollArea>
-    </QDrawer>
-    <QPageContainer>
-        <RouterView></RouterView>
-    </QPageContainer>
-</template>

src/pages/Travel/TravelMain.vue

@@ -1,17 +0,0 @@
-<script setup>
-import { useStateStore } from 'stores/useStateStore';
-import LeftMenu from 'src/components/LeftMenu.vue';
-
-const stateStore = useStateStore();
-</script>
-
-<template>
-    <QDrawer v-model="stateStore.leftDrawer" show-if-above :width="256">
-        <QScrollArea class="fit text-grey-8">
-            <LeftMenu />
-        </QScrollArea>
-    </QDrawer>
-    <QPageContainer>
-        <RouterView></RouterView>
-    </QPageContainer>
-</template>

src/pages/Wagon/WagonMain.vue

@@ -1,17 +0,0 @@
-<script setup>
-import { useStateStore } from 'stores/useStateStore';
-import LeftMenu from 'src/components/LeftMenu.vue';
-
-const stateStore = useStateStore();
-</script>
-
-<template>
-    <QDrawer v-model="stateStore.leftDrawer" show-if-above :width="256">
-        <QScrollArea class="fit text-grey-8">
-            <LeftMenu />
-        </QScrollArea>
-    </QDrawer>
-    <QPageContainer>
-        <RouterView></RouterView>
-    </QPageContainer>
-</template>

src/pages/Worker/Card/WorkerSummary.vue

@@ -10,6 +10,7 @@ import CardSummary from 'components/ui/CardSummary.vue';
 import VnUserLink from 'src/components/ui/VnUserLink.vue';
 import VnTitle from 'src/components/common/VnTitle.vue';
 import RoleDescriptorProxy from 'src/pages/Account/Role/Card/RoleDescriptorProxy.vue';
+import VnRow from 'src/components/ui/VnRow.vue';
 
 const route = useRoute();
 const { t } = useI18n();
@@ -133,30 +134,24 @@ const filter = {
                 />
                 <VnLv :label="t('worker.summary.fi')" :value="worker.fi" />
                 <VnLv :label="t('worker.summary.birth')" :value="toDate(worker.birth)" />
-                <QCheckbox
+                <VnRow class="q-mt-sm" wrap>
-                    class="padding-none"
+                    <VnLv
                         :label="t('worker.summary.isFreelance')"
-                    v-model="worker.isFreelance"
+                        :value="worker.isFreelance"
-                    :disable="true"
                     />
-                <QCheckbox
+                    <VnLv
-                    class="padding-none"
                         :label="t('worker.summary.isSsDiscounted')"
-                    v-model="worker.isSsDiscounted"
+                        :value="worker.isSsDiscounted"
-                    :disable="true"
                     />
-                <QCheckbox
+                    <VnLv
-                    class="padding-none"
                         :label="t('worker.summary.hasMachineryAuthorized')"
-                    v-model="worker.hasMachineryAuthorized"
+                        :value="worker.hasMachineryAuthorized"
-                    :disable="true"
                     />
-                <QCheckbox
+                    <VnLv
-                    class="padding-none"
                         :label="t('worker.summary.isDisable')"
-                    v-model="worker.isDisable"
+                        :value="worker.isDisable"
-                    :disable="true"
                     />
+                </VnRow>
             </QCard>
             <QCard class="vn-one">
                 <VnTitle :text="t('worker.summary.userData')" />

src/pages/Worker/WorkerMain.vue

@@ -1,17 +0,0 @@
-<script setup>
-import { useStateStore } from 'stores/useStateStore';
-import LeftMenu from 'src/components/LeftMenu.vue';
-
-const stateStore = useStateStore();
-</script>
-
-<template>
-    <QDrawer v-model="stateStore.leftDrawer" show-if-above :width="256">
-        <QScrollArea class="fit text-grey-8">
-            <LeftMenu />
-        </QScrollArea>
-    </QDrawer>
-    <QPageContainer>
-        <RouterView></RouterView>
-    </QPageContainer>
-</template>

src/pages/Zone/Card/ZoneCard.vue

@@ -2,9 +2,9 @@
 import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
 import { computed } from 'vue';
-
 import VnCard from 'components/common/VnCard.vue';
 import ZoneDescriptor from './ZoneDescriptor.vue';
+import ZoneSearchbar from './ZoneSearchbar.vue';
 
 const { t } = useI18n();
 const route = useRoute();
@@ -33,5 +33,9 @@ const searchBarDataKeys = {
         :search-make-fetch="searchbarMakeFetch"
         :searchbar-label="t('list.searchZone')"
         :searchbar-info="t('list.searchInfo')"
-    />
+    >
+        <template #searchbar>
+            <ZoneSearchbar />
+        </template>
+    </VnCard>
 </template>

src/pages/Zone/Card/ZoneSearchbar.vue

@@ -1,11 +1,8 @@
 <script setup>
 import { useI18n } from 'vue-i18n';
-import { useStateStore } from 'stores/useStateStore';
+import VnSearchbar from 'components/ui/VnSearchbar.vue';
-import LeftMenu from 'src/components/LeftMenu.vue';
-import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
 
 const { t } = useI18n();
-const stateStore = useStateStore();
 
 const exprBuilder = (param, value) => {
     switch (param) {
@@ -49,12 +46,4 @@ const exprBuilder = (param, value) => {
         :info="t('list.searchInfo')"
         custom-route-redirect-name="ZoneSummary"
     />
-    <QDrawer v-model="stateStore.leftDrawer" show-if-above :width="256">
-        <QScrollArea class="fit text-grey-8">
-            <LeftMenu />
-        </QScrollArea>
-    </QDrawer>
-    <QPageContainer>
-        <RouterView></RouterView>
-    </QPageContainer>
 </template>

src/pages/Zone/ZoneDeliveryDays.vue

@@ -3,6 +3,7 @@ import { ref } from 'vue';
 import ZoneDeliveryPanel from './ZoneDeliveryPanel.vue';
 import ZoneCalendarGrid from './ZoneCalendarGrid.vue';
 import RightMenu from 'src/components/common/RightMenu.vue';
+import ZoneSearchbar from './Card/ZoneSearchbar.vue';
 
 const firstDay = ref(null);
 const lastDay = ref(null);
@@ -10,6 +11,7 @@ const events = ref([]);
 </script>
 
 <template>
+    <ZoneSearchbar />
     <RightMenu>
         <template #right-panel>
             <ZoneDeliveryPanel />

src/pages/Zone/ZoneList.vue

@@ -15,6 +15,7 @@ import { useStateStore } from 'stores/useStateStore';
 import axios from 'axios';
 import RightMenu from 'src/components/common/RightMenu.vue';
 import ZoneFilterPanel from './ZoneFilterPanel.vue';
+import ZoneSearchbar from './Card/ZoneSearchbar.vue';
 
 const stateStore = useStateStore();
 const { t } = useI18n();
@@ -87,6 +88,7 @@ onMounted(() => (stateStore.rightDrawer = true));
 </script>
 
 <template>
+    <ZoneSearchbar />
     <RightMenu>
         <template #right-panel>
             <ZoneFilterPanel data-key="ZoneList" :expr-builder="exprBuilder" />

src/pages/Zone/ZoneUpcoming.vue

@@ -7,6 +7,7 @@ import FetchData from 'components/FetchData.vue';
 
 import { toDateFormat } from 'src/filters/date.js';
 import { useWeekdayStore } from 'src/stores/useWeekdayStore';
+import ZoneSearchbar from './Card/ZoneSearchbar.vue';
 
 const { t } = useI18n();
 const weekdayStore = useWeekdayStore();
@@ -52,6 +53,7 @@ onMounted(() => weekdayStore.initStore());
         @on-fetch="(data) => (details = data)"
         auto-load
     />
+    <ZoneSearchbar />
     <VnSubToolbar />
     <QPage class="column items-center q-pa-md">
         <QCard class="full-width q-pa-md">

src/router/modules/Supplier.js

@@ -29,7 +29,7 @@ export default {
         {
             path: '',
             name: 'SupplierMain',
-            component: () => import('src/pages/Supplier/SupplierMain.vue'),
+            component: () => import('src/components/common/VnSectionMain.vue'),
             redirect: { name: 'SupplierList' },
             children: [
                 {

src/router/modules/account.js

@@ -34,7 +34,7 @@ export default {
         {
             path: '',
             name: 'AccountMain',
-            component: () => import('src/pages/Account/AccountMain.vue'),
+            component: () => import('src/components/common/VnSectionMain.vue'),
             redirect: { name: 'AccountList' },
             children: [
                 {

src/router/modules/claim.js

@@ -26,7 +26,7 @@ export default {
         {
             name: 'ClaimMain',
             path: '',
-            component: () => import('src/pages/Claim/ClaimMain.vue'),
+            component: () => import('src/components/common/VnSectionMain.vue'),
             redirect: { name: 'ClaimList' },
             children: [
                 {

src/router/modules/customer.js

@@ -38,7 +38,7 @@ export default {
         {
             path: '',
             name: 'CustomerMain',
-            component: () => import('src/pages/Customer/CustomerMain.vue'),
+            component: () => import('src/components/common/VnSectionMain.vue'),
             redirect: { name: 'CustomerList' },
             children: [
                 {

src/router/modules/entry.js

@@ -18,7 +18,7 @@ export default {
         {
             path: '',
             name: 'EntryMain',
-            component: () => import('src/pages/Entry/EntryMain.vue'),
+            component: () => import('src/components/common/VnSectionMain.vue'),
             redirect: { name: 'EntryList' },
             children: [
                 {

src/router/modules/invoiceIn.js

@@ -25,7 +25,7 @@ export default {
         {
             path: '',
             name: 'InvoiceInMain',
-            component: () => import('src/pages/InvoiceIn/InvoiceInMain.vue'),
+            component: () => import('src/components/common/VnSectionMain.vue'),
             redirect: { name: 'InvoiceInList' },
             children: [
                 {

src/router/modules/invoiceOut.js

@@ -18,7 +18,7 @@ export default {
         {
             path: '',
             name: 'InvoiceOutMain',
-            component: () => import('src/pages/InvoiceOut/InvoiceOutMain.vue'),
+            component: () => import('src/components/common/VnSectionMain.vue'),
             redirect: { name: 'InvoiceOutList' },
             children: [
                 {

src/router/modules/item.js

@@ -35,7 +35,7 @@ export default {
         {
             path: '',
             name: 'ItemMain',
-            component: () => import('src/pages/Item/ItemMain.vue'),
+            component: () => import('src/components/common/VnSectionMain.vue'),
             redirect: { name: 'ItemList' },
             children: [
                 {

src/router/modules/monitor.js

@@ -18,7 +18,7 @@ export default {
         {
             path: '',
             name: 'MonitorMain',
-            component: () => import('src/pages/Monitor/MonitorMain.vue'),
+            component: () => import('src/components/common/VnSectionMain.vue'),
             redirect: { name: 'MonitorList' },
             children: [
                 {

src/router/modules/order.js

@@ -18,7 +18,7 @@ export default {
         {
             path: '',
             name: 'OrderMain',
-            component: () => import('src/pages/Order/OrderMain.vue'),
+            component: () => import('src/components/common/VnSectionMain.vue'),
             redirect: { name: 'OrderList' },
             children: [
                 {

src/router/modules/route.js

@@ -18,7 +18,10 @@ export default {
         {
             path: '/route',
             name: 'RouteMain',
-            component: () => import('src/pages/Route/RouteMain.vue'),
+            component: () => import('src/components/common/VnSectionMain.vue'),
+            props: {
+                leftDrawer: false,
+            },
             redirect: { name: 'RouteList' },
             children: [
                 {

src/router/modules/shelving.js

@@ -18,7 +18,7 @@ export default {
         {
             path: '',
             name: 'ShelvingMain',
-            component: () => import('src/pages/Shelving/ShelvingMain.vue'),
+            component: () => import('src/components/common/VnSectionMain.vue'),
             redirect: { name: 'ShelvingList' },
             children: [
                 {

src/router/modules/ticket.js

@@ -35,7 +35,7 @@ export default {
         {
             name: 'TicketMain',
             path: '',
-            component: () => import('src/pages/Ticket/TicketMain.vue'),
+            component: () => import('src/components/common/VnSectionMain.vue'),
             redirect: { name: 'TicketList' },
             children: [
                 {

src/router/modules/travel.js

@@ -18,7 +18,7 @@ export default {
         {
             path: '',
             name: 'TravelMain',
-            component: () => import('src/pages/Travel/TravelMain.vue'),
+            component: () => import('src/components/common/VnSectionMain.vue'),
             redirect: { name: 'TravelList' },
             children: [
                 {

src/router/modules/wagon.js

@@ -18,7 +18,7 @@ export default {
         {
             path: '/wagon',
             name: 'WagonMain',
-            component: () => import('src/pages/Wagon/WagonMain.vue'),
+            component: () => import('src/components/common/VnSectionMain.vue'),
             redirect: { name: 'WagonList' },
             children: [
                 {
@@ -62,7 +62,7 @@ export default {
         {
             path: '/wagon/type',
             name: 'WagonTypeMain',
-            component: () => import('src/pages/Wagon/WagonMain.vue'),
+            component: () => import('src/components/common/VnSectionMain.vue'),
             redirect: { name: 'WagonTypeList' },
             children: [
                 {

src/router/modules/worker.js

@@ -31,7 +31,7 @@ export default {
         {
             path: '',
             name: 'WorkerMain',
-            component: () => import('src/pages/Worker/WorkerMain.vue'),
+            component: () => import('src/components/common/VnSectionMain.vue'),
             redirect: { name: 'WorkerList' },
             children: [
                 {

src/router/modules/zone.js

@@ -29,7 +29,7 @@ export default {
         {
             path: '/zone',
             name: 'ZoneMain',
-            component: () => import('src/pages/Zone/ZoneMain.vue'),
+            component: () => import('src/components/common/VnSectionMain.vue'),
             redirect: { name: 'ZoneList' },
             children: [
                 {

test/cypress/integration/route/roadMap/roadmapList.spec.js

@@ -0,0 +1,13 @@
+describe('RoadMap', () => {
+    beforeEach(() => {
+        cy.viewport(1920, 1080);
+        cy.login('developer');
+        cy.visit(`/#/route/roadmap`);
+    });
+    it('Route list create roadmap and redirect', () => {
+        cy.get('.q-page-sticky > div > .q-btn > .q-btn__content > .q-icon').click();
+        cy.get('input[name="name"]').eq(1).type('roadMapTestOne{enter}');
+        cy.get('.q-notification__message').should('have.text', 'Data created');
+        cy.url().should('include', '/summary');
+    });
+});

test/cypress/integration/route/routeList.spec.js

@@ -4,12 +4,28 @@ describe('Route', () => {
         cy.login('developer');
         cy.visit(`/#/route/list`);
     });
+    const getVnSelect =
+        '> :nth-child(1) > .column > .q-field > .q-field__inner > .q-field__control > .q-field__control-container';
+    const getRowColumn = (row, column) => `:nth-child(${row}) > :nth-child(${column})`;
 
     it('Route list create route', () => {
-        cy.visit(`/#/route/list`);
         cy.get('.q-page-sticky > div > .q-btn > .q-btn__content > .q-icon').click();
         cy.get('input[name="description"]').eq(1).type('routeTestOne{enter}');
         cy.get('.q-notification__message').should('have.text', 'Data created');
         cy.url().should('include', '/summary');
     });
+
+    it('Route list search and edit', () => {
+        cy.get('input[name="description"]').type('routeTestOne{enter}');
+        cy.get('.q-table tr')
+            .its('length')
+            .then((rowCount) => {
+                expect(rowCount).to.be.greaterThan(0);
+            });
+        cy.get(getRowColumn(1, 3) + getVnSelect).type('{downArrow}{enter}');
+        cy.get(getRowColumn(1, 4) + getVnSelect).type('{downArrow}{enter}');
+        cy.get(getRowColumn(1, 5) + getVnSelect).type('{downArrow}{enter}');
+        cy.get('button[title="Save"]').click();
+        cy.get('.q-notification__message').should('have.text', 'Data created');
+    });
 });

test/cypress/integration/zone/zoneDeliveryDays.spec.js

@@ -0,0 +1,15 @@
+describe('ZoneDeliveryDays', () => {
+    beforeEach(() => {
+        cy.login('developer');
+        cy.viewport(1920, 1080);
+        cy.visit(`/#/zone/delivery-days`);
+    });
+
+    it('should query for the day', () => {
+        cy.get('.q-form > .q-btn > .q-btn__content').click();
+        cy.get('.q-notification__message').should(
+            'have.text',
+            'No service for the specified zone'
+        );
+    });
+});

test/cypress/integration/zone/zoneList.spec.js

@@ -0,0 +1,15 @@
+describe('ZoneList', () => {
+    beforeEach(() => {
+        cy.viewport(1920, 1080);
+        cy.login('developer');
+        cy.visit(`/#/zone/list`);
+    });
+
+    it('should open the details', () => {
+        cy.get(':nth-child(1) > .text-right > .material-symbols-outlined').click();
+    });
+    it('should redirect to summary', () => {
+        cy.waitForElement('.q-page');
+        cy.get('tbody > :nth-child(1)').click();
+    });
+});

test/cypress/integration/zone/zoneUpcomingDeliveries.spec.js

@@ -0,0 +1,9 @@
+describe('ZoneUpcomingDeliveries', () => {
+    beforeEach(() => {
+        cy.login('developer');
+        cy.viewport(1920, 1080);
+        cy.visit(`/#/zone/upcoming-deliveries`);
+    });
+
+    it('should show the page', () => {});
+});

test/vitest/__tests__/pages/Customer/CustomerPayments.spec.js

@@ -35,18 +35,4 @@ describe('CustomerPayments', () => {
             );
         });
     });
-
-    describe('stateColor()', () => {
-        it('should return "positive" when isConfirmed property is truthy', async () => {
-            const result = await vm.stateColor({ isConfirmed: true });
-
-            expect(result).toEqual('positive');
-        });
-
-        it('should return "primary" when isConfirmed property is falsy', async () => {
-            const result = await vm.stateColor({ isConfirmed: false });
-
-            expect(result).toEqual('primary');
-        });
-    });
 });