Jenkinsfile

@@ -126,7 +126,7 @@ pipeline {
                             sh "docker-compose ${env.COMPOSE_PARAMS} up -d"
 
                             image.inside("--network ${env.COMPOSE_PROJECT}_default -e CI -e TZ --init") {
-                                sh 'sh test/cypress/cypressParallel.sh 2'
+                                sh 'sh test/cypress/cypressParallel.sh 1'
                             }
                         }
                     }

package.json

@@ -1,6 +1,6 @@
 {
     "name": "salix-front",
-    "version": "25.16.0",
+    "version": "25.14.0",
     "description": "Salix frontend",
     "productName": "Salix",
     "author": "Verdnatura",
@@ -76,4 +76,4 @@
         "vite": "^6.0.11",
         "vitest": "^0.31.1"
     }
-}
+}

src/components/common/SendEmailDialog.vue

@@ -60,7 +60,7 @@ async function confirm() {
                     v-model="address"
                     is-outlined
                     autofocus
-                    data-cy="SendEmailNotificationDialogInput"
+                    data-cy="SendEmailNotifiactionDialogInput"
                 />
             </QCardSection>
             <QCardActions align="right">

src/components/common/VnLog.vue

@@ -219,7 +219,6 @@ function filterByRecord(modelLog) {
 }
 
 async function applyFilter(params = {}) {
-    paginate.value.arrayData.resetPagination();
     paginate.value.arrayData.applyFilter({
         filter: {},
         params: { originFk: route.params.id, ...params },

src/components/common/VnLogFilter.vue

@@ -10,7 +10,6 @@ import { useFilterParams } from 'src/composables/useFilterParams';
 import FetchData from '../FetchData.vue';
 import { useValidator } from 'src/composables/useValidator';
 import { useCapitalize } from 'src/composables/useCapitalize';
-import VnAvatar from '../ui/VnAvatar.vue';
 
 const $props = defineProps({
     dataKey: {
@@ -100,6 +99,7 @@ function getActions() {
         :columns="columns"
         :redirect="false"
         :hiddenTags="['originFk', 'creationDate']"
+        :exprBuilder
         search-url="logs"
         :showTagChips="false"
     >

src/components/ui/CardSummary.vue

@@ -159,7 +159,6 @@ async function fetch() {
                 display: flex;
                 flex-direction: row;
                 margin-top: 2px;
-                align-items: start;
                 .label {
                     color: var(--vn-label-color);
                     width: 9em;
@@ -170,15 +169,9 @@ async function fetch() {
                     flex-grow: 0;
                     flex-shrink: 0;
                 }
-                &.ellipsis > .value {
-                    text-overflow: ellipsis;
-                    white-space: pre;
-                }
                 .value {
                     color: var(--vn-text-color);
                     overflow: hidden;
-                    white-space: nowrap;
-                    text-overflow: ellipsis;
                 }
             }
             .header {
@@ -210,21 +203,27 @@ async function fetch() {
 }
 
 .vn-card-group {
-    display: grid;
+    display: flex;
-    grid-template-columns: repeat(auto-fit, minmax(250px, 1fr));
+    flex-direction: column;
-    gap: 16px;
 }
 
 .vn-card-content {
     display: flex;
     flex-direction: column;
-    overflow: hidden;
-    white-space: nowrap;
     text-overflow: ellipsis;
     > div {
         max-height: 70px;
     }
 }
+
+@media (min-width: 1010px) {
+    .vn-card-group {
+        flex-direction: row;
+    }
+    .vn-card-content {
+        flex: 1;
+    }
+}
 </style>
 <style lang="scss" scoped>
 .summaryHeader .vn-label-value {

src/components/ui/VnDescriptor.vue

@@ -252,10 +252,6 @@ const toModule = computed(() => {
                 content: ':';
             }
         }
-        &.ellipsis > .value {
-            text-overflow: ellipsis;
-            white-space: pre;
-        }
         .value {
             color: var(--vn-text-color);
             font-size: 14px;

src/components/ui/VnLinkMail.vue

@@ -1,11 +1,8 @@
 <script setup>
-import { dashIfEmpty } from 'src/filters';
-
 defineProps({ email: { type: [String], default: null } });
 </script>
 <template>
     <QBtn
-        class="q-pr-xs"
         v-if="email"
         flat
         round
@@ -16,5 +13,4 @@ defineProps({ email: { type: [String], default: null } });
         :href="`mailto:${email}`"
         @click.stop
     />
-    <span>{{ dashIfEmpty(email) }}</span>
 </template>

src/components/ui/VnLinkPhone.vue

@@ -1,7 +1,7 @@
 <script setup>
 import { ref, reactive, useAttrs, onBeforeMount, capitalize } from 'vue';
 import axios from 'axios';
-import { dashIfEmpty, parsePhone } from 'src/filters';
+import { parsePhone } from 'src/filters';
 import useOpenURL from 'src/composables/useOpenURL';
 
 const props = defineProps({
@@ -12,65 +12,50 @@ const props = defineProps({
 
 const phone = ref(props.phoneNumber);
 const config = reactive({
+    sip: { icon: 'phone', href: `sip:${props.phoneNumber}` },
     'say-simple': {
         icon: 'vn:saysimple',
         url: null,
         channel: props.channel,
     },
-    sip: { icon: 'phone', href: `sip:${props.phoneNumber}` },
 });
-
+const type = Object.keys(config).find((key) => key in useAttrs()) || 'sip';
-const attrs = useAttrs();
-const types = Object.keys(config)
-    .filter((key) => key in attrs)
-    .sort();
-const activeTypes = types.length ? types : ['sip'];
 
 onBeforeMount(async () => {
     if (!phone.value) return;
+    let { channel } = config[type];
 
-    for (const type of activeTypes) {
+    if (type === 'say-simple') {
-        if (type === 'say-simple') {
+        const { url, defaultChannel } = (await axios.get('SaySimpleConfigs/findOne'))
-            let { channel } = config[type];
+            .data;
-            const { url, defaultChannel } = (await axios.get('SaySimpleConfigs/findOne'))
+        if (!channel) channel = defaultChannel;
-                .data;
-            if (!channel) channel = defaultChannel;
 
-            phone.value = await parsePhone(
+        phone.value = await parsePhone(props.phoneNumber, props.country?.toLowerCase());
-                props.phoneNumber,
+        config[
-                props.country?.toLowerCase(),
+            type
-            );
+        ].url = `${url}?customerIdentity=%2B${phone.value}&channelId=${channel}`;
-            config[type].url =
-                `${url}?customerIdentity=%2B${phone.value}&channelId=${channel}`;
-        }
     }
 });
 
-function handleClick(type) {
+function handleClick() {
     if (config[type].url) useOpenURL(config[type].url);
     else if (config[type].href) window.location.href = config[type].href;
 }
 </script>
-
 <template>
-    <div class="flex items-center gap-2">
+    <QBtn
-        <template v-for="type in activeTypes">
+        v-if="phone"
-            <QBtn
+        flat
-                :key="type"
+        round
-                v-if="phone"
+        :icon="config[type].icon"
-                flat
+        size="sm"
-                round
+        color="primary"
-                :icon="config[type].icon"
+        padding="none"
-                size="sm"
+        @click.stop="handleClick"
-                color="primary"
+    >
-                padding="none"
+        <QTooltip>
-                @click.stop="() => handleClick(type)"
+            {{ capitalize(type).replace('-', '') }}
-            >
+        </QTooltip>
-                <QTooltip>
+    </QBtn>
-                    {{ capitalize(type).replace('-', '') }}
+    {{ phoneNumber }}
-                </QTooltip>
-            </QBtn></template
-        >
-        <span>{{ dashIfEmpty(phone) }}</span>
-    </div>
 </template>

src/composables/useAcl.js

@@ -30,16 +30,9 @@ export function useAcl() {
         return false;
     }
 
-    function hasAcl(model, prop, accessType) {
-        const modelAcl = state.getAcls().value[model];
-        const propAcl = modelAcl?.[prop] || modelAcl?.['*'];
-        return !!(propAcl?.[accessType] || propAcl?.['*']);
-    }
-
     return {
         fetch,
         hasAny,
         state,
-        hasAcl,
     };
 }

src/composables/useRole.js

@@ -13,7 +13,7 @@ export function useRole() {
             name: data.user.name,
             nickname: data.user.nickname,
             lang: data.user.lang || 'es',
-            departmentFk: data.user?.worker?.department?.departmentFk,
+            departmentFk: data.user.worker.department.departmentFk,
         };
         state.setUser(userData);
         state.setRoles(roles);

src/pages/Account/Card/AccountDescriptorMenu.vue

@@ -100,8 +100,12 @@ const onChangePass = (oldPass) => {
 };
 
 onMounted(() => {
-    hasitManagementAccess.value = useAcl().hasAcl('VnUser', 'higherPrivileges', 'WRITE');
+    hasitManagementAccess.value = useAcl().hasAny([
-    hasSysadminAccess.value = useAcl().hasAcl('VnUser', 'adminUser', 'WRITE');
+        { model: 'VnUser', props: 'higherPrivileges', accessType: 'WRITE' },
+    ]);
+    hasSysadminAccess.value = useAcl().hasAny([
+        { model: 'VnUser', props: 'adminUser', accessType: 'WRITE' },
+    ]);
 });
 </script>
 <template>
@@ -223,7 +227,7 @@ onMounted(() => {
         <QItemSection>{{ t('account.card.actions.deactivateUser.name') }}</QItemSection>
     </QItem>
     <QItem
-        v-if="useAcl().hasAcl('VnRole', '*', 'WRITE')"
+        v-if="useAcl().hasAny([{ model: 'VnRole', props: '*', accessType: 'WRITE' }])"
         v-ripple
         clickable
         @click="showSyncDialog = true"

src/pages/Account/Card/AccountDescriptorProxy.vue

@@ -6,7 +6,7 @@ import AccountSummary from './AccountSummary.vue';
     <QPopupProxy style="max-width: 10px">
         <AccountDescriptor
             v-if="$attrs.id"
-            v-bind="$attrs"
+            v-bind="$attrs.id"
             :summary="AccountSummary"
             :proxy-render="true"
         />

src/pages/Customer/Card/CustomerBalance.vue

@@ -25,7 +25,7 @@ import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.v
 const { openConfirmationModal } = useVnConfirm();
 const { sendEmail, openReport } = usePrintService();
 const { t } = useI18n();
-const { hasAcl } = useAcl();
+const { hasAny } = useAcl();
 
 const quasar = useQuasar();
 const route = useRoute();
@@ -276,7 +276,9 @@ const showBalancePdf = ({ id }) => {
             >
                 <VnInput
                     v-model="scope.value"
-                    :disable="!hasAcl('Receipt', '*', 'WRITE')"
+                    :disable="
+                        !hasAny([{ model: 'Receipt', props: '*', accessType: 'WRITE' }])
+                    "
                     @keypress.enter="scope.set"
                     autofocus
                 />

src/pages/Customer/Card/CustomerSummary.vue

@@ -84,31 +84,29 @@ const sumRisk = ({ clientRisks }) => {
                 <VnLv :label="t('customer.summary.customerId')" :value="entity.id" />
                 <VnLv :label="t('globals.name')" :value="entity.name" />
                 <VnLv :label="t('customer.summary.contact')" :value="entity.contact" />
-                <VnLv :label="t('customer.extendedList.tableVisibleColumns.phone')">
+                <VnLv :value="entity.phone">
-                    <template #value>
+                    <template #label>
+                        {{ t('customer.extendedList.tableVisibleColumns.phone') }}
                         <VnLinkPhone :phone-number="entity.phone" />
                     </template>
                 </VnLv>
-                <VnLv :label="t('customer.summary.mobile')">
+                <VnLv :value="entity.mobile">
-                    <template #value>
+                    <template #label>
+                        {{ t('customer.summary.mobile') }}
+                        <VnLinkPhone :phone-number="entity.mobile" />
                         <VnLinkPhone
-                            sip
                             say-simple
                             :phone-number="entity.mobile"
                             :channel="entity.country?.saySimpleCountry?.channel"
+                            class="q-ml-xs"
                         />
                     </template>
                 </VnLv>
-                <VnLv
+                <VnLv :value="entity.email" copy
-                    :label="t('globals.params.email')"
+                    ><template #label>
-                    :value="entity.email"
+                        {{ t('globals.params.email') }}
-                    class="ellipsis"
+                        <VnLinkMail email="entity.email"></VnLinkMail> </template
-                    copy
+                ></VnLv>
-                >
-                    <template #value>
-                        <VnLinkMail :email="entity.email" />
-                    </template>
-                </VnLv>
                 <VnLv :label="t('globals.department')">
                     <template #value>
                         <span class="link" v-text="entity.department?.name" />

src/pages/Customer/CustomerFilter.vue

@@ -72,7 +72,6 @@ const exprBuilder = (param, value) => {
                         option-value="id"
                         option-label="name"
                         url="Departments"
-                        no-one="true"
                     />
                 </QItemSection>
             </QItem>
@@ -155,9 +154,9 @@ en:
         city: City
         phone: Phone
         email: Email
-        departmentFk: Department
         isToBeMailed: Mailed
         isEqualizated: Equailized
+        departmentFk: Department
         businessTypeFk: Business type
         sageTaxTypeFk: Sage Tax Type
         sageTransactionTypeFk: Sage Tax Type

src/pages/Customer/Notifications/CustomerNotifications.vue

@@ -127,7 +127,6 @@ es:
     Identifier: Identificador
     Social name: Razón social
     Phone: Teléfono
-    Postcode: Código postal
     City: Población
     Email: Email
     Campaign consumption: Consumo campaña

src/pages/Customer/components/CustomerAddressEdit.vue

@@ -93,26 +93,10 @@ const updateAddressTicket = async () => {
 };
 
 const updateObservations = async (payload) => {
-    await axios.post('AddressObservations/crud', cleanPayload(payload));
+    await axios.post('AddressObservations/crud', payload);
     notes.value = [];
     deletes.value = [];
 };
-
-function cleanPayload(payload) {
-    ['creates', 'deletes', 'updates'].forEach((prop) => {
-        if (prop === 'creates' || prop === 'updates') {
-            payload[prop] = payload[prop].filter(
-                (item) => item.description !== '' && item.observationTypeFk !== '',
-            );
-        } else {
-            payload[prop] = payload[prop].filter(
-                (item) => item !== null && item !== undefined,
-            );
-        }
-    });
-    return payload;
-}
-
 async function updateAll({ data, payload }) {
     await updateObservations(payload);
     await updateAddress(data);

src/pages/Customer/components/CustomerSummaryTable.vue

@@ -191,7 +191,7 @@ const getItemPackagingType = (ticketSales) => {
         :without-header="true"
         auto-load
         :row-click="rowClick"
-        order="shipped DESC, id DESC"
+        order="shipped DESC, id"
         :disable-option="{ card: true, table: true }"
         class="full-width"
         :disable-infinite-scroll="true"

src/pages/Entry/Card/EntrySummary.vue

@@ -70,8 +70,8 @@ onMounted(async () => {
                     :url="`#/entry/${entityId}/basic-data`"
                     :text="t('globals.summary.basicData')"
                 />
-                <div class="vn-card-group">
+                <div class="card-group">
-                    <div class="vn-card-content">
+                    <div class="card-content">
                         <VnLv
                             :label="t('entry.summary.commission')"
                             :value="entry?.commission"
@@ -93,7 +93,7 @@ onMounted(async () => {
                             :value="entry?.invoiceNumber"
                         />
                     </div>
-                    <div class="vn-card-content">
+                    <div class="card-content">
                         <VnCheckbox
                             :label="t('entry.list.tableVisibleColumns.isOrdered')"
                             v-model="entry.isOrdered"
@@ -130,8 +130,8 @@ onMounted(async () => {
                     :url="`#/travel/${entry.travel.id}/summary`"
                     :text="t('Travel')"
                 />
-                <div class="vn-card-group">
+                <div class="card-group">
-                    <div class="vn-card-content">
+                    <div class="card-content">
                         <VnLv :label="t('entry.summary.travelReference')">
                             <template #value>
                                 <span class="link">
@@ -161,7 +161,7 @@ onMounted(async () => {
                             :value="entry.travel.warehouseIn?.name"
                         />
                     </div>
-                    <div class="vn-card-content">
+                    <div class="card-content">
                         <VnLv :label="t('travel.awbFk')" :value="entry.travel.awbFk" />
                         <VnCheckbox
                             :label="t('entry.summary.travelDelivered')"
@@ -193,6 +193,31 @@ onMounted(async () => {
         </template>
     </CardSummary>
 </template>
+<style lang="scss" scoped>
+.card-group {
+    display: flex;
+    flex-direction: column;
+}
+
+.card-content {
+    display: flex;
+    flex-direction: column;
+    text-overflow: ellipsis;
+    > div {
+        max-height: 24px;
+    }
+}
+
+@media (min-width: 1010px) {
+    .card-group {
+        flex-direction: row;
+    }
+    .card-content {
+        flex: 1;
+        margin-right: 16px;
+    }
+}
+</style>
 <i18n>
 es:
     Travel: Envío

src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue

@@ -22,7 +22,7 @@ const routes = reactive({
     getSupplier: (id) => {
         return { name: 'SupplierCard', params: { id } };
     },
-    getInvoices: (id) => {
+    getTickets: (id) => {
         return {
             name: 'InvoiceInList',
             query: {
@@ -131,11 +131,11 @@ async function setInvoiceCorrection(id) {
                 </QBtn>
                 <QBtn
                     size="md"
-                    icon="vn:invoice-in"
+                    icon="vn:ticket"
                     color="primary"
-                    :to="routes.getInvoices(entity.supplierFk)"
+                    :to="routes.getTickets(entity.supplierFk)"
                 >
-                    <QTooltip>{{ t('invoiceIn.descriptor.invoices') }}</QTooltip>
+                    <QTooltip>{{ t('globals.ticketList') }}</QTooltip>
                 </QBtn>
                 <QBtn
                     v-if="

src/pages/InvoiceIn/locale/en.yml

@@ -15,7 +15,6 @@ invoiceIn:
         amount: Amount
     descriptor:
         ticketList: Ticket list
-        invoices: Supplier invoices
     descriptorMenu:
         book: Book
         unbook: Unbook

src/pages/InvoiceIn/locale/es.yml

@@ -14,7 +14,7 @@ invoiceIn:
         awb: AWB
         amount: Importe
     descriptor:
-        invoices: Facturas de proveedor
+        ticketList: Listado de tickets
     descriptorMenu:
         book: Contabilizar
         unbook: Descontabilizar

src/pages/Monitor/Ticket/MonitorTicketFilter.vue

@@ -198,7 +198,7 @@ const getLocale = (label) => {
                 <QItemSection>
                     <VnSelect
                         dense
-                        filled
+                        rounded
                         :label="t('globals.params.packing')"
                         v-model="params.packing"
                         url="ItemPackingTypes"

src/pages/Route/Roadmap/RoadmapSummary.vue

@@ -112,9 +112,12 @@ const filter = {
                         :label="t('Trailer Plate')"
                         :value="dashIfEmpty(entity?.trailerPlate)"
                     />
-                    <VnLv :label="t('Phone')">
+                    <VnLv :label="t('Phone')" :value="dashIfEmpty(entity?.phone)">
                         <template #value>
-                            <VnLinkPhone :phone-number="entity?.phone" />
+                            <span>
+                                {{ dashIfEmpty(entity?.phone) }}
+                                <VnLinkPhone :phone-number="entity?.phone" />
+                            </span>
                         </template>
                     </VnLv>
                     <VnLv

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

@@ -25,7 +25,9 @@ const { validate } = useValidator();
 const { notify } = useNotify();
 const router = useRouter();
 const { t } = useI18n();
-const canEditZone = useAcl().hasAcl('Ticket', 'editZone', 'WRITE');
+const canEditZone = useAcl().hasAny([
+    { model: 'Ticket', props: 'editZone', accessType: 'WRITE' },
+]);
 
 const agencyFetchRef = ref();
 const warehousesOptions = ref([]);

src/pages/Ticket/Card/TicketSale.vue

@@ -1,5 +1,5 @@
 <script setup>
-import { onMounted, ref, computed, watch, inject } from 'vue';
+import { onMounted, ref, computed, watch } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRouter, useRoute } from 'vue-router';
 import { useQuasar } from 'quasar';
@@ -25,7 +25,7 @@ import VnTable from 'src/components/VnTable/VnTable.vue';
 import VnConfirm from 'src/components/ui/VnConfirm.vue';
 import TicketProblems from 'src/components/TicketProblems.vue';
 import RightMenu from 'src/components/common/RightMenu.vue';
-const app = inject('app');
+
 const route = useRoute();
 const router = useRouter();
 const { t } = useI18n();
@@ -196,17 +196,13 @@ const changeQuantity = async (sale) => {
     if (!sale.itemFk || sale.quantity == null || sale?.originalQuantity === sale.quantity)
         return;
     else sale.originalQuantity = sale.quantity;
-    try {
+    if (!sale.id) return addSale(sale);
-        if (!sale.id) await addSale(sale);
-    } catch (e) {
-        app.config.errorHandler(e);
-        return;
-    }
 
     if (await isSalePrepared(sale)) {
         await confirmUpdate(() => updateQuantity(sale));
     } else await updateQuantity(sale);
 };
+
 const updateQuantity = async (sale) => {
     try {
         let { quantity, id } = sale;
@@ -219,7 +215,7 @@ const updateQuantity = async (sale) => {
             (s) => s.id === sale.id,
         );
         sale.quantity = quantity;
-        app.config.errorHandler(e);
+        throw e;
     }
 };
 
@@ -228,27 +224,24 @@ const addSale = async (sale) => {
         barcode: sale.itemFk,
         quantity: sale.quantity,
     };
-    try {
-        const { data } = await axios.post(`tickets/${route.params.id}/addSale`, params);
 
-        if (!data) return;
+    const { data } = await axios.post(`tickets/${route.params.id}/addSale`, params);
 
-        const newSale = data;
+    if (!data) return;
-        sale.id = newSale.id;
-        sale.image = newSale.item.image;
-        sale.subName = newSale.item.subName;
-        sale.concept = newSale.concept;
-        sale.quantity = newSale.quantity;
-        sale.discount = newSale.discount;
-        sale.price = newSale.price;
-        sale.item = newSale.item;
 
-        notify('globals.dataSaved', 'positive');
+    const newSale = data;
-        sale.isNew = false;
+    sale.id = newSale.id;
-        resetChanges();
+    sale.image = newSale.item.image;
-    } catch (e) {
+    sale.subName = newSale.item.subName;
-        app.config.errorHandler(e);
+    sale.concept = newSale.concept;
-    }
+    sale.quantity = newSale.quantity;
+    sale.discount = newSale.discount;
+    sale.price = newSale.price;
+    sale.item = newSale.item;
+
+    notify('globals.dataSaved', 'positive');
+    sale.isNew = false;
+    resetChanges();
 };
 const changeConcept = async (sale) => {
     if (await isSalePrepared(sale)) {
@@ -257,14 +250,10 @@ const changeConcept = async (sale) => {
 };
 
 const updateConcept = async (sale) => {
-    try {
+    const data = { newConcept: sale.concept };
-        const data = { newConcept: sale.concept };
+    await axios.post(`Sales/${sale.id}/updateConcept`, data);
-        await axios.post(`Sales/${sale.id}/updateConcept`, data);
+    notify('globals.dataSaved', 'positive');
-        notify('globals.dataSaved', 'positive');
+    resetChanges();
-        resetChanges();
-    } catch (e) {
-        app.config.errorHandler(e);
-    }
 };
 
 const DEFAULT_EDIT = {
@@ -275,6 +264,18 @@ const DEFAULT_EDIT = {
     oldQuantity: null,
 };
 const edit = ref({ ...DEFAULT_EDIT });
+const usesMana = ref(null);
+
+const getUsesMana = async () => {
+    const { data } = await axios.get('Sales/usesMana');
+    usesMana.value = data;
+};
+
+const getMana = async () => {
+    const { data } = await axios.get(`Tickets/${route.params.id}/getDepartmentMana`);
+    mana.value = data;
+    await getUsesMana();
+};
 
 const selectedValidSales = computed(() => {
     if (!sales.value) return;
@@ -311,15 +312,11 @@ const changePrice = async (sale) => {
     }
 };
 const updatePrice = async (sale, newPrice) => {
-    try {
+    await axios.post(`Sales/${sale.id}/updatePrice`, { newPrice });
-        await axios.post(`Sales/${sale.id}/updatePrice`, { newPrice });
+    sale.price = newPrice;
-        sale.price = newPrice;
+    edit.value = { ...DEFAULT_EDIT };
-        edit.value = { ...DEFAULT_EDIT };
+    notify('globals.dataSaved', 'positive');
-        notify('globals.dataSaved', 'positive');
+    resetChanges();
-        resetChanges();
-    } catch (e) {
-        app.config.errorHandler(e);
-    }
 };
 
 const changeDiscount = async (sale) => {
@@ -342,20 +339,15 @@ const updateDiscounts = async (sales, newDiscount) => {
 };
 
 const updateDiscount = async (sales, newDiscount = 0) => {
-    try {
+    const salesIds = sales.map(({ id }) => id);
-        const salesIds = sales.map(({ id }) => id);
+    const params = {
-        const params = {
+        salesIds,
-            salesIds,
+        newDiscount,
-            newDiscount,
+        manaCode: manaCode.value,
-            manaCode: manaCode.value,
+    };
-        };
+    await axios.post(`Tickets/${route.params.id}/updateDiscount`, params);
-        await axios.post(`Tickets/${route.params.id}/updateDiscount`, params);
+    notify('globals.dataSaved', 'positive');
-        notify('globals.dataSaved', 'positive');
+    resetChanges();
-        resetChanges();
-    } catch (e) {
-        app.config.errorHandler(e);
-        return;
-    }
 };
 
 const getNewPrice = computed(() => {
@@ -377,15 +369,11 @@ const getNewPrice = computed(() => {
 });
 
 const newOrderFromTicket = async () => {
-    try {
+    const { data } = await axios.post(`Orders/newFromTicket`, {
-        const { data } = await axios.post(`Orders/newFromTicket`, {
+        ticketFk: Number(route.params.id),
-            ticketFk: Number(route.params.id),
+    });
-        });
+    const routeData = router.resolve({ name: 'OrderCatalog', params: { id: data } });
-        const routeData = router.resolve({ name: 'OrderCatalog', params: { id: data } });
+    window.open(routeData.href, '_blank');
-        window.open(routeData.href, '_blank');
-    } catch (e) {
-        app.config.errorHandler(e);
-    }
 };
 
 const goToLog = (saleId) => {
@@ -402,15 +390,11 @@ const goToLog = (saleId) => {
 };
 
 const changeTicketState = async (val) => {
-    try {
+    stateBtnDropdownRef.value.hide();
-        stateBtnDropdownRef.value.hide();
+    const params = { ticketFk: route.params.id, code: val };
-        const params = { ticketFk: route.params.id, code: val };
+    await axios.post('Tickets/state', params);
-        await axios.post('Tickets/state', params);
+    notify('globals.dataSaved', 'positive');
-        notify('globals.dataSaved', 'positive');
+    resetChanges();
-        resetChanges();
-    } catch (e) {
-        app.config.errorHandler(e);
-    }
 };
 
 const removeSelectedSales = () => {
@@ -430,14 +414,10 @@ const removeSales = async () => {
         .forEach((sale) => tableRef.value.CrudModelRef.formData.splice(sale.$index, 1));
 
     if (params.sales.length == 0) return;
-    try {
+    await axios.post('Sales/deleteSales', params);
-        await axios.post('Sales/deleteSales', params);
+    removeSelectedSales();
-        removeSelectedSales();
+    notify('globals.dataSaved', 'positive');
-        notify('globals.dataSaved', 'positive');
+    resetChanges();
-        resetChanges();
-    } catch (e) {
-        app.config.errorHandler(e);
-    }
 };
 
 const setTransferParams = async () => {

src/pages/Ticket/Card/TicketSaleMoreActions.vue

@@ -55,7 +55,9 @@ const isClaimable = computed(() => {
     if (ticket.value) {
         const landedPlusWeek = new Date(ticket.value.landed);
         landedPlusWeek.setDate(landedPlusWeek.getDate() + 7);
-        const createAfterDeadline = acl.hasAcl('Claim', 'createAfterDeadline', 'WRITE');
+        const createAfterDeadline = acl.hasAny([
+            { model: 'Claim', props: 'createAfterDeadline', accessType: 'WRITE' },
+        ]);
         return landedPlusWeek >= Date.vnNew() || createAfterDeadline;
     }
     return false;

src/pages/Ticket/TicketList.vue

@@ -113,7 +113,7 @@ const columns = computed(() => [
     },
     {
         align: 'left',
-        name: 'shippedDate',
+        name: 'shipped',
         cardVisible: true,
         label: t('ticketList.shipped'),
         columnFilter: {
@@ -123,7 +123,7 @@ const columns = computed(() => [
     },
     {
         align: 'left',
-        name: 'shippedHour',
+        name: 'shipped',
         component: 'time',
         columnFilter: false,
         label: t('ticketList.hour'),

src/pages/Ticket/locale/en.yml

@@ -205,7 +205,6 @@ ticketList:
     toLines: Go to lines
     addressNickname: Address nickname
     ref: Reference
-    hour: Hour
     rounding: Rounding
     noVerifiedData: No verified data
     purchaseRequest: Purchase request

src/pages/Travel/Card/TravelDescriptorMenuItems.vue

@@ -37,7 +37,7 @@ const cloneTravelWithEntries = async () => {
     router.push({ name: 'TravelBasicData', params: { id: data.id } });
 };
 
-const canDelete = computed(() => useAcl().hasAcl('Travel', '*', 'WRITE'));
+const canDelete = computed(() => useAcl().hasAny('Travel', '*', 'WRITE'));
 
 const openDeleteEntryDialog = (id) => {
     quasar

src/pages/Travel/ExtraCommunity.vue

@@ -505,6 +505,7 @@ watch(route, () => {
                         :props="props"
                         @click="stopEventPropagation($event, col)"
                         :style="col.style"
+                        style="padding-left: 5px"
                     >
                         <component
                             :is="tableColumnComponents[col.name].component"
@@ -580,20 +581,19 @@ watch(route, () => {
                         <QBtn dense flat class="link">{{ entry.id }} </QBtn>
                         <EntryDescriptorProxy :id="entry.id" />
                     </QTd>
-                    <QTd :colspan="2">
+                    <QTd>
-                        <div style="display: flex">
+                        <QBtn flat class="link" dense>{{ entry.supplierName }}</QBtn>
-                            <span class="link">
+                        <SupplierDescriptorProxy :id="entry.supplierFk" />
-                                {{ entry.supplierName }}
+                    </QTd>
-                                <SupplierDescriptorProxy :id="entry.supplierFk" />
+                    <QTd class="text-center">
-                            </span>
+                        <QIcon
-                            <QIcon
+                            v-if="entry.isCustomInspectionRequired"
-                                v-if="entry.isCustomInspectionRequired"
+                            name="warning"
-                                name="warning"
+                            color="negative"
-                                color="negative"
+                            size="md"
-                                size="md"
+                            :title="t('extraCommunity.requiresInspection')"
-                                :title="t('extraCommunity.requiresInspection')"
+                        >
-                            />
+                        </QIcon>
-                        </div>
                     </QTd>
                     <QTd class="text-right">
                         <span>{{ toCurrency(entry.invoiceAmount) }}</span>
@@ -639,7 +639,9 @@ watch(route, () => {
         &:nth-child(1) {
             max-width: 65px;
         }
-        padding: 0 5px 0;
+        &:nth-child(4) {
+            padding: 0;
+        }
     }
     thead > tr > th {
         padding: 3px;

src/pages/Worker/Card/WorkerCalendar.vue

@@ -18,7 +18,9 @@ const router = useRouter();
 const route = useRoute();
 const { t } = useI18n();
 const acl = useAcl();
-const canSeeNotes = computed(() => acl.hasAcl('Worker', '__get__business', 'READ'));
+const canSeeNotes = computed(() =>
+    acl.hasAny([{ model: 'Worker', props: '__get__business', accessType: 'READ' }]),
+);
 const workerIsFreelance = ref();
 const WorkerFreelanceRef = ref();
 const workerCalendarFilterRef = ref(null);

src/pages/Worker/Card/WorkerDescriptor.vue

@@ -116,7 +116,7 @@ const handlePhotoUpdated = (evt = false) => {
         <template #body="{ entity }">
             <VnLv :label="t('globals.user')" :value="entity.user?.name" />
             <VnLv
-                class="ellipsis"
+                class="ellipsis-text"
                 :label="t('globals.params.email')"
                 :value="entity.user?.emailUser?.email"
                 copy
@@ -128,13 +128,15 @@ const handlePhotoUpdated = (evt = false) => {
                 </template>
             </VnLv>
 
-            <VnLv :label="t('globals.phone')">
+            <VnLv :value="entity.phone">
-                <template #value>
+                <template #label>
+                    {{ t('globals.phone') }}
                     <VnLinkPhone :phone-number="entity.phone" />
                 </template>
             </VnLv>
-            <VnLv :label="t('worker.summary.sipExtension')">
+            <VnLv :value="entity?.sip?.extension">
-                <template #value>
+                <template #label>
+                    {{ t('worker.summary.sipExtension') }}
                     <VnLinkPhone :phone-number="entity?.sip?.extension" />
                 </template>
             </VnLv>

src/pages/Worker/Card/WorkerLocker.vue

@@ -9,7 +9,7 @@ import VnSelect from 'src/components/common/VnSelect.vue';
 import { useArrayData } from 'src/composables/useArrayData';
 import FetchData from 'components/FetchData.vue';
 
-const { hasAcl } = useAcl();
+const { hasAny } = useAcl();
 const { t } = useI18n();
 const fetchData = ref();
 const originaLockerId = ref();
@@ -58,7 +58,11 @@ const init = async (data) => {
                 option-label="code"
                 option-value="id"
                 hide-selected
-                :readonly="!hasAcl('Worker', '__get__locker', 'READ')"
+                :readonly="
+                    !hasAny([
+                        { model: 'Worker', props: '__get__locker', accessType: 'READ' },
+                    ])
+                "
             />
         </template>
     </FormModel>

src/pages/Worker/Card/WorkerSummary.vue

@@ -73,25 +73,28 @@ onBeforeMount(async () => {
                                 />
                             </template>
                         </VnLv>
-                        <VnLv :label="t('worker.summary.phoneExtension')">
+                        <VnLv :value="worker.mobileExtension">
-                            <template #value>
+                            <template #label>
+                                {{ t('worker.summary.phoneExtension') }}
                                 <VnLinkPhone :phone-number="worker.mobileExtension" />
                             </template>
                         </VnLv>
-                        <VnLv :label="t('worker.summary.entPhone')">
+                        <VnLv :value="worker.phone">
-                            <template #value>
+                            <template #label>
+                                {{ t('worker.summary.entPhone') }}
                                 <VnLinkPhone :phone-number="worker.phone" />
                             </template>
                         </VnLv>
-                        <VnLv :label="t('worker.summary.personalPhone')">
+                        <VnLv :value="advancedSummary?.client?.phone">
-                            <template #value>
+                            <template #label>
+                                {{ t('worker.summary.personalPhone') }}
                                 <VnLinkPhone
                                     :phone-number="advancedSummary?.client?.phone"
                                 />
                             </template>
                         </VnLv>
                     </div>
-                    <div class="vn-card-content" v-if="advancedSummary">
+                    <div class="vn-card-content">
                         <VnLv
                             :label="t('worker.summary.fiDueDate')"
                             :value="toDate(advancedSummary.fiDueDate)"
@@ -132,7 +135,6 @@ onBeforeMount(async () => {
                 <VnTitle :text="t('worker.summary.userData')" />
                 <VnLv :label="t('globals.name')" :value="worker?.user?.nickname" />
                 <VnLv
-                    class="ellipsis"
                     :label="t('globals.params.email')"
                     :value="worker.user?.emailUser?.email"
                     copy
@@ -145,8 +147,9 @@ onBeforeMount(async () => {
                         </span>
                     </template>
                 </VnLv>
-                <VnLv :label="t('worker.summary.sipExtension')">
+                <VnLv :value="worker?.sip?.extension">
-                    <template #value>
+                    <template #label>
+                        {{ t('worker.summary.sipExtension') }}
                         <VnLinkPhone :phone-number="worker?.sip?.extension" />
                     </template>
                 </VnLv>

src/pages/Worker/Card/WorkerTimeControl.vue

@@ -68,9 +68,13 @@ const arrayData = useArrayData('Worker');
 const acl = useAcl();
 const selectedDateYear = computed(() => moment(selectedDate.value).isoWeekYear());
 const worker = computed(() => arrayData.store?.data);
-const canSend = computed(() => acl.hasAcl('WorkerTimeControl', 'sendMail', 'WRITE'));
+const canSend = computed(() =>
+    acl.hasAny([{ model: 'WorkerTimeControl', props: 'sendMail', accessType: 'WRITE' }]),
+);
 const canUpdate = computed(() =>
-    acl.hasAcl('WorkerTimeControl', 'updateMailState', 'WRITE'),
+    acl.hasAny([
+        { model: 'WorkerTimeControl', props: 'updateMailState', accessType: 'WRITE' },
+    ]),
 );
 const isHimself = computed(() => user.value.id === Number(route.params.id));
 

src/pages/Zone/Card/ZoneSummary.vue

@@ -75,13 +75,13 @@ onMounted(async () => {
         <template #body="{ entity: zone }">
             <QCard class="vn-one">
                 <VnTitle :url="zoneUrl + `basic-data`" :text="t('summary.basicData')" />
-                <div class="vn-card-group">
+                <div class="card-group">
-                    <div class="vn-card-content">
+                    <div class="card-content">
                         <VnLv :label="t('list.agency')" :value="zone.agencyMode?.name" />
                         <VnLv :label="t('list.price')" :value="toCurrency(zone.price)" />
                         <VnLv :label="t('zone.bonus')" :value="toCurrency(zone.bonus)" />
                     </div>
-                    <div class="vn-card-content">
+                    <div class="card-content">
                         <VnLv
                             :label="t('summary.closeHour')"
                             :value="toTimeFormat(zone.hour)"
@@ -98,7 +98,7 @@ onMounted(async () => {
                     </div>
                 </div>
             </QCard>
-            <QCard class="vn-max">
+            <QCard class="vn-one">
                 <VnTitle :url="zoneUrl + `warehouses`" :text="t('list.warehouse')" />
                 <QTable
                     :columns="columns"
@@ -109,3 +109,15 @@ onMounted(async () => {
         </template>
     </CardSummary>
 </template>
+
+<style lang="scss" scoped>
+.card-group {
+    display: flex;
+    flex-direction: column;
+}
+
+.card-content {
+    display: flex;
+    flex-direction: column;
+}
+</style>

test/cypress/integration/invoiceIn/invoiceInDescriptor.spec.js

@@ -13,7 +13,7 @@ describe('InvoiceInDescriptor', () => {
             cy.validateCheckbox(checkbox, false);
         });
 
-        it('should delete the invoice properly', () => {
+        it.skip('should delete the invoice properly', () => {
             cy.visit('/#/invoice-in/2/summary');
             cy.selectDescriptorOption(2);
             cy.clickConfirm();
@@ -40,7 +40,7 @@ describe('InvoiceInDescriptor', () => {
             cy.visit('/#/invoice-in/6/summary');
             cy.selectDescriptorOption(5);
 
-            cy.dataCy('SendEmailNotificationDialogInput_input').type(
+            cy.dataCy('SendEmailNotifiactionDialogInput_input').type(
                 '{selectall}jorgito@gmail.mx',
             );
             cy.clickConfirm();

test/cypress/integration/invoiceOut/invoiceOutSummary.spec.js

@@ -37,7 +37,7 @@ describe('InvoiceOut summary', () => {
         });
     });
 
-    it.skip('should transfer the invoice ', () => {
+    it('should transfer the invoice ', () => {
         cy.typeSearchbar('T1111111{enter}');
         cy.dataCy('descriptor-more-opts').click();
         cy.get(selectMenuOption(1)).click();
@@ -50,7 +50,7 @@ describe('InvoiceOut summary', () => {
         cy.dataCy('descriptor-more-opts').click();
         cy.get(selectMenuOption(3)).click();
         cy.dataCy('InvoiceOutDescriptorMenuSendPdfOption').click();
-        cy.dataCy('SendEmailNotificationDialogInput').should('be.visible');
+        cy.dataCy('SendEmailNotifiactionDialogInput').should('be.visible');
         cy.get(confirmSend).click();
         cy.checkNotification('Notification sent');
     });
@@ -59,7 +59,7 @@ describe('InvoiceOut summary', () => {
         cy.dataCy('descriptor-more-opts').click();
         cy.get(selectMenuOption(3)).click();
         cy.dataCy('InvoiceOutDescriptorMenuSendCsvOption').click();
-        cy.dataCy('SendEmailNotificationDialogInput').should('be.visible');
+        cy.dataCy('SendEmailNotifiactionDialogInput').should('be.visible');
         cy.get(confirmSend).click();
         cy.checkNotification('Notification sent');
     });

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

@@ -1,6 +1,6 @@
 /// <reference types="cypress" />
-// https://redmine.verdnatura.es/issues/8848
+
-describe.skip('VnShortcuts', () => {
+describe('VnShortcuts', () => {
     const modules = {
         item: 'a',
         customer: 'c',

test/cypress/integration/worker/workerList.spec.js

@@ -1,5 +1,4 @@
-// https://redmine.verdnatura.es/issues/8848
+describe('WorkerList', () => {
-describe.skip('WorkerList', () => {
     const inputName = '.q-drawer .q-form input[aria-label="First Name"]';
     const searchBtn = '.q-drawer button:nth-child(3)';
     const descriptorTitle = '.descriptor .title span';
@@ -14,7 +13,7 @@ describe.skip('WorkerList', () => {
         cy.intercept('GET', /\/api\/Workers\/summary+/).as('worker');
         cy.get(searchBtn).click();
         cy.wait('@worker').then(() =>
-            cy.get(descriptorTitle).should('include.text', 'Jessica'),
+            cy.get(descriptorTitle).should('include.text', 'Jessica')
         );
     });
 });