Merge pull request #4311 from woocommerce/dev/PCP-6272-always-add-currency

Always add currency to cart (6272)

Author: stracker-phil

modules/ppcp-store-sync/services.php

@@ -18,6 +18,7 @@
 
 use WooCommerce\PayPalCommerce\StoreSync\Config\AgenticWebhookConfiguration;
 use WooCommerce\PayPalCommerce\StoreSync\Config\IngestionConfiguration;
+use WooCommerce\PayPalCommerce\StoreSync\Config\StoreCurrencyValue;
 use WooCommerce\PayPalCommerce\StoreSync\Auth\AuthServiceProvider;
 use WooCommerce\PayPalCommerce\StoreSync\Auth\PayPalJwkProvider;
 use WooCommerce\PayPalCommerce\StoreSync\Endpoint\CreateCartEndpoint;
@@ -85,6 +86,9 @@
 	'agentic.config.ingestion'                     => static function (): IngestionConfiguration {
 		return new IngestionConfiguration();
 	},
+	'agentic.config.store-currency'                => static function (): StoreCurrencyValue {
+		return new StoreCurrencyValue();
+	},
 
 	// Registration and merchant identification.
 	'agentic.merchant.provider'                    => static function ( ContainerInterface $c ): MerchantMetadataProvider {
@@ -226,7 +230,8 @@
 		return new ResponseFactory(
 			$c->get( 'agentic.helper.cart-builder' ),
 			$c->get( 'agentic.response.applied-coupons-builder' ),
-			$c->get( 'agentic.helper.shipping-options-builder' )
+			$c->get( 'agentic.helper.shipping-options-builder' ),
+			$c->get( 'agentic.config.store-currency' )
 		);
 	},
 

modules/ppcp-store-sync/src/Config/StoreCurrencyValue.php

@@ -0,0 +1,9 @@
+<?php
+
+namespace WooCommerce\PayPalCommerce\StoreSync\Config;
+
+class StoreCurrencyValue {
+	public function value(): string {
+		return get_woocommerce_currency();
+	}
+}

modules/ppcp-store-sync/src/Response/CartResponse.php

@@ -16,6 +16,7 @@
 use WooCommerce\PayPalCommerce\StoreSync\Validation\ValidationIssue;
 use WooCommerce\PayPalCommerce\StoreSync\Helper\CartHelper;
 use WooCommerce\PayPalCommerce\StoreSync\Enums\ErrorCode;
