Merge pull request #281 from PluginAndPartners/release/v5.3.1-for-woo…

…commerce Release v5.3.1
mercadopago · Aug 12, 2021 · 5625e62 · 5625e62
2 parents 15ee995 + a24d344
commit 5625e62
Show file tree

Hide file tree

Showing 18 changed files with 40 additions and 25 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,14 +5,17 @@ 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).
 
-## [5.3.0] - 2021-08-10
+## [5.3.1] - 2021-08-12
 
 ### Changed
+- Adjusted notification url, checking if it's a friendly url or not
+
+## [5.3.0] - 2021-08-10
 
+### Changed
 - Credentials order on painel
 
 ### Added
-
 - The seller can change checkout names
 
 ## [5.2.1] - 2021-07-28

diff --git a/changelog.log b/changelog.log
@@ -1,6 +1,10 @@
 CHANGELOG:
 == Changelog ==
-= 5.3.0 (10/08/2021)
+= 5.3.1 (12/08/2021) =
+* Bug fixes
+- Adjusted notification url, checking if it's a friendly url or not
+
+= 5.3.0 (10/08/2021) =
 * Features
 - Credentials order on painel
 - The seller can change checkout names

diff --git a/i18n/languages/woocommerce-mercadopago-es_AR.po b/i18n/languages/woocommerce-mercadopago-es_AR.po
@@ -2,7 +2,7 @@
 # This file is distributed under the same license as the Mercado Pago payments for WooCommerce plugin.
 msgid ""
 msgstr ""
-"Project-Id-Version: Mercado Pago payments for WooCommerce 5.3.0\n"
+"Project-Id-Version: Mercado Pago payments for WooCommerce 5.3.1\n"
 "Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/woocommerce-"
 "mercadopago\n"
 "POT-Creation-Date: \n"

diff --git a/i18n/languages/woocommerce-mercadopago-es_CO.po b/i18n/languages/woocommerce-mercadopago-es_CO.po
@@ -2,7 +2,7 @@
 # This file is distributed under the same license as the Mercado Pago payments for WooCommerce plugin.
 msgid ""
 msgstr ""
-"Project-Id-Version: Mercado Pago payments for WooCommerce 5.3.0\n"
+"Project-Id-Version: Mercado Pago payments for WooCommerce 5.3.1\n"
 "Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/woocommerce-"
 "mercadopago\n"
 "POT-Creation-Date: \n"

diff --git a/i18n/languages/woocommerce-mercadopago-es_ES.po b/i18n/languages/woocommerce-mercadopago-es_ES.po
@@ -2,7 +2,7 @@
 # This file is distributed under the same license as the Mercado Pago payments for WooCommerce plugin.
 msgid ""
 msgstr ""
-"Project-Id-Version: Mercado Pago payments for WooCommerce 5.3.0\n"
+"Project-Id-Version: Mercado Pago payments for WooCommerce 5.3.1\n"
 "Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/woocommerce-"
 "mercadopago\n"
 "POT-Creation-Date: \n"

diff --git a/i18n/languages/woocommerce-mercadopago-es_MX.po b/i18n/languages/woocommerce-mercadopago-es_MX.po
@@ -2,7 +2,7 @@
 # This file is distributed under the same license as the Mercado Pago payments for WooCommerce plugin.
 msgid ""
 msgstr ""
-"Project-Id-Version: Mercado Pago payments for WooCommerce 5.3.0\n"
+"Project-Id-Version: Mercado Pago payments for WooCommerce 5.3.1\n"
 "Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/woocommerce-"
 "mercadopago\n"
 "POT-Creation-Date: \n"

diff --git a/i18n/languages/woocommerce-mercadopago-es_PE.po b/i18n/languages/woocommerce-mercadopago-es_PE.po
@@ -2,7 +2,7 @@
 # This file is distributed under the same license as the Mercado Pago payments for WooCommerce plugin.
 msgid ""
 msgstr ""
-"Project-Id-Version: Mercado Pago payments for WooCommerce 5.3.0\n"
+"Project-Id-Version: Mercado Pago payments for WooCommerce 5.3.1\n"
 "Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/woocommerce-"
 "mercadopago\n"
 "POT-Creation-Date: \n"

diff --git a/i18n/languages/woocommerce-mercadopago-es_UY.po b/i18n/languages/woocommerce-mercadopago-es_UY.po
@@ -2,7 +2,7 @@
 # This file is distributed under the same license as the Mercado Pago payments for WooCommerce plugin.
 msgid ""
 msgstr ""
-"Project-Id-Version: Mercado Pago payments for WooCommerce 5.3.0\n"
+"Project-Id-Version: Mercado Pago payments for WooCommerce 5.3.1\n"
 "Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/woocommerce-"
 "mercadopago\n"
 "POT-Creation-Date: \n"

diff --git a/i18n/languages/woocommerce-mercadopago-es_VE.po b/i18n/languages/woocommerce-mercadopago-es_VE.po
@@ -2,7 +2,7 @@
 # This file is distributed under the same license as the Mercado Pago payments for WooCommerce plugin.
 msgid ""
 msgstr ""
-"Project-Id-Version: Mercado Pago payments for WooCommerce 5.3.0\n"
+"Project-Id-Version: Mercado Pago payments for WooCommerce 5.3.1\n"
 "Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/woocommerce-"
 "mercadopago\n"
 "POT-Creation-Date: \n"

diff --git a/i18n/languages/woocommerce-mercadopago-pt_BR.po b/i18n/languages/woocommerce-mercadopago-pt_BR.po
@@ -2,7 +2,7 @@
 # This file is distributed under the same license as the Mercado Pago payments for WooCommerce plugin.
 msgid ""
 msgstr ""
