diff --git a/packages/Webkul/Admin/src/DataGrids/CategoryDataGrid.php b/packages/Webkul/Admin/src/DataGrids/CategoryDataGrid.php index bd185f7df..1fc176f52 100644 --- a/packages/Webkul/Admin/src/DataGrids/CategoryDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/CategoryDataGrid.php @@ -123,12 +123,12 @@ class CategoryDataGrid 'filterable' => [ [ 'column' => 'cat.id', - 'alias' => 'catID', + 'alias' => 'cat_id', 'type' => 'number', 'label' => 'Category ID', ], [ 'column' => 'ct.name', - 'alias' => 'catName', + 'alias' => 'cat_name', 'type' => 'string', 'label' => 'Category Name', ], @@ -140,7 +140,7 @@ class CategoryDataGrid // ], [ 'column' => 'cat.status', - 'alias' => 'catStatus', + 'alias' => 'cat_status', 'type' => 'string', 'label' => 'Visible in Menu', ], diff --git a/packages/Webkul/Admin/src/DataGrids/ExchangeRatesDataGrid.php b/packages/Webkul/Admin/src/DataGrids/ExchangeRatesDataGrid.php index c5143cf80..67ac589b2 100644 --- a/packages/Webkul/Admin/src/DataGrids/ExchangeRatesDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/ExchangeRatesDataGrid.php @@ -68,54 +68,47 @@ class ExchangeRatesDataGrid //use aliasing on secodary columns if join is performed 'columns' => [ - [ 'name' => 'cer.id', - 'alias' => 'exchID', + 'alias' => 'exchid', 'type' => 'number', 'label' => 'Rate ID', 'sortable' => true, - ], - [ + ], [ 'name' => 'curr.name', - 'alias' => 'currencyname', + 'alias' => 'exchcurrname', 'type' => 'string', 'label' => 'Currency Name', 'sortable' => true, - ], - [ + ], [ 'name' => 'cer.rate', - 'alias' => 'exchRate', + 'alias' => 'exchrate', 'type' => 'string', 'label' => 'Exchange Rate', ], ], //don't use aliasing in case of filters - 'filterable' => [ [ 'column' => 'cer.id', - 'alias' => 'exchId', + 'alias' => 'exchid', 'type' => 'number', 'label' => 'Rate ID', - ], - [ + ], [ 'column' => 'curr.name', - 'alias' => 'exchTargetCurrency', + 'alias' => 'exchcurrname', 'type' => 'string', - 'label' => 'Target Currency', - 'sortable' => true, + 'label' => 'Currency Name', ], ], //don't use aliasing in case of searchables - 'searchable' => [ [ - 'column' => 'target_currency', + 'column' => 'exchcurrname', 'type' => 'string', - 'label' => 'Target Currency', + 'label' => 'Currency Name', ], ], diff --git a/packages/Webkul/Admin/src/DataGrids/OrderShipmentsDataGrid.php b/packages/Webkul/Admin/src/DataGrids/OrderShipmentsDataGrid.php index 466942ec6..1429b7407 100644 --- a/packages/Webkul/Admin/src/DataGrids/OrderShipmentsDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/OrderShipmentsDataGrid.php @@ -4,6 +4,7 @@ namespace Webkul\Admin\DataGrids; use Illuminate\View\View; use Webkul\Ui\DataGrid\Facades\DataGrid; +use DB; /** * OrderShipmentsDataGrid @@ -82,7 +83,10 @@ class OrderShipmentsDataGrid 'alias' => 'order_customer_first_name', 'type' => 'string', 'label' => 'Customer Name', - 'sortable' => false + 'sortable' => false, + // 'wrapper' => function($value) { + // return $value.$last_name; + // } ], [ 'name' => 'ors.created_at', 'alias' => 'orscreated', diff --git a/packages/Webkul/Admin/src/Resources/views/users/users/create.blade.php b/packages/Webkul/Admin/src/Resources/views/users/users/create.blade.php index 146ee6cbb..f22094ee0 100644 --- a/packages/Webkul/Admin/src/Resources/views/users/users/create.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/users/users/create.blade.php @@ -32,7 +32,7 @@
- + @{{ errors.first('email') }}
@@ -42,13 +42,13 @@
- + @{{ errors.first('password') }}
- + @{{ errors.first('password_confirmation') }}
diff --git a/packages/Webkul/Admin/src/Resources/views/users/users/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/users/users/edit.blade.php index 1f087608a..d54b52c32 100644 --- a/packages/Webkul/Admin/src/Resources/views/users/users/edit.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/users/users/edit.blade.php @@ -4,7 +4,6 @@ {{ __('admin::app.users.users.edit-user-title') }} @stop - @section('content')
@@ -34,7 +33,7 @@
- + @{{ errors.first('email') }}
diff --git a/packages/Webkul/Customer/src/Http/Controllers/CustomerController.php b/packages/Webkul/Customer/src/Http/Controllers/CustomerController.php index 30155dc53..8d0e9ab3b 100644 --- a/packages/Webkul/Customer/src/Http/Controllers/CustomerController.php +++ b/packages/Webkul/Customer/src/Http/Controllers/CustomerController.php @@ -105,15 +105,23 @@ class CustomerController extends Controller $data = collect(request()->input())->except('_token')->toArray(); + if($data['date_of_birth'] == "") { + unset($data['date_of_birth']); + } + if($data['oldpassword'] == null) { $data = collect(request()->input())->except(['_token','password','password_confirmation','oldpassword'])->toArray(); + if($data['date_of_birth'] == "") { + unset($data['date_of_birth']); + } + if($this->customer->update($data, $id)) { - Session()->flash('success','Profile Updated Successfully'); + Session()->flash('success', trans('shop::app.customer.account.profile.edit-success')); return redirect()->back(); } else { - Session()->flash('success','Profile Cannot Be Updated Successfully'); + Session()->flash('success', trans('shop::app.customer.account.profile.edit-fail')); return redirect()->back(); } @@ -122,18 +130,22 @@ class CustomerController extends Controller $data = collect(request()->input())->except(['_token','oldpassword'])->toArray(); $data['password'] = bcrypt($data['password']); + + if($data['date_of_birth'] == "") { + unset($data['date_of_birth']); + } } else { - session()->flash('warning', 'The Old Password Does Not Match'); + session()->flash('warning', trans('shop::app.customer.account.profile.unmatch')); return redirect()->back(); } if($this->customer->update($data, $id)) { - Session()->flash('success','Profile Updated Successfully'); + Session()->flash('success', trans('shop::app.customer.account.profile.edit-success')); return redirect()->back(); } else { - Session()->flash('success','Profile Cannot Be Updated Successfully'); + Session()->flash('success', trans('shop::app.customer.account.profile.edit-fail')); return redirect()->back(); } diff --git a/packages/Webkul/Customer/src/Http/Controllers/ResetPasswordController.php b/packages/Webkul/Customer/src/Http/Controllers/ResetPasswordController.php index 744219235..b2a759593 100644 --- a/packages/Webkul/Customer/src/Http/Controllers/ResetPasswordController.php +++ b/packages/Webkul/Customer/src/Http/Controllers/ResetPasswordController.php @@ -62,7 +62,6 @@ class ResetPasswordController extends Controller */ public function store() { - //dd(request()->input()); $this->validate(request(), [ 'token' => 'required', 'email' => 'required|email', @@ -74,7 +73,7 @@ class ResetPasswordController extends Controller $this->resetPassword($customer, $password); } ); - // dd($response); + if($response == Password::PASSWORD_RESET) { return redirect()->route($this->_config['redirect']); } diff --git a/packages/Webkul/Customer/src/Http/Controllers/WishlistController.php b/packages/Webkul/Customer/src/Http/Controllers/WishlistController.php index a7fb2fdd0..384ccd0f5 100644 --- a/packages/Webkul/Customer/src/Http/Controllers/WishlistController.php +++ b/packages/Webkul/Customer/src/Http/Controllers/WishlistController.php @@ -55,7 +55,7 @@ class WishlistController extends Controller 'channel_id' => core()->getCurrentChannel()->id, 'customer_id' => auth()->guard('customer')->user()->id] ); - // dd($wishlistItems->count()); + return view($this->_config['view'])->with('items', $wishlistItems); } @@ -76,7 +76,7 @@ class WishlistController extends Controller $checked = $this->wishlist->findWhere(['channel_id' => core()->getCurrentChannel()->id, 'product_id' => $itemId, 'customer_id' => auth()->guard('customer')->user()->id]); //accidental case if some one adds id of the product in the anchor tag amd gives id of a variant. - if($product->parent_id != null || $product->parent_id != 'null') { + if($product->parent_id != null) { $product = $this->product->findOneByField('id', $product->parent_id); $data['product_id'] = $product->parent_id; } @@ -149,7 +149,7 @@ class WishlistController extends Controller return redirect()->back(); } - session()->flash('warning', trans('shop::app.checkout.cart.add-config-warning')); + session()->flash('info', trans('shop::app.checkout.cart.add-config-warning')); return redirect()->route('shop.products.index', $wishlistItem->product->url_key); } diff --git a/packages/Webkul/Shop/src/Http/Controllers/SubscriptionController.php b/packages/Webkul/Shop/src/Http/Controllers/SubscriptionController.php index c7d74980d..122fd3cf1 100644 --- a/packages/Webkul/Shop/src/Http/Controllers/SubscriptionController.php +++ b/packages/Webkul/Shop/src/Http/Controllers/SubscriptionController.php @@ -19,7 +19,6 @@ use Webkul\Core\Repositories\SubscribersListRepository as Subscription; */ class SubscriptionController extends Controller { - /** * User object * @@ -48,17 +47,13 @@ class SubscriptionController extends Controller */ public function __construct(Customer $customer, Subscription $subscription) { - $this->user = auth()->guard('customer')->user(); - - $this->customer = $customer; - $this->subscription = $subscription; $this->_config = request('_config'); } /** - * Subscribes Customers and Guests to subscription mailing list and checks if already subscribed + * Subscribes email to the email subscription list */ public function subscribe() { @@ -70,44 +65,27 @@ class SubscriptionController extends Controller $unique = 0; - if(auth()->guard('customer')->check()) { - $unique = function() use($email) { - $count = $this->customer->findWhere(['email' => $email]); + $alreadySubscribed = $this->subscription->findWhere(['email' => $email]); - if($count->count() > 0 && $count->first()->subscribed_to_news_letter == 1) { - return 0; - } else { - return 1; - } - }; - } else { - $alreadySubscribed = $this->subscription->findWhere(['email' => $email]); - - $unique = function() use($alreadySubscribed){ - if($alreadySubscribed->count() > 0 ) { - return 0; - } else { - return 1; - } - }; - } + $unique = function() use($alreadySubscribed){ + if($alreadySubscribed->count() > 0 ) { + return 0; + } else { + return 1; + } + }; if($unique()) { $token = uniqid(); + $result = false; - if(!auth()->guard('customer')->check()) { - $result = $this->subscription->create([ - 'email' => $email, - 'channel_id' => core()->getCurrentChannel()->id, - 'is_subscribed' => 1, - 'token' => $token - ]); - } else { - $user = auth()->guard('customer')->user(); - $token = auth()->guard('customer')->user()->email; - $result = $user->update(['subscribed_to_news_letter' => 1]); - } + $result = $this->subscription->create([ + 'email' => $email, + 'channel_id' => core()->getCurrentChannel()->id, + 'is_subscribed' => 1, + 'token' => $token + ]); if(!$result) { session()->flash('error', trans('shop::app.subscription.not-subscribed')); @@ -121,12 +99,8 @@ class SubscriptionController extends Controller Mail::send(new SubscriptionEmail($subscriptionData)); session()->flash('success', trans('shop::app.subscription.subscribed')); - - return redirect()->back(); } else { session()->flash('error', trans('shop::app.subscription.already')); - - return redirect()->back(); } return redirect()->back(); @@ -138,27 +112,14 @@ class SubscriptionController extends Controller * @var string $token */ public function unsubscribe($token) { - if(auth()->guard('customer')->check()) { - if(auth()->guard('customer')->user()->email == $token) { - auth()->guard('customer')->user()->update(['subscribed_to_news_letter' => 0]); - session('info', 'You Are Unsubscribed'); - } else { - session()->flash('warning', 'You must be logged in with correct to unsubscribe'); - } + $subscriber = $this->subscription->findOneByField('token', $token); + + if($subscriber->count() > 0 && $subscriber->is_subscribed == 1 &&$subscriber->update(['is_subscribed' => 0])) { + session()->flash('info', trans('shop::app.subscription.unsubscribed')); } else { - $subscriber = $this->subscription->findOneByField('token', $token); - - if($subscriber->count() > 0 && $subscriber->delete()) { - session('info', 'You Are Unsubscribed'); - } else { - session('info', 'You Have Already Unsubscribed'); - } - - if($this->customer->findOneByField('email', $token)) { - session('info', 'You must Logged In To Unsubscribe'); - } + session()->flash('info', trans('shop::app.subscription.already-unsub')); } - return redirect()->back(); + return redirect()->route('shop.home.index'); } } \ 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 91bd103d8..7ba04e971 100644 --- a/packages/Webkul/Shop/src/Http/routes.php +++ b/packages/Webkul/Shop/src/Http/routes.php @@ -12,7 +12,7 @@ Route::group(['middleware' => ['web', 'theme', 'locale', 'currency']], function Route::get('/subscribe', 'Webkul\Shop\Http\Controllers\SubscriptionController@subscribe')->name('shop.subscribe'); //unsubscribe - Route::get('/unsubscribe', 'Webkul\Shop\Http\Controllers\SubscriptionController@unSubscribe')->name('shop.unsubscribe'); + Route::get('/unsubscribe/{token}', 'Webkul\Shop\Http\Controllers\SubscriptionController@unsubscribe')->name('shop.unsubscribe'); //Store front header nav-menu fetch Route::get('/categories/{slug}', 'Webkul\Shop\Http\Controllers\CategoryController@index')->defaults('_config', [ @@ -125,7 +125,7 @@ Route::group(['middleware' => ['web', 'theme', 'locale', 'currency']], function // Reset Password Form Store Route::post('/reset-password', 'Webkul\Customer\Http\Controllers\ResetPasswordController@store')->defaults('_config', [ - 'redirect' => 'customer.session.index' + 'redirect' => 'customer.profile.index' ])->name('customer.reset-password.store'); // Login Routes diff --git a/packages/Webkul/Shop/src/Resources/lang/en/app.php b/packages/Webkul/Shop/src/Resources/lang/en/app.php index dddafedfd..5dec700b8 100644 --- a/packages/Webkul/Shop/src/Resources/lang/en/app.php +++ b/packages/Webkul/Shop/src/Resources/lang/en/app.php @@ -33,7 +33,9 @@ return [ 'subscribe' => 'Subscribe', 'subscribed' => 'You Are Now Subscribed To Subscription Emails', 'not-subscribed' => 'You Cannot Be Subscribed To Subscription Emails, Try Again After Some time', - 'already' => 'You Are Already Subscribed To Our Subscription List' + 'already' => 'You Are Already Subscribed To Our Subscription List', + 'unsubscribed' => 'You Are Unsubscribed From Bagisto Subscription Mails', + 'already-unsub' => 'You Are Already Unsubscribed' ], 'search' => [ @@ -130,6 +132,10 @@ return [ 'edit' => 'Edit', ], + 'edit-success' => 'Profile Updated Successfully', + 'edit-fail' => 'Error! Profile Cannot Be Updated, Please Try Again Later', + 'unmatch' => 'The Old Password Does Not Match', + 'fname' => 'First Name', 'lname' => 'Last Name', 'gender' => 'Gender', diff --git a/packages/Webkul/Shop/src/Resources/views/customers/account/profile/edit.blade.php b/packages/Webkul/Shop/src/Resources/views/customers/account/profile/edit.blade.php index 9baca4624..4e091bede 100644 --- a/packages/Webkul/Shop/src/Resources/views/customers/account/profile/edit.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/customers/account/profile/edit.blade.php @@ -58,22 +58,22 @@ @{{ errors.first('email') }}
-
+
- + @{{ errors.first('oldpassword') }}
- + @{{ errors.first('password') }}
- - @{{ errors.first('password_confirmation') }} + + @{{ errors.first('password_confirmation') }}
diff --git a/packages/Webkul/Shop/src/Resources/views/customers/account/profile/index.blade.php b/packages/Webkul/Shop/src/Resources/views/customers/account/profile/index.blade.php index b39596c16..c27a50bc8 100644 --- a/packages/Webkul/Shop/src/Resources/views/customers/account/profile/index.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/customers/account/profile/index.blade.php @@ -53,14 +53,14 @@ {{ $customer->email }} - @if($customer->subscribed_to_news_letter == 1) + {{-- @if($customer->subscribed_to_news_letter == 1) {{ __('shop::app.footer.subscribe-newsletter') }} {{ __('shop::app.subscription.unsubscribe') }} - @endif + @endif --}} diff --git a/packages/Webkul/Shop/src/Resources/views/emails/customer/subscription-email.blade.php b/packages/Webkul/Shop/src/Resources/views/emails/customer/subscription-email.blade.php index c58daca8b..7d4555b75 100644 --- a/packages/Webkul/Shop/src/Resources/views/emails/customer/subscription-email.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/emails/customer/subscription-email.blade.php @@ -8,16 +8,18 @@
- {{ __('shop::app.subscription.title') }} + Welcome to Bagisto - Email Subscription
- {{ __('shop::app.subscription.message') }} + Thanks for putting me into your inbox. It’s been a while since you’ve read Bagisto + email, and we don’t want to overwhelm your inbox. If you still do not want to receive + the latest email marketing news then for sure click the button below.
- {{ __('shop::app.subscription.unsubscribe') }} + Unsubscribe
diff --git a/packages/Webkul/Shop/src/Resources/views/emails/customer/verification-email.blade.php b/packages/Webkul/Shop/src/Resources/views/emails/customer/verification-email.blade.php index 4c637eabb..762f81bc1 100644 --- a/packages/Webkul/Shop/src/Resources/views/emails/customer/verification-email.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/emails/customer/verification-email.blade.php @@ -8,11 +8,12 @@
- {{ __('shop::app.subscription.title') }} + Bagisto - Email Verification
- {{ __('shop::app.subscription.message') }} + This is the mail to verify that the email address you entered is yours. + Kindly click the 'Verify Your Account' button below to verify your account.
diff --git a/packages/Webkul/Shop/src/Resources/views/layouts/footer/footer.blade.php b/packages/Webkul/Shop/src/Resources/views/layouts/footer/footer.blade.php index 8df3513fa..160c6e435 100644 --- a/packages/Webkul/Shop/src/Resources/views/layouts/footer/footer.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/layouts/footer/footer.blade.php @@ -18,12 +18,10 @@
{{ __('shop::app.footer.subscribe-newsletter') }}
- +

- @{{ errors.first('email') }} -
diff --git a/packages/Webkul/Shop/src/Resources/views/products/view.blade.php b/packages/Webkul/Shop/src/Resources/views/products/view.blade.php index 89a9b797c..c03317fa0 100644 --- a/packages/Webkul/Shop/src/Resources/views/products/view.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/products/view.blade.php @@ -39,9 +39,9 @@
- + - + @{{ errors.first('quantity') }}
diff --git a/packages/Webkul/Shop/src/Resources/views/products/view/configurable-options.blade.php b/packages/Webkul/Shop/src/Resources/views/products/view/configurable-options.blade.php index f28bddd07..e00735bbc 100644 --- a/packages/Webkul/Shop/src/Resources/views/products/view/configurable-options.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/products/view/configurable-options.blade.php @@ -12,9 +12,9 @@
- + - @@ -98,23 +98,23 @@ } //wishlist anchor href changer with options - @auth('customer') - var wishlistLink = $('#wishlist-changer').attr('data-href'); + // @auth('customer') + // var wishlistLink = $('#wishlist-changer').attr('data-href'); - if(this.selectedProductId != '') { - var splitted = wishlistLink.split("/"); + // if(this.selectedProductId != '') { + // var splitted = wishlistLink.split("/"); - var lastItem = splitted.pop(); + // var lastItem = splitted.pop(); - lastItem = this.selectedProductId; + // lastItem = this.selectedProductId; - var joined = splitted.join('/'); + // var joined = splitted.join('/'); - var newWishlistUrl = joined + '/' + lastItem; + // var newWishlistUrl = joined + '/' + lastItem; - $('#wishlist-changer').attr('data-href', newWishlistUrl); - } - @endauth + // $('#wishlist-changer').attr('data-href', newWishlistUrl); + // } + // @endauth //buy now anchor href changer with options var buyNowLink = $('.btn.buynow').attr('data-href'); diff --git a/packages/Webkul/Shop/src/Resources/views/products/view/gallery.blade.php b/packages/Webkul/Shop/src/Resources/views/products/view/gallery.blade.php index 8fb4fb6d4..f96f4d7bf 100644 --- a/packages/Webkul/Shop/src/Resources/views/products/view/gallery.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/products/view/gallery.blade.php @@ -34,19 +34,15 @@
- {{-- Uncomment the line below for activating share links --}} {{-- @include('shop::products.sharelinks') --}} - @auth('customer') - + + @endauth -
-