From 14efa58c0aed7df271bb5919129891acd3d212ce Mon Sep 17 00:00:00 2001
From: SteffenMahler <57138594+SteffenMahler@users.noreply.github.com>
Date: Thu, 19 Mar 2020 12:02:11 +0100
Subject: [PATCH] tiny fixes, add before event

---
 packages/Webkul/Checkout/src/Cart.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/packages/Webkul/Checkout/src/Cart.php b/packages/Webkul/Checkout/src/Cart.php
index 3f01b0dcb..05a46f6c1 100755
--- a/packages/Webkul/Checkout/src/Cart.php
+++ b/packages/Webkul/Checkout/src/Cart.php
@@ -464,7 +464,7 @@ class Cart
         if ($cart->haveStockableItems()) {
             $data['shipping_address'] = $cart->shipping_address->toArray();
 
-            $data['selected_shipping_rate'] = $cart->selected_shipping_rate->toArray();
+            $data['selected_shipping_rate'] = $cart->selected_shipping_rate ? $cart->selected_shipping_rate->toArray() : 0.0;
         }
 
         $data['payment'] = $cart->payment->toArray();
@@ -567,6 +567,7 @@ class Cart
         Event::dispatch('checkout.cart.collect.totals.before', $cart);
 
         $this->calculateItemsTax();
+        $cart->refresh();
 
         $cart->grand_total = $cart->base_grand_total = 0;
         $cart->sub_total = $cart->base_sub_total = 0;
@@ -657,6 +658,8 @@ class Cart
         if (! $cart = $this->getCart()) {
             return;
         }
+        
+        Event::dispatch('checkout.cart.calculate.items.tax.before', $cart);
 
         foreach ($cart->items()->get() as $item) {
             $taxCategory = $this->taxCategoryRepository->find($item->product->tax_category_id);