From 54a268302b6c8466de6652a788214c6269c12e31 Mon Sep 17 00:00:00 2001 From: Prashant Singh Date: Fri, 21 Dec 2018 14:05:52 +0530 Subject: [PATCH 1/6] fixed issue #354 --- packages/Webkul/Admin/webpack.mix.js | 4 ++-- .../Webkul/Shop/src/Http/Controllers/SliderController.php | 3 ++- packages/Webkul/Shop/src/Resources/assets/sass/app.scss | 4 ++++ packages/Webkul/Shop/webpack.mix.js | 4 ++-- packages/Webkul/Ui/src/Resources/assets/sass/app.scss | 4 ++++ 5 files changed, 14 insertions(+), 5 deletions(-) diff --git a/packages/Webkul/Admin/webpack.mix.js b/packages/Webkul/Admin/webpack.mix.js index 92e3d593b..3f72c18c8 100644 --- a/packages/Webkul/Admin/webpack.mix.js +++ b/packages/Webkul/Admin/webpack.mix.js @@ -1,8 +1,8 @@ const { mix } = require("laravel-mix"); require("laravel-mix-merge-manifest"); -var publicPath = 'publishable/assets'; -// var publicPath = "../../../public/vendor/webkul/admin/assets"; +// var publicPath = 'publishable/assets'; +var publicPath = "../../../public/vendor/webkul/admin/assets"; mix.setPublicPath(publicPath).mergeManifest(); mix.disableNotifications(); diff --git a/packages/Webkul/Shop/src/Http/Controllers/SliderController.php b/packages/Webkul/Shop/src/Http/Controllers/SliderController.php index 6d243afc0..64fa39343 100644 --- a/packages/Webkul/Shop/src/Http/Controllers/SliderController.php +++ b/packages/Webkul/Shop/src/Http/Controllers/SliderController.php @@ -57,7 +57,7 @@ class SliderController extends controller $this->validate(request(), [ 'title' => 'string|required', 'channel_id' => 'required', - 'image' => 'required', + 'image' => 'required|mimes:jpeg,bmp,png' ]); $result = $this->slider->save(request()->all()); @@ -90,6 +90,7 @@ class SliderController extends controller $this->validate(request(), [ 'title' => 'string|required', 'channel_id' => 'required', + 'image' => 'sometimes|mimes:jpeg,bmp,png' ]); $result = $this->slider->updateItem(request()->all(), $id); diff --git a/packages/Webkul/Shop/src/Resources/assets/sass/app.scss b/packages/Webkul/Shop/src/Resources/assets/sass/app.scss index eabca650a..bf022bf20 100644 --- a/packages/Webkul/Shop/src/Resources/assets/sass/app.scss +++ b/packages/Webkul/Shop/src/Resources/assets/sass/app.scss @@ -25,6 +25,10 @@ body { font-family: "Montserrat", sans-serif; } +textarea { + resize: none; +} + input { font-family: 'Montserrat', sans-serif; } diff --git a/packages/Webkul/Shop/webpack.mix.js b/packages/Webkul/Shop/webpack.mix.js index acf0d5b90..cc2d629f2 100644 --- a/packages/Webkul/Shop/webpack.mix.js +++ b/packages/Webkul/Shop/webpack.mix.js @@ -1,8 +1,8 @@ const { mix } = require("laravel-mix"); require("laravel-mix-merge-manifest"); -var publicPath = 'publishable/assets'; -// var publicPath = "../../../public/themes/default/assets"; +// var publicPath = 'publishable/assets'; +var publicPath = "../../../public/themes/default/assets"; mix.setPublicPath(publicPath).mergeManifest(); mix.disableNotifications(); diff --git a/packages/Webkul/Ui/src/Resources/assets/sass/app.scss b/packages/Webkul/Ui/src/Resources/assets/sass/app.scss index 890a735a6..6b86cfc6c 100644 --- a/packages/Webkul/Ui/src/Resources/assets/sass/app.scss +++ b/packages/Webkul/Ui/src/Resources/assets/sass/app.scss @@ -24,6 +24,10 @@ a:active { color: $brand-color; } +textarea { + resize: none; +} + ul { margin: 0; padding: 0; From a69807c4881863418f6ebbffaea1de110a8f1c48 Mon Sep 17 00:00:00 2001 From: Prashant Singh Date: Fri, 21 Dec 2018 14:15:24 +0530 Subject: [PATCH 2/6] fixed issue #366 --- .../Resources/views/search/search.blade.php | 51 ++++++++++--------- 1 file changed, 26 insertions(+), 25 deletions(-) diff --git a/packages/Webkul/Shop/src/Resources/views/search/search.blade.php b/packages/Webkul/Shop/src/Resources/views/search/search.blade.php index 8de269d4f..1693f8544 100644 --- a/packages/Webkul/Shop/src/Resources/views/search/search.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/search/search.blade.php @@ -9,33 +9,34 @@ {{ __('shop::app.search.no-results') }} @endif -
- @if($results->isEmpty()) -
-

