diff --git a/packages/Webkul/SAASPreOrder/src/Resources/views/shop/products/view/product-add.blade.php b/packages/Webkul/SAASPreOrder/src/Resources/views/shop/products/view/product-add.blade.php
index ad19c7a11..1903ae6ba 100644
--- a/packages/Webkul/SAASPreOrder/src/Resources/views/shop/products/view/product-add.blade.php
+++ b/packages/Webkul/SAASPreOrder/src/Resources/views/shop/products/view/product-add.blade.php
@@ -1,4 +1,5 @@
 {!! view_render_event('bagisto.shop.products.view.product-add.after', ['product' => $product]) !!}
+
 <div class="add-to-buttons">
     @if ($product->type != 'configurable')
         @if ($product->totalQuantity() < 1 && $product->allow_preorder)
@@ -15,10 +16,10 @@
 
         @include ('shop::products.buy-now')
 
-        <button type="submit" class="btn btn-lg btn-primary pre-order-btn" style="width: 100%; display: none;background: #000 !important;">
+        <button type="submit" class="btn btn-lg btn-primary pre-order-btn" style="width: 100%; display: none;">
             {{ __('preorder::app.shop.products.preorder') }}
         </button>
     @endif
 </div>
 
-{!! view_render_event('bagisto.shop.products.view.product-add.after', ['product' => $product]) !!}
+{!! view_render_event('bagisto.shop.products.view.product-add.after', ['product' => $product]) !!}
\ No newline at end of file
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 76d0a7409..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,36 +1,22 @@
-@if ($product->type != "configurable" && $product->totalQuantity() < 1 && $product->allow_preorder)
-    @if (core()->getConfigData('preorder.settings.general.percent'))
-        @if (core()->getConfigData('preorder.settings.general.preorder_type') == 'partial')
-            <p>{{ __('preorder::app.shop.products.percent-to-pay', ['percent' => core()->getConfigData('preorder.settings.general.percent')]) }}</p>
-        @endif
+
+    @if ($product->type == "configurable")
+        <div class="cart-wish-wrap">
+            <a href="{{ route('cart.add.configurable', $product->url_key) }}" class="btn btn-lg btn-primary addtocart">
+                {{ __('shop::app.products.add-to-cart') }}
+            </a>
+
+            @include('shop::products.wishlist')
+        </div>
     @else
-        <p>{{ __('preorder::app.shop.products.nothing-to-pay') }}</p>
-    @endif
-@endif
-
-@if ($product->type == "configurable")
-    <div class="cart-wish-wrap">
-        <a href="{{ route('cart.add.configurable', $product->url_key) }}" class="btn btn-lg btn-primary addtocart">
-            {{ __('shop::app.products.add-to-cart') }}
-        </a>
-
-        @include('shop::products.wishlist')
-    </div>
-@else
-    <div class="cart-wish-wrap">
-        <form action="{{ route('cart.add', $product->product_id) }}" method="POST">
-            @csrf
-            <input type="hidden" name="product" value="{{ $product->product_id }}">
-            <input type="hidden" name="quantity" value="1">
-            <input type="hidden" value="false" name="is_configurable">
-
-            @if ($product->totalQuantity() < 1 && $product->allow_preorder)
-                <button class="btn btn-lg btn-primary addtocart">{{ __('preorder::app.shop.products.preorder') }}</button>
-            @else
+        <div class="cart-wish-wrap">
+            <form action="{{ route('cart.add', $product->product_id) }}" method="POST">
+                @csrf
+                <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>
-            @endif
-        </form>
+            </form>
 
-        @include('shop::products.wishlist')
-    </div>
-@endif
\ No newline at end of file
+            @include('shop::products.wishlist')
+        </div>
+    @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 b5b4b4e16..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,19 +1,7 @@
 {!! view_render_event('bagisto.shop.products.add_to_cart.before', ['product' => $product]) !!}
-@php
-    $status = core()->getConfigData('ShowPriceAfterLogin.settings.settings.enableordisable');
 
-    $function = core()->getConfigData('ShowPriceAfterLogin.settings.settings.selectfunction');
-@endphp
+<button type="submit" class="btn btn-lg btn-primary addtocart" {{ $product->type != 'configurable' && ! $product->haveSufficientQuantity(1) ? 'disabled' : '' }}>
+    {{ __('shop::app.products.add-to-cart') }}
+</button>
 
-@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') }}
-        </a>
-    </div>
-@else
-    <button type="submit" class="btn btn-lg btn-primary addtocart" {{ $product->type != 'configurable' && ! $product->haveSufficientQuantity(1) ? 'disabled' : '' }}>
-        {{ __('shop::app.products.add-to-cart') }}
-    </button>
-@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 0f7dcf1b8..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,15 +1,7 @@
 {!! view_render_event('bagisto.shop.products.buy_now.before', ['product' => $product]) !!}
 
-@php
-    $status = core()->getConfigData('ShowPriceAfterLogin.settings.settings.enableordisable');
+<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') }}
+</button>
 
-    $function = core()->getConfigData('ShowPriceAfterLogin.settings.settings.selectfunction');
-@endphp
-
-@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') }}
-    </button>
-@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/list/card.blade.php b/packages/Webkul/Shop/src/Resources/views/products/list/card.blade.php
index dd754d56c..c0d9f588c 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
@@ -1,12 +1,7 @@
 {!! view_render_event('bagisto.shop.products.list.card.before', ['product' => $product]) !!}
 
-@php
-    $status = core()->getConfigData('ShowPriceAfterLogin.settings.settings.enableordisable');
-
-    $function = core()->getConfigData('ShowPriceAfterLogin.settings.settings.selectfunction');
-@endphp
-
 <div class="product-card">
