Merge pull request #35 from gmatsuoka/master

Version 2.2.0
mercadopago · Aug 9, 2018 · ec76d37 · ec76d37 · josenovo77 · Aug 6, 2019
2 parents 0186073 + ac47bea
commit ec76d37
Show file tree

Hide file tree

Showing 19 changed files with 29 additions and 131 deletions.
diff --git a/README.md b/README.md
@@ -242,12 +242,3 @@ During the sandbox mode tests, you can operate over HTTP, but for homologation y
     * **Choose the status when payment was chargeback**: Sets up the order status when payments are chargeback.
     * **Choose the status when payment was canceled**: Sets up the order status when payments are canceled.
     * **Choose the status when payment was reject**: Sets up the order status when payments are rejected.
-
-<a name="social"></a>
-##Social##
-
-Follow our facebook group and watch our videos
-<ul>
-  <li><a href="https://www.facebook.com/groups/modulos.mercadopago/?ref=ts&fref=ts" target="_blank">FACEBOOK</a></li>
-  <li><a href="https://www.youtube.com/playlist?list=PLl8LGzRu2_sXxChIJm1e0xY6dU3Dj_tNi" target="_blank">YOUTUBE</a></li>
-</ul>
diff --git a/README_es.md b/README_es.md
@@ -241,13 +241,3 @@ Puedes obtener tu **Public Key** y **Access Token**, dependiendo de tu país, en
   * **Elige el status para ordenes canceladas**: Setea el status de la orden cuando los pagos son cancelados.
   * **Elige el status para ordenes rechazadas**: Setea el status de la orden cuando los pagos son rechazados.
 
-
-<a name="social"></a>
-## social ##
-
-Sigue nuestro grupo de facebook y mira nuestros videos
-<ul>
-  <li><a href="https://www.facebook.com/groups/modulos.mercadopago/?ref=ts&fref=ts" target="_blank">FACEBOOK</a></li>
-  <li><a href="https://www.youtube.com/playlist?list=PLl8LGzRu2_sXxChIJm1e0xY6dU3Dj_tNi" target="_blank">YOUTUBE</a></li>
-</ul>
-
diff --git a/README_pt.md b/README_pt.md
@@ -205,12 +205,4 @@ Para obter seu **Access Token**, acesse o link abaixo de acordo com o seu país:
 * Mexico: https://www.mercadopago.com/mlm/account/credentials
 * Venezuela: https://www.mercadopago.com/mlv/account/credentials
 * Uruguai: https://www.mercadopago.com/mlu/account/credentials  
-
-<a name="social"></a>
-##Social##
-
-Você pode participar do nosso grupo no facebook e assistir nossos vídeos no youtube
-<ul>
-  <li><a href="https://www.facebook.com/groups/modulos.mercadopago/?ref=ts&fref=ts" target="_blank">FACEBOOK</a></li>
-  <li><a href="https://www.youtube.com/playlist?list=PLl8LGzRu2_sXxChIJm1e0xY6dU3Dj_tNi" target="_blank">YOUTUBE</a></li>
-</ul>    
+
diff --git a/mercadopago/mercadopago.php b/mercadopago/mercadopago.php
@@ -3,7 +3,7 @@
 * Mercado Pago plugin
 *
 * @author Developers Mercado Pago <[email protected]>
-* @version 2.1.0
+* @version 2.2.0
 * @package VirtueMart
 * @subpackage payment
 * @link https://www.mercadopago.com
