woocommerce/woocommerce-paypal-payments
2
0
Fork 0
mirror of https://github.com/woocommerce/woocommerce-paypal-payments.git synced 2025-09-06 18:16:38 +08:00
Code Issues Projects Packages Wiki Activity Actions

Use utility method to get order type if hpos is enabled

Browse source
This commit is contained in:
Emili Castells Guasch 2023-08-02 10:47:50 +02:00
parent 9b589c6040
commit 7c64b6f007
2 changed files with 19 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
modules/ppcp-compat/src/PPEC/PPECHelper.php
View file

@ -79,7 +79,7 @@ class PPECHelper {
$result = $wpdb->get_var( $result = $wpdb->get_var(
$wpdb->prepare( $wpdb->prepare(
"SELECT 1 FROM {$wpdb->wc_orders} WHERE payment_method = %s", "SELECT 1 FROM {$wpdb->wc_orders} WHERE payment_method = %s",
'ppec_paypal' self::PPEC_GATEWAY_ID
) )
); );
} else { } else {

27
modules/ppcp-compat/src/PPEC/SubscriptionsHandler.php
View file

@ -9,6 +9,7 @@ declare(strict_types=1);
namespace WooCommerce\PayPalCommerce\Compat\PPEC; namespace WooCommerce\PayPalCommerce\Compat\PPEC;
use Automattic\WooCommerce\Utilities\OrderUtil;
use stdClass; use stdClass;
use WooCommerce\PayPalCommerce\Subscription\RenewalHandler; use WooCommerce\PayPalCommerce\Subscription\RenewalHandler;
use WooCommerce\PayPalCommerce\ApiClient\Entity\PaymentToken; use WooCommerce\PayPalCommerce\ApiClient\Entity\PaymentToken;
@ -183,22 +184,30 @@ class SubscriptionsHandler {
return true; return true;
} }
// Are we on the WC > Subscriptions screen?
// phpcs:ignore WordPress.Security.NonceVerification // phpcs:ignore WordPress.Security.NonceVerification
$post_type = wc_clean( wp_unslash( $_GET['post_type'] ?? $_POST['post_type'] ?? '' ) ); $order_id = wc_clean( wp_unslash( $_GET['post'] ?? $_POST['post_ID'] ?? '' ) );
if ( ! $order_id ) {
return false;
}
// Are we on the WC > Subscriptions screen?
/**
* Class exist in WooCommerce.
*
* @psalm-suppress UndefinedClass
*/
$post_type = class_exists( OrderUtil::class ) && OrderUtil::custom_orders_table_usage_is_enabled()
? OrderUtil::get_order_type( $order_id ) ?? ''
// phpcs:ignore WordPress.Security.NonceVerification
: wc_clean( wp_unslash( $_GET['post_type'] ?? $_POST['post_type'] ?? '' ) );
if ( $post_type === 'shop_subscription' ) { if ( $post_type === 'shop_subscription' ) {
return true; return true;
} }
// Are we editing an order or subscription tied to PPEC? // Are we editing an order or subscription tied to PPEC?
// phpcs:ignore WordPress.Security.NonceVerification // phpcs:ignore WordPress.Security.NonceVerification
$order_id = wc_clean( wp_unslash( $_GET['post'] ?? $_POST['post_ID'] ?? '' ) ); $order = wc_get_order( $order_id );
if ( $order_id ) { return ( $order && PPECHelper::PPEC_GATEWAY_ID === $order->get_payment_method() );
$order = wc_get_order( $order_id );
return ( $order && PPECHelper::PPEC_GATEWAY_ID === $order->get_payment_method() );
}
return false;
} }
} }