woocommerce/woocommerce-paypal-payments
2
0
Fork 0
mirror of https://github.com/woocommerce/woocommerce-paypal-payments.git synced 2025-09-01 07:02:48 +08:00
Code Issues Projects Packages Wiki Activity Actions

Merge branch 'trunk' of github.com:woocommerce/woocommerce-paypal-payments into PCP-4649-track-wizard-screen-views

Browse source
This commit is contained in:
Daniel Dudzic 2025-06-18 13:05:38 +02:00
commit e580a00dcf
No known key found for this signature in database
GPG key ID: 31B40D33E3465483
14 changed files with 234 additions and 146 deletions
Download patch file Download diff file Expand all files Collapse all files

5
modules/ppcp-api-client/services.php
View file

@ -682,6 +682,11 @@ return array(
'GB' => $default_currencies,
'US' => $default_currencies,
'NO' => $default_currencies,
'YT' => $default_currencies,
'RE' => $default_currencies,
'GP' => $default_currencies,
'GF' => $default_currencies,
'MQ' => $default_currencies,
)
);
},

26
modules/ppcp-applepay/src/ApplepayModule.php
View file

@ -11,6 +11,7 @@ namespace WooCommerce\PayPalCommerce\Applepay;
use WC_Payment_Gateway;
use Automattic\WooCommerce\Blocks\Payments\PaymentMethodRegistry;
use WooCommerce\PayPalCommerce\ApiClient\Factory\ExperienceContextBuilder;
use WooCommerce\PayPalCommerce\Applepay\Assets\ApplePayButton;
use WooCommerce\PayPalCommerce\Applepay\Assets\AppleProductStatus;
use WooCommerce\PayPalCommerce\Applepay\Assets\PropertiesDictionary;
@ -198,6 +199,31 @@ class ApplepayModule implements ServiceModule, ExtendingModule, ExecutableModule
}
);
add_filter(
'ppcp_create_order_request_body_data',
static function ( array $data, string $payment_method, array $request ) use ( $c ) : array {
if ( $payment_method !== ApplePayGateway::ID ) {
return $data;
}
$experience_context_builder = $c->get( 'wcgateway.builder.experience-context' );
assert( $experience_context_builder instanceof ExperienceContextBuilder );
$data['payment_source'] = array(
'apple_pay' => array(
'experience_context' => $experience_context_builder
->with_endpoint_return_urls()
->build()->to_array(),
),
);
return $data;
},
10,
3
);
return true;
}

51
modules/ppcp-button/src/Endpoint/CreateOrderEndpoint.php
View file

