Merge branch 'dev' into 7308_warning

src/components/VnTable/VnTable.vue

@@ -314,7 +314,19 @@ function handleSelection({ evt, added, rows: selectedRows }, rows) {
         show-if-above
     >
         <QScrollArea class="fit">
-            <VnTableFilter :data-key="$attrs['data-key']" :columns="columns" :redirect="redirect" />
+            <VnTableFilter
+                :data-key="$attrs['data-key']"
+                :columns="columns"
+                :redirect="redirect"
+            >
+                <template
+                    v-for="(_, slotName) in $slots"
+                    #[slotName]="slotData"
+                    :key="slotName"
+                >
+                    <slot :name="slotName" v-bind="slotData ?? {}" :key="slotName" />
+                </template>
+            </VnTableFilter>
         </QScrollArea>
     </QDrawer>
     <CrudModel

src/components/VnTable/VnTableFilter.vue

@@ -62,5 +62,8 @@ function columnName(col) {
                 <span>{{ formatFn(tag.value) }}</span>
             </div>
         </template>
+        <template v-for="(_, slotName) in $slots" #[slotName]="slotData" :key="slotName">
+            <slot :name="slotName" v-bind="slotData ?? {}" :key="slotName" />
+        </template>
     </VnFilterPanel>
 </template>

src/components/common/VnLocation.vue

@@ -70,6 +70,9 @@ const handleModelValue = (data) => {
     <VnSelectDialog
         v-model="modelValue"
         option-filter-value="search"
+        :option-label="
+            (opt) => (typeof modelValue === 'string' ? modelValue : showLabel(opt))
+        "
         url="Postcodes/filter"
         @update:model-value="handleModelValue"
         :use-like="false"

src/components/common/VnSelect.vue

@@ -27,7 +27,7 @@ const $props = defineProps({
         default: () => [],
     },
     optionLabel: {
-        type: [String],
+        type: [String, Function],
         default: 'name',
     },
     optionValue: {

src/components/common/__tests__/VnInput.spec.js

@@ -0,0 +1,91 @@
+import { createWrapper } from 'app/test/vitest/helper';
+import { vi, describe, expect, it } from 'vitest';
+import VnInput from 'src/components/common/VnInput.vue';
+
+
+describe('VnInput', () => {
+    let vm;
+    let wrapper;
+    let input;
+
+    function generateWrapper(value, isOutlined, emptyToNull, insertable) {
+        wrapper = createWrapper(VnInput, {
+            props: {
+                modelValue: value,                
+                isOutlined,  emptyToNull,  insertable,
+                maxlength: 101
+            },
+            attrs: {
+                label: 'test',
+                required: true,
+                maxlength: 101,
+                maxLength: 10,
+                'max-length':20
+            },
+        });
+        wrapper = wrapper.wrapper;
+        vm = wrapper.vm;
+        input = wrapper.find('[data-cy="test_input"]');
+    };
+
+    describe('value', () => {
+        it('should emit update:modelValue when value changes', async () => {
+            generateWrapper('12345', false, false, true)
+            await input.setValue('123');
+            expect(wrapper.emitted('update:modelValue')).toBeTruthy();
+            expect(wrapper.emitted('update:modelValue')[0]).toEqual(['123']);
+        });
+
+        it('should emit update:modelValue with null when input is empty', async () => {
+            generateWrapper('12345', false, true, true);
+            await input.setValue('');
+            expect(wrapper.emitted('update:modelValue')[0]).toEqual([null]);
+        });
+    });
+
+    describe('styleAttrs', () => {
+        it('should return empty styleAttrs when isOutlined is false', async () => {
+            generateWrapper('123', false, false, false);
+            expect(vm.styleAttrs).toEqual({}); 
+        });
+
+        it('should set styleAttrs when isOutlined is true', async () => {        
+            generateWrapper('123', true, false, false);
+            expect(vm.styleAttrs.outlined).toBe(true);
+        });
+    });
+
+    describe('handleKeydown', () => { 
+        it('should do nothing when "Backspace" key is pressed', async () => {
+            generateWrapper('12345', false, false, true);
+            await input.trigger('keydown', { key: 'Backspace' });
+            expect(wrapper.emitted('update:modelValue')).toBeUndefined();
+            const spyhandler = vi.spyOn(vm, 'handleInsertMode');
+            expect(spyhandler).not.toHaveBeenCalled();
+            
+        });
+        
+        /*
+        TODO: #8399 REDMINE
+        */
+        it.skip('handleKeydown respects insertable behavior', async () => {
+            const expectedValue = '12345';
+            generateWrapper('1234', false, false, true);
+            vm.focus()
+            await input.trigger('keydown', { key: '5' });
+            await vm.$nextTick();
+            expect(wrapper.emitted('update:modelValue')).toBeTruthy();
+            expect(wrapper.emitted('update:modelValue')[0]).toEqual([expectedValue ]);
+            expect(vm.value).toBe( expectedValue);
+        });
+    });
+
+    describe('focus', () => {
+        it('should call focus method when input is focused', async () => {
+            generateWrapper('123', false, false, true);
+            const focusSpy = vi.spyOn(input.element, 'focus');
+            vm.focus();
+            expect(focusSpy).toHaveBeenCalled();
+        }); 
+    });
+});

src/pages/Customer/Card/CustomerCard.vue

@@ -1,25 +1,12 @@
 <script setup>
-import { computed } from 'vue';
+import VnCardBeta from 'components/common/VnCardBeta.vue';
-import { useRoute } from 'vue-router';
-
-import VnCard from 'components/common/VnCard.vue';
 import CustomerDescriptor from './CustomerDescriptor.vue';
-import CustomerFilter from '../CustomerFilter.vue';
-const route = useRoute();
-
-const routeName = computed(() => route.name);
 </script>
+
 <template>
-    <VnCard
+    <VnCardBeta
         data-key="Client"
         base-url="Clients"
         :descriptor="CustomerDescriptor"
-        :filter-panel="routeName != 'CustomerConsumption' && CustomerFilter"
-        search-data-key="CustomerList"
-        :searchbar-props="{
-            url: 'Clients/filter',
-            label: 'Search customer',
-            info: 'You can search by customer id or name',
-        }"
     />
 </template>

src/pages/Customer/Card/CustomerConsumptionFilter.vue

@@ -1,177 +0,0 @@
-<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';
-import VnInputDate from 'src/components/common/VnInputDate.vue';
-import { toDate } from 'src/filters';
-
-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"
-                        :fields="['id', 'nickname']"
-                        sort-by="nickname ASC"
-                        :label="t('params.buyer')"
-                        option-value="id"
-                        option-label="nickname"
-                        dense
-                        outlined
-                        rounded
-                    />
-                </QItemSection>
-            </QItem>
-            <QItem>
-                <QItemSection>
-                    <VnSelect
-                        v-model="params.typeId"
-                        url="ItemTypes"
-                        :include="['category']"
-                        :fields="['id', 'name', 'categoryFk']"
-                        sort-by="name ASC"
-                        :label="t('params.typeId')"
-                        option-label="name"
-                        option-value="id"
-                        dense
-                        outlined
-                        rounded
-                    >
-                        <template #option="scope">
-                            <QItem v-bind="scope.itemProps">
-                                <QItemSection>
-                                    <QItemLabel>{{ scope.opt?.name }}</QItemLabel>
-                                    <QItemLabel caption>{{
-                                        scope.opt?.category?.name
-                                    }}</QItemLabel>
-                                </QItemSection>
-                            </QItem>
-                        </template>
-                    </VnSelect>
-                </QItemSection>
-            </QItem>
-            <QItem>
-                <QItemSection>
-                    <VnSelect
-                        v-model="params.categoryId"
-                        url="ItemCategories"
-                        :fields="['id', 'name']"
-                        sort-by="name ASC"
-                        :label="t('params.categoryId')"
-                        option-label="name"
-                        option-value="id"
-                        dense
-                        outlined
-                        rounded
-                    />
-                </QItemSection>
-            </QItem>
-            <QItem>
-                <QItemSection>
-                    <VnSelect
-                        v-model="params.campaignId"
-                        url="Campaigns/latest"
-                        sort-by="dated DESC"
-                        :label="t('params.campaignId')"
-                        option-label="code"
-                        option-value="id"
-                        dense
-                        outlined
-                        rounded
-                    >
-                        <template #option="scope">
-                            <QItem v-bind="scope.itemProps">
-                                <QItemSection>
-                                    <QItemLabel>{{
-                                        t(`params.${scope.opt?.code}`)
-                                    }}</QItemLabel>
-                                    <QItemLabel caption>{{
-                                        toDate(scope.opt.dated)
-                                    }}</QItemLabel>
-                                </QItemSection>
-                            </QItem>
-                        </template>
-                    </VnSelect>
-                </QItemSection>
-            </QItem>
-            <QItem>
-                <QItemSection>
-                    <VnInputDate
-                        :label="t('params.from')"
-                        v-model="params.from"
-                        @update:model-value="searchFn()"
-                        is-outlined
-                    />
-                </QItemSection>
-            </QItem>
-            <QItem>
-                <QItemSection>
-                    <VnInputDate
-                        :label="t('params.to')"
-                        v-model="params.to"
-                        @update:model-value="searchFn()"
-                        is-outlined
-                    />
-                </QItemSection>
-            </QItem>
-        </template>
-    </VnFilterPanel>
-</template>
-<i18n>
-en:
-    params:
-        item: Item id
-        buyer: Buyer
-        type: Type
-        category: Category
-        itemId: Item id
-        buyerId: Buyer
-        typeId: Type
-        categoryId: Category
-        from: From
-        to: To
-        campaignId: Campaña
-        valentinesDay: Valentine's Day
-        mothersDay: Mother's Day
-        allSaints: All Saints' Day
-es:
-    params:
-        item: Id artículo
-        buyer: Comprador
-        type: Tipo
-        category: Categoría
-        itemId: Id Artículo
-        buyerId: Comprador
-        typeId: Tipo
-        categoryId: Reino
-        from: Desde
-        to: Hasta
-        campaignId: Campaña
-        valentinesDay: Día de San Valentín
-        mothersDay: Día de la Madre
-        allSaints: Día de Todos los Santos
-</i18n>

src/pages/Customer/CustomerList.vue

@@ -5,18 +5,19 @@ import { useRouter } from 'vue-router';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
 import { toDate } from 'src/filters';
 
-import RightMenu from 'src/components/common/RightMenu.vue';
 import CustomerSummary from './Card/CustomerSummary.vue';
 import CustomerFilter from './CustomerFilter.vue';
 import VnTable from 'components/VnTable/VnTable.vue';
 import VnLocation from 'src/components/common/VnLocation.vue';
-import VnSearchbar from 'components/ui/VnSearchbar.vue';
 import VnLinkPhone from 'src/components/ui/VnLinkPhone.vue';
 import VnSelectWorker from 'src/components/common/VnSelectWorker.vue';
+import VnSection from 'src/components/common/VnSection.vue';
 
 const { t } = useI18n();
 const router = useRouter();
 const tableRef = ref();
+const dataKey = 'CustomerList';
+
 const columns = computed(() => [
     {
         align: 'left',
@@ -398,21 +399,23 @@ function handleLocation(data, location) {
 </script>
 
 <template>
-    <VnSearchbar
+    <VnSection
-        :info="t('You can search by customer id or name')"
+        :data-key="dataKey"
-        :label="t('Search customer')"
+        :columns="columns"
-        data-key="CustomerList"
+        prefix="customer"
-    />
+        :array-data-props="{
-    <RightMenu>
+            url: 'Clients/filter',
-        <template #right-panel>
+            order: ['id DESC'],
+        }"
+    >
+        <template #rightMenu>
             <CustomerFilter data-key="CustomerList" />
         </template>
-    </RightMenu>
+        <template #body>
             <VnTable
                 ref="tableRef"
-        data-key="CustomerList"
+                :data-key="dataKey"
                 url="Clients/filter"
-        order="id DESC"
                 :create="{
                     urlCreate: 'Clients/createWithUser',
                     title: t('globals.pageTitles.customerCreate'),
@@ -431,7 +434,7 @@ function handleLocation(data, location) {
                         :label="t('customer.summary.salesPerson')"
                         v-model="data.salesPersonFk"
                         :params="{
-                    departmentCodes: ['VT'],
+                            departmentCodes: ['VT', 'shopping'],
                         }"
                         :has-avatar="true"
                         :id-value="data.salesPersonFk"
@@ -463,7 +466,12 @@ function handleLocation(data, location) {
                         @update:model-value="(location) => handleLocation(data, location)"
                     />
                     <QInput v-model="data.userName" :label="t('Web user')" />
-            <QInput :label="t('Email')" clearable type="email" v-model="data.email">
+                    <QInput
+                        :label="t('Email')"
+                        clearable
+                        type="email"
+                        v-model="data.email"
+                    >
                         <template #append>
                             <QIcon name="info" class="cursor-info">
                                 <QTooltip max-width="400px">{{
@@ -474,6 +482,8 @@ function handleLocation(data, location) {
                     </QInput>
                 </template>
             </VnTable>
+        </template>
+    </VnSection>
 </template>
 <i18n>
 es:

src/pages/Customer/locale/en.yml

@@ -94,6 +94,8 @@ customer:
             hasToInvoiceByAddress: Invoice by address
             isToBeMailed: Mailing
             hasSepaVnl: VNL B2B received
+    search: Search customer
+    searchInfo: You can search by customer ID
     params:
         id: Id
         isWorker: Is Worker

src/pages/Customer/locale/es.yml

@@ -1,5 +1,3 @@
-Search customer: Buscar cliente
-You can search by customer id or name: Puedes buscar por id o nombre del cliente
 customer:
     card:
         debt: Riesgo
@@ -96,6 +94,8 @@ customer:
             hasToInvoiceByAddress: Factura por consigna
             isToBeMailed: Env. emails
             hasSepaVnl: Recibido B2B VNL
+    search: Buscar cliente
+    searchInfo: Puedes buscar por id o nombre del cliente
     params:
         id: ID
         isWorker: Es trabajador

src/pages/Worker/WorkerList.vue

@@ -196,7 +196,7 @@ async function autofillBic(worker) {
         prefix="workerSearch"
         :array-data-props="{
             url: 'Workers/filter',
-            order: ['id DESC'],
+            order: 'id DESC',
         }"
     >
         <template #rightMenu>

src/router/modules/customer.js

@@ -1,24 +1,12 @@
 import { RouterView } from 'vue-router';
 
-export default {
+const customerCard = {
-    path: '/customer',
+    name: 'CustomerCard',
-    name: 'Customer',
+    path: ':id',
+    component: () => import('src/pages/Customer/Card/CustomerCard.vue'),
+    redirect: { name: 'CustomerSummary' },                                           
     meta: { 
-        title: 'customers',
+        menu: [
-        icon: 'vn:client',
-        moduleName: 'Customer',
-        keyBinding: 'c',
-    },
-    component: RouterView,
-    redirect: { name: 'CustomerMain' },
-    menus: {
-        main: [
-            'CustomerList',
-            'CustomerPayments',
-            'CustomerNotifications',
-            'CustomerDefaulter',
-        ],
-        card: [
             'CustomerBasicData',
             'CustomerFiscalData',
             'CustomerBillingData',
@@ -35,70 +23,6 @@ export default {
             'CustomerOthers',
         ],
     },
-    children: [
-        {
-            path: '',
-            name: 'CustomerMain',
-            component: () => import('src/components/common/VnModule.vue'),
-            redirect: { name: 'CustomerList' },
-            children: [
-                {
-                    path: 'list',
-                    name: 'CustomerList',
-                    meta: {
-                        title: 'list',
-                        icon: 'view_list',
-                    },
-                    component: () => import('src/pages/Customer/CustomerList.vue'),
-                },
-                {
-                    path: 'create',
-                    name: 'CustomerCreate',
-                    meta: {
-                        title: 'customerCreate',
-                        icon: 'add',
-                    },
-                    component: () => import('src/pages/Customer/CustomerCreate.vue'),
-                },
-                {
-                    path: 'payments',
-                    name: 'CustomerPayments',
-                    meta: {
-                        title: 'webPayments',
-                        icon: 'vn:onlinepayment',
-                    },
-                    component: () =>
-                        import('src/pages/Customer/Payments/CustomerPayments.vue'),
-                },
-                {
-                    path: 'notifications',
-                    name: 'CustomerNotifications',
-                    meta: {
-                        title: 'notifications',
-                        icon: 'campaign',
-                    },
-                    component: () =>
-                        import(
-                            'src/pages/Customer/Notifications/CustomerNotifications.vue'
-                        ),
-                },
-                {
-                    path: 'defaulter',
-                    name: 'CustomerDefaulter',
-                    meta: {
-                        title: 'defaulter',
-                        icon: 'vn:defaulter',
-                    },
-                    component: () =>
-                        import('src/pages/Customer/Defaulter/CustomerDefaulter.vue'),
-                },
-            ],
-        },
-        {
-            name: 'CustomerCard',
-            path: ':id',
-            component: () => import('src/pages/Customer/Card/CustomerCard.vue'),
-            redirect: { name: 'CustomerSummary' },
     children: [
         {
             name: 'CustomerSummary',
@@ -107,8 +31,7 @@ export default {
                 title: 'summary',
                 icon: 'launch',
             },
-                    component: () =>
+            component: () => import('src/pages/Customer/Card/CustomerSummary.vue'),
-                        import('src/pages/Customer/Card/CustomerSummary.vue'),
         },
         {
             path: 'basic-data',
@@ -503,6 +426,91 @@ export default {
             ],
         },
     ],
+};
+
+export default {
+    name: 'Customer',    
+    path: '/customer',
+    meta: {
+        title: 'customers',
+        icon: 'vn:client',
+        moduleName: 'Customer',
+        keyBinding: 'c',
+        menu: [
+            'CustomerList',
+            'CustomerPayments',
+            'CustomerNotifications',
+            'CustomerDefaulter',
+        ],
+    },
+    component: RouterView,
+    redirect: { name: 'CustomerMain' },
+    children: [
+        {
+            name: 'CustomerMain',
+            path: '',
+            component: () => import('src/components/common/VnModule.vue'),
+            redirect: { name: 'CustomerIndexMain' },
+            children: [
+                {
+                    path: '',
+                    name: 'CustomerIndexMain',
+                    redirect: { name: 'CustomerList' },
+                    component: () => import('src/pages/Customer/CustomerList.vue'),
+                    children: [
+                        {
+                            name: 'CustomerList',
+                            path: 'list',
+                            meta: {
+                                title: 'list',
+                                icon: 'view_list',
+                            },
+                        },
+                        customerCard,
+                    ],
+                },
+                {
+                    path: 'create',
+                    name: 'CustomerCreate',
+                    meta: {
+                        title: 'customerCreate',
+                        icon: 'add',
+                    },
+                    component: () => import('src/pages/Customer/CustomerCreate.vue'),
+                },
+                {
+                    path: 'payments',
+                    name: 'CustomerPayments',
+                    meta: {
+                        title: 'webPayments',
+                        icon: 'vn:onlinepayment',
+                    },
+                    component: () =>
+                        import('src/pages/Customer/Payments/CustomerPayments.vue'),
+                },
+                {
+                    path: 'notifications',
+                    name: 'CustomerNotifications',
+                    meta: {
+                        title: 'notifications',
+                        icon: 'campaign',
+                    },
+                    component: () =>
+                        import(
+                            'src/pages/Customer/Notifications/CustomerNotifications.vue'
+                        ),
+                },
+                {
+                    path: 'defaulter',
+                    name: 'CustomerDefaulter',
+                    meta: {
+                        title: 'defaulter',
+                        icon: 'vn:defaulter',
+                    },
+                    component: () =>
+                        import('src/pages/Customer/Defaulter/CustomerDefaulter.vue'),
+                },
+            ],
         },
     ],
 };