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

closes #281

Browse Source
This commit is contained in:
denisdulici
2018-04-16 19:01:29 +03:00
parent 7897300cb8
commit d2b0a816e3
12 changed files with 130 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/Http/Controllers/Settings/Settings.php
View File

@ -47,7 +47,7 @@ class Settings extends Controller
$currencies = Currency::enabled()->pluck('name', 'code');
$taxes = Tax::enabled()->pluck('name', 'id');
$taxes = Tax::enabled()->get()->pluck('title', 'id');
$payment_methods = Modules::getPaymentMethods();
@ -56,7 +56,7 @@ class Settings extends Controller
'd F Y' => '31 December 2017',
'd m Y' => '31 12 2017',
'm d Y' => '12 31 2017',
'Y m d' => '2017 12 31'
'Y m d' => '2017 12 31',
];
$date_separators = [
@ -71,7 +71,12 @@ class Settings extends Controller
'mail' => trans('settings.email.php'),
'smtp' => trans('settings.email.smtp.name'),
'sendmail' => trans('settings.email.sendmail'),
'log' => trans('settings.email.log')
'log' => trans('settings.email.log'),
];
$percent_positions = [
'before' => trans('settings.localisation.percent.before'),
'after' => trans('settings.localisation.percent.after'),
];
return view('settings.settings.edit', compact(
@ -83,7 +88,8 @@ class Settings extends Controller
'payment_methods',
'date_formats',
'date_separators',
'email_protocols'
'email_protocols',
'percent_positions'
));
}