From bb310cd5c74a1c0d0e2438a8fb48d7752dce10a2 Mon Sep 17 00:00:00 2001 From: rahul shukla Date: Thu, 29 Nov 2018 18:07:58 +0530 Subject: [PATCH] route change --- packages/Webkul/Admin/src/Http/routes.php | 6 +++--- packages/Webkul/Admin/src/Resources/lang/en/app.php | 3 ++- .../Admin/src/Resources/views/customers/index.blade.php | 6 ++---- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/packages/Webkul/Admin/src/Http/routes.php b/packages/Webkul/Admin/src/Http/routes.php index 40d88800b..c6d3f8589 100644 --- a/packages/Webkul/Admin/src/Http/routes.php +++ b/packages/Webkul/Admin/src/Http/routes.php @@ -66,6 +66,9 @@ Route::group(['middleware' => ['web']], function () { Route::get('customers/delete/{id}', 'Webkul\Admin\Http\Controllers\Customer\CustomerController@destroy')->name('admin.customer.delete'); + //DataGrid Export + Route::get('customer-export', 'Webkul\Admin\Http\Controllers\Customer\CustomerController@export')->name('admin.customer.export'); + Route::get('reviews', 'Webkul\Product\Http\Controllers\ReviewController@index')->defaults('_config',[ 'view' => 'admin::customers.review.index' ])->name('admin.customer.review.index'); @@ -550,9 +553,6 @@ Route::group(['middleware' => ['web']], function () { Route::get('/tax-rates/delete/{id}', 'Webkul\Tax\Http\Controllers\TaxRateController@destroy')->name('admin.tax-rates.delete'); //tax rate ends - - //DataGrid Export - Route::get('export', 'Webkul\Admin\Http\Controllers\Customer\CustomerController@export')->name('admin.datagrid.export'); }); }); }); diff --git a/packages/Webkul/Admin/src/Resources/lang/en/app.php b/packages/Webkul/Admin/src/Resources/lang/en/app.php index b7dd75bc2..3aa3437ef 100644 --- a/packages/Webkul/Admin/src/Resources/lang/en/app.php +++ b/packages/Webkul/Admin/src/Resources/lang/en/app.php @@ -527,7 +527,8 @@ return [ 'channel_name' => 'Channel Name', 'state' => 'State', 'select-state' => 'Select a region, state or province.', - 'country' => 'Country' + 'country' => 'Country', + 'export' => 'Export' ], 'reviews' => [ 'title' => 'Reviews', 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 24027cadb..efdbd30bf 100644 --- a/packages/Webkul/Admin/src/Resources/views/customers/index.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/customers/index.blade.php @@ -16,11 +16,9 @@ {{ __('admin::app.customers.customers.add-title') }} - - - Export + + {{ __('admin::app.customers.customers.export') }} -