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

fixed #704

Browse Source
This commit is contained in:
denisdulici
2018-12-31 14:41:17 +03:00
parent a702d1ccba
commit 09366fa243
11 changed files with 85 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -14,6 +14,7 @@ use App\Traits\DateTime;
use App\Traits\Uploads;
use App\Utilities\Installer;
use App\Utilities\Modules;
use Date;
class Settings extends Controller
{
@ -26,20 +27,15 @@ class Settings extends Controller
*/
public function edit()
{
/*$setting = Setting::all()->pluck('value', 'key');*/
$setting = Setting::all()->map(function ($s) {
$s->key = str_replace('general.', '', $s->key);
return $s;
})->pluck('value', 'key');
$company_logo = $setting->pull('company_logo');
$setting['company_logo'] = Media::find($company_logo);
$invoice_logo = $setting->pull('invoice_logo');
$setting['invoice_logo'] = Media::find($invoice_logo);
$setting->put('company_logo', Media::find($setting->pull('company_logo')));
$setting->put('invoice_logo', Media::find($setting->pull('invoice_logo')));
$setting->put('financial_start', $this->getFinancialStart()->format('d F'));
$timezones = $this->getTimezones();
@ -165,6 +161,11 @@ class Settings extends Controller
$this->oneCompany($key, $value);
}
// Format financial year
if ($key == 'financial_start') {
$value = Date::parse($value)->format('d-m');
}
setting()->set('general.' . $key, $value);
}