Merge pull request #97 from gmatsuoka/master

Version 2.2.0
mercadopago · Aug 3, 2018 · 5a4db4d · 5a4db4d
2 parents 81e7ac3 + d280c5b
commit 5a4db4d
Show file tree

Hide file tree

Showing 263 changed files with 212 additions and 263 deletions.
diff --git a/README.img/logo_mp.png b/README.img/logo_mp.png
diff --git a/README.img/mercadoenvios.png b/README.img/mercadoenvios.png
diff --git a/README.img/mercadopago_custom_checkout_cc.png b/README.img/mercadopago_custom_checkout_cc.png
diff --git a/README.img/mercadopago_custom_checkout_configuration.png b/README.img/mercadopago_custom_checkout_configuration.png
diff --git a/README.img/mercadopago_custom_checkout_ticket.png b/README.img/mercadopago_custom_checkout_ticket.png
diff --git a/README.img/mercadopago_global_configuration.png b/README.img/mercadopago_global_configuration.png
diff --git a/README.md b/README.md
diff --git a/Test/.gitignore b/Test/.gitignore
diff --git a/Test/behat.yml.dist b/Test/behat.yml.dist
diff --git a/Test/composer.json b/Test/composer.json
diff --git a/Test/functional/features/MercadoPago/CouponDiscount.feature b/Test/functional/features/MercadoPago/CouponDiscount.feature
diff --git a/Test/functional/features/MercadoPago/CreditCards.feature b/Test/functional/features/MercadoPago/CreditCards.feature
diff --git a/Test/functional/features/MercadoPago/CreditCardsPerCountry.feature b/Test/functional/features/MercadoPago/CreditCardsPerCountry.feature
diff --git a/Test/functional/features/MercadoPago/CustomCheckout.feature b/Test/functional/features/MercadoPago/CustomCheckout.feature
diff --git a/Test/functional/features/MercadoPago/CustomForm.feature b/Test/functional/features/MercadoPago/CustomForm.feature
diff --git a/Test/functional/features/MercadoPago/OneClickPayCheckout.feature b/Test/functional/features/MercadoPago/OneClickPayCheckout.feature
diff --git a/Test/functional/features/MercadoPago/PaymentsOptionsCalculator.feature b/Test/functional/features/MercadoPago/PaymentsOptionsCalculator.feature
diff --git a/Test/functional/features/MercadoPago/StandardCheckout.feature b/Test/functional/features/MercadoPago/StandardCheckout.feature
diff --git a/Test/functional/features/MercadoPago/StandardCheckoutPerCountry.feature b/Test/functional/features/MercadoPago/StandardCheckoutPerCountry.feature
diff --git a/Test/functional/features/bootstrap/FeatureContext.php b/Test/functional/features/bootstrap/FeatureContext.php
diff --git a/Test/functional/features/fixture/MercadoPagoFixture.php b/Test/functional/features/fixture/MercadoPagoFixture.php
diff --git a/Test/static/phpcs/Ecg/LICENSE b/Test/static/phpcs/Ecg/LICENSE
diff --git a/Test/static/phpcs/Ecg/README.md b/Test/static/phpcs/Ecg/README.md
diff --git a/Test/static/phpcs/Ecg/Sniffs/Classes/Mysql4Sniff.php b/Test/static/phpcs/Ecg/Sniffs/Classes/Mysql4Sniff.php
diff --git a/Test/static/phpcs/Ecg/Sniffs/Classes/ObjectInstantiationSniff.php b/Test/static/phpcs/Ecg/Sniffs/Classes/ObjectInstantiationSniff.php
diff --git a/Test/static/phpcs/Ecg/Sniffs/PHP/GotoSniff.php b/Test/static/phpcs/Ecg/Sniffs/PHP/GotoSniff.php
diff --git a/Test/static/phpcs/Ecg/Sniffs/PHP/VarSniff.php b/Test/static/phpcs/Ecg/Sniffs/PHP/VarSniff.php
diff --git a/Test/static/phpcs/Ecg/Sniffs/Performance/CollectionCountSniff.php b/Test/static/phpcs/Ecg/Sniffs/Performance/CollectionCountSniff.php
diff --git a/Test/static/phpcs/Ecg/Sniffs/Performance/FetchAllSniff.php b/Test/static/phpcs/Ecg/Sniffs/Performance/FetchAllSniff.php
diff --git a/Test/static/phpcs/Ecg/Sniffs/Performance/GetFirstItemSniff.php b/Test/static/phpcs/Ecg/Sniffs/Performance/GetFirstItemSniff.php
diff --git a/Test/static/phpcs/Ecg/Sniffs/Performance/LoopSniff.php b/Test/static/phpcs/Ecg/Sniffs/Performance/LoopSniff.php
diff --git a/Test/static/phpcs/Ecg/Sniffs/Security/AclSniff.php b/Test/static/phpcs/Ecg/Sniffs/Security/AclSniff.php
diff --git a/Test/static/phpcs/Ecg/Sniffs/Security/ForbiddenFunctionSniff.php b/Test/static/phpcs/Ecg/Sniffs/Security/ForbiddenFunctionSniff.php
diff --git a/Test/static/phpcs/Ecg/Sniffs/Security/IncludeFileSniff.php b/Test/static/phpcs/Ecg/Sniffs/Security/IncludeFileSniff.php
diff --git a/Test/static/phpcs/Ecg/Sniffs/Security/LanguageConstructSniff.php b/Test/static/phpcs/Ecg/Sniffs/Security/LanguageConstructSniff.php
diff --git a/Test/static/phpcs/Ecg/Sniffs/Security/SuperglobalSniff.php b/Test/static/phpcs/Ecg/Sniffs/Security/SuperglobalSniff.php
diff --git a/Test/static/phpcs/Ecg/Sniffs/Sql/RawQuerySniff.php b/Test/static/phpcs/Ecg/Sniffs/Sql/RawQuerySniff.php
diff --git a/Test/static/phpcs/Ecg/Sniffs/Sql/SlowQuerySniff.php b/Test/static/phpcs/Ecg/Sniffs/Sql/SlowQuerySniff.php
diff --git a/Test/static/phpcs/Ecg/Sniffs/Strings/RegExSniff.php b/Test/static/phpcs/Ecg/Sniffs/Strings/RegExSniff.php
diff --git a/Test/static/phpcs/Ecg/Sniffs/Strings/StringConcatSniff.php b/Test/static/phpcs/Ecg/Sniffs/Strings/StringConcatSniff.php
diff --git a/Test/static/phpcs/Ecg/Sniffs/Strings/StringPositionSniff.php b/Test/static/phpcs/Ecg/Sniffs/Strings/StringPositionSniff.php
diff --git a/Test/static/phpcs/Ecg/Tests/Classes/Mysql4UnitTest.inc b/Test/static/phpcs/Ecg/Tests/Classes/Mysql4UnitTest.inc
diff --git a/Test/static/phpcs/Ecg/Tests/Classes/Mysql4UnitTest.php b/Test/static/phpcs/Ecg/Tests/Classes/Mysql4UnitTest.php
diff --git a/Test/static/phpcs/Ecg/Tests/Classes/ObjectInstantiationUnitTest.inc b/Test/static/phpcs/Ecg/Tests/Classes/ObjectInstantiationUnitTest.inc
diff --git a/Test/static/phpcs/Ecg/Tests/Classes/ObjectInstantiationUnitTest.php b/Test/static/phpcs/Ecg/Tests/Classes/ObjectInstantiationUnitTest.php
diff --git a/Test/static/phpcs/Ecg/Tests/PHP/GotoUnitTest.inc b/Test/static/phpcs/Ecg/Tests/PHP/GotoUnitTest.inc
diff --git a/Test/static/phpcs/Ecg/Tests/PHP/GotoUnitTest.php b/Test/static/phpcs/Ecg/Tests/PHP/GotoUnitTest.php
diff --git a/Test/static/phpcs/Ecg/Tests/PHP/VarUnitTest.inc b/Test/static/phpcs/Ecg/Tests/PHP/VarUnitTest.inc
diff --git a/Test/static/phpcs/Ecg/Tests/PHP/VarUnitTest.php b/Test/static/phpcs/Ecg/Tests/PHP/VarUnitTest.php
diff --git a/Test/static/phpcs/Ecg/Tests/Performance/CollectionCountUnitTest.inc b/Test/static/phpcs/Ecg/Tests/Performance/CollectionCountUnitTest.inc
diff --git a/Test/static/phpcs/Ecg/Tests/Performance/CollectionCountUnitTest.php b/Test/static/phpcs/Ecg/Tests/Performance/CollectionCountUnitTest.php
diff --git a/Test/static/phpcs/Ecg/Tests/Performance/FetchAllUnitTest.inc b/Test/static/phpcs/Ecg/Tests/Performance/FetchAllUnitTest.inc
diff --git a/Test/static/phpcs/Ecg/Tests/Performance/FetchAllUnitTest.php b/Test/static/phpcs/Ecg/Tests/Performance/FetchAllUnitTest.php
diff --git a/Test/static/phpcs/Ecg/Tests/Performance/GetFirstItemUnitTest.inc b/Test/static/phpcs/Ecg/Tests/Performance/GetFirstItemUnitTest.inc
diff --git a/Test/static/phpcs/Ecg/Tests/Performance/GetFirstItemUnitTest.php b/Test/static/phpcs/Ecg/Tests/Performance/GetFirstItemUnitTest.php
diff --git a/Test/static/phpcs/Ecg/Tests/Performance/LoopUnitTest.inc b/Test/static/phpcs/Ecg/Tests/Performance/LoopUnitTest.inc
diff --git a/Test/static/phpcs/Ecg/Tests/Performance/LoopUnitTest.php b/Test/static/phpcs/Ecg/Tests/Performance/LoopUnitTest.php
diff --git a/Test/static/phpcs/Ecg/Tests/Security/AclUnitTest.inc b/Test/static/phpcs/Ecg/Tests/Security/AclUnitTest.inc
diff --git a/Test/static/phpcs/Ecg/Tests/Security/AclUnitTest.php b/Test/static/phpcs/Ecg/Tests/Security/AclUnitTest.php
diff --git a/Test/static/phpcs/Ecg/Tests/Security/ForbiddenFunctionUnitTest.php b/Test/static/phpcs/Ecg/Tests/Security/ForbiddenFunctionUnitTest.php
diff --git a/Test/static/phpcs/Ecg/Tests/Security/IncludeFileUnitTest.inc b/Test/static/phpcs/Ecg/Tests/Security/IncludeFileUnitTest.inc
diff --git a/Test/static/phpcs/Ecg/Tests/Security/IncludeFileUnitTest.php b/Test/static/phpcs/Ecg/Tests/Security/IncludeFileUnitTest.php
diff --git a/Test/static/phpcs/Ecg/Tests/Security/LanguageConstructUnitTest.inc b/Test/static/phpcs/Ecg/Tests/Security/LanguageConstructUnitTest.inc
diff --git a/Test/static/phpcs/Ecg/Tests/Security/LanguageConstructUnitTest.php b/Test/static/phpcs/Ecg/Tests/Security/LanguageConstructUnitTest.php
diff --git a/Test/static/phpcs/Ecg/Tests/Security/SuperglobalUnitTest.inc b/Test/static/phpcs/Ecg/Tests/Security/SuperglobalUnitTest.inc
diff --git a/Test/static/phpcs/Ecg/Tests/Security/SuperglobalUnitTest.php b/Test/static/phpcs/Ecg/Tests/Security/SuperglobalUnitTest.php
diff --git a/Test/static/phpcs/Ecg/Tests/Sql/RawQueryUnitTest.inc b/Test/static/phpcs/Ecg/Tests/Sql/RawQueryUnitTest.inc
diff --git a/Test/static/phpcs/Ecg/Tests/Sql/RawQueryUnitTest.php b/Test/static/phpcs/Ecg/Tests/Sql/RawQueryUnitTest.php
diff --git a/Test/static/phpcs/Ecg/Tests/Sql/SlowQueryUnitTest.inc b/Test/static/phpcs/Ecg/Tests/Sql/SlowQueryUnitTest.inc
diff --git a/Test/static/phpcs/Ecg/Tests/Sql/SlowQueryUnitTest.php b/Test/static/phpcs/Ecg/Tests/Sql/SlowQueryUnitTest.php
diff --git a/Test/static/phpcs/Ecg/Tests/Strings/RegExUnitTest.inc b/Test/static/phpcs/Ecg/Tests/Strings/RegExUnitTest.inc
diff --git a/Test/static/phpcs/Ecg/Tests/Strings/RegExUnitTest.php b/Test/static/phpcs/Ecg/Tests/Strings/RegExUnitTest.php
diff --git a/Test/static/phpcs/Ecg/Tests/Strings/StringConcatUnitTest.inc b/Test/static/phpcs/Ecg/Tests/Strings/StringConcatUnitTest.inc
diff --git a/Test/static/phpcs/Ecg/Tests/Strings/StringConcatUnitTest.php b/Test/static/phpcs/Ecg/Tests/Strings/StringConcatUnitTest.php
diff --git a/Test/static/phpcs/Ecg/Tests/Strings/StringPositionUnitTest.inc b/Test/static/phpcs/Ecg/Tests/Strings/StringPositionUnitTest.inc
diff --git a/Test/static/phpcs/Ecg/Tests/Strings/StringPositionUnitTest.php b/Test/static/phpcs/Ecg/Tests/Strings/StringPositionUnitTest.php
diff --git a/Test/static/phpcs/Ecg/composer.json b/Test/static/phpcs/Ecg/composer.json
diff --git a/Test/static/phpcs/Ecg/ruleset.xml b/Test/static/phpcs/Ecg/ruleset.xml
diff --git a/Test/static/phpmd/ruleset.xml b/Test/static/phpmd/ruleset.xml
diff --git a/composer.json b/composer.json
@@ -8,7 +8,7 @@
     }
   ],
   "type": "magento2-component",
