verdnatura/salix-front
verdnatura
/
salix-front
2
2
Fork 1
Code Issues Pull Requests 85 Releases Wiki Activity

#7936 improve InvoiceIn #1004

Merged
jorgep merged 55 commits from 7936-improveInvoiceIn into dev 2024-12-18 09:22:09 +00:00
Conversation 0 Commits 55 Files Changed 36 +4 -5
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit cc7432b253 - Show all commits

5
src/composables/getTotal.js
View File

@ -1,11 +1,10 @@
import { toCurrency } from 'src/filters'; import { toCurrency } from 'src/filters';
export function getTotal(rows, key, opts = {}) { export function getTotal(rows, key, opts = {}) {
const { currency, cb, decimalPlaces, int } = opts; const { currency, cb, decimalPlaces } = opts;
jorgep marked this conversation as resolved Outdated
alexm commented 2024-12-10 08:23:28 +00:00
Outdated
Review
Copy Link

int?

int?
const total = rows.reduce((acc, row) => acc + +(cb ? cb(row) : row[key] || 0), 0); const total = rows.reduce((acc, row) => acc + +(cb ? cb(row) : row[key] || 0), 0);
const decimals = int ? 0 : decimalPlaces ?? 2;
return currency return currency
? toCurrency(total, currency == 'default' ? undefined : currency) ? toCurrency(total, currency == 'default' ? undefined : currency)
: parseFloat(total).toFixed(decimals); : parseFloat(total).toFixed(decimalPlaces ?? 2);
} }

2
src/pages/InvoiceIn/Card/InvoiceInIntrastat.vue
View File

@ -146,7 +146,7 @@ const columns = computed(() => [
{{ getTotal(rows, 'net') }} {{ getTotal(rows, 'net') }}
</QTd> </QTd>
<QTd> <QTd>
{{ getTotal(rows, 'stems', { int: true }) }} {{ getTotal(rows, 'stems', { decimalPlaces: 0 }) }}
</QTd> </QTd>
<QTd /> <QTd />
</QTr> </QTr>

2
test/vitest/__tests__/composables/getTotal.spec.js
View File

@ -33,7 +33,7 @@ describe('getTotal()', () => {
}); });
it('should calculate the total with integer formatting', () => { it('should calculate the total with integer formatting', () => {
const total = getTotal(rows, 'amount', { int: true }); const total = getTotal(rows, 'amount', { decimalPlaces: 0 });
expect(total).toBe('62'); expect(total).toBe('62');
}); });