Sfoglia il codice sorgente

Added more fields and payment details to settings page.

Alan Lam 8 anni fa
parent
commit
8b9e588923
3 ha cambiato i file con 73 aggiunte e 6 eliminazioni
  1. 7 0
      controllers/settings.php
  2. 10 1
      engine/user.php
  3. 56 5
      views/settings.php

+ 7 - 0
controllers/settings.php

@@ -29,12 +29,19 @@ if($submit) {
 		$user->date_of_birth = http::value("date_of_birth", "trim");
 		$user->date_of_birth = http::value("date_of_birth", "trim");
 		$user->phone = http::value("phone", "trim");
 		$user->phone = http::value("phone", "trim");
 
 
+		$user->preferred_payment_method = http::value("preferred_payment_method", "int");
+		$user->bank_name = http::value("bank_name", "trim");
+		$user->bank_sort_code = http::value("bank_sort_code", "trim");
+		$user->bank_account_number = http::value("bank_account_number", "trim");
+		$user->paypal_email = http::value("paypal_email", "email");
+
 		if(empty($user->email)) $form_exception->addError("Email address is invalid.");
 		if(empty($user->email)) $form_exception->addError("Email address is invalid.");
 		if(empty($user->title)) $form_exception->addError("Title is required.");
 		if(empty($user->title)) $form_exception->addError("Title is required.");
 		if(empty($user->first_name)) $form_exception->addError("First name is required.");
 		if(empty($user->first_name)) $form_exception->addError("First name is required.");
 		if(empty($user->last_name)) $form_exception->addError("Last name is required.");
 		if(empty($user->last_name)) $form_exception->addError("Last name is required.");
 		if(empty($user->date_of_birth)) $form_exception->addError("Date of birth is required.");
 		if(empty($user->date_of_birth)) $form_exception->addError("Date of birth is required.");
 		if(empty($user->phone)) $form_exception->addError("Mobile number is required.");
 		if(empty($user->phone)) $form_exception->addError("Mobile number is required.");
+		if(!isset(User::PAYMENT_METHODS[$user->preferred_payment_method])) $form_exception->addError("Invalid payment method selected.");
 
 
 		// Activation
 		// Activation
 		$deactivate = http::value("deactivate");
 		$deactivate = http::value("deactivate");

+ 10 - 1
engine/user.php

@@ -4,7 +4,7 @@ class User extends Model {
 
 
 	protected static $table = "user";
 	protected static $table = "user";
 	protected static $id_field = "id";
 	protected static $id_field = "id";
-	protected static $fillable_fields = ["email", "old_id", "password", "level", "score", "title", "first_name", "last_name", "gender", "date_of_birth", "phone", "bank_sort_code", "bank_account_number", "dts_registered", "dts_last_seen", "dts_verified", "verifier_id", "verifier_notes"];
+	protected static $fillable_fields = ["email", "old_id", "password", "level", "score", "title", "first_name", "last_name", "gender", "date_of_birth", "phone", "preferred_payment_method", "bank_name", "bank_sort_code", "bank_account_number", "paypal_email", "dts_registered", "dts_last_seen", "dts_verified", "verifier_id", "verifier_notes"];
 
 
 	protected static $field_map = [
 	protected static $field_map = [
 	];
 	];
@@ -36,6 +36,11 @@ class User extends Model {
 		128 => "Super Admin",
 		128 => "Super Admin",
 	];
 	];
 
 
+	const PAYMENT_METHODS = [
+		1 => "Bank Transfer",
+		2 => "PayPal",
+	];
+
 	// Object methods
 	// Object methods
 	public function canAdmin() {
 	public function canAdmin() {
 		return $this->level >= User::LEVEL_ADMIN;
 		return $this->level >= User::LEVEL_ADMIN;
@@ -180,6 +185,10 @@ class User extends Model {
 		]);
 		]);
 	}
 	}
 
 
+	public function getPreferredPaymentMethodText() {
+		return User::PAYMENT_METHODS[$this->preferred_payment_method];
+	}
+
 }
 }
 
 
 ?>
 ?>

+ 56 - 5
views/settings.php

@@ -4,6 +4,9 @@
 	<form method="post">
 	<form method="post">
 		<div class="row">
 		<div class="row">
 			<div class="col-lg-8 offset-lg-2">
 			<div class="col-lg-8 offset-lg-2">
+
+				<h3>Personal Details</h3>
+
 				<div class="row mb-1">
 				<div class="row mb-1">
 					<label class="col-sm-4 col-form-label" for="title">Title</label>
 					<label class="col-sm-4 col-form-label" for="title">Title</label>
 					<div class="col-sm">
 					<div class="col-sm">
@@ -50,6 +53,15 @@
 						</select>
 						</select>
 					</div>
 					</div>
 				</div>
 				</div>
