From 0c47cbc28294aef7ff87e83cd1b7eda9bd240d2e Mon Sep 17 00:00:00 2001
From: prashant-webkul <prashant.singh852@webkul.com>
Date: Fri, 12 Oct 2018 13:52:21 +0530
Subject: [PATCH] Bug fixes

---
 packages/Webkul/Checkout/src/Cart.php         |  2 +
 .../Shop/src/Resources/assets/sass/app.scss   |  6 +--
 .../views/checkout/cart/index.blade.php       |  6 +--
 .../views/layouts/header/index.blade.php      | 47 +++----------------
 .../Resources/views/products/view.blade.php   |  5 --
 .../Controllers}/Controller.php               |  0
 .../Controllers}/TaxCategoryController.php    |  0
 .../Controllers}/TaxController.php            |  0
 .../Controllers}/TaxRateController.php        |  0
 .../TaxServiceProvider.php                    |  0
 .../TaxCategoriesRepository.php               |  0
 .../TaxMapRepository.php                      |  0
 .../TaxRatesRepository.php                    |  0
 .../Ui/src/Resources/assets/sass/icons.scss   |  1 -
 public/themes/default/assets/css/shop.css     |  6 +--
 15 files changed, 17 insertions(+), 56 deletions(-)
 rename packages/Webkul/Tax/src/{http/controllers => Http/Controllers}/Controller.php (100%)
 rename packages/Webkul/Tax/src/{http/controllers => Http/Controllers}/TaxCategoryController.php (100%)
 rename packages/Webkul/Tax/src/{http/controllers => Http/Controllers}/TaxController.php (100%)
 rename packages/Webkul/Tax/src/{http/controllers => Http/Controllers}/TaxRateController.php (100%)
 rename packages/Webkul/Tax/src/{providers => Providers}/TaxServiceProvider.php (100%)
 rename packages/Webkul/Tax/src/{repositories => Repositories}/TaxCategoriesRepository.php (100%)
 rename packages/Webkul/Tax/src/{repositories => Repositories}/TaxMapRepository.php (100%)
 rename packages/Webkul/Tax/src/{repositories => Repositories}/TaxRatesRepository.php (100%)

