From 92ae16f99bb9e339a06c5cc6ad16f7426b3ef8a6 Mon Sep 17 00:00:00 2001
From: dinamiko <e.castells@inpsyde.com>
Date: Thu, 29 Sep 2022 14:34:11 +0200
Subject: [PATCH] Add short expiration time when ddc applies for country

---
 modules/ppcp-wc-gateway/services.php          |  7 ++++++-
 .../src/Helper/DCCProductStatus.php           | 20 +++++++++++++++++--
 2 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/modules/ppcp-wc-gateway/services.php b/modules/ppcp-wc-gateway/services.php
index f8508f43b..331a7ec3d 100644
--- a/modules/ppcp-wc-gateway/services.php
+++ b/modules/ppcp-wc-gateway/services.php
@@ -1929,7 +1929,12 @@ return array(
 
 		$settings         = $container->get( 'wcgateway.settings' );
 		$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 {
diff --git a/modules/ppcp-wc-gateway/src/Helper/DCCProductStatus.php b/modules/ppcp-wc-gateway/src/Helper/DCCProductStatus.php
index bd55cfbff..3c60fea55 100644
--- a/modules/ppcp-wc-gateway/src/Helper/DCCProductStatus.php
+++ b/modules/ppcp-wc-gateway/src/Helper/DCCProductStatus.php
@@ -13,6 +13,7 @@ use Throwable;
 use WooCommerce\PayPalCommerce\ApiClient\Endpoint\PartnersEndpoint;
 use WooCommerce\PayPalCommerce\ApiClient\Entity\SellerStatusProduct;
 use WooCommerce\PayPalCommerce\ApiClient\Helper\Cache;
+use WooCommerce\PayPalCommerce\ApiClient\Helper\DccApplies;
 use WooCommerce\PayPalCommerce\WcGateway\Settings\Settings;
 
 /**
@@ -49,21 +50,31 @@ class DCCProductStatus {
 	 */
 	private $partners_endpoint;
 
+	/**
+	 * The dcc applies helper.
+	 *
+	 * @var DccApplies
+	 */
+	protected $dcc_applies;
+
 	/**
 	 * DccProductStatus constructor.
 	 *
 	 * @param Settings         $settings The Settings.
 	 * @param PartnersEndpoint $partners_endpoint The Partner Endpoint.
 	 * @param Cache            $cache The cache.
+	 * @param DccApplies       $dcc_applies The dcc applies helper.
 	 */
 	public function __construct(
 		Settings $settings,
 		PartnersEndpoint $partners_endpoint,
-		Cache $cache
+		Cache $cache,
+		DccApplies $dcc_applies
 	) {
 		$this->settings          = $settings;
 		$this->partners_endpoint = $partners_endpoint;
 		$this->cache             = $cache;
+		$this->dcc_applies       = $dcc_applies;
 	}
 
 	/**
@@ -113,7 +124,12 @@ class DCCProductStatus {
 				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;
 		return false;