diff --git a/packages/Webkul/Admin/src/Providers/AdminServiceProvider.php b/packages/Webkul/Admin/src/Providers/AdminServiceProvider.php index 97f1f36ec..63e25dc28 100755 --- a/packages/Webkul/Admin/src/Providers/AdminServiceProvider.php +++ b/packages/Webkul/Admin/src/Providers/AdminServiceProvider.php @@ -3,9 +3,6 @@ namespace Webkul\Admin\Providers; use Illuminate\Support\ServiceProvider; -use Webkul\Admin\Providers\EventServiceProvider; -use Illuminate\Contracts\Debug\ExceptionHandler; -use Webkul\Admin\Exceptions\Handler; use Webkul\Core\Tree; class AdminServiceProvider extends ServiceProvider @@ -32,11 +29,6 @@ class AdminServiceProvider extends ServiceProvider $this->registerACL(); $this->app->register(EventServiceProvider::class); - - $this->app->bind( - ExceptionHandler::class, - Handler::class - ); } /** @@ -96,7 +88,7 @@ class AdminServiceProvider extends ServiceProvider view()->composer(['admin::users.roles.create', 'admin::users.roles.edit'], function ($view) { $view->with('acl', $this->createACL()); }); - + view()->composer(['admin::catalog.products.create'], function ($view) { $items = array(); diff --git a/packages/Webkul/Admin/src/Exceptions/Handler.php b/packages/Webkul/Core/src/Exceptions/Handler.php similarity index 92% rename from packages/Webkul/Admin/src/Exceptions/Handler.php rename to packages/Webkul/Core/src/Exceptions/Handler.php index 42328c22b..a475e08eb 100755 --- a/packages/Webkul/Admin/src/Exceptions/Handler.php +++ b/packages/Webkul/Core/src/Exceptions/Handler.php @@ -1,15 +1,15 @@ 'Resource not found', diff --git a/packages/Webkul/Core/src/Providers/CoreServiceProvider.php b/packages/Webkul/Core/src/Providers/CoreServiceProvider.php index dcc7c0e89..b60cdd31e 100755 --- a/packages/Webkul/Core/src/Providers/CoreServiceProvider.php +++ b/packages/Webkul/Core/src/Providers/CoreServiceProvider.php @@ -2,11 +2,13 @@ namespace Webkul\Core\Providers; +use Illuminate\Contracts\Debug\ExceptionHandler; use Illuminate\Database\Eloquent\Factory as EloquentFactory; use Illuminate\Support\ServiceProvider; use Illuminate\Support\Facades\Validator; use Illuminate\Foundation\AliasLoader; use Webkul\Core\Core; +use Webkul\Core\Exceptions\Handler; use Webkul\Core\Facades\Core as CoreFacade; use Webkul\Core\Models\SliderProxy; use Webkul\Core\Observers\SliderObserver; @@ -41,6 +43,11 @@ class CoreServiceProvider extends ServiceProvider dirname(__DIR__) . '/Config/concord.php' => config_path('concord.php'), ]); + $this->app->bind( + ExceptionHandler::class, + Handler::class + ); + SliderProxy::observe(SliderObserver::class); } diff --git a/packages/Webkul/Shop/src/Exceptions/Handler.php b/packages/Webkul/Shop/src/Exceptions/Handler.php deleted file mode 100644 index aea627dd0..000000000 --- a/packages/Webkul/Shop/src/Exceptions/Handler.php +++ /dev/null @@ -1,79 +0,0 @@ - 'Resource not found', - 403 => '403 forbidden Error', - 401 => 'Unauthenticated', - 500 => '500 Internal Server Error', - ]; - - /** - * Render an exception into an HTTP response. - * - * @param \Illuminate\Http\Request $request - * @param \Exception $exception - * @return \Illuminate\Http\Response - */ - public function render($request, Exception $exception) - { - $path = 'shop'; - - if ($exception instanceof HttpException) { - $statusCode = in_array($exception->getStatusCode(), [401, 403, 404, 503]) ? $exception->getStatusCode() : 500; - - return $this->response($path, $statusCode); - } elseif ($exception instanceof ModelNotFoundException) { - return $this->response($path, 404); - } elseif ($exception instanceof PDOException) { - return $this->response($path, 500); - } - - return parent::render($request, $exception); - } - - /** - * Convert an authentication exception into a response. - * - * @param \Illuminate\Http\Request $request - * @param \Illuminate\Auth\AuthenticationException $exception - * @return \Illuminate\Http\Response - */ - protected function unauthenticated($request, AuthenticationException $exception) - { - if ($request->expectsJson()) { - return response()->json(['error' => $this->jsonErrorMessages[401]], 401); - } - - return redirect()->guest(route('auth.login')); - } - - private function isSopUri() - { - return strpos(\Illuminate\Support\Facades\Request::path(), 'shop') !== false ? true : false; - } - - private function response($path, $statusCode) - { - if (request()->expectsJson()) { - return response()->json([ - 'error' => isset($this->jsonErrorMessages[$statusCode]) - ? $this->jsonErrorMessages[$statusCode] - : 'Something went wrong, please try again later.' - ], $statusCode); - } - - return response()->view("{$path}::errors.{$statusCode}", [], $statusCode); - } -} \ No newline at end of file