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

Fixes #553

Browse Source
This commit is contained in:
James Cole
2017-02-15 16:20:16 +01:00
parent f0783df123
commit 636b371b86
11 changed files with 1 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/Generator/Report/Audit/MonthReportGenerator.php
View File

@@ -140,7 +140,6 @@ class MonthReportGenerator implements ReportGeneratorInterface
/** @var JournalCollectorInterface $collector */ /** @var JournalCollectorInterface $collector */
$collector = app(JournalCollectorInterface::class); $collector = app(JournalCollectorInterface::class);
$collector->setUser(auth()->user());
$collector->setAccounts(new Collection([$account]))->setRange($this->start, $this->end); $collector->setAccounts(new Collection([$account]))->setRange($this->start, $this->end);
$journals = $collector->getJournals(); $journals = $collector->getJournals();
$journals = $journals->reverse(); $journals = $journals->reverse();

1
app/Generator/Report/Budget/MonthReportGenerator.php
View File

@@ -186,7 +186,6 @@ class MonthReportGenerator extends Support implements ReportGeneratorInterface
/** @var JournalCollectorInterface $collector */ /** @var JournalCollectorInterface $collector */
$collector = app(JournalCollectorInterface::class); $collector = app(JournalCollectorInterface::class);
$collector->setUser(auth()->user());
$collector->setAccounts($this->accounts)->setRange($this->start, $this->end) $collector->setAccounts($this->accounts)->setRange($this->start, $this->end)
->setTypes([TransactionType::WITHDRAWAL]) ->setTypes([TransactionType::WITHDRAWAL])
->setBudgets($this->budgets)->withOpposingAccount()->disableFilter(); ->setBudgets($this->budgets)->withOpposingAccount()->disableFilter();

2
app/Generator/Report/Category/MonthReportGenerator.php
View File

@@ -196,7 +196,6 @@ class MonthReportGenerator extends Support implements ReportGeneratorInterface
/** @var JournalCollectorInterface $collector */ /** @var JournalCollectorInterface $collector */
$collector = app(JournalCollectorInterface::class); $collector = app(JournalCollectorInterface::class);
$collector->setUser(auth()->user());
$collector->setAccounts($this->accounts)->setRange($this->start, $this->end) $collector->setAccounts($this->accounts)->setRange($this->start, $this->end)
->setTypes([TransactionType::WITHDRAWAL, TransactionType::TRANSFER]) ->setTypes([TransactionType::WITHDRAWAL, TransactionType::TRANSFER])
->setCategories($this->categories)->withOpposingAccount()->disableFilter(); ->setCategories($this->categories)->withOpposingAccount()->disableFilter();
@@ -220,7 +219,6 @@ class MonthReportGenerator extends Support implements ReportGeneratorInterface
/** @var JournalCollectorInterface $collector */ /** @var JournalCollectorInterface $collector */
$collector = app(JournalCollectorInterface::class); $collector = app(JournalCollectorInterface::class);
$collector->setUser(auth()->user());
$collector->setAccounts($this->accounts)->setRange($this->start, $this->end) $collector->setAccounts($this->accounts)->setRange($this->start, $this->end)
->setTypes([TransactionType::DEPOSIT, TransactionType::TRANSFER]) ->setTypes([TransactionType::DEPOSIT, TransactionType::TRANSFER])
->setCategories($this->categories)->withOpposingAccount(); ->setCategories($this->categories)->withOpposingAccount();

2
app/Helpers/Chart/MetaPieChart.php
View File

@@ -99,7 +99,6 @@ class MetaPieChart implements MetaPieChartInterface
if ($this->collectOtherObjects && $direction === 'income') { if ($this->collectOtherObjects && $direction === 'income') {
/** @var JournalCollectorInterface $collector */ /** @var JournalCollectorInterface $collector */
$collector = app(JournalCollectorInterface::class); $collector = app(JournalCollectorInterface::class);
$collector->setUser(auth()->user());
$collector->setAccounts($this->accounts)->setRange($this->start, $this->end)->setTypes([TransactionType::DEPOSIT]); $collector->setAccounts($this->accounts)->setRange($this->start, $this->end)->setTypes([TransactionType::DEPOSIT]);
$journals = $collector->getJournals(); $journals = $collector->getJournals();
$sum = strval($journals->sum('transaction_amount')); $sum = strval($journals->sum('transaction_amount'));
@@ -205,7 +204,6 @@ class MetaPieChart implements MetaPieChartInterface
} }
/** @var JournalCollectorInterface $collector */ /** @var JournalCollectorInterface $collector */
$collector = app(JournalCollectorInterface::class); $collector = app(JournalCollectorInterface::class);
$collector->setUser(auth()->user());
$collector->setAccounts($this->accounts); $collector->setAccounts($this->accounts);
$collector->setRange($this->start, $this->end); $collector->setRange($this->start, $this->end);
$collector->setTypes($types); $collector->setTypes($types);

