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

Added billable flag to projects

Browse Source
This commit is contained in:
Constantin Graf
2024-06-04 14:35:02 +02:00
committed by Constantin Graf
parent 20f9b344f6
commit 86555664c5
10 changed files with 106 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/Service/Import/Importers/ClockifyProjectsImporter.php
View File

@@ -41,6 +41,7 @@ class ClockifyProjectsImporter extends DefaultImporter
], [
'client_id' => $clientId,
'color' => $this->colorService->getRandomColor(),
'is_billable' => $record['Billability'] === 'Yes',
'billable_rate' => $billableRateKey !== null && $record[$billableRateKey] !== '' ? (int) (((float) $record[$billableRateKey]) * 100) : null,
]);
}

4
app/Service/Import/Importers/DefaultImporter.php
View File

@@ -96,6 +96,10 @@ abstract class DefaultImporter implements ImporterContract
'required',
'max:255',
],
'is_billable' => [
'required',
'boolean',
],
'billable_rate' => [
'nullable',
'integer',

1
app/Service/Import/Importers/TogglDataImporter.php
View File

@@ -121,6 +121,7 @@ class TogglDataImporter extends DefaultImporter
], [
'client_id' => $clientId,
'color' => $project->color,
'is_billable' => $project->rate !== null,
'billable_rate' => $project->rate !== null ? (int) ($project->rate * 100) : null,
], (string) $project->id);