// Merge -> revision 8342

modules/mondialrelay/classes/MRCreateTickets.php

@@ -275,7 +275,6 @@ class MRCreateTickets implements IMondialRelayWSMethod
 		
 		$this->_fields['list']['Enseigne']['value'] = Configuration::get('MR_ENSEIGNE_WEBSERVICE');
 		$this->_fields['list']['Expe_Langage']['value'] = Configuration::get('MR_LANGUAGE');
-		var_dump(Configuration::get('MR_LANGUAGE'));
 		$this->_fields['list']['Expe_Ad1']['value'] = Configuration::get('PS_MR_SHOP_NAME');
 		$this->_fields['list']['Expe_Ad3']['value'] = Configuration::get('PS_SHOP_ADDR1');
 		// Deleted, cause to many failed for the process

modules/mondialrelay/classes/MRTools.php

@@ -32,10 +32,17 @@ class MRTools
 {
 	static public function replaceAccentedCharacters($string)
 	{
+		if (function_exists('iconv'))
+		{
 		$currentLocale = setlocale(LC_ALL, NULL);
 		setlocale(LC_ALL, 'en_US.UTF8');
 		$cleanedString = iconv('UTF-8','ASCII//TRANSLIT', $string);
 		setLocale(LC_ALL, $currentLocale);
+		}
+		else
+			$cleanedString = strtr($string,
+			'àáâãäçèéêëìíîïñòóôõöùúûüýÿÀÁÂÃÄÇÈÉÊËÌÍÎÏÑÒÓÔÕÖÙÚÛÜÝ',
+			'aaaaaceeeeiiiinooooouuuuyyAAAAACEEEEIIIINOOOOOUUUUY');
 		return $cleanedString;
 	}
 	
@@ -48,8 +55,9 @@ class MRTools
 				FROM `'._DB_PREFIX_.'country`
 				WHERE `id_country` = '.(int)$id_country);
 
+		// Skip the cheking format if doesn't exist
 		if (!$zipcodeFormat)
-			return false;
+			return true;
 
 		$regxMask = str_replace(
 				array('N', 'C', 'L'),
@@ -64,4 +72,4 @@ class MRTools
 	}
 }
 
-?>
+?>