[UPMERGE] 1.7 -> 2.0 (#375)

This PR has been generated automatically.
For more details see
[upmerge_pr.yaml](/Sylius/PayPalPlugin/blob/1.7/.github/workflows/upmerge_pr.yaml).

**Remember!** The upmerge should always be merged with using `Merge pull
request` button.

In case of conflicts, please resolve them manually with usign the
following commands:
```
git fetch upstream
gh pr checkout <this-pr-number>
git merge upstream/2.0 -m "Resolve conflicts between 1.7 and 2.0"
```

If you use other name for the upstream remote, please replace `upstream`
with the name of your remote pointing to the `Sylius/PayPalPlugin`
repository.

Once the conflicts are resolved, please run `git merge --continue` and
push the changes to this PR.

Author: GSadee

src/Controller/ProcessPayPalOrderAction.php

@@ -17,6 +17,7 @@
 use Sylius\Abstraction\StateMachine\StateMachineInterface;
 use Sylius\Component\Core\Factory\AddressFactoryInterface;
 use Sylius\Component\Core\Model\CustomerInterface;
+use Sylius\Component\Core\Model\OrderInterface;
 use Sylius\Component\Core\Model\PaymentInterface;
 use Sylius\Component\Core\Model\PaymentMethodInterface;
 use Sylius\Component\Core\OrderCheckoutTransitions;
@@ -62,9 +63,18 @@ public function __invoke(Request $request): Response
     {
         $orderId = $request->request->getInt('orderId');
         $order = $this->orderProvider->provideOrderById($orderId);
-        /** @var PaymentInterface $payment */
+
+        if ($order->getState() !== OrderInterface::STATE_NEW) {
+            return new JsonResponse(['orderID' => $orderId]);
+        }
+
+        /** @var PaymentInterface|null $payment */
         $payment = $order->getLastPayment(PaymentInterface::STATE_CART);
 
+        if (null === $payment) {
+            return new JsonResponse(['orderID' => $orderId]);
+        }
+
         $data = $this->getOrderDetails((string) $request->request->get('payPalOrderId'), $payment);
 
         /** @var CustomerInterface|null $customer */
@@ -119,13 +129,13 @@ public function __invoke(Request $request): Response
         } catch (PaymentAmountMismatchException) {
             $this->paymentStateManager->cancel($payment);
 
-            return new JsonResponse(['orderID' => $order->getId()]);
+            return new JsonResponse(['orderID' => $orderId]);
         }
 
         $this->paymentStateManager->create($payment);
         $this->paymentStateManager->process($payment);
 
-        return new JsonResponse(['orderID' => $order->getId()]);
+        return new JsonResponse(['orderID' => $orderId]);
     }
 
     private function getOrderCustomer(array $customerData): CustomerInterface

src/Verifier/PaymentAmountVerifier.php

@@ -41,7 +41,7 @@ private function getTotalPaymentAmountFromPaypal(PaymentInterface $payment, arra
 
         foreach ($paypalOrderDetails['purchase_units'] as $unit) {
             $stringAmount = $unit['amount']['value'] ?? '0';
-            $totalAmount += (int) ($stringAmount * 100);
+            $totalAmount += (int) round((float) $stringAmount * 100, 0);
         }
 
         return $totalAmount;

tests/Unit/PaymentAmountVerifierTest.php

@@ -33,11 +33,11 @@ public function testVerifySucceedsWhenAmountsMatch(): void
         $payment = $this->createMock(PaymentInterface::class);
         $order = $this->createMock(OrderInterface::class);
         $payment->method('getOrder')->willReturn($order);
-        $order->method('getTotal')->willReturn(1500);
+        $order->method('getTotal')->willReturn(4398);
 
         $paypalOrderDetails = [
             'purchase_units' => [
-                ['amount' => ['value' => '10.00']],
+                ['amount' => ['value' => '38.98']],
                 ['amount' => ['value' => '5.00']],
             ],
         ];
@@ -52,11 +52,11 @@ public function testVerifyThrowsExceptionWhenAmountsDoNotMatch(): void
         $payment = $this->createMock(PaymentInterface::class);
         $order = $this->createMock(OrderInterface::class);
         $payment->method('getOrder')->willReturn($order);
-        $order->method('getTotal')->willReturn(1000);
+        $order->method('getTotal')->willReturn(4500);
 
         $paypalOrderDetails = [
             'purchase_units' => [
-                ['amount' => ['value' => '10.00']],
+                ['amount' => ['value' => '38.98']],
                 ['amount' => ['value' => '5.00']],
             ],
         ];