kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-12 15:35:15 +00:00
Code Issues Projects Releases Wiki Activity

Budget limit now has period.

Browse Source
This commit is contained in:
James Cole
2020-11-20 06:24:08 +01:00
parent 3dbc74b040
commit c659d67172
7 changed files with 193 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/Jobs/CreateAutoBudgetLimits.php
View File

@@ -45,8 +45,7 @@ class CreateAutoBudgetLimits implements ShouldQueue
{
use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
/** @var Carbon The current date */
private $date;
private Carbon $date;
/**
* Create a new job instance.
@@ -60,8 +59,8 @@ class CreateAutoBudgetLimits implements ShouldQueue
if (null !== $date) {
$date->startOfDay();
$this->date = $date;
Log::debug(sprintf('Created new CreateAutoBudgetLimits("%s")', $this->date->format('Y-m-d')));
}
Log::debug(sprintf('Created new CreateAutoBudgetLimits("%s")', $this->date->format('Y-m-d')));
}
/**
@@ -106,6 +105,8 @@ class CreateAutoBudgetLimits implements ShouldQueue
$budgetLimit->start_date = $start;
$budgetLimit->end_date = $end;
$budgetLimit->amount = $amount ?? $autoBudget->amount;
$budgetLimit->period = $autoBudget->period;
$budgetLimit->generated = true;
$budgetLimit->save();
Log::debug(sprintf('Created budget limit #%d.', $budgetLimit->id));
@@ -203,6 +204,7 @@ class CreateAutoBudgetLimits implements ShouldQueue
if (null === $autoBudget->budget) {
Log::info(sprintf('Auto budget #%d is associated with a deleted budget.', $autoBudget->id));
$autoBudget->delete();
return;
}
if (!$this->isMagicDay($autoBudget)) {