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

phpcs

Browse source
This commit is contained in:
David Remer 2020-08-25 15:13:56 +03:00
parent 7d490c6b7c
commit 2d48166eb1
8 changed files with 77 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

5
modules.local/ppcp-button/src/Assets/SmartButton.php
View file

@ -533,7 +533,10 @@ class SmartButton implements SmartButtonInterface
'intent' => ($this->settings->has('intent')) ?
$this->settings->get('intent') : 'capture',
];
if (defined('WP_DEBUG') && \WP_DEBUG && WC()->customer && WC()->customer->get_billing_country()) {
if (
defined('WP_DEBUG') && \WP_DEBUG
&& WC()->customer && WC()->customer->get_billing_country()
) {
$params['buyer-country'] = WC()->customer->get_billing_country();
}
$payee = $this->payeeRepository->payee();

9
modules.local/ppcp-button/src/ButtonModule.php
View file

@ -51,10 +51,13 @@ class ButtonModule implements ModuleInterface
$smartButton->enqueue();
});
add_action(
add_filter(
'woocommerce_create_order',
static function ($value) use ($container) {
$earlyOrderHelper = $container->get('button.helper.early-order-handler');
if (! is_null($value)) {
$value = (int) $value;
}
/**
* @var EarlyOrderHandler $earlyOrderHelper
*/
@ -65,8 +68,8 @@ class ButtonModule implements ModuleInterface
$this->registerAjaxEndpoints($container);
}
private function registerAjaxEndpoints(ContainerInterface $container) {
private function registerAjaxEndpoints(ContainerInterface $container)
{
add_action(
'wc_ajax_' . DataClientIdEndpoint::ENDPOINT,
static function () use ($container) {

53
modules.local/ppcp-button/src/Endpoint/CreateOrderEndpoint.php
View file

@ -29,6 +29,8 @@ class CreateOrderEndpoint implements EndpointInterface
private $sessionHandler;
private $settings;
private $earlyOrderHandler;
private $order;
public function __construct(
RequestData $requestData,
CartRepository $repository,
@ -92,36 +94,28 @@ class CreateOrderEndpoint implements EndpointInterface
return true;
} catch (\RuntimeException $error) {
wp_send_json_error(
__('Something went wrong. Please try again or choose another payment source.', 'woocommerce-paypal-commerce-gateway')
__(
'Something went wrong. Please try again or choose another payment source.',
'woocommerce-paypal-commerce-gateway'
)
);
return false;
}
}
private function validateForm(string $formValues, Order $order) {
private function validateForm(string $formValues, Order $order)
{
$this->order = $order;
$parsedValues = wp_parse_args($formValues);
$_POST = $parsedValues;
$_REQUEST = $parsedValues;
add_filter(
'woocommerce_after_checkout_validation',
function($data, \WP_Error $errors) use ($order) {
if (! $errors->errors) {
/**
* In case we are onboarded and everything is fine with the \WC_Order
* we want this order to be created. We will intercept it and leave it
* in the "Pending payment" status though, which than later will change
* during the "onApprove"-JS callback or the webhook listener.
*/
if (! $this->earlyOrderHandler->shouldCreateEarlyOrder()) {
wp_send_json_success($order->toArray());
}
$this->earlyOrderHandler->registerForOrder($order);
return $data;
}
wp_send_json_error($errors->get_error_message());
},
[
$this,
'afterCheckoutValidation',
],
10,
2
);
@ -129,4 +123,25 @@ class CreateOrderEndpoint implements EndpointInterface
$checkout->process_checkout();
}
public function afterCheckoutValidation(array $data, \WP_Error $errors): array
{
$order = $this->order;
if (! $errors->errors) {
/**
* In case we are onboarded and everything is fine with the \WC_Order
* we want this order to be created. We will intercept it and leave it
* in the "Pending payment" status though, which than later will change
* during the "onApprove"-JS callback or the webhook listener.
*/
if (! $this->earlyOrderHandler->shouldCreateEarlyOrder()) {
wp_send_json_success($order->toArray());
}
$this->earlyOrderHandler->registerForOrder($order);
return $data;
}
wp_send_json_error($errors->get_error_message());
return $data;
}
}

35
modules.local/ppcp-button/src/Helper/EarlyOrderHandler.php
View file

@ -14,13 +14,12 @@ use Inpsyde\PayPalCommerce\Webhooks\Handler\PrefixTrait;
class EarlyOrderHandler
{
use PrefixTrait;
private $state;
private $orderProcessor;
private $sessionHandler;
public function __construct(
State $state,
OrderProcessor $orderProcessor,
@ -34,15 +33,15 @@ class EarlyOrderHandler
$this->prefix = $prefix;
}
public function shouldCreateEarlyOrder() : bool
public function shouldCreateEarlyOrder(): bool
{
return $this->state->currentState() === State::STATE_ONBOARDED;
}
public function determineWcOrderId($value) : ?int {
if (! is_null($value)) {
$value = (int) $value;
}
//phpcs:disable WordPress.Security.NonceVerification.Recommended
public function determineWcOrderId(int $value = null): ?int
{
if (! isset($_REQUEST['ppcp-resume-order'])) {
return $value;
}
@ -54,31 +53,35 @@ class EarlyOrderHandler
return $value;
}
$orderId = false;
foreach ($order->purchaseUnits() as $purchaseUnit) {
if ($purchaseUnit->customId() === sanitize_text_field(wp_unslash($_REQUEST['ppcp-resume-order']))) {
$orderId = (int) $this->sanitizeCustomId($purchaseUnit->customId());
if ($orderId === $resumeOrderId) {
$value = $orderId;
}
}
}
if ($orderId === $resumeOrderId) {
$value = $orderId;
}
return $value;
}
//phpcs:enable WordPress.Security.NonceVerification.Recommended
public function registerForOrder(Order $order): bool {
public function registerForOrder(Order $order): bool
{
$success = (bool) add_action(
'woocommerce_checkout_order_processed',
function($orderId) use ($order) {
function ($orderId) use ($order) {
try {
$order = $this->configureSessionAndOrder((int) $orderId, $order);
wp_send_json_success($order->toArray());
return true;
} catch (\RuntimeException $error) {
} catch (\RuntimeException $error) {
wp_send_json_error(
__('Something went wrong. Please try again or choose another payment source.', 'woocommerce-paypal-commerce-gateway')
__(
'Something went wrong. Please try again or choose another payment source.',
'woocommerce-paypal-commerce-gateway'
)
);
return false;
}
}
);

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

@ -125,12 +125,14 @@ class PayPalGateway extends \WC_Payment_Gateway
/**
* If the WC_Order is payed through the approved webhook.
*/
//phpcs:disable WordPress.Security.NonceVerification.Recommended
if (isset($_REQUEST['ppcp-resume-order']) && $wcOrder->has_status('processing')) {
return [
'result' => 'success',
'redirect' => $this->get_return_url($wcOrder),
];
}
//phpcs:enable WordPress.Security.NonceVerification.Recommended
if ($this->orderProcessor->process($wcOrder, $woocommerce)) {
return [

5
modules.local/ppcp-wc-gateway/src/Processor/OrderProcessor.php
View file

@ -107,7 +107,10 @@ class OrderProcessor
private function captureAuthorizedDownloads(Order $order): bool
{
if (! $this->settings->has('capture_for_virtual_only') || ! $this->settings->get('capture_for_virtual_only')) {
if (
! $this->settings->has('capture_for_virtual_only')
|| ! $this->settings->get('capture_for_virtual_only')
) {
return false;
}

13
modules.local/ppcp-webhooks/src/Handler/CheckoutOrderApproved.php
View file

@ -1,17 +1,15 @@
<?php
declare(strict_types=1);
namespace Inpsyde\PayPalCommerce\Webhooks\Handler;
use Inpsyde\PayPalCommerce\ApiClient\Endpoint\OrderEndpoint;
use Inpsyde\PayPalCommerce\ApiClient\Entity\Order;
use Inpsyde\PayPalCommerce\ApiClient\Exception\RuntimeException;
use Psr\Log\LoggerInterface;
class CheckoutOrderApproved implements RequestHandler
{
use PrefixTrait;
private $logger;
@ -36,6 +34,7 @@ class CheckoutOrderApproved implements RequestHandler
return in_array($request['event_type'], $this->eventTypes(), true);
}
//phpcs:disable Inpsyde.CodeQuality.FunctionLength.TooLong
public function handleRequest(\WP_REST_Request $request): \WP_REST_Response
{
$response = ['success' => false];
@ -74,7 +73,8 @@ class CheckoutOrderApproved implements RequestHandler
}
try {
$order = isset($request['resource']['id']) ? $this->orderEndpoint->order($request['resource']['id']) : null;
$order = isset($request['resource']['id']) ?
$this->orderEndpoint->order($request['resource']['id']) : null;
if (! $order) {
$message = sprintf(
// translators: %s is the PayPal webhook Id.
@ -152,7 +152,7 @@ class CheckoutOrderApproved implements RequestHandler
__('Payment received.', 'woocommerce-paypal-commerce-gateway')
: __('Payment can be captured.', 'woocommerce-paypal-commerce-gateway');
foreach ($wcOrders as $wcOrder) {
if (! in_array($wcOrder->get_status(),['pending', 'on-hold'])) {
if (! in_array($wcOrder->get_status(), ['pending', 'on-hold'], true)) {
continue;
}
/**
@ -181,4 +181,5 @@ class CheckoutOrderApproved implements RequestHandler
$response['success'] = true;
return rest_ensure_response($response);
}
}
//phpcs:enable Inpsyde.CodeQuality.FunctionLength.TooLong
}

2
modules.local/ppcp-webhooks/src/Handler/CheckoutOrderCompleted.php
View file

@ -97,7 +97,7 @@ class CheckoutOrderCompleted implements RequestHandler
}
foreach ($wcOrders as $wcOrder) {
if (! in_array($wcOrder->get_status(),['pending', 'on-hold'])) {
if (! in_array($wcOrder->get_status(), ['pending', 'on-hold'], true)) {
continue;
}
/**