feat(client and ticket): add moreOptions in summary

package.json

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

src/components/CreateManualInvoiceForm.vue

@@ -0,0 +1,155 @@
+<script setup>
+import { reactive, ref, computed } from 'vue';
+import { useI18n } from 'vue-i18n';
+import { useRouter } from 'vue-router';
+
+import FetchData from 'components/FetchData.vue';
+import VnRow from 'components/ui/VnRow.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
+import VnInput from 'src/components/common/VnInput.vue';
+import FormModelPopup from './FormModelPopup.vue';
+import VnInputDate from './common/VnInputDate.vue';
+
+const emit = defineEmits(['onDataSaved']);
+
+const { t } = useI18n();
+const router = useRouter();
+
+const manualInvoiceFormData = reactive({
+    maxShipped: Date.vnNew(),
+});
+
+const formModelPopupRef = ref();
+const invoiceOutSerialsOptions = ref([]);
+const taxAreasOptions = ref([]);
+const ticketsOptions = ref([]);
+const clientsOptions = ref([]);
+const isLoading = computed(() => formModelPopupRef.value?.isLoading);
+
+const onDataSaved = async (formData, requestResponse) => {
+    emit('onDataSaved', formData, requestResponse);
+    if (requestResponse && requestResponse.id)
+        router.push({ name: 'InvoiceOutSummary', params: { id: requestResponse.id } });
+};
+</script>
+
+<template>
+    <FetchData
+        url="InvoiceOutSerials"
+        :filter="{ where: { code: { neq: 'R' } }, order: ['code'] }"
+        @on-fetch="(data) => (invoiceOutSerialsOptions = data)"
+        auto-load
+    />
+    <FetchData
+        url="TaxAreas"
+        :filter="{ order: ['code'] }"
+        @on-fetch="(data) => (taxAreasOptions = data)"
+        auto-load
+    />
+    <FormModelPopup
+        ref="formModelPopupRef"
+        :title="t('Create manual invoice')"
+        url-create="InvoiceOuts/createManualInvoice"
+        model="invoiceOut"
+        :form-initial-data="manualInvoiceFormData"
+        @on-data-saved="onDataSaved"
+    >
+        <template #form-inputs="{ data }">
+            <span v-if="isLoading" class="text-primary invoicing-text">
+                <QIcon name="warning" class="fill-icon q-mr-sm" size="md" />
+                {{ t('Invoicing in progress...') }}
+            </span>
+            <VnRow>
+                <VnSelect
+                    :label="t('Ticket')"
+                    :options="ticketsOptions"
+                    hide-selected
+                    option-label="id"
+                    option-value="id"
+                    v-model="data.ticketFk"
+                    @update:model-value="data.clientFk = null"
+                    url="Tickets"
+                    :where="{ refFk: null }"
+                    :fields="['id', 'nickname']"
+                    :filter-options="{ order: 'shipped DESC' }"
+                >
+                    <template #option="scope">
+                        <QItem v-bind="scope.itemProps">
+                            <QItemSection>
+                                <QItemLabel> #{{ scope.opt?.id }} </QItemLabel>
+                                <QItemLabel caption>{{ scope.opt?.nickname }}</QItemLabel>
+                            </QItemSection>
+                        </QItem>
+                    </template>
+                </VnSelect>
+                <span class="row items-center" style="max-width: max-content">{{
+                    t('Or')
+                }}</span>
+                <VnSelect
+                    :label="t('Client')"
+                    :options="clientsOptions"
+                    hide-selected
+                    option-label="name"
+                    option-value="id"
+                    v-model="data.clientFk"
+                    @update:model-value="data.ticketFk = null"
+                    url="Clients"
+                    :fields="['id', 'name']"
+                    :filter-options="{ order: 'name ASC' }"
+                />
+                <VnInputDate :label="t('Max date')" v-model="data.maxShipped" />
+            </VnRow>
+            <VnRow>
+                <VnSelect
+                    :label="t('Serial')"
+                    :options="invoiceOutSerialsOptions"
+                    hide-selected
+                    option-label="description"
+                    option-value="code"
+                    v-model="data.serial"
+                />
+                <VnSelect
+                    :label="t('Area')"
+                    :options="taxAreasOptions"
+                    hide-selected
+                    option-label="code"
+                    option-value="code"
+                    v-model="data.taxArea"
+                />
+            </VnRow>
+            <VnRow>
+                <VnInput
+                    :label="t('Reference')"
+                    type="textarea"
+                    v-model="data.reference"
+                    fill-input
+                    autogrow
+                />
+            </VnRow>
+        </template>
+    </FormModelPopup>
+</template>
+
+<style lang="scss" scoped>
+.invoicing-text {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    color: $primary;
+    font-size: 24px;
+    margin-bottom: 8px;
+}
+</style>
+
+<i18n>
+es:
+    Create manual invoice: Crear factura manual
+    Ticket: Ticket
+    Client: Cliente
+    Max date: Fecha límite
+    Serial: Serie
+    Area: Area
+    Reference: Referencia
+    Or: O
+    Invoicing in progress...: Facturación en progreso...
+</i18n>

src/components/CrudModel.vue

