瀏覽代碼

Add ability to set default retest fee for a project

Alan Lam 2 年之前
父節點
當前提交
0bc84fc6ec

+ 1 - 0
controllers/project_edit.php

@@ -46,6 +46,7 @@ if($submit) {
 		$project->min_age = HTTP::value("min_age", "int");
 		$project->max_age = HTTP::value("max_age", "int");
 		$project->default_customer_fee = HTTP::value("default_customer_fee", "float");
+		$project->default_retest_fee = HTTP::value("default_retest_fee", "float");
 		$project->default_tester_fee = HTTP::value("default_tester_fee", "float");
 		$project->time_of_day = HTTP::value("time_of_day", "trim");
 		$project->tester_can_claim = HTTP::value("tester_can_claim", "trim");

+ 11 - 0
db/migrations/20241031164205_add_default_retest_fee_field_to_project_table.php

@@ -0,0 +1,11 @@
+<?php
+
+use Phinx\Migration\AbstractMigration;
+
+class AddDefaultRetestFeeFieldToProjectTable extends AbstractMigration {
+	public function change() {
+		$this->table("project")
+			->addColumn("default_retest_fee", "decimal", ["null" => true, "precision" => 4, "scale" => 2, "after" => "default_customer_fee"])
+			->update();
+	}
+}

+ 13 - 6
engine/project.php

@@ -11,8 +11,9 @@ use Carbon\CarbonImmutable;
  * @property int $test_count
  * @property int $min_age
  * @property int $max_age
- * @property float $default_customer_fee
- * @property float $default_tester_fee
+ * @property string $default_customer_fee
+ * @property string $default_retest_fee
+ * @property string $default_tester_fee
  * @property string $time_of_day
  * @property bool $tester_can_claim
  * @property int $browse_time
@@ -36,7 +37,7 @@ class Project extends Model {
 
 	protected static $table = "project";
 	protected static $id_field = "id";
-	protected static $fillable_fields = ["customer_id", "template_id", "template_keys", "name", "test_count", "min_age", "max_age", "default_customer_fee", "default_tester_fee", "time_of_day", "tester_can_claim", "browse_time", "play_money", "play_time", "template_overrides_json", "dts_start", "dts_deadline", "dts_created", "dts_updated", "dts_report", "dts_finished", "user_id_finished"];
+	protected static $fillable_fields = ["customer_id", "template_id", "template_keys", "name", "test_count", "min_age", "max_age", "default_customer_fee", "default_retest_fee", "default_tester_fee", "time_of_day", "tester_can_claim", "browse_time", "play_money", "play_time", "template_overrides_json", "dts_start", "dts_deadline", "dts_created", "dts_updated", "dts_report", "dts_finished", "user_id_finished"];
 
 	/**
 	 * @var Test[] $tests
@@ -474,14 +475,12 @@ class Project extends Model {
 
 		$template = $this->getTemplate();
 
-		$default_customer_fee = $this->default_customer_fee;
 		$tests = $this->getTests();
 
 		$items = [];
 
 		foreach($tests as $test) {
-
-			$fee = $test->customer_fee ?? $default_customer_fee;
+			$fee = $test->getCustomerFee();
 
 			$key = "fee_{$fee}";
 
@@ -672,5 +671,13 @@ class Project extends Model {
 
 	}
 
+	public function getDefaultRetestFee(): string {
+		if($this->default_retest_fee) {
+			return $this->default_retest_fee;
+		}
+
+		return $this->default_customer_fee ?? "0.00";
+	}
+
 
 }

+ 20 - 0
engine/test.php

@@ -990,4 +990,24 @@ class Test extends Model {
 		<?php
 	}
 
+	/**
+	 * @return string
+	 * @throws Exception
+	 */
+	public function getCustomerFee(): string {
+		$project = $this->getProject();
+
+		if($this->customer_fee) {
+			$fee = $this->customer_fee;
+		}
+		elseif($this->retest) {
+			$fee = $project->getDefaultRetestFee();
+		}
+		else {
+			$fee = $project->default_customer_fee;
+		}
+
+		return $fee;
+	}
+
 }

+ 15 - 6
public/js/app-test-verify-form.js

@@ -1,21 +1,30 @@
 class TestVerifyForm {
 
 	constructor() {
-
 		this.$invoiceAmountField = $("#invoice-amount");
 
+		this.$newTestIsRetestField = $("#new-test-is-retest");
+		this.$newTestIsRetestField.on("change", event => this.updateInvoiceAmount());
+
 		this.$newTestProjectField = $("#new-test-project-id");
-		this.$newTestProjectField.on("change", event => {
-			const $option = this.$newTestProjectField.find("option:selected");
-			const customerFee = $option.attr("data-customer-fee");
-			this.$invoiceAmountField.val(customerFee);
-		});
+		this.$newTestProjectField.on("change", event => this.updateInvoiceAmount());
 
 		this.$paymentRequiredField = $("#payment-required");
 		this.$paymentRequiredField.on("change", event => {
 			$("#invoice-amount").closest(".row").prop("hidden", !event.currentTarget.checked);
 		});
+	}
+
+	updateInvoiceAmount() {
+		const $option = this.$newTestProjectField.find("option:selected");
+
+		let customerFee = $option.attr("data-customer-fee");
+
+		if(this.$newTestIsRetestField.prop("checked")) {
+			customerFee = $option.attr("data-retest-fee");
+		}
 
+		this.$invoiceAmountField.val(customerFee);
 	}
 
 }

+ 1 - 1
template_processing/age_verification_greene_king/project_account_csv.php

@@ -31,7 +31,7 @@ foreach($tests as $test) {
 	$output[] = $template->name;
 	$output[] = $test->getDateTimeStart()->format("d/m/Y");
 	$output[] = $test->id;
-	$output[] = bcadd($test->customer_fee ?: $project->default_customer_fee, 0, 2);
+	$output[] = $test->getCustomerFee();
 
 	fputcsv($handle, $output);
 }

+ 13 - 2
views/project_form.php

@@ -204,7 +204,18 @@ $output_locations = static function(array $locations, bool $selected) use ($loca
 							<div class="input-group-prepend">
 								<span class="input-group-text">£</span>
 							</div>
-							<input class="form-control" type="number" name="default_customer_fee" min=0" step="0.01" id="default-customer-fee" placeholder="Enter default customer fee" value="<?=htmlspecialchars($project->default_customer_fee)?>" required />
+							<input class="form-control" type="number" name="default_customer_fee" min=0" max="99.99" step="0.01" id="default-customer-fee" placeholder="Enter default customer fee" value="<?=htmlspecialchars($project->default_customer_fee)?>" required />
+						</div>
+					</div>
+				</div>
+				<div class="row mb-1">
+					<label class="col-sm-4 col-form-label" for="default-retest-fee">Default Retest Fee</label>
+					<div class="col-sm">
+						<div class="input-group">
+							<div class="input-group-prepend">
+								<span class="input-group-text">£</span>
+							</div>
+							<input class="form-control" type="number" name="default_retest_fee" min=0" max="99.99" step="0.01" id="default-retest-fee" placeholder="Enter default retest fee" value="<?=htmlspecialchars($project->default_retest_fee)?>" />
 						</div>
 					</div>
 				</div>
@@ -215,7 +226,7 @@ $output_locations = static function(array $locations, bool $selected) use ($loca
 							<div class="input-group-prepend">
 								<span class="input-group-text">£</span>
 							</div>
-							<input class="form-control" type="number" name="default_tester_fee" min=0" step="0.01" id="default-tester-fee" placeholder="Enter default tester fee" value="<?=htmlspecialchars($project->default_tester_fee)?>" required />
+							<input class="form-control" type="number" name="default_tester_fee" min="0" max="99.99" step="0.01" id="default-tester-fee" placeholder="Enter default tester fee" value="<?=htmlspecialchars($project->default_tester_fee)?>" required />
 						</div>
 					</div>
 				</div>

+ 1 - 1
views/test_verify_form.php

@@ -485,7 +485,7 @@ function render_card_list_group($details) {
 											<?php
 											foreach($future_projects as $future_project) {
 												?>
-												<option value="<?=$future_project->id?>" data-customer-fee="<?=$future_project->default_customer_fee?>">
+												<option value="<?=$future_project->id?>" data-customer-fee="<?=$future_project->default_customer_fee?>" data-retest-fee="<?=$future_project->getDefaultRetestFee()?>">
 													<?=htmlspecialchars($future_project->name)?>
 												</option>
 												<?php