lkddi/nexusphp
1
0
Fork 0
mirror of https://github.com/lkddi/nexusphp.git synced 2026-04-16 05:50:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

add donate until

Browse Source
This commit is contained in:
xiaomlove
2022-04-19 19:18:52 +08:00
parent 7267fb884b
commit 41e3ba55ee
10 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Repositories/ExamRepository.php
View File

@@ -800,10 +800,10 @@ class ExamRepository extends BaseRepository
if (!empty($filters->$filter) && count($filters->$filter) == 1) {
$donateStatus = $filters->$filter[0];
if ($donateStatus == User::DONATE_YES) {
$baseQuery->where("$userTable.donoruntil", ">=", Carbon::now()->toDateTimeString());
$baseQuery->where('donor', 'yes')->where("$userTable.donoruntil", ">=", Carbon::now()->toDateTimeString());
} elseif ($donateStatus == User::DONATE_NO) {
$baseQuery->where(function (Builder $query) use ($userTable) {
$query->whereNull("$userTable.donoruntil")->orWhere("$userTable.donoruntil", '<', Carbon::now()->toDateTimeString());
$query->where('donor', 'no')->orWhereNull("$userTable.donoruntil")->orWhere("$userTable.donoruntil", '<', Carbon::now()->toDateTimeString());
});
} else {
do_log("{$exam->id} filter $filter: $donateStatus invalid.", "error");

2
app/Repositories/TrackerRepository.php
View File

@@ -1013,7 +1013,7 @@ class TrackerRepository extends BaseRepository
if ($user->class >= \App\Models\HitAndRun::MINIMUM_IGNORE_USER_CLASS) {
return;
}
if ($user->donoruntil && $user->donoruntil->gte($now)) {
if ($user->isDonating()) {
return;
}
$hrMode = Setting::get('hr.mode');