From 64d8f86ea952bf28cc503e9fc86b93dcbabf0a72 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Tue, 12 Mar 2024 12:25:31 +0100
Subject: [PATCH 1/3] refactor(routeList): refs #6971 moved button to
 subtoolbar + same functionality as other subtoolbar items

---
 src/pages/Route/RouteList.vue | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/pages/Route/RouteList.vue b/src/pages/Route/RouteList.vue
index 0b4aa6795..de600bc0e 100644
--- a/src/pages/Route/RouteList.vue
+++ b/src/pages/Route/RouteList.vue
@@ -255,6 +255,15 @@ const markAsServed = () => {
                 >
                     <QTooltip>{{ t('Mark as served') }}</QTooltip>
                 </QBtn>
+                <RouterLink :to="{ name: 'RouteCreate' }">
+                    <QBtn
+                        icon="add"
+                        color="primary" 
+                        :disable="!selectedRows?.length"
+                        @click="{ navigate }"
+                    />
+                    <QTooltip>{{ t('newRoute') }}</QTooltip>
+                </RouterLink>
             </template>
         </VnSubToolbar>
         <div class="route-list">
@@ -494,12 +503,6 @@ const markAsServed = () => {
             </VnPaginate>
         </div>
         <QPageSticky :offset="[20, 20]">
-            <RouterLink :to="{ name: 'RouteCreate' }">
-                <QBtn fab icon="add" color="primary" />
-                <QTooltip>
-                    {{ t('newRoute') }}
-                </QTooltip>
-            </RouterLink>
         </QPageSticky>
     </QPage>
 </template>
-- 
2.40.1


From 0c8f5f488893597f1a2156dde929bfa35be464e6 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Fri, 22 Mar 2024 08:15:00 +0100
Subject: [PATCH 2/3] refactor: refs #6971 moved correct button + unmade
 previous changes

---
 src/pages/Route/RouteAutonomous.vue | 28 ++++++++++++++++------------
 src/pages/Route/RouteList.vue       | 23 ++++++++++++++---------
 2 files changed, 30 insertions(+), 21 deletions(-)

diff --git a/src/pages/Route/RouteAutonomous.vue b/src/pages/Route/RouteAutonomous.vue
index 6fd4d3f90..43dfac340 100644
--- a/src/pages/Route/RouteAutonomous.vue
+++ b/src/pages/Route/RouteAutonomous.vue
@@ -205,6 +205,17 @@ function navigateToRouteSummary(event, row) {
         <div class="route-list">
             <div class="q-pa-md">
                 <QCard class="vn-one q-py-sm q-px-lg">
+                    <QBtn
+                        icon="vn:invoice-in-create"
+                        color="primary"
+                        :disable="!selectedRows?.length"
+                        @click="openDmsUploadDialog"
+                        class="createInvoiceIn"
+                    >
+                        <QTooltip>
+                            {{ t('Create invoiceIn') }}
+                        </QTooltip>
+                    </QBtn>
                     <VnLv class="flex">
                         <template #label>
                             <span class="text-h6">{{ t('Total') }}</span>
@@ -289,18 +300,6 @@ function navigateToRouteSummary(event, row) {
                 </template>
             </VnPaginate>
         </div>
-        <QPageSticky :offset="[20, 20]" v-if="selectedRows?.length">
-            <QBtn
-                fab
-                icon="vn:invoice-in-create"
-                color="primary"
-                @click="openDmsUploadDialog"
-            >
-                <QTooltip>
-                    {{ t('Create invoiceIn') }}
-                </QTooltip>
-            </QBtn>
-        </QPageSticky>
     </QPage>
     <QDialog v-model="dmsDialog.show">
         <VnDms
@@ -326,6 +325,11 @@ function navigateToRouteSummary(event, row) {
         cursor: pointer;
     }
 }
+
+.createInvoiceIn {
+    float: right;
+    margin-top: -0.2%;
+}
 </style>
 <i18n>
 es:
diff --git a/src/pages/Route/RouteList.vue b/src/pages/Route/RouteList.vue
index 241b34d78..cefdf20b8 100644
--- a/src/pages/Route/RouteList.vue
+++ b/src/pages/Route/RouteList.vue
@@ -253,15 +253,6 @@ const openTicketsDialog = (id) => {
                 >
                     <QTooltip>{{ t('Mark as served') }}</QTooltip>
                 </QBtn>
-                <RouterLink :to="{ name: 'RouteCreate' }">
-                    <QBtn
-                        icon="add"
-                        color="primary" 
-                        :disable="!selectedRows?.length"
-                        @click="{ navigate }"
-                    />
-                    <QTooltip>{{ t('newRoute') }}</QTooltip>
-                </RouterLink>
             </template>
         </VnSubToolbar>
         <div class="route-list">
@@ -452,6 +443,20 @@ const openTicketsDialog = (id) => {
             </VnPaginate>
         </div>
         <QPageSticky :offset="[20, 20]">
+            <RouterLink :to="{ name: 'RouteCreate' }">
+                <QBtn
+                    fab
+                    icon="add"
+                    color="primary"
+                    :disable="!selectedRows?.length"
+                    @click="
+                        {
+                            navigate;
+                        }
+                    "
+                />
+                <QTooltip>{{ t('newRoute') }}</QTooltip>
+            </RouterLink>
         </QPageSticky>
     </QPage>
 </template>
-- 
2.40.1


From bf0e2d3bf661d0d9fc08b029bce745b2a6227edb Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Mon, 25 Mar 2024 09:52:04 +0100
Subject: [PATCH 3/3] refactor: refs #6971 fixed request changes

---
 src/pages/Route/RouteAutonomous.vue | 28 +++++++++++-----------------
 src/pages/Route/RouteList.vue       | 16 ++++------------
 2 files changed, 15 insertions(+), 29 deletions(-)

diff --git a/src/pages/Route/RouteAutonomous.vue b/src/pages/Route/RouteAutonomous.vue
index 43dfac340..0ecf0a971 100644
--- a/src/pages/Route/RouteAutonomous.vue
+++ b/src/pages/Route/RouteAutonomous.vue
@@ -204,18 +204,7 @@ function navigateToRouteSummary(event, row) {
     <QPage class="column items-center">
         <div class="route-list">
             <div class="q-pa-md">
-                <QCard class="vn-one q-py-sm q-px-lg">
-                    <QBtn
-                        icon="vn:invoice-in-create"
-                        color="primary"
-                        :disable="!selectedRows?.length"
-                        @click="openDmsUploadDialog"
-                        class="createInvoiceIn"
-                    >
-                        <QTooltip>
-                            {{ t('Create invoiceIn') }}
-                        </QTooltip>
-                    </QBtn>
+                <QCard class="vn-one q-py-sm q-px-lg flex justify-between">
                     <VnLv class="flex">
                         <template #label>
                             <span class="text-h6">{{ t('Total') }}</span>
@@ -224,6 +213,16 @@ function navigateToRouteSummary(event, row) {
                             <span class="text-h6 q-ml-md">{{ toCurrency(total) }}</span>
                         </template>
                     </VnLv>
+                    <QBtn
+                        icon="vn:invoice-in-create"
+                        color="primary"
+                        :disable="!selectedRows?.length"
+                        @click="openDmsUploadDialog"
+                    >
+                        <QTooltip>
+                            {{ t('Create invoiceIn') }}
+                        </QTooltip>
+                    </QBtn>
                 </QCard>
             </div>
             <VnPaginate
@@ -325,11 +324,6 @@ function navigateToRouteSummary(event, row) {
         cursor: pointer;
     }
 }
-
-.createInvoiceIn {
-    float: right;
-    margin-top: -0.2%;
-}
 </style>
 <i18n>
 es:
diff --git a/src/pages/Route/RouteList.vue b/src/pages/Route/RouteList.vue
index b5d2169c6..94c05ad54 100644
--- a/src/pages/Route/RouteList.vue
+++ b/src/pages/Route/RouteList.vue
@@ -444,18 +444,10 @@ const openTicketsDialog = (id) => {
         </div>
         <QPageSticky :offset="[20, 20]">
             <RouterLink :to="{ name: 'RouteCreate' }">
-                <QBtn
-                    fab
-                    icon="add"
-                    color="primary"
-                    :disable="!selectedRows?.length"
-                    @click="
-                        {
-                            navigate;
-                        }
-                    "
-                />
-                <QTooltip>{{ t('newRoute') }}</QTooltip>
+                <QBtn fab icon="add" color="primary" />
+                <QTooltip>
+                    {{ t('newRoute') }}
+                </QTooltip>
             </RouterLink>
         </QPageSticky>
     </QPage>
-- 
2.40.1