From bc9fbfb3fb1b456020998bfa6e420eab3974e7b5 Mon Sep 17 00:00:00 2001 From: denisdulici Date: Mon, 31 Dec 2018 18:07:56 +0300 Subject: [PATCH] fixed financial start --- app/Http/Controllers/Wizard/Companies.php | 6 ++++++ database/seeds/Settings.php | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/app/Http/Controllers/Wizard/Companies.php b/app/Http/Controllers/Wizard/Companies.php index b4f34ee11..bb4b2bd2c 100644 --- a/app/Http/Controllers/Wizard/Companies.php +++ b/app/Http/Controllers/Wizard/Companies.php @@ -6,6 +6,7 @@ use App\Http\Controllers\Controller; use App\Http\Requests\Wizard\Company as Request; use App\Models\Common\Company; use App\Traits\Uploads; +use Date; class Companies extends Controller { @@ -70,6 +71,11 @@ class Companies extends Controller } } + // Format financial year + if ($key == 'financial_start') { + $value = Date::parse($value)->format('d-m'); + } + setting()->set('general.' . $key, $value); } diff --git a/database/seeds/Settings.php b/database/seeds/Settings.php index 7b7ec7c8c..de11f8aba 100644 --- a/database/seeds/Settings.php +++ b/database/seeds/Settings.php @@ -28,7 +28,7 @@ class Settings extends Seeder $company_id = $this->command->argument('company'); Setting::set([ - 'general.financial_start' => Date::now()->startOfYear()->format('d F'), + 'general.financial_start' => Date::now()->startOfYear()->format('d-m'), 'general.timezone' => 'Europe/London', 'general.date_format' => 'd M Y', 'general.date_separator' => 'space',