diff --git a/packages/Webkul/Checkout/src/Cart.php b/packages/Webkul/Checkout/src/Cart.php
index f3397f054..e758bccc9 100644
--- a/packages/Webkul/Checkout/src/Cart.php
+++ b/packages/Webkul/Checkout/src/Cart.php
@@ -504,6 +504,8 @@ class Cart {
         if($cart = $this->getCart()) {
             $this->cartItem->delete($itemId);
 
+            $this->collectTotals();
+
             //delete the cart instance if no items are there
             if($cart->items()->get()->count() == 0) {
                 $this->cart->delete($cart->id);
diff --git a/packages/Webkul/Shop/src/Resources/assets/sass/app.scss b/packages/Webkul/Shop/src/Resources/assets/sass/app.scss
index a04ed07d9..9d425aa45 100644
--- a/packages/Webkul/Shop/src/Resources/assets/sass/app.scss
+++ b/packages/Webkul/Shop/src/Resources/assets/sass/app.scss
@@ -416,9 +416,9 @@ section.slider-block {
                             margin-bottom: 8px;
                         }
 
-                        .dropdown-footer button {
-                            border-radius: 0px;
-                            width: 130px;
+                        .dropdown-footer .btn {
+                            max-width: 170px;
+                            text-align: center;
                         }
                     }
                 }
diff --git a/packages/Webkul/Shop/src/Resources/views/checkout/cart/index.blade.php b/packages/Webkul/Shop/src/Resources/views/checkout/cart/index.blade.php
index ab04329d5..97db63736 100644
--- a/packages/Webkul/Shop/src/Resources/views/checkout/cart/index.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/checkout/cart/index.blade.php
@@ -32,13 +32,13 @@
 
                                 <div class="item">
                                     <div style="margin-right: 15px;">
-                                        <img class="item-image" src="{{ $productBaseImage['medium_image_url'] }}" />
+                                        <a href="{{ url()->to('/').'/products/'.$product->url_key }}"><img class="item-image" src="{{ $productBaseImage['medium_image_url'] }}" /></a>
                                     </div>
 
                                     <div class="item-details">
 
                                         <div class="item-title">
-                                            {{ $product->name }}
+                                            <a href="{{ url()->to('/').'/products/'.$product->url_key }}">{{ $product->name }}</a>
                                         </div>
 
                                         <div class="price">
@@ -50,7 +50,7 @@
                                             <div class="summary">
 
                                                 {{ Cart::getItemAttributeOptionDetails($item)['html'] }}
-                                                
+
                                             </div>
                                         @endif
 
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 c6e7dd9e1..b971dbe49 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
@@ -151,7 +151,7 @@
                                     <div class="dropdown-footer">
                                         <a href="{{ route('shop.checkout.cart.index') }}">View Shopping Cart</a>
 
-                                        <button class="btn btn-primary btn-lg"><a style="color: white;" href="{{ route('shop.checkout.onepage.index') }}">CHECKOUT</a></button>
+                                        <a class="btn btn-primary btn-lg" style="color: white;" href="{{ route('shop.checkout.onepage.index') }}">CHECKOUT</a>
                                     </div>
                                 </div>
                             </div>
@@ -223,48 +223,13 @@
                 <ul class="resp-cart-dropdown-container">
 
                     <li class="cart-dropdown">
-                        @if(isset($cart) && session()->has('cart'))
-                        @php
-                            $cart = session()->get('cart');
-                        @endphp
-                        <div class="dropdown-toggle">
-                            <span class="icon cart-icon"></span>
-                        </div>
-
-                        <div class="dropdown-list" style="display: none; top: 50px; right: 0px">
-                            <div class="dropdown-container">
-                                <div class="dropdown-cart">
-                                    <div class="dropdown-header">
-                                        <p class="heading">Cart Subtotal - {{ $cart->sub_total }}</p>
-                                    </div>
-
-                                    <div class="dropdown-content">
-                                        @foreach($cart as $product)
-                                        <div class="item" >
-                                            <div class="item-image" >
-                                                <img src="{{$product['2']}}" />
-                                            </div>
-                                            <div class="item-details">
-                                                <div class="item-name">{{$product['0']}}</div>
-                                                <div class="item-price">{{$product['1']}}</div>
-                                                <div class="item-qty">Quantity - {{$product['3']}}</div>
-                                            </div>
-                                        </div>
-                                        @endforeach
-                                    </div>
-
-                                    <div class="dropdown-footer">
-                                        <a href="/">View Shopping Cart</a>
-                                        <button class="btn btn-primary btn-lg">CHECKOUT</button>
-                                    </div>
-                                </div>
-                            </div>
+                        @if(isset($cart))
+                        <div>
+                            <a href="{{ route('shop.checkout.cart.index') }}"><span class="icon cart-icon"></span></a>
                         </div>
                         @else
-                        <div class="dropdown-toggle">
-                            <div style="display: inline-block; cursor: pointer;">
-                                <span class="icon cart-icon"></span>
-                            </div>
+                        <div style="display: inline-block; cursor: pointer;">
+                            <span class="icon cart-icon"></span>
                         </div>
                         @endif
                     </li>
diff --git a/packages/Webkul/Shop/src/Resources/views/products/view.blade.php b/packages/Webkul/Shop/src/Resources/views/products/view.blade.php
index 9fd492848..1dfbdb13a 100644
--- a/packages/Webkul/Shop/src/Resources/views/products/view.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/products/view.blade.php
@@ -65,17 +65,12 @@
                     </accordian>
 
                     @include ('shop::products.view.attributes')
-
                     @include ('shop::products.view.reviews')
-
                 </div>
-
             </form>
-
         </div>
 
         @include ('shop::products.view.up-sells')
-
     </section>
 
 @endsection
diff --git a/packages/Webkul/Tax/src/http/controllers/Controller.php b/packages/Webkul/Tax/src/Http/Controllers/Controller.php
similarity index 100%
rename from packages/Webkul/Tax/src/http/controllers/Controller.php
rename to packages/Webkul/Tax/src/Http/Controllers/Controller.php
diff --git a/packages/Webkul/Tax/src/http/controllers/TaxCategoryController.php b/packages/Webkul/Tax/src/Http/Controllers/TaxCategoryController.php
similarity index 100%
rename from packages/Webkul/Tax/src/http/controllers/TaxCategoryController.php
rename to packages/Webkul/Tax/src/Http/Controllers/TaxCategoryController.php
diff --git a/packages/Webkul/Tax/src/http/controllers/TaxController.php b/packages/Webkul/Tax/src/Http/Controllers/TaxController.php
similarity index 100%
rename from packages/Webkul/Tax/src/http/controllers/TaxController.php
rename to packages/Webkul/Tax/src/Http/Controllers/TaxController.php
diff --git a/packages/Webkul/Tax/src/http/controllers/TaxRateController.php b/packages/Webkul/Tax/src/Http/Controllers/TaxRateController.php
similarity index 100%
rename from packages/Webkul/Tax/src/http/controllers/TaxRateController.php
rename to packages/Webkul/Tax/src/Http/Controllers/TaxRateController.php
diff --git a/packages/Webkul/Tax/src/providers/TaxServiceProvider.php b/packages/Webkul/Tax/src/Providers/TaxServiceProvider.php
similarity index 100%
rename from packages/Webkul/Tax/src/providers/TaxServiceProvider.php
rename to packages/Webkul/Tax/src/Providers/TaxServiceProvider.php
diff --git a/packages/Webkul/Tax/src/repositories/TaxCategoriesRepository.php b/packages/Webkul/Tax/src/Repositories/TaxCategoriesRepository.php
similarity index 100%
rename from packages/Webkul/Tax/src/repositories/TaxCategoriesRepository.php
rename to packages/Webkul/Tax/src/Repositories/TaxCategoriesRepository.php
diff --git a/packages/Webkul/Tax/src/repositories/TaxMapRepository.php b/packages/Webkul/Tax/src/Repositories/TaxMapRepository.php
similarity index 100%
rename from packages/Webkul/Tax/src/repositories/TaxMapRepository.php
rename to packages/Webkul/Tax/src/Repositories/TaxMapRepository.php
diff --git a/packages/Webkul/Tax/src/repositories/TaxRatesRepository.php b/packages/Webkul/Tax/src/Repositories/TaxRatesRepository.php
similarity index 100%
rename from packages/Webkul/Tax/src/repositories/TaxRatesRepository.php
rename to packages/Webkul/Tax/src/Repositories/TaxRatesRepository.php
diff --git a/packages/Webkul/Ui/src/Resources/assets/sass/icons.scss b/packages/Webkul/Ui/src/Resources/assets/sass/icons.scss
index cd5f00ab3..6aaf709a1 100644
--- a/packages/Webkul/Ui/src/Resources/assets/sass/icons.scss
+++ b/packages/Webkul/Ui/src/Resources/assets/sass/icons.scss
@@ -2,7 +2,6 @@
 %menu-properties {
     width: 48px;
     height: 48px;
-    margin-bottom: 10px;
     display: inline-block;
     background-size: cover;
 }
diff --git a/public/themes/default/assets/css/shop.css b/public/themes/default/assets/css/shop.css
index 171e06c6d..905dcc374 100644
--- a/public/themes/default/assets/css/shop.css
+++ b/public/themes/default/assets/css/shop.css
@@ -1029,9 +1029,9 @@ section.slider-block div.slider-content div.slider-control .light-right-icon {
   margin-bottom: 8px;
 }
 
-.header .header-top div.right-content ul.cart-dropdown-container li.cart-dropdown .dropdown-list .dropdown-container .dropdown-footer button {
-  border-radius: 0px;
-  width: 130px;
+.header .header-top div.right-content ul.cart-dropdown-container li.cart-dropdown .dropdown-list .dropdown-container .dropdown-footer .btn {
+  max-width: 170px;
+  text-align: center;
 }
 
 .header .header-top ul.right-responsive {