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

Prevent and remove zero values for billable rates

Browse Source
This commit is contained in:
Constantin Graf
2024-06-10 19:19:51 +02:00
committed by Constantin Graf
parent 92dde6a701
commit bd9cede081
20 changed files with 343 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -37,7 +37,7 @@ class OrganizationController extends Controller
$this->checkPermission($organization, 'organizations:update');
$organization->name = $request->input('name');
$organization->billable_rate = $request->input('billable_rate');
$organization->billable_rate = $request->getBillableRate();
$organization->save();
return new OrganizationResource($organization);

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

@@ -86,7 +86,7 @@ class ProjectController extends Controller
$project->name = $request->input('name');
$project->color = $request->input('color');
$project->is_billable = (bool) $request->input('is_billable');
$project->billable_rate = $request->input('billable_rate');
$project->billable_rate = $request->getBillableRate();
$project->client_id = $request->input('client_id');
$project->organization()->associate($organization);
$project->save();
@@ -107,7 +107,7 @@ class ProjectController extends Controller
$project->name = $request->input('name');
$project->color = $request->input('color');
$project->is_billable = (bool) $request->input('is_billable');
$project->billable_rate = $request->input('billable_rate');
$project->billable_rate = $request->getBillableRate();
$project->client_id = $request->input('client_id');
$project->save();

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

@@ -71,7 +71,7 @@ class ProjectMemberController extends Controller
}
$projectMember = new ProjectMember();
$projectMember->billable_rate = $request->input('billable_rate');
$projectMember->billable_rate = $request->getBillableRate();
$projectMember->member()->associate($member);
$projectMember->user()->associate($member->user);
$projectMember->project()->associate($project);
@@ -90,7 +90,7 @@ class ProjectMemberController extends Controller
public function update(Organization $organization, ProjectMember $projectMember, ProjectMemberUpdateRequest $request): JsonResource
{
$this->checkPermission($organization, 'project-members:update', projectMember: $projectMember);
$projectMember->billable_rate = $request->input('billable_rate');
$projectMember->billable_rate = $request->getBillableRate();
$projectMember->save();
return new ProjectMemberResource($projectMember);