From 8d9627c1948ff8d43a7b19d8d60862dd299d7a8a Mon Sep 17 00:00:00 2001 From: rahul shukla Date: Thu, 25 Oct 2018 10:38:51 +0530 Subject: [PATCH 1/5] customer changes --- .../src/DataGrids/CustomerGroupDataGrid.php | 24 ++----------------- .../Customer/CustomerGroupController.php | 4 ++-- .../views/customers/create.blade.php | 2 +- .../Resources/views/customers/edit.blade.php | 2 +- .../views/customers/group/create.blade.php | 19 ++++----------- .../views/customers/group/edit.blade.php | 20 ++++------------ .../Customer/src/Models/CustomerGroup.php | 2 +- 7 files changed, 15 insertions(+), 58 deletions(-) diff --git a/packages/Webkul/Admin/src/DataGrids/CustomerGroupDataGrid.php b/packages/Webkul/Admin/src/DataGrids/CustomerGroupDataGrid.php index c2254f226..d62eacc05 100644 --- a/packages/Webkul/Admin/src/DataGrids/CustomerGroupDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/CustomerGroupDataGrid.php @@ -84,30 +84,17 @@ class CustomerGroupDataGrid 'sortable' => true, ], [ - 'name' => 'cg.group_name', + 'name' => 'cg.name', 'alias' => 'Name', 'type' => 'string', 'label' => 'Name', 'sortable' => true, ], - [ - 'name' => 'cg.is_user_defined', - 'alias' => 'User Defined', - 'type' => 'boolean', - 'label' => 'User Defined', - 'sortable' => true, - 'wrapper' => function ($value) { - if($value == 1) - return "False"; - else - return "True"; - }, - ], ], //don't use aliasing in case of filters 'filterable' => [ [ - 'column' => 'cg.group_name', + 'column' => 'cg.name', 'alias' => 'Name', 'type' => 'string', 'label' => 'Name' @@ -118,12 +105,6 @@ class CustomerGroupDataGrid 'type' => 'number', 'label' => 'ID' ], - [ - 'column' => 'cg.is_user_defined', - 'alias' => 'User Defined', - 'type' => 'boolean', - 'label' => 'User Defined' - ] ], //don't use aliasing in case of searchables 'searchable' => [ @@ -158,6 +139,5 @@ class CustomerGroupDataGrid public function render() { return $this->createCustomerGroupDataGrid()->render(); - } } \ No newline at end of file diff --git a/packages/Webkul/Admin/src/Http/Controllers/Customer/CustomerGroupController.php b/packages/Webkul/Admin/src/Http/Controllers/Customer/CustomerGroupController.php index 3d3759235..68c9ac975 100644 --- a/packages/Webkul/Admin/src/Http/Controllers/Customer/CustomerGroupController.php +++ b/packages/Webkul/Admin/src/Http/Controllers/Customer/CustomerGroupController.php @@ -70,7 +70,7 @@ class CustomerGroupController extends Controller public function store() { $this->validate(request(), [ - 'group_name' => 'string|required', + 'name' => 'string|required', ]); $this->customerGroup->create(request()->all()); @@ -103,7 +103,7 @@ class CustomerGroupController extends Controller public function update(Request $request, $id) { $this->validate(request(), [ - 'group_name' => 'string|required', + 'name' => 'string|required', ]); $this->customerGroup->update(request()->all(),$id); diff --git a/packages/Webkul/Admin/src/Resources/views/customers/create.blade.php b/packages/Webkul/Admin/src/Resources/views/customers/create.blade.php index d4bcddbf1..a7089e869 100644 --- a/packages/Webkul/Admin/src/Resources/views/customers/create.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/customers/create.blade.php @@ -71,7 +71,7 @@ diff --git a/packages/Webkul/Admin/src/Resources/views/customers/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/customers/edit.blade.php index e9aa664b2..0e4c97079 100644 --- a/packages/Webkul/Admin/src/Resources/views/customers/edit.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/customers/edit.blade.php @@ -82,7 +82,7 @@ diff --git a/packages/Webkul/Admin/src/Resources/views/customers/group/create.blade.php b/packages/Webkul/Admin/src/Resources/views/customers/group/create.blade.php index 79fca7fa3..c200c2c83 100644 --- a/packages/Webkul/Admin/src/Resources/views/customers/group/create.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/customers/group/create.blade.php @@ -27,23 +27,12 @@
@csrf() -
-
diff --git a/packages/Webkul/Admin/src/Resources/views/customers/group/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/customers/group/edit.blade.php index c97085720..d13bbd115 100644 --- a/packages/Webkul/Admin/src/Resources/views/customers/group/edit.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/customers/group/edit.blade.php @@ -29,25 +29,13 @@ -
-
diff --git a/packages/Webkul/Customer/src/Models/CustomerGroup.php b/packages/Webkul/Customer/src/Models/CustomerGroup.php index 47e77ff5b..79c51c298 100644 --- a/packages/Webkul/Customer/src/Models/CustomerGroup.php +++ b/packages/Webkul/Customer/src/Models/CustomerGroup.php @@ -7,5 +7,5 @@ class CustomerGroup extends Model { protected $table = 'customer_groups'; - protected $fillable = ['group_name', 'is_user_defined']; + protected $fillable = ['name', 'is_user_defined']; } From d1e49a2170166439dda5471c45ff4c5a18b3a152 Mon Sep 17 00:00:00 2001 From: rahul shukla Date: Thu, 25 Oct 2018 10:56:03 +0530 Subject: [PATCH 2/5] logo-img --- .../2018_07_24_082635_create_customer_groups_table.php | 4 ++-- packages/Webkul/Shop/src/Resources/assets/sass/app.scss | 5 +++++ public/themes/default/assets/css/shop.css | 5 +++++ 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/packages/Webkul/Customer/src/Database/migrations/2018_07_24_082635_create_customer_groups_table.php b/packages/Webkul/Customer/src/Database/migrations/2018_07_24_082635_create_customer_groups_table.php index 854f7fad0..b9f7aaf71 100644 --- a/packages/Webkul/Customer/src/Database/migrations/2018_07_24_082635_create_customer_groups_table.php +++ b/packages/Webkul/Customer/src/Database/migrations/2018_07_24_082635_create_customer_groups_table.php @@ -15,8 +15,8 @@ class CreateCustomerGroupsTable extends Migration { Schema::create('customer_groups', function (Blueprint $table) { $table->increments('id'); - $table->string('group_name'); - $table->boolean('is_user_defined')->default(true); + $table->string('name'); + $table->boolean('is_user_defined')->default(1); $table->timestamps(); }); } diff --git a/packages/Webkul/Shop/src/Resources/assets/sass/app.scss b/packages/Webkul/Shop/src/Resources/assets/sass/app.scss index 8d94a5f22..d48aa521b 100644 --- a/packages/Webkul/Shop/src/Resources/assets/sass/app.scss +++ b/packages/Webkul/Shop/src/Resources/assets/sass/app.scss @@ -356,6 +356,11 @@ section.slider-block { li { display: flex; + + img { + max-width: 120px; + max-height: 40px; + } } } diff --git a/public/themes/default/assets/css/shop.css b/public/themes/default/assets/css/shop.css index 8e8d73929..5367eb3de 100644 --- a/public/themes/default/assets/css/shop.css +++ b/public/themes/default/assets/css/shop.css @@ -775,6 +775,11 @@ section.slider-block div.slider-content div.slider-control .light-right-icon { display: flex; } +.header .header-top div.left-content ul.logo-container li img { + max-width: 120px; + max-height: 40px; +} + .header .header-top div.left-content ul.search-container li.search-group { display: -webkit-inline-box; display: -ms-inline-flexbox; From f281d01a53c72da5eab014c44487626ad0289432 Mon Sep 17 00:00:00 2001 From: rahul shukla Date: Thu, 25 Oct 2018 13:37:21 +0530 Subject: [PATCH 3/5] error pages --- .../Webkul/Admin/src/Exceptions/Handler.php | 30 +++++++++++++-- .../Admin/src/Resources/lang/en/app.php | 10 ++++- .../src/Resources/views/errors/401.blade.php | 38 +++++++++++++++++++ .../src/Resources/views/errors/403.blade.php | 4 +- .../src/Resources/views/errors/404.blade.php | 4 +- .../src/Resources/views/errors/500.blade.php | 6 ++- .../src/Resources/views/errors/401.blade.php | 38 +++++++++++++++++++ .../src/Resources/views/errors/403.blade.php | 6 ++- .../src/Resources/views/errors/404.blade.php | 8 +++- .../src/Resources/views/errors/500.blade.php | 8 +++- 10 files changed, 140 insertions(+), 12 deletions(-) create mode 100644 packages/Webkul/Admin/src/Resources/views/errors/401.blade.php create mode 100644 packages/Webkul/Shop/src/Resources/views/errors/401.blade.php diff --git a/packages/Webkul/Admin/src/Exceptions/Handler.php b/packages/Webkul/Admin/src/Exceptions/Handler.php index 918aca539..af0259b7b 100644 --- a/packages/Webkul/Admin/src/Exceptions/Handler.php +++ b/packages/Webkul/Admin/src/Exceptions/Handler.php @@ -6,6 +6,9 @@ use Exception; use Illuminate\Auth\AuthenticationException; use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler; use Symfony\Component\HttpKernel\Exception\HttpException; +use Illuminate\Database\Eloquent\ModelNotFoundException; +use Illuminate\Database\Eloquent\PDOException; +use Illuminate\Database\Eloquent\ErrorException; class Handler extends ExceptionHandler { @@ -19,23 +22,44 @@ class Handler extends ExceptionHandler */ public function render($request, Exception $exception) { - if ($exception instanceof HttpException) { $statusCode = $exception->getStatusCode(); - if(strpos($_SERVER['REQUEST_URI'], 'admin') !== false){ + if (strpos($_SERVER['REQUEST_URI'], 'admin') !== false) { return response(view('admin::errors.'.$statusCode, [ 'msg' => $exception->getMessage(), 'code' => $statusCode ]), $statusCode); - }else { + } else { return response(view('shop::errors.'.$statusCode, [ 'msg' => $exception->getMessage(), 'code' => $statusCode ]), $statusCode); } + } else if ($exception instanceof ModelNotFoundException) { + if (strpos($_SERVER['REQUEST_URI'], 'admin') !== false){ + return response()->view('admin::errors.404', [], 404); + }else { + return response()->view('shop::errors.404', [], 404); + } + } else if ($exception instanceof PDOException) { + + if (strpos($_SERVER['REQUEST_URI'], 'admin') !== false){ + return response()->view('admin::errors.500', [], 500); + } else { + return response()->view('shop::errors.500', [], 500); + } } + // else if ($exception instanceof ErrorException) { + + // if(strpos($_SERVER['REQUEST_URI'], 'admin') !== false){ + // return response()->view('admin::errors.500', [], 500); + // }else { + // return response()->view('shop::errors.500', [], 500); + // } + + // } return parent::render($request, $exception); } diff --git a/packages/Webkul/Admin/src/Resources/lang/en/app.php b/packages/Webkul/Admin/src/Resources/lang/en/app.php index 6a66e69ad..6c5b4599a 100644 --- a/packages/Webkul/Admin/src/Resources/lang/en/app.php +++ b/packages/Webkul/Admin/src/Resources/lang/en/app.php @@ -519,7 +519,13 @@ return [ 'page-title' => '500 Internal Server Error', 'name' => '500', 'title' => 'Internal Server Error', - 'message' => 'You do not have permission to access this page' - ] + 'message' => 'The Server Encountered an internal error.' + ], + '401' => [ + 'page-title' => '401 Unauthorized Error', + 'name' => '401', + 'title' => 'Unauthorized Error', + 'message' => 'The request has not been applied because it lacks valid authentication credentials for the target resource.' + ], ] ]; \ No newline at end of file diff --git a/packages/Webkul/Admin/src/Resources/views/errors/401.blade.php b/packages/Webkul/Admin/src/Resources/views/errors/401.blade.php new file mode 100644 index 000000000..8bf5cb507 --- /dev/null +++ b/packages/Webkul/Admin/src/Resources/views/errors/401.blade.php @@ -0,0 +1,38 @@ +@extends('shop::layouts.master') + +@section('page_title') + {{ __('admin::app.error.401.page-title') }} +@stop + +@section('content-wrapper') + +
+ +
+ +
+ +
{{ __('admin::app.error.401.name') }}
+ +
+ {{ __('admin::app.error.401.title') }} +
+ +
+ {{ __('admin::app.error.401.message') }} +
+ + + {{ __('admin::app.error.go-to-home') }} + + +
+ +
+ +
+ +
+ +@endsection \ No newline at end of file diff --git a/packages/Webkul/Admin/src/Resources/views/errors/403.blade.php b/packages/Webkul/Admin/src/Resources/views/errors/403.blade.php index 3f6dd9a30..8763a4939 100644 --- a/packages/Webkul/Admin/src/Resources/views/errors/403.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/errors/403.blade.php @@ -12,7 +12,9 @@
-
{{ $code }}
+
+ {{ __('admin::app.error.403.name') }} +
{{ __('admin::app.error.403.title') }} diff --git a/packages/Webkul/Admin/src/Resources/views/errors/404.blade.php b/packages/Webkul/Admin/src/Resources/views/errors/404.blade.php index cb7f7da76..a9f532197 100644 --- a/packages/Webkul/Admin/src/Resources/views/errors/404.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/errors/404.blade.php @@ -12,7 +12,9 @@
-
{{ $code }}
+
+ {{ __('admin::app.error.404.name') }} +
{{ __('admin::app.error.404.title') }} diff --git a/packages/Webkul/Admin/src/Resources/views/errors/500.blade.php b/packages/Webkul/Admin/src/Resources/views/errors/500.blade.php index 40152c113..d9e0dbea8 100644 --- a/packages/Webkul/Admin/src/Resources/views/errors/500.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/errors/500.blade.php @@ -1,7 +1,7 @@ @extends('admin::layouts.content') @section('page_title') - {{ __('admin::app.error.403.page-title') }} + {{ __('admin::app.error.500.page-title') }} @stop @section('content') @@ -13,7 +13,9 @@
-
{{ $code }}
+
+ {{ __('admin::app.error.500.name') }} +
{{ __('admin::app.error.500.title') }} diff --git a/packages/Webkul/Shop/src/Resources/views/errors/401.blade.php b/packages/Webkul/Shop/src/Resources/views/errors/401.blade.php new file mode 100644 index 000000000..8bf5cb507 --- /dev/null +++ b/packages/Webkul/Shop/src/Resources/views/errors/401.blade.php @@ -0,0 +1,38 @@ +@extends('shop::layouts.master') + +@section('page_title') + {{ __('admin::app.error.401.page-title') }} +@stop + +@section('content-wrapper') + +
+ +
+ +
+ +
{{ __('admin::app.error.401.name') }}
+ +
+ {{ __('admin::app.error.401.title') }} +
+ +
+ {{ __('admin::app.error.401.message') }} +
+ + + {{ __('admin::app.error.go-to-home') }} + + +
+ +
+ +
+ +
+ +@endsection \ No newline at end of file diff --git a/packages/Webkul/Shop/src/Resources/views/errors/403.blade.php b/packages/Webkul/Shop/src/Resources/views/errors/403.blade.php index 36ef96c4b..96f98cf52 100644 --- a/packages/Webkul/Shop/src/Resources/views/errors/403.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/errors/403.blade.php @@ -1,5 +1,9 @@ @extends('shop::layouts.master') +@section('page_title') + {{ __('admin::app.error.403.page-title') }} +@stop + @section('content-wrapper')
@@ -9,7 +13,7 @@
-
{{ $code }}
+
{{ __('admin::app.error.403.name') }}
{{ __('admin::app.error.403.title') }} diff --git a/packages/Webkul/Shop/src/Resources/views/errors/404.blade.php b/packages/Webkul/Shop/src/Resources/views/errors/404.blade.php index 3c198c687..abcfb0890 100644 --- a/packages/Webkul/Shop/src/Resources/views/errors/404.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/errors/404.blade.php @@ -1,5 +1,9 @@ @extends('shop::layouts.master') +@section('page_title') + {{ __('admin::app.error.404.page-title') }} +@stop + @section('content-wrapper')
@@ -9,7 +13,9 @@
-
{{ $code }}
+
+ {{ __('admin::app.error.404.name') }} +
{{ __('admin::app.error.404.title') }} diff --git a/packages/Webkul/Shop/src/Resources/views/errors/500.blade.php b/packages/Webkul/Shop/src/Resources/views/errors/500.blade.php index 0bbe40f7f..2a19c0d20 100644 --- a/packages/Webkul/Shop/src/Resources/views/errors/500.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/errors/500.blade.php @@ -1,5 +1,9 @@ @extends('shop::layouts.master') +@section('page_title') + {{ __('admin::app.error.500.page-title') }} +@stop + @section('content-wrapper')
@@ -9,7 +13,9 @@
-
{{ $code }}
+
+ {{ __('admin::app.error.500.name') }} +
{{ __('admin::app.error.500.title') }} From c9037806b0997d6f971f2baacf6e756c727f2f21 Mon Sep 17 00:00:00 2001 From: rahul shukla Date: Thu, 25 Oct 2018 13:50:30 +0530 Subject: [PATCH 4/5] error pages --- .../Webkul/Admin/src/Exceptions/Handler.php | 34 ++++++++++++++----- .../src/Resources/views/errors/401.blade.php | 14 ++++---- 2 files changed, 33 insertions(+), 15 deletions(-) diff --git a/packages/Webkul/Admin/src/Exceptions/Handler.php b/packages/Webkul/Admin/src/Exceptions/Handler.php index af0259b7b..e1c2a92ea 100644 --- a/packages/Webkul/Admin/src/Exceptions/Handler.php +++ b/packages/Webkul/Admin/src/Exceptions/Handler.php @@ -26,15 +26,33 @@ class Handler extends ExceptionHandler $statusCode = $exception->getStatusCode(); if (strpos($_SERVER['REQUEST_URI'], 'admin') !== false) { - return response(view('admin::errors.'.$statusCode, [ - 'msg' => $exception->getMessage(), - 'code' => $statusCode - ]), $statusCode); + switch ($statusCode) { + case 404: + return response()->view('admin::errors.404', [], 404); + break; + case 403: + return response()->view('admin::errors.403', [], 403); + break; + case 401: + return response()->view('admin::errors.401', [], 401); + break; + default: + return response()->view('admin::errors.500', [], 500); + } } else { - return response(view('shop::errors.'.$statusCode, [ - 'msg' => $exception->getMessage(), - 'code' => $statusCode - ]), $statusCode); + switch ($statusCode) { + case 404: + return response()->view('shop::errors.404', [], 404); + break; + case 403: + return response()->view('shop::errors.403', [], 403); + break; + case 401: + return response()->view('shop::errors.401', [], 401); + break; + default: + return response()->view('shop::errors.500', [], 500); + } } } else if ($exception instanceof ModelNotFoundException) { diff --git a/packages/Webkul/Admin/src/Resources/views/errors/401.blade.php b/packages/Webkul/Admin/src/Resources/views/errors/401.blade.php index 8bf5cb507..df9846347 100644 --- a/packages/Webkul/Admin/src/Resources/views/errors/401.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/errors/401.blade.php @@ -1,11 +1,10 @@ -@extends('shop::layouts.master') +@extends('admin::layouts.content') @section('page_title') {{ __('admin::app.error.401.page-title') }} @stop -@section('content-wrapper') - +@section('content')
-
{{ __('admin::app.error.401.name') }}
+
+ {{ __('admin::app.error.401.name') }} +
{{ __('admin::app.error.401.title') }} @@ -23,7 +24,7 @@ {{ __('admin::app.error.401.message') }}
- + {{ __('admin::app.error.go-to-home') }} @@ -34,5 +35,4 @@
- -@endsection \ No newline at end of file +@stop \ No newline at end of file From 84ba1d4fc65087062a613da55b7591a3487734c1 Mon Sep 17 00:00:00 2001 From: rahul shukla Date: Thu, 25 Oct 2018 14:36:51 +0530 Subject: [PATCH 5/5] error changes --- .../Webkul/Admin/src/Exceptions/Handler.php | 38 +++++++++++++------ .../Admin/src/Resources/lang/en/app.php | 2 +- 2 files changed, 27 insertions(+), 13 deletions(-) diff --git a/packages/Webkul/Admin/src/Exceptions/Handler.php b/packages/Webkul/Admin/src/Exceptions/Handler.php index 2329e6c60..1444b9217 100644 --- a/packages/Webkul/Admin/src/Exceptions/Handler.php +++ b/packages/Webkul/Admin/src/Exceptions/Handler.php @@ -22,30 +22,44 @@ class Handler extends ExceptionHandler */ public function render($request, Exception $exception) { - if ($exception instanceof HttpException) { $statusCode = $exception->getStatusCode(); - if (strpos($_SERVER['REQUEST_URI'], 'admin') !== false) { - return response(view('admin::errors.'.$statusCode, [ - 'msg' => $exception->getMessage(), - 'code' => $statusCode - ]), $statusCode); + switch ($statusCode) { + case 404: + return response()->view('admin::errors.404', [], 404); + break; + case 403: + return response()->view('admin::errors.403', [], 403); + break; + case 401: + return response()->view('admin::errors.401', [], 401); + break; + default: + return response()->view('admin::errors.500', [], 500); + } } else { - return response(view('shop::errors.'.$statusCode, [ - 'msg' => $exception->getMessage(), - 'code' => $statusCode - ]), $statusCode); + switch ($statusCode) { + case 404: + return response()->view('shop::errors.404', [], 404); + break; + case 403: + return response()->view('shop::errors.403', [], 403); + break; + case 401: + return response()->view('shop::errors.401', [], 401); + break; + default: + return response()->view('shop::errors.500', [], 500); + } } } else if ($exception instanceof ModelNotFoundException) { - if (strpos($_SERVER['REQUEST_URI'], 'admin') !== false){ return response()->view('admin::errors.404', [], 404); }else { return response()->view('shop::errors.404', [], 404); } } else if ($exception instanceof PDOException) { - if (strpos($_SERVER['REQUEST_URI'], 'admin') !== false){ return response()->view('admin::errors.500', [], 500); } else { diff --git a/packages/Webkul/Admin/src/Resources/lang/en/app.php b/packages/Webkul/Admin/src/Resources/lang/en/app.php index 0c6ab60f1..5b7009864 100644 --- a/packages/Webkul/Admin/src/Resources/lang/en/app.php +++ b/packages/Webkul/Admin/src/Resources/lang/en/app.php @@ -462,7 +462,7 @@ return [ 'go-to-home' => 'GO TO HOME', '404' => [ - 'page-title' => 'Page not found', + 'page-title' => '404 Page not found', 'name' => '404', 'title' => 'Page Not found', 'message' => 'The Page you are looking for doesnt exist or have secrately escaped;head back to home and make a fresh move again.'