From 0338e0ea458437b05d951d6ec552419e5716963f Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Thu, 16 Jan 2025 10:42:58 +0100
Subject: [PATCH 1/7] fix: refs #6426 create constants

---
 src/boot/defaults/constants.js | 4 ++++
 src/layouts/OutLayout.vue      | 3 +--
 2 files changed, 5 insertions(+), 2 deletions(-)
 create mode 100644 src/boot/defaults/constants.js

diff --git a/src/boot/defaults/constants.js b/src/boot/defaults/constants.js
new file mode 100644
index 000000000..b8b92b120
--- /dev/null
+++ b/src/boot/defaults/constants.js
@@ -0,0 +1,4 @@
+// src/boot/defaults/constants.js
+
+export const langs = ['en', 'es'];
+export const decimalPlaces = 2;
diff --git a/src/layouts/OutLayout.vue b/src/layouts/OutLayout.vue
index 0eb1329a4..ea902b169 100644
--- a/src/layouts/OutLayout.vue
+++ b/src/layouts/OutLayout.vue
@@ -2,9 +2,9 @@
 import { Dark, Quasar } from 'quasar';
 import { computed } from 'vue';
 import { useI18n } from 'vue-i18n';
+import { langs } from 'src/boot/defaults/constants.js'; // Importamos 'langs'
 
 const { t, locale } = useI18n();
