Skip to content

[Bug] Fix issue after paypal checkout #355

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

Merged
GSadee merged 1 commit into from
Mar 19, 2025
Merged

[Bug] Fix issue after paypal checkout #355

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 8 additions & 3 deletions spec/Processor/PayPalOrderCompleteProcessorSpec.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,15 @@
use Sylius\Component\Core\Model\PaymentInterface;
use Sylius\Component\Core\Model\PaymentMethodInterface;
use Sylius\PayPalPlugin\Manager\PaymentStateManagerInterface;
use Sylius\PayPalPlugin\Verifier\PaymentAmountVerifierInterface;

final class PayPalOrderCompleteProcessorSpec extends ObjectBehavior
{
function let(PaymentStateManagerInterface $paymentStateManager): void
{
$this->beConstructedWith($paymentStateManager);
function let(
PaymentStateManagerInterface $paymentStateManager,
PaymentAmountVerifierInterface $paymentAmountVerifier,
): void {
$this->beConstructedWith($paymentStateManager, $paymentAmountVerifier);
}

function it_completes_pay_pal_order(
Expand All @@ -34,12 +37,14 @@ function it_completes_pay_pal_order(
PaymentInterface $payment,
PaymentMethodInterface $paymentMethod,
GatewayConfigInterface $gatewayConfig,
PaymentAmountVerifierInterface $paymentAmountVerifier,
): void {
$order->getLastPayment(PaymentInterface::STATE_PROCESSING)->willReturn($payment);

$payment->getMethod()->willReturn($paymentMethod);
$paymentMethod->getGatewayConfig()->willReturn($gatewayConfig);
$gatewayConfig->getFactoryName()->willReturn('sylius.pay_pal');
$paymentAmountVerifier->verify($payment)->shouldBeCalled();

$paymentStateManager->complete($payment)->shouldBeCalled();

Expand Down
47 changes: 42 additions & 5 deletions src/Processor/PayPalOrderCompleteProcessor.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,24 @@
use Sylius\Component\Core\Model\OrderInterface;
use Sylius\Component\Core\Model\PaymentInterface;
use Sylius\Component\Core\Model\PaymentMethodInterface;
use Sylius\PayPalPlugin\Exception\PaymentAmountMismatchException;
use Sylius\PayPalPlugin\Manager\PaymentStateManagerInterface;
use Sylius\PayPalPlugin\Verifier\PaymentAmountVerifierInterface;

final class PayPalOrderCompleteProcessor
{
private PaymentStateManagerInterface $paymentStateManager;

public function __construct(PaymentStateManagerInterface $paymentStateManager)
{
$this->paymentStateManager = $paymentStateManager;
public function __construct(
private PaymentStateManagerInterface $paymentStateManager,
private ?PaymentAmountVerifierInterface $paymentAmountVerifier = null,
) {
if (null === $this->paymentAmountVerifier) {
trigger_deprecation(
'sylius/paypal-plugin',
'1.6',
'Not passing an instance of "%s" as the second argument is deprecated and will be prohibited in 3.0.',
PaymentAmountVerifierInterface::class,
);
}
}

public function completePayPalOrder(OrderInterface $order): void
Expand All @@ -44,6 +53,34 @@ public function completePayPalOrder(OrderInterface $order): void
return;
}

try {
if (null !== $this->paymentAmountVerifier) {
$this->paymentAmountVerifier->verify($payment);
} else {
$this->verify($payment);
}
} catch (PaymentAmountMismatchException) {
$this->paymentStateManager->cancel($payment);

return;
}

$this->paymentStateManager->complete($payment);
}

private function verify(PaymentInterface $payment): void
{
$totalAmount = $this->getTotalPaymentAmountFromPaypal($payment);

if ($payment->getOrder()->getTotal() !== $totalAmount) {
throw new PaymentAmountMismatchException();
}
}

private function getTotalPaymentAmountFromPaypal(PaymentInterface $payment): int
{
$details = $payment->getDetails();

return $details['payment_amount'] ?? 0;
}
}
1 change: 1 addition & 0 deletions src/Resources/config/services.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,7 @@

<service id="Sylius\PayPalPlugin\Processor\PayPalOrderCompleteProcessor" public="true">
<argument type="service" id="Sylius\PayPalPlugin\Manager\PaymentStateManagerInterface" />
<argument type="service" id="sylius_paypal.verifier.payment_amount" />
</service>

<service
Expand Down