From c9da9491a6f9b2796189d5f17306aea0e2498b3c Mon Sep 17 00:00:00 2001
From: prashant-webkul <prashant.singh852@webkul.com>
Date: Fri, 5 Oct 2018 11:49:30 +0530
Subject: [PATCH] Before merge

---
 packages/Webkul/Checkout/src/Cart.php                    | 9 +++++++--
 .../views/checkout/onepage/customer-info.blade.php       | 8 +++++---
 .../src/Resources/views/layouts/header/index.blade.php   | 3 ++-
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/packages/Webkul/Checkout/src/Cart.php b/packages/Webkul/Checkout/src/Cart.php
index bd0058d74..224a685ba 100644
--- a/packages/Webkul/Checkout/src/Cart.php
+++ b/packages/Webkul/Checkout/src/Cart.php
@@ -238,8 +238,13 @@ class Cart {
      */
     public function getCart()
     {
-        if(!$cart = session()->get('cart'))
-            return false;
+        if(session()->has('cart')) {
+
+            $cart = session()->get('cart');
+        } else if(auth()->guard('customer')->check()) {
+
+            return $cart = $this->cart->findOneByField('customer_id', auth()->guard('customer')->user()->id);
+        }
 
         return $this->cart->find($cart->id);
     }
diff --git a/packages/Webkul/Shop/src/Resources/views/checkout/onepage/customer-info.blade.php b/packages/Webkul/Shop/src/Resources/views/checkout/onepage/customer-info.blade.php
index 28e088e00..5857732be 100644
--- a/packages/Webkul/Shop/src/Resources/views/checkout/onepage/customer-info.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/checkout/onepage/customer-info.blade.php
@@ -5,9 +5,11 @@
         <div class="form-header">
             <h1>{{ __('shop::app.checkout.onepage.billing-address') }}</h1>
 
-            <a href="{{ route('customer.session.index') }}" class="btn btn-lg btn-primary">
-                {{ __('shop::app.checkout.onepage.sign-in') }}
-            </a>
+            @guest('customer')
+                <a href="{{ route('customer.session.index') }}" class="btn btn-lg btn-primary">
+                    {{ __('shop::app.checkout.onepage.sign-in') }}
+                </a>
+            @endguest
         </div>
 
         <div class="control-group" :class="[errors.has('address-form.billing[first_name]') ? 'has-error' : '']">
diff --git a/packages/Webkul/Shop/src/Resources/views/layouts/header/index.blade.php b/packages/Webkul/Shop/src/Resources/views/layouts/header/index.blade.php
index d78c8a394..40ccfe716 100644
--- a/packages/Webkul/Shop/src/Resources/views/layouts/header/index.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/layouts/header/index.blade.php
@@ -85,12 +85,13 @@
             <ul class="cart-dropdown-container">
                 <?php
                     $cart = cart()->getCart();
+                    // dd($cart);
                 ?>
                 @inject ('productImageHelper', 'Webkul\Product\Product\ProductImage')
 
                 <li class="cart-dropdown">
                     <span class="icon cart-icon"></span>
-                    @if(isset($cart) && session()->has('cart'))
+                    @if(isset($cart))
                     @php
                         $items = $cart->items;
                     @endphp