From dfb4e5f2109f331df81f9c43840b54116a2b0cdc Mon Sep 17 00:00:00 2001 From: prashant-webkul Date: Wed, 19 Dec 2018 14:57:44 +0530 Subject: [PATCH] subscription exception issue #337 fixed --- packages/Webkul/Admin/src/Http/routes.php | 7 ++++++- .../Shop/src/Http/Controllers/SubscriptionController.php | 1 + 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/packages/Webkul/Admin/src/Http/routes.php b/packages/Webkul/Admin/src/Http/routes.php index 7207e872a..cb5347827 100644 --- a/packages/Webkul/Admin/src/Http/routes.php +++ b/packages/Webkul/Admin/src/Http/routes.php @@ -296,29 +296,34 @@ Route::group(['middleware' => ['web']], function () { }); // User Routes + //datagrid for backend users Route::get('/users', 'Webkul\User\Http\Controllers\UserController@index')->defaults('_config', [ 'view' => 'admin::users.users.index' ])->name('admin.users.index'); + //create backend user get Route::get('/users/create', 'Webkul\User\Http\Controllers\UserController@create')->defaults('_config', [ 'view' => 'admin::users.users.create' ])->name('admin.users.create'); + //create backend user post Route::post('/users/create', 'Webkul\User\Http\Controllers\UserController@store')->defaults('_config', [ 'redirect' => 'admin.users.index' ])->name('admin.users.store'); + //delete backend user view Route::get('/users/edit/{id}', 'Webkul\User\Http\Controllers\UserController@edit')->defaults('_config', [ 'view' => 'admin::users.users.edit' ])->name('admin.users.edit'); + //edit backend user submit Route::put('/users/edit/{id}', 'Webkul\User\Http\Controllers\UserController@update')->defaults('_config', [ 'redirect' => 'admin.users.index' ])->name('admin.users.update'); + //delete backend user Route::get('/users/delete/{id}', 'Webkul\User\Http\Controllers\UserController@destroy')->name('admin.users.delete'); - // User Role Routes Route::get('/roles', 'Webkul\User\Http\Controllers\RoleController@index')->defaults('_config', [ 'view' => 'admin::users.roles.index' diff --git a/packages/Webkul/Shop/src/Http/Controllers/SubscriptionController.php b/packages/Webkul/Shop/src/Http/Controllers/SubscriptionController.php index e7556edb9..57a6fa7a1 100644 --- a/packages/Webkul/Shop/src/Http/Controllers/SubscriptionController.php +++ b/packages/Webkul/Shop/src/Http/Controllers/SubscriptionController.php @@ -124,6 +124,7 @@ class SubscriptionController extends Controller public function unsubscribe($token) { $subscriber = $this->subscription->findOneByField('token', $token); + if(isset($subscriber)) if($subscriber->count() > 0 && $subscriber->is_subscribed == 1 &&$subscriber->update(['is_subscribed' => 0])) { session()->flash('info', trans('shop::app.subscription.unsubscribed')); } else {