diff --git a/application/modules/frontend/controllers/GeographiqueController.php b/application/modules/frontend/controllers/GeographiqueController.php index b58e4f0e..57b42e4a 100644 --- a/application/modules/frontend/controllers/GeographiqueController.php +++ b/application/modules/frontend/controllers/GeographiqueController.php @@ -39,6 +39,10 @@ class GeographiqueController extends Libs_Controller $output = $this->completedReg($request->getParam('q')); } else if($request->getParam('vil')) { $output = $this->completedVil($request->getParam('q')); + }else if($request->getParam('adr_com')) { + $output = $this->completedVil($request->getParam('q')); + }else if($request->getParam('adr_com_ex')) { + $output = $this->completedVil($request->getParam('q')); } echo json_encode($output); diff --git a/application/modules/frontend/models/Objects/Comptage.php b/application/modules/frontend/models/Objects/Comptage.php index 3c8d3098..de155811 100644 --- a/application/modules/frontend/models/Objects/Comptage.php +++ b/application/modules/frontend/models/Objects/Comptage.php @@ -62,7 +62,7 @@ class Object_Comptage extends Libs_Row require_once 'Scores/SessionCiblage.php'; $session = new SessionCiblage(); - if(in_array($key, array('adr_dept', 'adr_com', 'adr_reg'))) + if(in_array($key, array('adr_dept', 'adr_com', 'adr_reg', 'adr_com_ex'))) { $valeurs = explode(',', $valeur); foreach($valeurs as $valeur) @@ -84,6 +84,9 @@ class Object_Comptage extends Libs_Row default: $vil .= trim($valeur).','; break; + case 'adr_com_ex': + $adr_com_ex .= trim($valeur).','; + break; } } if(strlen($dept)>0) { @@ -98,6 +101,10 @@ class Object_Comptage extends Libs_Row $vil = substr($vil, 0, strlen($vil)-1); $session->setCritere('adr_com', $vil); } + if(strlen($adr_com_ex)>0) { + $adr_com_ex = substr($adr_com_ex, 0, strlen($adr_com_ex)-1); + $session->setCritere('adr_com_ex', $adr_com_ex); + } } else $session->setCritere($key, $valeur); diff --git a/application/modules/frontend/views/helpers/Field.php b/application/modules/frontend/views/helpers/Field.php index d723a1e5..01748a85 100644 --- a/application/modules/frontend/views/helpers/Field.php +++ b/application/modules/frontend/views/helpers/Field.php @@ -41,6 +41,7 @@ Class Zend_View_Helper_Field extends Zend_View_Helper_Abstract $label = 'Localisation Régions'; break; case 'vil': + case 'adr_com': $label = 'Localisation Villes'; break; case 'dep': @@ -139,13 +140,13 @@ Class Zend_View_Helper_Field extends Zend_View_Helper_Abstract $session = new SessionCiblage(); $sessionValeur = $session->getCritere($name); - if(is_array($sessionValeur)) - $sessionValeur = implode(',', $sessionValeur); + /*if(is_array($sessionValeur)) + $sessionValeur = implode(',', $sessionValeur);*/ $return = ''; diff --git a/application/modules/frontend/views/scripts/financier/index.phtml b/application/modules/frontend/views/scripts/financier/index.phtml index bf5b8cc5..8fcf4086 100644 --- a/application/modules/frontend/views/scripts/financier/index.phtml +++ b/application/modules/frontend/views/scripts/financier/index.phtml @@ -1,10 +1,26 @@