Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8277-createEntryControl

2025-02-13 13:16:25 +01:00 · 2025-02-13 13:16:25 +01:00 · 7a84e406e9
parent 1facb04d7a d38a07f881
commit 7a84e406e9
14 changed files with 174 additions and 112 deletions
--- a/src/components/FormModelPopup.vue
+++ b/src/components/FormModelPopup.vue
@ -58,19 +58,6 @@ defineExpose({
            <p>{{ subtitle }}</p>
            <slot name="form-inputs" :data="data" :validate="validate" />
            <div class="q-mt-lg row justify-end">
-                <QBtn
-                    v-if="showSaveAndContinueBtn"
-                    :label="t('globals.isSaveAndContinue')"
-                    :title="t('globals.isSaveAndContinue')"
-                    type="submit"
-                    color="primary"
-                    class="q-ml-sm"
-                    :disabled="isLoading"
-                    :loading="isLoading"
-                    data-cy="FormModelPopup_isSaveAndContinue"
-                    z-max
-                    @click="() => (isSaveAndContinue = true)"
-                />
                <QBtn
                    :label="t('globals.cancel')"
                    :title="t('globals.cancel')"
@ -90,6 +77,7 @@ defineExpose({
                    "
                />
                <QBtn
+                    :flat="showSaveAndContinueBtn"
                    :label="t('globals.save')"
                    :title="t('globals.save')"
                    type="submit"
@ -101,6 +89,19 @@ defineExpose({
                    z-max
                    @click="() => (isSaveAndContinue = false)"
                />
+                <QBtn
+                    v-if="showSaveAndContinueBtn"
+                    :label="t('globals.isSaveAndContinue')"
+                    :title="t('globals.isSaveAndContinue')"
+                    type="submit"
+                    color="primary"
+                    class="q-ml-sm"
+                    :disabled="isLoading"
+                    :loading="isLoading"
+                    data-cy="FormModelPopup_isSaveAndContinue"
+                    z-max
+                    @click="() => (isSaveAndContinue = true)"
+                />
            </div>
        </template>
    </FormModel>
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@ -340,8 +340,9 @@ const clickHandler = async (event) => {

    const isDateElement = event.target.closest('.q-date');
    const isTimeElement = event.target.closest('.q-time');
+    const isQselectDropDown = event.target.closest('.q-select__dropdown-icon');

-    if (isDateElement || isTimeElement) return;
+    if (isDateElement || isTimeElement || isQselectDropDown) return;

    if (clickedElement === null) {
        destroyInput(editingRow.value, editingField.value);
@ -411,7 +412,7 @@ async function renderInput(rowId, field, clickedElement) {
        focusOnMount: true,
        eventHandlers: {
            'update:modelValue': async (value) => {
-                if (isSelect) {
+                if (isSelect && value) {
                    row[column.name] = value[column.attrs?.optionValue ?? 'id'];
                    row[column?.name + 'TextValue'] =
                        value[column.attrs?.optionLabel ?? 'name'];
@ -593,6 +594,7 @@ const checkbox = ref(null);
                @row-click="(_, row) => rowClickFunction && rowClickFunction(row)"
                @update:selected="emit('update:selected', $event)"
                @selection="(details) => handleSelection(details, rows)"
+                :hide-selected-banner="true"
            >
                <template #top-left v-if="!$props.withoutHeader">
                    <slot name="top-left"> </slot>
@ -1042,7 +1044,7 @@ es:

 .grid-three {
    display: grid;
-    grid-template-columns: repeat(auto-fit, minmax(150px, max-content));
+    grid-template-columns: repeat(auto-fit, minmax(300px, max-content));
    max-width: 100%;
    grid-gap: 20px;
    margin: 0 auto;
--- a/src/components/common/VnColor.vue
+++ b/src/components/common/VnColor.vue
@ -2,7 +2,7 @@
 const $props = defineProps({
    colors: {
        type: String,
-        default: '{"value":[]}',
+        default: '{"value": []}',
    },
 });

@ -11,7 +11,7 @@ const maxHeight = 30;
 const colorHeight = maxHeight / colorArray?.length;
 </script>
 <template>
-    <div class="color-div" :style="{ height: `${maxHeight}px` }">
+    <div v-if="colors" class="color-div" :style="{ height: `${maxHeight}px` }">
        <div
            v-for="(color, index) in colorArray"
            :key="index"
--- a/src/components/ui/CardDescriptor.vue
+++ b/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 { useClipboard } from 'src/composables/useClipboard';
 import VnMoreOptions from './VnMoreOptions.vue';

 const $props = defineProps({
@ -42,6 +43,7 @@ const $props = defineProps({
 const state = useState();
 const route = useRoute();
 const { t } = useI18n();
+const { copyText } = useClipboard();
 const { viewSummary } = useSummaryDialog();
 let arrayData;
 let store;
@ -99,6 +101,14 @@ function getValueFromPath(path) {
    return current;
 }

+function copyIdText(id) {
+    copyText(id, {
+        component: {
+            copyValue: id,
+        },
+    });
+}
+
 const emit = defineEmits(['onFetch']);

 const iconModule = computed(() => route.matched[1].meta.icon);
@ -182,9 +192,22 @@ const toModule = computed(() =>
                            </slot>
                        </div>
                    </QItemLabel>
-                    <QItem dense>
+                    <QItem>
                        <QItemLabel class="subtitle" caption>
                            #{{ getValueFromPath(subtitle) ?? entity.id }}
+                            <QBtn
+                                round
+                                flat
+                                dense
+                                size="sm"
+                                icon="content_copy"
+                                color="primary"
+                                @click.stop="copyIdText(entity.id)"
+                            >
+                                <QTooltip>
+                                    {{ t('globals.copyId') }}
+                                </QTooltip>
+                            </QBtn>
                        </QItemLabel>
                    </QItem>
                </QList>
@ -292,3 +315,11 @@ const toModule = computed(() =>
    }
 }
 </style>
+<i18n>
+    en:
+        globals:
+            copyId: Copy ID
+    es:
+        globals:
+            copyId: Copiar ID
+</i18n>
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@ -156,6 +156,7 @@ globals:
    changeState: Change state
    raid: 'Raid {daysInForward} days'
    isVies: Vies
+    noData: No data available
    pageTitles:
        logIn: Login
        addressEdit: Update address
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@ -160,6 +160,7 @@ globals:
    changeState: Cambiar estado
    raid: 'Redada {daysInForward} días'
    isVies: Vies
+    noData: Datos no disponibles
    pageTitles:
        logIn: Inicio de sesión
        addressEdit: Modificar consignatario
--- a/src/pages/Entry/Card/EntryBuys.vue
+++ b/src/pages/Entry/Card/EntryBuys.vue
@ -156,10 +156,10 @@ const columns = [
    {
        align: 'center',
        labelAbbreviation: t('Sti.'),
-        label: t('Printed Stickers/Stickers'),
+        label: t('Stickers'),
        toolTip: t('Printed Stickers/Stickers'),
        name: 'stickers',
-        component: 'number',
+        component: 'input',
        create: true,
        attrs: {
            positive: false,
@ -179,7 +179,7 @@ const columns = [
        component: 'select',
        attrs: {
            url: 'packagings',
-            fields: ['id', 'volume'],
+            fields: ['id'],
            optionLabel: 'id',
        },
        create: true,
@ -192,10 +192,10 @@ const columns = [
        component: 'number',
        create: true,
        width: '35px',
+        format: (row, dashIfEmpty) => parseFloat(row['weight']).toFixed(1),
    },
    {
-        align: 'center',
-        labelAbbreviation: 'Pack',
+        labelAbbreviation: 'P',
        label: 'Packing',
        toolTip: 'Packing',
        name: 'packing',
@ -209,14 +209,13 @@ const columns = [
                row['amount'] = row['quantity'] * row['buyingValue'];
            },
        },
-        width: '35px',
+        width: '20px',
        style: (row) => {
            if (row.groupingMode === 'grouping')
                return { color: 'var(--vn-label-color)' };
        },
    },
    {
-        align: 'center',
        labelAbbreviation: 'GM',
        label: t('Grouping selector'),
        toolTip: t('Grouping selector'),
@ -229,7 +228,7 @@ const columns = [
            indeterminateValue: null,
        },
        size: 'xs',
-        width: '30px',
+        width: '25px',
        create: true,
        rightFilter: false,
        getIcon: (value) => {
@ -245,12 +244,12 @@ const columns = [
    },
    {
        align: 'center',
-        labelAbbreviation: 'Group',
+        labelAbbreviation: 'G',
        label: 'Grouping',
        toolTip: 'Grouping',
        name: 'grouping',
        component: 'number',
-        width: '35px',
+        width: '20px',
        create: true,
        style: (row) => {
            if (row.groupingMode === 'packing') return { color: 'var(--vn-label-color)' };
@ -290,6 +289,7 @@ const columns = [
            },
        },
        width: '45px',
+        format: (row) => parseFloat(row['buyingValue']).toFixed(3),
    },
    {
        align: 'center',
@ -301,6 +301,7 @@ const columns = [
            positive: false,
        },
        isEditable: false,
+        format: (row) => parseFloat(row['amount']).toFixed(2),
        style: getAmountStyle,
    },
    {
@ -312,6 +313,7 @@ const columns = [
        component: 'number',
        width: '35px',
        create: true,
+        format: (row) => parseFloat(row['price2']).toFixed(2),
    },
    {
        align: 'center',
@ -325,6 +327,7 @@ const columns = [
        },
        width: '35px',
        create: true,
+        format: (row) => parseFloat(row['price3']).toFixed(2),
    },
    {
        align: 'center',
@ -344,6 +347,7 @@ const columns = [
        style: (row) => {
            if (!row?.hasMinPrice) return { color: 'var(--vn-label-color)' };
        },
+        format: (row) => parseFloat(row['minPrice']).toFixed(2),
    },
    {
        align: 'center',
@ -518,7 +522,7 @@ onMounted(() => {
    <Teleport to="#st-data" v-if="stateStore?.isSubToolbarShown() && editableMode">
        <QBtnGroup push style="column-gap: 1px">
            <QBtnDropdown
-                icon="exposure_neg_1"
+                label="+/-"
                color="primary"
                flat
                :title="t('Invert quantity value')"
@ -533,7 +537,7 @@ onMounted(() => {
                                @click="invertQuantitySign(selectedRows, -1)"
                                data-cy="set-negative-quantity"
                            >
-                                <span style="font-size: medium">-1</span>
+                                <span style="font-size: large">-</span>
                            </QBtn>
                        </QItemSection>
                    </QItem>
@ -544,7 +548,7 @@ onMounted(() => {
                                @click="invertQuantitySign(selectedRows, 1)"
                                data-cy="set-positive-quantity"
                            >
-                                <span style="font-size: medium">1</span>
+                                <span style="font-size: large">+</span>
                            </QBtn>
                        </QItemSection>
                    </QItem>
@ -558,11 +562,11 @@ onMounted(() => {
                :disable="!selectedRows.length"
                data-cy="check-buy-amount"
            >
-                <QTooltip>{{}}</QTooltip>
                <QList>
                    <QItem>
                        <QItemSection>
                            <QBtn
+                                size="sm"
                                icon="check"
                                flat
                                @click="setIsChecked(selectedRows, true)"
@ -573,6 +577,7 @@ onMounted(() => {
                    <QItem>
                        <QItemSection>
                            <QBtn
+                                size="sm"
                                icon="close"
                                flat
                                @click="setIsChecked(selectedRows, false)"
@ -662,7 +667,7 @@ onMounted(() => {
            <FetchedTags :item="row" :columns="3" />
        </template>
        <template #column-stickers="{ row }">
-            <span class="editable-text">
+            <span :class="editableMode ? 'editable-text' : ''">
                <span style="color: var(--vn-label-color)">
                    {{ row.printedStickers }}
                </span>
@ -693,20 +698,36 @@ onMounted(() => {
        </template>
        <template #column-create-itemFk="{ data }">
            <VnSelect
-                url="Items"
+                url="Items/search"
                v-model="data.itemFk"
                :label="t('Article')"
-                :fields="['id', 'name']"
+                :fields="['id', 'name', 'size', 'producerName']"
+                :filter-options="['id', 'name', 'size', 'producerName']"
                option-label="name"
                option-value="id"
                @update:modelValue="
                    async (value) => {
-                        setBuyUltimate(value, data);
+                        await setBuyUltimate(value, data);
                    }
                "
                :required="true"
                data-cy="itemFk-create-popup"
-            />
+                sort-by="nickname DESC"
+            >
+                <template #option="scope">
+                    <QItem v-bind="scope.itemProps">
+                        <QItemSection>
+                            <QItemLabel>
+                                {{ scope.opt.name }}
+                            </QItemLabel>
+                            <QItemLabel caption>
+                                #{{ scope.opt.id }}, {{ scope.opt?.size }},
+                                {{ scope.opt?.producerName }}
+                            </QItemLabel>
+                        </QItemSection>
+                    </QItem>
+                </template>
+            </VnSelect>
        </template>
        <template #column-create-groupingMode="{ data }">
            <VnSelectEnum
@ -720,9 +741,14 @@ onMounted(() => {
            />
        </template>
        <template #previous-create-dialog="{ data }">
-            <div style="position: absolute">
+            <div
+                style="position: absolute"
+                :class="{ 'centered-container': !data.itemFk }"
+            >
                <ItemDescriptor :id="data.itemFk" v-if="data.itemFk" />
-                <SkeletonDescriptor v-if="!data.itemFk" :has-image="true" />
+                <div v-else>
+                    <span>{{ t('globals.noData') }}</span>
+                </div>
            </div>
        </template>
    </VnTable>
@ -744,6 +770,7 @@ es:
    Com.: Ref.
    Comment: Referencia
    Minimum price: Precio mínimo
+    Stickers: Etiquetas
    Printed Stickers/Stickers: Etiquetas impresas/Etiquetas
    Cost: Cost.
    Buying value: Coste
@ -761,7 +788,12 @@ es:
    Check buy amount: Marcar como correcta la cantidad de compra
 </i18n>
 <style lang="scss" scoped>
-.test {
+.centered-container {
+    display: flex;
    justify-content: center;
+    align-items: center;
+    position: absolute;
+    width: 40%;
+    height: 100%;
 }
 </style>
--- a/src/pages/Entry/EntryList.vue
+++ b/src/pages/Entry/EntryList.vue
@ -182,14 +182,6 @@ const columns = computed(() => [
        name: 'entryTypeCode',
        cardVisible: true,
    },
-    {
-        name: 'dated',
-        label: t('entry.list.tableVisibleColumns.dated'),
-        component: 'date',
-        cardVisible: false,
-        visible: false,
-        create: true,
-    },
    {
        name: 'companyFk',
        label: t('entry.list.tableVisibleColumns.companyFk'),
@ -220,7 +212,8 @@ function getBadgeAttrs(row) {

    let timeDiff = today - timeTicket;

-    if (timeDiff > 0) return { color: 'warning', 'text-color': 'black' };
+    if (timeDiff > 0) return { color: 'info', 'text-color': 'black' };
+    if (timeDiff < 0) return { color: 'warning', 'text-color': 'black' };
    switch (row.entryTypeCode) {
        case 'regularization':
        case 'life':
@ -245,7 +238,6 @@ function getBadgeAttrs(row) {
        default:
            break;
    }
-    if (timeDiff < 0) return { color: 'info', 'text-color': 'black' };
    return { color: 'transparent' };
 }

--- a/src/pages/Item/Card/ItemShelving.vue
+++ b/src/pages/Item/Card/ItemShelving.vue
@ -110,10 +110,16 @@ const columns = computed(() => [
        attrs: { inWhere: true },
        align: 'left',
    },
+    {
+        label: t('globals.visible'),
+        name: 'stock',
+        attrs: { inWhere: true },
+        align: 'left',
+    },
 ]);

 const totalLabels = computed(() =>
-    rows.value.reduce((acc, row) => acc + row.stock / row.packing, 0).toFixed(2)
+    rows.value.reduce((acc, row) => acc + row.stock / row.packing, 0).toFixed(2),
 );

 const removeLines = async () => {
@ -157,7 +163,7 @@ watchEffect(selectedRows);
                    openConfirmationModal(
                        t('shelvings.removeConfirmTitle'),
                        t('shelvings.removeConfirmSubtitle'),
-                        removeLines
+                        removeLines,
                    )
                "
            >
--- a/src/pages/Ticket/Negative/TicketLackList.vue
+++ b/src/pages/Ticket/Negative/TicketLackList.vue
@ -34,7 +34,7 @@ const redirectToCreateView = ({ itemFk }) => {
 const columns = computed(() => [
    {
        name: 'date',
-        align: 'left',
+        align: 'center',
        label: t('negative.date'),
        format: ({ timed }) => toDate(timed),
        sortable: true,
@ -47,7 +47,7 @@ const columns = computed(() => [
    {
        columnClass: 'shrink',
        name: 'timed',
-        align: 'left',
+        align: 'center',
        label: t('negative.timed'),
        format: ({ timed }) => toHour(timed),
        sortable: true,
@ -58,7 +58,7 @@ const columns = computed(() => [
    },
    {
        name: 'itemFk',
-        align: 'left',
+        align: 'center',
        label: t('negative.id'),
        format: ({ itemFk }) => itemFk,
        sortable: true,
@ -70,7 +70,7 @@ const columns = computed(() => [
    },
    {
        name: 'longName',
-        align: 'left',
+        align: 'center',
        label: t('negative.longName'),
        field: ({ longName }) => longName,

@ -81,7 +81,7 @@ const columns = computed(() => [
    },
    {
        name: 'producer',
-        align: 'left',
+        align: 'center',
        label: t('negative.supplier'),
        field: ({ producer }) => dashIfEmpty(producer),
        sortable: true,
@ -89,7 +89,7 @@ const columns = computed(() => [
    },
    {
        name: 'inkFk',
-        align: 'left',
+        align: 'center',
        label: t('negative.colour'),
        field: ({ inkFk }) => inkFk,
        sortable: true,
@ -97,7 +97,7 @@ const columns = computed(() => [
    },
    {
        name: 'size',
-        align: 'left',
+        align: 'center',
        label: t('negative.size'),
        field: ({ size }) => size,
        sortable: true,
@ -110,7 +110,7 @@ const columns = computed(() => [
    },
    {
        name: 'category',
-        align: 'left',
+        align: 'center',
        label: t('negative.origen'),
        field: ({ category }) => dashIfEmpty(category),
        sortable: true,
@ -118,7 +118,7 @@ const columns = computed(() => [
    },
    {
        name: 'lack',
-        align: 'left',
+        align: 'center',
        label: t('negative.lack'),
        field: ({ lack }) => lack,
        columnFilter: {
@ -127,12 +127,12 @@ const columns = computed(() => [
            columnClass: 'shrink',
        },
        sortable: true,
-        headerStyle: 'padding-left: 33px',
+        headerStyle: 'padding-center: 33px',
        cardVisible: true,
    },
    {
        name: 'tableActions',
-        align: 'left',
+        align: 'center',
        actions: [
            {
                title: t('Open details'),
--- a/src/pages/Ticket/Negative/TicketLackTable.vue
+++ b/src/pages/Ticket/Negative/TicketLackTable.vue
@ -52,27 +52,26 @@ const route = useRoute();
 const columns = computed(() => [
    {
        name: 'status',
-        align: 'left',
+        align: 'center',
        sortable: false,
-        columnClass: 'expand',
+        columnClass: 'shrink',
        columnFilter: false,
    },
    {
        name: 'ticketFk',
        label: t('negative.detail.ticketFk'),
-        align: 'left',
+        align: 'center',
        sortable: true,
        columnFilter: {
            component: 'input',
            type: 'number',
        },
-        columnClass: 'shrink',
    },
    {
        name: 'shipped',
        label: t('negative.detail.shipped'),
        field: 'shipped',
-        align: 'left',
+        align: 'center',
        format: ({ shipped }) => toDate(shipped),
        sortable: true,
        columnFilter: {
@ -84,11 +83,9 @@ const columns = computed(() => [
        name: 'minTimed',
        label: t('negative.detail.theoreticalhour'),
        field: 'minTimed',
-        align: 'left',
-        format: ({ minTimed }) => toHour(minTimed),
+        align: 'center',
        sortable: true,
        component: 'time',
-        columnClass: 'shrink',
        columnFilter: {},
    },
    {
@ -104,29 +101,27 @@ const columns = computed(() => [
                optionValue: 'code',
            },
        },
-        columnClass: 'expand',
-        align: 'left',
+        align: 'center',
        sortable: true,
    },
    {
        name: 'zoneName',
        label: t('negative.detail.zoneName'),
        field: 'zoneName',
-        align: 'left',
+        align: 'center',
        sortable: true,
    },
    {
        name: 'nickname',
        label: t('negative.detail.nickname'),
        field: 'nickname',
-        align: 'left',
+        align: 'center',
        sortable: true,
    },
    {
        name: 'quantity',
        label: t('negative.detail.quantity'),
        field: 'quantity',
-        align: 'left',
        sortable: true,
        component: 'input',
        type: 'number',
@ -167,7 +162,6 @@ const saveChange = async (field, { row }) => {
    }
 };

-const hasToIgnore = (row) => row.hasToIgnore === 1;
 function onBuysFetched(data) {
    Object.assign(item.value, data[0]);
 }
@ -244,7 +238,7 @@ function onBuysFetched(data) {
        </template>

        <template #column-status="{ row }">
-            <QTd style="width: 150px">
+            <QTd style="min-width: 150px">
                <div class="icon-container">
                    <QIcon
                        v-if="row.isBasket"
--- a/src/pages/Ticket/TicketList.vue
+++ b/src/pages/Ticket/TicketList.vue
@ -232,7 +232,7 @@ const columns = computed(() => [

 function resetAgenciesSelector(formData) {
    agenciesOptions.value = [];
-    if(formData) formData.agencyModeId = null;
+    if (formData) formData.agencyModeId = null;
 }

 function redirectToLines(id) {
@ -240,7 +240,7 @@ function redirectToLines(id) {
    window.open(url, '_blank');
 }

-const onClientSelected = async (formData) => {    
+const onClientSelected = async (formData) => {
    resetAgenciesSelector(formData);
    await fetchClient(formData);
    await fetchAddresses(formData);
@ -248,14 +248,12 @@ const onClientSelected = async (formData) => {

 const fetchAvailableAgencies = async (formData) => {
    resetAgenciesSelector(formData);
-    const response= await getAgencies(formData, selectedClient.value);
+    const response = await getAgencies(formData, selectedClient.value);
    if (!response) return;
-    
-    const { options, agency } =  response
-    if(options)
-        agenciesOptions.value = options;
-    if(agency)
-        formData.agencyModeId = agency;
+
+    const { options, agency } = response;
+    if (options) agenciesOptions.value = options;
+    if (agency) formData.agencyModeId = agency;
 };

 const fetchClient = async (formData) => {
@ -330,7 +328,7 @@ function openBalanceDialog(ticket) {
    const description = ref([]);
    const firstTicketClientId = checkedTickets[0].clientFk;
    const isSameClient = checkedTickets.every(
-        (ticket) => ticket.clientFk === firstTicketClientId
+        (ticket) => ticket.clientFk === firstTicketClientId,
    );

    if (!isSameClient) {
@ -369,7 +367,7 @@ async function onSubmit() {
            description: dialogData.value.value.description,
            clientFk: dialogData.value.value.clientFk,
            email: email[0].email,
-        }
+        },
    );

    if (data) notify('globals.dataSaved', 'positive');
@ -388,32 +386,32 @@ function setReference(data) {
    switch (data) {
        case 1:
            newDescription = `${t(
-                'ticketList.creditCard'
+                'ticketList.creditCard',
            )}, ${dialogData.value.value.description.replace(
                /^(Credit Card, |Cash, |Transfers, )/,
-                ''
+                '',
            )}`;
            break;
        case 2:
            newDescription = `${t(
-                'ticketList.cash'
+                'ticketList.cash',
            )}, ${dialogData.value.value.description.replace(
                /^(Credit Card, |Cash, |Transfers, )/,
-                ''
+                '',
            )}`;
            break;
        case 3:
            newDescription = `${newDescription.replace(
                /^(Credit Card, |Cash, |Transfers, )/,
-                ''
+                '',
            )}`;
            break;
        case 4:
            newDescription = `${t(
-                'ticketList.transfers'
+                'ticketList.transfers',
            )}, ${dialogData.value.value.description.replace(
                /^(Credit Card, |Cash, |Transfers, )/,
-                ''
+                '',
            )}`;
            break;
        case 3317:
--- a/test/cypress/integration/entry/entryList.spec.js
+++ b/test/cypress/integration/entry/entryList.spec.js
@ -124,12 +124,12 @@ describe('Entry', () => {

        clickAndType('stickers', '1');
        checkText('quantity', '11');
-        checkText('amount', '550');
+        checkText('amount', '550.00');
        clickAndType('packing', '2');
        checkText('packing', '12close');
-        checkText('weight', '12');
+        checkText('weight', '12.0');
        checkText('quantity', '132');
-        checkText('amount', '6600');
+        checkText('amount', '6600.00');
        checkColor('packing', COLORS.enabled);

        selectCell('groupingMode').click().click().click();
@ -137,7 +137,7 @@ describe('Entry', () => {
        checkColor('grouping', COLORS.enabled);

        selectCell('buyingValue').click().clear().type('{backspace}{backspace}1');
-        checkText('amount', '132');
+        checkText('amount', '132.00');
        checkColor('minPrice', COLORS.disable);

        selectCell('hasMinPrice').click().click();
--- a/test/cypress/integration/route/routeList.spec.js
+++ b/test/cypress/integration/route/routeList.spec.js
@ -4,9 +4,6 @@ describe('Route', () => {
        cy.login('developer');
        cy.visit(`/#/route/extended-list`);
    });
-    const getVnSelect =
-        '> :nth-child(1) > .column > .q-field > .q-field__inner > .q-field__control > .q-field__control-container';
-    const getRowColumn = (row, column) => `:nth-child(${row}) > :nth-child(${column})`;

    it('Route list create route', () => {
        cy.addBtnClick();
@ -16,18 +13,25 @@ describe('Route', () => {
    });

    it('Route list search and edit', () => {
-        cy.get('#searchbar input').type('{enter}'); /* 
-        cy.get('td[data-col-field="description"]').click(); */
-        cy.get('input[name="description"]').type('routeTestOne{enter}');
-        /*  cy.get('.q-table tr')
+        cy.get('#searchbar input').type('{enter}');
+        cy.get('[data-col-field="description"][data-row-index="0"]')
+            .click()
+            .type('routeTestOne{enter}');
+        cy.get('.q-table tr')
            .its('length')
            .then((rowCount) => {
                expect(rowCount).to.be.greaterThan(0);
            });
-        cy.get(getRowColumn(1, 3) + getVnSelect).type('{downArrow}{enter}');
-        cy.get(getRowColumn(1, 4) + getVnSelect).type('{downArrow}{enter}');
-        cy.get(getRowColumn(1, 5) + getVnSelect).type('{downArrow}{enter}');
+        cy.get('[data-col-field="workerFk"][data-row-index="0"]')
+            .click()
+            .type('{downArrow}{enter}');
+        cy.get('[data-col-field="agencyModeFk"][data-row-index="0"]')
+            .click()
+            .type('{downArrow}{enter}');
+        cy.get('[data-col-field="vehicleFk"][data-row-index="0"]')
+            .click()
+            .type('{downArrow}{enter}');
        cy.get('button[title="Save"]').click();
-        cy.get('.q-notification__message').should('have.text', 'Data saved'); */
+        cy.get('.q-notification__message').should('have.text', 'Data saved');
    });
 });