adalal/solidtime
1
0
Fork 0
mirror of https://github.com/solidtime-io/solidtime.git synced 2026-08-09 00:32:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix bugs in computed attribute calculation

Browse Source
This commit is contained in:
Constantin Graf
2024-10-15 11:00:14 +02:00
committed by Constantin Graf
parent 69d3ff4f7b
commit 4c27f1a2de
4 changed files with 156 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
app/Http/Controllers/Api/V1/ProjectController.php
View File

@@ -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);
}