From aa40a3b0f5b958c5c8ecff246b31a67152df6b96 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Wed, 31 Jan 2024 11:27:08 -0300
Subject: [PATCH] resolve conflicts with dev

---
 src/i18n/en/index.js                          |  3 +
 src/i18n/es/index.js                          |  3 +
 .../Supplier/Card/SupplierConsumption.vue     | 60 +++++++++----------
 3 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/src/i18n/en/index.js b/src/i18n/en/index.js
index e8d10e8b4..baaf414d6 100644
--- a/src/i18n/en/index.js
+++ b/src/i18n/en/index.js
@@ -1105,5 +1105,8 @@ export default {
         editPictureForm: {
             allowedFilesText: 'Allowed file types: { allowedContentTypes }',
         },
+        VnLv: {
+            copyText: '{copyValue} has been copied to the clipboard',
+        },
     },
 };
diff --git a/src/i18n/es/index.js b/src/i18n/es/index.js
index 67e3a2c29..0ea506b55 100644
--- a/src/i18n/es/index.js
+++ b/src/i18n/es/index.js
@@ -1105,5 +1105,8 @@ export default {
         editPictureForm: {
             allowedFilesText: 'Tipos de archivo permitidos: { allowedContentTypes }',
         },
+        VnLv: {
+            copyText: '{copyValue} se ha copiado al portapepeles',
+        },
     },
 };
diff --git a/src/pages/Supplier/Card/SupplierConsumption.vue b/src/pages/Supplier/Card/SupplierConsumption.vue
index da14a6343..3be2d7a90 100644
--- a/src/pages/Supplier/Card/SupplierConsumption.vue
+++ b/src/pages/Supplier/Card/SupplierConsumption.vue
@@ -105,10 +105,8 @@ const sendCampaignMetricsEmail = ({ address }) => {
     });
 };
 
-const calculateTotal = (buysArray) => {
-    if (!buysArray || !buysArray.length > 0) return;
-    return buysArray.reduce((accumulator, { total }) => accumulator + total, 0);
-};
+const calculateTotal = (buysArray = []) =>
+    buysArray.reduce((accumulator, { total }) => accumulator + total, 0);
 
 onMounted(async () => {
     stateStore.rightDrawer = true;
@@ -117,35 +115,31 @@ onMounted(async () => {
 </script>
 
 <template>
-    <QToolbar v-if="rows && rows.length > 0" class="bg-vn-dark justify-end">
-        <div id="st-data">
-            <QBtn
-                :disabled="!dateRanges.from && !dateRanges.to"
-                color="primary"
-                icon-right="picture_as_pdf"
-                no-caps
-                class="q-mr-md"
-                @click="openReportPdf()"
-            >
-                <QTooltip>
-                    {{ t('Open as PDF') }}
-                </QTooltip>
-            </QBtn>
-            <QBtn
-                :disabled="!dateRanges.from && !dateRanges.to"
-                color="primary"
-                icon-right="email"
-                no-caps
-                @click="openSendEmailDialog()"
-            >
-                <QTooltip>
-                    {{ t('Send to email') }}
-                </QTooltip>
-            </QBtn>
-        </div>
-        <QSpace />
-        <div id="st-actions"></div>
-    </QToolbar>
+    <Teleport to="#st-data" v-if="stateStore.isSubToolbarShown()">
+        <QBtn
+            v-if="dateRanges.from && dateRanges.to"
+            color="primary"
+            icon-right="picture_as_pdf"
+            no-caps
+            class="q-mr-md"
+            @click="openReportPdf()"
+        >
+            <QTooltip>
+                {{ t('Open as PDF') }}
+            </QTooltip>
+        </QBtn>
+        <QBtn
+            v-if="dateRanges.from && dateRanges.to"
+            color="primary"
+            icon-right="email"
+            no-caps
+            @click="openSendEmailDialog()"
+        >
+            <QTooltip>
+                {{ t('Send to email') }}
+            </QTooltip>
+        </QBtn>
+    </Teleport>
 
     <QPage class="column items-center q-pa-md">
         <QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above>