-  "version": "2.1.4",
+  "version": "2.2.0",
   "license": [
     "OSL-3.0",
     "AFL-3.0"

diff --git a/src/MercadoPago/Core/Block/AbstractSuccess.php b/src/MercadoPago/Core/Block/AbstractSuccess.php
diff --git a/src/MercadoPago/Core/Block/Adminhtml/System/Config/Fieldset/Payment.php b/src/MercadoPago/Core/Block/Adminhtml/System/Config/Fieldset/Payment.php
diff --git a/src/MercadoPago/Core/Block/Analytics/AfterCheckout.php b/src/MercadoPago/Core/Block/Analytics/AfterCheckout.php
diff --git a/src/MercadoPago/Core/Block/Calculator/CalculatorForm.php b/src/MercadoPago/Core/Block/Calculator/CalculatorForm.php
diff --git a/src/MercadoPago/Core/Block/Calculator/CalculatorLink.php b/src/MercadoPago/Core/Block/Calculator/CalculatorLink.php
diff --git a/src/MercadoPago/Core/Block/Custom/Success.php b/src/MercadoPago/Core/Block/Custom/Success.php
diff --git a/src/MercadoPago/Core/Block/CustomTicket/Success.php b/src/MercadoPago/Core/Block/CustomTicket/Success.php
diff --git a/src/MercadoPago/Core/Block/Info.php b/src/MercadoPago/Core/Block/Info.php
diff --git a/src/MercadoPago/Core/Block/Sales/Order/Totals/DiscountCoupon.php b/src/MercadoPago/Core/Block/Sales/Order/Totals/DiscountCoupon.php
diff --git a/src/MercadoPago/Core/Block/Sales/Order/Totals/FinanceCost.php b/src/MercadoPago/Core/Block/Sales/Order/Totals/FinanceCost.php
@@ -33,7 +33,8 @@ public function getSource()
      */
     public function initTotals()
     {
-        if ((float)$this->getSource()->getFinanceCostAmount() == 0) {
+        if ((float)$this->getSource()->getFinanceCostAmount() == 0 
+            || !$this->_scopeConfig->isSetFlag('payment/mercadopago/financing_cost',\Magento\Store\Model\ScopeInterface::SCOPE_STORE)) {
             return $this;
         }
         $total = new \Magento\Framework\DataObject([

diff --git a/src/MercadoPago/Core/Block/Standard/Failure.php b/src/MercadoPago/Core/Block/Standard/Failure.php
diff --git a/src/MercadoPago/Core/Block/Standard/FailureRedirect.php b/src/MercadoPago/Core/Block/Standard/FailureRedirect.php
diff --git a/src/MercadoPago/Core/Block/Standard/Success.php b/src/MercadoPago/Core/Block/Standard/Success.php
diff --git a/src/MercadoPago/Core/Controller/Api/Coupon.php b/src/MercadoPago/Core/Controller/Api/Coupon.php
diff --git a/src/MercadoPago/Core/Controller/Api/Subtotals.php b/src/MercadoPago/Core/Controller/Api/Subtotals.php
diff --git a/src/MercadoPago/Core/Controller/Calculator/Popup.php b/src/MercadoPago/Core/Controller/Calculator/Popup.php
diff --git a/src/MercadoPago/Core/Controller/Checkout/Page.php b/src/MercadoPago/Core/Controller/Checkout/Page.php
diff --git a/src/MercadoPago/Core/Controller/Customticket/Success.php b/src/MercadoPago/Core/Controller/Customticket/Success.php
diff --git a/src/MercadoPago/Core/Controller/Notifications/Custom.php b/src/MercadoPago/Core/Controller/Notifications/Custom.php
diff --git a/src/MercadoPago/Core/Controller/Notifications/Standard.php b/src/MercadoPago/Core/Controller/Notifications/Standard.php
@@ -89,7 +89,7 @@ protected function _responseLog()
     protected function _getFormattedPaymentData($paymentId, $data = [])
     {
         $response = $this->coreModel->getPayment($paymentId);
-        $payment = $response['response']['collection'];
+        $payment = $response['response'];
 
         return  $this->_statusHelper->formatArrayPayment($data, $payment, self::LOG_NAME);
     }
@@ -207,7 +207,7 @@ protected function _getDataPayments($merchantOrder)
         $data = array();
         foreach ($merchantOrder['payments'] as $payment) {
             $response = $this->coreModel->getPayment($payment['id']);
-            $payment = $response['response']['collection'];
+            $payment = $response['response'];
             $data = $this->_statusHelper->formatArrayPayment($data, $payment, self::LOG_NAME);
         }
         return $data;

diff --git a/src/MercadoPago/Core/Controller/Standard/Failure.php b/src/MercadoPago/Core/Controller/Standard/Failure.php
diff --git a/src/MercadoPago/Core/Controller/Standard/FailureRedirect.php b/src/MercadoPago/Core/Controller/Standard/FailureRedirect.php
diff --git a/src/MercadoPago/Core/Controller/Standard/Pay.php b/src/MercadoPago/Core/Controller/Standard/Pay.php
diff --git a/src/MercadoPago/Core/Cron/OrderUpdate.php b/src/MercadoPago/Core/Cron/OrderUpdate.php
diff --git a/src/MercadoPago/Core/Helper/Data.php b/src/MercadoPago/Core/Helper/Data.php
@@ -82,6 +82,8 @@ class Data
     const XML_PATH_SPONSOR_ID = 'payment/mercadopago/sponsor_id';
 
     const XML_PATH_CONSIDER_DISCOUNT = 'payment/mercadopago/consider_discount';
+
+    const XML_PATH_CONSIDER_FINANCING_COST = 'payment/mercadopago/financing_cost';
 
 
     /**
@@ -354,7 +356,7 @@ public function setOrderSubtotals($data, $order)
         }
 
 
-        if (\Zend_Locale_Math::round($financingCost, 4) > 0) {
+        if (\Zend_Locale_Math::round($financingCost, 4) > 0 && $this->scopeConfig->isSetFlag(self::XML_PATH_CONSIDER_FINANCING_COST,\Magento\Store\Model\ScopeInterface::SCOPE_STORE)) {
             $order->setFinanceCostAmount($financingCost);
             $order->setBaseFinanceCostAmount($financingCost);
         }

diff --git a/src/MercadoPago/Core/Helper/Message/AbstractMessage.php b/src/MercadoPago/Core/Helper/Message/AbstractMessage.php
diff --git a/src/MercadoPago/Core/Helper/Message/MessageInterface.php b/src/MercadoPago/Core/Helper/Message/MessageInterface.php
diff --git a/src/MercadoPago/Core/Helper/Message/StatusDetailMessage.php b/src/MercadoPago/Core/Helper/Message/StatusDetailMessage.php
diff --git a/src/MercadoPago/Core/Helper/Message/StatusMessage.php b/src/MercadoPago/Core/Helper/Message/StatusMessage.php
diff --git a/src/MercadoPago/Core/Helper/Message/StatusOrderMessage.php b/src/MercadoPago/Core/Helper/Message/StatusOrderMessage.php
diff --git a/src/MercadoPago/Core/Helper/Response.php b/src/MercadoPago/Core/Helper/Response.php
diff --git a/src/MercadoPago/Core/Helper/StatusUpdate.php b/src/MercadoPago/Core/Helper/StatusUpdate.php
@@ -370,88 +370,92 @@ protected function _createCreditmemo($order, $data)
      */
     public function formatArrayPayment($data, $payment, $logName)
     {
-        $this->_dataHelper->log("Format Array", $logName);
-
-        $fields = [
-            "status",
-            "status_detail",
-            "order_id",
-            "id",
-            "payment_method_id",
-            "transaction_amount",
-            "total_paid_amount",
-            "coupon_amount",
-            "installments",
-            "shipping_cost",
-            "amount_refunded"
-        ];
-
-        foreach ($fields as $field) {
-            if (isset($payment[$field])) {
-                if (isset($data[$field])) {
-                    $data[$field] .= " | " . $payment[$field];
-                } else {
-                    $data[$field] = $payment[$field];
-                }
-            }
+      $this->_dataHelper->log("Format Array", $logName);
+
+      $fields = [
+        "status",
+        "status_detail",
+        "id",
+        "payment_method_id",
+        "transaction_amount",
+        "coupon_amount",
+        "installments",
+        "amount_refunded"
+      ];
+
+      foreach ($fields as $field) {
+        if (isset($payment[$field])) {
+          if (isset($data[$field])) {
+            $data[$field] .= " | " . $payment[$field];
+          } else {
+            $data[$field] = $payment[$field];
+          }
         }
-
-        if (isset($payment['refunds'])) {
-            foreach ($payment['refunds'] as $refund) {
-                if (isset($data['refunds'])) {
-                    $data['refunds'] .= " | " . $refund['id'];
-                } else {
-                    $data['refunds'] = $refund['id'];
-                }
-            }
+      }
+
+      if (isset($payment['refunds'])) {
+        foreach ($payment['refunds'] as $refund) {
+          if (isset($data['refunds'])) {
+            $data['refunds'] .= " | " . $refund['id'];
+          } else {
+            $data['refunds'] = $refund['id'];
+          }
         }
-
-        $data = $this->_updateAtributesData($data, $payment);
-
-        $data['external_reference'] = $payment['external_reference'];
-        $data['payer_first_name'] = $payment['payer']['first_name'];
-        $data['payer_last_name'] = $payment['payer']['last_name'];
-        $data['payer_email'] = $payment['payer']['email'];
-
-        if (isset($data['payer_identification_type'])) {
-            $data['payer_identification_type'] .= " | " . $payment['payer']['identification']['type'];
-        } else {
-            $data['payer_identification_type'] = $payment['payer']['identification']['type'];
+      }
+
+      $data = $this->_updateAtributesData($data, $payment);
+
+      $data['external_reference'] = $payment['external_reference'];
+      $data['order_id'] = $payment['external_reference'];
+      $data['payer_first_name'] = $payment['payer']['first_name'];
+      $data['payer_last_name'] = $payment['payer']['last_name'];
+      $data['payer_email'] = $payment['payer']['email'];
+      $data['total_paid_amount'] = $payment['transaction_details']['total_paid_amount'];
+      $data['shipping_cost'] = isset($payment['shipping_amount']) ? $payment['shipping_amount'] : "0"; 
+
+      if (isset($data['payer_identification_type'])) {
+        $data['payer_identification_type'] .= " | " . $payment['payer']['identification']['type'];
+      } else {
+        if (isset($payment['payer']) && isset($payment['payer']['identification']) && isset($payment['payer']['identification']['type'])) {
+          $data['payer_identification_type'] = $payment['payer']['identification']['type'];
         }
-
-        if (isset($data['payer_identification_number'])) {
-            $data['payer_identification_number'] .= " | " . $payment['payer']['identification']['number'];
-        } else {
-            $data['payer_identification_number'] = $payment['payer']['identification']['number'];
+      }
+
+      if (isset($data['payer_identification_number'])) {
+        $data['payer_identification_number'] .= " | " . $payment['payer']['identification']['number'];
+      } else {
+        if (isset($payment['payer']) && isset($payment['payer']['identification']) && isset($payment['payer']['identification']['number'])) {
+          $data['payer_identification_number'] = $payment['payer']['identification']['number'];
         }
+      }
 
-        return $data;
+      return $data;
     }
 
     protected function _updateAtributesData($data, $payment)
     {
-        if (isset($payment["last_four_digits"])) {
+        if (isset($payment['card']) && isset($payment['card']["last_four_digits"])) {
             if (isset($data["trunc_card"])) {
-                $data["trunc_card"] .= " | " . "xxxx xxxx xxxx " . $payment["last_four_digits"];
+                $data["trunc_card"] .= " | " . "xxxx xxxx xxxx " . $payment['card']["last_four_digits"];
             } else {
-                $data["trunc_card"] = "xxxx xxxx xxxx " . $payment["last_four_digits"];
+                $data["trunc_card"] = "xxxx xxxx xxxx " . $payment['card']["last_four_digits"];
             }
         }
 
-        if (isset($payment['cardholder']['name'])) {
+        if (isset($payment['card']) && isset($payment['card']['cardholder']) && isset($payment['card']['cardholder']['name'])) {
             if (isset($data["cardholder_name"])) {
-                $data["cardholder_name"] .= " | " . $payment["cardholder"]["name"];
+                $data["cardholder_name"] .= " | " . $payment['card']["cardholder"]["name"];
             } else {
-                $data["cardholder_name"] = $payment["cardholder"]["name"];
+                $data["cardholder_name"] = $payment['card']["cardholder"]["name"];
             }
         }
 
         if (isset($payment['statement_descriptor'])) {
             $data['statement_descriptor'] = $payment['statement_descriptor'];
         }
 
-        if (isset($payment['merchant_order_id'])) {
-            $data['merchant_order_id'] = $payment['merchant_order_id'];
+        if (isset($payment['order']) && isset($payment['order']['type']) && $payment['order']['type'] == "mercadopago") {
+            $data['merchant_order_id'] = $payment['order']['id'] ;
         }
 
         return $data;

diff --git a/src/MercadoPago/Core/Lib/Api.php b/src/MercadoPago/Core/Lib/Api.php
@@ -109,29 +109,6 @@ public function get_access_token() {
         return $this->access_data['access_token'];
     }
 
-    /**
-     * Get information for specific payment
-     * @param int $id
-     * @return array(json)
-     */
-    public function get_payment($id) {
-        $access_token = $this->get_access_token();
-
-        $uri_prefix = $this->sandbox ? "/sandbox" : "";
-
-        $payment_info = \MercadoPago\Core\Lib\RestClient::get($uri_prefix."/collections/notifications/" . $id . "?access_token=" . $access_token);
-        return $payment_info;
-    }
-
-    /**
-     * @param $id
-     *
-     * @return array
-     */
-    public function get_payment_info($id) {
-        return $this->get_payment($id);
-    }
-
     /**
      * Get information for specific authorized payment
      * @param id
@@ -152,27 +129,7 @@ public function get_authorized_payment($id) {
     public function refund_payment($id) {
         $access_token = $this->get_access_token();
 
-        $refund_status = array(
-            "status" => "refunded"
-        );
-
-        $response = \MercadoPago\Core\Lib\RestClient::put("/collections/" . $id . "?access_token=" . $access_token, $refund_status);
-        return $response;
-    }
-
-    /**
-     * Cancel pending payment
-     * @param int $id
-     * @return array(json)
-     */
-    public function cancel_payment($id) {
-        $access_token = $this->get_access_token();
-
-        $cancel_status = array(
-            "status" => "cancelled"
-        );
-
-        $response = \MercadoPago\Core\Lib\RestClient::put("/collections/" . $id . "?access_token=" . $access_token, $cancel_status);
+        $response = \MercadoPago\Core\Lib\RestClient::post("/v1/payments/$id/refunds?access_token=$access_token", array());
         return $response;
     }
 
@@ -192,27 +149,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) {
-        $access_token = $this->get_access_token();
-
-        $filters["offset"] = $offset;
-        $filters["limit"] = $limit;
-
-        $filters = $this->build_query($filters);
-
-        $uri_prefix = $this->sandbox ? "/sandbox" : "";
-
-        $collection_result = \MercadoPago\Core\Lib\RestClient::get($uri_prefix."/collections/search?" . $filters . "&access_token=" . $access_token);
-        return $collection_result;
-    }
-
     /**
      * Create a checkout preference
      * @param array $preference