|
|
@@ -35,6 +35,7 @@ try {
|
|
|
$user->dts_registered = gmdate("Y-m-d H:i:s");
|
|
|
|
|
|
$user_address->postal_code = http::value("postal_code");
|
|
|
+ $user_address->country = http::value("country");
|
|
|
|
|
|
// Referrer
|
|
|
$referrer_id = http::value("r", "int");
|
|
|
@@ -52,13 +53,14 @@ try {
|
|
|
if(empty($user->terms_accepted)) $form_exception->addError("Acceptance of Terms and Conditions is required.");
|
|
|
|
|
|
if(empty($user_address->postal_code)) $form_exception->addError("Postal code is required.");
|
|
|
+ if(empty($user_address->country)) $form_exception->addError("Country is required.");
|
|
|
|
|
|
$email_exists = User::query(["email" => $user->email]);
|
|
|
if($email_exists) $form_exception->addError("Email address is already registered.");
|
|
|
|
|
|
// Geocode the postal code
|
|
|
try {
|
|
|
- $results = Geolocation::geocode($user_address->postal_code);
|
|
|
+ $results = Geolocation::geocode($user_address->postal_code . ", " . $user_address->country);
|
|
|
|
|
|
$result = $results[0];
|
|
|
|
|
|
@@ -75,7 +77,7 @@ try {
|
|
|
$user_address->longitude = $result->geometry->location->lng;
|
|
|
}
|
|
|
catch(Exception $e) {
|
|
|
- $form_exception->addError("Failed to get location from postal code.");
|
|
|
+ $form_exception->addError("Failed to get location from postal code and country.");
|
|
|
}
|
|
|
|
|
|
if($form_exception->hasErrors()) {
|