mirror of
https://github.com/solidtime-io/solidtime.git
synced 2026-08-10 01:02:15 +01:00
Fix bugs in computed attribute calculation
This commit is contained in:
committed by
Constantin Graf
parent
69d3ff4f7b
commit
4c27f1a2de
@@ -14,6 +14,7 @@ use App\Http\Resources\V1\Project\ProjectResource;
|
||||
use App\Models\Organization;
|
||||
use App\Models\Project;
|
||||
use App\Models\ProjectMember;
|
||||
use App\Models\TimeEntry;
|
||||
use App\Service\BillableRateService;
|
||||
use Illuminate\Auth\Access\AuthorizationException;
|
||||
use Illuminate\Http\JsonResponse;
|
||||
@@ -130,13 +131,23 @@ class ProjectController extends Controller
|
||||
$project->estimated_time = $request->getEstimatedTime();
|
||||
}
|
||||
$oldBillableRate = $project->billable_rate;
|
||||
$clientIdChanged = false;
|
||||
$project->billable_rate = $request->getBillableRate();
|
||||
$project->client_id = $request->input('client_id');
|
||||
if ($project->client_id !== $request->input('client_id')) {
|
||||
$project->client_id = $request->input('client_id');
|
||||
$clientIdChanged = true;
|
||||
}
|
||||
$project->save();
|
||||
|
||||
if ($oldBillableRate !== $request->getBillableRate()) {
|
||||
$billableRateService->updateTimeEntriesBillableRateForProject($project);
|
||||
}
|
||||
if ($clientIdChanged) {
|
||||
TimeEntry::query()
|
||||
->whereBelongsTo($organization, 'organization')
|
||||
->whereBelongsTo($project, 'project')
|
||||
->update(['client_id' => $project->client_id]);
|
||||
}
|
||||
|
||||
return new ProjectResource($project, true);
|
||||
}
|
||||
|
||||
@@ -450,6 +450,10 @@ class TimeEntryController extends Controller
|
||||
$ids = $request->validated('ids');
|
||||
$timeEntries = TimeEntry::query()
|
||||
->whereBelongsTo($organization, 'organization')
|
||||
->with([
|
||||
'project',
|
||||
'task',
|
||||
])
|
||||
->whereIn('id', $ids)
|
||||
->get();
|
||||
|
||||
@@ -473,7 +477,17 @@ class TimeEntryController extends Controller
|
||||
|
||||
}
|
||||
|
||||
$project = $timeEntry->project;
|
||||
$task = $timeEntry->task;
|
||||
|
||||
$timeEntry->delete();
|
||||
|
||||
if ($project !== null) {
|
||||
RecalculateSpentTimeForProject::dispatch($project);
|
||||
}
|
||||
if ($task !== null) {
|
||||
RecalculateSpentTimeForTask::dispatch($task);
|
||||
}
|
||||
$success->push($id);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user