fix: fix _header blade include (#3587)

monicahq · Feb 16, 2020 · 4bd5edc · 4bd5edc
1 parent 0d60218
commit 4bd5edc
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/app/Http/Controllers/Contacts/DebtController.php b/app/Http/Controllers/Contacts/DebtController.php
@@ -3,6 +3,7 @@
 namespace App\Http\Controllers\Contacts;
 
 use App\Models\Contact\Debt;
+use App\Helpers\AccountHelper;
 use App\Models\Contact\Contact;
 use App\Http\Controllers\Controller;
 use App\Http\Requests\People\DebtRequest;
@@ -33,6 +34,7 @@ public function create(Contact $contact)
     {
         return view('people.debt.add')
             ->withContact($contact)
+            ->withAccountHasLimitations(AccountHelper::hasLimitations(auth()->user()->account))
             ->withDebt(new Debt);
     }
 
@@ -87,6 +89,7 @@ public function edit(Contact $contact, Debt $debt)
     {
         return view('people.debt.edit')
             ->withContact($contact)
+            ->withAccountHasLimitations(AccountHelper::hasLimitations(auth()->user()->account))
             ->withDebt($debt);
     }
 

diff --git a/app/Http/Controllers/Contacts/RemindersController.php b/app/Http/Controllers/Contacts/RemindersController.php
@@ -3,6 +3,7 @@
 namespace App\Http\Controllers\Contacts;
 
 use Illuminate\Http\Request;
+use App\Helpers\AccountHelper;
 use App\Models\Contact\Contact;
 use App\Models\Contact\Reminder;
 use App\Http\Controllers\Controller;
@@ -23,6 +24,7 @@ public function create(Contact $contact)
     {
         return view('people.reminders.add')
             ->withContact($contact)
+            ->withAccountHasLimitations(AccountHelper::hasLimitations(auth()->user()->account))
             ->withReminder(new Reminder);
     }
 
@@ -64,6 +66,7 @@ public function edit(Contact $contact, Reminder $reminder)
     {
         return view('people.reminders.edit')
             ->withContact($contact)
+            ->withAccountHasLimitations(AccountHelper::hasLimitations(auth()->user()->account))
             ->withReminder($reminder);
     }
 

diff --git a/app/Http/Controllers/SettingsController.php b/app/Http/Controllers/SettingsController.php
@@ -157,7 +157,7 @@ public function reset(Request $request)
     public function export()
     {
         return view('settings.export')
-            ->with('accountHasLimitations', AccountHelper::hasLimitations(auth()->user()->account));
+            ->withAccountHasLimitations(AccountHelper::hasLimitations(auth()->user()->account));
     }
 
     /**
@@ -360,7 +360,7 @@ public function deleteAdditionalUser($userID)
     public function tags()
     {
         return view('settings.tags')
-            ->with('accountHasLimitations', AccountHelper::hasLimitations(auth()->user()->account));
+            ->withAccountHasLimitations(AccountHelper::hasLimitations(auth()->user()->account));
     }
 
     /**
@@ -384,7 +384,7 @@ public function deleteTag($tagId)
     public function api()
     {
         return view('settings.api.index')
-            ->with('accountHasLimitations', AccountHelper::hasLimitations(auth()->user()->account));
+            ->withAccountHasLimitations(AccountHelper::hasLimitations(auth()->user()->account));
     }
 
     public function dav()
@@ -397,7 +397,7 @@ public function dav()
                 ->withCardDavRoute("{$davroute}/addressbooks/{$email}/contacts")
                 ->withCalDavBirthdaysRoute("{$davroute}/calendars/{$email}/birthdays")
                 ->withCalDavTasksRoute("{$davroute}/calendars/{$email}/tasks")
-                ->with('accountHasLimitations', AccountHelper::hasLimitations(auth()->user()->account));
+                ->withAccountHasLimitations(AccountHelper::hasLimitations(auth()->user()->account));
     }
 
     public function security()
@@ -411,7 +411,7 @@ public function security()
             ->with('is2FAActivated', Google2FA::isActivated())
             ->with('currentkeys', U2fKeyResource::collection($u2fKeys))
             ->withWebauthnKeys(WebauthnKeyResource::collection($webauthnKeys))
-            ->with('accountHasLimitations', AccountHelper::hasLimitations(auth()->user()->account));
+            ->withAccountHasLimitations(AccountHelper::hasLimitations(auth()->user()->account));
     }
 
     /**