From fc73149dcfe1b2f83d06d3dd5cbaa6c6dc14008e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Andr=C3=A9s?= <carlosap@verdnatura.es>
Date: Mon, 11 Nov 2024 14:20:39 +0100
Subject: [PATCH] feat: refs #8087 refs#8087 Redadas en travel

---
 src/i18n/locale/en.yml                        |  1 +
 src/i18n/locale/es.yml                        |  1 +
 .../Card/BasicData/TicketBasicDataForm.vue    | 45 ++++++++++++++-----
 src/pages/Ticket/locale/en.yml                |  1 +
 src/pages/Ticket/locale/es.yml                |  1 +
 src/pages/Travel/Card/TravelBasicData.vue     |  5 ++-
 src/pages/Travel/Card/TravelDescriptor.vue    |  8 +---
 src/pages/Travel/Card/TravelSummary.vue       | 13 ++++--
 src/pages/Travel/TravelList.vue               |  8 ++--
 9 files changed, 57 insertions(+), 26 deletions(-)

diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index a6065e451..53d6e2e9e 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -1041,6 +1041,7 @@ travel:
         delivered: Delivered
         received: Received
         daysInForward: Days in forward
+        isRaid: Raid
     thermographs:
         code: Code
         temperature: Temperature
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index 6f01f7dd1..0e6ee61c8 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -1039,6 +1039,7 @@ travel:
         delivered: Enviada
         received: Recibida
         daysInForward: Días redada
+        isRaid: Redada
     thermographs:
         code: Código
         temperature: Temperatura
