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

Fix inconsistent instance of AppleProductStatus

Browse source
This commit is contained in:
Pedro Silva 2024-02-02 17:16:42 +00:00
parent 6e78c875c2
commit 42f3e575bc
No known key found for this signature in database
GPG key ID: E2EE20C0669D24B3
2 changed files with 13 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

19
modules/ppcp-applepay/services.php
View file

@ -18,6 +18,7 @@ use WooCommerce\PayPalCommerce\Applepay\Assets\BlocksPaymentMethod;
use WooCommerce\PayPalCommerce\Applepay\Assets\PropertiesDictionary; use WooCommerce\PayPalCommerce\Applepay\Assets\PropertiesDictionary;
use WooCommerce\PayPalCommerce\Applepay\Helper\ApmApplies; use WooCommerce\PayPalCommerce\Applepay\Helper\ApmApplies;
use WooCommerce\PayPalCommerce\Applepay\Helper\AvailabilityNotice; use WooCommerce\PayPalCommerce\Applepay\Helper\AvailabilityNotice;
use WooCommerce\PayPalCommerce\Common\Pattern\SingletonDecorator;
use WooCommerce\PayPalCommerce\Onboarding\Environment; use WooCommerce\PayPalCommerce\Onboarding\Environment;
use WooCommerce\PayPalCommerce\Onboarding\State; use WooCommerce\PayPalCommerce\Onboarding\State;
use WooCommerce\PayPalCommerce\Vendor\Psr\Container\ContainerInterface; use WooCommerce\PayPalCommerce\Vendor\Psr\Container\ContainerInterface;
@ -72,14 +73,16 @@ return array(
return $settings->has( 'applepay_validated' ) ? $settings->get( 'applepay_validated' ) === true : false; return $settings->has( 'applepay_validated' ) ? $settings->get( 'applepay_validated' ) === true : false;
}, },
'applepay.apple-product-status' => static function( ContainerInterface $container ): AppleProductStatus { 'applepay.apple-product-status' => SingletonDecorator::make(
return new AppleProductStatus( static function( ContainerInterface $container ): AppleProductStatus {
$container->get( 'wcgateway.settings' ), return new AppleProductStatus(
$container->get( 'api.endpoint.partners' ), $container->get( 'wcgateway.settings' ),
$container->get( 'onboarding.state' ), $container->get( 'api.endpoint.partners' ),
$container->get( 'api.helper.failure-registry' ) $container->get( 'onboarding.state' ),
); $container->get( 'api.helper.failure-registry' )
}, );
}
),
'applepay.available' => static function ( ContainerInterface $container ): bool { 'applepay.available' => static function ( ContainerInterface $container ): bool {
if ( apply_filters( 'woocommerce_paypal_payments_applepay_validate_product_status', true ) ) { if ( apply_filters( 'woocommerce_paypal_payments_applepay_validate_product_status', true ) ) {
$status = $container->get( 'applepay.apple-product-status' ); $status = $container->get( 'applepay.apple-product-status' );

3
modules/ppcp-wc-gateway/src/Settings/SettingsListener.php
View file

@ -346,9 +346,10 @@ class SettingsListener {
/** /**
* Prevent enabling both Pay Later messaging and PayPal vaulting * Prevent enabling both Pay Later messaging and PayPal vaulting
* *
* @return void
* @throws RuntimeException When API request fails. * @throws RuntimeException When API request fails.
*/ */
public function listen_for_vaulting_enabled() { public function listen_for_vaulting_enabled(): void {
if ( ! $this->is_valid_site_request() || State::STATE_ONBOARDED !== $this->state->current_state() ) { if ( ! $this->is_valid_site_request() || State::STATE_ONBOARDED !== $this->state->current_state() ) {
return; return;
} }