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

fix carbon 3 diffIn*

Browse Source
This commit is contained in:
xiaomlove
2025-01-19 23:41:50 +08:00
parent 943e960921
commit 9de6fb42a9
12 changed files with 20 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Repositories/AttendanceRepository.php
View File

@@ -37,7 +37,7 @@ class AttendanceRepository extends BaseRepository
//already attended today, do nothing
$isUpdated = 0;
} else {
$diffDays = $today->diffInDays($added);
$diffDays = $today->diffInDays($added, true);
if ($diffDays == 1) {
//yesterday do it, it's continuous
$continuousDays = $this->getContinuousDays($attendance, Carbon::yesterday());
@@ -292,7 +292,7 @@ class AttendanceRepository extends BaseRepository
}
$date = Carbon::parse($dateStr);
$now = Carbon::now();
if ($date->gte($now) || $now->diffInDays($date) > Attendance::MAX_RETROACTIVE_DAYS) {
if ($date->gte($now) || $now->diffInDays($date, true) > Attendance::MAX_RETROACTIVE_DAYS) {
throw new \LogicException(nexus_trans('attendance.target_date_can_no_be_retroactive', ['date' => $date->format('Y-m-d')]));
}
return NexusDB::transaction(function () use ($user, $attendance, $date) {