{{ __('shop::app.products.whoops') }}

- {{ __('shop::app.search.no-results') }} -
- @else - @if($results->count() == 1) -
- {{ $results->count() }} {{ __('shop::app.search.found-result') }} + @if($results) +
+ @if($results->isEmpty()) +
+

{{ __('shop::app.products.whoops') }}

+ {{ __('shop::app.search.no-results') }}
@else -
- {{ $results->count() }} {{ __('shop::app.search.found-results') }} + @if($results->count() == 1) +
+ {{ $results->count() }} {{ __('shop::app.search.found-result') }} +
+ @else +
+ {{ $results->count() }} {{ __('shop::app.search.found-results') }} +
+ @endif + {{-- @include ('shop::products.list.toolbar') + + @inject ('toolbarHelper', 'Webkul\Product\Helpers\Toolbar') --}} +
+ @foreach ($results as $product) + @include('shop::products.list.card', ['product' => $product]) + @endforeach
+ + @include('ui::datagrid.pagination') @endif - {{-- @include ('shop::products.list.toolbar') - - @inject ('toolbarHelper', 'Webkul\Product\Helpers\Toolbar') --}} -
- @foreach ($results as $product) - @include('shop::products.list.card', ['product' => $product]) - @endforeach -
- - @include('ui::datagrid.pagination') - @endif -
- +
+ @endif @endsection From 5ebe171117ab6a3e24064b46ba6be8bff563a47a Mon Sep 17 00:00:00 2001 From: Prashant Singh Date: Fri, 21 Dec 2018 14:18:59 +0530 Subject: [PATCH 3/6] Fixed issue #363 --- .../Http/Controllers/TaxCategoryController.php | 12 +++++------- .../src/Http/Controllers/TaxRateController.php | 16 +++++++++++----- 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/packages/Webkul/Tax/src/Http/Controllers/TaxCategoryController.php b/packages/Webkul/Tax/src/Http/Controllers/TaxCategoryController.php index 8bb061042..7a6c64626 100644 --- a/packages/Webkul/Tax/src/Http/Controllers/TaxCategoryController.php +++ b/packages/Webkul/Tax/src/Http/Controllers/TaxCategoryController.php @@ -144,14 +144,14 @@ class TaxCategoryController extends Controller ]); $data = request()->input(); - + $taxCategory = $this->taxCategory->update($data, $id); if(!$taxCategory) { session()->flash('error', trans('admin::app.settings.tax-categories.update-error')); return redirect()->back(); } - + $taxRates = $data['taxrates']; //attach the categories in the tax map table @@ -170,12 +170,10 @@ class TaxCategoryController extends Controller */ public function destroy($id) { - if($this->taxCategory->count() == 1) { - session()->flash('error', trans('admin::app.settings.tax-categories.atleast-one')); - } else { + try { $this->taxCategory->delete($id); - - session()->flash('success', trans('admin::app.settings.tax-categories.delete')); + } catch(Exception $e) { + return redirect()->back(); } return redirect()->back(); diff --git a/packages/Webkul/Tax/src/Http/Controllers/TaxRateController.php b/packages/Webkul/Tax/src/Http/Controllers/TaxRateController.php index 5ee2771fe..d01627e75 100644 --- a/packages/Webkul/Tax/src/Http/Controllers/TaxRateController.php +++ b/packages/Webkul/Tax/src/Http/Controllers/TaxRateController.php @@ -157,12 +157,18 @@ class TaxRateController extends Controller */ public function destroy($id) { - if($this->taxRate->count() == 1) { - session()->flash('error', trans('admin::app.settings.tax-rates.atleast-one')); - } else { - $this->taxRate->delete($id); + // if($this->taxRate->count() == 1) { + // session()->flash('error', trans('admin::app.settings.tax-rates.atleast-one')); + // } else { - session()->flash('success', trans('admin::app.settings.tax-rates.delete')); + + // session()->flash('success', trans('admin::app.settings.tax-rates.delete')); + // } + + try{ + $this->taxRate->delete($id); + } catch(Exception $e) { + return redirect()->back(); } return redirect()->back(); From 6fba17ea8115cef593eb235e9c9d0fa4b4a3c970 Mon Sep 17 00:00:00 2001 From: Prashant Singh Date: Fri, 21 Dec 2018 16:14:20 +0530 Subject: [PATCH 4/6] Fixed issues #300 & Updated inventory in product grid after order received --- packages/Webkul/Admin/src/Listeners/Order.php | 8 ++++---- packages/Webkul/Admin/src/Listeners/Product.php | 14 ++++++++++++++ packages/Webkul/Checkout/src/Cart.php | 6 +++--- 3 files changed, 21 insertions(+), 7 deletions(-) diff --git a/packages/Webkul/Admin/src/Listeners/Order.php b/packages/Webkul/Admin/src/Listeners/Order.php index 8ade83005..44a433981 100644 --- a/packages/Webkul/Admin/src/Listeners/Order.php +++ b/packages/Webkul/Admin/src/Listeners/Order.php @@ -25,7 +25,7 @@ class Order { try { Mail::send(new NewOrderNotification($order)); } catch (\Exception $e) { - + } } @@ -39,7 +39,7 @@ class Order { try { Mail::send(new NewInvoiceNotification($invoice)); } catch (\Exception $e) { - + } } @@ -53,7 +53,7 @@ class Order { try { Mail::send(new NewShipmentNotification($shipment)); } catch (\Exception $e) { - + } } @@ -67,7 +67,7 @@ class Order { $productListener = app(\Webkul\Admin\Listeners\Product::class); foreach ($order->items as $item) { - $productListener->afterProductCreated($item->product); + $productListener->afterOrderRecieved($item->product->id, $item->qty_ordered); } } } \ No newline at end of file diff --git a/packages/Webkul/Admin/src/Listeners/Product.php b/packages/Webkul/Admin/src/Listeners/Product.php index cbe1b54b9..1f259232f 100644 --- a/packages/Webkul/Admin/src/Listeners/Product.php +++ b/packages/Webkul/Admin/src/Listeners/Product.php @@ -213,6 +213,20 @@ class Product { return true; } + /** + * Updates the product quantity when the order is received + * + * @param $productId + * @param $itemQuantity + */ + public function afterOrderRecieved($productId, $itemQuantity) { + $productGrid = $this->productGrid->findOneByField('product_id', $productId); + + $productGrid->update(['quantity' => $productGrid->quantity - $itemQuantity]); + + return true; + } + /** * Manually invoke this function when you have created the products by importing or seeding or factory. */ diff --git a/packages/Webkul/Checkout/src/Cart.php b/packages/Webkul/Checkout/src/Cart.php index aeca264d3..215f6b2a2 100644 --- a/packages/Webkul/Checkout/src/Cart.php +++ b/packages/Webkul/Checkout/src/Cart.php @@ -639,9 +639,9 @@ class Cart { } } - $cart->customer_email = $cart->shipping_address->email; - $cart->customer_first_name = $cart->shipping_address->first_name; - $cart->customer_last_name = $cart->shipping_address->last_name; + $cart->customer_email = $cart->billing_address->email; + $cart->customer_first_name = $cart->billing_address->first_name; + $cart->customer_last_name = $cart->billing_address->last_name; $cart->save(); return true; From 529db351f691b68132e0d0037351d5e1a6828a7e Mon Sep 17 00:00:00 2001 From: Prashant Singh Date: Fri, 21 Dec 2018 16:26:15 +0530 Subject: [PATCH 5/6] orders menu item was missing from the customer account side menu --- packages/Webkul/Shop/src/Config/menu.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/packages/Webkul/Shop/src/Config/menu.php b/packages/Webkul/Shop/src/Config/menu.php index 45f2025dc..c453ee5bd 100644 --- a/packages/Webkul/Shop/src/Config/menu.php +++ b/packages/Webkul/Shop/src/Config/menu.php @@ -26,7 +26,13 @@ return [ 'name' => 'Wishlist', 'route' =>'customer.wishlist.index', 'sort' => 4 + ], [ + 'key' => 'account.orders', + 'name' => 'Orders', + 'route' =>'customer.orders.index', + 'sort' => 5 ] + ]; ?> \ No newline at end of file From ae9bcb8398b818e088ce3b413a76ccc13aa9bc44 Mon Sep 17 00:00:00 2001 From: Prashant Singh Date: Fri, 21 Dec 2018 18:20:58 +0530 Subject: [PATCH 6/6] sort by field's translation value issue fixed on category page --- .../Customer/src/Http/Controllers/RegistrationController.php | 1 + .../Shop/src/Http/Controllers/SubscriptionController.php | 4 ++-- packages/Webkul/Shop/src/Resources/lang/en/app.php | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/packages/Webkul/Customer/src/Http/Controllers/RegistrationController.php b/packages/Webkul/Customer/src/Http/Controllers/RegistrationController.php index f53e16263..96dc026ce 100644 --- a/packages/Webkul/Customer/src/Http/Controllers/RegistrationController.php +++ b/packages/Webkul/Customer/src/Http/Controllers/RegistrationController.php @@ -94,6 +94,7 @@ class RegistrationController extends Controller /** * Method to verify account * + * @param string $token */ public function verifyAccount($token) { $customer = $this->customer->findOneByField('token', $token); diff --git a/packages/Webkul/Shop/src/Http/Controllers/SubscriptionController.php b/packages/Webkul/Shop/src/Http/Controllers/SubscriptionController.php index 57a6fa7a1..1df70439e 100644 --- a/packages/Webkul/Shop/src/Http/Controllers/SubscriptionController.php +++ b/packages/Webkul/Shop/src/Http/Controllers/SubscriptionController.php @@ -84,9 +84,9 @@ class SubscriptionController extends Controller $mailSent = true; try { - session()->flash('success', trans('shop::app.subscription.subscribed')); - Mail::send(new SubscriptionEmail($subscriptionData)); + + session()->flash('success', trans('shop::app.subscription.subscribed')); } catch(\Exception $e) { session()->flash('error', trans('shop::app.subscription.not-subscribed')); diff --git a/packages/Webkul/Shop/src/Resources/lang/en/app.php b/packages/Webkul/Shop/src/Resources/lang/en/app.php index f5ba7e3ee..14b66ab5f 100644 --- a/packages/Webkul/Shop/src/Resources/lang/en/app.php +++ b/packages/Webkul/Shop/src/Resources/lang/en/app.php @@ -286,7 +286,7 @@ return [ 'newest-first' => 'Newest First', 'oldest-first' => 'Oldest First', 'cheapest-first' => 'Cheapest First', - 'expensive-first' => 'Expensive First', + 'expansive-first' => 'Expensive First', 'show' => 'Show', 'pager-info' => 'Showing :showing of :total Items', 'description' => 'Description',