// Merge -> revision 7906

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7909 b9a71923-0436-4b27-9f14-aed3839534dd
2011-08-05 13:26:44 +00:00
parent e4825ac555
commit 239f92eaf1
55 changed files with 174 additions and 1296 deletions
@@ -188,8 +188,20 @@ class MRGetRelayPoint implements IMondialRelayWSMethod
 			
 			// Clean Content
 			foreach($result as &$relayPoint)
+			{
+				$totalEmptyFields = 0;
 				foreach ($relayPoint as $key => &$value)
+				{
 					$value = trim($value);
+ 					if (empty($value))
+ 						++$totalEmptyFields;
+ 				}
+ 				if ($totalEmptyFields == count($relayPoint))
+ 				{
+ 					$errors[] = $this->_mondialRelay->l('MondialRelay can\'t find any relay point near your address. Maybe your address isn\'t properly filled ?');
+ 					break;
+ 				}
+ 			}
 			$success = $result;
 		}
 		$this->_resultList['error'] = $errors;