shihaam/akaunting
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add regex for adding thousands seperator

Browse Source
This commit is contained in:
benguozakinci@gmail.com 2021-09-29 13:20:31 +03:00
parent eeb26abf16
commit e13faac98e
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/Traits/Charts.php
View File

@ -152,6 +152,10 @@ trait Charts
}; };
const formattedCurrency = function (input, opt = moneySettings) { const formattedCurrency = function (input, opt = moneySettings) {
if (typeof input === 'number') {
input = input.toFixed(fixed(opt.precision))
}
function fixed (precision) { function fixed (precision) {
return Math.max(0, Math.min(precision, 20)); return Math.max(0, Math.min(precision, 20));
}; };
@ -179,7 +183,7 @@ trait Charts
var numbers = toStr(input).replace(/\D+/g, '') || '0'; var numbers = toStr(input).replace(/\D+/g, '') || '0';
var currency = numbersToCurrency(numbers, opt.precision); var currency = numbersToCurrency(numbers, opt.precision);
var parts = toStr(currency).split('.'); var parts = toStr(currency).split('.');
var integer = parts[0].replace(/(\d)(?=(?:\d{3})+\b)/gm, opt.thousands); var integer = parts[0].replace(/(\d)(?=(?:\d{3})+\b)/gm, ('$1' + opt.thousands));
var decimal = parts[1]; var decimal = parts[1];
if (opt.isPrefix == 1) { if (opt.isPrefix == 1) {
@ -204,6 +208,10 @@ trait Charts
}; };
const formattedCurrency = function (input, opt = moneySettings) { const formattedCurrency = function (input, opt = moneySettings) {
if (typeof input === 'number') {
input = input.toFixed(fixed(opt.precision))
}
function fixed (precision) { function fixed (precision) {
return Math.max(0, Math.min(precision, 20)); return Math.max(0, Math.min(precision, 20));
}; };
@ -231,7 +239,7 @@ trait Charts
var numbers = toStr(input).replace(/\D+/g, '') || '0'; var numbers = toStr(input).replace(/\D+/g, '') || '0';
var currency = numbersToCurrency(numbers, opt.precision); var currency = numbersToCurrency(numbers, opt.precision);
var parts = toStr(currency).split('.'); var parts = toStr(currency).split('.');
var integer = parts[0].replace(/(\d)(?=(?:\d{3})+\b)/gm, opt.thousands); var integer = parts[0].replace(/(\d)(?=(?:\d{3})+\b)/gm, ('$1' + opt.thousands));
var decimal = parts[1]; var decimal = parts[1];
if (opt.isPrefix == 1) { if (opt.isPrefix == 1) {