kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-11-16 22:58:09 +00:00
Code Issues Projects Releases Wiki Activity

Fix #2456

Browse Source
This commit is contained in:
James Cole
2019-08-21 18:01:57 +02:00
parent c7931f2b72
commit 24a2238134
3 changed files with 727 additions and 714 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/Repositories/Bill/BillRepository.php
View File

@@ -415,10 +415,10 @@ class BillRepository implements BillRepositoryInterface
{
return $bill->transactionJournals()
->before($end)->after($start)->get(
[
'transaction_journals.id', 'transaction_journals.date',
'transaction_journals.transaction_group_id',
]
[
'transaction_journals.id', 'transaction_journals.date',
'transaction_journals.transaction_group_id',
]
);
}
@@ -544,14 +544,14 @@ class BillRepository implements BillRepositoryInterface
/**
* Link a set of journals to a bill.
*
* @param Bill $bill
* @param Bill $bill
* @param array $transactions
*/
public function linkCollectionToBill(Bill $bill, array $transactions): void
{
/** @var Transaction $transaction */
foreach ($transactions as $transaction) {
$journal = $transaction->transactionJournal;
$journal = $bill->user->transactionJournals()->find((int)$transaction['transaction_journal_id']);
$journal->bill_id = $bill->id;
$journal->save();
Log::debug(sprintf('Linked journal #%d to bill #%d', $journal->id, $bill->id));