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

Merge branch 'trunk' into feat/PCP-154-apple-pay-payment

Browse source
This commit is contained in:
carmenmaymo 2023-09-09 11:33:58 +02:00
commit c5d39a13a0
No known key found for this signature in database
GPG key ID: 6023F686B0F3102E
3 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
modules/ppcp-api-client/src/Endpoint/BillingAgreementsEndpoint.php
View file

@ -121,7 +121,7 @@ class BillingAgreementsEndpoint {
*/ */
public function reference_transaction_enabled(): bool { public function reference_transaction_enabled(): bool {
try { try {
if ( get_transient( 'ppcp_reference_transaction_enabled' ) === true ) { if ( wc_string_to_bool( get_transient( 'ppcp_reference_transaction_enabled' ) ) === true ) {
return true; return true;
} }

5
modules/ppcp-api-client/src/Entity/Item.php
View file

@ -249,9 +249,12 @@ class Item {
'sku' => $this->sku(), 'sku' => $this->sku(),
'category' => $this->category(), 'category' => $this->category(),
'url' => $this->url(), 'url' => $this->url(),
'image_url' => $this->image_url(),
); );
if ( $this->image_url() ) {
$item['image_url'] = $this->image_url();
}
if ( $this->tax() ) { if ( $this->tax() ) {
$item['tax'] = $this->tax()->to_array(); $item['tax'] = $this->tax()->to_array();
} }

3
modules/ppcp-wc-gateway/src/Gateway/PayPalGateway.php
View file

@ -227,7 +227,6 @@ class PayPalGateway extends \WC_Payment_Gateway {
if ( if (
( $this->config->has( 'vault_enabled' ) && $this->config->get( 'vault_enabled' ) ) ( $this->config->has( 'vault_enabled' ) && $this->config->get( 'vault_enabled' ) )
|| ( $this->config->has( 'vault_enabled_dcc' ) && $this->config->get( 'vault_enabled_dcc' ) )
|| ( $this->config->has( 'subscriptions_mode' ) && $this->config->get( 'subscriptions_mode' ) === 'subscriptions_api' ) || ( $this->config->has( 'subscriptions_mode' ) && $this->config->get( 'subscriptions_mode' ) === 'subscriptions_api' )
) { ) {
array_push( array_push(
@ -244,6 +243,8 @@ class PayPalGateway extends \WC_Payment_Gateway {
'subscription_payment_method_change_admin', 'subscription_payment_method_change_admin',
'multiple_subscriptions' 'multiple_subscriptions'
); );
} elseif ( $this->config->has( 'vault_enabled_dcc' ) && $this->config->get( 'vault_enabled_dcc' ) ) {
$this->supports[] = 'tokenization';
} }
} }