mirror of
https://github.com/firefly-iii/firefly-iii.git
synced 2025-12-12 01:42:32 +00:00
This commit is contained in:
@@ -77,7 +77,11 @@ class BudgetLimitHandler
|
|||||||
$end = app('navigation')->endOfPeriod($end, $viewRange);
|
$end = app('navigation')->endOfPeriod($end, $viewRange);
|
||||||
$budget = Budget::find($budgetLimit->budget_id);
|
$budget = Budget::find($budgetLimit->budget_id);
|
||||||
if (null === $budget) {
|
if (null === $budget) {
|
||||||
Log::warning('Budget is null, cannot continue.');
|
Log::warning('Budget is null, probably deleted, find deleted version.');
|
||||||
|
$budget = Budget::withTrashed()->find($budgetLimit->budget_id);
|
||||||
|
}
|
||||||
|
if (null === $budget) {
|
||||||
|
Log::warning('Budget is still null, cannot continue, will delete budget limit.');
|
||||||
$budgetLimit->forceDelete();
|
$budgetLimit->forceDelete();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -176,8 +180,8 @@ class BudgetLimitHandler
|
|||||||
);
|
);
|
||||||
// overlap in days:
|
// overlap in days:
|
||||||
$limitPeriod = Period::make(
|
$limitPeriod = Period::make(
|
||||||
$budgetLimit->start_date,
|
$budgetLimit->start_date,
|
||||||
$budgetLimit->end_date,
|
$budgetLimit->end_date,
|
||||||
precision : Precision::DAY(),
|
precision : Precision::DAY(),
|
||||||
boundaries: Boundaries::EXCLUDE_NONE()
|
boundaries: Boundaries::EXCLUDE_NONE()
|
||||||
);
|
);
|
||||||
@@ -219,8 +223,8 @@ class BudgetLimitHandler
|
|||||||
return '0';
|
return '0';
|
||||||
}
|
}
|
||||||
$limitPeriod = Period::make(
|
$limitPeriod = Period::make(
|
||||||
$budgetLimit->start_date,
|
$budgetLimit->start_date,
|
||||||
$budgetLimit->end_date,
|
$budgetLimit->end_date,
|
||||||
precision : Precision::DAY(),
|
precision : Precision::DAY(),
|
||||||
boundaries: Boundaries::EXCLUDE_NONE()
|
boundaries: Boundaries::EXCLUDE_NONE()
|
||||||
);
|
);
|
||||||
|
|||||||
Reference in New Issue
Block a user