1
app/Helpers/Report/ReportHelper.php
View File

@@ -69,7 +69,6 @@ class ReportHelper implements ReportHelperInterface
$repository = app(BillRepositoryInterface::class); $repository = app(BillRepositoryInterface::class);
$bills = $repository->getBillsForAccounts($accounts); $bills = $repository->getBillsForAccounts($accounts);
$collector = app(JournalCollectorInterface::class); $collector = app(JournalCollectorInterface::class);
$collector->setUser(auth()->user());
$collector->setAccounts($accounts)->setRange($start, $end)->setBills($bills); $collector->setAccounts($accounts)->setRange($start, $end)->setBills($bills);
$journals = $collector->getJournals(); $journals = $collector->getJournals();
$collection = new BillCollection; $collection = new BillCollection;

1
app/Http/Controllers/Chart/BudgetController.php
View File

@@ -417,7 +417,6 @@ class BudgetController extends Controller
// collector // collector
/** @var JournalCollectorInterface $collector */ /** @var JournalCollectorInterface $collector */
$collector = app(JournalCollectorInterface::class); $collector = app(JournalCollectorInterface::class);
$collector->setUser(auth()->user());
$types = [TransactionType::WITHDRAWAL]; $types = [TransactionType::WITHDRAWAL];
$collector->setAllAssetAccounts()->setTypes($types)->setRange($start, $end)->withoutBudget(); $collector->setAllAssetAccounts()->setTypes($types)->setRange($start, $end)->withoutBudget();
$journals = $collector->getJournals(); $journals = $collector->getJournals();

3
app/Http/Controllers/Chart/BudgetReportController.php
View File

