mirror of
https://github.com/woocommerce/woocommerce-paypal-payments.git
synced 2025-09-05 08:59:14 +08:00
move payment process out of wc gateway
This commit is contained in:
David Remer
parent
95f608bf40
commit
a09a4e1e3d
4 changed files with 125 additions and 100 deletions
|
|
@ -14,7 +14,7 @@ use Inpsyde\PayPalCommerce\WcGateway\Gateway\WcGatewayBase;
|
|||
use Inpsyde\PayPalCommerce\WcGateway\Notice\AuthorizeOrderActionNotice;
|
||||
use Inpsyde\PayPalCommerce\WcGateway\Notice\ConnectAdminNotice;
|
||||
use Inpsyde\PayPalCommerce\WcGateway\Processor\AuthorizedPaymentsProcessor;
|
||||
use Inpsyde\PayPalCommerce\WcGateway\Processor\Processor;
|
||||
use Inpsyde\PayPalCommerce\WcGateway\Processor\OrderProcessor;
|
||||
use Inpsyde\PayPalCommerce\WcGateway\Settings\Settings;
|
||||
use Inpsyde\PayPalCommerce\WcGateway\Settings\SettingsFields;
|
||||
|
||||
|
|
@ -23,23 +23,14 @@ return [
|
|||
return new WcGatewayBase();
|
||||
},
|
||||
'wcgateway.gateway' => static function (ContainerInterface $container): WcGateway {
|
||||
$sessionHandler = $container->get('session.handler');
|
||||
$cartRepository = $container->get('api.repository.cart');
|
||||
// TODO eventuall get rid of the endpoints as the processor is sufficient
|
||||
$orderEndpoint = $container->get('api.endpoint.order');
|
||||
$paymentsEndpoint = $container->get('api.endpoint.payments');
|
||||
$orderFactory = $container->get('api.factory.order');
|
||||
$orderProcessor = $container->get('wcgateway.order-processor');
|
||||
$settingsFields = $container->get('wcgateway.settings.fields');
|
||||
$processor = $container->get('wcgateway.processor');
|
||||
$authorizedPayments = $container->get('wcgateway.processor.authorized-payments');
|
||||
$notice = $container->get('wcgateway.notice.authorize-order-action');
|
||||
return new WcGateway(
|
||||
$sessionHandler,
|
||||
$cartRepository,
|
||||
$orderEndpoint,
|
||||
$paymentsEndpoint,
|
||||
$orderFactory,
|
||||
$settingsFields,
|
||||
$processor,
|
||||
$orderProcessor,
|
||||
$authorizedPayments,
|
||||
$notice
|
||||
);
|
||||
},
|
||||
|
|
@ -63,9 +54,20 @@ return [
|
|||
'wcgateway.settings.fields' => static function (ContainerInterface $container): SettingsFields {
|
||||
return new SettingsFields();
|
||||
},
|
||||
'wcgateway.processor' => static function (ContainerInterface $container): Processor {
|
||||
$authorizedPaymentsProcessor = $container->get('wcgateway.processor.authorized-payments');
|
||||
return new Processor($authorizedPaymentsProcessor);
|
||||
'wcgateway.order-processor' => static function (ContainerInterface $container): OrderProcessor {
|
||||
|
||||
$sessionHandler = $container->get('session.handler');
|
||||
$cartRepository = $container->get('api.repository.cart');
|
||||
$orderEndpoint = $container->get('api.endpoint.order');
|
||||
$paymentsEndpoint = $container->get('api.endpoint.payments');
|
||||
$orderFactory = $container->get('api.factory.order');
|
||||
return new OrderProcessor(
|
||||
$sessionHandler,
|
||||
$cartRepository,
|
||||
$orderEndpoint,
|
||||
$paymentsEndpoint,
|
||||
$orderFactory
|
||||
);
|
||||
},
|
||||
'wcgateway.processor.authorized-payments' => static function (ContainerInterface $container): AuthorizedPaymentsProcessor {
|
||||
$orderEndpoint = $container->get('api.endpoint.order');
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@ use Inpsyde\PayPalCommerce\ApiClient\Repository\CartRepository;
|
|||
use Inpsyde\PayPalCommerce\Session\SessionHandler;
|
||||
use Inpsyde\PayPalCommerce\WcGateway\Notice\AuthorizeOrderActionNotice;
|
||||
use Inpsyde\PayPalCommerce\WcGateway\Processor\AuthorizedPaymentsProcessor;
|
||||
use Inpsyde\PayPalCommerce\WcGateway\Processor\Processor;
|
||||
use Inpsyde\PayPalCommerce\WcGateway\Processor\OrderProcessor;
|
||||
use Inpsyde\PayPalCommerce\WcGateway\Settings\SettingsFields;
|
||||
|
||||
//phpcs:disable PSR1.Methods.CamelCapsMethodName.NotCamelCaps
|
||||
|
|
@ -26,34 +26,22 @@ class WcGateway extends WcGatewayBase implements WcGatewayInterface
|
|||
public const ORDER_ID_META_KEY = '_ppcp_paypal_order_id';
|
||||
|
||||
private $isSandbox = true;
|
||||
private $sessionHandler;
|
||||
private $orderEndpoint;
|
||||
private $cartRepository;
|
||||
private $orderFactory;
|
||||
private $settingsFields;
|
||||
private $paymentsEndpoint;
|
||||
private $processor;
|
||||
private $authorizedPayments;
|
||||
private $notice;
|
||||
private $orderProcessor;
|
||||
|
||||
public function __construct(
|
||||
SessionHandler $sessionHandler,
|
||||
CartRepository $cartRepository,
|
||||
OrderEndpoint $orderEndpoint,
|
||||
PaymentsEndpoint $paymentsEndpoint,
|
||||
OrderFactory $orderFactory,
|
||||
SettingsFields $settingsFields,
|
||||
Processor $processor,
|
||||
OrderProcessor $orderProcessor,
|
||||
AuthorizedPaymentsProcessor $authorizedPayments,
|
||||
AuthorizeOrderActionNotice $notice
|
||||
) {
|
||||
|
||||
$this->sessionHandler = $sessionHandler;
|
||||
$this->cartRepository = $cartRepository;
|
||||
$this->orderEndpoint = $orderEndpoint;
|
||||
$this->paymentsEndpoint = $paymentsEndpoint;
|
||||
$this->orderFactory = $orderFactory;
|
||||
$this->settingsFields = $settingsFields;
|
||||
$this->processor = $processor;
|
||||
$this->orderProcessor = $orderProcessor;
|
||||
$this->authorizedPayments = $authorizedPayments;
|
||||
$this->notice = $notice;
|
||||
$this->settingsFields = $settingsFields;
|
||||
|
||||
$this->method_title = __('PayPal Payments', 'woocommerce-paypal-gateway');
|
||||
$this->method_description = __(
|
||||
|
|
@ -87,51 +75,24 @@ class WcGateway extends WcGatewayBase implements WcGatewayInterface
|
|||
{
|
||||
global $woocommerce;
|
||||
$wcOrder = new \WC_Order($orderId);
|
||||
|
||||
$order = $this->sessionHandler->order();
|
||||
$wcOrder->update_meta_data(self::ORDER_ID_META_KEY, $order->id());
|
||||
$wcOrder->update_meta_data(self::INTENT_META_KEY, $order->intent());
|
||||
|
||||
$errorMessage = null;
|
||||
if (!$order || !$order->status()->is(OrderStatus::APPROVED)) {
|
||||
$errorMessage = __('The payment has not been approved yet.', 'woocommerce-paypal-gateway');
|
||||
}
|
||||
if ($errorMessage) {
|
||||
$notice = sprintf(
|
||||
// translators %s is the message of the error.
|
||||
__('Payment error: %s', 'woocommerce-paypal-gateway'),
|
||||
$errorMessage
|
||||
);
|
||||
wc_add_notice($notice, 'error');
|
||||
if (! is_a($wcOrder, \WC_Order::class)) {
|
||||
return null;
|
||||
}
|
||||
|
||||
$order = $this->patchOrder($wcOrder, $order);
|
||||
if ($order->intent() === 'CAPTURE') {
|
||||
$order = $this->orderEndpoint->capture($order);
|
||||
if ($this->orderProcessor->process($wcOrder, $woocommerce)) {
|
||||
return [
|
||||
'result' => 'success',
|
||||
'redirect' => $this->get_return_url($wcOrder),
|
||||
];
|
||||
}
|
||||
|
||||
if ($order->intent() === 'AUTHORIZE') {
|
||||
$order = $this->orderEndpoint->authorize($order);
|
||||
$wcOrder->update_meta_data(self::CAPTURED_META_KEY, 'false');
|
||||
}
|
||||
|
||||
$wcOrder->update_status('on-hold', __('Awaiting payment.', 'woocommerce-paypal-gateway'));
|
||||
if ($order->status()->is(OrderStatus::COMPLETED) && $order->intent() === 'CAPTURE') {
|
||||
$wcOrder->update_status('processing', __('Payment received.', 'woocommerce-paypal-gateway'));
|
||||
}
|
||||
$woocommerce->cart->empty_cart();
|
||||
$this->sessionHandler->destroySessionData();
|
||||
|
||||
return [
|
||||
'result' => 'success',
|
||||
'redirect' => $this->get_return_url($wcOrder),
|
||||
];
|
||||
wc_add_notice($this->orderProcessor->lastError());
|
||||
return null;
|
||||
}
|
||||
|
||||
public function captureAuthorizedPayment(\WC_Order $wcOrder): void
|
||||
{
|
||||
$result = $this->processor->authorizedPayments()->process($wcOrder);
|
||||
$result = $this->authorizedPayments->process($wcOrder);
|
||||
|
||||
if ($result === AuthorizedPaymentsProcessor::INACCESSIBLE) {
|
||||
$this->notice->displayMessage(AuthorizeOrderActionNotice::NO_INFO);
|
||||
|
|
@ -178,10 +139,4 @@ class WcGateway extends WcGatewayBase implements WcGatewayInterface
|
|||
}
|
||||
}
|
||||
|
||||
private function patchOrder(\WC_Order $wcOrder, Order $order): Order
|
||||
{
|
||||
$updatedOrder = $this->orderFactory->fromWcOrder($wcOrder, $order);
|
||||
$order = $this->orderEndpoint->patchOrderWith($order, $updatedOrder);
|
||||
return $order;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,89 @@
|
|||
<?php
|
||||
|
||||
declare(strict_types=1);
|
||||
|
||||
namespace Inpsyde\PayPalCommerce\WcGateway\Processor;
|
||||
|
||||
use Inpsyde\PayPalCommerce\ApiClient\Endpoint\OrderEndpoint;
|
||||
use Inpsyde\PayPalCommerce\ApiClient\Endpoint\PaymentsEndpoint;
|
||||
use Inpsyde\PayPalCommerce\ApiClient\Entity\Order;
|
||||
use Inpsyde\PayPalCommerce\ApiClient\Entity\OrderStatus;
|
||||
use Inpsyde\PayPalCommerce\ApiClient\Factory\OrderFactory;
|
||||
use Inpsyde\PayPalCommerce\ApiClient\Repository\CartRepository;
|
||||
use Inpsyde\PayPalCommerce\Session\SessionHandler;
|
||||
use Inpsyde\PayPalCommerce\WcGateway\Gateway\WcGateway;
|
||||
|
||||
class OrderProcessor
|
||||
{
|
||||
private $sessionHandler;
|
||||
private $cartRepository;
|
||||
private $orderEndpoint;
|
||||
private $paymentsEndpoint;
|
||||
private $orderFactory;
|
||||
|
||||
private $lastError = '';
|
||||
|
||||
public function __construct(
|
||||
SessionHandler $sessionHandler,
|
||||
CartRepository $cartRepository,
|
||||
OrderEndpoint $orderEndpoint,
|
||||
PaymentsEndpoint $paymentsEndpoint,
|
||||
OrderFactory $orderFactory
|
||||
) {
|
||||
$this->sessionHandler = $sessionHandler;
|
||||
$this->cartRepository = $cartRepository;
|
||||
$this->orderEndpoint = $orderEndpoint;
|
||||
$this->paymentsEndpoint = $paymentsEndpoint;
|
||||
$this->orderFactory = $orderFactory;
|
||||
}
|
||||
|
||||
public function process(\WC_Order $wcOrder, $woocommerce) : bool
|
||||
{
|
||||
$order = $this->sessionHandler->order();
|
||||
$wcOrder->update_meta_data(WcGateway::ORDER_ID_META_KEY, $order->id());
|
||||
$wcOrder->update_meta_data(WcGateway::INTENT_META_KEY, $order->intent());
|
||||
|
||||
$errorMessage = null;
|
||||
if (!$order || !$order->status()->is(OrderStatus::APPROVED)) {
|
||||
$errorMessage = __('The payment has not been approved yet.', 'woocommerce-paypal-gateway');
|
||||
}
|
||||
if ($errorMessage) {
|
||||
$this->lastError = sprintf(
|
||||
// translators %s is the message of the error.
|
||||
__('Payment error: %s', 'woocommerce-paypal-gateway'),
|
||||
$errorMessage
|
||||
);
|
||||
return false;
|
||||
}
|
||||
|
||||
$order = $this->patchOrder($wcOrder, $order);
|
||||
if ($order->intent() === 'CAPTURE') {
|
||||
$order = $this->orderEndpoint->capture($order);
|
||||
}
|
||||
|
||||
if ($order->intent() === 'AUTHORIZE') {
|
||||
$order = $this->orderEndpoint->authorize($order);
|
||||
$wcOrder->update_meta_data(WcGateway::CAPTURED_META_KEY, 'false');
|
||||
}
|
||||
|
||||
$wcOrder->update_status('on-hold', __('Awaiting payment.', 'woocommerce-paypal-gateway'));
|
||||
if ($order->status()->is(OrderStatus::COMPLETED) && $order->intent() === 'CAPTURE') {
|
||||
$wcOrder->update_status('processing', __('Payment received.', 'woocommerce-paypal-gateway'));
|
||||
}
|
||||
$woocommerce->cart->empty_cart();
|
||||
$this->sessionHandler->destroySessionData();
|
||||
$this->lastError = '';
|
||||
return true;
|
||||
}
|
||||
|
||||
public function lastError() : string {
|
||||
return $this->lastError;
|
||||
}
|
||||
|
||||
private function patchOrder(\WC_Order $wcOrder, Order $order): Order
|
||||
{
|
||||
$updatedOrder = $this->orderFactory->fromWcOrder($wcOrder, $order);
|
||||
$order = $this->orderEndpoint->patchOrderWith($order, $updatedOrder);
|
||||
return $order;
|
||||
}
|
||||
}
|
||||
|
|
@ -1,21 +0,0 @@
|
|||
<?php
|
||||
|
||||
declare(strict_types=1);
|
||||
|
||||
namespace Inpsyde\PayPalCommerce\WcGateway\Processor;
|
||||
|
||||
class Processor
|
||||
{
|
||||
protected $authorizedPaymentsProcessor;
|
||||
|
||||
public function __construct(AuthorizedPaymentsProcessor $authorizedPaymentsProcessor)
|
||||
{
|
||||
$this->authorizedPaymentsProcessor = $authorizedPaymentsProcessor;
|
||||
}
|
||||
|
||||
public function authorizedPayments(): AuthorizedPaymentsProcessor
|
||||
{
|
||||
|
||||
return $this->authorizedPaymentsProcessor;
|
||||
}
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue
