diff --git a/app/Support/JsonApi/Enrichments/SubscriptionEnrichment.php b/app/Support/JsonApi/Enrichments/SubscriptionEnrichment.php index 60a3b66789..19db60bba8 100644 --- a/app/Support/JsonApi/Enrichments/SubscriptionEnrichment.php +++ b/app/Support/JsonApi/Enrichments/SubscriptionEnrichment.php @@ -1,5 +1,7 @@ amounts = $amounts; $item->meta = $meta; + return $item; }); return $collection; } - public function enrichSingle(Model|array $model): array|Model + public function enrichSingle(array|Model $model): array|Model { Log::debug(__METHOD__); $collection = new Collection([$model]); @@ -160,7 +163,7 @@ class SubscriptionEnrichment implements EnrichmentInterface ->where('object_groupable_type', Bill::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; diff --git a/app/Transformers/BillTransformer.php b/app/Transformers/BillTransformer.php index 1d2d1dfadd..02b83d841b 100644 --- a/app/Transformers/BillTransformer.php +++ b/app/Transformers/BillTransformer.php @@ -51,6 +51,7 @@ class BillTransformer extends AbstractTransformer { $currency = $bill->transactionCurrency; + return [ 'id' => $bill->id, 'created_at' => $bill->created_at->toAtomString(), @@ -81,6 +82,7 @@ class BillTransformer extends AbstractTransformer '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(), diff --git a/config/firefly.php b/config/firefly.php index 0c0ef9d451..b28ffd6e60 100644 --- a/config/firefly.php +++ b/config/firefly.php @@ -78,8 +78,8 @@ return [ 'running_balance_column' => env('USE_RUNNING_BALANCE', false), // see cer.php for exchange rates feature flag. ], - 'version' => 'develop/2025-07-30', - 'build_time' => 1753878970, + 'version' => 'develop/2025-07-31', + 'build_time' => 1753936691, 'api_version' => '2.1.0', // field is no longer used. 'db_version' => 26,