-
 const userLocale = computed({
     get() {
         return locale.value;
@@ -35,7 +35,6 @@ const darkMode = computed({
         Dark.set(value);
     },
 });
-const langs = ['en', 'es'];
 </script>
 
 <template>

From 822058b491169de845653259ea191df99c85732c Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Mon, 27 Jan 2025 11:37:50 +0100
Subject: [PATCH 2/7] fix: refs #6426 constants

---
 src/boot/defaults/constants.js | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/boot/defaults/constants.js b/src/boot/defaults/constants.js
index b8b92b120..c06cb4561 100644
--- a/src/boot/defaults/constants.js
+++ b/src/boot/defaults/constants.js
@@ -1,4 +1,6 @@
 // src/boot/defaults/constants.js
-
-export const langs = ['en', 'es'];
-export const decimalPlaces = 2;
+const config = {
+    langs: ['en', 'es'],
+    decimalPlaces: 2,
+};
+export default config;

From b45e529879a02bcb0bef814cce6d727cc383425f Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Wed, 5 Feb 2025 12:51:04 +0100
Subject: [PATCH 3/7] fix: refs #6426 fix constants

---
 src/boot/defaults/constants.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/boot/defaults/constants.js b/src/boot/defaults/constants.js
index c06cb4561..6e6a8ce81 100644
--- a/src/boot/defaults/constants.js
+++ b/src/boot/defaults/constants.js
@@ -1,6 +1,4 @@
-// src/boot/defaults/constants.js
-const config = {
+export default {
     langs: ['en', 'es'],
     decimalPlaces: 2,
 };
-export default config;

From 64a52e0183e1fe5ec73595a99524048329533992 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Thu, 6 Feb 2025 11:57:27 +0100
Subject: [PATCH 4/7] fix: refs #6426 outLayout

---
 src/layouts/OutLayout.vue | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/layouts/OutLayout.vue b/src/layouts/OutLayout.vue
index 1912ab2d7..407b222c9 100644
--- a/src/layouts/OutLayout.vue
+++ b/src/layouts/OutLayout.vue
@@ -1,11 +1,13 @@
 <script setup>
 import { Dark, Quasar } from 'quasar';
-import { computed } from 'vue';
+import { computed, onMounted } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { localeEquivalence } from 'src/i18n/index';
 import quasarLang from 'src/utils/quasarLang';
+import constants from 'src/boot/defaults/constants.js';
 
 const { t, locale } = useI18n();
+const langs = constants.langs;
 const userLocale = computed({
     get() {
         return locale.value;

From 07eacdcebf9da8503dbb4178875518b061622370 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Thu, 6 Feb 2025 12:42:00 +0100
Subject: [PATCH 5/7] fix: refs #6426 constants

---
 src/boot/defaults/constants.js | 6 ++----
 src/layouts/OutLayout.vue      | 3 +--
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/boot/defaults/constants.js b/src/boot/defaults/constants.js
index 6e6a8ce81..c96ceb2d1 100644
--- a/src/boot/defaults/constants.js
+++ b/src/boot/defaults/constants.js
@@ -1,4 +1,2 @@
-export default {
-    langs: ['en', 'es'],
-    decimalPlaces: 2,
-};
+export const langs = ['en', 'es'];
+export const decimalPlaces = 2;
diff --git a/src/layouts/OutLayout.vue b/src/layouts/OutLayout.vue
index 407b222c9..eba57c198 100644
--- a/src/layouts/OutLayout.vue
+++ b/src/layouts/OutLayout.vue
@@ -4,10 +4,9 @@ import { computed, onMounted } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { localeEquivalence } from 'src/i18n/index';
 import quasarLang from 'src/utils/quasarLang';
-import constants from 'src/boot/defaults/constants.js';
+import { langs } from 'src/boot/defaults/constants.js';
 
 const { t, locale } = useI18n();
-const langs = constants.langs;
 const userLocale = computed({
     get() {
         return locale.value;

From e8a90faa62766ad0d5132316db033a072d0772f7 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Thu, 6 Feb 2025 12:33:26 +0000
Subject: [PATCH 6/7] feat: add agency icon

---
 src/pages/Ticket/TicketFuture.vue | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/src/pages/Ticket/TicketFuture.vue b/src/pages/Ticket/TicketFuture.vue
index 0d216bed4..e8e2dd775 100644
--- a/src/pages/Ticket/TicketFuture.vue
+++ b/src/pages/Ticket/TicketFuture.vue
@@ -376,6 +376,30 @@ onMounted(async () => {
             </template>
             <template #body-cell-problems="{ row }">
                 <QTd class="q-gutter-x-xs">
+                    <QIcon
+                        v-if="row.futureAgencyFk !== row.agencyFk && row.agencyFk"
+                        color="primary"
+                        name="vn:agency-term"
+                        size="xs"
+                        class="q-mr-xs"
+                    >
+                        <QTooltip class="column">
+                            <span>
+                                {{
+                                    t('advanceTickets.originAgency', {
+                                        agency: row.futureAgency,
+                                    })
+                                }}
+                            </span>
+                            <span>
+                                {{
+                                    t('advanceTickets.destinationAgency', {
+                                        agency: row.agency,
+                                    })
+                                }}
+                            </span>
+                        </QTooltip>
+                    </QIcon>
                     <QIcon
                         v-if="row.isTaxDataChecked === 0"
                         color="primary"

From 5e17af2fae06bba2c15d7b2b5f0103fe81009736 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Thu, 6 Feb 2025 16:19:38 +0100
Subject: [PATCH 7/7] feat: refs #7119 show country name

---
 src/pages/Route/Vehicle/Card/VehicleCard.vue | 2 +-
 src/pages/Route/Vehicle/VehicleList.vue      | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/pages/Route/Vehicle/Card/VehicleCard.vue b/src/pages/Route/Vehicle/Card/VehicleCard.vue
index 852879651..f59420aa2 100644
--- a/src/pages/Route/Vehicle/Card/VehicleCard.vue
+++ b/src/pages/Route/Vehicle/Card/VehicleCard.vue
@@ -6,7 +6,7 @@ import VehicleFilter from '../VehicleFilter.js';
 <template>
     <VnCardBeta
         data-key="Vehicle"
-        base-url="Vehicles"
+        url="Vehicles"
         :filter="VehicleFilter"
         :descriptor="VehicleDescriptor"
     />
diff --git a/src/pages/Route/Vehicle/VehicleList.vue b/src/pages/Route/Vehicle/VehicleList.vue
index de6aaba5f..e5b945010 100644
--- a/src/pages/Route/Vehicle/VehicleList.vue
+++ b/src/pages/Route/Vehicle/VehicleList.vue
@@ -136,7 +136,7 @@ const columns = computed(() => [
     />
     <FetchData
         url="Countries"
-        :filter="{ fields: ['code'] }"
+        :filter="{ fields: ['name', 'code'] }"
         @on-fetch="(data) => (countries = data)"
         auto-load
     />
@@ -209,7 +209,7 @@ const columns = computed(() => [
                         v-model="data.countryCodeFk"
                         :label="$t('globals.country')"
                         option-value="code"
-                        option-label="code"
+                        option-label="name"
                         :options="countries"
                     />
                     <VnInput