lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Qual: Define constant to know if we must use or not the ziptown table.

Browse Source
This commit is contained in:
Laurent Destailleur 2011-04-10 21:47:24 +00:00
parent e96a6afe67
commit 692d664e26
1 changed files with 58 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
htdocs/core/ajaxziptown.php
View File

@ -33,6 +33,8 @@ if (! defined('NOCSRFCHECK')) define('NOCSRFCHECK','1');
require('../main.inc.php'); require('../main.inc.php');
require_once(DOL_DOCUMENT_ROOT."/core/class/html.formcompany.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/html.formcompany.class.php");
/* /*
* View * View
*/ */
@ -49,7 +51,7 @@ top_httphead();
dol_syslog(join(',',$_GET)); dol_syslog(join(',',$_GET));
// Generation liste des societes // Generation of list of zip-town
if (! empty($_GET['zipcode']) || ! empty($_GET['town'])) if (! empty($_GET['zipcode']) || ! empty($_GET['town']))
{ {
$return_arr = array(); $return_arr = array();
@ -59,6 +61,8 @@ if (! empty($_GET['zipcode']) || ! empty($_GET['town']))
$zipcode = $_GET['zipcode']?$_GET['zipcode']:''; $zipcode = $_GET['zipcode']?$_GET['zipcode']:'';
$town = $_GET['town']?$_GET['town']:''; $town = $_GET['town']?$_GET['town']:'';
if ($conf->global->MAIN_USE_ZIPTOWN_DICTIONNARY) // Use zip-town table
{
$sql = "SELECT z.rowid, z.zip, z.town, z.fk_county"; $sql = "SELECT z.rowid, z.zip, z.town, z.fk_county";
$sql.= ", p.rowid as fk_country, p.code as country_code, p.libelle as country"; $sql.= ", p.rowid as fk_country, p.code as country_code, p.libelle as country";
$sql.= ", d.rowid as fk_county, d.code_departement as county_code , d.nom as county"; $sql.= ", d.rowid as fk_county, d.code_departement as county_code , d.nom as county";
@ -73,16 +77,9 @@ if (! empty($_GET['zipcode']) || ! empty($_GET['town']))
if ($zipcode) " AND z.zip LIKE '" . $db->escape($zipcode) . "%'"; if ($zipcode) " AND z.zip LIKE '" . $db->escape($zipcode) . "%'";
if ($town) " AND z.town LIKE '%" . $db->escape($town) . "%'"; if ($town) " AND z.town LIKE '%" . $db->escape($town) . "%'";
$sql.= " ORDER BY p.rowid, z.zip, z.town"; $sql.= " ORDER BY p.rowid, z.zip, z.town";
$sql.= $db->plimit(50); // Avoid pb with bad criteria
//print $sql; }
$resql=$db->query($sql); else // Use table of third parties
//var_dump($db);
if ($resql)
{
$num = $db->num_rows($resql);
//print 'num='.$num;
if (! $num)
{ {
$sql = "SELECT DISTINCT s.cp as zip, s.ville as town, s.fk_departement as fk_county, s.fk_pays as fk_country"; $sql = "SELECT DISTINCT s.cp as zip, s.ville as town, s.fk_departement as fk_county, s.fk_pays as fk_country";
$sql.= ", p.code as country_code, p.libelle as country"; $sql.= ", p.code as country_code, p.libelle as country";
@ -94,11 +91,11 @@ if (! empty($_GET['zipcode']) || ! empty($_GET['town']))
if ($zipcode) $sql.= " s.cp LIKE '".$db->escape($zipcode)."%'"; if ($zipcode) $sql.= " s.cp LIKE '".$db->escape($zipcode)."%'";
if ($town) $sql.= " s.ville LIKE '%" . $db->escape($town) . "%'"; if ($town) $sql.= " s.ville LIKE '%" . $db->escape($town) . "%'";
$sql.= " ORDER BY s.fk_pays, s.cp, s.ville"; $sql.= " ORDER BY s.fk_pays, s.cp, s.ville";
$sql.= $db->plimit(50); // Avoid pb with bad criteria
//print $sql;
$resql=$db->query($sql);
} }
//print $sql;
$resql=$db->query($sql);
//var_dump($db);
if ($resql) if ($resql)
{ {
while ($row = $db->fetch_array($resql)) while ($row = $db->fetch_array($resql))
@ -130,7 +127,6 @@ if (! empty($_GET['zipcode']) || ! empty($_GET['town']))
array_push($return_arr,$row_array); array_push($return_arr,$row_array);
} }
} }
}
echo json_encode($return_arr); echo json_encode($return_arr);
} }