settings install for add new company

akaunting · Mar 28, 2019 · 9466551 · 9466551
1 parent 8773df6
commit 9466551
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 34 deletions.
diff --git a/.env.example b/.env.example
diff --git a/app/Http/Controllers/Common/Companies.php b/app/Http/Controllers/Common/Companies.php
@@ -65,10 +65,7 @@ public function store(Request $request)
 
         // 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 @@ public function disable(Company $company)
         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 @@ public function set(Company $company)
         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
@@ -26,6 +26,7 @@ private function create()
     {
         $company_id = $this->command->argument('company');
 
+        setting()->forgetAll();
         setting()->setExtraColumns(['company_id' => $company_id]);
 
         setting()->set([