diff --git a/app/models/principle.php b/app/models/principle.php index c748bc45..fba9dae7 100755 --- a/app/models/principle.php +++ b/app/models/principle.php @@ -59,14 +59,14 @@ class Principle extends AppModel { function getCityCountryList() { - $principles = $this->find('all', array('recursive'=>1)); - - + //$principles = $this->find('all', array('recursive'=>1)); + $principles = $this->query("select p.name, p.city, c.name FROM principles p JOIN countries c ON p.country_id = c.id ORDER BY p.name ASC"); + print_r($principles); $search = array('{company}','{city}','{country}'); $phrase = "Ex Works Incoterms 2010 ({company}, {city}, {country})"; $list = array(); - + return $list; foreach($principles as $principle) { $replace = array($principle['Principle']['name'], $principle['Principle']['city'], $principle['Country']['name']);