-"Project-Id-Version: Mercado Pago payments for WooCommerce 5.3.0\n"
+"Project-Id-Version: Mercado Pago payments for WooCommerce 5.3.1\n"
 "Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/woocommerce-"
 "mercadopago\n"
 "POT-Creation-Date: \n"

diff --git a/i18n/languages/woocommerce-mercadopago.pot b/i18n/languages/woocommerce-mercadopago.pot
@@ -1140,7 +1140,7 @@ msgstr ""
 msgid "Shipping service used by the store."
 msgstr ""
 
-#: ../../includes/module/preference/class-wc-woomercadopago-preference-abstract.php:536, ../../includes/module/preference/class-wc-woomercadopago-preference-abstract.php:537
+#: ../../includes/module/preference/class-wc-woomercadopago-preference-abstract.php:540, ../../includes/module/preference/class-wc-woomercadopago-preference-abstract.php:541
 msgid "Discount provided by store"
 msgstr ""
 

diff --git a/includes/module/class-wc-woomercadopago-module.php b/includes/module/class-wc-woomercadopago-module.php
@@ -681,9 +681,9 @@ public static function is_mobile() {
 	 */
 	public static function get_notification_type( $notification_type ) {
 		$types['WC_WooMercadoPago_Basic_Gateway']  = 'ipn';
-		$types['WC_WooMercadoPago_Custom_Gateway'] = 'webhook';
-		$types['WC_WooMercadoPago_Pix_Gateway']    = 'webhook';
-		$types['WC_WooMercadoPago_Ticket_Gateway'] = 'webhook';
+		$types['WC_WooMercadoPago_Custom_Gateway'] = 'webhooks';
+		$types['WC_WooMercadoPago_Pix_Gateway']    = 'webhooks';
+		$types['WC_WooMercadoPago_Ticket_Gateway'] = 'webhooks';
 		return $types[$notification_type];
 	}
 

diff --git a/includes/module/config/class-wc-woomercadopago-constants.php b/includes/module/config/class-wc-woomercadopago-constants.php
@@ -21,7 +21,7 @@ class WC_WooMercadoPago_Constants {
 	const PRODUCT_ID_DESKTOP = 'BT7OF5FEOO6G01NJK3QG';
 	const PRODUCT_ID_MOBILE  = 'BT7OFH09QS3001K5A0H0';
 	const PLATAFORM_ID       = 'bo2hnr2ic4p001kbgpt0';
-	const VERSION            = '5.3.0';
+	const VERSION            = '5.3.1';
 	const MIN_PHP            = 5.6;
 	const API_MP_BASE_URL    = 'https://api.mercadopago.com';
 	const PAYMENT_GATEWAYS   = array(

diff --git a/includes/module/preference/class-wc-woomercadopago-preference-abstract.php b/includes/module/preference/class-wc-woomercadopago-preference-abstract.php
@@ -432,11 +432,15 @@ public function shipments_receiver_address() {
 	/**
 	 * Get notification type
 	 *
-	 * @return mixed
+	 * @param $notification_url
+	 * @param $notification_class
+	 *
+	 * @return string
 	 */
 	public function get_notification_type( $notification_url, $notification_class ) {
-		$type = WC_WooMercadoPago_Module::get_notification_type($notification_class);
-		return $notification_url . '?source_news=' . $type;
+		$type               = WC_WooMercadoPago_Module::get_notification_type($notification_class);
+		$url_join_character = preg_match('#/wc-api/#', $notification_url) ? '?' : '&';
+		return sprintf('%s%ssource_news=%s', $notification_url, $url_join_character, $type);
 	}
 
 	/**

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -9,7 +9,7 @@
     "pot": "node -e 'require(\"./main.js\").generatePotFiles()'",
     "lint": "jshint"
   },
-  "version": "5.3.0",
+  "version": "5.3.1",
   "repository": {
     "type": "git",
     "url": "https://github.com/mercadopago/cart-woocommerce"

diff --git a/readme.txt b/readme.txt
@@ -4,7 +4,7 @@ Tags: ecommerce, mercadopago, woocommerce
 Requires at least: 4.9.10
 Tested up to: 5.8
 Requires PHP: 5.6
-Stable tag: 5.3.0
+Stable tag: 5.3.1
 License: GPLv2 or later
 License URI: https://www.gnu.org/licenses/gpl-2.0.html
 
@@ -129,7 +129,11 @@ Set up both the plugin and the checkouts you want to activate on your payment av
 Check out our <a href="https://www.mercadopago.com.br/developers/pt/plugins_sdks/plugins/official/woo-commerce/">official documentation</a> for more information on the specific fields to configure.
 
 == Changelog ==
-= 5.3.0 (10/08/2021)
+= 5.3.1 (12/08/2021) =
+* Bug fixes
+- Adjusted notification url, checking if it's a friendly url or not
+
+= 5.3.0 (10/08/2021) =
 * Features
 - Credentials order on painel
 - The seller can change checkout names

diff --git a/woocommerce-mercadopago.php b/woocommerce-mercadopago.php
@@ -3,13 +3,13 @@
  * Plugin Name: Mercado Pago payments for WooCommerce
  * Plugin URI: https://github.com/mercadopago/cart-woocommerce
  * Description: Configure the payment options and accept payments with cards, ticket and money of Mercado Pago account.
- * Version: 5.3.0
+ * Version: 5.3.1
  * Author: Mercado Pago
  * Author URI: https://developers.mercadopago.com/
  * Text Domain: woocommerce-mercadopago
  * Domain Path: /i18n/languages/
  * WC requires at least: 3.0.0
- * WC tested up to: 5.5.1
+ * WC tested up to: 5.5.2
  *
  * @package MercadoPago
  */