Merge pull request #739 from PrestaShopCorp/dev

Release v2.12.1

config.xml

@@ -2,7 +2,7 @@
 <module>
 	<name>ps_checkout</name>
 	<displayName><![CDATA[PrestaShop Checkout]]></displayName>
-	<version><![CDATA[2.12.0]]></version>
+	<version><![CDATA[2.12.1]]></version>
 	<description><![CDATA[Provide the most commonly used payment methods to your customers in this all-in-one module, and manage all your sales in a centralized interface.]]></description>
 	<author><![CDATA[PrestaShop]]></author>
 	<tab><![CDATA[payments_gateways]]></tab>

controllers/front/validate.php

@@ -267,6 +267,10 @@ private function handleException(Exception $exception)
                 case PsCheckoutException::PRESTASHOP_ORDER_PAYMENT:
                     $exceptionMessageForCustomer = $this->module->l('OrderPayment cannot be saved');
                     break;
+                case PsCheckoutException::DIFFERENCE_BETWEEN_TRANSACTION_AND_CART:
+                    $exceptionMessageForCustomer = $this->module->l('The transaction amount doesn\'t match with the cart amount.');
+                    $notifyCustomerService = false;
+                    break;
             }
         } elseif ('PrestaShop\Module\PrestashopCheckout\Exception\PayPalException' === $exceptionClass) {
             switch ($exception->getCode()) {

ps_checkout.php

@@ -126,7 +126,7 @@ class Ps_checkout extends PaymentModule
 
     // Needed in order to retrieve the module version easier (in api call headers) than instanciate
     // the module each time to get the version
-    const VERSION = '2.12.0';
+    const VERSION = '2.12.1';
 
     const INTEGRATION_DATE = '2020-07-30';
 
@@ -147,7 +147,7 @@ public function __construct()
 
         // We cannot use the const VERSION because the const is not computed by addons marketplace
         // when the zip is uploaded
-        $this->version = '2.12.0';
+        $this->version = '2.12.1';
         $this->author = 'PrestaShop';
         $this->need_instance = 0;
         $this->currencies = true;

src/Exception/PsCheckoutException.php

@@ -64,4 +64,5 @@ class PsCheckoutException extends \Exception
     const PRESTASHOP_VALIDATE_ORDER = 40;
     const PRESTASHOP_ORDER_PAYMENT = 41;
     const PRESTASHOP_CART_NOT_FOUND = 42;
+    const DIFFERENCE_BETWEEN_TRANSACTION_AND_CART = 43;
 }

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();
     }
 
     /**
@@ -95,7 +101,16 @@ public function validateOrder($payload)
             /** @var \PsCheckoutCart|false $psCheckoutCart */
             $psCheckoutCart = $psCheckoutCartRepository->findOneByCartId((int) $payload['cartId']);
 
-            $apiOrder = new Order(\Context::getContext()->link);
+            // Check if the PayPal order amount is the same than the cart amount
+            // We tolerate a difference of more or less 0.05
+            $paypalOrderAmount = number_format($order['purchase_units'][0]['amount']['value'], 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($this->context->link);
 
             $fundingSource = false === $psCheckoutCart ? 'paypal' : $psCheckoutCart->paypal_funding;