Steve-Dee-Designs
/
woocommerce
mirror of https://github.com/woocommerce/woocommerce.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Simplify the has_wcpay logic to avoid overlapping conditions

This commit is contained in:
Vlad Olaru 2023-07-13 09:23:43 +03:00
parent 96f15ec5bd
commit 5abf7acdbb
No known key found for this signature in database
1 changed files with 6 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
plugins/woocommerce/src/Internal/Admin/WcPayWelcomePage.php
View File

@ -189,14 +189,10 @@ class WcPayWelcomePage {
* @return boolean * @return boolean
*/ */
private function has_wcpay(): bool { private function has_wcpay(): bool {
$has_wcpay_setup = false; // We consider the store to have WooPayments if there is meaningful account data in the WooPayments account cache.
// This implies that WooPayments is or was active at some point and that it was connected.
// We consider the store to have WooPayments if: if ( $this->has_wcpay_account_data() ) {
// - the WooPayments plugin is active return true;
// - and the WooPayments payment gateway is connected
// - and there is meaningful account data in the WooPayments account cache.
if ( $this->is_wcpay_active() && $this->is_wcpay_connected() && $this->has_wcpay_account_data() ) {
$has_wcpay_setup = true;
} }
// If there is at least one order processed with WooPayments, we consider the store to have WooPayments. // If there is at least one order processed with WooPayments, we consider the store to have WooPayments.
@ -209,10 +205,10 @@ class WcPayWelcomePage {
] ]
) )
) ) { ) ) {
$has_wcpay_setup = true; return true;
} }
return $has_wcpay_setup; return false;
} }
/** /**
@ -224,24 +220,6 @@ class WcPayWelcomePage {
return class_exists( '\WC_Payments' ); return class_exists( '\WC_Payments' );
} }
/**
* Check if the WooPayments payment gateway has a connected account.
*
* @see WC_Payment_Gateway_WCPay::is_connected()
*
* @return boolean
*/
private function is_wcpay_connected(): bool {
if ( class_exists( '\WC_Payments' ) ) {
$wc_payments_gateway = \WC_Payments::get_gateway();
return method_exists( $wc_payments_gateway, 'is_connected' )
? $wc_payments_gateway->is_connected()
: false;
}
return false;
}
/** /**
* Check if there is meaningful data in the WooPayments account cache. * Check if there is meaningful data in the WooPayments account cache.
* *