Merge branch 'dev' into 8031_notify_dataSaved

package.json

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

src/components/CrudModel.vue

@@ -234,6 +234,8 @@ async function remove(data) {
                 newData = newData.filter((form) => !ids.some((id) => id == form[pk]));
                 fetch(newData);
             });
+    } else {
+        reset();
     }
     emit('update:selected', []);
 }

src/components/VnTable/VnTable.vue

@@ -53,6 +53,10 @@ const $props = defineProps({
         type: Boolean,
         default: true,
     },
+    bottom: {
+        type: Object,
+        default: null,
+    },
     cardClass: {
         type: String,
         default: 'flex-one',
@@ -102,6 +106,10 @@ const $props = defineProps({
         type: Boolean,
         default: false,
     },
+    disabledAttr: {
+        type: Boolean,
+        default: false,
+    },
 });
 const { t } = useI18n();
 const stateStore = useStateStore();
@@ -420,7 +428,7 @@ function handleOnDataSaved(_) {
                     <QBtn
                         v-if="$props.rightSearch"
                         icon="filter_alt"
-                        class="bg-vn-section-color q-ml-md"
+                        class="bg-vn-section-color q-ml-sm"
                         dense
                         @click="stateStore.toggleRightDrawer()"
                     />
@@ -507,8 +515,12 @@ function handleOnDataSaved(_) {
                             :key="index"
                             :title="btn.title"
                             :icon="btn.icon"
-                            class="q-px-sm text-primary-light"
+                            class="q-pa-xs"
                             flat
+                            dense
+                            :class="
+                                btn.isPrimary ? 'text-primary-light' : 'color-vn-text '
+                            "
                             :style="`visibility: ${
                                 (btn.show && btn.show(row)) ?? true ? 'visible' : 'hidden'
                             }`"
@@ -516,6 +528,29 @@ function handleOnDataSaved(_) {
                         />
                     </QTd>
                 </template>
+                <template #bottom v-if="bottom">
+                    <slot name="bottom-table">
+                        <QBtn
+                            @click="
+                                () =>
+                                    createAsDialog
+                                        ? (showForm = !showForm)
+                                        : handleOnDataSaved(create)
+                            "
+                            class="cursor-pointer fill-icon"
+                            color="primary"
+                            icon="add_circle"
+                            size="md"
+                            round
+                            flat
+                            shortcut="+"
+                            :disabled="!disabledAttr"
+                        />
+                        <QTooltip>
+                            {{ createForm.title }}
+                        </QTooltip>
+                    </slot>
+                </template>
                 <template #item="{ row, colsMap }">
                     <component
                         :is="$props.redirect ? 'router-link' : 'span'"
@@ -639,18 +674,10 @@ function handleOnDataSaved(_) {
                             :key="col?.id"
                             class="text-center"
                         >
-                            <div
-                                v-if="col?.summation"
-                                :class="`text-${col?.align ?? 'left'}`"
-                                class="text-bold q-pa-sm"
-                            >
-                                {{
-                                    rows.reduce(
-                                        (sum, currentRow) => sum + currentRow[col.name],
-                                        0
-                                    )
-                                }}
-                            </div>
+                            <slot
+                                :name="`column-footer-${col.name}`"
+                                :class="getColAlign(col)"
+                            />
                         </QTh>
                     </QTr>
                 </template>
@@ -767,10 +794,16 @@ es:
     }
 }
 
-.q-table th {
+.q-table {
+    th {
         padding: 0;
-}
+    }
 
+    &__top {
+        padding: 12px 0px;
+        top: 0;
+    }
+}
 .vnTable {
     thead tr th {
         position: sticky;
@@ -851,4 +884,13 @@ es:
     cursor: text;
     user-select: all;
 }
+
+.full-width-slot {
+    width: 100%;
+    display: flex;
+    text-align: center;
+    color: var(--vn-text-color);
+    margin-bottom: -1%;
+    background-color: var(--vn-header-color);
+}
 </style>

src/components/VnTable/VnVisibleColumn.vue

@@ -135,7 +135,7 @@ onMounted(async () => {
 });
 </script>
 <template>
-    <QBtn icon="vn:visible_columns" class="bg-vn-section-color q-mr-md q-px-sm" dense>
+    <QBtn icon="vn:visible_columns" class="bg-vn-section-color q-mr-sm q-px-sm" dense>
         <QPopupProxy ref="popupProxyRef">
             <QCard class="column q-pa-md">
                 <QIcon name="info" size="sm" class="info-icon">

src/components/common/VnInput.vue

@@ -103,6 +103,7 @@ const mixinRules = [
                     @click="
                         () => {
                             value = null;
+                            vnInputRef.focus();
                             emit('remove');
                         }
                     "

src/components/common/VnInputDate.vue

@@ -20,6 +20,7 @@ const { validations } = useValidator();
 
 const { t } = useI18n();
 const requiredFieldRule = (val) => validations().required($attrs.required, val);
+const vnInputDateRef = ref(null);
 
 const dateFormat = 'DD/MM/YYYY';
 const isPopupOpen = ref();
@@ -91,6 +92,7 @@ const styleAttrs = computed(() => {
 <template>
     <div @mouseover="hover = true" @mouseleave="hover = false">
         <QInput
+            ref="vnInputDateRef"
             v-model="formattedDate"
             class="vn-input-date"
             :mask="mask"
@@ -113,6 +115,7 @@ const styleAttrs = computed(() => {
                         !$attrs.disable
                     "
                     @click="
+                        vnInputDateRef.focus();
                         model = null;
                         isPopupOpen = false;
                     "

src/components/common/VnInputTime.vue

@@ -16,6 +16,7 @@ const props = defineProps({
         default: false,
     },
 });
+const vnInputTimeRef = ref(null);
 const initialDate = ref(model.value ?? Date.vnNew());
 const { t } = useI18n();
 const requiredFieldRule = (val) => validations().required($attrs.required, val);
@@ -69,6 +70,7 @@ function dateToTime(newDate) {
 <template>
     <div @mouseover="hover = true" @mouseleave="hover = false">
         <QInput
+            ref="vnInputTimeRef"
             class="vn-input-time"
             mask="##:##"
             placeholder="--:--"
@@ -92,6 +94,7 @@ function dateToTime(newDate) {
                         !$attrs.disable
                     "
                     @click="
+                        vnInputTimeRef.focus();
                         model = null;
                         isPopupOpen = false;
                     "

src/components/common/VnLocation.vue

@@ -14,11 +14,11 @@ const props = defineProps({
 });
 const modelValue = ref(
     props.location
-        ? `${props.location?.postcode} - ${props.location?.city}(${props.location?.province?.name}), ${props.location?.country?.name}`
+        ? `${props.location?.postcode}, ${props.location?.city}(${props.location?.province?.name}), ${props.location?.country?.name}`
         : null
 );
 function showLabel(data) {
-    return `${data.code} - ${data.town}(${data.province}), ${data.country}`;
+    return `${data.code}, ${data.town}(${data.province}), ${data.country}`;
 }
 const handleModelValue = (data) => {
     emit('update:model-value', data);

src/components/ui/CardDescriptor.vue

@@ -47,6 +47,7 @@ let store;
 let entity;
 const isLoading = ref(false);
 const isSameDataKey = computed(() => $props.dataKey === route.meta.moduleName);
+const menuRef = ref();
 defineExpose({ getData });
 
 onBeforeMount(async () => {
@@ -170,7 +171,7 @@ const toModule = computed(() =>
                     <QTooltip>
                         {{ t('components.cardDescriptor.moreOptions') }}
                     </QTooltip>
-                    <QMenu ref="menuRef">
+                    <QMenu :ref="menuRef">
                         <QList>
                             <slot name="menu" :entity="entity" :menu-ref="menuRef" />
                         </QList>

src/components/ui/VnPaginate.vue

@@ -131,9 +131,8 @@ async function fetch(params) {
     useArrayData(props.dataKey, params);
     arrayData.reset(['filter.skip', 'skip']);
     await arrayData.fetch({ append: false });
-    if (!store.hasMoreData) {
-        isLoading.value = false;
-    }
+    if (!store.hasMoreData) isLoading.value = false;
+
     emit('onFetch', store.data);
     return store.data;
 }

src/css/quasar.variables.scss

@@ -36,7 +36,6 @@ $color-font-secondary: #777;
 .bg-success {
     background-color: $positive;
 }
-
 .bg-notice {
     background-color: $info;
 }

src/i18n/locale/en.yml

@@ -495,6 +495,8 @@ ticket:
         warehouse: Warehouse
         customerCard: Customer card
         alias: Alias
+        ticketList: Ticket List
+        newOrder: New Order
     boxing:
         expedition: Expedition
         item: Item
@@ -516,6 +518,7 @@ ticket:
         landed: Landed
         consigneePhone: Consignee phone
         consigneeMobile: Consignee mobile
+        consigneeAddress: Consignee address
         clientPhone: Client phone
         clientMobile: Client mobile
         consignee: Consignee
@@ -545,6 +548,11 @@ ticket:
         weight: Weight
         goTo: Go to
         summaryAmount: Summary
+        purchaseRequest: Purchase request
+        service: Service
+        description: Description
+        attender: Attender
+        ok: Ok
     create:
         client: Client
         address: Address
@@ -568,7 +576,6 @@ invoiceOut:
         client: Client
         company: Company
         customerCard: Customer card
-        ticketList: Ticket List
     summary:
         issued: Issued
         created: Created
@@ -901,6 +908,7 @@ supplier:
             account: Account
             payMethod: Pay Method
             payDay: Pay Day
+            country: Country
     summary:
         responsible: Responsible
         notes: Notes
@@ -1074,7 +1082,7 @@ item:
         producer: Producer
         landed: Landed
     fixedPrice:
-        itemId: Item ID
+        itemFk: Item ID
         groupingPrice: Grouping price
         packingPrice: Packing price
         hasMinPrice: Has min price

src/i18n/locale/es.yml

@@ -63,7 +63,7 @@ globals:
     shipped: F. envío
     totalEntries: Ent. totales
     amount: Importe
-    packages: Bultos
+    packages: Embalajes
     download: Descargar
     downloadPdf: Descargar PDF
     selectRows: 'Seleccionar las { numberRows } filas(s)'
@@ -162,6 +162,7 @@ globals:
         dms: Gestión documental
         entryCreate: Nueva entrada
         latestBuys: Últimas compras
+        reserves: Reservas
         tickets: Tickets
         ticketCreate: Nuevo ticket
         boxing: Encajado
@@ -266,7 +267,7 @@ globals:
         tracking: Estados
         components: Componentes
         pictures: Fotos
-        packages: Bultos
+        packages: Embalajes
         ldap: LDAP
         samba: Samba
         twoFactor: Doble factor
@@ -485,7 +486,7 @@ ticket:
         tracking: Estados
         components: Componentes
         pictures: Fotos
-        packages: Bultos
+        packages: Embalajes
     list:
         nickname: Alias
         state: Estado
@@ -503,6 +504,8 @@ ticket:
         warehouse: Almacén
         customerCard: Ficha del cliente
         alias: Alias
+        ticketList: Listado de tickets
+        newOrder: Nuevo pedido
     boxing:
         expedition: Expedición
         item: Artículo
@@ -524,6 +527,7 @@ ticket:
         landed: Entregado
         consigneePhone: Tel. consignatario
         consigneeMobile: Móv. consignatario
+        consigneeAddress: Dir. consignatario
         clientPhone: Tel. cliente
         clientMobile: Móv. cliente
         consignee: Consignatario
@@ -553,6 +557,10 @@ ticket:
         weight: Peso
         goTo: Ir a
         summaryAmount: Resumen
+        purchaseRequest: Petición de compra
+        service: Servicio
+        description: Descripción
+        attender: Consignatario
     create:
         client: Cliente
         address: Dirección
@@ -885,6 +893,7 @@ supplier:
             account: Cuenta
             payMethod: Método de pago
             payDay: Dia de pago
+            country: País
     summary:
         responsible: Responsable
         notes: Notas
@@ -1058,7 +1067,7 @@ item:
         producer: Productor
         landed: F. entrega
     fixedPrice:
-        itemId: ID Artículo
+        itemFk: ID Artículo
         groupingPrice: Precio grouping
         packingPrice: Precio packing
         hasMinPrice: Tiene precio mínimo

src/pages/Customer/Card/CustomerBasicData.vue

@@ -111,6 +111,8 @@ const exprBuilder = (param, value) => {
                     }"
                     :fields="['id', 'nickname']"
                     sort-by="nickname ASC"
+                    option-label="nickname"
+                    option-value="id"
                     :rules="validate('client.salesPersonFk')"
                     :expr-builder="exprBuilder"
                     emit-value

src/pages/Customer/Card/CustomerConsumptionFilter.vue

@@ -0,0 +1,177 @@
+<script setup>
+import { useI18n } from 'vue-i18n';
+import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
+import VnInput from 'src/components/common/VnInput.vue';
+import { QItem } from 'quasar';
+import VnSelect from 'src/components/common/VnSelect.vue';
+import { QItemSection } from 'quasar';
+import VnInputDate from 'src/components/common/VnInputDate.vue';
+import { toDate } from 'src/filters';
+
+const { t } = useI18n();
+defineProps({ dataKey: { type: String, required: true } });
+</script>
+<template>
+    <VnFilterPanel :data-key="dataKey" :search-button="true">
+        <template #tags="{ tag, formatFn }">
+            <div class="q-gutter-x-xs">
+                <strong>{{ t(`params.${tag.label}`) }}: </strong>
+                <span>{{ formatFn(tag.value) }}</span>
+            </div>
+        </template>
+        <template #body="{ params }">
+            <QItem>
+                <QItemSection>
+                    <VnInput
+                        :label="t('params.item')"
+                        v-model="params.itemId"
+                        is-outlined
+                        lazy-rules
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnSelect
+                        v-model="params.buyerId"
+                        url="TicketRequests/getItemTypeWorker"
+                        :fields="['id', 'nickname']"
+                        sort-by="nickname ASC"
+                        :label="t('params.buyer')"
+                        option-value="id"
+                        option-label="nickname"
+                        dense
+                        outlined
+                        rounded
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnSelect
+                        v-model="params.typeId"
+                        url="ItemTypes"
+                        :include="['category']"
+                        :fields="['id', 'name', 'categoryFk']"
+                        sort-by="name ASC"
+                        :label="t('params.typeId')"
+                        option-label="name"
+                        option-value="id"
+                        dense
+                        outlined
+                        rounded
+                    >
+                        <template #option="scope">
+                            <QItem v-bind="scope.itemProps">
+                                <QItemSection>
+                                    <QItemLabel>{{ scope.opt?.name }}</QItemLabel>
+                                    <QItemLabel caption>{{
+                                        scope.opt?.category?.name
+                                    }}</QItemLabel>
+                                </QItemSection>
+                            </QItem>
+                        </template>
+                    </VnSelect>
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnSelect
+                        v-model="params.categoryId"
+                        url="ItemCategories"
+                        :fields="['id', 'name']"
+                        sort-by="name ASC"
+                        :label="t('params.categoryId')"
+                        option-label="name"
+                        option-value="id"
+                        dense
+                        outlined
+                        rounded
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnSelect
+                        v-model="params.campaignId"
+                        url="Campaigns/latest"
+                        sort-by="dated DESC"
+                        :label="t('params.campaignId')"
+                        option-label="code"
+                        option-value="id"
+                        dense
+                        outlined
+                        rounded
+                    >
+                        <template #option="scope">
+                            <QItem v-bind="scope.itemProps">
+                                <QItemSection>
+                                    <QItemLabel>{{
+                                        t(`params.${scope.opt?.code}`)
+                                    }}</QItemLabel>
+                                    <QItemLabel caption>{{
+                                        toDate(scope.opt.dated)
+                                    }}</QItemLabel>
+                                </QItemSection>
+                            </QItem>
+                        </template>
+                    </VnSelect>
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnInputDate
+                        :label="t('params.from')"
+                        v-model="params.from"
+                        @update:model-value="searchFn()"
+                        is-outlined
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnInputDate
+                        :label="t('params.to')"
+                        v-model="params.to"
+                        @update:model-value="searchFn()"
+                        is-outlined
+                    />
+                </QItemSection>
+            </QItem>
+        </template>
+    </VnFilterPanel>
+</template>
+<i18n>
+en:
+    params:
+        item: Item id
+        buyer: Buyer
+        type: Type
+        category: Category
+        itemId: Item id
+        buyerId: Buyer
+        typeId: Type
+        categoryId: Category
+        from: From
+        to: To
+        campaignId: Campaña
+        valentinesDay: Valentine's Day
+        mothersDay: Mother's Day
+        allSaints: All Saints' Day
+es:
+    params:
+        item: Id artículo
+        buyer: Comprador
+        type: Tipo
+        category: Categoría
+        itemId: Id Artículo
+        buyerId: Comprador
+        typeId: Tipo
+        categoryId: Reino
+        from: Desde
+        to: Hasta
+        campaignId: Campaña
+        valentinesDay: Día de San Valentín
+        mothersDay: Día de la Madre
+        allSaints: Día de Todos los Santos
+</i18n>

src/pages/Customer/CustomerList.vue

@@ -429,6 +429,8 @@ function handleLocation(data, location) {
                 :params="{
                     departmentCodes: ['VT', 'shopping'],
                 }"
+                option-label="nickname"
+                option-value="id"
                 :fields="['id', 'nickname']"
                 sort-by="nickname ASC"
                 emit-value

src/pages/Entry/Card/EntrySummary.vue

@@ -10,6 +10,7 @@ import TravelDescriptorProxy from 'src/pages/Travel/Card/TravelDescriptorProxy.v
 import { toDate, toCurrency } from 'src/filters';
 import { getUrl } from 'src/composables/getUrl';
 import axios from 'axios';
+import FetchedTags from 'src/components/ui/FetchedTags.vue';
 
 const route = useRoute();
 const { t } = useI18n();
@@ -163,7 +164,7 @@ const fetchEntryBuys = async () => {
     >
         <template #header-left>
             <router-link
-                v-if="route.name !== 'EntrySummary'"
+                v-if="route?.name !== 'EntrySummary'"
                 :to="{ name: 'EntrySummary', params: { id: entityId } }"
                 class="header link"
                 :href="entryUrl"
@@ -184,7 +185,10 @@ const fetchEntryBuys = async () => {
                     <QIcon name="open_in_new" />
                 </router-link>
                 <VnLv :label="t('entry.summary.commission')" :value="entry.commission" />
-                <VnLv :label="t('entry.summary.currency')" :value="entry.currency.name" />
+                <VnLv
+                    :label="t('entry.summary.currency')"
+                    :value="entry.currency?.name"
+                />
                 <VnLv :label="t('entry.summary.company')" :value="entry.company.code" />
                 <VnLv :label="t('entry.summary.reference')" :value="entry.reference" />
                 <VnLv
@@ -210,12 +214,12 @@ const fetchEntryBuys = async () => {
                 </VnLv>
                 <VnLv
                     :label="t('entry.summary.travelAgency')"
-                    :value="entry.travel.agency.name"
+                    :value="entry.travel.agency?.name"
                 />
                 <VnLv :label="t('shipped')" :value="toDate(entry.travel.shipped)" />
                 <VnLv
                     :label="t('entry.summary.travelWarehouseOut')"
-                    :value="entry.travel.warehouseOut.name"
+                    :value="entry.travel.warehouseOut?.name"
                 />
                 <QCheckbox
                     :label="t('entry.summary.travelDelivered')"
@@ -225,7 +229,7 @@ const fetchEntryBuys = async () => {
                 <VnLv :label="t('landed')" :value="toDate(entry.travel.landed)" />
                 <VnLv
                     :label="t('entry.summary.travelWarehouseIn')"
-                    :value="entry.travel.warehouseIn.name"
+                    :value="entry.travel.warehouseIn?.name"
                 />
                 <QCheckbox
                     :label="t('entry.summary.travelReceived')"
@@ -281,17 +285,17 @@ const fetchEntryBuys = async () => {
                 >
                     <template #body="{ cols, row, rowIndex }">
                         <QTr no-hover>
-                            <QTd v-for="col in cols" :key="col.name">
+                            <QTd v-for="col in cols" :key="col?.name">
                                 <component
-                                    :is="tableColumnComponents[col.name].component(props)"
-                                    v-bind="tableColumnComponents[col.name].props(props)"
-                                    @click="tableColumnComponents[col.name].event(props)"
+                                    :is="tableColumnComponents[col?.name].component()"
+                                    v-bind="tableColumnComponents[col?.name].props()"
+                                    @click="tableColumnComponents[col?.name].event()"
                                     class="col-content"
                                 >
                                     <template
                                         v-if="
-                                            col.name !== 'observation' &&
-                                            col.name !== 'isConfirmed'
+                                            col?.name !== 'observation' &&
+                                            col?.name !== 'isConfirmed'
                                         "
                                         >{{ col.value }}</template
                                     >

src/pages/Entry/EntryLatestBuys.vue

@@ -1,16 +1,17 @@
 <script setup>
 import { onMounted, onUnmounted, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
-import RightMenu from 'src/components/common/RightMenu.vue';
-import VnTable from 'components/VnTable/VnTable.vue';
-import EntryLatestBuysFilter from './EntryLatestBuysFilter.vue';
 import { useStateStore } from 'stores/useStateStore';
+import { toDate } from 'src/filters';
+
+import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
+import RightMenu from 'src/components/common/RightMenu.vue';
+import EntryLatestBuysFilter from './EntryLatestBuysFilter.vue';
+import VnTable from 'components/VnTable/VnTable.vue';
+import VnImg from 'src/components/ui/VnImg.vue';
+
 const stateStore = useStateStore();
 const { t } = useI18n();
-import { toDate } from 'src/filters';
-import VnImg from 'src/components/ui/VnImg.vue';
-import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
-
 const columns = [
     {
         align: 'center',

src/pages/Entry/EntryLatestBuysFilter.vue

@@ -4,6 +4,7 @@ import { useI18n } from 'vue-i18n';
 
 import FetchData from 'components/FetchData.vue';
 import VnInputDate from 'src/components/common/VnInputDate.vue';
+import VnInput from 'components/common/VnInput.vue';
 import VnSelect from 'components/common/VnSelect.vue';
 import ItemsFilterPanel from 'src/components/ItemsFilterPanel.vue';
 
@@ -18,6 +19,7 @@ defineProps({
 
 const itemTypeWorkersOptions = ref([]);
 const suppliersOptions = ref([]);
+const tagValues = ref([]);
 </script>
 
 <template>

src/pages/Entry/EntryStockBought.vue

@@ -54,10 +54,9 @@ const columns = [
         create: true,
         component: 'number',
         summation: true,
-        cardVisible: true,
     },
     {
-        align: 'left',
+        align: 'center',
         label: t('Bought'),
         name: 'bought',
         summation: true,
@@ -101,14 +100,9 @@ const travel = ref(null);
 const userParams = ref({
     dated: Date.vnNew(),
 });
+
 const filter = ref({
-    where: {
-        shipped: (userParams.value.dated
-            ? new Date(userParams.value.dated)
-            : Date.vnNew()
-        ).setHours(0, 0, 0, 0),
-        m3: { neq: null },
-    },
+    fields: ['id', 'm3', 'warehouseInFk'],
     include: [
         {
             relation: 'warehouseIn',
@@ -117,6 +111,13 @@ const filter = ref({
             },
         },
     ],
+    where: {
+        shipped: (userParams.value.dated
+            ? new Date(userParams.value.dated)
+            : Date.vnNew()
+        ).setHours(0, 0, 0, 0),
+        m3: { neq: null },
+    },
 });
 
 const setUserParams = async ({ dated }) => {
@@ -128,6 +129,18 @@ const setUserParams = async ({ dated }) => {
 function openDialog() {
     travelDialogRef.value = true;
 }
+
+function setFooter(data) {
+    const footer = {
+        bought: 0,
+        reserve: 0,
+    };
+    data.forEach((row) => {
+        footer.bought += row?.bought;
+        footer.reserve += row?.reserve;
+    });
+    tableRef.value.footer = footer;
+}
 </script>
 <template>
     <VnSubToolbar>
@@ -139,7 +152,7 @@ function openDialog() {
                 :filter="filter"
                 @on-fetch="
                     (data) => {
-                        travel = data.filter((data) => data.warehouseIn.code === 'VNH');
+                        travel = data.find((data) => data.warehouseIn.code === 'VNH');
                     }
                 "
             />
@@ -149,10 +162,10 @@ function openDialog() {
                         {{ t('Booked trucks') }}:
                     </span>
                     <span>
-                        {{ travel[0]?.m3 }}
+                        {{ travel?.m3 }}
                     </span>
                     <QBtn
-                        v-if="travel[0]?.m3"
+                        v-if="travel?.m3"
                         style="max-width: 20%"
                         flat
                         icon="edit"
@@ -166,10 +179,10 @@ function openDialog() {
     </VnSubToolbar>
     <QDialog v-model="travelDialogRef" :maximized="true" :class="['vn-row', 'wrap']">
         <FormModelPopup
-            :url-update="`Travels/${travel[0].id}`"
+            :url-update="`Travels/${travel?.id}`"
             model="travel"
             :title="t('Travel m3')"
-            :form-initial-data="{ id: travel[0].id, m3: travel[0].m3 }"
+            :form-initial-data="{ id: travel?.id, m3: travel?.m3 }"
             @on-data-saved="fetchDataRef.fetch()"
         >
             <template #form-inputs="{ data }">
@@ -192,6 +205,7 @@ function openDialog() {
             />
         </template>
     </RightMenu>
+    <div class="table-container">
         <QPage class="column items-center q-pa-md">
             <VnTable
                 ref="tableRef"
@@ -201,6 +215,7 @@ function openDialog() {
                 order="reserve DESC"
                 :right-search="false"
                 :is-editable="true"
+                @on-fetch="(data) => setFooter(data)"
                 :create="{
                     urlCreate: 'StockBoughts',
                     title: t('Reserve some space'),
@@ -221,22 +236,49 @@ function openDialog() {
                         <WorkerDescriptorProxy :id="row?.workerFk" />
                     </span>
                 </template>
+                <template #column-bought="{ row }">
+                    <span :class="{ 'text-negative': row.reserve < row.bought }">
+                        {{ row?.bought }}
+                    </span>
+                </template>
+                <template #column-footer-reserve>
+                    <span>
+                        {{ tableRef.footer.reserve }}
+                    </span>
+                </template>
+                <template #column-footer-bought>
+                    <span
+                        :class="{
+                            'text-negative':
+                                tableRef.footer.reserve < tableRef.footer.bought,
+                        }"
+                    >
+                        {{ tableRef.footer.bought }}
+                    </span>
+                </template>
             </VnTable>
         </QPage>
+    </div>
 </template>
-<style lang="css" scoped>
+<style lang="scss" scoped>
 .travel {
     margin-bottom: 0px;
 }
+.table-container {
+    display: flex;
+    justify-content: center;
+}
+.column {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    width: 40%;
+}
+.text-negative {
+    color: $negative !important;
+}
 </style>
 <i18n>
-    en:
-        Buyer: Buyer
-        Reserve: Reserve
-        Bought: Bought
-        More: More
-        Date: Date
-        This buyer has already made a reservation for this date: This buyer has already made a reservation for this date
     es:
         Edit travel: Editar envío
         Travel: Envíos

src/pages/Entry/EntryStockBoughtDetail.vue

@@ -22,7 +22,7 @@ const customUrl = `StockBoughts/getStockBoughtDetail?workerFk=${$props.workerFk}
 const columns = [
     {
         align: 'left',
-        label: 'Entry',
+        label: t('Entry'),
         name: 'entryFk',
         isTitle: true,
         isId: true,
@@ -41,29 +41,33 @@ const columns = [
         create: true,
         columnClass: 'expand',
         columnFilter: false,
+        cardVisible: true,
     },
     {
         align: 'left',
         name: 'volume',
         label: t('Volume'),
         columnFilter: false,
+        cardVisible: true,
     },
     {
         align: 'left',
         label: t('Packaging'),
         name: 'packagingFk',
         columnFilter: false,
+        cardVisible: true,
     },
     {
         align: 'left',
         label: 'Packing',
         name: 'packing',
         columnFilter: false,
+        cardVisible: true,
     },
 ];
 </script>
 <template>
-    <QDialog :maximized="true">
+    <QDialog>
         <div class="container">
             <VnTable
                 ref="tableRef"
@@ -73,18 +77,26 @@ const columns = [
                 :columns="columns"
                 :right-search="false"
                 :disable-infinite-scroll="true"
-                :disable-option="{ card: true }"
                 :limit="0"
                 auto-load
             >
+                <template #top-left>
+                    <QBtn
+                        flat
+                        icon="Close"
+                        color="primary"
+                        class="bg-vn-section-color q-pa-xs"
+                        v-close-popup
+                    />
+                </template>
                 <template #column-entryFk="{ row }">
-                    <span class="link" @click.stop>
+                    <span class="link">
                         {{ row?.entryFk }}
                         <EntryDescriptorProxy :id="row.entryFk" />
                     </span>
                 </template>
                 <template #column-itemName="{ row }">
-                    <span class="link" @click.stop>
+                    <span class="link">
                         {{ row?.itemName }}
                         <ItemDescriptorProxy :id="row.itemFk" />
                     </span>
@@ -93,11 +105,10 @@ const columns = [
         </div>
     </QDialog>
 </template>
-<style lang="css">
-.q-dialog__inner {
+<style lang="css" scoped>
+.container {
     max-width: 50vw;
     overflow: auto;
-    display: flex;
     justify-content: center;
     align-items: center;
     margin: auto;
@@ -110,4 +121,9 @@ const columns = [
         Bought: Comprado
         More: Más
         Date: Fecha
+        Entry: Entrada
+        Item: Artículo
+        Name: Nombre
+        Volume: Volumen
+        Packaging: Embalage 
 </i18n>

src/pages/InvoiceOut/Card/InvoiceOutDescriptorProxy.vue

@@ -1,5 +1,6 @@
 <script setup>
 import InvoiceOutDescriptor from './InvoiceOutDescriptor.vue';
+import InvoiceOutSummary from './InvoiceOutSummary.vue';
 
 const $props = defineProps({
     id: {
@@ -10,6 +11,10 @@ const $props = defineProps({
 </script>
 <template>
     <QPopupProxy>
-        <InvoiceOutDescriptor v-if="$props.id" :id="$props.id" />
+        <InvoiceOutDescriptor
+            v-if="$props.id"
+            :id="$props.id"
+            :summary="InvoiceOutSummary"
+        />
     </QPopupProxy>
 </template>

src/pages/Item/ItemFixedPrice.vue

@@ -36,23 +36,23 @@ const user = state.getUser();
 const fixedPrices = ref([]);
 const warehousesOptions = ref([]);
 const rowsSelected = ref([]);
-
 const itemFixedPriceFilterRef = ref();
-
 const params = reactive({});
-const defaultColumnAttrs = {
-    align: 'left',
-    sortable: true,
-};
+
 onMounted(async () => {
     stateStore.rightDrawer = true;
     params.warehouseFk = user.value.warehouseFk;
 });
 onUnmounted(() => (stateStore.rightDrawer = false));
+
+const defaultColumnAttrs = {
+    align: 'left',
+    sortable: true,
+};
 const columns = computed(() => [
     {
-        label: t('item.fixedPrice.itemId'),
-        name: 'itemId',
+        label: t('item.fixedPrice.itemFk'),
+        name: 'itemFk',
         ...defaultColumnAttrs,
         isId: true,
         cardVisible: true,
@@ -426,7 +426,7 @@ function handleOnDataSave({ CrudModelRef }) {
             :default-save="false"
             data-key="ItemFixedPrices"
             url="FixedPrices/filter"
-            :order="['itemFk ASC']"
+            :order="['description DESC']"
             save-url="FixedPrices/crud"
             :user-params="{ warehouseFk: user.warehouseFk }"
             ref="tableRef"
@@ -460,7 +460,7 @@ function handleOnDataSave({ CrudModelRef }) {
                 <QCheckbox flat v-model="scope.selected" />
             </template>
 
-            <template #column-itemId="props">
+            <template #column-itemFk="props">
                 <VnSelect
                     style="max-width: 100px"
                     url="Items/withName"

src/pages/Monitor/MonitorClients.vue

@@ -139,7 +139,11 @@ const columns = computed(() => [
     </VnTable>
 </template>
 <style lang="scss" scoped>
-.full-width .vn-row > * {
-    flex: 0.4;
+.full-width .vn-row {
+    margin-bottom: 0;
+    flex-direction: row;
+    > * {
+        max-width: 125px;
+    }
 }
 </style>

src/pages/Monitor/MonitorOrders.vue

@@ -132,7 +132,6 @@ const openTab = (id) =>
         :table="{
             'row-key': 'id',
             selection: 'multiple',
-            'hide-bottom': true,
         }"
         default-mode="table"
         :row-click="({ id }) => openTab(id)"

src/pages/Monitor/Ticket/MonitorTickets.vue

@@ -54,7 +54,6 @@ const columns = computed(() => [
         label: t('salesTicketsTable.problems'),
         name: 'totalProblems',
         align: 'left',
-
         columnFilter: false,
         attrs: {
             dense: true,
@@ -65,7 +64,6 @@ const columns = computed(() => [
         name: 'id',
         field: 'id',
         align: 'left',
-
         columnFilter: {
             component: 'number',
             name: 'id',
@@ -108,9 +106,7 @@ const columns = computed(() => [
     {
         label: t('salesTicketsTable.date'),
         name: 'shippedDate',
-        style: { 'max-width': '100px' },
         align: 'left',
-
         columnFilter: {
             component: 'date',
             name: 'shippedDate',
@@ -164,7 +160,6 @@ const columns = computed(() => [
         label: t('salesTicketsTable.state'),
         name: 'state',
         align: 'left',
-        style: { 'max-width': '100px' },
         columnFilter: {
             component: 'select',
             name: 'stateFk',
@@ -193,7 +188,6 @@ const columns = computed(() => [
         label: t('salesTicketsTable.zone'),
         name: 'zoneFk',
         align: 'left',
-
         columnFilter: {
             component: 'select',
             name: 'zoneFk',
@@ -210,8 +204,6 @@ const columns = computed(() => [
         name: 'totalWithVat',
         field: 'totalWithVat',
         align: 'left',
-        style: { 'max-width': '75px' },
-
         columnFilter: {
             component: 'number',
             name: 'totalWithVat',
@@ -370,7 +362,7 @@ const openTab = (id) =>
             </QCheckbox>
         </template>
         <template #column-totalProblems="{ row }">
-            <QTd class="no-padding" style="max-width: 60px">
+            <span>
                 <QIcon
                     v-if="row.isTaxDataChecked === 0"
                     name="vn:no036"
@@ -424,30 +416,27 @@ const openTab = (id) =>
                 >
                     <QTooltip>{{ $t('salesTicketsTable.tooLittle') }}</QTooltip>
                 </QIcon>
-            </QTd>
+            </span>
         </template>
         <template #column-id="{ row }">
-            <QTd class="no-padding">
             <span class="link" @click.stop.prevent>
                 {{ row.id }}
                 <TicketDescriptorProxy :id="row.id" />
             </span>
-            </QTd>
         </template>
         <template #column-clientFk="{ row }">
-            <QTd class="no-padding" @click.stop :title="row.nickname">
-                <span class="link">{{ row.nickname }}</span>
+            <div @click.stop :title="row.nickname">
+                <span class="link" v-text="row.nickname" />
                 <CustomerDescriptorProxy :id="row.clientFk" />
-            </QTd>
+            </div>
         </template>
         <template #column-salesPersonFk="{ row }">
-            <QTd class="no-padding" @click.stop :title="row.userName">
+            <div @click.stop :title="row.userName">
                 <span class="link" v-text="dashIfEmpty(row.userName)" />
                 <WorkerDescriptorProxy :id="row.salesPersonFk" />
-            </QTd>
+            </div>
         </template>
         <template #column-shippedDate="{ row }">
-            <QTd class="no-padding">
             <QBadge
                 v-bind="getBadgeAttrs(row.shippedDate)"
                 class="q-pa-sm"
@@ -455,15 +444,12 @@ const openTab = (id) =>
             >
                 {{ formatShippedDate(row.shippedDate) }}
             </QBadge>
-            </QTd>
         </template>
         <template #column-provinceFk="{ row }">
-            <QTd class="no-padding">
             <span :title="row.province" v-text="row.province" />
-            </QTd>
         </template>
         <template #column-state="{ row }">
-            <QTd class="no-padding" @click.stop.prevent>
+            <div @click.stop.prevent>
                 <div v-if="row.refFk">
                     <span class="link">{{ row.refFk }}</span>
                     <InvoiceOutDescriptorProxy :id="row.invoiceOutId" />
@@ -477,23 +463,20 @@ const openTab = (id) =>
                 >
                     {{ row.state }}
                 </QBadge>
-            </QTd>
+            </div>
         </template>
         <template #column-isFragile="{ row }">
-            <QTd class="no-padding">
             <QIcon v-if="row.isFragile" name="local_bar" color="primary" size="sm">
                 <QTooltip>{{ $t('salesTicketsTable.isFragile') }}</QTooltip>
             </QIcon>
-            </QTd>
         </template>
         <template #column-zoneFk="{ row }">
-            <QTd class="no-padding" @click.stop.prevent :title="row.zoneName">
+            <div @click.stop.prevent :title="row.zoneName">
                 <span class="link">{{ row.zoneName }}</span>
                 <ZoneDescriptorProxy :id="row.zoneFk" />
-            </QTd>
+            </div>
         </template>
         <template #column-totalWithVat="{ row }">
-            <QTd class="no-padding">
             <QBadge
                 :color="totalPriceColor(row) || 'transparent'"
                 :text-color="totalPriceColor(row) ? 'black' : 'white'"
@@ -502,7 +485,11 @@ const openTab = (id) =>
             >
                 {{ toCurrency(row.totalWithVat) }}
             </QBadge>
-            </QTd>
         </template>
     </VnTable>
 </template>
+<style lang="scss" scoped>
+td .q-icon {
+    margin: 0 2px;
+}
+</style>

src/pages/Order/Card/OrderLines.vue

@@ -249,7 +249,7 @@ watch(
         @on-fetch="(data) => (orderSummary.vat = data)"
         auto-load
     />
-    <QDrawer side="right" :width="270" v-model="stateStore.rightDrawer">
+    <QDrawer side="right" :width="265" v-model="stateStore.rightDrawer">
         <QCard
             class="order-lines-summary q-pa-lg"
             v-if="orderSummary.vat && orderSummary.total"

src/pages/Order/OrderList.vue

@@ -14,14 +14,15 @@ import OrderFilter from './Card/OrderFilter.vue';
 import CustomerDescriptorProxy from '../Customer/Card/CustomerDescriptorProxy.vue';
 import WorkerDescriptorProxy from '../Worker/Card/WorkerDescriptorProxy.vue';
 import { toDateTimeFormat } from 'src/filters/date';
+import { onMounted } from 'vue';
+import { useRoute } from 'vue-router';
 
 const { t } = useI18n();
 const { viewSummary } = useSummaryDialog();
 const tableRef = ref();
 const agencyList = ref([]);
 const addressesList = ref([]);
-const clientId = ref();
-
+const route = useRoute();
 const columns = computed(() => [
     {
         align: 'left',
@@ -169,6 +170,13 @@ const getDateColor = (date) => {
     if (comparation == 0) return 'bg-warning';
     if (comparation < 0) return 'bg-success';
 };
+
+onMounted(() => {
+    if (!route.query.createForm) return;
+    const clientId = route.query.createForm;
+    const id = JSON.parse(clientId);
+    fetchClientAddress(id.clientFk, id);
+});
 </script>
 <template>
     <OrderSearchbar />
@@ -184,13 +192,14 @@ const getDateColor = (date) => {
         :order="['landed DESC', 'clientFk ASC', 'id DESC']"
         :create="{
             urlCreate: 'Orders/new',
-            title: 'Create Order',
+            title: t('module.cerateOrder'),
             onDataSaved: (url) => {
                 tableRef.redirect(url);
             },
             formInitialData: {
                 active: true,
                 addressId: null,
+                clientFk: null,
             },
         }"
         :user-params="{ showEmpty: false }"
@@ -221,7 +230,7 @@ const getDateColor = (date) => {
             <VnSelect
                 url="Clients"
                 :include="{ relation: 'addresses' }"
-                v-model="clientId"
+                v-model="data.clientFk"
                 :label="t('module.customer')"
                 @update:model-value="(id) => fetchClientAddress(id, data)"
             />

src/pages/Order/locale/en.yml

@@ -10,6 +10,7 @@ module:
     total: Total
     salesPerson: Sales Person
     address: Address
+    cerateOrder: Create order
 lines:
     item: Item
     warehouse: Warehouse

src/pages/Order/locale/es.yml

@@ -10,6 +10,7 @@ module:
     total: Total
     salesPerson: Comercial
     address: Dirección
+    cerateOrder: Crear cesta
 lines:
     item: Artículo
     warehouse: Almacén

src/pages/Supplier/SupplierList.vue

@@ -75,6 +75,19 @@ const columns = computed(() => [
         },
         visible: false,
     },
+    {
+        align: 'left',
+        label: t('supplier.list.tableVisibleColumns.country'),
+        name: 'country',
+        columnFilter: {
+            component: 'select',
+            name: 'countryFk',
+            attrs: {
+                url: 'countries',
+                fields: ['id', 'name'],
+            },
+        },
+    },
 ]);
 </script>
 

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

@@ -4,7 +4,6 @@ import { useI18n } from 'vue-i18n';
 
 import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue';
 import FetchedTags from 'components/ui/FetchedTags.vue';
-import RightMenu from 'src/components/common/RightMenu.vue';
 import FetchData from 'components/FetchData.vue';
 
 import { useStateStore } from 'stores/useStateStore';
@@ -115,7 +114,7 @@ const totalNewPrice = computed(() => {
 const totalDifference = computed(() => {
     return rows.value.reduce((acc, item) => acc + item.component?.difference || 0, 0);
 });
-const showMovablecolumn = computed(() => (haveDifferences.value > 0 ? ['movable'] : []));
+const showMovableColumn = computed(() => (haveDifferences.value > 0 ? ['movable'] : []));
 const haveDifferences = computed(() => _ticketData.value.sale?.haveDifferences);
 const ticketHaveNegatives = () => {
     let _haveNegatives = false;
@@ -145,8 +144,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
         @on-fetch="(data) => (ticketUpdateActions = data)"
         auto-load
     />
-    <RightMenu>
-        <template #right-panel>
+    <QDrawer side="right" :width="265" v-model="stateStore.rightDrawer">
         <QCard
             class="q-pa-md q-mb-md q-ma-md color-vn-text"
             bordered
@@ -158,18 +156,18 @@ onUnmounted(() => (stateStore.rightDrawer = false));
                     {{ t('basicData.total') }}
                 </span>
             </QCardSection>
-                <QCardSection class="column items-center" horizontal>
+            <QCardSection class="column items-left" horizontal>
                 <span>
                     {{ t('basicData.price') }}:
                     {{ toCurrency(totalPrice) }}
                 </span>
             </QCardSection>
-                <QCardSection class="column items-center" horizontal>
+            <QCardSection class="column items-left" horizontal>
                 <span>
                     {{ t('basicData.newPrice') }}: {{ toCurrency(totalNewPrice) }}
                 </span>
             </QCardSection>
-                <QCardSection class="column items-center" horizontal>
+            <QCardSection class="column items-left" horizontal>
                 <span>
                     {{ t('basicData.difference') }}: {{ toCurrency(totalDifference) }}
                 </span>
@@ -220,10 +218,9 @@ onUnmounted(() => (stateStore.rightDrawer = false));
                 </QIcon>
             </QCardSection>
         </QCard>
-        </template>
-    </RightMenu>
+    </QDrawer>
     <QTable
-        :visible-columns="showMovablecolumn"
+        :visible-columns="showMovableColumn"
         :rows="rows"
         :columns="columns"
         row-key="id"
@@ -233,15 +230,15 @@ onUnmounted(() => (stateStore.rightDrawer = false));
         flat
     >
         <template #body-cell-item="{ row }">
-            <QTd>
-                <QBtn flat color="primary">
+            <QTd @click.stop class="link">
+                <QBtn flat>
                     {{ row.itemFk }}
                     <ItemDescriptorProxy :id="row.itemFk" />
                 </QBtn>
             </QTd>
         </template>
         <template #body-cell-description="{ row }">
-            <QTd>
+            <QTd style="display: contents">
                 <div class="column">
                     <span>{{ row.item.name }}</span>
                     <span class="color-vn-label">{{ row.item.subName }}</span>

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

@@ -12,6 +12,7 @@ import VnInputTime from 'components/common/VnInputTime.vue';
 
 import axios from 'axios';
 import useNotify from 'src/composables/useNotify.js';
+import { useValidator } from 'src/composables/useValidator';
 import { toTimeFormat } from 'filters/date.js';
 
 const $props = defineProps({
@@ -23,7 +24,7 @@ const $props = defineProps({
 });
 
 const emit = defineEmits(['updateForm']);
-
+const { validate } = useValidator();
 const { notify } = useNotify();
 const router = useRouter();
 const { t } = useI18n();
@@ -51,18 +52,18 @@ const agencyByWarehouseFilter = computed(() => ({
     },
 }));
 
-const zonesFilter = computed(() => ({
-    fields: ['id', 'name'],
-    order: 'name ASC',
-    where: formData.value?.agencyModeFk
+function zoneWhere() {
+    if (formData?.value?.agencyModeFk) {
+        return formData.value?.agencyModeFk
             ? {
                   shipped: formData.value?.shipped,
                   addressFk: formData.value?.addressFk,
                   agencyModeFk: formData.value?.agencyModeFk,
                   warehouseFk: formData.value?.warehouseFk,
               }
-        : {},
-}));
+            : {};
+    }
+}
 
 const getLanded = async (params) => {
     try {
@@ -293,13 +294,6 @@ onMounted(() => onFormModelInit());
         @on-fetch="(data) => (agenciesOptions = data)"
         auto-load
     />
-    <FetchData
-        ref="zonesFetchRef"
-        url="Zones/includingExpired"
-        :filter="zonesFilter"
-        @on-fetch="(data) => (zonesOptions = data)"
-        auto-load
-    />
     <QForm>
         <VnRow>
             <VnSelect
@@ -313,6 +307,7 @@ onMounted(() => onFormModelInit());
                 hide-selected
                 map-options
                 :required="true"
+                :rules="validate('basicData.client')"
             >
                 <template #option="scope">
                     <QItem v-bind="scope.itemProps">
@@ -333,6 +328,7 @@ onMounted(() => onFormModelInit());
                 hide-selected
                 map-options
                 :required="true"
+                :rules="validate('basicData.warehouse')"
             />
         </VnRow>
         <VnRow>
@@ -345,6 +341,7 @@ onMounted(() => onFormModelInit());
                 hide-selected
                 map-options
                 :required="true"
+                :rules="validate('basicData.address')"
             >
                 <template #option="scope">
                     <QItem v-bind="scope.itemProps">
@@ -392,6 +389,7 @@ onMounted(() => onFormModelInit());
                 :label="t('basicData.alias')"
                 v-model="formData.nickname"
                 :required="true"
+                :rules="validate('basicData.alias')"
             />
         </VnRow>
         <VnRow class="row q-gutter-md q-mb-md no-wrap">
@@ -404,6 +402,7 @@ onMounted(() => onFormModelInit());
                 hide-selected
                 map-options
                 :required="true"
+                :rules="validate('basicData.company')"
             />
             <VnSelect
                 :label="t('basicData.agency')"
@@ -414,17 +413,22 @@ onMounted(() => onFormModelInit());
                 hide-selected
                 map-options
                 @focus="agencyFetchRef.fetch()"
+                :rules="validate('basicData.agency')"
             />
             <VnSelect
                 :label="t('basicData.zone')"
                 v-model="zoneId"
                 option-value="id"
                 option-label="name"
-                :options="zonesOptions"
+                url="Zones/includingExpired"
+                :fields="['id', 'name']"
+                sort-by="id"
+                :where="zoneWhere"
                 hide-selected
                 map-options
                 :required="true"
                 @focus="zonesFetchRef.fetch()"
+                :rules="validate('basicData.zone')"
             >
                 <template #option="scope">
                     <QItem v-bind="scope.itemProps">
@@ -444,16 +448,19 @@ onMounted(() => onFormModelInit());
                 :label="t('basicData.shipped')"
                 v-model="formData.shipped"
                 :required="true"
+                :rules="validate('basicData.shipped')"
             />
             <VnInputTime
                 :label="t('basicData.shippedHour')"
                 v-model="formData.shipped"
                 :required="true"
+                :rules="validate('basicData.shippedHour')"
             />
             <VnInputDate
                 :label="t('basicData.landed')"
                 v-model="formData.landed"
                 :required="true"
+                :rules="validate('basicData.landed')"
             />
         </VnRow>
     </QForm>

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

@@ -3,7 +3,7 @@ import { ref, onBeforeMount } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute, useRouter } from 'vue-router';
 
-import BasicDataTable from './BasicDataTable.vue';
+import TicketBasicData from './TicketBasicData.vue';
 import TicketBasicDataForm from './TicketBasicDataForm.vue';
 import { useVnConfirm } from 'composables/useVnConfirm';
 
@@ -158,7 +158,10 @@ onBeforeMount(async () => await getTicketData());
         color="primary"
         animated
         keep-alive
-        style="max-width: 800px; margin: auto"
+        style="margin: auto"
+        :style="{
+            'max-width': step > 1 ? 'none' : '800px',
+        }"
     >
         <QStep :name="1" :title="t('globals.pageTitles.basicData')" :done="step > 1">
             <TicketBasicDataForm
@@ -168,7 +171,7 @@ onBeforeMount(async () => await getTicketData());
             />
         </QStep>
         <QStep :name="2" :title="t('basicData.priceDifference')">
-            <BasicDataTable
+            <TicketBasicData
                 :form-data="formData"
                 v-model:haveNegatives="haveNegatives"
                 @update-form="($event) => (formData = $event)"

src/pages/Ticket/Card/ExpeditionNewTicket.vue

@@ -31,6 +31,7 @@ const router = useRouter();
 const { notify } = useNotify();
 
 const newTicketFormData = reactive({});
+const date = new Date();
 
 const createTicket = async () => {
     try {
@@ -64,7 +65,11 @@ const createTicket = async () => {
     >
         <template #form-inputs="{ data }">
             <VnRow>
-                <VnInputDate :label="t('expedition.landed')" v-model="data.landed" />
+                <VnInputDate
+                    :label="t('expedition.landed')"
+                    v-model="data.landed"
+                    :model-value="date"
+                />
             </VnRow>
             <VnRow>
                 <VnInput

src/pages/Ticket/Card/TicketComponents.vue

@@ -5,15 +5,16 @@ import { useRoute } from 'vue-router';
 
 import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue';
 import FetchedTags from 'components/ui/FetchedTags.vue';
-import RightMenu from 'src/components/common/RightMenu.vue';
 import FetchData from 'components/FetchData.vue';
 import ZoneDescriptorProxy from 'src/pages/Zone/Card/ZoneDescriptorProxy.vue';
+import VnImg from 'src/components/ui/VnImg.vue';
 
 import { useStateStore } from 'stores/useStateStore';
 import { dashIfEmpty } from 'src/filters';
 import { useArrayData } from 'composables/useArrayData';
 import { toCurrency } from 'filters/index';
 import axios from 'axios';
+import VnTable from 'src/components/VnTable/VnTable.vue';
 
 const route = useRoute();
 const stateStore = useStateStore();
@@ -75,22 +76,39 @@ const columns = computed(() => [
         name: 'item',
         align: 'left',
     },
+    {
+        align: 'left',
+        label: t('lines.image'),
+        name: 'image',
+        columnField: {
+            component: VnImg,
+            attrs: (id) => {
+                return {
+                    id,
+                    width: '50px',
+                };
+            },
+        },
+        columnFilter: false,
+    },
     {
         label: t('ticketComponents.description'),
         name: 'description',
         align: 'left',
+        columnClass: 'expand',
     },
     {
         label: t('ticketComponents.quantity'),
         name: 'quantity',
         field: 'quantity',
         align: 'left',
-        format: (val) => dashIfEmpty(val),
+        format: (row) => dashIfEmpty(row.quantity),
     },
     {
         label: t('ticketComponents.serie'),
         name: 'serie',
         align: 'left',
+        format: (row) => dashIfEmpty(row.serie),
     },
     {
         label: t('ticketComponents.components'),
@@ -174,14 +192,8 @@ onUnmounted(() => (stateStore.rightDrawer = false));
         @on-fetch="(data) => (components = data)"
         auto-load
     />
-    <RightMenu>
-        <template #right-panel>
-            <QCard
-                class="q-pa-sm color-vn-text"
-                bordered
-                flat
-                style="border-color: black"
-            >
+    <QDrawer side="right" :width="265" v-model="stateStore.rightDrawer">
+        <QCard class="q-pa-sm color-vn-text" bordered flat style="border-color: black">
             <QCardSection horizontal>
                 <span class="text-weight-bold text-subtitle1 text-center full-width">
                     {{ t('ticketComponents.total') }}
@@ -200,12 +212,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
                 <span>{{ toCurrency(getTotal) }}</span>
             </QCardSection>
         </QCard>
-            <QCard
-                class="q-pa-sm color-vn-text"
-                bordered
-                flat
-                style="border-color: black"
-            >
+        <QCard class="q-pa-sm color-vn-text" bordered flat style="border-color: black">
             <QCardSection horizontal>
                 <span class="text-weight-bold text-subtitle1 text-center full-width">
                     {{ t('ticketComponents.components') }}
@@ -224,12 +231,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
                 }}</span>
             </QCardSection>
         </QCard>
-            <QCard
-                class="q-pa-sm color-vn-text"
-                bordered
-                flat
-                style="border-color: black"
-            >
+        <QCard class="q-pa-sm color-vn-text" bordered flat style="border-color: black">
             <QCardSection horizontal>
                 <span class="text-weight-bold text-subtitle1 text-center full-width">
                     {{ t('ticketComponents.zoneBreakdown') }}
@@ -269,12 +271,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
                 <span>{{ dashIfEmpty(ticketData?.packages) }}</span>
             </QCardSection>
         </QCard>
-            <QCard
-                class="q-pa-sm color-vn-text"
-                bordered
-                flat
-                style="border-color: black"
-            >
+        <QCard class="q-pa-sm color-vn-text" bordered flat style="border-color: black">
             <QCardSection horizontal>
                 <span class="text-weight-bold text-subtitle1 text-center full-width">
                     {{ t('ticketComponents.theoricalCost') }}
@@ -287,68 +284,74 @@ onUnmounted(() => (stateStore.rightDrawer = false));
                 <span>{{ toCurrency(theoricalCost, 'EUR', 2) }}</span>
             </QCardSection>
         </QCard>
-        </template>
-    </RightMenu>
-    <QTable
-        :rows="components"
+    </QDrawer>
+    <VnTable
+        ref="tableRef"
+        data-key="TicketComponents"
+        url="Sales"
+        :user-filter="salesFilter"
         :columns="columns"
-        row-key="id"
-        :pagination="{ rowsPerPage: 0 }"
-        class="full-width q-mt-md"
-        :no-data-label="t('globals.noResults')"
+        :right-search="false"
+        auto-load
+        :disable-option="{ card: true }"
+        :column-search="false"
     >
-        <template #body-cell-item="{ row }">
-            <QTd>
-                <QBtn flat color="primary">
-                    <span class="link">{{ row.itemFk }}</span>
+        <template #column-item="{ row }">
+            <span @click.stop flat class="link">
+                {{ row.itemFk }}
                 <ItemDescriptorProxy :id="row.itemFk" />
-                </QBtn>
-            </QTd>
+            </span>
         </template>
-        <template #body-cell-description="{ row }">
-            <QTd>
+        <template #column-image="{ row }">
+            <div class="image-wrapper">
+                <VnImg :id="parseInt(row?.item?.id)" class="rounded" />
+            </div>
+        </template>
+        <template #column-description="{ row }">
             <div class="column">
                 <span>{{ row.item.name }}</span>
                 <span class="color-vn-label">{{ row.item.subName }}</span>
                 <FetchedTags :item="row.item" />
             </div>
-            </QTd>
         </template>
-        <template #body-cell-serie="{ row }">
-            <QTd>
+        <template #column-serie="{ row }">
             <div class="column">
                 <span v-for="(saleComponent, index) in row.components" :key="index">
                     {{ saleComponent.component?.componentType?.name }}
                 </span>
             </div>
-            </QTd>
         </template>
-        <template #body-cell-components="{ row }">
-            <QTd>
+        <template #column-components="{ row }">
             <div class="column">
                 <span v-for="(saleComponent, index) in row.components" :key="index">
                     {{ saleComponent.component?.name }}
                 </span>
             </div>
-            </QTd>
         </template>
-        <template #body-cell-import="{ row }">
-            <QTd>
-                <div class="column text-right">
+        <template #column-import="{ row }">
+            <div class="column text-left">
                 <span v-for="(saleComponent, index) in row.components" :key="index">
                     {{ toCurrency(saleComponent.value, 'EUR', 3) }}
                 </span>
             </div>
-            </QTd>
         </template>
-        <template #body-cell-total="{ row }">
-            <QTd>
-                <div class="column text-right">
+        <template #column-total="{ row }">
+            <div class="column">
                 <span v-for="(saleComponent, index) in row.components" :key="index">
                     {{ toCurrency(saleComponent.value * row.quantity, 'EUR', 3) }}
+                    <!-- <QTooltip>
+                        {{ saleComponent.component?.name }}:
+                        {{ toCurrency(saleComponent.value, 'EUR', 3) }}
+                    </QTooltip> -->
                 </span>
             </div>
-            </QTd>
         </template>
-    </QTable>
+    </VnTable>
 </template>
+
+<style lang="scss" scoped>
+.image-wrapper {
+    width: 40px;
+    height: 40px;
+}
+</style>

src/pages/Ticket/Card/TicketDescriptor.vue

@@ -2,13 +2,13 @@
 import { ref, computed } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
-import { toDate } from 'src/filters';
 import CustomerDescriptorProxy from 'pages/Customer/Card/CustomerDescriptorProxy.vue';
 import CardDescriptor from 'components/ui/CardDescriptor.vue';
 import TicketDescriptorMenu from './TicketDescriptorMenu.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
 import useCardDescription from 'src/composables/useCardDescription';
 import VnUserLink from 'src/components/ui/VnUserLink.vue';
+import { toDateTimeFormat } from 'src/filters/date';
 
 const $props = defineProps({
     id: {
@@ -30,13 +30,24 @@ const filter = {
         {
             relation: 'address',
             scope: {
-                fields: ['id', 'name', 'mobile', 'phone'],
+                fields: ['id', 'name', 'mobile', 'phone', 'incotermsFk'],
             },
         },
         {
             relation: 'client',
             scope: {
-                fields: ['id', 'name', 'salesPersonFk', 'phone', 'mobile', 'email'],
+                fields: [
+                    'id',
+                    'name',
+                    'salesPersonFk',
+                    'phone',
+                    'mobile',
+                    'email',
+                    'isActive',
+                    'isFreezed',
+                    'isTaxDataChecked',
+                    'hasElectronicInvoice',
+                ],
                 include: [
                     {
                         relation: 'user',
@@ -87,6 +98,10 @@ const filter = {
 };
 
 const data = ref(useCardDescription());
+
+function ticketFilter(ticket) {
+    return JSON.stringify({ clientFk: ticket.clientFk });
+}
 </script>
 
 <template>
@@ -128,7 +143,10 @@ const data = ref(useCardDescription());
                     />
                 </template>
             </VnLv>
-            <VnLv :label="t('ticket.card.shipped')" :value="toDate(entity.shipped)" />
+            <VnLv
+                :label="t('ticket.card.shipped')"
+                :value="toDateTimeFormat(entity.shipped)"
+            />
             <VnLv
                 v-if="entity.agencyMode"
                 :label="t('ticket.card.agency')"
@@ -138,7 +156,39 @@ const data = ref(useCardDescription());
             <VnLv :label="t('ticket.card.alias')" :value="entity.nickname" />
         </template>
         <template #icons="{ entity }">
-            <QCardActions>
+            <QCardActions class="q-gutter-x-xs">
+                <QIcon
+                    v-if="entity.client.isActive == false"
+                    name="vn:disabled"
+                    size="xs"
+                    color="primary"
+                >
+                    <QTooltip>{{ t('Client inactive') }}</QTooltip>
+                </QIcon>
+                <QIcon
+                    v-if="entity.client.isFreezed == true"
+                    name="vn:frozen"
+                    size="xs"
+                    color="primary"
+                >
+                    <QTooltip>{{ t('Client Frozen') }}</QTooltip>
+                </QIcon>
+                <QIcon
+                    v-if="entity.problem.includes('hasRisk')"
+                    name="vn:risk"
+                    size="xs"
+                    color="primary"
+                >
+                    <QTooltip>{{ t('Client has debt') }}</QTooltip>
+                </QIcon>
+                <QIcon
+                    v-if="entity.client.isTaxDataChecked == false"
+                    name="vn:no036"
+                    size="xs"
+                    color="primary"
+                >
+                    <QTooltip>{{ t('Client not checked') }}</QTooltip>
+                </QIcon>
                 <QIcon
                     v-if="entity.isDeleted == true"
                     name="vn:deletedTicket"
@@ -159,6 +209,27 @@ const data = ref(useCardDescription());
                 >
                     <QTooltip>{{ t('ticket.card.customerCard') }}</QTooltip>
                 </QBtn>
+                <QBtn
+                    size="md"
+                    icon="vn:ticket"
+                    color="primary"
+                    :to="{ name: 'TicketList', query: { table: ticketFilter(entity) } }"
+                >
+                    <QTooltip>{{ t('ticket.card.ticketList') }}</QTooltip>
+                </QBtn>
+                <QBtn
+                    size="md"
+                    icon="vn:basketadd"
+                    color="primary"
+                    :to="{
+                        name: 'OrderList',
+                        query: {
+                            createForm: JSON.stringify({ clientFk: entity.clientFk }),
+                        },
+                    }"
+                >
+                    <QTooltip>{{ t('ticket.card.newOrder') }}</QTooltip>
+                </QBtn>
             </QCardActions>
         </template>
     </CardDescriptor>
@@ -168,4 +239,8 @@ const data = ref(useCardDescription());
 es:
     This ticket is deleted: Este ticket está eliminado
     Go to module index: Ir al índice del modulo
+    Client inactive: Cliente inactivo
+    Client not checked: Cliente no verificado
+    Client has debt: Cliente con deuda
+    Client Frozen: Cliente congelado
 </i18n>

src/pages/Ticket/Card/TicketDescriptorMenu.vue

@@ -1,6 +1,6 @@
 <script setup>
 import axios from 'axios';
-import { ref } from 'vue';
+import { ref, toRefs } from 'vue';
 import { useQuasar } from 'quasar';
 import { useI18n } from 'vue-i18n';
 import { useRouter } from 'vue-router';
@@ -9,6 +9,11 @@ import SendEmailDialog from 'components/common/SendEmailDialog.vue';
 import VnConfirm from 'components/ui/VnConfirm.vue';
 import VnSmsDialog from 'components/common/VnSmsDialog.vue';
 import toDate from 'filters/toDate';
+import FormPopup from 'components/FormPopup.vue';
+import VnSelect from 'components/common/VnSelect.vue';
+import FetchData from 'components/FetchData.vue';
+import VnInputTime from 'src/components/common/VnInputTime.vue';
+import { useAcl } from 'src/composables/useAcl';
 import VnInputNumber from 'src/components/common/VnInputNumber.vue';
 import { useArrayData } from 'src/composables/useArrayData';
 
@@ -24,8 +29,16 @@ const { dialog, notify } = useQuasar();
 const { t } = useI18n();
 const { openReport, sendEmail } = usePrintService();
 const ticketSummary = useArrayData('TicketSummary');
-const ticket = ref(props.ticket);
+const { ticket } = toRefs(props);
 const ticketId = currentRoute.value.params.id;
+const client = ref();
+const showTransferDialog = ref(false);
+const showTurnDialog = ref(false);
+const showChangeTimeDialog = ref(false);
+const dialogRef = ref();
+const isEditable = ref();
+const hasInvoicing = useAcl('invoicing');
+const hasPdf = ref();
 const weight = ref();
 const actions = {
     clone: async () => {
@@ -76,6 +89,7 @@ const actions = {
             notify({
                 message: t('You can undo this action within the first hour'),
                 icon: 'info',
+                type: 'warning',
             });
 
             push({ name: 'TicketList' });
@@ -87,10 +101,14 @@ const actions = {
 
 function openDeliveryNote(type = 'deliveryNote', documentType = 'pdf') {
     const path = `Tickets/${ticket.value.id}/delivery-note-${documentType}`;
-    openReport(path, {
+    openReport(
+        path,
+        {
             recipientId: ticket.value.clientFk,
             type: type,
-    });
+        },
+        '_blank'
+    );
 }
 
 function sendDeliveryNoteConfirmation(type = 'deliveryNote', documentType = 'pdf') {
@@ -173,34 +191,280 @@ function openConfirmDialog(callback) {
     dialog({
         component: VnConfirm,
         componentProps: {
+            title: t('This ticket will be removed from current route! Continue anyway?'),
+            message: t('You are going to delete this ticket'),
             promise: actions[callback],
         },
     });
 }
+
+function generatePdfDialog() {
+    dialog({
+        component: VnConfirm,
+        componentProps: {
+            promise: generatePdfInvoice,
+        },
+    });
+}
+
+async function generatePdfInvoice() {
+    const { data } = await axios.get('invoiceOuts', {
+        params: {
+            filter: JSON.stringify({
+                where: { ref: ticket.value.refFk },
+            }),
+        },
+    });
+    const invoiceId = data[0].id;
+    const { response } = await axios.post(`InvoiceOuts/${invoiceId}/createPdf`);
+    if (!response) {
+        notify({
+            message: 'The invoice PDF document has been regenerated',
+            type: 'positive',
+        });
+    }
+}
+
+function makeInvoiceDialog() {
+    dialog({
+        component: VnConfirm,
+        componentProps: {
+            title: t('Are you sure you want to invoice this ticket?'),
+            message: t('You are going to invoice this ticket'),
+            promise: makeInvoice,
+        },
+    });
+}
+async function makeInvoice() {
+    const params = {
+        ticketsIds: [parseInt(ticketId)],
+    };
+    await axios.post(`Tickets/invoiceTicketsAndPdf`, params);
+
+    notify({
+        message: t('Ticket invoiced'),
+        type: 'positive',
+    });
+    window.location.reload();
+}
+
+async function transferClient(client) {
+    const params = {
+        clientFk: client,
+    };
+
+    const { data } = await axios.patch(`Tickets/${ticketId}/transferClient`, params);
+
+    if (data) window.location.reload();
+}
+
+async function addTurn(day) {
+    const params = {
+        ticketFk: parseInt(ticketId),
+        weekDay: day,
+        agencyModeFk: ticket.value.agencyModeFk,
+    };
+    await axios.patch(`TicketWeeklies`, params);
+
+    notify({
+        message: t('Current ticket deleted and added to shift'),
+        type: 'positive',
+    });
+    window.location.reload();
+}
+
+async function createRefund(withWarehouse) {
+    const params = {
+        ticketsIds: [parseInt(ticketId)],
+        withWarehouse: withWarehouse,
+    };
+    const { data } = await axios.post(`Tickets/refund`, params);
+
+    if (data) {
+        const refundTicket = data;
+
+        push({ name: 'TicketSale', params: { id: refundTicket[0].id } });
+    }
+}
+
+async function changeShippedHour(time) {
+    const params = {
+        shipped: time,
+    };
+
+    const { data } = await axios.post(`Tickets/${ticketId}/updateEditableTicket`, params);
+
+    if (data) window.location.reload();
+}
+
+function openRecalculateDialog() {
+    dialog({
+        component: VnConfirm,
+        componentProps: {
+            title: t('Recalculate components'),
+            message: t('Are you sure you want to recalculate components?'),
+            promise: recalculateComponents,
+        },
+    });
+}
+
+async function recalculateComponents() {
+    await axios.post(`Tickets/${ticketId}/recalculateComponents`);
+    notify({
+        message: t('Data saved'),
+        type: 'positive',
+    });
+    window.location.reload();
+}
+
+const handleFetchData = (data) => {
+    isEditable.value = data;
+    handleInvoiceOutData();
+};
+
+async function handleInvoiceOutData() {
+    const { data } = await axios.get(`InvoiceOuts`, {
+        params: {
+            filter: JSON.stringify({ where: { ref: ticket.value.refFk } }),
+        },
+    });
+    hasPdf.value = data[0]?.hasPdf;
+}
 </script>
 <template>
+    <FetchData
+        :url="`Tickets/${ticketId}/isEditable`"
+        auto-load
+        @on-fetch="handleFetchData"
+    />
+    <QItem @click="showTransferDialog = !showTransferDialog" v-ripple clickable>
+        <QItemSection avatar>
+            <QIcon name="content_paste" />
+        </QItemSection>
+        <QItemSection>{{ t('Transfer client') }}</QItemSection>
+    </QItem>
+    <QDialog ref="dialogRef" v-model="showTransferDialog">
+        <FormPopup
+            @on-submit="transferClient(client)"
+            :title="t('Transfer client')"
+            :custom-submit-button-label="t('Transfer client')"
+            :default-cancel-button="false"
+        >
+            <template #form-inputs>
+                <VnSelect
+                    url="Clients"
+                    :fields="['id', 'name']"
+                    option-label="name"
+                    option-value="id"
+                    v-model="client"
+                    :label="t('Client')"
+                    auto-load
+                >
+                    <template #option="scope">
+                        <QItem v-bind="scope.itemProps">
+                            <QItemSection>
+                                <QItemLabel>
+                                    {{ `#${scope.opt.id} - ` }}
+                                    {{ scope.opt.name }}
+                                </QItemLabel>
+                            </QItemSection>
+                        </QItem>
+                    </template>
+                </VnSelect>
+            </template>
+        </FormPopup>
+    </QDialog>
+    <QItem @click="showTurnDialog = !showTurnDialog" v-ripple clickable>
+        <QItemSection avatar>
+            <QIcon name="vn:calendar" />
+        </QItemSection>
+        <QItemSection>{{ t('addTurn') }}</QItemSection>
+    </QItem>
+    <QDialog ref="dialogRef" v-model="showTurnDialog">
+        <FormPopup
+            @on-submit="addTurn"
+            :title="t('What is the day of receipt of the ticket?')"
+            :default-submit-button="false"
+            :default-cancel-button="false"
+            style="text-align: center"
+        >
+            <template #form-inputs>
+                <QBtnGroup spread>
+                    <QBtn
+                        :label="t('weekdays.mon')"
+                        color="primary"
+                        @click="addTurn(0)"
+                        v-ripple
+                        class="weekdaysBtn"
+                    />
+                    <QBtn
+                        :label="t('weekdays.tue')"
+                        color="primary"
+                        @click="addTurn(1)"
+                        v-ripple
+                        class="weekdaysBtn"
+                    />
+                    <QBtn
+                        :label="t('weekdays.wed')"
+                        color="primary"
+                        @click="addTurn(2)"
+                        v-ripple
+                        class="weekdaysBtn"
+                    />
+                    <QBtn
+                        :label="t('weekdays.thu')"
+                        color="primary"
+                        @click="addTurn(3)"
+                        v-ripple
+                        class="weekdaysBtn"
+                    />
+                    <QBtn
+                        :label="t('weekdays.fri')"
+                        color="primary"
+                        @click="addTurn(4)"
+                        v-ripple
+                        class="weekdaysBtn"
+                    />
+                    <QBtn
+                        :label="t('weekdays.sat')"
+                        color="primary"
+                        @click="addTurn(5)"
+                        v-ripple
+                        class="weekdaysBtn"
+                    />
+                    <QBtn
+                        :label="t('weekdays.sun')"
+                        color="primary"
+                        @click="addTurn(6)"
+                        v-ripple
+                        class="weekdaysBtn"
+                    />
+                </QBtnGroup>
+            </template>
+        </FormPopup>
+    </QDialog>
     <QItem v-ripple clickable>
         <QItemSection avatar>
             <QIcon name="picture_as_pdf" />
         </QItemSection>
-        <QItemSection>{{ t('Open Delivery Note...') }}</QItemSection>
+        <QItemSection>{{ t('Show Delivery Note...') }}</QItemSection>
         <QItemSection side>
             <QIcon name="keyboard_arrow_right" />
         </QItemSection>
         <QMenu anchor="top end" self="top start" auto-close bordered>
             <QList>
                 <QItem @click="openDeliveryNote('deliveryNote')" v-ripple clickable>
-                    <QItemSection>{{ t('With prices') }}</QItemSection>
+                    <QItemSection>{{ t('as PDF') }}</QItemSection>
                 </QItem>
                 <QItem @click="openDeliveryNote('withoutPrices')" v-ripple clickable>
-                    <QItemSection>{{ t('Without prices') }}</QItemSection>
+                    <QItemSection>{{ t('as PDF without prices') }}</QItemSection>
                 </QItem>
                 <QItem
                     @click="openDeliveryNote('deliveryNote', 'csv')"
                     v-ripple
                     clickable
                 >
-                    <QItemSection>{{ t('As CSV') }}</QItemSection>
+                    <QItemSection>{{ t('as CSV') }}</QItemSection>
                 </QItem>
             </QList>
         </QMenu>
@@ -220,21 +484,21 @@ function openConfirmDialog(callback) {
                     v-ripple
                     clickable
                 >
-                    <QItemSection>{{ t('With prices') }}</QItemSection>
+                    <QItemSection>{{ t('Send PDF') }}</QItemSection>
                 </QItem>
                 <QItem
                     @click="sendDeliveryNoteConfirmation('withoutPrices')"
                     v-ripple
                     clickable
                 >
-                    <QItemSection>{{ t('Without prices') }}</QItemSection>
+                    <QItemSection>{{ t('Send PDF to tablet') }}</QItemSection>
                 </QItem>
                 <QItem
                     @click="sendDeliveryNoteConfirmation('deliveryNote', 'csv')"
                     v-ripple
                     clickable
                 >
-                    <QItemSection>{{ t('As CSV') }}</QItemSection>
+                    <QItemSection>{{ t('Send CSV') }}</QItemSection>
                 </QItem>
             </QList>
         </QMenu>
@@ -243,8 +507,26 @@ function openConfirmDialog(callback) {
         <QItemSection avatar>
             <QIcon name="receipt" />
         </QItemSection>
-        <QItemSection>{{ t('Open Proforma Invoice') }}</QItemSection>
+        <QItemSection>{{ t('Show Proforma') }}</QItemSection>
     </QItem>
+    <QItem
+        v-if="isEditable"
+        @click="showChangeTimeDialog = !showChangeTimeDialog"
+        v-ripple
+        clickable
+    >
+        <QItemSection avatar>
+            <QIcon name="schedule" />
+        </QItemSection>
+        <QItemSection>{{ t('Change shipped hour') }}</QItemSection>
+    </QItem>
+    <QDialog ref="dialogRef" v-model="showChangeTimeDialog">
+        <FormPopup @on-submit="changeShippedHour(time)" :title="t('Change shipped hour')">
+            <template #form-inputs>
+                <VnInputTime v-model="time" :label="t('Shipped hour')" clearable />
+            </template>
+        </FormPopup>
+    </QDialog>
     <QItem v-ripple clickable>
         <QItemSection avatar>
             <QIcon name="sms" />
@@ -259,24 +541,72 @@ function openConfirmDialog(callback) {
                     <QItemSection>{{ t('Pending payment') }}</QItemSection>
                 </QItem>
                 <QItem @click="showSmsDialog('minAmount')" v-ripple clickable>
-                    <QItemSection>{{ t('Minimum amount') }}</QItemSection>
+                    <QItemSection>{{ t('Minimum import') }}</QItemSection>
                 </QItem>
                 <QItem
                     @click="showSmsDialogWithChanges('orderChanges')"
                     v-ripple
                     clickable
                 >
-                    <QItemSection>{{ t('Order changes') }}</QItemSection>
+                    <QItemSection>{{ t('Notify changes') }}</QItemSection>
                 </QItem>
             </QList>
         </QMenu>
     </QItem>
+    <QItem @click="makeInvoiceDialog()" v-ripple clickable v-if="isEditable">
+        <QItemSection avatar>
+            <QIcon name="picture_as_pdf" />
+        </QItemSection>
+        <QItemSection>{{ t('Make invoice') }}</QItemSection>
+    </QItem>
+    <QItem
+        @click="generatePdfDialog()"
+        v-ripple
+        clickable
+        v-if="ticket.refFk !== null && (hasInvoicing || hasPdf)"
+    >
+        <QItemSection avatar>
+            <QIcon name="picture_as_pdf" />
+        </QItemSection>
+        <QItemSection>{{
+            hasPdf ? t('Regenerate PDF invoice') : t('Generate PDF invoice')
+        }}</QItemSection>
+    </QItem>
     <QItem @click="openConfirmDialog('clone')" v-ripple clickable>
         <QItemSection avatar>
             <QIcon name="content_copy" />
         </QItemSection>
         <QItemSection>{{ t('To clone ticket') }}</QItemSection>
     </QItem>
+    <QItem v-if="isEditable" @click="openRecalculateDialog()" v-ripple clickable>
+        <QItemSection avatar>
+            <QIcon name="refresh" />
+        </QItemSection>
+        <QItemSection>{{ t('Recalculate components') }}</QItemSection>
+    </QItem>
+    <QItem v-ripple clickable>
+        <QItemSection avatar>
+            <QIcon name="monetization_on" />
+        </QItemSection>
+        <QItemSection>{{ t('Refund all...') }}</QItemSection>
+        <QItemSection side>
+            <QIcon name="keyboard_arrow_right" />
+        </QItemSection>
+        <QMenu anchor="top end" self="top start" auto-close bordered>
+            <QList>
+                <QItem v-ripple clickable @click="createRefund(true)">
+                    <QItemSection>
+                        {{ t('with warehouse') }}
+                    </QItemSection>
+                </QItem>
+                <QItem v-ripple clickable @click="createRefund(false)">
+                    <QItemSection>
+                        {{ t('without warehouse') }}
+                    </QItemSection>
+                </QItem>
+            </QList>
+        </QMenu>
+    </QItem>
     <QItem @click="$refs.weightDialog.show()" v-ripple clickable>
         <QItemSection avatar>
             <QIcon name="weight" />
@@ -307,29 +637,61 @@ function openConfirmDialog(callback) {
         </template>
     </VnConfirm>
 </template>
+
+<style lang="scss" scoped>
+.weekdaysBtn {
+    margin: 1%;
+}
+</style>
 <i18n>
 en:
+    addTurn: Add turn
     invoiceIds: "Invoices have been generated with the following ids: {invoiceIds}"
 
 es:
-    Open Delivery Note...: Abrir albarán...
+    Show Delivery Note...: Ver albarán...
     Send Delivery Note...: Enviar albarán...
-    With prices: Con precios
-    Without prices: Sin precios
-    As CSV: Como CSV
-    Open Proforma Invoice: Abrir factura proforma
+    as PDF: como PDF
+    as PDF without prices: como PDF sin precios
+    as CSV: Como CSV
+    Send PDF: Enviar PDF
+    Send PDF to tablet: Enviar PDF a tablet
+    Send CSV: Enviar CSV
+    Show Proforma: Ver proforma
     Delete ticket: Eliminar ticket
-    Send SMS...: Enviar SMS
+    Send SMS...: Enviar SMS...
     Pending payment: Pago pendiente
-    Minimum amount: Importe mínimo
-    Order changes: Cambios del pedido
+    Minimum import: Importe mínimo
+    Notify changes: Notificar cambios
     Ticket deleted: Ticket eliminado
     You can undo this action within the first hour: Puedes deshacer esta acción dentro de la primera hora
     To clone ticket: Clonar ticket
     Ticket cloned: Ticked clonado
     It was not able to clone the ticket: No se pudo clonar el ticket
+    Generate PDF invoice: Generar PDF factura
+    Regenerate PDF invoice: Regenerar PDF factura
+    The invoice PDF document has been regenerated: El documento PDF de la factura ha sido regenerado
+    Transfer client: Transferir cliente
+    Client: Cliente
+    addTurn: Añadir a turno
+    What is the day of receipt of the ticket?: ¿Cuál es el día de preparación del pedido?
+    Current ticket deleted and added to shift: Ticket actual eliminado y añadido al turno
+    Refund all...: Abonar todo...
+    with warehouse: con almacén
+    without warehouse: sin almacén
+    Make invoice: Crear factura
+    Change shipped hour: Cambiar hora de envío
+    Shipped hour: Hora de envío
+    Recalculate components: Recalcular componentes
+    Are you sure you want to recalculate components?: ¿Seguro que quieres recalcular los componentes?
+    Data saved: Datos guardados
+    Are you sure you want to invoice this ticket?: ¿Seguro que quieres facturar este ticket?
+    You are going to invoice this ticket: Vas a facturar este ticket
+    Ticket invoiced: Ticket facturado
     Set weight: Establecer peso
     Weight set: Peso establecido
     This ticket may be invoiced, do you want to continue?: Es posible que se facture este ticket, desea continuar?
     invoiceIds: "Se han generado las facturas con los siguientes ids: {invoiceIds}"
+    This ticket will be removed from current route! Continue anyway?: ¡Se eliminará el ticket de la ruta actual! ¿Continuar de todas formas?
+    You are going to delete this ticket: Vas a eliminar este ticket
 </i18n>

src/pages/Ticket/Card/TicketExpedition.vue

@@ -1,39 +1,35 @@
 <script setup>
-import { onMounted, ref, computed, onUnmounted, reactive, watch } from 'vue';
+import { onMounted, ref, computed, onUnmounted, watch } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
 
-import VnInput from 'src/components/common/VnInput.vue';
 import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue';
-import TicketEditManaProxy from './TicketEditMana.vue';
-import TableVisibleColumns from 'src/components/common/TableVisibleColumns.vue';
 import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 import ExpeditionNewTicket from './ExpeditionNewTicket.vue';
 import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
-import VnSelect from 'src/components/common/VnSelect.vue';
 
 import { useStateStore } from 'stores/useStateStore';
-import { toCurrency, toPercentage } from 'src/filters';
 import { useArrayData } from 'composables/useArrayData';
 import { useVnConfirm } from 'composables/useVnConfirm';
 import useNotify from 'src/composables/useNotify.js';
 import { toDateTimeFormat } from 'src/filters/date';
 import axios from 'axios';
+import VnTable from 'src/components/VnTable/VnTable.vue';
 
 const route = useRoute();
 const stateStore = useStateStore();
 const { t } = useI18n();
 const { notify } = useNotify();
 const { openConfirmationModal } = useVnConfirm();
-const editPriceProxyRef = ref(null);
 const newTicketDialogRef = ref(null);
 const logsTableDialogRef = ref(null);
-
+const tableRef = ref();
 const expeditionsLogsData = ref([]);
 const selectedExpeditions = ref([]);
 const allColumnNames = ref([]);
-const visibleColumns = ref([]);
 const newTicketWithRoute = ref(false);
+const selectedRows = ref([]);
+const hasSelectedRows = computed(() => selectedRows.value.length > 0);
 
 const exprBuilder = (param, value) => {
     switch (param) {
@@ -54,8 +50,6 @@ const expeditionsArrayData = useArrayData('ticketExpeditions', {
     filter: expeditionsFilter.value,
     exprBuilder: exprBuilder,
 });
-const expeditionsStore = expeditionsArrayData.store;
-const ticketExpeditions = computed(() => expeditionsStore.data);
 
 const ticketArrayData = useArrayData('ticketData');
 const ticketStore = ticketArrayData.store;
@@ -73,129 +67,87 @@ watch(
     { immediate: true }
 );
 
-const params = reactive({});
-
-const applyColumnFilter = async (col) => {
-    try {
-        const paramKey = col.columnFilter?.filterParamKey || col.field;
-        params[paramKey] = col.columnFilter.filterValue;
-        await expeditionsArrayData.addFilter({ filter: expeditionsFilter.value, params });
-    } catch (err) {
-        console.error('Error applying column filter', err);
-    }
-};
-
-const getInputEvents = (col) => {
-    return col.columnFilter.type === 'select'
-        ? { 'update:modelValue': () => applyColumnFilter(col) }
-        : {
-              'keyup.enter': () => applyColumnFilter(col),
-          };
-};
-
 const columns = computed(() => [
     {
+        align: 'left',
         label: t('expedition.id'),
         name: 'id',
-        field: 'id',
-        align: 'left',
-        sortable: true,
-        columnFilter: {
-            component: VnInput,
-            type: 'text',
-            filterParamKey: 'expeditionFk',
-            filterValue: null,
-            event: getInputEvents,
-            attrs: {
-                dense: true,
+        chip: {
+            condition: () => true,
         },
+        isId: true,
+        columnFilter: {
+            inWhere: true,
         },
     },
     {
         label: t('expedition.item'),
-        name: 'item',
+        name: 'packagingItemFk',
         align: 'left',
+        cardVisible: true,
         columnFilter: {
-            component: VnInput,
-            type: 'text',
-            filterParamKey: 'packageItemName',
-            filterValue: null,
-            event: getInputEvents,
-            attrs: {
-                dense: true,
-            },
+            inWhere: true,
         },
     },
     {
         label: t('expedition.name'),
-        name: 'name',
-        field: 'packageItemName',
+        name: 'packageItemName',
         align: 'left',
+        isTitle: true,
         columnFilter: {
-            component: VnSelect,
-            type: 'select',
-            filterValue: null,
-            event: getInputEvents,
-            attrs: {
-                url: 'Items',
-                fields: ['id', 'name'],
-                'sort-by': 'name ASC',
-                'option-value': 'id',
-                'option-label': 'name',
-                dense: true,
-            },
+            inWhere: true,
         },
     },
     {
         label: t('expedition.packageType'),
-        name: 'packageType',
-        field: 'freightItemName',
+        name: 'freightItemName',
         align: 'left',
         columnFilter: {
-            component: VnInput,
-            type: 'text',
-            // filterParamKey: 'expeditionFk',
-            filterValue: null,
-            event: getInputEvents,
-            attrs: {
-                dense: true,
-            },
+            inWhere: true,
         },
     },
     {
         label: t('expedition.counter'),
         name: 'counter',
-        field: 'counter',
         align: 'left',
-        columnFilter: null,
+        columnFilter: {
+            inWhere: true,
+        },
     },
     {
         label: t('expedition.externalId'),
         name: 'externalId',
-        field: 'externalId',
         align: 'left',
-        columnFilter: null,
+        cardVisible: true,
+        columnFilter: {
+            inWhere: true,
+        },
     },
     {
         label: t('expedition.created'),
         name: 'created',
-        field: 'created',
         align: 'left',
-        columnFilter: null,
-        format: (value) => toDateTimeFormat(value),
+        cardVisible: true,
+        format: (row) => toDateTimeFormat(row.created),
     },
     {
         label: t('expedition.state'),
         name: 'state',
-        field: 'state',
         align: 'left',
-        columnFilter: null,
+        cardVisible: true,
+        columnFilter: { inWhere: true },
     },
     {
-        label: '',
-        name: 'history',
-        align: 'left',
-        columnFilter: null,
+        align: 'right',
+        name: 'tableActions',
+        actions: [
+            {
+                title: t('expedition.historyAction'),
+                icon: 'history',
+                isPrimary: true,
+                action: (row) => showLog(row),
+            },
+        ],
     },
 ]);
 
@@ -204,23 +156,29 @@ const logTableColumns = computed(() => [
         label: t('expedition.state'),
         name: 'state',
         field: 'state',
-        align: 'left',
+        align: 'center',
         sortable: true,
     },
     {
         label: t('expedition.name'),
         name: 'name',
-        align: 'name',
+        field: 'name',
+        align: 'center',
         columnFilter: null,
     },
     {
         label: t('expedition.created'),
         name: 'created',
         field: 'created',
-        align: 'left',
-        columnFilter: null,
+        align: 'center',
         format: (value) => toDateTimeFormat(value),
     },
+    {
+        label: t('expedition.isScanned'),
+        name: 'isScanned',
+        field: 'isScanned',
+        align: 'center',
+    },
 ]);
 
 const showNewTicketDialog = (withRoute = false) => {
@@ -255,10 +213,20 @@ const getExpeditionState = async (expedition) => {
             order: ['created DESC'],
         };
 
-        const { data } = await axios.get(`ExpeditionStates/filter`, {
+        const { data: expeditionStates } = await axios.get(`ExpeditionStates/filter`, {
             params: { filter: JSON.stringify(filter) },
         });
-        expeditionsLogsData.value = data;
+        const { data: scannedStates } = await axios.get(`ExpeditionStates`, {
+            params: { filter: JSON.stringify(filter), fields: ['id', 'isScanned'] },
+        });
+
+        expeditionsLogsData.value = expeditionStates.map((state) => {
+            const scannedState = scannedStates.find((s) => s.id === state.id);
+            return {
+                ...state,
+                isScanned: scannedState ? scannedState.isScanned : false,
+            };
+        });
     } catch (error) {
         console.error(error);
     }
@@ -275,21 +243,13 @@ onUnmounted(() => (stateStore.rightDrawer = false));
 
 <template>
     <VnSubToolbar>
-        <template #st-data>
-            <TableVisibleColumns
-                :all-columns="allColumnNames"
-                table-code="expeditionIndex"
-                labels-traductions-path="expedition"
-                @on-config-saved="visibleColumns = [...$event, 'history']"
-            />
-        </template>
         <template #st-actions>
             <QBtnGroup push class="q-gutter-x-sm" flat>
                 <QBtnDropdown
                     ref="btnDropdownRef"
                     color="primary"
                     :label="t('expedition.move')"
-                    :disable="!selectedExpeditions.length"
+                    :disable="!hasSelectedRows"
                 >
                     <template #label>
                         <QTooltip>{{ t('Select lines to see the options') }}</QTooltip>
@@ -322,7 +282,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
                     </QList>
                 </QBtnDropdown>
                 <QBtn
-                    :disable="!selectedExpeditions.length"
+                    :disable="!hasSelectedRows"
                     icon="delete"
                     color="primary"
                     @click="
@@ -332,115 +292,34 @@ onUnmounted(() => (stateStore.rightDrawer = false));
                             deleteExpedition
                         )
                     "
-                />
+                >
+                    <QTooltip>{{ t('expedition.removeExpedition') }}</QTooltip>
+                </QBtn>
             </QBtnGroup>
         </template>
     </VnSubToolbar>
 
-    <QTable
-        :rows="ticketExpeditions"
+    <VnTable
+        ref="tableRef"
+        data-key="TicketExpedition"
+        url="Expeditions/filter"
         :columns="columns"
-        row-key="id"
-        :pagination="{ rowsPerPage: 0 }"
-        class="full-width q-mt-md"
-        selection="multiple"
-        v-model:selected="selectedExpeditions"
-        :visible-columns="visibleColumns"
-        :no-data-label="t('globals.noResults')"
+        :filter="expeditionsFilter"
+        v-model:selected="selectedRows"
+        :table="{
+            'row-key': 'id',
+            selection: 'multiple',
+        }"
+        auto-load
+        order="created DESC"
     >
-        <template #top-row="{ cols }">
-            <QTr>
-                <QTd />
-                <QTd v-for="(col, index) in cols" :key="index" style="max-width: 100px">
-                    <component
-                        :is="col.columnFilter.component"
-                        v-if="col.columnFilter"
-                        v-model="col.columnFilter.filterValue"
-                        v-bind="col.columnFilter.attrs"
-                        v-on="col.columnFilter.event(col)"
-                        dense
-                    />
-                </QTd>
-            </QTr>
-        </template>
-        <template #body-cell-item="{ row }">
-            <QTd auto-width @click.stop>
-                <QBtn flat color="primary">{{ row.packagingItemFk }}</QBtn>
+        <template #column-packagingItemFk="{ row }">
+            <span class="link" @click.stop>
+                {{ row.packagingItemFk }}
                 <ItemDescriptorProxy :id="row.packagingItemFk" />
-            </QTd>
+            </span>
         </template>
-        <template #body-cell-available="{ row }">
-            <QTd @click.stop>
-                <QBadge :color="row.available < 0 ? 'alert' : 'transparent'" dense>
-                    {{ row.available }}
-                </QBadge>
-            </QTd>
-        </template>
-
-        <template #body-cell-price="{ row }">
-            <QTd>
-                <template v-if="isTicketEditable && row.id">
-                    <QBtn flat color="primary" dense @click="onOpenEditPricePopover(row)">
-                        {{ toCurrency(row.price) }}
-                    </QBtn>
-                    <TicketEditManaProxy
-                        ref="editPriceProxyRef"
-                        :mana="mana"
-                        :new-price="getNewPrice"
-                        @save="updatePrice(row)"
-                    >
-                        <VnInput
-                            v-model.number="edit.price"
-                            :label="t('ticketSale.price')"
-                            type="number"
-                        />
-                    </TicketEditManaProxy>
-                </template>
-                <span v-else>{{ toCurrency(row.price) }}</span>
-            </QTd>
-        </template>
-        <template #body-cell-discount="{ row }">
-            <QTd>
-                <template v-if="!isLocked && row.id">
-                    <QBtn
-                        flat
-                        color="primary"
-                        dense
-                        @click="onOpenEditDiscountPopover(row)"
-                    >
-                        {{ toPercentage(row.discount / 100) }}
-                    </QBtn>
-                    <TicketEditManaProxy
-                        :mana="mana"
-                        :new-price="getNewPrice"
-                        @save="changeDiscount(row)"
-                    >
-                        <VnInput
-                            v-model.number="edit.discount"
-                            :label="t('ticketSale.discount')"
-                            type="number"
-                        />
-                    </TicketEditManaProxy>
-                </template>
-                <span v-else>{{ toPercentage(row.discount / 100) }}</span>
-            </QTd>
-        </template>
-        <template #body-cell-history="{ row }">
-            <QTd>
-                <QBtn
-                    @click.stop="showLog(row)"
-                    color="primary"
-                    icon="history"
-                    size="md"
-                    flat
-                >
-                    <QTooltip class="text-no-wrap">
-                        {{ t('expedition.historyAction') }}
-                    </QTooltip>
-                </QBtn>
-            </QTd>
-        </template>
-    </QTable>
+    </VnTable>
     <QDialog ref="newTicketDialogRef" transition-show="scale" transition-hide="scale">
         <ExpeditionNewTicket
             :ticket="ticketData"
@@ -454,12 +333,23 @@ onUnmounted(() => (stateStore.rightDrawer = false));
             data-key="TicketExpeditionLog"
             :rows="expeditionsLogsData"
             :columns="logTableColumns"
-            class="q-pa-sm"
+            class="q-pa-md full-width"
         >
             <template #body-cell-name="{ row }">
-                <QTd auto-width>
-                    <QBtn flat dense color="primary">{{ row.name }}</QBtn>
+                <QTd style="text-align: center">
+                    <span class="link" @click.stop>
+                        <QBtn flat dense>{{ row.name }}</QBtn>
                         <WorkerDescriptorProxy :id="row.workerFk" />
+                    </span>
+                </QTd>
+            </template>
+            <template #body-cell-isScanned="{ row }">
+                <QTd style="text-align: center">
+                    <QCheckbox disable v-model="row.isScanned">
+                        {{
+                            row.isScanned === 1 ? t('expedition.yes') : t('expedition.no')
+                        }}
+                    </QCheckbox>
                 </QTd>
             </template>
         </QTable>

src/pages/Ticket/Card/TicketNotes.vue

@@ -17,6 +17,7 @@ const ticketNotesCrudRef = ref(null);
 const observationTypes = ref([]);
 const arrayData = useArrayData('TicketNotes');
 const { store } = arrayData;
+const isSaving = ref(false);
 
 const crudModelFilter = reactive({
     where: { ticketFk: route.params.id },
@@ -33,6 +34,17 @@ watch(
         await ticketNotesCrudRef.value.reload();
     }
 );
+function handleDelete(row) {
+    ticketNotesCrudRef.value.remove([row]);
+}
+
+async function handleSave() {
+    if (!isSaving.value) {
+        isSaving.value = true;
+        await ticketNotesCrudRef.value?.saveChanges();
+        isSaving.value = false;
+    }
+}
 </script>
 
 <template>
@@ -73,13 +85,14 @@ watch(
                             :label="t('ticketNotes.description')"
                             v-model="row.description"
                             class="col"
+                            @keyup.enter="handleSave"
                         />
                         <QIcon
                             name="delete"
                             size="sm"
                             class="cursor-pointer"
                             color="primary"
-                            @click="ticketNotesCrudRef.remove([row])"
+                            @click="handleDelete(row)"
                         >
                             <QTooltip>
                                 {{ t('ticketNotes.removeNote') }}

src/pages/Ticket/Card/TicketPackage.vue

@@ -10,6 +10,7 @@ import FetchData from 'components/FetchData.vue';
 import VnInputDate from 'src/components/common/VnInputDate.vue';
 
 import { useArrayData } from 'src/composables/useArrayData';
+import VnRow from 'src/components/ui/VnRow.vue';
 
 const route = useRoute();
 const { t } = useI18n();

src/pages/Ticket/Card/TicketPurchaseRequest.vue

@@ -1,27 +1,35 @@
 <script setup>
 import { ref, computed, watch, reactive } from 'vue';
+import axios from 'axios';
 import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
 
-import VnInput from 'src/components/common/VnInput.vue';
 import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
 import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue';
-import CrudModel from 'src/components/CrudModel.vue';
-import TicketCreateRequest from './TicketCreateRequest.vue';
-
 import { dashIfEmpty } from 'src/filters';
 import { toDateFormat } from 'src/filters/date.js';
+import VnTable from 'src/components/VnTable/VnTable.vue';
+import VnInput from 'src/components/common/VnInput.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
+import FetchData from 'src/components/FetchData.vue';
+import { useVnConfirm } from 'composables/useVnConfirm';
+import useNotify from 'src/composables/useNotify.js';
+import { onMounted } from 'vue';
+import { useStateStore } from 'src/stores/useStateStore';
 
 const route = useRoute();
+const stateStore = useStateStore();
 const { t } = useI18n();
-const createTicketRequestDialogRef = ref(null);
-const crudModelRef = ref(null);
+const tableRef = ref();
+const attendersOptions = ref([]);
+const { openConfirmationModal } = useVnConfirm();
+const { notify } = useNotify();
 
 watch(
     () => route.params.id,
     async (val) => {
         crudModelFilter.where.ticketFk = val;
-        crudModelRef.value.reload();
+        tableRef.value.reload();
     }
 );
 
@@ -72,64 +80,81 @@ const crudModelFilter = reactive({
 
 const columns = computed(() => [
     {
+        align: 'left',
         label: t('purchaseRequest.id'),
         name: 'id',
-        field: 'id',
-        align: 'left',
-        columnFilter: null,
+        chip: {
+            condition: () => true,
+        },
+        isId: true,
     },
     {
+        align: 'left',
         label: t('purchaseRequest.description'),
         name: 'description',
-        field: 'description',
-        align: 'left',
-        format: (val) => dashIfEmpty(val),
+        columnClass: 'expand',
     },
     {
+        align: 'left',
         label: t('purchaseRequest.created'),
         name: 'created',
-        field: 'created',
-        align: 'left',
-        format: (val) => toDateFormat(val),
+        format: (row) => toDateFormat(row.created),
+        cardVisible: true,
     },
     {
+        align: 'left',
         label: t('purchaseRequest.requester'),
-        name: 'requester',
-        align: 'left',
-        sortable: true,
+        name: 'requesterFk',
+        cardVisible: true,
+        format: (row) => dashIfEmpty(row.requester?.user?.nickname),
     },
     {
+        align: 'left',
         label: t('purchaseRequest.atender'),
-        name: 'atender',
-        align: 'left',
+        name: 'attenderFk',
+        cardVisible: true,
+        format: (row) => dashIfEmpty(row.atender?.user?.nickname),
     },
     {
+        align: 'left',
         label: t('purchaseRequest.quantity'),
         name: 'quantity',
-        align: 'left',
     },
     {
+        align: 'left',
         label: t('purchaseRequest.price'),
         name: 'price',
-        align: 'left',
     },
     {
+        align: 'left',
         label: t('purchaseRequest.saleFk'),
         name: 'saleFk',
-        align: 'left',
+        cardVisible: true,
     },
     {
+        align: 'left',
         label: t('purchaseRequest.state'),
-        name: 'state',
-        field: 'isOk',
-        align: 'left',
-        format: (val) => t(getRequestState(val)),
+        name: 'isOk',
+        cardVisible: true,
     },
     {
-        label: '',
-        name: 'actions',
-        align: 'left',
-        columnFilter: null,
+        align: 'right',
+        name: 'tableActions',
+        actions: [
+            {
+                title: t('globals.delete'),
+                icon: 'delete',
+                isPrimary: true,
+                action: (row) =>
+                    openConfirmationModal(
+                        t('You are going to delete this ticket purchase request'),
+                        t(
+                            'This ticket will be removed from ticket purchase requests! Continue anyway?'
+                        ),
+                        () => removeLine(row.id)
+                    ),
+            },
+        ],
     },
 ]);
 
@@ -140,131 +165,117 @@ const getRequestState = (state) => {
         case false:
             return 'Denied';
         case true:
-            return 'Acepted';
+            return 'Accepted';
     }
 };
 
 const isEditable = (isOk) => isOk !== null;
 
-const removeLine = async (row) => crudModelRef.value.remove([row]);
+async function removeLine(id) {
+    try {
+        await axios.delete(`TicketRequests/${id}`);
+        notify(t('globals.dataSaved'), 'positive');
+        location.reload();
+    } catch (err) {
+        console.error('Error ', err);
+    }
+}
 
-const openCreateModal = () => createTicketRequestDialogRef.value.show();
+onMounted(() => (stateStore.rightDrawer = false));
 </script>
 
 <template>
-    <QPage class="column items-center q-pa-md">
-        <CrudModel
+    <FetchData
+        url="TicketRequests/getItemTypeWorker"
+        :filter="{ fields: ['id', 'nickname'], order: 'nickname ASC' }"
+        auto-load
+        @on-fetch="(data) => (attendersOptions = data)"
+    />
+    <VnTable
+        ref="tableRef"
         data-key="PurchaseRequests"
         url="TicketRequests"
-            ref="crudModelRef"
+        :create="{
+            urlCreate: 'TicketRequests',
+            title: t('Create request'),
+            onDataSaved: ({ id }) => tableRef.reload(id),
+            formInitialData: {
+                ticketFk: route.params.id,
+            },
+        }"
+        save-url="TicketRequests/crud"
         :filter="crudModelFilter"
-            :order="['created ASC']"
-            :default-remove="false"
-            :default-save="false"
-            :default-reset="false"
-            :limit="0"
+        :columns="columns"
+        :is-editable="true"
+        :right-search="false"
+        :column-search="false"
         auto-load
     >
-            <template #body="{ rows }">
-                <QTable
-                    :rows="rows"
-                    :columns="columns"
-                    row-key="id"
-                    :pagination="{ rowsPerPage: 0 }"
-                    class="full-width q-mt-md"
-                    :no-data-label="t('globals.noResults')"
-                    @row-click="(_, row) => redirectToTicketSummary(row.ticketFk)"
-                >
-                    <template #body-cell-description="{ row }">
-                        <QTd @click.stop>
-                            <VnInput
-                                v-model="row.description"
-                                @blur="crudModelRef.saveChanges()"
-                                :disable="isEditable(row.isOk)"
-                            />
-                        </QTd>
+        <template #column-description="{ row }">
+            <VnInput v-model="row.description" :disable="isEditable(row.isOk)" />
         </template>
-                    <template #body-cell-requester="{ row }">
-                        <QTd @click.stop>
-                            <QBtn flat color="primary">
+        <template #column-requesterFk="{ row }">
+            <span class="link" @click.stop>
                 {{ row.requester?.user?.nickname }}
                 <WorkerDescriptorProxy :id="row.requesterFk" />
-                            </QBtn>
-                        </QTd>
+            </span>
         </template>
-                    <template #body-cell-atender="{ row }">
-                        <QTd @click.stop>
-                            <QBtn flat color="primary">
+        <template #column-attenderFk="{ row }">
+            <span class="link" @click.stop>
                 {{ row.atender?.user?.nickname }}
                 <WorkerDescriptorProxy :id="row.attenderFk" />
-                            </QBtn>
-                        </QTd>
+            </span>
         </template>
-                    <template #body-cell-quantity="{ row }">
-                        <QTd @click.stop>
+        <template #column-quantity="{ row }">
+            <VnInput v-model="row.quantity" :disable="isEditable(row.isOk)" />
+        </template>
+        <template #column-price="{ row }">
+            <span @click.stop>
+                <VnInput v-model="row.price" :disable="isEditable(row.isOk)">
+                    {{ row.price }}
+                </VnInput>
+            </span>
+        </template>
+        <template #column-saleFk="{ row }">
+            <QTd style="width: 3%">
+                <span class="link" @click.stop>
+                    {{ dashIfEmpty(row.sale?.itemFk) }}
+                    <ItemDescriptorProxy :id="row.sale?.itemFk" /> </span
+            ></QTd>
+        </template>
+        <template #column-isOk="{ row }">
+            {{ t(getRequestState(row.isOk)) }}
+        </template>
+
+        <template #more-create-dialog="{ data }">
             <VnInput
-                                v-model="row.quantity"
-                                @blur="crudModelRef.saveChanges()"
-                                :disable="isEditable(row.isOk)"
+                v-model="data.description"
+                :label="t('purchaseRequest.description')"
+            />
+            <VnSelect
+                :label="t('purchaseRequest.atender')"
+                v-model="data.attenderFk"
+                :options="attendersOptions"
+                hide-selected
+                option-label="nickname"
+                option-value="id"
             />
-                        </QTd>
-                    </template>
-                    <template #body-cell-price="{ row }">
-                        <QTd @click.stop>
             <VnInput
-                                v-model="row.price"
-                                @blur="crudModelRef.saveChanges()"
-                                :disable="isEditable(row.isOk)"
+                v-model="data.quantity"
+                :label="t('purchaseRequest.quantity')"
+                type="number"
+                min="1"
             />
-                        </QTd>
-                    </template>
-                    <template #body-cell-saleFk="{ row }">
-                        <QTd @click.stop>
-                            <QBtn v-if="row.saleFk" flat color="primary">
-                                {{ row.sale.itemFk }}
-                                <ItemDescriptorProxy :id="row.sale.itemFk" />
-                            </QBtn>
-                        </QTd>
-                    </template>
-                    <template #body-cell-actions="{ row }">
-                        <QTd>
-                            <QIcon
-                                @click.stop="removeLine(row)"
-                                class="q-ml-sm cursor-pointer"
-                                color="primary"
-                                name="delete"
-                                size="sm"
-                            >
-                                <QTooltip>
-                                    {{ t('globals.delete') }}
-                                </QTooltip>
-                            </QIcon>
-                        </QTd>
-                    </template>
-                </QTable>
-            </template>
-        </CrudModel>
-        <QDialog
-            ref="createTicketRequestDialogRef"
-            transition-show="scale"
-            transition-hide="scale"
-        >
-            <TicketCreateRequest @on-request-created="crudModelRef.reload()" />
-        </QDialog>
-        <QPageSticky :offset="[20, 20]">
-            <QBtn
-                @click="openCreateModal()"
-                color="primary"
-                fab
-                icon="add"
-                shortcut="+"
+            <VnInput
+                v-model="data.price"
+                :label="t('purchaseRequest.price')"
+                type="number"
+                min="0"
             />
-            <QTooltip class="text-no-wrap">
-                {{ t('purchaseRequest.newRequest') }}
-            </QTooltip>
-        </QPageSticky>
-    </QPage>
+        </template>
+    </VnTable>
 </template>
+
 <i18n>
     es:
         New: Nueva

src/pages/Ticket/Card/TicketSale.vue

@@ -16,11 +16,12 @@ import TicketSaleMoreActions from './TicketSaleMoreActions.vue';
 import TicketTransfer from './TicketTransfer.vue';
 
 import { useStateStore } from 'stores/useStateStore';
-import { toCurrency, toPercentage, dashIfEmpty } from 'src/filters';
+import { toCurrency, toPercentage } from 'src/filters';
 import { useArrayData } from 'composables/useArrayData';
 import { useVnConfirm } from 'composables/useVnConfirm';
 import useNotify from 'src/composables/useNotify.js';
 import axios from 'axios';
+import VnTable from 'src/components/VnTable/VnTable.vue';
 
 const route = useRoute();
 const router = useRouter();
@@ -33,7 +34,8 @@ const stateBtnDropdownRef = ref(null);
 
 const arrayData = useArrayData('ticketData');
 const { store } = arrayData;
-
+const selectedRows = ref([]);
+const hasSelectedRows = computed(() => selectedRows.value.length > 0);
 const ticketConfig = ref(null);
 const isLocked = ref(false);
 const isTicketEditable = ref(false);
@@ -47,6 +49,7 @@ const transfer = ref({
     lastActiveTickets: [],
     sales: [],
 });
+const tableRef = ref([]);
 
 watch(
     () => route.params.id,
@@ -55,86 +58,89 @@ watch(
 
 const columns = computed(() => [
     {
-        label: '',
+        align: 'left',
         name: 'statusIcons',
-        align: 'left',
     },
     {
-        label: '',
-        name: 'picture',
-        align: 'left',
+        align: 'center',
+        label: t('lines.image'),
+        name: 'image',
+        columnField: {
+            component: VnImg,
+            attrs: (id) => {
+                return {
+                    id,
+                    width: '50px',
+                };
+            },
+        },
+        columnFilter: false,
     },
     {
+        align: 'left',
         label: t('ticketSale.visible'),
         name: 'visible',
-        field: 'visible',
-        align: 'left',
-        sortable: true,
+        format: (row, dashIfEmpty) => dashIfEmpty(row.visible),
     },
     {
+        align: 'left',
         label: t('ticketSale.available'),
         name: 'available',
-        field: 'available',
-        align: 'left',
-        sortable: true,
+        format: (row, dashIfEmpty) => dashIfEmpty(row.available),
     },
     {
+        align: 'left',
         label: t('ticketSale.id'),
         name: 'itemFk',
-        field: 'itemFk',
-        align: 'left',
-        sortable: true,
     },
     {
+        align: 'left',
         label: t('ticketSale.quantity'),
         name: 'quantity',
-        field: 'quantity',
-        align: 'left',
-        sortable: true,
+        format: (row) => toCurrency(row.quantity),
     },
     {
+        align: 'left',
         label: t('ticketSale.item'),
         name: 'item',
-        field: 'item',
-        align: 'left',
-        sortable: true,
+        format: (row) => row?.item?.name,
+        columnClass: 'expand',
     },
     {
+        align: 'left',
         label: t('ticketSale.price'),
         name: 'price',
-        field: 'price',
-        align: 'left',
-        sortable: true,
-        format: (val) => toCurrency(val),
+        format: (row) => toCurrency(row.price),
     },
     {
+        align: 'left',
         label: t('ticketSale.discount'),
         name: 'discount',
-        field: 'discount',
-        align: 'left',
-        sortable: true,
+        format: (row) => toPercentage(row.discount),
     },
     {
+        align: 'left',
         label: t('ticketSale.amount'),
         name: 'amount',
-        field: 'amount',
-        align: 'left',
-        sortable: true,
-        format: (val) => toCurrency(val),
+        format: (row) => parseInt(row.amount * row.quantity),
     },
     {
+        align: 'left',
         label: t('ticketSale.packaging'),
         name: 'itemPackingTypeFk',
-        field: 'item',
-        align: 'left',
-        sortable: true,
-        format: (val) => dashIfEmpty(val?.itemPackingTypeFk),
+        format: (row, dashIfEmpty) => dashIfEmpty(row?.item?.itemPackingTypeFk),
     },
     {
-        label: '',
-        name: 'history',
-        align: 'left',
-        columnFilter: null,
+        align: 'right',
+        name: 'tableActions',
+        actions: [
+            {
+                title: t('ticketSale.history'),
+                icon: 'history',
+                isPrimary: true,
+                action: (row) => goToLog(row.id),
+            },
+        ],
     },
 ]);
 
@@ -210,6 +216,7 @@ const addSale = async (sale) => {
         sale.item = newSale.item;
 
         notify('globals.dataSaved', 'positive');
+        window.location.reload();
     } catch (err) {
         console.error('Error adding sale', err);
     }
@@ -259,7 +266,7 @@ const getMana = async () => {
 
 const selectedValidSales = computed(() => {
     if (!sales.value) return;
-    return selectedSales.value.filter((sale) => sale.id != undefined);
+    return [...selectedRows.value];
 });
 
 const onOpenEditPricePopover = async (sale) => {
@@ -374,7 +381,7 @@ const changeTicketState = async (val) => {
 };
 
 const removeSelectedSales = () => {
-    selectedSales.value.forEach((sale) => {
+    selectedRows.value.forEach((sale) => {
         const index = sales.value.indexOf(sale);
         sales.value.splice(index, 1);
     });
@@ -382,19 +389,29 @@ const removeSelectedSales = () => {
 
 const removeSales = async () => {
     try {
-        const params = { sales: selectedValidSales.value, ticketId: store.data.id };
+        const params = {
+            sales: selectedRows.value.filter((sale) => sale.id),
+            ticketId: store.data.id,
+        };
+        selectedRows.value
+            .filter((sale) => !sale.id)
+            .forEach((sale) =>
+                tableRef.value.CrudModelRef.formData.splice(sale.$index, 1)
+            );
+
+        if (params.sales.length == 0) return;
         await axios.post('Sales/deleteSales', params);
         removeSelectedSales();
         notify('globals.dataSaved', 'positive');
+        window.location.reload();
     } catch (err) {
         console.error('Error deleting sales', err);
     }
 };
 
-const insertRow = () => sales.value.push({ ...DEFAULT_EDIT });
-
 const setTransferParams = async () => {
     try {
+        selectedSales.value = selectedValidSales.value;
         const checkedSales = JSON.parse(JSON.stringify(selectedSales.value));
         transfer.value = {
             lastActiveTickets: [],
@@ -418,9 +435,70 @@ onMounted(async () => {
     stateStore.rightDrawer = true;
     getConfig();
     getSales();
+    getItems();
 });
 
 onUnmounted(() => (stateStore.rightDrawer = false));
+
+const items = ref([]);
+const newRow = ref({});
+
+async function getItems() {
+    const { data } = await axios.get(`Items/withName`);
+    items.value = data;
+}
+
+const updateItem = (row) => {
+    const selectedItem = items.value.find((item) => item.id === row.itemFk);
+    if (selectedItem) {
+        row.item = selectedItem;
+        row.itemFk = selectedItem.id;
+        row.price = selectedItem.price;
+        row.discount = 0;
+        row.quantity = 0;
+        row.amount = row.price * row.quantity;
+    }
+    endNewRow(selectedItem);
+};
+
+function handleOnDataSave({ CrudModelRef }) {
+    const { copy } = addRow(CrudModelRef.formData);
+    CrudModelRef.insert(copy);
+}
+
+const addRow = (original = null) => {
+    let copy = null;
+    if (!original) {
+        copy = { isNew: true };
+    } else {
+        copy = {
+            itemFk: original.itemFk,
+            item: original.item,
+            quantity: original.quantity,
+            price: original.price,
+            discount: original.discount,
+            amount: original.amount,
+            isNew: true,
+        };
+    }
+    newRow.value = copy;
+    return { original, copy };
+};
+
+const endNewRow = (row) => {
+    if (row.itemFk && row.quantity) {
+        row.isNew = false;
+    }
+};
+
+watch(
+    () => newRow.value.itemFk,
+    (newItemFk) => {
+        if (newItemFk) {
+            updateItem(newRow.value);
+        }
+    }
+);
 </script>
 
 <template>
@@ -471,7 +549,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
                     :ticket="store.data"
                     :is-ticket-editable="isTicketEditable"
                     :sales="selectedValidSales"
-                    :disable="!selectedSales.length"
+                    :disable="!hasSelectedRows"
                     :mana="mana"
                     :ticket-config="ticketConfig"
                     @get-mana="getMana()"
@@ -480,7 +558,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
                 <QBtn
                     color="primary"
                     icon="delete"
-                    :disable="!isTicketEditable || !selectedSales.length"
+                    :disable="!isTicketEditable || !hasSelectedRows"
                     @click="
                         openConfirmationModal(
                             t('Continue anyway?'),
@@ -494,7 +572,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
                 <QBtn
                     color="primary"
                     icon="vn:splitline"
-                    :disable="!isTicketEditable || !selectedSales.length"
+                    :disable="!isTicketEditable || !hasSelectedRows"
                     @click="setTransferParams()"
                 >
                     <QTooltip>{{ t('Transfer lines') }}</QTooltip>
@@ -507,44 +585,57 @@ onUnmounted(() => (stateStore.rightDrawer = false));
             </QBtnGroup>
         </template>
     </VnSubToolbar>
-    <QDrawer side="right" :width="270" v-model="stateStore.rightDrawer">
+    <QDrawer side="right" :width="265" v-model="stateStore.rightDrawer">
         <div
             class="q-pa-md q-mb-md q-ma-md color-vn-text"
             style="border: 2px solid black"
         >
-            <QCardSection class="justify-center text-subtitle1" horizontal>
+            <QCardSection class="justify-end text-subtitle1" horizontal>
                 <span class="q-mr-xs color-vn-label"
                     >{{ t('ticketSale.subtotal') }}:
                 </span>
                 <span>{{ toCurrency(store.data?.totalWithoutVat) }}</span>
             </QCardSection>
-            <QCardSection class="justify-center text-subtitle1" horizontal>
+            <QCardSection class="justify-end text-subtitle1" horizontal>
                 <span class="q-mr-xs color-vn-label"> {{ t('ticketSale.tax') }}: </span>
                 <span>{{
                     toCurrency(store.data?.totalWithVat - store.data?.totalWithoutVat)
                 }}</span>
             </QCardSection>
-            <QCardSection
-                class="justify-center text-weight-bold text-subtitle1"
-                horizontal
-            >
+            <QCardSection class="justify-end text-weight-bold text-subtitle1" horizontal>
                 <span class="q-mr-xs color-vn-label"> {{ t('ticketSale.total') }}: </span>
                 <span>{{ toCurrency(store.data?.totalWithVat) }}</span>
             </QCardSection>
         </div></QDrawer
     >
-    <QTable
-        :rows="sales"
+    <VnTable
+        ref="tableRef"
+        data-key="TicketSales"
+        :url="`Tickets/${route.params.id}/getSales`"
         :columns="columns"
-        row-key="id"
-        :pagination="{ rowsPerPage: 0 }"
-        class="full-width q-mt-md"
-        selection="multiple"
-        v-model:selected="selectedSales"
-        :no-data-label="t('globals.noResults')"
+        v-model:selected="selectedRows"
+        :bottom="true"
+        :table="{
+            'row-key': 'id',
+            selection: 'multiple',
+        }"
+        :right-search="false"
+        :column-search="false"
+        :disable-option="{ card: true }"
+        auto-load
+        :create="{
+            onDataSaved: handleOnDataSave,
+        }"
+        :create-as-dialog="false"
+        :crud-model="{
+            paginate: false,
+        }"
+        :default-remove="false"
+        :default-reset="false"
+        :default-save="false"
+        :disabled-attr="isTicketEditable"
     >
-        <template #body-cell-statusIcons="{ row }">
-            <QTd class="q-gutter-x-xs">
+        <template #column-statusIcons="{ row }">
             <router-link
                 v-if="row.claim?.claimFk"
                 :to="{ name: 'ClaimBasicData', params: { id: row.claim?.claimFk } }"
@@ -586,87 +677,80 @@ onUnmounted(() => (stateStore.rightDrawer = false));
                     {{ t('ticketSale.hasComponentLack') }}
                 </QTooltip>
             </QIcon>
-            </QTd>
         </template>
-        <template #body-cell-picture="{ row }">
-            <QTd>
+        <template #column-image="{ row }">
             <div class="image-wrapper">
-                    <VnImg :id="row.itemFk" class="rounded" />
+                <VnImg :id="parseInt(row?.item?.id)" class="rounded" />
             </div>
-            </QTd>
         </template>
-        <template #body-cell-visible="{ row }">
-            <QTd @click.stop>
+        <template #column-visible="{ row }">
             <QBadge :color="row.visible < 0 ? 'alert' : 'transparent'" dense>
                 {{ row.visible }}
             </QBadge>
-            </QTd>
         </template>
-        <template #body-cell-available="{ row }">
-            <QTd @click.stop>
+        <template #column-available="{ row }">
             <QBadge :color="row.available < 0 ? 'alert' : 'transparent'" dense>
                 {{ row.available }}
             </QBadge>
-            </QTd>
         </template>
-        <template #body-cell-itemFk="{ row }">
-            <QTd @click.stop>
-                <div v-if="row.id">
-                    <QBtn flat color="primary" dense>
-                        {{ row.itemFk }}
-                    </QBtn>
-                    <ItemDescriptorProxy :id="row.itemFk" />
-                </div>
+        <template #column-itemFk="{ row }">
             <VnSelect
-                    v-else
-                    hide-selected
+                v-if="row.isNew"
+                url="Items/WithName"
+                :fields="['id', 'name']"
+                :sort-by="['id DESC']"
+                :options="items"
                 option-label="name"
                 option-value="id"
-                    url="Items/withName"
-                    :fields="['id', 'name']"
-                    sort-by="id DESC"
-                    @update:model-value="changeQuantity(row)"
                 v-model="row.itemFk"
+                @update:model-value="updateItem(row)"
             >
                 <template #option="scope">
                     <QItem v-bind="scope.itemProps">
                         <QItemSection>
-                                <QItemLabel> #{{ scope.opt?.id }} </QItemLabel>
-                                <QItemLabel caption>{{ scope.opt?.name }}</QItemLabel>
+                            <QItemLabel>
+                                {{ scope.opt?.id }} - {{ scope.opt?.name }}</QItemLabel
+                            >
                         </QItemSection>
                     </QItem>
                 </template>
             </VnSelect>
-            </QTd>
+            <span v-else class="link" @click.stop>
+                {{ row?.itemFk }}
+                <ItemDescriptorProxy :id="row?.itemFk" />
+            </span>
         </template>
-        <template #body-cell-quantity="{ row }">
-            <QTd @click.stop>
+        <template #column-item="{ row }">
+            <div class="row column full-width justify-between items-start">
+                {{ row?.item?.name }}
+                <div v-if="row?.item?.subName" class="subName">
+                    {{ row?.item?.subName.toUpperCase() }}
+                </div>
+            </div>
+            <FetchedTags :item="row" :max-length="6" />
+            <QPopupProxy v-if="row.id && isTicketEditable">
+                <VnInput v-model="row.concept" @change="updateConcept(row)" />
+            </QPopupProxy>
+        </template>
+        <template #column-quantity="{ row }">
             <VnInput
-                    v-if="isTicketEditable"
+                v-if="row.isNew"
+                v-model.number="row.quantity"
+                type="number"
+                @blur="changeQuantity(row)"
+                @focus="edit.oldQuantity = row.quantity"
+            />
+            <VnInput
+                v-else-if="isTicketEditable"
                 v-model.number="row.quantity"
-                    @keyup.enter="changeQuantity(row)"
                 @blur="changeQuantity(row)"
                 @focus="edit.oldQuantity = row.quantity"
             />
             <span v-else>{{ row.quantity }}</span>
-            </QTd>
         </template>
-        <template #body-cell-item="{ row }">
-            <QTd class="col">
-                <div class="column">
-                    <span>{{ row.concept }}</span>
-                    <span class="color-vn-label">{{ row.item?.subName }}</span>
-                    <FetchedTags v-if="row.item" :item="row.item" />
-                    <QPopupProxy v-if="row.id && isTicketEditable">
-                        <VnInput v-model="row.concept" @change="updateConcept(row)" />
-                    </QPopupProxy>
-                </div>
-            </QTd>
-        </template>
-        <template #body-cell-price="{ row }">
-            <QTd>
+        <template #column-price="{ row }">
             <template v-if="isTicketEditable && row.id">
-                    <QBtn flat color="primary" dense @click="onOpenEditPricePopover(row)">
+                <QBtn flat class="link" dense @click="onOpenEditPricePopover(row)">
                     {{ toCurrency(row.price) }}
                 </QBtn>
                 <TicketEditManaProxy
@@ -683,17 +767,10 @@ onUnmounted(() => (stateStore.rightDrawer = false));
                 </TicketEditManaProxy>
             </template>
             <span v-else>{{ toCurrency(row.price) }}</span>
-            </QTd>
         </template>
-        <template #body-cell-discount="{ row }">
-            <QTd>
+        <template #column-discount="{ row }">
             <template v-if="!isLocked && row.id">
-                    <QBtn
-                        flat
-                        color="primary"
-                        dense
-                        @click="onOpenEditDiscountPopover(row)"
-                    >
+                <QBtn flat class="link" dense @click="onOpenEditDiscountPopover(row)">
                     {{ toPercentage(row.discount / 100) }}
                 </QBtn>
                 <TicketEditManaProxy
@@ -709,44 +786,13 @@ onUnmounted(() => (stateStore.rightDrawer = false));
                 </TicketEditManaProxy>
             </template>
             <span v-else>{{ toPercentage(row.discount / 100) }}</span>
-            </QTd>
         </template>
-        <template #body-cell-history="{ row }">
-            <QTd>
-                <QBtn
-                    v-if="row.$hasLogs"
-                    @click.stop="goToLog(row.id)"
-                    color="primary"
-                    icon="history"
-                    size="md"
-                    flat
-                >
-                    <QTooltip class="text-no-wrap">
-                        {{ t('ticketSale.history') }}
-                    </QTooltip>
-                </QBtn>
-            </QTd>
+        <template #column-amount="{ row }">
+            {{ toCurrency(row.quantity * row.price) }}
         </template>
-        <template #bottom-row>
-            <QBtn
-                class="cursor-pointer fill-icon q-ml-md q-my-lg"
-                color="primary"
-                icon="add_circle"
-                size="md"
-                round
-                flat
-                shortcut="+"
-                :disable="!isTicketEditable"
-                @click="insertRow()"
-            >
-                <QTooltip>
-                    {{ t('Add item') }}
-                </QTooltip>
-            </QBtn>
-        </template>
-    </QTable>
+    </VnTable>
 
-    <QPageSticky :offset="[20, 20]">
+    <QPageSticky :offset="[20, 20]" style="z-index: 2">
         <QBtn @click="newOrderFromTicket()" color="primary" fab icon="add" shortcut="+" />
         <QTooltip class="text-no-wrap">
             {{ t('Add item to basket') }}
@@ -754,6 +800,18 @@ onUnmounted(() => (stateStore.rightDrawer = false));
     </QPageSticky>
 </template>
 
+<style lang="scss" scoped>
+.image-wrapper {
+    height: 50px;
+    width: 50px;
+}
+
+.subName {
+    text-transform: uppercase;
+    color: var(--vn-label-color);
+}
+</style>
+
 <i18n>
 es:
     New item: Nuevo artículo

src/pages/Ticket/Card/TicketSaleTracking.vue

@@ -25,7 +25,7 @@ const saleTrackingFetchDataRef = ref(null);
 
 const sales = ref([]);
 const saleTrackings = ref([]);
-const itemShelvignsSales = ref([]);
+const itemShelvingsSales = ref([]);
 const saleTrackingUrl = computed(() => `SaleTrackings/${route.params.id}/filter`);
 const oldQuantity = ref(null);
 
@@ -88,7 +88,7 @@ const logTableColumns = computed(() => [
         label: t('ticketSaleTracking.original'),
         name: 'original',
         field: 'originalQuantity',
-        align: 'original',
+        align: 'left',
         sortable: true,
     },
     {
@@ -177,7 +177,7 @@ const getItemShelvingSales = async (sale) => {
         const { data } = await axios.get(`ItemShelvingSales/filter`, {
             params: { filter: JSON.stringify(filter) },
         });
-        itemShelvignsSales.value = data;
+        itemShelvingsSales.value = data;
     } catch (error) {
         console.error(error);
     }
@@ -337,7 +337,7 @@ const qCheckBoxController = (sale, action) => {
         :no-data-label="t('globals.noResults')"
     >
         <template #body-cell-isChecked="{ row }">
-            <QTd @click.stop>
+            <QTd @click.stop style="width: 20%">
                 <QCheckbox
                     :model-value="!!row.hasSaleGroupDetail"
                     color="pink"
@@ -396,12 +396,14 @@ const qCheckBoxController = (sale, action) => {
             </QTd>
         </template>
         <template #body-cell-item="{ row }">
-            <QTd @click.stop>
+            <QTd @click.stop style="width: 20%">
                 <div>
-                    <QBtn flat color="primary">
+                    <span class="link">
+                        <QBtn flat>
                             {{ row.itemFk }}
                         </QBtn>
                         <ItemDescriptorProxy :id="row.itemFk" />
+                    </span>
                 </div>
             </QTd>
         </template>
@@ -416,8 +418,18 @@ const qCheckBoxController = (sale, action) => {
                 </div>
             </QTd>
         </template>
+        <template #body-cell-quantity="{ row }">
+            <QTd style="width: 10%">
+                {{ row.quantity }}
+            </QTd>
+        </template>
+        <template #body-cell-parking="{ row }">
+            <QTd style="width: 10%">
+                {{ dashIfEmpty(row.parkingFk) }}
+            </QTd>
+        </template>
         <template #body-cell-actions="{ row }">
-            <QTd>
+            <QTd style="width: 20%">
                 <QBtn
                     @click.stop="showLog(row)"
                     color="primary"
@@ -452,12 +464,14 @@ const qCheckBoxController = (sale, action) => {
             data-key="saleTrackingLog"
             :rows="saleTrackings"
             :columns="logTableColumns"
-            class="q-pa-sm"
+            class="q-pa-sm full-width"
         >
             <template #body-cell-worker="{ row }">
-                <QTd auto-width>
-                    <QBtn flat dense color="primary">{{ row.name }}</QBtn>
+                <QTd>
+                    <QBtn flat class="link">
+                        {{ row.name }}
                         <WorkerDescriptorProxy :id="row.workerFk" />
+                    </QBtn>
                 </QTd>
             </template>
         </QTable>
@@ -469,12 +483,12 @@ const qCheckBoxController = (sale, action) => {
     >
         <QTable
             data-key="itemShelvingsSales"
-            :rows="itemShelvignsSales"
+            :rows="itemShelvingsSales"
             :columns="shelvingsTableColumns"
-            class="q-pa-sm"
+            class="q-pa-sm full-width"
         >
             <template #body-cell-quantity="{ row }">
-                <QTd auto-width>
+                <QTd>
                     <VnInput
                         v-model.number="row.quantity"
                         @keyup.enter="updateQuantity(row)"
@@ -484,13 +498,15 @@ const qCheckBoxController = (sale, action) => {
                 </QTd>
             </template>
             <template #body-cell-worker="{ row }">
-                <QTd auto-width>
-                    <QBtn flat dense color="primary">{{ row.name }}</QBtn>
+                <QTd>
+                    <QBtn flat class="link">
+                        {{ row.name }}
                         <WorkerDescriptorProxy :id="row.userFk" />
+                    </QBtn>
                 </QTd>
             </template>
             <template #body-cell-shelving="{ row }">
-                <QTd auto-width>
+                <QTd>
                     <VnSelect
                         url="Shelvings"
                         hide-selected
@@ -503,7 +519,7 @@ const qCheckBoxController = (sale, action) => {
                 </QTd>
             </template>
             <template #body-cell-parking="{ row }">
-                <QTd auto-width>
+                <QTd>
                     <VnSelect
                         url="Parkings"
                         hide-selected
@@ -538,4 +554,10 @@ $estados: (
         }
     }
 }
+
+@media (min-width: 560px) {
+    .q-dialog__inner--minimized > div {
+        max-width: 900px;
+    }
+}
 </style>

src/pages/Ticket/Card/TicketService.vue

@@ -25,7 +25,7 @@ const { notify } = useNotify();
 
 const selected = ref([]);
 const defaultTaxClass = ref(null);
-
+const isSaving = ref(false);
 const crudModelFilter = computed(() => ({
     where: { ticketFk: route.params.id },
 }));
@@ -50,7 +50,7 @@ const createRefund = async () => {
         if (!selected.value.length) return;
 
         const params = {
-            servicesIds: selected.value.map((s) => +s.ticketFk),
+            servicesIds: selected.value.map((s) => +s.id),
             withWarehouse: false,
             negative: true,
         };
@@ -104,7 +104,31 @@ const columns = computed(() => [
         sortable: true,
         align: 'left',
     },
+    {
+        label: '',
+        name: 'actions',
+        align: 'left',
+        columnFilter: null,
+    },
 ]);
+
+async function deleteService(row) {
+    const serviceId = row.id;
+    if (!row.id) ticketServiceCrudRef.value.reset();
+    else {
+        const { data } = await axios.delete(`TicketServices/${serviceId}`);
+        if (data) notify('Service deleted successfully', 'positive');
+        ticketServiceCrudRef.value.reload();
+    }
+}
+
+async function handleSave() {
+    if (!isSaving.value) {
+        isSaving.value = true;
+        await ticketServiceCrudRef.value?.saveChanges();
+        isSaving.value = false;
+    }
+}
 </script>
 
 <template>
@@ -123,6 +147,8 @@ const columns = computed(() => [
         :data-required="crudModelRequiredData"
         auto-load
         v-model:selected="selected"
+        :order="['description ASC']"
+        :default-remove="false"
     >
         <template #moreBeforeActions>
             <QBtn
@@ -177,9 +203,25 @@ const columns = computed(() => [
                             v-model.number="row.price"
                             type="number"
                             min="0"
+                            @keyup.enter="handleSave"
                         />
                     </QTd>
                 </template>
+                <template #body-cell-actions="{ row }">
+                    <QTd auto-width>
+                        <QIcon
+                            color="primary"
+                            name="delete"
+                            class="cursor-pointer"
+                            size="sm"
+                            @click.stop="deleteService(row)"
+                        >
+                            <QTooltip class="text-no-wrap">
+                                {{ t('globals.delete') }}
+                            </QTooltip>
+                        </QIcon>
+                    </QTd>
+                </template>
             </QTable>
         </template>
     </CrudModel>
@@ -193,3 +235,4 @@ const columns = computed(() => [
         />
     </QPageSticky>
 </template>
+ñ

src/pages/Ticket/Card/TicketSummary.vue

@@ -1,4 +1,5 @@
 <script setup>
+import RouteDescriptorProxy from 'pages/Route/Card/RouteDescriptorProxy.vue';
 import { onMounted, ref, computed } from 'vue';
 import { useRoute, useRouter } from 'vue-router';
 import { useI18n } from 'vue-i18n';
@@ -14,6 +15,8 @@ import { getUrl } from 'src/composables/getUrl';
 import VnUserLink from 'src/components/ui/VnUserLink.vue';
 import VnTitle from 'src/components/common/VnTitle.vue';
 import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue';
+import ZoneDescriptorProxy from 'src/pages/Zone/Card/ZoneDescriptorProxy.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
 
 const route = useRoute();
 const router = useRouter();
@@ -71,13 +74,41 @@ async function changeState(value) {
     await axios.post(`Tickets/state`, formData);
     router.go(route.fullPath);
 }
+
+function getNoteValue(description) {
+    switch (description) {
+        case 'ItemPicker':
+            return t('ItemPicker');
+        case 'Packager':
+            return t('Packager');
+        case 'Delivery':
+            return t('Delivery');
+        case 'SalesPerson':
+            return t('SalesPerson');
+        case 'Administrative':
+            return t('Administrative');
+        case 'Weight':
+            return t('Weight');
+        case 'InvoiceOut':
+            return t('InvoiceOut');
+        case 'DropOff':
+            return t('DropOff');
+        case 'Sustitución':
+            return t('Sustitución');
+    }
+}
+
+function toTicketUrl(section) {
+    return '#/ticket/' + entityId.value + '/' + section;
+}
 </script>
 
 <template>
     <FetchData
         url="States/editableStates"
-        @on-fetch="(data) => (editableStates = data)"
+        :filter="{ fields: ['code', 'name', 'id', 'alertLevel'], order: 'name ASC' }"
         auto-load
+        @on-fetch="(data) => (editableStates = data)"
     />
     <CardSummary
         ref="summaryRef"
@@ -94,46 +125,36 @@ async function changeState(value) {
         </template>
         <template #header-right>
             <QBtnDropdown
-                side
-                top
                 color="black"
                 text-color="white"
                 :label="t('ticket.summary.changeState')"
                 :disable="!isEditable()"
             >
-                <QList>
-                    <QVirtualScroll
-                        style="max-height: 300px"
-                        :items="editableStates"
-                        separator
-                        v-slot="{ item, index }"
-                    >
-                        <QItem
-                            :key="index"
-                            dense
-                            clickable
-                            v-close-popup
-                            @click="changeState(item.code)"
-                        >
-                            <QItemSection>
-                                <QItemLabel>{{ item.name }}</QItemLabel>
-                            </QItemSection>
-                        </QItem>
-                    </QVirtualScroll>
-                </QList>
+                <VnSelect
+                    :options="editableStates"
+                    hide-selected
+                    option-label="name"
+                    option-value="code"
+                    hide-dropdown-icon
+                    focus-on-mount
+                    @update:model-value="changeState(item.code)"
+                />
             </QBtnDropdown>
         </template>
         <template #body="{ entity }">
             <QCard class="vn-one">
                 <VnTitle
-                    :url="ticketUrl + 'basic-data/step-one'"
+                    :url="toTicketUrl('basic-data')"
                     :text="t('globals.summary.basicData')"
                 />
-                <VnLv :label="t('ticket.summary.state')">
+                <VnLv v-if="entity.ticketState" :label="t('ticket.summary.state')">
                     <template #value>
-                        <QChip :color="entity.ticketState?.state?.classColor ?? 'dark'">
-                            {{ entity.ticketState?.state?.name }}
-                        </QChip>
+                        <QBadge
+                            text-color="black"
+                            :color="entity.ticketState.state.classColor"
+                        >
+                            {{ entity.ticketState.state.name }}
+                        </QBadge>
                     </template>
                 </VnLv>
                 <VnLv :label="t('ticket.summary.salesPerson')">
@@ -148,7 +169,14 @@ async function changeState(value) {
                     :label="t('ticket.summary.agency')"
                     :value="entity.agencyMode?.name"
                 />
-                <VnLv :label="t('ticket.summary.zone')" :value="entity?.zone?.name" />
+                <VnLv :label="t('ticket.summary.zone')">
+                    <template #value>
+                        <span class="link" @click.stop>
+                            {{ entity?.zone?.name }}
+                            <ZoneDescriptorProxy :id="entity.zoneFk" />
+                        </span>
+                    </template>
+                </VnLv>
                 <VnLv
                     :label="t('ticket.summary.warehouse')"
                     :value="entity.warehouse?.name"
@@ -168,7 +196,14 @@ async function changeState(value) {
                         </a>
                     </template>
                 </VnLv>
-                <VnLv :label="t('ticket.summary.route')" :value="entity.routeFk" />
+                <VnLv :label="t('ticket.summary.route')">
+                    <template #value>
+                        <span class="link">
+                            {{ entity.routeFk }}
+                            <RouteDescriptorProxy :id="entity.routeFk" />
+                        </span>
+                    </template>
+                </VnLv>
                 <VnLv :label="t('ticket.summary.invoice')">
                     <template #value>
                         <span :class="{ link: entity.refFk }">
@@ -185,9 +220,9 @@ async function changeState(value) {
                     :value="dashIfEmpty(entity.weight)"
                 />
             </QCard>
-            <QCard class="vn-one">
+            <QCard class="vn-one" style="flex: 2 1">
                 <VnTitle
-                    :url="ticketUrl + 'basic-data/step-one'"
+                    :url="toTicketUrl('basic-data')"
                     :text="t('globals.summary.basicData')"
                 />
                 <VnLv
@@ -230,13 +265,13 @@ async function changeState(value) {
             </QCard>
             <QCard class="vn-one" v-if="entity.notes.length">
                 <VnTitle
-                    :url="ticketUrl + 'observation'"
+                    :url="toTicketUrl('observation')"
                     :text="t('ticket.pageTitles.notes')"
                 />
                 <VnLv
                     v-for="note in entity.notes"
                     :key="note.id"
-                    :label="note.observationType.description"
+                    :label="getNoteValue(note.observationType.description)"
                     :value="note.description"
                 >
                     <template #value>
@@ -246,6 +281,7 @@ async function changeState(value) {
                             type="textarea"
                             class="notes"
                             readonly
+                            autogrow
                         />
                     </template>
                 </VnLv>
@@ -263,13 +299,14 @@ async function changeState(value) {
                     />
                     <VnLv
                         :label="t('ticket.summary.total')"
-                        :value="toCurrency(entity.totalWithVat)"
+                        :value="toCurrency(ticket.totalWithVat)"
+                        style="font-weight: bold"
                     />
                 </div>
             </QCard>
             <QCard class="vn-max">
                 <VnTitle
-                    :url="ticketUrl + 'sale'"
+                    :url="toTicketUrl('sale')"
                     :text="t('ticket.summary.saleLines')"
                 />
                 <QTable :rows="entity.sales" style="text-align: center">
@@ -292,11 +329,10 @@ async function changeState(value) {
                     </template>
                     <template #body="props">
                         <QTr :props="props">
-                            <QTd>
+                            <QTd class="q-gutter-x-xs">
                                 <QBtn
                                     flat
                                     round
-                                    size="xs"
                                     icon="vn:claims"
                                     v-if="props.row.claim"
                                     color="primary"
@@ -307,15 +343,14 @@ async function changeState(value) {
                                         },
                                     }"
                                 >
-                                    <QTooltip
-                                        >{{ t('ticket.summary.claim') }}:
-                                        {{ props.row.claim.claimFk }}</QTooltip
-                                    >
+                                    <QTooltip>
+                                        {{ t('ticket.summary.claim') }}:
+                                        {{ props.row.claim.claimFk }}
+                                    </QTooltip>
                                 </QBtn>
                                 <QBtn
                                     flat
                                     round
-                                    size="xs"
                                     icon="vn:claims"
                                     v-if="props.row.claimBeginning"
                                     color="primary"
@@ -326,27 +361,27 @@ async function changeState(value) {
                                         },
                                     }"
                                 >
-                                    <QTooltip
-                                        >{{ t('ticket.summary.claim') }}:
-                                        {{ props.row.claimBeginning.claimFk }}</QTooltip
-                                    >
+                                    <QTooltip>
+                                        {{ t('ticket.summary.claim') }}:
+                                        {{ props.row.claimBeginning.claimFk }}
+                                    </QTooltip>
                                 </QBtn>
                                 <QIcon
                                     name="warning"
                                     v-show="props.row.visible < 0"
-                                    size="xs"
                                     color="primary"
+                                    size="xs"
                                 >
-                                    <QTooltip
-                                        >{{ t('ticket.summary.visible') }}:
-                                        {{ props.row.visible }}</QTooltip
-                                    >
+                                    <QTooltip>
+                                        {{ t('ticket.summary.visible') }}:
+                                        {{ props.row.visible }}
+                                    </QTooltip>
                                 </QIcon>
                                 <QIcon
-                                    name="vn:reserva"
+                                    name="vn:reserved"
                                     v-show="props.row.reserved"
-                                    size="xs"
                                     color="primary"
+                                    size="xs"
                                 >
                                     <QTooltip>
                                         {{ t('ticket.summary.reserved') }}
@@ -355,8 +390,8 @@ async function changeState(value) {
                                 <QIcon
                                     name="vn:unavailable"
                                     v-show="props.row.itemShortage"
-                                    size="xs"
                                     color="primary"
+                                    size="xs"
                                 >
                                     <QTooltip>
                                         {{ t('ticket.summary.itemShortage') }}
@@ -365,8 +400,8 @@ async function changeState(value) {
                                 <QIcon
                                     name="vn:components"
                                     v-show="props.row.hasComponentLack"
-                                    size="xs"
                                     color="primary"
+                                    size="xs"
                                 >
                                     <QTooltip>
                                         {{ t('ticket.summary.hasComponentLack') }}
@@ -383,8 +418,34 @@ async function changeState(value) {
                                     />
                                 </QBtn>
                             </QTd>
-                            <QTd>{{ props.row.visible }}</QTd>
-                            <QTd>{{ props.row.available }}</QTd>
+                            <QTd>
+                                <QChip
+                                    v-if="props.row.visible < 0"
+                                    dense
+                                    rounded
+                                    :color="'negative'"
+                                    text-color="white"
+                                >
+                                    {{ props.row.visible }}
+                                </QChip>
+                                <span v-else>
+                                    {{ props.row.visible }}
+                                </span>
+                            </QTd>
+                            <QTd>
+                                <QChip
+                                    v-if="props.row.available < 0"
+                                    dense
+                                    rounded
+                                    :color="'negative'"
+                                    text-color="white"
+                                >
+                                    {{ props.row.available }}
+                                </QChip>
+                                <span v-else>
+                                    {{ props.row.available }}
+                                </span>
+                            </QTd>
                             <QTd>{{ props.row.quantity }}</QTd>
                             <QTd class="description-cell">
                                 <div class="row full-width justify-between">
@@ -414,14 +475,11 @@ async function changeState(value) {
                     </template>
                 </QTable>
             </QCard>
-            <QCard
-                class="vn-max"
-                v-if="entity.packagings.length || entity.services.length"
-            >
-                <VnTitle :url="ticketUrl + 'package'" :text="t('globals.packages')" />
-                <QTable :rows="entity.packagings" flat>
+            <QCard class="vn-max" v-if="ticket.packagings.length != 0">
+                <VnTitle :url="toTicketUrl('package')" :text="t('globals.packages')" />
+                <QTable :rows="ticket.packagings" flat style="text-align: center">
                     <template #header="props">
-                        <QTr :props="props">
+                        <QTr class="tr-header" :props="props">
                             <QTh auto-width>{{ t('ticket.summary.created') }}</QTh>
                             <QTh auto-width>{{ t('ticket.summary.package') }}</QTh>
                             <QTh auto-width>{{ t('ticket.summary.quantity') }}</QTh>
@@ -435,13 +493,15 @@ async function changeState(value) {
                         </QTr>
                     </template>
                 </QTable>
+            </QCard>
+            <QCard class="vn-max" v-if="ticket.services.length != 0">
                 <VnTitle
-                    :url="ticketUrl + 'service'"
+                    :url="toTicketUrl('service')"
                     :text="t('ticket.summary.service')"
                 />
-                <QTable :rows="entity.services" flat>
+                <QTable :rows="ticket.services" flat style="text-align: center">
                     <template #header="props">
-                        <QTr :props="props">
+                        <QTr class="tr-header" :props="props">
                             <QTh auto-width>{{ t('ticket.summary.quantity') }}</QTh>
                             <QTh auto-width>{{ t('globals.description') }}</QTh>
                             <QTh auto-width>{{ t('ticket.summary.price') }}</QTh>
@@ -462,12 +522,62 @@ async function changeState(value) {
                     </template>
                 </QTable>
             </QCard>
+            <QCard class="vn-max" v-if="ticket.requests.length != 0">
+                <VnTitle
+                    :url="toTicketUrl('request')"
+                    :text="t('ticket.summary.purchaseRequest')"
+                />
+                <QTable :rows="ticket.requests" flat style="text-align: center">
+                    <template #header="props">
+                        <QTr class="tr-header" :props="props">
+                            <QTh auto-width>{{ t('ticket.summary.description') }}</QTh>
+                            <QTh auto-width>{{ t('ticket.summary.created') }}</QTh>
+                            <QTh auto-width>{{ t('ticket.summary.requester') }}</QTh>
+                            <QTh auto-width>{{ t('ticket.summary.attender') }}</QTh>
+                            <QTh auto-width>{{ t('ticket.summary.quantity') }}</QTh>
+                            <QTh auto-width>{{ t('ticket.summary.price') }}</QTh>
+                            <QTh auto-width>{{ t('ticket.summary.item') }}</QTh>
+                            <QTh auto-width>{{ t('ticket.summary.ok') }}</QTh>
+                        </QTr>
+                    </template>
+                    <template #body="props">
+                        <QTr :props="props">
+                            <QTd>{{ props.row.description }}</QTd>
+                            <QTd>{{ toDate(props.row.created) }}</QTd>
+                            <QTd>{{ props.row.requester?.user?.username }}</QTd>
+                            <QTd>{{ props.row.atender?.user?.username }}</QTd>
+                            <QTd>{{ props.row.quantity }}</QTd>
+                            <QTd>{{ toCurrency(props.row.price) }}</QTd>
+                            <QTd>
+                                <span class="link" v-if="props.row.isOk">
+                                    {{ props.row.itemFk }}
+                                    <ItemDescriptorProxy :id="props.row.itemFk" />
+                                </span>
+                            </QTd>
+                            <QTd>
+                                <QCheckbox
+                                    v-model="props.row.isOk"
+                                    disable
+                                    :toggle-indeterminate="false"
+                                >
+                                    <QTooltip v-if="props.row.isOk">
+                                        {{ t('Accepted') }}
+                                    </QTooltip>
+                                    <QTooltip v-else>
+                                        {{ t('Denied') }}
+                                    </QTooltip>
+                                </QCheckbox>
+                            </QTd>
+                        </QTr>
+                    </template>
+                </QTable>
+            </QCard>
         </template>
     </CardSummary>
 </template>
 <style lang="scss" scoped>
 .notes {
-    width: max-content;
+    width: fit-content;
 }
 
 .q-card.q-card--dark.q-dark.vn-one {
@@ -503,3 +613,28 @@ async function changeState(value) {
     color: $primary-light;
 }
 </style>
+
+<i18n>
+en:
+    ItemPicker: Item Picker
+    Packager: Packager
+    Delivery: Delivery
+    SalesPerson: Sales Person
+    Administrative: Administrative
+    Weight: Weight
+    InvoiceOut: Invoice Out
+    DropOff: Drop Off
+    Sustitución: Sustitution
+es:
+    ItemPicker: Items
+    Packager: Encajador
+    Delivery: Envío
+    SalesPerson: Comercial
+    Administrative: Administrativa
+    Weight: Peso
+    InvoiceOut: Facturas
+    DropOff: Despacho
+    Sustitución: Sustitución
+    Accepted: Aceptado
+    Denied: Denegado
+</i18n>

src/pages/Ticket/Card/TicketTracking.vue

@@ -96,8 +96,8 @@ const openCreateModal = () => createTrackingDialogRef.value.show();
                     :no-data-label="t('globals.noResults')"
                 >
                     <template #body-cell-worker="{ row }">
-                        <QTd @click.stop>
-                            <QBtn flat color="primary">
+                        <QTd>
+                            <QBtn flat class="link" @click.stop>
                                 {{ row.user?.name }}
                                 <WorkerDescriptorProxy :id="row.user?.worker?.id" />
                             </QBtn>

src/pages/Ticket/Card/TicketTransfer.vue

@@ -1,13 +1,11 @@
 <script setup>
 import { ref, computed, onMounted } from 'vue';
 import { useI18n } from 'vue-i18n';
-import { useRouter } from 'vue-router';
 
 import VnInput from 'src/components/common/VnInput.vue';
 import TicketTransferForm from './TicketTransferForm.vue';
 
 import { toDateFormat } from 'src/filters/date.js';
-import axios from 'axios';
 
 const $props = defineProps({
     mana: {
@@ -28,13 +26,10 @@ const $props = defineProps({
     },
 });
 
-const emit = defineEmits(['refreshData']);
-
-const router = useRouter();
 const { t } = useI18n();
 const QPopupProxyRef = ref(null);
-
-const _transfer = ref(null);
+const transferFormRef = ref(null);
+const _transfer = ref();
 
 const transferLinesColumns = computed(() => [
     {
@@ -85,19 +80,11 @@ const destinationTicketColumns = computed(() => [
     },
 ]);
 
-const transferSales = async (ticketId) => {
-    const params = {
-        ticketId: ticketId,
-        sales: $props.transfer.sales,
-    };
-
-    const { data } = await axios.post(
-        `tickets/${$props.ticket.id}/transferSales`,
-        params
-    );
-
-    if (data && data.id === $props.ticket.id) emit('refreshData');
-    else router.push({ name: 'TicketSale', params: { id: data.id } });
+const handleRowClick = (row) => {
+    const ticketId = row.id;
+    if (transferFormRef.value) {
+        transferFormRef.value.transferSales(ticketId);
+    }
 };
 
 onMounted(() => (_transfer.value = $props.transfer));
@@ -105,9 +92,8 @@ onMounted(() => (_transfer.value = $props.transfer));
 
 <template>
     <QPopupProxy ref="QPopupProxyRef">
-        <QCard class="q-px-md" style="display: flex">
+        <QCard class="q-px-md" style="display: flex; width: 80vw">
             <QTable
-                v-if="transfer.sales"
                 :rows="transfer.sales"
                 :columns="transferLinesColumns"
                 :title="t('Sales to transfer')"
@@ -121,9 +107,6 @@ onMounted(() => (_transfer.value = $props.transfer));
                         <VnInput
                             v-model.number="row.quantity"
                             :clearable="false"
-                            @keyup.enter="changeQuantity(row)"
-                            @blur="changeQuantity(row)"
-                            @focus="edit.oldQuantity = row.quantity"
                             style="max-width: 60px"
                         />
                     </QTd>
@@ -137,6 +120,7 @@ onMounted(() => (_transfer.value = $props.transfer));
                 :title="t('Destination ticket')"
                 row-key="id"
                 class="full-width q-mt-md"
+                @row-click="(_, row) => handleRowClick(row)"
             >
                 <template #body-cell-address="{ row }">
                     <QTd @click.stop>
@@ -158,10 +142,10 @@ onMounted(() => (_transfer.value = $props.transfer));
                 </template>
 
                 <template #no-data>
-                    <TicketTransferForm v-bind="$props" />
+                    <TicketTransferForm ref="transferFormRef" v-bind="$props" />
                 </template>
                 <template #bottom>
-                    <TicketTransferForm v-bind="$props" />
+                    <TicketTransferForm ref="transferFormRef" v-bind="$props" />
                 </template>
             </QTable>
         </QCard>

src/pages/Ticket/Card/TicketTransferForm.vue

@@ -1,5 +1,5 @@
 <script setup>
-import { ref, onMounted } from 'vue';
+import { ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRouter } from 'vue-router';
 
@@ -31,7 +31,7 @@ const emit = defineEmits(['refreshData']);
 const router = useRouter();
 const { t } = useI18n();
 
-const _transfer = ref(null);
+const _transfer = ref($props.transfer);
 
 const transferSales = async (ticketId) => {
     const params = {
@@ -48,11 +48,10 @@ const transferSales = async (ticketId) => {
     else router.push({ name: 'TicketSale', params: { id: data.id } });
 };
 
-onMounted(() => (_transfer.value = $props.transfer));
+defineExpose({ transferSales });
 </script>
 
 <template>
-    {{ _transfer }}
     <QForm class="q-mt-lg full-width">
         <VnInput
             v-model.number="_transfer.ticketId"

src/pages/Ticket/Card/TicketVolume.vue

@@ -5,17 +5,18 @@ import { useRoute } from 'vue-router';
 
 import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue';
 import FetchedTags from 'components/ui/FetchedTags.vue';
-import RightMenu from 'src/components/common/RightMenu.vue';
 import FetchData from 'components/FetchData.vue';
 
 import { useStateStore } from 'stores/useStateStore';
 import { dashIfEmpty } from 'src/filters';
 import axios from 'axios';
+import VnTable from 'src/components/VnTable/VnTable.vue';
 
 const route = useRoute();
 const stateStore = useStateStore();
 const { t } = useI18n();
 const salesRef = ref(null);
+const tableRef = ref();
 
 watch(
     () => route.params.id,
@@ -34,37 +35,42 @@ const salesFilter = computed(() => ({
 
 const sales = ref([]);
 const packingTypeVolume = ref([]);
-const rows = computed(() => sales.value);
 
 const columns = computed(() => [
     {
+        align: 'left',
         label: t('volume.item'),
-        name: 'item',
-        align: 'left',
+        name: 'itemFk',
+        chip: {
+            condition: () => true,
+        },
+        isId: true,
     },
     {
+        align: 'left',
         label: t('volume.description'),
-        name: 'description',
-        align: 'left',
+        name: 'concept',
+        columnClass: 'expand',
+        cardVisible: true,
     },
     {
+        align: 'left',
         label: t('volume.packingType'),
-        name: 'quantity',
-        field: (row) => row.item.itemPackingTypeFk,
-        align: 'left',
-        format: (val) => dashIfEmpty(val),
+        name: 'itemPackingTypeFk',
+        cardVisible: true,
+        format: (row, dashIfEmpty) => dashIfEmpty(row.item.itemPackingTypeFk),
     },
     {
+        align: 'left',
         label: t('volume.quantity'),
         name: 'quantity',
-        field: 'quantity',
-        align: 'left',
+        cardVisible: true,
     },
     {
-        label: t('volume.volumeQuantity'),
-        name: 'quantity',
-        field: (row) => row.saleVolume?.volume,
         align: 'left',
+        label: t('volume.volumeQuantity'),
+        name: 'volume',
+        cardVisible: true,
     },
 ]);
 
@@ -87,9 +93,7 @@ const applyVolumes = async (salesData) => {
     }
 };
 
-onMounted(() => {
-    stateStore.rightDrawer = true;
-});
+onMounted(() => (stateStore.rightDrawer = true));
 
 onUnmounted(() => (stateStore.rightDrawer = false));
 </script>
@@ -102,8 +106,12 @@ onUnmounted(() => (stateStore.rightDrawer = false));
         @on-fetch="(data) => applyVolumes(data)"
         auto-load
     />
-    <RightMenu v-if="packingTypeVolume.length">
-        <template #right-panel>
+    <QDrawer
+        v-if="packingTypeVolume.length"
+        side="right"
+        :width="265"
+        v-model="stateStore.rightDrawer"
+    >
         <QCard
             v-for="(packingType, index) in packingTypeVolume"
             :key="index"
@@ -122,32 +130,31 @@ onUnmounted(() => (stateStore.rightDrawer = false));
                 <span> {{ t('volume.volume') }}: {{ packingType.volume }} </span>
             </QCardSection>
         </QCard>
-        </template>
-    </RightMenu>
-    <QTable
-        :rows="rows"
+    </QDrawer>
+
+    <VnTable
+        ref="tableRef"
+        data-key="TicketVolume"
+        :url="`Tickets/${route.params.id}/getSales`"
         :columns="columns"
-        row-key="id"
-        :pagination="{ rowsPerPage: 0 }"
-        class="full-width q-mt-md"
-        :no-data-label="t('globals.noResults')"
+        :right-search="false"
+        :column-search="false"
+        :order="['itemPackingTypeFk']"
+        auto-load
     >
-        <template #body-cell-item="{ row }">
-            <QTd>
-                <QBtn flat color="primary">
+        <template #column-itemFk="{ row }">
+            <span class="link">
                 {{ row.itemFk }}
                 <ItemDescriptorProxy :id="row.itemFk" />
-                </QBtn>
-            </QTd>
+            </span>
         </template>
-        <template #body-cell-description="{ row }">
-            <QTd>
-                <div class="column">
+        <template #column-concept="{ row }">
             <span>{{ row.item.name }}</span>
-                    <span class="color-vn-label">{{ row.item.subName }}</span>
+            <span class="color-vn-label q-pl-md">{{ row.item.subName }}</span>
             <FetchedTags :item="row.item" />
-                </div>
-            </QTd>
         </template>
-    </QTable>
+        <template #column-volume="{ rowIndex }">
+            <span>{{ packingTypeVolume?.[rowIndex]?.volume }}</span>
+        </template>
+    </VnTable>
 </template>

src/pages/Ticket/TicketAdvance.vue

@@ -456,11 +456,12 @@ const handleCloseProgressDialog = () => {
 const handleCancelProgress = () => (cancelProgress.value = true);
 
 onMounted(async () => {
-    let today = Date.vnNew().toISOString();
+    let today = Date.vnNew();
     const tomorrow = new Date(today);
     tomorrow.setDate(tomorrow.getDate() + 1);
     userParams.dateFuture = tomorrow;
     userParams.dateToAdvance = today;
+    userParams.scopeDays = 1;
     userParams.warehouseFk = user.value.warehouseFk;
     const filter = { limit: 0 };
     await arrayData.addFilter({ filter, userParams });
@@ -550,6 +551,7 @@ onMounted(async () => {
             style="max-width: 99%"
         >
             <template #header="props">
+                {{ userParams.scopeDays }}
                 <QTr :props="props">
                     <QTh
                         class="horizontal-separator text-uppercase color-vn-label"

src/pages/Ticket/TicketAdvanceFilter.vue

@@ -9,6 +9,7 @@ import VnInputDate from 'src/components/common/VnInputDate.vue';
 
 import axios from 'axios';
 import { onMounted } from 'vue';
+import VnInputNumber from 'src/components/common/VnInputNumber.vue';
 
 const { t } = useI18n();
 const props = defineProps({
@@ -116,6 +117,15 @@ onMounted(async () => await getItemPackingTypes());
                     </VnSelect>
                 </QItemSection>
             </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnInputNumber
+                        v-model="params.scopeDays"
+                        :label="t('Days onward')"
+                        is-outlined
+                    />
+                </QItemSection>
+            </QItem>
             <QItem>
                 <QItemSection>
                     <QCheckbox

src/pages/Ticket/TicketFilter.vue

@@ -115,6 +115,15 @@ const warehouses = ref([]);
                     />
                 </QItemSection>
             </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnInput
+                        v-model="params.scopeDays"
+                        :label="t('Days onward')"
+                        is-outlined
+                    />
+                </QItemSection>
+            </QItem>
             <QItem>
                 <QItemSection>
                     <QCheckbox
@@ -278,4 +287,5 @@ es:
     Warehouse: Almacén
     Yes: Si
     No: No
+    Days onward: Días adelante
 </i18n>

src/pages/Ticket/TicketList.vue

@@ -4,7 +4,9 @@ import { computed, ref, onMounted } from 'vue';
 import { useRoute } from 'vue-router';
 import { useStateStore } from 'stores/useStateStore';
 import { useI18n } from 'vue-i18n';
-import { toDate, toCurrency } from 'src/filters/index';
+import { useQuasar } from 'quasar';
+import { toDate, toCurrency, dashIfEmpty } from 'src/filters/index';
+import useNotify from 'src/composables/useNotify';
 import TicketSummary from './Card/TicketSummary.vue';
 import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
@@ -14,11 +16,19 @@ import VnInputDate from 'src/components/common/VnInputDate.vue';
 import VnRow from 'src/components/ui/VnRow.vue';
 import RightMenu from 'src/components/common/RightMenu.vue';
 import TicketFilter from './TicketFilter.vue';
+import VnInput from 'src/components/common/VnInput.vue';
+import FetchData from 'src/components/FetchData.vue';
+import CustomerDescriptorProxy from '../Customer/Card/CustomerDescriptorProxy.vue';
+import ZoneDescriptorProxy from '../Zone/Card/ZoneDescriptorProxy.vue';
+import { toTimeFormat } from 'src/filters/date';
+import InvoiceOutDescriptorProxy from '../InvoiceOut/Card/InvoiceOutDescriptorProxy.vue';
 
 const route = useRoute();
 const { t } = useI18n();
 const { viewSummary } = useSummaryDialog();
 const tableRef = ref();
+const quasar = useQuasar();
+const { notify } = useNotify();
 const clientsOptions = ref([]);
 const addressesOptions = ref([]);
 const agenciesOptions = ref([]);
@@ -26,6 +36,7 @@ const selectedClient = ref();
 const stateStore = useStateStore();
 const from = Date.vnNew();
 from.setHours(0, 0, 0, 0);
+from.setDate(from.getDate() - 7);
 const to = Date.vnNew();
 to.setHours(23, 59, 0, 0);
 to.setDate(to.getDate() + 1);
@@ -44,19 +55,21 @@ const initializeFromQuery = () => {
     Object.assign(userParams, { from, to });
 };
 
+const selectedRows = ref([]);
+const hasSelectedRows = computed(() => selectedRows.value.length > 0);
+const showForm = ref(false);
+const dialogData = ref();
+const companiesOptions = ref([]);
+const accountingOptions = ref([]);
+const amountToReturn = ref();
+
 const columns = computed(() => [
     {
         align: 'left',
-        name: 'stateFk',
-        label: t('ticketList.state'),
-        columnFilter: {
-            name: 'stateFk',
-            component: 'select',
-            attrs: {
-                url: 'States',
-                fields: ['id', 'name'],
-            },
-        },
+        name: 'statusIcons',
+        hidden: true,
+        format: () => '',
+        columnClass: 'expand',
     },
     {
         align: 'left',
@@ -67,40 +80,6 @@ const columns = computed(() => [
         },
         isId: true,
     },
-    {
-        align: 'left',
-        name: 'nickname',
-        label: t('ticketList.nickname'),
-        isTitle: true,
-    },
-
-    {
-        align: 'left',
-        name: 'shipped',
-        cardVisible: true,
-        label: t('ticketList.shipped'),
-        columnFilter: {
-            component: 'date',
-            alias: 't',
-            inWhere: true,
-        },
-        format: ({ shipped }) => toDate(shipped),
-    },
-    {
-        align: 'left',
-        name: 'zoneFk',
-        label: t('ticketList.zone'),
-        columnFilter: {
-            component: 'select',
-            attrs: {
-                url: 'Zones',
-                fields: ['id', 'name'],
-            },
-            alias: 't',
-            inWhere: true,
-        },
-        format: (row, dashIfEmpty) => dashIfEmpty(row.zoneName),
-    },
     {
         align: 'left',
         label: t('ticketList.salesPerson'),
@@ -118,6 +97,89 @@ const columns = computed(() => [
         },
         format: (row, dashIfEmpty) => dashIfEmpty(row.salesPerson),
     },
+    {
+        align: 'left',
+        name: 'shippedDate',
+        cardVisible: true,
+        label: t('ticketList.shipped'),
+        columnFilter: {
+            component: 'date',
+            alias: 't',
+            inWhere: true,
+        },
+        format: ({ shippedDate }) => toDate(shippedDate),
+    },
+    {
+        align: 'left',
+        name: 'shipped',
+        label: t('ticketList.hour'),
+        format: (row) => toTimeFormat(row.shipped),
+    },
+    {
+        align: 'left',
+        name: 'zoneLanding',
+        label: t('ticketList.closure'),
+        format: (row, dashIfEmpty) => dashIfEmpty(toTimeFormat(row.zoneLanding)),
+    },
+    {
+        align: 'left',
+        name: 'nickname',
+        label: t('ticketList.nickname'),
+        columnClass: 'expand',
+    },
+    {
+        align: 'left',
+        name: 'addressNickname',
+        label: t('ticketList.addressNickname'),
+        columnClass: 'expand',
+    },
+    {
+        align: 'left',
+        name: 'province',
+        label: t('ticketList.province'),
+        columnClass: 'expand',
+    },
+    {
+        align: 'left',
+        name: 'stateFk',
+        label: t('ticketList.state'),
+        columnFilter: {
+            name: 'stateFk',
+            component: 'select',
+            attrs: {
+                url: 'States',
+                fields: ['id', 'name'],
+            },
+        },
+        columnClass: 'expand',
+    },
+    {
+        align: 'left',
+        name: 'refFk',
+        label: t('ticketList.ref'),
+    },
+    {
+        align: 'left',
+        name: 'zoneFk',
+        label: t('ticketList.zone'),
+        columnFilter: {
+            component: 'select',
+            attrs: {
+                url: 'Zones',
+                fields: ['id', 'name'],
+            },
+            alias: 't',
+            inWhere: true,
+        },
+        columnClass: 'expand',
+        format: (row, dashIfEmpty) => dashIfEmpty(row.zoneName),
+    },
+    {
+        align: 'left',
+        name: 'warehouse',
+        label: t('ticketList.warehouse'),
+        columnClass: 'expand',
+    },
     {
         align: 'left',
         name: 'totalWithVat',
@@ -133,15 +195,27 @@ const columns = computed(() => [
         align: 'right',
         name: 'tableActions',
         actions: [
+            {
+                title: t('ticketList.toLines'),
+                icon: 'list',
+                isPrimary: true,
+                action: (row) => redirectToLines(row.id),
+            },
             {
                 title: t('ticketList.summary'),
                 icon: 'preview',
+                isPrimary: true,
                 action: (row) => viewSummary(row.id, TicketSummary),
             },
         ],
     },
 ]);
 
+function redirectToLines(id) {
+    const url = `#/ticket/${id}/sale`;
+    window.open(url, '_blank');
+}
+
 const onClientSelected = async (formData) => {
     await fetchClient(formData);
     await fetchAddresses(formData);
@@ -210,16 +284,174 @@ const fetchAddresses = async (formData) => {
     }
 };
 const getColor = (row) => {
-    return row?.classColor ? `bg-${row.classColor}` : 'bg-orange';
+    if (row.alertLevelCode === 'OK') return 'bg-success';
+    else if (row.alertLevelCode === 'FREE') return 'bg-notice';
+    else if (row.alertLevel === 1) return 'bg-warning';
+    else if (row.alertLevel === 0) return 'bg-alert';
+};
+
+const getDateColor = (date) => {
+    const today = Date.vnNew();
+    today.setHours(0, 0, 0, 0);
+    const timeTicket = new Date(date);
+    timeTicket.setHours(0, 0, 0, 0);
+    const comparation = today - timeTicket;
+    if (comparation == 0) return 'bg-warning';
+    if (comparation < 0) return 'bg-success';
 };
 
 onMounted(() => {
     initializeFromQuery();
     stateStore.rightDrawer = true;
 });
+
+async function makeInvoice(ticket) {
+    const ticketsIds = ticket.map((item) => item.id);
+    const { data } = await axios.post(`Tickets/invoiceTicketsAndPdf`, { ticketsIds });
+    const response = data;
+    if (response)
+        quasar.notify({
+            message: t('globals.dataSaved'),
+            type: 'positive',
+        });
+}
+
+async function sendDocuware(ticket) {
+    try {
+        let ticketIds = ticket.map((item) => item.id);
+
+        const { data } = await axios.post(`Docuwares/upload`, {
+            fileCabinet: 'deliveryNote',
+            ticketIds,
+        });
+
+        for (let ticket of ticketIds) {
+            ticket.stateFk = data.id;
+            ticket.state = data.name;
+            ticket.alertLevel = data.alertLevel;
+            ticket.alertLevelCode = data.code;
+        }
+        notify('globals.dataSaved', 'positive');
+    } catch (err) {
+        console.err('err: ', err);
+    }
+}
+
+function openBalanceDialog(ticket) {
+    const checkedTickets = ticket;
+    const amountPaid = ref(0);
+    const clientFk = ref(null);
+    const description = ref([]);
+    const firstTicketClientId = checkedTickets[0].clientFk;
+    const isSameClient = checkedTickets.every(
+        (ticket) => ticket.clientFk === firstTicketClientId
+    );
+
+    if (!isSameClient) {
+        throw new Error('You cannot make a payment on account from multiple clients');
+    }
+
+    for (let ticketData of checkedTickets) {
+        amountPaid.value += ticketData.totalWithVat;
+        clientFk.value = ticketData.clientFk;
+        description.value.push(ticketData.id);
+    }
+
+    const balanceCreateDialog = ref({
+        amountPaid: amountPaid.value,
+        clientFk: clientFk.value,
+        description: `Albaran: ${description.value.join(', ')}`,
+    });
+    dialogData.value = balanceCreateDialog;
+    showForm.value = true;
+}
+
+async function onSubmit() {
+    const { data: email } = await axios.get('Clients', {
+        params: {
+            filter: JSON.stringify({ where: { id: dialogData.value.value.clientFk } }),
+        },
+    });
+
+    const { data } = await axios.post(
+        `Clients/${dialogData.value.value.clientFk}/createReceipt`,
+        {
+            payed: dialogData.value.payed,
+            companyFk: dialogData.value.companyFk,
+            bankFk: dialogData.value.bankFk,
+            amountPaid: dialogData.value.value.amountPaid,
+            description: dialogData.value.value.description,
+            clientFk: dialogData.value.value.clientFk,
+            email: email[0].email,
+        }
+    );
+
+    if (data) notify('globals.dataSaved', 'positive');
+    showForm.value = false;
+}
+
+const setAmountToReturn = (newAmountGiven) => {
+    const amountPaid = dialogData.value.value.amountPaid;
+
+    amountToReturn.value = newAmountGiven - amountPaid;
+};
+
+function setReference(data) {
+    let newDescription = '';
+
+    switch (data) {
+        case 1:
+            newDescription = `${t(
+                'ticketList.creditCard'
+            )}, ${dialogData.value.value.description.replace(
+                /^(Credit Card, |Cash, |Transfers, )/,
+                ''
+            )}`;
+            break;
+        case 2:
+            newDescription = `${t(
+                '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'
+            )}, ${dialogData.value.value.description.replace(
+                /^(Credit Card, |Cash, |Transfers, )/,
+                ''
+            )}`;
+            break;
+        case 3317:
+            newDescription = '';
+            break;
+        default:
+            break;
+    }
+
+    dialogData.value.value.description = newDescription;
+}
 </script>
 
 <template>
+    <FetchData
+        url="Companies"
+        @on-fetch="(data) => (companiesOptions = data)"
+        auto-load
+    />
+    <FetchData
+        url="Accountings"
+        @on-fetch="(data) => (accountingOptions = data)"
+        auto-load
+    />
     <VnSearchbar
         data-key="Ticket"
         :label="t('Search ticket')"
@@ -246,12 +478,136 @@ onMounted(() => {
         :user-params="userParams"
         :right-search="false"
         redirect="ticket"
-        auto-load
+        v-model:selected="selectedRows"
+        :table="{
+            'row-key': 'id',
+            selection: 'multiple',
+        }"
     >
+        <template #column-statusIcons="{ 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>
+                {{ row.salesPerson }}
+                <CustomerDescriptorProxy :id="row.salesPersonFk" />
+            </span>
+        </template>
+        <template #column-shippedDate="{ row }">
+            <span v-if="getDateColor(row.shipped)">
+                <QChip :class="getDateColor(row.shipped)" dense square>
+                    {{ toDate(row.shippedDate) }}
+                </QChip>
+            </span>
+        </template>
+        <template #column-nickname="{ row }">
+            <span class="link" @click.stop>
+                {{ row.nickname }}
+                <CustomerDescriptorProxy :id="row.clientFk" />
+            </span>
+        </template>
+        <template #column-addressNickname="{ row }">
+            <span class="link" @click.stop>
+                {{ row.addressNickname }}
+                <CustomerDescriptorProxy :id="row.clientFk" />
+            </span>
+        </template>
+        <template #column-stateFk="{ row }">
+            <span v-if="getColor(row)">
+                <QChip :class="getColor(row)" dense square>
+                    {{ row.state }}
+                </QChip>
+            </span>
+            <span v-else>
+                {{ row.state }}
+            </span>
+        </template>
+        <template #column-refFk="{ row }">
+            <span class="link" @click.stop>
+                {{ dashIfEmpty(row.refFk) }}
+                <InvoiceOutDescriptorProxy :id="row.invoiceOutId" />
+            </span>
+        </template>
+        <template #column-zoneFk="{ row }">
+            <span class="link" @click.stop>
+                {{ dashIfEmpty(row.zoneName) }}
+                <ZoneDescriptorProxy :id="row.zoneFk" />
+            </span>
+        </template>
+        <template #column-totalWithVat="{ row }">
+            <QChip
+                v-if="row.totalWithVat > 0 && row.totalWithVat < 50"
+                class="bg-warning"
+                dense
+                square
+            >
+                {{ row.totalWithVat }}
+            </QChip>
+        </template>
         <template #more-create-dialog="{ data }">
             <VnRow>
                 <VnSelect
                     url="Clients"
+                    :fields="['id', 'name']"
                     :label="t('ticketList.client')"
                     v-model="data.clientId"
                     :options="clientsOptions"
@@ -259,6 +615,7 @@ onMounted(() => {
                     option-label="name"
                     hide-selected
                     @update:model-value="(client) => onClientSelected(data)"
+                    :sort-by="'id ASC'"
                 >
                     <template #option="scope">
                         <QItem v-bind="scope.itemProps">
@@ -339,12 +696,136 @@ onMounted(() => {
                 </div>
             </VnRow>
         </template>
-        <template #column-stateFk="{ row }">
-            <QChip :class="getColor(row)" dense square>
-                {{ row.state }}
-            </QChip>
-        </template>
     </VnTable>
+    <QPageSticky :offset="[20, 80]" style="z-index: 2">
+        <QBtn
+            v-if="hasSelectedRows"
+            @click="makeInvoice(selectedRows)"
+            color="primary"
+            fab
+            icon="vn:invoice-in"
+        />
+        <QTooltip>
+            {{ t('ticketList.createInvoice') }}
+        </QTooltip>
+    </QPageSticky>
+    <QPageSticky v-if="hasSelectedRows" :offset="[20, 140]" style="z-index: 2">
+        <QBtn
+            @click.stop="openBalanceDialog(selectedRows)"
+            color="primary"
+            fab
+            icon="vn:recovery"
+        />
+        <QTooltip>
+            {{ t('ticketList.accountPayment') }}
+        </QTooltip>
+    </QPageSticky>
+    <QDialog ref="dialogRef" v-model="showForm">
+        <QCard class="q-pa-md q-mb-md">
+            <QForm @submit="onSubmit()" class="q-pa-sm">
+                {{ t('ticketList.addPayment') }}
+                <VnRow>
+                    <VnInputDate
+                        :label="t('ticketList.date')"
+                        v-model="dialogData.payed"
+                    />
+                    <VnSelect
+                        :label="t('ticketList.company')"
+                        v-model="dialogData.companyFk"
+                        :options="companiesOptions"
+                        option-value="id"
+                        option-label="code"
+                        hide-selected
+                    >
+                    </VnSelect>
+                </VnRow>
+                <VnRow>
+                    <VnSelect
+                        :label="t('ticketList.bank')"
+                        v-model="dialogData.bankFk"
+                        :options="accountingOptions"
+                        option-value="id"
+                        option-label="bank"
+                        hide-selected
+                        @update:model-value="setReference"
+                    />
+                    <VnInput
+                        :label="t('ticketList.amount')"
+                        v-model="dialogData.value.amountPaid"
+                    />
+                </VnRow>
+                <VnRow v-if="dialogData.bankFk === 2">
+                    <span>
+                        {{ t('ticketList.cash') }}
+                    </span>
+                </VnRow>
+                <VnRow v-if="dialogData.bankFk === 2">
+                    <VnInput
+                        :label="t('ticketList.deliveredAmount')"
+                        v-model="dialogData.value.amountGiven"
+                        @update:model-value="setAmountToReturn"
+                        type="number"
+                    />
+                    <VnInput
+                        :label="t('ticketList.amountToReturn')"
+                        :model-value="amountToReturn"
+                        type="number"
+                        readonly
+                    />
+                </VnRow>
+                <VnRow v-if="dialogData.bankFk === 3 || dialogData.bankFk === 3117">
+                    <VnInput
+                        :label="t('ticketList.compensation')"
+                        v-model="dialogData.value.compensation"
+                        type="text"
+                    />
+                </VnRow>
+                <VnRow>
+                    <VnInput
+                        :label="t('ticketList.reference')"
+                        v-model="dialogData.value.description"
+                        type="text"
+                    />
+                </VnRow>
+                <VnRow v-if="dialogData.bankFk === 2">
+                    <QCheckbox
+                        :label="t('ticketList.viewReceipt')"
+                        v-model="dialogData.value.viewReceipt"
+                        :toggle-indeterminate="false"
+                    />
+                    <QCheckbox
+                        :label="t('ticketList.sendEmail')"
+                        v-model="dialogData.value.senEmail"
+                        :toggle-indeterminate="false"
+                    />
+                </VnRow>
+                <div class="q-mt-lg row justify-end">
+                    <QBtn
+                        :label="t('globals.save')"
+                        color="primary"
+                        @click="onSubmit()"
+                    />
+                    <QBtn
+                        flat
+                        :label="t('globals.close')"
+                        color="primary"
+                        v-close-popup
+                    />
+                </div>
+            </QForm>
+        </QCard>
+    </QDialog>
+    <QPageSticky v-if="hasSelectedRows" :offset="[20, 200]" style="z-index: 2">
+        <QBtn
+            @click="sendDocuware(selectedRows)"
+            color="primary"
+            fab
+            icon="install_mobile"
+        />
+        <QTooltip>
+            {{ t('ticketList.sendDocuware') }}
+        </QTooltip>
+    </QPageSticky>
 </template>
 
 <i18n>
@@ -353,4 +834,5 @@ es:
     You can search by ticket id or alias: Puedes buscar por id o alias del ticket
     Zone: Zona
     New ticket: Nuevo ticket
+    Component lack: Faltan componentes
 </i18n>

src/pages/Ticket/locale/en.yml

@@ -67,6 +67,8 @@ advanceTickets:
     advanceWithoutNegativeTitle: Advance tickets (without negatives)
     advanceWithoutNegativeSubtitle: Advance {selectedTickets} tickets confirmation
     errorsList: Errors list
+    search: Search advance tickets
+    searchInfo: Search advance tickets by ID or client ID
 futureTickets:
     problems: Problems
     ticketId: ID
@@ -105,7 +107,7 @@ expedition:
     name: Name
     packageType: Package type
     counter: Counter
-    externalId: externalId
+    externalId: external Id
     created: Created
     state: State
     historyAction: Status log
@@ -118,6 +120,10 @@ expedition:
     removeExpeditionSubtitle: Are you sure you want to delete this expedition?
     worker: Worker
     move: Move
+    isScanned: Is scanned
+    yes: Yes
+    no: No
+    removeExpedition: Delete expedition
 basicData:
     next: Next
     back: Back
@@ -233,7 +239,7 @@ package:
     removePackage: Remove package
 ticketList:
     id: Id
-    nickname: Nickname
+    nickname: Ticket nickname
     state: State
     shipped: Shipped
     zone: Zone
@@ -242,3 +248,27 @@ ticketList:
     summary: Summary
     client: Customer
     createTicket: Create ticket
+    createInvoice: Create invoice
+    accountPayment: Account payment
+    sendDocuware: Set delivered and send delivery note(s) to the tablet
+    addPayment: Add payment
+    date: Date
+    company: Company
+    amount: Amount
+    reference: Reference
+    bank: Bank
+    cash: Cash
+    deliveredAmount: Delivered amount
+    amountToReturn: Amount to return
+    viewReceipt: View receipt
+    sendEmail: Send email
+    compensation: Compensation
+    creditCard: Credit card
+    transfers: Transfers
+    province: Province
+    warehouse: Warehouse
+    hour: Hour
+    closure: Closure
+    toLines: Go to lines
+    addressNickname: Address nickname
+    ref: Reference

src/pages/Ticket/locale/es.yml

@@ -114,6 +114,8 @@ advanceTickets:
     advanceWithoutNegativeTitle: Adelantar tickets (sin negativos)
     advanceWithoutNegativeSubtitle: '¿Desea adelantar {selectedTickets} tickets?'
     errorsList: Lista de errores
+    search: Buscar por tickets adelantados
+    searchInfo: Buscar tickets adelantados por el identificador o el identificador del cliente
 futureTickets:
     problems: Problemas
     ticketId: ID
@@ -192,9 +194,9 @@ expedition:
     id: Expedición
     item: Artículo
     name: Nombre
-    packageType: Package type
+    packageType: Embalaje
     counter: Contador
-    externalId: externalId
+    externalId: ID externo
     created: Fecha creación
     state: Estado
     historyAction: Historial de estados
@@ -207,6 +209,10 @@ expedition:
     removeExpeditionSubtitle: ¿Está seguro de eliminar esta expedición?
     worker: Trabajador
     move: Mover
+    isScanned: Escaneado
+    yes: Sí
+    no: No
+    removeExpedition: Eliminar expedición
 package:
     package: Embalaje
     quantity: Cantidad
@@ -236,7 +242,7 @@ You can search by ticket id or alias: Puedes buscar por id o alias del ticket
 Select lines to see the options: Selecciona líneas para ver las opciones
 ticketList:
     id: Id
-    nickname: Alias
+    nickname: Alias ticket
     state: Estado
     shipped: F. Envío
     zone: Zona
@@ -245,3 +251,27 @@ ticketList:
     summary: Resumen
     client: Cliente
     createTicket: Crear ticket
+    createInvoice: Crear factura
+    accountPayment: Pago a cuenta...
+    sendDocuware: Marcar como servido/s y enviar albarán/es a la tablet
+    addPayment: Añadir pago
+    date: Fecha
+    company: Empresa
+    amount: Importe
+    reference: Referencia
+    bank: Caja
+    cash: Efectivo
+    deliveredAmount: Cantidad entregada
+    amountToReturn: Cantidad a devolver
+    viewReceipt: Ver recibido
+    sendEmail: Enviar correo
+    compensation: Compensación
+    creditCard: Tarjeta de crédito
+    transfers: Transferencias
+    province: Provincia
+    warehouse: Almacén
+    hour: Hora
+    closure: Cierre
+    toLines: Ir a lineas
+    addressNickname: Alias consignatario
+    ref: Referencia

src/pages/Travel/Card/TravelThermographsForm.vue

@@ -28,18 +28,8 @@ const route = useRoute();
 const router = useRouter();
 const state = useState();
 const { notify } = useNotify();
-
-const thermographFilter = {
-    fields: ['thermographFk'],
-    where: {
-        travelFk: null,
-    },
-    order: 'thermographFk ASC',
-};
-const fetchTravelThermographsRef = ref(null);
 const allowedContentTypes = ref('');
 const user = state.getUser();
-const thermographsOptions = ref([]);
 const dmsTypesOptions = ref([]);
 const companiesOptions = ref([]);
 const warehousesOptions = ref([]);
@@ -168,24 +158,15 @@ const updateThermograph = async () => {
 };
 
 const onThermographCreated = async (data) => {
-    await fetchTravelThermographsRef.value.fetch();
-    thermographForm.thermographId = data.thermographId;
+    thermographForm.thermographId = data.id;
 };
 </script>
-
 <template>
     <FetchData
         url="DmsContainers/allowedContentTypes"
         @on-fetch="(data) => (allowedContentTypes = data.join(', '))"
         auto-load
     />
-    <FetchData
-        ref="fetchTravelThermographsRef"
-        url="TravelThermographs"
-        @on-fetch="(data) => (thermographsOptions = data)"
-        :filter="thermographFilter"
-        auto-load
-    />
     <FetchData
         url="DmsTypes"
         :filter="{ order: 'name' }"
@@ -239,15 +220,20 @@ const onThermographCreated = async (data) => {
                     <VnSelectDialog
                         :label="t('travel.thermographs.thermograph')"
                         v-model="thermographForm.thermographId"
-                        :options="thermographsOptions"
+                        url="TravelThermographs"
                         option-value="thermographFk"
                         option-label="thermographFk"
+                        :fields="['thermographFk']"
+                        :where="{ travelFk: null }"
+                        sort-by="thermographFk ASC"
                         :disable="viewAction === 'edit'"
                         :tooltip="t('New thermograph')"
                     >
                         <template #form>
                             <CreateThermographForm
-                                @on-data-saved="onThermographCreated($event, data)"
+                                @on-data-saved="
+                                    (data) => (thermographForm.thermographId = data.id)
+                                "
                             />
                         </template>
                     </VnSelectDialog>
@@ -323,7 +309,6 @@ const onThermographCreated = async (data) => {
         </QForm>
     </QPage>
 </template>
-
 <i18n>
 es:
     Select files: Selecciona ficheros

src/pages/Zone/Card/ZoneBasicData.vue

@@ -64,6 +64,15 @@ const agencyOptions = ref([]);
                     type="number"
                     min="0"
                 />
+
+                <VnInput
+                    class="mw-10"
+                    v-model="data.itemMaxLength"
+                    :label="t('Max length m³')"
+                    clearable
+                    type="number"
+                    min="0"
+                />
             </VnRow>
 
             <VnRow>
@@ -128,4 +137,5 @@ es:
     Bonus: Bonificación
     Inflation: Inflación
     Volumetric: Volumétrico
+    Max length m³: Medida máxima tumbado
 </i18n>

src/router/modules/ticket.js

@@ -198,7 +198,7 @@ export default {
                     name: 'TicketPackage',
                     meta: {
                         title: 'packages',
-                        icon: 'vn:bin',
+                        icon: 'vn:bucket',
                     },
                     component: () => import('src/pages/Ticket/Card/TicketPackage.vue'),
                 },

test/cypress/integration/entry/stockBought.spec.js

@@ -6,7 +6,6 @@ describe('EntryStockBought', () => {
     });
     it('Should edit the reserved space', () => {
         cy.get('.q-field__native.q-placeholder').should('have.value', '01/01/2001');
-        cy.get('tBody > tr').its('length').should('eq', 2);
         cy.get('input[name="reserve"]').type('10{enter}');
         cy.get('button[title="Save"]').click();
         cy.get('.q-notification__message').should('have.text', 'Data saved');
@@ -18,7 +17,6 @@ describe('EntryStockBought', () => {
         cy.get('input[aria-label="Date"]').eq(1).type('01-01');
         cy.get('input[aria-label="Buyer"]').type('buyerboss{downarrow}{enter}');
         cy.get('.q-notification__message').should('have.text', 'Data created');
-        cy.get('tBody > tr').its('length').should('eq', 3);
     });
     it('Should check detail for the buyer', () => {
         cy.get(':nth-child(1) > .sticky > .q-btn > .q-btn__content > .q-icon').click();

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

@@ -11,7 +11,9 @@ describe('WagonCreate', () => {
         cy.get('input').eq(1).type('1234ABCD');
         cy.get('input').eq(2).type('100');
         cy.get('input').eq(3).click();
-        cy.get('div[role="listbox"]').find('div.q-item').click();
+        cy.get('.q-select > .q-field__inner > .q-field__control').type(
+            '{downarrow}{enter}'
+        );
 
         // Save
         cy.get('button[type="submit"]').click();
@@ -19,12 +21,22 @@ describe('WagonCreate', () => {
         // Check data has been saved successfully
         cy.waitForElement('.q-card');
 
-        cy.get('.title').should('have.text', '1234');
-        cy.get('[title-label="Plate"] > .value > span').should('have.text', '1234ABCD');
-        cy.get(':nth-child(2) > .value > span').should('have.text', '100');
-        cy.get(':nth-child(3) > .value > span').should('have.text', 'Wagon Type #1');
+        cy.get(
+            '[to="/null/1"] > .q-card > .no-padding > .q-py-none > .cursor-text'
+        ).should('have.text', '1234');
+        cy.get(
+            '[to="/null/1"] > .q-card > .no-padding > .q-pr-lg > :nth-child(1) > .vn-label-value > .value > :nth-child(1) > .row > span'
+        ).should('have.text', '1234ABCD');
+        cy.get(
+            '[to="/null/1"] > .q-card > .no-padding > .q-pr-lg > :nth-child(2) > .vn-label-value > .value > :nth-child(1) > .row > span'
+        ).should('have.text', '100');
+        cy.get(
+            '[to="/null/1"] > .q-card > .no-padding > .q-pr-lg > :nth-child(3) > .vn-label-value > .value > :nth-child(1) > .row > span'
+        ).should('have.text', 'Wagon Type #1');
 
         // Delete wagon type created
-        cy.get('.actions > .q-btn--standard').click();
+        cy.get(
+            '[to="/null/2"] > .q-card > .column > [title="Remove"] > .q-btn__content > .q-icon'
+        ).click();
     });
 });

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

@@ -13,7 +13,7 @@ describe('WagonTypeCreate', () => {
     });
     it('delete a wagon type', () => {
         cy.get(
-            ':nth-child(2) > :nth-child(1) > .card-list-body > .actions > .q-btn--standard'
+            '[to="/null/2"] > .q-card > .column > [title="Remove"] > .q-btn__content > .q-icon'
         ).click();
     });
 });

test/cypress/integration/wagonType/wagonTypeEdit.spec.js

@@ -4,7 +4,7 @@ describe('WagonTypeEdit', () => {
     beforeEach(() => {
         cy.viewport(1920, 1080);
         cy.login('developer');
-        cy.visit('/#/wagon/type/2/edit');
+        cy.visit('/#/wagon/type/1/edit');
     });
 
     it('should edit the name and the divisible field of the wagon type', () => {
@@ -14,14 +14,14 @@ describe('WagonTypeEdit', () => {
         cy.get('.q-btn--standard').click();
     });
 
-    it('should create a tray', () => {
-        cy.get('.action-button > .q-btn > .q-btn__content > .q-icon').click();
-        cy.get('input').last().type('150');
-        cy.get(trayColorRow).type('{downArrow}{downArrow}{enter}');
-    });
-
     it('should delete a tray', () => {
         cy.get('.action-button > .q-btn > .q-btn__content > .q-icon').first().click();
         cy.reload();
     });
+
+    it('should create a tray', () => {
+        cy.get('.action-button > .q-btn > .q-btn__content > .q-icon').last().click();
+        cy.get('input').last().type('150');
+        cy.get(trayColorRow).type('{downArrow}{downArrow}{downArrow}{enter}');
+    });
 });