ouyang/snipe-it
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added comma in US currency format [ch16628]

Browse Source 
Signed-off-by: snipe <snipe@snipe.net>
This commit is contained in:
snipe
2021-06-28 16:14:32 -07:00
parent 68c751fe63
commit d4e46ee41f
4 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/Helpers/Helper.php
View File

@@ -44,7 +44,11 @@ class Helper
public static function formatCurrencyOutput($cost)
{
if (is_numeric($cost)) {
return number_format($cost, 2, '.', '');
if (Setting::getSettings()->digit_separator=='1.234,56') {
return number_format($cost, 2, ',', '.');
}
return number_format($cost, 2, '.', ',');
}
// It's already been parsed.
return $cost;

1
app/Presenters/AssetPresenter.php
View File

@@ -145,7 +145,6 @@ class AssetPresenter extends Presenter
'searchable' => true,
'sortable' => true,
'title' => trans('general.purchase_cost'),
'formatter' => 'numberWithCommas',
'footerFormatter' => 'sumFormatter',
], [
'field' => 'order_number',

2
resources/macros/macros.php
View File

@@ -400,7 +400,7 @@ Form::macro('time_display_format', function ($name = 'time_display_format', $sel
Form::macro('digit_separator', function ($name = 'digit_separator', $selected = null, $class = null) {
$formats = [
'1234.56',
'1,234.56',
'1.234,56',
];

10
resources/views/partials/bootstrap-table.blade.php
View File

@@ -608,9 +608,13 @@
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, ".");
return parts.join(",");
var parts = value.toString().split(".");
parts[0] = parts[0].replace(/\B(?=(\d{3})+(?!\d))/g, ".");
return parts.join(",");
} else {
var parts = value.toString().split(",");
parts[0] = parts[0].replace(/\B(?=(\d{3})+(?!\d))/g, ",");
return parts.join(".");
}
return value
}