From 1f5e32c0b0d1ecff931d43d8761ce6863e88784e Mon Sep 17 00:00:00 2001
From: Narek Zakarian <narekzakarian@gmail.com>
Date: Tue, 5 Mar 2024 17:08:10 +0400
Subject: [PATCH] Use the new way to check if block should be enabled

---
 modules.php                                                   | 2 +-
 modules/ppcp-button/src/Assets/SmartButton.php                | 4 ++--
 .../ppcp-paylater-configurator/src/Endpoint/SaveConfig.php    | 1 +
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/modules.php b/modules.php
index 8ee91f43e..c6840d8ab 100644
--- a/modules.php
+++ b/modules.php
@@ -68,7 +68,7 @@ return function ( string $root_dir ): iterable {
 		$modules[] = ( require "$modules_dir/ppcp-save-payment-methods/module.php" )();
 	}
 
-	if ( PayLaterBlockModule::is_enabled() ) {
+	if ( PayLaterBlockModule::is_module_loading_required() ) {
 		$modules[] = ( require "$modules_dir/ppcp-paylater-block/module.php" )();
 	}
 
diff --git a/modules/ppcp-button/src/Assets/SmartButton.php b/modules/ppcp-button/src/Assets/SmartButton.php
index d63b56af4..12e7abfbd 100644
--- a/modules/ppcp-button/src/Assets/SmartButton.php
+++ b/modules/ppcp-button/src/Assets/SmartButton.php
@@ -631,7 +631,7 @@ document.querySelector("#payment").before(document.querySelector("#ppcp-messages
 
 		$messaging_enabled_for_current_location = $this->settings_status->is_pay_later_messaging_enabled_for_location( $location );
 
-		$has_paylater_block = has_block( 'woocommerce-paypal-payments/paylater-messages' ) && PayLaterBlockModule::is_enabled();
+		$has_paylater_block = has_block( 'woocommerce-paypal-payments/paylater-messages' ) && PayLaterBlockModule::is_block_enabled( $this->settings_status );
 
 		switch ( $location ) {
 			case 'checkout':
@@ -878,7 +878,7 @@ document.querySelector("#payment").before(document.querySelector("#ppcp-messages
 			'wrapper'   => '#ppcp-messages',
 			'is_hidden' => ! $this->is_pay_later_filter_enabled_for_location( $this->context() ),
 			'block'     => array(
-				'enabled' => PayLaterBlockModule::is_enabled(),
+				'enabled' => PayLaterBlockModule::is_block_enabled( $this->settings_status ),
 			),
 			'amount'    => $amount,
 			'placement' => $placement,
diff --git a/modules/ppcp-paylater-configurator/src/Endpoint/SaveConfig.php b/modules/ppcp-paylater-configurator/src/Endpoint/SaveConfig.php
index 051a89dd6..e5e01c8e8 100644
--- a/modules/ppcp-paylater-configurator/src/Endpoint/SaveConfig.php
+++ b/modules/ppcp-paylater-configurator/src/Endpoint/SaveConfig.php
@@ -156,6 +156,7 @@ class SaveConfig {
 			case 'cart':
 			case 'checkout':
 			case 'product':
+			case 'product_preview':
 				return $placement;
 			case 'category':
 				return 'shop';