Explorar o código

Add country field to location forms

Alan Lam %!s(int64=8) %!d(string=hai) anos
pai
achega
71a9a85a2c
Modificáronse 3 ficheiros con 11 adicións e 2 borrados
  1. 3 2
      controllers/location_add.php
  2. 2 0
      controllers/location_edit.php
  3. 6 0
      views/location_form.php

+ 3 - 2
controllers/location_add.php

@@ -26,6 +26,7 @@ if($submit) {
 		$location->city = http::value("city", "trim");
 		$location->city = http::value("city", "trim");
 		$location->county = http::value("county", "trim");
 		$location->county = http::value("county", "trim");
 		$location->postal_code = http::value("postal_code", "trim");
 		$location->postal_code = http::value("postal_code", "trim");
+		$location->country = http::value("country", "trim");
 		$location->email = http::value("email", "email");
 		$location->email = http::value("email", "email");
 		$location->phone = http::value("phone", "trim");
 		$location->phone = http::value("phone", "trim");
 		$location->opening_hours = http::value("opening_hours", "trim");
 		$location->opening_hours = http::value("opening_hours", "trim");
@@ -42,17 +43,17 @@ if($submit) {
 		if(empty($location->address_1)) $form_exception->addError("Location line 1 is required.");
 		if(empty($location->address_1)) $form_exception->addError("Location line 1 is required.");
 		if(empty($location->city)) $form_exception->addError("City is required.");
 		if(empty($location->city)) $form_exception->addError("City is required.");
 		if(empty($location->postal_code)) $form_exception->addError("Postal code is required.");
 		if(empty($location->postal_code)) $form_exception->addError("Postal code is required.");
+		if(empty($location->country)) $form_exception->addError("Country is required.");
 
 
 		// Geocode
 		// Geocode
 		try {
 		try {
-			$results = Geolocation::geocode($location->getDisplayAddress(["address_1", "address_2", "city", "postal_code"]));
+			$results = Geolocation::geocode($location->getDisplayAddress(["address_1", "address_2", "city", "postal_code", "country"]));
 
 
 			$result = $results[0];
 			$result = $results[0];
 
 
 			foreach($result->address_components as $component) {
 			foreach($result->address_components as $component) {
 				$types = $component->types;
 				$types = $component->types;
 				if(in_array("administrative_area_level_1", $types)) $location->state = $component->long_name;
 				if(in_array("administrative_area_level_1", $types)) $location->state = $component->long_name;
-				if(in_array("country", $types)) $location->country = $component->long_name;
 			}
 			}
 
 
 			$location->latitude = $result->geometry->location->lat;
 			$location->latitude = $result->geometry->location->lat;

+ 2 - 0
controllers/location_edit.php

@@ -21,6 +21,7 @@ if($submit) {
 		$location->city = http::value("city", "trim");
 		$location->city = http::value("city", "trim");
 		$location->county = http::value("county", "trim");
 		$location->county = http::value("county", "trim");
 		$location->postal_code = http::value("postal_code", "trim");
 		$location->postal_code = http::value("postal_code", "trim");
+		$location->country = http::value("country", "trim");
 		$location->email = http::value("email", "email");
 		$location->email = http::value("email", "email");
 		$location->phone = http::value("phone", "trim");
 		$location->phone = http::value("phone", "trim");
 		$location->opening_hours = http::value("opening_hours", "trim");
 		$location->opening_hours = http::value("opening_hours", "trim");
@@ -42,6 +43,7 @@ if($submit) {
 		if(empty($location->address_1)) $form_exception->addError("Location line 1 is required.");
 		if(empty($location->address_1)) $form_exception->addError("Location line 1 is required.");
 		if(empty($location->city)) $form_exception->addError("City is required.");
 		if(empty($location->city)) $form_exception->addError("City is required.");
 		if(empty($location->postal_code)) $form_exception->addError("Postal code is required.");
 		if(empty($location->postal_code)) $form_exception->addError("Postal code is required.");
+		if(empty($location->country)) $form_exception->addError("Country is required.");
 
 
 		if(empty($location->latitude)) $form_exception->addError("Map location is required.");
 		if(empty($location->latitude)) $form_exception->addError("Map location is required.");
 		else if(empty($location->longitude)) $form_exception->addError("Map location is required.");
 		else if(empty($location->longitude)) $form_exception->addError("Map location is required.");

+ 6 - 0
views/location_form.php

@@ -75,6 +75,12 @@ $tabs = [
 								<input class="form-control" type="text" name="postal_code" id="postal-code" placeholder="Enter postal code" value="<?=htmlspecialchars($location->postal_code)?>" required />
 								<input class="form-control" type="text" name="postal_code" id="postal-code" placeholder="Enter postal code" value="<?=htmlspecialchars($location->postal_code)?>" required />
 							</div>
 							</div>
 						</div>
 						</div>
+						<div class="row mb-1">
+							<label class="col-sm-4 col-form-label" for="country">Country</label>
+							<div class="col-sm">
+								<input class="form-control" type="text" name="country" id="country" placeholder="Enter country" value="<?=htmlspecialchars($location->country)?>" required />
+							</div>
+						</div>
 
 
 						<div class="row mb-1">
 						<div class="row mb-1">
 							<label class="col-sm-4 col-form-label" for="email">Email Address</label>
 							<label class="col-sm-4 col-form-label" for="email">Email Address</label>