Release v4.14.0

.jshintrc

@@ -0,0 +1,3 @@
+{
+  "esversion": 6
+}

CHANGELOG.md

@@ -5,6 +5,15 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [4.14.0] - 2023-25-05
+
+### Added
+- Identification to payment-methods requests
+- Secure Fields to card form
+
+### Updated
+- Dependencies versions
+
 ## [4.13.0] - 2023-09-01
 
 ### Changed

README.md

@@ -4,7 +4,7 @@
   </a>
 </p>
 
-# Prestashop 1.6.x & 1.7.x - Mercado Pago Module (v4.13.0)
+# Prestashop 1.6.x & 1.7.x - Mercado Pago Module (v4.14.0)
 
 With the official module of Mercado Pago you will have an integration, hundreds of solutions and thousands of sales. Maximize your conversions and make your customers return to your store by increasing their confidence in the shopping experience.
 

controllers/front/custom.php

@@ -32,9 +32,12 @@
 
 class MercadoPagoCustomModuleFrontController extends ModuleFrontController
 {
+    public $mpuseful;
+
     public function __construct()
     {
         parent::__construct();
+        $this->mpuseful = MPUseful::getInstance();
     }
 
     /**
@@ -62,7 +65,7 @@ public function postProcess()
 
                 //order confirmation redirect
                 $old_cart = new Cart($this->context->cart->id);
-                $order = Order::getOrderByCartId($old_cart->id);
+                $order = $this->mpuseful->getOrderIdByCartId($old_cart->id);
                 $order = new Order($order);
 
                 $uri = __PS_BASE_URI__ . 'index.php?controller=order-confirmation';

controllers/front/pix.php

@@ -32,9 +32,12 @@
 
 class MercadoPagoPixModuleFrontController extends ModuleFrontController
 {
+    public $mpuseful;
+
     public function __construct()
     {
         parent::__construct();
+        $this->mpuseful = MPUseful::getInstance();
     }
 
     /**
@@ -96,7 +99,7 @@ public function createOrder($payment, $cart, $preference)
         $preference->disableCartRule();
 
         $oldCart = new Cart($cart->id);
-        $order = Order::getOrderByCartId($oldCart->id);
+        $order = $this->mpuseful->getOrderIdByCartId($oldCart->id);
         $order = new Order($order);
 
         return $order;

controllers/front/standardvalidation.php

@@ -32,12 +32,14 @@
 class MercadoPagoStandardValidationModuleFrontController extends ModuleFrontController
 {
     public $mp_transaction;
+    public $mpuseful;
 
     public function __construct()
     {
         parent::__construct();
         $this->mercadopago = MPApi::getInstance();
         $this->mp_transaction = new MPTransaction();
+        $this->mpuseful = MPUseful::getInstance();
     }
 
     /**
@@ -111,7 +113,7 @@ public function createOrder($cart, $transaction_id)
         $notification = new IpnNotification($transaction_id, $merchant_order);
         $notification = $notification->createStandardOrder($cart);
 
-        $order = Order::getOrderByCartId($cart->id);
+        $order = $this->mpuseful->getOrderIdByCartId($cart->id);
         $order = new Order($order);
 
         return $order;

controllers/front/ticket.php

@@ -32,9 +32,12 @@
 
 class MercadoPagoTicketModuleFrontController extends ModuleFrontController
 {
+    public $mpuseful;
+
     public function __construct()
     {
         parent::__construct();
+        $this->mpuseful = MPUseful::getInstance();
     }
 
     /**
@@ -68,7 +71,7 @@ public function postProcess()
 
                 //order confirmation redirect
                 $old_cart = new Cart($this->context->cart->id);
-                $order = Order::getOrderByCartId($old_cart->id);
+                $order = $this->mpuseful->getOrderIdByCartId($old_cart->id);
                 $order = new Order($order);
 
                 $uri = __PS_BASE_URI__ . 'index.php?controller=order-confirmation';

includes/MPApi.php

@@ -112,8 +112,10 @@ public function getCredentialsWrapper($access_token)
     public function getPaymentMethods()
     {
         $access_token = $this->getAccessToken();
-        $response = MPRestCli::get('/v1/bifrost/payment-methods', ["Authorization: Bearer " . $access_token]);
-
+        $response = MPRestCli::get('/v1/bifrost/payment-methods', [
+            "Authorization: Bearer " . $access_token,
+            "x-product-id: " . MPRestCli::PRODUCT_ID
+        ]);
 
         //in case of failures
         if ($response['status'] > 202) {

includes/MPUseful.php

@@ -344,4 +344,20 @@ public function getDiscountByCheckoutType($checkout)
                 return 0.00;
         }
     }
+
+    /**
+     * Handles call to get order id in different Prestashop versions
+     *
+     * @param int $id_cart Cart id
+     *
+     * @return int $id_order
+     */
+    public function getOrderIdByCartId($cartId)
+    {
+        if (method_exists(Order::class, 'getIdByCartId')) {
+            return Order::getIdByCartId($cartId);
+        } else {
+            return Order::getOrderByCartId($cartId);
+        }
+    }
 }

