diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php index 1087cfa39..05992519f 100644 --- a/app/Http/Kernel.php +++ b/app/Http/Kernel.php @@ -19,6 +19,7 @@ class Kernel extends HttpKernel \App\Http\Middleware\TrimStrings::class, \Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull::class, \App\Http\Middleware\TrustProxies::class, + // \Illuminate\Session\Middleware\StartSession::class, ]; /** @@ -31,7 +32,7 @@ class Kernel extends HttpKernel \App\Http\Middleware\EncryptCookies::class, \Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse::class, \Illuminate\Session\Middleware\StartSession::class, - // \Illuminate\Session\Middleware\AuthenticateSession::class, + \Illuminate\Session\Middleware\AuthenticateSession::class, \Illuminate\View\Middleware\ShareErrorsFromSession::class, \App\Http\Middleware\VerifyCsrfToken::class, \Illuminate\Routing\Middleware\SubstituteBindings::class, diff --git a/packages/Webkul/Admin/src/DataGrids/CustomerDataGrid.php b/packages/Webkul/Admin/src/DataGrids/CustomerDataGrid.php index 070694ca2..98e8568f5 100644 --- a/packages/Webkul/Admin/src/DataGrids/CustomerDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/CustomerDataGrid.php @@ -65,35 +65,35 @@ class CustomerDataGrid 'name' => 'id', 'alias' => 'ID', 'type' => 'number', - 'label' => 'Customer ID', + 'label' => 'ID', 'sortable' => true, ], [ 'name' => 'first_name', 'alias' => 'FirstName', 'type' => 'string', - 'label' => 'Customer First Name', + 'label' => 'First Name', 'sortable' => false, ], [ 'name' => 'email', 'alias' => 'Email', 'type' => 'string', - 'label' => 'Customer E-Mail', + 'label' => 'E-Mail', 'sortable' => false, ], [ 'name' => 'phone', 'alias' => 'Phone', 'type' => 'number', - 'label' => 'Customer Phone', + 'label' => 'Phone', 'sortable' => true, ], [ 'name' => 'customer_group_id', 'alias' => 'CustomerGroupId', 'type' => 'number', - 'label' => 'Customer Group', + 'label' => 'Group ID', 'sortable' => false, ], ], @@ -106,13 +106,13 @@ class CustomerDataGrid 'column' => 'id', 'alias' => 'ID', 'type' => 'number', - 'label' => 'Customer ID', + 'label' => 'ID', ], [ 'column' => 'first_name', 'alias' => 'FirstName', 'type' => 'string', - 'label' => 'Customer First Name', + 'label' => 'First Name', ] ], @@ -122,12 +122,12 @@ class CustomerDataGrid [ 'column' => 'FirstName', 'type' => 'string', - 'label' => 'Customer First Name', + 'label' => 'First Name', ], [ 'column' => 'email', 'type' => 'string', - 'label' => 'Customer E-Mail', + 'label' => 'E-Mail', ], ], diff --git a/packages/Webkul/Admin/src/DataGrids/CustomerGroupDataGrid.php b/packages/Webkul/Admin/src/DataGrids/CustomerGroupDataGrid.php new file mode 100644 index 000000000..c2254f226 --- /dev/null +++ b/packages/Webkul/Admin/src/DataGrids/CustomerGroupDataGrid.php @@ -0,0 +1,163 @@ + + * @copyright 2018 Webkul Software Pvt Ltd (http://www.webkul.com) + */ + +class CustomerGroupDataGrid +{ + /** + * The Customer Group Data + * Grid implementation. + * + * @var CustomerGroupDataGrid + */ + public function createCustomerGroupDataGrid() + { + + return DataGrid::make([ + + 'name' => 'Customer Group', + 'table' => 'customer_groups as cg', + 'select' => 'cg.id', + 'perpage' => 10, + 'aliased' => true, //use this with false as default and true in case of joins + + 'massoperations' =>[ + [ + 'route' => route('admin.datagrid.delete'), + 'method' => 'DELETE', + 'label' => 'Delete', + 'type' => 'button', + ], + [ + 'route' => route('admin.datagrid.index'), + 'method' => 'POST', + 'label' => 'View Grid', + 'type' => 'select', + 'options' =>[ + 1 => 'Edit', + 2 => 'Set', + 3 => 'Change Status' + ] + ], + ], + 'actions' => [ + [ + 'type' => 'Edit', + 'route' => route('admin.datagrid.delete'), + 'confirm_text' => 'Do you really wanis?', + 'icon' => 'icon pencil-lg-icon', + ], + [ + 'type' => 'Delete', + 'route' => route('admin.datagrid.delete'), + 'confirm_text' => 'Do you really want to do this?', + 'icon' => 'icon trash-icon', + ], + ], + 'join' => [ + // [ + // 'join' => 'leftjoin', + // 'table' => 'roles as r', + // 'primaryKey' => 'u.role_id', + // 'condition' => '=', + // 'secondaryKey' => 'r.id', + // ] + ], + + //use aliasing on secodary columns if join is performed + 'columns' => [ + [ + 'name' => 'cg.id', + 'alias' => 'ID', + 'type' => 'number', + 'label' => 'ID', + 'sortable' => true, + ], + [ + 'name' => 'cg.group_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', + 'alias' => 'Name', + 'type' => 'string', + 'label' => 'Name' + ], + [ + 'column' => 'cg.id', + 'alias' => 'ID', + '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' => [ + [ + 'column' => 'cg.code', + 'type' => 'string', + 'label' => 'Code' + ], + [ + 'column' => 'cg.name', + 'type' => 'string', + 'label' => 'Name' + ] + ], + 'operators' => [ + 'eq' => "=", + 'lt' => "<", + 'gt' => ">", + 'lte' => "<=", + 'gte' => ">=", + 'neqs' => "<>", + 'neqn' => "!=", + 'like' => "like", + 'nlike' => "not like", + ], + // 'css' => [] + + ]); + + } + + public function render() { + + return $this->createCustomerGroupDataGrid()->render(); + + } +} \ No newline at end of file diff --git a/packages/Webkul/Admin/src/Http/Controllers/Customer/CustomerController.php b/packages/Webkul/Admin/src/Http/Controllers/Customer/CustomerController.php index 0fbe05caa..cdcc99b1b 100644 --- a/packages/Webkul/Admin/src/Http/Controllers/Customer/CustomerController.php +++ b/packages/Webkul/Admin/src/Http/Controllers/Customer/CustomerController.php @@ -4,13 +4,13 @@ namespace Webkul\Admin\Http\Controllers\Customer; use Illuminate\Http\Request; use Illuminate\Http\Response; -use Illuminate\Routing\Controller; +use Webkul\Admin\Http\Controllers\Controller; use Webkul\Customer\Repositories\CustomerRepository as Customer; use Webkul\Customer\Repositories\CustomerGroupRepository as CustomerGroup; +use Webkul\Core\Repositories\ChannelRepository as Channel; /** - * Customer controlller for the customer - * to show customer data on admin login + * Customer controlller * * @author Rahul Shukla * @copyright 2018 Webkul Software Pvt Ltd (http://www.webkul.com) @@ -38,20 +38,30 @@ class CustomerController extends Controller */ protected $customerGroup; + /** + * ChannelRepository object + * + * @var array + */ + protected $channel; + /** * Create a new controller instance. * * @param Webkul\Customer\Repositories\CustomerRepository as customer; * @param Webkul\Customer\Repositories\CustomerGroupRepository as customerGroup; + * @param Webkul\Core\Repositories\ChannelRepository as Channel; * @return void */ - public function __construct(Customer $customer , CustomerGroup $customerGroup ) + public function __construct(Customer $customer, CustomerGroup $customerGroup, Channel $channel ) { $this->_config = request('_config'); $this->customer = $customer; $this->customerGroup = $customerGroup; + + $this->channel = $channel; } /** @@ -73,7 +83,9 @@ class CustomerController extends Controller { $customerGroup = $this->customerGroup->all(); - return view($this->_config['view'],compact('customerGroup')); + $channelName = $this->channel->all(); + + return view($this->_config['view'],compact('customerGroup','channelName')); } /** @@ -81,17 +93,18 @@ class CustomerController extends Controller * * @return \Illuminate\Http\Response */ - public function store(Request $request) + public function store() { - $request->validate([ + $this->validate(request(), [ + 'channel_id' => 'required', 'first_name' => 'string|required', 'last_name' => 'string|required', 'gender' => 'required', - 'phone' => 'nullable|numeric', + 'phone' => 'nullable|numeric|unique:customers,phone', 'email' => 'required|unique:customers,email' ]); - $data=$request->all(); + $data=request()->all(); $password = bcrypt(rand(100000,10000000)); @@ -116,7 +129,9 @@ class CustomerController extends Controller $customerGroup = $this->customerGroup->all(); - return view($this->_config['view'],compact('customer','customerGroup')); + $channelName = $this->channel->all(); + + return view($this->_config['view'],compact('customer', 'customerGroup', 'channelName')); } /** @@ -128,11 +143,12 @@ class CustomerController extends Controller */ public function update(Request $request, $id) { - $request->validate([ + $this->validate(request(), [ + 'channel_id' => 'required', 'first_name' => 'string|required', 'last_name' => 'string|required', 'gender' => 'required', - 'phone' => 'nullable|numeric', + 'phone' => 'nullable|numeric|unique:customers,phone,'. $id, 'email' => 'required|unique:customers,email,'. $id ]); diff --git a/packages/Webkul/Admin/src/Http/Controllers/Customer/CustomerGroupController.php b/packages/Webkul/Admin/src/Http/Controllers/Customer/CustomerGroupController.php new file mode 100644 index 000000000..3d3759235 --- /dev/null +++ b/packages/Webkul/Admin/src/Http/Controllers/Customer/CustomerGroupController.php @@ -0,0 +1,136 @@ + + * @copyright 2018 Webkul Software Pvt Ltd (http://www.webkul.com) + */ +class CustomerGroupController extends Controller +{ + /** + * Contains route related configuration + * + * @var array + */ + protected $_config; + + /** + * CustomerGroupRepository object + * + * @var array + */ + protected $customerGroup; + + /** + * Create a new controller instance. + * + * @param Webkul\Customer\Repositories\CustomerGroupRepository as customerGroup; + * @return void + */ + public function __construct(CustomerGroup $customerGroup) + { + $this->_config = request('_config'); + + $this->customerGroup = $customerGroup; + } + + /** + * Display a listing of the resource. + * + * @return \Illuminate\Http\Response + */ + public function index() + { + return view($this->_config['view']); + } + + /** + * Show the form for creating a new resource. + * + * @return \Illuminate\Http\Response + */ + public function create() + { + return view($this->_config['view']); + } + + /** + * Store a newly created resource in storage. + * + * @return \Illuminate\Http\Response + */ + public function store() + { + $this->validate(request(), [ + 'group_name' => 'string|required', + ]); + + $this->customerGroup->create(request()->all()); + + session()->flash('success', 'Customer Group created successfully.'); + + return redirect()->route($this->_config['redirect']); + } + + /** + * Show the form for editing the specified resource. + * + * @param int $id + * @return \Illuminate\Http\Response + */ + public function edit($id) + { + $group = $this->customerGroup->findOneWhere(['id'=>$id]); + + return view($this->_config['view'],compact('group')); + } + + /** + * Update the specified resource in storage. + * + * @param \Illuminate\Http\Request $request + * @param int $id + * @return \Illuminate\Http\Response + */ + public function update(Request $request, $id) + { + $this->validate(request(), [ + 'group_name' => 'string|required', + ]); + + $this->customerGroup->update(request()->all(),$id); + + session()->flash('success', 'Customer Group updated successfully.'); + + return redirect()->route($this->_config['redirect']); + } + + /** + * Remove the specified resource from storage. + * + * @param int $id + * @return \Illuminate\Http\Response + */ + public function destroy($id) + { + $group = $this->customerGroup->findOneWhere(['id'=>$id]); + + if($group->is_user_defined == 1) { + session()->flash('error', 'This Customer Group can not be deleted'); + } else { + $this->customerGroup->delete($id); + + session()->flash('success', 'Customer Group deleted successfully.'); + } + + return redirect()->back(); + } +} \ No newline at end of file diff --git a/packages/Webkul/Admin/src/Http/routes.php b/packages/Webkul/Admin/src/Http/routes.php index a872d9e38..3b334b2ab 100644 --- a/packages/Webkul/Admin/src/Http/routes.php +++ b/packages/Webkul/Admin/src/Http/routes.php @@ -70,6 +70,7 @@ Route::group(['middleware' => ['web']], function () { 'view' => 'admin::customers.review.index' ])->name('admin.customer.review.index'); + // Reviews Routes Route::get('reviews/edit/{id}', 'Webkul\Product\Http\Controllers\ReviewController@edit')->defaults('_config',[ 'view' => 'admin::customers.review.edit' ])->name('admin.customer.review.edit'); @@ -78,6 +79,29 @@ Route::group(['middleware' => ['web']], function () { 'redirect' => 'admin.customer.review.index' ])->name('admin.customer.review.update'); + // Customer Groups Routes + + Route::get('groups', 'Webkul\Admin\Http\Controllers\Customer\CustomerGroupController@index')->defaults('_config',[ + 'view' => 'admin::customers.group.index' + ])->name('admin.groups.index'); + + Route::get('groups/create', 'Webkul\Admin\Http\Controllers\Customer\CustomerGroupController@create')->defaults('_config',[ + 'view' => 'admin::customers.group.create' + ])->name('admin.groups.create'); + + Route::post('groups/create', 'Webkul\Admin\Http\Controllers\Customer\CustomerGroupController@store')->defaults('_config',[ + 'redirect' => 'admin.groups.index' + ])->name('admin.groups.store'); + + Route::get('groups/edit/{id}', 'Webkul\Admin\Http\Controllers\Customer\CustomerGroupController@edit')->defaults('_config',[ + 'view' => 'admin::customers.group.edit' + ])->name('admin.groups.edit'); + + Route::put('groups/edit/{id}', 'Webkul\Admin\Http\Controllers\Customer\CustomerGroupController@update')->defaults('_config',[ + 'redirect' => 'admin.groups.index' + ])->name('admin.groups.update'); + + Route::get('groups/delete/{id}', 'Webkul\Admin\Http\Controllers\Customer\CustomerGroupController@destroy')->name('admin.groups.delete'); // Sales Routes Route::prefix('sales')->group(function () { @@ -403,11 +427,13 @@ Route::group(['middleware' => ['web']], function () { ])->name('admin.sliders.index'); // Admin Store Front Settings Route - Route::get('/slider/create','Webkul\Shop\Http\Controllers\SliderController@create')->defaults('_config',[ + + //slider create + Route::get('slider/create','Webkul\Shop\Http\Controllers\SliderController@create')->defaults('_config',[ 'view' => 'admin::settings.sliders.create' ])->name('admin.sliders.create'); - Route::post('/slider/create','Webkul\Shop\Http\Controllers\SliderController@store')->defaults('_config',[ + Route::post('slider/create','Webkul\Shop\Http\Controllers\SliderController@store')->defaults('_config',[ 'redirect' => 'admin::sliders.index' ])->name('admin.sliders.store'); @@ -415,9 +441,11 @@ Route::group(['middleware' => ['web']], function () { Route::get('slider/edit/{id}','Webkul\Shop\Http\Controllers\SliderController@edit')->defaults('_config',[ 'view' => 'admin::settings.sliders.edit' ])->name('admin.sliders.edit'); + Route::post('slider/edit/{id}','Webkul\Shop\Http\Controllers\SliderController@update')->defaults('_config',[ 'redirect' => 'admin::sliders.index' ])->name('admin.sliders.update'); + //destroy a slider item Route::get('slider/delete/{id}', 'Webkul\Shop\Http\Controllers\SliderController@destroy'); diff --git a/packages/Webkul/Admin/src/Providers/AdminServiceProvider.php b/packages/Webkul/Admin/src/Providers/AdminServiceProvider.php index 1fe463fbb..e9bbe7479 100644 --- a/packages/Webkul/Admin/src/Providers/AdminServiceProvider.php +++ b/packages/Webkul/Admin/src/Providers/AdminServiceProvider.php @@ -38,6 +38,15 @@ class AdminServiceProvider extends ServiceProvider ); } + /** + * Register services. + * + * @return void + */ + public function register() + { + } + /** * Bind the the data to the views * @@ -76,19 +85,6 @@ class AdminServiceProvider extends ServiceProvider }); } - /** - * Register services. - * - * @return void - */ - public function register() - { - // $this->mergeConfigFrom( - // __DIR__ . '/../Config/auth.php', - // 'auth' - // ); - } - /** * Merge the given configuration with the existing configuration. * diff --git a/packages/Webkul/Admin/src/Providers/EventServiceProvider.php b/packages/Webkul/Admin/src/Providers/EventServiceProvider.php index 0ed37ee12..53cb77851 100644 --- a/packages/Webkul/Admin/src/Providers/EventServiceProvider.php +++ b/packages/Webkul/Admin/src/Providers/EventServiceProvider.php @@ -71,6 +71,12 @@ class EventServiceProvider extends ServiceProvider 'route' => 'admin.customer.review.index', 'sort' => 2, 'icon-class' => '', + ], [ + 'key' => 'customers.groups', + 'name' => 'Groups', + 'route' => 'admin.groups.index', + 'sort' => 3, + 'icon-class' => '', ], [ 'key' => 'configuration', 'name' => 'Configure', diff --git a/packages/Webkul/Admin/src/Resources/assets/images/logo.png b/packages/Webkul/Admin/src/Resources/assets/images/logo.png deleted file mode 100644 index f3a6baf4d..000000000 Binary files a/packages/Webkul/Admin/src/Resources/assets/images/logo.png and /dev/null differ diff --git a/packages/Webkul/Admin/src/Resources/assets/sass/app.scss b/packages/Webkul/Admin/src/Resources/assets/sass/app.scss index 77b325653..43653f4a7 100644 --- a/packages/Webkul/Admin/src/Resources/assets/sass/app.scss +++ b/packages/Webkul/Admin/src/Resources/assets/sass/app.scss @@ -526,30 +526,6 @@ body { } } - - - - - - - - - - - - - - - - - - - - - - - - // customer oder css for admin start here .sale-container { .sale-section { diff --git a/packages/Webkul/Admin/src/Resources/lang/en/app.php b/packages/Webkul/Admin/src/Resources/lang/en/app.php index 515ecbe70..131bbfcd8 100644 --- a/packages/Webkul/Admin/src/Resources/lang/en/app.php +++ b/packages/Webkul/Admin/src/Resources/lang/en/app.php @@ -406,7 +406,19 @@ return [ ], ], 'customers' => [ + 'groups' =>[ + 'add-title' => 'Add Group', + 'edit-title' => 'Edit Group', + 'save-btn-title' => 'Save Group', + 'title' => 'Groups', + 'save-btn-title' => 'Save Group', + 'name' => 'Name', + 'is_user_defined' => 'User Defined', + 'yes' => 'Yes' + ], 'customers' => [ + 'add-title' => 'Add Customer', + 'edit-title' => 'Edit Customer', 'title' => 'Customers', 'first_name' => 'First Name', 'last_name' => 'Last Name', @@ -415,7 +427,8 @@ return [ 'date_of_birth' => 'Date of Birth', 'phone' => 'Phone', 'customer_group' => 'Customer Group', - 'save-btn-title' => 'Save Customer' + 'save-btn-title' => 'Save Customer', + 'channel_name' => 'Channel Name' ], 'reviews' => [ 'title' => 'Reviews', @@ -459,5 +472,27 @@ return [ 'carrier' => 'Carrier', 'tracking-number' => 'Tracking Number' ] + ], + 'error' => [ + 'go-to-home' => 'GO TO HOME', + + '404' => [ + 'page-title' => '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.' + ], + '403' => [ + 'page-title' => '403 forbidden', + 'name' => '403', + 'title' => 'Forbidden error', + 'message' => 'You do not have permission to access this page' + ], + '500' => [ + 'page-title' => '500 Internal Server Error', + 'name' => '500', + 'title' => 'Internal Server Error', + 'message' => 'You do not have permission to access this page' + ] ] ]; \ No newline at end of file diff --git a/packages/Webkul/Admin/src/Resources/views/catalog/products/create.blade.php b/packages/Webkul/Admin/src/Resources/views/catalog/products/create.blade.php index cd14cc08a..5e6966c2d 100644 --- a/packages/Webkul/Admin/src/Resources/views/catalog/products/create.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/catalog/products/create.blade.php @@ -77,7 +77,7 @@ @{{ errors.first('sku') }} - + @@ -94,7 +94,7 @@ - + @foreach($configurableFamily->configurable_attributes as $attribute) 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 97bbd7b33..d4bcddbf1 100644 --- a/packages/Webkul/Admin/src/Resources/views/customers/create.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/customers/create.blade.php @@ -1,8 +1,12 @@ @extends('admin::layouts.content') +@section('page_title') + {{ __('admin::app.customers.customers.add-title') }} +@stop + @section('content')
-
+
@@ -45,7 +49,7 @@
- @@ -64,7 +68,7 @@
- +
+
+ + + @{{ errors.first('channel_id') }} +
+
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 639ac370d..e9aa664b2 100644 --- a/packages/Webkul/Admin/src/Resources/views/customers/edit.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/customers/edit.blade.php @@ -1,5 +1,9 @@ @extends('admin::layouts.content') +@section('page_title') + {{ __('admin::app.customers.customers.edit-title') }} +@stop + @section('content')
@@ -47,7 +51,7 @@
- + - @foreach($customerGroup as $group) - @endforeach -
+
+ + + @if(!is_null($customer->channel_id)) + channel_id ?> + @else + channel_id ?> + @endif + + + @{{ errors.first('channel_id') }} +
+
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 new file mode 100644 index 000000000..79fca7fa3 --- /dev/null +++ b/packages/Webkul/Admin/src/Resources/views/customers/group/create.blade.php @@ -0,0 +1,54 @@ +@extends('admin::layouts.content') + +@section('page_title') + {{ __('admin::app.customers.groups.add-title') }} +@stop + +@section('content') +
+ + +
+
+

