improved finish update command

akaunting · Apr 22, 2021 · 5aec526 · 5aec526
1 parent 110fe68
commit 5aec526
Showing 1 changed file with 9 additions and 8 deletions.
diff --git a/app/Console/Commands/FinishUpdate.php b/app/Console/Commands/FinishUpdate.php
@@ -3,7 +3,6 @@
 namespace App\Console\Commands;
 
 use App\Events\Install\UpdateFinished;
-use App\Models\Common\Company;
 use Illuminate\Console\Command;
 
 class FinishUpdate extends Command
@@ -48,16 +47,18 @@ public function handle()
             throw new \Exception(trans('modules.errors.finish', ['module' => $alias]));
         }
 
-        // Set locale for modules
-        if ($alias != 'core') {
-            $company = Company::find($company_id);
+        $company = company($company_id);
 
-            if (!empty($company->locale)) {
-                app()->setLocale($company->locale);
-            }
+        if (empty($company)) {
+            return;
         }
 
-        company($company_id)->makeCurrent();
+        $company->makeCurrent();
+
+        // Set locale for modules
+        if (($alias != 'core') && !empty($company->locale)) {
+            app()->setLocale($company->locale);
+        }
 
         // Disable model cache during update
         config(['laravel-model-caching.enabled' => false]);