Просмотр исходного кода

Add country field to address forms

Alan Lam 8 лет назад
Родитель
Сommit
3058bd779b

+ 5 - 6
controllers/address_add.php

@@ -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;

+ 2 - 0
controllers/address_edit.php

@@ -18,6 +18,7 @@ if($submit) {
 		$user_address->city = http::value("city", "trim");
 		$user_address->county = http::value("county", "trim");
 		$user_address->postal_code = http::value("postal_code", "trim");
+		$user_address->country = http::value("country", "trim");
 		$user_address->max_radius_miles = http::value("max_radius_miles", "float");
 
 		$user_address->latitude = http::value("latitude", "float");
@@ -27,6 +28,7 @@ if($submit) {
 		if(empty($user_address->address_1)) $form_exception->addError("Address line 1 is required.");
 		if(empty($user_address->city)) $form_exception->addError("City 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.");
 		if(empty($user_address->max_radius_miles)) $form_exception->addError("Max distance is required.");
 		if(!in_array($user_address->max_radius_miles, UserAddress::RADIUSES)) $form_exception->addError("Max distance is invalid.");
 

+ 4 - 0
views/address_add_form.php

@@ -11,6 +11,10 @@
 			<label for="postal-code">Postal Code</label>
 			<input class="form-control" type="text" name="postal_code" id="postal-code" placeholder="Enter postal code" value="<?=htmlspecialchars($user_address->postal_code)?>" required />
 		</div>
+		<div class="form-group">
+			<label  for="country">Country</label>
+			<input class="form-control" type="text" name="country" id="country" placeholder="Enter country" value="<?=htmlspecialchars($user_address->country)?>" required />
+		</div>
 		<button class="btn btn-primary" type="submit" name="submit" value="<?=$_SESSION["csrf_token"]?>">Add</button>
 	</form>
 </div>

+ 4 - 0
views/address_edit_form.php

@@ -29,6 +29,10 @@
 					<label for="postal-code">Postal Code</label>
 					<input class="form-control" type="text" name="postal_code" id="postal-code" placeholder="Enter postal code" value="<?=htmlspecialchars($user_address->postal_code)?>" required />
 				</div>
+				<div class="form-group">
+					<label  for="country">Country</label>
+					<input class="form-control" type="text" name="country" id="country" placeholder="Enter country" value="<?=htmlspecialchars($user_address->country)?>" required />
+				</div>
 			</div>
 			<div class="col-lg">
 				<label>Map</label>