Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add payment refund handler #14

Closed
wants to merge 4 commits into from
Closed

Add payment refund handler #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
aed35dc
Add payment refund handler
felixbrucker Aug 28, 2020
44d47cb
Simplify processPayPalOrder method
felixbrucker Jan 12, 2021
589ac38
Use OrderTransactionCaptureService directly
felixbrucker Jan 12, 2021
991bf55
Delete OrderTransactionCaptures via repository
felixbrucker Jan 12, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 39 additions & 0 deletions src/Checkout/PayPalOrderTransactionCaptureService.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
<?php

declare(strict_types=1);

namespace Swag\PayPal\Checkout;

use Shopware\Core\Framework\Context;
use Shopware\Core\Framework\DataAbstractionLayer\EntityRepositoryInterface;
use Swag\PayPal\SwagPayPal;

class PayPalOrderTransactionCaptureService
{
/**
* @var EntityRepositoryInterface
*/
private $orderTransactionCaptureRepository;

public function __construct(
EntityRepositoryInterface $orderTransactionCaptureRepository
) {
$this->orderTransactionCaptureRepository = $orderTransactionCaptureRepository;
}

public function addPayPalResourceToOrderTransactionCapture(
string $orderTransactionCaptureId,
string $paypalResourceId,
string $paypalResourceType,
Context $context
): void {
$data = [
'id' => $orderTransactionCaptureId,
'externalReference' => $paypalResourceId,
'customFields' => [
SwagPayPal::ORDER_TRANSACTION_CAPTURE_CUSTOM_FIELDS_PAYPAL_RESOURCE_TYPE => $paypalResourceType,
],
];
$this->orderTransactionCaptureRepository->update([$data], $context);
}
}
97 changes: 80 additions & 17 deletions src/Checkout/Payment/Handler/PayPalHandler.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,15 @@
use Psr\Log\LoggerInterface;
use Shopware\Core\Checkout\Customer\CustomerEntity;
use Shopware\Core\Checkout\Order\Aggregate\OrderTransaction\OrderTransactionStateHandler;
use Shopware\Core\Checkout\Order\Aggregate\OrderTransactionCapture\OrderTransactionCaptureService;
use Shopware\Core\Checkout\Order\Aggregate\OrderTransactionCapture\OrderTransactionCaptureStateHandler;
use Shopware\Core\Checkout\Payment\Cart\AsyncPaymentTransactionStruct;
use Shopware\Core\Checkout\Payment\Exception\AsyncPaymentFinalizeException;
use Shopware\Core\Checkout\Payment\Exception\AsyncPaymentProcessException;
use Shopware\Core\Framework\Context;
use Shopware\Core\Framework\DataAbstractionLayer\EntityRepositoryInterface;
use Shopware\Core\System\SalesChannel\SalesChannelContext;
use Swag\PayPal\Checkout\PayPalOrderTransactionCaptureService;
use Swag\PayPal\OrdersApi\Builder\OrderFromOrderBuilder;
use Swag\PayPal\OrdersApi\Patch\CustomIdPatchBuilder;
use Swag\PayPal\OrdersApi\Patch\OrderNumberPatchBuilder;
Expand Down Expand Up @@ -66,6 +69,21 @@ class PayPalHandler extends AbstractPaymentHandler
*/
private $logger;

/**
* @var OrderTransactionCaptureStateHandler
*/
private $orderTransactionCaptureStateHandler;

/**
* @var OrderTransactionCaptureService
*/
private $orderTransactionCaptureService;

/**
* @var PayPalOrderTransactionCaptureService
*/
private $payPalOrderTransactionCaptureService;

