DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-25 21:54:14 -08:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop'

Browse source
This commit is contained in:
snipe 2021-08-17 22:01:23 -07:00
parent d70e4e04c0 b5e69d6678
commit b5bb74b8ca
5 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/Helpers/Helper.php
View file

@ -46,7 +46,10 @@ class Helper
public static function formatCurrencyOutput($cost) public static function formatCurrencyOutput($cost)
{ {
if (is_numeric($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. // It's already been parsed.
return $cost; return $cost;

1
app/Presenters/AssetPresenter.php
View file

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

2
database/migrations/2020_12_14_233815_add_digit_separator_to_settings.php
View file

@ -14,7 +14,7 @@ class AddDigitSeparatorToSettings extends Migration
public function up() public function up()
{ {
Schema::table('settings', function (Blueprint $table) { Schema::table('settings', function (Blueprint $table) {
$table->char('digit_separator')->nullable()->default('1234.56'); $table->char('digit_separator')->nullable()->default('1,234.56');
}); });
} }

2
resources/macros/macros.php
View file

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

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

@ -608,9 +608,13 @@
function numberWithCommas(value) { function numberWithCommas(value) {
if ((value) && ("{{$snipeSettings->digit_separator}}" == "1.234,56")){ if ((value) && ("{{$snipeSettings->digit_separator}}" == "1.234,56")){
var parts = value.toString().split("."); var parts = value.toString().split(".");
parts[0] = parts[0].replace(/\B(?=(\d{3})+(?!\d))/g, "."); parts[0] = parts[0].replace(/\B(?=(\d{3})+(?!\d))/g, ".");
return parts.join(","); return parts.join(",");
} else {
var parts = value.toString().split(",");
parts[0] = parts[0].replace(/\B(?=(\d{3})+(?!\d))/g, ",");
return parts.join(".");
} }
return value return value
} }