Firefly III: a personal finances manager
PHP accountingbudgetbudgetingbudgetscash-flowcashflowcredit-carddockerexpensesfinancefinancesfinanciallinuxmoneypaycheckpersonal-financephpphp7
Catch null
James Cole7f5a1bda8d8f
diff --git a/app/Support/JsonApi/Enrichments/PiggyBankEnrichment.php b/app/Support/JsonApi/Enrichments/PiggyBankEnrichment.phpindex 3cb22c5885..8df413ce5c 100644--- a/app/Support/JsonApi/Enrichments/PiggyBankEnrichment.php+++ b/app/Support/JsonApi/Enrichments/PiggyBankEnrichment.php@@ -82,7 +82,7 @@ class PiggyBankEnrichment implements EnrichmentInterface$this->ids[] = $id;$this->currencyIds[$id] = (int)$piggy->transaction_currency_id;}- $this->ids = array_unique($this->ids);+ $this->ids = array_unique($this->ids);// collect currencies.$currencies = TransactionCurrency::whereIn('id', $this->currencyIds)->get();@@ -91,10 +91,10 @@ class PiggyBankEnrichment implements EnrichmentInterface}// collect accounts- $set = DB::table('account_piggy_bank')->whereIn('piggy_bank_id', $this->ids)->get(['piggy_bank_id', 'account_id', 'current_amount', 'native_current_amount']);+ $set = DB::table('account_piggy_bank')->whereIn('piggy_bank_id', $this->ids)->get(['piggy_bank_id', 'account_id', 'current_amount', 'native_current_amount']);foreach ($set as $item) {- $id = (int)$item->piggy_bank_id;- $accountId = (int)$item->account_id;+ $id = (int)$item->piggy_bank_id;+ $accountId = (int)$item->account_id;$this->amounts[$id] ??= [];if (!array_key_exists($id, $this->accountIds)) {$this->accountIds[$id] = (int)$item->account_id;@@ -105,17 +105,19 @@ class PiggyBankEnrichment implements EnrichmentInterface'pc_current_amount' => '0',];}- $this->amounts[$id][$accountId]['current_amount'] = bcadd($this->amounts[$id][$accountId]['current_amount'], $item->current_amount);- $this->amounts[$id][$accountId]['pc_current_amount'] = bcadd($this->amounts[$id][$accountId]['pc_current_amount'], $item->native_current_amount);+ $this->amounts[$id][$accountId]['current_amount'] = bcadd($this->amounts[$id][$accountId]['current_amount'], $item->current_amount);+ if (null !== $this->amounts[$id][$accountId]['pc_current_amount']) {+ $this->amounts[$id][$accountId]['pc_current_amount'] = bcadd($this->amounts[$id][$accountId]['pc_current_amount'], $item->native_current_amount);+ }}// get account currency preference for ALL.- $set = AccountMeta::whereIn('account_id', array_values($this->accountIds))->where('name', 'currency_id')->get();+ $set = AccountMeta::whereIn('account_id', array_values($this->accountIds))->where('name', 'currency_id')->get();/** @var AccountMeta $item */foreach ($set as $item) {- $accountId = (int)$item->account_id;- $currencyId = (int)$item->data;+ $accountId = (int)$item->account_id;+ $currencyId = (int)$item->data;if (!array_key_exists($currencyId, $this->currencies)) {$this->currencies[$currencyId] = TransactionCurrency::find($currencyId);}@@ -123,7 +125,7 @@ class PiggyBankEnrichment implements EnrichmentInterface}// get account info.- $set = Account::whereIn('id', array_values($this->accountIds))->get();+ $set = Account::whereIn('id', array_values($this->accountIds))->get();/** @var Account $item */foreach ($set as $item) {@@ -138,14 +140,14 @@ class PiggyBankEnrichment implements EnrichmentInterfaceprivate function appendCollectedData(): void{$this->collection = $this->collection->map(function (PiggyBank $item) {- $id = (int)$item->id;- $currencyId = (int)$item->transaction_currency_id;- $currency = $this->currencies[$currencyId] ?? $this->primaryCurrency;- $targetAmount = null;+ $id = (int)$item->id;+ $currencyId = (int)$item->transaction_currency_id;+ $currency = $this->currencies[$currencyId] ?? $this->primaryCurrency;+ $targetAmount = null;if (0 !== bccomp($item->target_amount, '0')) {$targetAmount = $item->target_amount;}- $meta = [+ $meta = ['notes' => $this->notes[$id] ?? null,'currency' => $this->currencies[$currencyId] ?? null,// 'auto_budget' => $this->autoBudgets[$id] ?? null,@@ -174,17 +176,17 @@ class PiggyBankEnrichment implements EnrichmentInterface}// add current amount(s).foreach ($this->amounts[$id] as $accountId => $row) {- $meta['accounts'][] = [+ $meta['accounts'][] = ['account_id' => (string)$accountId,'name' => $this->accounts[$accountId]['name'] ?? '','current_amount' => Steam::bcround($row['current_amount'], $currency->decimal_places),'pc_current_amount' => Steam::bcround($row['pc_current_amount'], $this->primaryCurrency->decimal_places),];- $meta['current_amount'] = bcadd($meta['current_amount'], $row['current_amount']);+ $meta['current_amount'] = bcadd($meta['current_amount'], $row['current_amount']);// only add pc_current_amount when the pc_current_amount is set$meta['pc_current_amount'] = null === $row['pc_current_amount'] ? null : bcadd($meta['pc_current_amount'], $row['pc_current_amount']);}- $meta['current_amount'] = Steam::bcround($meta['current_amount'], $currency->decimal_places);+ $meta['current_amount'] = Steam::bcround($meta['current_amount'], $currency->decimal_places);// only round this number when pc_current_amount is set.$meta['pc_current_amount'] = null === $meta['pc_current_amount'] ? null : Steam::bcround($meta['pc_current_amount'], $this->primaryCurrency->decimal_places);@@ -198,7 +200,7 @@ class PiggyBankEnrichment implements EnrichmentInterface$meta['save_per_month'] = Steam::bcround($this->getSuggestedMonthlyAmount($item->start_date, $item->target_date, $meta['target_amount'], $meta['current_amount']), $currency->decimal_places);$meta['pc_save_per_month'] = Steam::bcround($this->getSuggestedMonthlyAmount($item->start_date, $item->target_date, $meta['pc_target_amount'], $meta['pc_current_amount']), $currency->decimal_places);- $item->meta = $meta;+ $item->meta = $meta;return $item;});@@ -207,10 +209,9 @@ class PiggyBankEnrichment implements EnrichmentInterfaceprivate function collectNotes(): void{$notes = Note::query()->whereIn('noteable_id', $this->ids)- ->whereNotNull('notes.text')- ->where('notes.text', '!=', '')- ->where('noteable_type', PiggyBank::class)->get(['notes.noteable_id', 'notes.text'])->toArray()- ;+ ->whereNotNull('notes.text')+ ->where('notes.text', '!=', '')+ ->where('noteable_type', PiggyBank::class)->get(['notes.noteable_id', 'notes.text'])->toArray();foreach ($notes as $note) {$this->notes[(int)$note['noteable_id']] = (string)$note['text'];}@@ -219,13 +220,12 @@ class PiggyBankEnrichment implements EnrichmentInterfaceprivate function collectObjectGroups(): void{- $set = DB::table('object_groupables')- ->whereIn('object_groupable_id', $this->ids)- ->where('object_groupable_type', PiggyBank::class)- ->get(['object_groupable_id', 'object_group_id'])- ;+ $set = DB::table('object_groupables')+ ->whereIn('object_groupable_id', $this->ids)+ ->where('object_groupable_type', PiggyBank::class)+ ->get(['object_groupable_id', 'object_group_id']);- $ids = array_unique($set->pluck('object_group_id')->toArray());+ $ids = array_unique($set->pluck('object_group_id')->toArray());foreach ($set as $entry) {$this->mappedObjects[(int)$entry->object_groupable_id] = (int)$entry->object_group_id;@@ -239,7 +239,9 @@ class PiggyBankEnrichment implements EnrichmentInterface}}- private function collectCurrentAmounts(): void {}+ private function collectCurrentAmounts(): void+ {+ }/*** Returns the suggested amount the user should save per month, or "".