resolve conflicts with dev

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',
+        },
     },
 };

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',
+        },
     },
 };

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,10 +115,9 @@ onMounted(async () => {
 </script>
 
 <template>
-    <QToolbar v-if="rows && rows.length > 0" class="bg-vn-dark justify-end">
-        <div id="st-data">
+    <Teleport to="#st-data" v-if="stateStore.isSubToolbarShown()">
         <QBtn
-                :disabled="!dateRanges.from && !dateRanges.to"
+            v-if="dateRanges.from && dateRanges.to"
             color="primary"
             icon-right="picture_as_pdf"
             no-caps
@@ -132,7 +129,7 @@ onMounted(async () => {
             </QTooltip>
         </QBtn>
         <QBtn
-                :disabled="!dateRanges.from && !dateRanges.to"
+            v-if="dateRanges.from && dateRanges.to"
             color="primary"
             icon-right="email"
             no-caps
@@ -142,10 +139,7 @@ onMounted(async () => {
                 {{ t('Send to email') }}
             </QTooltip>
         </QBtn>
-        </div>
-        <QSpace />
-        <div id="st-actions"></div>
-    </QToolbar>
+    </Teleport>
 
     <QPage class="column items-center q-pa-md">
         <QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above>