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 26e3a42db..22c22ef3a 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 @@ -1,71 +1,22 @@ -@if (Route::currentRouteName() == "shop.products.index") - @include ('shop::products.add-to', ['product' => $product]) -@else - @if(auth()->guard('customer')->check() && core()->getConfigData('ShowPriceAfterLogin.settings.settings.enableordisable')) - @if ($product->type == "configurable") -
- - {{ __('shop::app.products.add-to-cart') }} - - @include('shop::products.wishlist') -
- @else -
-
- @csrf - - - - -
- - @include('shop::products.wishlist') -
- @endif - - - - @elseif( - !auth()->guard('customer')->check() - && core()->getConfigData('ShowPriceAfterLogin.settings.settings.enableordisable') - && ( - core()->getConfigData('ShowPriceAfterLogin.settings.settings.selectfunction') == "hide-buy-cart-guest") - ) -
- - {{ __('ShowPriceAfterLogin::app.products.login-to-buy') }} + @if ($product->type == "configurable") +
+ + {{ __('shop::app.products.add-to-cart') }} -
- @elseif(! auth()->guard('customer')->check() && core()->getConfigData('ShowPriceAfterLogin.settings.settings.enableordisable') && core()->getConfigData('ShowPriceAfterLogin.settings.settings.selectfunction') == "hide-price-buy-cart-guest") -
- - {{ __('ShowPriceAfterLogin::app.products.login-to-view-price') }} - -
+ @include('shop::products.wishlist') +
@else - @if ($product->type == "configurable") -
- - {{ __('shop::app.products.add-to-cart') }} - +
+
+ @csrf + + + + +
- @include('shop::products.wishlist') -
- @else -
-
- @csrf - - - - -
- - @include('shop::products.wishlist') -
- @endif - - @endif -@endif \ No newline at end of file + @include('shop::products.wishlist') +
+ @endif \ No newline at end of file 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 f4fe91285..6f3e31784 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 @@ -1,24 +1,7 @@ {!! view_render_event('bagisto.shop.products.add_to_cart.before', ['product' => $product]) !!} -@if(auth()->guard('customer')->check() && core()->getConfigData('ShowPriceAfterLogin.settings.settings.enableordisable')) - + - @elseif( - !auth()->guard('customer')->check() - && core()->getConfigData('ShowPriceAfterLogin.settings.settings.enableordisable') - && ( - core()->getConfigData('ShowPriceAfterLogin.settings.settings.selectfunction') == "hide-price-buy-cart-guest" - || core()->getConfigData('ShowPriceAfterLogin.settings.settings.selectfunction') == "hide-buy-cart-guest") - ) - - - -@else - - -@endif {!! view_render_event('bagisto.shop.products.add_to_cart.after', ['product' => $product]) !!} \ No newline at end of file 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 edcfaa261..e38dcda14 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 @@ -1,21 +1,7 @@ {!! view_render_event('bagisto.shop.products.buy_now.before', ['product' => $product]) !!} -@if(auth()->guard('customer')->check() && core()->getConfigData('ShowPriceAfterLogin.settings.settings.enableordisable')) - - -@elseif( - !auth()->guard('customer')->check() - && core()->getConfigData('ShowPriceAfterLogin.settings.settings.enableordisable') - && ( core()->getConfigData('ShowPriceAfterLogin.settings.settings.selectfunction') == "hide-price-buy-cart-guest" - ||core()->getConfigData('ShowPriceAfterLogin.settings.settings.selectfunction') == "hide-buy-cart-guest")) - - -@else - -@endif + {!! view_render_event('bagisto.shop.products.buy_now.after', ['product' => $product]) !!} \ No newline at end of file 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 29d6087c6..a6d740bc4 100755 --- a/packages/Webkul/Shop/src/Resources/views/products/price.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/products/price.blade.php @@ -1,66 +1,25 @@ {!! view_render_event('bagisto.shop.products.price.before', ['product' => $product]) !!} +
- @if(auth()->guard('customer')->check() && core()->getConfigData('ShowPriceAfterLogin.settings.settings.enableordisable')) - @inject ('priceHelper', 'Webkul\Product\Helpers\Price') - - @if ($product->type == 'configurable') - - {{ __('shop::app.products.price-label') }} - - {{ core()->currency($priceHelper->getMinimalPrice($product)) }} - - @else - - @if ($priceHelper->haveSpecialPrice($product)) - -
- {{ __('shop::app.products.sale') }} -
- - {{ core()->currency($product->price) }} - - {{ core()->currency($priceHelper->getSpecialPrice($product)) }} - - @else - - {{ core()->currency($product->price) }} - - @endif - - @endif - - @elseif(!auth()->guard('customer')->check() && core()->getConfigData('ShowPriceAfterLogin.settings.settings.enableordisable') && (core()->getConfigData('ShowPriceAfterLogin.settings.settings.selectfunction') == "hide-price-buy-cart-guest")) - + @inject ('priceHelper', 'Webkul\Product\Helpers\Price') + @if ($product->type == 'configurable') + {{ __('shop::app.products.price-label') }} + {{ core()->currency($priceHelper->getMinimalPrice($product)) }} @else - @inject ('priceHelper', 'Webkul\Product\Helpers\Price') + @if ($priceHelper->haveSpecialPrice($product)) +
+ {{ __('shop::app.products.sale') }} +
- @if ($product->type == 'configurable') - - {{ __('shop::app.products.price-label') }} - - {{ core()->currency($priceHelper->getMinimalPrice($product)) }} + {{ core()->currency($product->price) }} + {{ core()->currency($priceHelper->getSpecialPrice($product)) }} @else - - @if ($priceHelper->haveSpecialPrice($product)) - -
- {{ __('shop::app.products.sale') }} -
- - {{ core()->currency($product->price) }} - - {{ core()->currency($priceHelper->getSpecialPrice($product)) }} - - @else - - {{ core()->currency($product->price) }} - - @endif - + {{ core()->currency($product->price) }} @endif @endif
+ {!! view_render_event('bagisto.shop.products.price.after', ['product' => $product]) !!} \ No newline at end of file diff --git a/packages/Webkul/Shop/src/Resources/views/products/review-price.blade.php b/packages/Webkul/Shop/src/Resources/views/products/review-price.blade.php index 99e01100c..4a69f26af 100644 --- a/packages/Webkul/Shop/src/Resources/views/products/review-price.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/products/review-price.blade.php @@ -1,4 +1,3 @@ -@if( !(core()->getConfigData('ShowPriceAfterLogin.settings.settings.enableordisable')) )
@inject ('priceHelper', 'Webkul\Product\Helpers\Price') @@ -11,5 +10,4 @@ {{ core()->currency($product->price) }} @endif @endif -
-@endif \ No newline at end of file + \ No newline at end of file diff --git a/packages/Webkul/Shop/src/Resources/views/products/view/product-add.blade.php b/packages/Webkul/Shop/src/Resources/views/products/view/product-add.blade.php index 6cb4e60f7..3254792c6 100755 --- a/packages/Webkul/Shop/src/Resources/views/products/view/product-add.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/products/view/product-add.blade.php @@ -1,28 +1,9 @@ {!! view_render_event('bagisto.shop.products.view.product-add.after', ['product' => $product]) !!} -@php - $status = core()->getConfigData('ShowPriceAfterLogin.settings.settings.enableordisable'); - $function = core()->getConfigData('ShowPriceAfterLogin.settings.settings.selectfunction'); -@endphp
@include ('shop::products.add-to-cart', ['product' => $product]) @include ('shop::products.buy-now') - - @if(! auth()->guard('customer')->check() && $status && $function == "hide-price-buy-cart-guest") -
- - {{ __('ShowPriceAfterLogin::app.products.login-to-view-price') }} - -
- @elseif(! auth()->guard('customer')->check() && $status && $function == "hide-buy-cart-guest") - ) -
- - {{ __('ShowPriceAfterLogin::app.products.login-to-buy') }} - -
- @endif
{!! view_render_event('bagisto.shop.products.view.product-add.after', ['product' => $product]) !!} \ No newline at end of file diff --git a/packages/Webkul/ShowPriceAfterLogin/src/Resources/views/Shop/add-buttons.blade.php b/packages/Webkul/ShowPriceAfterLogin/src/Resources/views/Shop/add-buttons.blade.php deleted file mode 100644 index 26e3a42db..000000000 --- a/packages/Webkul/ShowPriceAfterLogin/src/Resources/views/Shop/add-buttons.blade.php +++ /dev/null @@ -1,71 +0,0 @@ -@if (Route::currentRouteName() == "shop.products.index") - @include ('shop::products.add-to', ['product' => $product]) -@else - @if(auth()->guard('customer')->check() && core()->getConfigData('ShowPriceAfterLogin.settings.settings.enableordisable')) - @if ($product->type == "configurable") -
- - {{ __('shop::app.products.add-to-cart') }} - - - @include('shop::products.wishlist') -
- @else -
-
- @csrf - - - - -
- - @include('shop::products.wishlist') -
- @endif - - - - @elseif( - !auth()->guard('customer')->check() - && core()->getConfigData('ShowPriceAfterLogin.settings.settings.enableordisable') - && ( - core()->getConfigData('ShowPriceAfterLogin.settings.settings.selectfunction') == "hide-buy-cart-guest") - ) -
- - {{ __('ShowPriceAfterLogin::app.products.login-to-buy') }} - -
- @elseif(! auth()->guard('customer')->check() && core()->getConfigData('ShowPriceAfterLogin.settings.settings.enableordisable') && core()->getConfigData('ShowPriceAfterLogin.settings.settings.selectfunction') == "hide-price-buy-cart-guest") -
- - {{ __('ShowPriceAfterLogin::app.products.login-to-view-price') }} - -
- - @else - @if ($product->type == "configurable") -
- - {{ __('shop::app.products.add-to-cart') }} - - - @include('shop::products.wishlist') -
- @else -
-
- @csrf - - - - -
- - @include('shop::products.wishlist') -
- @endif - - @endif -@endif \ No newline at end of file diff --git a/packages/Webkul/ShowPriceAfterLogin/src/Resources/views/Shop/add-to-cart.blade.php b/packages/Webkul/ShowPriceAfterLogin/src/Resources/views/Shop/add-to-cart.blade.php deleted file mode 100755 index f4fe91285..000000000 --- a/packages/Webkul/ShowPriceAfterLogin/src/Resources/views/Shop/add-to-cart.blade.php +++ /dev/null @@ -1,24 +0,0 @@ -{!! view_render_event('bagisto.shop.products.add_to_cart.before', ['product' => $product]) !!} - -@if(auth()->guard('customer')->check() && core()->getConfigData('ShowPriceAfterLogin.settings.settings.enableordisable')) - - - @elseif( - !auth()->guard('customer')->check() - && core()->getConfigData('ShowPriceAfterLogin.settings.settings.enableordisable') - && ( - core()->getConfigData('ShowPriceAfterLogin.settings.settings.selectfunction') == "hide-price-buy-cart-guest" - || core()->getConfigData('ShowPriceAfterLogin.settings.settings.selectfunction') == "hide-buy-cart-guest") - ) - - - -@else - - -@endif -{!! view_render_event('bagisto.shop.products.add_to_cart.after', ['product' => $product]) !!} \ No newline at end of file diff --git a/packages/Webkul/ShowPriceAfterLogin/src/Resources/views/Shop/buy-now.blade.php b/packages/Webkul/ShowPriceAfterLogin/src/Resources/views/Shop/buy-now.blade.php deleted file mode 100755 index edcfaa261..000000000 --- a/packages/Webkul/ShowPriceAfterLogin/src/Resources/views/Shop/buy-now.blade.php +++ /dev/null @@ -1,21 +0,0 @@ -{!! view_render_event('bagisto.shop.products.buy_now.before', ['product' => $product]) !!} - -@if(auth()->guard('customer')->check() && core()->getConfigData('ShowPriceAfterLogin.settings.settings.enableordisable')) - - -@elseif( - !auth()->guard('customer')->check() - && core()->getConfigData('ShowPriceAfterLogin.settings.settings.enableordisable') - && ( core()->getConfigData('ShowPriceAfterLogin.settings.settings.selectfunction') == "hide-price-buy-cart-guest" - ||core()->getConfigData('ShowPriceAfterLogin.settings.settings.selectfunction') == "hide-buy-cart-guest")) - - -@else - -@endif - -{!! view_render_event('bagisto.shop.products.buy_now.after', ['product' => $product]) !!} \ No newline at end of file diff --git a/packages/Webkul/ShowPriceAfterLogin/src/Resources/views/Shop/price.blade.php b/packages/Webkul/ShowPriceAfterLogin/src/Resources/views/Shop/price.blade.php deleted file mode 100755 index 29d6087c6..000000000 --- a/packages/Webkul/ShowPriceAfterLogin/src/Resources/views/Shop/price.blade.php +++ /dev/null @@ -1,66 +0,0 @@ -{!! view_render_event('bagisto.shop.products.price.before', ['product' => $product]) !!} -
- @if(auth()->guard('customer')->check() && core()->getConfigData('ShowPriceAfterLogin.settings.settings.enableordisable')) - @inject ('priceHelper', 'Webkul\Product\Helpers\Price') - - @if ($product->type == 'configurable') - - {{ __('shop::app.products.price-label') }} - - {{ core()->currency($priceHelper->getMinimalPrice($product)) }} - - @else - - @if ($priceHelper->haveSpecialPrice($product)) - -
- {{ __('shop::app.products.sale') }} -
- - {{ core()->currency($product->price) }} - - {{ core()->currency($priceHelper->getSpecialPrice($product)) }} - - @else - - {{ core()->currency($product->price) }} - - @endif - - @endif - - @elseif(!auth()->guard('customer')->check() && core()->getConfigData('ShowPriceAfterLogin.settings.settings.enableordisable') && (core()->getConfigData('ShowPriceAfterLogin.settings.settings.selectfunction') == "hide-price-buy-cart-guest")) - - - - @else - @inject ('priceHelper', 'Webkul\Product\Helpers\Price') - - @if ($product->type == 'configurable') - - {{ __('shop::app.products.price-label') }} - - {{ core()->currency($priceHelper->getMinimalPrice($product)) }} - - @else - - @if ($priceHelper->haveSpecialPrice($product)) - -
- {{ __('shop::app.products.sale') }} -
- - {{ core()->currency($product->price) }} - - {{ core()->currency($priceHelper->getSpecialPrice($product)) }} - - @else - - {{ core()->currency($product->price) }} - - @endif - - @endif - @endif -
-{!! view_render_event('bagisto.shop.products.price.after', ['product' => $product]) !!} \ No newline at end of file diff --git a/packages/Webkul/ShowPriceAfterLogin/src/Resources/views/Shop/review-price.blade.php b/packages/Webkul/ShowPriceAfterLogin/src/Resources/views/Shop/review-price.blade.php deleted file mode 100644 index 99e01100c..000000000 --- a/packages/Webkul/ShowPriceAfterLogin/src/Resources/views/Shop/review-price.blade.php +++ /dev/null @@ -1,15 +0,0 @@ -@if( !(core()->getConfigData('ShowPriceAfterLogin.settings.settings.enableordisable')) ) -
- @inject ('priceHelper', 'Webkul\Product\Helpers\Price') - - @if ($product->type == 'configurable') - {{ core()->currency($priceHelper->getMinimalPrice($product)) }} - @else - @if ($priceHelper->haveSpecialPrice($product)) - {{ core()->currency($priceHelper->getSpecialPrice($product)) }} - @else - {{ core()->currency($product->price) }} - @endif - @endif -
-@endif \ No newline at end of file diff --git a/packages/Webkul/ShowPriceAfterLogin/src/Resources/views/Shop/view/product-add.blade.php b/packages/Webkul/ShowPriceAfterLogin/src/Resources/views/Shop/view/product-add.blade.php deleted file mode 100644 index f676878b5..000000000 --- a/packages/Webkul/ShowPriceAfterLogin/src/Resources/views/Shop/view/product-add.blade.php +++ /dev/null @@ -1,24 +0,0 @@ -{!! view_render_event('bagisto.shop.products.view.product-add.after', ['product' => $product]) !!} -@php - $status = core()->getConfigData('ShowPriceAfterLogin.settings.settings.enableordisable'); - $function = core()->getConfigData('ShowPriceAfterLogin.settings.settings.selectfunction'); -@endphp - -
- @include ('shop::products.add-to-cart', ['product' => $product]) - - @include ('shop::products.buy-now') - - @if(! auth()->guard('customer')->check() && $status) -
- - @if ($function == "hide-price-buy-cart-guest") - {{ __('ShowPriceAfterLogin::app.products.login-to-buy') }} - @elseif ($function == "hide-buy-cart-guest") - {{ __('ShowPriceAfterLogin::app.products.login-to-view-price') }} - @endif - -
-
- -{!! view_render_event('bagisto.shop.products.view.product-add.after', ['product' => $product]) !!} \ No newline at end of file