@ -392,50 +392,6 @@ class CreateOrderEndpoint implements EndpointInterface {
return false;
}
/**
* Once the checkout has been validated we execute this method.
*
* @param array $data The data.
* @param \WP_Error $errors The errors, which occurred.
*
* @return array
* @throws Exception On Error.
*/
public function after_checkout_validation( array $data, \WP_Error $errors ): array {
if ( ! $errors->errors ) {
try {
$order = $this->create_paypal_order();
} catch ( Exception $exception ) {
$this->logger->error( 'Order creation failed: ' . $exception->getMessage() );
throw $exception;
}
/**
* In case we are onboarded and everything is fine with the \WC_Order
* we want this order to be created. We will intercept it and leave it
* in the "Pending payment" status though, which than later will change
* during the "onApprove"-JS callback or the webhook listener.
*/
if ( ! $this->early_order_handler->should_create_early_order() ) {
wp_send_json_success( $this->make_response( $order ) );
}
$this->early_order_handler->register_for_order( $order );
return $data;
}
$this->logger->error( 'Checkout validation failed: ' . $errors->get_error_message() );
wp_send_json_error(
array(
'name' => '',
'message' => $errors->get_error_message(),
'code' => (int) $errors->get_error_code(),
'details' => array(),
)
);
return $data;
}
/**
* Creates the order in the PayPal, uses data from WC order if provided.
*
@ -485,8 +441,13 @@ class CreateOrderEndpoint implements EndpointInterface {
}
}
$payment_source_key = 'paypal';
if ( in_array( $funding_source, array( 'venmo' ), true ) ) {
$payment_source_key = $funding_source;
}
$payment_source = new PaymentSource(
'paypal',
$payment_source_key,
(object) array(
'experience_context' => $this->experience_context_builder
->with_default_paypal_config( $shipping_preference, $action )

20
modules/ppcp-card-fields/src/CardFieldsModule.php
View file

@ -12,6 +12,7 @@ namespace WooCommerce\PayPalCommerce\CardFields;
use DomainException;
use Psr\Log\LoggerInterface;
use WooCommerce\PayPalCommerce\ApiClient\Entity\Order;
use WooCommerce\PayPalCommerce\ApiClient\Factory\ExperienceContextBuilder;
use WooCommerce\PayPalCommerce\CardFields\Service\CardCaptureValidator;
use WooCommerce\PayPalCommerce\Vendor\Inpsyde\Modularity\Module\ExecutableModule;
use WooCommerce\PayPalCommerce\Vendor\Inpsyde\Modularity\Module\ExtendingModule;
@ -150,6 +151,15 @@ class CardFieldsModule implements ServiceModule, ExtendingModule, ExecutableModu
$settings = $c->get( 'wcgateway.settings' );
assert( $settings instanceof Settings );
$experience_context_builder = $c->get( 'wcgateway.builder.experience-context' );
assert( $experience_context_builder instanceof ExperienceContextBuilder );
$payment_source_data = array(
'experience_context' => $experience_context_builder
->with_endpoint_return_urls()
->build()->to_array(),
);
$three_d_secure_contingency =
$settings->has( '3d_secure_contingency' )
? apply_filters( 'woocommerce_paypal_payments_three_d_secure_contingency', $settings->get( '3d_secure_contingency' ) )
@ -159,15 +169,15 @@ class CardFieldsModule implements ServiceModule, ExtendingModule, ExecutableModu
$three_d_secure_contingency === 'SCA_ALWAYS'
|| $three_d_secure_contingency === 'SCA_WHEN_REQUIRED'
) {
$data['payment_source']['card'] = array(
'attributes' => array(
'verification' => array(
'method' => $three_d_secure_contingency,
),
$payment_source_data['attributes'] = array(
'verification' => array(
'method' => $three_d_secure_contingency,
),
);
}
$data['payment_source'] = array( 'card' => $payment_source_data );
return $data;
},
10,

20
modules/ppcp-googlepay/src/GooglepayModule.php
View file

@ -11,6 +11,7 @@ namespace WooCommerce\PayPalCommerce\Googlepay;
use Automattic\WooCommerce\Blocks\Payments\PaymentMethodRegistry;
use WC_Payment_Gateway;
use WooCommerce\PayPalCommerce\ApiClient\Factory\ExperienceContextBuilder;
use WooCommerce\PayPalCommerce\Button\Assets\ButtonInterface;
use WooCommerce\PayPalCommerce\Button\Assets\SmartButtonInterface;
use WooCommerce\PayPalCommerce\Googlepay\Endpoint\UpdatePaymentDataEndpoint;
@ -261,6 +262,15 @@ class GooglepayModule implements ServiceModule, ExtendingModule, ExecutableModul
$settings = $c->get( 'wcgateway.settings' );
assert( $settings instanceof Settings );
$experience_context_builder = $c->get( 'wcgateway.builder.experience-context' );
assert( $experience_context_builder instanceof ExperienceContextBuilder );
$payment_source_data = array(
'experience_context' => $experience_context_builder
->with_endpoint_return_urls()
->build()->to_array(),
);
$three_d_secure_contingency =
$settings->has( '3d_secure_contingency' )
? apply_filters( 'woocommerce_paypal_payments_three_d_secure_contingency', $settings->get( '3d_secure_contingency' ) )
@ -270,15 +280,15 @@ class GooglepayModule implements ServiceModule, ExtendingModule, ExecutableModul
$three_d_secure_contingency === 'SCA_ALWAYS'
|| $three_d_secure_contingency === 'SCA_WHEN_REQUIRED'
) {
$data['payment_source']['google_pay'] = array(
'attributes' => array(
'verification' => array(
'method' => $three_d_secure_contingency,
),
$payment_source_data['attributes'] = array(
'verification' => array(
'method' => $three_d_secure_contingency,
),
);
}
$data['payment_source'] = array( 'google_pay' => $payment_source_data );
return $data;
},
10,

5
modules/ppcp-save-payment-methods/services.php
View file

@ -78,6 +78,11 @@ return array(
'SE',
'GB',
'US',
'YT',
'RE',
'GP',
'GF',
'MQ',
)
);
},

110
modules/ppcp-save-payment-methods/src/SavePaymentMethodsModule.php
View file

@ -115,87 +115,67 @@ class SavePaymentMethodsModule implements ServiceModule, ExtendingModule, Execut
function ( array $data, string $payment_method, array $request_data ) use ( $c ): array {
$settings = $c->get( 'wcgateway.settings' );
assert( $settings instanceof Settings );
$new_attributes = array(
'vault' => array(
'store_in_vault' => 'ON_SUCCESS',
),
);
$target_customer_id = get_user_meta( get_current_user_id(), '_ppcp_target_customer_id', true );
if ( ! $target_customer_id ) {
$target_customer_id = get_user_meta( get_current_user_id(), 'ppcp_customer_id', true );
}
if ( $target_customer_id ) {
$new_attributes['customer'] = array(
'id' => $target_customer_id,
);
}
$funding_source = (string) ( $request_data['funding_source'] ?? '' );
if ( $payment_method === CreditCardGateway::ID ) {
if ( ! $settings->has( 'vault_enabled_dcc' ) || ! $settings->get( 'vault_enabled_dcc' ) ) {
return $data;
}
$save_payment_method = $request_data['save_payment_method'] ?? false;
if ( $save_payment_method ) {
$data['payment_source'] = array(
'card' => array(
'attributes' => array(
'vault' => array(
'store_in_vault' => 'ON_SUCCESS',
),
),
),
);
$target_customer_id = get_user_meta( get_current_user_id(), '_ppcp_target_customer_id', true );
if ( ! $target_customer_id ) {
$target_customer_id = get_user_meta( get_current_user_id(), 'ppcp_customer_id', true );
}
if ( $target_customer_id ) {
$data['payment_source']['card']['attributes']['customer'] = array(
'id' => $target_customer_id,
);
}
if ( ! $save_payment_method ) {
return $data;
}
}
if ( $payment_method === PayPalGateway::ID ) {
} elseif ( $payment_method === PayPalGateway::ID ) {
if ( ! $settings->has( 'vault_enabled' ) || ! $settings->get( 'vault_enabled' ) ) {
return $data;
}
$funding_source = $request_data['funding_source'] ?? null;
if ( $funding_source && $funding_source === 'venmo' ) {
$data['payment_source'] = array(
'venmo' => array(
'attributes' => array(
'vault' => array(
'store_in_vault' => 'ON_SUCCESS',
'usage_type' => 'MERCHANT',
'permit_multiple_payment_tokens' => apply_filters( 'woocommerce_paypal_payments_permit_multiple_payment_tokens', false ),
),
),
),
);
} elseif ( $funding_source && $funding_source === 'apple_pay' ) {
$data['payment_source'] = array(
'apple_pay' => array(
'stored_credential' => array(
'payment_initiator' => 'CUSTOMER',
'payment_type' => 'RECURRING',
),
'attributes' => array(
'vault' => array(
'store_in_vault' => 'ON_SUCCESS',
),
),
),
);
} else {
$data['payment_source'] = array(
'paypal' => array(
'attributes' => array(
'vault' => array(
'store_in_vault' => 'ON_SUCCESS',
'usage_type' => 'MERCHANT',
'permit_multiple_payment_tokens' => apply_filters( 'woocommerce_paypal_payments_permit_multiple_payment_tokens', false ),
),
),
),
);
if ( ! in_array( $funding_source, array( 'paypal', 'venmo' ), true ) ) {
return $data;
}
$new_attributes['vault']['usage_type'] = 'MERCHANT';
$new_attributes['vault']['permit_multiple_payment_tokens'] = apply_filters( 'woocommerce_paypal_payments_permit_multiple_payment_tokens', false );
} else {
return $data;
}
$payment_source = (array) ( $data['payment_source'] ?? array() );
$key = array_key_first( $payment_source );
if ( ! is_string( $key ) || empty( $key ) ) {
$key = $payment_method;
if ( $payment_method === PayPalGateway::ID && $funding_source ) {
$key = $funding_source;
}
$payment_source[ $key ] = array();
}
$payment_source[ $key ] = (array) $payment_source[ $key ];
$attributes = (array) ( $payment_source[ $key ]['attributes'] ?? array() );
$payment_source[ $key ]['attributes'] = array_merge( $attributes, $new_attributes );
$data['payment_source'] = $payment_source;
return $data;
},
10,
20,
3
);

6
modules/ppcp-settings/services.php
View file

@ -120,8 +120,12 @@ return array(
return new PaymentSettings();
},
'settings.data.settings' => static function ( ContainerInterface $container ) : SettingsModel {
$environment = $container->get( 'settings.environment' );
assert( $environment instanceof Environment );
return new SettingsModel(
$container->get( 'settings.service.sanitizer' )
$container->get( 'settings.service.sanitizer' ),
$environment->is_sandbox() ? $container->get( 'wcgateway.settings.invoice-prefix-random' ) : $container->get( 'wcgateway.settings.invoice-prefix' )
);
},
'settings.data.paylater-messaging' => static function ( ContainerInterface $container ) : array {

16
modules/ppcp-settings/src/Data/SettingsModel.php
View file

@ -47,14 +47,24 @@ class SettingsModel extends AbstractDataModel {
*/
protected DataSanitizer $sanitizer;
/**
* Invoice prefix.
*
* @var string
*/
private string $invoice_prefix;
/**
* Constructor.
*
* @param DataSanitizer $sanitizer Data sanitizer service.
* @param string $invoice_prefix Invoice prefix.
* @throws RuntimeException If the OPTION_KEY is not defined in the child class.
*/
public function __construct( DataSanitizer $sanitizer ) {
$this->sanitizer = $sanitizer;
public function __construct( DataSanitizer $sanitizer, string $invoice_prefix ) {
$this->sanitizer = $sanitizer;
$this->invoice_prefix = $invoice_prefix;
parent::__construct();
}
@ -66,7 +76,7 @@ class SettingsModel extends AbstractDataModel {
protected function get_defaults() : array {
return array(
// Free-form string values.
'invoice_prefix' => '',
'invoice_prefix' => $this->invoice_prefix,
'brand_name' => '',
'soft_descriptor' => '',

1
modules/ppcp-settings/src/Service/SettingsDataManager.php
View file

@ -269,7 +269,6 @@ class SettingsDataManager {
// Enable BCDC for business sellers without ACDC.
$this->payment_methods->toggle_method_state( CardButtonGateway::ID, true );
}
/**
* Allow plugins to modify apm payment gateway states before saving.
*

9
modules/ppcp-settings/src/SettingsModule.php
View file

@ -576,7 +576,7 @@ class SettingsModule implements ServiceModule, ExecutableModule {
// Enable APMs after onboarding if the country is compatible.
add_action(
'woocommerce_paypal_payments_toggle_payment_gateways_apms',
function ( PaymentSettings $payment_methods, array $methods_apm ) use ( $container ) {
function ( PaymentSettings $payment_methods, array $methods_apm, ConfigurationFlagsDTO $flags ) use ( $container ) {
$general_settings = $container->get( 'settings.data.general' );
assert( $general_settings instanceof GeneralSettings );
@ -586,6 +586,11 @@ class SettingsModule implements ServiceModule, ExecutableModule {
// Enable all APM methods.
foreach ( $methods_apm as $method ) {
if ( $flags->use_card_payments === false ) {
$payment_methods->toggle_method_state( $method['id'], $flags->use_card_payments );
continue;
}
// Skip PayUponInvoice if merchant is not in Germany.
if ( PayUponInvoiceGateway::ID === $method['id'] && 'DE' !== $merchant_country ) {
continue;
@ -606,7 +611,7 @@ class SettingsModule implements ServiceModule, ExecutableModule {
}
},
10,
2
3
);
// Toggle payment gateways after onboarding based on flags.

84
modules/ppcp-wc-gateway/services.php
View file

@ -2021,6 +2021,49 @@ return array(
return new TaskRegistrar();
},
'wcgateway.settings.wc-tasks.pay-later-task-config' => static function( ContainerInterface $container ): array {
$section_id = PayPalGateway::ID;
$pay_later_tab_id = Settings::PAY_LATER_TAB_ID;
if ( $container->has( 'paylater-configurator.is-available' ) && $container->get( 'paylater-configurator.is-available' ) ) {
return array(
array(
'id' => 'pay-later-messaging-task',
'title' => __( 'Configure PayPal Pay Later messaging', 'woocommerce-paypal-payments' ),
'description' => __( 'Decide where you want dynamic Pay Later messaging to show up and how you want it to look on your site.', 'woocommerce-paypal-payments' ),
'redirect_url' => admin_url( "admin.php?page=wc-settings&tab=checkout&section={$section_id}&ppcp-tab={$pay_later_tab_id}" ),
),
);
}
return array();
},
'wcgateway.settings.wc-tasks.connect-task-config' => static function( ContainerInterface $container ): array {
$is_connected = $container->get( 'settings.flag.is-connected' );
$is_current_country_send_only = $container->get( 'wcgateway.is-send-only-country' );
if ( ! $is_connected && ! $is_current_country_send_only ) {
return array(
array(
'id' => 'connect-to-paypal-task',
'title' => __( 'Connect PayPal to complete setup', 'woocommerce-paypal-payments' ),
'description' => __( 'PayPal Payments is almost ready. To get started, connect your account with the Activate PayPal Payments button.', 'woocommerce-paypal-payments' ),
'redirect_url' => admin_url( 'admin.php?page=wc-settings&tab=checkout&section=ppcp-gateway&ppcp-tab=' . Settings::CONNECTION_TAB_ID ),
),
);
}
return array();
},
'wcgateway.settings.wc-tasks.task-config-services' => static function(): array {
return array(
'wcgateway.settings.wc-tasks.pay-later-task-config',
'wcgateway.settings.wc-tasks.connect-task-config',
);
},
/**
* A configuration for simple redirect wc tasks.
*
@ -2032,18 +2075,14 @@ return array(
* }>
*/
'wcgateway.settings.wc-tasks.simple-redirect-tasks-config' => static function( ContainerInterface $container ): array {
$section_id = PayPalGateway::ID;
$pay_later_tab_id = Settings::PAY_LATER_TAB_ID;
$list_of_config = array();
$task_config_services = $container->get( 'wcgateway.settings.wc-tasks.task-config-services' );
if ( $container->has( 'paylater-configurator.is-available' ) && $container->get( 'paylater-configurator.is-available' ) ) {
$list_of_config[] = array(
'id' => 'pay-later-messaging-task',
'title' => __( 'Configure PayPal Pay Later messaging', 'woocommerce-paypal-payments' ),
'description' => __( 'Decide where you want dynamic Pay Later messaging to show up and how you want it to look on your site.', 'woocommerce-paypal-payments' ),
'redirect_url' => admin_url( "admin.php?page=wc-settings&tab=checkout&section={$section_id}&ppcp-tab={$pay_later_tab_id}" ),
);
foreach ( $task_config_services as $service_id ) {
if ( $container->has( $service_id ) ) {
$task_config = $container->get( $service_id );
$list_of_config = array_merge( $list_of_config, $task_config );
}
}
return $list_of_config;
@ -2092,4 +2131,29 @@ return array(
'wcgateway.settings.admin-settings-enabled' => static function( ContainerInterface $container ): bool {
return $container->has( 'settings.url' ) && ! SettingsModule::should_use_the_old_ui();
},
/**
* Returns a prefix for the site, ensuring the same site always gets the same prefix (unless the URL changes).
*/
'wcgateway.settings.invoice-prefix' => static function( ContainerInterface $container ): string {
$site_url = get_site_url( get_current_blog_id() );
$hash = md5( $site_url );
$letters = preg_replace( '~\d~', '', $hash ) ?? '';
$prefix = substr( $letters, 0, 6 );
return $prefix ? $prefix . '-' : '';
},
/**
* Returns random 6 characters length alphabetic prefix, followed by a hyphen.
*/
'wcgateway.settings.invoice-prefix-random' => static function( ContainerInterface $container ): string {
$characters = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ';
$prefix = '';
for ( $i = 0; $i < 6; $i++ ) {
$prefix .= $characters[ wp_rand( 0, strlen( $characters ) - 1 ) ];
}
return $prefix . '-';
},
);

16
modules/ppcp-wc-gateway/src/Notice/ConnectAdminNotice.php
View file

@ -69,7 +69,7 @@ class ConnectAdminNotice {
$message = sprintf(
/* translators: %1$s the gateway name. */
__(
'PayPal Payments is almost ready. To get started, connect your account with the <b>Activate PayPal</b> button <a href="%1$s">on the Account Setup page</a>.',
'PayPal Payments is almost ready. To get started, connect your account with the <b>Activate PayPal Payments</b> button <a href="%1$s">on the Account Setup page</a>.',
'woocommerce-paypal-payments'
),
admin_url( 'admin.php?page=wc-settings&tab=checkout&section=ppcp-gateway&ppcp-tab=' . Settings::CONNECTION_TAB_ID )
@ -77,6 +77,16 @@ class ConnectAdminNotice {
return new Message( $message, 'warning' );
}
/**
* Returns whether the current page is plugins.php.
*
* @return bool
*/
private function is_current_page_plugins_page(): bool {
global $pagenow;
return isset( $pagenow ) && $pagenow === 'plugins.php';
}
/**
* Whether the message should display.
*
@ -87,6 +97,8 @@ class ConnectAdminNotice {
* @return bool
*/
protected function should_display(): bool {
return ! $this->is_connected && ! $this->is_current_country_send_only;
return $this->is_current_page_plugins_page()
&& ! $this->is_connected
&& ! $this->is_current_country_send_only;
}
}

11
modules/ppcp-wc-gateway/src/Settings/Fields/connection-tab-fields.php
View file

@ -49,6 +49,9 @@ return function ( ContainerInterface $container, array $fields ): array {
$onboarding_send_only_notice_renderer = $container->get( 'onboarding.render-send-only-notice' );
assert( $onboarding_send_only_notice_renderer instanceof OnboardingSendOnlyNoticeRenderer );
$environment = $container->get( 'settings.environment' );
assert( $environment instanceof Environment );
$is_send_only_country = $container->get( 'wcgateway.is-send-only-country' );
$onboarding_elements_class = $is_send_only_country ? 'hide' : 'ppcp-onboarding-element';
$send_only_country_notice_class = $is_send_only_country ? 'ppcp-onboarding-element' : 'hide';
@ -510,13 +513,7 @@ return function ( ContainerInterface $container, array $fields ): array {
'custom_attributes' => array(
'pattern' => '[a-zA-Z_\\-]+',
),
'default' => ( static function (): string {
$site_url = get_site_url( get_current_blog_id() );
$hash = md5( $site_url );
$letters = preg_replace( '~\d~', '', $hash ) ?? '';
$prefix = substr( $letters, 0, 6 );
return $prefix ? $prefix . '-' : '';
} )(),
'default' => $environment->is_sandbox() ? $container->get( 'wcgateway.settings.invoice-prefix-random' ) : $container->get( 'wcgateway.settings.invoice-prefix' ),
'screens' => array(
State::STATE_START,
State::STATE_ONBOARDED,