Merge branch 'dev' into 8484-waitToDomContentLoadedInTests

package.json

@@ -1,74 +1,74 @@
 {
-  "name": "salix-front",
-  "version": "25.06.0",
-  "description": "Salix frontend",
-  "productName": "Salix",
-  "author": "Verdnatura",
-  "private": true,
-  "packageManager": "pnpm@8.15.1",
-  "type": "module",
-  "scripts": {
-    "resetDatabase": "cd ../salix && gulp docker",
-    "lint": "eslint --ext .js,.vue ./",
-    "format": "prettier --write \"**/*.{js,vue,scss,html,md,json}\" --ignore-path .gitignore",
-    "test:e2e": "cypress open",
-    "test:e2e:ci": "npm run resetDatabase && cd ../salix-front && cypress run",
-    "test": "echo \"See package.json => scripts for available tests.\" && exit 0",
-    "test:unit": "vitest",
-    "test:unit:ci": "vitest run",
-    "commitlint": "commitlint --edit",
-    "prepare": "npx husky install",
-    "addReferenceTag": "node .husky/addReferenceTag.js",
-    "docs:dev": "vitepress dev docs",
-    "docs:build": "vitepress build docs",
-    "docs:preview": "vitepress preview docs"
-  },
-  "dependencies": {
-    "@quasar/cli": "^2.4.1",
-    "@quasar/extras": "^1.16.16",
-    "axios": "^1.4.0",
-    "chromium": "^3.0.3",
-    "croppie": "^2.6.5",
-    "moment": "^2.30.1",
-    "pinia": "^2.1.3",
-    "quasar": "^2.17.7",
-    "validator": "^13.9.0",
-    "vue": "^3.5.13",
-    "vue-i18n": "^9.3.0",
-    "vue-router": "^4.2.5"
-  },
-  "devDependencies": {
-    "@commitlint/cli": "^19.2.1",
-    "@commitlint/config-conventional": "^19.1.0",
-    "@intlify/unplugin-vue-i18n": "^0.8.2",
-    "@pinia/testing": "^0.1.2",
-    "@quasar/app-vite": "^2.0.8",
-    "@quasar/quasar-app-extension-qcalendar": "^4.0.2",
-    "@quasar/quasar-app-extension-testing-unit-vitest": "^0.4.0",
-    "@vue/test-utils": "^2.4.4",
-    "autoprefixer": "^10.4.14",
-    "cypress": "^13.6.6",
-    "cypress-mochawesome-reporter": "^3.8.2",
-    "eslint": "^9.18.0",
-    "eslint-config-prettier": "^10.0.1",
-    "eslint-plugin-cypress": "^4.1.0",
-    "eslint-plugin-vue": "^9.32.0",
-    "husky": "^8.0.0",
-    "postcss": "^8.4.23",
-    "prettier": "^3.4.2",
-    "sass": "^1.83.4",
-    "vitepress": "^1.6.3",
-    "vitest": "^0.34.0"
-  },
-  "engines": {
-    "node": "^20 || ^18 || ^16",
-    "npm": ">= 8.1.2",
-    "yarn": ">= 1.21.1",
-    "bun": ">= 1.0.25"
-  },
-  "overrides": {
-    "@vitejs/plugin-vue": "^5.2.1",
-    "vite": "^6.0.11",
-    "vitest": "^0.31.1"
-  }
+    "name": "salix-front",
+    "version": "25.08.0",
+    "description": "Salix frontend",
+    "productName": "Salix",
+    "author": "Verdnatura",
+    "private": true,
+    "packageManager": "pnpm@8.15.1",
+    "type": "module",
+    "scripts": {
+        "resetDatabase": "cd ../salix && gulp docker",
+        "lint": "eslint --ext .js,.vue ./",
+        "format": "prettier --write \"**/*.{js,vue,scss,html,md,json}\" --ignore-path .gitignore",
+        "test:e2e": "cypress open",
+        "test:e2e:ci": "npm run resetDatabase && cd ../salix-front && cypress run",
+        "test": "echo \"See package.json => scripts for available tests.\" && exit 0",
+        "test:unit": "vitest",
+        "test:unit:ci": "vitest run",
+        "commitlint": "commitlint --edit",
+        "prepare": "npx husky install",
+        "addReferenceTag": "node .husky/addReferenceTag.js",
+        "docs:dev": "vitepress dev docs",
+        "docs:build": "vitepress build docs",
+        "docs:preview": "vitepress preview docs"
+    },
+    "dependencies": {
+        "@quasar/cli": "^2.4.1",
+        "@quasar/extras": "^1.16.16",
+        "axios": "^1.4.0",
+        "chromium": "^3.0.3",
+        "croppie": "^2.6.5",
+        "moment": "^2.30.1",
+        "pinia": "^2.1.3",
+        "quasar": "^2.17.7",
+        "validator": "^13.9.0",
+        "vue": "^3.5.13",
+        "vue-i18n": "^9.3.0",
+        "vue-router": "^4.2.5"
+    },
+    "devDependencies": {
+        "@commitlint/cli": "^19.2.1",
+        "@commitlint/config-conventional": "^19.1.0",
+        "@intlify/unplugin-vue-i18n": "^0.8.2",
+        "@pinia/testing": "^0.1.2",
+        "@quasar/app-vite": "^2.0.8",
+        "@quasar/quasar-app-extension-qcalendar": "^4.0.2",
+        "@quasar/quasar-app-extension-testing-unit-vitest": "^0.4.0",
+        "@vue/test-utils": "^2.4.4",
+        "autoprefixer": "^10.4.14",
+        "cypress": "^13.6.6",
+        "cypress-mochawesome-reporter": "^3.8.2",
+        "eslint": "^9.18.0",
+        "eslint-config-prettier": "^10.0.1",
+        "eslint-plugin-cypress": "^4.1.0",
+        "eslint-plugin-vue": "^9.32.0",
+        "husky": "^8.0.0",
+        "postcss": "^8.4.23",
+        "prettier": "^3.4.2",
+        "sass": "^1.83.4",
+        "vitepress": "^1.6.3",
+        "vitest": "^0.34.0"
+    },
+    "engines": {
+        "node": "^20 || ^18 || ^16",
+        "npm": ">= 8.1.2",
+        "yarn": ">= 1.21.1",
+        "bun": ">= 1.0.25"
+    },
+    "overrides": {
+        "@vitejs/plugin-vue": "^5.2.1",
+        "vite": "^6.0.11",
+        "vitest": "^0.31.1"
+    }
 }

src/components/TicketProblems.vue

@@ -2,26 +2,9 @@
 defineProps({ row: { type: Object, required: true } });
 </script>
 <template>
-    <span>
+    <span class="q-gutter-x-xs">
         <QIcon
-            v-if="row.isTaxDataChecked === 0"
-            name="vn:no036"
-            color="primary"
-            size="xs"
-        >
-            <QTooltip>{{ $t('salesTicketsTable.noVerifiedData') }}</QTooltip>
-        </QIcon>
-        <QIcon v-if="row.hasTicketRequest" name="vn:buyrequest" color="primary" size="xs">
-            <QTooltip>{{ $t('salesTicketsTable.purchaseRequest') }}</QTooltip>
-        </QIcon>
-        <QIcon v-if="row.itemShortage" name="vn:unavailable" color="primary" size="xs">
-            <QTooltip>{{ $t('salesTicketsTable.notVisible') }}</QTooltip>
-        </QIcon>
-        <QIcon v-if="row.isFreezed" name="vn:frozen" color="primary" size="xs">
-            <QTooltip>{{ $t('salesTicketsTable.clientFrozen') }}</QTooltip>
-        </QIcon>
-        <QIcon
-            v-if="row.risk"
+            v-if="row?.risk"
             name="vn:risk"
             :color="row.hasHighRisk ? 'negative' : 'primary'"
             size="xs"
@@ -30,10 +13,57 @@ defineProps({ row: { type: Object, required: true } });
                 {{ $t('salesTicketsTable.risk') }}: {{ row.risk - row.credit }}
             </QTooltip>
         </QIcon>
-        <QIcon v-if="row.hasComponentLack" name="vn:components" color="primary" size="xs">
+        <QIcon
+            v-if="row?.hasComponentLack"
+            name="vn:components"
+            color="primary"
+            size="xs"
+        >
             <QTooltip>{{ $t('salesTicketsTable.componentLack') }}</QTooltip>
         </QIcon>
