// Merge -> revision 9221

modules/mondialrelay/classes/MRGetRelayPoint.php

@@ -167,6 +167,41 @@ class MRGetRelayPoint implements IMondialRelayWSMethod
 		return $params;
 	}
 	
+	/*
+	** Get detail information for each relay
+	*/
+	private function _getRelayPointDetails($relayPointList)
+	{
+		$relayPointNumList = array();
+		foreach($relayPointList as $num => $relayPoint)
+			$relayPointNumList[] = $relayPoint['Num'];
+			
+		$MRRelayDetail = new MRRelayDetail(array(
+			'relayPointNumList' => $relayPointNumList,
+			'id_address_delivery' => $this->_id_address_delivery));
+ 		$MRRelayDetail->init();
+ 		$MRRelayDetail->send();
+ 		return $MRRelayDetail->getResult();
+	}
+	
+	/*
+	** Generate a perman link to view relay detail on their website
+	*/
+	private function _addLinkHoursDetail(&$relayPointList)
+	{
+		$relayPointNumList = array();
+		foreach($relayPointList as $num => $relayPoint)
+			$relayPointNumList[] = $relayPoint['Num'];
+		$permaList = MRRelayDetail::getPermaLink($relayPointNumList, $this->_id_address_delivery);
+		foreach($relayPointList as $num => &$relayPoint)
+		{
+			$relayPoint['permaLinkDetail'] = '';
+			if (array_key_exists($relayPoint['Num'], $permaList))
+				$relayPoint['permaLinkDetail'] = $permaList[$relayPoint['Num']];
+		}
+		return $relayPointList;
+	}
+	
 	/*
 	 * Manage the return value of the webservice, handle the errors or build the
 	 * succeed message
@@ -206,6 +241,14 @@ class MRGetRelayPoint implements IMondialRelayWSMethod
  				}
  			if (!count($result))
  				$errors[] = $this->_mondialRelay->l('MondialRelay can\'t find any relay point near your address. Maybe your address isn\'t properly filled ?');
+ 			else
+ 			{
+ 				$this->_addLinkHoursDetail($result);
+ 				
+ 				// Fetch detail info using webservice (not used anymore)
+ 				// $this->_generateLinkHoursDetail($result);
+ 				// $result = (count($relayDetail['success'])) ? $relayDetail['success'] : $result;
+ 			}
 			$success = $result;
 		}
 		$this->_resultList['error'] = $errors;
@@ -251,4 +294,4 @@ class MRGetRelayPoint implements IMondialRelayWSMethod
 	{
 		return $this->_resultList;
 	}
-}
+}