Merge branch 'dev' into 8593-parkingTestsE2e

cypress.config.js

@@ -39,10 +39,17 @@ export default defineConfig({
         downloadsFolder: 'test/cypress/downloads',
         video: false,
         specPattern: 'test/cypress/integration/**/*.spec.js',
-        experimentalRunAllSpecs: true,
+        experimentalRunAllSpecs: false,
-        watchForFileChanges: true,
+        watchForFileChanges: false,
-        reporter,
+        reporter: 'cypress-mochawesome-reporter',
-        reporterOptions,
+        reporterOptions: {
+            charts: true,
+            reportPageTitle: 'Cypress Inline Reporter',
+            reportFilename: '[status]_[datetime]-report',
+            embeddedScreenshots: true,
+            reportDir: 'test/cypress/reports',
+            inlineAssets: true,
+        },
         component: {
             componentFolder: 'src',
             testFiles: '**/*.spec.js',

src/components/VnTable/VnTable.vue

@@ -165,6 +165,7 @@ const app = inject('app');
 const editingRow = ref(null);
 const editingField = ref(null);
 const isTableMode = computed(() => mode.value == TABLE_MODE);
+const showRightIcon = computed(() => $props.rightSearch || $props.rightSearchIcon);
 const selectRegex = /select/;
 const emit = defineEmits(['onFetch', 'update:selected', 'saveChanges']);
 const tableModes = [

src/components/ui/CardDescriptor.vue

@@ -196,7 +196,6 @@ const toModule = computed(() =>
                         <QItemLabel class="subtitle">
                             #{{ getValueFromPath(subtitle) ?? entity.id }}
                         </QItemLabel>
-
                         <QBtn
                             round
                             flat
@@ -210,7 +209,6 @@ const toModule = computed(() =>
                                 {{ t('globals.copyId') }}
                             </QTooltip>
                         </QBtn>
-                        <!-- </QItemLabel> -->
                     </QItem>
                 </QList>
                 <div class="list-box q-mt-xs">

src/pages/Claim/Card/ClaimBasicData.vue

@@ -40,7 +40,7 @@ const workersOptions = ref([]);
             </VnRow>
             <VnRow>
                 <VnSelect
-                    :label="t('claim.assignedTo')"
+                    :label="t('claim.attendedBy')"
                     v-model="data.workerFk"
                     :options="workersOptions"
                     option-value="id"

src/pages/Claim/Card/ClaimSummary.vue

@@ -233,20 +233,27 @@ function claimUrl(section) {
             <ClaimDescriptorMenu :claim="entity.claim" />
         </template>
         <template #body="{ entity: { claim, salesClaimed, developments } }">
-            <QCard class="vn-one" v-if="$route.name != 'ClaimSummary'">
+            <QCard class="vn-one">
                 <VnTitle
                     :url="claimUrl('basic-data')"
                     :text="t('globals.pageTitles.basicData')"
                 />
-                <VnLv :label="t('claim.created')" :value="toDate(claim.created)" />
+                <VnLv
-                <VnLv :label="t('claim.state')">
+                    v-if="$route.name != 'ClaimSummary'"
+                    :label="t('claim.created')"
+                    :value="toDate(claim.created)"
+                />
+                <VnLv v-if="$route.name != 'ClaimSummary'" :label="t('claim.state')">
                     <template #value>
                         <QChip :color="stateColor(claim.claimState.code)" dense>
                             {{ claim.claimState.description }}
                         </QChip>
                     </template>
                 </VnLv>
-                <VnLv :label="t('globals.salesPerson')">
+                <VnLv
+                    v-if="$route.name != 'ClaimSummary'"
+                    :label="t('globals.salesPerson')"
+                >
                     <template #value>
                         <VnUserLink
                             :name="claim.client?.salesPersonUser?.name"
@@ -254,7 +261,7 @@ function claimUrl(section) {
                         />
                     </template>
                 </VnLv>
-                <VnLv :label="t('claim.attendedBy')">
+                <VnLv v-if="$route.name != 'ClaimSummary'" :label="t('claim.attendedBy')">
                     <template #value>
                         <VnUserLink
                             :name="claim.worker?.user?.nickname"
@@ -262,7 +269,7 @@ function claimUrl(section) {
                         />
                     </template>
                 </VnLv>
-                <VnLv :label="t('claim.customer')">
+                <VnLv v-if="$route.name != 'ClaimSummary'" :label="t('claim.customer')">
                     <template #value>
                         <span class="link cursor-pointer">
                             {{ claim.client?.name }}
@@ -274,6 +281,11 @@ function claimUrl(section) {
                     :label="t('claim.pickup')"
                     :value="`${dashIfEmpty(claim.pickup)}`"
                 />
+                <VnLv
+                    :label="t('globals.packages')"
+                    :value="`${dashIfEmpty(claim.packages)}`"
+                    :translation="(value) => t(`claim.packages`)"
+                />
             </QCard>
             <QCard class="vn-two">
                 <VnTitle :url="claimUrl('notes')" :text="t('claim.notes')" />

src/pages/Claim/ClaimFilter.vue

@@ -106,7 +106,6 @@ const props = defineProps({
                     :label="t('claim.zone')"
                     v-model="params.zoneFk"
                     url="Zones"
-                    :use-like="false"
                     outlined
                     rounded
                     dense

src/pages/Claim/locale/en.yml

@@ -13,7 +13,6 @@ claim:
     province: Province
     zone: Zone
     customerId: client ID
-    assignedTo: Assigned
     created: Created
     details: Details
     item: Item

src/pages/Claim/locale/es.yml

@@ -13,7 +13,6 @@ claim:
     province: Provincia
     zone: Zona
     customerId: ID de cliente
-    assignedTo: Asignado a
     created: Creado
     details: Detalles
     item: Artículo

src/pages/Customer/components/CustomerNewPayment.vue

@@ -77,7 +77,6 @@ onBeforeMount(() => {
 function setPaymentType(accounting) {
     if (!accounting) return;
     accountingType.value = accounting.accountingType;
-
     initialData.description = [];
     initialData.payed = Date.vnNew();
     isCash.value = accountingType.value.code == 'cash';
@@ -87,14 +86,14 @@ function setPaymentType(accounting) {
             initialData.payed.getDate() + accountingType.value.daysInFuture,
         );
     maxAmount.value = accountingType.value && accountingType.value.maxAmount;
-
     if (accountingType.value.code == 'compensation')
         return (initialData.description = '');
-    if (accountingType.value.receiptDescription)
-        initialData.description.push(accountingType.value.receiptDescription);
-    if (initialData.description) initialData.description.push(initialData.description);
 
-    initialData.description = initialData.description.join(', ');
+    let descriptions = [];
+    if (accountingType.value.receiptDescription)
+        descriptions.push(accountingType.value.receiptDescription);
+    if (initialData.description) descriptions.push(initialData.description);
+    initialData.description = descriptions.join(', ');
 }
 
 const calculateFromAmount = (event) => {

src/pages/Route/RouteExtendedList.vue

@@ -335,7 +335,6 @@ const openTicketsDialog = (id) => {
                 <QBtn
                     icon="vn:clone"
                     color="primary"
-                    flat
                     class="q-mr-sm"
                     :disable="!selectedRows?.length"
                     @click="confirmationDialog = true"
@@ -345,7 +344,6 @@ const openTicketsDialog = (id) => {
                 <QBtn
                     icon="cloud_download"
                     color="primary"
-                    flat
                     class="q-mr-sm"
                     :disable="!selectedRows?.length"
                     @click="showRouteReport"
@@ -355,7 +353,6 @@ const openTicketsDialog = (id) => {
                 <QBtn
                     icon="check"
                     color="primary"
-                    flat
                     class="q-mr-sm"
                     :disable="!selectedRows?.length"
                     @click="markAsServed()"

src/pages/Ticket/Card/TicketEditMana.vue

@@ -1,32 +1,26 @@
 <script setup>
-import { ref } from 'vue';
+import axios from 'axios';
 import { useI18n } from 'vue-i18n';
+import { computed, ref } from 'vue';
+import { useRoute } from 'vue-router';
 import { toCurrency } from 'src/filters';
 import VnUsesMana from 'components/ui/VnUsesMana.vue';
 
 const $props = defineProps({
-    mana: {
-        type: Number,
-        default: null,
-    },
     newPrice: {
         type: Number,
         default: 0,
     },
-    usesMana: {
-        type: Boolean,
-        default: false,
-    },
-    manaCode: {
-        type: String,
-        default: 'mana',
-    },
     sale: {
         type: Object,
         default: null,
     },
 });
 
+const route = useRoute();
+const mana = ref(null);
+const usesMana = ref(false);
+
 const emit = defineEmits(['save', 'cancel']);
 
 const { t } = useI18n();
@@ -38,20 +32,35 @@ const save = (sale = $props.sale) => {
     QPopupProxyRef.value.hide();
 };
 
+const getMana = async () => {
+    const { data } = await axios.get(`Tickets/${route.params.id}/getSalesPersonMana`);
+    mana.value = data;
+    await getUsesMana();
+};
+
+const getUsesMana = async () => {
+    const { data } = await axios.get('Sales/usesMana');
+    usesMana.value = data;
+};
+
 const cancel = () => {
     emit('cancel');
     QPopupProxyRef.value.hide();
 };
+const hasMana = computed(() => typeof mana.value === 'number');
 defineExpose({ save });
 </script>
 
 <template>
-    <QPopupProxy ref="QPopupProxyRef" data-cy="ticketEditManaProxy">
+    <QPopupProxy
+        ref="QPopupProxyRef"
+        @before-show="getMana"
+        data-cy="ticketEditManaProxy"
+    >
         <div class="container">
-            <QSpinner v-if="!mana" color="primary" size="md" />
-            <div v-else>
             <div class="header">Mana: {{ toCurrency(mana) }}</div>
-                <div class="q-pa-md">
+            <QSpinner v-if="!hasMana" color="primary" size="md" />
+            <div class="q-pa-md" v-else>
                 <slot :popup="QPopupProxyRef" />
                 <div v-if="usesMana" class="column q-gutter-y-sm q-mt-sm">
                     <VnUsesMana :mana-code="manaCode" />
@@ -63,7 +72,7 @@ defineExpose({ save });
                     </span>
                 </div>
             </div>
-            </div>
+
             <div class="row">
                 <QBtn
                     color="primary"

src/pages/Ticket/Card/TicketSale.vue

@@ -45,7 +45,6 @@ const isTicketEditable = ref(false);
 const sales = ref([]);
 const editableStatesOptions = ref([]);
 const selectedSales = ref([]);
-const mana = ref(null);
 const manaCode = ref('mana');
 const ticketState = computed(() => store.data?.ticketState?.state?.code);
 const transfer = ref({
@@ -259,18 +258,6 @@ 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}/getSalesPersonMana`);
-    mana.value = data;
-    await getUsesMana();
-};
 
 const selectedValidSales = computed(() => {
     if (!sales.value) return;
@@ -278,7 +265,6 @@ const selectedValidSales = computed(() => {
 });
 
 const onOpenEditPricePopover = async (sale) => {
-    await getMana();
     edit.value = {
         sale: JSON.parse(JSON.stringify(sale)),
         price: sale.price,
@@ -286,7 +272,6 @@ const onOpenEditPricePopover = async (sale) => {
 };
 
 const onOpenEditDiscountPopover = async (sale) => {
-    await getMana();
     if (isLocked.value) return;
     if (sale) {
         edit.value = {
@@ -307,7 +292,6 @@ const changePrice = async (sale) => {
             await confirmUpdate(() => updatePrice(sale, newPrice));
         } else updatePrice(sale, newPrice);
     }
-    await getMana();
 };
 const updatePrice = async (sale, newPrice) => {
     await axios.post(`Sales/${sale.id}/updatePrice`, { newPrice });
@@ -600,9 +584,7 @@ watch(
                     :is-ticket-editable="isTicketEditable"
                     :sales="selectedValidSales"
                     :disable="!hasSelectedRows"
-                    :mana="mana"
                     :ticket-config="ticketConfig"
-                    @get-mana="getMana()"
                     @update-discounts="updateDiscounts"
                     @refresh-table="resetChanges"
                 />
@@ -785,7 +767,6 @@ watch(
                 </QBtn>
                 <TicketEditManaProxy
                     ref="editPriceProxyRef"
-                    :mana="mana"
                     :sale="row"
                     :new-price="getNewPrice"
                     @save="changePrice"
@@ -808,10 +789,8 @@ watch(
 
                 <TicketEditManaProxy
                     ref="editManaProxyRef"
-                    :mana="mana"
                     :sale="row"
                     :new-price="getNewPrice"
-                    :uses-mana="usesMana"
                     :mana-code="manaCode"
                     @save="changeDiscount"
                 >

src/pages/Ticket/Card/TicketSaleMoreActions.vue

@@ -34,10 +34,6 @@ const props = defineProps({
         type: Array,
         default: () => [],
     },
-    mana: {
-        type: Number,
-        default: null,
-    },
     ticketConfig: {
         type: Array,
         default: () => [],
@@ -220,7 +216,6 @@ const createRefund = async (withWarehouse) => {
                 <TicketEditManaProxy
                     ref="editManaProxyRef"
                     :sale="row"
-                    :mana="props.mana"
                     @save="changeMultipleDiscount"
                 >
                     <VnInput

src/pages/Ticket/Card/TicketSaleTracking.vue

@@ -31,7 +31,7 @@ const oldQuantity = ref(null);
 
 watch(
     () => route.params.id,
-    async () => nextTick(async () => await saleTrackingFetchDataRef.value.fetch())
+    async () => nextTick(async () => await saleTrackingFetchDataRef.value.fetch()),
 );
 
 const columns = computed(() => [
@@ -212,7 +212,7 @@ const updateShelving = async (sale) => {
 
     const { data: patchResponseData } = await axios.patch(
         `ItemShelvings/${sale.itemShelvingFk}`,
-        params
+        params,
     );
     const filter = {
         fields: ['parkingFk'],
@@ -385,7 +385,7 @@ const qCheckBoxController = (sale, action) => {
         </template>
         <template #body-cell-parking="{ row }">
             <QTd style="width: 10%">
-                {{ dashIfEmpty(row.parkingFk) }}
+                {{ dashIfEmpty(row.parkingCode) }}
             </QTd>
         </template>
         <template #body-cell-actions="{ row }">

src/pages/Worker/Card/WorkerBusiness.vue

@@ -3,7 +3,7 @@ import { ref, computed } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
 import VnTable from 'components/VnTable/VnTable.vue';
-import { toDate } from 'src/filters';
+import { dashIfEmpty, toDate } from 'src/filters';
 import { useQuasar } from 'quasar';
 import axios from 'axios';
 
@@ -15,7 +15,7 @@ const quasar = useQuasar();
 
 async function reactivateWorker() {
     const hasToReactive = tableRef.value.CrudModelRef.formData.find(
-        (data) => !data.ended
+        (data) => !data.ended,
     );
     if (hasToReactive) {
         quasar
@@ -38,25 +38,25 @@ const columns = computed(() => [
     {
         name: 'started',
         label: t('worker.business.tableVisibleColumns.started'),
-        align: 'left',
         format: ({ started }) => toDate(started),
         component: 'date',
         cardVisible: true,
         create: true,
+        width: '90px',
     },
 
     {
         name: 'ended',
         label: t('worker.business.tableVisibleColumns.ended'),
-        align: 'left',
         format: ({ ended }) => toDate(ended),
         component: 'date',
         cardVisible: true,
         create: true,
+        width: '90px',
     },
     {
         label: t('worker.business.tableVisibleColumns.company'),
-        align: 'left',
+        toolTip: t('worker.business.tableVisibleColumns.company'),
         name: 'companyCodeFk',
         component: 'select',
         attrs: {
@@ -65,23 +65,23 @@ const columns = computed(() => [
             optionLabel: 'code',
             optionValue: 'code',
         },
-        cardVisible: true,
         create: true,
+        width: '60px',
     },
     {
-        align: 'left',
         name: 'reasonEndFk',
         component: 'select',
         label: t('worker.business.tableVisibleColumns.reasonEnd'),
+        toolTip: t('worker.business.tableVisibleColumns.reasonEnd'),
         attrs: {
             url: 'BusinessReasonEnds',
             fields: ['id', 'reason'],
             optionLabel: 'reason',
         },
         cardVisible: true,
+        format: ({ reason }, dashIfEmpty) => dashIfEmpty(reason),
     },
     {
-        align: 'left',
         name: 'departmentFk',
         component: 'select',
         label: t('worker.business.tableVisibleColumns.department'),
@@ -89,15 +89,19 @@ const columns = computed(() => [
             url: 'Departments',
             fields: ['id', 'name'],
             optionLabel: 'name',
+            optionValue: 'id',
         },
         cardVisible: true,
         create: true,
+        width: '80px',
+        format: ({ departmentName }, dashIfEmpty) => dashIfEmpty(departmentName),
     },
     {
         align: 'left',
         name: 'workerBusinessProfessionalCategoryFk',
         component: 'select',
         label: t('worker.business.tableVisibleColumns.professionalCategory'),
+        toolTip: t('worker.business.tableVisibleColumns.professionalCategory'),
         attrs: {
             url: 'WorkerBusinessProfessionalCategories',
             fields: ['id', 'description', 'code'],
@@ -105,6 +109,9 @@ const columns = computed(() => [
         },
         cardVisible: true,
         create: true,
+        width: '100px',
+        format: ({ professionalDescription }, dashIfEmpty) =>
+            dashIfEmpty(professionalDescription),
     },
     {
         align: 'left',
@@ -118,6 +125,8 @@ const columns = computed(() => [
         },
         cardVisible: true,
         create: true,
+        format: ({ calendarTypeDescription }, dashIfEmpty) =>
+            dashIfEmpty(calendarTypeDescription),
     },
     {
         align: 'left',
@@ -131,6 +140,8 @@ const columns = computed(() => [
         },
         cardVisible: true,
         create: true,
+        width: '100px',
+        format: ({ workCenterName }, dashIfEmpty) => dashIfEmpty(workCenterName),
     },
     {
         align: 'left',
@@ -144,6 +155,7 @@ const columns = computed(() => [
         },
         cardVisible: true,
         create: true,
+        format: ({ payrollDescription }, dashIfEmpty) => dashIfEmpty(payrollDescription),
     },
     {
         align: 'left',
@@ -157,6 +169,7 @@ const columns = computed(() => [
         },
         cardVisible: true,
         create: true,
+        format: ({ occupationName }, dashIfEmpty) => dashIfEmpty(occupationName),
     },
     {
         align: 'left',
@@ -165,6 +178,7 @@ const columns = computed(() => [
         component: 'input',
         cardVisible: true,
         create: true,
+        width: '50px',
     },
     {
         align: 'left',
@@ -177,6 +191,8 @@ const columns = computed(() => [
         },
         cardVisible: true,
         create: true,
+        format: ({ workerBusinessTypeName }, dashIfEmpty) =>
+            dashIfEmpty(workerBusinessTypeName),
     },
     {
         align: 'left',
@@ -185,6 +201,7 @@ const columns = computed(() => [
         component: 'input',
         cardVisible: true,
         create: true,
+        width: '70px',
     },
     {
         align: 'left',
@@ -193,6 +210,7 @@ const columns = computed(() => [
         component: 'input',
         cardVisible: true,
         create: true,
+        width: '70px',
     },
     {
         name: 'notes',
@@ -208,7 +226,7 @@ const columns = computed(() => [
     <VnTable
         ref="tableRef"
         data-key="WorkerBusiness"
-        :url="`Workers/${entityId}/Business`"
+        :url="`Workers/${entityId}/getWorkerBusiness`"
         save-url="/Businesses/crud"
         :create="{
             urlCreate: `Workers/${entityId}/Business`,
@@ -218,13 +236,12 @@ const columns = computed(() => [
         }"
         order="id DESC"
         :columns="columns"
-        default-mode="card"
         auto-load
-        :disable-option="{ table: true }"
+        :disable-option="{ card: true }"
         :right-search="false"
-        card-class="grid-two q-gutter-x-xl q-gutter-y-md q-pr-lg q-py-lg"
         :is-editable="true"
         :use-model="true"
+        :right-search-icon="false"
         @save-changes="(data) => reactivateWorker(data)"
     />
 </template>

src/pages/Worker/Card/WorkerDescriptor.vue

@@ -111,6 +111,7 @@ const handlePhotoUpdated = (evt = false) => {
         <template #body="{ entity }">
             <VnLv :label="t('globals.user')" :value="entity.user?.name" />
             <VnLv
+                class="ellipsis-text"
                 :label="t('globals.params.email')"
                 :value="entity.user?.emailUser?.email"
                 copy
@@ -177,6 +178,12 @@ const handlePhotoUpdated = (evt = false) => {
 .photo {
     height: 256px;
 }
+.ellipsis-text {
+    width: 100%;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+}
 </style>
 
 <i18n>

src/pages/Zone/ZoneList.vue

@@ -65,6 +65,7 @@ const tableFilter = {
 
 const columns = computed(() => [
     {
+        align: 'left',
         name: 'id',
         label: t('list.id'),
         chip: {
@@ -74,8 +75,6 @@ const columns = computed(() => [
         columnFilter: {
             inWhere: true,
         },
-        columnClass: 'shrink-column',
-        component: 'number',
     },
     {
         align: 'left',
@@ -107,6 +106,7 @@ const columns = computed(() => [
         format: (row, dashIfEmpty) => dashIfEmpty(row?.agencyMode?.name),
     },
     {
+        align: 'left',
         name: 'price',
         label: t('list.price'),
         cardVisible: true,
@@ -114,11 +114,9 @@ const columns = computed(() => [
         columnFilter: {
             inWhere: true,
         },
-        columnClass: 'shrink-column',
-        component: 'number',
     },
     {
-        align: 'center',
+        align: 'left',
         name: 'hour',
         label: t('list.close'),
         cardVisible: true,
@@ -180,8 +178,6 @@ function formatRow(row) {
             <ZoneFilterPanel data-key="ZonesList" />
         </template>
     </RightMenu>
-    <div class="table-container">
-        <div class="column items-center">
     <VnTable
         ref="tableRef"
         data-key="ZonesList"
@@ -196,8 +192,6 @@ function formatRow(row) {
         :columns="columns"
         redirect="zone"
         :right-search="false"
-                table-height="85vh"
-                order="id ASC"
     >
         <template #column-addressFk="{ row }">
             {{ dashIfEmpty(formatRow(row)) }}
@@ -245,8 +239,6 @@ function formatRow(row) {
             />
         </template>
     </VnTable>
-        </div>
-    </div>
 </template>
 
 <i18n>
@@ -254,20 +246,3 @@ es:
     Search zone: Buscar zona
     You can search zones by id or name: Puedes buscar zonas por id o nombre
 </i18n>
-
-<style lang="scss" scoped>
-.table-container {
-    display: flex;
-    justify-content: center;
-}
-.column {
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    min-width: 70%;
-}
-
-:deep(.shrink-column) {
-    width: 8%;
-}
-</style>