From 9466551f0f33e23ef0f113222f2bcb9af6020be8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mehmet=20=C3=87OBAN?= <mehmetcoban8489@gmail.com>
Date: Thu, 28 Mar 2019 17:54:06 +0300
Subject: [PATCH] settings install for add new company

---
 .env.example                              | 30 -----------------------
 app/Http/Controllers/Common/Companies.php |  9 ++++---
 database/seeds/Settings.php               |  1 +
 3 files changed, 6 insertions(+), 34 deletions(-)
 delete mode 100644 .env.example

diff --git a/.env.example b/.env.example
deleted file mode 100644
index a6faea667..000000000
--- a/.env.example
+++ /dev/null
@@ -1,30 +0,0 @@
-APP_NAME=Akaunting
-APP_ENV=production
-APP_LOCALE=en-GB
-APP_INSTALLED=false
-APP_KEY=
-APP_DEBUG=true
-APP_LOG_LEVEL=debug
-APP_SCHEDULE_TIME="09:00"
-
-DB_CONNECTION=mysql
-DB_HOST=localhost
-DB_PORT=3306
-DB_DATABASE=
-DB_USERNAME=
-DB_PASSWORD=
-DB_PREFIX=
-
-BROADCAST_DRIVER=log
-CACHE_DRIVER=file
-SESSION_DRIVER=file
-QUEUE_DRIVER=database
-
-MAIL_DRIVER=mail
-MAIL_HOST=localhost
-MAIL_PORT=2525
-MAIL_USERNAME=null
-MAIL_PASSWORD=null
-MAIL_ENCRYPTION=null
-MAIL_FROM_NAME=null
-MAIL_FROM_ADDRESS=null
diff --git a/app/Http/Controllers/Common/Companies.php b/app/Http/Controllers/Common/Companies.php
index db86c74d0..60dea9433 100644
--- a/app/Http/Controllers/Common/Companies.php
+++ b/app/Http/Controllers/Common/Companies.php
@@ -65,10 +65,7 @@ class Companies extends Controller
 
         // Create company
         $company = Company::create($request->input());
-
-        setting()->forgetAll();
-        setting()->setExtraColumns(['company_id' => $company->id]);
-
+        
         // Create settings
         setting()->set('general.company_name', $request->get('company_name'));
         setting()->set('general.company_email', $request->get('company_email'));
@@ -223,6 +220,8 @@ class Companies extends Controller
         if (!$this->isUserCompany($company)) {
             $message = trans('companies.error.not_user_company');
 
+            Overrider::load('settings');
+
             flash($message)->error();
 
             return redirect()->route('companies.index');
@@ -278,6 +277,8 @@ class Companies extends Controller
         if ($this->isUserCompany($company)) {
             session(['company_id' => $company->id]);
 
+            Overrider::load('settings');
+
             event(new CompanySwitched($company));
         }
 
diff --git a/database/seeds/Settings.php b/database/seeds/Settings.php
index a9b0b9933..4be7ea05f 100644
--- a/database/seeds/Settings.php
+++ b/database/seeds/Settings.php
@@ -26,6 +26,7 @@ class Settings extends Seeder
     {
         $company_id = $this->command->argument('company');
 
+        setting()->forgetAll();
         setting()->setExtraColumns(['company_id' => $company_id]);
 
         setting()->set([