From 036e7d0c33c5992df8b31c86f61fc2124ed3c8cc Mon Sep 17 00:00:00 2001
From: Narek Zakarian <narekzakarian@gmail.com>
Date: Mon, 27 Jun 2022 15:47:21 +0400
Subject: [PATCH] Fix button_renderer logic & the behavior for single products

---
 .../ppcp-button/src/Assets/SmartButton.php    | 68 +++++++++----------
 1 file changed, 32 insertions(+), 36 deletions(-)

diff --git a/modules/ppcp-button/src/Assets/SmartButton.php b/modules/ppcp-button/src/Assets/SmartButton.php
index d6b772fbf..64c3b6bd8 100644
--- a/modules/ppcp-button/src/Assets/SmartButton.php
+++ b/modules/ppcp-button/src/Assets/SmartButton.php
@@ -411,16 +411,23 @@ class SmartButton implements SmartButtonInterface {
 		) {
 			add_action(
 				$this->single_product_renderer_hook(),
-				array(
-					$this,
-					'button_renderer',
-				),
+				function () {
+					$product = wc_get_product();
+
+					if (
+						is_a( $product, WC_Product::class )
+						&& ! $this->product_supports_payment( $product )
+					) {
+
+						return;
+					}
+
+					$this->button_renderer();
+				},
 				31
 			);
 		}
 
-		add_action( $this->pay_order_renderer_hook(), array( $this, 'button_renderer' ), 10 );
-
 		$not_enabled_on_minicart = $this->settings->has( 'button_mini_cart_enabled' ) &&
 			! $this->settings->get( 'button_mini_cart_enabled' );
 		if (
@@ -447,21 +454,26 @@ class SmartButton implements SmartButtonInterface {
 			);
 		}
 
-		add_action( $this->checkout_button_renderer_hook(), array( $this, 'button_renderer' ), 10 );
+		$available_gateways = WC()->payment_gateways->get_available_payment_gateways();
 
-		$not_enabled_on_cart = $this->settings->has( 'button_cart_enabled' ) &&
-			! $this->settings->get( 'button_cart_enabled' );
-		add_action(
-			$this->proceed_to_checkout_button_renderer_hook(),
-			function() use ( $not_enabled_on_cart ) {
-				if ( ! is_cart() || $not_enabled_on_cart || $this->is_free_trial_cart() || $this->is_cart_price_total_zero() ) {
-					return;
-				}
+		if ( isset( $available_gateways['ppcp-gateway'] ) ) {
+			add_action( $this->pay_order_renderer_hook(), array( $this, 'button_renderer' ), 10 );
+			add_action( $this->checkout_button_renderer_hook(), array( $this, 'button_renderer' ), 10 );
 
-				$this->button_renderer();
-			},
-			20
-		);
+			$not_enabled_on_cart = $this->settings->has( 'button_cart_enabled' ) &&
+				! $this->settings->get( 'button_cart_enabled' );
+			add_action(
+				$this->proceed_to_checkout_button_renderer_hook(),
+				function() use ( $not_enabled_on_cart ) {
+					if ( ! is_cart() || $not_enabled_on_cart || $this->is_free_trial_cart() || $this->is_cart_price_total_zero() ) {
+						return;
+					}
+
+					$this->button_renderer();
+				},
+				20
+			);
+		}
 
 		return true;
 	}
@@ -521,22 +533,6 @@ class SmartButton implements SmartButtonInterface {
 			return;
 		}
 
-		$product = wc_get_product();
-
-		if (
-			! is_checkout() && is_a( $product, WC_Product::class )
-			&& ! $this->product_supports_payment( $product )
-		) {
-
-			return;
-		}
-
-		$available_gateways = WC()->payment_gateways->get_available_payment_gateways();
-
-		if ( ! isset( $available_gateways['ppcp-gateway'] ) ) {
-			return;
-		}
-
 		// The wrapper is needed for the loading spinner,
 		// otherwise jQuery block() prevents buttons rendering.
 		echo '<div class="ppc-button-wrapper"><div id="ppc-button"></div></div>';
@@ -843,7 +839,7 @@ class SmartButton implements SmartButtonInterface {
 			'messages'                       => $this->message_values(),
 			'labels'                         => array(
 				'error' => array(
-					'generic' => __(
+					'generic'       => __(
 						'Something went wrong. Please try again or choose another payment source.',
 						'woocommerce-paypal-payments'
 					),