Merge pull request #273 from checkout/fix/order-action-button

Add condition to not run code if order payment method is not cko

Author: SanketChodavadiya

woocommerce-gateway-checkout-com/includes/settings/class-wc-checkoutcom-webhook.php

@@ -207,7 +207,7 @@ public function is_registered( $url = '' ): string {
 		}
 
 		foreach ( $webhooks as $item ) {
-			if ( str_contains( $item['url'], $url ) ) {
+			if ( false !== strpos( $item['url'], $url ) ) {
 				$this->url_is_registered = $item['url'];
 
 				return $this->url_is_registered;

woocommerce-gateway-checkout-com/includes/settings/class-wc-checkoutcom-workflows.php

@@ -68,7 +68,7 @@ public function is_registered( $url = '' ): string {
 
 		foreach ( $webhooks as $item ) {
 
-			if ( str_contains( $item['name'], $url ) ) {
+			if ( false !== strpos( $item['name'], $url ) ) {
 				$this->url_is_registered = $item['name'];
 
 				return $this->url_is_registered;

woocommerce-gateway-checkout-com/readme.txt

@@ -4,7 +4,7 @@ Tags: checkout, payments, credit card, payment gateway, apple pay, google pay, p
 Requires at least: 4.0
 Stable tag: trunk
 Requires PHP: 7.2
-Tested up to: 5.9.3
+Tested up to: 6.0
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 

woocommerce-gateway-checkout-com/woocommerce-gateway-checkout-com.php

@@ -244,6 +244,11 @@ function cko_refund() {
 add_action( 'woocommerce_order_item_add_action_buttons', 'action_woocommerce_order_item_add_action_buttons', 10, 1 );
 function action_woocommerce_order_item_add_action_buttons( $order ) {
 
+    // Check order payment method is checkout.
+    if ( false === strpos( $order->get_payment_method(), 'wc_checkout_com_' ) ) {
+        return;
+    }
+
     $order_status = $order->get_status();
     $auth_status = str_replace('wc-', '', WC_Admin_Settings::get_option('ckocom_order_authorised', 'on-hold'));
     $capture_status = str_replace('wc-', '', WC_Admin_Settings::get_option('ckocom_order_captured', 'processing'));
@@ -447,7 +452,7 @@ function cko_is_nas_account() {
 
     $core_settings = get_option( 'woocommerce_wc_checkout_com_cards_settings' );
 
-    return isset( $core_settings['ckocom_account_type'] ) && str_contains( $core_settings['ckocom_account_type'], 'NAS' );
+    return isset( $core_settings['ckocom_account_type'] ) && ( 'NAS' === $core_settings['ckocom_account_type'] );
 }
 
 /**