|
@@ -11,8 +11,9 @@ use Carbon\CarbonImmutable;
|
|
|
* @property int $test_count
|
|
* @property int $test_count
|
|
|
* @property int $min_age
|
|
* @property int $min_age
|
|
|
* @property int $max_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 string $time_of_day
|
|
|
* @property bool $tester_can_claim
|
|
* @property bool $tester_can_claim
|
|
|
* @property int $browse_time
|
|
* @property int $browse_time
|
|
@@ -36,7 +37,7 @@ class Project extends Model {
|
|
|
|
|
|
|
|
protected static $table = "project";
|
|
protected static $table = "project";
|
|
|
protected static $id_field = "id";
|
|
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
|
|
* @var Test[] $tests
|
|
@@ -474,14 +475,12 @@ class Project extends Model {
|
|
|
|
|
|
|
|
$template = $this->getTemplate();
|
|
$template = $this->getTemplate();
|
|
|
|
|
|
|
|
- $default_customer_fee = $this->default_customer_fee;
|
|
|
|
|
$tests = $this->getTests();
|
|
$tests = $this->getTests();
|
|
|
|
|
|
|
|
$items = [];
|
|
$items = [];
|
|
|
|
|
|
|
|
foreach($tests as $test) {
|
|
foreach($tests as $test) {
|
|
|
-
|
|
|
|
|
- $fee = $test->customer_fee ?? $default_customer_fee;
|
|
|
|
|
|
|
+ $fee = $test->getCustomerFee();
|
|
|
|
|
|
|
|
$key = "fee_{$fee}";
|
|
$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";
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
|
|
|
}
|
|
}
|