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

Move the logic to Gateway

Browse source
This commit is contained in:
Mészáros Róbert 2020-04-13 14:25:20 +03:00
parent 35cceed231
commit cd1da8c460
3 changed files with 72 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

6
modules.local/ppcp-api-client/src/Endpoint/OrderEndpoint.php
View file

@ -105,7 +105,7 @@ class OrderEndpoint
return $order;
}
public function authorize(string $orderId) {
public function authorize(string $orderId) : bool {
$bearer = $this->bearer->bearer();
$url = trailingslashit($this->host) . 'v2/checkout/orders/' . $orderId . '/authorize';
$args = [
@ -121,9 +121,9 @@ class OrderEndpoint
throw new RuntimeException(__('Could not authorize order.', 'woocommerce-paypal-commerce-gateway'));
}
if (wp_remote_retrieve_response_code($response) !== 201) {
throw new RuntimeException(__('Could not capture order.', 'woocommerce-paypal-commerce-gateway'));
throw new RuntimeException(__('Could not authorize order.', 'woocommerce-paypal-commerce-gateway'));
}
return $orderId;
return true;
}
public function order(string $id) : Order

68
modules.local/ppcp-wc-gateway/src/Gateway/WcGateway.php
View file

@ -1,4 +1,5 @@
<?php
declare(strict_types=1);
namespace Inpsyde\PayPalCommerce\WcGateway\Gateway;
@ -6,6 +7,7 @@ namespace Inpsyde\PayPalCommerce\WcGateway\Gateway;
use Inpsyde\PayPalCommerce\ApiClient\Endpoint\OrderEndpoint;
use Inpsyde\PayPalCommerce\ApiClient\Entity\Order;
use Inpsyde\PayPalCommerce\ApiClient\Entity\OrderStatus;
use Inpsyde\PayPalCommerce\ApiClient\Exception\RuntimeException;
use Inpsyde\PayPalCommerce\ApiClient\Factory\OrderFactory;
use Inpsyde\PayPalCommerce\ApiClient\Repository\CartRepository;
use Inpsyde\PayPalCommerce\Session\SessionHandler;
@ -66,7 +68,7 @@ class WcGateway extends \WC_Payment_Gateway
$this->form_fields = $this->settingsFields->fields();
}
public function process_payment($orderId) : ?array
public function process_payment($orderId): ?array
{
global $woocommerce;
$wcOrder = new \WC_Order($orderId);
@ -76,7 +78,7 @@ class WcGateway extends \WC_Payment_Gateway
update_post_meta($orderId, '_paypal_order_id', $order->id());
$errorMessage = null;
if (! $order || ! $order->status()->is(OrderStatus::APPROVED)) {
if (!$order || !$order->status()->is(OrderStatus::APPROVED)) {
$errorMessage = 'not approve yet';
}
$errorMessage = null;
@ -103,7 +105,67 @@ class WcGateway extends \WC_Payment_Gateway
];
}
private function patchOrder(\WC_Order $wcOrder, Order $order) : Order
public function authorizeOrder(\WC_Order $wcOrder)
{
$payPalOrderId = get_post_meta($wcOrder->get_id(), '_paypal_order_id', true);
try {
$order = $this->endpoint->order($payPalOrderId);
} catch (RuntimeException $e) {
// TODO: add a notice instead
$wcOrder->add_order_note(
__(
'Unable to capture charge:',
'woocommerce-paypal-gateway'
) . ' ' . $e->getMessage()
);
}
if ($order->status()->is(OrderStatus::COMPLETED)) {
// TODO: add a notice instead
$wcOrder->add_order_note(
__(
'Order already completed',
'woocommerce-paypal-gateway'
)
);
return;
}
if (!$order->status()->is(OrderStatus::APPROVED)) {
// TODO: add a notice instead
$wcOrder->add_order_note(
__(
'Order not approved',
'woocommerce-paypal-gateway'
)
);
return;
}
try {
$this->endpoint->authorize($payPalOrderId);
} catch (RuntimeException $e) {
// TODO: display admin error message
$wcOrder->add_order_note(
__(
'Unable to capture charge:',
'woocommerce-paypal-gateway'
) . ' ' . $e->getMessage()
);
return;
}
$wcOrder->add_order_note(
__(
'Payment authorized.',
'woocommerce-paypal-gateway'
)
);
$wcOrder->update_status('processing');
}
private function patchOrder(\WC_Order $wcOrder, Order $order): Order
{
$updatedOrder = $this->orderFactory->fromWcOrder($wcOrder, $order);
$order = $this->endpoint->patchOrderWith($order, $updatedOrder);

13
modules.local/ppcp-wc-gateway/src/WcGatewayModule.php
View file

@ -5,8 +5,8 @@ namespace Inpsyde\PayPalCommerce\WcGateway;
use Dhii\Container\ServiceProvider;
use Dhii\Modular\Module\ModuleInterface;
use Inpsyde\PayPalCommerce\ApiClient\Endpoint\OrderEndpoint;
use Inpsyde\PayPalCommerce\WcGateway\Checkout\DisableGateways;
use Inpsyde\PayPalCommerce\WcGateway\Gateway\WcGateway;
use Interop\Container\ServiceProviderInterface;
use Psr\Container\ContainerInterface;
@ -57,16 +57,11 @@ class WcGatewayModule implements ModuleInterface
add_action(
'woocommerce_order_action_ppcp_authorize_order',
function (\WC_Order $wcOrder) use ($container) {
$payPalOrderId = get_post_meta($wcOrder->get_id(), '_paypal_order_id', true);
/**
* @var OrderEndpoint $orderEndpoint
* @var WcGateway $gateway
*/
$orderEndpoint = $container->get('api.endpoint.order');
$orderEndpoint->authorize($payPalOrderId);
$wcOrder->update_status('processing');
$gateway = $container->get('wcgateway.gateway');
$gateway->authorizeOrder($wcOrder);
}
);
}