@@ -394,7 +394,6 @@ watch(formUrl, async () => {
                 @click="onSubmit"
                 :disable="!hasChanges"
                 :title="t('globals.save')"
-                data-cy="crudModelDefaultSaveBtn"
             />
             <slot name="moreAfterActions" />
         </QBtnGroup>

src/components/TicketProblems.vue

@@ -1,40 +0,0 @@
-<script setup>
-defineProps({ row: { type: Object, required: true } });
-</script>
-<template>
-    <span>
-        <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"
-            name="vn:risk"
-            :color="row.hasHighRisk ? 'negative' : 'primary'"
-            size="xs"
-        >
-            <QTooltip>
-                {{ $t('salesTicketsTable.risk') }}: {{ row.risk - row.credit }}
-            </QTooltip>
-        </QIcon>
-        <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">
-            <QTooltip>{{ $t('salesTicketsTable.tooLittle') }}</QTooltip>
-        </QIcon>
-    </span>
-</template>

src/components/VnTable/VnFilter.vue

@@ -143,10 +143,6 @@ function alignRow() {
 const showFilter = computed(
     () => $props.column?.columnFilter !== false && $props.column.name != 'tableActions'
 );
-
-const onTabPressed = async () => {
-    if (model.value) enterEvent['keyup.enter']();
-};
 </script>
 <template>
     <div
@@ -161,7 +157,6 @@ const onTabPressed = async () => {
             v-model="model"
             :components="components"
             component-prop="columnFilter"
-            @keydown.tab="onTabPressed"
         />
     </div>
 </template>

src/components/VnTable/VnTable.vue

@@ -162,7 +162,9 @@ onMounted(() => {
             : $props.defaultMode;
     stateStore.rightDrawer = quasar.screen.gt.xs;
     columnsVisibilitySkipped.value = [
-        ...splittedColumns.value.columns.filter((c) => !c.visible).map((c) => c.name),
+        ...splittedColumns.value.columns
+            .filter((c) => c.visible == false)
+            .map((c) => c.name),
         ...['tableActions'],
     ];
     createForm.value = $props.create;
@@ -235,7 +237,7 @@ function splitColumns(columns) {
         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 !== false)
+        if ($props.useModel && col.columnFilter != false)
             col.columnFilter = { inWhere: true, ...col.columnFilter };
         splittedColumns.value.columns.push(col);
     }
@@ -394,7 +396,7 @@ function handleSelection({ evt, added, rows: selectedRows }, rows) {
                             :name="col.orderBy ?? col.name"
                             :data-key="$attrs['data-key']"
                             :search-url="searchUrl"
-                            :vertical="false"
+                            :vertical="true"
                         />
                     </div>
                     <slot
@@ -737,7 +739,6 @@ function handleSelection({ evt, added, rows: selectedRows }, rows) {
             fab
             icon="add"
             shortcut="+"
-            data-cy="vnTableCreateBtn"
         />
         <QTooltip self="top right">
             {{ createForm?.title }}

src/components/common/VnInputDate.vue

@@ -1,7 +1,8 @@
 <script setup>
-import { onMounted, watch, computed, ref, useAttrs } from 'vue';
+import { onMounted, watch, computed, ref } from 'vue';
 import { date } from 'quasar';
 import { useI18n } from 'vue-i18n';
+import { useAttrs } from 'vue';
 import VnDate from './VnDate.vue';
 import { useRequired } from 'src/composables/useRequired';
 

src/components/common/VnRadio.vue

@@ -2,12 +2,5 @@
 const model = defineModel({ type: Boolean, required: true });
 </script>
 <template>
-    <QRadio
-        v-model="model"
-        v-bind="$attrs"
-        dense
-        :dark="true"
-        class="q-mr-sm"
-        size="xs"
-    />
+    <QRadio v-model="model" v-bind="$attrs" dense :dark="true" class="q-mr-sm" />
 </template>

src/components/common/VnSelect.vue

@@ -138,6 +138,8 @@ onMounted(() => {
     if ($props.focusOnMount) setTimeout(() => vnSelectRef.value.showPopup(), 300);
 });
 
+defineExpose({ opts: myOptions });
+
 const arrayDataKey =
     $props.dataKey ?? ($props.url?.length > 0 ? $props.url : $attrs.name ?? $attrs.label);
 
@@ -257,30 +259,6 @@ async function onScroll({ to, direction, from, index }) {
         isLoading.value = false;
     }
 }
-
-defineExpose({ opts: myOptions });
-
-function handleKeyDown(event) {
-    if (event.key === 'Tab') {
-        event.preventDefault();
-
-        const inputValue = vnSelectRef.value?.inputValue;
-
-        if (inputValue) {
-            const matchingOption = myOptions.value.find(
-                (option) =>
-                    option[optionLabel.value].toLowerCase() === inputValue.toLowerCase()
-            );
-
-            if (matchingOption) {
-                emit('update:modelValue', matchingOption[optionValue.value]);
-            } else {
-                emit('update:modelValue', inputValue);
-            }
-            vnSelectRef.value?.hidePopup();
-        }
-    }
-}
 </script>
 
 <template>
@@ -291,7 +269,6 @@ function handleKeyDown(event) {
         :option-value="optionValue"
         v-bind="$attrs"
         @filter="filterHandler"
-        @keydown="handleKeyDown"
         :emit-value="nullishToTrue($attrs['emit-value'])"
         :map-options="nullishToTrue($attrs['map-options'])"
         :use-input="nullishToTrue($attrs['use-input'])"

src/components/common/VnSmsDialog.vue

@@ -86,7 +86,7 @@ async function send() {
 </script>
 
 <template>
-    <QDialog ref="dialogRef" data-cy="vnSmsDialog">
+    <QDialog ref="dialogRef">
         <QCard class="q-pa-sm">
             <QCardSection class="row items-center q-pb-none">
                 <span class="text-h6 text-grey">
@@ -161,7 +161,6 @@ async function send() {
                     :loading="isLoading"
                     color="primary"
                     unelevated
-                    data-cy="sendSmsBtn"
                 />
             </QCardActions>
         </QCard>

src/components/ui/CardDescriptor.vue

@@ -6,6 +6,7 @@ import { useArrayData } from 'composables/useArrayData';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
 import { useState } from 'src/composables/useState';
 import { useRoute } from 'vue-router';
+import VnMoreOptions from './VnMoreOptions.vue';
 
 const $props = defineProps({
     url: {
@@ -159,25 +160,11 @@ const toModule = computed(() =>
                         </QTooltip>
                     </QBtn>
                 </RouterLink>
-                <QBtn
-                    v-if="$slots.menu"
-                    color="white"
-                    dense
-                    flat
-                    icon="more_vert"
-                    round
-                    size="md"
-                    data-cy="descriptor-more-opts"
-                >
-                    <QTooltip>
-                        {{ t('components.cardDescriptor.moreOptions') }}
-                    </QTooltip>
-                    <QMenu :ref="menuRef">
-                        <QList>
-                            <slot name="menu" :entity="entity" :menu-ref="menuRef" />
-                        </QList>
-                    </QMenu>
-                </QBtn>
+                <VnMoreOptions v-if="$slots.menu">
+                    <template #menu>
+                        <slot name="menu" :entity="entity" :menu-ref="menuRef" />
+                    </template>
+                </VnMoreOptions>
             </div>
             <slot name="before" />
             <div class="body q-py-sm">

src/components/ui/CardSummary.vue

@@ -5,6 +5,7 @@ import SkeletonSummary from 'components/ui/SkeletonSummary.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
 import { useArrayData } from 'src/composables/useArrayData';
 import { isDialogOpened } from 'src/filters';
+import VnMoreOptions from './VnMoreOptions.vue';
 
 const props = defineProps({
     url: {
@@ -83,9 +84,14 @@ async function fetch() {
                     <slot name="header" :entity="entity" dense>
                         <VnLv :label="`${entity.id} -`" :value="entity.name" />
                     </slot>
-                    <slot name="header-right" :entity="entity">
-                        <span></span>
-                    </slot>
+                    <span class="row no-wrap">
+                        <slot name="header-right" :entity="entity" />
+                        <VnMoreOptions v-if="$slots.menu && isDialogOpened()">
+                            <template #menu>
+                                <slot name="menu" :entity="entity" />
+                            </template>
+                        </VnMoreOptions>
+                    </span>
                 </div>
                 <div class="summaryBody row q-mb-md">
                     <slot name="body" :entity="entity" />

src/components/ui/VnFilterPanel.vue

@@ -37,7 +37,7 @@ const $props = defineProps({
     },
     hiddenTags: {
         type: Array,
-        default: () => ['filter', 'or', 'and'],
+        default: () => ['filter', 'search', 'or', 'and'],
     },
     customTags: {
         type: Array,
@@ -61,6 +61,7 @@ const emit = defineEmits([
     'update:modelValue',
     'refresh',
     'clear',
+    'search',
     'init',
     'remove',
     'setUserParams',

src/components/ui/VnMoreOptions.vue

@@ -0,0 +1,20 @@
+<template>
+    <QBtn
+        color="white"
+        dense
+        flat
+        icon="more_vert"
+        round
+        size="md"
+        data-cy="descriptor-more-opts"
+    >
+        <QTooltip>
+            {{ $t('components.cardDescriptor.moreOptions') }}
+        </QTooltip>
+        <QMenu ref="menuRef">
+            <QList>
+                <slot name="menu" />
+            </QList>
+        </QMenu>
+    </QBtn>
+</template>

src/components/ui/VnRow.vue

@@ -1,5 +1,5 @@
 <template>
-    <div class="vn-row q-gutter-md">
+    <div class="vn-row q-gutter-md q-mb-md">
         <slot />
     </div>
 </template>
@@ -18,9 +18,6 @@
         &:not(.wrap) {
             flex-direction: column;
         }
-        &[fixed] {
-            flex-direction: row;
-        }
     }
 }
 </style>

src/components/ui/VnSearchbar.vue

@@ -130,7 +130,6 @@ async function search() {
                 dense
                 standout
                 autofocus
-                data-cy="vnSearchBar"
             >
                 <template #prepend>
                     <QIcon

src/composables/downloadFile.js

@@ -1,24 +1,11 @@
 import { useSession } from 'src/composables/useSession';
 import { getUrl } from './getUrl';
-import axios from 'axios';
-import { exportFile } from 'quasar';
 
 const { getTokenMultimedia } = useSession();
 const token = getTokenMultimedia();
 
 export async function downloadFile(id, model = 'dms', urlPath = '/downloadFile', url) {
-    const appUrl = (await getUrl('', 'lilium')).replace('/#/', '');
-    const response = await axios.get(
-        url ?? `${appUrl}/${model}/${id}${urlPath}?access_token=${token}`,
-        { responseType: 'blob' }
-    );
-
-    const contentDisposition = response.headers['content-disposition'];
-    const matches = /filename[^;=\n]*=((['"]).*?\2|[^;\n]*)/.exec(contentDisposition);
-    const filename =
-        matches != null && matches[1]
-            ? matches[1].replace(/['"]/g, '')
-            : 'downloaded-file';
-
-    exportFile(filename, response.data);
+    let appUrl = await getUrl('', 'lilium');
+    appUrl = appUrl.replace('/#/', '');
+    window.open(url ?? `${appUrl}/api/${model}/${id}${urlPath}?access_token=${token}`);
 }

src/css/app.scss

@@ -241,7 +241,7 @@ input::-webkit-inner-spin-button {
     th,
     td {
         padding: 1px 10px 1px 10px;
-        max-width: 130px;
+        max-width: 100px;
         div span {
             overflow: hidden;
             white-space: nowrap;

src/i18n/locale/en.yml

@@ -506,7 +506,6 @@ invoiceOut:
             invoiceWithFutureDate: Exists an invoice with a future date
             noTicketsToInvoice: There are not tickets to invoice
             criticalInvoiceError: 'Critical invoicing error, process stopped'
-            invalidSerialTypeForAll: The serial type must be global when invoicing all clients
         table:
             addressId: Address id
             streetAddress: Street
@@ -859,7 +858,6 @@ components:
         downloadFile: Download file
         openCard: View
         openSummary: Summary
-        viewSummary: Summary
     cardDescriptor:
         mainList: Main list
         summary: Summary

src/i18n/locale/es.yml

@@ -509,7 +509,6 @@ invoiceOut:
             invoiceWithFutureDate: Existe una factura con una fecha futura
             noTicketsToInvoice: No existen tickets para facturar
             criticalInvoiceError: Error crítico en la facturación proceso detenido
-            invalidSerialTypeForAll: El tipo de serie debe ser global cuando se facturan todos los clientes
         table:
             addressId: Id dirección
             streetAddress: Dirección fiscal

src/pages/Claim/Card/ClaimDescriptorMenu.vue

@@ -100,7 +100,7 @@ async function remove() {
         </QMenu>
     </QItem>
     <QSeparator />
-    <QItem @click="confirmRemove()" v-ripple clickable data-cy="deleteClaim">
+    <QItem @click="confirmRemove()" v-ripple clickable>
         <QItemSection avatar>
             <QIcon name="delete" />
         </QItemSection>

src/pages/Claim/ClaimList.vue

@@ -95,6 +95,7 @@ const columns = computed(() => [
                 optionLabel: 'description',
             },
         },
+        orderBy: 'priority',
     },
     {
         align: 'right',

src/pages/Customer/Card/CustomerSummary.vue

@@ -1,18 +1,18 @@
 <script setup>
-import { computed, ref, onMounted } from 'vue';
+import { computed, ref } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import VnUserLink from 'src/components/ui/VnUserLink.vue';
 
 import { toCurrency, toPercentage, toDate, dashOrCurrency } from 'src/filters';
 import CardSummary from 'components/ui/CardSummary.vue';
-import { getUrl } from 'src/composables/getUrl';
 import VnLv from 'src/components/ui/VnLv.vue';
 import VnLinkPhone from 'src/components/ui/VnLinkPhone.vue';
 import VnLinkMail from 'src/components/ui/VnLinkMail.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';
+import CustomerDescriptorMenu from './CustomerDescriptorMenu.vue';
 const route = useRoute();
 const { t } = useI18n();
 const grafanaUrl = 'https://grafana.verdnatura.es';
@@ -71,6 +71,9 @@ const sumRisk = ({ clientRisks }) => {
         data-key="CustomerSummary"
         module-name="Customer"
     >
+        <template #menu="{ entity }">
+            <CustomerDescriptorMenu :customer="entity" />
+        </template>
         <template #body="{ entity }">
             <QCard class="vn-one">
                 <VnTitle

src/pages/Entry/EntryLatestBuys.vue

@@ -12,7 +12,6 @@ import VnImg from 'src/components/ui/VnImg.vue';
 
 const stateStore = useStateStore();
 const { t } = useI18n();
-const tableRef = ref();
 const columns = [
     {
         align: 'center',
@@ -235,6 +234,7 @@ const columns = [
         format: (row, dashIfEmpty) => dashIfEmpty(toDate(row.landing)),
     },
 ];
+const tableRef = ref();
 
 onMounted(async () => {
     stateStore.rightDrawer = true;

src/pages/InvoiceOut/InvoiceOutGlobalForm.vue

@@ -183,7 +183,7 @@ onMounted(async () => {
 <i18n>
 en:
     invoiceDate: Invoice date
-    maxShipped: Max date ticket
+    maxShipped: Max date
     allClients: All clients
     oneClient: One client
     company: Company
@@ -195,7 +195,7 @@ en:
 
 es:
     invoiceDate: Fecha de factura
-    maxShipped: Fecha límite ticket
+    maxShipped: Fecha límite
     allClients: Todos los clientes
     oneClient: Un solo cliente
     company: Empresa

src/pages/InvoiceOut/InvoiceOutList.vue

@@ -6,19 +6,15 @@ import VnInputDate from 'src/components/common/VnInputDate.vue';
 import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
 import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
-import { usePrintService } from 'src/composables/usePrintService';
-import VnTable from 'src/components/VnTable/VnTable.vue';
+import { usePrintService } from 'composables/usePrintService';
+import VnTable from 'components/VnTable/VnTable.vue';
 import InvoiceOutSummary from './Card/InvoiceOutSummary.vue';
 import { toCurrency, toDate } from 'src/filters/index';
 import { useStateStore } from 'stores/useStateStore';
 import { QBtn } from 'quasar';
-import axios from 'axios';
+import CustomerDescriptorProxy from '../Customer/Card/CustomerDescriptorProxy.vue';
 import RightMenu from 'src/components/common/RightMenu.vue';
 import InvoiceOutFilter from './InvoiceOutFilter.vue';
-import VnRow from 'src/components/ui/VnRow.vue';
-import VnRadio from 'src/components/common/VnRadio.vue';
-import VnInput from 'src/components/common/VnInput.vue';
-import CustomerDescriptorProxy from '../Customer/Card/CustomerDescriptorProxy.vue';
 
 const { t } = useI18n();
 const stateStore = useStateStore();
@@ -30,86 +26,99 @@ const selectedRows = ref([]);
 const hasSelectedCards = computed(() => selectedRows.value.length > 0);
 const MODEL = 'InvoiceOuts';
 const { openReport } = usePrintService();
-const addressOptions = ref([]);
-const selectedOption = ref('ticket');
-async function fetchClientAddress(id) {
-    const { data } = await axios.get(
-        `Clients/${id}/addresses?filter[order]=isActive DESC`
-    );
-    addressOptions.value = data;
-}
-
-const exprBuilder = (_, value) => {
-    return {
-        or: [{ code: value }, { description: { like: `%${value}%` } }],
-    };
-};
 
 const columns = computed(() => [
     {
         align: 'center',
         name: 'id',
         label: t('invoiceOutList.tableVisibleColumns.id'),
-        chip: { condition: () => true },
+        chip: {
+            condition: () => true,
+        },
         isId: true,
-        columnFilter: { name: 'search' },
+        columnFilter: {
+            name: 'search',
+        },
     },
     {
         align: 'left',
         name: 'ref',
-        label: t('globals.reference'),
+        label: t('invoiceOutList.tableVisibleColumns.ref'),
         isTitle: true,
         component: 'select',
-        attrs: { url: MODEL, optionLabel: 'ref', optionValue: 'id' },
-        columnField: { component: null },
+        attrs: {
+            url: MODEL,
+            optionLabel: 'ref',
+            optionValue: 'id',
+        },
+        columnField: {
+            component: null,
+        },
     },
     {
         align: 'left',
-        name: 'issued',
-        label: t('invoiceOut.summary.issued'),
+        name: 'Issued',
+        label: t('invoiceOutList.tableVisibleColumns.issued'),
         component: 'date',
         format: (row) => toDate(row.issued),
-        columnField: { component: null },
+        columnField: {
+            component: null,
+        },
     },
     {
         align: 'left',
         name: 'clientFk',
-        label: t('globals.client'),
+        label: t('invoiceOutModule.customer'),
         cardVisible: true,
         component: 'select',
-        attrs: { url: 'Clients', fields: ['id', 'name'] },
-        columnField: { component: null },
+        attrs: {
+            url: 'Clients',
+            fields: ['id', 'name'],
+        },
+        columnField: {
+            component: null,
+        },
     },
     {
         align: 'left',
         name: 'companyCode',
-        label: t('globals.company'),
+        label: t('invoiceOutModule.company'),
         cardVisible: true,
         component: 'select',
-        attrs: { url: 'Companies', optionLabel: 'code', optionValue: 'id' },
-        columnField: { component: null },
+        attrs: {
+            url: 'Companies',
+            optionLabel: 'code',
+            optionValue: 'id',
+        },
+        columnField: {
+            component: null,
+        },
     },
     {
         align: 'left',
         name: 'amount',
-        label: t('globals.amount'),
+        label: t('invoiceOutModule.amount'),
         cardVisible: true,
         format: (row) => toCurrency(row.amount),
     },
     {
         align: 'left',
         name: 'created',
-        label: t('globals.created'),
+        label: t('invoiceOutList.tableVisibleColumns.created'),
         component: 'date',
-        columnField: { component: null },
+        columnField: {
+            component: null,
+        },
         format: (row) => toDate(row.created),
     },
     {
         align: 'left',
         name: 'dued',
-        label: t('invoiceOut.summary.dued'),
+        label: t('invoiceOutList.tableVisibleColumns.dueDate'),
         component: 'date',
-        columnField: { component: null },
+        columnField: {
+            component: null,
+        },
         format: (row) => toDate(row.dued),
     },
     {
@@ -119,12 +128,11 @@ const columns = computed(() => [
             {
                 title: t('components.smartCard.viewSummary'),
                 icon: 'preview',
-                isPrimary: true,
                 action: (row) => viewSummary(row.id, InvoiceOutSummary),
             },
             {
-                title: t('globals.downloadPdf'),
-                icon: 'cloud_download',
+                title: t('DownloadPdf'),
+                icon: 'vn:ticket',
                 isPrimary: true,
                 action: (row) => openPdf(row.id),
             },
@@ -166,7 +174,7 @@ watchEffect(selectedRows);
 <template>
     <VnSearchbar
         :info="t('youCanSearchByInvoiceReference')"
-        :label="t('Search invoice')"
+        :label="t('searchInvoice')"
         data-key="invoiceOutList"
     />
     <RightMenu>
@@ -182,7 +190,7 @@ watchEffect(selectedRows);
                 @click="downloadPdf()"
                 :disable="!hasSelectedCards"
             >
-                <QTooltip>{{ t('downloadPdf') }}</QTooltip>
+                <QTooltip>{{ t('globals.downloadPdf') }}</QTooltip>
             </QBtn>
         </template>
     </VnSubToolbar>
@@ -192,9 +200,11 @@ watchEffect(selectedRows);
         :url="`${MODEL}/filter`"
         :create="{
             urlCreate: 'InvoiceOuts/createManualInvoice',
-            title: t('createManualInvoice'),
+            title: t('Create manual invoice'),
             onDataSaved: ({ id }) => tableRef.redirect(id),
-            formInitialData: { active: true },
+            formInitialData: {
+                active: true,
+            },
         }"
         :right-search="false"
         v-model:selected="selectedRows"
@@ -214,199 +224,74 @@ watchEffect(selectedRows);
             </span>
         </template>
         <template #more-create-dialog="{ data }">
-            <div class="row q-col-gutter-xs">
-                <div class="col-12">
-                    <div class="q-col-gutter-xs">
-                        <VnRow fixed>
-                            <VnRadio
-                                v-model="selectedOption"
-                                val="ticket"
-                                :label="t('globals.ticket')"
-                                class="q-my-none q-mr-md"
-                            />
-
-                            <VnInput
-                                v-show="selectedOption === 'ticket'"
-                                v-model="data.ticketFk"
-                                :label="t('globals.ticket')"
-                                style="flex: 1"
-                            />
-
-                            <div
-                                class="row q-col-gutter-xs q-ml-none"
-                                v-show="selectedOption !== 'ticket'"
-                            >
-                                <div class="col">
-                                    <VnSelect
-                                        v-model="data.clientFk"
-                                        :label="t('globals.client')"
-                                        url="Clients"
-                                        :options="customerOptions"
-                                        option-label="name"
-                                        option-value="id"
-                                        @update:model-value="fetchClientAddress"
-                                    >
-                                        <template #option="scope">
-                                            <QItem v-bind="scope.itemProps">
-                                                <QItemSection>
-                                                    <QItemLabel>
-                                                        #{{ scope.opt?.id }} -
-                                                        {{ scope.opt?.name }}
-                                                    </QItemLabel>
-                                                </QItemSection>
-                                            </QItem>
-                                        </template>
-                                    </VnSelect>
-                                </div>
-                                <div class="col">
-                                    <VnSelect
-                                        v-model="data.addressFk"
-                                        :label="t('ticket.summary.consignee')"
-                                        :options="addressOptions"
-                                        option-label="nickname"
-                                        option-value="id"
-                                        v-if="
-                                            data.clientFk &&
-                                            selectedOption === 'consignatario'
-                                        "
-                                    >
-                                        <template #option="scope">
-                                            <QItem v-bind="scope.itemProps">
-                                                <QItemSection>
-                                                    <QItemLabel
-                                                        :class="{
-                                                            'color-vn-label':
-                                                                !scope.opt?.isActive,
-                                                        }"
-                                                    >
-                                                        {{
-                                                            `${
-                                                                !scope.opt?.isActive
-                                                                    ? t('inactive')
-                                                                    : ''
-                                                            } `
-                                                        }}
-                                                        <span>{{
-                                                            scope.opt?.nickname
-                                                        }}</span>
-                                                        <span
-                                                            v-if="
-                                                                scope.opt?.province ||
-                                                                scope.opt?.city ||
-                                                                scope.opt?.street
-                                                            "
-                                                        >
-                                                            , {{ scope.opt?.street }},
-                                                            {{ scope.opt?.city }},
-                                                            {{
-                                                                scope.opt?.province?.name
-                                                            }}
-                                                            -
-                                                            {{
-                                                                scope.opt?.agencyMode
-                                                                    ?.name
-                                                            }}
-                                                        </span>
-                                                    </QItemLabel>
-                                                </QItemSection>
-                                            </QItem>
-                                        </template>
-                                    </VnSelect>
-                                </div>
-                            </div>
-                        </VnRow>
-                        <VnRow fixed>
-                            <VnRadio
-                                v-model="selectedOption"
-                                val="cliente"
-                                :label="t('globals.client')"
-                                class="q-my-none q-mr-md"
-                            />
-                        </VnRow>
-                        <VnRow fixed>
-                            <VnRadio
-                                v-model="selectedOption"
-                                val="consignatario"
-                                :label="t('ticket.summary.consignee')"
-                                class="q-my-none q-mr-md"
-                            />
-                        </VnRow>
-                    </div>
-                </div>
-                <div class="full-width">
-                    <VnRow class="row q-col-gutter-xs">
-                        <VnSelect
-                            url="InvoiceOutSerials"
-                            v-model="data.serial"
-                            :label="t('invoiceIn.serial')"
-                            :options="invoiceOutSerialsOptions"
-                            option-label="description"
-                            option-value="code"
-                            option-filter
-                            :expr-builder="exprBuilder"
-                        >
-                            <template #option="scope">
-                                <QItem v-bind="scope.itemProps">
-                                    <QItemSection>
-                                        <QItemLabel>
-                                            {{ scope.opt?.code }} -
-                                            {{ scope.opt?.description }}
-                                        </QItemLabel>
-                                    </QItemSection>
-                                </QItem>
-                            </template>
-                        </VnSelect>
-                        <VnInputDate
-                            :label="t('invoiceOut.summary.dued')"
-                            v-model="data.maxShipped"
-                        />
-                    </VnRow>
-                    <VnRow class="row q-col-gutter-xs">
-                        <VnSelect
-                            url="TaxAreas"
-                            v-model="data.taxArea"
-                            :label="t('invoiceOutList.tableVisibleColumns.taxArea')"
-                            :options="taxAreasOptions"
-                            option-label="code"
-                            option-value="code"
-                        />
-                        <VnInput
-                            v-model="data.reference"
-                            :label="t('globals.reference')"
-                        />
-                    </VnRow>
-                </div>
+            <div class="flex no-wrap flex-center">
+                <VnSelect
+                    url="Tickets"
+                    v-model="data.ticketFk"
+                    :label="t('invoiceOutList.tableVisibleColumns.ticket')"
+                    option-label="id"
+                    option-value="id"
+                >
+                    <template #option="scope">
+                        <QItem v-bind="scope.itemProps">
+                            <QItemSection>
+                                <QItemLabel> #{{ scope.opt?.id }} </QItemLabel>
+                                <QItemLabel caption>{{ scope.opt?.nickname }}</QItemLabel>
+                            </QItemSection>
+                        </QItem>
+                    </template>
+                </VnSelect>
+                <span class="q-ml-md">O</span>
             </div>
+            <VnSelect
+                url="Clients"
+                v-model="data.clientFk"
+                :label="t('invoiceOutModule.customer')"
+                :options="customerOptions"
+                option-label="name"
+                option-value="id"
+            />
+            <VnSelect
+                url="InvoiceOutSerials"
+                v-model="data.serial"
+                :label="t('invoiceOutList.tableVisibleColumns.invoiceOutSerial')"
+                :options="invoiceOutSerialsOptions"
+                option-label="description"
+                option-value="code"
+            />
+            <VnInputDate
+                :label="t('invoiceOutList.tableVisibleColumns.dueDate')"
+                v-model="data.maxShipped"
+            />
+            <VnSelect
+                url="TaxAreas"
+                v-model="data.taxArea"
+                :label="t('invoiceOutList.tableVisibleColumns.taxArea')"
+                :options="taxAreasOptions"
+                option-label="code"
+                option-value="code"
+            />
+            <QInput
+                v-model="data.reference"
+                :label="t('invoiceOutList.tableVisibleColumns.ref')"
+            />
         </template>
     </VnTable>
 </template>
 
-<style lang="scss" scoped>
-#formModel .vn-row {
-    min-height: 45px;
-
-    .q-radio {
-        align-self: flex-end;
-        flex: 0.3;
-    }
-
-    > .q-input,
-    > .q-select {
-        flex: 0.75;
-    }
-}
-</style>
-
 <i18n>
-    en:
-        invoiceId: Invoice ID
-        youCanSearchByInvoiceReference: You can search by invoice reference
-        createManualInvoice: Create Manual Invoice
-        inactive: (Inactive)
-
-    es:
-        invoiceId: ID de factura
-        youCanSearchByInvoiceReference: Puedes buscar por referencia de la factura
-        createManualInvoice: Crear factura manual
-        inactive: (Inactivo)
+en:
+    searchInvoice: Search issued invoice
+    fileDenied: Browser denied file download...
+    fileAllowed: Successful download of CSV file
+    youCanSearchByInvoiceReference: You can search by invoice reference
+    createInvoice: Make invoice
+    Create manual invoice: Create manual invoice
+es:
+    searchInvoice: Buscar factura emitida
+    fileDenied: El navegador denegó la descarga de archivos...
+    fileAllowed: Descarga exitosa de archivo CSV
+    youCanSearchByInvoiceReference: Puedes buscar por referencia de la factura
+    createInvoice: Crear factura
+    Create manual invoice: Crear factura manual
 </i18n>

src/pages/InvoiceOut/locale/en.yml

@@ -2,7 +2,6 @@ invoiceOutModule:
     customer: Client
     amount: Amount
     company: Company
-    address: Address
 invoiceOutList:
     tableVisibleColumns:
         id: ID
@@ -16,11 +15,11 @@ invoiceOutList:
 DownloadPdf: Download PDF
 InvoiceOutSummary: Summary
 negativeBases:
-    country: Country
-    clientId: Client ID
-    base: Base
-    ticketId: Ticket
-    active: Active
-    hasToInvoice: Has to invoice
-    verifiedData: Verified data
-    commercial: Commercial
+        country: Country
+        clientId: Client ID
+        base: Base
+        ticketId: Ticket
+        active: Active
+        hasToInvoice: Has to invoice
+        verifiedData: Verified data
+        commercial: Commercial

src/pages/InvoiceOut/locale/es.yml

@@ -4,7 +4,6 @@ invoiceOutModule:
     customer: Cliente
     amount: Importe
     company: Empresa
-    address: Consignatario
 invoiceOutList:
     tableVisibleColumns:
         id: ID

src/pages/Monitor/Ticket/MonitorTickets.vue

@@ -15,7 +15,6 @@ import { toCurrency, dateRange, dashIfEmpty } from 'src/filters';
 import RightMenu from 'src/components/common/RightMenu.vue';
 import MonitorTicketSearchbar from './MonitorTicketSearchbar.vue';
 import MonitorTicketFilter from './MonitorTicketFilter.vue';
-import TicketProblems from 'src/components/TicketProblems.vue';
 
 const DEFAULT_AUTO_REFRESH = 2 * 60 * 1000; // 2min in ms
 const { t } = useI18n();
@@ -24,18 +23,13 @@ const tableRef = ref(null);
 const provinceOpts = ref([]);
 const stateOpts = ref([]);
 const zoneOpts = ref([]);
+const visibleColumns = ref([]);
 const { viewSummary } = useSummaryDialog();
 const from = Date.vnNew();
 from.setHours(0, 0, 0, 0);
 const to = new Date(from.getTime());
 to.setDate(to.getDate() + 1);
 to.setHours(23, 59, 59, 999);
-const stateColors = {
-    notice: 'info',
-    success: 'positive',
-    warning: 'warning',
-    alert: 'negative',
-};
 
 function exprBuilder(param, value) {
     switch (param) {
@@ -230,7 +224,7 @@ const columns = computed(() => [
             {
                 title: t('salesTicketsTable.goToLines'),
                 icon: 'vn:lines',
-                color: 'primary',
+                color: 'priamry',
                 action: (row) => openTab(row.id),
                 isPrimary: true,
                 attrs: {
@@ -241,7 +235,7 @@ const columns = computed(() => [
             {
                 title: t('salesTicketsTable.preview'),
                 icon: 'preview',
-                color: 'primary',
+                color: 'priamry',
                 action: (row) => viewSummary(row.id, TicketSummary),
                 isPrimary: true,
                 attrs: {
@@ -259,10 +253,10 @@ const getBadgeAttrs = (date) => {
     let timeTicket = new Date(date);
     timeTicket.setHours(0, 0, 0, 0);
 
-    let timeDiff = today - timeTicket;
+    let comparation = today - timeTicket;
 
-    if (timeDiff == 0) return { color: 'warning', 'text-color': 'black' };
-    if (timeDiff < 0) return { color: 'success', 'text-color': 'black' };
+    if (comparation == 0) return { color: 'warning', 'text-color': 'black' };
+    if (comparation < 0) return { color: 'success', 'text-color': 'black' };
     return { color: 'transparent', 'text-color': 'white' };
 };
 
@@ -277,6 +271,13 @@ const autoRefreshHandler = (value) => {
     }
 };
 
+const stateColors = {
+    notice: 'info',
+    success: 'positive',
+    warning: 'warning',
+    alert: 'negative',
+};
+
 const totalPriceColor = (ticket) => {
     const total = parseInt(ticket.totalWithVat);
     if (total > 0 && total < 50) return 'warning';
@@ -284,10 +285,10 @@ const totalPriceColor = (ticket) => {
 
 const formatShippedDate = (date) => {
     if (!date) return '-';
-    const dateSplit = date.split('T');
-    const [year, month, day] = dateSplit[0].split('-');
-    const newDate = new Date(year, month - 1, day);
-    return toDateFormat(newDate);
+    const split1 = date.split('T');
+    const [year, month, day] = split1[0].split('-');
+    const _date = new Date(year, month - 1, day);
+    return toDateFormat(_date);
 };
 
 const openTab = (id) =>
@@ -335,6 +336,7 @@ const openTab = (id) =>
         :expr-builder="exprBuilder"
         :offset="50"
         :columns="columns"
+        :visible-columns="visibleColumns"
         :right-search="false"
         default-mode="table"
         auto-load
@@ -364,7 +366,61 @@ const openTab = (id) =>
             </QCheckbox>
         </template>
         <template #column-totalProblems="{ row }">
-            <TicketProblems :row="row" />
+            <span>
+                <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"
+                    name="vn:risk"
+                    :color="row.hasHighRisk ? 'negative' : 'primary'"
+                    size="xs"
+                >
+                    <QTooltip
+                        >{{ $t('salesTicketsTable.risk') }}: {{ row.risk }}</QTooltip
+                    >
+                </QIcon>
+                <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"
+                >
+                    <QTooltip>{{ $t('salesTicketsTable.tooLittle') }}</QTooltip>
+                </QIcon>
+            </span>
         </template>
         <template #column-id="{ row }">
             <span class="link" @click.stop.prevent>
@@ -419,7 +475,7 @@ const openTab = (id) =>
             </QIcon>
         </template>
         <template #column-zoneFk="{ row }">
-            <div v-if="row.zoneFk" @click.stop.prevent :title="row.zoneName">
+            <div @click.stop.prevent :title="row.zoneName">
                 <span class="link">{{ row.zoneName }}</span>
                 <ZoneDescriptorProxy :id="row.zoneFk" />
             </div>

src/pages/Order/Card/OrderCreateDialog.vue

@@ -1,6 +1,6 @@
 <script setup>
 import { useRouter } from 'vue-router';
-import { reactive, onMounted, ref } from 'vue';
+import { onMounted, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import axios from 'axios';
 import { useState } from 'composables/useState';
@@ -9,6 +9,7 @@ import VnRow from 'components/ui/VnRow.vue';
 import VnSelect from 'components/common/VnSelect.vue';
 import VnInputDate from 'components/common/VnInputDate.vue';
 import { useDialogPluginComponent } from 'quasar';
+import { reactive } from 'vue';
 
 const { t } = useI18n();
 const state = useState();
@@ -47,6 +48,10 @@ const fetchAgencyList = async (landed, addressFk) => {
     agencyList.value = data;
 };
 
+// const fetchOrderDetails = (order) => {
+//     fetchAddressList(order?.addressFk);
+//     fetchAgencyList(order?.landed, order?.addressFk);
+// };
 const $props = defineProps({
     clientFk: {
         type: Number,
@@ -58,6 +63,39 @@ const initialFormState = reactive({
     addressId: null,
     clientFk: $props.clientFk,
 });
+// const orderMapper = (order) => {
+//     return {
+//         addressId: order.addressFk,
+//         agencyModeId: order.agencyModeFk,
+//         landed: new Date(order.landed).toISOString(),
+//     };
+// };
+// const orderFilter = {
+//     include: [
+//         { relation: 'agencyMode', scope: { fields: ['name'] } },
+//         {
+//             relation: 'address',
+//             scope: { fields: ['nickname'] },
+//         },
+//         { relation: 'rows', scope: { fields: ['id'] } },
+//         {
+//             relation: 'client',
+//             scope: {
+//                 fields: [
+//                     'salesPersonFk',
+//                     'name',
+//                     'isActive',
+//                     'isFreezed',
+//                     'isTaxDataChecked',
+//                 ],
+//                 include: {
+//                     relation: 'salesPersonUser',
+//                     scope: { fields: ['id', 'name'] },
+//                 },
+//             },
+//         },
+//     ],
+// };
 
 const onClientChange = async (clientId = $props.clientFk) => {
     const { data } = await axios.get(`Clients/${clientId}`);

src/pages/Ticket/Card/BasicData/TicketBasicDataForm.vue

@@ -33,7 +33,6 @@ const canEditZone = useAcl().hasAny([
 const agencyFetchRef = ref();
 const warehousesOptions = ref([]);
 const companiesOptions = ref([]);
-const currenciesOptions = ref([]);
 const agenciesOptions = ref([]);
 const zonesOptions = ref([]);
 const addresses = ref([]);

src/pages/Ticket/Card/TicketDescriptor.vue

@@ -130,7 +130,6 @@ function ticketFilter(ticket) {
                     <QBadge
                         text-color="black"
                         :color="entity.ticketState.state.classColor"
-                        data-cy="ticketDescriptorStateBadge"
                     >
                         {{ entity.ticketState.state.name }}
                     </QBadge>
@@ -175,7 +174,7 @@ function ticketFilter(ticket) {
                     <QTooltip>{{ t('Client Frozen') }}</QTooltip>
                 </QIcon>
                 <QIcon
-                    v-if="entity?.problem?.includes('hasRisk')"
+                    v-if="entity.problem.includes('hasRisk')"
                     name="vn:risk"
                     size="xs"
                     color="primary"

src/pages/Ticket/Card/TicketEditMana.vue

@@ -75,7 +75,6 @@ const cancel = () => {
                     dense
                     style="width: 50%"
                     @click="save()"
-                    data-cy="saveManaBtn"
                 >
                     {{ t('globals.save') }}
                 </QBtn>

src/pages/Ticket/Card/TicketNotes.vue

@@ -80,14 +80,12 @@ async function handleSave() {
                             option-value="id"
                             v-model="row.observationTypeFk"
                             :disable="!!row.id"
-                            data-cy="ticketNotesObservationType"
                         />
                         <VnInput
                             :label="t('basicData.description')"
                             v-model="row.description"
                             class="col"
                             @keyup.enter="handleSave"
-                            data-cy="ticketNotesDescription"
                         />
                         <QIcon
                             name="delete"
@@ -95,7 +93,6 @@ async function handleSave() {
                             class="cursor-pointer"
                             color="primary"
                             @click="handleDelete(row)"
-                            data-cy="ticketNotesRemoveNoteBtn"
                         >
                             <QTooltip>
                                 {{ t('ticketNotes.removeNote') }}
@@ -110,7 +107,6 @@ async function handleSave() {
                             class="fill-icon-on-hover q-ml-md"
                             color="primary"
                             @click="ticketNotesCrudRef.insert()"
-                            data-cy="ticketNotesAddNoteBtn"
                         >
                             <QTooltip>
                                 {{ t('ticketNotes.addNote') }}

src/pages/Ticket/Card/TicketSale.vue

@@ -544,7 +544,6 @@ watch(
                     color="primary"
                     :disable="!isTicketEditable || ticketState === 'OK'"
                     @click="changeTicketState('OK')"
-                    data-cy="ticketSaleOkStateBtn"
                 >
                     <QTooltip>{{ t(`Change ticket state to 'Ok'`) }}</QTooltip>
                 </QBtn>
@@ -553,7 +552,6 @@ watch(
                     color="primary"
                     :label="t('ticketList.state')"
                     :disable="!isTicketEditable"
-                    data-cy="ticketSaleStateDropdown"
                 >
                     <VnSelect
                         :options="editableStatesOptions"
@@ -563,7 +561,6 @@ watch(
                         hide-dropdown-icon
                         focus-on-mount
                         @update:model-value="changeTicketState"
-                        data-cy="ticketSaleStateSelect"
                     />
                 </QBtnDropdown>
                 <TicketSaleMoreActions
@@ -596,7 +593,6 @@ watch(
                     icon="vn:splitline"
                     :disable="!isTicketEditable || !hasSelectedRows"
                     @click="setTransferParams()"
-                    data-cy="ticketSaleTransferBtn"
                 >
                     <QTooltip>{{ t('Transfer lines') }}</QTooltip>
                     <TicketTransfer
@@ -676,13 +672,7 @@ watch(
                     {{ t('ticketSale.visible') }}: {{ row.visible || 0 }}
                 </QTooltip>
             </QIcon>
-            <QIcon
-                v-if="row.reserved"
-                color="primary"
-                name="vn:reserva"
-                size="xs"
-                data-cy="ticketSaleReservedIcon"
-            >
+            <QIcon v-if="row.reserved" color="primary" name="vn:reserva" size="xs">
                 <QTooltip>
                     {{ t('ticketSale.reserved') }}
                 </QTooltip>
@@ -835,14 +825,7 @@ watch(
     </VnTable>
 
     <QPageSticky :offset="[20, 20]" style="z-index: 2">
-        <QBtn
-            @click="newOrderFromTicket()"
-            color="primary"
-            fab
-            icon="add"
-            shortcut="+"
-            data-cy="ticketSaleAddToBasketBtn"
-        />
+        <QBtn @click="newOrderFromTicket()" color="primary" fab icon="add" shortcut="+" />
         <QTooltip class="text-no-wrap">
             {{ t('Add item to basket') }}
         </QTooltip>

src/pages/Ticket/Card/TicketSaleMoreActions.vue

@@ -175,7 +175,6 @@ const createRefund = async (withWarehouse) => {
         color="primary"
         :label="t('ticketSale.more')"
         :disable="disable"
-        data-cy="ticketSaleMoreActionsDropdown"
     >
         <template #label>
             <QTooltip>{{ t('Select lines to see the options') }}</QTooltip>
@@ -187,7 +186,6 @@ const createRefund = async (withWarehouse) => {
                 v-close-popup
                 v-ripple
                 @click="showSmsDialog('productNotAvailable')"
-                data-cy="sendShortageSMSItem"
             >
                 <QItemSection>
                     <QItemLabel>{{ t('Send shortage SMS') }}</QItemLabel>
@@ -199,18 +197,12 @@ const createRefund = async (withWarehouse) => {
                 v-close-popup
                 v-ripple
                 @click="calculateSalePrice()"
-                data-cy="recalculatePriceItem"
             >
                 <QItemSection>
                     <QItemLabel>{{ t('Recalculate price') }}</QItemLabel>
                 </QItemSection>
             </QItem>
-            <QItem
-                clickable
-                v-ripple
-                @click="emit('getMana')"
-                data-cy="updateDiscountItem"
-            >
+            <QItem clickable v-ripple @click="emit('getMana')">
                 <QItemSection>
                     <QItemLabel>{{ t('Update discount') }}</QItemLabel>
                 </QItemSection>
@@ -219,7 +211,6 @@ const createRefund = async (withWarehouse) => {
                         v-model.number="newDiscount"
                         :label="t('ticketSale.discount')"
                         type="number"
-                        data-cy="ticketSaleDiscountInput"
                     />
                 </TicketEditManaProxy>
             </QItem>
@@ -229,7 +220,6 @@ const createRefund = async (withWarehouse) => {
                 v-close-popup
                 v-ripple
                 @click="createClaim()"
-                data-cy="createClaimItem"
             >
                 <QItemSection>
                     <QItemLabel>{{ t('Add claim') }}</QItemLabel>
@@ -241,7 +231,6 @@ const createRefund = async (withWarehouse) => {
                 v-close-popup
                 v-ripple
                 @click="setReserved(true)"
-                data-cy="markAsReservedItem"
             >
                 <QItemSection>
                     <QItemLabel>{{ t('Mark as reserved') }}</QItemLabel>
@@ -253,13 +242,12 @@ const createRefund = async (withWarehouse) => {
                 v-close-popup
                 v-ripple
                 @click="setReserved(false)"
-                data-cy="unmarkAsReservedItem"
             >
                 <QItemSection>
                     <QItemLabel>{{ t('Unmark as reserved') }}</QItemLabel>
                 </QItemSection>
             </QItem>
-            <QItem clickable v-ripple data-cy="ticketSaleRefundItem">
+            <QItem clickable v-ripple>
                 <QItemSection>
                     <QItemLabel>{{ t('Refund') }}</QItemLabel>
                 </QItemSection>
@@ -268,22 +256,12 @@ const createRefund = async (withWarehouse) => {
                 </QItemSection>
                 <QMenu anchor="top end" self="top start" auto-close bordered>
                     <QList>
-                        <QItem
-                            v-ripple
-                            clickable
-                            @click="createRefund(true)"
-                            data-cy="ticketSaleRefundWithWarehouse"
-                        >
+                        <QItem v-ripple clickable @click="createRefund(true)">
                             <QItemSection>
                                 {{ t('with warehouse') }}
                             </QItemSection>
                         </QItem>
-                        <QItem
-                            v-ripple
-                            clickable
-                            @click="createRefund(false)"
-                            data-cy="ticketSaleRefundWithoutWarehouse"
-                        >
+                        <QItem v-ripple clickable @click="createRefund(false)">
                             <QItemSection>
                                 {{ t('without warehouse') }}
                             </QItemSection>

src/pages/Ticket/Card/TicketSummary.vue

@@ -96,7 +96,6 @@ function toTicketUrl(section) {
         ref="summaryRef"
         :url="`Tickets/${entityId}/summary`"
         data-key="TicketSummary"
-        data-cy="ticketSummary"
     >
         <template #header-left>
             <VnToSummary
@@ -114,7 +113,7 @@ function toTicketUrl(section) {
                 {{ entity.nickname }}
             </div>
         </template>
-        <template #header-right="{ entity }">
+        <template #header-right>
             <div>
                 <QBtnDropdown
                     ref="stateBtnDropdownRef"
@@ -133,18 +132,11 @@ function toTicketUrl(section) {
                         @update:model-value="changeState"
                     />
                 </QBtnDropdown>
-                <QBtn color="white" dense flat icon="more_vert" round size="md">
-                    <QTooltip>
-                        {{ t('components.cardDescriptor.moreOptions') }}
-                    </QTooltip>
-                    <QMenu>
-                        <QList>
-                            <TicketDescriptorMenu :ticket="entity" />
-                        </QList>
-                    </QMenu>
-                </QBtn>
             </div>
         </template>
+        <template #menu="{ entity }">
+            <TicketDescriptorMenu :ticket="entity" />
+        </template>
         <template #body="{ entity }">
             <QCard class="vn-one">
                 <VnTitle

src/pages/Ticket/Card/TicketTransfer.vue

@@ -91,7 +91,7 @@ onMounted(() => (_transfer.value = $props.transfer));
 </script>
 
 <template>
-    <QPopupProxy ref="QPopupProxyRef" data-cy="ticketTransferPopup">
+    <QPopupProxy ref="QPopupProxyRef">
         <QCard class="q-px-md" style="display: flex; width: 80vw">
             <QTable
                 :rows="transfer.sales"

src/pages/Ticket/Card/TicketTransferForm.vue

@@ -57,7 +57,6 @@ defineExpose({ transferSales });
             v-model.number="_transfer.ticketId"
             :label="t('Transfer to ticket')"
             :clearable="false"
-            data-cy="ticketTransferDestinationTicketInput"
         >
             <template #append>
                 <QBtn
@@ -65,7 +64,6 @@ defineExpose({ transferSales });
                     color="primary"
                     @click="transferSales(_transfer.ticketId)"
                     style="width: 30px"
-                    data-cy="ticketTransferTransferBtn"
                 />
             </template>
         </VnInput>
@@ -74,7 +72,6 @@ defineExpose({ transferSales });
             color="primary"
             class="full-width q-my-lg"
             @click="transferSales()"
-            data-cy="ticketTransferNewTicketBtn"
         />
     </QForm>
 </template>

src/pages/Ticket/TicketAdvance.vue

@@ -215,7 +215,7 @@ const requestComponentUpdate = async (ticket, isWithoutNegatives) => {
 
         if (!newLanded) {
             notify(t('advanceTickets.noDeliveryZone'), 'negative');
-            throw new Error(t('advanceTickets.noDeliveryZone'));
+            return;
         }
 
         ticket.landed = newLanded.landed;
@@ -299,10 +299,10 @@ const splitTickets = async () => {
                 const { query, params } = await requestComponentUpdate(ticket, true);
                 await axios.post(query, params);
                 progressAdd(ticket.futureId);
-            } catch (e) {
+            } catch (error) {
                 splitErrors.value.push({
                     id: ticket.futureId,
-                    reason: e.message || e.response?.data?.error?.message,
+                    reason: error.response?.data?.error?.message,
                 });
                 progressAdd(ticket.futureId);
             }

src/pages/Ticket/TicketList.vue

@@ -22,7 +22,6 @@ import CustomerDescriptorProxy from 'src/pages/Customer/Card/CustomerDescriptorP
 import ZoneDescriptorProxy from 'src/pages/Zone/Card/ZoneDescriptorProxy.vue';
 import { toTimeFormat } from 'src/filters/date';
 import InvoiceOutDescriptorProxy from 'src/pages/InvoiceOut/Card/InvoiceOutDescriptorProxy.vue';
-import TicketProblems from 'src/components/TicketProblems.vue';
 
 const route = useRoute();
 const router = useRouter();
@@ -456,7 +455,6 @@ function setReference(data) {
         data-key="TicketList"
         :label="t('Search ticket')"
         :info="t('You can search by ticket id or alias')"
-        data-cy="ticketListSearchBar"
     />
     <RightMenu>
         <template #right-panel>
@@ -484,10 +482,68 @@ function setReference(data) {
             'row-key': 'id',
             selection: 'multiple',
         }"
-        data-cy="ticketListTable"
     >
         <template #column-statusIcons="{ row }">
-            <TicketProblems :row="row" />
+            <div class="q-gutter-x-xs">
+                <QIcon
+                    v-if="row.isTaxDataChecked === 0"
+                    color="primary"
+                    name="vn:no036"
+                    size="xs"
+                >
+                    <QTooltip>
+                        {{ t('No verified data') }}
+                    </QTooltip>
+                </QIcon>
+                <QIcon
+                    v-if="row.hasTicketRequest"
+                    color="primary"
+                    name="vn:buyrequest"
+                    size="xs"
+                >
+                    <QTooltip>
+                        {{ t('Purchase request') }}
+                    </QTooltip>
+                </QIcon>
+                <QIcon
+                    v-if="row.itemShortage"
+                    color="primary"
+                    name="vn:unavailable"
+                    size="xs"
+                >
+                    <QTooltip>
+                        {{ t('Not visible') }}
+                    </QTooltip>
+                </QIcon>
+                <QIcon v-if="row.isFreezed" color="primary" name="vn:frozen" size="xs">
+                    <QTooltip>
+                        {{ t('Client frozen') }}
+                    </QTooltip>
+                </QIcon>
+                <QIcon v-if="row.risk" color="primary" name="vn:risk" size="xs">
+                    <QTooltip> {{ t('Risk') }}: {{ row.risk }} </QTooltip>
+                </QIcon>
+                <QIcon
+                    v-if="row.hasComponentLack"
+                    color="primary"
+                    name="vn:components"
+                    size="xs"
+                >
+                    <QTooltip>
+                        {{ t('Component lack') }}
+                    </QTooltip>
+                </QIcon>
+                <QIcon
+                    v-if="row.hasRounding"
+                    color="primary"
+                    name="sync_problem"
+                    size="xs"
+                >
+                    <QTooltip>
+                        {{ t('Rounding') }}
+                    </QTooltip>
+                </QIcon>
+            </div>
         </template>
         <template #column-salesPersonFk="{ row }">
             <span class="link" @click.stop>

src/pages/Travel/Card/TravelSummary.vue

@@ -300,6 +300,10 @@ const getLink = (param) => `#/travel/${entityId.value}/${param}`;
                 <VnLv :label="t('globals.reference')" :value="travel.ref" />
                 <VnLv label="m³" :value="travel.m3" />
                 <VnLv :label="t('globals.totalEntries')" :value="travel.totalEntries" />
+                <VnLv
+                    :label="t('travel.basicData.daysInForward')"
+                    :value="travel?.daysInForward"
+                />
             </QCard>
             <QCard class="full-width">
                 <VnTitle :text="t('travel.summary.entries')" />

src/router/modules/Supplier.js

@@ -113,7 +113,7 @@ export default {
                     name: 'SupplierAccounts',
                     meta: {
                         title: 'accounts',
-                        icon: 'vn:credit',
+                        icon: 'vn:account',
                     },
                     component: () =>
                         import('src/pages/Supplier/Card/SupplierAccounts.vue'),

src/stores/invoiceOutGlobal.js

@@ -162,15 +162,6 @@ export const useInvoiceOutGlobalStore = defineStore({
                 );
                 throw new Error('Invalid Serial Type');
             }
-
-            if (clientsToInvoice === 'all' && params.serialType !== 'global') {
-                notify(
-                    'invoiceOut.globalInvoices.errors.invalidSerialTypeForAll',
-                    'negative'
-                );
-                throw new Error('For "all" clients, the serialType must be "global"');
-            }
-
             if (!params.companyFk) {
                 notify('invoiceOut.globalInvoices.errors.chooseValidCompany', 'negative');
                 throw new Error('Invalid company');

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

@@ -1,54 +0,0 @@
-/// <reference types="cypress" />
-describe('TicketList', () => {
-    const firstRow = 'tbody > :nth-child(1)';
-
-    beforeEach(() => {
-        cy.login('developer');
-        cy.viewport(1920, 1080);
-        cy.visit('/#/ticket/list');
-    });
-
-    const searchResults = (search) => {
-        cy.dataCy('vnSearchBar').find('input').focus();
-        if (search) cy.dataCy('vnSearchBar').find('input').type(search);
-        cy.dataCy('vnSearchBar').find('input').type('{enter}');
-        cy.dataCy('ticketListTable').should('exist');
-        cy.get(firstRow).should('exist');
-    };
-
-    it('should search results', () => {
-        cy.dataCy('ticketListTable').should('not.exist');
-        cy.get('.q-field__control').should('exist');
-        searchResults();
-    });
-
-    it('should open ticket sales', () => {
-        searchResults();
-        cy.window().then((win) => {
-            cy.stub(win, 'open').as('windowOpen');
-        });
-        cy.get(firstRow).find('.q-btn:first').click();
-        cy.get('@windowOpen').should('be.calledWithMatch', /\/ticket\/\d+\/sale/);
-    });
-
-    it('should open ticket summary', () => {
-        searchResults();
-        cy.get(firstRow).find('.q-btn:last').click();
-        cy.dataCy('ticketSummary').should('exist');
-    });
-
-    it('Client list create new client', () => {
-        cy.dataCy('vnTableCreateBtn').should('exist');
-        cy.dataCy('vnTableCreateBtn').click();
-        const data = {
-            Customer: { val: 1, type: 'select' },
-            Warehouse: { val: 'Warehouse One', type: 'select' },
-            Address: { val: 'employee', type: 'select' },
-            Landed: { val: '01-01-2024', type: 'date' },
-        };
-        cy.fillInForm(data);
-        cy.get('.q-mt-lg > .q-btn--standard').click();
-        cy.checkNotification('Data created');
-        cy.url().should('match', /\/ticket\/\d+\/summary/);
-    });
-});

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

@@ -1,25 +0,0 @@
-/// <reference types="cypress" />
-describe('TicketRequest', () => {
-    beforeEach(() => {
-        cy.login('developer');
-        cy.viewport(1920, 1080);
-        cy.visit('/#/ticket/31/observation');
-    });
-
-    it('Creates and deletes a note', () => {
-        cy.dataCy('ticketNotesAddNoteBtn').should('exist');
-        cy.dataCy('ticketNotesAddNoteBtn').click();
-        cy.dataCy('ticketNotesObservationType').should('exist');
-        cy.selectOption('[data-cy="ticketNotesObservationType"]:last', 'Weight');
-        cy.dataCy('ticketNotesDescription').should('exist');
-        cy.get('[data-cy="ticketNotesDescription"]:last').type(
-            'This is a note description'
-        );
-        cy.dataCy('crudModelDefaultSaveBtn').click();
-        cy.checkNotification('Data saved');
-        cy.dataCy('ticketNotesRemoveNoteBtn').should('exist');
-        cy.dataCy('ticketNotesRemoveNoteBtn').click();
-        cy.dataCy('VnConfirm_confirm').click();
-        cy.checkNotification('Data saved');
-    });
-});

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

@@ -1,22 +0,0 @@
-/// <reference types="cypress" />
-describe('TicketRequest', () => {
-    beforeEach(() => {
-        cy.login('developer');
-        cy.viewport(1920, 1080);
-        cy.visit('/#/ticket/31/request');
-    });
-
-    it('Creates a new request', () => {
-        cy.dataCy('vnTableCreateBtn').should('exist');
-        cy.dataCy('vnTableCreateBtn').click();
-        const data = {
-            Description: { val: 'Purchase description' },
-            Atender: { val: 'buyerNick', type: 'select' },
-            Quantity: { val: 2 },
-            Price: { val: 123 },
-        };
-        cy.fillInForm(data);
-        cy.get('.q-mt-lg > .q-btn--standard').click();
-        cy.checkNotification('Data created');
-    });
-});

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

@@ -1,131 +0,0 @@
-/// <reference types="cypress" />
-
-const c = require('croppie');
-
-describe('TicketSale', () => {
-    beforeEach(() => {
-        cy.login('developer');
-        cy.viewport(1920, 1080);
-        cy.visit('/#/ticket/31/sale');
-    });
-
-    const firstRow = 'tbody > :nth-child(1)';
-
-    const selectFirstRow = () => {
-        cy.waitForElement(firstRow);
-        cy.get(firstRow).find('.q-checkbox__inner').click();
-    };
-
-    it('it should add item to basket', () => {
-        cy.window().then((win) => {
-            cy.stub(win, 'open').as('windowOpen');
-        });
-        cy.dataCy('ticketSaleAddToBasketBtn').should('exist');
-        cy.dataCy('ticketSaleAddToBasketBtn').click();
-        cy.get('@windowOpen').should('be.calledWithMatch', /\/order\/\d+\/catalog/);
-    });
-
-    it('should send SMS', () => {
-        selectFirstRow();
-        cy.dataCy('ticketSaleMoreActionsDropdown').click();
-        cy.waitForElement('[data-cy="sendShortageSMSItem"]');
-        cy.dataCy('sendShortageSMSItem').should('exist');
-        cy.dataCy('sendShortageSMSItem').click();
-        cy.dataCy('vnSmsDialog').should('exist');
-        cy.dataCy('sendSmsBtn').click();
-        cy.checkNotification('SMS sent');
-    });
-
-    it('should recalculate price when "Recalculate price" is clicked', () => {
-        cy.intercept('POST', '**/recalculatePrice').as('recalculatePrice');
-        selectFirstRow();
-        cy.dataCy('ticketSaleMoreActionsDropdown').click();
-        cy.waitForElement('[data-cy="recalculatePriceItem"]');
-        cy.dataCy('recalculatePriceItem').should('exist');
-        cy.dataCy('recalculatePriceItem').click();
-        cy.wait('@recalculatePrice').its('response.statusCode').should('eq', 200);
-        cy.checkNotification('Data saved');
-    });
-
-    it('should update discount when "Update discount" is clicked', () => {
-        selectFirstRow();
-        cy.dataCy('ticketSaleMoreActionsDropdown').click();
-        cy.waitForElement('[data-cy="updateDiscountItem"]');
-        cy.dataCy('updateDiscountItem').should('exist');
-        cy.dataCy('updateDiscountItem').click();
-        cy.waitForElement('[data-cy="ticketSaleDiscountInput"]');
-        cy.dataCy('ticketSaleDiscountInput').find('input').focus();
-        cy.dataCy('ticketSaleDiscountInput').find('input').type('10');
-        cy.dataCy('saveManaBtn').click();
-        cy.waitForElement('.q-notification__message');
-        cy.checkNotification('Data saved');
-    });
-
-    it('adds claim', () => {
-        selectFirstRow();
-        cy.dataCy('ticketSaleMoreActionsDropdown').click();
-        cy.dataCy('createClaimItem').click();
-        cy.dataCy('VnConfirm_confirm').click();
-        cy.url().should('match', /\/claim\/\d+\/basic-data/);
-        // Delete created claim to avoid cluttering the database
-        cy.dataCy('descriptor-more-opts').click();
-        cy.dataCy('deleteClaim').click();
-        cy.dataCy('VnConfirm_confirm').click();
-        cy.checkNotification('Data deleted');
-    });
-
-    it('marks row as reserved', () => {
-        selectFirstRow();
-        cy.dataCy('ticketSaleMoreActionsDropdown').click();
-        cy.waitForElement('[data-cy="markAsReservedItem"]');
-        cy.dataCy('markAsReservedItem').click();
-        cy.dataCy('ticketSaleReservedIcon').should('exist');
-    });
-
-    it('unmarks row as reserved', () => {
-        selectFirstRow();
-        cy.dataCy('ticketSaleMoreActionsDropdown').click();
-        cy.waitForElement('[data-cy="unmarkAsReservedItem"]');
-        cy.dataCy('unmarkAsReservedItem').click();
-        cy.dataCy('ticketSaleReservedIcon').should('not.exist');
-    });
-
-    it('refunds row with warehouse', () => {
-        selectFirstRow();
-        cy.dataCy('ticketSaleMoreActionsDropdown').click();
-        cy.dataCy('ticketSaleRefundItem').click();
-        cy.dataCy('ticketSaleRefundWithWarehouse').click();
-        cy.checkNotification('The following refund ticket have been created');
-    });
-
-    it('refunds row without warehouse', () => {
-        selectFirstRow();
-        cy.dataCy('ticketSaleMoreActionsDropdown').click();
-        cy.dataCy('ticketSaleRefundItem').click();
-        cy.dataCy('ticketSaleRefundWithoutWarehouse').click();
-        cy.checkNotification('The following refund ticket have been created');
-    });
-
-    it('transfers ticket', () => {
-        cy.visit('/#/ticket/32/sale');
-        selectFirstRow();
-        cy.dataCy('ticketSaleTransferBtn').click();
-        cy.dataCy('ticketTransferPopup').should('exist');
-        cy.dataCy('ticketTransferNewTicketBtn').click();
-        // existen 3 elementos "tbody" necesito checkear que el segundo elemento tbody tenga una row sola
-        cy.get('tbody').eq(1).find('tr').should('have.length', 1);
-        selectFirstRow();
-        cy.dataCy('ticketSaleTransferBtn').click();
-        cy.dataCy('ticketTransferPopup').should('exist');
-        cy.dataCy('ticketTransferDestinationTicketInput').find('input').focus();
-        cy.dataCy('ticketTransferDestinationTicketInput').find('input').type('32');
-        cy.dataCy('ticketTransferTransferBtn').click();
-        // checkear que la url contenga /ticket/1000002/sale
-        cy.url().should('match', /\/ticket\/32\/sale/);
-    });
-
-    it('should redirect to ticket logs', () => {
-        cy.get(firstRow).find('.q-btn:last').click();
-        cy.url().should('match', /\/ticket\/31\/log/);
-    });
-});

test/cypress/support/commands.js

@@ -310,7 +310,3 @@ Cypress.Commands.add('checkValueSelectForm', (id, search) => {
 Cypress.Commands.add('searchByLabel', (label, value) => {
     cy.get(`[label="${label}"] > .q-field > .q-field__inner`).type(`${value}{enter}`);
 });
-
-Cypress.Commands.add('dataCy', (dataTestId, attr = 'data-cy') => {
-    return cy.get(`[${attr}="${dataTestId}"]`);
-});

test/vitest/__tests__/composables/downloadFile.spec.js

@@ -1,36 +1,25 @@
-import { vi, describe, expect, it, beforeAll, afterAll } from 'vitest';
+import { vi, describe, expect, it } from 'vitest';
 import { axios } from 'app/test/vitest/helper';
 import { downloadFile } from 'src/composables/downloadFile';
 import { useSession } from 'src/composables/useSession';
+
 const session = useSession();
 const token = session.getToken();
 
 describe('downloadFile', () => {
-    const baseUrl = 'http://localhost:9000';
-    let defaulCreateObjectURL;
-
-    beforeAll(() => {
-        defaulCreateObjectURL = window.URL.createObjectURL;
-        window.URL.createObjectURL = vi.fn(() => 'blob:http://localhost:9000/blob-id');
-    });
-
-    afterAll(() => (window.URL.createObjectURL = defaulCreateObjectURL));
-
     it('should open a new window to download the file', async () => {
-        const res = {
-            data: new Blob(['file content'], { type: 'application/octet-stream' }),
-            headers: { 'content-disposition': 'attachment; filename="test-file.txt"' },
-        };
-        vi.spyOn(axios, 'get').mockImplementation((url) => {
-            if (url == 'Urls/getUrl') return Promise.resolve({ data: baseUrl });
-            else if (url.includes('downloadFile')) return Promise.resolve(res);
-        });
+        const url = 'http://localhost:9000';
+
+        vi.spyOn(axios, 'get').mockResolvedValueOnce({ data: url });
+
+        const mockWindowOpen = vi.spyOn(window, 'open');
 
         await downloadFile(1);
 
-        expect(axios.get).toHaveBeenCalledWith(
-            `${baseUrl}/dms/1/downloadFile?access_token=${token}`,
-            { responseType: 'blob' }
+        expect(mockWindowOpen).toHaveBeenCalledWith(
+            `${url}/api/dms/1/downloadFile?access_token=${token}`
         );
+
+        mockWindowOpen.mockRestore();
     });
 });