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

fix invoice budget calculation (#3024)

Browse Source
This commit is contained in:
Kevin Papst
2021-12-15 17:56:18 +01:00
committed by GitHub
parent 358959522d
commit 3621b8c27c
7 changed files with 100 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
src/Model/BudgetStatisticModel.php
View File

@@ -80,13 +80,23 @@ class BudgetStatisticModel implements BudgetStatisticModelInterface
public function getDurationBillable(): int
{
if ($this->isMonthlyBudget()) {
if ($this->statistic === null) {
return 0;
}
return $this->statistic->getDurationBillable();
return $this->getDurationBillableRelative();
}
return $this->getDurationBillableTotal();
}
public function getDurationBillableRelative(): int
{
if ($this->statistic === null) {
return 0;
}
return $this->statistic->getDurationBillable();
}
public function getDurationBillableTotal(): int
{
if ($this->statisticTotal === null) {
return 0;
}
@@ -96,7 +106,14 @@ class BudgetStatisticModel implements BudgetStatisticModelInterface
public function getTimeBudgetOpen(): int
{
$value = $this->getTimeBudget() - $this->getTimeBudgetSpent();
$value = $this->getTimeBudget() - $this->getDurationBillable();
return $value > 0 ? $value : 0;
}
public function getTimeBudgetOpenRelative(): int
{
$value = $this->getTimeBudget() - $this->getDurationBillableRelative();
return $value > 0 ? $value : 0;
}
@@ -118,7 +135,14 @@ class BudgetStatisticModel implements BudgetStatisticModelInterface
public function getBudgetOpen(): float
{
$value = $this->getBudget() - $this->getBudgetSpent();
$value = $this->getBudget() - $this->getRateBillable();
return $value > 0 ? $value : 0;
}
public function getBudgetOpenRelative(): float
{
$value = $this->getBudget() - $this->getRateBillableRelative();
return $value > 0 ? $value : 0;
}
@@ -131,13 +155,23 @@ class BudgetStatisticModel implements BudgetStatisticModelInterface
public function getRateBillable(): float
{
if ($this->isMonthlyBudget()) {
if ($this->statistic === null) {
return 0.00;
}
return $this->statistic->getRateBillable();
return $this->getRateBillableRelative();
}
return $this->getRateBillableTotal();
}
public function getRateBillableRelative(): float
{
if ($this->statistic === null) {
return 0.00;
}
return $this->statistic->getRateBillable();
}
public function getRateBillableTotal(): float
{
if ($this->statisticTotal === null) {
return 0.00;
}