From 7d023afa5b0d21a43f55cc8d9eeafe53e973ff33 Mon Sep 17 00:00:00 2001
From: Prashant Singh <prashant.singh852@webkul.com>
Date: Sat, 22 Jun 2019 16:52:46 +0530
Subject: [PATCH] conditions now more properly grouped for show price after
 login functionalities

---
 .../Shop/src/Resources/views/products/add-buttons.blade.php  | 1 +
 .../Shop/src/Resources/views/products/add-to-cart.blade.php  | 4 ++--
 .../Shop/src/Resources/views/products/buy-now.blade.php      | 4 ++--
 .../Shop/src/Resources/views/products/list/card.blade.php    | 5 ++---
 .../Webkul/Shop/src/Resources/views/products/price.blade.php | 4 ++--
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/packages/Webkul/Shop/src/Resources/views/products/add-buttons.blade.php b/packages/Webkul/Shop/src/Resources/views/products/add-buttons.blade.php
index 7bb923696..ce1af212b 100644
--- a/packages/Webkul/Shop/src/Resources/views/products/add-buttons.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/products/add-buttons.blade.php
@@ -14,6 +14,7 @@
             <input type="hidden" name="product" value="{{ $product->product_id }}">
             <input type="hidden" name="quantity" value="1">
             <input type="hidden" value="false" name="is_configurable">
+
             <button class="btn btn-lg btn-primary addtocart" {{ $product->haveSufficientQuantity(1) ? '' : 'disabled' }}>{{ __('shop::app.products.add-to-cart') }}</button>
         </form>
 
diff --git a/packages/Webkul/Shop/src/Resources/views/products/add-to-cart.blade.php b/packages/Webkul/Shop/src/Resources/views/products/add-to-cart.blade.php
index d9265d2b4..b5b4b4e16 100755
--- a/packages/Webkul/Shop/src/Resources/views/products/add-to-cart.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/products/add-to-cart.blade.php
@@ -2,10 +2,10 @@
 @php
     $status = core()->getConfigData('ShowPriceAfterLogin.settings.settings.enableordisable');
 
-    $function = $status = core()->getConfigData('ShowPriceAfterLogin.settings.settings.selectfunction');
+    $function = core()->getConfigData('ShowPriceAfterLogin.settings.settings.selectfunction');
 @endphp
 
-@if ($status && ($function == 'hide-buy-cart-guest' || $function == 'hide-price-buy-cart-guest') && ! auth()->guard('customer')->check())
+@if (($status && ! auth()->guard('customer')->check()) && ($function == 'hide-buy-cart-guest' || $function == 'hide-price-buy-cart-guest'))
     <div class="login-to-view-price">
         <a class="btn btn-lg btn-primary addtocart" href="{{ route('customer.session.index') }}" style="width:100%;">
             {{ __('ShowPriceAfterLogin::app.products.login-to-view-price') }}
diff --git a/packages/Webkul/Shop/src/Resources/views/products/buy-now.blade.php b/packages/Webkul/Shop/src/Resources/views/products/buy-now.blade.php
index 60184a582..0f7dcf1b8 100755
--- a/packages/Webkul/Shop/src/Resources/views/products/buy-now.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/products/buy-now.blade.php
@@ -3,10 +3,10 @@
 @php
     $status = core()->getConfigData('ShowPriceAfterLogin.settings.settings.enableordisable');
 
-    $function = $status = core()->getConfigData('ShowPriceAfterLogin.settings.settings.selectfunction');
+    $function = core()->getConfigData('ShowPriceAfterLogin.settings.settings.selectfunction');
 @endphp
 
-@if ($status && ($function == 'hide-buy-cart-guest' || $function == 'hide-price-buy-cart-guest') && ! auth()->guard('customer')->check())
+@if (($status && ! auth()->guard('customer')->check()) && ($function == 'hide-buy-cart-guest' || $function == 'hide-price-buy-cart-guest'))
 @else
     <button type="submit" data-href="{{ route('shop.product.buynow', $product->product_id)}}" class="btn btn-lg btn-primary buynow" {{ $product->type != 'configurable' && ! $product->haveSufficientQuantity(1) ? 'disabled' : '' }}>
         {{ __('shop::app.products.buy-now') }}
diff --git a/packages/Webkul/Shop/src/Resources/views/products/list/card.blade.php b/packages/Webkul/Shop/src/Resources/views/products/list/card.blade.php
index 19450ebc6..dd754d56c 100755
--- a/packages/Webkul/Shop/src/Resources/views/products/list/card.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/products/list/card.blade.php
@@ -3,7 +3,7 @@
 @php
     $status = core()->getConfigData('ShowPriceAfterLogin.settings.settings.enableordisable');
 
-    $function = $status = core()->getConfigData('ShowPriceAfterLogin.settings.settings.selectfunction');
+    $function = core()->getConfigData('ShowPriceAfterLogin.settings.settings.selectfunction');
 @endphp
 
 <div class="product-card">
@@ -35,7 +35,7 @@
 
         @include ('shop::products.price', ['product' => $product])
 
-        @if ($status && ($function == 'hide-buy-cart-guest' || $function == 'hide-price-buy-cart-guest')  && ! auth()->guard('customer')->check())
+        @if (($status && ! auth()->guard('customer')->check()) && ($function == 'hide-buy-cart-guest' || $function == 'hide-price-buy-cart-guest'))
             <div class="login-to-view-price">
                 <a class="btn btn-lg btn-primary addtocart" href="{{ route('customer.session.index') }}" style="width:100%;">
                     @if ($function == 'hide-buy-cart-guest')
@@ -43,7 +43,6 @@
                     @else
                         {{ __('ShowPriceAfterLogin::app.products.login-to-view-price') }}
                     @endif
-
                 </a>
             </div>
         @else
diff --git a/packages/Webkul/Shop/src/Resources/views/products/price.blade.php b/packages/Webkul/Shop/src/Resources/views/products/price.blade.php
index 4173ba96d..380148499 100755
--- a/packages/Webkul/Shop/src/Resources/views/products/price.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/products/price.blade.php
@@ -3,12 +3,12 @@
 @php
     $status = core()->getConfigData('ShowPriceAfterLogin.settings.settings.enableordisable');
 
-    $function = $status = core()->getConfigData('ShowPriceAfterLogin.settings.settings.selectfunction');
+    $function = core()->getConfigData('ShowPriceAfterLogin.settings.settings.selectfunction');
 @endphp
 
 <div class="product-price">
     @inject ('priceHelper', 'Webkul\Product\Helpers\Price')
-    @if ($status && $function == "hide-price-buy-cart-guest" && ! auth()->guard('customer')->check())
+    @if (($status && ! auth()->guard('customer')->check()) && $function == "hide-price-buy-cart-guest")
     @else
         @if ($product->type == 'configurable')
             <span class="price-label">{{ __('shop::app.products.price-label') }}</span>