moved wizard check to middleware

app/Http/Controllers/Auth/Login.php

@@ -79,12 +79,7 @@ class Login extends Controller
             return redirect($path);
         }
 
-        // Check wizard
+        return redirect()->intended('wizard');
-        if (!setting('general.wizard', false)) {
-            return redirect('wizard');
-        }
-
-        return redirect()->intended('/');
     }
 
     public function destroy()

app/Http/Controllers/Wizard/Companies.php

@@ -19,10 +19,6 @@ class Companies extends Controller
      */
     public function edit()
     {
-        if (setting('general.wizard', false)) {
-            return redirect('/');
-        }
-
         $company = Company::find(session('company_id'));
 
         $company->setSettings();

app/Http/Controllers/Wizard/Currencies.php

@@ -13,16 +13,10 @@ class Currencies extends Controller
     /**
      * Show the form for editing the specified resource.
      *
-     * @param  Currency  $currency
-     *
      * @return Response
      */
     public function index()
     {
-        if (setting('general.wizard', false)) {
-            return redirect('/');
-        }
-
         $currencies = Currency::all();
 
         return view('wizard.currencies.index', compact('currencies'));
@@ -35,10 +29,6 @@ class Currencies extends Controller
      */
     public function create()
     {
-        if (setting('general.wizard', false)) {
-            return redirect('/');
-        }
-
         // Get current currencies
         $current = Currency::pluck('code')->toArray();
 
@@ -105,10 +95,6 @@ class Currencies extends Controller
      */
     public function edit(Currency $currency)
     {
-        if (setting('general.wizard', false)) {
-            return redirect('/');
-        }
-
         // Get current currencies
         $current = Currency::pluck('code')->toArray();
 

app/Http/Controllers/Wizard/Finish.php

@@ -17,10 +17,6 @@ class Finish extends Controller
      */
     public function index()
     {
-        if (setting('general.wizard', false)) {
-            return redirect('/');
-        }
-
         setting()->set('general.wizard', true);
 
         // Save all settings

app/Http/Controllers/Wizard/Taxes.php

@@ -15,10 +15,6 @@ class Taxes extends Controller
      */
     public function index()
     {
-        if (setting('general.wizard', false)) {
-            return redirect('/');
-        }
-
         $taxes = Tax::all();
 
         return view('wizard.taxes.index', compact('taxes'));
@@ -31,10 +27,6 @@ class Taxes extends Controller
      */
     public function create()
     {
-        if (setting('general.wizard', false)) {
-            return redirect('/');
-        }
-
         $html = view('wizard.taxes.create', compact('codes'))->render();
 
         return response()->json([
@@ -75,10 +67,6 @@ class Taxes extends Controller
      */
     public function edit(Tax $tax)
     {
-        if (setting('general.wizard', false)) {
-            return redirect('/');
-        }
-
         $item = $tax;
 
         $html = view('wizard.taxes.edit', compact('item'))->render();

app/Http/Kernel.php

@@ -36,6 +36,7 @@ class Kernel extends HttpKernel
             \App\Http\Middleware\VerifyCsrfToken::class,
             \Illuminate\Routing\Middleware\SubstituteBindings::class,
             \App\Http\Middleware\RedirectIfNotInstalled::class,
+            \App\Http\Middleware\RedirectIfWizardCompleted::class,
             \App\Http\Middleware\AddXHeader::class,
             'company.settings',
             'company.currencies',
@@ -83,7 +84,6 @@ class Kernel extends HttpKernel
             'signed-url',
             'signed-url.company',
             \Illuminate\Routing\Middleware\SubstituteBindings::class,
-            \App\Http\Middleware\RedirectIfNotInstalled::class,
             \App\Http\Middleware\AddXHeader::class,
             'company.settings',
             'company.currencies',

app/Http/Middleware/RedirectIfWizardCompleted.php

@@ -0,0 +1,31 @@
+<?php
+
+namespace App\Http\Middleware;
+
+use Closure;
+
+class RedirectIfWizardCompleted
+{
+    /**
+     * Handle an incoming request.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @param  \Closure  $next
+     * @return mixed
+     */
+    public function handle($request, Closure $next)
+    {
+        // Not in wizard
+        if (!starts_with($request->getPathInfo(), '/wizard')) {
+            return $next($request);
+        }
+
+        // Wizard not completed
+        if (!setting('general.wizard', 0)) {
+            return $next($request);
+        }
+
+        // Wizard completed, redirect to home
+        redirect()->intended('/')->send();
+    }
+}

config/setting.php

@@ -67,4 +67,20 @@ return [
 	'override' => [
 		
 	],
+
+    /*
+    |--------------------------------------------------------------------------
+    | Required Extra Columns
+    |--------------------------------------------------------------------------
+    |
+    | The list of columns required to be set up
+    |
+    | Sample:
+    |   "user_id",
+    |   "tenant_id",
+    |
+    */
+    'required_extra_columns' => [
+        'company_id'
+    ],
 ];