+
     @inject ('productImageHelper', 'Webkul\Product\Helpers\ProductImage')
 
     <?php $productBaseImage = $productImageHelper->getProductBaseImage($product); ?>
@@ -35,19 +30,7 @@
 
         @include ('shop::products.price', ['product' => $product])
 
-        @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')
-                        {{ __('ShowPriceAfterLogin::app.products.login-to-buy') }}
-                    @else
-                        {{ __('ShowPriceAfterLogin::app.products.login-to-view-price') }}
-                    @endif
-                </a>
-            </div>
-        @else
-            @include('shop::products.add-buttons', ['product' => $product])
-        @endif
+        @include('shop::products.add-buttons', ['product' => $product])
     </div>
 
 </div>
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 380148499..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,31 +1,23 @@
 {!! view_render_event('bagisto.shop.products.price.before', ['product' => $product]) !!}
 
-@php
-    $status = core()->getConfigData('ShowPriceAfterLogin.settings.settings.enableordisable');
-
-    $function = core()->getConfigData('ShowPriceAfterLogin.settings.settings.selectfunction');
-@endphp
-
 <div class="product-price">
     @inject ('priceHelper', 'Webkul\Product\Helpers\Price')
-    @if (($status && ! auth()->guard('customer')->check()) && $function == "hide-price-buy-cart-guest")
+
+    @if ($product->type == 'configurable')
+        <span class="price-label">{{ __('shop::app.products.price-label') }}</span>
+
+        <span class="final-price">{{ core()->currency($priceHelper->getMinimalPrice($product)) }}</span>
     @else
-        @if ($product->type == 'configurable')
-            <span class="price-label">{{ __('shop::app.products.price-label') }}</span>
+        @if ($priceHelper->haveSpecialPrice($product))
+            <div class="sticker sale">
+                {{ __('shop::app.products.sale') }}
+            </div>
 
-            <span class="final-price">{{ core()->currency($priceHelper->getMinimalPrice($product)) }}</span>
+            <span class="regular-price">{{ core()->currency($product->price) }}</span>
+
+            <span class="special-price">{{ core()->currency($priceHelper->getSpecialPrice($product)) }}</span>
         @else
-            @if ($priceHelper->haveSpecialPrice($product))
-                <div class="sticker sale">
-                    {{ __('shop::app.products.sale') }}
-                </div>
-
-                <span class="regular-price">{{ core()->currency($product->price) }}</span>
-
-                <span class="special-price">{{ core()->currency($priceHelper->getSpecialPrice($product)) }}</span>
-            @else
-                <span>{{ core()->currency($product->price) }}</span>
-            @endif
+            <span>{{ core()->currency($product->price) }}</span>
         @endif
     @endif
 </div>
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 0245d38a3..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,20 +1,13 @@
-@php
-    $status = core()->getConfigData('ShowPriceAfterLogin.settings.settings.enableordisable');
-    $function = core()->getConfigData('ShowPriceAfterLogin.settings.settings.selectfunction');
-@endphp
+<div class="product-price mt-10">
+    @inject ('priceHelper', 'Webkul\Product\Helpers\Price')
 
-@if(($status && ! auth()->guard('customer')->check()) && $function == 'hide-price-buy-cart-guest')
-    <div class="product-price mt-10">
-        @inject ('priceHelper', 'Webkul\Product\Helpers\Price')
-
-        @if ($product->type == 'configurable')
-            <span class="pro-price">{{ core()->currency($priceHelper->getMinimalPrice($product)) }}</span>
+    @if ($product->type == 'configurable')
+        <span class="pro-price">{{ core()->currency($priceHelper->getMinimalPrice($product)) }}</span>
+    @else
+        @if ($priceHelper->haveSpecialPrice($product))
+            <span class="pro-price">{{ core()->currency($priceHelper->getSpecialPrice($product)) }}</span>
         @else
-            @if ($priceHelper->haveSpecialPrice($product))
-                <span class="pro-price">{{ core()->currency($priceHelper->getSpecialPrice($product)) }}</span>
-            @else
-                <span class="pro-price">{{ core()->currency($product->price) }}</span>
-            @endif
+            <span class="pro-price">{{ core()->currency($product->price) }}</span>
         @endif
-    </div>
-@endif
+    @endif
+</div>
\ 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 1903ae6ba..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,25 +1,9 @@
 {!! view_render_event('bagisto.shop.products.view.product-add.after', ['product' => $product]) !!}
 
 <div class="add-to-buttons">
-    @if ($product->type != 'configurable')
-        @if ($product->totalQuantity() < 1 && $product->allow_preorder)
-            <button type="submit" class="btn btn-lg btn-primary addtocart" style="width: 100%">
-                {{ __('preorder::app.shop.products.preorder') }}
-            </button>
-        @else
-            @include ('shop::products.add-to-cart', ['product' => $product])
+    @include ('shop::products.add-to-cart', ['product' => $product])
 
-            @include ('shop::products.buy-now')
-        @endif
-    @else
-        @include ('shop::products.add-to-cart', ['product' => $product])
-
-        @include ('shop::products.buy-now')
-
-        <button type="submit" class="btn btn-lg btn-primary pre-order-btn" style="width: 100%; display: none;">
-            {{ __('preorder::app.shop.products.preorder') }}
-        </button>
-    @endif
+    @include ('shop::products.buy-now')
 </div>
 
 {!! view_render_event('bagisto.shop.products.view.product-add.after', ['product' => $product]) !!}
\ No newline at end of file