diff --git a/src/pages/Ticket/Card/BasicData/TicketBasicDataForm.vue b/src/pages/Ticket/Card/BasicData/TicketBasicDataForm.vue
index f6c20c514..3ac385fbd 100644
--- a/src/pages/Ticket/Card/BasicData/TicketBasicDataForm.vue
+++ b/src/pages/Ticket/Card/BasicData/TicketBasicDataForm.vue
@@ -36,6 +36,7 @@ const canEditZone = useAcl().hasAny([
 const agencyFetchRef = ref();
 const warehousesOptions = ref([]);
 const companiesOptions = ref([]);
+const currenciesOptions = ref([]);
 const agenciesOptions = ref([]);
 const zonesOptions = ref([]);
 const addresses = ref([]);
@@ -289,6 +290,15 @@ async function getZone(options) {
         @on-fetch="(data) => (companiesOptions = data)"
         auto-load
     />
+    <FetchData
+        url="Currencies"
+        :filter="{
+            fields: ['id', 'code'],
+            order: 'code ASC',
+        }"
+        @on-fetch="(data) => (currenciesOptions = data)"
+        auto-load
+    />
     <FetchData
         ref="agencyFetchRef"
         url="AgencyModes/byWarehouse"
@@ -395,17 +405,6 @@ async function getZone(options) {
             />
         </VnRow>
         <VnRow class="row q-gutter-md q-mb-md no-wrap">
-            <VnSelect
-                :label="t('basicData.company')"
-                v-model="formData.companyFk"
-                option-value="id"
-                option-label="code"
-                :options="companiesOptions"
-                hide-selected
-                map-options
-                :required="true"
-                :rules="validate('basicData.company')"
-            />
             <VnSelect
                 :label="t('basicData.agency')"
                 v-model="agencyModeId"
@@ -444,6 +443,30 @@ async function getZone(options) {
                     </QItem>
                 </template>
             </VnSelect>
+            <VnSelect
+                :label="t('basicData.company')"
+                v-model="formData.companyFk"
+                option-value="id"
+                option-label="code"
+                :options="companiesOptions"
+                hide-selected
+                map-options
+                :required="true"
+                :rules="validate('basicData.company')"
+            />
+        </VnRow>
+        <VnRow class="row q-gutter-md q-mb-md no-wrap">
+            <VnSelect
+                :label="t('basicData.currencyFk')"
+                v-model="formData.currencyFk"
+                option-value="id"
+                option-label="code"
+                :options="currenciesOptions"
+                hide-selected
+                map-options
+                :required="true"
+                :rules="validate('basicData.currencyFk')"
+            />
         </VnRow>
         <VnRow>
             <VnInputDate
diff --git a/src/pages/Ticket/locale/en.yml b/src/pages/Ticket/locale/en.yml
index 829ea7a91..a1f426c3c 100644
--- a/src/pages/Ticket/locale/en.yml
+++ b/src/pages/Ticket/locale/en.yml
@@ -170,6 +170,7 @@ basicData:
     negativesConfirmMessage: Negatives are going to be generated, are you sure you want to advance all the lines?
     chooseAnOption: Choose an option
     unroutedTicket: The ticket has been unrouted
+    currencyFk: Currency
 purchaseRequest:
     id: Id
     description: Description
diff --git a/src/pages/Ticket/locale/es.yml b/src/pages/Ticket/locale/es.yml
index eab38a402..a13d07566 100644
--- a/src/pages/Ticket/locale/es.yml
+++ b/src/pages/Ticket/locale/es.yml
@@ -88,6 +88,7 @@ basicData:
     negativesConfirmMessage: Se van a generar negativos, ¿seguro que quieres adelantar todas las líneas?
     chooseAnOption: Elige una opción
     unroutedTicket: El ticket ha sido desenrutado
+    currencyFk: Moneda
 weeklyTickets:
     id: ID Ticket
     client: Cliente
diff --git a/src/pages/Travel/Card/TravelBasicData.vue b/src/pages/Travel/Card/TravelBasicData.vue
index d6245e655..37af383e2 100644
--- a/src/pages/Travel/Card/TravelBasicData.vue
+++ b/src/pages/Travel/Card/TravelBasicData.vue
@@ -84,6 +84,7 @@ const agenciesOptions = ref([]);
                 </VnInput>
             </VnRow>
             <VnRow>
+                <QCheckbox v-model="data.isRaid" :label="t('travel.basicData.isRaid')" />
                 <QCheckbox
                     :label="t('travel.basicData.delivered')"
                     v-model="data.isDelivered"
@@ -99,7 +100,7 @@ const agenciesOptions = ref([]);
 
 <i18n>
 es:
-    raidDays: Al rellenarlo, generamos una redada. Indica los días que un travel se moverá automáticamente en el tiempo
+    raidDays: Si se marca "Redada", la fecha de entrega se moverá automáticamente los días indicados (incluido 0). Si no se especifican días, la fecha no cambiará
 en:
-    raidDays: When filling, a raid is generated. Enter the number of days the travel will automatically forward in time
+    raidDays: If "Raid" is checked, the landing date will automatically shift by the specified number of days (including 0). If no days are specified, the date will stay the same.
 </i18n>
diff --git a/src/pages/Travel/Card/TravelDescriptor.vue b/src/pages/Travel/Card/TravelDescriptor.vue
index 6025ad045..a77d7460e 100644
--- a/src/pages/Travel/Card/TravelDescriptor.vue
+++ b/src/pages/Travel/Card/TravelDescriptor.vue
@@ -32,6 +32,7 @@ const filter = {
         'warehouseOutFk',
         'cargoSupplierFk',
         'agencyModeFk',
+        'isRaid',
         'daysInForward',
     ],
     include: [
@@ -80,12 +81,7 @@ const setData = (entity) => (data.value = useCardDescription(entity.ref, entity.
         </template>
         <template #icons="{ entity }">
             <QCardActions class="q-gutter-x-md">
-                <QIcon
-                    v-if="entity.daysInForward"
-                    name="vn:net"
-                    color="primary"
-                    size="xs"
-                >
+                <QIcon v-if="entity.isRaid" name="vn:net" color="primary" size="xs">
                     <QTooltip>
                         {{
                             t('globals.raid', { daysInForward: entity.daysInForward })
diff --git a/src/pages/Travel/Card/TravelSummary.vue b/src/pages/Travel/Card/TravelSummary.vue
index 7dc267671..6c98d18b8 100644
--- a/src/pages/Travel/Card/TravelSummary.vue
+++ b/src/pages/Travel/Card/TravelSummary.vue
@@ -268,6 +268,11 @@ const getLink = (param) => `#/travel/${entityId.value}/${param}`;
                     :label="t('globals.wareHouseOut')"
                     :value="travel.warehouseOut?.name"
                 />
+                <QCheckbox
+                    :label="t('travel.basicData.isRaid')"
+                    v-model="travel.isRaid"
+                    :disable="true"
+                />
                 <QCheckbox
                     :label="t('travel.summary.delivered')"
                     v-model="travel.isDelivered"
@@ -286,6 +291,10 @@ const getLink = (param) => `#/travel/${entityId.value}/${param}`;
                     :label="t('globals.wareHouseIn')"
                     :value="travel.warehouseIn?.name"
                 />
+                <VnLv
+                    :label="t('travel.basicData.daysInForward')"
+                    :value="travel?.daysInForward"
+                />
                 <QCheckbox
                     :label="t('travel.summary.received')"
                     v-model="travel.isReceived"
@@ -303,10 +312,6 @@ const getLink = (param) => `#/travel/${entityId.value}/${param}`;
                 <VnLv :label="t('globals.reference')" :value="travel.ref" />
                 <VnLv label="m³" :value="travel.m3" />
                 <VnLv :label="t('globals.totalEntries')" :value="travel.totalEntries" />
-                <VnLv
-                    :label="t('travel.basicData.daysInForward')"
-                    :value="travel?.daysInForward"
-                />
             </QCard>
             <QCard class="full-width">
                 <VnTitle :text="t('travel.summary.entries')" />
diff --git a/src/pages/Travel/TravelList.vue b/src/pages/Travel/TravelList.vue
index 334640bff..89c7548cd 100644
--- a/src/pages/Travel/TravelList.vue
+++ b/src/pages/Travel/TravelList.vue
@@ -227,12 +227,14 @@ const columns = computed(() => [
     >
         <template #column-status="{ row }">
             <div class="row">
-                <QIcon v-if="!!row.daysInForward" name="vn:net" color="primary">
+                <QIcon v-if="!!row.isRaid" name="vn:net" color="primary">
                     <QTooltip>
                         {{
-                            t('globals.raid', { daysInForward: row.daysInForward })
+                            t('globals.raid', {
+                                daysInForward: row.daysInForward,
+                            })
                         }}</QTooltip
-                    >
+                    >{{ console.log(row.daysInForward) }}
                 </QIcon>
             </div>
         </template>