Merge pull request #741 from PrestaShopCorp/fix/difference-paypal-ord…

…er-and-cart

Fix difference PayPal order and cart amounts

src/ValidateOrder.php

@@ -50,6 +50,11 @@ class ValidateOrder
      */
     private $merchantId;
 
+    /**
+     * @var \Context
+     */
+    private $context;
+
     /**
      * @param string $paypalOrderId
      * @param string $merchantId
@@ -58,6 +63,7 @@ public function __construct($paypalOrderId, $merchantId)
     {
         $this->merchantId = $merchantId;
         $this->paypalOrderId = $paypalOrderId;
+        $this->context = \Context::getContext();
     }
 
     /**
@@ -97,15 +103,14 @@ public function validateOrder($payload)
 
             // Check if the PayPal order amount is the same than the cart amount
             // We tolerate a difference of more or less 0.05
-            $context = \Context::getContext();
             $paypalOrderAmount = number_format($order['purchase_units'][0]['amount']['value'], 2);
-            $cartAmount = number_format($context->cart->getOrderTotal(true, \Cart::BOTH), 2);
+            $cartAmount = number_format($this->context->cart->getOrderTotal(true, \Cart::BOTH), 2);
 
             if ($paypalOrderAmount + 0.05 < $cartAmount || $paypalOrderAmount - 0.05 > $cartAmount) {
                 throw new PsCheckoutException('The transaction amount doesn\'t match with the cart amount.', PsCheckoutException::DIFFERENCE_BETWEEN_TRANSACTION_AND_CART);
             }
 
-            $apiOrder = new Order(\Context::getContext()->link);
+            $apiOrder = new Order($this->context->link);
 
             $fundingSource = false === $psCheckoutCart ? 'paypal' : $psCheckoutCart->paypal_funding;