lunax/snipe_it
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity Actions

Merge pull request #10393 from aranar-pro/fix/#10365-Total-Purchase

Browse source 
Fixed #10365: Snipe-IT has a wrong total purchase cost when reaches m…
This commit is contained in:
snipe 2021-12-06 14:08:24 -08:00 • committed by GitHub
commit 0ba55e0eaf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
resources/views/partials/bootstrap-table.blade.php
View file

@ -637,7 +637,7 @@
decimalfixed = periodless.replace(/,/g,".");
} else {
// yank commas, that's it.
decimalfixed = number.toString().replace(",","");
decimalfixed = number.toString().replace(/\,/g,"");
}
return parseFloat(decimalfixed);
}
@ -646,8 +646,10 @@
if (Array.isArray(data)) {
var field = this.field;
var total_sum = data.reduce(function(sum, row) {
return (sum) + (cleanFloat(row[field]) || 0);
}, 0);
return numberWithCommas(total_sum.toFixed(2));
}
return 'not an array';
@ -679,6 +681,7 @@
}
function numberWithCommas(value) {
if ((value) && ("{{$snipeSettings->digit_separator}}" == "1.234,56")){
var parts = value.toString().split(".");
parts[0] = parts[0].replace(/\B(?=(\d{3})+(?!\d))/g, ".");