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

Removed option to update billable rate without updating time entries

Browse Source
This commit is contained in:
Constantin Graf
2024-07-15 14:01:33 +02:00
committed by Constantin Graf
parent be50397775
commit 1dc35f1f55
14 changed files with 22 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/Http/Controllers/Api/V1/MemberController.php
View File

@@ -71,8 +71,10 @@ class MemberController extends Controller
{
$this->checkPermission($organization, 'members:update', $member);
if ($request->has('billable_rate')) {
if ($request->has('billable_rate') && $member->billable_rate !== $request->getBillableRate()) {
$member->billable_rate = $request->getBillableRate();
$billableRateService->updateTimeEntriesBillableRateForMember($member);
}
if ($request->has('role') && $member->role !== $request->getRole()->value) {
$newRole = $request->getRole();
@@ -95,10 +97,6 @@ class MemberController extends Controller
}
$member->save();
if ($request->getBillableRateUpdateTimeEntries()) {
$billableRateService->updateTimeEntriesBillableRateForMember($member);
}
return new MemberResource($member);
}

3
app/Http/Controllers/Api/V1/OrganizationController.php
View File

@@ -38,10 +38,11 @@ class OrganizationController extends Controller
$this->checkPermission($organization, 'organizations:update');
$organization->name = $request->input('name');
$oldBillableRate = $organization->billable_rate;
$organization->billable_rate = $request->getBillableRate();
$organization->save();
if ($request->getBillableRateUpdateTimeEntries()) {
if ($oldBillableRate !== $request->getBillableRate()) {
$billableRateService->updateTimeEntriesBillableRateForOrganization($organization);
}

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

@@ -117,11 +117,12 @@ class ProjectController extends Controller
if ($request->has('is_archived')) {
$project->archived_at = $request->getIsArchived() ? Carbon::now() : null;
}
$oldBillableRate = $project->billable_rate;
$project->billable_rate = $request->getBillableRate();
$project->client_id = $request->input('client_id');
$project->save();
if ($request->getBillableRateUpdateTimeEntries()) {
if ($oldBillableRate !== $request->getBillableRate()) {
$billableRateService->updateTimeEntriesBillableRateForProject($project);
}

3
app/Http/Controllers/Api/V1/ProjectMemberController.php
View File

@@ -91,10 +91,11 @@ class ProjectMemberController extends Controller
public function update(Organization $organization, ProjectMember $projectMember, ProjectMemberUpdateRequest $request, BillableRateService $billableRateService): JsonResource
{
$this->checkPermission($organization, 'project-members:update', projectMember: $projectMember);
$oldBillableRate = $projectMember->billable_rate;
$projectMember->billable_rate = $request->getBillableRate();
$projectMember->save();
if ($request->getBillableRateUpdateTimeEntries()) {
if ($oldBillableRate !== $request->getBillableRate()) {
$billableRateService->updateTimeEntriesBillableRateForProjectMember($projectMember);
}

1
app/Http/Controllers/Api/V1/TimeEntryController.php
View File

@@ -257,6 +257,7 @@ class TimeEntryController extends Controller
$timeEntry->fill($request->validated());
$timeEntry->description = $request->input('description', $timeEntry->description) ?? '';
$timeEntry->setComputedAttributeValue('billable_rate');
$timeEntry->save();
return new TimeEntryResource($timeEntry);