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

Various code cleanup.

Browse Source
This commit is contained in:
James Cole
2021-04-07 07:53:05 +02:00
parent 49013264d5
commit eddf0c1200
50 changed files with 138 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -29,6 +29,7 @@ use FireflyIII\Factory\BillFactory;
use FireflyIII\Models\Attachment;
use FireflyIII\Models\Bill;
use FireflyIII\Models\Note;
use FireflyIII\Models\Rule;
use FireflyIII\Models\Transaction;
use FireflyIII\Models\TransactionJournal;
use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
@@ -200,7 +201,6 @@ class BillRepository implements BillRepositoryInterface
*/
public function getBills(): Collection
{
/** @var Collection $set */
return $this->user->bills()
->orderBy('order', 'ASC')
->orderBy('active', 'DESC')
@@ -549,6 +549,7 @@ class BillRepository implements BillRepositoryInterface
->where('rule_actions.action_type', 'link_to_bill')
->get(['rules.id', 'rules.title', 'rule_actions.action_value', 'rules.active']);
$array = [];
/** @var Rule $rule */
foreach ($rules as $rule) {
$array[$rule->action_value] = $array[$rule->action_value] ?? [];
$array[$rule->action_value][] = ['id' => $rule->id, 'title' => $rule->title, 'active' => $rule->active];