diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php index 3ea3eaf..af9c0b8 100644 --- a/app/Http/Controllers/Auth/LoginController.php +++ b/app/Http/Controllers/Auth/LoginController.php @@ -46,7 +46,7 @@ class LoginController extends Controller { $this->validateLogin($request); - if (Auth::attempt(array_merge($this->credentials($request),['active'=>TRUE]))) { + if (Auth::attempt(array_merge($this->credentials($request),['active'=>TRUE,'site_id'=>config('site')->site_id]))) { $request->session()->regenerate(); return $this->sendLoginResponse($request); diff --git a/app/Http/Middleware/SetSite.php b/app/Http/Middleware/SetSite.php index 24cbbdd..4c19804 100644 --- a/app/Http/Middleware/SetSite.php +++ b/app/Http/Middleware/SetSite.php @@ -43,7 +43,7 @@ class SetSite } // Set who we are in SETUP. - Config::set('SITE',$so); + Config::set('site',$so); if (! $request->ajax()) View::share('site',$so); diff --git a/app/Models/Product.php b/app/Models/Product.php index c98e326..29996fe 100644 --- a/app/Models/Product.php +++ b/app/Models/Product.php @@ -100,7 +100,7 @@ class Product extends Model implements IDs private function getDefaultLanguage() { - return config('SITE')->language; + return config('site')->language; } public function getDescriptionAttribute() diff --git a/resources/views/theme/frontend/metronic/layouts/partials/sidebar.blade.php b/resources/views/theme/frontend/metronic/layouts/partials/sidebar.blade.php deleted file mode 100644 index e69de29..0000000 diff --git a/resources/views/vendor/adminlte/layouts/partials/footer.blade.php b/resources/views/vendor/adminlte/layouts/partials/footer.blade.php new file mode 100644 index 0000000..600a32e --- /dev/null +++ b/resources/views/vendor/adminlte/layouts/partials/footer.blade.php @@ -0,0 +1,10 @@ + + \ No newline at end of file diff --git a/resources/views/vendor/metronic/layouts/partials/footer.blade.php b/resources/views/vendor/metronic/layouts/partials/footer.blade.php new file mode 100644 index 0000000..f2ed1bf --- /dev/null +++ b/resources/views/vendor/metronic/layouts/partials/footer.blade.php @@ -0,0 +1,99 @@ +{{-- This page needs $site_social --}} + + + + + + + +