-        <QIcon v-if="row.isTooLittle" name="vn:isTooLittle" color="primary" size="xs">
+        <QIcon v-if="row?.hasItemDelay" color="primary" size="xs" name="vn:hasItemDelay">
+            <QTooltip>
+                {{ $t('ticket.summary.hasItemDelay') }}
+            </QTooltip>
+        </QIcon>
+        <QIcon v-if="row?.hasItemLost" color="primary" size="xs" name="vn:hasItemLost">
+            <QTooltip>
+                {{ $t('salesTicketsTable.hasItemLost') }}
+            </QTooltip>
+        </QIcon>
+        <QIcon
+            v-if="row?.hasItemShortage"
+            name="vn:unavailable"
+            color="primary"
+            size="xs"
+        >
+            <QTooltip>{{ $t('salesTicketsTable.notVisible') }}</QTooltip>
+        </QIcon>
+        <QIcon v-if="row?.hasRounding" color="primary" name="sync_problem" size="xs">
+            <QTooltip>
+                {{ $t('ticketList.rounding') }}
+            </QTooltip>
+        </QIcon>
+        <QIcon
+            v-if="row?.hasTicketRequest"
+            name="vn:buyrequest"
+            color="primary"
+            size="xs"
+        >
+            <QTooltip>{{ $t('salesTicketsTable.purchaseRequest') }}</QTooltip>
+        </QIcon>
+        <QIcon
+            v-if="!row?.isTaxDataChecked === 0"
+            name="vn:no036"
+            color="primary"
+            size="xs"
+        >
+            <QTooltip>{{ $t('salesTicketsTable.noVerifiedData') }}</QTooltip>
+        </QIcon>
+        <QIcon v-if="row?.isFreezed" name="vn:frozen" color="primary" size="xs">
+            <QTooltip>{{ $t('salesTicketsTable.clientFrozen') }}</QTooltip>
+        </QIcon>
+        <QIcon v-if="row?.isTooLittle" name="vn:isTooLittle" color="primary" size="xs">
             <QTooltip>{{ $t('salesTicketsTable.tooLittle') }}</QTooltip>
         </QIcon>
     </span>

src/components/ui/CardSummary.vue