public function __construct(
EntityRepositoryInterface $orderTransactionRepo,
OrderFromOrderBuilder $orderBuilder,
Expand All @@ -74,7 +92,10 @@ public function __construct(
SettingsServiceInterface $settingsService,
OrderNumberPatchBuilder $orderNumberPatchBuilder,
CustomIdPatchBuilder $customIdPatchBuilder,
LoggerInterface $logger
LoggerInterface $logger,
OrderTransactionCaptureStateHandler $orderTransactionCaptureStateHandler,
OrderTransactionCaptureService $orderTransactionCaptureService,
PayPalOrderTransactionCaptureService $payPalOrderTransactionCaptureService
) {
parent::__construct($orderTransactionRepo);
$this->orderBuilder = $orderBuilder;
Expand All @@ -84,6 +105,9 @@ public function __construct(
$this->orderNumberPatchBuilder = $orderNumberPatchBuilder;
$this->customIdPatchBuilder = $customIdPatchBuilder;
$this->logger = $logger;
$this->orderTransactionCaptureStateHandler = $orderTransactionCaptureStateHandler;
$this->orderTransactionCaptureService = $orderTransactionCaptureService;
$this->payPalOrderTransactionCaptureService = $payPalOrderTransactionCaptureService;
}

/**
Expand Down Expand Up @@ -169,14 +193,13 @@ public function handleFinalizeOrder(
$paypalOrder = $this->orderResource->get($paypalOrderId, $salesChannelId);

try {
if ($paypalOrder->getIntent() === PaymentIntentV2::CAPTURE) {
$response = $this->orderResource->capture($paypalOrderId, $salesChannelId, $partnerAttributionId);
if ($response->getStatus() === PaymentStatusV2::ORDER_COMPLETED) {
$this->orderTransactionStateHandler->paid($transactionId, $context);
}
} else {
$this->orderResource->authorize($paypalOrderId, $salesChannelId, $partnerAttributionId);
}
$this->processPayPalOrder(
$paypalOrder,
$transactionId,
$salesChannelId,
$partnerAttributionId,
$context
);
} catch (PayPalApiException $e) {
if ($e->getStatusCode() !== Response::HTTP_UNPROCESSABLE_ENTITY
|| (\strpos($e->getMessage(), PayPalApiException::ERROR_CODE_DUPLICATE_INVOICE_ID) === false)) {
Expand All @@ -192,19 +215,59 @@ public function handleFinalizeOrder(
$partnerAttributionId
);

if ($paypalOrder->getIntent() === PaymentIntentV2::CAPTURE) {
$response = $this->orderResource->capture($paypalOrderId, $salesChannelId, $partnerAttributionId);
if ($response->getStatus() === PaymentStatusV2::ORDER_COMPLETED) {
$this->orderTransactionStateHandler->paid($transactionId, $context);
}
} else {
$this->orderResource->authorize($paypalOrderId, $salesChannelId, $partnerAttributionId);
}
$this->processPayPalOrder(
$paypalOrder,
$transactionId,
$salesChannelId,
$partnerAttributionId,
$context
);
} catch (\Exception $e) {
throw new AsyncPaymentFinalizeException(
$transactionId,
\sprintf('An error occurred during the communication with PayPal%s%s', PHP_EOL, $e->getMessage())
);
}
}

private function processPayPalOrder(
PayPalOrder $paypalOrder,
string $transactionId,
string $salesChannelId,
string $partnerAttributionId,
Context $context
): void {
if ($paypalOrder->getIntent() !== PaymentIntentV2::CAPTURE) {
$this->orderResource->authorize($paypalOrder->getId(), $salesChannelId, $partnerAttributionId);

return;
}

$orderTransactionCaptureId = $this->orderTransactionCaptureService->createOrderTransactionCaptureForFullAmount(
$transactionId,
$context
);
try {
$response = $this->orderResource->capture($paypalOrder->getId(), $salesChannelId, $partnerAttributionId);
} catch (PayPalApiException $apiException) {
$this->orderTransactionCaptureStateHandler->fail($orderTransactionCaptureId, $context);

throw $apiException;
}
$paypalCapture = $response->getPurchaseUnits()[0]->getPayments()->getCaptures()[0];
$paypalCaptureId = $paypalCapture->getId();
$this->payPalOrderTransactionCaptureService->addPayPalResourceToOrderTransactionCapture(
$orderTransactionCaptureId,
$paypalCaptureId,
PaymentIntentV2::CAPTURE,
$context
);
if ($paypalCapture->getStatus() === PaymentStatusV2::ORDER_CAPTURE_COMPLETED) {
$this->orderTransactionCaptureStateHandler->complete($orderTransactionCaptureId, $context);
}

if ($response->getStatus() === PaymentStatusV2::ORDER_COMPLETED) {
$this->orderTransactionStateHandler->paid($transactionId, $context);
}
}
}
102 changes: 97 additions & 5 deletions src/Checkout/Payment/Handler/PlusPuiHandler.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,16 @@
use Psr\Log\LoggerInterface;
use Shopware\Core\Checkout\Customer\CustomerEntity;
use Shopware\Core\Checkout\Order\Aggregate\OrderTransaction\OrderTransactionStateHandler;
use Shopware\Core\Checkout\Order\Aggregate\OrderTransactionCapture\OrderTransactionCaptureService;
use Shopware\Core\Checkout\Order\Aggregate\OrderTransactionCapture\OrderTransactionCaptureStateHandler;
use Shopware\Core\Checkout\Payment\Cart\AsyncPaymentTransactionStruct;
use Shopware\Core\Checkout\Payment\Exception\AsyncPaymentFinalizeException;
use Shopware\Core\Checkout\Payment\Exception\AsyncPaymentProcessException;
use Shopware\Core\Framework\Context;
use Shopware\Core\Framework\DataAbstractionLayer\EntityRepositoryInterface;
use Shopware\Core\Framework\Validation\DataBag\RequestDataBag;
use Shopware\Core\System\SalesChannel\SalesChannelContext;
use Swag\PayPal\Checkout\PayPalOrderTransactionCaptureService;
use Swag\PayPal\PaymentsApi\Builder\OrderPaymentBuilderInterface;
use Swag\PayPal\PaymentsApi\Patch\OrderNumberPatchBuilder;
use Swag\PayPal\PaymentsApi\Patch\PayerInfoPatchBuilder;
Expand All @@ -26,6 +29,9 @@
use Swag\PayPal\RestApi\V1\Api\Patch;
use Swag\PayPal\RestApi\V1\Api\Payment;
use Swag\PayPal\RestApi\V1\Api\Payment\PaymentInstruction;
use Swag\PayPal\RestApi\V1\Api\Payment\Transaction\RelatedResource;
use Swag\PayPal\RestApi\V1\Api\Payment\Transaction\RelatedResource\Capture;
use Swag\PayPal\RestApi\V1\Api\Payment\Transaction\RelatedResource\Sale;
use Swag\PayPal\RestApi\V1\PaymentIntentV1;
use Swag\PayPal\RestApi\V1\PaymentStatusV1;
use Swag\PayPal\RestApi\V1\Resource\PaymentResource;
Expand Down Expand Up @@ -83,6 +89,26 @@ class PlusPuiHandler
*/
private $logger;

/**
* @var OrderTransactionCaptureStateHandler
*/
private $orderTransactionCaptureStateHandler;

/**
* @var OrderTransactionCaptureService
*/
private $orderTransactionCaptureService;

/**
* @var PayPalOrderTransactionCaptureService
*/
private $payPalOrderTransactionCaptureService;

/**
* @var EntityRepositoryInterface
*/
private $orderTransactionCaptureRepository;

public function __construct(
PaymentResource $paymentResource,
EntityRepositoryInterface $orderTransactionRepo,
Expand All @@ -92,7 +118,11 @@ public function __construct(
ShippingAddressPatchBuilder $shippingAddressPatchBuilder,
SettingsServiceInterface $settingsService,
OrderTransactionStateHandler $orderTransactionStateHandler,
LoggerInterface $logger
LoggerInterface $logger,
OrderTransactionCaptureStateHandler $orderTransactionCaptureStateHandler,
OrderTransactionCaptureService $orderTransactionCaptureService,
PayPalOrderTransactionCaptureService $payPalOrderTransactionCaptureService,
EntityRepositoryInterface $orderTransactionCaptureRepository
) {
$this->paymentResource = $paymentResource;
$this->orderTransactionRepo = $orderTransactionRepo;
Expand All @@ -103,6 +133,10 @@ public function __construct(
$this->settingsService = $settingsService;
$this->orderTransactionStateHandler = $orderTransactionStateHandler;
$this->logger = $logger;
$this->orderTransactionCaptureStateHandler = $orderTransactionCaptureStateHandler;
$this->orderTransactionCaptureService = $orderTransactionCaptureService;
$this->payPalOrderTransactionCaptureService = $payPalOrderTransactionCaptureService;
$this->orderTransactionCaptureRepository = $orderTransactionCaptureRepository;
}

public function handlePlusPayment(
Expand Down Expand Up @@ -209,11 +243,13 @@ public function handleFinalizePayment(
}

try {
$response = $this->paymentResource->execute(
$response = $this->processPayPalPlusPayment(
$transactionId,
$payerId,
$paymentId,
$salesChannelId,
$partnerAttributionId
$partnerAttributionId,
$context
);
} catch (PayPalApiException $e) {
$parameters = $e->getParameters();
Expand All @@ -231,11 +267,13 @@ public function handleFinalizePayment(
$salesChannelId
);

$response = $this->paymentResource->execute(
$response = $this->processPayPalPlusPayment(
$transactionId,
$payerId,
$paymentId,
$salesChannelId,
$partnerAttributionId
$partnerAttributionId,
$context
);
} catch (\Exception $e) {
throw new AsyncPaymentFinalizeException(
Expand Down Expand Up @@ -349,4 +387,58 @@ private function savePaymentInstructions(Payment $payment, string $transactionId
],
]], $context);
}

private function processPayPalPlusPayment(
string $transactionId,
string $payerId,
string $paymentId,
string $salesChannelId,
string $partnerAttributionId,
Context $context
): Payment {
$orderTransactionCaptureId = $this->orderTransactionCaptureService->createOrderTransactionCaptureForFullAmount(
$transactionId,
$context
);
try {
$response = $this->paymentResource->execute(
$payerId,
$paymentId,
$salesChannelId,
$partnerAttributionId
);
} catch (PayPalApiException $apiException) {
$this->orderTransactionCaptureStateHandler->fail($orderTransactionCaptureId, $context);

throw $apiException;
}
$relatedResource = $response->getTransactions()[0]->getRelatedResources()[0];
/** @var Capture|Sale|null $paypalResource */
$paypalResource = null;
if ($relatedResource->getCapture() !== null) {
$paypalResourceType = RelatedResource::CAPTURE;
$paypalResource = $relatedResource->getCapture();
$paypalResourceCompletedState = PaymentStatusV1::PAYMENT_CAPTURE_COMPLETED;
} elseif ($relatedResource->getSale() !== null) {
$paypalResourceType = RelatedResource::SALE;
$paypalResource = $relatedResource->getSale();
$paypalResourceCompletedState = PaymentStatusV1::PAYMENT_SALE_COMPLETED;
} else {
$this->orderTransactionCaptureRepository->delete([['id' => $orderTransactionCaptureId]], $context);

return $response;
}

$this->payPalOrderTransactionCaptureService->addPayPalResourceToOrderTransactionCapture(
$orderTransactionCaptureId,
$paypalResource->getId(),
$paypalResourceType,
$context
);
if ($paypalResource->getState() === $paypalResourceCompletedState) {
$this->orderTransactionCaptureStateHandler->complete($orderTransactionCaptureId, $context);
}

return $response;
}
}
Loading