wbuezas
/
salix-front-mindshore-fork2
forked from verdnatura/salix-front
0
0
Fork 0
Code Pull Requests Activity

resolve conflicts with dev

This commit is contained in:
William Buezas 2024-01-31 11:27:08 -03:00
parent cb51445ead
commit aa40a3b0f5
3 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/i18n/en/index.js
View File

@ -1105,5 +1105,8 @@ export default {
editPictureForm: { editPictureForm: {
allowedFilesText: 'Allowed file types: { allowedContentTypes }', allowedFilesText: 'Allowed file types: { allowedContentTypes }',
}, },
VnLv: {
copyText: '{copyValue} has been copied to the clipboard',
},
}, },
}; };

3
src/i18n/es/index.js
View File

@ -1105,5 +1105,8 @@ export default {
editPictureForm: { editPictureForm: {
allowedFilesText: 'Tipos de archivo permitidos: { allowedContentTypes }', allowedFilesText: 'Tipos de archivo permitidos: { allowedContentTypes }',
}, },
VnLv: {
copyText: '{copyValue} se ha copiado al portapepeles',
},
}, },
}; };

60
src/pages/Supplier/Card/SupplierConsumption.vue
View File

@ -105,10 +105,8 @@ const sendCampaignMetricsEmail = ({ address }) => {
}); });
}; };
const calculateTotal = (buysArray) => { const calculateTotal = (buysArray = []) =>
if (!buysArray || !buysArray.length > 0) return; buysArray.reduce((accumulator, { total }) => accumulator + total, 0);
return buysArray.reduce((accumulator, { total }) => accumulator + total, 0);
};
onMounted(async () => { onMounted(async () => {
stateStore.rightDrawer = true; stateStore.rightDrawer = true;
@ -117,35 +115,31 @@ onMounted(async () => {
</script> </script>
<template> <template>
<QToolbar v-if="rows && rows.length > 0" class="bg-vn-dark justify-end"> <Teleport to="#st-data" v-if="stateStore.isSubToolbarShown()">
<div id="st-data"> <QBtn
<QBtn v-if="dateRanges.from && dateRanges.to"
:disabled="!dateRanges.from && !dateRanges.to" color="primary"
color="primary" icon-right="picture_as_pdf"
icon-right="picture_as_pdf" no-caps
no-caps class="q-mr-md"
class="q-mr-md" @click="openReportPdf()"
@click="openReportPdf()" >
> <QTooltip>
<QTooltip> {{ t('Open as PDF') }}
{{ t('Open as PDF') }} </QTooltip>
</QTooltip> </QBtn>
</QBtn> <QBtn
<QBtn v-if="dateRanges.from && dateRanges.to"
:disabled="!dateRanges.from && !dateRanges.to" color="primary"
color="primary" icon-right="email"
icon-right="email" no-caps
no-caps @click="openSendEmailDialog()"
@click="openSendEmailDialog()" >
> <QTooltip>
<QTooltip> {{ t('Send to email') }}
{{ t('Send to email') }} </QTooltip>
</QTooltip> </QBtn>
</QBtn> </Teleport>
</div>
<QSpace />
<div id="st-actions"></div>
</QToolbar>
<QPage class="column items-center q-pa-md"> <QPage class="column items-center q-pa-md">
<QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above> <QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above>