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

Merge branch 'trunk' into PCP-4210-features-refactor-to-use-rest-endpoints

Browse source
This commit is contained in:
carmenmaymo 2025-02-21 09:13:04 +01:00
commit 3bd2292655
No known key found for this signature in database
GPG key ID: 6023F686B0F3102E
12 changed files with 130 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -160,7 +160,7 @@ class PartnersEndpoint {
$this->failure_registry->clear_failures( FailureRegistry::SELLER_STATUS_KEY );
$status = $this->seller_status_factory->from_paypal_reponse( $json );
$status = $this->seller_status_factory->from_paypal_response( $json );
return $status;
}
}

23
modules/ppcp-api-client/src/Entity/SellerStatus.php
View file

@ -28,15 +28,23 @@ class SellerStatus {
*/
private $capabilities;
/**
* Merchant country on PayPal.
*
* @var string
*/
private string $country;
/**
* SellerStatus constructor.
*
* @param SellerStatusProduct[] $products The products.
* @param SellerStatusCapability[] $capabilities The capabilities.
* @param string $country Merchant country on PayPal.
*
* @psalm-suppress RedundantConditionGivenDocblockType
*/
public function __construct( array $products, array $capabilities ) {
public function __construct( array $products, array $capabilities, string $country = '' ) {
foreach ( $products as $key => $product ) {
if ( is_a( $product, SellerStatusProduct::class ) ) {
continue;
@ -52,6 +60,7 @@ class SellerStatus {
$this->products = $products;
$this->capabilities = $capabilities;
$this->country = $country;
}
/**
@ -73,7 +82,16 @@ class SellerStatus {
}
/**
* Returns the enitity as array.
* Returns merchant's country on PayPal.
*
* @return string
*/
public function country() : string {
return $this->country;
}
/**
* Returns the entity as array.
*
* @return array
*/
@ -95,6 +113,7 @@ class SellerStatus {
return array(
'products' => $products,
'capabilities' => $capabilities,
'country' => $this->country,
);
}
}

4
modules/ppcp-api-client/src/Factory/SellerStatusFactory.php
View file

@ -25,7 +25,7 @@ class SellerStatusFactory {
*
* @return SellerStatus
*/
public function from_paypal_reponse( \stdClass $json ) : SellerStatus {
public function from_paypal_response( \stdClass $json ) : SellerStatus {
$products = array_map(
function( $json ) : SellerStatusProduct {
$product = new SellerStatusProduct(
@ -49,6 +49,6 @@ class SellerStatusFactory {
isset( $json->capabilities ) ? (array) $json->capabilities : array()
);
return new SellerStatus( $products, $capabilities );
return new SellerStatus( $products, $capabilities, $json->country ?? '' );
}
}

5
modules/ppcp-settings/resources/js/Components/Screens/Onboarding/Steps/StepBusiness.js
View file

@ -22,8 +22,13 @@ const StepBusiness = ( {} ) => {
);
useEffect( () => {
if ( ! businessChoice ) {
return;
}
setIsCasualSeller( BUSINESS_TYPES.CASUAL_SELLER === businessChoice );
}, [ businessChoice, setIsCasualSeller ] );
const { canUseSubscriptions } = OnboardingHooks.useFlags();
const businessChoices = [
{

3
modules/ppcp-settings/resources/js/Components/Screens/Onboarding/Steps/index.js
View file

@ -36,8 +36,7 @@ const ALL_STEPS = [
id: 'methods',
title: __( 'Choose checkout options', 'woocommerce-paypal-payments' ),
StepComponent: StepPaymentMethods,
canProceed: ( { methods } ) =>
methods.areOptionalPaymentMethodsEnabled !== null,
canProceed: ( { methods } ) => methods.optionalMethods !== null,
},
{
id: 'complete',

2
modules/ppcp-settings/resources/js/utils/countryInfoLinks.js
View file

@ -24,7 +24,7 @@ export const learnMoreLinks = {
'https://www.paypal.com/uk/business/paypal-business-fees',
PayPalCheckout:
'https://www.paypal.com/uk/business/accept-payments/checkout',
PayLater:
PayInThree:
'https://www.paypal.com/uk/business/accept-payments/checkout/installments',
},
FR: {

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

@ -312,7 +312,8 @@ return array(
$container->get( 'api.env.endpoint.login-seller' ),
$container->get( 'api.repository.partner-referrals-data' ),
$container->get( 'settings.connection-state' ),
$container->get( 'woocommerce.logger.woocommerce' ),
$container->get( 'api.endpoint.partners' ),
$container->get( 'woocommerce.logger.woocommerce' )
);
},
'settings.service.sanitizer' => static function ( ContainerInterface $container ) : DataSanitizer {

22
modules/ppcp-settings/src/DTO/MerchantConnectionDTO.php
View file

@ -52,6 +52,13 @@ class MerchantConnectionDTO {
*/
public string $merchant_email = '';
/**
* Merchant's country.
*
* @var string
*/
public string $merchant_country = '';
/**
* Whether the merchant is a business or personal account.
* Possible values: ['business'|'personal'|'unknown']
@ -68,6 +75,7 @@ class MerchantConnectionDTO {
* @param string $client_secret API client secret.
* @param string $merchant_id PayPal's 13-character merchant ID.
* @param string $merchant_email Email address of the merchant account.
* @param string $merchant_country Merchant's country.
* @param string $seller_type Whether the merchant is a business or personal account.
*/
public function __construct(
@ -76,13 +84,15 @@ class MerchantConnectionDTO {
string $client_secret,
string $merchant_id,
string $merchant_email,
string $merchant_country,
string $seller_type = SellerTypeEnum::UNKNOWN
) {
$this->is_sandbox = $is_sandbox;
$this->client_id = $client_id;
$this->client_secret = $client_secret;
$this->merchant_id = $merchant_id;
$this->merchant_email = $merchant_email;
$this->seller_type = $seller_type;
$this->is_sandbox = $is_sandbox;
$this->client_id = $client_id;
$this->client_secret = $client_secret;
$this->merchant_id = $merchant_id;
$this->merchant_email = $merchant_email;
$this->merchant_country = $merchant_country;
$this->seller_type = $seller_type;
}
}

13
modules/ppcp-settings/src/Data/GeneralSettings.php
View file

@ -74,6 +74,7 @@ class GeneralSettings extends AbstractDataModel {
'sandbox_merchant' => false,
'merchant_id' => '',
'merchant_email' => '',
'merchant_country' => '',
'client_id' => '',
'client_secret' => '',
'seller_type' => 'unknown',
@ -138,6 +139,7 @@ class GeneralSettings extends AbstractDataModel {
$this->data['sandbox_merchant'] = $connection->is_sandbox;
$this->data['merchant_id'] = sanitize_text_field( $connection->merchant_id );
$this->data['merchant_email'] = sanitize_email( $connection->merchant_email );
$this->data['merchant_country'] = sanitize_text_field( $connection->merchant_country );
$this->data['client_id'] = sanitize_text_field( $connection->client_id );
$this->data['client_secret'] = sanitize_text_field( $connection->client_secret );
$this->data['seller_type'] = sanitize_text_field( $connection->seller_type );
@ -156,6 +158,7 @@ class GeneralSettings extends AbstractDataModel {
$this->data['client_secret'],
$this->data['merchant_id'],
$this->data['merchant_email'],
$this->data['merchant_country'],
$this->data['seller_type']
);
}
@ -171,6 +174,7 @@ class GeneralSettings extends AbstractDataModel {
$this->data['sandbox_merchant'] = $defaults['sandbox_merchant'];
$this->data['merchant_id'] = $defaults['merchant_id'];
$this->data['merchant_email'] = $defaults['merchant_email'];
$this->data['merchant_country'] = $defaults['merchant_country'];
$this->data['client_id'] = $defaults['client_id'];
$this->data['client_secret'] = $defaults['client_secret'];
$this->data['seller_type'] = $defaults['seller_type'];
@ -239,4 +243,13 @@ class GeneralSettings extends AbstractDataModel {
public function get_merchant_email() : string {
return $this->data['merchant_email'];
}
/**
* Gets the currently connected merchant's country.
*
* @return string
*/
public function get_merchant_country() : string {
return $this->data['merchant_country'];
}
}

53
modules/ppcp-settings/src/Service/AuthenticationManager.php
View file

@ -12,6 +12,8 @@ namespace WooCommerce\PayPalCommerce\Settings\Service;
use JsonException;
use Throwable;
use Psr\Log\LoggerInterface;
use WooCommerce\PayPalCommerce\ApiClient\Endpoint\PartnersEndpoint;
use WooCommerce\PayPalCommerce\ApiClient\Exception\PayPalApiException;
use WooCommerce\PayPalCommerce\ApiClient\Exception\RuntimeException;
use WooCommerce\PayPalCommerce\ApiClient\Authentication\PayPalBearer;
use WooCommerce\PayPalCommerce\ApiClient\Endpoint\LoginSeller;
@ -72,6 +74,13 @@ class AuthenticationManager {
*/
private ConnectionState $connection_state;
/**
* Partners endpoint.
*
* @var PartnersEndpoint
*/
private PartnersEndpoint $partners_endpoint;
/**
* Constructor.
*
@ -80,6 +89,7 @@ class AuthenticationManager {
* @param EnvironmentConfig $login_endpoint API handler to fetch merchant credentials.
* @param PartnerReferralsData $referrals_data Partner referrals data.
* @param ConnectionState $connection_state Connection state manager.
* @param PartnersEndpoint $partners_endpoint Partners endpoint.
* @param ?LoggerInterface $logger Logging instance.
*/
public function __construct(
@ -88,14 +98,16 @@ class AuthenticationManager {
EnvironmentConfig $login_endpoint,
PartnerReferralsData $referrals_data,
ConnectionState $connection_state,
PartnersEndpoint $partners_endpoint,
?LoggerInterface $logger = null
) {
$this->common_settings = $common_settings;
$this->connection_host = $connection_host;
$this->login_endpoint = $login_endpoint;
$this->referrals_data = $referrals_data;
$this->connection_state = $connection_state;
$this->logger = $logger ?: new NullLogger();
$this->common_settings = $common_settings;
$this->connection_host = $connection_host;
$this->login_endpoint = $login_endpoint;
$this->referrals_data = $referrals_data;
$this->connection_state = $connection_state;
$this->partners_endpoint = $partners_endpoint;
$this->logger = $logger ?: new NullLogger();
}
/**
@ -196,12 +208,19 @@ class AuthenticationManager {
$payee = $this->request_payee( $client_id, $client_secret, $use_sandbox );
try {
$seller_status = $this->partners_endpoint->seller_status();
} catch ( PayPalApiException $exception ) {
$seller_status = null;
}
$connection = new MerchantConnectionDTO(
$use_sandbox,
$client_id,
$client_secret,
$payee['merchant_id'],
$payee['email_address'],
! is_null( $seller_status ) ? $seller_status->country() : '',
SellerTypeEnum::BUSINESS
);
@ -267,10 +286,17 @@ class AuthenticationManager {
*/
$connection = $this->common_settings->get_merchant_data();
$connection->is_sandbox = $use_sandbox;
$connection->client_id = $credentials['client_id'];
$connection->client_secret = $credentials['client_secret'];
$connection->merchant_id = $credentials['merchant_id'];
try {
$seller_status = $this->partners_endpoint->seller_status();
} catch ( PayPalApiException $exception ) {
$seller_status = null;
}
$connection->is_sandbox = $use_sandbox;
$connection->client_id = $credentials['client_id'];
$connection->client_secret = $credentials['client_secret'];
$connection->merchant_id = $credentials['merchant_id'];
$connection->merchant_country = ! is_null( $seller_status ) ? $seller_status->country() : '';
$this->update_connection_details( $connection );
}
@ -306,6 +332,13 @@ class AuthenticationManager {
$connection->seller_type = $seller_type;
}
try {
$seller_status = $this->partners_endpoint->seller_status();
} catch ( PayPalApiException $exception ) {
$seller_status = null;
}
$connection->merchant_country = ! is_null( $seller_status ) ? $seller_status->country() : '';
$this->update_connection_details( $connection );
}

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

@ -10,6 +10,8 @@ declare( strict_types = 1 );
namespace WooCommerce\PayPalCommerce\Settings;
use WC_Payment_Gateway;
use WooCommerce\PayPalCommerce\ApiClient\Endpoint\PartnersEndpoint;
use WooCommerce\PayPalCommerce\ApiClient\Exception\PayPalApiException;
use WooCommerce\PayPalCommerce\ApiClient\Helper\DccApplies;
use WooCommerce\PayPalCommerce\Applepay\Assets\AppleProductStatus;
use WooCommerce\PayPalCommerce\Googlepay\Helper\ApmProductStatus;
@ -106,7 +108,11 @@ class SettingsModule implements ServiceModule, ExecutableModule {
)
);
wp_enqueue_script( 'ppcp-switch-settings-ui' );
wp_enqueue_script( 'ppcp-switch-settings-ui', '', array( 'wp-i18n' ), $script_asset_file['version'] );
wp_set_script_translations(
'ppcp-switch-settings-ui',
'woocommerce-paypal-payments',
);
}
);
@ -159,7 +165,11 @@ class SettingsModule implements ServiceModule, ExecutableModule {
true
);
wp_enqueue_script( 'ppcp-admin-settings' );
wp_enqueue_script( 'ppcp-admin-settings', '', array( 'wp-i18n' ), $script_asset_file['version'] );
wp_set_script_translations(
'ppcp-admin-settings',
'woocommerce-paypal-payments',
);
/**
* Require resolves.
@ -198,11 +208,14 @@ class SettingsModule implements ServiceModule, ExecutableModule {
wp_enqueue_script(
'ppcp-paylater-configurator-lib',
'https://www.paypalobjects.com/merchant-library/merchant-configurator.js',
array(),
array( 'wp-i18n' ),
$script_asset_file['version'],
true
);
wp_set_script_translations(
'ppcp-paylater-configurator-lib',
'woocommerce-paypal-payments',
);
$script_data['PcpPayLaterConfigurator'] = array(
'config' => array(),
'merchantClientId' => $settings->get( 'client_id' ),
@ -303,8 +316,7 @@ class SettingsModule implements ServiceModule, ExecutableModule {
$flags = new ConfigurationFlagsDTO();
// TODO: Get the merchant country from PayPal here!
$flags->country_code = 'US';
$flags->country_code = $general_settings->get_merchant_country();
$flags->is_business_seller = $general_settings->is_business_seller();
$flags->use_card_payments = $onboarding_profile->get_accept_card_payments();
$flags->use_subscriptions = in_array( ProductChoicesEnum::SUBSCRIPTIONS, $onboarding_profile->get_products(), true );

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

@ -1854,6 +1854,13 @@ return array(
$settings = $container->get( 'wcgateway.settings' );
assert( $settings instanceof Settings );
if ( apply_filters(
'woocommerce.feature-flags.woocommerce_paypal_payments.settings_enabled',
getenv( 'PCP_SETTINGS_ENABLED' ) === '1'
) ) {
return true;
}
return $settings->has( 'fraudnet_enabled' ) && $settings->get( 'fraudnet_enabled' );
},
'wcgateway.fraudnet-assets' => function( ContainerInterface $container ) : FraudNetAssets {