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 PCP-3677-pay-pal-subscriptions-api-renewal-order-not-created-in-woo-commerce

Browse source
This commit is contained in:
Emili Castells Guasch 2024-09-23 12:19:01 +02:00
commit 54770491d3
7 changed files with 33 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
changelog.txt
View file

@ -15,6 +15,8 @@
* Enhancement - Require PHP 7.4+, WP 6.3+, WC 6.9+ #2556
* Enhancement - Modularity module migration #1944
* Enhancement - Keep only 5 tags in readme.txt #2562
* Enhancement - Select ACDC by default during onboarding for China store locations #2619
* Enhancement - Add title, description and gatewayId to the express payment method #2566
= 2.9.0 - 2024-09-02 =
* Fix - Fatal error in Block Editor when using WooCommerce blocks #2534

1
modules/ppcp-blocks/package.json
View file

@ -19,6 +19,7 @@
"@babel/core": "^7.19",
"@babel/preset-env": "^7.19",
"@babel/preset-react": "^7.18.6",
"@wordpress/i18n": "^5.6.0",
"@woocommerce/dependency-extraction-webpack-plugin": "2.2.0",
"babel-loader": "^8.2",
"cross-env": "^7.0.3",

7
modules/ppcp-blocks/resources/js/checkout-block.js
View file

@ -3,6 +3,7 @@ import {
registerExpressPaymentMethod,
registerPaymentMethod,
} from '@woocommerce/blocks-registry';
import { __ } from '@wordpress/i18n';
import {
mergeWcAddress,
paypalAddressToWc,
@ -774,6 +775,12 @@ if ( block_enabled && config.enabled ) {
] ) {
registerExpressPaymentMethod( {
name: `${ config.id }-${ fundingSource }`,
title: 'PayPal',
description: __(
'Eligible users will see the PayPal button.',
'woocommerce-paypal-payments'
),
gatewayId: 'ppcp-gateway',
paymentMethodId: config.id,
label: (
<div dangerouslySetInnerHTML={ { __html: config.title } } />

1
modules/ppcp-googlepay/package.json
View file

@ -17,6 +17,7 @@
"@babel/core": "^7.19",
"@babel/preset-env": "^7.19",
"@babel/preset-react": "^7.18.6",
"@wordpress/i18n": "^5.6.0",
"@woocommerce/dependency-extraction-webpack-plugin": "^2.2.0",
"babel-loader": "^8.2",
"cross-env": "^7.0.3",

7
modules/ppcp-googlepay/resources/js/boot-block.js
View file

@ -3,6 +3,7 @@ import {
registerExpressPaymentMethod,
registerPaymentMethod,
} from '@woocommerce/blocks-registry';
import { __ } from '@wordpress/i18n';
import { loadPaypalScript } from '../../../ppcp-button/resources/js/modules/Helper/ScriptLoading';
import GooglepayManager from './GooglepayManager';
import { loadCustomScript } from '@paypal/paypal-js';
@ -58,6 +59,12 @@ const features = [ 'products' ];
registerExpressPaymentMethod( {
name: buttonData.id,
title: `PayPal - ${ buttonData.title }`,
description: __(
'Eligible users will see the PayPal button.',
'woocommerce-paypal-payments'
),
gatewayId: 'ppcp-gateway',
label: <div dangerouslySetInnerHTML={ { __html: buttonData.title } } />,
content: <GooglePayComponent isEditing={ false } />,
edit: <GooglePayComponent isEditing={ true } />,

16
modules/ppcp-googlepay/src/Assets/Button.php
View file

@ -431,10 +431,20 @@ class Button implements ButtonInterface {
* @return array
*/
public function script_data(): array {
$use_shipping_form = $this->settings->has( 'googlepay_button_shipping_enabled' ) && $this->settings->get( 'googlepay_button_shipping_enabled' );
// On the product page, only show the shipping form for physical products.
$context = $this->context();
if ( $use_shipping_form && 'product' === $context ) {
$product = wc_get_product();
if ( ! $product || $product->is_downloadable() || $product->is_virtual() ) {
$use_shipping_form = false;
}
}
$shipping = array(
'enabled' => $this->settings->has( 'googlepay_button_shipping_enabled' )
? boolval( $this->settings->get( 'googlepay_button_shipping_enabled' ) )
: false,
'enabled' => $use_shipping_form,
'configured' => wc_shipping_enabled() && wc_get_shipping_method_count( false, true ) > 0,
);

2
readme.txt
View file

@ -194,6 +194,8 @@ If you encounter issues with the PayPal buttons not appearing after an update, p
* Enhancement - Require PHP 7.4+, WP 6.3+, WC 6.9+ #2556
* Enhancement - Modularity module migration #1944
* Enhancement - Keep only 5 tags in readme.txt #2562
* Enhancement - Select ACDC by default during onboarding for China store locations #2619
* Enhancement - Add title, description and gatewayId to the express payment method #2566
= 2.9.0 - 2024-09-02 =
* Fix - Fatal error in Block Editor when using WooCommerce blocks #2534