From 35a22eee287cbdeebe013e0c0014aa9b3fd34c94 Mon Sep 17 00:00:00 2001
From: Gabriel Matsuoka <gabriel.matsuoka@gmail.com>
Date: Wed, 26 Sep 2018 18:31:53 -0300
Subject: [PATCH] Removed checkout validation when creating back_url

---
 composer.json                                   |  2 +-
 src/MercadoPago/Core/Model/Standard/Payment.php | 14 +++++---------
 src/MercadoPago/Core/composer.json              |  2 +-
 src/MercadoPago/Core/etc/module.xml             |  2 +-
 src/MercadoPago/MercadoEnvios/composer.json     |  2 +-
 src/MercadoPago/MercadoEnvios/etc/module.xml    |  2 +-
 6 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/composer.json b/composer.json
index 413f9ff1..0e79f013 100755
--- a/composer.json
+++ b/composer.json
@@ -8,7 +8,7 @@
     }
   ],
   "type": "magento2-component",
-  "version": "2.2.0",
+  "version": "2.2.1",
   "license": [
     "OSL-3.0",
     "AFL-3.0"
diff --git a/src/MercadoPago/Core/Model/Standard/Payment.php b/src/MercadoPago/Core/Model/Standard/Payment.php
index fd5d2d0b..594cac27 100644
--- a/src/MercadoPago/Core/Model/Standard/Payment.php
+++ b/src/MercadoPago/Core/Model/Standard/Payment.php
@@ -314,15 +314,11 @@ public function makePreference()
 
         $url = $this->_helperData->getSuccessUrl();
         $arr['back_urls']['success'] = $this->_urlBuilder->getUrl($url);
-
-        $typeCheckout = $this->_scopeConfig->getValue('payment/mercadopago_standard/type_checkout', \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
-        if ($typeCheckout == 'redirect') {
-            $arr['back_urls']['pending'] = $this->_urlBuilder->getUrl($url);
-            if (!$this->_scopeConfig->getValue(\MercadoPago\Core\Helper\Data::XML_PATH_USE_SUCCESSPAGE_MP, \Magento\Store\Model\ScopeInterface::SCOPE_STORE)){
-                $arr['back_urls']['failure'] = $this->_urlBuilder->getUrl('checkout/onepage/failure');
-            }else{
-                $arr['back_urls']['failure'] = $this->_urlBuilder->getUrl('mercadopago/standard/failure');
-            }
+        $arr['back_urls']['pending'] = $this->_urlBuilder->getUrl($url);
+        if (!$this->_scopeConfig->getValue(\MercadoPago\Core\Helper\Data::XML_PATH_USE_SUCCESSPAGE_MP, \Magento\Store\Model\ScopeInterface::SCOPE_STORE)){
+            $arr['back_urls']['failure'] = $this->_urlBuilder->getUrl('checkout/onepage/failure');
+        }else{
+            $arr['back_urls']['failure'] = $this->_urlBuilder->getUrl('mercadopago/standard/failure');
         }
 
         $arr['notification_url'] = $this->_urlBuilder->getUrl("mercadopago/notifications/standard");
diff --git a/src/MercadoPago/Core/composer.json b/src/MercadoPago/Core/composer.json
index 5bb81779..25210131 100644
--- a/src/MercadoPago/Core/composer.json
+++ b/src/MercadoPago/Core/composer.json
@@ -2,7 +2,7 @@
     "name": "mercadopago/module-core",
     "description": "Mercado Pago payment method module",
     "type": "magento2-module",
-    "version": "2.2.0",
+    "version": "2.2.1",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/src/MercadoPago/Core/etc/module.xml b/src/MercadoPago/Core/etc/module.xml
index e1a984f1..f0fa5b83 100644
--- a/src/MercadoPago/Core/etc/module.xml
+++ b/src/MercadoPago/Core/etc/module.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="MercadoPago_Core" setup_version="2.2.0">
+    <module name="MercadoPago_Core" setup_version="2.2.1">
         <sequence>
             <module name="Magento_Sales"/>
             <module name="Magento_Payment"/>
diff --git a/src/MercadoPago/MercadoEnvios/composer.json b/src/MercadoPago/MercadoEnvios/composer.json
index 9b6efca6..143ca4ef 100644
--- a/src/MercadoPago/MercadoEnvios/composer.json
+++ b/src/MercadoPago/MercadoEnvios/composer.json
@@ -5,7 +5,7 @@
         "php": "~5.5.0|~5.6.0|~7.0.0"
     },
     "type": "magento2-module",
-    "version": "2.2.0",
+    "version": "2.2.1",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/src/MercadoPago/MercadoEnvios/etc/module.xml b/src/MercadoPago/MercadoEnvios/etc/module.xml
index 4fe40b8d..85086300 100644
--- a/src/MercadoPago/MercadoEnvios/etc/module.xml
+++ b/src/MercadoPago/MercadoEnvios/etc/module.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="MercadoPago_MercadoEnvios" setup_version="2.2.0">
+    <module name="MercadoPago_MercadoEnvios" setup_version="2.2.1">
         <sequence>
             <module name="Magento_Sales"/>
             <module name="Magento_Payment"/>