Merge branch 'dev' into 6802-Clientes-gestionados-por-equipos

Jenkinsfile

@@ -26,6 +26,7 @@ node {
        // https://www.jenkins.io/doc/book/pipeline/jenkinsfile/#using-environment-variables
         echo "NODE_NAME: ${env.NODE_NAME}"
         echo "WORKSPACE: ${env.WORKSPACE}"
+        echo "CHANGE_TARGET: ${env.CHANGE_TARGET}"
 
         configFileProvider([
             configFile(fileId: 'salix-front.properties',
@@ -107,7 +108,6 @@ pipeline {
                 }
                 stage('E2E') {
                     environment {
-                        CREDENTIALS = credentials('docker-registry')
                         COMPOSE_PROJECT = "${PROJECT_NAME}-${env.BUILD_ID}"
                         COMPOSE_PARAMS = "-p ${env.COMPOSE_PROJECT} -f test/cypress/docker-compose.yml --project-directory ."
                     }
@@ -115,8 +115,10 @@ pipeline {
                         script {
                             sh 'rm junit/e2e-*.xml || true'
                             env.COMPOSE_TAG = PROTECTED_BRANCH.contains(env.CHANGE_TARGET) ? env.CHANGE_TARGET : 'dev'
+                            withDockerRegistry([credentialsId: 'docker-registry', url: "https://${env.REGISTRY}" ]) {
+                                sh "docker-compose ${env.COMPOSE_PARAMS} up -d"
+                            }
                             def image = docker.build('lilium-dev', '-f docs/Dockerfile.dev docs')
-                            sh "docker-compose ${env.COMPOSE_PARAMS} up -d"
                             image.inside("--network ${env.COMPOSE_PROJECT}_default -e CI -e TZ") {
                                 sh 'cypress run --browser chromium || true'
                             }

package.json

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

src/components/FilterTravelForm.vue

@@ -124,7 +124,7 @@ const selectTravel = ({ id }) => {
     <FetchData
         url="AgencyModes"
         @on-fetch="(data) => (agenciesOptions = data)"
-        :filter="{ fields: ['id', 'name'], order: 'name ASC' }"
+        :filter="{ fields: ['id', 'name'], order: ['name ASC'] }"
         auto-load
     />
     <FetchData

src/components/TicketProblems.vue

@@ -12,7 +12,7 @@ defineProps({ row: { type: Object, required: true } });
         >
             <QIcon name="vn:claims" size="xs">
                 <QTooltip>
-                    {{ t('ticketSale.claim') }}:
+                    {{ $t('ticketSale.claim') }}:
                     {{ row.claim?.claimFk }}
                 </QTooltip>
             </QIcon>

src/components/VnTable/VnTable.vue

@@ -55,6 +55,10 @@ const $props = defineProps({
         type: [Function, Boolean],
         default: null,
     },
+    rowCtrlClick: {
+        type: [Function, Boolean],
+        default: null,
+    },
     redirect: {
         type: String,
         default: null,

src/components/common/VnAccountNumber.vue

@@ -1,12 +1,9 @@
 <script setup>
-import { nextTick, ref, watch } from 'vue';
+import { nextTick, ref } from 'vue';
-import { QInput } from 'quasar';
+import VnInput from './VnInput.vue';
+import { useAccountShortToStandard } from 'src/composables/useAccountShortToStandard';
 
 const $props = defineProps({
-    modelValue: {
-        type: String,
-        default: '',
-    },
     insertable: {
         type: Boolean,
         default: false,
@@ -14,70 +11,25 @@ const $props = defineProps({
 });
 
 const emit = defineEmits(['update:modelValue', 'accountShortToStandard']);
+const model = defineModel({ prop: 'modelValue' });
+const inputRef = ref(false);
 
-let internalValue = ref($props.modelValue);
+function setCursorPosition(pos) {
-
+    const input = inputRef.value.vnInputRef.$el.querySelector('input');
-watch(
+    input.focus();
-    () => $props.modelValue,
+    input.setSelectionRange(pos, pos);
-    (newVal) => {
-        internalValue.value = newVal;
-    }
-);
-
-watch(
-    () => internalValue.value,
-    (newVal) => {
-        emit('update:modelValue', newVal);
-        accountShortToStandard();
-    }
-);
-
-const handleKeydown = (e) => {
-    if (e.key === 'Backspace') return;
-    if (e.key === '.') {
-        accountShortToStandard();
-        // TODO: Fix this setTimeout, with nextTick doesn't work
-        setTimeout(() => {
-            setCursorPosition(0, e.target);
-        }, 1);
-        return;
-    }
-
-    if ($props.insertable && e.key.match(/[0-9]/)) {
-        handleInsertMode(e);
-    }
-};
-function setCursorPosition(pos, el = vnInputRef.value) {
-    el.focus();
-    el.setSelectionRange(pos, pos);
 }
-const vnInputRef = ref(false);
+
-const handleInsertMode = (e) => {
+async function handleUpdateModel(val) {
-    e.preventDefault();
+    model.value = val?.at(-1) === '.' ? useAccountShortToStandard(val) : val;
-    const input = e.target;
+    await nextTick(() => setCursorPosition(0));
-    const cursorPos = input.selectionStart;
-    const { maxlength } = vnInputRef.value;
-    let currentValue = internalValue.value;
-    if (!currentValue) currentValue = e.key;
-    const newValue = e.key;
-    if (newValue && !isNaN(newValue) && cursorPos < maxlength) {
-        internalValue.value =
-            currentValue.substring(0, cursorPos) +
-            newValue +
-            currentValue.substring(cursorPos + 1);
-    }
-    nextTick(() => {
-        input.setSelectionRange(cursorPos + 1, cursorPos + 1);
-    });
-};
-function accountShortToStandard() {
-    internalValue.value = internalValue.value?.replace(
-        '.',
-        '0'.repeat(11 - internalValue.value.length)
-    );
 }
 </script>
-
 <template>
-    <QInput @keydown="handleKeydown" ref="vnInputRef" v-model="internalValue" />
+    <VnInput
+        v-model="model"
+        ref="inputRef"
+        :insertable
+        @update:model-value="handleUpdateModel"
+    />
 </template>

src/components/common/VnInput.vue

@@ -83,7 +83,7 @@ const mixinRules = [
     requiredFieldRule,
     ...($attrs.rules ?? []),
     (val) => {
-        const { maxlength } = vnInputRef.value;
+        const maxlength = $props.maxlength;
         if (maxlength && +val.length > maxlength)
             return t(`maxLength`, { value: maxlength });
         const { min, max } = vnInputRef.value.$attrs;
@@ -108,7 +108,7 @@ const handleInsertMode = (e) => {
     e.preventDefault();
     const input = e.target;
     const cursorPos = input.selectionStart;
-    const { maxlength } = vnInputRef.value;
+    const maxlength = $props.maxlength;
     let currentValue = value.value;
     if (!currentValue) currentValue = e.key;
     const newValue = e.key;
@@ -143,7 +143,7 @@ const handleUppercase = () => {
             :rules="mixinRules"
             :lazy-rules="true"
             hide-bottom-space
-            :data-cy="$attrs.dataCy ?? $attrs.label + '_input'"
+            :data-cy="($attrs['data-cy'] ?? $attrs.label) + '_input'"
         >
             <template #prepend v-if="$slots.prepend">
                 <slot name="prepend" />

src/components/ui/CatalogItem.vue

@@ -132,7 +132,8 @@ const card = toRef(props, 'item');
     display: flex;
     flex-direction: column;
     gap: 4px;
-
+    white-space: nowrap;
+    width: 192px;
     p {
         margin-bottom: 0;
     }

src/i18n/locale/en.yml

@@ -368,6 +368,7 @@ globals:
         countryFk: Country
         countryCodeFk: Country
         companyFk: Company
+        nickname: Alias
     model: Model
     fuel: Fuel
     active: Active

src/i18n/locale/es.yml

@@ -369,6 +369,7 @@ globals:
         countryFk: País
         countryCodeFk: País
         companyFk: Empresa
+        nickname: Alias
 errors:
     statusUnauthorized: Acceso denegado
     statusInternalServerError: Ha ocurrido un error interno del servidor

src/pages/Claim/Card/ClaimPhoto.vue

@@ -210,6 +210,7 @@ function onDrag() {
                     class="all-pointer-events absolute delete-button zindex"
                     @click.stop="viewDeleteDms(index)"
                     round
+                    :data-cy="`delete-button-${index+1}`"
                 />
                 <QIcon
                     name="play_circle"
@@ -227,6 +228,7 @@ function onDrag() {
                         class="rounded-borders cursor-pointer fit"
                         @click="openDialog(media.dmsFk)"
                         v-if="!media.isVideo"
+                        :data-cy="`file-${index+1}`"
                     >
                     </QImg>
                     <video
@@ -235,6 +237,7 @@ function onDrag() {
                         muted="muted"
                         v-if="media.isVideo"
                         @click="openDialog(media.dmsFk)"
+                        :data-cy="`file-${index+1}`"
                     />
                 </QCard>
             </div>

src/pages/Customer/Card/CustomerDescriptor.vue

@@ -114,14 +114,6 @@ const debtWarning = computed(() => {
                 >
                     <QTooltip>{{ t('Allowed substitution') }}</QTooltip>
                 </QIcon>
-                <QIcon
-                    v-if="customer?.isFreezed"
-                    name="vn:frozen"
-                    size="xs"
-                    color="primary"
-                >
-                    <QTooltip>{{ t('customer.card.isFrozen') }}</QTooltip>
-                </QIcon>
                 <QIcon
                     v-if="!entity.account?.active"
                     color="primary"
@@ -146,6 +138,14 @@ const debtWarning = computed(() => {
                 >
                     <QTooltip>{{ t('customer.card.notChecked') }}</QTooltip>
                 </QIcon>
+                <QIcon
+                    v-if="entity?.isFreezed"
+                    name="vn:frozen"
+                    size="xs"
+                    color="primary"
+                >
+                    <QTooltip>{{ t('customer.card.isFrozen') }}</QTooltip>
+                </QIcon>
                 <QBtn
                     v-if="entity.unpaid"
                     flat
@@ -159,13 +159,13 @@ const debtWarning = computed(() => {
                         <br />
                         {{
                             t('unpaidDated', {
-                                dated: toDate(customer.unpaid?.dated),
+                                dated: toDate(entity.unpaid?.dated),
                             })
                         }}
                         <br />
                         {{
                             t('unpaidAmount', {
-                                amount: toCurrency(customer.unpaid?.amount),
+                                amount: toCurrency(entity.unpaid?.amount),
                             })
                         }}
                     </QTooltip>

src/pages/Entry/EntryFilter.vue

@@ -145,6 +145,7 @@ const entryFilterPanel = ref();
                         v-model="params.agencyModeId"
                         @update:model-value="searchFn()"
                         url="AgencyModes"
+                        sort-by="name ASC"
                         :fields="['id', 'name']"
                         hide-selected
                         dense

src/pages/Monitor/Ticket/MonitorTickets.vue

@@ -17,6 +17,7 @@ import MonitorTicketFilter from './MonitorTicketFilter.vue';
 import TicketProblems from 'src/components/TicketProblems.vue';
 import VnDateBadge from 'src/components/common/VnDateBadge.vue';
 import { useStateStore } from 'src/stores/useStateStore';
+import useOpenURL from 'src/composables/useOpenURL';
 
 const DEFAULT_AUTO_REFRESH = 2 * 60 * 1000;
 const { t } = useI18n();
@@ -320,8 +321,7 @@ const totalPriceColor = (ticket) => {
     if (total > 0 && total < 50) return 'warning';
 };
 
-const openTab = (id) =>
+const openTab = (id) => useOpenURL(`#/ticket/${id}/sale`);
-    window.open(`#/ticket/${id}/sale`, '_blank', 'noopener, noreferrer');
 </script>
 <template>
     <FetchData
@@ -396,6 +396,7 @@ const openTab = (id) =>
         default-mode="table"
         auto-load
         :row-click="({ id }) => openTab(id)"
+        :row-ctrl-click="(_, { id }) => openTab(id)"
         :disable-option="{ card: true }"
         :user-params="{ from, to, scopeDays: 0 }"
     >

src/pages/Monitor/locale/en.yml

@@ -21,7 +21,7 @@ salesTicketsTable:
     notVisible: Not visible
     purchaseRequest: Purchase request
     clientFrozen: Client frozen
-    risk: Risk
+    risk: Excess risk
     componentLack: Component lack
     tooLittle: Ticket too little
     identifier: Identifier

src/pages/Monitor/locale/es.yml

@@ -21,7 +21,7 @@ salesTicketsTable:
     notVisible: No visible
     purchaseRequest: Petición de compra
     clientFrozen: Cliente congelado
-    risk: Riesgo
+    risk: Exceso de riesgo
     componentLack: Faltan componentes
     tooLittle: Ticket demasiado pequeño
     identifier: Identificador

src/pages/Route/Card/RouteAutonomousFilter.vue

@@ -44,8 +44,7 @@ const exprBuilder = (param, value) => {
 <template>
     <FetchData
         url="AgencyModes"
-        :filter="{ fields: ['id', 'name'] }"
+        :filter="{ fields: ['id', 'name'], order: ['name ASC'] }"
-        sort-by="name ASC"
         @on-fetch="(data) => (agencyList = data)"
         auto-load
     />

src/pages/Shelving/ShelvingList.vue

@@ -1,14 +1,17 @@
 <script setup>
-import VnPaginate from 'components/ui/VnPaginate.vue';
+import { computed } from 'vue';
-import CardList from 'components/ui/CardList.vue';
-import VnLv from 'components/ui/VnLv.vue';
 import { useRouter } from 'vue-router';
-import ShelvingFilter from 'pages/Shelving/Card/ShelvingFilter.vue';
+import { useI18n } from 'vue-i18n';
-import ShelvingSummary from 'pages/Shelving/Card/ShelvingSummary.vue';
+import VnTable from 'components/VnTable/VnTable.vue';
-import { useSummaryDialog } from 'src/composables/useSummaryDialog';
 import VnSection from 'src/components/common/VnSection.vue';
+import ShelvingFilter from 'pages/Shelving/Card/ShelvingFilter.vue';
+import ShelvingSummary from './Card/ShelvingSummary.vue';
+import { useSummaryDialog } from 'src/composables/useSummaryDialog';
 import exprBuilder from './ShelvingExprBuilder.js';
+import VnSelect from 'src/components/common/VnSelect.vue';
+import VnCheckbox from 'src/components/common/VnCheckbox.vue';
 
+const { t } = useI18n();
 const router = useRouter();
 const { viewSummary } = useSummaryDialog();
 const dataKey = 'ShelvingList';
@@ -17,9 +20,56 @@ const filter = {
     include: [{ relation: 'parking' }],
 };
 
-function navigate(id) {
+const columns = computed(() => [
-    router.push({ path: `/shelving/${id}` });
+    {
-}
+        align: 'left',
+        name: 'code',
+        label: t('globals.code'),
+        isId: true,
+        isTitle: true,
+        columnFilter: false,
+        create: true,
+    },
+    {
+        align: 'left',
+        name: 'parking',
+        label: t('shelving.list.parking'),
+        sortable: true,
+        format: (val) => val?.code ?? '',
+        cardVisible: true,
+    },
+    {
+        align: 'left',
+        name: 'priority',
+        label: t('shelving.list.priority'),
+        sortable: true,
+        cardVisible: true,
+        create: true,
+    },
+    {
+        align: 'left',
+        name: 'isRecyclable',
+        label: t('shelving.summary.recyclable'),
+        sortable: true,
+    },
+    {
+        align: 'right',
+        label: '',
+        name: 'tableActions',
+        actions: [
+            {
+                title: t('components.smartCard.viewSummary'),
+                icon: 'preview',
+                action: (row) => viewSummary(row.id, ShelvingSummary),
+                isPrimary: true,
+            },
+        ],
+    },
+]);
+
+const onDataSaved = ({ id }) => {
+    router.push({ name: 'ShelvingBasicData', params: { id } });
+};
 </script>
 
 <template>
@@ -37,48 +87,75 @@ function navigate(id) {
             <ShelvingFilter data-key="ShelvingList" />
         </template>
         <template #body>
-            <QPage class="column items-center q-pa-md">
+            <VnTable
-                <div class="vn-card-list">
+                :data-key="dataKey"
-                    <VnPaginate :data-key="dataKey">
+                :columns="columns"
-                        <template #body="{ rows }">
+                is-editable="false"
-                            <CardList
+                :right-search="false"
-                                v-for="row of rows"
+                :use-model="true"
-                                :key="row.id"
+                :disable-option="{ table: true }"
-                                :id="row.id"
+                redirect="shelving"
-                                :title="row.code"
+                default-mode="card"
-                                @click="navigate(row.id)"
+                :create="{
-                            >
+                    urlCreate: 'Shelvings',
-                                <template #list-items>
+                    title: t('globals.pageTitles.shelvingCreate'),
-                                    <VnLv
+                    onDataSaved,
-                                        :label="$t('shelving.list.parking')"
+                    formInitialData: {
-                                        :title-label="$t('shelving.list.parking')"
+                        parkingFk: null,
-                                        :value="row.parking?.code"
+                        priority: null,
-                                    />
+                        code: '',
-                                    <VnLv
+                        isRecyclable: false,
-                                        :label="$t('shelving.list.priority')"
+                    },
-                                        :value="row?.priority"
+                }"
-                                    />
+            >
-                                </template>
+                <template #more-create-dialog="{ data }">
-                                <template #actions>
+                    <VnSelect
-                                    <QBtn
+                        v-model="data.parkingFk"
-                                        :label="$t('components.smartCard.openSummary')"
+                        url="Parkings"
-                                        @click.stop="viewSummary(row.id, ShelvingSummary)"
+                        option-value="id"
-                                        color="primary"
+                        option-label="code"
-                                    />
+                        :label="t('shelving.list.parking')"
-                                </template>
+                        :filter-options="['id', 'code']"
-                            </CardList>
+                        :fields="['id', 'code']"
-                        </template>
+                    />
-                    </VnPaginate>
+                    <VnCheckbox
-                </div>
+                        v-model="data.isRecyclable"
-                <QPageSticky :offset="[20, 20]">
+                        :label="t('shelving.summary.recyclable')"
-                    <RouterLink :to="{ name: 'ShelvingCreate' }">
+                    />
-                        <QBtn fab icon="add" color="primary" v-shortcut="'+'" />
+                </template>
-                        <QTooltip>
+            </VnTable>
-                            {{ $t('shelving.list.newShelving') }}
-                        </QTooltip>
-                    </RouterLink>
-                </QPageSticky>
-            </QPage>
         </template>
     </VnSection>
 </template>
+
+<style lang="scss" scoped>
+.list {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    width: 55%;
+}
+.list-container {
+    display: flex;
+    justify-content: center;
+}
+</style>
+
+<i18n>
+    es:
+        shelving:
+            list:
+                parking: Estacionamiento
+                priority: Prioridad
+        
+            summary:
+                recyclable: Reciclable
+    en:
+        shelving:
+            list:
+                parking: Parking
+                priority: Priority
+        
+            summary:
+                recyclable: Recyclable
+</i18n>

src/pages/Supplier/Card/SupplierFilter.js

@@ -11,6 +11,11 @@ export default {
         'isSerious',
         'isTrucker',
         'account',
+        'workerFk',
+        'note',
+        'isReal',
+        'isPayMethodChecked',
+        'companySize',
     ],
     include: [
         {

src/pages/Supplier/Card/SupplierFiscalData.vue

@@ -108,7 +108,6 @@ function handleLocation(data, location) {
                 <VnAccountNumber
                     v-model="data.account"
                     :label="t('supplier.fiscalData.account')"
-                    clearable
                     data-cy="supplierFiscalDataAccount"
                     insertable
                     :maxlength="10"
@@ -185,8 +184,8 @@ function handleLocation(data, location) {
                     />
                     <VnCheckbox
                         v-model="data.isVies"
-                        :label="t('globals.isVies')" 
+                        :label="t('globals.isVies')"
-                        :info="t('whenActivatingIt')" 
+                        :info="t('whenActivatingIt')"
                     />
                 </div>
             </VnRow>

src/pages/Supplier/SupplierList.vue

@@ -4,7 +4,6 @@ import { useI18n } from 'vue-i18n';
 import VnTable from 'components/VnTable/VnTable.vue';
 import VnSection from 'src/components/common/VnSection.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 { useSummaryDialog } from 'src/composables/useSummaryDialog';
 import SupplierSummary from './Card/SupplierSummary.vue';
@@ -53,7 +52,7 @@ const columns = computed(() => [
         label: t('globals.alias'),
         name: 'alias',
         columnFilter: {
-            name: 'search',
+            name: 'nickname',
         },
         cardVisible: true,
     },
@@ -120,6 +119,21 @@ const columns = computed(() => [
         ],
     },
 ]);
+
+const filterColumns = computed(() => {
+    const copy = [...columns.value];
+    copy.splice(copy.length - 1, 0, {
+        align: 'left',
+        label: t('globals.params.provinceFk'),
+        name: 'provinceFk',
+        options: provincesOptions.value,
+        columnFilter: {
+            component: 'select',
+        },
+    });
+
+    return copy;
+});
 </script>
 <template>
     <FetchData
@@ -130,7 +144,7 @@ const columns = computed(() => [
     />
     <VnSection
         :data-key="dataKey"
-        :columns="columns"
+        :columns="filterColumns"
         prefix="supplier"
         :array-data-props="{
             url: 'Suppliers/filter',
@@ -165,17 +179,6 @@ const columns = computed(() => [
                 </template>
             </VnTable>
         </template>
-        <template #moreFilterPanel="{ params, searchFn }">
-            <VnSelect
-                :label="t('globals.params.provinceFk')"
-                v-model="params.provinceFk"
-                @update:model-value="searchFn()"
-                :options="provincesOptions"
-                filled
-                dense
-                class="q-px-sm q-pr-lg"
-            />
-        </template>
     </VnSection>
 </template>
 

src/pages/Ticket/Card/TicketDescriptor.vue

@@ -93,9 +93,9 @@ function ticketFilter(ticket) {
             <VnLv :label="t('globals.warehouse')" :value="entity.warehouse?.name" />
             <VnLv :label="t('globals.alias')" :value="entity.nickname" />
         </template>
-        <template #icons>
+        <template #icons="{ entity }">
             <QCardActions class="q-gutter-x-xs">
-                <TicketProblems :row="problems" />
+                <TicketProblems :row="{ ...entity?.client, ...problems }" />
             </QCardActions>
         </template>
         <template #actions="{ entity }">

src/pages/Ticket/Card/TicketSale.vue

@@ -693,6 +693,17 @@ watch(
         :disabled-attr="isTicketEditable"
     >
         <template #column-statusIcons="{ row }">
+            <QIcon
+                v-if="row.saleGroupFk"
+                name="inventory_2"
+                size="xs"
+                color="primary"
+                class="cursor-pointer"
+            >
+                <QTooltip class="no-pointer-events">
+                    {{ `saleGroup: ${row.saleGroupFk}` }}
+                </QTooltip>
+            </QIcon>
             <TicketProblems :row="row" />
         </template>
         <template #body-cell-picture="{ row }">

src/pages/Ticket/TicketFilter.vue

@@ -48,7 +48,7 @@ const getGroupedStates = (data) => {
     />
     <FetchData
         url="AgencyModes"
-        :sort-by="['name ASC']"
+        :filter="{ fields: ['id', 'name'], order: ['name ASC'] }"
         @on-fetch="(data) => (agencies = data)"
         auto-load
     />
@@ -256,8 +256,6 @@ const getGroupedStates = (data) => {
                         v-model="params.agencyModeFk"
                         @update:model-value="searchFn()"
                         :options="agencies"
-                        option-value="id"
-                        option-label="name"
                         emit-value
                         map-options
                         use-input

src/pages/Travel/ExtraCommunityFilter.vue

@@ -73,6 +73,7 @@ warehouses();
     />
     <FetchData
         url="AgencyModes"
+        :filter="{ fields: ['id', 'name'], order: ['name ASC'] }"
         @on-fetch="(data) => (agenciesOptions = data)"
         auto-load
     />

src/pages/Travel/TravelCreate.vue

@@ -39,6 +39,7 @@ const redirectToTravelBasicData = (_, { id }) => {
 <template>
     <FetchData
         url="AgencyModes"
+        :filter="{ fields: ['id', 'name'], order: ['name ASC'] }"
         @on-fetch="(data) => (agenciesOptions = data)"
         auto-load
     />

src/pages/Travel/TravelFilter.vue

@@ -52,9 +52,8 @@ defineExpose({ states });
                     v-model="params.agencyModeFk"
                     @update:model-value="searchFn()"
                     url="agencyModes"
+                    sort-by="name ASC"
                     :use-like="false"
-                    option-value="id"
-                    option-label="name"
                     option-filter="name"
                     dense
                     outlined

src/pages/Worker/Card/WorkerTimeControl.vue

@@ -343,19 +343,29 @@ const updateData = async () => {
 
 const getMailStates = async (date) => {
     const url = `WorkerTimeControls/${route.params.id}/getMailStates`;
+    const year = date.getFullYear();
     const month = date.getMonth() + 1;
-    const prevMonth = month == 1 ? 12 : month - 1;
+
-    const params = {
+    const getMonthStates = async (month, year) => {
-        month,
+        return (await axios.get(url, { params: { month, year } })).data;
-        year: date.getFullYear(),
     };
 
-    const curMonthStates = (await axios.get(url, { params })).data;
+    const curMonthStates = await getMonthStates(month, year);
-    const prevMonthStates = (
-        await axios.get(url, { params: { ...params, month: prevMonth } })
-    ).data;
 
-    workerTimeControlMails.value = curMonthStates.concat(prevMonthStates);
+    const prevMonthStates = await getMonthStates(
+        month === 1 ? 12 : month - 1,
+        month === 1 ? year - 1 : year,
+    );
+
+    const postMonthStates = await getMonthStates(
+        month === 12 ? 1 : month + 1,
+        month === 12 ? year + 1 : year,
+    );
+    workerTimeControlMails.value = [
+        ...curMonthStates,
+        ...prevMonthStates,
+        ...postMonthStates,
+    ];
 };
 
 const showWorkerTimeForm = (propValue, formType) => {

src/pages/Zone/Card/ZoneBasicData.vue

@@ -9,22 +9,22 @@ import VnInputTime from 'src/components/common/VnInputTime.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
 
 const { t } = useI18n();
-const validAddresses = ref([]);
 const addresses = ref([]);
 
 const setFilteredAddresses = (data) => {
-    const validIds = new Set(validAddresses.value.map((item) => item.addressFk));
+    addresses.value = data.map(({ address }) => address);
-    addresses.value = data.filter((address) => validIds.has(address.id));
 };
 </script>
 
 <template>
     <FetchData
         url="RoadmapAddresses"
+        :filter="{
+            include: { relation: 'address' },
+        }"
         auto-load
-        @on-fetch="(data) => (validAddresses = data)"
+        @on-fetch="setFilteredAddresses"
     />
-    <FetchData url="Addresses" auto-load @on-fetch="setFilteredAddresses" />
     <FormModel auto-load model="Zone">
         <template #form="{ data, validate }">
             <VnRow>
@@ -125,7 +125,6 @@ const setFilteredAddresses = (data) => {
                     map-options
                     :rules="validate('data.addressFk')"
                     :filter-options="['id']"
-                    :where="filterWhere"
                 />
             </VnRow>
             <VnRow>

src/pages/Zone/ZoneFilterPanel.vue

@@ -5,6 +5,7 @@ import VnInput from 'components/common/VnInput.vue';
 import FetchData from 'components/FetchData.vue';
 import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
 import VnSelect from 'components/common/VnSelect.vue';
+import order from 'src/router/modules/order';
 
 const { t } = useI18n();
 const props = defineProps({
@@ -24,7 +25,7 @@ const agencies = ref([]);
 <template>
     <FetchData
         url="AgencyModes"
-        :filter="{ fields: ['id', 'name'] }"
+        :filter="{ fields: ['id', 'name'], order: ['name ASC'] }"
         @on-fetch="(data) => (agencies = data)"
         auto-load
     />

src/pages/Zone/ZoneList.vue

@@ -199,9 +199,8 @@ function formatRow(row) {
         <template #more-create-dialog="{ data }">
             <VnSelect
                 url="AgencyModes"
+                sort-by="name ASC"
                 v-model="data.agencyModeFk"
-                option-value="id"
-                option-label="name"
                 :label="t('list.agency')"
             />
             <VnInput

src/router/modules/shelving.js

@@ -111,15 +111,6 @@ export default {
                         shelvingCard,
                     ],
                 },
-                {
-                    path: 'create',
-                    name: 'ShelvingCreate',
-                    meta: {
-                        title: 'shelvingCreate',
-                        icon: 'add',
-                    },
-                    component: () => import('src/pages/Shelving/Card/ShelvingForm.vue'),
-                },
                 {
                     path: 'parking',
                     name: 'ParkingMain',

test/cypress/integration/claim/claimPhoto.spec.js

@@ -1,6 +1,6 @@
 /// <reference types="cypress" />
-// redmine.verdnatura.es/issues/8417
+describe('ClaimPhoto', () => {
-describe.skip('ClaimPhoto', () => {
+    const carrouselClose = '.q-dialog__inner > .q-toolbar > .q-btn > .q-btn__content > .q-icon';
     beforeEach(() => {
         const claimId = 1;
         cy.login('developer');
@@ -16,6 +16,7 @@ describe.skip('ClaimPhoto', () => {
     });
 
     it('should add new file with drag and drop', () => {
+        cy.get('.container').should('be.visible').and('exist');
         cy.get('.container').selectFile('test/cypress/fixtures/image.jpg', {
             action: 'drag-drop',
         });
@@ -23,33 +24,23 @@ describe.skip('ClaimPhoto', () => {
     });
 
     it('should open first image dialog change to second and close', () => {
-        cy.get(':nth-last-child(1) > .q-card').click();
+        cy.dataCy('file-1').click();
-        cy.get('.q-carousel__slide > .q-img > .q-img__container > .q-img__image').should(
+        cy.get(carrouselClose).click();
-            'be.visible',
-        );
 
-        cy.get('.q-carousel__control > button').click();
+        cy.dataCy('file-1').click();
-
+        cy.get('.q-carousel__control > button').as('nextButton').click();
-        cy.get(
+        cy.get('.q-carousel__slide > .q-ma-none').should('be.visible');
-            '.q-dialog__inner > .q-toolbar > .q-btn > .q-btn__content > .q-icon',
+        cy.get(carrouselClose).click();
-        ).click();
-        cy.get('.q-carousel__slide > .q-img > .q-img__container > .q-img__image').should(
-            'not.be.visible',
-        );
     });
 
     it('should remove third and fourth file', () => {
-        cy.get(
+        cy.dataCy('delete-button-4').click();
-            '.multimediaParent > :nth-last-child(1) > .q-btn > .q-btn__content > .q-icon',
-        ).click();
         cy.get(
             '.q-card__actions > .q-btn--unelevated > .q-btn__content > .block',
         ).click();
         cy.get('.q-notification__message').should('have.text', 'Data deleted');
 
-        cy.get(
+        cy.dataCy('delete-button-3').click();
-            '.multimediaParent > :nth-last-child(1) > .q-btn > .q-btn__content > .q-icon',
-        ).click();
         cy.get(
             '.q-card__actions > .q-btn--unelevated > .q-btn__content > .block',
         ).click();

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

@@ -17,7 +17,6 @@ describe('InvoiceOut summary', () => {
         cy.login('developer');
         cy.visit(`/#/invoice-out/1/summary`);
     });
-
     it('open the descriptors', () => {
         cy.get(firstRowDescriptors(1)).click();
         cy.get('.descriptor').should('be.visible');
@@ -35,7 +34,6 @@ describe('InvoiceOut summary', () => {
 
     it('should open the ticket list', () => {
         cy.get(toTicketList).click();
-        cy.get('.descriptor').should('be.visible');
         cy.dataCy('vnFilterPanelChip').should('include.text', 'T1111111');
     });
 

test/cypress/integration/shelving/parking/parkingList.spec.js

@@ -1,7 +1,7 @@
 /// <reference types="cypress" />
 describe('ParkingList', () => {
     const searchbar = '#searchbar input';
-    const firstCard = ':nth-child(1) > .q-card > .no-margin > .q-py-none';   
+    const firstCard = ':nth-child(1) > .q-card > .no-margin > .q-py-none';
     const summaryHeader = '.summaryBody .header';
 
     beforeEach(() => {

test/cypress/integration/shelving/shelvingBasicData.spec.js

@@ -0,0 +1,24 @@
+/// <reference types="cypress" />
+describe('ShelvingList', () => {
+    const parking =
+        '.q-card > :nth-child(1) > .q-select > .q-field__inner > .q-field__control > .q-field__control-container';
+    beforeEach(() => {
+        cy.viewport(1920, 1080);
+        cy.login('developer');
+        cy.visit(`/#/shelving/1/basic-data`);
+    });
+
+    it('should give an error if the code aldready exists', () => {
+        cy.dataCy('Code_input').should('exist').clear().type('AA7');
+        cy.saveCard();
+        cy.get('.q-notification__message').should('have.text', 'The code already exists');
+    });
+    it('should edit the data and save', () => {
+        cy.selectOption(parking, 'P-01-1');
+        cy.dataCy('Code_input').clear().type('AA1');
+        cy.dataCy('Priority_input').clear().type('10');
+        cy.get(':nth-child(2) > .q-checkbox > .q-checkbox__inner').click();
+        cy.saveCard();
+        cy.get('.q-notification__message').should('have.text', 'Data saved');
+    });
+});

test/cypress/integration/shelving/shelvingList.spec.js

@@ -0,0 +1,41 @@
+/// <reference types="cypress" />
+describe('ShelvingList', () => {
+    beforeEach(() => {
+        cy.viewport(1920, 1080);
+        cy.login('developer');
+        cy.visit(`/#/shelving/list`);
+    });
+
+    it('should redirect on clicking a shelving', () => {
+        cy.typeSearchbar('{enter}');
+        cy.dataCy('cardBtn').eq(0).click();
+        cy.get('.summaryHeader > .header > .q-icon').click();
+        cy.url().should('include', '/shelving/1/summary');
+    });
+
+    it('should redirect from preview to basic-data', () => {
+        cy.typeSearchbar('{enter}');
+        cy.dataCy('cardBtn').eq(0).click();
+        cy.get('.q-card > .header').click();
+        cy.url().should('include', '/shelving/1/basic-data');
+    });
+
+    it('should filter and redirect if only one result', () => {
+        cy.selectOption('[data-cy="Parking_select"]', 'P-02-2');
+        cy.dataCy('Parking_select').type('{enter}');
+        cy.url().should('match', /\/shelving\/\d+\/summary/);
+    });
+
+    it('should create a new shelving', () => {
+        cy.dataCy('vnTableCreateBtn').click();
+        cy.dataCy('code-create-popup').type('Test');
+        cy.dataCy('Priority_input').type('10');
+        cy.selectOption(
+            '.grid-create > .q-select > .q-field__inner > .q-field__control > .q-field__control-container',
+            '100-01',
+        );
+        cy.dataCy('FormModelPopup_save').click();
+        cy.checkNotification('Data created');
+        cy.url().should('match', /\/shelving\/\d+\/basic-data/);
+    });
+});

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

@@ -1,35 +1,50 @@
-describe('VnInput Component', () => {
+describe('VnAccountNumber', () => {
     beforeEach(() => {
         cy.login('developer');
         cy.viewport(1920, 1080);
         cy.visit('/#/supplier/1/fiscal-data');
     });
 
-    it('should replace character at cursor position in insert mode', () => {
+    describe('VnInput handleInsertMode()', () => {
-        // Simula escribir en el input
+        it('should replace character at cursor position in insert mode', () => {
-        cy.dataCy('supplierFiscalDataAccount').clear();
+            cy.get('input[data-cy="supplierFiscalDataAccount"]').type(
-        cy.dataCy('supplierFiscalDataAccount').type('4100000001');
+                '{selectall}4100000001',
-        // Coloca el cursor en la posición 0
+            );
-        cy.dataCy('supplierFiscalDataAccount').type('{movetostart}');
+            cy.get('input[data-cy="supplierFiscalDataAccount"]').type('{movetostart}');
-        // Escribe un número y verifica que se reemplace correctamente
+            cy.get('input[data-cy="supplierFiscalDataAccount"]').type('999');
-        cy.dataCy('supplierFiscalDataAccount').type('999');
+            cy.get('input[data-cy="supplierFiscalDataAccount"]').should(
-        cy.dataCy('supplierFiscalDataAccount').should('have.value', '9990000001');
+                'have.value',
+                '9990000001',
+            );
+        });
+
+        it('should replace character at cursor position in insert mode', () => {
+            cy.get('input[data-cy="supplierFiscalDataAccount"]').clear();
+            cy.get('input[data-cy="supplierFiscalDataAccount"]').type('4100000001');
+            cy.get('input[data-cy="supplierFiscalDataAccount"]').type('{movetostart}');
+            cy.get('input[data-cy="supplierFiscalDataAccount"]').type('999');
+            cy.get('input[data-cy="supplierFiscalDataAccount"]').should(
+                'have.value',
+                '9990000001',
+            );
+        });
+
+        it('should respect maxlength prop', () => {
+            cy.get('input[data-cy="supplierFiscalDataAccount"]').clear();
+            cy.get('input[data-cy="supplierFiscalDataAccount"]').type('123456789012345');
+            cy.get('input[data-cy="supplierFiscalDataAccount"]').should(
+                'have.value',
+                '1234567890',
+            );
+        });
     });
 
-    it('should replace character at cursor position in insert mode', () => {
+    it('should convert short account number to standard format', () => {
-        // Simula escribir en el input
+        cy.get('input[data-cy="supplierFiscalDataAccount"]').clear();
-        cy.dataCy('supplierFiscalDataAccount').clear();
+        cy.get('input[data-cy="supplierFiscalDataAccount"]').type('123.');
-        cy.dataCy('supplierFiscalDataAccount').type('4100000001');
+        cy.get('input[data-cy="supplierFiscalDataAccount"]').should(
-        // Coloca el cursor en la posición 0
+            'have.value',
-        cy.dataCy('supplierFiscalDataAccount').type('{movetostart}');
+            '1230000000',
-        // Escribe un número y verifica que se reemplace correctamente en la posicion incial
+        );
-        cy.dataCy('supplierFiscalDataAccount').type('999');
-        cy.dataCy('supplierFiscalDataAccount').should('have.value', '9990000001');
-    });
-
-    it('should respect maxlength prop', () => {
-        cy.dataCy('supplierFiscalDataAccount').clear();
-        cy.dataCy('supplierFiscalDataAccount').type('123456789012345');
-        cy.dataCy('supplierFiscalDataAccount').should('have.value', '1234567890'); // asumiendo que maxlength es 10
     });
 });