diff --git a/app/Http/ViewComposers/HeaderComposer.php b/app/Http/ViewComposers/HeaderComposer.php index 8dfa5fbee30f..a7b38b24cbb1 100644 --- a/app/Http/ViewComposers/HeaderComposer.php +++ b/app/Http/ViewComposers/HeaderComposer.php @@ -38,10 +38,13 @@ class HeaderComposer { if(!auth()->user()) return []; - / - //companies - $companies = auth()->user()->companies; + + $companies = auth()->user()->companies + //companies + $data['current_company'] = $companies->first(); + $data['companies'] = $companies; +/* $data['current_company'] = $companies->first(function ($company){ return $company->id == auth()->user()->company()->id; }); @@ -49,7 +52,7 @@ class HeaderComposer $data['companies'] = $companies->reject(function ($company){ return $company->id == auth()->user()->company()->id; }); - +*/ return $data; } diff --git a/app/Providers/ComposerServiceProvider.php b/app/Providers/ComposerServiceProvider.php index 8556932a8dd7..145f5f1ce4cb 100644 --- a/app/Providers/ComposerServiceProvider.php +++ b/app/Providers/ComposerServiceProvider.php @@ -22,7 +22,7 @@ class ComposerServiceProvider extends ServiceProvider */ public function boot() { - /* + view()->composer('*', 'App\Http\ViewComposers\HeaderComposer'); view()->composer( @@ -31,7 +31,7 @@ class ComposerServiceProvider extends ServiceProvider ], 'App\Http\ViewComposers\TranslationComposer' ); - */ + } /**