+use WooCommerce\PayPalCommerce\StoreSync\Config\StoreCurrencyValue;
 
 class CartResponse {
 	private const ALLOWED_STATUS = array(
@@ -33,6 +34,8 @@ class CartResponse {
 
 	private PayPalCart $cart;
 
+	private string $default_currency = '';
+
 	private ?WC_Cart $wc_cart = null;
 
 	private array $applied_coupons = array();
@@ -160,6 +163,18 @@ public function wc_cart( ?WC_Cart $wc_cart ): self {
 		return $this;
 	}
 
+	/**
+	 * Configures the CartResponse instance - only used by the ResponseFactory.
+	 *
+	 * @param StoreCurrencyValue $store_currency Resolves the WooCommerce currency code.
+	 * @return $this
+	 */
+	public function store_currency( StoreCurrencyValue $store_currency ): self {
+		$this->default_currency = $store_currency->value();
+
+		return $this;
+	}
+
 	/**
 	 * Convert to array for API response.
 	 *
@@ -218,9 +233,11 @@ private function calculate_totals(): ?array {
 			return null;
 		}
 
-		$currency_code = CartHelper::currency( $this->cart );
+		return CartHelper::calculate_totals( $this->wc_cart, $this->currency_code() );
+	}
 
-		return CartHelper::calculate_totals( $this->wc_cart, $currency_code );
+	private function currency_code(): string {
+		return CartHelper::currency( $this->cart, $this->default_currency );
 	}
 
 	private function status(): string {

modules/ppcp-store-sync/src/Response/ResponseFactory.php

@@ -15,28 +15,25 @@
 use WooCommerce\PayPalCommerce\StoreSync\Helper\AgenticCartBuilder;
 use WooCommerce\PayPalCommerce\StoreSync\Helper\ShippingOptionsBuilder;
 use WooCommerce\PayPalCommerce\StoreSync\Schema\PayPalCart;
+use WooCommerce\PayPalCommerce\StoreSync\Config\StoreCurrencyValue;
 
 class ResponseFactory {
 
 	private AgenticCartBuilder $cart_builder;
 	private AppliedCouponsBuilder $applied_coupons_builder;
 	private ShippingOptionsBuilder $shipping_options_builder;
+	private StoreCurrencyValue $store_currency;
 
-	/**
-	 * Constructor.
-	 *
-	 * @param AgenticCartBuilder     $cart_builder             Cart builder service.
-	 * @param AppliedCouponsBuilder  $applied_coupons_builder  Applied coupons builder service.
-	 * @param ShippingOptionsBuilder $shipping_options_builder Shipping options builder service.
-	 */
 	public function __construct(
 		AgenticCartBuilder $cart_builder,
 		AppliedCouponsBuilder $applied_coupons_builder,
-		ShippingOptionsBuilder $shipping_options_builder
+		ShippingOptionsBuilder $shipping_options_builder,
+		StoreCurrencyValue $store_currency
 	) {
 		$this->cart_builder             = $cart_builder;
 		$this->applied_coupons_builder  = $applied_coupons_builder;
 		$this->shipping_options_builder = $shipping_options_builder;
+		$this->store_currency           = $store_currency;
 	}
 
 	/**
@@ -52,6 +49,7 @@ public function new_cart( PayPalCart $cart, string $cart_id, string $token ): Ca
 
 		return CartResponse::create_new( $cart, $cart_id, $token )
 			->wc_cart( $wc_cart )
+			->store_currency( $this->store_currency )
 			->applied_coupons( $this->build_applied_coupons( $cart ) )
 			->shipping_options( $this->shipping_options_builder->build( $wc_cart ) );
 	}
@@ -69,6 +67,7 @@ public function from_order( WC_Order $order, PayPalCart $cart, string $cart_id )
 
 		return CartResponse::create_completed( $cart, $cart_id, $order )
 			->wc_cart( $wc_cart )
+			->store_currency( $this->store_currency )
 			->applied_coupons( $this->build_applied_coupons( $cart ) )
 			->shipping_options( $this->shipping_options_builder->build( $wc_cart ) );
 	}
@@ -85,6 +84,7 @@ public function from_cart( PayPalCart $cart, string $cart_id ): CartResponse {
 
 		return CartResponse::create( $cart, $cart_id )
 			->wc_cart( $wc_cart )
+			->store_currency( $this->store_currency )
 			->applied_coupons( $this->build_applied_coupons( $cart ) )
 			->shipping_options( $this->shipping_options_builder->build( $wc_cart ) );
 	}

tests/PHPUnit/StoreSync/Config/StoreCurrencyValueTest.php

@@ -0,0 +1,25 @@
+<?php
+declare( strict_types = 1 );
+
+namespace WooCommerce\PayPalCommerce\StoreSync\Config;
+
+use WooCommerce\PayPalCommerce\TestCase;
+use function Brain\Monkey\Functions\when;
+
+/**
+ * @covers \WooCommerce\PayPalCommerce\StoreSync\Config\StoreCurrencyValue
+ */
+class StoreCurrencyValueTest extends TestCase {
+	/**
+	 * GIVEN the WooCommerce store is configured with USD as the active currency
+	 * WHEN value() is called
+	 * THEN it returns the string 'USD'
+	 */
+	public function test_value_returns_woocommerce_currency_code(): void {
+		when( 'get_woocommerce_currency' )->justReturn( 'USD' );
+
+		$testee = new StoreCurrencyValue();
+
+		$this->assertSame( 'USD', $testee->value() );
+	}
+}