+ {{ __('admin::app.customers.groups.add-title') }} +

+
+ +
+ +
+
+ +
+ +
+ @csrf() + +
+ + + @{{ errors.first('group_name') }} +
+ +
+ + + + + {{ __('admin::app.customers.groups.yes') }} + +
+ +
+ +
+ +
+@stop \ No newline at end of file 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 new file mode 100644 index 000000000..c97085720 --- /dev/null +++ b/packages/Webkul/Admin/src/Resources/views/customers/group/edit.blade.php @@ -0,0 +1,55 @@ +@extends('admin::layouts.content') + +@section('page_title') + {{ __('admin::app.customers.groups.edit-title') }} +@stop + +@section('content') +
+
+ +
+
+

+ {{ __('admin::app.customers.groups.edit-title') }} +

+
+ +
+ +
+
+ +
+ +
+ @csrf() + + + +
+ + + @{{ errors.first('group_name') }} +
+ +
+ + + is_user_defined ? 'checked' : '' }}> + + {{ __('admin::app.customers.groups.yes') }} + +
+ +
+
+
+
+@stop \ No newline at end of file diff --git a/packages/Webkul/Admin/src/Resources/views/customers/group/index.blade.php b/packages/Webkul/Admin/src/Resources/views/customers/group/index.blade.php new file mode 100644 index 000000000..a383ff6cd --- /dev/null +++ b/packages/Webkul/Admin/src/Resources/views/customers/group/index.blade.php @@ -0,0 +1,27 @@ +@extends('admin::layouts.content') + +@section('page_title') + {{ __('admin::app.customers.groups.title') }} +@stop + +@section('content') + +
+
+
+

