From d2f620bb9f16af7d4f6b06a9ed2912cc4c720ed6 Mon Sep 17 00:00:00 2001
From: jitendra <jitendra@webkul.com>
Date: Fri, 15 Feb 2019 19:38:10 +0530
Subject: [PATCH] Issue fixed (If configurable product added to cart without
 options)

---
 packages/Webkul/Checkout/src/Cart.php                     | 2 +-
 .../Webkul/Shop/src/Http/Controllers/CartController.php   | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/packages/Webkul/Checkout/src/Cart.php b/packages/Webkul/Checkout/src/Cart.php
index e11c3ecc5..c07df8c2f 100755
--- a/packages/Webkul/Checkout/src/Cart.php
+++ b/packages/Webkul/Checkout/src/Cart.php
@@ -241,7 +241,7 @@ class Cart {
         $product = $this->product->findOneByField('id', $id);
 
         if ($product->type == 'configurable') {
-            if (! isset($data['selected_configurable_option'])) {
+            if (! isset($data['selected_configurable_option']) || ! $data['selected_configurable_option']) {
                 return false;
             }
 
diff --git a/packages/Webkul/Shop/src/Http/Controllers/CartController.php b/packages/Webkul/Shop/src/Http/Controllers/CartController.php
index 849425744..d560d2df2 100755
--- a/packages/Webkul/Shop/src/Http/Controllers/CartController.php
+++ b/packages/Webkul/Shop/src/Http/Controllers/CartController.php
@@ -97,13 +97,17 @@ class CartController extends Controller
 
             Event::fire('checkout.cart.add.after', $result);
 
+            Cart::collectTotals();
+
             if ($result) {
                 session()->flash('success', trans('shop::app.checkout.cart.item.success'));
+
+                return redirect()->route($this->_config['redirect']);
             } else {
                 session()->flash('warning', trans('shop::app.checkout.cart.item.error-add'));
-            }
 
-            Cart::collectTotals();
+                return redirect()->back();
+            }
 
             return redirect()->route($this->_config['redirect']);