Firefly III: a personal finances manager
PHP accountingbudgetbudgetingbudgetscash-flowcashflowcredit-carddockerexpensesfinancefinancesfinanciallinuxmoneypaycheckpersonal-financephpphp7
🤖 Auto commit for release 'develop' on 2025-07-31
JC56ff9943fe060
diff --git a/app/Api/V1/Controllers/Models/Bill/ShowController.php b/app/Api/V1/Controllers/Models/Bill/ShowController.phpindex bcc83c8fae..0204fcaf99 100644--- a/app/Api/V1/Controllers/Models/Bill/ShowController.php+++ b/app/Api/V1/Controllers/Models/Bill/ShowController.php@@ -87,7 +87,7 @@ class ShowController extends Controller$enrichment->setNative($this->nativeCurrency);$enrichment->setStart($this->parameters->get('start'));$enrichment->setEnd($this->parameters->get('end'));- $bills = $enrichment->enrich($bills);+ $bills = $enrichment->enrich($bills);/** @var BillTransformer $transformer */$transformer = app(BillTransformer::class);diff --git a/app/Support/JsonApi/Enrichments/SubscriptionEnrichment.php b/app/Support/JsonApi/Enrichments/SubscriptionEnrichment.phpindex 19db60bba8..1111b3a9b7 100644--- a/app/Support/JsonApi/Enrichments/SubscriptionEnrichment.php+++ b/app/Support/JsonApi/Enrichments/SubscriptionEnrichment.php@@ -53,11 +53,11 @@ class SubscriptionEnrichment implements EnrichmentInterface$paidDates = $this->paidDates;$payDates = $this->payDates;$this->collection = $this->collection->map(function (Bill $item) use ($notes, $objectGroups, $paidDates, $payDates) {- $id = (int)$item->id;- $currency = $item->transactionCurrency;- $nem = $this->getNextExpectedMatch($payDates[$id] ?? []);+ $id = (int)$item->id;+ $currency = $item->transactionCurrency;+ $nem = $this->getNextExpectedMatch($payDates[$id] ?? []);- $meta = [+ $meta = ['notes' => null,'object_group_id' => null,'object_group_title' => null,@@ -66,9 +66,9 @@ class SubscriptionEnrichment implements EnrichmentInterface'paid_dates' => $this->filterPaidDates($paidDates[$id] ?? []),'pay_dates' => $payDates[$id] ?? [],'nem' => $nem,- 'nem_diff' => $this->getNextExpectedMatchDiff($nem, $payDates[$id] ?? [])+ 'nem_diff' => $this->getNextExpectedMatchDiff($nem, $payDates[$id] ?? []),];- $amounts = [+ $amounts = ['amount_min' => Steam::bcround($item->amount_min, $currency->decimal_places),'amount_max' => Steam::bcround($item->amount_max, $currency->decimal_places),'average' => Steam::bcround(bcdiv(bcadd($item->amount_min, $item->amount_max), '2'), $currency->decimal_places),@@ -117,9 +117,10 @@ class SubscriptionEnrichment implements EnrichmentInterfaceprivate function collectNotes(): void{$notes = Note::query()->whereIn('noteable_id', $this->subscriptionIds)- ->whereNotNull('notes.text')- ->where('notes.text', '!=', '')- ->where('noteable_type', Bill::class)->get(['notes.noteable_id', 'notes.text'])->toArray();+ ->whereNotNull('notes.text')+ ->where('notes.text', '!=', '')+ ->where('noteable_type', Bill::class)->get(['notes.noteable_id', 'notes.text'])->toArray()+ ;foreach ($notes as $note) {$this->notes[(int)$note['noteable_id']] = (string)$note['text'];}@@ -158,10 +159,11 @@ class SubscriptionEnrichment implements EnrichmentInterfaceprivate function collectObjectGroups(): void{- $set = DB::table('object_groupables')- ->whereIn('object_groupable_id', $this->subscriptionIds)- ->where('object_groupable_type', Bill::class)- ->get(['object_groupable_id', 'object_group_id']);+ $set = DB::table('object_groupables')+ ->whereIn('object_groupable_id', $this->subscriptionIds)+ ->where('object_groupable_type', Bill::class)+ ->get(['object_groupable_id', 'object_group_id'])+ ;$ids = array_unique($set->pluck('object_group_id')->toArray());@@ -183,6 +185,7 @@ class SubscriptionEnrichment implements EnrichmentInterfaceif (null === $this->start || null === $this->end) {Log::debug('Parameters are NULL, return empty array');$this->paidDates = [];+return;}@@ -195,8 +198,8 @@ class SubscriptionEnrichment implements EnrichmentInterface$start->subDay();/** @var Carbon $end */- $end = clone $this->end;- $searchEnd = clone $end;+ $end = clone $this->end;+ $searchEnd = clone $end;// move the search dates to the start of the day.$searchStart->startOfDay();@@ -206,13 +209,13 @@ class SubscriptionEnrichment implements EnrichmentInterfaceLog::debug(sprintf('Search parameters are: start: %s, end: %s', $searchStart->format('Y-m-d H:i:s'), $searchEnd->format('Y-m-d H:i:s')));// Get from database when bills were paid.- $set = $this->user->transactionJournals()- ->whereIn('bill_id', $this->subscriptionIds)- ->leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id')- ->leftJoin('transaction_currencies AS currency', 'currency.id', '=', 'transactions.transaction_currency_id')- ->leftJoin('transaction_currencies AS foreign_currency', 'foreign_currency.id', '=', 'transactions.foreign_currency_id')- ->where('transactions.amount', '>', 0)- ->before($searchEnd)->after($searchStart)->get(+ $set = $this->user->transactionJournals()+ ->whereIn('bill_id', $this->subscriptionIds)+ ->leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id')+ ->leftJoin('transaction_currencies AS currency', 'currency.id', '=', 'transactions.transaction_currency_id')+ ->leftJoin('transaction_currencies AS foreign_currency', 'foreign_currency.id', '=', 'transactions.foreign_currency_id')+ ->where('transactions.amount', '>', 0)+ ->before($searchEnd)->after($searchStart)->get(['transaction_journals.id','transaction_journals.date',@@ -226,7 +229,8 @@ class SubscriptionEnrichment implements EnrichmentInterface'transactions.amount','transactions.foreign_amount',]- );+ )+ ;Log::debug(sprintf('Count %d entries in set', $set->count()));// for each bill, do a loop.@@ -234,13 +238,13 @@ class SubscriptionEnrichment implements EnrichmentInterfaceforeach ($this->collection as $subscription) {// Grab from array the most recent payment. If none exist, fall back to the start date and pretend *that* was the last paid date.Log::debug(sprintf('Grab last paid date from function, return %s if it comes up with nothing.', $start->format('Y-m-d')));- $lastPaidDate = $this->lastPaidDate($subscription, $set, $start);+ $lastPaidDate = $this->lastPaidDate($subscription, $set, $start);Log::debug(sprintf('Result of lastPaidDate is %s', $lastPaidDate->format('Y-m-d')));// At this point the "next match" is exactly after the last time the bill was paid.- $result = [];+ $result = [];foreach ($set as $entry) {- $array = [+ $array = ['transaction_group_id' => (string)$entry->transaction_group_id,'transaction_journal_id' => (string)$entry->id,'date' => $entry->date->toAtomString(),@@ -286,7 +290,7 @@ class SubscriptionEnrichment implements EnrichmentInterfacereturn $default;}- $latest = $filtered->first()->date;+ $latest = $filtered->first()->date;/** @var TransactionJournal $journal */foreach ($filtered as $journal) {@@ -326,12 +330,12 @@ class SubscriptionEnrichment implements EnrichmentInterface{/** @var Bill $subscription */foreach ($this->collection as $subscription) {- $id = (int)$subscription->id;- $lastPaidDate = $this->getLastPaidDate($paidDates[$id] ?? []);- $payDates = $this->calculator->getPayDates($this->start, $this->end, $subscription->date, $subscription->repeat_freq, $subscription->skip, $lastPaidDate);- $payDatesFormatted = [];+ $id = (int)$subscription->id;+ $lastPaidDate = $this->getLastPaidDate($paidDates[$id] ?? []);+ $payDates = $this->calculator->getPayDates($this->start, $this->end, $subscription->date, $subscription->repeat_freq, $subscription->skip, $lastPaidDate);+ $payDatesFormatted = [];foreach ($payDates as $string) {- $date = Carbon::createFromFormat('!Y-m-d', $string, config('app.timezone'));+ $date = Carbon::createFromFormat('!Y-m-d', $string, config('app.timezone'));if (!$date instanceof Carbon) {$date = today(config('app.timezone'));}@@ -345,6 +349,7 @@ class SubscriptionEnrichment implements EnrichmentInterface{return array_map(function (array $entry) {unset($entry['date_object']);+return $entry;}, $entries);}@@ -360,7 +365,7 @@ class SubscriptionEnrichment implements EnrichmentInterfaceif (!$nemDate instanceof Carbon) {$nemDate = today(config('app.timezone'));}- $nem = $nemDate;+ $nem = $nemDate;// nullify again when it's outside the current view range.if (@@ -372,6 +377,7 @@ class SubscriptionEnrichment implements EnrichmentInterface$firstPayDate = null;}}+return $nem;}@@ -380,7 +386,7 @@ class SubscriptionEnrichment implements EnrichmentInterfaceif (null === $nem) {return trans('firefly.not_expected_period');}- $nemDiff = trans('firefly.not_expected_period');;+ $nemDiff = trans('firefly.not_expected_period');// converting back and forth is bad code but OK.if ($nem->isToday()) {$nemDiff = trans('firefly.today');@@ -388,7 +394,7 @@ class SubscriptionEnrichment implements EnrichmentInterface$current = $payDates[0] ?? null;if (null !== $current && !$nem->isToday()) {- $temp2 = Carbon::parse($current, config('app.timezone'));+ $temp2 = Carbon::parse($current, config('app.timezone'));if (!$temp2 instanceof Carbon) {$temp2 = today(config('app.timezone'));}@@ -399,4 +405,3 @@ class SubscriptionEnrichment implements EnrichmentInterfacereturn $nemDiff;}}-diff --git a/app/Transformers/BillTransformer.php b/app/Transformers/BillTransformer.phpindex 02b83d841b..5318d08533 100644--- a/app/Transformers/BillTransformer.php+++ b/app/Transformers/BillTransformer.php@@ -45,7 +45,6 @@ class BillTransformer extends AbstractTransformer/*** Transform the bill.- **/public function transform(Bill $bill): array{@@ -53,53 +52,51 @@ class BillTransformer extends AbstractTransformerreturn [- 'id' => $bill->id,- 'created_at' => $bill->created_at->toAtomString(),- 'updated_at' => $bill->updated_at->toAtomString(),- 'currency_id' => (string)$bill->transaction_currency_id,- 'currency_code' => $currency->code,- 'currency_symbol' => $currency->symbol,- 'currency_decimal_places' => $currency->decimal_places,+ 'id' => $bill->id,+ 'created_at' => $bill->created_at->toAtomString(),+ 'updated_at' => $bill->updated_at->toAtomString(),+ 'currency_id' => (string)$bill->transaction_currency_id,+ 'currency_code' => $currency->code,+ 'currency_symbol' => $currency->symbol,+ 'currency_decimal_places' => $currency->decimal_places,'native_currency_id' => (string)$this->native->id,'native_currency_code' => $this->native->code,'native_currency_symbol' => $this->native->symbol,'native_currency_decimal_places' => $this->native->decimal_places,- 'name' => $bill->name,- 'amount_min' => $bill->amounts['amount_min'],- 'amount_max' => $bill->amounts['amount_max'],- 'amount_avg' => $bill->amounts['average'],- 'date' => $bill->date->toAtomString(),- 'end_date' => $bill->end_date?->toAtomString(),- 'extension_date' => $bill->extension_date?->toAtomString(),- 'repeat_freq' => $bill->repeat_freq,- 'skip' => $bill->skip,- 'active' => $bill->active,- 'order' => $bill->order,- 'notes' => $bill->meta['notes'],- 'object_group_id' => $bill->meta['object_group_id'],- 'object_group_order' => $bill->meta['object_group_order'],- 'object_group_title' => $bill->meta['object_group_title'],--- 'paid_dates' => $bill->meta['paid_dates'],- 'pay_dates' => $bill->meta['pay_dates'],- 'next_expected_match' => $bill->meta['nem']?->toAtomString(),- 'next_expected_match_diff' => $bill->meta['nem_diff'],+ 'name' => $bill->name,+ 'amount_min' => $bill->amounts['amount_min'],+ 'amount_max' => $bill->amounts['amount_max'],+ 'amount_avg' => $bill->amounts['average'],+ 'date' => $bill->date->toAtomString(),+ 'end_date' => $bill->end_date?->toAtomString(),+ 'extension_date' => $bill->extension_date?->toAtomString(),+ 'repeat_freq' => $bill->repeat_freq,+ 'skip' => $bill->skip,+ 'active' => $bill->active,+ 'order' => $bill->order,+ 'notes' => $bill->meta['notes'],+ 'object_group_id' => $bill->meta['object_group_id'],+ 'object_group_order' => $bill->meta['object_group_order'],+ 'object_group_title' => $bill->meta['object_group_title'],+++ 'paid_dates' => $bill->meta['paid_dates'],+ 'pay_dates' => $bill->meta['pay_dates'],+ 'next_expected_match' => $bill->meta['nem']?->toAtomString(),+ 'next_expected_match_diff' => $bill->meta['nem_diff'],// these fields need work:// 'next_expected_match' => $nem,// 'next_expected_match_diff' => $nemDiff,// 'pay_dates' => $payDatesFormatted,- 'links' => [+ 'links' => [['rel' => 'self',- 'uri' => '/bills/' . $bill->id,+ 'uri' => '/bills/'.$bill->id,],],];}--}diff --git a/config/firefly.php b/config/firefly.phpindex b28ffd6e60..10c5e0fa02 100644--- a/config/firefly.php+++ b/config/firefly.php@@ -79,7 +79,7 @@ return [// see cer.php for exchange rates feature flag.],'version' => 'develop/2025-07-31',- 'build_time' => 1753936691,+ 'build_time' => 1753939947,'api_version' => '2.1.0', // field is no longer used.'db_version' => 26,