@@ -15,6 +15,10 @@ const props = defineProps({
         type: Object,
         default: null,
     },
+    userFilter: {
+        type: Object,
+        default: null,
+    },
     entityId: {
         type: [Number, String],
         default: null,
@@ -34,6 +38,7 @@ const isSummary = ref();
 const arrayData = useArrayData(props.dataKey, {
     url: props.url,
     filter: props.filter,
+    userFilter: props.userFilter,
     skip: 0,
 });
 const { store } = arrayData;

src/composables/useArrayData.js

@@ -93,6 +93,9 @@ export function useArrayData(key, userOptions) {
 
         if (params.filter.where || exprFilter)
             params.filter.where = { ...params.filter.where, ...exprFilter };
+
+        if (!params?.filter?.order?.length) delete params?.filter?.order;
+
         params.filter = JSON.stringify(params.filter);
 
         store.isLoading = true;

src/pages/Monitor/locale/en.yml

@@ -38,6 +38,7 @@ salesTicketsTable:
     payMethod: Pay method
     department: Department
     packing: ITP
+    hasItemLost: Item lost
 searchBar:
     label: Search tickets
     info: Search tickets by id or alias

src/pages/Monitor/locale/es.yml

@@ -39,6 +39,7 @@ salesTicketsTable:
     payMethod: Método de pago
     department: Departamento
     packing: ITP
+    hasItemLost: Artículo perdido
 searchBar:
     label: Buscar tickets
     info: Buscar tickets por identificador o alias

src/pages/Ticket/Card/TicketDescriptor.vue

@@ -9,6 +9,8 @@ import VnLv from 'src/components/ui/VnLv.vue';
 import useCardDescription from 'src/composables/useCardDescription';
 import VnUserLink from 'src/components/ui/VnUserLink.vue';
 import { toDateTimeFormat } from 'src/filters/date';
+import FetchData from 'src/components/FetchData.vue';
+import TicketProblems from 'src/components/TicketProblems.vue';
 
 const $props = defineProps({
     id: {
@@ -28,6 +30,7 @@ const { t } = useI18n();
 const entityId = computed(() => {
     return $props.id || route.params.id;
 });
+const problems = ref({});
 
 const filter = {
     include: [
@@ -113,6 +116,11 @@ const setData = (entity) => {
 </script>
 
 <template>
+    <FetchData
+        :url="`Tickets/${entityId}/getTicketProblems`"
+        auto-load
+        @on-fetch="(data) => ([problems] = data)"
+    />
     <CardDescriptor
         module="Ticket"
         :url="`Tickets/${entityId}`"
@@ -167,48 +175,9 @@ const setData = (entity) => {
             <VnLv :label="t('globals.warehouse')" :value="entity.warehouse?.name" />
             <VnLv :label="t('globals.alias')" :value="entity.nickname" />
         </template>
-        <template #icons="{ entity }">
-            <QCardActions class="q-gutter-x-md">
-                <QIcon
-                    v-if="entity.client.isActive == false"
-                    name="vn:disabled"
-                    size="xs"
-                    color="primary"
-                >
-                    <QTooltip>{{ t('Client inactive') }}</QTooltip>
-                </QIcon>
-                <QIcon
-                    v-if="entity.client.isFreezed == true"
-                    name="vn:frozen"
-                    size="xs"
-                    color="primary"
-                >
-                    <QTooltip>{{ t('Client Frozen') }}</QTooltip>
-                </QIcon>
-                <QIcon
-                    v-if="entity?.problem?.includes('hasRisk')"
-                    name="vn:risk"
-                    size="xs"
-                    color="primary"
-                >
-                    <QTooltip>{{ t('Client has debt') }}</QTooltip>
-                </QIcon>
-                <QIcon
-                    v-if="entity.client.isTaxDataChecked == false"
-                    name="vn:no036"
-                    size="xs"
-                    color="primary"
-                >
-                    <QTooltip>{{ t('Client not checked') }}</QTooltip>
-                </QIcon>
-                <QIcon
-                    v-if="entity.isDeleted == true"
-                    name="vn:deletedTicket"
-                    size="xs"
-                    color="primary"
-                >
-                    <QTooltip>{{ t('This ticket is deleted') }}</QTooltip>
-                </QIcon>
+        <template #icons>
+            <QCardActions class="q-gutter-x-xs">
+                <TicketProblems :row="problems" />
             </QCardActions>
         </template>
         <template #actions="{ entity }">

src/pages/Ticket/Card/TicketSale.vue

@@ -24,6 +24,7 @@ import axios from 'axios';
 import VnTable from 'src/components/VnTable/VnTable.vue';
 import VnUsesMana from 'src/components/ui/VnUsesMana.vue';
 import VnConfirm from 'src/components/ui/VnConfirm.vue';
+import TicketProblems from 'src/components/TicketProblems.vue';
 import RightMenu from 'src/components/common/RightMenu.vue';
 
 const route = useRoute();
@@ -56,7 +57,7 @@ const canProceed = ref();
 
 watch(
     () => route.params.id,
-    () => tableRef.value.reload()
+    () => tableRef.value.reload(),
 );
 
 const columns = computed(() => [
@@ -199,7 +200,7 @@ const changeQuantity = async (sale) => {
         await updateQuantity(sale);
     } catch (e) {
         const { quantity } = tableRef.value.CrudModelRef.originalData.find(
-            (s) => s.id === sale.id
+            (s) => s.id === sale.id,
         );
         sale.quantity = quantity;
         throw e;
@@ -503,7 +504,7 @@ async function isSalePrepared(item) {
                         componentProps: {
                             title: t('Item prepared'),
                             message: t(
-                                'This item is already prepared. Do you want to continue?'
+                                'This item is already prepared. Do you want to continue?',
                             ),
                             data: item,
                         },
@@ -525,7 +526,7 @@ watch(
         if (newItemFk) {
             updateItem(newRow.value);
         }
-    }
+    },
 );
 </script>
 
@@ -595,7 +596,7 @@ watch(
                         openConfirmationModal(
                             t('Continue anyway?'),
                             t('You are going to delete lines of the ticket'),
-                            removeSales
+                            removeSales,
                         )
                     "
                 >
@@ -679,53 +680,7 @@ watch(
         :disabled-attr="isTicketEditable"
     >
         <template #column-statusIcons="{ row }">
-            <router-link
-                v-if="row.claim?.claimFk"
-                :to="{ name: 'ClaimBasicData', params: { id: row.claim?.claimFk } }"
-            >
-                <QIcon color="primary" name="vn:claims" size="xs">
-                    <QTooltip>
-                        {{ t('ticketSale.claim') }}:
-                        {{ row.claim?.claimFk }}
-                    </QTooltip>
-                </QIcon>
-            </router-link>
-            <QIcon v-if="row.visible < 0" color="primary" name="warning" size="xs">
-                <QTooltip>
-                    {{ t('ticketSale.visible') }}: {{ row.visible || 0 }}
-                </QTooltip>
-            </QIcon>
-            <QIcon
-                v-if="row.reserved"
-                color="primary"
-                name="vn:reserva"
-                size="xs"
-                data-cy="ticketSaleReservedIcon"
-            >
-                <QTooltip>
-                    {{ t('ticketSale.reserved') }}
-                </QTooltip>
-            </QIcon>
-            <QIcon
-                v-if="row.itemShortage"
-                color="primary"
-                name="vn:unavailable"
-                size="xs"
-            >
-                <QTooltip>
-                    {{ t('ticketSale.noVisible') }}
-                </QTooltip>
-            </QIcon>
-            <QIcon
-                v-if="row.hasComponentLack"
-                color="primary"
-                name="vn:components"
-                size="xs"
-            >
-                <QTooltip>
-                    {{ t('ticketSale.hasComponentLack') }}
-                </QTooltip>
-            </QIcon>
+            <TicketProblems :row="row" />
         </template>
         <template #body-cell-picture="{ row }">
             <QTd>

src/pages/Ticket/Card/TicketSummary.vue

@@ -20,6 +20,7 @@ import ZoneDescriptorProxy from 'src/pages/Zone/Card/ZoneDescriptorProxy.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
 import VnToSummary from 'src/components/ui/VnToSummary.vue';
 import TicketDescriptorMenu from './TicketDescriptorMenu.vue';
+import TicketProblems from 'src/components/TicketProblems.vue';
 
 const route = useRoute();
 const { notify } = useNotify();
@@ -311,83 +312,7 @@ onMounted(async () => {
                     <template #body="props">
                         <QTr :props="props">
                             <QTd class="q-gutter-x-xs">
-                                <QBtn
-                                    flat
-                                    round
-                                    icon="vn:claims"
-                                    v-if="props.row.claim"
-                                    color="primary"
-                                    :to="{
-                                        name: 'ClaimCard',
-                                        params: {
-                                            id: props.row.claim.claimFk,
-                                        },
-                                    }"
-                                >
-                                    <QTooltip>
-                                        {{ t('ticket.summary.claim') }}:
-                                        {{ props.row.claim.claimFk }}
-                                    </QTooltip>
-                                </QBtn>
-                                <QBtn
-                                    flat
-                                    round
-                                    icon="vn:claims"
-                                    v-if="props.row.claimBeginning"
-                                    color="primary"
-                                    :to="{
-                                        name: 'ClaimCard',
-                                        params: {
-                                            id: props.row.claimBeginning.claimFk,
-                                        },
-                                    }"
-                                >
-                                    <QTooltip>
-                                        {{ t('ticket.summary.claim') }}:
-                                        {{ props.row.claimBeginning.claimFk }}
-                                    </QTooltip>
-                                </QBtn>
-                                <QIcon
-                                    name="warning"
-                                    v-show="props.row.visible < 0"
-                                    color="primary"
-                                    size="xs"
-                                >
-                                    <QTooltip>
-                                        {{ t('globals.visible') }}:
-                                        {{ props.row.visible }}
-                                    </QTooltip>
-                                </QIcon>
-                                <QIcon
-                                    name="vn:reserved"
-                                    v-show="props.row.reserved"
-                                    color="primary"
-                                    size="xs"
-                                >
-                                    <QTooltip>
-                                        {{ t('ticket.summary.reserved') }}
-                                    </QTooltip>
-                                </QIcon>
-                                <QIcon
-                                    name="vn:unavailable"
-                                    v-show="props.row.itemShortage"
-                                    color="primary"
-                                    size="xs"
-                                >
-                                    <QTooltip>
-                                        {{ t('ticket.summary.itemShortage') }}
-                                    </QTooltip>
-                                </QIcon>
-                                <QIcon
-                                    name="vn:components"
-                                    v-show="props.row.hasComponentLack"
-                                    color="primary"
-                                    size="xs"
-                                >
-                                    <QTooltip>
-                                        {{ t('ticket.summary.hasComponentLack') }}
-                                    </QTooltip>
-                                </QIcon>
+                                <TicketProblems :row="props.row" />
                             </QTd>
                             <QTd>
                                 <QBtn class="link" flat>

src/pages/Ticket/locale/en.yml

@@ -208,3 +208,9 @@ ticketList:
     toLines: Go to lines
     addressNickname: Address nickname
     ref: Reference
+    rounding: Rounding
+    noVerifiedData: No verified data
+    purchaseRequest: Purchase request
+    notVisible: Not visible
+    clientFrozen: Client frozen
+    componentLack: Component lack

src/pages/Ticket/locale/es.yml

@@ -213,3 +213,9 @@ ticketList:
     toLines: Ir a lineas
     addressNickname: Alias consignatario
     ref: Referencia
+    rounding: Redondeo
+    noVerifiedData: Sin datos comprobados
+    purchaseRequest: Petición de compra
+    notVisible: No visible
+    clientFrozen: Cliente congelado
+    componentLack: Faltan componentes

src/pages/Worker/Card/WorkerSummary.vue

@@ -12,7 +12,6 @@ import RoleDescriptorProxy from 'src/pages/Account/Role/Card/RoleDescriptorProxy
 import DepartmentDescriptorProxy from 'src/pages/Department/Card/DepartmentDescriptorProxy.vue';
 import { useAdvancedSummary } from 'src/composables/useAdvancedSummary';
 import WorkerDescriptorMenu from './WorkerDescriptorMenu.vue';
-import axios from 'axios';
 
 const route = useRoute();
 const { t } = useI18n();
@@ -28,76 +27,6 @@ const entityId = computed(() => $props.id || route.params.id);
 const basicDataUrl = ref(null);
 const advancedSummary = ref();
 
-const filter = {
-    include: [
-        {
-            relation: 'user',
-            scope: {
-                fields: ['name', 'nickname', 'roleFk'],
-
-                include: [
-                    {
-                        relation: 'role',
-                        scope: {
-                            fields: ['name'],
-                        },
-                    },
-                    {
-                        relation: 'emailUser',
-                        scope: {
-                            fields: ['email'],
-                        },
-                    },
-                ],
-            },
-        },
-        {
-            relation: 'department',
-            scope: {
-                include: {
-                    relation: 'department',
-                    scope: {
-                        fields: ['name'],
-                    },
-                },
-            },
-        },
-        {
-            relation: 'boss',
-        },
-        {
-            relation: 'client',
-        },
-        {
-            relation: 'sip',
-        },
-        {
-            relation: 'business',
-            scope: {
-                include: [
-                    {
-                        relation: 'department',
-                        scope: {
-                            fields: ['id', 'name'],
-                        },
-                    },
-                    {
-                        relation: 'reasonEnd',
-                        scope: {
-                            fields: ['id', 'reason'],
-                        },
-                    },
-                    {
-                        relation: 'workerBusinessProfessionalCategory',
-                        scope: {
-                            fields: ['id', 'description'],
-                        },
-                    },
-                ],
-            },
-        },
-    ],
-};
 onBeforeMount(async () => {
     advancedSummary.value = await useAdvancedSummary('Workers', entityId.value);
     basicDataUrl.value = `#/worker/${entityId.value}/basic-data`;
@@ -107,8 +36,8 @@ onBeforeMount(async () => {
 <template>
     <CardSummary
         ref="summary"
-        :url="`Workers/summary`"
-        :user-filter="{ where: { id: entityId }, filter }"
+        url="Workers/summary"
+        :user-filter="{ where: { id: entityId } }"
         data-key="Worker"
     >
         <template #header="{ entity }">

src/router/modules/shelving.js

@@ -44,6 +44,7 @@ const shelvingCard = {
     path: ':id',
     component: () => import('pages/Shelving/Card/ShelvingCard.vue'),
     redirect: { name: 'ShelvingSummary' },
+    meta: { menu: ['ShelvingBasicData', 'ShelvingLog'] },
     children: [
         {
             name: 'ShelvingSummary',
@@ -81,13 +82,10 @@ export default {
         title: 'shelving',
         icon: 'vn:inventory',
         moduleName: 'Shelving',
+        menu: ['ShelvingList', 'ParkingMain'],
     },
     component: RouterView,
     redirect: { name: 'ShelvingMain' },
-    menus: {
-        main: ['ShelvingList', 'ParkingMain'],
-        card: ['ShelvingBasicData', 'ShelvingLog'],
-    },
     children: [
         {
             path: '',

test/cypress/integration/client/clientSms.spec.js

@@ -7,6 +7,5 @@ describe('Client notes', () => {
     });
     it('Should load layout', () => {
         cy.get('.q-page').should('be.visible');
-        cy.get('.q-page > :nth-child(2) > :nth-child(1)').should('not.be.visible');
     });
 });

test/cypress/integration/ticket/ticketList.spec.js

@@ -53,4 +53,29 @@ describe('TicketList', () => {
         cy.checkNotification('Data created');
         cy.url().should('match', /\/ticket\/\d+\/summary/);
     });
+
+    it('should show the corerct problems', () => {
+        cy.intercept('GET', '**/api/Tickets/filter*', (req) => {
+            req.headers['cache-control'] = 'no-cache';
+            req.headers['pragma'] = 'no-cache';
+            req.headers['expires'] = '0';
+
+            req.on('response', (res) => {
+                delete res.headers['if-none-match'];
+                delete res.headers['if-modified-since'];
+            });
+        }).as('ticket');
+
+        cy.get('[data-cy="Warehouse_select"]').type('Warehouse Five');
+        cy.get('.q-menu .q-item').contains('Warehouse Five').click();
+        cy.wait('@ticket').then((interception) => {
+            const data = interception.response.body[1];
+            expect(data.hasComponentLack).to.equal(1);
+            expect(data.isTooLittle).to.equal(1);
+            expect(data.hasItemShortage).to.equal(1);
+        });
+        cy.get('.icon-components').should('exist');
+        cy.get('.icon-unavailable').should('exist');
+        cy.get('.icon-isTooLittle').should('exist');
+    });
 });

test/cypress/integration/vnComponent/VnSearchBar.spec.js

@@ -1,7 +1,6 @@
 /// <reference types="cypress" />
 describe('VnSearchBar', () => {
     const employeeId = ' #1';
-    const salesPersonClaimId = ' #132';
     const idGap = '.q-item > .q-item__label';
     const vnTableRow = '.q-virtual-scroll__content';
     beforeEach(() => {
@@ -12,7 +11,7 @@ describe('VnSearchBar', () => {
 
     it('should redirect to account summary page', () => {
         searchAndCheck('1', employeeId);
-        searchAndCheck('salesPersonClaim', salesPersonClaimId);
+        searchAndCheck('employee', employeeId);
     });
 
     it('should stay on the list page if there are several results or none', () => {

test/cypress/integration/wagon/wagonCreate.spec.js

@@ -8,16 +8,16 @@ describe('WagonCreate', () => {
     it('should create and delete a new wagon', () => {
         cy.dataCy('vnTableCreateBtn').click();
         cy.get(
-            '.grid-create > [label="Label"] > .q-field > .q-field__inner > .q-field__control > .q-field__control-container > [data-cy="Label_input"]'
+            '.grid-create > [label="Label"] > .q-field > .q-field__inner > .q-field__control > .q-field__control-container > [data-cy="Label_input"]',
         ).type('1234');
         cy.get(
-            '.grid-create > [label="Plate"] > .q-field > .q-field__inner > .q-field__control > .q-field__control-container > [data-cy="Plate_input"]'
+            '.grid-create > [label="Plate"] > .q-field > .q-field__inner > .q-field__control > .q-field__control-container > [data-cy="Plate_input"]',
         ).type('1234ABCD');
         cy.get(
-            '.grid-create > [label="Volume"] > .q-field > .q-field__inner > .q-field__control > .q-field__control-container > [data-cy="Volume_input"]'
+            '.grid-create > [label="Volume"] > .q-field > .q-field__inner > .q-field__control > .q-field__control-container > [data-cy="Volume_input"]',
         ).type('100');
         cy.dataCy('Type_select').type('{downarrow}{enter}');
-        // // Delete wagon type created
-        cy.get('.q-card').first().find('[title="Remove"] .q-icon').click();
+
+        cy.get('[title="Remove"] > .q-btn__content > .q-icon').first().click();
     });
 });

test/cypress/integration/wagon/wagonType/wagonTypeCreate.spec.js

@@ -6,12 +6,10 @@ describe('WagonTypeCreate', () => {
         cy.waitForElement('.q-page', 6000);
     });
 
-    it('should create a new wagon type', () => {
+    it('should create a new wagon type and then delete it', () => {
         cy.get('.q-page-sticky > div > .q-btn').click();
         cy.get('input').first().type('Example for testing');
         cy.get('button[type="submit"]').click();
-    });
-    it('delete a wagon type', () => {
-        cy.get('.q-card').first().find('[title="Remove"] .q-icon').click();
+        cy.get('[title="Remove"] > .q-btn__content > .q-icon').first().click();
     });
 });