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

Merge pull request #7523 from firefly-iii/fix-7522

Browse Source 
Fix 7522
This commit is contained in:
James Cole
2023-05-19 05:44:33 +02:00
committed by GitHub
parent 56b34aa624 79c2065471
commit 4c78e23a9c
3 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/DebugController.php
View File

@@ -118,7 +118,7 @@ class DebugController extends Controller
public function index(Request $request) public function index(Request $request)
{ {
// basic scope information: // basic scope information:
$now = today(config('app.timezone'))->format('Y-m-d H:i:s e'); $now = now(config('app.timezone'))->format('Y-m-d H:i:s e');
$buildNr = '(unknown)'; $buildNr = '(unknown)';
$buildDate = '(unknown)'; $buildDate = '(unknown)';
$baseBuildNr = '(unknown)'; $baseBuildNr = '(unknown)';

7
app/Jobs/CreateAutoBudgetLimits.php
View File

@@ -111,7 +111,7 @@ class CreateAutoBudgetLimits implements ShouldQueue
if (null === $budgetLimit) { if (null === $budgetLimit) {
Log::debug('No budget limit exists in previous period, so create one.'); Log::debug('No budget limit exists in previous period, so create one.');
// if not, create standard amount and we're done. // if not, create standard amount, and we're done.
$this->createBudgetLimit($autoBudget, $start, $end); $this->createBudgetLimit($autoBudget, $start, $end);
return; return;
} }
@@ -132,10 +132,11 @@ class CreateAutoBudgetLimits implements ShouldQueue
$totalAmount = $autoBudget->amount; $totalAmount = $autoBudget->amount;
Log::debug(sprintf('Total amount available for current budget period is %s', $budgetAvailable)); Log::debug(sprintf('Total amount available for current budget period is %s', $budgetAvailable));
if (-1 !== bccomp($budgetAvailable, $totalAmount)) { if (-1 !== bccomp($budgetAvailable, $totalAmount)) {
Log::info(sprintf('There is no overspending, no need to adjust. Budget limit amount will be %s.', $totalAmount)); Log::info(sprintf('There is no overspending, no need to adjust. Budget limit amount will be %s.', $budgetAvailable));
// create budget limit: // create budget limit:
$this->createBudgetLimit($autoBudget, $start, $end, $totalAmount); $this->createBudgetLimit($autoBudget, $start, $end, $budgetAvailable);
} }
if (1 !== bccomp($budgetAvailable, $totalAmount) && 1 === bccomp($budgetAvailable, '0')) { if (1 !== bccomp($budgetAvailable, $totalAmount) && 1 === bccomp($budgetAvailable, '0')) {
Log::info(sprintf('There was overspending, so the new amount will be %s.', $budgetAvailable)); Log::info(sprintf('There was overspending, so the new amount will be %s.', $budgetAvailable));

11
app/Support/Navigation.php
View File

@@ -65,6 +65,14 @@ class Navigation
'yearly' => 'addYears', 'yearly' => 'addYears',
'1Y' => 'addYears', '1Y' => 'addYears',
'custom' => 'addMonths', // custom? just add one month. 'custom' => 'addMonths', // custom? just add one month.
// last X periods? Jump the relevant month / quarter / year
'last7' => 'addDays',
'last30' => 'addMonths',
'last90' => 'addMonths',
'last365' => 'addYears',
'MTD' => 'addMonths',
'QTD' => 'addMonths',
'YTD' => 'addYears',
]; ];
$modifierMap = [ $modifierMap = [
'quarter' => 3, 'quarter' => 3,
@@ -72,6 +80,9 @@ class Navigation
'quarterly' => 3, 'quarterly' => 3,
'6M' => 6, '6M' => 6,
'half-year' => 6, 'half-year' => 6,
'last7' => 7,
'last90' => 3,
'QTD' => 3,
]; ];
if (!array_key_exists($repeatFreq, $functionMap)) { if (!array_key_exists($repeatFreq, $functionMap)) {