Luca/thetool
1
0
Fork 0
Code Issues 5 Pull Requests 5 Actions Packages Projects Releases Wiki Activity

Address: changed country to country_id with Country table

Browse Source
This commit is contained in:
Frank Schubert
2024-02-20 20:20:48 +01:00
parent c83fc9bcca
commit 20163e6008
20 changed files with 455 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
application/Address/AddressModel.php
View File

@@ -17,7 +17,7 @@ class AddressModel {
public $street;
public $zip;
public $city;
public $country;
public $country_id;
public $phone;
public $fax;
public $mobile;
@@ -71,7 +71,19 @@ class AddressModel {
$where = self::getSqlFilter($filter);
//mfLoghandler::singleton()->debug($where);
$res = $db->select("Address", "*", "$where ORDER BY company, lastname, firstname, zip, city LIMIT 1");
$sql = "SELECT Address.* FROM Address
LEFT JOIN Addresstype ON (Addresstype.address_id = Address.id)
LEFT JOIN Country ON (Country.id = Address.country_id)
WHERE $where
GROUP BY Address.id
ORDER BY company, lastname, firstname, zip, city, Address.id
LIMIT 1
";
$res = $db->query($sql);
//$res = $db->select("Address", "*", "$where ORDER BY company, lastname, firstname, zip, city LIMIT 1");
if($db->num_rows($res)) {
$data = $db->fetch_object($res);
$item = new Address($data);
@@ -165,6 +177,7 @@ class AddressModel {
SELECT Address.id as address_id
FROM Address
LEFT JOIN Addresstype ON (Addresstype.address_id = Address.id)
LEFT JOIN Country ON (Country.id = Address.country_id)
WHERE $where
GROUP BY Address.id
) as tbl";
@@ -193,6 +206,7 @@ class AddressModel {
ORDER BY Address.id";*/
$sql = "SELECT Address.* FROM Address
LEFT JOIN Addresstype ON (Addresstype.address_id = Address.id)
LEFT JOIN Country ON (Country.id = Address.country_id)
WHERE $where
GROUP BY Address.id
ORDER BY company, lastname, firstname, zip, city, Address.id";
@@ -349,7 +363,7 @@ class AddressModel {
if(array_key_exists("country", $filter)) {
$country = FronkDB::singleton()->escape($filter["country"]);
if($country) {
$where .= " AND country like '%$country%'";
$where .= " AND (Country.name like '%$country%' OR Country.isocode = '$country')";
}
}