@@ -80,7 +80,6 @@ class BudgetReportController extends Controller
$helper = app(MetaPieChartInterface::class); $helper = app(MetaPieChartInterface::class);
$helper->setAccounts($accounts); $helper->setAccounts($accounts);
$helper->setBudgets($budgets); $helper->setBudgets($budgets);
$helper->setUser(auth()->user());
$helper->setStart($start); $helper->setStart($start);
$helper->setEnd($end); $helper->setEnd($end);
$helper->setCollectOtherObjects(intval($others) === 1); $helper->setCollectOtherObjects(intval($others) === 1);
@@ -106,7 +105,6 @@ class BudgetReportController extends Controller
$helper = app(MetaPieChartInterface::class); $helper = app(MetaPieChartInterface::class);
$helper->setAccounts($accounts); $helper->setAccounts($accounts);
$helper->setBudgets($budgets); $helper->setBudgets($budgets);
$helper->setUser(auth()->user());
$helper->setStart($start); $helper->setStart($start);
$helper->setEnd($end); $helper->setEnd($end);
$helper->setCollectOtherObjects(intval($others) === 1); $helper->setCollectOtherObjects(intval($others) === 1);
@@ -240,7 +238,6 @@ class BudgetReportController extends Controller
{ {
/** @var JournalCollectorInterface $collector */ /** @var JournalCollectorInterface $collector */
$collector = app(JournalCollectorInterface::class); $collector = app(JournalCollectorInterface::class);
$collector->setUser(auth()->user());
$collector->setAccounts($accounts)->setRange($start, $end)->setTypes([TransactionType::WITHDRAWAL, TransactionType::TRANSFER]) $collector->setAccounts($accounts)->setRange($start, $end)->setTypes([TransactionType::WITHDRAWAL, TransactionType::TRANSFER])
->setBudgets($budgets)->withOpposingAccount()->disableFilter(); ->setBudgets($budgets)->withOpposingAccount()->disableFilter();
$accountIds = $accounts->pluck('id')->toArray(); $accountIds = $accounts->pluck('id')->toArray();

6
app/Http/Controllers/Chart/CategoryReportController.php
View File

@@ -80,7 +80,6 @@ class CategoryReportController extends Controller
$helper = app(MetaPieChartInterface::class); $helper = app(MetaPieChartInterface::class);
$helper->setAccounts($accounts); $helper->setAccounts($accounts);
$helper->setCategories($categories); $helper->setCategories($categories);
$helper->setUser(auth()->user());
$helper->setStart($start); $helper->setStart($start);
$helper->setEnd($end); $helper->setEnd($end);
$helper->setCollectOtherObjects(intval($others) === 1); $helper->setCollectOtherObjects(intval($others) === 1);
@@ -105,7 +104,6 @@ class CategoryReportController extends Controller
$helper = app(MetaPieChartInterface::class); $helper = app(MetaPieChartInterface::class);
$helper->setAccounts($accounts); $helper->setAccounts($accounts);
$helper->setCategories($categories); $helper->setCategories($categories);
$helper->setUser(auth()->user());
$helper->setStart($start); $helper->setStart($start);
$helper->setEnd($end); $helper->setEnd($end);
$helper->setCollectOtherObjects(intval($others) === 1); $helper->setCollectOtherObjects(intval($others) === 1);
@@ -130,7 +128,6 @@ class CategoryReportController extends Controller
$helper = app(MetaPieChartInterface::class); $helper = app(MetaPieChartInterface::class);
$helper->setAccounts($accounts); $helper->setAccounts($accounts);
$helper->setCategories($categories); $helper->setCategories($categories);
$helper->setUser(auth()->user());
$helper->setStart($start); $helper->setStart($start);
$helper->setEnd($end); $helper->setEnd($end);
$helper->setCollectOtherObjects(intval($others) === 1); $helper->setCollectOtherObjects(intval($others) === 1);
@@ -156,7 +153,6 @@ class CategoryReportController extends Controller
$helper = app(MetaPieChartInterface::class); $helper = app(MetaPieChartInterface::class);
$helper->setAccounts($accounts); $helper->setAccounts($accounts);
$helper->setCategories($categories); $helper->setCategories($categories);
$helper->setUser(auth()->user());
$helper->setStart($start); $helper->setStart($start);
$helper->setEnd($end); $helper->setEnd($end);
$helper->setCollectOtherObjects(intval($others) === 1); $helper->setCollectOtherObjects(intval($others) === 1);
@@ -285,7 +281,6 @@ class CategoryReportController extends Controller
{ {
/** @var JournalCollectorInterface $collector */ /** @var JournalCollectorInterface $collector */
$collector = app(JournalCollectorInterface::class); $collector = app(JournalCollectorInterface::class);
$collector->setUser(auth()->user());
$collector->setAccounts($accounts)->setRange($start, $end)->setTypes([TransactionType::WITHDRAWAL, TransactionType::TRANSFER]) $collector->setAccounts($accounts)->setRange($start, $end)->setTypes([TransactionType::WITHDRAWAL, TransactionType::TRANSFER])
->setCategories($categories)->withOpposingAccount()->disableFilter(); ->setCategories($categories)->withOpposingAccount()->disableFilter();
$accountIds = $accounts->pluck('id')->toArray(); $accountIds = $accounts->pluck('id')->toArray();
@@ -307,7 +302,6 @@ class CategoryReportController extends Controller
{ {
/** @var JournalCollectorInterface $collector */ /** @var JournalCollectorInterface $collector */
$collector = app(JournalCollectorInterface::class); $collector = app(JournalCollectorInterface::class);
$collector->setUser(auth()->user());
$collector->setAccounts($accounts)->setRange($start, $end)->setTypes([TransactionType::DEPOSIT, TransactionType::TRANSFER]) $collector->setAccounts($accounts)->setRange($start, $end)->setTypes([TransactionType::DEPOSIT, TransactionType::TRANSFER])
->setCategories($categories)->withOpposingAccount(); ->setCategories($categories)->withOpposingAccount();
$accountIds = $accounts->pluck('id')->toArray(); $accountIds = $accounts->pluck('id')->toArray();

7
app/Http/Controllers/Popup/ReportController.php
View File

@@ -104,7 +104,6 @@ class ReportController extends Controller
case ($role === BalanceLine::ROLE_DEFAULTROLE && !is_null($budget->id)): case ($role === BalanceLine::ROLE_DEFAULTROLE && !is_null($budget->id)):
/** @var JournalCollectorInterface $collector */ /** @var JournalCollectorInterface $collector */
$collector = app(JournalCollectorInterface::class); $collector = app(JournalCollectorInterface::class);
$collector->setUser(auth()->user());
$collector $collector
->setAccounts(new Collection([$account])) ->setAccounts(new Collection([$account]))
->setRange($attributes['startDate'], $attributes['endDate']) ->setRange($attributes['startDate'], $attributes['endDate'])
@@ -116,7 +115,6 @@ class ReportController extends Controller
$budget->name = strval(trans('firefly.no_budget')); $budget->name = strval(trans('firefly.no_budget'));
/** @var JournalCollectorInterface $collector */ /** @var JournalCollectorInterface $collector */
$collector = app(JournalCollectorInterface::class); $collector = app(JournalCollectorInterface::class);
$collector->setUser(auth()->user());
$collector $collector
->setAccounts(new Collection([$account])) ->setAccounts(new Collection([$account]))
->setTypes($types) ->setTypes($types)
@@ -127,7 +125,6 @@ class ReportController extends Controller
case ($role === BalanceLine::ROLE_DIFFROLE): case ($role === BalanceLine::ROLE_DIFFROLE):
/** @var JournalCollectorInterface $collector */ /** @var JournalCollectorInterface $collector */
$collector = app(JournalCollectorInterface::class); $collector = app(JournalCollectorInterface::class);
$collector->setUser(auth()->user());
$collector $collector
->setAccounts(new Collection([$account])) ->setAccounts(new Collection([$account]))
->setTypes($types) ->setTypes($types)
@@ -173,7 +170,6 @@ class ReportController extends Controller
$budget = $repository->find(intval($attributes['budgetId'])); $budget = $repository->find(intval($attributes['budgetId']));
/** @var JournalCollectorInterface $collector */ /** @var JournalCollectorInterface $collector */
$collector = app(JournalCollectorInterface::class); $collector = app(JournalCollectorInterface::class);
$collector->setUser(auth()->user());
$collector $collector
->setAccounts($attributes['accounts']) ->setAccounts($attributes['accounts'])
@@ -208,7 +204,6 @@ class ReportController extends Controller
$types = [TransactionType::WITHDRAWAL, TransactionType::TRANSFER]; $types = [TransactionType::WITHDRAWAL, TransactionType::TRANSFER];
/** @var JournalCollectorInterface $collector */ /** @var JournalCollectorInterface $collector */
$collector = app(JournalCollectorInterface::class); $collector = app(JournalCollectorInterface::class);
$collector->setUser(auth()->user());
$collector->setAccounts($attributes['accounts'])->setTypes($types) $collector->setAccounts($attributes['accounts'])->setTypes($types)
->setRange($attributes['startDate'], $attributes['endDate']) ->setRange($attributes['startDate'], $attributes['endDate'])
->setCategory($category); ->setCategory($category);
@@ -236,7 +231,6 @@ class ReportController extends Controller
$types = [TransactionType::WITHDRAWAL, TransactionType::TRANSFER]; $types = [TransactionType::WITHDRAWAL, TransactionType::TRANSFER];
/** @var JournalCollectorInterface $collector */ /** @var JournalCollectorInterface $collector */
$collector = app(JournalCollectorInterface::class); $collector = app(JournalCollectorInterface::class);
$collector->setUser(auth()->user());
$collector->setAccounts(new Collection([$account]))->setRange($attributes['startDate'], $attributes['endDate'])->setTypes($types); $collector->setAccounts(new Collection([$account]))->setRange($attributes['startDate'], $attributes['endDate'])->setTypes($types);
$journals = $collector->getJournals(); $journals = $collector->getJournals();
$report = $attributes['accounts']->pluck('id')->toArray(); // accounts used in this report $report = $attributes['accounts']->pluck('id')->toArray(); // accounts used in this report
@@ -273,7 +267,6 @@ class ReportController extends Controller
$types = [TransactionType::DEPOSIT, TransactionType::TRANSFER]; $types = [TransactionType::DEPOSIT, TransactionType::TRANSFER];
/** @var JournalCollectorInterface $collector */ /** @var JournalCollectorInterface $collector */
$collector = app(JournalCollectorInterface::class); $collector = app(JournalCollectorInterface::class);
$collector->setUser(auth()->user());
$collector->setAccounts(new Collection([$account]))->setRange($attributes['startDate'], $attributes['endDate'])->setTypes($types); $collector->setAccounts(new Collection([$account]))->setRange($attributes['startDate'], $attributes['endDate'])->setTypes($types);
$journals = $collector->getJournals(); $journals = $collector->getJournals();
$report = $attributes['accounts']->pluck('id')->toArray(); // accounts used in this report $report = $attributes['accounts']->pluck('id')->toArray(); // accounts used in this report

2
app/Import/Setup/CsvSetup.php
View File

@@ -182,8 +182,6 @@ class CsvSetup implements SetupInterface
{ {
/** @var AccountRepositoryInterface $repository */ /** @var AccountRepositoryInterface $repository */
$repository = app(AccountRepositoryInterface::class); $repository = app(AccountRepositoryInterface::class);
$repository->setUser(auth()->user());
$importId = $data['csv_import_account'] ?? 0; $importId = $data['csv_import_account'] ?? 0;
$account = $repository->find(intval($importId)); $account = $repository->find(intval($importId));

2
app/Jobs/ExecuteRuleGroupOnExistingTransactions.php
View File

@@ -157,7 +157,7 @@ class ExecuteRuleGroupOnExistingTransactions extends Job implements ShouldQueue
{ {
/** @var JournalCollectorInterface $collector */ /** @var JournalCollectorInterface $collector */
$collector = app(JournalCollectorInterface::class); $collector = app(JournalCollectorInterface::class);
$collector->setUser(auth()->user()); $collector->setUser($this->user);
$collector->setAccounts($this->accounts)->setRange($this->startDate, $this->endDate); $collector->setAccounts($this->accounts)->setRange($this->startDate, $this->endDate);
return $collector->getJournals(); return $collector->getJournals();