jjsm01/kimai2
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

fix billable calculation on timesheet restart (#3225)

Browse Source
This commit is contained in:
Kevin Papst
2022-03-29 23:24:22 +02:00
committed by GitHub
parent 2c2ba2e32c
commit 31743cf962
5 changed files with 204 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/Form/TimesheetEditForm.php
View File

@@ -21,6 +21,7 @@ use App\Form\Type\TimesheetBillableType;
use App\Form\Type\UserType;
use App\Form\Type\YesNoType;
use App\Repository\CustomerRepository;
use App\Timesheet\Calculator\BillableCalculator;
use Symfony\Component\Form\AbstractType;
use Symfony\Component\Form\CallbackTransformer;
use Symfony\Component\Form\FormBuilderInterface;
@@ -279,36 +280,8 @@ class TimesheetEditForm extends AbstractType
return $record;
},
function (Timesheet $record) {
switch ($record->getBillableMode()) {
case Timesheet::BILLABLE_NO:
$record->setBillable(false);
break;
case Timesheet::BILLABLE_YES:
$record->setBillable(true);
break;
case Timesheet::BILLABLE_AUTOMATIC:
$billable = true;
$activity = $record->getActivity();
if ($activity !== null && !$activity->isBillable()) {
$billable = false;
}
$project = $record->getProject();
if ($billable && $project !== null && !$project->isBillable()) {
$billable = false;
}
if ($billable && $project !== null) {
$customer = $project->getCustomer();
if ($customer !== null && !$customer->isBillable()) {
$billable = false;
}
}
$record->setBillable($billable);
break;
}
$billable = new BillableCalculator();
$billable->calculate($record);
return $record;
}