{{ __('admin::app.customers.groups.title') }}

+
+
+ + {{ __('admin::app.customers.groups.add-title') }} + +
+
+ +
+ @inject('customerGroup','Webkul\Admin\DataGrids\CustomerGroupDataGrid') + {!! $customerGroup->render() !!} +
+
+ +@stop \ No newline at end of file diff --git a/packages/Webkul/Admin/src/Resources/views/customers/index.blade.php b/packages/Webkul/Admin/src/Resources/views/customers/index.blade.php index d40180509..03feb24cd 100644 --- a/packages/Webkul/Admin/src/Resources/views/customers/index.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/customers/index.blade.php @@ -13,7 +13,7 @@
- {{ __('Add Customer') }} + {{ __('admin::app.customers.customers.add-title') }}
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 b351a4191..3f6dd9a30 100644 --- a/packages/Webkul/Admin/src/Resources/views/errors/403.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/errors/403.blade.php @@ -1,7 +1,7 @@ @extends('admin::layouts.content') @section('page_title') - + {{ __('admin::app.error.403.page-title') }} @stop @section('content') @@ -14,11 +14,17 @@
{{ $code }}
-
Page Not Found
+
+ {{ __('admin::app.error.403.title') }} +
-
The Page you are looking for doesnt exist or have secrately escaped;head backm to home and make a fresh move again.
+
+ {{ __('admin::app.error.403.message') }} +
- GO TO HOME + + {{ __('admin::app.error.go-to-home') }} + 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 b351a4191..cb7f7da76 100644 --- a/packages/Webkul/Admin/src/Resources/views/errors/404.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/errors/404.blade.php @@ -1,7 +1,7 @@ @extends('admin::layouts.content') @section('page_title') - + {{ __('admin::app.error.404.page-title') }} @stop @section('content') @@ -14,11 +14,17 @@
{{ $code }}
-
Page Not Found
+
+ {{ __('admin::app.error.404.title') }} +
-
The Page you are looking for doesnt exist or have secrately escaped;head backm to home and make a fresh move again.
+
+ {{ __('admin::app.error.404.message') }} +
- GO TO HOME + + {{ __('admin::app.error.go-to-home') }} + 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 b351a4191..40152c113 100644 --- a/packages/Webkul/Admin/src/Resources/views/errors/500.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/errors/500.blade.php @@ -1,10 +1,11 @@ @extends('admin::layouts.content') @section('page_title') - + {{ __('admin::app.error.403.page-title') }} @stop @section('content') +
{{ $code }}
-
Page Not Found
+
+ {{ __('admin::app.error.500.title') }} +
-
The Page you are looking for doesnt exist or have secrately escaped;head backm to home and make a fresh move again.
+
+ {{ __('admin::app.error.500.message') }} +
- GO TO HOME + + {{ __('admin::app.error.go-to-home') }} +
@@ -27,4 +34,5 @@ + @stop \ No newline at end of file diff --git a/packages/Webkul/Admin/src/Resources/views/layouts/master.blade.php b/packages/Webkul/Admin/src/Resources/views/layouts/master.blade.php index a47db30c1..f1a786c9b 100644 --- a/packages/Webkul/Admin/src/Resources/views/layouts/master.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/layouts/master.blade.php @@ -7,6 +7,8 @@ + + diff --git a/packages/Webkul/Admin/src/Resources/views/layouts/nav-top.blade.php b/packages/Webkul/Admin/src/Resources/views/layouts/nav-top.blade.php index a52a6a85d..36a6fc1bd 100644 --- a/packages/Webkul/Admin/src/Resources/views/layouts/nav-top.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/layouts/nav-top.blade.php @@ -14,7 +14,7 @@
- {{-- {{ auth()->guard('admin')->user()->name }} --}} + {{ auth()->guard('admin')->user()->name }} diff --git a/packages/Webkul/Admin/src/Resources/views/settings/sliders/create.blade.php b/packages/Webkul/Admin/src/Resources/views/settings/sliders/create.blade.php index dfbcafa39..3de76411b 100644 --- a/packages/Webkul/Admin/src/Resources/views/settings/sliders/create.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/settings/sliders/create.blade.php @@ -31,11 +31,14 @@ @{{ errors.first('title') }}
+ getAllChannels() ?>
- + @foreach($channels as $channel) + @endforeach @{{ errors.first('channel_id') }} diff --git a/packages/Webkul/Admin/src/Resources/views/settings/sliders/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/settings/sliders/edit.blade.php new file mode 100644 index 000000000..1ed666826 --- /dev/null +++ b/packages/Webkul/Admin/src/Resources/views/settings/sliders/edit.blade.php @@ -0,0 +1,69 @@ +@extends('admin::layouts.content') + +@section('page_title') + {{ __('admin::app.settings.sliders.add-title') }} +@stop + +@section('content') +
+
+
+
+

