|
|
@@ -18,15 +18,15 @@ if($submit) {
|
|
|
$user_address->user_id = Core::$user->id;
|
|
|
$user_address->name = http::value("name", "trim");
|
|
|
$user_address->postal_code = http::value("postal_code", "trim");
|
|
|
+ $user_address->country = http::value("country", "trim");
|
|
|
|
|
|
if(empty($user_address->name)) $form_exception->addError("Name is required.");
|
|
|
- if(empty($user_address->postal_code)) {
|
|
|
- $form_exception->addError("Postal code is required.");
|
|
|
- }
|
|
|
+ if(empty($user_address->postal_code)) $form_exception->addError("Postal code is required.");
|
|
|
+ else if(empty($user_address->country)) $form_exception->addError("Country is required.");
|
|
|
else {
|
|
|
- // Geocode the postal code
|
|
|
+ // Geocode the postal code and country
|
|
|
try {
|
|
|
- $results = Geolocation::geocode($user_address->postal_code);
|
|
|
+ $results = Geolocation::geocode($user_address->postal_code . ", " . $user_address->country);
|
|
|
|
|
|
$result = $results[0];
|
|
|
|
|
|
@@ -36,7 +36,6 @@ if($submit) {
|
|
|
if(in_array("route", $types)) $user_address->address_1 = $component->long_name;
|
|
|
if(in_array("postal_town", $types)) $user_address->city = $component->long_name;
|
|
|
if(in_array("administrative_area_level_1", $types)) $user_address->state = $component->long_name;
|
|
|
- if(in_array("country", $types)) $user_address->country = $component->long_name;
|
|
|
}
|
|
|
|
|
|
$user_address->latitude = $result->geometry->location->lat;
|