Fix: auto fill zip and town with jquery

This commit is contained in:
Regis Houssin 2010-10-12 19:15:08 +00:00
parent 895fd7b6dd
commit 42fdbaa856
3 changed files with 12 additions and 16 deletions

View File

@ -612,7 +612,7 @@ class FormCompany
*/ */
function select_zipcode($selected='',$field1='zipcode',$field2='town',$field3='fk_pays') function select_zipcode($selected='',$field1='zipcode',$field2='town',$field3='fk_pays')
{ {
print ajax_autocompleter_ziptown($selected='',$field1,$field2,$field3,DOL_URL_ROOT.'/societe/ajaxziptown.php')."\n"; print ajax_autocompleter_ziptown($field1,$field2,$field3,DOL_URL_ROOT.'/societe/ajaxziptown.php')."\n";
print '<input id="'.$field1.'" type="text" name="'.$field1.'" size="6" value="'.$selected.'">'."\n"; print '<input id="'.$field1.'" type="text" name="'.$field1.'" size="6" value="'.$selected.'">'."\n";
} }
@ -621,7 +621,7 @@ class FormCompany
*/ */
function select_town($selected='',$field1='town',$field2='zipcode',$field3='fk_pays') function select_town($selected='',$field1='town',$field2='zipcode',$field3='fk_pays')
{ {
print ajax_autocompleter_ziptown($selected='',$field1,$field2,$field3,DOL_URL_ROOT.'/societe/ajaxziptown.php')."\n"; print ajax_autocompleter_ziptown($field1,$field2,$field3,DOL_URL_ROOT.'/societe/ajaxziptown.php')."\n";
print '<input id="'.$field1.'" type="text" name="'.$field1.'" value="'.$selected.'">'."\n"; print '<input id="'.$field1.'" type="text" name="'.$field1.'" value="'.$selected.'">'."\n";
} }

View File

@ -134,20 +134,12 @@ function ajax_autocompleter($selected='',$htmlname,$url,$option='')
* \param url chemin du fichier de reponse : /chemin/fichier.php * \param url chemin du fichier de reponse : /chemin/fichier.php
* \return string script complet * \return string script complet
*/ */
function ajax_autocompleter_ziptown($selected='',$field1,$field2,$field3,$url,$option='') function ajax_autocompleter_ziptown($field1,$field2,$field3,$url,$option='')
{ {
$script=''; $script='';
$script.= '<script type="text/javascript">'; $script.= '<script type="text/javascript">';
$script.= 'jQuery(document).ready(function() { $script.= 'jQuery(document).ready(function() {
jQuery("input#'.$field1.'").blur(function() {
//console.log(this.value.length);
if (this.value.length == 0)
{
jQuery("input#'.$field1.'").val("");
jQuery("input#'.$field2.'").val("");
}
});
jQuery("input#'.$field1.'").autocomplete({ jQuery("input#'.$field1.'").autocomplete({
source: function( request, response ) { source: function( request, response ) {
jQuery.get("'.$url.($option?'?'.$option:'').'", { '.$field1.': request.term }, function(data){ jQuery.get("'.$url.($option?'?'.$option:'').'", { '.$field1.': request.term }, function(data){

View File

@ -1183,10 +1183,14 @@ else
print '</textarea></td></tr>'; print '</textarea></td></tr>';
// Zip / Town // Zip / Town
print '<tr><td>'.$langs->trans('Zip').'</td><td><input size="6" type="text" name="cp" value="'.$soc->cp.'">'; print '<tr><td>'.$langs->trans('Zip').'</td><td>';
if ($conf->use_javascript_ajax && $conf->global->MAIN_AUTOFILL_TOWNFROMZIP) print ' <input class="button" type="button" name="searchpostalcode" value="'.$langs->trans('FillTownFromZip').'" onclick="autofilltownfromzip_PopupPostalCode(\''.DOL_URL_ROOT.'\',cp.value,ville,pays_id,departement_id)">'; $formcompany->select_zipcode($soc->cp,'zipcode','town','selectpays_id');
print '</td>'; //print '<input size="6" type="text" name="cp" value="'.$soc->cp.'">';
print '<td>'.$langs->trans('Town').'</td><td><input type="text" name="ville" value="'.$soc->ville.'"></td></tr>'; //if ($conf->use_javascript_ajax && $conf->global->MAIN_AUTOFILL_TOWNFROMZIP) print ' <input class="button" type="button" name="searchpostalcode" value="'.$langs->trans('FillTownFromZip').'" onclick="autofilltownfromzip_PopupPostalCode(\''.DOL_URL_ROOT.'\',cp.value,ville,pays_id,departement_id)">';
print '</td><td>'.$langs->trans('Town').'</td><td>';
$formcompany->select_zipcode($soc->ville,'town','zipcode','selectpays_id');
//print '<input type="text" name="ville" value="'.$soc->ville.'">';
print '</td></tr>';
// Country // Country
print '<tr><td>'.$langs->trans('Country').'</td><td colspan="3">'; print '<tr><td>'.$langs->trans('Country').'</td><td colspan="3">';