Merge branch 'master' into hotfix_checbox_css

src/i18n/locale/en.yml

@@ -60,7 +60,7 @@ globals:
     reference: Reference
     agency: Agency
     warehouseOut: Warehouse Out
-    wareHouseIn: Warehouse In
+    warehouseIn: Warehouse In
     landed: Landed
     shipped: Shipped
     totalEntries: Total entries

src/pages/Order/OrderList.vue

@@ -149,7 +149,12 @@ onMounted(() => {
 });
 async function fetchClientAddress(id, formData = {}) {
     const { data } = await axios.get(`Clients/${id}`, {
-        params: { filter: { include: { relation: 'addresses' } } },
+        params: {
+            filter: {
+                order: ['isDefaultAddress DESC', 'isActive DESC', 'nickname ASC'],
+                include: { relation: 'addresses' },
+            },
+        },
     });
     addressesList.value = data.addresses;
     formData.addressId = data.defaultAddressFk;
@@ -191,7 +196,7 @@ const getDateColor = (date) => {
             urlCreate: 'Orders/new',
             title: t('module.cerateOrder'),
             onDataSaved: (url) => {
-               tableRef.redirect(`${url}/catalog`);
+                tableRef.redirect(`${url}/catalog`);
             },
             formInitialData: {
                 active: true,
@@ -253,22 +258,27 @@ const getDateColor = (date) => {
                 @update:model-value="() => fetchAgencies(data)"
             >
                 <template #option="scope">
-                    <QItem v-bind="scope.itemProps">
+                    <QItem
+                        v-bind="scope.itemProps"
+                        :class="{ disabled: !scope.opt.isActive }"
+                    >
+                        <QItemSection style="min-width: min-content" avatar>
+                            <QIcon
+                                v-if="
+                                    scope.opt.isActive && data.addressId === scope.opt.id
+                                "
+                                size="sm"
+                                color="grey"
+                                name="star"
+                                class="fill-icon"
+                            />
+                        </QItemSection>
                         <QItemSection>
-                            <QItemLabel
+                            <QItemLabel>
-                                :class="{
+                                {{ scope.opt.nickname }}
-                                    'color-vn-label': !scope.opt?.isActive,
+                            </QItemLabel>
-                                }"
+                            <QItemLabel caption>
-                            >
+                                {{ `${scope.opt.street}, ${scope.opt.city}` }}
-                                {{
-                                    `${
-                                        !scope.opt?.isActive
-                                            ? t('basicData.inactive')
-                                            : ''
-                                    } `
-                                }}
-                                {{ scope.opt?.nickname }}: {{ scope.opt?.street }},
-                                {{ scope.opt?.city }}
                             </QItemLabel>
                         </QItemSection>
                     </QItem>

src/pages/Ticket/TicketList.vue

@@ -273,7 +273,7 @@ const fetchAddresses = async (formData) => {
 
     const filter = {
         fields: ['nickname', 'street', 'city', 'id', 'isActive'],
-        order: 'nickname ASC',
+        order: ['isDefaultAddress DESC', 'isActive DESC', 'nickname ASC'],
     };
     const params = { filter: JSON.stringify(filter) };
     const { data } = await axios.get(`Clients/${formData.clientId}/addresses`, {
@@ -646,7 +646,22 @@ function setReference(data) {
                     @update:model-value="() => fetchAvailableAgencies(data)"
                 >
                     <template #option="scope">
-                        <QItem v-bind="scope.itemProps">
+                        <QItem
+                            v-bind="scope.itemProps"
+                            :class="{ disabled: !scope.opt.isActive }"
+                        >
+                            <QItemSection style="min-width: min-content" avatar>
+                                <QIcon
+                                    v-if="
+                                        scope.opt.isActive &&
+                                        selectedClient?.defaultAddressFk === scope.opt.id
+                                    "
+                                    size="sm"
+                                    color="grey"
+                                    name="star"
+                                    class="fill-icon"
+                                />
+                            </QItemSection>
                             <QItemSection>
                                 <QItemLabel
                                     :class="{

src/pages/Travel/Card/TravelBasicData.vue

@@ -14,6 +14,8 @@ const route = useRoute();
 const { t } = useI18n();
 
 const agenciesOptions = ref([]);
+const warehousesOptionsOut = ref([]);
+const warehousesOptionsIn = ref([]);
 </script>
 <template>
     <FetchData
@@ -21,6 +23,18 @@ const agenciesOptions = ref([]);
         @on-fetch="(data) => (agenciesOptions = data)"
         auto-load
     />
+    <FetchData
+        url="Warehouses"
+        @on-fetch="(data) => (warehousesOptionsOut = data)"
+        auto-load
+        :filter="{ where: { isOrigin: TRUE } }"
+    />
+    <FetchData
+        url="Warehouses"
+        @on-fetch="(data) => (warehousesOptionsIn = data)"
+        auto-load
+        :filter="{ where: { isDestiny: TRUE } }"
+    />
     <FormModel :url-update="`Travels/${route.params.id}`" model="Travel" auto-load>
         <template #form="{ data }">
             <VnRow>
@@ -39,11 +53,12 @@ const agenciesOptions = ref([]);
                 <VnInputDate v-model="data.shipped" :label="t('globals.shipped')" />
                 <VnInputDate v-model="data.landed" :label="t('globals.landed')" />
             </VnRow>
+
             <VnRow>
                 <VnSelect
                     :label="t('globals.warehouseOut')"
                     v-model="data.warehouseOutFk"
-                    :options="agenciesOptions"
+                    :options="warehousesOptionsOut"
                     option-value="id"
                     option-label="name"
                     map-options
@@ -52,7 +67,7 @@ const agenciesOptions = ref([]);
                 <VnSelect
                     :label="t('globals.warehouseIn')"
                     v-model="data.warehouseInFk"
-                    :options="agenciesOptions"
+                    :options="warehousesOptionsIn"
                     option-value="id"
                     option-label="name"
                     map-options
@@ -89,7 +104,7 @@ const agenciesOptions = ref([]);
 
 <i18n>
 es:
-    raidDays: Si se marca "Redada", la fecha de entrega se moverá automáticamente los días indicados (incluido 0). Si se deja vacio, la fecha no cambiará
+    raidDays: Si se marca "Redada", la fecha de entrega se moverá automáticamente los días indicados.
 en:
-    raidDays: If "Raid" is checked, the landing date will automatically shift by the specified number of days (including 0). If left empty, the date will stay the same.
+    raidDays: If "Raid" is checked, the landing date will automatically shift by the specified number of days.
 </i18n>

src/pages/Travel/Card/TravelDescriptor.vue

@@ -44,8 +44,8 @@ const setData = (entity) => (data.value = useCardDescription(entity.ref, entity.
             <TravelDescriptorMenuItems :travel="entity" />
         </template>
         <template #body="{ entity }">
-            <VnLv :label="t('globals.warehouseIn')" :value="entity.warehouseIn.name" />
+            <VnLv :label="t('globals.warehouseIn')" :value="entity.warehouseIn?.name" />
-            <VnLv :label="t('globals.warehouseOut')" :value="entity.warehouseOut.name" />
+            <VnLv :label="t('globals.warehouseOut')" :value="entity.warehouseOut?.name" />
             <VnLv :label="t('globals.shipped')" :value="toDate(entity.shipped)" />
             <VnLv :label="t('globals.landed')" :value="toDate(entity.landed)" />
             <VnLv :label="t('globals.totalEntries')" :value="entity.totalEntries" />