includes/module/notification/AbstractNotification.php

@@ -137,7 +137,7 @@ public function createOrder($cart, $custom_create_order = false)
                 false
             );
 
-            $this->order_id = Order::getOrderByCartId($cart->id);
+            $this->order_id = $this->mpuseful->getOrderIdByCartId($cart->id);
             $order = new Order($this->order_id);
 
             $payments = $order->getOrderPaymentCollection();

includes/module/notification/IpnNotification.php

@@ -34,6 +34,7 @@ class IpnNotification extends AbstractNotification
     public $merchant_order;
     public $preference;
     public $isWalletButton;
+    public $mpuseful;
 
     public function __construct($transaction_id, $merchant_order)
     {
@@ -44,6 +45,7 @@ public function __construct($transaction_id, $merchant_order)
         $this->isWalletButton = $this->checkout === 'wallet_button';
         $this->preference = $this->getCheckoutPreference();
         $this->mp_transaction_amount = $merchant_order['total_amount'];
+        $this->mpuseful = MPUseful::getInstance();
     }
 
     /**
@@ -146,7 +148,7 @@ public function getCheckoutType()
      */
     public function getOrderId($cart)
     {
-        $orderId = Order::getOrderByCartId($cart->id);
+        $orderId = $this->mpuseful->getOrderIdByCartId($cart->id);
         $this->order_id = $orderId;
 
         return $orderId;

includes/module/notification/WebhookNotification.php

@@ -32,6 +32,7 @@
 class WebhookNotification extends AbstractNotification
 {
     public $payment;
+    public $mpuseful;
 
     public function __construct($transaction_id, $payment)
     {
@@ -40,6 +41,7 @@ public function __construct($transaction_id, $payment)
         $this->payment = $payment;
         $this->checkout = $payment['metadata']['checkout_type'];
         $this->mp_transaction_amount = $payment['transaction_amount'];
+        $this->mpuseful = MPUseful::getInstance();
     }
 
     /**
@@ -53,7 +55,7 @@ public function receiveNotification($cart)
         $this->verifyWebhook($cart);
 
         $this->total = $this->getTotal($cart, $this->checkout);
-        $orderId = Order::getOrderByCartId($cart->id);
+        $orderId = $this->mpuseful->getOrderIdByCartId($cart->id);
 
         if ($orderId != 0) {
             $this->verifyCustomPayment();

mercadopago.php

@@ -24,7 +24,7 @@
  *  International Registered Trademark & Property of MercadoPago
  */
 
-define('MP_VERSION', '4.13.0');
+define('MP_VERSION', '4.14.0');
 define('MP_ROOT_URL', dirname(__FILE__));
 
 if (!defined('_PS_VERSION_')) {
@@ -73,7 +73,7 @@ public function __construct()
         $this->bootstrap = true;
 
         //Always update, because prestashop doesn't accept version coming from another variable (MP_VERSION)
-        $this->version = '4.13.0';
+        $this->version = '4.14.0';
         $this->ps_versions_compliancy = array('min' => '1.6', 'max' => _PS_VERSION_);
 
         parent::__construct();