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

Merge pull request #870 from woocommerce/PCP-886-hide-pay-pal-card-processing-tab-is-not-available-in-country-or-for-merchant

Browse source 
Hide PayPal Card Processing tab is not available in country or for merchant (886)
This commit is contained in:
Emili Castells 2022-09-30 14:17:32 +02:00 • committed by GitHub
commit 88d40513dc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 35 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
.psalm/stubs.php
View file

@ -5,3 +5,6 @@ if (!defined('EP_PAGES')) {
if (!defined('MONTH_IN_SECONDS')) { if (!defined('MONTH_IN_SECONDS')) {
define('MONTH_IN_SECONDS', 30 * DAY_IN_SECONDS); define('MONTH_IN_SECONDS', 30 * DAY_IN_SECONDS);
} }
if (!defined('HOUR_IN_SECONDS')) {
define('HOUR_IN_SECONDS', 60 * MINUTE_IN_SECONDS);
}

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

@ -243,6 +243,14 @@ return array(
} }
} }


$dcc_product_status = $container->get( 'wcgateway.helper.dcc-product-status' );
assert( $dcc_product_status instanceof DCCProductStatus );
$dcc_applies = $container->get( 'api.helpers.dccapplies' );
assert( $dcc_applies instanceof DccApplies );
if ( ! $dcc_product_status->dcc_is_active() || ! $dcc_applies->for_country_currency() ) {
unset( $sections['ppcp-credit-card-gateway'] );
}

return $sections; return $sections;
}, },
'wcgateway.settings.status' => static function ( ContainerInterface $container ): SettingsStatus { 'wcgateway.settings.status' => static function ( ContainerInterface $container ): SettingsStatus {
@ -1923,7 +1931,12 @@ return array(


$settings = $container->get( 'wcgateway.settings' ); $settings = $container->get( 'wcgateway.settings' );
$partner_endpoint = $container->get( 'api.endpoint.partners' ); $partner_endpoint = $container->get( 'api.endpoint.partners' );
return new DCCProductStatus( $settings, $partner_endpoint, $container->get( 'dcc.status-cache' ) ); return new DCCProductStatus(
$settings,
$partner_endpoint,
$container->get( 'dcc.status-cache' ),
$container->get( 'api.helpers.dccapplies' )
);
}, },


'button.helper.messages-disclaimers' => static function ( ContainerInterface $container ): MessagesDisclaimers { 'button.helper.messages-disclaimers' => static function ( ContainerInterface $container ): MessagesDisclaimers {

20
modules/ppcp-wc-gateway/src/Helper/DCCProductStatus.php
View file

@ -13,6 +13,7 @@ use Throwable;
use WooCommerce\PayPalCommerce\ApiClient\Endpoint\PartnersEndpoint; use WooCommerce\PayPalCommerce\ApiClient\Endpoint\PartnersEndpoint;
use WooCommerce\PayPalCommerce\ApiClient\Entity\SellerStatusProduct; use WooCommerce\PayPalCommerce\ApiClient\Entity\SellerStatusProduct;
use WooCommerce\PayPalCommerce\ApiClient\Helper\Cache; use WooCommerce\PayPalCommerce\ApiClient\Helper\Cache;
use WooCommerce\PayPalCommerce\ApiClient\Helper\DccApplies;
use WooCommerce\PayPalCommerce\WcGateway\Settings\Settings; use WooCommerce\PayPalCommerce\WcGateway\Settings\Settings;


/** /**
@ -49,21 +50,31 @@ class DCCProductStatus {
*/ */
private $partners_endpoint; private $partners_endpoint;


/**
* The dcc applies helper.
*
* @var DccApplies
*/
protected $dcc_applies;

/** /**
* DccProductStatus constructor. * DccProductStatus constructor.
* *
* @param Settings $settings The Settings. * @param Settings $settings The Settings.
* @param PartnersEndpoint $partners_endpoint The Partner Endpoint. * @param PartnersEndpoint $partners_endpoint The Partner Endpoint.
* @param Cache $cache The cache. * @param Cache $cache The cache.
* @param DccApplies $dcc_applies The dcc applies helper.
*/ */
public function __construct( public function __construct(
Settings $settings, Settings $settings,
PartnersEndpoint $partners_endpoint, PartnersEndpoint $partners_endpoint,
Cache $cache Cache $cache,
DccApplies $dcc_applies
) { ) {
$this->settings = $settings; $this->settings = $settings;
$this->partners_endpoint = $partners_endpoint; $this->partners_endpoint = $partners_endpoint;
$this->cache = $cache; $this->cache = $cache;
$this->dcc_applies = $dcc_applies;
} }


/** /**
@ -113,7 +124,12 @@ class DCCProductStatus {
return true; return true;
} }
} }
$this->cache->set( self::DCC_STATUS_CACHE_KEY, false, 3 * MONTH_IN_SECONDS );
$expiration = 3 * MONTH_IN_SECONDS;
if ( $this->dcc_applies->for_country_currency() ) {
$expiration = 3 * HOUR_IN_SECONDS;
}
$this->cache->set( self::DCC_STATUS_CACHE_KEY, false, $expiration );


$this->current_status_cache = false; $this->current_status_cache = false;
return false; return false;