woocommerce/woocommerce-paypal-payments
2
0
Fork 0
mirror of https://github.com/woocommerce/woocommerce-paypal-payments.git synced 2025-09-05 08:59:14 +08:00
Code Issues Projects Packages Wiki Activity Actions 7

♻️ Refactor ConnectAdminNotice

Browse source
This commit is contained in:
Philipp Stracker 2025-02-17 17:10:02 +01:00
parent f98c1ec5a7
commit bdd6c23e3c
No known key found for this signature in database
2 changed files with 20 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

9
modules/ppcp-wc-gateway/services.php
View file

@ -328,10 +328,11 @@ return array(
} }
), ),
'wcgateway.notice.connect' => static function ( ContainerInterface $container ): ConnectAdminNotice { 'wcgateway.notice.connect' => static function ( ContainerInterface $container ): ConnectAdminNotice {
$state = $container->get( 'onboarding.state' ); return new ConnectAdminNotice(
$settings = $container->get( 'wcgateway.settings' ); $container->get( 'settings.flag.is-connected' ),
$is_current_country_send_only = $container->get( 'wcgateway.is-send-only-country' ); $container->get( 'wcgateway.settings' ),
return new ConnectAdminNotice( $state, $settings, $is_current_country_send_only ); $container->get( 'wcgateway.is-send-only-country' )
);
}, },
'wcgateway.notice.currency-unsupported' => static function ( ContainerInterface $container ): UnsupportedCurrencyAdminNotice { 'wcgateway.notice.currency-unsupported' => static function ( ContainerInterface $container ): UnsupportedCurrencyAdminNotice {
$state = $container->get( 'onboarding.state' ); $state = $container->get( 'onboarding.state' );

23
modules/ppcp-wc-gateway/src/Notice/ConnectAdminNotice.php
View file

@ -10,7 +10,6 @@ declare(strict_types=1);
namespace WooCommerce\PayPalCommerce\WcGateway\Notice; namespace WooCommerce\PayPalCommerce\WcGateway\Notice;
use WooCommerce\PayPalCommerce\AdminNotices\Entity\Message; use WooCommerce\PayPalCommerce\AdminNotices\Entity\Message;
use WooCommerce\PayPalCommerce\Onboarding\State;
use WooCommerce\PayPalCommerce\WcGateway\Settings\Settings; use WooCommerce\PayPalCommerce\WcGateway\Settings\Settings;
use WooCommerce\PayPalCommerce\Vendor\Psr\Container\ContainerInterface; use WooCommerce\PayPalCommerce\Vendor\Psr\Container\ContainerInterface;
@ -20,11 +19,11 @@ use WooCommerce\PayPalCommerce\Vendor\Psr\Container\ContainerInterface;
class ConnectAdminNotice { class ConnectAdminNotice {
/** /**
* The state. * Whether the merchant completed the onboarding and is connected to PayPal.
* *
* @var State * @var bool
*/ */
private $state; private bool $is_connected;
/** /**
* The settings. * The settings.
@ -43,12 +42,16 @@ class ConnectAdminNotice {
/** /**
* ConnectAdminNotice constructor. * ConnectAdminNotice constructor.
* *
* @param State $state The state. * @param bool $is_connected Whether onboarding was completed.
* @param ContainerInterface $settings The settings. * @param ContainerInterface $settings The settings.
* @param bool $is_current_country_send_only Whether the current store's country is classified as a send-only country. * @param bool $is_current_country_send_only Whether the current store's country is classified as a send-only country.
*/ */
public function __construct( State $state, ContainerInterface $settings, bool $is_current_country_send_only ) { public function __construct(
$this->state = $state; bool $is_connected,
ContainerInterface $settings,
bool $is_current_country_send_only
) {
$this->is_connected = $is_connected;
$this->settings = $settings; $this->settings = $settings;
$this->is_current_country_send_only = $is_current_country_send_only; $this->is_current_country_send_only = $is_current_country_send_only;
} }
@ -77,9 +80,13 @@ class ConnectAdminNotice {
/** /**
* Whether the message should display. * Whether the message should display.
* *
* Only display the "almost ready" message for merchants that did not complete
* the onboarding wizard. Also, ensure their store country is eligible for
* collecting PayPal payments.
*
* @return bool * @return bool
*/ */
protected function should_display(): bool { protected function should_display(): bool {
return $this->state->current_state() !== State::STATE_ONBOARDED && $this->is_current_country_send_only === false; return ! $this->is_connected && ! $this->is_current_country_send_only;
} }
} }