Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into beta

src/pages/Item/ItemFixedPrice.vue

@@ -361,7 +361,7 @@ function handleOnDataSave({ CrudModelRef }) {
         @on-fetch="(data) => (warehousesOptions = data)"
         auto-load
         url="Warehouses"
-        :filter="{ fields: ['id', 'name'], order: 'name ASC', limit: 30 }"
+        :filter="{ fields: ['id', 'name'], order: 'name ASC' }"
     />
     <RightMenu>
         <template #right-panel>
@@ -394,7 +394,6 @@ function handleOnDataSave({ CrudModelRef }) {
             />
         </template>
     </VnSubToolbar>
-    <QPage>
     <VnTable
         @on-fetch="
             (data) =>
@@ -425,15 +424,12 @@ function handleOnDataSave({ CrudModelRef }) {
             'row-key': 'id',
             selection: 'multiple',
         }"
-            :crud-model="{
+        :use-model="true"
-                disableInfiniteScroll: true,
-            }"
         v-model:selected="rowsSelected"
         :create-as-dialog="false"
         :create="{
             onDataSaved: handleOnDataSave,
         }"
-            :use-model="true"
         :disable-option="{ card: true }"
     >
         <template #header-selection="scope">
@@ -578,7 +574,6 @@ function handleOnDataSave({ CrudModelRef }) {
             @on-data-saved="onEditCellDataSaved()"
         />
     </QDialog>
-    </QPage>
 </template>
 <style lang="scss">
 .q-table th,

src/pages/Route/Card/RouteAutonomousFilter.vue

@@ -29,7 +29,7 @@ const exprBuilder = (param, value) => {
             return { 'a.supplierName': value };
         case 'routeFk':
             return { 'a.routeFk': value };
-        case 'created':
+        case 'dated':
         case 'agencyFk':
         case 'packages':
         case 'm3':
@@ -145,7 +145,7 @@ const exprBuilder = (param, value) => {
                 <QItem class="q-my-sm">
                     <QItemSection>
                         <VnInputDate
-                            v-model="params.created"
+                            v-model="params.dated"
                             :label="t('Date')"
                             is-outlined
                         />

src/pages/Route/Card/RouteDescriptor.vue

@@ -28,7 +28,7 @@ const filter = {
         'id',
         'workerFk',
         'agencyModeFk',
-        'created',
+        'dated',
         'm3',
         'warehouseFk',
         'description',
@@ -78,7 +78,7 @@ const setData = (entity) => (data.value = useCardDescription(entity.code, entity
         @on-fetch="setData"
     >
         <template #body="{ entity }">
-            <VnLv :label="t('Date')" :value="toDate(entity?.created)" />
+            <VnLv :label="t('Date')" :value="toDate(entity?.dated)" />
             <VnLv :label="t('Agency')" :value="entity?.agencyMode?.name" />
             <VnLv :label="t('Zone')" :value="entity?.zone?.name" />
             <VnLv

src/pages/Route/Card/RouteForm.vue

@@ -19,7 +19,7 @@ const shelvingId = ref(route.params?.id || null);
 const isNew = Boolean(!shelvingId.value);
 const defaultInitialData = {
     agencyModeFk: null,
-    created: null,
+    dated: null,
     description: '',
     vehicleFk: null,
     workerFk: null,
@@ -32,7 +32,7 @@ const routeFilter = {
         'id',
         'workerFk',
         'agencyModeFk',
-        'created',
+        'dated',
         'm3',
         'warehouseFk',
         'description',
@@ -134,7 +134,7 @@ const onSave = (data, response) => {
                     option-label="name"
                     :input-debounce="0"
                 />
-                <VnInputDate v-model="data.created" :label="t('Created')" />
+                <VnInputDate v-model="data.dated" :label="t('Dated')" />
             </VnRow>
             <template v-if="!isNew">
                 <VnRow>
@@ -188,7 +188,7 @@ es:
     Hour finished: Hora fin
     Description: Descripción
     Is served: Se ha servido
-    Created: Creado
+    Dated: Fecha
     The km can not exceed: La distancia debe ser inferior a {maxDistance}
 en:
     The km can not exceed: Distance must be lesser than {maxDistance}

src/pages/Route/Card/RouteSummary.vue

@@ -139,7 +139,7 @@ const ticketColumns = ref([
                 <QCard class="vn-one">
                     <VnLv
                         :label="t('route.summary.date')"
-                        :value="toDate(entity?.route.created)"
+                        :value="toDate(entity?.route.dated)"
                     />
                     <VnLv
                         :label="t('route.summary.agency')"

src/pages/Route/RouteAutonomous.vue

@@ -46,10 +46,10 @@ const columns = computed(() => [
     },
     {
         align: 'left',
-        name: 'created',
+        name: 'dated',
         label: t('Date'),
         columnFilter: false,
-        format: ({ created }) => toDate(created),
+        format: ({ dated }) => toDate(dated),
     },
     {
         align: 'left',

src/pages/Route/RouteExtendedList.vue

@@ -111,7 +111,7 @@ const columns = computed(() => [
     },
     {
         align: 'left',
-        name: 'created',
+        name: 'dated',
         label: t('route.Date'),
         columnFilter: false,
         cardVisible: true,

src/pages/Route/RouteRoadmap.vue

@@ -45,7 +45,7 @@ const columns = computed(() => [
         columnFilter: {
             inWhere: true,
         },
-        format: ({ created }) => toDate(created),
+        format: ({ dated }) => toDate(dated),
         cardVisible: true,
     },
     {

src/pages/Route/RouteTickets.vue

@@ -109,7 +109,7 @@ const ticketList = ref([]);
 
 const cloneRoutes = () => {
     axios.post('Routes/clone', {
-        created: startingDate.value,
+        dated: startingDate.value,
         ids: selectedRows.value.map((row) => row?.id),
     });
     refreshKey.value++;

src/pages/Route/locale/en.yml

@@ -5,7 +5,7 @@ route:
     Description: Description
     hourStarted: H.Start
     hourFinished: H.End
-    createRoute: Create route
+    dated: Dated
     From: From
     To: To
     Date: Date

src/pages/Supplier/SupplierListFilter.vue

@@ -23,13 +23,13 @@ const countriesOptions = ref([]);
 <template>
     <FetchData
         url="Provinces"
-        :filter="{ fields: ['id', 'name'], order: 'name ASC', limit: 30 }"
+        :filter="{ fields: ['id', 'name'], order: 'name ASC'}"
         @on-fetch="(data) => (provincesOptions = data)"
         auto-load
     />
     <FetchData
         url="countries"
-        :filter="{ fields: ['id', 'name'], order: 'name ASC', limit: 30 }"
+        :filter="{ fields: ['id', 'name'], order: 'name ASC'}"
         @on-fetch="(data) => (countriesOptions = data)"
         auto-load
     />

src/pages/Travel/Card/TravelSummary.vue

@@ -8,7 +8,7 @@ import VnLv from 'src/components/ui/VnLv.vue';
 import VnTitle from 'src/components/common/VnTitle.vue';
 import EntryDescriptorProxy from 'src/pages/Entry/Card/EntryDescriptorProxy.vue';
 import FetchData from 'src/components/FetchData.vue';
-
+import VnRow from 'components/ui/VnRow.vue';
 import { toDate, toCurrency } from 'src/filters';
 import axios from 'axios';
 
@@ -256,16 +256,20 @@ const getLink = (param) => `#/travel/${entityId.value}/${param}`;
                     :label="t('globals.warehouseOut')"
                     :value="travel.warehouseOut?.name"
                 />
+                <VnRow>
                     <QCheckbox
                         :label="t('travel.basicData.isRaid')"
                         v-model="travel.isRaid"
                         :disable="true"
                     />
+                </VnRow>
+                <VnRow>
                     <QCheckbox
                         :label="t('travel.summary.delivered')"
                         v-model="travel.isDelivered"
                         :disable="true"
                     />
+                </VnRow>
             </QCard>
             <QCard class="vn-one">
                 <QCardSection class="q-pa-none">
@@ -320,7 +324,6 @@ const getLink = (param) => `#/travel/${entityId.value}/${param}`;
                         <QTd>
                             <QCheckbox
                                 v-if="col.name === 'isConfirmed'"
-                                :label="t('travel.summary.received')"
                                 :true-value="1"
                                 :false-value="0"
                                 v-model="row[col.name]"

src/pages/Travel/TravelFilter.vue

@@ -77,7 +77,6 @@ defineExpose({ states });
                     :label="t('travel.shipped')"
                     v-model="params.shipped"
                     @update:model-value="searchFn()"
-                    dense
                     outlined
                     rounded
                 />
@@ -153,7 +152,7 @@ es:
         Id: Id
         ref: Referencia
         agency: Agencia
-        warehouseInFk: Alm.Salida
+        warehouseInFk: Alm.Entrada
         shipped: F.Envío
         shipmentHour: Hora de envío
         warehouseOut: Alm.Entrada

src/pages/Travel/TravelList.vue

@@ -54,7 +54,9 @@ const columns = computed(() => [
         name: 'id',
         label: t('globals.id'),
         isId: true,
-        cardVisible: true,
+        chip: {
+            condition: () => true,
+        },
     },
     {
         align: 'left',
@@ -64,7 +66,7 @@ const columns = computed(() => [
         columnField: {
             component: null,
         },
-        cardVisible: true,
+        isTitle: true,
         create: true,
     },
     {
@@ -103,14 +105,14 @@ const columns = computed(() => [
     },
     {
         align: 'left',
-        name: 'shipped',
         label: t('globals.shipped'),
+        name: 'shipped',
+        create: true,
+        cardVisible: true,
         component: 'date',
         columnField: {
             component: null,
         },
-        cardVisible: true,
-        create: true,
         format: (row, dashIfEmpty) => dashIfEmpty(toDate(row.shipped)),
     },
     {
@@ -201,7 +203,7 @@ const columns = computed(() => [
     />
     <RightMenu>
         <template #right-panel>
-            <TravelFilter data-key="TravelList" ref="travelFilterRef" />
+            <TravelFilter data-key="TravelList" />
         </template>
     </RightMenu>
     <VnTable

src/pages/Worker/Card/WorkerTimeControl.vue

@@ -103,9 +103,12 @@ const formattedWeekTotalHours = computed(() =>
 const onInputChange = async (date) => {
     if (!date) return;
 
-    const { year, month, day } = date.scope.timestamp;
+    const { timestamp, outside } = date.scope;
+    const { year, month, day } = timestamp;
     const _date = new Date(year, month - 1, day);
     setDate(_date);
+
+    if (outside) getMailStates(_date);
 };
 
 const setDate = async (date) => {
@@ -378,7 +381,7 @@ const isUnsatisfied = async (reason) => {
 
 const resendEmail = async () => {
     const params = {
-        recipient: worker.value?.user?.email,
+        recipient: worker.value[0]?.user?.emailUser?.email,
         week: selectedWeekNumber.value,
         year: selectedDate.value.getFullYear(),
         workerId: Number(route.params.id),

src/pages/Zone/Card/ZoneDescriptorMenuItems.vue

@@ -16,24 +16,14 @@ const actions = {
     clone: async () => {
         const opts = { message: t('Zone cloned'), type: 'positive' };
 
-        try {
         const { data } = await axios.post(`Zones/${zoneId}/clone`, {});
         notify(opts);
         push(`/zone/${data.id}/basic-data`);
-        } catch (e) {
-            opts.message = t('It was not able to clone the zone');
-            opts.type = 'negative';
-        }
     },
     remove: async () => {
-        try {
         await axios.post(`Zones/${zoneId}/deleteZone`);
-
         notify({ message: t('Zone deleted'), type: 'positive' });
         push({ name: 'ZoneList' });
-        } catch (e) {
-            notify({ message: e.message, type: 'negative' });
-        }
     },
 };
 function openConfirmDialog(callback) {