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

♻️ Refactor PayPalGateway

Browse source
This commit is contained in:
Philipp Stracker 2025-02-17 17:02:54 +01:00
parent 6294dcac52
commit 1a2eabe7ca
No known key found for this signature in database
2 changed files with 4 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -93,7 +93,6 @@ return array(
$settings = $container->get( 'wcgateway.settings' );
$session_handler = $container->get( 'session.handler' );
$refund_processor = $container->get( 'wcgateway.processor.refunds' );
$state = $container->get( 'onboarding.state' );
$transaction_url_provider = $container->get( 'wcgateway.transaction-url-provider' );
$subscription_helper = $container->get( 'wc-subscriptions.helper' );
$page_id = $container->get( 'wcgateway.current-ppcp-settings-page-id' );
@ -108,7 +107,7 @@ return array(
$settings,
$session_handler,
$refund_processor,
$state,
$container->get( 'settings.flag.is-connected' ),
$transaction_url_provider,
$subscription_helper,
$page_id,

15
modules/ppcp-wc-gateway/src/Gateway/PayPalGateway.php
View file

@ -19,7 +19,6 @@ use WooCommerce\PayPalCommerce\ApiClient\Entity\OrderStatus;
use WooCommerce\PayPalCommerce\ApiClient\Entity\PaymentToken;
use WooCommerce\PayPalCommerce\ApiClient\Exception\PayPalApiException;
use WooCommerce\PayPalCommerce\WcGateway\Helper\Environment;
use WooCommerce\PayPalCommerce\Onboarding\State;
use WooCommerce\PayPalCommerce\Session\SessionHandler;
use WooCommerce\PayPalCommerce\Vaulting\WooCommercePaymentTokens;
use WooCommerce\PayPalCommerce\WcSubscriptions\FreeTrialHandlerTrait;
@ -104,13 +103,6 @@ class PayPalGateway extends \WC_Payment_Gateway {
*/
private $refund_processor;
/**
* The state.
*
* @var State
*/
protected $state;
/**
* Service able to provide transaction url for an order.
*
@ -225,7 +217,7 @@ class PayPalGateway extends \WC_Payment_Gateway {
* @param ContainerInterface $config The settings.
* @param SessionHandler $session_handler The Session Handler.
* @param RefundProcessor $refund_processor The Refund Processor.
* @param State $state The state.
* @param bool $is_connected Whether onboarding was completed.
* @param TransactionUrlProvider $transaction_url_provider Service providing transaction view URL based on order.
* @param SubscriptionHelper $subscription_helper The subscription helper.
* @param string $page_id ID of the current PPCP gateway settings page, or empty if it is not such page.
@ -249,7 +241,7 @@ class PayPalGateway extends \WC_Payment_Gateway {
ContainerInterface $config,
SessionHandler $session_handler,
RefundProcessor $refund_processor,
State $state,
bool $is_connected,
TransactionUrlProvider $transaction_url_provider,
SubscriptionHelper $subscription_helper,
string $page_id,
@ -273,12 +265,11 @@ class PayPalGateway extends \WC_Payment_Gateway {
$this->config = $config;
$this->session_handler = $session_handler;
$this->refund_processor = $refund_processor;
$this->state = $state;
$this->transaction_url_provider = $transaction_url_provider;
$this->subscription_helper = $subscription_helper;
$this->page_id = $page_id;
$this->environment = $environment;
$this->onboarded = $state->current_state() === State::STATE_ONBOARDED;
$this->onboarded = $is_connected;
$this->payment_token_repository = $payment_token_repository;
$this->logger = $logger;
$this->api_shop_country = $api_shop_country;