{{ __('admin::app.settings.sliders.add-title') }}

+
+ +
+ +
+
+ +
+
+ + @csrf() + +
+ + + @{{ errors.first('title') }} +
+ + getAllChannels() ?> +
+ + + @{{ errors.first('channel_id') }} +
+ +
+ + + + + + @{{ errors.first('image') }} + +
+ +
+ + + + + @{{ errors.first('content') }} +
+ + +
+
+
+
+@endsection \ No newline at end of file diff --git a/packages/Webkul/Core/src/Repositories/SliderRepository.php b/packages/Webkul/Core/src/Repositories/SliderRepository.php index 766a0bcd8..3f734ad68 100644 --- a/packages/Webkul/Core/src/Repositories/SliderRepository.php +++ b/packages/Webkul/Core/src/Repositories/SliderRepository.php @@ -2,7 +2,10 @@ namespace Webkul\Core\Repositories; +use Illuminate\Container\Container as App; use Webkul\Core\Eloquent\Repository; +use Webkul\Core\Repositories\ChannelRepository as Channel; +use Storage; /** * Slider Reposotory @@ -12,6 +15,18 @@ use Webkul\Core\Eloquent\Repository; */ class SliderRepository extends Repository { + protected $channel; + + public function __construct( + Channel $channel, + App $app + ) + { + $this->channel = $channel; + + parent::__construct($app); + } + /** * Specify Model class name * @@ -28,15 +43,52 @@ class SliderRepository extends Repository */ public function create(array $data) { - $image = request()->file('image'); - $image_name = uniqid(20).'.'.$image->getClientOriginalExtension(); + $channelName = $this->channel->find($data['channel_id'])->name; + + $dir = 'slider_images/' . $channelName; + + $image = request()->file('image')->store($dir); + + unset($data['image'], $data['_token']); + + $data['path'] = $image; - $destinationPath = public_path('/vendor/webkul/shop/assets/images/slider'); - $path = $image->move($destinationPath, $image_name); - $path= 'vendor/webkul/shop/assets/images/slider/'.$image_name; - $data['path'] = $path; $this->model->create($data); } + /** + * @param array $data + * @return mixed + */ + public function updateItem(array $data, $id) + { + $channelName = $this->channel->find($data['channel_id'])->name; + + $dir = 'slider_images/' . $channelName; + + $image = request()->file('image')->store($dir); + + unset($data['image'], $data['_token']); + + $data['path'] = $image; + + $this->update($data, $id); + } + + /** + * Delete a slider item and delete the image from the disk or where ever it is + * + * @return Boolean + */ + public function destroy($id) { + + $sliderItem = $this->find($id); + + $sliderItemImage = $sliderItem->path; + + Storage::delete($sliderItemImage); + + return $this->model->destroy($id); + } } \ No newline at end of file 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 7d7e5f7ce..854f7fad0 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 @@ -16,6 +16,7 @@ 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->timestamps(); }); } diff --git a/packages/Webkul/Customer/src/Database/migrations/2018_09_11_064045_customers_password_resets.php b/packages/Webkul/Customer/src/Database/migrations/2018_09_11_064045_customers_password_resets.php new file mode 100644 index 000000000..3312a7865 --- /dev/null +++ b/packages/Webkul/Customer/src/Database/migrations/2018_09_11_064045_customers_password_resets.php @@ -0,0 +1,32 @@ +string('email')->index(); + $table->string('token'); + $table->timestamp('created_at')->nullable(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::dropIfExists('customers_password_resets'); + } +} \ No newline at end of file diff --git a/packages/Webkul/Customer/src/Http/Controllers/AddressController.php b/packages/Webkul/Customer/src/Http/Controllers/AddressController.php index 9ca161166..1f5b98c5b 100644 --- a/packages/Webkul/Customer/src/Http/Controllers/AddressController.php +++ b/packages/Webkul/Customer/src/Http/Controllers/AddressController.php @@ -28,7 +28,6 @@ class AddressController extends Controller protected $customer; protected $address; - public function __construct(CustomerRepository $customer, CustomerAddressRepository $address) { $this->middleware('customer'); @@ -41,22 +40,9 @@ class AddressController extends Controller } /** - * Getting logged in - * customer helper - * @return Array - */ - private function getCustomer($id) { - - $customer = collect($this->customer->findOneWhere(['id'=>$id])); - - return $customer; - } - - /** - * Getting logged in - * customer address - * helper - * @return Array + * Getting logged in customer address helper + * + * @return array */ private function getAddress($id) { @@ -66,37 +52,32 @@ class AddressController extends Controller } - /** - * Address Route - * index page - * @return View + * Address Route index page + * + * @return view */ public function index() { $id = auth()->guard('customer')->user()->id; - $customer = $this->getCustomer($id); - $address = $this->getAddress($id); return view($this->_config['view'])->with('address', $address); } /** - * Show the address - * create form - * @return View + * Show the address create form + * + * @return view */ public function show() { return view($this->_config['view']); } /** - * Create a new - * address for - * customer. + * Create a new address for customer. * - * @return View + * @return view */ public function create() { @@ -144,11 +125,9 @@ class AddressController extends Controller } /** - * For editing the - * existing address - * of the customer + * For editing the existing address of the customer * - * @return View + * @return view */ public function showEdit() { @@ -160,6 +139,12 @@ class AddressController extends Controller } + /** + * Edits the premade resource of customer called + * Address. + * + * @return redirect + */ public function edit() { $id = auth()->guard('customer')->user()->id; diff --git a/packages/Webkul/Customer/src/Http/Controllers/CustomerController.php b/packages/Webkul/Customer/src/Http/Controllers/CustomerController.php index 913ecdd9d..0f4ea7683 100644 --- a/packages/Webkul/Customer/src/Http/Controllers/CustomerController.php +++ b/packages/Webkul/Customer/src/Http/Controllers/CustomerController.php @@ -10,10 +10,7 @@ use Webkul\Customer\Models\Customer; use Auth; /** - * Customer controlller for the customer - * basically for the tasks of customers - * which will be done after customer - * authenticastion. + * Customer controlller for the customer basically for the tasks of customers which will be done after customer authentication. * * @author Prashant Singh * @copyright 2018 Webkul Software Pvt Ltd (http://www.webkul.com) @@ -36,7 +33,7 @@ class CustomerController extends Controller protected $productReview; /** - * Create a new controller instance. + * Create a new Repository instance. * * @param Webkul\Product\Repositories\ProductReviewRepository $productReview * @return void @@ -54,9 +51,8 @@ class CustomerController extends Controller } /** - * For taking the customer - * to the dashboard after - * authentication + * For taking the customer to the dashboard after authentication + * * @return view */ private function getCustomer($id) { @@ -65,9 +61,8 @@ class CustomerController extends Controller } /** - * Taking the customer - * to profile details - * page + * Taking the customer to profile details page + * * @return View */ public function index() { @@ -79,8 +74,7 @@ class CustomerController extends Controller } /** - * For loading the - * edit form page. + * For loading the edit form page. * * @return View */ @@ -93,9 +87,7 @@ class CustomerController extends Controller } /** - * Edit function - * for editing customer - * profile. + * Edit function for editing customer profile. * * @return Redirect. */ @@ -148,23 +140,40 @@ class CustomerController extends Controller } } + /** + * Load the view for the customer account panel, showing orders in a table. + * + * @return Mixed + */ public function orders() { return view($this->_config['view']); } + /** + * Load the view for the customer account panel, showing wishlist items. + * + * @return Mixed + */ public function wishlist() { return view($this->_config['view']); } + /** + * Load the view for the customer account panel, showing approved reviews. + * + * @return Mixed + */ public function reviews() { - - $id = auth()->guard('customer')->user()->id; - - $reviews = $this->productReview->getCustomerReview($id); + $reviews = $this->productReview->getCustomerReview(); return view($this->_config['view'],compact('reviews')); } + /** + * Load the view for the customer account panel, shows the customer address. + * + * @return Mixed + */ public function address() { return view($this->_config['view']); } diff --git a/packages/Webkul/Customer/src/Http/Controllers/ReviewsController.php b/packages/Webkul/Customer/src/Http/Controllers/ReviewsController.php deleted file mode 100644 index 62e2f78ec..000000000 --- a/packages/Webkul/Customer/src/Http/Controllers/ReviewsController.php +++ /dev/null @@ -1,61 +0,0 @@ - - * @copyright 2018 Webkul Software Pvt Ltd (http://www.webkul.com) - */ -class ReviewsController extends Controller -{ - /** - * Display a listing of the resource. - * - * @return \Illuminate\Http\Response - */ - protected $_config; - protected $customer; - - - public function __construct(CustomerRepository $customer) - { - $this->middleware('customer'); - - $this->_config = request('_config'); - - $this->customer = $customer; - } - - /** - * For taking the customer - * to the dashboard after - * authentication - * @return view - */ - private function getCustomer($id) { - $customer = collect($this->customer->findOneWhere(['id'=>$id])); - return $customer; - } - - public function index() { - $id = auth()->guard('customer')->user()->id; - - $customer = $this->getCustomer($id); - - return view($this->_config['view'])->with('customer', $customer); - } - - public function reviews() { - return view($this->_config['view']); - } -} \ No newline at end of file diff --git a/packages/Webkul/Customer/src/Models/Customer.php b/packages/Webkul/Customer/src/Models/Customer.php index bb6589d57..c587195f4 100644 --- a/packages/Webkul/Customer/src/Models/Customer.php +++ b/packages/Webkul/Customer/src/Models/Customer.php @@ -18,7 +18,7 @@ class Customer extends Authenticatable protected $table = 'customers'; - protected $fillable = ['first_name', 'last_name', 'gender', 'date_of_birth','phone','email','password','customer_group_id','subscribed_to_news_letter']; + protected $fillable = ['channel_id', 'first_name', 'last_name', 'gender', 'date_of_birth','phone','email','password','customer_group_id','subscribed_to_news_letter']; protected $hidden = ['password','remember_token']; diff --git a/packages/Webkul/Customer/src/Models/CustomerGroups.php b/packages/Webkul/Customer/src/Models/CustomerGroups.php index c71d8e34d..27ed1a786 100644 --- a/packages/Webkul/Customer/src/Models/CustomerGroups.php +++ b/packages/Webkul/Customer/src/Models/CustomerGroups.php @@ -6,4 +6,6 @@ use Illuminate\Database\Eloquent\Model; class CustomersGroups extends Model { protected $table = 'customer_groups'; + + protected $fillable = ['group_name', 'is_user_defined']; } diff --git a/packages/Webkul/Product/src/Repositories/ProductReviewRepository.php b/packages/Webkul/Product/src/Repositories/ProductReviewRepository.php index 4e135b324..71c19f9ce 100644 --- a/packages/Webkul/Product/src/Repositories/ProductReviewRepository.php +++ b/packages/Webkul/Product/src/Repositories/ProductReviewRepository.php @@ -14,7 +14,7 @@ use Webkul\Product\Repositories\ProductRepository; */ class ProductReviewRepository extends Repository { - /** + /** * ProductImageRepository object * * @var array @@ -51,9 +51,13 @@ class ProductReviewRepository extends Repository * * @param int $customerId */ - function getCustomerReview($customerId) + function getCustomerReview() { - $reviews = $this->model->where('customer_id',$customerId)->with('product')->get(); + $customerId = auth()->guard('customer')->user()->id; + + $reviews = $this->model->where(['customer_id'=> $customerId, 'status' => 'approved'])->with('product')->get(); + + // dd($reviews); return $reviews; } diff --git a/packages/Webkul/Shop/src/Http/Controllers/ReviewController.php b/packages/Webkul/Shop/src/Http/Controllers/ReviewController.php index 4447db8b0..bf7a8fda9 100644 --- a/packages/Webkul/Shop/src/Http/Controllers/ReviewController.php +++ b/packages/Webkul/Shop/src/Http/Controllers/ReviewController.php @@ -46,6 +46,10 @@ class ReviewController extends Controller */ public function __construct(Product $product, ProductReview $productReview) { + $this->middleware('admin'); + + $this->middleware('customer')->only(['create', 'store']); + $this->product = $product; $this->productReview = $productReview; @@ -118,7 +122,7 @@ class ReviewController extends Controller return view($this->_config['view'],compact('product')); } - /** + /** * Show the form for editing the specified resource. * * @param int $id @@ -131,7 +135,7 @@ class ReviewController extends Controller return view($this->_config['view'],compact('review')); } - /** + /** * Update the specified resource in storage. * * @param \Illuminate\Http\Request $request diff --git a/packages/Webkul/Shop/src/Http/Controllers/SliderController.php b/packages/Webkul/Shop/src/Http/Controllers/SliderController.php index e9d3fc11b..86eac42db 100644 --- a/packages/Webkul/Shop/src/Http/Controllers/SliderController.php +++ b/packages/Webkul/Shop/src/Http/Controllers/SliderController.php @@ -45,20 +45,50 @@ class SliderController extends controller public function create() { $channels = core()->getAllChannels(); - return view($this->_config['view'])->with('channels',[$channels]); + return view($this->_config['view']); } /** - * Creates the new - * sider item + * Creates the new sider item. + * + * @return response */ public function store() { + $this->slider->create(request()->all()); + session()->flash('success', 'Slider created successfully.'); + return redirect()->back(); } - /** + /** + * Edit the previously created slider item. + * + * @return mixed + */ + public function edit($id) { + $slider = $this->slider->find($id); + + return view($this->_config['view'])->with('slider', $slider); + } + + /** + * Edit the previously created slider item. + * + * @return response + */ + public function update($id) { + if($this->slider->updateItem(request()->all(), $id)) { + session()->flash('success', 'Slider Item Successfully Updated'); + } else { + session()->flash('error', 'Slider Cannot Be Updated'); + } + + return redirect()->back(); + } + + /** * Delete a slider item and preserve the last one from deleting * * @return mixed @@ -68,8 +98,10 @@ class SliderController extends controller session()->flash('warning', 'Cannot Delete The Last Slider Item'); } else { $this->slider->destroy($id); + session()->flash('success', 'Slider Item Successfully Deleted'); } + return redirect()->back(); } } \ No newline at end of file diff --git a/packages/Webkul/Shop/src/Http/routes.php b/packages/Webkul/Shop/src/Http/routes.php index a2da19300..de905434d 100644 --- a/packages/Webkul/Shop/src/Http/routes.php +++ b/packages/Webkul/Shop/src/Http/routes.php @@ -66,10 +66,6 @@ Route::group(['middleware' => ['web', 'theme', 'locale']], function () { 'redirect' => 'customer.reviews.index' ])->name('shop.reviews.store'); - // Route::post('/reviews/create/{slug}', 'Webkul\Shop\Http\Controllers\ReviewController@store')->defaults('_config', [ - // 'redirect' => 'admin.reviews.index' - // ])->name('admin.reviews.store'); - // forgot Password Routes Route::get('/forgot-password', 'Webkul\Customer\Http\Controllers\ForgotPasswordController@create')->defaults('_config', [ 'view' => 'shop::customers.signup.forgot-password' diff --git a/packages/Webkul/Shop/src/Resources/assets/images/favicon.ico b/packages/Webkul/Shop/src/Resources/assets/images/favicon.ico new file mode 100644 index 000000000..e9c217bb3 Binary files /dev/null and b/packages/Webkul/Shop/src/Resources/assets/images/favicon.ico differ diff --git a/packages/Webkul/Shop/src/Resources/assets/js/components/category-nav.vue b/packages/Webkul/Shop/src/Resources/assets/js/components/category-nav.vue index 286ff15cf..e82d91329 100644 --- a/packages/Webkul/Shop/src/Resources/assets/js/components/category-nav.vue +++ b/packages/Webkul/Shop/src/Resources/assets/js/components/category-nav.vue @@ -7,11 +7,6 @@ :item="item" :parent="index"> - -
  • - - Offer Zone -
    • diff --git a/packages/Webkul/Shop/src/Resources/assets/js/components/image-slider.vue b/packages/Webkul/Shop/src/Resources/assets/js/components/image-slider.vue index 219ac0f5a..25c09aa93 100644 --- a/packages/Webkul/Shop/src/Resources/assets/js/components/image-slider.vue +++ b/packages/Webkul/Shop/src/Resources/assets/js/components/image-slider.vue @@ -25,6 +25,11 @@ export default { type: Array, required: true, default: () => [], + }, + + public_path: { + type: String, + required: true, } }, @@ -53,8 +58,9 @@ export default { setProps() { var this_this = this; + this.slides.forEach(function(slider) { - this_this.images.push(slider.path); + this_this.images.push(this_this.public_path+'/storage/'+slider.path); }); this.currentIndex = 0; diff --git a/packages/Webkul/Shop/src/Resources/assets/sass/app.scss b/packages/Webkul/Shop/src/Resources/assets/sass/app.scss index 9b1b942a0..7cb0ddf48 100644 --- a/packages/Webkul/Shop/src/Resources/assets/sass/app.scss +++ b/packages/Webkul/Shop/src/Resources/assets/sass/app.scss @@ -299,21 +299,12 @@ section.slider-block { div.slider-control { display: flex; justify-content:space-between; - bottom: 48%; + bottom: 46%; right: 0%; width:100%; - - .dark-left-icon { - margin-left: 15px; - } - - .light-right-icon { - margin-right: 15px; - } } } } - } //header navigation diff --git a/packages/Webkul/Shop/src/Resources/assets/sass/components.scss b/packages/Webkul/Shop/src/Resources/assets/sass/components.scss index b4c9bfa0a..b5259a317 100644 --- a/packages/Webkul/Shop/src/Resources/assets/sass/components.scss +++ b/packages/Webkul/Shop/src/Resources/assets/sass/components.scss @@ -1,5 +1,3 @@ - - @media only screen and (max-width: 425px) { .product-card { font-size: 90%; diff --git a/packages/Webkul/Shop/src/Resources/assets/sass/override.scss b/packages/Webkul/Shop/src/Resources/assets/sass/override.scss index c43623a87..ad44108ae 100644 --- a/packages/Webkul/Shop/src/Resources/assets/sass/override.scss +++ b/packages/Webkul/Shop/src/Resources/assets/sass/override.scss @@ -285,6 +285,7 @@ body { } .responsive-layred-filter { + @extend .layered-filter-wrapper; width: 100%; float: none; padding-right: 0px; diff --git a/packages/Webkul/Shop/src/Resources/views/customers/account/address/address.blade.php b/packages/Webkul/Shop/src/Resources/views/customers/account/address/address.blade.php index 5a2a87908..26caedc2d 100644 --- a/packages/Webkul/Shop/src/Resources/views/customers/account/address/address.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/customers/account/address/address.blade.php @@ -13,7 +13,6 @@