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

Merge pull request 'Add csv download feature and add descriptors' (#15) from feature/ms-29-NegativeBasesDetails into dev 

Reviewed-on: hyervoni/salix-front-mindshore#15
This commit is contained in:
Carlos Fonseca 2023-11-28 13:26:38 +00:00
parent ac39a2d398 7646934431
commit cc79d699f6
7 changed files with 83 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/composables/useNotify.js
View File

@ -2,10 +2,17 @@ import { Notify } from 'quasar';
import { i18n } from 'src/boot/i18n';
export default function useNotify() {
const notify = (message, type) => {
const notify = (message, type, icon) => {
const defaultIcons = {
warning: 'warning',
negative: 'error',
positive: 'check',
};
Notify.create({
message: i18n.global.t(message),
type: type,
icon: icon ? icon : defaultIcons[type],
});
};

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

@ -37,6 +37,7 @@ export default {
basicData: 'Basic data',
},
noSelectedRows: `You don't have any line selected`,
downloadCSVSuccess: 'CSV downloaded successfully',
},
errors: {
statusUnauthorized: 'Access denied',
@ -422,6 +423,9 @@ export default {
hasToInvoice: 'Has to Invoice',
verifiedData: 'Verified Data',
comercial: 'Comercial',
errors: {
downloadCsvFailed: 'CSV download failed',
},
},
},
shelving: {

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

@ -37,6 +37,7 @@ export default {
basicData: 'Datos básicos',
},
noSelectedRows: `No tienes ninguna línea seleccionada`,
downloadCSVSuccess: 'Descarga de CSV exitosa',
},
errors: {
statusUnauthorized: 'Acceso denegado',
@ -424,6 +425,9 @@ export default {
hasToInvoice: 'Facturar',
verifiedData: 'Datos comprobados',
comercial: 'Comercial',
errors: {
downloadCsvFailed: 'Error al descargar CSV',
},
},
},
shelving: {

87
src/pages/InvoiceOut/InvoiceOutNegativeBases.vue
View File

@ -1,21 +1,26 @@
<script setup>
import { onMounted, computed, ref } from 'vue';
import { onMounted, ref, reactive } from 'vue';
import { useI18n } from 'vue-i18n';
import CustomerDescriptorProxy from 'src/pages/Customer/Card/CustomerDescriptorProxy.vue';
import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
import invoiceOutService from 'src/services/invoiceOut.service';
import { toCurrency } from 'src/filters';
import { QBadge, QBtn, exportFile } from 'quasar';
import { QBadge, QBtn } from 'quasar';
import { useInvoiceOutGlobalStore } from 'src/stores/invoiceOutGlobal.js';
import { toDate } from 'src/filters';
const invoiceOutGlobalStore = useInvoiceOutGlobalStore();
const rows = ref([]);
const { t } = useI18n();
const payload = ref({
const dateRange = reactive({
from: Date.vnFirstDayOfMonth(),
to: Date.vnLastDayOfMonth(),
});
const selectedCustomerId = ref(0);
const selectedWorkerId = ref(0);
const filter = ref({
company: null,
@ -35,10 +40,12 @@ const tableColumnComponents = {
company: {
component: 'span',
props: {},
event: () => {},
},
country: {
component: 'span',
props: {},
event: () => {},
},
clientId: {
component: QBtn,
@ -48,34 +55,42 @@ const tableColumnComponents = {
client: {
component: 'span',
props: {},
event: () => {},
},
amount: {
component: 'span',
props: {},
event: () => {},
},
base: {
component: 'span',
props: {},
event: () => {},
},
ticketId: {
component: 'span',
props: {},
event: () => {},
},
active: {
component: 'span',
props: { type: 'boolean' },
event: () => {},
},
hasToInvoice: {
component: 'span',
props: { type: 'boolean' },
event: () => {},
},
verifiedData: {
component: 'span',
props: { type: 'boolean' },
event: () => {},
},
comercial: {
component: QBtn,
props: { flat: true, color: 'blue' },
event: (prop) => selectWorkerId(prop.row.comercialId),
},
};
@ -149,37 +164,8 @@ const columns = ref([
},
]);
const wrapCsvValue = (val, formatFn, row) => {
let formatted = formatFn !== void 0 ? formatFn(val, row) : val;
formatted = formatted === void 0 || formatted === null ? '' : String(formatted);
formatted = formatted.split('"').join('""');
return `"${formatted}"`;
};
const exportTable = () => {
const content = [columns.value.map((col) => wrapCsvValue(col.label))]
.concat(
rows.value.map((row) =>
columns.value
.map((col) =>
wrapCsvValue(
typeof col.field === 'function'
? col.field(row)
: row[col.field === void 0 ? col.name : col.field],
col.format,
row
)
)
.join(',')
)
)
.join('\r\n');
const status = exportFile('table-export.csv', content, 'text/csv');
if (status !== true) {
console.log('Browser denied file download...');
}
const downloadCSV = async () => {
invoiceOutGlobalStore.getNegativeBasesCsv(dateRange.from, dateRange.to);
};
const search = async () => {
@ -193,7 +179,7 @@ const search = async () => {
});
const params = {
...payload.value,
...dateRange,
filter: {
limit: 20,
where: { and },
@ -203,10 +189,8 @@ const search = async () => {
};
const refresh = () => {
payload.value = {
from: Date.vnFirstDayOfMonth(),
to: Date.vnLastDayOfMonth(),
};
dateRange.from = Date.vnFirstDayOfMonth();
dateRange.to = Date.vnLastDayOfMonth();
filter.value = {
company: null,
country: null,
@ -227,6 +211,10 @@ const selectCustomerId = (id) => {
selectedCustomerId.value = id;
};
const selectWorkerId = (id) => {
selectedWorkerId.value = id;
};
onMounted(async () => {
refresh();
});
@ -252,7 +240,7 @@ onMounted(async () => {
placeholder="dd-mm-aaa"
:label="t('invoiceOut.negativeBases.from')"
class="q-mr-md q"
:model-value="toDate(payload.from)"
:model-value="toDate(dateRange.from)"
>
<template #append>
<QIcon name="event" class="cursor-pointer">
@ -261,7 +249,7 @@ onMounted(async () => {
transition-show="scale"
transition-hide="scale"
>
<QDate v-model="payload.from">
<QDate v-model="dateRange.from">
<div class="row items-center justify-end">
<QBtn
v-close-popup
@ -275,7 +263,6 @@ onMounted(async () => {
</QIcon>
</template>
</QInput>
<QInput
dense
lazy-rules
@ -284,7 +271,7 @@ onMounted(async () => {
placeholder="dd-mm-aaa"
:label="t('invoiceOut.negativeBases.to')"
class="q-mr-md q"
:model-value="toDate(payload.to)"
:model-value="toDate(dateRange.to)"
>
<template #append>
<QIcon name="event" class="cursor-pointer">
@ -293,7 +280,7 @@ onMounted(async () => {
transition-show="scale"
transition-hide="scale"
>
<QDate v-model="payload.to">
<QDate v-model="dateRange.to">
<div class="row items-center justify-end">
<QBtn
v-close-popup
@ -311,7 +298,7 @@ onMounted(async () => {
color="primary"
icon-right="archive"
no-caps
@click="exportTable"
@click="downloadCSV()"
/>
</div>
</template>
@ -384,7 +371,15 @@ onMounted(async () => {
<QIcon name="" size="xs" />
</QBadge>
</span>
<CustomerDescriptorProxy :id="selectedCustomerId" />
<CustomerDescriptorProxy
v-if="props.col.name === 'clientId'"
:id="selectedCustomerId"
/>
<WorkerDescriptorProxy
v-if="props.col.name === 'comercial'"
:id="selectedWorkerId"
/>
</component>
</QTd>
</template>

2
src/pages/Supplier/Card/SupplierSummary.vue
View File

@ -73,8 +73,8 @@ const isAdministrative = computed(() => {
<span class="link">
{{ supplier.worker?.user?.nickname || '-' }}
<WorkerDescriptorProxy
:id="supplier.worker?.user?.id"
v-if="supplier.worker?.user?.id"
:id="supplier.worker?.user?.id"
/>
</span>
</template>

4
src/services/invoiceOut.service.js
View File

@ -21,6 +21,10 @@ const invoiceOutService = {
return await request('GET', 'InvoiceOuts/negativeBases', params);
},
getNegativeBasesCsv: async (params) => {
return await request('GET', 'InvoiceOuts/negativeBasesCsv', params);
},
getInvoiceDate: async (params) => {
return await request('GET', 'InvoiceOuts/getInvoiceDate', params);
},

21
src/stores/invoiceOutGlobal.js
View File

@ -2,6 +2,7 @@ import { defineStore } from 'pinia';
import { useUserConfig } from 'src/composables/useUserConfig';
import invoiceOutService from 'src/services/invoiceOut.service';
import useNotify from 'src/composables/useNotify.js';
import { exportFile } from 'quasar';
const { notify } = useNotify();
@ -257,6 +258,26 @@ export const useInvoiceOutGlobalStore = defineStore({
throw err;
},
async getNegativeBasesCsv(from, to) {
try {
const params = { from: from, to: to };
const CSVResponse = await invoiceOutService.getNegativeBasesCsv(params);
if (CSVResponse.data && CSVResponse.data.error) throw new Error();
const status = exportFile('negativeBases.csv', CSVResponse, {
encoding: 'windows-1252',
mimeType: 'text/csv;charset=windows-1252;',
});
if (status) {
notify('globals.downloadCSVSuccess', 'positive');
}
} catch (err) {
notify('invoiceOut.negativeBases.errors.downloadCsvFailed', 'negative');
}
},
// State mutations actions
setPrinterValue(printer) {