{
- const { PaymentMethodIcons } = components;
-
- return (
- <>
-
-
-
- );
- };
-
registerPaymentMethod( {
name: config.id,
label:
,
@@ -837,8 +116,13 @@ if ( block_enabled ) {
registerPaymentMethod( {
name: config.id,
label:
,
- content:
,
- edit:
,
+ content:
,
+ edit: (
+
+ ),
ariaLabel: config.title,
canMakePayment: () => {
return true;
@@ -848,10 +132,11 @@ if ( block_enabled ) {
},
} );
} else if ( config.smartButtonsEnabled ) {
- for ( const fundingSource of [
- 'paypal',
- ...config.enabledFundingSources,
- ] ) {
+ const fundingSources = config.scriptData.is_free_trial_cart
+ ? [ 'paypal' ]
+ : [ 'paypal', ...config.enabledFundingSources ];
+
+ for ( const fundingSource of fundingSources ) {
registerExpressPaymentMethod( {
name: `${ config.id }-${ fundingSource }`,
title: 'PayPal',
@@ -866,12 +151,14 @@ if ( block_enabled ) {
),
content: (
),
edit: (
),
diff --git a/modules/ppcp-blocks/resources/js/paypal-config.js b/modules/ppcp-blocks/resources/js/paypal-config.js
new file mode 100644
index 000000000..d78ee14db
--- /dev/null
+++ b/modules/ppcp-blocks/resources/js/paypal-config.js
@@ -0,0 +1,316 @@
+import {
+ paypalOrderToWcAddresses,
+ paypalSubscriptionToWcAddresses,
+} from './Helper/Address';
+
+export const createOrder = async ( data, config, onError, onClose ) => {
+ try {
+ const requestBody = {
+ nonce: config.scriptData.ajax.create_order.nonce,
+ bn_code: '',
+ context: config.scriptData.context,
+ payment_method: 'ppcp-gateway',
+ funding_source: window.ppcpFundingSource ?? 'paypal',
+ createaccount: false,
+ ...( data?.paymentSource && {
+ payment_source: data.paymentSource,
+ } ),
+ };
+
+ const res = await fetch( config.scriptData.ajax.create_order.endpoint, {
+ method: 'POST',
+ credentials: 'same-origin',
+ body: JSON.stringify( requestBody ),
+ } );
+
+ const json = await res.json();
+
+ if ( ! json.success ) {
+ if ( json.data?.details?.length > 0 ) {
+ throw new Error(
+ json.data.details
+ .map( ( d ) => `${ d.issue } ${ d.description }` )
+ .join( '
' )
+ );
+ } else if ( json.data?.message ) {
+ throw new Error( json.data.message );
+ }
+
+ throw new Error( config.scriptData.labels.error.generic );
+ }
+
+ return json.data.id;
+ } catch ( err ) {
+ console.error( err );
+
+ onError( err.message );
+
+ onClose();
+
+ throw err;
+ }
+};
+
+export const handleApprove = async (
+ data,
+ actions,
+ config,
+ shouldHandleShippingInPayPal,
+ shippingData,
+ setPaypalOrder,
+ shouldskipFinalConfirmation,
+ getCheckoutRedirectUrl,
+ setGotoContinuationOnError,
+ enforcePaymentMethodForCart,
+ onSubmit,
+ onError,
+ onClose
+) => {
+ try {
+ const order = await actions.order.get();
+
+ if ( order ) {
+ const addresses = paypalOrderToWcAddresses( order );
+
+ const promises = [
+ // save address on server
+ wp.data.dispatch( 'wc/store/cart' ).updateCustomerData( {
+ billing_address: addresses.billingAddress,
+ shipping_address: addresses.shippingAddress,
+ } ),
+ ];
+ if ( shouldHandleShippingInPayPal() ) {
+ // set address in UI
+ promises.push(
+ wp.data
+ .dispatch( 'wc/store/cart' )
+ .setBillingAddress( addresses.billingAddress )
+ );
+ if ( shippingData.needsShipping ) {
+ promises.push(
+ wp.data
+ .dispatch( 'wc/store/cart' )
+ .setShippingAddress( addresses.shippingAddress )
+ );
+ }
+ }
+ await Promise.all( promises );
+ }
+
+ setPaypalOrder( order );
+
+ const res = await fetch(
+ config.scriptData.ajax.approve_order.endpoint,
+ {
+ method: 'POST',
+ credentials: 'same-origin',
+ body: JSON.stringify( {
+ nonce: config.scriptData.ajax.approve_order.nonce,
+ order_id: data.orderID,
+ funding_source: window.ppcpFundingSource ?? 'paypal',
+ } ),
+ }
+ );
+
+ const json = await res.json();
+
+ if ( ! json.success ) {
+ if (
+ typeof actions !== 'undefined' &&
+ typeof actions.restart !== 'undefined'
+ ) {
+ return actions.restart();
+ }
+ if ( json.data?.message ) {
+ throw new Error( json.data.message );
+ }
+
+ throw new Error( config.scriptData.labels.error.generic );
+ }
+
+ if ( ! shouldskipFinalConfirmation() ) {
+ location.href = getCheckoutRedirectUrl();
+ } else {
+ setGotoContinuationOnError( true );
+ enforcePaymentMethodForCart();
+ onSubmit();
+ }
+ } catch ( err ) {
+ console.error( err );
+
+ onError( err.message );
+
+ onClose();
+
+ throw err;
+ }
+};
+
+export const createSubscription = async ( data, actions, config ) => {
+ let planId = config.scriptData.subscription_plan_id;
+ if (
+ config.scriptData.variable_paypal_subscription_variation_from_cart !==
+ ''
+ ) {
+ planId =
+ config.scriptData.variable_paypal_subscription_variation_from_cart;
+ }
+
+ return actions.subscription.create( {
+ plan_id: planId,
+ } );
+};
+
+export const handleApproveSubscription = async (
+ data,
+ actions,
+ config,
+ shouldHandleShippingInPayPal,
+ shippingData,
+ setPaypalOrder,
+ shouldskipFinalConfirmation,
+ getCheckoutRedirectUrl,
+ setGotoContinuationOnError,
+ enforcePaymentMethodForCart,
+ onSubmit,
+ onError,
+ onClose
+) => {
+ try {
+ const subscription = await actions.subscription.get();
+
+ if ( subscription ) {
+ const addresses = paypalSubscriptionToWcAddresses( subscription );
+
+ const promises = [
+ // save address on server
+ wp.data.dispatch( 'wc/store/cart' ).updateCustomerData( {
+ billing_address: addresses.billingAddress,
+ shipping_address: addresses.shippingAddress,
+ } ),
+ ];
+ if ( shouldHandleShippingInPayPal() ) {
+ // set address in UI
+ promises.push(
+ wp.data
+ .dispatch( 'wc/store/cart' )
+ .setBillingAddress( addresses.billingAddress )
+ );
+ if ( shippingData.needsShipping ) {
+ promises.push(
+ wp.data
+ .dispatch( 'wc/store/cart' )
+ .setShippingAddress( addresses.shippingAddress )
+ );
+ }
+ }
+ await Promise.all( promises );
+ }
+
+ setPaypalOrder( subscription );
+
+ const res = await fetch(
+ config.scriptData.ajax.approve_subscription.endpoint,
+ {
+ method: 'POST',
+ credentials: 'same-origin',
+ body: JSON.stringify( {
+ nonce: config.scriptData.ajax.approve_subscription.nonce,
+ order_id: data.orderID,
+ subscription_id: data.subscriptionID,
+ } ),
+ }
+ );
+
+ const json = await res.json();
+
+ if ( ! json.success ) {
+ if (
+ typeof actions !== 'undefined' &&
+ typeof actions.restart !== 'undefined'
+ ) {
+ return actions.restart();
+ }
+ if ( json.data?.message ) {
+ throw new Error( json.data.message );
+ }
+
+ throw new Error( config.scriptData.labels.error.generic );
+ }
+
+ if ( ! shouldskipFinalConfirmation() ) {
+ location.href = getCheckoutRedirectUrl();
+ } else {
+ setGotoContinuationOnError( true );
+ enforcePaymentMethodForCart();
+ onSubmit();
+ }
+ } catch ( err ) {
+ console.error( err );
+
+ onError( err.message );
+
+ onClose();
+
+ throw err;
+ }
+};
+
+export const createVaultSetupToken = async ( config ) => {
+ return fetch( config.scriptData.ajax.create_setup_token.endpoint, {
+ method: 'POST',
+ headers: {
+ 'Content-Type': 'application/json',
+ },
+ body: JSON.stringify( {
+ nonce: config.scriptData.ajax.create_setup_token.nonce,
+ payment_method: 'ppcp-gateway',
+ } ),
+ } )
+ .then( ( response ) => response.json() )
+ .then( ( result ) => {
+ return result.data.id;
+ } )
+ .catch( ( err ) => {
+ console.error( err );
+ } );
+};
+
+export const onApproveSavePayment = async (
+ vaultSetupToken,
+ config,
+ onSubmit
+) => {
+ let endpoint =
+ config.scriptData.ajax.create_payment_token_for_guest.endpoint;
+ let bodyContent = {
+ nonce: config.scriptData.ajax.create_payment_token_for_guest.nonce,
+ vault_setup_token: vaultSetupToken,
+ };
+
+ if ( config.scriptData.user.is_logged_in ) {
+ endpoint = config.scriptData.ajax.create_payment_token.endpoint;
+
+ bodyContent = {
+ nonce: config.scriptData.ajax.create_payment_token.nonce,
+ vault_setup_token: vaultSetupToken,
+ is_free_trial_cart: config.scriptData.is_free_trial_cart,
+ };
+ }
+
+ const response = await fetch( endpoint, {
+ method: 'POST',
+ credentials: 'same-origin',
+ headers: {
+ 'Content-Type': 'application/json',
+ },
+ body: JSON.stringify( bodyContent ),
+ } );
+
+ const result = await response.json();
+ if ( result.success === true ) {
+ onSubmit();
+ }
+
+ console.error( result );
+};
diff --git a/modules/ppcp-blocks/src/AdvancedCardPaymentMethod.php b/modules/ppcp-blocks/src/AdvancedCardPaymentMethod.php
index c52d7e601..222d53e22 100644
--- a/modules/ppcp-blocks/src/AdvancedCardPaymentMethod.php
+++ b/modules/ppcp-blocks/src/AdvancedCardPaymentMethod.php
@@ -97,11 +97,16 @@ class AdvancedCardPaymentMethod extends AbstractPaymentMethodType {
wp_register_script(
'ppcp-advanced-card-checkout-block',
trailingslashit( $this->module_url ) . 'assets/js/advanced-card-checkout-block.js',
- array(),
+ array( 'wp-i18n' ),
$this->version,
true
);
+ wp_set_script_translations(
+ 'ppcp-advanced-card-checkout-block',
+ 'woocommerce-paypal-payments'
+ );
+
return array( 'ppcp-advanced-card-checkout-block' );
}
diff --git a/modules/ppcp-button/src/Assets/SmartButton.php b/modules/ppcp-button/src/Assets/SmartButton.php
index a08c20b27..fd1b93404 100644
--- a/modules/ppcp-button/src/Assets/SmartButton.php
+++ b/modules/ppcp-button/src/Assets/SmartButton.php
@@ -1910,7 +1910,7 @@ document.querySelector("#payment").before(document.querySelector(".ppcp-messages
$in_stock = $product->is_in_stock();
- if ( $product->is_type( 'variable' ) ) {
+ if ( ! $in_stock && $product->is_type( 'variable' ) ) {
/**
* The method is defined in WC_Product_Variable class.
*
diff --git a/modules/ppcp-onboarding/resources/js/onboarding.js b/modules/ppcp-onboarding/resources/js/onboarding.js
index 5a6ab333a..06197afd6 100644
--- a/modules/ppcp-onboarding/resources/js/onboarding.js
+++ b/modules/ppcp-onboarding/resources/js/onboarding.js
@@ -345,6 +345,10 @@ window.ppcp_onboarding_productionCallback = function ( ...args ) {
const sandboxSwitchElement = document.querySelector( '#ppcp-sandbox_on' );
+ sandboxSwitchElement?.addEventListener( 'click', () => {
+ document.querySelector( '.woocommerce-save-button' )?.removeAttribute( 'disabled' );
+ });
+
const validate = () => {
const selectors = sandboxSwitchElement.checked
? sandboxCredentialElementsSelectors
diff --git a/modules/ppcp-save-payment-methods/src/Endpoint/CreatePaymentToken.php b/modules/ppcp-save-payment-methods/src/Endpoint/CreatePaymentToken.php
index 434a08925..b89d17e53 100644
--- a/modules/ppcp-save-payment-methods/src/Endpoint/CreatePaymentToken.php
+++ b/modules/ppcp-save-payment-methods/src/Endpoint/CreatePaymentToken.php
@@ -96,7 +96,7 @@ class CreatePaymentToken implements EndpointInterface {
$customer_id = get_user_meta( get_current_user_id(), '_ppcp_target_customer_id', true );
- $result = $this->payment_method_tokens_endpoint->create_payment_token( $payment_source, $customer_id );
+ $result = $this->payment_method_tokens_endpoint->create_payment_token( $payment_source, (string) $customer_id );
if ( is_user_logged_in() && isset( $result->customer->id ) ) {
$current_user_id = get_current_user_id();
diff --git a/modules/ppcp-save-payment-methods/src/Endpoint/CreateSetupToken.php b/modules/ppcp-save-payment-methods/src/Endpoint/CreateSetupToken.php
index 6952feb43..0b53f0828 100644
--- a/modules/ppcp-save-payment-methods/src/Endpoint/CreateSetupToken.php
+++ b/modules/ppcp-save-payment-methods/src/Endpoint/CreateSetupToken.php
@@ -105,7 +105,7 @@ class CreateSetupToken implements EndpointInterface {
$customer_id = get_user_meta( get_current_user_id(), '_ppcp_target_customer_id', true );
- $result = $this->payment_method_tokens_endpoint->setup_tokens( $payment_source, $customer_id );
+ $result = $this->payment_method_tokens_endpoint->setup_tokens( $payment_source, (string) $customer_id );
wp_send_json_success( $result );
return true;
diff --git a/modules/ppcp-save-payment-methods/src/SavePaymentMethodsModule.php b/modules/ppcp-save-payment-methods/src/SavePaymentMethodsModule.php
index c76162193..c5a8776d0 100644
--- a/modules/ppcp-save-payment-methods/src/SavePaymentMethodsModule.php
+++ b/modules/ppcp-save-payment-methods/src/SavePaymentMethodsModule.php
@@ -66,396 +66,382 @@ class SavePaymentMethodsModule implements ServiceModule, ExtendingModule, Execut
add_action(
'woocommerce_paypal_payments_gateway_migrate_on_update',
function() use ( $c ) {
+ $settings = $c->get( 'wcgateway.settings' );
+ assert( $settings instanceof Settings );
+
$billing_agreements_endpoint = $c->get( 'api.endpoint.billing-agreements' );
assert( $billing_agreements_endpoint instanceof BillingAgreementsEndpoint );
-
$reference_transaction_enabled = $billing_agreements_endpoint->reference_transaction_enabled();
if ( $reference_transaction_enabled !== true ) {
- $c->get( 'wcgateway.settings' )->set( 'vault_enabled', false );
- $c->get( 'wcgateway.settings' )->persist();
+ $settings->set( 'vault_enabled', false );
+ $settings->persist();
}
}
);
- add_filter(
- 'woocommerce_paypal_payments_localized_script_data',
- function( array $localized_script_data ) use ( $c ) {
- if ( ! self::vault_enabled( $c ) ) {
- return $localized_script_data;
- }
- $subscriptions_helper = $c->get( 'wc-subscriptions.helper' );
- assert( $subscriptions_helper instanceof SubscriptionHelper );
- if ( ! is_user_logged_in() && ! $subscriptions_helper->cart_contains_subscription() ) {
- return $localized_script_data;
- }
-
- $api = $c->get( 'api.user-id-token' );
- assert( $api instanceof UserIdToken );
-
- $logger = $c->get( 'woocommerce.logger.woocommerce' );
- assert( $logger instanceof LoggerInterface );
-
- return $this->add_id_token_to_script_data( $api, $logger, $localized_script_data );
- }
- );
-
- // Adds attributes needed to save payment method.
- add_filter(
- 'ppcp_create_order_request_body_data',
- function( array $data, string $payment_method, array $request_data ) use ( $c ): array {
- if ( ! self::vault_enabled( $c ) ) {
- return $data;
- }
- if ( $payment_method === CreditCardGateway::ID ) {
- $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 ( $payment_method === PayPalGateway::ID ) {
- $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 ),
- ),
- ),
- ),
- );
- }
- }
-
- return $data;
- },
- 10,
- 3
- );
-
- add_action(
- 'woocommerce_paypal_payments_after_order_processor',
- function( WC_Order $wc_order, Order $order ) use ( $c ) {
- if ( ! self::vault_enabled( $c ) ) {
- return;
- }
- $payment_source = $order->payment_source();
- assert( $payment_source instanceof PaymentSource );
-
- $payment_vault_attributes = $payment_source->properties()->attributes->vault ?? null;
- if ( $payment_vault_attributes ) {
- $customer_id = $payment_vault_attributes->customer->id ?? '';
- $token_id = $payment_vault_attributes->id ?? '';
- if ( ! $customer_id || ! $token_id ) {
- return;
- }
-
- update_user_meta( $wc_order->get_customer_id(), '_ppcp_target_customer_id', $customer_id );
-
- $wc_payment_tokens = $c->get( 'vaulting.wc-payment-tokens' );
- assert( $wc_payment_tokens instanceof WooCommercePaymentTokens );
-
- if ( $wc_order->get_payment_method() === CreditCardGateway::ID ) {
- $token = new \WC_Payment_Token_CC();
- $token->set_token( $token_id );
- $token->set_user_id( $wc_order->get_customer_id() );
- $token->set_gateway_id( CreditCardGateway::ID );
-
- $token->set_last4( $payment_source->properties()->last_digits ?? '' );
- $expiry = explode( '-', $payment_source->properties()->expiry ?? '' );
- $token->set_expiry_year( $expiry[0] ?? '' );
- $token->set_expiry_month( $expiry[1] ?? '' );
- $token->set_card_type( $payment_source->properties()->brand ?? '' );
-
- $token->save();
- }
-
- if ( $wc_order->get_payment_method() === PayPalGateway::ID ) {
- switch ( $payment_source->name() ) {
- case 'venmo':
- $wc_payment_tokens->create_payment_token_venmo(
- $wc_order->get_customer_id(),
- $token_id,
- $payment_source->properties()->email_address ?? ''
- );
- break;
- case 'apple_pay':
- $wc_payment_tokens->create_payment_token_applepay(
- $wc_order->get_customer_id(),
- $token_id
- );
- break;
- case 'paypal':
- default:
- $wc_payment_tokens->create_payment_token_paypal(
- $wc_order->get_customer_id(),
- $token_id,
- $payment_source->properties()->email_address ?? ''
- );
- break;
- }
- }
- }
- },
- 10,
- 2
- );
-
- add_filter(
- 'woocommerce_paypal_payments_disable_add_payment_method',
- function ( bool $value ) use ( $c ): bool {
- if ( ! self::vault_enabled( $c ) ) {
- return $value;
- }
- return false;
- }
- );
-
- add_filter(
- 'woocommerce_paypal_payments_should_render_card_custom_fields',
- function ( bool $value ) use ( $c ): bool {
- if ( ! self::vault_enabled( $c ) ) {
- return $value;
- }
- return false;
- }
- );
-
add_action(
- 'wp_enqueue_scripts',
- function() use ( $c ) {
- if ( ! is_user_logged_in() || ! ( $this->is_add_payment_method_page() || $this->is_subscription_change_payment_method_page() ) || ! self::vault_enabled( $c ) ) {
- return;
+ 'after_setup_theme',
+ function () use ( $c ) {
+ $settings = $c->get( 'wcgateway.settings' );
+ if (
+ ( ! $settings->has( 'vault_enabled' ) || ! $settings->get( 'vault_enabled' ) )
+ && ( ! $settings->has( 'vault_enabled_dcc' ) || ! $settings->get( 'vault_enabled_dcc' ) )
+ ) {
+ return true;
}
- $module_url = $c->get( 'save-payment-methods.module.url' );
- wp_enqueue_script(
- 'ppcp-add-payment-method',
- untrailingslashit( $module_url ) . '/assets/js/add-payment-method.js',
- array( 'jquery' ),
- $c->get( 'ppcp.asset-version' ),
- true
+ add_filter(
+ 'woocommerce_paypal_payments_localized_script_data',
+ function ( array $localized_script_data ) use ( $c ) {
+ $subscriptions_helper = $c->get( 'wc-subscriptions.helper' );
+ assert( $subscriptions_helper instanceof SubscriptionHelper );
+ if ( ! is_user_logged_in() && ! $subscriptions_helper->cart_contains_subscription() ) {
+ return $localized_script_data;
+ }
+
+ $api = $c->get( 'api.user-id-token' );
+ assert( $api instanceof UserIdToken );
+
+ $logger = $c->get( 'woocommerce.logger.woocommerce' );
+ assert( $logger instanceof LoggerInterface );
+
+ return $this->add_id_token_to_script_data( $api, $logger, $localized_script_data );
+ }
);
- $api = $c->get( 'api.user-id-token' );
- assert( $api instanceof UserIdToken );
+ // Adds attributes needed to save payment method.
+ add_filter(
+ 'ppcp_create_order_request_body_data',
+ function ( array $data, string $payment_method, array $request_data ) use ( $c ): array {
+ $settings = $c->get( 'wcgateway.settings' );
+ assert( $settings instanceof Settings );
+ if ( $payment_method === CreditCardGateway::ID ) {
+ if ( ! $settings->has( 'vault_enabled_dcc' ) || ! $settings->get( 'vault_enabled_dcc' ) ) {
+ return $data;
+ }
- try {
- $target_customer_id = '';
- if ( is_user_logged_in() ) {
- $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 );
+ $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 ( $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 ),
+ ),
+ ),
+ ),
+ );
+ }
+ }
+
+ return $data;
+ },
+ 10,
+ 3
+ );
+
+ add_action(
+ 'woocommerce_paypal_payments_after_order_processor',
+ function ( WC_Order $wc_order, Order $order ) use ( $c ) {
+ $payment_source = $order->payment_source();
+ assert( $payment_source instanceof PaymentSource );
+
+ $payment_vault_attributes = $payment_source->properties()->attributes->vault ?? null;
+ if ( $payment_vault_attributes ) {
+ $customer_id = $payment_vault_attributes->customer->id ?? '';
+ $token_id = $payment_vault_attributes->id ?? '';
+ if ( ! $customer_id || ! $token_id ) {
+ return;
+ }
+
+ update_user_meta( $wc_order->get_customer_id(), '_ppcp_target_customer_id', $customer_id );
+
+ $wc_payment_tokens = $c->get( 'vaulting.wc-payment-tokens' );
+ assert( $wc_payment_tokens instanceof WooCommercePaymentTokens );
+
+ if ( $wc_order->get_payment_method() === CreditCardGateway::ID ) {
+ $token = new \WC_Payment_Token_CC();
+ $token->set_token( $token_id );
+ $token->set_user_id( $wc_order->get_customer_id() );
+ $token->set_gateway_id( CreditCardGateway::ID );
+
+ $token->set_last4( $payment_source->properties()->last_digits ?? '' );
+ $expiry = explode( '-', $payment_source->properties()->expiry ?? '' );
+ $token->set_expiry_year( $expiry[0] ?? '' );
+ $token->set_expiry_month( $expiry[1] ?? '' );
+ $token->set_card_type( $payment_source->properties()->brand ?? '' );
+
+ $token->save();
+ }
+
+ if ( $wc_order->get_payment_method() === PayPalGateway::ID ) {
+ switch ( $payment_source->name() ) {
+ case 'venmo':
+ $wc_payment_tokens->create_payment_token_venmo(
+ $wc_order->get_customer_id(),
+ $token_id,
+ $payment_source->properties()->email_address ?? ''
+ );
+ break;
+ case 'apple_pay':
+ $wc_payment_tokens->create_payment_token_applepay(
+ $wc_order->get_customer_id(),
+ $token_id
+ );
+ break;
+ case 'paypal':
+ default:
+ $wc_payment_tokens->create_payment_token_paypal(
+ $wc_order->get_customer_id(),
+ $token_id,
+ $payment_source->properties()->email_address ?? ''
+ );
+ break;
+ }
+ }
+ }
+ },
+ 10,
+ 2
+ );
+
+ add_filter( 'woocommerce_paypal_payments_disable_add_payment_method', '__return_false' );
+ add_filter( 'woocommerce_paypal_payments_should_render_card_custom_fields', '__return_false' );
+
+ add_action(
+ 'wp_enqueue_scripts',
+ function () use ( $c ) {
+ if ( ! is_user_logged_in() || ! ( $this->is_add_payment_method_page() || $this->is_subscription_change_payment_method_page() ) ) {
+ return;
+ }
+
+ $module_url = $c->get( 'save-payment-methods.module.url' );
+ wp_enqueue_script(
+ 'ppcp-add-payment-method',
+ untrailingslashit( $module_url ) . '/assets/js/add-payment-method.js',
+ array( 'jquery' ),
+ $c->get( 'ppcp.asset-version' ),
+ true
+ );
+
+ $api = $c->get( 'api.user-id-token' );
+ assert( $api instanceof UserIdToken );
+
+ try {
+ $target_customer_id = '';
+ if ( is_user_logged_in() ) {
+ $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 );
+ }
+ }
+
+ $id_token = $api->id_token( $target_customer_id );
+
+ $settings = $c->get( 'wcgateway.settings' );
+ assert( $settings instanceof Settings );
+
+ $verification_method =
+ $settings->has( '3d_secure_contingency' )
+ ? apply_filters( 'woocommerce_paypal_payments_three_d_secure_contingency', $settings->get( '3d_secure_contingency' ) )
+ : '';
+
+ $change_payment_method = wc_clean( wp_unslash( $_GET['change_payment_method'] ?? '' ) ); // phpcs:ignore WordPress.Security.NonceVerification
+
+ wp_localize_script(
+ 'ppcp-add-payment-method',
+ 'ppcp_add_payment_method',
+ array(
+ 'client_id' => $c->get( 'button.client_id' ),
+ 'merchant_id' => $c->get( 'api.merchant_id' ),
+ 'id_token' => $id_token,
+ 'payment_methods_page' => wc_get_account_endpoint_url( 'payment-methods' ),
+ 'view_subscriptions_page' => wc_get_account_endpoint_url( 'view-subscription' ),
+ 'is_subscription_change_payment_page' => $this->is_subscription_change_payment_method_page(),
+ 'subscription_id_to_change_payment' => $this->is_subscription_change_payment_method_page() ? (int) $change_payment_method : 0,
+ 'error_message' => __( 'Could not save payment method.', 'woocommerce-paypal-payments' ),
+ 'verification_method' => $verification_method,
+ 'ajax' => array(
+ 'create_setup_token' => array(
+ 'endpoint' => \WC_AJAX::get_endpoint( CreateSetupToken::ENDPOINT ),
+ 'nonce' => wp_create_nonce( CreateSetupToken::nonce() ),
+ ),
+ 'create_payment_token' => array(
+ 'endpoint' => \WC_AJAX::get_endpoint( CreatePaymentToken::ENDPOINT ),
+ 'nonce' => wp_create_nonce( CreatePaymentToken::nonce() ),
+ ),
+ 'subscription_change_payment_method' => array(
+ 'endpoint' => \WC_AJAX::get_endpoint( SubscriptionChangePaymentMethod::ENDPOINT ),
+ 'nonce' => wp_create_nonce( SubscriptionChangePaymentMethod::nonce() ),
+ ),
+ ),
+ 'labels' => array(
+ 'error' => array(
+ 'generic' => __(
+ 'Something went wrong. Please try again or choose another payment source.',
+ 'woocommerce-paypal-payments'
+ ),
+ ),
+ ),
+ )
+ );
+ } catch ( RuntimeException $exception ) {
+ $logger = $c->get( 'woocommerce.logger.woocommerce' );
+ assert( $logger instanceof LoggerInterface );
+
+ $error = $exception->getMessage();
+ if ( is_a( $exception, PayPalApiException::class ) ) {
+ $error = $exception->get_details( $error );
+ }
+
+ $logger->error( $error );
}
}
+ );
- $id_token = $api->id_token( $target_customer_id );
+ add_action(
+ 'woocommerce_add_payment_method_form_bottom',
+ function () {
+ if ( ! is_user_logged_in() || ! is_add_payment_method_page() ) {
+ return;
+ }
- $settings = $c->get( 'wcgateway.settings' );
- assert( $settings instanceof Settings );
-
- $verification_method =
- $settings->has( '3d_secure_contingency' )
- ? apply_filters( 'woocommerce_paypal_payments_three_d_secure_contingency', $settings->get( '3d_secure_contingency' ) )
- : '';
-
- $change_payment_method = wc_clean( wp_unslash( $_GET['change_payment_method'] ?? '' ) ); // phpcs:ignore WordPress.Security.NonceVerification
-
- wp_localize_script(
- 'ppcp-add-payment-method',
- 'ppcp_add_payment_method',
- array(
- 'client_id' => $c->get( 'button.client_id' ),
- 'merchant_id' => $c->get( 'api.merchant_id' ),
- 'id_token' => $id_token,
- 'payment_methods_page' => wc_get_account_endpoint_url( 'payment-methods' ),
- 'view_subscriptions_page' => wc_get_account_endpoint_url( 'view-subscription' ),
- 'is_subscription_change_payment_page' => $this->is_subscription_change_payment_method_page(),
- 'subscription_id_to_change_payment' => $this->is_subscription_change_payment_method_page() ? (int) $change_payment_method : 0,
- 'error_message' => __( 'Could not save payment method.', 'woocommerce-paypal-payments' ),
- 'verification_method' => $verification_method,
- 'ajax' => array(
- 'create_setup_token' => array(
- 'endpoint' => \WC_AJAX::get_endpoint( CreateSetupToken::ENDPOINT ),
- 'nonce' => wp_create_nonce( CreateSetupToken::nonce() ),
- ),
- 'create_payment_token' => array(
- 'endpoint' => \WC_AJAX::get_endpoint( CreatePaymentToken::ENDPOINT ),
- 'nonce' => wp_create_nonce( CreatePaymentToken::nonce() ),
- ),
- 'subscription_change_payment_method' => array(
- 'endpoint' => \WC_AJAX::get_endpoint( SubscriptionChangePaymentMethod::ENDPOINT ),
- 'nonce' => wp_create_nonce( SubscriptionChangePaymentMethod::nonce() ),
- ),
- ),
- 'labels' => array(
- 'error' => array(
- 'generic' => __(
- 'Something went wrong. Please try again or choose another payment source.',
- 'woocommerce-paypal-payments'
- ),
- ),
- ),
- )
- );
- } catch ( RuntimeException $exception ) {
- $logger = $c->get( 'woocommerce.logger.woocommerce' );
- assert( $logger instanceof LoggerInterface );
-
- $error = $exception->getMessage();
- if ( is_a( $exception, PayPalApiException::class ) ) {
- $error = $exception->get_details( $error );
+ echo '
';
}
+ );
- $logger->error( $error );
- }
- }
- );
+ add_action(
+ 'wc_ajax_' . CreateSetupToken::ENDPOINT,
+ static function () use ( $c ) {
+ $endpoint = $c->get( 'save-payment-methods.endpoint.create-setup-token' );
+ assert( $endpoint instanceof CreateSetupToken );
- add_action(
- 'woocommerce_add_payment_method_form_bottom',
- function () use ( $c ) {
- if ( ! is_user_logged_in() || ! is_add_payment_method_page() || ! self::vault_enabled( $c ) ) {
- return;
- }
-
- echo '
';
- }
- );
-
- add_action(
- 'wc_ajax_' . CreateSetupToken::ENDPOINT,
- static function () use ( $c ) {
- if ( ! self::vault_enabled( $c ) ) {
- return;
- }
- $endpoint = $c->get( 'save-payment-methods.endpoint.create-setup-token' );
- assert( $endpoint instanceof CreateSetupToken );
-
- $endpoint->handle_request();
- }
- );
-
- add_action(
- 'wc_ajax_' . CreatePaymentToken::ENDPOINT,
- static function () use ( $c ) {
- if ( ! self::vault_enabled( $c ) ) {
- return;
- }
- $endpoint = $c->get( 'save-payment-methods.endpoint.create-payment-token' );
- assert( $endpoint instanceof CreatePaymentToken );
-
- $endpoint->handle_request();
- }
- );
-
- add_action(
- 'wc_ajax_' . CreatePaymentTokenForGuest::ENDPOINT,
- static function () use ( $c ) {
- if ( ! self::vault_enabled( $c ) ) {
- return;
- }
- $endpoint = $c->get( 'save-payment-methods.endpoint.create-payment-token-for-guest' );
- assert( $endpoint instanceof CreatePaymentTokenForGuest );
-
- $endpoint->handle_request();
- }
- );
-
- add_action(
- 'woocommerce_paypal_payments_before_delete_payment_token',
- function( string $token_id ) use ( $c ) {
- if ( ! self::vault_enabled( $c ) ) {
- return;
- }
- try {
- $endpoint = $c->get( 'api.endpoint.payment-tokens' );
- assert( $endpoint instanceof PaymentTokensEndpoint );
-
- $endpoint->delete( $token_id );
- } catch ( RuntimeException $exception ) {
- $logger = $c->get( 'woocommerce.logger.woocommerce' );
- assert( $logger instanceof LoggerInterface );
-
- $error = $exception->getMessage();
- if ( is_a( $exception, PayPalApiException::class ) ) {
- $error = $exception->get_details( $error );
+ $endpoint->handle_request();
}
+ );
- $logger->error( $error );
- }
- }
- );
+ add_action(
+ 'wc_ajax_' . CreatePaymentToken::ENDPOINT,
+ static function () use ( $c ) {
+ $endpoint = $c->get( 'save-payment-methods.endpoint.create-payment-token' );
+ assert( $endpoint instanceof CreatePaymentToken );
- add_filter(
- 'woocommerce_paypal_payments_credit_card_gateway_supports',
- function( array $supports ) use ( $c ): array {
- if ( ! self::vault_enabled( $c ) ) {
- return $supports;
- }
- $supports[] = 'tokenization';
- $supports[] = 'add_payment_method';
+ $endpoint->handle_request();
+ }
+ );
- return $supports;
- }
- );
+ add_action(
+ 'wc_ajax_' . CreatePaymentTokenForGuest::ENDPOINT,
+ static function () use ( $c ) {
+ $endpoint = $c->get( 'save-payment-methods.endpoint.create-payment-token-for-guest' );
+ assert( $endpoint instanceof CreatePaymentTokenForGuest );
- add_filter(
- 'woocommerce_paypal_payments_save_payment_methods_eligible',
- function( bool $value ) use ( $c ): bool {
- if ( ! self::vault_enabled( $c ) ) {
- return $value;
- }
- return true;
+ $endpoint->handle_request();
+ }
+ );
+
+ add_action(
+ 'woocommerce_paypal_payments_before_delete_payment_token',
+ function( string $token_id ) use ( $c ) {
+ try {
+ $endpoint = $c->get( 'api.endpoint.payment-tokens' );
+ assert( $endpoint instanceof PaymentTokensEndpoint );
+
+ $endpoint->delete( $token_id );
+ } catch ( RuntimeException $exception ) {
+ $logger = $c->get( 'woocommerce.logger.woocommerce' );
+ assert( $logger instanceof LoggerInterface );
+
+ $error = $exception->getMessage();
+ if ( is_a( $exception, PayPalApiException::class ) ) {
+ $error = $exception->get_details( $error );
+ }
+
+ $logger->error( $error );
+ }
+ }
+ );
+
+ add_filter(
+ 'woocommerce_paypal_payments_credit_card_gateway_supports',
+ function( array $supports ) use ( $c ): array {
+ $settings = $c->get( 'wcgateway.settings' );
+ assert( $settings instanceof ContainerInterface );
+
+ if ( $settings->has( 'vault_enabled_dcc' ) && $settings->get( 'vault_enabled_dcc' ) ) {
+ $supports[] = 'tokenization';
+ $supports[] = 'add_payment_method';
+ }
+
+ return $supports;
+ }
+ );
+
+ add_filter(
+ 'woocommerce_paypal_payments_save_payment_methods_eligible',
+ function() {
+ return true;
+ }
+ );
}
);
@@ -502,24 +488,4 @@ class SavePaymentMethodsModule implements ServiceModule, ExtendingModule, Execut
return $localized_script_data;
}
-
- /**
- * Checks whether the vault functionality is enabled based on configuration settings.
- *
- * @param ContainerInterface $container The dependency injection container from which settings can be retrieved.
- *
- * @return bool Returns true if either 'vault_enabled' or 'vault_enabled_dcc' settings are enabled; otherwise, false.
- */
- private static function vault_enabled( ContainerInterface $container ): bool {
- $settings = $container->get( 'wcgateway.settings' );
- assert( $settings instanceof Settings );
-
- if (
- ( ! $settings->has( 'vault_enabled' ) || ! $settings->get( 'vault_enabled' ) )
- && ( ! $settings->has( 'vault_enabled_dcc' ) || ! $settings->get( 'vault_enabled_dcc' ) )
- ) {
- return false;
- }
- return true;
- }
}
diff --git a/modules/ppcp-settings/resources/css/components/screens/_settings.scss b/modules/ppcp-settings/resources/css/components/screens/_settings.scss
index de3f778b2..b2f587d6b 100644
--- a/modules/ppcp-settings/resources/css/components/screens/_settings.scss
+++ b/modules/ppcp-settings/resources/css/components/screens/_settings.scss
@@ -97,6 +97,8 @@
span {
font-weight: 500;
}
+
+ margin-top:24px;
}
}
diff --git a/modules/ppcp-settings/resources/js/Components/ReusableComponents/Icons.js b/modules/ppcp-settings/resources/js/Components/ReusableComponents/Icons.js
index 3344c3ceb..ddf3606dc 100644
--- a/modules/ppcp-settings/resources/js/Components/ReusableComponents/Icons.js
+++ b/modules/ppcp-settings/resources/js/Components/ReusableComponents/Icons.js
@@ -1 +1,3 @@
export { default as openSignup } from './Icons/open-signup';
+export const NOTIFICATION_SUCCESS = '✔️';
+export const NOTIFICATION_ERROR = '❌';
diff --git a/modules/ppcp-settings/resources/js/Components/ReusableComponents/PricingTitleBadge.js b/modules/ppcp-settings/resources/js/Components/ReusableComponents/PricingTitleBadge.js
index 33825d96b..5603d10e4 100644
--- a/modules/ppcp-settings/resources/js/Components/ReusableComponents/PricingTitleBadge.js
+++ b/modules/ppcp-settings/resources/js/Components/ReusableComponents/PricingTitleBadge.js
@@ -5,26 +5,29 @@ import { countryPriceInfo } from '../../utils/countryPriceInfo';
import { formatPrice } from '../../utils/formatPrice';
import TitleBadge, { TITLE_BADGE_INFO } from './TitleBadge';
-const getFixedAmount = ( currency, priceList ) => {
- if ( priceList[ currency ] ) {
- return formatPrice( priceList[ currency ], currency );
+const getFixedAmount = ( currency, priceList, itemFixedAmount ) => {
+ if ( priceList[ currency ] ) {
+ const sum = priceList[ currency ] + itemFixedAmount;
+ return formatPrice( sum, currency );
}
const [ defaultCurrency, defaultPrice ] = Object.entries( priceList )[ 0 ];
-
- return formatPrice( defaultPrice, defaultCurrency );
+ const sum = defaultPrice + itemFixedAmount;
+ return formatPrice( sum, defaultCurrency );
};
const PricingTitleBadge = ( { item } ) => {
- const { storeCountry } = CommonHooks.useWooSettings();
+ const { storeCountry, storeCurrency } = CommonHooks.useWooSettings();
const infos = countryPriceInfo[ storeCountry ];
+ const itemKey = item.split(' ')[0]; // Extract the first word, fastlane has more than one
- if ( ! infos || ! infos[ item ] ) {
+ if ( ! infos || ! infos[ itemKey ] ) {
return null;
}
- const percentage = infos[ item ].toFixed( 2 );
- const fixedAmount = getFixedAmount( storeCountry, infos.fixedFee );
+ const percentage = typeof infos[itemKey] === 'number' ? infos[itemKey].toFixed(2) : infos[itemKey]['percentage'].toFixed(2);
+ const itemFixedAmount = infos[itemKey]['fixedFee'] ? infos[itemKey]['fixedFee'] : 0;
+ const fixedAmount = getFixedAmount( storeCurrency, infos.fixedFee, itemFixedAmount );
const label = sprintf(
__( 'from %1$s%% + %2$s', 'woocommerce-paypal-payments' ),
diff --git a/modules/ppcp-settings/resources/js/Components/ReusableComponents/SettingsBlocks/ButtonSettingsBlock.js b/modules/ppcp-settings/resources/js/Components/ReusableComponents/SettingsBlocks/ButtonSettingsBlock.js
index e66223ba5..6bc1521ee 100644
--- a/modules/ppcp-settings/resources/js/Components/ReusableComponents/SettingsBlocks/ButtonSettingsBlock.js
+++ b/modules/ppcp-settings/resources/js/Components/ReusableComponents/SettingsBlocks/ButtonSettingsBlock.js
@@ -1,6 +1,6 @@
import { Button } from '@wordpress/components';
import SettingsBlock from './SettingsBlock';
-import { Header, Title, Action, Description } from './SettingsBlockElements';
+import { Action, Description, Header, Title } from './SettingsBlockElements';
const ButtonSettingsBlock = ( { title, description, ...props } ) => (
@@ -10,6 +10,7 @@ const ButtonSettingsBlock = ( { title, description, ...props } ) => (