Procházet zdrojové kódy

Add support for deleting addresses

Alan Lam před 6 roky
rodič
revize
f75185cf08
5 změnil soubory, kde provedl 60 přidání a 13 odebrání
  1. 9 2
      controllers/user.php
  2. 8 0
      engine/user_address.php
  3. 7 0
      public/js/app-user.js
  4. 9 0
      views/footer.php
  5. 27 11
      views/user.php

+ 9 - 2
controllers/user.php

@@ -15,14 +15,21 @@ if($submit) {
 				if($user->activated) throw new Exception("This user has already been activated.");
 				$user->sendActivationEmail();
 				Core::addAlert("success", "Activation email sent.");
-				http::redirect("/account/users/$id");
 				break;
 			case "send_documentation_email":
 				$success = $user->sendDocumentationEmail();
 				Core::addAlert("success", "Documentation email sent.");
-				http::redirect("/account/users/$id");
+				break;
+			case "delete_address":
+				$address_id = http::value("address_id", "int");
+				$address = UserAddress::getByUser($address_id, $user);
+				if(!$address) throw new Exception(__("Address not found."));
+
+				$address->delete();
+				Core::addAlert("success", __("Address deleted successfully."));
 				break;
 		}
+		http::redirect("/account/users/$id");
 	}
 	catch(Exception $e) {
 		Core::addAlert("danger", $e->getMessage());

+ 8 - 0
engine/user_address.php

@@ -29,6 +29,14 @@ class UserAddress extends Model {
 		"0.25", "0.50", "1.00", "1.50", "2.00", "2.50", "3.00", "4.00", "5.00", "7.50", "10.00", "12.50", "15.00", "20.00", "25.00",
 	];
 
+	// Static method
+	public static function getByUser(int $id, User $user) {
+		return UserAddress::queryOne([
+			"id" => $id,
+			"user_id" => $user->id
+		]);
+	}
+
 	// Object methods
 
 	/**

+ 7 - 0
public/js/app-user.js

@@ -41,6 +41,13 @@ $(function() {
 
 	$("#pending-tests").on("change", () => initialiseLocations());
 
+	$("#delete-address-form button[type=submit]").on("click", event => {
+		const confirmed = confirm("Are you sure you want to delete this address?");
+		if(!confirmed) {
+			event.preventDefault();
+		}
+	});
+
 });
 
 function initialiseAddresses() {

+ 9 - 0
views/footer.php

@@ -91,6 +91,15 @@
 		}
 		?>
 
+		<?php
+		if(Core::$user) {
+			// CSRF token
+			?>
+			<input type="hidden" id="csrf-token" value="<?=htmlspecialchars($_SESSION["csrf_token"])?>" />
+			<?php
+		}
+		?>
+
 		<?php
 		$scripts = Core::getScripts();
 		foreach($scripts as $script) {

+ 27 - 11
views/user.php

@@ -160,18 +160,34 @@ const userId = <?=$user->id?>;
 				?>
 				<div class="row">
 					<div class="col-lg-6 mb-4">
-						<div class="list-group">
-						<?php
-						foreach($addresses as $address) {
-							?>
-							<div class="list-group-item">
-								<strong><?=htmlspecialchars($address->name)?></strong><br />
-								<small><?=htmlspecialchars($address->getDisplayAddress())?></small>
+						<form id="delete-address-form" method="post">
+							<input type="hidden" name="submit" value="<?=htmlspecialchars($_SESSION["csrf_token"])?>" />
+							<input type="hidden" name="action" value="delete_address" />
+							<div class="list-group">
+								<?php
+								foreach($addresses as $address) {
+									?>
+									<div class="list-group-item">
+										<div class="row">
+											<div class="col">
+												<strong><?=htmlspecialchars($address->name)?></strong><br />
+												<small><?=htmlspecialchars($address->getDisplayAddress())?></small>
+											</div>
+											<div class="col-auto">
+												<button type="submit" class="btn btn-sm btn-danger" name="address_id" value="<?=$address->id?>">
+													<i class="fa fa-fw fa-trash"></i>
+													<span class="sr-only">
+												<?=htmlspecialchars(__("Delete"))?>
+											</span>
+												</button>
+											</div>
+										</div>
+									</div>
+									<?php
+								}
+								?>
 							</div>
-							<?php
-						}
-						?>
-						</div>
+						</form>
 					</div>
 					<div class="col-lg-6 mb-4">
 						<div id="map" style="height: 248px;" data-maps data-lat="0" data-lng="0" data-zoom="10"></div>