From 850bfb869a7be8fc3c2ac1934402892179038660 Mon Sep 17 00:00:00 2001
From: Philipp Stracker <p.stracker@syde.com>
Date: Wed, 12 Feb 2025 18:55:58 +0100
Subject: [PATCH 01/48] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20Rename=20function=20?=
 =?UTF-8?q?argument?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/ppcp-settings/src/Data/OnboardingProfile.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/ppcp-settings/src/Data/OnboardingProfile.php b/modules/ppcp-settings/src/Data/OnboardingProfile.php
index a2d8e6c36..ec2e40a0a 100644
--- a/modules/ppcp-settings/src/Data/OnboardingProfile.php
+++ b/modules/ppcp-settings/src/Data/OnboardingProfile.php
@@ -89,10 +89,10 @@ class OnboardingProfile extends AbstractDataModel {
 	/**
 	 * Sets the 'completed' flag.
 	 *
-	 * @param bool $step Whether the onboarding process has been completed.
+	 * @param bool $state Whether the onboarding process has been completed.
 	 */
-	public function set_completed( bool $step ) : void {
-		$this->data['completed'] = $step;
+	public function set_completed( bool $state ) : void {
+		$this->data['completed'] = $state;
 	}
 
 	/**

From 34c67bb8d1224cef30b5d7d97b8075a96fc7cf09 Mon Sep 17 00:00:00 2001
From: Philipp Stracker <p.stracker@syde.com>
Date: Wed, 12 Feb 2025 18:56:37 +0100
Subject: [PATCH 02/48] =?UTF-8?q?=E2=9C=A8=20New=20onboarding=20flag=20for?=
 =?UTF-8?q?=20=E2=80=9Csetup-done=E2=80=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/Data/OnboardingProfile.php            | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/modules/ppcp-settings/src/Data/OnboardingProfile.php b/modules/ppcp-settings/src/Data/OnboardingProfile.php
index ec2e40a0a..070d478c8 100644
--- a/modules/ppcp-settings/src/Data/OnboardingProfile.php
+++ b/modules/ppcp-settings/src/Data/OnboardingProfile.php
@@ -72,6 +72,7 @@ class OnboardingProfile extends AbstractDataModel {
 			'is_casual_seller'                     => null,
 			'are_optional_payment_methods_enabled' => null,
 			'products'                             => array(),
+			'setup_done'                           => false,
 		);
 	}
 
@@ -166,4 +167,22 @@ class OnboardingProfile extends AbstractDataModel {
 	public function get_flags() : array {
 		return $this->flags;
 	}
+
+	/**
+	 * Gets the 'setup_done' flag.
+	 *
+	 * @return bool
+	 */
+	public function is_setup_done() : bool {
+		return (bool) $this->data['setup_done'];
+	}
+
+	/**
+	 * Sets the 'setup_done' flag.
+	 *
+	 * @param bool $done Whether the onboarding process has been setup_done.
+	 */
+	public function set_setup_done( bool $done ) : void {
+		$this->data['setup_done'] = $done;
+	}
 }

From 0728f80281818599020fded6d46f548ce2274c59 Mon Sep 17 00:00:00 2001
From: Philipp Stracker <p.stracker@syde.com>
Date: Wed, 12 Feb 2025 21:06:47 +0100
Subject: [PATCH 03/48] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20Refactor=20the=20set?=
 =?UTF-8?q?tingsdata=20manager=20constructor?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/ppcp-settings/services.php            |  7 ++----
 .../src/Service/SettingsDataManager.php       | 22 ++++++++++++++-----
 2 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/modules/ppcp-settings/services.php b/modules/ppcp-settings/services.php
index e5ab98d74..9bc845589 100644
--- a/modules/ppcp-settings/services.php
+++ b/modules/ppcp-settings/services.php
@@ -249,17 +249,14 @@ return array(
 		return new DataSanitizer();
 	},
 	'settings.service.data-manager'               => static function ( ContainerInterface $container ) : SettingsDataManager {
-		$models = array(
+		return new SettingsDataManager(
 			$container->get( 'settings.data.onboarding' ),
 			$container->get( 'settings.data.general' ),
+			$container->get( 'settings.data.settings' ),
 			$container->get( 'settings.data.styling' ),
 			$container->get( 'settings.data.payment' ),
-			$container->get( 'settings.data.settings' ),
 			$container->get( 'settings.data.todos' ),
-			$container->get( 'settings.data.definition.todos' ),
 		);
-
-		return new SettingsDataManager( $models );
 	},
 	'settings.ajax.switch_ui'                     => static function ( ContainerInterface $container ) : SwitchSettingsUiEndpoint {
 		return new SwitchSettingsUiEndpoint(
diff --git a/modules/ppcp-settings/src/Service/SettingsDataManager.php b/modules/ppcp-settings/src/Service/SettingsDataManager.php
index cb7aa6275..fd01a16ef 100644
--- a/modules/ppcp-settings/src/Service/SettingsDataManager.php
+++ b/modules/ppcp-settings/src/Service/SettingsDataManager.php
@@ -10,6 +10,7 @@ declare( strict_types = 1 );
 namespace WooCommerce\PayPalCommerce\Settings\Service;
 
 use WooCommerce\PayPalCommerce\Settings\Data\AbstractDataModel;
+use WooCommerce\PayPalCommerce\Settings\Data\OnboardingProfile;
 
 /**
  * Class SettingsDataManager
@@ -19,25 +20,36 @@ use WooCommerce\PayPalCommerce\Settings\Data\AbstractDataModel;
  */
 class SettingsDataManager {
 
+	/**
+	 * The onboarding profile data model.
+	 *
+	 * @var OnboardingProfile
+	 */
+	private OnboardingProfile $onboarding_profile;
+
 	/**
 	 * Stores a list of all AbstractDataModel instances that are managed by
 	 * this service.
 	 *
 	 * @var AbstractDataModel[]
 	 */
-	private array $models = array();
+	private array $purgeable_models = array();
 
 	/**
 	 * Constructor.
 	 *
-	 * @param array $data_models List of AbstractDataModel instances.
+	 * @param OnboardingProfile $onboarding_profile The onboarding profile model.
+	 * @param array             ...$data_models     List of additional data models to reset.
 	 */
-	public function __construct( array $data_models ) {
+	public function __construct( OnboardingProfile $onboarding_profile, ...$data_models ) {
 		foreach ( $data_models as $data_model ) {
 			if ( $data_model instanceof AbstractDataModel ) {
-				$this->models[] = $data_model;
+				$this->purgeable_models[] = $data_model;
 			}
 		}
+
+		$this->purgeable_models[] = $onboarding_profile;
+		$this->onboarding_profile = $onboarding_profile;
 	}
 
 	/**
@@ -52,7 +64,7 @@ class SettingsDataManager {
 		 */
 		do_action( 'woocommerce_paypal_payments_reset_settings' );
 
-		foreach ( $this->models as $model ) {
+		foreach ( $this->purgeable_models as $model ) {
 			$model->purge();
 		}
 

From cda49d87e26244a0c0dbba7a9bbe0f6e5da9b493 Mon Sep 17 00:00:00 2001
From: Philipp Stracker <p.stracker@syde.com>
Date: Wed, 12 Feb 2025 21:07:56 +0100
Subject: [PATCH 04/48] =?UTF-8?q?=E2=9C=A8=20New=20DTO=20to=20define=20plu?=
 =?UTF-8?q?gin=20setup=20configuration?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/DTO/ConfigurationFlagsDTO.php         | 47 +++++++++++++++++++
 1 file changed, 47 insertions(+)
 create mode 100644 modules/ppcp-settings/src/DTO/ConfigurationFlagsDTO.php

diff --git a/modules/ppcp-settings/src/DTO/ConfigurationFlagsDTO.php b/modules/ppcp-settings/src/DTO/ConfigurationFlagsDTO.php
new file mode 100644
index 000000000..4f00ff405
--- /dev/null
+++ b/modules/ppcp-settings/src/DTO/ConfigurationFlagsDTO.php
@@ -0,0 +1,47 @@
+<?php
+/**
+ * Data transfer object. Stores flags that are relevant for the default plugin
+ * configuration at the end of the onboarding process.
+ *
+ * @package WooCommerce\PayPalCommerce\Settings\DTO;
+ */
+
+declare( strict_types = 1 );
+
+namespace WooCommerce\PayPalCommerce\Settings\DTO;
+
+/**
+ * DTO that represents a plugin configuration.
+ *
+ * Intentionally has no internal logic, sanitation or validation.
+ */
+class ConfigurationFlagsDTO {
+	/**
+	 * The merchant's country, which indicates availability of certain features.
+	 *
+	 * @var string
+	 */
+	public string $country_code = '';
+
+	/**
+	 * Whether we configure a business account.
+	 * If false, a personal (casual seller) account is set up.
+	 *
+	 * @var bool
+	 */
+	public bool $is_business_seller = false;
+
+	/**
+	 * Whether credit card payments should be handled by our plugin.
+	 *
+	 * @var bool
+	 */
+	public bool $use_card_payments = false;
+
+	/**
+	 * If the shop needs to process subscription payments.
+	 *
+	 * @var bool
+	 */
+	public bool $use_subscriptions = false;
+}

From 6d11c8ef99a2c86d9c61efc5bc2730a919820eee Mon Sep 17 00:00:00 2001
From: Philipp Stracker <p.stracker@syde.com>
Date: Wed, 12 Feb 2025 21:08:37 +0100
Subject: [PATCH 05/48] =?UTF-8?q?=E2=9C=A8=20Add=20a=20plugin-config=20met?=
 =?UTF-8?q?hod=20to=20the=20data=20manager?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/Service/SettingsDataManager.php             | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/modules/ppcp-settings/src/Service/SettingsDataManager.php b/modules/ppcp-settings/src/Service/SettingsDataManager.php
index fd01a16ef..465a4f195 100644
--- a/modules/ppcp-settings/src/Service/SettingsDataManager.php
+++ b/modules/ppcp-settings/src/Service/SettingsDataManager.php
@@ -11,6 +11,7 @@ namespace WooCommerce\PayPalCommerce\Settings\Service;
 
 use WooCommerce\PayPalCommerce\Settings\Data\AbstractDataModel;
 use WooCommerce\PayPalCommerce\Settings\Data\OnboardingProfile;
+use WooCommerce\PayPalCommerce\Settings\DTO\ConfigurationFlagsDTO;
 
 /**
  * Class SettingsDataManager
@@ -71,4 +72,16 @@ class SettingsDataManager {
 		// Clear any caches.
 		wp_cache_flush();
 	}
+
+	/**
+	 * Applies a default configuration to the plugin.
+	 *
+	 * @param ConfigurationFlagsDTO $flags The configuration flags.
+	 * @return void
+	 */
+	public function apply_configuration( ConfigurationFlagsDTO $flags ) : void {
+		// Onboarding stuff...
+
+		$this->onboarding_profile->set_setup_done( true );
+	}
 }

From 275c28bfa3f6ddd0b8a5d2ab3c351a772bca17e3 Mon Sep 17 00:00:00 2001
From: Philipp Stracker <p.stracker@syde.com>
Date: Wed, 12 Feb 2025 21:14:26 +0100
Subject: [PATCH 06/48] =?UTF-8?q?=F0=9F=91=94=20Apply=20plugin=20configura?=
 =?UTF-8?q?tion=20after=20authentication?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/Service/SettingsDataManager.php        |  1 +
 modules/ppcp-settings/src/SettingsModule.php   | 18 ++++++++++++++++++
 2 files changed, 19 insertions(+)

diff --git a/modules/ppcp-settings/src/Service/SettingsDataManager.php b/modules/ppcp-settings/src/Service/SettingsDataManager.php
index 465a4f195..20c6c7533 100644
--- a/modules/ppcp-settings/src/Service/SettingsDataManager.php
+++ b/modules/ppcp-settings/src/Service/SettingsDataManager.php
@@ -83,5 +83,6 @@ class SettingsDataManager {
 		// Onboarding stuff...
 
 		$this->onboarding_profile->set_setup_done( true );
+		$this->onboarding_profile->save();
 	}
 }
diff --git a/modules/ppcp-settings/src/SettingsModule.php b/modules/ppcp-settings/src/SettingsModule.php
index 2035011d6..38e51fc1b 100644
--- a/modules/ppcp-settings/src/SettingsModule.php
+++ b/modules/ppcp-settings/src/SettingsModule.php
@@ -36,6 +36,8 @@ use WooCommerce\PayPalCommerce\WcGateway\Gateway\OXXO\OXXO;
 use WooCommerce\PayPalCommerce\WcGateway\Gateway\PayUponInvoice\PayUponInvoiceGateway;
 use WooCommerce\PayPalCommerce\WcGateway\Helper\DCCProductStatus;
 use WooCommerce\PayPalCommerce\WcGateway\Settings\Settings;
+use WooCommerce\PayPalCommerce\Settings\Service\SettingsDataManager;
+use WooCommerce\PayPalCommerce\Settings\DTO\ConfigurationFlagsDTO;
 
 /**
  * Class SettingsModule
@@ -288,6 +290,22 @@ class SettingsModule implements ServiceModule, ExecutableModule {
 
 				$onboarding_profile->set_completed( true );
 				$onboarding_profile->save();
+
+				// If the initial plugin configuration was not applied yet, do it now.
+				if ( ! $onboarding_profile->is_setup_done() ) {
+					$data_manager = $container->get( 'settings.service.data-manager' );
+					assert( $data_manager instanceof SettingsDataManager );
+
+					$flags = new ConfigurationFlagsDTO();
+
+					// TODO: Dummy values, use real values!
+					$flags->country_code       = 'US';
+					$flags->is_business_seller = true;
+					$flags->use_card_payments  = true;
+					$flags->use_subscriptions  = true;
+
+					$data_manager->apply_configuration( $flags );
+				}
 			}
 		);
 

From f8d5213b16b69396b29168ea0572ec6e0a4aa0cd Mon Sep 17 00:00:00 2001
From: Philipp Stracker <p.stracker@syde.com>
Date: Wed, 12 Feb 2025 21:14:52 +0100
Subject: [PATCH 07/48] =?UTF-8?q?=F0=9F=8E=A8=20Apply=20phpcs=20styles?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/ppcp-settings/src/SettingsModule.php | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/modules/ppcp-settings/src/SettingsModule.php b/modules/ppcp-settings/src/SettingsModule.php
index 38e51fc1b..52278b84e 100644
--- a/modules/ppcp-settings/src/SettingsModule.php
+++ b/modules/ppcp-settings/src/SettingsModule.php
@@ -124,7 +124,7 @@ class SettingsModule implements ServiceModule, ExecutableModule {
 
 		add_action(
 			'woocommerce_paypal_payments_gateway_migrate_on_update',
-			static fn () => ! get_option( SwitchSettingsUiEndpoint::OPTION_NAME_SHOULD_USE_OLD_UI )
+			static fn() => ! get_option( SwitchSettingsUiEndpoint::OPTION_NAME_SHOULD_USE_OLD_UI )
 				&& update_option( SwitchSettingsUiEndpoint::OPTION_NAME_SHOULD_USE_OLD_UI, 'yes' )
 		);
 
@@ -311,7 +311,7 @@ class SettingsModule implements ServiceModule, ExecutableModule {
 
 		add_filter(
 			'woocommerce_paypal_payments_payment_methods',
-			function( array $payment_methods ) use ( $container ) : array {
+			function ( array $payment_methods ) use ( $container ) : array {
 				$all_payment_methods = $payment_methods;
 
 				$dcc_product_status = $container->get( 'wcgateway.helper.dcc-product-status' );
@@ -380,7 +380,7 @@ class SettingsModule implements ServiceModule, ExecutableModule {
 			 *
 			 * @psalm-suppress MissingClosureParamType
 			 */
-			static function ( $methods ) use ( $container ): array {
+			static function ( $methods ) use ( $container ) : array {
 				if ( ! is_array( $methods ) ) {
 					return $methods;
 				}
@@ -408,7 +408,7 @@ class SettingsModule implements ServiceModule, ExecutableModule {
 
 		add_filter(
 			'woocommerce_paypal_payments_gateway_title',
-			function( string $title, WC_Payment_Gateway $gateway ) {
+			function ( string $title, WC_Payment_Gateway $gateway ) {
 				return $gateway->get_option( 'title', $title );
 			},
 			10,
@@ -416,7 +416,7 @@ class SettingsModule implements ServiceModule, ExecutableModule {
 		);
 		add_filter(
 			'woocommerce_paypal_payments_gateway_description',
-			function( string $description, WC_Payment_Gateway $gateway ) {
+			function ( string $description, WC_Payment_Gateway $gateway ) {
 				return $gateway->get_option( 'description', $description );
 			},
 			10,
@@ -427,7 +427,7 @@ class SettingsModule implements ServiceModule, ExecutableModule {
 
 		add_filter(
 			'woocommerce_paypal_payments_credit_card_gateway_form_fields',
-			function( array $form_fields ) {
+			function ( array $form_fields ) {
 				$form_fields['enabled'] = array(
 					'title'       => __( 'Enable/Disable', 'woocommerce-paypal-payments' ),
 					'type'        => 'checkbox',
@@ -444,7 +444,7 @@ class SettingsModule implements ServiceModule, ExecutableModule {
 
 		add_filter(
 			'woocommerce_paypal_payments_credit_card_gateway_title',
-			function( string $title, WC_Payment_Gateway $gateway ) {
+			function ( string $title, WC_Payment_Gateway $gateway ) {
 				return $gateway->get_option( 'title', $title );
 			},
 			10,
@@ -452,7 +452,7 @@ class SettingsModule implements ServiceModule, ExecutableModule {
 		);
 		add_filter(
 			'woocommerce_paypal_payments_credit_card_gateway_description',
-			function( string $description, WC_Payment_Gateway $gateway ) {
+			function ( string $description, WC_Payment_Gateway $gateway ) {
 				return $gateway->get_option( 'description', $description );
 			},
 			10,
@@ -462,7 +462,7 @@ class SettingsModule implements ServiceModule, ExecutableModule {
 		add_filter( 'woocommerce_paypal_payments_axo_gateway_should_update_enabled', '__return_false' );
 		add_filter(
 			'woocommerce_paypal_payments_axo_gateway_title',
-			function( string $title, WC_Payment_Gateway $gateway ) {
+			function ( string $title, WC_Payment_Gateway $gateway ) {
 				return $gateway->get_option( 'title', $title );
 			},
 			10,
@@ -470,7 +470,7 @@ class SettingsModule implements ServiceModule, ExecutableModule {
 		);
 		add_filter(
 			'woocommerce_paypal_payments_axo_gateway_description',
-			function( string $description, WC_Payment_Gateway $gateway ) {
+			function ( string $description, WC_Payment_Gateway $gateway ) {
 				return $gateway->get_option( 'description', $description );
 			},
 			10,

From 7a5ac3cabac46c9c7d1075a99ed6fc4686855945 Mon Sep 17 00:00:00 2001
From: Philipp Stracker <p.stracker@syde.com>
Date: Thu, 13 Feb 2025 14:27:05 +0100
Subject: [PATCH 08/48] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20Move=20detection=20o?=
 =?UTF-8?q?f=20=E2=80=9Cnew=20merchant=E2=80=9D=20into=20manager?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/Service/SettingsDataManager.php       | 28 +++++++++++++++++--
 modules/ppcp-settings/src/SettingsModule.php  | 22 +++++++--------
 2 files changed, 35 insertions(+), 15 deletions(-)

diff --git a/modules/ppcp-settings/src/Service/SettingsDataManager.php b/modules/ppcp-settings/src/Service/SettingsDataManager.php
index 20c6c7533..5d0e4153c 100644
--- a/modules/ppcp-settings/src/Service/SettingsDataManager.php
+++ b/modules/ppcp-settings/src/Service/SettingsDataManager.php
@@ -74,15 +74,37 @@ class SettingsDataManager {
 	}
 
 	/**
-	 * Applies a default configuration to the plugin.
+	 * Applies a default configuration to the plugin for a new merchant.
+	 *
+	 * This method checks the onboarding "setup_done" flag to determine if
+	 * the defaults should be applied. At the end of this method, the
+	 * "setup_done" flag is set, so future calls to the method have no effect.
 	 *
 	 * @param ConfigurationFlagsDTO $flags The configuration flags.
 	 * @return void
 	 */
-	public function apply_configuration( ConfigurationFlagsDTO $flags ) : void {
-		// Onboarding stuff...
+	public function set_defaults_for_new_merchant( ConfigurationFlagsDTO $flags ) : void {
+		if ( $this->onboarding_profile->is_setup_done() ) {
+			return;
+		}
+
+		$this->apply_configuration( $flags );
 
 		$this->onboarding_profile->set_setup_done( true );
 		$this->onboarding_profile->save();
 	}
+
+	/**
+	 * Applies a default configuration to the plugin, without any condition.
+	 *
+	 * @param ConfigurationFlagsDTO $flags The configuration flags.
+	 * @return void
+	 */
+	protected function apply_configuration( ConfigurationFlagsDTO $flags ) : void {
+		// Apply defaults for the "Payment Methods" tab.
+
+		// Apply defaults for the "Settings" tab.
+
+		// Assign defaults for the "Styling" tab.
+	}
 }
diff --git a/modules/ppcp-settings/src/SettingsModule.php b/modules/ppcp-settings/src/SettingsModule.php
index 52278b84e..50bd9e294 100644
--- a/modules/ppcp-settings/src/SettingsModule.php
+++ b/modules/ppcp-settings/src/SettingsModule.php
@@ -291,21 +291,19 @@ class SettingsModule implements ServiceModule, ExecutableModule {
 				$onboarding_profile->set_completed( true );
 				$onboarding_profile->save();
 
-				// If the initial plugin configuration was not applied yet, do it now.
-				if ( ! $onboarding_profile->is_setup_done() ) {
-					$data_manager = $container->get( 'settings.service.data-manager' );
-					assert( $data_manager instanceof SettingsDataManager );
+				// Try to apply a default configuration for the current store.
+				$data_manager = $container->get( 'settings.service.data-manager' );
+				assert( $data_manager instanceof SettingsDataManager );
 
-					$flags = new ConfigurationFlagsDTO();
+				$flags = new ConfigurationFlagsDTO();
 
-					// TODO: Dummy values, use real values!
-					$flags->country_code       = 'US';
-					$flags->is_business_seller = true;
-					$flags->use_card_payments  = true;
-					$flags->use_subscriptions  = true;
+				// TODO: Dummy values, use real values!
+				$flags->country_code       = 'US';
+				$flags->is_business_seller = true;
+				$flags->use_card_payments  = true;
+				$flags->use_subscriptions  = true;
 
-					$data_manager->apply_configuration( $flags );
-				}
+				$data_manager->set_defaults_for_new_merchant( $flags );
 			}
 		);
 

From 8c411c196941346cd82e8e9bb1c74f1a831ea9a3 Mon Sep 17 00:00:00 2001
From: Philipp Stracker <p.stracker@syde.com>
Date: Thu, 13 Feb 2025 14:27:59 +0100
Subject: [PATCH 09/48] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20Minor=20renaming=20o?=
 =?UTF-8?q?f=20attributes?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/Service/SettingsDataManager.php          | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/modules/ppcp-settings/src/Service/SettingsDataManager.php b/modules/ppcp-settings/src/Service/SettingsDataManager.php
index 5d0e4153c..6dc954728 100644
--- a/modules/ppcp-settings/src/Service/SettingsDataManager.php
+++ b/modules/ppcp-settings/src/Service/SettingsDataManager.php
@@ -34,7 +34,7 @@ class SettingsDataManager {
 	 *
 	 * @var AbstractDataModel[]
 	 */
-	private array $purgeable_models = array();
+	private array $models_to_reset = array();
 
 	/**
 	 * Constructor.
@@ -44,12 +44,20 @@ class SettingsDataManager {
 	 */
 	public function __construct( OnboardingProfile $onboarding_profile, ...$data_models ) {
 		foreach ( $data_models as $data_model ) {
+			/**
+			 * An instance extracted from the spread operator. We only process
+			 * AbstractDataModel instances.
+			 *
+			 * @var mixed|AbstractDataModel $data_model
+			 */
+
 			if ( $data_model instanceof AbstractDataModel ) {
-				$this->purgeable_models[] = $data_model;
+				$this->models_to_reset[] = $data_model;
 			}
 		}
 
-		$this->purgeable_models[] = $onboarding_profile;
+		$this->models_to_reset[] = $onboarding_profile;
+
 		$this->onboarding_profile = $onboarding_profile;
 	}
 
@@ -65,7 +73,7 @@ class SettingsDataManager {
 		 */
 		do_action( 'woocommerce_paypal_payments_reset_settings' );
 
-		foreach ( $this->purgeable_models as $model ) {
+		foreach ( $this->models_to_reset as $model ) {
 			$model->purge();
 		}
 

From 769234ca157c7ea02ffd20978e79c497e0f9918b Mon Sep 17 00:00:00 2001
From: Philipp Stracker <p.stracker@syde.com>
Date: Thu, 13 Feb 2025 14:43:54 +0100
Subject: [PATCH 10/48] =?UTF-8?q?=E2=9C=A8=20Apply=20styling=20config=20af?=
 =?UTF-8?q?ter=20onboarding?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/Service/SettingsDataManager.php       | 71 ++++++++++++++++++-
 1 file changed, 70 insertions(+), 1 deletion(-)

diff --git a/modules/ppcp-settings/src/Service/SettingsDataManager.php b/modules/ppcp-settings/src/Service/SettingsDataManager.php
index 6dc954728..b47529337 100644
--- a/modules/ppcp-settings/src/Service/SettingsDataManager.php
+++ b/modules/ppcp-settings/src/Service/SettingsDataManager.php
@@ -12,6 +12,13 @@ namespace WooCommerce\PayPalCommerce\Settings\Service;
 use WooCommerce\PayPalCommerce\Settings\Data\AbstractDataModel;
 use WooCommerce\PayPalCommerce\Settings\Data\OnboardingProfile;
 use WooCommerce\PayPalCommerce\Settings\DTO\ConfigurationFlagsDTO;
+use WooCommerce\PayPalCommerce\Settings\DTO\LocationStylingDTO;
+use WooCommerce\PayPalCommerce\Googlepay\GooglePayGateway;
+use WooCommerce\PayPalCommerce\Applepay\ApplePayGateway;
+use WooCommerce\PayPalCommerce\WcGateway\Gateway\PayPalGateway;
+use WooCommerce\PayPalCommerce\Settings\Data\StylingSettings;
+use WooCommerce\PayPalCommerce\Settings\Data\GeneralSettings;
+use WooCommerce\PayPalCommerce\Settings\Data\SettingsModel;
 
 /**
  * Class SettingsDataManager
@@ -28,6 +35,13 @@ class SettingsDataManager {
 	 */
 	private OnboardingProfile $onboarding_profile;
 
+	/**
+	 * Data model that handles button styling on the front end.
+	 *
+	 * @var StylingSettings
+	 */
+	private StylingSettings $styling_settings;
+
 	/**
 	 * Stores a list of all AbstractDataModel instances that are managed by
 	 * this service.
@@ -40,9 +54,18 @@ class SettingsDataManager {
 	 * Constructor.
 	 *
 	 * @param OnboardingProfile $onboarding_profile The onboarding profile model.
+	 * @param GeneralSettings   $general_settings   The general settings model.
+	 * @param SettingsModel     $settings_model     The settings model.
+	 * @param StylingSettings   $styling_settings   The styling settings model.
 	 * @param array             ...$data_models     List of additional data models to reset.
 	 */
-	public function __construct( OnboardingProfile $onboarding_profile, ...$data_models ) {
+	public function __construct(
+		OnboardingProfile $onboarding_profile,
+		GeneralSettings $general_settings,
+		SettingsModel $settings_model,
+		StylingSettings $styling_settings,
+		...$data_models
+	) {
 		foreach ( $data_models as $data_model ) {
 			/**
 			 * An instance extracted from the spread operator. We only process
@@ -57,8 +80,12 @@ class SettingsDataManager {
 		}
 
 		$this->models_to_reset[] = $onboarding_profile;
+		$this->models_to_reset[] = $general_settings;
+		$this->models_to_reset[] = $settings_model;
+		$this->models_to_reset[] = $styling_settings;
 
 		$this->onboarding_profile = $onboarding_profile;
+		$this->styling_settings   = $styling_settings;
 	}
 
 	/**
@@ -114,5 +141,47 @@ class SettingsDataManager {
 		// Apply defaults for the "Settings" tab.
 
 		// Assign defaults for the "Styling" tab.
+		$location_styles = $this->get_location_styles( $flags );
+		$this->styling_settings->from_array( $location_styles );
+		$this->styling_settings->save();
+	}
+
+	/**
+	 * Builds an array of styling details that should be applied for the shop.
+	 *
+	 * @param ConfigurationFlagsDTO $flags Shop configuration flags.
+	 * @return LocationStylingDTO[] A set of styling details.
+	 */
+	protected function get_location_styles( ConfigurationFlagsDTO $flags ) : array {
+		$methods_full = array(
+			PayPalGateway::ID,
+			'venmo',
+			'pay-later',
+			ApplePayGateway::ID,
+			GooglePayGateway::ID,
+		);
+
+		$methods_own = array(
+			PayPalGateway::ID,
+			'venmo',
+			'pay-later',
+		);
+
+		return array(
+			// Cart: Enabled, display PayPal, Venmo, Pay Later, Google Pay, Apple Pay.
+			'cart'             => new LocationStylingDTO( 'cart', true, $methods_full ),
+
+			// Classic Checkout: Display PayPal, Venmo, Pay Later, Google Pay, Apple Pay.
+			'classic_checkout' => new LocationStylingDTO( 'classic_checkout', true, $methods_full ),
+
+			// Express Checkout: Display PayPal, Venmo, Pay Later, Google Pay, Apple Pay.
+			'express_checkout' => new LocationStylingDTO( 'express_checkout', true, $methods_full ),
+
+			// Mini Cart: Display PayPal, Venmo, Pay Later, Google Pay, Apple Pay.
+			'mini_cart'        => new LocationStylingDTO( 'mini_cart', true, $methods_full ),
+
+			// Product Page: Display PayPal, Venmo, Pay Later.
+			'product'          => new LocationStylingDTO( 'product', true, $methods_own ),
+		);
 	}
 }

From f7b2f97b891634e9d5dcc1cbaf325cfee5480a64 Mon Sep 17 00:00:00 2001
From: Philipp Stracker <p.stracker@syde.com>
Date: Thu, 13 Feb 2025 15:08:50 +0100
Subject: [PATCH 11/48] =?UTF-8?q?=F0=9F=92=84=20Improve=20visual=20hint=20?=
 =?UTF-8?q?for=20settings-reset=20toggle?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/css/components/screens/_modals.scss      | 10 ++++++++--
 .../Components/Settings/Parts/DisconnectButton.js      |  2 +-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/modules/ppcp-settings/resources/css/components/screens/_modals.scss b/modules/ppcp-settings/resources/css/components/screens/_modals.scss
index fee98d538..5dbdf7652 100644
--- a/modules/ppcp-settings/resources/css/components/screens/_modals.scss
+++ b/modules/ppcp-settings/resources/css/components/screens/_modals.scss
@@ -2,12 +2,18 @@
  * Modal for disconnecting the merchant from the current PayPal account.
  */
 .ppcp--modal-disconnect {
-	.ppcp--toggle-danger {
-		--wp-components-color-accent: #cc1818
+	.ppcp--toggle-danger .components-form-toggle {
+		&.is-checked {
+			--wp-components-color-accent: #cc1818;
+		}
 	}
 
 	.ppcp--action-buttons {
 		text-align: right;
 		margin-top: 32px;
+
+		.components-button {
+			transition: background 0.3s;
+		}
 	}
 }
diff --git a/modules/ppcp-settings/resources/js/Components/Screens/Settings/Components/Settings/Parts/DisconnectButton.js b/modules/ppcp-settings/resources/js/Components/Screens/Settings/Components/Settings/Parts/DisconnectButton.js
index 8e5fbe9d6..48fd6c226 100644
--- a/modules/ppcp-settings/resources/js/Components/Screens/Settings/Components/Settings/Parts/DisconnectButton.js
+++ b/modules/ppcp-settings/resources/js/Components/Screens/Settings/Components/Settings/Parts/DisconnectButton.js
@@ -78,7 +78,7 @@ const DisconnectButton = () => {
 						</Button>
 						<Button
 							variant="primary"
-							isDestructive={ true }
+							isDestructive={ resetFlag }
 							onClick={ handleConfirm }
 						>
 							{ __(

From 30ff337c0695c05d8feeac6f64e5c59f31532246 Mon Sep 17 00:00:00 2001
From: Philipp Stracker <p.stracker@syde.com>
Date: Thu, 13 Feb 2025 15:22:21 +0100
Subject: [PATCH 12/48] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20Reuse=20existing=20g?=
 =?UTF-8?q?ateway-IDs=20for=20styling=20tab?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Styling/Content/PaymentMethods.js         | 11 +++-------
 .../js/data/styling/configuration.js          | 21 +++++++------------
 2 files changed, 11 insertions(+), 21 deletions(-)

diff --git a/modules/ppcp-settings/resources/js/Components/Screens/Settings/Components/Styling/Content/PaymentMethods.js b/modules/ppcp-settings/resources/js/Components/Screens/Settings/Components/Styling/Content/PaymentMethods.js
index 785d6f08c..9b2d28cfb 100644
--- a/modules/ppcp-settings/resources/js/Components/Screens/Settings/Components/Styling/Content/PaymentMethods.js
+++ b/modules/ppcp-settings/resources/js/Components/Screens/Settings/Components/Styling/Content/PaymentMethods.js
@@ -7,16 +7,11 @@ const SectionPaymentMethods = ( { location } ) => {
 	const { paymentMethods, setPaymentMethods, choices } =
 		StylingHooks.usePaymentMethodProps( location );
 
-	const methods = PaymentHooks.usePaymentMethods();
-	const methodIds = [];
-	methods.all.forEach( ( method ) => {
-		if ( method.enabled === true ) {
-			methodIds.push( method.id );
-		}
-	} );
+	const { all: allMethods } = PaymentHooks.usePaymentMethods();
 
 	const filteredChoices = choices.filter( ( choice ) => {
-		return methodIds.includes( choice.paymentMethod );
+		const methodConfig = allMethods.find( ( i ) => i.id === choice.value );
+		return methodConfig?.enabled;
 	} );
 
 	return (
diff --git a/modules/ppcp-settings/resources/js/data/styling/configuration.js b/modules/ppcp-settings/resources/js/data/styling/configuration.js
index f6e3feddb..366ecbd33 100644
--- a/modules/ppcp-settings/resources/js/data/styling/configuration.js
+++ b/modules/ppcp-settings/resources/js/data/styling/configuration.js
@@ -104,33 +104,28 @@ export const STYLING_SHAPES = {
 };
 
 export const STYLING_PAYMENT_METHODS = {
-	paypal: {
-		value: '',
+	'ppcp-gateway': {
+		value: 'ppcp-gateway',
 		label: __( 'PayPal', 'woocommerce-paypal-payments' ),
 		checked: true,
 		disabled: true,
-		paymentMethod: 'ppcp-gateway',
 	},
 	venmo: {
 		value: 'venmo',
 		label: __( 'Venmo', 'woocommerce-paypal-payments' ),
 		isFunding: true,
-		paymentMethod: 'venmo',
 	},
-	paylater: {
-		value: 'paylater',
+	'pay-later': {
+		value: 'pay-later',
 		label: __( 'Pay Later', 'woocommerce-paypal-payments' ),
 		isFunding: true,
-		paymentMethod: 'pay-later',
 	},
-	googlepay: {
-		value: 'googlepay',
+	'ppcp-googlepay': {
+		value: 'ppcp-googlepay',
 		label: __( 'Google Pay', 'woocommerce-paypal-payments' ),
-		paymentMethod: 'ppcp-googlepay',
 	},
-	applepay: {
-		value: 'applepay',
+	'ppcp-applepay': {
+		value: 'ppcp-applepay',
 		label: __( 'Apple Pay', 'woocommerce-paypal-payments' ),
-		paymentMethod: 'ppcp-applepay',
 	},
 };

From 16ec522830f28dadd495597ff0fb0ec0d4c5d4fe Mon Sep 17 00:00:00 2001
From: Philipp Stracker <p.stracker@syde.com>
Date: Thu, 13 Feb 2025 15:27:29 +0100
Subject: [PATCH 13/48] =?UTF-8?q?=E2=9A=A1=EF=B8=8F=20Memoize=20payment=20?=
 =?UTF-8?q?methods=20in=20styling=20tab?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Components/Styling/Content/PaymentMethods.js   | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/modules/ppcp-settings/resources/js/Components/Screens/Settings/Components/Styling/Content/PaymentMethods.js b/modules/ppcp-settings/resources/js/Components/Screens/Settings/Components/Styling/Content/PaymentMethods.js
index 9b2d28cfb..191898b45 100644
--- a/modules/ppcp-settings/resources/js/Components/Screens/Settings/Components/Styling/Content/PaymentMethods.js
+++ b/modules/ppcp-settings/resources/js/Components/Screens/Settings/Components/Styling/Content/PaymentMethods.js
@@ -2,17 +2,21 @@ import { __ } from '@wordpress/i18n';
 
 import { PaymentHooks, StylingHooks } from '../../../../../../data';
 import { CheckboxStylingSection } from '../Layout';
+import { useMemo } from '@wordpress/element';
 
 const SectionPaymentMethods = ( { location } ) => {
 	const { paymentMethods, setPaymentMethods, choices } =
 		StylingHooks.usePaymentMethodProps( location );
-
 	const { all: allMethods } = PaymentHooks.usePaymentMethods();
 
-	const filteredChoices = choices.filter( ( choice ) => {
-		const methodConfig = allMethods.find( ( i ) => i.id === choice.value );
-		return methodConfig?.enabled;
-	} );
+	const filteredChoices = useMemo( () => {
+		return choices.filter( ( choice ) => {
+			const methodConfig = allMethods.find(
+				( i ) => i.id === choice.value
+			);
+			return methodConfig?.enabled;
+		} );
+	}, [ choices, allMethods ] );
 
 	return (
 		<CheckboxStylingSection

From 69c2e710fc09b915f20e9a43985d1fda243e6353 Mon Sep 17 00:00:00 2001
From: Philipp Stracker <p.stracker@syde.com>
Date: Thu, 13 Feb 2025 16:03:19 +0100
Subject: [PATCH 14/48] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20Restructure=20code?=
 =?UTF-8?q?=20slightly?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/Service/SettingsDataManager.php       | 34 ++++++++++---------
 1 file changed, 18 insertions(+), 16 deletions(-)

diff --git a/modules/ppcp-settings/src/Service/SettingsDataManager.php b/modules/ppcp-settings/src/Service/SettingsDataManager.php
index b47529337..c9987aa44 100644
--- a/modules/ppcp-settings/src/Service/SettingsDataManager.php
+++ b/modules/ppcp-settings/src/Service/SettingsDataManager.php
@@ -141,18 +141,16 @@ class SettingsDataManager {
 		// Apply defaults for the "Settings" tab.
 
 		// Assign defaults for the "Styling" tab.
-		$location_styles = $this->get_location_styles( $flags );
-		$this->styling_settings->from_array( $location_styles );
-		$this->styling_settings->save();
+		$this->apply_location_styles( $flags );
 	}
 
 	/**
-	 * Builds an array of styling details that should be applied for the shop.
+	 * Applies the default styling details for the shop.
 	 *
 	 * @param ConfigurationFlagsDTO $flags Shop configuration flags.
-	 * @return LocationStylingDTO[] A set of styling details.
+	 * @return void
 	 */
-	protected function get_location_styles( ConfigurationFlagsDTO $flags ) : array {
+	protected function apply_location_styles( ConfigurationFlagsDTO $flags ) : void {
 		$methods_full = array(
 			PayPalGateway::ID,
 			'venmo',
@@ -167,21 +165,25 @@ class SettingsDataManager {
 			'pay-later',
 		);
 
-		return array(
-			// Cart: Enabled, display PayPal, Venmo, Pay Later, Google Pay, Apple Pay.
+		/**
+		 * Initialize the styling options using the defaults.
+		 *
+		 * - Cart: Enabled, display PayPal, Venmo, Pay Later, Google Pay, Apple Pay.
+		 * - Classic Checkout: Display PayPal, Venmo, Pay Later, Google Pay, Apple Pay.
+		 * - Express Checkout: Display PayPal, Venmo, Pay Later, Google Pay, Apple Pay.
+		 * - Mini Cart: Display PayPal, Venmo, Pay Later, Google Pay, Apple Pay.
+		 * - Product Page: Display PayPal, Venmo, Pay Later.
+		 */
+		$location_styles = array(
 			'cart'             => new LocationStylingDTO( 'cart', true, $methods_full ),
-
-			// Classic Checkout: Display PayPal, Venmo, Pay Later, Google Pay, Apple Pay.
 			'classic_checkout' => new LocationStylingDTO( 'classic_checkout', true, $methods_full ),
-
-			// Express Checkout: Display PayPal, Venmo, Pay Later, Google Pay, Apple Pay.
 			'express_checkout' => new LocationStylingDTO( 'express_checkout', true, $methods_full ),
-
-			// Mini Cart: Display PayPal, Venmo, Pay Later, Google Pay, Apple Pay.
 			'mini_cart'        => new LocationStylingDTO( 'mini_cart', true, $methods_full ),
-
-			// Product Page: Display PayPal, Venmo, Pay Later.
 			'product'          => new LocationStylingDTO( 'product', true, $methods_own ),
 		);
+
+		// Apply the settings and persist them to the DB. All merchants use the same options.
+		$this->styling_settings->from_array( $location_styles );
+		$this->styling_settings->save();
 	}
 }

From e8379f09e80b5de13fa387a65ee421887a17a189 Mon Sep 17 00:00:00 2001
From: Philipp Stracker <p.stracker@syde.com>
Date: Thu, 13 Feb 2025 16:07:19 +0100
Subject: [PATCH 15/48] =?UTF-8?q?=E2=9C=A8=20Default=20configuration=20for?=
 =?UTF-8?q?=20payment=20settings?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/Service/SettingsDataManager.php       | 39 +++++++++++++++++--
 1 file changed, 36 insertions(+), 3 deletions(-)

diff --git a/modules/ppcp-settings/src/Service/SettingsDataManager.php b/modules/ppcp-settings/src/Service/SettingsDataManager.php
index c9987aa44..8fb02ee6d 100644
--- a/modules/ppcp-settings/src/Service/SettingsDataManager.php
+++ b/modules/ppcp-settings/src/Service/SettingsDataManager.php
@@ -35,6 +35,13 @@ class SettingsDataManager {
 	 */
 	private OnboardingProfile $onboarding_profile;
 
+	/**
+	 * Payment settings model.
+	 *
+	 * @var SettingsModel
+	 */
+	private SettingsModel $payment_settings;
+
 	/**
 	 * Data model that handles button styling on the front end.
 	 *
@@ -55,14 +62,14 @@ class SettingsDataManager {
 	 *
 	 * @param OnboardingProfile $onboarding_profile The onboarding profile model.
 	 * @param GeneralSettings   $general_settings   The general settings model.
-	 * @param SettingsModel     $settings_model     The settings model.
+	 * @param SettingsModel     $payment_settings   The settings model.
 	 * @param StylingSettings   $styling_settings   The styling settings model.
 	 * @param array             ...$data_models     List of additional data models to reset.
 	 */
 	public function __construct(
 		OnboardingProfile $onboarding_profile,
 		GeneralSettings $general_settings,
-		SettingsModel $settings_model,
+		SettingsModel $payment_settings,
 		StylingSettings $styling_settings,
 		...$data_models
 	) {
@@ -81,10 +88,11 @@ class SettingsDataManager {
 
 		$this->models_to_reset[] = $onboarding_profile;
 		$this->models_to_reset[] = $general_settings;
-		$this->models_to_reset[] = $settings_model;
+		$this->models_to_reset[] = $payment_settings;
 		$this->models_to_reset[] = $styling_settings;
 
 		$this->onboarding_profile = $onboarding_profile;
+		$this->payment_settings   = $payment_settings;
 		$this->styling_settings   = $styling_settings;
 	}
 
@@ -139,11 +147,36 @@ class SettingsDataManager {
 		// Apply defaults for the "Payment Methods" tab.
 
 		// Apply defaults for the "Settings" tab.
+		$this->apply_payment_settings( $flags );
 
 		// Assign defaults for the "Styling" tab.
 		$this->apply_location_styles( $flags );
 	}
 
+	/**
+	 * Applies the default payment settings that are relevant for the provided
+	 * configuration flags.
+	 *
+	 * @param ConfigurationFlagsDTO $flags Shop configuration flags.
+	 * @return void
+	 */
+	protected function apply_payment_settings( ConfigurationFlagsDTO $flags ) : void {
+		// Enable Pay-Now experience for all merchants.
+		$this->payment_settings->set_enable_pay_now( true );
+
+		if ( $flags->is_business_seller && $flags->use_subscriptions ) {
+			$this->payment_settings->set_save_paypal_and_venmo( true );
+
+			if ( $flags->use_card_payments ) {
+				$this->payment_settings->set_save_card_details( true );
+			} else {
+				$this->payment_settings->set_save_card_details( false );
+			}
+		}
+
+		$this->payment_settings->save();
+	}
+
 	/**
 	 * Applies the default styling details for the shop.
 	 *

From 4ecd07b453e85ccbd51c28208a64b1a4749bb6e9 Mon Sep 17 00:00:00 2001
From: Philipp Stracker <p.stracker@syde.com>
Date: Thu, 13 Feb 2025 16:22:40 +0100
Subject: [PATCH 16/48] =?UTF-8?q?=F0=9F=9A=9A=20Rename=20UI=20hook=20to=20?=
 =?UTF-8?q?make=20it=20more=20generic?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Components/ReusableComponents/AccordionSection.js |  4 ++--
 .../hooks/{useAccordionState.js => useToggleState.js} | 11 ++++++++++-
 2 files changed, 12 insertions(+), 3 deletions(-)
 rename modules/ppcp-settings/resources/js/hooks/{useAccordionState.js => useToggleState.js} (56%)

diff --git a/modules/ppcp-settings/resources/js/Components/ReusableComponents/AccordionSection.js b/modules/ppcp-settings/resources/js/Components/ReusableComponents/AccordionSection.js
index 44c5beb27..379a16580 100644
--- a/modules/ppcp-settings/resources/js/Components/ReusableComponents/AccordionSection.js
+++ b/modules/ppcp-settings/resources/js/Components/ReusableComponents/AccordionSection.js
@@ -2,7 +2,7 @@ import { Icon } from '@wordpress/components';
 import { chevronDown, chevronUp } from '@wordpress/icons';
 import classNames from 'classnames';
 
-import { useAccordionState } from '../../hooks/useAccordionState';
+import { useToggleState } from '../../hooks/useToggleState';
 import {
 	Content,
 	Description,
@@ -21,7 +21,7 @@ const Accordion = ( {
 	children = null,
 	className = '',
 } ) => {
-	const { isOpen, toggleOpen } = useAccordionState( { id, initiallyOpen } );
+	const { isOpen, toggleOpen } = useToggleState( { id, initiallyOpen } );
 	const wrapperClasses = classNames( 'ppcp-r-accordion', className, {
 		'ppcp--is-open': isOpen,
 	} );
diff --git a/modules/ppcp-settings/resources/js/hooks/useAccordionState.js b/modules/ppcp-settings/resources/js/hooks/useToggleState.js
similarity index 56%
rename from modules/ppcp-settings/resources/js/hooks/useAccordionState.js
rename to modules/ppcp-settings/resources/js/hooks/useToggleState.js
index f54018262..bc1ad0e98 100644
--- a/modules/ppcp-settings/resources/js/hooks/useAccordionState.js
+++ b/modules/ppcp-settings/resources/js/hooks/useToggleState.js
@@ -11,7 +11,16 @@ const determineInitialState = ( id, initiallyOpen ) => {
 	return checkIfCurrentTab( id );
 };
 
-export function useAccordionState( { id = '', initiallyOpen = null } ) {
+/**
+ * Allows managing a toggle-able component, such as an accordion or a modal dialog.
+ *
+ * @param {Object}       props
+ * @param {string}       props.id            - Optional, if provided, the toggle can be opened via the URL.
+ * @param {null|boolean} props.initiallyOpen - Optional. If provided, it defines the initial open state.
+ *                                           If omitted, the initial open state is determined by using the "id" logic (inspecting the URL).
+ * @return {{isOpen: unknown, toggleOpen: (function(*): boolean)}} Hook object.
+ */
+export function useToggleState( { id = '', initiallyOpen = null } ) {
 	const [ isOpen, setIsOpen ] = useState(
 		determineInitialState( id, initiallyOpen )
 	);

From c6d7875fdaabc3e1bd1873e7eba22a5b0991668b Mon Sep 17 00:00:00 2001
From: Philipp Stracker <p.stracker@syde.com>
Date: Thu, 13 Feb 2025 16:24:54 +0100
Subject: [PATCH 17/48] =?UTF-8?q?=E2=9A=A1=EF=B8=8F=20Add=20useCallback=20?=
 =?UTF-8?q?to=20make=20hook=20more=20stable?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/js/hooks/useToggleState.js          | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/modules/ppcp-settings/resources/js/hooks/useToggleState.js b/modules/ppcp-settings/resources/js/hooks/useToggleState.js
index bc1ad0e98..030291e00 100644
--- a/modules/ppcp-settings/resources/js/hooks/useToggleState.js
+++ b/modules/ppcp-settings/resources/js/hooks/useToggleState.js
@@ -1,4 +1,4 @@
-import { useEffect, useState } from '@wordpress/element';
+import { useCallback, useEffect, useState } from '@wordpress/element';
 
 const checkIfCurrentTab = ( id ) => {
 	return id && window.location.hash === `#${ id }`;
@@ -38,11 +38,14 @@ export function useToggleState( { id = '', initiallyOpen = null } ) {
 		};
 	}, [ id ] );
 
-	const toggleOpen = ( ev ) => {
-		setIsOpen( ! isOpen );
-		ev?.preventDefault();
-		return false;
-	};
+	const toggleOpen = useCallback(
+		( ev ) => {
+			setIsOpen( ! isOpen );
+			ev?.preventDefault();
+			return false;
+		},
+		[ isOpen ]
+	);
 
 	return { isOpen, toggleOpen };
 }

From d28f4f07846b4ec359920806b8c891c536ef1867 Mon Sep 17 00:00:00 2001
From: Philipp Stracker <p.stracker@syde.com>
Date: Thu, 13 Feb 2025 16:28:24 +0100
Subject: [PATCH 18/48] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20Change=20hook=20prop?=
 =?UTF-8?q?s=20from=20object=20to=20argument=20list?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../js/Components/ReusableComponents/AccordionSection.js | 2 +-
 .../ppcp-settings/resources/js/hooks/useToggleState.js   | 9 ++++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/modules/ppcp-settings/resources/js/Components/ReusableComponents/AccordionSection.js b/modules/ppcp-settings/resources/js/Components/ReusableComponents/AccordionSection.js
index 379a16580..ca73ab531 100644
--- a/modules/ppcp-settings/resources/js/Components/ReusableComponents/AccordionSection.js
+++ b/modules/ppcp-settings/resources/js/Components/ReusableComponents/AccordionSection.js
@@ -21,7 +21,7 @@ const Accordion = ( {
 	children = null,
 	className = '',
 } ) => {
-	const { isOpen, toggleOpen } = useToggleState( { id, initiallyOpen } );
+	const { isOpen, toggleOpen } = useToggleState( id, initiallyOpen );
 	const wrapperClasses = classNames( 'ppcp-r-accordion', className, {
 		'ppcp--is-open': isOpen,
 	} );
diff --git a/modules/ppcp-settings/resources/js/hooks/useToggleState.js b/modules/ppcp-settings/resources/js/hooks/useToggleState.js
index 030291e00..a1ee750cc 100644
--- a/modules/ppcp-settings/resources/js/hooks/useToggleState.js
+++ b/modules/ppcp-settings/resources/js/hooks/useToggleState.js
@@ -14,13 +14,12 @@ const determineInitialState = ( id, initiallyOpen ) => {
 /**
  * Allows managing a toggle-able component, such as an accordion or a modal dialog.
  *
- * @param {Object}       props
- * @param {string}       props.id            - Optional, if provided, the toggle can be opened via the URL.
- * @param {null|boolean} props.initiallyOpen - Optional. If provided, it defines the initial open state.
- *                                           If omitted, the initial open state is determined by using the "id" logic (inspecting the URL).
+ * @param {string}       [id='']              - If provided, the toggle can be opened via the URL.
+ * @param {null|boolean} [initiallyOpen=null] - If provided, it defines the initial open state.
+ *                                            If omitted, the initial open state is determined by using the "id" logic (inspecting the URL).
  * @return {{isOpen: unknown, toggleOpen: (function(*): boolean)}} Hook object.
  */
-export function useToggleState( { id = '', initiallyOpen = null } ) {
+export function useToggleState( id = '', initiallyOpen = null ) {
 	const [ isOpen, setIsOpen ] = useState(
 		determineInitialState( id, initiallyOpen )
 	);

From 12316b10228e9a4f06f38f098fa97f65fba78d93 Mon Sep 17 00:00:00 2001
From: Philipp Stracker <p.stracker@syde.com>
Date: Thu, 13 Feb 2025 16:30:53 +0100
Subject: [PATCH 19/48] =?UTF-8?q?=E2=9C=A8=20Expose=20=E2=80=9CsetIsOpen?=
 =?UTF-8?q?=E2=80=9D=20action=20for=20toggle=20hook?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/ppcp-settings/resources/js/hooks/useToggleState.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/ppcp-settings/resources/js/hooks/useToggleState.js b/modules/ppcp-settings/resources/js/hooks/useToggleState.js
index a1ee750cc..ebad28575 100644
--- a/modules/ppcp-settings/resources/js/hooks/useToggleState.js
+++ b/modules/ppcp-settings/resources/js/hooks/useToggleState.js
@@ -46,5 +46,5 @@ export function useToggleState( id = '', initiallyOpen = null ) {
 		[ isOpen ]
 	);
 
-	return { isOpen, toggleOpen };
+	return { isOpen, setIsOpen, toggleOpen };
 }

From 3a096b832d73c71ad61b5c5a581b9e7c89054a90 Mon Sep 17 00:00:00 2001
From: Philipp Stracker <p.stracker@syde.com>
Date: Thu, 13 Feb 2025 16:32:18 +0100
Subject: [PATCH 20/48] =?UTF-8?q?=E2=9C=A8=20Trigger=20disconnect=20modal?=
 =?UTF-8?q?=20via=20URL=20hash?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Settings/Components/Settings/Parts/DisconnectButton.js     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/ppcp-settings/resources/js/Components/Screens/Settings/Components/Settings/Parts/DisconnectButton.js b/modules/ppcp-settings/resources/js/Components/Screens/Settings/Components/Settings/Parts/DisconnectButton.js
index 48fd6c226..6e17c428d 100644
--- a/modules/ppcp-settings/resources/js/Components/Screens/Settings/Components/Settings/Parts/DisconnectButton.js
+++ b/modules/ppcp-settings/resources/js/Components/Screens/Settings/Components/Settings/Parts/DisconnectButton.js
@@ -3,10 +3,11 @@ import { Button, Modal, ToggleControl } from '@wordpress/components';
 import { useCallback, useState } from '@wordpress/element';
 
 import { CommonHooks } from '../../../../../../data';
+import { useToggleState } from '../../../../../../hooks/useToggleState';
 import { HStack } from '../../../../../ReusableComponents/Stack';
 
 const DisconnectButton = () => {
-	const [ isOpen, setIsOpen ] = useState( false );
+	const { isOpen, setIsOpen } = useToggleState( 'disconnect-merchant' );
 	const [ resetFlag, setResetFlag ] = useState( false );
 	const { disconnectMerchant } = CommonHooks.useDisconnectMerchant();
 

From ec575f19d83bc4eb2d0324e230345777513a3e67 Mon Sep 17 00:00:00 2001
From: Philipp Stracker <p.stracker@syde.com>
Date: Thu, 13 Feb 2025 16:52:07 +0100
Subject: [PATCH 21/48] =?UTF-8?q?=F0=9F=93=9D=20Initial=20=E2=80=9Cdefault?=
 =?UTF-8?q?=20config=E2=80=9D=20documentation?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...pplying-default-values-after-onboarding.md | 54 +++++++++++++++++++
 1 file changed, 54 insertions(+)
 create mode 100644 modules/ppcp-settings/docs/applying-default-values-after-onboarding.md

diff --git a/modules/ppcp-settings/docs/applying-default-values-after-onboarding.md b/modules/ppcp-settings/docs/applying-default-values-after-onboarding.md
new file mode 100644
index 000000000..bfeefc65e
--- /dev/null
+++ b/modules/ppcp-settings/docs/applying-default-values-after-onboarding.md
@@ -0,0 +1,54 @@
+# Applying Default Configuration After Onboarding
+
+The `OnboardingProfile` has a property named `setup_done`, which indicated whether the default
+configuration was set up.
+
+### `OnboardingProfile::is_setup_done()`
+
+This flag indicated, whether the default plugin configuration was applied or not.
+It's set to true after the merchant's authentication attempt was successful, and settings were
+adjusted.
+
+The only way to reset this flag, is to enable the "**Start Over**" toggle and disconnecting the
+merchant:
+https://example.com/wp-admin/admin.php?page=wc-settings&tab=checkout&section=ppcp-gateway&panel=settings#disconnect-merchant
+
+### `class SettingsDataManager`
+
+The `SettingsDataManager` service is responsible for applying all defaults options at the end of the
+onboarding process.
+
+### `SettingsDataManager::set_defaults_for_new_merchant()`
+
+This method expects a DTO argument (`ConfigurationFlagsDTO`) that provides relevant details about
+the merchant and onboarding choices.
+
+It verifies, if default settings were already applied (by checking the
+`OnboardingProfile::is_setup_done()` state). If not done yet, the DTO object is inspected to
+initialize the plugin's configuration, before marking the `setup_done` flag as completed.
+
+## Default Settings Matrix
+
+### Payment Methods
+
+
+
+### Settings
+
+| Feature                     | Country | Seller-Type | Subscriptions | Cards | 
+|-----------------------------|---------|-------------|---------------|-------|
+| Pay Now Experience          | US      | _any_       | _any_         | _any_ |
+| Save PayPal and Venmo       | US      | Business    | ✅             | _any_ |
+| Save Credit and Debit Cards | US      | Business    | ✅             | ✅     |
+
+### Styling
+
+All US merchants use the same settings, regardless of any onboarding choices.
+
+| Button Location  | Enabled | Displayed Payment Methods                       |
+|------------------|---------|-------------------------------------------------|
+| Cart             | ✅       | PayPal, Venmo, Pay Later, Google Pay, Apple Pay |
+| Classic Checkout | ✅       | PayPal, Venmo, Pay Later, Google Pay, Apple Pay |
+| Express Checkout | ✅       | PayPal, Venmo, Pay Later, Google Pay, Apple Pay |
+| Mini Cart        | ✅       | PayPal, Venmo, Pay Later, Google Pay, Apple Pay |
+| Product Page     | ✅       | PayPal, Venmo, Pay Later                        |

From c272ba00ca435b9d629f6fc594aa1c62bd150f28 Mon Sep 17 00:00:00 2001
From: Philipp Stracker <p.stracker@syde.com>
Date: Thu, 13 Feb 2025 17:26:00 +0100
Subject: [PATCH 22/48] =?UTF-8?q?=F0=9F=93=9D=20Improve=20configuration=20?=
 =?UTF-8?q?documentation?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...pplying-default-values-after-onboarding.md | 23 +++++++++++++++----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/modules/ppcp-settings/docs/applying-default-values-after-onboarding.md b/modules/ppcp-settings/docs/applying-default-values-after-onboarding.md
index bfeefc65e..b62921811 100644
--- a/modules/ppcp-settings/docs/applying-default-values-after-onboarding.md
+++ b/modules/ppcp-settings/docs/applying-default-values-after-onboarding.md
@@ -31,15 +31,28 @@ initialize the plugin's configuration, before marking the `setup_done` flag as c
 
 ### Payment Methods
 
+By default, all payment methods are turned off after onboarding, unless the conditions specified in
+the following table are met.
 
+| Payment Method | Country | Seller Type | Subscriptions | Cards | Notes                         |
+|----------------|---------|-------------|---------------|-------|-------------------------------|
+| Venmo          | US      | *any*       | *any*         | *any* | Always                        |
+| Pay Later      | US      | *any*       | *any*         | *any* | Always                        |
+| ACDC           | US      | Business    | *any*         | ✅     | Greyed out for Casual Sellers |
+| BCDC           | US      | *any*       | *any*         | ✅     |                               |
+| Apple Pay      | US      | Business    | *any*         | ✅     | Based on feature eligibility  |
+| Google Pay     | US      | Business    | *any*         | ✅     | Based on feature eligibility  |
+| All APMs       | US      | Business    | *any*         | ✅     | Based on feature eligibility  |
 
 ### Settings
 
-| Feature                     | Country | Seller-Type | Subscriptions | Cards | 
-|-----------------------------|---------|-------------|---------------|-------|
-| Pay Now Experience          | US      | _any_       | _any_         | _any_ |
-| Save PayPal and Venmo       | US      | Business    | ✅             | _any_ |
-| Save Credit and Debit Cards | US      | Business    | ✅             | ✅     |
+| Feature                     | Country | Seller-Type | Subscriptions | Cards | Notes                      |
+|-----------------------------|---------|-------------|---------------|-------|----------------------------|
+| Pay Now Experience          | US      | _any_       | _any_         | _any_ |                            |
+| Save PayPal and Venmo       | US      | Business    | ✅             | _any_ |                            |
+| Save Credit and Debit Cards | US      | Business    | ✅             | ✅     | Requires ACDC eligibility* |
+
+- `*` If merchant has no ACDC eligibility, the setting should be disabled (not toggleable).
 
 ### Styling
 

From 9a4d79d1358b89cbdff4410189b35af35fe779f8 Mon Sep 17 00:00:00 2001
From: Philipp Stracker <p.stracker@syde.com>
Date: Thu, 13 Feb 2025 17:31:43 +0100
Subject: [PATCH 23/48] =?UTF-8?q?=F0=9F=93=9D=20Additional=20documentatoin?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../applying-default-values-after-onboarding.md    | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/modules/ppcp-settings/docs/applying-default-values-after-onboarding.md b/modules/ppcp-settings/docs/applying-default-values-after-onboarding.md
index b62921811..37d7ca4e9 100644
--- a/modules/ppcp-settings/docs/applying-default-values-after-onboarding.md
+++ b/modules/ppcp-settings/docs/applying-default-values-after-onboarding.md
@@ -29,6 +29,20 @@ initialize the plugin's configuration, before marking the `setup_done` flag as c
 
 ## Default Settings Matrix
 
+### Decision Flags
+
+- **Country**: The merchant country.
+	- According to PayPal settings, not the WooCommerce country
+	- Test case: Set Woo country to Germany and sign in with a US merchant account; this should
+	  trigger the "Country: US" branches below.
+- **Seller Type**: Business or Casual.
+	- According to PayPal, not the onboarding choice
+	- Test case: Choose "Personal" during onboarding but log in with a business account; this should
+	  trigger the "Account: Business" branches below.
+- **Subscriptions**: An onboarding choice on the "Products" screen.
+- **Cards**: An onboarding choice, on the "Checkout Options" screen.
+	- Refers to the first option on the checkout options screen ("Custom Card Fields", etc.)
+
 ### Payment Methods
 
 By default, all payment methods are turned off after onboarding, unless the conditions specified in

From 645ac3da38b974ebd9c4d8b696cb1385523bfe1f Mon Sep 17 00:00:00 2001
From: Philipp Stracker <p.stracker@syde.com>
Date: Thu, 13 Feb 2025 17:36:54 +0100
Subject: [PATCH 24/48] =?UTF-8?q?=F0=9F=93=9D=20Extend=20documentation?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../applying-default-values-after-onboarding.md   | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/modules/ppcp-settings/docs/applying-default-values-after-onboarding.md b/modules/ppcp-settings/docs/applying-default-values-after-onboarding.md
index 37d7ca4e9..851fcc3c4 100644
--- a/modules/ppcp-settings/docs/applying-default-values-after-onboarding.md
+++ b/modules/ppcp-settings/docs/applying-default-values-after-onboarding.md
@@ -70,7 +70,7 @@ the following table are met.
 
 ### Styling
 
-All US merchants use the same settings, regardless of any onboarding choices.
+All US merchants use the same settings, regardless of onboarding choices.
 
 | Button Location  | Enabled | Displayed Payment Methods                       |
 |------------------|---------|-------------------------------------------------|
@@ -79,3 +79,16 @@ All US merchants use the same settings, regardless of any onboarding choices.
 | Express Checkout | ✅       | PayPal, Venmo, Pay Later, Google Pay, Apple Pay |
 | Mini Cart        | ✅       | PayPal, Venmo, Pay Later, Google Pay, Apple Pay |
 | Product Page     | ✅       | PayPal, Venmo, Pay Later                        |
+
+### Pay Later Messaging
+
+All US merchants use the same settings, regardless of onboarding choices.
+
+| Location          | Enabled |
+|-------------------|---------|
+| Product           | ✅       |
+| Cart              | ✅       |
+| Checkout          | ✅       |
+| Home              | ❌       |
+| Shop              | ❌       |
+| WooCommerce Block | ❌       |

From 7908a1c56a7fbbc25ec8c3b3d8ff396ef2755435 Mon Sep 17 00:00:00 2001
From: Philipp Stracker <p.stracker@syde.com>
Date: Thu, 13 Feb 2025 19:05:26 +0100
Subject: [PATCH 25/48] =?UTF-8?q?=E2=9C=A8=20New=20definition=20service=20?=
 =?UTF-8?q?for=20payment=20method=20config?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/ppcp-settings/services.php            |   6 +
 .../Definition/PaymentMethodsDefinition.php   | 466 ++++++++++++++++++
 2 files changed, 472 insertions(+)
 create mode 100644 modules/ppcp-settings/src/Data/Definition/PaymentMethodsDefinition.php

diff --git a/modules/ppcp-settings/services.php b/modules/ppcp-settings/services.php
index 9bc845589..acb7a7217 100644
--- a/modules/ppcp-settings/services.php
+++ b/modules/ppcp-settings/services.php
@@ -39,6 +39,7 @@ use WooCommerce\PayPalCommerce\Settings\Service\TodosEligibilityService;
 use WooCommerce\PayPalCommerce\Vendor\Psr\Container\ContainerInterface;
 use WooCommerce\PayPalCommerce\Settings\Service\DataSanitizer;
 use WooCommerce\PayPalCommerce\Settings\Service\SettingsDataManager;
+use WooCommerce\PayPalCommerce\Settings\Data\Definition\PaymentMethodsDefinition;
 
 return array(
 	'settings.url'                                => static function ( ContainerInterface $container ) : string {
@@ -282,6 +283,11 @@ return array(
 			$container->get( 'settings.data.general' )
 		);
 	},
+	'settings.data.definition.methods'            => static function ( ContainerInterface $container ) : PaymentMethodsDefinition {
+		return new PaymentMethodsDefinition(
+			$container->get( 'settings.data.payment' ),
+		);
+	},
 	'settings.service.todos_eligibilities'        => static function ( ContainerInterface $container ) : TodosEligibilityService {
 		$features = apply_filters(
 			'woocommerce_paypal_payments_rest_common_merchant_features',
diff --git a/modules/ppcp-settings/src/Data/Definition/PaymentMethodsDefinition.php b/modules/ppcp-settings/src/Data/Definition/PaymentMethodsDefinition.php
new file mode 100644
index 000000000..56d8cf988
--- /dev/null
+++ b/modules/ppcp-settings/src/Data/Definition/PaymentMethodsDefinition.php
@@ -0,0 +1,466 @@
+<?php
+/**
+ * PayPal Commerce Todos Definitions
+ *
+ * @package WooCommerce\PayPalCommerce\Settings\Data\Definition
+ */
+
+declare( strict_types = 1 );
+
+namespace WooCommerce\PayPalCommerce\Settings\Data\Definition;
+
+use WooCommerce\PayPalCommerce\Applepay\ApplePayGateway;
+use WooCommerce\PayPalCommerce\Axo\Gateway\AxoGateway;
+use WooCommerce\PayPalCommerce\Googlepay\GooglePayGateway;
+use WooCommerce\PayPalCommerce\LocalAlternativePaymentMethods\BancontactGateway;
+use WooCommerce\PayPalCommerce\LocalAlternativePaymentMethods\BlikGateway;
+use WooCommerce\PayPalCommerce\LocalAlternativePaymentMethods\EPSGateway;
+use WooCommerce\PayPalCommerce\LocalAlternativePaymentMethods\IDealGateway;
+use WooCommerce\PayPalCommerce\LocalAlternativePaymentMethods\MultibancoGateway;
+use WooCommerce\PayPalCommerce\LocalAlternativePaymentMethods\MyBankGateway;
+use WooCommerce\PayPalCommerce\LocalAlternativePaymentMethods\P24Gateway;
+use WooCommerce\PayPalCommerce\LocalAlternativePaymentMethods\TrustlyGateway;
+use WooCommerce\PayPalCommerce\Settings\Data\PaymentSettings;
+use WooCommerce\PayPalCommerce\WcGateway\Gateway\CardButtonGateway;
+use WooCommerce\PayPalCommerce\WcGateway\Gateway\CreditCardGateway;
+use WooCommerce\PayPalCommerce\WcGateway\Gateway\OXXO\OXXO;
+use WooCommerce\PayPalCommerce\WcGateway\Gateway\PayPalGateway;
+use WooCommerce\PayPalCommerce\WcGateway\Gateway\PayUponInvoice\PayUponInvoiceGateway;
+
+/**
+ * Class PaymentMethodsDefinition
+ *
+ * Provides a list of all payment methods that are available in the settings UI.
+ */
+class PaymentMethodsDefinition {
+	/**
+	 * Data model that manages the payment method configuration.
+	 *
+	 * @var PaymentSettings
+	 */
+	private PaymentSettings $settings;
+
+	/**
+	 * List of WooCommerce payment gateways.
+	 *
+	 * @var array|null
+	 */
+	private ?array $wc_gateways = null;
+
+	/**
+	 * Constructor.
+	 *
+	 * @param PaymentSettings $settings Payment methods data model.
+	 */
+	public function __construct( PaymentSettings $settings ) {
+		$this->settings = $settings;
+	}
+
+	/**
+	 * Returns the payment method definitions.
+	 *
+	 * @return array
+	 */
+	public function get_definitions() : array {
+		// Refresh the WooCommerce gateway details before we build the definitions.
+		$this->wc_gateways = WC()->payment_gateways()->payment_gateways();
+
+		$paypal_methods = $this->group_paypal_methods();
+		$card_methods   = $this->group_card_methods();
+		$apm_methods    = $this->group_apms();
+
+		$all_methods = array_merge( $paypal_methods, $card_methods, $apm_methods );
+
+		$result = array();
+		foreach ( $all_methods as $method ) {
+			$result[ $method['id'] ] = $method;
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Returns a new payment method configuration array that contains all
+	 * common attributes which must be present in every method definition.
+	 *
+	 * @param string $gateway_id  The payment method ID.
+	 * @param string $title       Admin-side payment method title.
+	 * @param string $description Admin-side info about the payment method.
+	 * @param string $icon        Admin-side icon of the payment method.
+	 * @return array Payment method definition.
+	 */
+	private function define_common_fields( string $gateway_id, string $title, string $description, string $icon ) : array {
+		$gateway = $this->wc_gateways[ $gateway_id ] ?? null;
+
+		return array(
+			'id'              => $gateway_id,
+			'title'           => $title,
+			'description'     => $description,
+			'icon'            => $icon,
+			'itemTitle'       => $title,
+			'itemDescription' => $description,
+			'fields'          => array(
+				'checkoutPageTitle'       => array(
+					'type'    => 'text',
+					'default' => $gateway ? $gateway->get_title() : '',
+					'label'   => __( 'Checkout page title', 'woocommerce-paypal-payments' ),
+				),
+				'checkoutPageDescription' => array(
+					'type'    => 'text',
+					'default' => $gateway ? $gateway->get_description() : '',
+					'label'   => __( 'Checkout page description', 'woocommerce-paypal-payments' ),
+				),
+			),
+		);
+	}
+
+	// Payment method groups.
+
+	/**
+	 * Define PayPal related payment methods.
+	 *
+	 * @return array
+	 */
+	private function group_paypal_methods() : array {
+		return array(
+			$this->define_paypal(),
+			$this->define_venmo(),
+			$this->define_pay_later(),
+			$this->define_card_button(),
+		);
+	}
+
+	/**
+	 * Define card related payment methods.
+	 *
+	 * @return array
+	 */
+	private function group_card_methods() : array {
+		return array(
+			$this->define_advanced_cards(),
+			$this->define_axo(),
+			$this->define_apple_pay(),
+			$this->define_google_pay(),
+		);
+	}
+
+	/**
+	 * Builds an array of payment method definitions, which includes details
+	 * of all APM gateways.
+	 *
+	 * @return array List of payment method definitions.
+	 */
+	private function group_apms() : array {
+		$apm_list = array(
+			array(
+				'id'          => BancontactGateway::ID,
+				'title'       => __( 'Bancontact', 'woocommerce-paypal-payments' ),
+				'description' => __(
+					'Bancontact is the most widely used, accepted and trusted electronic payment method in Belgium. Bancontact makes it possible to pay directly through the online payment systems of all major Belgian banks.',
+					'woocommerce-paypal-payments'
+				),
+				'icon'        => 'payment-method-bancontact',
+			),
+			array(
+				'id'          => BlikGateway::ID,
+				'title'       => __( 'BLIK', 'woocommerce-paypal-payments' ),
+				'description' => __(
+					'A widely used mobile payment method in Poland, allowing Polish customers to pay directly via their banking apps. Transactions are processed in PLN.',
+					'woocommerce-paypal-payments'
+				),
+				'icon'        => 'payment-method-blik',
+			),
+			array(
+				'id'          => EPSGateway::ID,
+				'title'       => __( 'eps', 'woocommerce-paypal-payments' ),
+				'description' => __(
+					'An online payment method in Austria, enabling Austrian buyers to make secure payments directly through their bank accounts. Transactions are processed in EUR.',
+					'woocommerce-paypal-payments'
+				),
+				'icon'        => 'payment-method-eps',
+			),
+			array(
+				'id'          => IDealGateway::ID,
+				'title'       => __( 'iDEAL', 'woocommerce-paypal-payments' ),
+				'description' => __(
+					'iDEAL is a payment method in the Netherlands that allows buyers to select their issuing bank from a list of options.',
+					'woocommerce-paypal-payments'
+				),
+				'icon'        => 'payment-method-ideal',
+			),
+			array(
+				'id'          => MyBankGateway::ID,
+				'title'       => __( 'MyBank', 'woocommerce-paypal-payments' ),
+				'description' => __(
+					'A European online banking payment solution primarily used in Italy, enabling customers to make secure bank transfers during checkout. Transactions are processed in EUR.',
+					'woocommerce-paypal-payments'
+				),
+				'icon'        => 'payment-method-mybank',
+			),
+			array(
+				'id'          => P24Gateway::ID,
+				'title'       => __( 'Przelewy24', 'woocommerce-paypal-payments' ),
+				'description' => __(
+					'A popular online payment gateway in Poland, offering various payment options for Polish customers. Transactions can be processed in PLN or EUR.',
+					'woocommerce-paypal-payments'
+				),
+				'icon'        => 'payment-method-przelewy24',
+			),
+			array(
+				'id'          => TrustlyGateway::ID,
+				'title'       => __( 'Trustly', 'woocommerce-paypal-payments' ),
+				'description' => __(
+					'A European payment method that allows buyers to make payments directly from their bank accounts, suitable for customers across multiple European countries. Supported currencies include EUR, DKK, SEK, GBP, and NOK.',
+					'woocommerce-paypal-payments'
+				),
+				'icon'        => 'payment-method-trustly',
+			),
+			array(
+				'id'          => MultibancoGateway::ID,
+				'title'       => __( 'Multibanco', 'woocommerce-paypal-payments' ),
+				'description' => __(
+					'An online payment method in Portugal, enabling Portuguese buyers to make secure payments directly through their bank accounts. Transactions are processed in EUR.',
+					'woocommerce-paypal-payments'
+				),
+				'icon'        => 'payment-method-multibanco',
+			),
+			array(
+				'id'          => PayUponInvoiceGateway::ID,
+				'title'       => __( 'Pay upon Invoice', 'woocommerce-paypal-payments' ),
+				'description' => __(
+					'Pay upon Invoice is an invoice payment method in Germany. It is a local buy now, pay later payment method that allows the buyer to place an order, receive the goods, try them, verify they are in good order, and then pay the invoice within 30 days.',
+					'woocommerce-paypal-payments'
+				),
+				'icon'        => '',
+			),
+			array(
+				'id'          => OXXO::ID,
+				'title'       => __( 'OXXO', 'woocommerce-paypal-payments' ),
+				'description' => __(
+					'OXXO is a Mexican chain of convenience stores. *Get PayPal account permission to use OXXO payment functionality by contacting us at (+52) 800–925–0304',
+					'woocommerce-paypal-payments'
+				),
+				'icon'        => 'payment-method-oxxo',
+			),
+		);
+
+		return array_map(
+			function ( $apm ) {
+				return $this->define_common_fields(
+					$apm['id'],
+					$apm['title'],
+					$apm['description'],
+					$apm['icon']
+				);
+			},
+			$apm_list
+		);
+	}
+
+	// Payment method specific definitions.
+
+	/**
+	 * Builds the payment method definition for PayPal.
+	 *
+	 * @return array Payment method definition.
+	 */
+	private function define_paypal() : array {
+		$gateway = $this->define_common_fields(
+			PayPalGateway::ID,
+			__( 'PayPal', 'woocommerce-paypal-payments' ),
+			__( 'Our all-in-one checkout solution lets you offer PayPal, Venmo, Pay Later options, and more to help maximize conversion.', 'woocommerce-paypal-payments' ),
+			'payment-method-paypal',
+		);
+
+		$gateway['fields'] = array_merge(
+			$gateway['fields'],
+			array(
+				'paypalShowLogo' => array(
+					'type'    => 'toggle',
+					'default' => $this->settings->get_paypal_show_logo(),
+					'label'   => __( 'Show logo', 'woocommerce-paypal-payments' ),
+				),
+			),
+		);
+
+		return $gateway;
+	}
+
+	/**
+	 * Builds the payment method definition for Venmo.
+	 *
+	 * @return array Payment method definition.
+	 */
+	private function define_venmo() : array {
+		$gateway = $this->define_common_fields(
+			'venmo',
+			__( 'Venmo', 'woocommerce-paypal-payments' ),
+			__(
+				'Offer Venmo at checkout to millions of active users.',
+				'woocommerce-paypal-payments'
+			),
+			'payment-method-venmo',
+		);
+
+		$gateway['enabled'] = $this->settings->get_venmo_enabled();
+		unset( $gateway['fields'] );
+
+		return $gateway;
+	}
+
+	/**
+	 * Builds the payment method definition for Pay Later.
+	 *
+	 * @return array Payment method definition.
+	 */
+	private function define_pay_later() : array {
+		$gateway = $this->define_common_fields(
+			'pay-later',
+			__( 'Pay Later', 'woocommerce-paypal-payments' ),
+			__(
+				'Get paid in full at checkout while giving your customers the flexibility to pay in installments over time with no late fees.',
+				'woocommerce-paypal-payments'
+			),
+			'payment-method-paypal',
+		);
+
+		$gateway['enabled'] = $this->settings->get_paylater_enabled();
+		unset( $gateway['fields'] );
+
+		return $gateway;
+	}
+
+	/**
+	 * Builds the payment method definition for Credit Card Button.
+	 *
+	 * @return array Payment method definition.
+	 */
+	private function define_card_button() : array {
+		return $this->define_common_fields(
+			CardButtonGateway::ID,
+			__( 'Credit and debit card payments', 'woocommerce-paypal-payments' ),
+			__( "Accept all major credit and debit cards - even if your customer doesn't have a PayPal account.", 'woocommerce-paypal-payments' ),
+			'payment-method-cards',
+		);
+	}
+
+	/**
+	 * Builds the payment method definition for Advanced Card Payments.
+	 *
+	 * @return array Payment method definition.
+	 */
+	private function define_advanced_cards() : array {
+		$gateway = $this->define_common_fields(
+			CreditCardGateway::ID,
+			__( 'Advanced Credit and Debit Card Payments', 'woocommerce-paypal-payments' ),
+			__( "Present custom credit and debit card fields to your payers so they can pay with credit and debit cards using your site's branding.", 'woocommerce-paypal-payments' ),
+			'payment-method-advanced-cards',
+		);
+
+		$gateway['fields'] = array_merge(
+			$gateway['fields'],
+			array(
+				'threeDSecure' => array(
+					'type'        => 'radio',
+					'default'     => $this->settings->get_three_d_secure(),
+					'label'       => __( '3D Secure', 'woocommerce-paypal-payments' ),
+					'description' => __(
+						'Authenticate cardholders through their card issuers to reduce fraud and improve transaction security. Successful 3D Secure authentication can shift liability for fraudulent chargebacks to the card issuer.',
+						'woocommerce-paypal-payments'
+					),
+					'options'     => array(
+						array(
+							'label' => __(
+								'No 3D Secure',
+								'woocommerce-paypal-payments'
+							),
+							'value' => 'no-3d-secure',
+						),
+						array(
+							'label' => __(
+								'Only when required',
+								'woocommerce-paypal-payments'
+							),
+							'value' => 'only-required-3d-secure',
+						),
+						array(
+							'label' => __(
+								'Always require 3D Secure',
+								'woocommerce-paypal-payments'
+							),
+							'value' => 'always-3d-secure',
+						),
+					),
+				),
+			),
+		);
+
+		return $gateway;
+	}
+
+	/**
+	 * Builds the payment method definition for Fastlane.
+	 *
+	 * @return array Payment method definition.
+	 */
+	private function define_axo() : array {
+		$gateway = $this->define_common_fields(
+			AxoGateway::ID,
+			__( 'Fastlane by PayPal', 'woocommerce-paypal-payments' ),
+			__( "Tap into the scale and trust of PayPal's customer network to recognize shoppers and make guest checkout more seamless than ever.", 'woocommerce-paypal-payments' ),
+			'payment-method-fastlane'
+		);
+
+		$gateway['fields'] = array_merge(
+			$gateway['fields'],
+			array(
+				'fastlaneCardholderName'   => array(
+					'type'    => 'toggle',
+					'default' => $this->settings->get_fastlane_cardholder_name(),
+					'label'   => __(
+						'Display cardholder name',
+						'woocommerce-paypal-payments'
+					),
+				),
+				'fastlaneDisplayWatermark' => array(
+					'type'    => 'toggle',
+					'default' => $this->settings->get_fastlane_display_watermark(),
+					'label'   => __(
+						'Display Fastlane Watermark',
+						'woocommerce-paypal-payments'
+					),
+				),
+			),
+		);
+
+		return $gateway;
+	}
+
+	/**
+	 * Builds the payment method definition for Apple Pay.
+	 *
+	 * @return array Payment method definition.
+	 */
+	private function define_apple_pay() : array {
+		return $this->define_common_fields(
+			ApplePayGateway::ID,
+			__( 'Apple Pay', 'woocommerce-paypal-payments' ),
+			__( 'Allow customers to pay via their Apple Pay digital wallet.', 'woocommerce-paypal-payments' ),
+			'payment-method-apple-pay',
+		);
+	}
+
+	/**
+	 * Builds the payment method definition for Google Pay.
+	 *
+	 * @return array Payment method definition.
+	 */
+	private function define_google_pay() : array {
+		return $this->define_common_fields(
+			GooglePayGateway::ID,
+			__( 'Google Pay', 'woocommerce-paypal-payments' ),
+			__( 'Allow customers to pay via their Google Pay digital wallet.', 'woocommerce-paypal-payments' ),
+			'payment-method-google-pay',
+		);
+	}
+}

From b5d717cac0a9474656ca17587d461b47c74b6963 Mon Sep 17 00:00:00 2001
From: Philipp Stracker <p.stracker@syde.com>
Date: Thu, 13 Feb 2025 19:06:12 +0100
Subject: [PATCH 26/48] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20Use=20new=20definiti?=
 =?UTF-8?q?on=20service=20in=20REST=20endpoint?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/ppcp-settings/services.php            |   5 +-
 .../src/Endpoint/PaymentRestEndpoint.php      | 595 ++----------------
 2 files changed, 39 insertions(+), 561 deletions(-)

diff --git a/modules/ppcp-settings/services.php b/modules/ppcp-settings/services.php
index acb7a7217..bc4ec4de3 100644
--- a/modules/ppcp-settings/services.php
+++ b/modules/ppcp-settings/services.php
@@ -109,7 +109,10 @@ return array(
 		return new CommonRestEndpoint( $container->get( 'settings.data.general' ) );
 	},
 	'settings.rest.payment'                       => static function ( ContainerInterface $container ) : PaymentRestEndpoint {
-		return new PaymentRestEndpoint( $container->get( 'settings.data.payment' ) );
+		return new PaymentRestEndpoint(
+			$container->get( 'settings.data.payment' ),
+			$container->get( 'settings.data.definition.methods' )
+		);
 	},
 	'settings.rest.styling'                       => static function ( ContainerInterface $container ) : StylingRestEndpoint {
 		return new StylingRestEndpoint(
diff --git a/modules/ppcp-settings/src/Endpoint/PaymentRestEndpoint.php b/modules/ppcp-settings/src/Endpoint/PaymentRestEndpoint.php
index 5047b484d..3f4bf6c0e 100644
--- a/modules/ppcp-settings/src/Endpoint/PaymentRestEndpoint.php
+++ b/modules/ppcp-settings/src/Endpoint/PaymentRestEndpoint.php
@@ -29,6 +29,7 @@ use WP_REST_Response;
 use WP_REST_Request;
 use WooCommerce\PayPalCommerce\Applepay\ApplePayGateway;
 use WooCommerce\PayPalCommerce\LocalAlternativePaymentMethods\EPSGateway;
+use WooCommerce\PayPalCommerce\Settings\Data\Definition\PaymentMethodsDefinition;
 
 /**
  * REST controller for the "Payment Methods" settings tab.
@@ -51,6 +52,13 @@ class PaymentRestEndpoint extends RestEndpoint {
 	 */
 	protected PaymentSettings $settings;
 
+	/**
+	 * The payment method details.
+	 *
+	 * @var PaymentMethodsDefinition
+	 */
+	protected PaymentMethodsDefinition $methods_definition;
+
 	/**
 	 * Field mapping for request to profile transformation.
 	 *
@@ -78,10 +86,12 @@ class PaymentRestEndpoint extends RestEndpoint {
 	/**
 	 * Constructor.
 	 *
-	 * @param PaymentSettings $settings The settings instance.
+	 * @param PaymentSettings          $settings           The settings instance.
+	 * @param PaymentMethodsDefinition $methods_definition Payment Method details.
 	 */
-	public function __construct( PaymentSettings $settings ) {
-		$this->settings = $settings;
+	public function __construct( PaymentSettings $settings, PaymentMethodsDefinition $methods_definition ) {
+		$this->settings           = $settings;
+		$this->methods_definition = $methods_definition;
 	}
 
 	/**
@@ -89,515 +99,8 @@ class PaymentRestEndpoint extends RestEndpoint {
 	 *
 	 * @return array[]
 	 */
-	protected function gateways():array {
-		return array(
-			// PayPal checkout.
-			PayPalGateway::ID         => array(
-				'id'              => PayPalGateway::ID,
-				'title'           => __( 'PayPal', 'woocommerce-paypal-payments' ),
-				'description'     => __(
-					'Our all-in-one checkout solution lets you offer PayPal, Venmo, Pay Later options, and more to help maximize conversion.',
-					'woocommerce-paypal-payments'
-				),
-				'icon'            => 'payment-method-paypal',
-				'itemTitle'       => __( 'PayPal', 'woocommerce-paypal-payments' ),
-				'itemDescription' => __(
-					'Our all-in-one checkout solution lets you offer PayPal, Venmo, Pay Later options, and more to help maximize conversion.',
-					'woocommerce-paypal-payments'
-				),
-				'fields'          => array(
-					'checkoutPageTitle'       => array(
-						'type'    => 'text',
-						'default' => $this->getPaymentTitle( PayPalGateway::ID ) ?? '',
-						'label'   => __( 'Checkout page title', 'woocommerce-paypal-payments' ),
-					),
-					'checkoutPageDescription' => array(
-						'type'    => 'text',
-						'default' => $this->getPaymentDescription( PayPalGateway::ID ) ?? '',
-						'label'   => __( 'Checkout page description', 'woocommerce-paypal-payments' ),
-					),
-					'paypalShowLogo'          => array(
-						'type'    => 'toggle',
-						'default' => $this->settings->get_paypal_show_logo(),
-						'label'   => __( 'Show logo', 'woocommerce-paypal-payments' ),
-					),
-				),
-			),
-			'venmo'                   => array(
-				'id'              => 'venmo',
-				'itemTitle'       => __( 'Venmo', 'woocommerce-paypal-payments' ),
-				'itemDescription' => __(
-					'Offer Venmo at checkout to millions of active users.',
-					'woocommerce-paypal-payments'
-				),
-				'icon'            => 'payment-method-venmo',
-				'enabled'         => $this->settings->get_venmo_enabled(),
-			),
-			'pay-later'               => array(
-				'id'              => 'pay-later',
-				'itemTitle'       => __( 'Pay Later', 'woocommerce-paypal-payments' ),
-				'itemDescription' => __(
-					'Get paid in full at checkout while giving your customers the flexibility to pay in installments over time with no late fees.',
-					'woocommerce-paypal-payments'
-				),
-				'icon'            => 'payment-method-paypal',
-				'enabled'         => $this->settings->get_paylater_enabled(),
-			),
-			CardButtonGateway::ID     => array(
-				'id'              => CardButtonGateway::ID,
-				'title'           => __(
-					'Credit and debit card payments',
-					'woocommerce-paypal-payments'
-				),
-				'description'     => __(
-					"Accept all major credit and debit cards - even if your customer doesn't have a PayPal account.",
-					'woocommerce-paypal-payments'
-				),
-				'icon'            => 'payment-method-cards',
-				'itemTitle'       => __(
-					'Credit and debit card payments',
-					'woocommerce-paypal-payments'
-				),
-				'itemDescription' => __(
-					"Accept all major credit and debit cards - even if your customer doesn't have a PayPal account.",
-					'woocommerce-paypal-payments'
-				),
-				'fields'          => array(
-					'checkoutPageTitle'       => array(
-						'type'    => 'text',
-						'default' => $this->getPaymentTitle( CardButtonGateway::ID ) ?? '',
-						'label'   => __( 'Checkout page title', 'woocommerce-paypal-payments' ),
-					),
-					'checkoutPageDescription' => array(
-						'type'    => 'text',
-						'default' => $this->getPaymentDescription( CardButtonGateway::ID ) ?? '',
-						'label'   => __( 'Checkout page description', 'woocommerce-paypal-payments' ),
-					),
-				),
-			),
-
-			// Online card Payments.
-			CreditCardGateway::ID     => array(
-				'id'              => CreditCardGateway::ID,
-				'title'           => __(
-					'Advanced Credit and Debit Card Payments',
-					'woocommerce-paypal-payments'
-				),
-				'description'     => __(
-					"Present custom credit and debit card fields to your payers so they can pay with credit and debit cards using your site's branding.",
-					'woocommerce-paypal-payments'
-				),
-				'icon'            => 'payment-method-advanced-cards',
-				'itemTitle'       => __(
-					'Advanced Credit and Debit Card Payments',
-					'woocommerce-paypal-payments'
-				),
-				'itemDescription' => __(
-					"Present custom credit and debit card fields to your payers so they can pay with credit and debit cards using your site's branding.",
-					'woocommerce-paypal-payments'
-				),
-				'fields'          => array(
-					'checkoutPageTitle'       => array(
-						'type'    => 'text',
-						'default' => $this->getPaymentTitle( CreditCardGateway::ID ) ?? '',
-						'label'   => __( 'Checkout page title', 'woocommerce-paypal-payments' ),
-					),
-					'checkoutPageDescription' => array(
-						'type'    => 'text',
-						'default' => $this->getPaymentDescription( CreditCardGateway::ID ) ?? '',
-						'label'   => __( 'Checkout page description', 'woocommerce-paypal-payments' ),
-					),
-					'threeDSecure'            => array(
-						'type'        => 'radio',
-						'default'     => $this->settings->get_three_d_secure(),
-						'label'       => __( '3D Secure', 'woocommerce-paypal-payments' ),
-						'description' => __(
-							'Authenticate cardholders through their card issuers to reduce fraud and improve transaction security. Successful 3D Secure authentication can shift liability for fraudulent chargebacks to the card issuer.',
-							'woocommerce-paypal-payments'
-						),
-						'options'     => array(
-							array(
-								'label' => __(
-									'No 3D Secure',
-									'woocommerce-paypal-payments'
-								),
-								'value' => 'no-3d-secure',
-							),
-							array(
-								'label' => __(
-									'Only when required',
-									'woocommerce-paypal-payments'
-								),
-								'value' => 'only-required-3d-secure',
-							),
-							array(
-								'label' => __(
-									'Always require 3D Secure',
-									'woocommerce-paypal-payments'
-								),
-								'value' => 'always-3d-secure',
-							),
-						),
-					),
-				),
-			),
-			AxoGateway::ID            => array(
-				'id'              => AxoGateway::ID,
-				'title'           => __( 'Fastlane by PayPal', 'woocommerce-paypal-payments' ),
-				'description'     => __(
-					"Tap into the scale and trust of PayPal's customer network to recognize shoppers and make guest checkout more seamless than ever.",
-					'woocommerce-paypal-payments'
-				),
-				'icon'            => 'payment-method-fastlane',
-				'itemTitle'       => __( 'Fastlane by PayPal', 'woocommerce-paypal-payments' ),
-				'itemDescription' => __(
-					"Tap into the scale and trust of PayPal's customer network to recognize shoppers and make guest checkout more seamless than ever.",
-					'woocommerce-paypal-payments'
-				),
-				'fields'          => array(
-					'checkoutPageTitle'        => array(
-						'type'    => 'text',
-						'default' => $this->getPaymentTitle( AxoGateway::ID ) ?? '',
-						'label'   => __( 'Checkout page title', 'woocommerce-paypal-payments' ),
-					),
-					'checkoutPageDescription'  => array(
-						'type'    => 'text',
-						'default' => $this->getPaymentDescription( AxoGateway::ID ) ?? '',
-						'label'   => __( 'Checkout page description', 'woocommerce-paypal-payments' ),
-					),
-					'fastlaneCardholderName'   => array(
-						'type'    => 'toggle',
-						'default' => $this->settings->get_fastlane_cardholder_name(),
-						'label'   => __(
-							'Display cardholder name',
-							'woocommerce-paypal-payments'
-						),
-					),
-					'fastlaneDisplayWatermark' => array(
-						'type'    => 'toggle',
-						'default' => $this->settings->get_fastlane_display_watermark(),
-						'label'   => __(
-							'Display Fastlane Watermark',
-							'woocommerce-paypal-payments'
-						),
-					),
-				),
-			),
-			ApplePayGateway::ID       => array(
-				'id'              => ApplePayGateway::ID,
-				'title'           => __( 'Apple Pay', 'woocommerce-paypal-payments' ),
-				'description'     => __(
-					'Allow customers to pay via their Apple Pay digital wallet.',
-					'woocommerce-paypal-payments'
-				),
-				'icon'            => 'payment-method-apple-pay',
-				'itemTitle'       => __( 'Apple Pay', 'woocommerce-paypal-payments' ),
-				'itemDescription' => __(
-					'Allow customers to pay via their Apple Pay digital wallet.',
-					'woocommerce-paypal-payments'
-				),
-				'fields'          => array(
-					'checkoutPageTitle'       => array(
-						'type'    => 'text',
-						'default' => $this->getPaymentTitle( ApplePayGateway::ID ) ?? '',
-						'label'   => __( 'Checkout page title', 'woocommerce-paypal-payments' ),
-					),
-					'checkoutPageDescription' => array(
-						'type'    => 'text',
-						'default' => $this->getPaymentDescription( ApplePayGateway::ID ) ?? '',
-						'label'   => __( 'Checkout page description', 'woocommerce-paypal-payments' ),
-					),
-				),
-			),
-			GooglePayGateway::ID      => array(
-				'id'              => GooglePayGateway::ID,
-				'title'           => __( 'Google Pay', 'woocommerce-paypal-payments' ),
-				'description'     => __(
-					'Allow customers to pay via their Google Pay digital wallet.',
-					'woocommerce-paypal-payments'
-				),
-				'icon'            => 'payment-method-google-pay',
-				'itemTitle'       => __( 'Google Pay', 'woocommerce-paypal-payments' ),
-				'itemDescription' => __(
-					'Allow customers to pay via their Google Pay digital wallet.',
-					'woocommerce-paypal-payments'
-				),
-				'fields'          => array(
-					'checkoutPageTitle'       => array(
-						'type'    => 'text',
-						'default' => $this->getPaymentTitle( GooglePayGateway::ID ) ?? '',
-						'label'   => __( 'Checkout page title', 'woocommerce-paypal-payments' ),
-					),
-					'checkoutPageDescription' => array(
-						'type'    => 'text',
-						'default' => $this->getPaymentDescription( GooglePayGateway::ID ) ?? '',
-						'label'   => __( 'Checkout page description', 'woocommerce-paypal-payments' ),
-					),
-				),
-			),
-
-			// Alternative payment methods.
-			BancontactGateway::ID     => array(
-				'id'              => BancontactGateway::ID,
-				'title'           => __( 'Bancontact', 'woocommerce-paypal-payments' ),
-				'description'     => __(
-					'Bancontact is the most widely used, accepted and trusted electronic payment method in Belgium. Bancontact makes it possible to pay directly through the online payment systems of all major Belgian banks.',
-					'woocommerce-paypal-payments'
-				),
-				'icon'            => 'payment-method-bancontact',
-				'itemTitle'       => __( 'Bancontact', 'woocommerce-paypal-payments' ),
-				'itemDescription' => __(
-					'Bancontact is the most widely used, accepted and trusted electronic payment method in Belgium. Bancontact makes it possible to pay directly through the online payment systems of all major Belgian banks.',
-					'woocommerce-paypal-payments'
-				),
-				'fields'          => array(
-					'checkoutPageTitle'       => array(
-						'type'    => 'text',
-						'default' => $this->getPaymentTitle( BancontactGateway::ID ) ?? '',
-						'label'   => __( 'Checkout page title', 'woocommerce-paypal-payments' ),
-					),
-					'checkoutPageDescription' => array(
-						'type'    => 'text',
-						'default' => $this->getPaymentDescription( BancontactGateway::ID ) ?? '',
-						'label'   => __( 'Checkout page description', 'woocommerce-paypal-payments' ),
-					),
-				),
-			),
-			BlikGateway::ID           => array(
-				'id'              => BlikGateway::ID,
-				'title'           => __( 'BLIK', 'woocommerce-paypal-payments' ),
-				'description'     => __(
-					'A widely used mobile payment method in Poland, allowing Polish customers to pay directly via their banking apps. Transactions are processed in PLN.',
-					'woocommerce-paypal-payments'
-				),
-				'icon'            => 'payment-method-blik',
-				'itemTitle'       => __( 'BLIK', 'woocommerce-paypal-payments' ),
-				'itemDescription' => __(
-					'A widely used mobile payment method in Poland, allowing Polish customers to pay directly via their banking apps. Transactions are processed in PLN.',
-					'woocommerce-paypal-payments'
-				),
-				'fields'          => array(
-					'checkoutPageTitle'       => array(
-						'type'    => 'text',
-						'default' => $this->getPaymentTitle( BlikGateway::ID ) ?? '',
-						'label'   => __( 'Checkout page title', 'woocommerce-paypal-payments' ),
-					),
-					'checkoutPageDescription' => array(
-						'type'    => 'text',
-						'default' => $this->getPaymentDescription( BlikGateway::ID ) ?? '',
-						'label'   => __( 'Checkout page description', 'woocommerce-paypal-payments' ),
-					),
-				),
-			),
-			EPSGateway::ID            => array(
-				'id'              => EPSGateway::ID,
-				'title'           => __( 'eps', 'woocommerce-paypal-payments' ),
-				'description'     => __(
-					'An online payment method in Austria, enabling Austrian buyers to make secure payments directly through their bank accounts. Transactions are processed in EUR.',
-					'woocommerce-paypal-payments'
-				),
-				'icon'            => 'payment-method-eps',
-				'itemTitle'       => __( 'eps', 'woocommerce-paypal-payments' ),
-				'itemDescription' => __(
-					'An online payment method in Austria, enabling Austrian buyers to make secure payments directly through their bank accounts. Transactions are processed in EUR.',
-					'woocommerce-paypal-payments'
-				),
-				'fields'          => array(
-					'checkoutPageTitle'       => array(
-						'type'    => 'text',
-						'default' => $this->getPaymentTitle( EPSGateway::ID ) ?? '',
-						'label'   => __( 'Checkout page title', 'woocommerce-paypal-payments' ),
-					),
-					'checkoutPageDescription' => array(
-						'type'    => 'text',
-						'default' => $this->getPaymentDescription( EPSGateway::ID ) ?? '',
-						'label'   => __( 'Checkout page description', 'woocommerce-paypal-payments' ),
-					),
-				),
-			),
-			IDealGateway::ID          => array(
-				'id'              => IDealGateway::ID,
-				'title'           => __( 'iDEAL', 'woocommerce-paypal-payments' ),
-				'description'     => __(
-					'iDEAL is a payment method in the Netherlands that allows buyers to select their issuing bank from a list of options.',
-					'woocommerce-paypal-payments'
-				),
-				'icon'            => 'payment-method-ideal',
-				'itemTitle'       => __( 'iDEAL', 'woocommerce-paypal-payments' ),
-				'itemDescription' => __(
-					'iDEAL is a payment method in the Netherlands that allows buyers to select their issuing bank from a list of options.',
-					'woocommerce-paypal-payments'
-				),
-				'fields'          => array(
-					'checkoutPageTitle'       => array(
-						'type'    => 'text',
-						'default' => $this->getPaymentTitle( IDealGateway::ID ) ?? '',
-						'label'   => __( 'Checkout page title', 'woocommerce-paypal-payments' ),
-					),
-					'checkoutPageDescription' => array(
-						'type'    => 'text',
-						'default' => $this->getPaymentDescription( IDealGateway::ID ) ?? '',
-						'label'   => __( 'Checkout page description', 'woocommerce-paypal-payments' ),
-					),
-				),
-			),
-			MyBankGateway::ID         => array(
-				'id'              => MyBankGateway::ID,
-				'title'           => __( 'MyBank', 'woocommerce-paypal-payments' ),
-				'description'     => __(
-					'A European online banking payment solution primarily used in Italy, enabling customers to make secure bank transfers during checkout. Transactions are processed in EUR.',
-					'woocommerce-paypal-payments'
-				),
-				'icon'            => 'payment-method-mybank',
-				'itemTitle'       => __( 'MyBank', 'woocommerce-paypal-payments' ),
-				'itemDescription' => __(
-					'A European online banking payment solution primarily used in Italy, enabling customers to make secure bank transfers during checkout. Transactions are processed in EUR.',
-					'woocommerce-paypal-payments'
-				),
-				'fields'          => array(
-					'checkoutPageTitle'       => array(
-						'type'    => 'text',
-						'default' => $this->getPaymentTitle( MyBankGateway::ID ) ?? '',
-						'label'   => __( 'Checkout page title', 'woocommerce-paypal-payments' ),
-					),
-					'checkoutPageDescription' => array(
-						'type'    => 'text',
-						'default' => $this->getPaymentDescription( MyBankGateway::ID ) ?? '',
-						'label'   => __( 'Checkout page description', 'woocommerce-paypal-payments' ),
-					),
-				),
-			),
-			P24Gateway::ID            => array(
-				'id'              => P24Gateway::ID,
-				'title'           => __( 'Przelewy24', 'woocommerce-paypal-payments' ),
-				'description'     => __(
-					'A popular online payment gateway in Poland, offering various payment options for Polish customers. Transactions can be processed in PLN or EUR.',
-					'woocommerce-paypal-payments'
-				),
-				'icon'            => 'payment-method-przelewy24',
-				'itemTitle'       => __( 'Przelewy24', 'woocommerce-paypal-payments' ),
-				'itemDescription' => __(
-					'A popular online payment gateway in Poland, offering various payment options for Polish customers. Transactions can be processed in PLN or EUR.',
-					'woocommerce-paypal-payments'
-				),
-				'fields'          => array(
-					'checkoutPageTitle'       => array(
-						'type'    => 'text',
-						'default' => $this->getPaymentTitle( P24Gateway::ID ) ?? '',
-						'label'   => __( 'Checkout page title', 'woocommerce-paypal-payments' ),
-					),
-					'checkoutPageDescription' => array(
-						'type'    => 'text',
-						'default' => $this->getPaymentDescription( P24Gateway::ID ) ?? '',
-						'label'   => __( 'Checkout page description', 'woocommerce-paypal-payments' ),
-					),
-				),
-			),
-			TrustlyGateway::ID        => array(
-				'id'              => TrustlyGateway::ID,
-				'title'           => __( 'Trustly', 'woocommerce-paypal-payments' ),
-				'description'     => __(
-					'A European payment method that allows buyers to make payments directly from their bank accounts, suitable for customers across multiple European countries. Supported currencies include EUR, DKK, SEK, GBP, and NOK.',
-					'woocommerce-paypal-payments'
-				),
-				'icon'            => 'payment-method-trustly',
-				'itemTitle'       => __( 'Trustly', 'woocommerce-paypal-payments' ),
-				'itemDescription' => __(
-					'A European payment method that allows buyers to make payments directly from their bank accounts, suitable for customers across multiple European countries. Supported currencies include EUR, DKK, SEK, GBP, and NOK.',
-					'woocommerce-paypal-payments'
-				),
-				'fields'          => array(
-					'checkoutPageTitle'       => array(
-						'type'    => 'text',
-						'default' => $this->getPaymentTitle( TrustlyGateway::ID ) ?? '',
-						'label'   => __( 'Checkout page title', 'woocommerce-paypal-payments' ),
-					),
-					'checkoutPageDescription' => array(
-						'type'    => 'text',
-						'default' => $this->getPaymentDescription( TrustlyGateway::ID ) ?? '',
-						'label'   => __( 'Checkout page description', 'woocommerce-paypal-payments' ),
-					),
-				),
-			),
-			MultibancoGateway::ID     => array(
-				'id'              => MultibancoGateway::ID,
-				'title'           => __( 'Multibanco', 'woocommerce-paypal-payments' ),
-				'description'     => __(
-					'An online payment method in Portugal, enabling Portuguese buyers to make secure payments directly through their bank accounts. Transactions are processed in EUR.',
-					'woocommerce-paypal-payments'
-				),
-				'icon'            => 'payment-method-multibanco',
-				'itemTitle'       => __( 'Multibanco', 'woocommerce-paypal-payments' ),
-				'itemDescription' => __(
-					'An online payment method in Portugal, enabling Portuguese buyers to make secure payments directly through their bank accounts. Transactions are processed in EUR.',
-					'woocommerce-paypal-payments'
-				),
-				'fields'          => array(
-					'checkoutPageTitle'       => array(
-						'type'    => 'text',
-						'default' => $this->getPaymentTitle( MultibancoGateway::ID ) ?? '',
-						'label'   => __( 'Checkout page title', 'woocommerce-paypal-payments' ),
-					),
-					'checkoutPageDescription' => array(
-						'type'    => 'text',
-						'default' => $this->getPaymentDescription( MultibancoGateway::ID ) ?? '',
-						'label'   => __( 'Checkout page description', 'woocommerce-paypal-payments' ),
-					),
-				),
-			),
-			PayUponInvoiceGateway::ID => array(
-				'id'              => PayUponInvoiceGateway::ID,
-				'title'           => __( 'Pay upon Invoice', 'woocommerce-paypal-payments' ),
-				'description'     => __(
-					'Pay upon Invoice is an invoice payment method in Germany. It is a local buy now, pay later payment method that allows the buyer to place an order, receive the goods, try them, verify they are in good order, and then pay the invoice within 30 days.',
-					'woocommerce-paypal-payments'
-				),
-				'icon'            => '',
-				'itemTitle'       => __( 'Pay upon Invoice', 'woocommerce-paypal-payments' ),
-				'itemDescription' => __(
-					'Pay upon Invoice is an invoice payment method in Germany. It is a local buy now, pay later payment method that allows the buyer to place an order, receive the goods, try them, verify they are in good order, and then pay the invoice within 30 days.',
-					'woocommerce-paypal-payments'
-				),
-				'fields'          => array(
-					'checkoutPageTitle'       => array(
-						'type'    => 'text',
-						'default' => $this->getPaymentTitle( PayUponInvoiceGateway::ID ) ?? '',
-						'label'   => __( 'Checkout page title', 'woocommerce-paypal-payments' ),
-					),
-					'checkoutPageDescription' => array(
-						'type'    => 'text',
-						'default' => $this->getPaymentDescription( PayUponInvoiceGateway::ID ) ?? '',
-						'label'   => __( 'Checkout page description', 'woocommerce-paypal-payments' ),
-					),
-				),
-			),
-			OXXO::ID                  => array(
-				'id'              => OXXO::ID,
-				'title'           => __( 'OXXO', 'woocommerce-paypal-payments' ),
-				'description'     => __(
-					'OXXO is a Mexican chain of convenience stores. *Get PayPal account permission to use OXXO payment functionality by contacting us at (+52) 800–925–0304',
-					'woocommerce-paypal-payments'
-				),
-				'icon'            => 'payment-method-oxxo',
-				'itemTitle'       => __( 'OXXO', 'woocommerce-paypal-payments' ),
-				'itemDescription' => __(
-					'OXXO is a Mexican chain of convenience stores. *Get PayPal account permission to use OXXO payment functionality by contacting us at (+52) 800–925–0304',
-					'woocommerce-paypal-payments'
-				),
-				'fields'          => array(
-					'checkoutPageTitle'       => array(
-						'type'    => 'text',
-						'default' => $this->getPaymentTitle( OXXO::ID ) ?? '',
-						'label'   => __( 'Checkout page title', 'woocommerce-paypal-payments' ),
-					),
-					'checkoutPageDescription' => array(
-						'type'    => 'text',
-						'default' => $this->getPaymentDescription( OXXO::ID ) ?? '',
-						'label'   => __( 'Checkout page description', 'woocommerce-paypal-payments' ),
-					),
-				),
-			),
-		);
+	protected function gateways() : array {
+		return $this->methods_definition->get_definitions();
 	}
 
 	/**
@@ -644,25 +147,25 @@ class PaymentRestEndpoint extends RestEndpoint {
 	 * @return WP_REST_Response The current payment methods details.
 	 */
 	public function get_details() : WP_REST_Response {
-		$all_gateways = WC()->payment_gateways->payment_gateways();
-
+		$all_gateways     = WC()->payment_gateways->payment_gateways();
 		$gateway_settings = array();
+		$all_methods      = $this->gateways();
 
-		foreach ( $this->gateways() as $key => $value ) {
+		foreach ( $all_methods as $key => $method ) {
 			// Here we handle the payment methods that are listed on the page but not registered as WooCommerce Payment gateways.
 			if ( ! isset( $all_gateways[ $key ] ) ) {
 				$gateway_settings[ $key ] = array(
-					'id'              => $this->gateways()[ $key ]['id'] ?? '',
-					'title'           => $this->gateways()[ $key ]['title'] ?? '',
-					'description'     => $this->gateways()[ $key ]['description'] ?? '',
-					'enabled'         => $this->gateways()[ $key ]['enabled'] ?? false,
-					'icon'            => $this->gateways()[ $key ]['icon'] ?? '',
-					'itemTitle'       => $this->gateways()[ $key ]['itemTitle'] ?? '',
-					'itemDescription' => $this->gateways()[ $key ]['itemDescription'] ?? '',
+					'id'              => $method['id'] ?? '',
+					'title'           => $method['title'] ?? '',
+					'description'     => $method['description'] ?? '',
+					'enabled'         => $method['enabled'] ?? false,
+					'icon'            => $method['icon'] ?? '',
+					'itemTitle'       => $method['itemTitle'] ?? '',
+					'itemDescription' => $method['itemDescription'] ?? '',
 				);
 
-				if ( isset( $this->gateways()[ $key ]['fields'] ) ) {
-					$gateway_settings[ $key ]['fields'] = $this->gateways()[ $key ]['fields'];
+				if ( isset( $method['fields'] ) ) {
+					$gateway_settings[ $key ]['fields'] = $method['fields'];
 				}
 
 				continue;
@@ -674,14 +177,14 @@ class PaymentRestEndpoint extends RestEndpoint {
 				'enabled'         => 'yes' === $gateway->enabled,
 				'title'           => str_replace( '&amp;', '&', $gateway->get_title() ),
 				'description'     => $gateway->get_description(),
-				'id'              => $this->gateways()[ $key ]['id'] ?? $key,
-				'icon'            => $this->gateways()[ $key ]['icon'] ?? '',
-				'itemTitle'       => $this->gateways()[ $key ]['itemTitle'] ?? '',
-				'itemDescription' => $this->gateways()[ $key ]['itemDescription'] ?? '',
+				'id'              => $method['id'] ?? $key,
+				'icon'            => $method['icon'] ?? '',
+				'itemTitle'       => $method['itemTitle'] ?? '',
+				'itemDescription' => $method['itemDescription'] ?? '',
 			);
 
-			if ( isset( $this->gateways()[ $key ]['fields'] ) ) {
-				$gateway_settings[ $key ]['fields'] = $this->gateways()[ $key ]['fields'];
+			if ( isset( $method['fields'] ) ) {
+				$gateway_settings[ $key ]['fields'] = $method['fields'];
 			}
 		}
 
@@ -702,10 +205,10 @@ class PaymentRestEndpoint extends RestEndpoint {
 	 */
 	public function update_details( WP_REST_Request $request ) : WP_REST_Response {
 		$all_gateways = WC()->payment_gateways->payment_gateways();
-
 		$request_data = $request->get_params();
+		$all_methods  = $this->gateways();
 
-		foreach ( $this->gateways() as $key => $value ) {
+		foreach ( $all_methods as $key => $value ) {
 			// Here we handle the payment methods that are listed on the page but not registered as WooCommerce Payment gateways.
 			if ( ! isset( $all_gateways[ $key ] ) && isset( $request_data[ $key ] ) ) {
 				switch ( $key ) {
@@ -759,32 +262,4 @@ class PaymentRestEndpoint extends RestEndpoint {
 
 		return $this->get_details();
 	}
-
-	/**
-	 * Returns title for the given gateway.
-	 *
-	 * @param string $id Gateway ID.
-	 * @return string
-	 */
-	private function getPaymentTitle( string $id ): string {
-		if ( ! isset( WC()->payment_gateways()->payment_gateways()[ $id ] ) ) {
-			return '';
-		}
-
-		return WC()->payment_gateways()->payment_gateways()[ $id ]->get_title() ?? '';
-	}
-
-	/**
-	 * Returns title for the given gateway.
-	 *
-	 * @param string $id Gateway ID.
-	 * @return string
-	 */
-	private function getPaymentDescription( string $id ): string {
-		if ( ! isset( WC()->payment_gateways()->payment_gateways()[ $id ] ) ) {
-			return '';
-		}
-
-		return WC()->payment_gateways()->payment_gateways()[ $id ]->get_description() ?? '';
-	}
 }

From c854c8dceb043287e12795a7516e2cb0edf16ca4 Mon Sep 17 00:00:00 2001
From: Philipp Stracker <p.stracker@syde.com>
Date: Thu, 13 Feb 2025 19:37:42 +0100
Subject: [PATCH 27/48] =?UTF-8?q?=E2=9C=A8=20Start=20to=20implement=20paym?=
 =?UTF-8?q?ent=20method=20configuration?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/Service/SettingsDataManager.php       | 26 +++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/modules/ppcp-settings/src/Service/SettingsDataManager.php b/modules/ppcp-settings/src/Service/SettingsDataManager.php
index 8fb02ee6d..9f9194be8 100644
--- a/modules/ppcp-settings/src/Service/SettingsDataManager.php
+++ b/modules/ppcp-settings/src/Service/SettingsDataManager.php
@@ -19,6 +19,7 @@ use WooCommerce\PayPalCommerce\WcGateway\Gateway\PayPalGateway;
 use WooCommerce\PayPalCommerce\Settings\Data\StylingSettings;
 use WooCommerce\PayPalCommerce\Settings\Data\GeneralSettings;
 use WooCommerce\PayPalCommerce\Settings\Data\SettingsModel;
+use WooCommerce\PayPalCommerce\Settings\Data\PaymentSettings;
 
 /**
  * Class SettingsDataManager
@@ -49,6 +50,13 @@ class SettingsDataManager {
 	 */
 	private StylingSettings $styling_settings;
 
+	/**
+	 * Model for handling payment methods.
+	 *
+	 * @var PaymentSettings
+	 */
+	private PaymentSettings $payment_methods;
+
 	/**
 	 * Stores a list of all AbstractDataModel instances that are managed by
 	 * this service.
@@ -64,6 +72,7 @@ class SettingsDataManager {
 	 * @param GeneralSettings   $general_settings   The general settings model.
 	 * @param SettingsModel     $payment_settings   The settings model.
 	 * @param StylingSettings   $styling_settings   The styling settings model.
+	 * @param PaymentSettings   $payment_methods    The payment settings model.
 	 * @param array             ...$data_models     List of additional data models to reset.
 	 */
 	public function __construct(
@@ -71,6 +80,7 @@ class SettingsDataManager {
 		GeneralSettings $general_settings,
 		SettingsModel $payment_settings,
 		StylingSettings $styling_settings,
+		PaymentSettings $payment_methods,
 		...$data_models
 	) {
 		foreach ( $data_models as $data_model ) {
@@ -90,10 +100,12 @@ class SettingsDataManager {
 		$this->models_to_reset[] = $general_settings;
 		$this->models_to_reset[] = $payment_settings;
 		$this->models_to_reset[] = $styling_settings;
+		$this->models_to_reset[] = $payment_methods;
 
 		$this->onboarding_profile = $onboarding_profile;
 		$this->payment_settings   = $payment_settings;
 		$this->styling_settings   = $styling_settings;
+		$this->payment_methods    = $payment_methods;
 	}
 
 	/**
@@ -145,6 +157,7 @@ class SettingsDataManager {
 	 */
 	protected function apply_configuration( ConfigurationFlagsDTO $flags ) : void {
 		// Apply defaults for the "Payment Methods" tab.
+		$this->toggle_payment_gateways( $flags );
 
 		// Apply defaults for the "Settings" tab.
 		$this->apply_payment_settings( $flags );
@@ -153,6 +166,19 @@ class SettingsDataManager {
 		$this->apply_location_styles( $flags );
 	}
 
+	/**
+	 * Enables or disables payment gateways depending on the provided
+	 * configuration flags.
+	 *
+	 * @param ConfigurationFlagsDTO $flags Shop configuration flags.
+	 * @return void
+	 */
+	protected function toggle_payment_gateways( ConfigurationFlagsDTO $flags ) : void {
+		// Always enable Venmo and Pay Later.
+		$this->payment_methods->set_venmo_enabled( true );
+		$this->payment_methods->set_paylater_enabled( true );
+	}
+
 	/**
 	 * Applies the default payment settings that are relevant for the provided
 	 * configuration flags.

From 093e6ff1b2e99a04288376a1cbe0a49052c6c5f1 Mon Sep 17 00:00:00 2001
From: Philipp Stracker <p.stracker@syde.com>
Date: Thu, 13 Feb 2025 19:38:08 +0100
Subject: [PATCH 28/48] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20Extend=20payment=20m?=
 =?UTF-8?q?ethod=20definition=20response?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/Data/Definition/PaymentMethodsDefinition.php   | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/modules/ppcp-settings/src/Data/Definition/PaymentMethodsDefinition.php b/modules/ppcp-settings/src/Data/Definition/PaymentMethodsDefinition.php
index 56d8cf988..f9ac675d5 100644
--- a/modules/ppcp-settings/src/Data/Definition/PaymentMethodsDefinition.php
+++ b/modules/ppcp-settings/src/Data/Definition/PaymentMethodsDefinition.php
@@ -92,17 +92,21 @@ class PaymentMethodsDefinition {
 	private function define_common_fields( string $gateway_id, string $title, string $description, string $icon ) : array {
 		$gateway = $this->wc_gateways[ $gateway_id ] ?? null;
 
+		$gateway_title       = $gateway ? $gateway->get_title() : $title;
+		$gateway_description = $gateway ? $gateway->get_description() : $description;
+
 		return array(
 			'id'              => $gateway_id,
-			'title'           => $title,
-			'description'     => $description,
+			'enabled'         => wc_string_to_bool( $gateway ? $gateway->enabled : '' ),
+			'title'           => str_replace( '&amp;', '&', $gateway_title ),
+			'description'     => $gateway_description,
 			'icon'            => $icon,
 			'itemTitle'       => $title,
 			'itemDescription' => $description,
 			'fields'          => array(
 				'checkoutPageTitle'       => array(
 					'type'    => 'text',
-					'default' => $gateway ? $gateway->get_title() : '',
+					'default' => $gateway_title,
 					'label'   => __( 'Checkout page title', 'woocommerce-paypal-payments' ),
 				),
 				'checkoutPageDescription' => array(

From 87318dd500e5b2e07b94a6ff158adbc48f69fae1 Mon Sep 17 00:00:00 2001
From: Philipp Stracker <p.stracker@syde.com>
Date: Thu, 13 Feb 2025 19:38:44 +0100
Subject: [PATCH 29/48] =?UTF-8?q?=E2=9C=A8=20Allow=20toggling=20WC=20Gatew?=
 =?UTF-8?q?ays=20via=20PaymentSettings?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Definition/PaymentMethodsDefinition.php   |   2 +-
 .../src/Data/PaymentSettings.php              | 102 +++++++++++++++---
 2 files changed, 90 insertions(+), 14 deletions(-)

diff --git a/modules/ppcp-settings/src/Data/Definition/PaymentMethodsDefinition.php b/modules/ppcp-settings/src/Data/Definition/PaymentMethodsDefinition.php
index f9ac675d5..7e031f035 100644
--- a/modules/ppcp-settings/src/Data/Definition/PaymentMethodsDefinition.php
+++ b/modules/ppcp-settings/src/Data/Definition/PaymentMethodsDefinition.php
@@ -97,7 +97,7 @@ class PaymentMethodsDefinition {
 
 		return array(
 			'id'              => $gateway_id,
-			'enabled'         => wc_string_to_bool( $gateway ? $gateway->enabled : '' ),
+			'enabled'         => $this->settings->is_method_enabled( $gateway_id ),
 			'title'           => str_replace( '&amp;', '&', $gateway_title ),
 			'description'     => $gateway_description,
 			'icon'            => $icon,
diff --git a/modules/ppcp-settings/src/Data/PaymentSettings.php b/modules/ppcp-settings/src/Data/PaymentSettings.php
index ffea3153d..891872805 100644
--- a/modules/ppcp-settings/src/Data/PaymentSettings.php
+++ b/modules/ppcp-settings/src/Data/PaymentSettings.php
@@ -9,6 +9,8 @@ declare( strict_types = 1 );
 
 namespace WooCommerce\PayPalCommerce\Settings\Data;
 
+use WC_Payment_Gateway;
+
 /**
  * Class PaymentSettings
  */
@@ -21,12 +23,19 @@ class PaymentSettings extends AbstractDataModel {
 	 */
 	protected const OPTION_KEY = 'woocommerce-ppcp-data-payment';
 
+	/**
+	 * List of WC_Payment_Gateway instances that need to be saved.
+	 *
+	 * @var WC_Payment_Gateway[]
+	 */
+	private array $unsaved_gateways = array();
+
 	/**
 	 * Get default values for the model.
 	 *
 	 * @return array
 	 */
-	protected function get_defaults(): array {
+	protected function get_defaults() : array {
 		return array(
 			'paypal_show_logo'           => false,
 			'three_d_secure'             => 'no-3d-secure',
@@ -37,12 +46,79 @@ class PaymentSettings extends AbstractDataModel {
 		);
 	}
 
+	/**
+	 * Saves the model data to WordPress options.
+	 */
+	public function save() : void {
+		parent::save();
+
+		foreach ( $this->unsaved_gateways as $gateway_id => $gateway ) {
+			update_option( $gateway->get_option_key(), $gateway->settings );
+		}
+
+		$this->unsaved_gateways = array();
+	}
+
+	/**
+	 * Enables or disables the defined payment method, if it exists.
+	 *
+	 * @param string $method_id  ID of the payment method.
+	 * @param bool   $is_enabled Whether to enable the method.
+	 */
+	public function toggle_method_state( string $method_id, bool $is_enabled ) : void {
+		switch ( $method_id ) {
+			case 'venmo':
+				$this->set_venmo_enabled( $is_enabled );
+				break;
+
+			case 'pay-later':
+				$this->set_paylater_enabled( $is_enabled );
+				break;
+
+			default:
+				$gateway = WC()->payment_gateways()->payment_gateways()[ $method_id ] ?? null;
+
+				if ( $gateway ) {
+					$gateway->enabled = wc_bool_to_string( $is_enabled );
+
+					$this->unsaved_gateways[ $gateway->id ] = $gateway;
+				}
+		}
+	}
+
+	/**
+	 * Checks, if the provided payment method is enabled.
+	 *
+	 * @param string $method_id ID of the payment method.
+	 * @return bool True, if the method is enabled. False if it's disabled or not existing.
+	 */
+	public function is_method_enabled( string $method_id ) : bool {
+		switch ( $method_id ) {
+			case 'venmo':
+				$this->get_venmo_enabled();
+				break;
+
+			case 'pay-later':
+				$this->get_paylater_enabled();
+				break;
+
+			default:
+				$gateway = WC()->payment_gateways()->payment_gateways()[ $method_id ] ?? null;
+
+				if ( $gateway ) {
+					return wc_string_to_bool( $gateway->enabled );
+				}
+		}
+
+		return false;
+	}
+
 	/**
 	 * Get PayPal show logo.
 	 *
 	 * @return bool
 	 */
-	public function get_paypal_show_logo(): bool {
+	public function get_paypal_show_logo() : bool {
 		return (bool) $this->data['paypal_show_logo'];
 	}
 
@@ -51,7 +127,7 @@ class PaymentSettings extends AbstractDataModel {
 	 *
 	 * @return string
 	 */
-	public function get_three_d_secure(): string {
+	public function get_three_d_secure() : string {
 		return $this->data['three_d_secure'];
 	}
 
@@ -60,7 +136,7 @@ class PaymentSettings extends AbstractDataModel {
 	 *
 	 * @return bool
 	 */
-	public function get_fastlane_cardholder_name(): bool {
+	public function get_fastlane_cardholder_name() : bool {
 		return (bool) $this->data['fastlane_cardholder_name'];
 	}
 
@@ -69,7 +145,7 @@ class PaymentSettings extends AbstractDataModel {
 	 *
 	 * @return bool
 	 */
-	public function get_fastlane_display_watermark(): bool {
+	public function get_fastlane_display_watermark() : bool {
 		return (bool) $this->data['fastlane_display_watermark'];
 	}
 
@@ -78,7 +154,7 @@ class PaymentSettings extends AbstractDataModel {
 	 *
 	 * @return bool
 	 */
-	public function get_venmo_enabled(): bool {
+	public function get_venmo_enabled() : bool {
 		return (bool) $this->data['venmo_enabled'];
 	}
 
@@ -87,7 +163,7 @@ class PaymentSettings extends AbstractDataModel {
 	 *
 	 * @return bool
 	 */
-	public function get_paylater_enabled(): bool {
+	public function get_paylater_enabled() : bool {
 		return (bool) $this->data['paylater_enabled'];
 	}
 
@@ -97,7 +173,7 @@ class PaymentSettings extends AbstractDataModel {
 	 * @param bool $value The value.
 	 * @return void
 	 */
-	public function set_paypal_show_logo( bool $value ): void {
+	public function set_paypal_show_logo( bool $value ) : void {
 		$this->data['paypal_show_logo'] = $value;
 	}
 
@@ -107,7 +183,7 @@ class PaymentSettings extends AbstractDataModel {
 	 * @param string $value The value.
 	 * @return void
 	 */
-	public function set_three_d_secure( string $value ): void {
+	public function set_three_d_secure( string $value ) : void {
 		$this->data['three_d_secure'] = $value;
 	}
 
@@ -117,7 +193,7 @@ class PaymentSettings extends AbstractDataModel {
 	 * @param bool $value The value.
 	 * @return void
 	 */
-	public function set_fastlane_cardholder_name( bool $value ): void {
+	public function set_fastlane_cardholder_name( bool $value ) : void {
 		$this->data['fastlane_cardholder_name'] = $value;
 	}
 
@@ -127,7 +203,7 @@ class PaymentSettings extends AbstractDataModel {
 	 * @param bool $value The value.
 	 * @return void
 	 */
-	public function set_fastlane_display_watermark( bool $value ): void {
+	public function set_fastlane_display_watermark( bool $value ) : void {
 		$this->data['fastlane_display_watermark'] = $value;
 	}
 
@@ -137,7 +213,7 @@ class PaymentSettings extends AbstractDataModel {
 	 * @param bool $value The value.
 	 * @return void
 	 */
-	public function set_venmo_enabled( bool $value ): void {
+	public function set_venmo_enabled( bool $value ) : void {
 		$this->data['venmo_enabled'] = $value;
 	}
 
@@ -147,7 +223,7 @@ class PaymentSettings extends AbstractDataModel {
 	 * @param bool $value The value.
 	 * @return void
 	 */
-	public function set_paylater_enabled( bool $value ): void {
+	public function set_paylater_enabled( bool $value ) : void {
 		$this->data['paylater_enabled'] = $value;
 	}
 }

From e8cee60072f2d7dd9143d29e299a7d842db7b521 Mon Sep 17 00:00:00 2001
From: Philipp Stracker <p.stracker@syde.com>
Date: Thu, 13 Feb 2025 19:43:24 +0100
Subject: [PATCH 30/48] =?UTF-8?q?=E2=9A=A1=EF=B8=8F=20Introduce=20better?=
 =?UTF-8?q?=20WC=5FGateway=20caching?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/Data/PaymentSettings.php              | 20 +++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/modules/ppcp-settings/src/Data/PaymentSettings.php b/modules/ppcp-settings/src/Data/PaymentSettings.php
index 891872805..ac80e66fe 100644
--- a/modules/ppcp-settings/src/Data/PaymentSettings.php
+++ b/modules/ppcp-settings/src/Data/PaymentSettings.php
@@ -76,7 +76,7 @@ class PaymentSettings extends AbstractDataModel {
 				break;
 
 			default:
-				$gateway = WC()->payment_gateways()->payment_gateways()[ $method_id ] ?? null;
+				$gateway = $this->get_gateway( $method_id );
 
 				if ( $gateway ) {
 					$gateway->enabled = wc_bool_to_string( $is_enabled );
@@ -103,7 +103,7 @@ class PaymentSettings extends AbstractDataModel {
 				break;
 
 			default:
-				$gateway = WC()->payment_gateways()->payment_gateways()[ $method_id ] ?? null;
+				$gateway = $this->get_gateway( $method_id );
 
 				if ( $gateway ) {
 					return wc_string_to_bool( $gateway->enabled );
@@ -226,4 +226,20 @@ class PaymentSettings extends AbstractDataModel {
 	public function set_paylater_enabled( bool $value ) : void {
 		$this->data['paylater_enabled'] = $value;
 	}
+
+	/**
+	 * Get the gateway object for the given method ID.
+	 *
+	 * @param string $method_id ID of the payment method.
+	 * @return WC_Payment_Gateway|null
+	 */
+	private function get_gateway( string $method_id ) : ?WC_Payment_Gateway {
+		if ( isset( $this->unsaved_gateways[ $method_id ] ) ) {
+			return $this->unsaved_gateways[ $method_id ];
+		}
+
+		$gateways = WC()->payment_gateways()->payment_gateways();
+
+		return isset( $gateways[ $method_id ] ) ? $gateways[ $method_id ] : null;
+	}
 }

From 47fa01110c8266804b87d3067a0e31830d69f4b6 Mon Sep 17 00:00:00 2001
From: Philipp Stracker <p.stracker@syde.com>
Date: Thu, 13 Feb 2025 19:57:26 +0100
Subject: [PATCH 31/48] =?UTF-8?q?=E2=9C=A8=20Allow=20WC=20Gateway=20change?=
 =?UTF-8?q?s=20vis=20PaymentSettings?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/Data/PaymentSettings.php              | 61 ++++++++++++++++++-
 1 file changed, 58 insertions(+), 3 deletions(-)

diff --git a/modules/ppcp-settings/src/Data/PaymentSettings.php b/modules/ppcp-settings/src/Data/PaymentSettings.php
index ac80e66fe..424aec26e 100644
--- a/modules/ppcp-settings/src/Data/PaymentSettings.php
+++ b/modules/ppcp-settings/src/Data/PaymentSettings.php
@@ -52,7 +52,11 @@ class PaymentSettings extends AbstractDataModel {
 	public function save() : void {
 		parent::save();
 
-		foreach ( $this->unsaved_gateways as $gateway_id => $gateway ) {
+		foreach ( $this->unsaved_gateways as $gateway ) {
+			$gateway->settings['enabled']     = $gateway->enabled;
+			$gateway->settings['title']       = $gateway->title;
+			$gateway->settings['description'] = $gateway->description;
+
 			update_option( $gateway->get_option_key(), $gateway->settings );
 		}
 
@@ -81,7 +85,7 @@ class PaymentSettings extends AbstractDataModel {
 				if ( $gateway ) {
 					$gateway->enabled = wc_bool_to_string( $is_enabled );
 
-					$this->unsaved_gateways[ $gateway->id ] = $gateway;
+					$this->modified_gateway( $gateway );
 				}
 		}
 	}
@@ -113,6 +117,40 @@ class PaymentSettings extends AbstractDataModel {
 		return false;
 	}
 
+	/**
+	 * Updates the payment method title.
+	 *
+	 * @param string $method_id ID of the payment method.
+	 * @param string $title     The new title.
+	 * @return void
+	 */
+	public function set_method_title( string $method_id, string $title ) : void {
+		$gateway = $this->get_gateway( $method_id );
+
+		if ( $gateway ) {
+			$gateway->title = $title;
+
+			$this->modified_gateway( $gateway );
+		}
+	}
+
+	/**
+	 * Updates the payment method description.
+	 *
+	 * @param string $method_id   ID of the payment method.
+	 * @param string $description The new description.
+	 * @return void
+	 */
+	public function set_method_description( string $method_id, string $description ) : void {
+		$gateway = $this->get_gateway( $method_id );
+
+		if ( $gateway ) {
+			$gateway->description = $description;
+
+			$this->modified_gateway( $gateway );
+		}
+	}
+
 	/**
 	 * Get PayPal show logo.
 	 *
@@ -240,6 +278,23 @@ class PaymentSettings extends AbstractDataModel {
 
 		$gateways = WC()->payment_gateways()->payment_gateways();
 
-		return isset( $gateways[ $method_id ] ) ? $gateways[ $method_id ] : null;
+		if ( ! isset( $gateways[ $method_id ] ) ) {
+			return null;
+		}
+
+		$gateway = $gateways[ $method_id ];
+		$gateway->init_form_fields();
+
+		return $gateway;
+	}
+
+	/**
+	 * Store the gateway object for later saving.
+	 *
+	 * @param WC_Payment_Gateway $gateway The gateway object.
+	 * @return void
+	 */
+	private function modified_gateway( WC_Payment_Gateway $gateway ) : void {
+		$this->unsaved_gateways[ $gateway->id ] = $gateway;
 	}
 }

From 6a011160b1c61a8dd7a74718fac6419b75d862a1 Mon Sep 17 00:00:00 2001
From: Philipp Stracker <p.stracker@syde.com>
Date: Thu, 13 Feb 2025 19:58:11 +0100
Subject: [PATCH 32/48] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20Simplify=20PaymentRe?=
 =?UTF-8?q?stEndpoint?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/Endpoint/PaymentRestEndpoint.php      | 74 ++++---------------
 1 file changed, 13 insertions(+), 61 deletions(-)

diff --git a/modules/ppcp-settings/src/Endpoint/PaymentRestEndpoint.php b/modules/ppcp-settings/src/Endpoint/PaymentRestEndpoint.php
index 3f4bf6c0e..dfb511463 100644
--- a/modules/ppcp-settings/src/Endpoint/PaymentRestEndpoint.php
+++ b/modules/ppcp-settings/src/Endpoint/PaymentRestEndpoint.php
@@ -147,40 +147,18 @@ class PaymentRestEndpoint extends RestEndpoint {
 	 * @return WP_REST_Response The current payment methods details.
 	 */
 	public function get_details() : WP_REST_Response {
-		$all_gateways     = WC()->payment_gateways->payment_gateways();
 		$gateway_settings = array();
 		$all_methods      = $this->gateways();
 
 		foreach ( $all_methods as $key => $method ) {
-			// Here we handle the payment methods that are listed on the page but not registered as WooCommerce Payment gateways.
-			if ( ! isset( $all_gateways[ $key ] ) ) {
-				$gateway_settings[ $key ] = array(
-					'id'              => $method['id'] ?? '',
-					'title'           => $method['title'] ?? '',
-					'description'     => $method['description'] ?? '',
-					'enabled'         => $method['enabled'] ?? false,
-					'icon'            => $method['icon'] ?? '',
-					'itemTitle'       => $method['itemTitle'] ?? '',
-					'itemDescription' => $method['itemDescription'] ?? '',
-				);
-
-				if ( isset( $method['fields'] ) ) {
-					$gateway_settings[ $key ]['fields'] = $method['fields'];
-				}
-
-				continue;
-			}
-
-			$gateway = $all_gateways[ $key ];
-
 			$gateway_settings[ $key ] = array(
-				'enabled'         => 'yes' === $gateway->enabled,
-				'title'           => str_replace( '&amp;', '&', $gateway->get_title() ),
-				'description'     => $gateway->get_description(),
-				'id'              => $method['id'] ?? $key,
-				'icon'            => $method['icon'] ?? '',
-				'itemTitle'       => $method['itemTitle'] ?? '',
-				'itemDescription' => $method['itemDescription'] ?? '',
+				'id'              => $method['id'],
+				'title'           => $method['title'],
+				'description'     => $method['description'],
+				'enabled'         => $method['enabled'],
+				'icon'            => $method['icon'],
+				'itemTitle'       => $method['itemTitle'],
+				'itemDescription' => $method['itemDescription'],
 			);
 
 			if ( isset( $method['fields'] ) ) {
@@ -204,52 +182,26 @@ class PaymentRestEndpoint extends RestEndpoint {
 	 * @return WP_REST_Response The updated payment methods details.
 	 */
 	public function update_details( WP_REST_Request $request ) : WP_REST_Response {
-		$all_gateways = WC()->payment_gateways->payment_gateways();
 		$request_data = $request->get_params();
 		$all_methods  = $this->gateways();
 
 		foreach ( $all_methods as $key => $value ) {
-			// Here we handle the payment methods that are listed on the page but not registered as WooCommerce Payment gateways.
-			if ( ! isset( $all_gateways[ $key ] ) && isset( $request_data[ $key ] ) ) {
-				switch ( $key ) {
-					case 'venmo':
-						$this->settings->set_venmo_enabled( $request_data[ $key ]['enabled'] );
-						break;
-					case 'pay-later':
-						$this->settings->set_paylater_enabled( $request_data[ $key ]['enabled'] );
-						break;
-				}
-
-				continue;
-			}
-
-			// Check if the REST body contains details for this gateway.
-			if ( ! isset( $request_data[ $key ] ) || ! isset( $all_gateways[ $key ] ) ) {
-				continue;
-			}
-
-			$gateway  = $all_gateways[ $key ];
 			$new_data = $request_data[ $key ];
-			$gateway->init_form_fields();
-			$settings = $gateway->settings;
+			if ( ! $new_data ) {
+				continue;
+			}
 
 			if ( isset( $new_data['enabled'] ) ) {
-				$settings['enabled'] = wc_bool_to_string( $new_data['enabled'] );
-				$gateway->enabled    = $settings['enabled'];
+				$this->settings->toggle_method_state( $key, $new_data['enabled'] );
 			}
 
 			if ( isset( $new_data['title'] ) ) {
-				$settings['title'] = sanitize_text_field( $new_data['title'] );
-				$gateway->title    = $settings['title'];
+				$this->settings->set_method_title( $key, sanitize_text_field( $new_data['title'] ) );
 			}
 
 			if ( isset( $new_data['description'] ) ) {
-				$settings['description'] = wp_kses_post( $new_data['description'] );
-				$gateway->description    = $settings['description'];
+				$this->settings->set_method_description( $key, wp_kses_post( $new_data['description'] ) );
 			}
-
-			$gateway->settings = $settings;
-			update_option( $gateway->get_option_key(), $settings );
 		}
 
 		$wp_data = $this->sanitize_for_wordpress(

From 32af11f94cadb3fc2f67adb777ed729dcecaddf8 Mon Sep 17 00:00:00 2001
From: Philipp Stracker <p.stracker@syde.com>
Date: Thu, 13 Feb 2025 19:58:47 +0100
Subject: [PATCH 33/48] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20Default=20conditions?=
 =?UTF-8?q?:=20Use=20new=20methods?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/Service/SettingsDataManager.php          | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/modules/ppcp-settings/src/Service/SettingsDataManager.php b/modules/ppcp-settings/src/Service/SettingsDataManager.php
index 9f9194be8..8fd273cd5 100644
--- a/modules/ppcp-settings/src/Service/SettingsDataManager.php
+++ b/modules/ppcp-settings/src/Service/SettingsDataManager.php
@@ -174,9 +174,21 @@ class SettingsDataManager {
 	 * @return void
 	 */
 	protected function toggle_payment_gateways( ConfigurationFlagsDTO $flags ) : void {
+		/*
+		TODO: Implement those conditions:
+
+		| Payment Method | Country | Seller Type | Subscriptions | Cards | Notes                         |
+		|----------------|---------|-------------|---------------|-------|-------------------------------|
+		| ACDC           | US      | Business    | *any*         | ✅     | Greyed out for Casual Sellers |
+		| BCDC           | US      | *any*       | *any*         | ✅     |                               |
+		| Apple Pay      | US      | Business    | *any*         | ✅     | Based on feature eligibility  |
+		| Google Pay     | US      | Business    | *any*         | ✅     | Based on feature eligibility  |
+		| All APMs       | US      | Business    | *any*         | ✅     | Based on feature eligibility  |
+		*/
+
 		// Always enable Venmo and Pay Later.
-		$this->payment_methods->set_venmo_enabled( true );
-		$this->payment_methods->set_paylater_enabled( true );
+		$this->payment_methods->toggle_method_state( 'venmo', true );
+		$this->payment_methods->toggle_method_state( 'pay-later', true );
 	}
 
 	/**

From 62e1f4b9ac83b5562e96088aa999145229015e85 Mon Sep 17 00:00:00 2001
From: Philipp Stracker <p.stracker@syde.com>
Date: Fri, 14 Feb 2025 11:08:02 +0100
Subject: [PATCH 34/48] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20Streamline=20the=20P?=
 =?UTF-8?q?aymentMethodDefinition=20logic?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Definition/PaymentMethodsDefinition.php   | 77 +++++++++----------
 1 file changed, 35 insertions(+), 42 deletions(-)

diff --git a/modules/ppcp-settings/src/Data/Definition/PaymentMethodsDefinition.php b/modules/ppcp-settings/src/Data/Definition/PaymentMethodsDefinition.php
index 7e031f035..106a4b1c5 100644
--- a/modules/ppcp-settings/src/Data/Definition/PaymentMethodsDefinition.php
+++ b/modules/ppcp-settings/src/Data/Definition/PaymentMethodsDefinition.php
@@ -83,18 +83,42 @@ class PaymentMethodsDefinition {
 	 * Returns a new payment method configuration array that contains all
 	 * common attributes which must be present in every method definition.
 	 *
-	 * @param string $gateway_id  The payment method ID.
-	 * @param string $title       Admin-side payment method title.
-	 * @param string $description Admin-side info about the payment method.
-	 * @param string $icon        Admin-side icon of the payment method.
+	 * @param string $gateway_id   The payment method ID.
+	 * @param string $title        Admin-side payment method title.
+	 * @param string $description  Admin-side info about the payment method.
+	 * @param string $icon         Admin-side icon of the payment method.
+	 * @param array  $extra_fields Optional. Additional fields to display in the edit modal.
 	 * @return array Payment method definition.
 	 */
-	private function define_common_fields( string $gateway_id, string $title, string $description, string $icon ) : array {
+	private function define_common_fields(
+		string $gateway_id,
+		string $title,
+		string $description,
+		string $icon,
+		array $extra_fields = array()
+	) : array {
 		$gateway = $this->wc_gateways[ $gateway_id ] ?? null;
 
 		$gateway_title       = $gateway ? $gateway->get_title() : $title;
 		$gateway_description = $gateway ? $gateway->get_description() : $description;
 
+		$fields = array(
+			'checkoutPageTitle'       => array(
+				'type'    => 'text',
+				'default' => $gateway_title,
+				'label'   => __( 'Checkout page title', 'woocommerce-paypal-payments' ),
+			),
+			'checkoutPageDescription' => array(
+				'type'    => 'text',
+				'default' => $gateway ? $gateway->get_description() : '',
+				'label'   => __( 'Checkout page description', 'woocommerce-paypal-payments' ),
+			),
+		);
+
+		if ( $extra_fields ) {
+			$fields = array_merge( $fields, $extra_fields );
+		}
+
 		return array(
 			'id'              => $gateway_id,
 			'enabled'         => $this->settings->is_method_enabled( $gateway_id ),
@@ -103,18 +127,7 @@ class PaymentMethodsDefinition {
 			'icon'            => $icon,
 			'itemTitle'       => $title,
 			'itemDescription' => $description,
-			'fields'          => array(
-				'checkoutPageTitle'       => array(
-					'type'    => 'text',
-					'default' => $gateway_title,
-					'label'   => __( 'Checkout page title', 'woocommerce-paypal-payments' ),
-				),
-				'checkoutPageDescription' => array(
-					'type'    => 'text',
-					'default' => $gateway ? $gateway->get_description() : '',
-					'label'   => __( 'Checkout page description', 'woocommerce-paypal-payments' ),
-				),
-			),
+			'fields'          => $fields,
 		);
 	}
 
@@ -269,25 +282,19 @@ class PaymentMethodsDefinition {
 	 * @return array Payment method definition.
 	 */
 	private function define_paypal() : array {
-		$gateway = $this->define_common_fields(
+		return $this->define_common_fields(
 			PayPalGateway::ID,
 			__( 'PayPal', 'woocommerce-paypal-payments' ),
 			__( 'Our all-in-one checkout solution lets you offer PayPal, Venmo, Pay Later options, and more to help maximize conversion.', 'woocommerce-paypal-payments' ),
 			'payment-method-paypal',
-		);
-
-		$gateway['fields'] = array_merge(
-			$gateway['fields'],
 			array(
 				'paypalShowLogo' => array(
 					'type'    => 'toggle',
 					'default' => $this->settings->get_paypal_show_logo(),
 					'label'   => __( 'Show logo', 'woocommerce-paypal-payments' ),
 				),
-			),
+			)
 		);
-
-		return $gateway;
 	}
 
 	/**
@@ -306,7 +313,6 @@ class PaymentMethodsDefinition {
 			'payment-method-venmo',
 		);
 
-		$gateway['enabled'] = $this->settings->get_venmo_enabled();
 		unset( $gateway['fields'] );
 
 		return $gateway;
@@ -328,7 +334,6 @@ class PaymentMethodsDefinition {
 			'payment-method-paypal',
 		);
 
-		$gateway['enabled'] = $this->settings->get_paylater_enabled();
 		unset( $gateway['fields'] );
 
 		return $gateway;
@@ -354,15 +359,11 @@ class PaymentMethodsDefinition {
 	 * @return array Payment method definition.
 	 */
 	private function define_advanced_cards() : array {
-		$gateway = $this->define_common_fields(
+		return $this->define_common_fields(
 			CreditCardGateway::ID,
 			__( 'Advanced Credit and Debit Card Payments', 'woocommerce-paypal-payments' ),
 			__( "Present custom credit and debit card fields to your payers so they can pay with credit and debit cards using your site's branding.", 'woocommerce-paypal-payments' ),
 			'payment-method-advanced-cards',
-		);
-
-		$gateway['fields'] = array_merge(
-			$gateway['fields'],
 			array(
 				'threeDSecure' => array(
 					'type'        => 'radio',
@@ -398,8 +399,6 @@ class PaymentMethodsDefinition {
 				),
 			),
 		);
-
-		return $gateway;
 	}
 
 	/**
@@ -408,15 +407,11 @@ class PaymentMethodsDefinition {
 	 * @return array Payment method definition.
 	 */
 	private function define_axo() : array {
-		$gateway = $this->define_common_fields(
+		return $this->define_common_fields(
 			AxoGateway::ID,
 			__( 'Fastlane by PayPal', 'woocommerce-paypal-payments' ),
 			__( "Tap into the scale and trust of PayPal's customer network to recognize shoppers and make guest checkout more seamless than ever.", 'woocommerce-paypal-payments' ),
-			'payment-method-fastlane'
-		);
-
-		$gateway['fields'] = array_merge(
-			$gateway['fields'],
+			'payment-method-fastlane',
 			array(
 				'fastlaneCardholderName'   => array(
 					'type'    => 'toggle',
@@ -436,8 +431,6 @@ class PaymentMethodsDefinition {
 				),
 			),
 		);
-
-		return $gateway;
 	}
 
 	/**

From 4073f844543d7c557c1e7f73d9280627873018bf Mon Sep 17 00:00:00 2001
From: Philipp Stracker <p.stracker@syde.com>
Date: Fri, 14 Feb 2025 11:11:33 +0100
Subject: [PATCH 35/48] =?UTF-8?q?=F0=9F=90=9B=20Fix=20incorrect=20method-s?=
 =?UTF-8?q?tatus=20response?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/ppcp-settings/src/Data/PaymentSettings.php | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/modules/ppcp-settings/src/Data/PaymentSettings.php b/modules/ppcp-settings/src/Data/PaymentSettings.php
index 424aec26e..52ac3e419 100644
--- a/modules/ppcp-settings/src/Data/PaymentSettings.php
+++ b/modules/ppcp-settings/src/Data/PaymentSettings.php
@@ -99,12 +99,10 @@ class PaymentSettings extends AbstractDataModel {
 	public function is_method_enabled( string $method_id ) : bool {
 		switch ( $method_id ) {
 			case 'venmo':
-				$this->get_venmo_enabled();
-				break;
+				return $this->get_venmo_enabled();
 
 			case 'pay-later':
-				$this->get_paylater_enabled();
-				break;
+				return $this->get_paylater_enabled();
 
 			default:
 				$gateway = $this->get_gateway( $method_id );
@@ -112,9 +110,9 @@ class PaymentSettings extends AbstractDataModel {
 				if ( $gateway ) {
 					return wc_string_to_bool( $gateway->enabled );
 				}
-		}
 
-		return false;
+				return false;
+		}
 	}
 
 	/**

From 4d2f9d204230753bb49002fd116c48124fdc93a4 Mon Sep 17 00:00:00 2001
From: Philipp Stracker <p.stracker@syde.com>
Date: Fri, 14 Feb 2025 11:26:41 +0100
Subject: [PATCH 36/48] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20Refactor=20PaymentMe?=
 =?UTF-8?q?thodsDefinition=20structure?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Definition/PaymentMethodsDefinition.php   | 354 +++++++-----------
 1 file changed, 136 insertions(+), 218 deletions(-)

diff --git a/modules/ppcp-settings/src/Data/Definition/PaymentMethodsDefinition.php b/modules/ppcp-settings/src/Data/Definition/PaymentMethodsDefinition.php
index 106a4b1c5..958e6a122 100644
--- a/modules/ppcp-settings/src/Data/Definition/PaymentMethodsDefinition.php
+++ b/modules/ppcp-settings/src/Data/Definition/PaymentMethodsDefinition.php
@@ -65,15 +65,21 @@ class PaymentMethodsDefinition {
 		// Refresh the WooCommerce gateway details before we build the definitions.
 		$this->wc_gateways = WC()->payment_gateways()->payment_gateways();
 
-		$paypal_methods = $this->group_paypal_methods();
-		$card_methods   = $this->group_card_methods();
-		$apm_methods    = $this->group_apms();
-
-		$all_methods = array_merge( $paypal_methods, $card_methods, $apm_methods );
+		$all_methods = array_merge(
+			$this->group_paypal_methods(),
+			$this->group_card_methods(),
+			$this->group_apms(),
+		);
 
 		$result = array();
 		foreach ( $all_methods as $method ) {
-			$result[ $method['id'] ] = $method;
+			$result[ $method['id'] ] = $this->define_common_fields(
+				$method['id'],
+				$method['title'],
+				$method['description'],
+				$method['icon'],
+				$method['fields'] ?? array()
+			);
 		}
 
 		return $result;
@@ -138,13 +144,48 @@ class PaymentMethodsDefinition {
 	 *
 	 * @return array
 	 */
-	private function group_paypal_methods() : array {
-		return array(
-			$this->define_paypal(),
-			$this->define_venmo(),
-			$this->define_pay_later(),
-			$this->define_card_button(),
+	public function group_paypal_methods() : array {
+		$group = array(
+			array(
+				'id'          => PayPalGateway::ID,
+				'title'       => __( 'PayPal', 'woocommerce-paypal-payments' ),
+				'description' => __( 'Our all-in-one checkout solution lets you offer PayPal, Venmo, Pay Later options, and more to help maximize conversion.', 'woocommerce-paypal-payments' ),
+				'icon'        => 'payment-method-paypal',
+				'fields'      => array(
+					'paypalShowLogo' => array(
+						'type'    => 'toggle',
+						'default' => $this->settings->get_paypal_show_logo(),
+						'label'   => __( 'Show logo', 'woocommerce-paypal-payments' ),
+					),
+				),
+			),
+			array(
+				'id'          => 'venmo',
+				'title'       => __( 'Venmo', 'woocommerce-paypal-payments' ),
+				'description' => __(
+					'Offer Venmo at checkout to millions of active users.',
+					'woocommerce-paypal-payments'
+				),
+				'icon'        => 'payment-method-venmo',
+			),
+			array(
+				'id'          => 'pay-later',
+				'title'       => __( 'Pay Later', 'woocommerce-paypal-payments' ),
+				'description' => __(
+					'Get paid in full at checkout while giving your customers the flexibility to pay in installments over time with no late fees.',
+					'woocommerce-paypal-payments'
+				),
+				'icon'        => 'payment-method-paypal',
+			),
+			array(
+				'id'          => CardButtonGateway::ID,
+				'title'       => __( 'Credit and debit card payments', 'woocommerce-paypal-payments' ),
+				'description' => __( "Accept all major credit and debit cards - even if your customer doesn't have a PayPal account . ", 'woocommerce-paypal-payments' ),
+				'icon'        => 'payment-method-cards',
+			),
 		);
+
+		return apply_filters( 'woocommerce_paypal_payments_gateway_group_paypal', $group );
 	}
 
 	/**
@@ -152,13 +193,87 @@ class PaymentMethodsDefinition {
 	 *
 	 * @return array
 	 */
-	private function group_card_methods() : array {
-		return array(
-			$this->define_advanced_cards(),
-			$this->define_axo(),
-			$this->define_apple_pay(),
-			$this->define_google_pay(),
+	public function group_card_methods() : array {
+		$group = array(
+			array(
+				'id'          => CreditCardGateway::ID,
+				'title'       => __( 'Advanced Credit and Debit Card Payments', 'woocommerce-paypal-payments' ),
+				'description' => __( "Present custom credit and debit card fields to your payers so they can pay with credit and debit cards using your site's branding.", 'woocommerce-paypal-payments' ),
+				'icon'        => 'payment-method-advanced-cards',
+				'fields'      => array(
+					'threeDSecure' => array(
+						'type'        => 'radio',
+						'default'     => $this->settings->get_three_d_secure(),
+						'label'       => __( '3D Secure', 'woocommerce-paypal-payments' ),
+						'description' => __(
+							'Authenticate cardholders through their card issuers to reduce fraud and improve transaction security. Successful 3D Secure authentication can shift liability for fraudulent chargebacks to the card issuer.',
+							'woocommerce-paypal-payments'
+						),
+						'options'     => array(
+							array(
+								'label' => __(
+									'No 3D Secure',
+									'woocommerce-paypal-payments'
+								),
+								'value' => 'no-3d-secure',
+							),
+							array(
+								'label' => __(
+									'Only when required',
+									'woocommerce-paypal-payments'
+								),
+								'value' => 'only-required-3d-secure',
+							),
+							array(
+								'label' => __(
+									'Always require 3D Secure',
+									'woocommerce-paypal-payments'
+								),
+								'value' => 'always-3d-secure',
+							),
+						),
+					),
+				),
+			),
+			array(
+				'id'          => AxoGateway::ID,
+				'title'       => __( 'Fastlane by PayPal', 'woocommerce-paypal-payments' ),
+				'description' => __( "Tap into the scale and trust of PayPal's customer network to recognize shoppers and make guest checkout more seamless than ever.", 'woocommerce-paypal-payments' ),
+				'icon'        => 'payment-method-fastlane',
+				'fields'      => array(
+					'fastlaneCardholderName'   => array(
+						'type'    => 'toggle',
+						'default' => $this->settings->get_fastlane_cardholder_name(),
+						'label'   => __(
+							'Display cardholder name',
+							'woocommerce-paypal-payments'
+						),
+					),
+					'fastlaneDisplayWatermark' => array(
+						'type'    => 'toggle',
+						'default' => $this->settings->get_fastlane_display_watermark(),
+						'label'   => __(
+							'Display Fastlane Watermark',
+							'woocommerce-paypal-payments'
+						),
+					),
+				),
+			),
+			array(
+				'id'          => ApplePayGateway::ID,
+				'title'       => __( 'Apple Pay', 'woocommerce-paypal-payments' ),
+				'description' => __( 'Allow customers to pay via their Apple Pay digital wallet.', 'woocommerce-paypal-payments' ),
+				'icon'        => 'payment-method-apple-pay',
+			),
+			array(
+				'id'          => GooglePayGateway::ID,
+				'title'       => __( 'Google Pay', 'woocommerce-paypal-payments' ),
+				'description' => __( 'Allow customers to pay via their Google Pay digital wallet.', 'woocommerce-paypal-payments' ),
+				'icon'        => 'payment-method-google-pay',
+			),
 		);
+
+		return apply_filters( 'woocommerce_paypal_payments_gateway_group_cards', $group );
 	}
 
 	/**
@@ -167,8 +282,8 @@ class PaymentMethodsDefinition {
 	 *
 	 * @return array List of payment method definitions.
 	 */
-	private function group_apms() : array {
-		$apm_list = array(
+	public function group_apms() : array {
+		$group = array(
 			array(
 				'id'          => BancontactGateway::ID,
 				'title'       => __( 'Bancontact', 'woocommerce-paypal-payments' ),
@@ -261,203 +376,6 @@ class PaymentMethodsDefinition {
 			),
 		);
 
-		return array_map(
-			function ( $apm ) {
-				return $this->define_common_fields(
-					$apm['id'],
-					$apm['title'],
-					$apm['description'],
-					$apm['icon']
-				);
-			},
-			$apm_list
-		);
-	}
-
-	// Payment method specific definitions.
-
-	/**
-	 * Builds the payment method definition for PayPal.
-	 *
-	 * @return array Payment method definition.
-	 */
-	private function define_paypal() : array {
-		return $this->define_common_fields(
-			PayPalGateway::ID,
-			__( 'PayPal', 'woocommerce-paypal-payments' ),
-			__( 'Our all-in-one checkout solution lets you offer PayPal, Venmo, Pay Later options, and more to help maximize conversion.', 'woocommerce-paypal-payments' ),
-			'payment-method-paypal',
-			array(
-				'paypalShowLogo' => array(
-					'type'    => 'toggle',
-					'default' => $this->settings->get_paypal_show_logo(),
-					'label'   => __( 'Show logo', 'woocommerce-paypal-payments' ),
-				),
-			)
-		);
-	}
-
-	/**
-	 * Builds the payment method definition for Venmo.
-	 *
-	 * @return array Payment method definition.
-	 */
-	private function define_venmo() : array {
-		$gateway = $this->define_common_fields(
-			'venmo',
-			__( 'Venmo', 'woocommerce-paypal-payments' ),
-			__(
-				'Offer Venmo at checkout to millions of active users.',
-				'woocommerce-paypal-payments'
-			),
-			'payment-method-venmo',
-		);
-
-		unset( $gateway['fields'] );
-
-		return $gateway;
-	}
-
-	/**
-	 * Builds the payment method definition for Pay Later.
-	 *
-	 * @return array Payment method definition.
-	 */
-	private function define_pay_later() : array {
-		$gateway = $this->define_common_fields(
-			'pay-later',
-			__( 'Pay Later', 'woocommerce-paypal-payments' ),
-			__(
-				'Get paid in full at checkout while giving your customers the flexibility to pay in installments over time with no late fees.',
-				'woocommerce-paypal-payments'
-			),
-			'payment-method-paypal',
-		);
-
-		unset( $gateway['fields'] );
-
-		return $gateway;
-	}
-
-	/**
-	 * Builds the payment method definition for Credit Card Button.
-	 *
-	 * @return array Payment method definition.
-	 */
-	private function define_card_button() : array {
-		return $this->define_common_fields(
-			CardButtonGateway::ID,
-			__( 'Credit and debit card payments', 'woocommerce-paypal-payments' ),
-			__( "Accept all major credit and debit cards - even if your customer doesn't have a PayPal account.", 'woocommerce-paypal-payments' ),
-			'payment-method-cards',
-		);
-	}
-
-	/**
-	 * Builds the payment method definition for Advanced Card Payments.
-	 *
-	 * @return array Payment method definition.
-	 */
-	private function define_advanced_cards() : array {
-		return $this->define_common_fields(
-			CreditCardGateway::ID,
-			__( 'Advanced Credit and Debit Card Payments', 'woocommerce-paypal-payments' ),
-			__( "Present custom credit and debit card fields to your payers so they can pay with credit and debit cards using your site's branding.", 'woocommerce-paypal-payments' ),
-			'payment-method-advanced-cards',
-			array(
-				'threeDSecure' => array(
-					'type'        => 'radio',
-					'default'     => $this->settings->get_three_d_secure(),
-					'label'       => __( '3D Secure', 'woocommerce-paypal-payments' ),
-					'description' => __(
-						'Authenticate cardholders through their card issuers to reduce fraud and improve transaction security. Successful 3D Secure authentication can shift liability for fraudulent chargebacks to the card issuer.',
-						'woocommerce-paypal-payments'
-					),
-					'options'     => array(
-						array(
-							'label' => __(
-								'No 3D Secure',
-								'woocommerce-paypal-payments'
-							),
-							'value' => 'no-3d-secure',
-						),
-						array(
-							'label' => __(
-								'Only when required',
-								'woocommerce-paypal-payments'
-							),
-							'value' => 'only-required-3d-secure',
-						),
-						array(
-							'label' => __(
-								'Always require 3D Secure',
-								'woocommerce-paypal-payments'
-							),
-							'value' => 'always-3d-secure',
-						),
-					),
-				),
-			),
-		);
-	}
-
-	/**
-	 * Builds the payment method definition for Fastlane.
-	 *
-	 * @return array Payment method definition.
-	 */
-	private function define_axo() : array {
-		return $this->define_common_fields(
-			AxoGateway::ID,
-			__( 'Fastlane by PayPal', 'woocommerce-paypal-payments' ),
-			__( "Tap into the scale and trust of PayPal's customer network to recognize shoppers and make guest checkout more seamless than ever.", 'woocommerce-paypal-payments' ),
-			'payment-method-fastlane',
-			array(
-				'fastlaneCardholderName'   => array(
-					'type'    => 'toggle',
-					'default' => $this->settings->get_fastlane_cardholder_name(),
-					'label'   => __(
-						'Display cardholder name',
-						'woocommerce-paypal-payments'
-					),
-				),
-				'fastlaneDisplayWatermark' => array(
-					'type'    => 'toggle',
-					'default' => $this->settings->get_fastlane_display_watermark(),
-					'label'   => __(
-						'Display Fastlane Watermark',
-						'woocommerce-paypal-payments'
-					),
-				),
-			),
-		);
-	}
-
-	/**
-	 * Builds the payment method definition for Apple Pay.
-	 *
-	 * @return array Payment method definition.
-	 */
-	private function define_apple_pay() : array {
-		return $this->define_common_fields(
-			ApplePayGateway::ID,
-			__( 'Apple Pay', 'woocommerce-paypal-payments' ),
-			__( 'Allow customers to pay via their Apple Pay digital wallet.', 'woocommerce-paypal-payments' ),
-			'payment-method-apple-pay',
-		);
-	}
-
-	/**
-	 * Builds the payment method definition for Google Pay.
-	 *
-	 * @return array Payment method definition.
-	 */
-	private function define_google_pay() : array {
-		return $this->define_common_fields(
-			GooglePayGateway::ID,
-			__( 'Google Pay', 'woocommerce-paypal-payments' ),
-			__( 'Allow customers to pay via their Google Pay digital wallet.', 'woocommerce-paypal-payments' ),
-			'payment-method-google-pay',
-		);
+		return apply_filters( 'woocommerce_paypal_payments_gateway_group_apm', $group );
 	}
 }

From 0bb609349c1dbe970bebe32181746e899dfd15e4 Mon Sep 17 00:00:00 2001
From: Philipp Stracker <p.stracker@syde.com>
Date: Fri, 14 Feb 2025 12:20:01 +0100
Subject: [PATCH 37/48] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20Add=20option=20to=20?=
 =?UTF-8?q?disable=20form=20fields=20for=20methods?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Definition/PaymentMethodsDefinition.php   | 59 ++++++++++---------
 1 file changed, 32 insertions(+), 27 deletions(-)

diff --git a/modules/ppcp-settings/src/Data/Definition/PaymentMethodsDefinition.php b/modules/ppcp-settings/src/Data/Definition/PaymentMethodsDefinition.php
index 958e6a122..5926df18f 100644
--- a/modules/ppcp-settings/src/Data/Definition/PaymentMethodsDefinition.php
+++ b/modules/ppcp-settings/src/Data/Definition/PaymentMethodsDefinition.php
@@ -73,7 +73,7 @@ class PaymentMethodsDefinition {
 
 		$result = array();
 		foreach ( $all_methods as $method ) {
-			$result[ $method['id'] ] = $this->define_common_fields(
+			$result[ $method['id'] ] = $this->build_method_definition(
 				$method['id'],
 				$method['title'],
 				$method['description'],
@@ -89,43 +89,27 @@ class PaymentMethodsDefinition {
 	 * Returns a new payment method configuration array that contains all
 	 * common attributes which must be present in every method definition.
 	 *
-	 * @param string $gateway_id   The payment method ID.
-	 * @param string $title        Admin-side payment method title.
-	 * @param string $description  Admin-side info about the payment method.
-	 * @param string $icon         Admin-side icon of the payment method.
-	 * @param array  $extra_fields Optional. Additional fields to display in the edit modal.
+	 * @param string      $gateway_id  The payment method ID.
+	 * @param string      $title       Admin-side payment method title.
+	 * @param string      $description Admin-side info about the payment method.
+	 * @param string      $icon        Admin-side icon of the payment method.
+	 * @param array|false $fields      Optional. Additional fields to display in the edit modal.
+	 *                                 Setting this to false omits all fields.
 	 * @return array Payment method definition.
 	 */
-	private function define_common_fields(
+	private function build_method_definition(
 		string $gateway_id,
 		string $title,
 		string $description,
 		string $icon,
-		array $extra_fields = array()
+		$fields = array()
 	) : array {
 		$gateway = $this->wc_gateways[ $gateway_id ] ?? null;
 
 		$gateway_title       = $gateway ? $gateway->get_title() : $title;
 		$gateway_description = $gateway ? $gateway->get_description() : $description;
 
-		$fields = array(
-			'checkoutPageTitle'       => array(
-				'type'    => 'text',
-				'default' => $gateway_title,
-				'label'   => __( 'Checkout page title', 'woocommerce-paypal-payments' ),
-			),
-			'checkoutPageDescription' => array(
-				'type'    => 'text',
-				'default' => $gateway ? $gateway->get_description() : '',
-				'label'   => __( 'Checkout page description', 'woocommerce-paypal-payments' ),
-			),
-		);
-
-		if ( $extra_fields ) {
-			$fields = array_merge( $fields, $extra_fields );
-		}
-
-		return array(
+		$config = array(
 			'id'              => $gateway_id,
 			'enabled'         => $this->settings->is_method_enabled( $gateway_id ),
 			'title'           => str_replace( '&amp;', '&', $gateway_title ),
@@ -133,8 +117,27 @@ class PaymentMethodsDefinition {
 			'icon'            => $icon,
 			'itemTitle'       => $title,
 			'itemDescription' => $description,
-			'fields'          => $fields,
 		);
+
+		if ( is_array( $fields ) ) {
+			$config['fields'] = array_merge(
+				array(
+					'checkoutPageTitle'       => array(
+						'type'    => 'text',
+						'default' => $gateway_title,
+						'label'   => __( 'Checkout page title', 'woocommerce-paypal-payments' ),
+					),
+					'checkoutPageDescription' => array(
+						'type'    => 'text',
+						'default' => $gateway ? $gateway->get_description() : '',
+						'label'   => __( 'Checkout page description', 'woocommerce-paypal-payments' ),
+					),
+				),
+				$fields
+			);
+		}
+
+		return $config;
 	}
 
 	// Payment method groups.
@@ -167,6 +170,7 @@ class PaymentMethodsDefinition {
 					'woocommerce-paypal-payments'
 				),
 				'icon'        => 'payment-method-venmo',
+				'fields'      => false,
 			),
 			array(
 				'id'          => 'pay-later',
@@ -176,6 +180,7 @@ class PaymentMethodsDefinition {
 					'woocommerce-paypal-payments'
 				),
 				'icon'        => 'payment-method-paypal',
+				'fields'      => false,
 			),
 			array(
 				'id'          => CardButtonGateway::ID,

From b6024dc815309a0c9e955e06321708db4b4374af Mon Sep 17 00:00:00 2001
From: Philipp Stracker <p.stracker@syde.com>
Date: Fri, 14 Feb 2025 12:22:41 +0100
Subject: [PATCH 38/48] =?UTF-8?q?=E2=9C=A8=20Conditionally=20enable=20paym?=
 =?UTF-8?q?ent=20methods?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/Service/SettingsDataManager.php         | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/modules/ppcp-settings/src/Service/SettingsDataManager.php b/modules/ppcp-settings/src/Service/SettingsDataManager.php
index 8fd273cd5..59ad7d8a4 100644
--- a/modules/ppcp-settings/src/Service/SettingsDataManager.php
+++ b/modules/ppcp-settings/src/Service/SettingsDataManager.php
@@ -20,6 +20,8 @@ use WooCommerce\PayPalCommerce\Settings\Data\StylingSettings;
 use WooCommerce\PayPalCommerce\Settings\Data\GeneralSettings;
 use WooCommerce\PayPalCommerce\Settings\Data\SettingsModel;
 use WooCommerce\PayPalCommerce\Settings\Data\PaymentSettings;
+use WooCommerce\PayPalCommerce\WcGateway\Gateway\CreditCardGateway;
+use WooCommerce\PayPalCommerce\WcGateway\Gateway\CardButtonGateway;
 
 /**
  * Class SettingsDataManager
@@ -189,6 +191,21 @@ class SettingsDataManager {
 		// Always enable Venmo and Pay Later.
 		$this->payment_methods->toggle_method_state( 'venmo', true );
 		$this->payment_methods->toggle_method_state( 'pay-later', true );
+
+		// Use BCDC for casual sellers.
+		$this->payment_methods->toggle_method_state(
+			CardButtonGateway::ID,
+			! $flags->is_business_seller && $flags->use_card_payments
+		);
+
+		// Enable ACDC for business sellers.
+		$this->payment_methods->toggle_method_state(
+			CreditCardGateway::ID,
+			$flags->is_business_seller && $flags->use_card_payments
+		);
+
+		$this->payment_methods->toggle_method_state( ApplePayGateway::ID, $flags->is_business_seller );
+		$this->payment_methods->toggle_method_state( GooglePayGateway::ID, $flags->is_business_seller );
 	}
 
 	/**

From 67e7703e1f50f954e9230e427d5def00603bdb58 Mon Sep 17 00:00:00 2001
From: Philipp Stracker <p.stracker@syde.com>
Date: Fri, 14 Feb 2025 12:30:25 +0100
Subject: [PATCH 39/48] =?UTF-8?q?=E2=9C=A8=20Finish=20the=20payment=20meth?=
 =?UTF-8?q?od=20configuraton?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/ppcp-settings/services.php            |  1 +
 .../src/Service/SettingsDataManager.php       | 47 +++++++++++++++----
 2 files changed, 38 insertions(+), 10 deletions(-)

diff --git a/modules/ppcp-settings/services.php b/modules/ppcp-settings/services.php
index bc4ec4de3..da64c0968 100644
--- a/modules/ppcp-settings/services.php
+++ b/modules/ppcp-settings/services.php
@@ -254,6 +254,7 @@ return array(
 	},
 	'settings.service.data-manager'               => static function ( ContainerInterface $container ) : SettingsDataManager {
 		return new SettingsDataManager(
+			$container->get( 'settings.data.definition.methods' ),
 			$container->get( 'settings.data.onboarding' ),
 			$container->get( 'settings.data.general' ),
 			$container->get( 'settings.data.settings' ),
diff --git a/modules/ppcp-settings/src/Service/SettingsDataManager.php b/modules/ppcp-settings/src/Service/SettingsDataManager.php
index 59ad7d8a4..e7be9b908 100644
--- a/modules/ppcp-settings/src/Service/SettingsDataManager.php
+++ b/modules/ppcp-settings/src/Service/SettingsDataManager.php
@@ -22,6 +22,7 @@ use WooCommerce\PayPalCommerce\Settings\Data\SettingsModel;
 use WooCommerce\PayPalCommerce\Settings\Data\PaymentSettings;
 use WooCommerce\PayPalCommerce\WcGateway\Gateway\CreditCardGateway;
 use WooCommerce\PayPalCommerce\WcGateway\Gateway\CardButtonGateway;
+use WooCommerce\PayPalCommerce\Settings\Data\Definition\PaymentMethodsDefinition;
 
 /**
  * Class SettingsDataManager
@@ -31,6 +32,13 @@ use WooCommerce\PayPalCommerce\WcGateway\Gateway\CardButtonGateway;
  */
 class SettingsDataManager {
 
+	/**
+     * The payment methods definition, provides a list of all available payment methods.
+     *
+     * @var PaymentMethodsDefinition
+     */
+	private PaymentMethodsDefinition $methods_definition;
+
 	/**
 	 * The onboarding profile data model.
 	 *
@@ -70,6 +78,7 @@ class SettingsDataManager {
 	/**
 	 * Constructor.
 	 *
+	 * @param PaymentMethodsDefinition $methods_definition Access list of all payment methods.
 	 * @param OnboardingProfile $onboarding_profile The onboarding profile model.
 	 * @param GeneralSettings   $general_settings   The general settings model.
 	 * @param SettingsModel     $payment_settings   The settings model.
@@ -78,6 +87,7 @@ class SettingsDataManager {
 	 * @param array             ...$data_models     List of additional data models to reset.
 	 */
 	public function __construct(
+		PaymentMethodsDefinition $methods_definition,
 		OnboardingProfile $onboarding_profile,
 		GeneralSettings $general_settings,
 		SettingsModel $payment_settings,
@@ -104,6 +114,7 @@ class SettingsDataManager {
 		$this->models_to_reset[] = $styling_settings;
 		$this->models_to_reset[] = $payment_methods;
 
+		$this->methods_definition = $methods_definition;
 		$this->onboarding_profile = $onboarding_profile;
 		$this->payment_settings   = $payment_settings;
 		$this->styling_settings   = $styling_settings;
@@ -187,25 +198,41 @@ class SettingsDataManager {
 		| Google Pay     | US      | Business    | *any*         | ✅     | Based on feature eligibility  |
 		| All APMs       | US      | Business    | *any*         | ✅     | Based on feature eligibility  |
 		*/
+		// First, disable all payment methods.
+		$methods_paypal = $this->methods_definition->group_paypal_methods();
+		$methods_cards  = $this->methods_definition->group_card_methods();
+		$methods_apm    = $this->methods_definition->group_apms();
+		$all_methods    = array_merge( $methods_paypal, $methods_cards, $methods_apm );
+
+		foreach ( $all_methods as $method ) {
+			$this->payment_methods->toggle_method_state( $method['id'], false );
+		}
 
 		// Always enable Venmo and Pay Later.
 		$this->payment_methods->toggle_method_state( 'venmo', true );
 		$this->payment_methods->toggle_method_state( 'pay-later', true );
 
+		if ( $flags->is_business_seller && $flags->use_card_payments ) {
 		// Use BCDC for casual sellers.
-		$this->payment_methods->toggle_method_state(
-			CardButtonGateway::ID,
-			! $flags->is_business_seller && $flags->use_card_payments
-		);
+			$this->payment_methods->toggle_method_state( CardButtonGateway::ID, true );
+		}
 
+		if ( $flags->is_business_seller ) {
+			if ( $flags->use_card_payments ) {
 		// Enable ACDC for business sellers.
-		$this->payment_methods->toggle_method_state(
-			CreditCardGateway::ID,
-			$flags->is_business_seller && $flags->use_card_payments
-		);
+				$this->payment_methods->toggle_method_state( CreditCardGateway::ID, true );
+			}
 
-		$this->payment_methods->toggle_method_state( ApplePayGateway::ID, $flags->is_business_seller );
-		$this->payment_methods->toggle_method_state( GooglePayGateway::ID, $flags->is_business_seller );
+			$this->payment_methods->toggle_method_state( ApplePayGateway::ID, true );
+			$this->payment_methods->toggle_method_state( GooglePayGateway::ID, true );
+
+			// Enable all APM methods.
+			foreach ( $methods_apm as $method ) {
+				$this->payment_methods->toggle_method_state( $method['id'], true );
+			}
+		}
+
+		$this->payment_methods->save();
 	}
 
 	/**

From 3fb710f174cf57450a7ba3d966452e947db2907a Mon Sep 17 00:00:00 2001
From: Philipp Stracker <p.stracker@syde.com>
Date: Fri, 14 Feb 2025 12:31:05 +0100
Subject: [PATCH 40/48] =?UTF-8?q?=F0=9F=94=A5=20Remove=20dev-comments?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/Service/SettingsDataManager.php       | 35 +++++++------------
 1 file changed, 12 insertions(+), 23 deletions(-)

diff --git a/modules/ppcp-settings/src/Service/SettingsDataManager.php b/modules/ppcp-settings/src/Service/SettingsDataManager.php
index e7be9b908..0db24b5fc 100644
--- a/modules/ppcp-settings/src/Service/SettingsDataManager.php
+++ b/modules/ppcp-settings/src/Service/SettingsDataManager.php
@@ -33,10 +33,10 @@ use WooCommerce\PayPalCommerce\Settings\Data\Definition\PaymentMethodsDefinition
 class SettingsDataManager {
 
 	/**
-     * The payment methods definition, provides a list of all available payment methods.
-     *
-     * @var PaymentMethodsDefinition
-     */
+	 * The payment methods definition, provides a list of all available payment methods.
+	 *
+	 * @var PaymentMethodsDefinition
+	 */
 	private PaymentMethodsDefinition $methods_definition;
 
 	/**
@@ -79,12 +79,12 @@ class SettingsDataManager {
 	 * Constructor.
 	 *
 	 * @param PaymentMethodsDefinition $methods_definition Access list of all payment methods.
-	 * @param OnboardingProfile $onboarding_profile The onboarding profile model.
-	 * @param GeneralSettings   $general_settings   The general settings model.
-	 * @param SettingsModel     $payment_settings   The settings model.
-	 * @param StylingSettings   $styling_settings   The styling settings model.
-	 * @param PaymentSettings   $payment_methods    The payment settings model.
-	 * @param array             ...$data_models     List of additional data models to reset.
+	 * @param OnboardingProfile        $onboarding_profile The onboarding profile model.
+	 * @param GeneralSettings          $general_settings   The general settings model.
+	 * @param SettingsModel            $payment_settings   The settings model.
+	 * @param StylingSettings          $styling_settings   The styling settings model.
+	 * @param PaymentSettings          $payment_methods    The payment settings model.
+	 * @param array                    ...$data_models     List of additional data models to reset.
 	 */
 	public function __construct(
 		PaymentMethodsDefinition $methods_definition,
@@ -187,17 +187,6 @@ class SettingsDataManager {
 	 * @return void
 	 */
 	protected function toggle_payment_gateways( ConfigurationFlagsDTO $flags ) : void {
-		/*
-		TODO: Implement those conditions:
-
-		| Payment Method | Country | Seller Type | Subscriptions | Cards | Notes                         |
-		|----------------|---------|-------------|---------------|-------|-------------------------------|
-		| ACDC           | US      | Business    | *any*         | ✅     | Greyed out for Casual Sellers |
-		| BCDC           | US      | *any*       | *any*         | ✅     |                               |
-		| Apple Pay      | US      | Business    | *any*         | ✅     | Based on feature eligibility  |
-		| Google Pay     | US      | Business    | *any*         | ✅     | Based on feature eligibility  |
-		| All APMs       | US      | Business    | *any*         | ✅     | Based on feature eligibility  |
-		*/
 		// First, disable all payment methods.
 		$methods_paypal = $this->methods_definition->group_paypal_methods();
 		$methods_cards  = $this->methods_definition->group_card_methods();
@@ -213,13 +202,13 @@ class SettingsDataManager {
 		$this->payment_methods->toggle_method_state( 'pay-later', true );
 
 		if ( $flags->is_business_seller && $flags->use_card_payments ) {
-		// Use BCDC for casual sellers.
+			// Use BCDC for casual sellers.
 			$this->payment_methods->toggle_method_state( CardButtonGateway::ID, true );
 		}
 
 		if ( $flags->is_business_seller ) {
 			if ( $flags->use_card_payments ) {
-		// Enable ACDC for business sellers.
+				// Enable ACDC for business sellers.
 				$this->payment_methods->toggle_method_state( CreditCardGateway::ID, true );
 			}
 

From 1c25075ea45fee4efc946aeb2ed6f1f76cf2370e Mon Sep 17 00:00:00 2001
From: Philipp Stracker <p.stracker@syde.com>
Date: Fri, 14 Feb 2025 12:52:35 +0100
Subject: [PATCH 41/48] =?UTF-8?q?=E2=9C=A8=20Draft=20a=20paylater=20messag?=
 =?UTF-8?q?ing=20data=20service?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/ppcp-settings/services.php | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/modules/ppcp-settings/services.php b/modules/ppcp-settings/services.php
index da64c0968..56ca01917 100644
--- a/modules/ppcp-settings/services.php
+++ b/modules/ppcp-settings/services.php
@@ -40,6 +40,9 @@ use WooCommerce\PayPalCommerce\Vendor\Psr\Container\ContainerInterface;
 use WooCommerce\PayPalCommerce\Settings\Service\DataSanitizer;
 use WooCommerce\PayPalCommerce\Settings\Service\SettingsDataManager;
 use WooCommerce\PayPalCommerce\Settings\Data\Definition\PaymentMethodsDefinition;
+use WooCommerce\PayPalCommerce\PayLaterConfigurator\Factory\ConfigFactory;
+use WooCommerce\PayPalCommerce\WcGateway\Settings\Settings;
+use WooCommerce\PayPalCommerce\PayLaterConfigurator\Endpoint\SaveConfig;
 
 return array(
 	'settings.url'                                => static function ( ContainerInterface $container ) : string {
@@ -93,6 +96,25 @@ return array(
 			$container->get( 'settings.service.sanitizer' )
 		);
 	},
+	'settings.data.paylater-messaging'            => static function ( ContainerInterface $container ) : array {
+		// TODO: Create an AbstractDataModel wrapper for this configuration!
+
+		$config_factors = $container->get( 'paylater-configurator.factory.config' );
+		assert( $config_factors instanceof ConfigFactory );
+
+		$save_config = $container->get( 'paylater-configurator.endpoint.save-config' );
+		assert( $save_config instanceof SaveConfig );
+
+		$settings = $container->get( 'wcgateway.settings' );
+		assert( $settings instanceof Settings );
+
+		$pay_later_config = $config_factors->from_settings( $settings );
+
+		return array(
+			'read' => $pay_later_config,
+			'save' => $save_config,
+		);
+	},
 	/**
 	 * Checks if valid merchant connection details are stored in the DB.
 	 */

From 41a07b47dc4817d9084e17db1fb0a081739d4758 Mon Sep 17 00:00:00 2001
From: Philipp Stracker <p.stracker@syde.com>
Date: Fri, 14 Feb 2025 12:53:12 +0100
Subject: [PATCH 42/48] =?UTF-8?q?=E2=9C=A8=20Initialize=20Pay=20Later=20Me?=
 =?UTF-8?q?ssaging=20after=20onboarding?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/ppcp-settings/services.php            |  1 +
 .../src/Service/SettingsDataManager.php       | 36 +++++++++++++++++++
 2 files changed, 37 insertions(+)

diff --git a/modules/ppcp-settings/services.php b/modules/ppcp-settings/services.php
index 56ca01917..9bb48f438 100644
--- a/modules/ppcp-settings/services.php
+++ b/modules/ppcp-settings/services.php
@@ -282,6 +282,7 @@ return array(
 			$container->get( 'settings.data.settings' ),
 			$container->get( 'settings.data.styling' ),
 			$container->get( 'settings.data.payment' ),
+			$container->get( 'settings.data.paylater-messaging' ),
 			$container->get( 'settings.data.todos' ),
 		);
 	},
diff --git a/modules/ppcp-settings/src/Service/SettingsDataManager.php b/modules/ppcp-settings/src/Service/SettingsDataManager.php
index 0db24b5fc..2feefc4ee 100644
--- a/modules/ppcp-settings/src/Service/SettingsDataManager.php
+++ b/modules/ppcp-settings/src/Service/SettingsDataManager.php
@@ -67,6 +67,14 @@ class SettingsDataManager {
 	 */
 	private PaymentSettings $payment_methods;
 
+	/**
+	 * Data accessors for pay later messaging settings.
+	 *
+	 * @var array
+	 * @todo This should be a proper class!
+	 */
+	private array $paylater_messaging;
+
 	/**
 	 * Stores a list of all AbstractDataModel instances that are managed by
 	 * this service.
@@ -84,6 +92,7 @@ class SettingsDataManager {
 	 * @param SettingsModel            $payment_settings   The settings model.
 	 * @param StylingSettings          $styling_settings   The styling settings model.
 	 * @param PaymentSettings          $payment_methods    The payment settings model.
+	 * @param array                    $paylater_messaging Paylater Messaging accessor.
 	 * @param array                    ...$data_models     List of additional data models to reset.
 	 */
 	public function __construct(
@@ -93,6 +102,7 @@ class SettingsDataManager {
 		SettingsModel $payment_settings,
 		StylingSettings $styling_settings,
 		PaymentSettings $payment_methods,
+		array $paylater_messaging, // TODO should be migrated to an AbstractDataModel.
 		...$data_models
 	) {
 		foreach ( $data_models as $data_model ) {
@@ -119,6 +129,7 @@ class SettingsDataManager {
 		$this->payment_settings   = $payment_settings;
 		$this->styling_settings   = $styling_settings;
 		$this->payment_methods    = $payment_methods;
+		$this->paylater_messaging = $paylater_messaging;
 	}
 
 	/**
@@ -177,6 +188,9 @@ class SettingsDataManager {
 
 		// Assign defaults for the "Styling" tab.
 		$this->apply_location_styles( $flags );
+
+		// Assign defaults for the "Pay Later Messaging" tab.
+		$this->apply_pay_later_messaging( $flags );
 	}
 
 	/**
@@ -290,4 +304,26 @@ class SettingsDataManager {
 		$this->styling_settings->from_array( $location_styles );
 		$this->styling_settings->save();
 	}
+
+	/**
+	 * Applies the default pay later messaging details for the shop.
+	 *
+	 * @param ConfigurationFlagsDTO $flags Shop configuration flags.
+	 * @return void
+	 */
+	protected function apply_pay_later_messaging( ConfigurationFlagsDTO $flags ) : void {
+		$config = $this->paylater_messaging['read'];
+
+		$config['cart']['status']     = 'enabled';
+		$config['checkout']['status'] = 'enabled';
+		$config['product']['status']  = 'enabled';
+		$config['shop']['status']     = 'disabled';
+		$config['home']['status']     = 'disabled';
+
+		foreach ( $config['custom_placement'] as $key => $placement ) {
+			$config['custom_placement'][ $key ]['status'] = 'disabled';
+		}
+
+		$this->paylater_messaging['save']->save_config( $config );
+	}
 }

From 37e442eb1e661f136718d71cfaf0c100a828c427 Mon Sep 17 00:00:00 2001
From: Philipp Stracker <p.stracker@syde.com>
Date: Fri, 14 Feb 2025 13:04:37 +0100
Subject: [PATCH 43/48] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20Rename=20onboarding?=
 =?UTF-8?q?=20prop=20to=20match=20its=20meaning?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/Data/OnboardingProfile.php            | 20 +++++++++----------
 .../src/Endpoint/OnboardingRestEndpoint.php   | 10 +++++-----
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/modules/ppcp-settings/src/Data/OnboardingProfile.php b/modules/ppcp-settings/src/Data/OnboardingProfile.php
index 070d478c8..c0049921d 100644
--- a/modules/ppcp-settings/src/Data/OnboardingProfile.php
+++ b/modules/ppcp-settings/src/Data/OnboardingProfile.php
@@ -67,12 +67,12 @@ class OnboardingProfile extends AbstractDataModel {
 	 */
 	protected function get_defaults() : array {
 		return array(
-			'completed'                            => false,
-			'step'                                 => 0,
-			'is_casual_seller'                     => null,
-			'are_optional_payment_methods_enabled' => null,
-			'products'                             => array(),
-			'setup_done'                           => false,
+			'completed'            => false,
+			'step'                 => 0,
+			'is_casual_seller'     => null,
+			'accept_card_payments' => null,
+			'products'             => array(),
+			'setup_done'           => false,
 		);
 	}
 
@@ -133,12 +133,12 @@ class OnboardingProfile extends AbstractDataModel {
 	}
 
 	/**
-	 * Sets the optional payment methods flag.
+	 * Sets the "accept card payments" flag.
 	 *
-	 * @param bool|null $are_optional_payment_methods_enabled Whether the PayPal optional payment methods are enabled.
+	 * @param bool|null $accept_cards Whether to accept card payments via the PayPal plugin.
 	 */
-	public function set_are_optional_payment_methods_enabled( ?bool $are_optional_payment_methods_enabled ) : void {
-		$this->data['are_optional_payment_methods_enabled'] = $are_optional_payment_methods_enabled;
+	public function set_accept_card_payments( ?bool $accept_cards ) : void {
+		$this->data['accept_card_payments'] = $accept_cards;
 	}
 
 	/**
diff --git a/modules/ppcp-settings/src/Endpoint/OnboardingRestEndpoint.php b/modules/ppcp-settings/src/Endpoint/OnboardingRestEndpoint.php
index b055ab3e2..b7a5b8023 100644
--- a/modules/ppcp-settings/src/Endpoint/OnboardingRestEndpoint.php
+++ b/modules/ppcp-settings/src/Endpoint/OnboardingRestEndpoint.php
@@ -41,23 +41,23 @@ class OnboardingRestEndpoint extends RestEndpoint {
 	 * @var array
 	 */
 	private array $field_map = array(
-		'completed'                            => array(
+		'completed'            => array(
 			'js_name'  => 'completed',
 			'sanitize' => 'to_boolean',
 		),
-		'step'                                 => array(
+		'step'                 => array(
 			'js_name'  => 'step',
 			'sanitize' => 'to_number',
 		),
-		'is_casual_seller'                     => array(
+		'is_casual_seller'     => array(
 			'js_name'  => 'isCasualSeller',
 			'sanitize' => 'to_boolean',
 		),
-		'are_optional_payment_methods_enabled' => array(
+		'accept_card_payments' => array(
 			'js_name'  => 'areOptionalPaymentMethodsEnabled',
 			'sanitize' => 'to_boolean',
 		),
-		'products'                             => array(
+		'products'             => array(
 			'js_name' => 'products',
 		),
 	);

From 0e0a73db11fde3c63bbbb55e04492c706a594a7b Mon Sep 17 00:00:00 2001
From: Philipp Stracker <p.stracker@syde.com>
Date: Fri, 14 Feb 2025 13:06:33 +0100
Subject: [PATCH 44/48] =?UTF-8?q?=E2=9C=A8=20Replace=20dummy=20flag=20with?=
 =?UTF-8?q?=20real=20user=20choice?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/ppcp-settings/src/Data/OnboardingProfile.php | 9 +++++++++
 modules/ppcp-settings/src/SettingsModule.php         | 2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/modules/ppcp-settings/src/Data/OnboardingProfile.php b/modules/ppcp-settings/src/Data/OnboardingProfile.php
index c0049921d..3ba3f36c2 100644
--- a/modules/ppcp-settings/src/Data/OnboardingProfile.php
+++ b/modules/ppcp-settings/src/Data/OnboardingProfile.php
@@ -132,6 +132,15 @@ class OnboardingProfile extends AbstractDataModel {
 		$this->data['is_casual_seller'] = $casual_seller;
 	}
 
+	/**
+	 * Whether the merchant wants to accept card payments via the PayPal plugin.
+	 *
+	 * @return bool
+	 */
+	public function get_accept_card_payments() : bool {
+		return (bool) $this->data['accept_card_payments'];
+	}
+
 	/**
 	 * Sets the "accept card payments" flag.
 	 *
diff --git a/modules/ppcp-settings/src/SettingsModule.php b/modules/ppcp-settings/src/SettingsModule.php
index 50bd9e294..6a1dcc587 100644
--- a/modules/ppcp-settings/src/SettingsModule.php
+++ b/modules/ppcp-settings/src/SettingsModule.php
@@ -300,7 +300,7 @@ class SettingsModule implements ServiceModule, ExecutableModule {
 				// TODO: Dummy values, use real values!
 				$flags->country_code       = 'US';
 				$flags->is_business_seller = true;
-				$flags->use_card_payments  = true;
+				$flags->use_card_payments  = $onboarding_profile->get_accept_card_payments();
 				$flags->use_subscriptions  = true;
 
 				$data_manager->set_defaults_for_new_merchant( $flags );

From 6061d9e20ead2e398da3cc80661dd2009eb3fabb Mon Sep 17 00:00:00 2001
From: Philipp Stracker <p.stracker@syde.com>
Date: Fri, 14 Feb 2025 13:11:58 +0100
Subject: [PATCH 45/48] =?UTF-8?q?=E2=9C=A8=20New=20enum=20to=20define=20pr?=
 =?UTF-8?q?oduct=20choices?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/Enum/ProductChoicesEnum.php           | 56 +++++++++++++++++++
 1 file changed, 56 insertions(+)
 create mode 100644 modules/ppcp-settings/src/Enum/ProductChoicesEnum.php

diff --git a/modules/ppcp-settings/src/Enum/ProductChoicesEnum.php b/modules/ppcp-settings/src/Enum/ProductChoicesEnum.php
new file mode 100644
index 000000000..57a4a8ee6
--- /dev/null
+++ b/modules/ppcp-settings/src/Enum/ProductChoicesEnum.php
@@ -0,0 +1,56 @@
+<?php
+/**
+ * Defines valid "product" options that can be chosen during onboarding.
+ *
+ * @package WooCommerce\PayPalCommerce\Settings\Enum
+ */
+
+declare( strict_types = 1 );
+
+namespace WooCommerce\PayPalCommerce\Settings\Enum;
+
+/**
+ * Enum for the "product" list choice.
+ */
+class ProductChoicesEnum {
+	/**
+	 * Virtual products that don't require shipping
+	 * Sample: downloads, courses, events
+	 */
+	public const VIRTUAL = 'virtual';
+
+	/**
+	 * Physical products that require shipping
+	 * Sample: books, clothing, electronics
+	 */
+	public const PHYSICAL = 'physical';
+
+	/**
+	 * Subscription products that require automatic payments
+	 * Sample: memberships, subscriptions
+	 */
+	public const SUBSCRIPTIONS = 'subscriptions';
+
+	/**
+	 * Get all valid seller types.
+	 *
+	 * @return array List of all valid seller_types.
+	 */
+	public static function get_valid_values() : array {
+		return array(
+			self::VIRTUAL,
+			self::PHYSICAL,
+			self::SUBSCRIPTIONS,
+		);
+	}
+
+	/**
+	 * Check if a given type is valid.
+	 *
+	 * @param string $type The value to validate.
+	 * @return bool True, if the value is a valid seller_type.
+	 */
+	public static function is_valid( string $type ) : bool {
+		return in_array( $type, self::get_valid_values(), true );
+	}
+}

From 09bbcb0b3ca106cf7b2f8a111b67aad8365a677c Mon Sep 17 00:00:00 2001
From: Philipp Stracker <p.stracker@syde.com>
Date: Fri, 14 Feb 2025 13:12:21 +0100
Subject: [PATCH 46/48] =?UTF-8?q?=E2=9C=A8=20Replace=20dummy=20value=20wit?=
 =?UTF-8?q?h=20real=20onboarding-flag?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/ppcp-settings/src/SettingsModule.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/ppcp-settings/src/SettingsModule.php b/modules/ppcp-settings/src/SettingsModule.php
index 6a1dcc587..ec6ca1bb5 100644
--- a/modules/ppcp-settings/src/SettingsModule.php
+++ b/modules/ppcp-settings/src/SettingsModule.php
@@ -38,6 +38,7 @@ use WooCommerce\PayPalCommerce\WcGateway\Helper\DCCProductStatus;
 use WooCommerce\PayPalCommerce\WcGateway\Settings\Settings;
 use WooCommerce\PayPalCommerce\Settings\Service\SettingsDataManager;
 use WooCommerce\PayPalCommerce\Settings\DTO\ConfigurationFlagsDTO;
+use WooCommerce\PayPalCommerce\Settings\Enum\ProductChoicesEnum;
 
 /**
  * Class SettingsModule
@@ -301,7 +302,7 @@ class SettingsModule implements ServiceModule, ExecutableModule {
 				$flags->country_code       = 'US';
 				$flags->is_business_seller = true;
 				$flags->use_card_payments  = $onboarding_profile->get_accept_card_payments();
-				$flags->use_subscriptions  = true;
+				$flags->use_subscriptions  = in_array( ProductChoicesEnum::SUBSCRIPTIONS, $onboarding_profile->get_products(), true );
 
 				$data_manager->set_defaults_for_new_merchant( $flags );
 			}

From 68b924f4e37ad38dffd28232a2cccf3f385a568d Mon Sep 17 00:00:00 2001
From: Philipp Stracker <p.stracker@syde.com>
Date: Fri, 14 Feb 2025 13:13:43 +0100
Subject: [PATCH 47/48] =?UTF-8?q?=E2=9C=A8=20Replace=20dummy=20flag=20with?=
 =?UTF-8?q?=20real=20merchant=20type?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/ppcp-settings/src/SettingsModule.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/modules/ppcp-settings/src/SettingsModule.php b/modules/ppcp-settings/src/SettingsModule.php
index ec6ca1bb5..741054ba7 100644
--- a/modules/ppcp-settings/src/SettingsModule.php
+++ b/modules/ppcp-settings/src/SettingsModule.php
@@ -39,6 +39,7 @@ use WooCommerce\PayPalCommerce\WcGateway\Settings\Settings;
 use WooCommerce\PayPalCommerce\Settings\Service\SettingsDataManager;
 use WooCommerce\PayPalCommerce\Settings\DTO\ConfigurationFlagsDTO;
 use WooCommerce\PayPalCommerce\Settings\Enum\ProductChoicesEnum;
+use WooCommerce\PayPalCommerce\Settings\Data\GeneralSettings;
 
 /**
  * Class SettingsModule
@@ -296,11 +297,14 @@ class SettingsModule implements ServiceModule, ExecutableModule {
 				$data_manager = $container->get( 'settings.service.data-manager' );
 				assert( $data_manager instanceof SettingsDataManager );
 
+				$general_settings = $container->get( 'settings.data.general' );
+				assert( $general_settings instanceof GeneralSettings );
+
 				$flags = new ConfigurationFlagsDTO();
 
 				// TODO: Dummy values, use real values!
 				$flags->country_code       = 'US';
-				$flags->is_business_seller = true;
+				$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 );
 

From 1d5ef6d58bf618bad67ac82e7e3cae3728c74e60 Mon Sep 17 00:00:00 2001
From: Philipp Stracker <p.stracker@syde.com>
Date: Fri, 14 Feb 2025 13:14:18 +0100
Subject: [PATCH 48/48] =?UTF-8?q?=F0=9F=92=A1=20Update=20a=20code=20commen?=
 =?UTF-8?q?t?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/ppcp-settings/src/SettingsModule.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/ppcp-settings/src/SettingsModule.php b/modules/ppcp-settings/src/SettingsModule.php
index 741054ba7..1e6c1f818 100644
--- a/modules/ppcp-settings/src/SettingsModule.php
+++ b/modules/ppcp-settings/src/SettingsModule.php
@@ -302,7 +302,7 @@ class SettingsModule implements ServiceModule, ExecutableModule {
 
 				$flags = new ConfigurationFlagsDTO();
 
-				// TODO: Dummy values, use real values!
+				// TODO: Get the merchant country from PayPal here!
 				$flags->country_code       = 'US';
 				$flags->is_business_seller = $general_settings->is_business_seller();
 				$flags->use_card_payments  = $onboarding_profile->get_accept_card_payments();