Index: branches/5.3.x/units/shipping_quote_engines/shipping_quote_collector.php
===================================================================
diff -u -N -r16522 -r16548
--- branches/5.3.x/units/shipping_quote_engines/shipping_quote_collector.php	(.../shipping_quote_collector.php)	(revision 16522)
+++ branches/5.3.x/units/shipping_quote_engines/shipping_quote_collector.php	(.../shipping_quote_collector.php)	(revision 16548)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: shipping_quote_collector.php 16522 2017-01-20 20:28:16Z alex $
+* @version	$Id: shipping_quote_collector.php 16548 2017-07-02 13:58:23Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -19,9 +19,8 @@
 	{
 		/** @var kCountryStatesHelper $cs_helper */
 		$cs_helper = $this->Application->recallObject('CountryStatesHelper');
+		$has_states = $cs_helper->CountryHasStates($params['dest_country']);
 
-		$has_states = $cs_helper->CountryHasStates( $cs_helper->getCountryIso($params['dest_country'], true) );
-
 		if (
 			!$params['dest_city'] || !$params['dest_country'] ||
 			($has_states && !$params['dest_state']) ||
@@ -194,4 +193,4 @@
 
 		return $elem1['TotalCost'] < $elem2['TotalCost'] ? -1 : 1;
 	}
-}
\ No newline at end of file
+}
Index: branches/5.3.x/install/upgrades.sql
===================================================================
diff -u -N -r16506 -r16548
--- branches/5.3.x/install/upgrades.sql	(.../upgrades.sql)	(revision 16506)
+++ branches/5.3.x/install/upgrades.sql	(.../upgrades.sql)	(revision 16548)
@@ -298,13 +298,19 @@
 
 # ===== v 5.2.2-B1 =====
 
+# ===== v 5.2.2-B2 =====
+UPDATE Modules
+SET ClassNamespace = 'InPortal\\Modules\\InCommerce'
+WHERE `Name` = 'In-Commerce';
+
 # ===== v 5.3.0-B1 =====
 ALTER TABLE Affiliates DROP SSN;
 DELETE FROM LanguageLabels WHERE PhraseKey IN ('LA_FLD_SSN', 'LU_COMM_SSNFIELD', 'LU_FLD_SSNFIELD');
 
-UPDATE Modules
-SET ClassNamespace = 'InPortal\\Modules\\InCommerce'
-WHERE `Name` = 'In-Commerce';
+# Backported in http://jira.in-portal.org/browse/INP-1690.
+# UPDATE Modules
+# SET ClassNamespace = 'InPortal\\Modules\\InCommerce'
+# WHERE `Name` = 'In-Commerce';
 
 INSERT INTO SearchConfig VALUES ('Products', 'MetaKeywords', 0, 1, '', 'lc_field_MetaKeywords', 'In-Commerce', 'la_Text_Products', 24, DEFAULT, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 INSERT INTO SearchConfig VALUES ('Products', 'MetaDescription', 0, 1, '', 'lc_field_MetaDescription', 'In-Commerce', 'la_Text_Products', 25, DEFAULT, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
Index: branches/5.3.x/units/helpers/order_helper.php
===================================================================
diff -u -N -r16522 -r16548
--- branches/5.3.x/units/helpers/order_helper.php	(.../order_helper.php)	(revision 16522)
+++ branches/5.3.x/units/helpers/order_helper.php	(.../order_helper.php)	(revision 16548)
@@ -174,14 +174,12 @@
 		 * @param string $number Credit card number.
 		 *
 		 * @return     integer
-		 * @deprecated
+		 * @deprecated 5.2.2-B1
+		 * @see        OrderHelper::getCreditCardType()
 		 */
 		public function getCreditCartType($number)
 		{
-			@trigger_error(
-				'Usage of deprecated method OrderHelper::getCreditCartType. Use OrderHelper::getCreditCardType.',
-				E_USER_DEPRECATED
-			);
+			kUtil::deprecatedMethod(__METHOD__, '5.2.2-B1', 'OrderHelper::getCreditCardType');
 
 			return $this->getCreditCardType($number);
 		}