From 62596778552efd04327a5c3d7bdcedbd971a4d4d Mon Sep 17 00:00:00 2001 From: Narek Zakarian Date: Thu, 14 Mar 2024 16:37:58 +0400 Subject: [PATCH] Change the `product_preview` to `woocommerceBlock` --- .../src/PayLaterBlockModule.php | 2 +- .../resources/js/paylater-configurator.js | 5 ++++- .../src/Factory/ConfigFactory.php | 14 +++++++------- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/modules/ppcp-paylater-block/src/PayLaterBlockModule.php b/modules/ppcp-paylater-block/src/PayLaterBlockModule.php index d5953f407..d6b9c7404 100644 --- a/modules/ppcp-paylater-block/src/PayLaterBlockModule.php +++ b/modules/ppcp-paylater-block/src/PayLaterBlockModule.php @@ -40,7 +40,7 @@ class PayLaterBlockModule implements ModuleInterface { * @return bool true if the block is enabled, otherwise false. */ public static function is_block_enabled( SettingsStatus $settings_status ): bool { - return self::is_module_loading_required() && $settings_status->is_pay_later_messaging_enabled_for_location( 'product_preview' ); + return self::is_module_loading_required() && $settings_status->is_pay_later_messaging_enabled_for_location( 'woocommerceBlock' ); } /** diff --git a/modules/ppcp-paylater-configurator/resources/js/paylater-configurator.js b/modules/ppcp-paylater-configurator/resources/js/paylater-configurator.js index 8f2c24f8f..15f65f183 100644 --- a/modules/ppcp-paylater-configurator/resources/js/paylater-configurator.js +++ b/modules/ppcp-paylater-configurator/resources/js/paylater-configurator.js @@ -40,7 +40,10 @@ document.addEventListener( 'DOMContentLoaded', () => { partnerClientId: PcpPayLaterConfigurator.partnerClientId, partnerName: 'WooCommerce', bnCode: 'Woo_PPCP', - placements: ['cart', 'checkout', 'product', 'shop', 'home', 'product_preview'], + placements: ['cart', 'checkout', 'product', 'shop', 'home'], + custom_placement:[{ + message_reference: 'woocommerceBlock', + }], styleOverrides: { button: publishButtonClassName, header: PcpPayLaterConfigurator.headerClassName, diff --git a/modules/ppcp-paylater-configurator/src/Factory/ConfigFactory.php b/modules/ppcp-paylater-configurator/src/Factory/ConfigFactory.php index 240cfeafd..c7b56738f 100644 --- a/modules/ppcp-paylater-configurator/src/Factory/ConfigFactory.php +++ b/modules/ppcp-paylater-configurator/src/Factory/ConfigFactory.php @@ -22,12 +22,12 @@ class ConfigFactory { */ public function from_settings( Settings $settings ): array { return array( - 'cart' => $this->for_location( $settings, 'cart' ), - 'checkout' => $this->for_location( $settings, 'checkout' ), - 'product' => $this->for_location( $settings, 'product' ), - 'shop' => $this->for_location( $settings, 'shop' ), - 'home' => $this->for_location( $settings, 'home' ), - 'product_preview' => $this->for_location( $settings, 'product_preview' ), + 'cart' => $this->for_location( $settings, 'cart' ), + 'checkout' => $this->for_location( $settings, 'checkout' ), + 'product' => $this->for_location( $settings, 'product' ), + 'shop' => $this->for_location( $settings, 'shop' ), + 'home' => $this->for_location( $settings, 'home' ), + 'woocommerceBlock' => $this->for_location( $settings, 'woocommerceBlock' ), ); } @@ -46,7 +46,7 @@ class ConfigFactory { 'color' => $this->get_or_default( $settings, "pay_later_{$location}_message_flex_color", 'black', array( 'black', 'blue', 'white', 'white-no-border' ) ), 'ratio' => $this->get_or_default( $settings, "pay_later_{$location}_message_flex_ratio", '8x1', array( '8x1', '20x1' ) ), ); - } else { + } elseif($location !== 'woocommerceBlock') { $config = array( 'layout' => 'text', 'logo-position' => $this->get_or_default( $settings, "pay_later_{$location}_message_position", 'left' ),