From 3f814d9253e01aa511d57929f493917d6d296592 Mon Sep 17 00:00:00 2001
From: jitendra <jitendra@webkul.com>
Date: Fri, 14 Jun 2019 15:13:20 +0530
Subject: [PATCH] Fixed checkout issue

---
 .../views/checkout/onepage.blade.php          | 23 +++++++-----
 .../views/checkout/total/summary.blade.php    | 36 ++++++++++---------
 2 files changed, 34 insertions(+), 25 deletions(-)

diff --git a/packages/Webkul/Shop/src/Resources/views/checkout/onepage.blade.php b/packages/Webkul/Shop/src/Resources/views/checkout/onepage.blade.php
index 196349745..a2d7294fb 100755
--- a/packages/Webkul/Shop/src/Resources/views/checkout/onepage.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/checkout/onepage.blade.php
@@ -83,17 +83,17 @@
             </div>
 
             <div class="col-right" v-if="resetSummary" v-show="currentStep != 4">
-                <summary-section></summary-section>
+                <summary-section hide-discount="1"></summary-section>
             </div>
         </div>
     </script>
 
     <script>
-        var shippingHtml = null;
-        var paymentHtml = null;
-        var reviewHtml = null;
-        var summaryHtml = null;
-        var customerAddress = null;
+        var shippingHtml = '';
+        var paymentHtml = '';
+        var reviewHtml = '';
+        var summaryHtml = '';
+        var customerAddress = '';
 
         @auth('customer')
             @if(auth('customer')->user()->addresses)
@@ -349,8 +349,12 @@
             data: function() {
                 return {
                     templateRender: null,
+
                     code: null,
-                    coupon_used: false
+
+                    coupon_used: false,
+
+                    hide_discount: 0
                 }
             },
 
@@ -395,6 +399,7 @@
             data: function() {
                 return {
                     templateRender: null,
+
                     selected_shipping_method: '',
                 }
             },
@@ -478,7 +483,9 @@
                 return {
                     templateRender: null,
 
-                    code: ''
+                    code: '',
+
+                    hide_discount: 1
                 }
             },
 
diff --git a/packages/Webkul/Shop/src/Resources/views/checkout/total/summary.blade.php b/packages/Webkul/Shop/src/Resources/views/checkout/total/summary.blade.php
index b0cdc4f81..1ffa9f9c4 100755
--- a/packages/Webkul/Shop/src/Resources/views/checkout/total/summary.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/checkout/total/summary.blade.php
@@ -36,24 +36,26 @@
         <label class="right">{{ core()->currency($cart->base_grand_total) }}</label>
     </div>
 
-    @if (! request()->is('checkout/cart') && ! $cart->coupon_code)
-        <div class="discount">
-            <div class="discount-group">
-                <form class="coupon-form" method="post" @submit.prevent="onSubmit">
-                    <div class="control-group mt-20" :class="[errors.has('code') ? 'has-error' : '']">
-                        <input type="text" class="control" value="" v-model="code" name="code" placeholder="Enter Coupon Code" v-validate="'required'" style="width: 100%">
-                    </div>
+    <div v-if="hide_discount">
+        @if (! request()->is('checkout/cart') && ! $cart->coupon_code)
+            <div class="discount">
+                <div class="discount-group">
+                    <form class="coupon-form" method="post" @submit.prevent="onSubmit">
+                        <div class="control-group mt-20" :class="[errors.has('code') ? 'has-error' : '']">
+                            <input type="text" class="control" value="" v-model="code" name="code" placeholder="Enter Coupon Code" v-validate="'required'" style="width: 100%">
+                        </div>
 
-                    <button class="btn btn-lg btn-black">{{ __('shop::app.checkout.onepage.apply-coupon') }}</button>
-                </form>
+                        <button class="btn btn-lg btn-black">{{ __('shop::app.checkout.onepage.apply-coupon') }}</button>
+                    </form>
+                </div>
             </div>
-        </div>
-    @else
-        <div class="discount-details-group">
-            <div class="item-detail">
-                <label>{{ __('shop::app.checkout.total.coupon-applied') }}</label>
-                <label class="right" style="display: inline-flex; align-items: center;">{{ $cart->coupon_code }} <span class="icon cross-icon" title="{{ __('shop::app.checkout.total.remove-coupon') }}"></span></label>
+        @else
+            <div class="discount-details-group">
+                <div class="item-detail">
+                    <label>{{ __('shop::app.checkout.total.coupon-applied') }}</label>
+                    <label class="right" style="display: inline-flex; align-items: center;">{{ $cart->coupon_code }} <span class="icon cross-icon" title="{{ __('shop::app.checkout.total.remove-coupon') }}"></span></label>
+                </div>
             </div>
-        </div>
-    @endif
+        @endif
+    </div>
 </div>
\ No newline at end of file