+				<div class="row mb-1">
+					<label class="col-sm-4 col-form-label"  for="date-of-birth">Date of Birth</label>
+					<div class="col-sm">
+						<input class="form-control" type="date" name="date_of_birth" id="date-of-birth" placeholder="YYYY-MM-DD" value="<?=htmlspecialchars($user->date_of_birth)?>" required />
+					</div>
+				</div>
+
+				<h3 class="mt-3">Contact Details</h3>
+
 				<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>
 					<div class="col-sm">
 					<div class="col-sm">
@@ -59,9 +71,12 @@
 				<div class="row mb-1">
 				<div class="row mb-1">
 					<label class="col-sm-4 col-form-label"  for="phone">Mobile Number</label>
 					<label class="col-sm-4 col-form-label"  for="phone">Mobile Number</label>
 					<div class="col-sm">
 					<div class="col-sm">
-						<input class="form-control" type="phone" name="phone" id="phone" placeholder="Enter mobile number" value="<?=htmlspecialchars($user->phone)?>" />
+						<input class="form-control" type="phone" name="phone" id="phone" placeholder="Enter mobile number" value="<?=htmlspecialchars($user->phone)?>" required />
 					</div>
 					</div>
 				</div>
 				</div>
+
+				<h3 class="mt-3">Security Details</h3>
+
 				<div class="row mb-1">
 				<div class="row mb-1">
 					<label class="col-sm-4 col-form-label"  for="password">Password (if changing)</label>
 					<label class="col-sm-4 col-form-label"  for="password">Password (if changing)</label>
 					<div class="col-sm">
 					<div class="col-sm">
@@ -71,16 +86,52 @@
 				<div class="row mb-1">
 				<div class="row mb-1">
 					<label class="col-sm-4 col-form-label"  for="password-confirm">Confirm Password</label>
 					<label class="col-sm-4 col-form-label"  for="password-confirm">Confirm Password</label>
 					<div class="col-sm">
 					<div class="col-sm">
-						<input class="form-control" type="password" name="password_confirm" id="password-confirm" placeholder="Confirm password" required />
+						<input class="form-control" type="password" name="password_confirm" id="password-confirm" placeholder="Confirm password" />
 					</div>
 					</div>
 				</div>
 				</div>
+
+				<h3 class="mt-3">Payment Details</h3>
 				<div class="row mb-1">
 				<div class="row mb-1">
-					<label class="col-sm-4 col-form-label"  for="date-of-birth">Date of Birth</label>
+					<label class="col-sm-4 col-form-label" for="preferred-payment-method">Preferred Payment Method</label>
 					<div class="col-sm">
 					<div class="col-sm">
-						<input class="form-control" type="date" name="date_of_birth" id="date-of-birth" placeholder="YYYY-MM-DD" value="<?=htmlspecialchars($user->date_of_birth)?>" required />
+						<select class="form-control" name="preferred_payment_method" id="preferred-payment-method">
+							<?php
+							foreach(User::PAYMENT_METHODS as $value => $display) {
+								$selected = ($user->preferred_payment_method == $value) ? "selected" : "";
+								?>
+								<option value="<?=htmlspecialchars($value)?>" <?=$selected?>><?=htmlspecialchars($display)?></option>
+								<?php
+							}
+							?>
+						</select>
+					</div>
+				</div>
+				<div class="row mb-1">
+					<label class="col-sm-4 col-form-label"  for="bank-name">Bank Name</label>
+					<div class="col-sm">
+						<input class="form-control" type="text" name="bank_name" id="bank-name" placeholder="Enter bank name" value="<?=htmlspecialchars($user->bank_name)?>" />
+					</div>
+				</div>
+				<div class="row mb-1">
+					<label class="col-sm-4 col-form-label"  for="bank-sort-code">Bank Sort Code</label>
+					<div class="col-sm">
+						<input class="form-control" type="text" name="bank_sort_code" id="bank-sort-code" placeholder="Enter bank sort code" value="<?=htmlspecialchars($user->bank_sort_code)?>" />
 					</div>
 					</div>
 				</div>
 				</div>
-				<button class="btn btn-primary" type="submit" name="submit" value="<?=$_SESSION["csrf_token"]?>">Save</button>
+				<div class="row mb-1">
+					<label class="col-sm-4 col-form-label"  for="bank-account-number">Bank Account Number</label>
+					<div class="col-sm">
+						<input class="form-control" type="text" name="bank_account_number" id="bank-account-number" placeholder="Enter bank account number" value="<?=htmlspecialchars($user->bank_account_number)?>" />
+					</div>
+				</div>
+				<div class="row mb-1">
+					<label class="col-sm-4 col-form-label" for="paypal-email">PayPal Email Address</label>
+					<div class="col-sm">
+						<input class="form-control" type="email" name="paypal-email" id="paypal-email" placeholder="Enter PayPal email address" value="<?=htmlspecialchars($user->paypal_email)?>" />
+					</div>
+				</div>
+
+				<button class="btn btn-primary mt-3" type="submit" name="submit" value="<?=$_SESSION["csrf_token"]?>">Save</button>
 			</div>
 			</div>
 		</div>
 		</div>
 	</form>
 	</form>