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

Some debug for #916

Browse Source
This commit is contained in:
James Cole
2017-10-08 10:14:26 +02:00
parent 70d5737d83
commit 9a8ddf5c05
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/Helpers/Collector/JournalCollector.php
View File

@@ -314,6 +314,7 @@ class JournalCollector implements JournalCollectorInterface
return $this; return $this;
} }
$this->joinBudgetTables(); $this->joinBudgetTables();
Log::debug('Journal collector will filter for budgets', $budgetIds);
$this->query->where( $this->query->where(
function (EloquentBuilder $q) use ($budgetIds) { function (EloquentBuilder $q) use ($budgetIds) {
@@ -433,8 +434,11 @@ class JournalCollector implements JournalCollectorInterface
public function setRange(Carbon $start, Carbon $end): JournalCollectorInterface public function setRange(Carbon $start, Carbon $end): JournalCollectorInterface
{ {
if ($start <= $end) { if ($start <= $end) {
$this->query->where('transaction_journals.date', '>=', $start->format('Y-m-d')); $startStr = $start->format('Y-m-d');
$this->query->where('transaction_journals.date', '<=', $end->format('Y-m-d')); $endStr = $end->format('Y-m-d');
$this->query->where('transaction_journals.date', '>=', $startStr);
$this->query->where('transaction_journals.date', '<=', $endStr);
Log::debug(sprintf('JournalCollector range is now %s - %s (inclusive)', $startStr, $endStr));
} }
return $this; return $this;