merdan
/
sarga
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into tax-enhancement

This commit is contained in:
devansh bawari 2021-05-07 17:00:03 +05:30
parent a7a2b688e1 dc2cc7a3c7
commit 3b951350b5
3 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
packages/Webkul/Admin/src/Config/acl.php
View File

@ -325,6 +325,11 @@ return [
'name' => 'admin::app.acl.mass-delete',
'route' => 'admin.customer.review.massdelete',
'sort' => 4,
], [
'key' => 'customers.orders',
'name' => 'admin::app.acl.orders',
'route' => 'admin.customer.orders.data',
'sort' => 7,
],
/*

4
packages/Webkul/Admin/src/Http/Controllers/Customer/CustomerController.php
View File

@ -329,5 +329,9 @@ class CustomerController extends Controller
if (request()->ajax()) {
return app(CustomerOrderDataGrid::class)->toJson();
}
$customer = $this->customerRepository->find(request('id'));
return view($this->_config['view'], compact('customer'));
}
}

4
packages/Webkul/Admin/src/Http/routes.php
View File

@ -116,7 +116,9 @@ Route::group(['middleware' => ['web']], function () {
Route::get('customers/{id}/invoices', 'Webkul\Admin\Http\Controllers\Customer\CustomerController@invoices')->name('admin.customer.invoices.data');
// Customer's orders route
Route::get('customers/{id}/orders', 'Webkul\Admin\Http\Controllers\Customer\CustomerController@orders')->name('admin.customer.orders.data');
Route::get('customers/{id}/orders', 'Webkul\Admin\Http\Controllers\Customer\CustomerController@orders')->defaults('_config', [
'view' => 'admin::customers.orders.index',
])->name('admin.customer.orders.data');
// Configuration routes
Route::get('configuration/{slug?}/{slug2?}', 'Webkul\Admin\Http\Controllers\ConfigurationController@index')->defaults('_config', [