From f69b00005219c9bfa3c573f13a5c2773692b9b89 Mon Sep 17 00:00:00 2001
From: prashant-webkul <prashant.singh852@webkul.com>
Date: Fri, 28 Sep 2018 19:44:54 +0530
Subject: [PATCH] Cart Bugs Fixes

---
 packages/Webkul/Checkout/src/Cart.php  | 9 +++++----
 packages/Webkul/Shipping/composer.json | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/packages/Webkul/Checkout/src/Cart.php b/packages/Webkul/Checkout/src/Cart.php
index ec1c41953..bf7306a77 100644
--- a/packages/Webkul/Checkout/src/Cart.php
+++ b/packages/Webkul/Checkout/src/Cart.php
@@ -332,8 +332,9 @@ class Cart {
                         }
                     } else if($data['is_configurable'] == "true") {
                         if($cartItem->type == "configurable") {
-                            if($cartItem->child->product_id == $data['selected_configurable_option']) {
-                                $child = $cartItem->child;
+                            $temp = $this->cartItem->findOneByField('parent_id', $cartItem->id);
+                            if($temp->product_id == $data['selected_configurable_option']) {
+                                $child = $temp->child;
 
                                 $parent = $cartItem;
                                 $parentPrice = $parent->price;
@@ -368,12 +369,12 @@ class Cart {
                 }
 
                 if($data['is_configurable'] == "true") {
-                    $this->canAddOrUpdate($parent->child->id, $parent->quantity);
-
                     $parent = $cart->items()->create($itemData['parent']);
 
                     $itemData['child']['parent_id'] = $parent->id;
 
+                    // $this->canAddOrUpdate($parent->child->id, $parent->quantity);
+
                     $cart->items()->create($itemData['child']);
                 } else if($data['is_configurable'] == "false"){
                     // $this->canAddOrUpdate($parent->id, $parent->quantity);
diff --git a/packages/Webkul/Shipping/composer.json b/packages/Webkul/Shipping/composer.json
index 7e3676e4f..f894797bb 100644
--- a/packages/Webkul/Shipping/composer.json
+++ b/packages/Webkul/Shipping/composer.json
@@ -17,7 +17,7 @@
     "extra": {
         "laravel": {
             "providers": [
-                "Webkul\\Cart\\Providers\\ShippingServiceProvider"
+                "Webkul\\Shipping\\Providers\\ShippingServiceProvider"
             ],
             "aliases": {}
         }