diff --git a/resources/views/partials/bootstrap-table.blade.php b/resources/views/partials/bootstrap-table.blade.php index 7138ecf80..04f5d4cd7 100644 --- a/resources/views/partials/bootstrap-table.blade.php +++ b/resources/views/partials/bootstrap-table.blade.php @@ -595,11 +595,23 @@ } } + function cleanFloat(number) { + if ("{{$snipeSettings->digit_separator}}" == "1.234,56") { + // yank periods, change commas to periods + periodless = number.toString().replace("\.",""); + decimalfixed = periodless.replace(",","."); + } else { + // yank commas, that's it. + decimalfixed = number.toString().replace(",",""); + } + return parseFloat(decimalfixed); + } + function sumFormatter(data) { if (Array.isArray(data)) { var field = this.field; var total_sum = data.reduce(function(sum, row) { - return (sum) + (parseFloat(row[field]) || 0); + return (sum) + (cleanFloat(row[field]) || 0); }, 0); return numberWithCommas(total_sum.toFixed(2)); }