Преглед на файлове

Hide payment settings for non-tester users

Alan Lam преди 7 години
родител
ревизия
89f5db3e9e
променени са 2 файла, в които са добавени 63 реда и са изтрити 50 реда
  1. 10 7
      controllers/settings.php
  2. 53 43
      views/settings.php

+ 10 - 7
controllers/settings.php

@@ -34,12 +34,6 @@ if($submit) {
 
 		$user->newsletter_consent = http::value("newsletter_content", "int");
 
-		$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");
-
 		$locales = Core::locales();
 
 		if($password && !User::validatePassword($password)) $form_exception->addError(__("Password must be at least 6 characters in length and contain at least one lowercase, uppercase, number and special character."));
@@ -49,9 +43,18 @@ if($submit) {
 		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->phone)) $form_exception->addError(__("Mobile number is required."));
-		if(!isset(User::PAYMENT_METHODS[$user->preferred_payment_method])) $form_exception->addError(__("Invalid payment method selected."));
 		if(!isset($locales[$user->locale])) $form_exception->addError(__("Invalid language selected."));
 
+		if($user->isTester()) {
+			$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(!isset(User::PAYMENT_METHODS[$user->preferred_payment_method])) $form_exception->addError(__("Invalid payment method selected."));
+		}
+
 		// Activation
 		$deactivate = http::value("deactivate");
 		if($deactivate && $user->level == User::LEVEL_TESTER) {

+ 53 - 43
views/settings.php

@@ -61,7 +61,7 @@ if(is_null($user->locale)) $user->locale = LOCALE;
 					<div class="row mb-1">
 						<label class="col-sm-4 col-form-label"  for="phone"><?=htmlspecialchars(__("Mobile Number"))?></label>
 						<div class="col-sm">
-							<input class="form-control" type="phone" name="phone" id="phone" placeholder="<?=htmlspecialchars(__("Enter mobile number"))?>" value="<?=htmlspecialchars($user->phone)?>" required />
+							<input class="form-control" type="tel" name="phone" id="phone" placeholder="<?=htmlspecialchars(__("Enter mobile number"))?>" value="<?=htmlspecialchars($user->phone)?>" required />
 						</div>
 					</div>
 				</div>
@@ -109,48 +109,58 @@ if(is_null($user->locale)) $user->locale = LOCALE;
 						</div>
 					</div>
 				</div>
-				<div class="card card-body mb-3">
-					<h3><?=htmlspecialchars(__("Payment"))?></h3>
-					<div class="row mb-1">
-						<label class="col-sm-4 col-form-label" for="preferred-payment-method"><?=htmlspecialchars(__("Preferred Payment Method"))?></label>
-						<div class="col-sm">
-							<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
+
+                if($user->isTester()) {
+                    ?>
+                    <div class="card card-body mb-3">
+                        <h3><?=htmlspecialchars(__("Payment"))?></h3>
+                        <div class="row mb-1">
+                            <label class="col-sm-4 col-form-label" for="preferred-payment-method"><?=htmlspecialchars(__("Preferred Payment Method"))?></label>
+                            <div class="col-sm">
+                                <select class="form-control" name="preferred_payment_method" id="preferred-payment-method">
 									<?php
-								}
-								?>
-							</select>
-						</div>
-					</div>
-					<div class="row mb-1">
-						<label class="col-sm-4 col-form-label"  for="bank-name"><?=htmlspecialchars(__("Bank Name"))?></label>
-						<div class="col-sm">
-							<input class="form-control" type="text" name="bank_name" id="bank-name" placeholder="<?=htmlspecialchars(__("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"><?=htmlspecialchars(__("Bank Sort Code"))?></label>
-						<div class="col-sm">
-							<input class="form-control" type="text" name="bank_sort_code" id="bank-sort-code" placeholder="<?=htmlspecialchars(__("Enter bank sort code"))?>" value="<?=htmlspecialchars($user->bank_sort_code)?>" />
-						</div>
-					</div>
-					<div class="row mb-1">
-						<label class="col-sm-4 col-form-label"  for="bank-account-number"><?=htmlspecialchars(__("Bank Account Number"))?></label>
-						<div class="col-sm">
-							<input class="form-control" type="text" name="bank_account_number" id="bank-account-number" placeholder="<?=htmlspecialchars(__("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"><?=htmlspecialchars(__("PayPal Email Address"))?></label>
-						<div class="col-sm">
-							<input class="form-control" type="email" name="paypal_email" id="paypal-email" placeholder="<?=htmlspecialchars(__("Enter PayPal email address"))?>" value="<?=htmlspecialchars($user->paypal_email)?>" />
-						</div>
-					</div>
-				</div>
+									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"><?=htmlspecialchars(__("Bank Name"))?></label>
+                            <div class="col-sm">
+                                <input class="form-control" type="text" name="bank_name" id="bank-name" placeholder="<?=htmlspecialchars(__("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"><?=htmlspecialchars(__("Bank Sort Code"))?></label>
+                            <div class="col-sm">
+                                <input class="form-control" type="text" name="bank_sort_code" id="bank-sort-code" placeholder="<?=htmlspecialchars(__("Enter bank sort code"))?>" value="<?=htmlspecialchars($user->bank_sort_code)?>" />
+                            </div>
+                        </div>
+                        <div class="row mb-1">
+                            <label class="col-sm-4 col-form-label"  for="bank-account-number"><?=htmlspecialchars(__("Bank Account Number"))?></label>
+                            <div class="col-sm">
+                                <input class="form-control" type="text" name="bank_account_number" id="bank-account-number" placeholder="<?=htmlspecialchars(__("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"><?=htmlspecialchars(__("PayPal Email Address"))?></label>
+                            <div class="col-sm">
+                                <input class="form-control" type="email" name="paypal_email" id="paypal-email" placeholder="<?=htmlspecialchars(__("Enter PayPal email address"))?>" value="<?=htmlspecialchars($user->paypal_email)?>" />
+                            </div>
+                        </div>
+                    </div>
+                    <?php
+                }
+
+                ?>
 
 				<div class="row">
 					<div class="col">
@@ -175,4 +185,4 @@ if(is_null($user->locale)) $user->locale = LOCALE;
 			</div>
 		</div>
 	</form>
-</div>
+</div>