@@ -690,7 +690,7 @@ function makePreferenceV1($cart, $order, $payment_method){
 
 		$payment['description'] = $this->vendor->vendor_store_name . " - " . $order['details']['BT']->virtuemart_order_id;
 
-		$payment['transaction_amount'] = (float) number_format($cart->cartPrices['billTotal'], 2);
+		$payment['transaction_amount'] = (float) number_format($cart->cartPrices['billTotal'], 2, '.', '');
 
 		$payment['external_reference'] = $order['details']['BT']->virtuemart_order_id;
 

diff --git a/mercadopago/mercadopago.xml b/mercadopago/mercadopago.xml
@@ -7,7 +7,7 @@
     <authorUrl>https://mercadopago.com</authorUrl>
     <copyright>Copyright (C) 2004-2016 Mercado Pago. All rights reserved.</copyright>
     <license>http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
-    <version>2.1.0</version>
+    <version>2.2.0</version>
     <description>Mercado Pago</description>
 
     <files>

diff --git a/mercadopago/mercadopago/fields/getmercadopago.php b/mercadopago/mercadopago/fields/getmercadopago.php
@@ -3,7 +3,7 @@
  * Mercado Pago plugin
  *
  * @author Developers Mercado Pago <[email protected]>
- * @version 2.1.0
+ * @version 2.2.0
  * @package VirtueMart
  * @subpackage payment
  * @link https://www.mercadopago.com
@@ -25,7 +25,7 @@ protected function getInput() {
 		$html = '<img src="' . $banner . '" />';
 		$html .= '<input type="hidden" name="mercadopago_sponsor_id" value="VALUE_SPONSOR_ID" />';
 		$html .= '<input type="hidden" name="mercadopago_site_id" value="VALUE_SITE_ID" />';
-		$html .= '<br/>Module Version: <strong>2.1.0</strong>';
+		$html .= '<br/>Module Version: <strong>2.2.0</strong>';
 
 		return $html;
 	}

diff --git a/mercadopago/mercadopago/fields/getmercadopagocategories.php b/mercadopago/mercadopago/fields/getmercadopagocategories.php
@@ -3,7 +3,7 @@
  * Mercado Pago plugin
  *
  * @author Developers Mercado Pago <[email protected]>
- * @version 2.1.0
+ * @version 2.2.0
  * @package VirtueMart
  * @subpackage payment
  * @link https://www.mercadopago.com

diff --git a/mercadopago/mercadopago/fields/getmercadopagocredentialscountry.php b/mercadopago/mercadopago/fields/getmercadopagocredentialscountry.php
@@ -3,7 +3,7 @@
  * Mercado Pago plugin
  *
  * @author Developers Mercado Pago <[email protected]>
- * @version 2.1.0
+ * @version 2.2.0
  * @package VirtueMart
  * @subpackage payment
  * @link https://www.mercadopago.com

diff --git a/mercadopago/mercadopago/fields/getmercadopagocredentialscustom.php b/mercadopago/mercadopago/fields/getmercadopagocredentialscustom.php
@@ -3,7 +3,7 @@
  * Mercado Pago plugin
  *
  * @author Developers Mercado Pago <[email protected]>
- * @version 2.1.0
+ * @version 2.2.0
  * @package VirtueMart
  * @subpackage payment
  * @link https://www.mercadopago.com

diff --git a/mercadopago/mercadopago/fields/getmercadopagopaymentmethods.php b/mercadopago/mercadopago/fields/getmercadopagopaymentmethods.php
@@ -3,7 +3,7 @@
  * Mercado Pago plugin
  *
  * @author Developers Mercado Pago <[email protected]>
- * @version 2.1.0
+ * @version 2.2.0
  * @package VirtueMart
  * @subpackage payment
  * @link https://www.mercadopago.com

diff --git a/mercadopago/mercadopago/helpers/mercadopago.php b/mercadopago/mercadopago/helpers/mercadopago.php
@@ -3,7 +3,7 @@
  * Mercado Pago plugin
  *
  * @author Developers Mercado Pago <[email protected]>
- * @version 2.1.0
+ * @version 2.2.0
  * @package VirtueMart
  * @subpackage payment
  * @link https://www.mercadopago.com

diff --git a/mercadopago/mercadopago/lib/mercadopago.php b/mercadopago/mercadopago/lib/mercadopago.php
@@ -99,28 +99,6 @@ public function get_merchant_order($id) {
         return $merchant_order;
     }
 
-    /**
-     * Get information for specific payment
-     * @param int $id
-     * @return array(json)
-     */
-    public function get_payment($id) {
-        $uri_prefix = $this->sandbox ? "/sandbox" : "";
-
-        $request = array(
-            "uri" => $uri_prefix."/collections/notifications/{$id}",
-            "params" => array(
-                "access_token" => $this->get_access_token()
-            )
-        );
-
-        $payment_info = MPRestClient::get($request);
-        return $payment_info;
-    }
-    public function get_payment_info($id) {
-        return $this->get_payment($id);
-    }
-
     /**
      * Get information for specific authorized payment
      * @param id
@@ -138,46 +116,6 @@ public function get_authorized_payment($id) {
         return $authorized_payment_info;
     }
 
-    /**
-     * Refund accredited payment
-     * @param int $id
-     * @return array(json)
-     */
-    public function refund_payment($id) {
-        $request = array(
-            "uri" => "/collections/{$id}",
-            "params" => array(
-                "access_token" => $this->get_access_token()
-            ),
-            "data" => array(
-                "status" => "refunded"
-            )
-        );
-
-        $response = MPRestClient::put($request);
-        return $response;
-    }
-
-    /**
-     * Cancel pending payment
-     * @param int $id
-     * @return array(json)
-     */
-    public function cancel_payment($id) {
-        $request = array(
-            "uri" => "/collections/{$id}",
-            "params" => array(
-                "access_token" => $this->get_access_token()
-            ),
-            "data" => array(
-                "status" => "cancelled"
-            )
-        );
-
-        $response = MPRestClient::put($request);
-        return $response;
-    }
-
     /**
      * Cancel preapproval payment
      * @param int $id
@@ -198,30 +136,6 @@ public function cancel_preapproval_payment($id) {
         return $response;
     }
 
-    /**
-     * Search payments according to filters, with pagination
-     * @param array $filters
-     * @param int $offset
-     * @param int $limit
-     * @return array(json)
-     */
-    public function search_payment($filters, $offset = 0, $limit = 0) {
-        $filters["offset"] = $offset;
-        $filters["limit"] = $limit;
-
-        $uri_prefix = $this->sandbox ? "/sandbox" : "";
-
-        $request = array(
-            "uri" => $uri_prefix."/collections/search",
-            "params" => array_merge ($filters, array(
-                "access_token" => $this->get_access_token()
-            ))
-        );
-
-        $collection_result = MPRestClient::get($request);
-        return $collection_result;
-    }
-
     /**
      * Create a checkout preference
      * @param array $preference
@@ -556,6 +470,11 @@ public function delete($request, $params = null) {
 class MPRestClient {
     static $check_loop = 0;
     const API_BASE_URL = "https://api.mercadopago.com";
+
+    /**
+     *Product Id 
+     */
+    const PRODUCT_ID = "BC32CJBU643001OI39C0";
 
     private static function build_request($request) {
         if (!extension_loaded ("curl")) {
@@ -572,6 +491,12 @@ private static function build_request($request) {
 
         // Set headers
         $headers = array("accept: application/json");
+
+        //set x_product_id
+        if($request["method"] == 'POST'){
+            $header_opt[] = "x-product-id: " . self::PRODUCT_ID;
+        }
+
         $json_content = true;
         $form_content = false;
         $default_content_type = true;

diff --git a/mercadopago/mercadopago/tmpl/mercadopago_checkout_custom.php b/mercadopago/mercadopago/tmpl/mercadopago_checkout_custom.php
@@ -6,7 +6,7 @@
  * Mercado Pago plugin
  *
  * @author Developers Mercado Pago <[email protected]>
- * @version 2.1.0
+ * @version 2.2.0
  * @package VirtueMart
  * @subpackage payment
  * @link https://www.mercadopago.com

diff --git a/mercadopago/mercadopago/tmpl/mercadopago_checkout_custom_ticket.php b/mercadopago/mercadopago/tmpl/mercadopago_checkout_custom_ticket.php
@@ -6,7 +6,7 @@
  * Mercado Pago plugin
  *
  * @author Developers Mercado Pago <[email protected]>
- * @version 2.1.0
+ * @version 2.2.0
  * @package VirtueMart
  * @subpackage payment
  * @link https://www.mercadopago.com

diff --git a/mercadopago/mercadopago/tmpl/mercadopago_checkout_standard.php b/mercadopago/mercadopago/tmpl/mercadopago_checkout_standard.php
@@ -6,7 +6,7 @@
  * Mercado Pago plugin
  *
  * @author Developers Mercado Pago <[email protected]>
- * @version 2.1.0
+ * @version 2.2.0
  * @package VirtueMart
  * @subpackage payment
  * @link https://www.mercadopago.com

diff --git a/mercadopago/mercadopago/tmpl/mercadopago_checkout_standard_flow.php b/mercadopago/mercadopago/tmpl/mercadopago_checkout_standard_flow.php
@@ -6,7 +6,7 @@
  * Mercado Pago plugin
  *
  * @author Developers Mercado Pago <[email protected]>
- * @version 2.1.0
+ * @version 2.2.0
  * @package VirtueMart
  * @subpackage payment
  * @link https://www.mercadopago.com

diff --git a/mercadopago/mercadopago/tmpl/mercadopago_response_custom.php b/mercadopago/mercadopago/tmpl/mercadopago_response_custom.php
@@ -6,7 +6,7 @@
  * Mercado Pago plugin
  *
  * @author Developers Mercado Pago <[email protected]>
- * @version 2.1.0
+ * @version 2.2.0
  * @package VirtueMart
  * @subpackage payment
  * @link https://www.mercadopago.com

diff --git a/mercadopago/mercadopago/tmpl/mercadopago_response_custom_ticket.php b/mercadopago/mercadopago/tmpl/mercadopago_response_custom_ticket.php
@@ -6,7 +6,7 @@
  * Mercado Pago plugin
  *
  * @author Developers Mercado Pago <[email protected]>
- * @version 2.1.0
+ * @version 2.2.0
  * @package VirtueMart
  * @subpackage payment
  * @link https://www.mercadopago.com

diff --git a/mercadopago/mercadopago/tmpl/mercadopago_response_standard.php b/mercadopago/mercadopago/tmpl/mercadopago_response_standard.php
@@ -6,7 +6,7 @@
  * Mercado Pago plugin
  *
  * @author Developers Mercado Pago <[email protected]>
- * @version 2.1.0
+ * @version 2.2.0
  * @package VirtueMart
  * @subpackage payment
  * @link https://www.mercadopago.com