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

Merge pull request #2667 from woocommerce/PCP-3744-fix-multicurrency

Browse source 
Fix multi-currency support
This commit is contained in:
Emili Castells 2024-10-03 12:40:35 +02:00 • committed by GitHub
commit 634b3707ee
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
30 changed files with 238 additions and 165 deletions
Download patch file Download diff file Expand all files Collapse all files

2
modules/ppcp-paypal-subscriptions/services.php
View file

@ -25,7 +25,7 @@ return array(
$container->get( 'api.endpoint.billing-plans' ),
$container->get( 'api.factory.billing-cycle' ),
$container->get( 'api.factory.payment-preferences' ),
$container->get( 'api.shop.currency' ),
$container->get( 'api.shop.currency.getter' ),
$container->get( 'woocommerce.logger.woocommerce' )
);
},

13
modules/ppcp-paypal-subscriptions/src/SubscriptionsApiHandler.php
View file

@ -19,6 +19,7 @@ use WooCommerce\PayPalCommerce\ApiClient\Exception\RuntimeException;
use WooCommerce\PayPalCommerce\ApiClient\Factory\BillingCycleFactory;
use WooCommerce\PayPalCommerce\ApiClient\Factory\PaymentPreferencesFactory;
use WooCommerce\PayPalCommerce\ApiClient\Factory\ProductFactory;
use WooCommerce\PayPalCommerce\ApiClient\Helper\CurrencyGetter;
use WooCommerce\PayPalCommerce\ApiClient\Helper\ItemTrait;
/**
@ -66,9 +67,9 @@ class SubscriptionsApiHandler {
/**
* The currency.
*
* @var string
* @var CurrencyGetter
*/
private $currency;
private CurrencyGetter $currency;
/**
* The logger.
@ -85,7 +86,7 @@ class SubscriptionsApiHandler {
* @param BillingPlans $billing_plans_endpoint Billing plans endpoint.
* @param BillingCycleFactory $billing_cycle_factory Billing cycle factory.
* @param PaymentPreferencesFactory $payment_preferences_factory Payment preferences factory.
* @param string $currency The currency.
* @param CurrencyGetter $currency The currency.
* @param LoggerInterface $logger The logger.
*/
public function __construct(
@ -94,7 +95,7 @@ class SubscriptionsApiHandler {
BillingPlans $billing_plans_endpoint,
BillingCycleFactory $billing_cycle_factory,
PaymentPreferencesFactory $payment_preferences_factory,
string $currency,
CurrencyGetter $currency,
LoggerInterface $logger
) {
$this->products_endpoint = $products_endpoint;
@ -253,7 +254,7 @@ class SubscriptionsApiHandler {
array(
'fixed_price' => array(
'value' => '0',
'currency_code' => $this->currency,
'currency_code' => $this->currency->get(),
),
),
1
@ -272,7 +273,7 @@ class SubscriptionsApiHandler {
array(
'fixed_price' => array(
'value' => $product->get_meta( '_subscription_price' ) ?: $product->get_price(),
'currency_code' => $this->currency,
'currency_code' => $this->currency->get(),
),
),
(int) $product->get_meta( '_subscription_length' )