  |
17 | 17 | | $address_format = ''; |
| |
18 | 18 | | |
| |
19 | 19 | | if (is_numeric($address)) { |
 |
20 | | - | $Qaddress = $osC_Database->query('select entry_firstname as firstname, entry_lastname as lastname, entry_company as company, entry_street_address as street_address, entry_suburb as suburb, entry_city as city, entry_postcode as postcode, entry_state as state, entry_zone_id as zone_id, entry_country_id as country_id from :table_address_book where address_book_id = :address_book_id'); |
| |
| 20 | + | $Qaddress = $osC_Database->query('select ab.entry_firstname as firstname, ab.entry_lastname as lastname, ab.entry_company as company, ab.entry_street_address as street_address, ab.entry_suburb as suburb, ab.entry_city as city, ab.entry_postcode as postcode, ab.entry_state as state, ab.entry_zone_id as zone_id, ab.entry_country_id as country_id, z.zone_code as zone_code, c.countries_name as country_title from :table_address_book ab left join :table_zones z on (ab.entry_zone_id = z.zone_id), :table_countries c where ab.address_book_id = :address_book_id and ab.entry_country_id = c.countries_id'); |
|
21 | 21 | | $Qaddress->bindTable(':table_address_book', TABLE_ADDRESS_BOOK); |
|
| 22 | + | $Qaddress->bindTable(':table_zones', TABLE_ZONES); |
| |
| 23 | + | $Qaddress->bindTable(':table_countries', TABLE_COUNTRIES); |
|
22 | 24 | | $Qaddress->bindInt(':address_book_id', $address); |
| |
23 | 25 | | $Qaddress->execute(); |
| |
24 | 26 | | |
| |
|
|
 |
… |
|
35 | 37 | | } |
| |
36 | 38 | | |
| |
37 | 39 | | $state = $address['state']; |
|
38 | | - | $state_code = $address['state_code']; |
| |
| 40 | + | $state_code = $address['zone_code']; |
|
39 | 41 | | |
| |
40 | 42 | | if (isset($address['zone_id']) && is_numeric($address['zone_id']) && ($address['zone_id'] > 0)) { |
| |
41 | 43 | | $state = osC_Address::getZoneName($address['zone_id']); |
| |
42 | 44 | | $state_code = osC_Address::getZoneCode($address['zone_id']); |
| |
43 | 45 | | } |
| |
44 | 46 | | |
|
45 | | - | $country = $address['country']; |
| |
| 47 | + | $country = $address['country_title']; |
|
46 | 48 | | |
|
47 | | - | if (isset($address['country_id']) && is_numeric($address['country_id']) && ($address['country_id'] > 0)) { |
| |
| 49 | + | if (empty($country) && isset($address['country_id']) && is_numeric($address['country_id']) && ($address['country_id'] > 0)) { |
|
48 | 50 | | $country = osC_Address::getCountryName($address['country_id']); |
| |
49 | 51 | | } |
| |
50 | 52 | | |