// Merge -> revision 8342

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8344 b9a71923-0436-4b27-9f14-aed3839534dd

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
 	}
 }
 
-?>
+?>

modules/mondialrelay/style.css

@@ -277,11 +277,12 @@ tr.PS_MRSelectedCarrier > td
 
 .PS_MRFloatRelayPointSelected a.PS_MRSelectRelayPointButton 
 {
+	font-size: 10px;
 	float:right;
 	display: block;
 	width: 60px;
 	height: 20px;
-	padding: 6px 20px 0px 25px;
+	padding: 7px 20px 0px 25px;
 	text-decoration: none;
 	margin-top: 8px;
 	color:#333333;
@@ -313,4 +314,15 @@ div.PS_MRGmapStyle
 div#PS_MRPersonalizedFields
 {
 	display:none;
-}
+}
+
+.clearfix:before,
+.clearfix:after 
+{
+	content: ".";
+	display: block;
+	height: 0;
+	overflow: hidden
+}
+.clearfix:after {clear: both}
+.clearfix {zoom: 1}