Alan Lam 8 лет назад
Родитель
Сommit
e5e098b397
9 измененных файлов с 80 добавлено и 8 удалено
  1. 3 1
      controllers/account.php
  2. 5 0
      controllers/register.php
  3. 11 1
      engine/user.php
  4. 1 0
      initialise.php
  5. 1 0
      package.json
  6. 2 0
      public/js/app.js
  7. 6 0
      public/js/clipboard.min.js
  8. 45 6
      views/account.php
  9. 6 0
      views/user.php

+ 3 - 1
controllers/account.php

@@ -45,8 +45,10 @@ $links["/account/settings"] = "Settings";
 
 asort($links);
 
+$referrals = Core::$user->getReferrals();
+
 View::includeOnce("header", compact("page_title"));
-View::include("account", compact("links", "users_pending_verification", "tests_pending_verification"));
+View::include("account", compact("links", "referrals", "users_pending_verification", "tests_pending_verification"));
 View::includeOnce("footer");
 
 ?>

+ 5 - 0
controllers/register.php

@@ -35,6 +35,11 @@ try {
 
 		$user_address->postal_code = http::value("postal_code");
 
+		// Referrer
+		$referrer_id = http::value("r", "int");
+		$referrer = User::get($referrer_id);
+		if($referrer) $user->referrer_id = $referrer_id;
+
 		if(!Form::checkRecaptcha()) $form_exception->addError("reCAPTCHA check failed.");
 		if(!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.");
 		if(empty($user->email)) $form_exception->addError("Email address is invalid.");

+ 11 - 1
engine/user.php

@@ -4,7 +4,7 @@ class User extends Model {
 
 	protected static $table = "user";
 	protected static $id_field = "id";
-	protected static $fillable_fields = ["email", "old_id", "password", "activated", "level", "score", "title", "first_name", "last_name", "gender", "date_of_birth", "phone", "verify_token", "reset_token", "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 $fillable_fields = ["email", "old_id", "referrer_id", "password", "activated", "level", "score", "title", "first_name", "last_name", "gender", "date_of_birth", "phone", "verify_token", "reset_token", "preferred_payment_method", "bank_name", "bank_sort_code", "bank_account_number", "paypal_email", "dts_registered", "dts_last_seen", "dts_verified", "verifier_id", "verifier_notes"];
 
 	// Constants
 
@@ -217,6 +217,10 @@ class User extends Model {
 		return $this->level >= User::LEVEL_ADMIN;
 	}
 
+	public function getReferrer() {
+		return is_null($this->referrer_id) ? false : User::get($this->referrer_id);
+	}
+
 	public function getDirectory() {
 		$directory = ROOT_DIR . "/files/users/" . $this->id;
 		if(!file_exists($directory)) mkdir($directory, 0777, true);
@@ -373,6 +377,12 @@ class User extends Model {
 		]);
 	}
 
+	public function getReferrals() {
+		return User::query([
+			"referrer_id" => $this->id
+		]);
+	}
+
 	public function getPreferredPaymentMethodText() {
 		return User::PAYMENT_METHODS[$this->preferred_payment_method];
 	}

+ 1 - 0
initialise.php

@@ -65,6 +65,7 @@ if(PHP_SAPI != "cli") {
 Core::addScript("public/js/jquery-3.3.1.min.js");
 Core::addScript("public/js/popper.min.js");
 Core::addScript("public/js/bootstrap.min.js");
+Core::addScript("public/js/clipboard.min.js");
 Core::addScript("public/js/app.js");
 
 ?>

+ 1 - 0
package.json

@@ -10,6 +10,7 @@
   "license": "ISC",
   "dependencies": {
     "bootstrap": "^4.0.0",
+    "clipboard": "^2.0.0",
     "holderjs": "^2.9.4",
     "jquery": "^3.3.1",
     "popper.js": "^1.12.9"

+ 2 - 0
public/js/app.js

@@ -44,6 +44,8 @@ $(function() {
 		specialSpan.attr("class", specialClass);
 	});
 
+    var clipboard = new ClipboardJS(".btn[data-clipboard-target]");
+
 });
 
 var maps = [];

Разница между файлами не показана из-за своего большого размера
+ 6 - 0
public/js/clipboard.min.js


+ 45 - 6
views/account.php

@@ -80,12 +80,51 @@
 
 			<h3>Useful Documents</h3>
 
-			<ul>
-				<li><a href="/files/id_response.pdf">ID Response for Testers</a></li>
-				<li><a href="/files/testing_methodology.pdf">Age Verification Testing Methodology</a></li>
-				<li><a href="/files/machine_categories.pdf">Machine Categories</a></li>
-				<li><a href="/files/testing_procedure.pdf">Testing Procedure</a></li>
-			</ul>
+			<div class="list-group mb-3">
+				<a class="list-group-item list-group-item-action" href="/files/id_response.pdf">
+					<i class="fal fa-fw fa-file-pdf"></i>
+					ID Response for Testers
+				</a>
+				<a class="list-group-item list-group-item-action" href="/files/testing_methodology.pdf">
+					<i class="fal fa-fw fa-file-pdf"></i>
+					Age Verification Testing Methodology
+				</a>
+				<a class="list-group-item list-group-item-action" href="/files/machine_categories.pdf">
+					<i class="fal fa-fw fa-file-pdf"></i>
+					Machine Categories
+				</a>
+				<a class="list-group-item list-group-item-action" href="/files/testing_procedure.pdf">
+					<i class="fal fa-fw fa-file-pdf"></i>
+					Testing Procedure
+				</a>
+			</div>
+
+			<h3>Referrals</h3>
+
+			<div class="list-group mb-3">
+				<div class="list-group-item d-flex justify-content-between">
+					<span>
+						<i class="fal fa-fw fa-users"></i>
+						Users Referred:
+					</span>
+					<span><?=number_format(count($referrals))?></span>
+				</div>
+				<div class="list-group-item d-flex align-items-center justify-content-between">
+					<span>
+						<i class="fal fa-fw fa-external-link"></i>
+						Referral Link:
+					</span>
+					<div class="input-group input-group-sm w-50">
+						<input class="form-control w-auto" type="text" id="referral-link" readonly value="<?=PROTOCOL?>://<?=DOMAIN?>/register?r=<?=Core::$user->id?>" />
+						<div class="input-group-append">
+							<button class="btn btn-secondary" data-clipboard-target="#referral-link" data-toggle="tooltip" title="Copy to clipboard">
+								<i class="fal fa-fw fa-clipboard"></i>
+								<span class="sr-only">Copy to clipboard</span>
+							</button>
+						</div>
+					</div>
+				</div>
+			</div>
 		</div>
 	</div>
 

+ 6 - 0
views/user.php

@@ -1,5 +1,6 @@
 <?php
 $addresses = $user->getAddresses();
+$referrer = $user->getReferrer();
 
 $details = [
 	"ID" => $user->id,
@@ -13,6 +14,11 @@ $details = [
 	"Last Seen" => $user->dts_last_seen,
 ];
 
+if($referrer) {
+	$details["Referrer"] = "<a href=\"/account/users/$referrer->id\">" . htmlspecialchars($referrer->getDisplayName()) . "</a>";
+}
+
+
 $pending_tests = $user->getPendingTests();
 $completed_tests = $user->getCompletedTests();
 

Некоторые файлы не были показаны из-за большого количества измененных файлов