Merge pull request #10693 from firefly-iii/release-1754278961

🤖 Automatically merge the PR into the develop branch.

app/Api/V1/Controllers/Models/Budget/ListController.php

@@ -32,6 +32,7 @@ use FireflyIII\Models\Budget;
 use FireflyIII\Repositories\Budget\BudgetLimitRepositoryInterface;
 use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
 use FireflyIII\Support\Http\Api\TransactionFilter;
+use FireflyIII\Support\JsonApi\Enrichments\BudgetLimitEnrichment;
 use FireflyIII\Support\JsonApi\Enrichments\TransactionGroupEnrichment;
 use FireflyIII\Transformers\AttachmentTransformer;
 use FireflyIII\Transformers\BudgetLimitTransformer;
@@ -117,6 +118,14 @@ class ListController extends Controller
         $paginator    = new LengthAwarePaginator($budgetLimits, $count, $pageSize, $this->parameters->get('page'));
         $paginator->setPath(route('api.v1.budgets.budget-limits', [$budget->id]).$this->buildParams());
 
+        // enrich
+        /** @var User $admin */
+        $admin        = auth()->user();
+        $enrichment   = new BudgetLimitEnrichment();
+        $enrichment->setUser($admin);
+        $budgetLimits = $enrichment->enrich($budgetLimits);
+
+
         /** @var BudgetLimitTransformer $transformer */
         $transformer  = app(BudgetLimitTransformer::class);
         $transformer->setParameters($this->parameters);

app/Api/V1/Controllers/Models/Budget/ShowController.php

@@ -29,7 +29,9 @@ use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Models\Budget;
 use FireflyIII\Repositories\Budget\BudgetLimitRepositoryInterface;
 use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
+use FireflyIII\Support\JsonApi\Enrichments\BudgetEnrichment;
 use FireflyIII\Transformers\BudgetTransformer;
+use FireflyIII\User;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Pagination\LengthAwarePaginator;
 use League\Fractal\Pagination\IlluminatePaginatorAdapter;
@@ -82,6 +84,15 @@ class ShowController extends Controller
         $count       = $collection->count();
         $budgets     = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);
 
+        // enrich
+        /** @var User $admin */
+        $admin       = auth()->user();
+        $enrichment  = new BudgetEnrichment();
+        $enrichment->setUser($admin);
+        $enrichment->setStart($this->parameters->get('start'));
+        $enrichment->setEnd($this->parameters->get('end'));
+        $budgets     = $enrichment->enrich($budgets);
+
         // make paginator:
         $paginator   = new LengthAwarePaginator($budgets, $count, $pageSize, $this->parameters->get('page'));
         $paginator->setPath(route('api.v1.budgets.index').$this->buildParams());
@@ -103,6 +114,15 @@ class ShowController extends Controller
     {
         $manager     = $this->getManager();
 
+        // enrich
+        /** @var User $admin */
+        $admin       = auth()->user();
+        $enrichment  = new BudgetEnrichment();
+        $enrichment->setUser($admin);
+        $enrichment->setStart($this->parameters->get('start'));
+        $enrichment->setEnd($this->parameters->get('end'));
+        $budget      = $enrichment->enrichSingle($budget);
+
         /** @var BudgetTransformer $transformer */
         $transformer = app(BudgetTransformer::class);
         $transformer->setParameters($this->parameters);

app/Api/V1/Controllers/Models/Budget/StoreController.php

@@ -28,7 +28,9 @@ use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\Models\Budget\StoreRequest;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
+use FireflyIII\Support\JsonApi\Enrichments\BudgetEnrichment;
 use FireflyIII\Transformers\BudgetTransformer;
+use FireflyIII\User;
 use Illuminate\Http\JsonResponse;
 use League\Fractal\Resource\Item;
 
@@ -69,6 +71,13 @@ class StoreController extends Controller
         $budget->refresh();
         $manager     = $this->getManager();
 
+        // enrich
+        /** @var User $admin */
+        $admin       = auth()->user();
+        $enrichment  = new BudgetEnrichment();
+        $enrichment->setUser($admin);
+        $budget      = $enrichment->enrichSingle($budget);
+
         /** @var BudgetTransformer $transformer */
         $transformer = app(BudgetTransformer::class);
         $transformer->setParameters($this->parameters);

app/Api/V1/Controllers/Models/Budget/UpdateController.php

@@ -28,7 +28,9 @@ use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\Models\Budget\UpdateRequest;
 use FireflyIII\Models\Budget;
 use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
+use FireflyIII\Support\JsonApi\Enrichments\BudgetEnrichment;
 use FireflyIII\Transformers\BudgetTransformer;
+use FireflyIII\User;
 use Illuminate\Http\JsonResponse;
 use League\Fractal\Resource\Item;
 
@@ -67,6 +69,13 @@ class UpdateController extends Controller
         $budget      = $this->repository->update($budget, $data);
         $manager     = $this->getManager();
 
+        // enrich
+        /** @var User $admin */
+        $admin       = auth()->user();
+        $enrichment  = new BudgetEnrichment();
+        $enrichment->setUser($admin);
+        $budget      = $enrichment->enrichSingle($budget);
+
         /** @var BudgetTransformer $transformer */
         $transformer = app(BudgetTransformer::class);
         $transformer->setParameters($this->parameters);

app/Api/V1/Controllers/Models/BudgetLimit/ShowController.php

@@ -31,6 +31,7 @@ use FireflyIII\Models\Budget;
 use FireflyIII\Models\BudgetLimit;
 use FireflyIII\Repositories\Budget\BudgetLimitRepositoryInterface;
 use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
+use FireflyIII\Support\JsonApi\Enrichments\BudgetLimitEnrichment;
 use FireflyIII\Transformers\BudgetLimitTransformer;
 use FireflyIII\User;
 use Illuminate\Http\JsonResponse;
@@ -84,6 +85,14 @@ class ShowController extends Controller
         $paginator    = new LengthAwarePaginator($budgetLimits, $count, $pageSize, $this->parameters->get('page'));
         $paginator->setPath(route('api.v1.budgets.limits.index', [$budget->id]).$this->buildParams());
 
+
+        // enrich
+        /** @var User $admin */
+        $admin        = auth()->user();
+        $enrichment   = new BudgetLimitEnrichment();
+        $enrichment->setUser($admin);
+        $budgetLimits = $enrichment->enrich($budgetLimits);
+
         /** @var BudgetLimitTransformer $transformer */
         $transformer  = app(BudgetLimitTransformer::class);
         $transformer->setParameters($this->parameters);
@@ -113,6 +122,13 @@ class ShowController extends Controller
         $paginator    = new LengthAwarePaginator($budgetLimits, $count, $pageSize, $this->parameters->get('page'));
         $paginator->setPath(route('api.v1.budget-limits.index').$this->buildParams());
 
+        // enrich
+        /** @var User $admin */
+        $admin        = auth()->user();
+        $enrichment   = new BudgetLimitEnrichment();
+        $enrichment->setUser($admin);
+        $budgetLimits = $enrichment->enrich($budgetLimits);
+
         /** @var BudgetLimitTransformer $transformer */
         $transformer  = app(BudgetLimitTransformer::class);
         $transformer->setParameters($this->parameters);
@@ -137,6 +153,13 @@ class ShowController extends Controller
         // continue!
         $manager     = $this->getManager();
 
+        // enrich
+        /** @var User $admin */
+        $admin       = auth()->user();
+        $enrichment  = new BudgetLimitEnrichment();
+        $enrichment->setUser($admin);
+        $budgetLimit = $enrichment->enrichSingle($budgetLimit);
+
         /** @var BudgetLimitTransformer $transformer */
         $transformer = app(BudgetLimitTransformer::class);
         $transformer->setParameters($this->parameters);

app/Api/V1/Controllers/Models/BudgetLimit/StoreController.php

@@ -28,6 +28,7 @@ use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\Models\BudgetLimit\StoreRequest;
 use FireflyIII\Models\Budget;
 use FireflyIII\Repositories\Budget\BudgetLimitRepositoryInterface;
+use FireflyIII\Support\JsonApi\Enrichments\BudgetLimitEnrichment;
 use FireflyIII\Transformers\BudgetLimitTransformer;
 use FireflyIII\User;
 use Illuminate\Http\JsonResponse;
@@ -74,6 +75,13 @@ class StoreController extends Controller
         $budgetLimit        = $this->blRepository->store($data);
         $manager            = $this->getManager();
 
+        // enrich
+        /** @var User $admin */
+        $admin              = auth()->user();
+        $enrichment         = new BudgetLimitEnrichment();
+        $enrichment->setUser($admin);
+        $budgetLimit        = $enrichment->enrichSingle($budgetLimit);
+
         /** @var BudgetLimitTransformer $transformer */
         $transformer        = app(BudgetLimitTransformer::class);
         $transformer->setParameters($this->parameters);

app/Api/V1/Controllers/Models/BudgetLimit/UpdateController.php

@@ -30,6 +30,7 @@ use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Models\Budget;
 use FireflyIII\Models\BudgetLimit;
 use FireflyIII\Repositories\Budget\BudgetLimitRepositoryInterface;
+use FireflyIII\Support\JsonApi\Enrichments\BudgetLimitEnrichment;
 use FireflyIII\Transformers\BudgetLimitTransformer;
 use FireflyIII\User;
 use Illuminate\Http\JsonResponse;
@@ -80,6 +81,13 @@ class UpdateController extends Controller
         $budgetLimit       = $this->blRepository->update($budgetLimit, $data);
         $manager           = $this->getManager();
 
+        // enrich
+        /** @var User $admin */
+        $admin             = auth()->user();
+        $enrichment        = new BudgetLimitEnrichment();
+        $enrichment->setUser($admin);
+        $budgetLimit       = $enrichment->enrich($budgetLimit);
+
         /** @var BudgetLimitTransformer $transformer */
         $transformer       = app(BudgetLimitTransformer::class);
         $transformer->setParameters($this->parameters);

app/Api/V1/Controllers/Models/TransactionCurrency/ListController.php

@@ -43,6 +43,7 @@ use FireflyIII\Repositories\Rule\RuleRepositoryInterface;
 use FireflyIII\Support\Http\Api\AccountFilter;
 use FireflyIII\Support\Http\Api\TransactionFilter;
 use FireflyIII\Support\JsonApi\Enrichments\AccountEnrichment;
+use FireflyIII\Support\JsonApi\Enrichments\BudgetLimitEnrichment;
 use FireflyIII\Support\JsonApi\Enrichments\SubscriptionEnrichment;
 use FireflyIII\Support\JsonApi\Enrichments\TransactionGroupEnrichment;
 use FireflyIII\Transformers\AccountTransformer;
@@ -227,6 +228,13 @@ class ListController extends Controller
         $paginator    = new LengthAwarePaginator($budgetLimits, $count, $pageSize, $this->parameters->get('page'));
         $paginator->setPath(route('api.v1.currencies.budget-limits', [$currency->code]).$this->buildParams());
 
+        // enrich
+        /** @var User $admin */
+        $admin        = auth()->user();
+        $enrichment   = new BudgetLimitEnrichment();
+        $enrichment->setUser($admin);
+        $budgetLimits = $enrichment->enrich($budgetLimits);
+
         /** @var BudgetLimitTransformer $transformer */
         $transformer  = app(BudgetLimitTransformer::class);
         $transformer->setParameters($this->parameters);

app/Http/Controllers/Budget/EditController.php

@@ -95,6 +95,7 @@ class EditController extends Controller
         $preFilled         = [
             'active'                  => $hasOldInput ? (bool) $request->old('active') : $budget->active,
             'auto_budget_currency_id' => $hasOldInput ? (int) $request->old('auto_budget_currency_id') : $this->primaryCurrency->id,
+            'notes'                   => $this->repository->getNoteText($budget),
         ];
         if ($autoBudget instanceof AutoBudget) {
             $amount                          = $hasOldInput ? $request->old('auto_budget_amount') : $autoBudget->amount;

app/Http/Requests/BudgetFormUpdateRequest.php

@@ -47,12 +47,13 @@ class BudgetFormUpdateRequest extends FormRequest
     public function getBudgetData(): array
     {
         return [
-            'name'               => $this->convertString('name'),
-            'active'             => $this->boolean('active'),
-            'auto_budget_type'   => $this->convertInteger('auto_budget_type'),
-            'currency_id'        => $this->convertInteger('auto_budget_currency_id'),
-            'auto_budget_amount' => $this->convertString('auto_budget_amount'),
-            'auto_budget_period' => $this->convertString('auto_budget_period'),
+            'name'                    => $this->convertString('name'),
+            'active'                  => $this->boolean('active'),
+            'auto_budget_type'        => $this->convertInteger('auto_budget_type'),
+            'currency_id'             => $this->convertInteger('auto_budget_currency_id'),
+            'auto_budget_amount'      => $this->convertString('auto_budget_amount'),
+            'auto_budget_period'      => $this->convertString('auto_budget_period'),
+            'notes'                   => $this->stringWithNewlines('notes'),
         ];
     }
 

app/Repositories/Budget/OperationsRepository.php

@@ -290,7 +290,7 @@ class OperationsRepository implements OperationsRepositoryInterface, UserGroupIn
         $summarizer = new TransactionSummarizer($this->user);
         $summarizer->setConvertToPrimary($convertToPrimary);
 
-        // filter $journals by range.
+        // filter $journals by range AND currency if it is present.
         $expenses   = array_filter($expenses, static function (array $expense) use ($start, $end, $transactionCurrency): bool {
             return $expense['date']->between($start, $end) && $expense['currency_id'] === $transactionCurrency->id;
         });
@@ -298,6 +298,20 @@ class OperationsRepository implements OperationsRepositoryInterface, UserGroupIn
         return $summarizer->groupByCurrencyId($expenses, 'negative', false);
     }
 
+    public function sumCollectedExpensesByBudget(array $expenses, Budget $budget, bool $convertToPrimary = false): array
+    {
+        Log::debug(sprintf('Start of %s.', __METHOD__));
+        $summarizer = new TransactionSummarizer($this->user);
+        $summarizer->setConvertToPrimary($convertToPrimary);
+
+        // filter $journals by range AND currency if it is present.
+        $expenses   = array_filter($expenses, static function (array $expense) use ($budget): bool {
+            return $expense['budget_id'] === $budget->id;
+        });
+
+        return $summarizer->groupByCurrencyId($expenses, 'negative', false);
+    }
+
     #[Override]
     public function collectExpenses(Carbon $start, Carbon $end, ?Collection $accounts = null, ?Collection $budgets = null, ?TransactionCurrency $currency = null): array
     {

app/Repositories/Budget/OperationsRepositoryInterface.php

@@ -76,5 +76,7 @@ interface OperationsRepositoryInterface
 
     public function sumCollectedExpenses(array $expenses, Carbon $start, Carbon $end, TransactionCurrency $transactionCurrency, bool $convertToPrimary = false): array;
 
+    public function sumCollectedExpensesByBudget(array $expenses, Budget $budget, bool $convertToPrimary = false): array;
+
     public function collectExpenses(Carbon $start, Carbon $end, ?Collection $accounts = null, ?Collection $budgets = null, ?TransactionCurrency $currency = null): array;
 }

app/Support/JsonApi/Enrichments/BudgetEnrichment.php

@@ -0,0 +1,156 @@
+<?php
+
+declare(strict_types=1);
+
+namespace FireflyIII\Support\JsonApi\Enrichments;
+
+use Carbon\Carbon;
+use FireflyIII\Models\AutoBudget;
+use FireflyIII\Models\Budget;
+use FireflyIII\Models\Note;
+use FireflyIII\Models\TransactionCurrency;
+use FireflyIII\Models\UserGroup;
+use FireflyIII\Repositories\Budget\OperationsRepositoryInterface;
+use FireflyIII\Support\Facades\Amount;
+use FireflyIII\User;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Support\Collection;
+use Illuminate\Support\Facades\Log;
+
+class BudgetEnrichment implements EnrichmentInterface
+{
+    private Collection          $collection;
+    private bool                $convertToPrimary = true;
+    private TransactionCurrency $primaryCurrency;
+    private User                $user;
+    private UserGroup           $userGroup;
+    private array               $ids              = [];
+    private array               $notes            = [];
+    private array               $autoBudgets      = [];
+    private array               $currencies       = [];
+    private ?Carbon             $start            = null;
+    private ?Carbon             $end              = null;
+    private array               $spent            = [];
+    private array               $pcSpent          = [];
+
+    public function __construct()
+    {
+        $this->convertToPrimary = Amount::convertToPrimary();
+        $this->primaryCurrency  = Amount::getPrimaryCurrency();
+    }
+
+    public function enrich(Collection $collection): Collection
+    {
+        $this->collection = $collection;
+        $this->collectIds();
+        $this->collectNotes();
+        $this->collectAutoBudgets();
+        $this->collectExpenses();
+        $this->appendCollectedData();
+
+        return $this->collection;
+    }
+
+    public function enrichSingle(array|Model $model): array|Model
+    {
+        Log::debug(__METHOD__);
+        $collection = new Collection([$model]);
+        $collection = $this->enrich($collection);
+
+        return $collection->first();
+    }
+
+    public function setUser(User $user): void
+    {
+        $this->user = $user;
+        $this->setUserGroup($user->userGroup);
+    }
+
+    public function setUserGroup(UserGroup $userGroup): void
+    {
+        $this->userGroup = $userGroup;
+    }
+
+    private function collectIds(): void
+    {
+        /** @var Budget $budget */
+        foreach ($this->collection as $budget) {
+            $this->ids[] = (int)$budget->id;
+        }
+    }
+
+    private function collectNotes(): void
+    {
+        $notes = Note::query()->whereIn('noteable_id', $this->ids)
+            ->whereNotNull('notes.text')
+            ->where('notes.text', '!=', '')
+            ->where('noteable_type', Budget::class)->get(['notes.noteable_id', 'notes.text'])->toArray()
+        ;
+        foreach ($notes as $note) {
+            $this->notes[(int)$note['noteable_id']] = (string)$note['text'];
+        }
+        Log::debug(sprintf('Enrich with %d note(s)', count($this->notes)));
+    }
+
+    private function appendCollectedData(): void
+    {
+        $this->collection = $this->collection->map(function (Budget $item) {
+            $id         = (int)$item->id;
+            $meta       = [
+                'notes'       => $this->notes[$id] ?? null,
+                'currency'    => $this->currencies[$id] ?? null,
+                'auto_budget' => $this->autoBudgets[$id] ?? null,
+                'spent'       => $this->spent[$id] ?? null,
+                'pc_spent'    => $this->pcSpent[$id] ?? null,
+            ];
+            $item->meta = $meta;
+
+            return $item;
+        });
+    }
+
+    private function collectAutoBudgets(): void
+    {
+        $set = AutoBudget::whereIn('budget_id', $this->ids)->with(['transactionCurrency'])->get();
+
+        /** @var AutoBudget $autoBudget */
+        foreach ($set as $autoBudget) {
+            $budgetId                     = (int)$autoBudget->budget_id;
+            $this->currencies[$budgetId]  = $autoBudget->transactionCurrency;
+            $this->autoBudgets[$budgetId] = [
+                'type'      => (int)$autoBudget->auto_budget_type,
+                'period'    => $autoBudget->period,
+                'amount'    => $autoBudget->amount,
+                'pc_amount' => $autoBudget->native_amount,
+            ];
+        }
+    }
+
+    private function collectExpenses(): void
+    {
+        if (null !== $this->start && null !== $this->end) {
+            /** @var OperationsRepositoryInterface $opsRepository */
+            $opsRepository = app(OperationsRepositoryInterface::class);
+            $opsRepository->setUser($this->user);
+            $opsRepository->setUserGroup($this->userGroup);
+            // $spent = $this->beautify();
+            // $set = $this->opsRepository->sumExpenses($start, $end, null, new Collection([$budget]))
+            $expenses      = $opsRepository->collectExpenses($this->start, $this->end, null, $this->collection, null);
+            foreach ($this->collection as $item) {
+                $id                 = (int)$item->id;
+                $this->spent[$id]   = array_values($opsRepository->sumCollectedExpensesByBudget($expenses, $item, false));
+                $this->pcSpent[$id] = array_values($opsRepository->sumCollectedExpensesByBudget($expenses, $item, true));
+            }
+        }
+    }
+
+    public function setEnd(?Carbon $end): void
+    {
+        $this->end = $end;
+    }
+
+    public function setStart(?Carbon $start): void
+    {
+        $this->start = $start;
+    }
+}

app/Support/JsonApi/Enrichments/BudgetLimitEnrichment.php

@@ -0,0 +1,136 @@
+<?php
+
+declare(strict_types=1);
+
+namespace FireflyIII\Support\JsonApi\Enrichments;
+
+use Carbon\Carbon;
+use FireflyIII\Models\Budget;
+use FireflyIII\Models\BudgetLimit;
+use FireflyIII\Models\Note;
+use FireflyIII\Models\TransactionCurrency;
+use FireflyIII\Models\UserGroup;
+use FireflyIII\Repositories\Budget\OperationsRepository;
+use FireflyIII\Support\Facades\Amount;
+use FireflyIII\User;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Support\Collection;
+use Illuminate\Support\Facades\Log;
+
+class BudgetLimitEnrichment implements EnrichmentInterface
+{
+    private User                $user;
+    private UserGroup           $userGroup;
+    private Collection          $collection;
+    private array               $ids              = [];
+    private array               $notes            = [];
+    private Carbon              $start;
+    private Carbon              $end;
+    private Collection          $budgets;
+    private array               $expenses         = [];
+    private array               $pcExpenses       = [];
+    private bool                $convertToPrimary = true;
+    private TransactionCurrency $primaryCurrency;
+
+    public function __construct()
+    {
+        $this->convertToPrimary = Amount::convertToPrimary();
+        $this->primaryCurrency  = Amount::getPrimaryCurrency();
+    }
+
+    public function enrich(Collection $collection): Collection
+    {
+        $this->collection = $collection;
+        $this->collectIds();
+        $this->collectNotes();
+        $this->collectBudgets();
+        $this->appendCollectedData();
+
+        return $this->collection;
+    }
+
+    public function enrichSingle(array|Model $model): array|Model
+    {
+        Log::debug(__METHOD__);
+        $collection = new Collection()->push($model);
+        $collection = $this->enrich($collection);
+
+        return $collection->first();
+    }
+
+    public function setUser(User $user): void
+    {
+        $this->user      = $user;
+        $this->userGroup = $user->userGroup;
+    }
+
+    public function setUserGroup(UserGroup $userGroup): void
+    {
+        $this->userGroup = $userGroup;
+    }
+
+    private function collectIds(): void
+    {
+        $this->start = $this->collection->min('start_date');
+        $this->end   = $this->collection->max('end_date');
+
+        /** @var BudgetLimit $limit */
+        foreach ($this->collection as $limit) {
+            $this->ids[] = (int)$limit->id;
+        }
+        $this->ids   = array_unique($this->ids);
+    }
+
+    private function collectNotes(): void
+    {
+        $notes = Note::query()->whereIn('noteable_id', $this->ids)
+            ->whereNotNull('notes.text')
+            ->where('notes.text', '!=', '')
+            ->where('noteable_type', BudgetLimit::class)->get(['notes.noteable_id', 'notes.text'])->toArray()
+        ;
+        foreach ($notes as $note) {
+            $this->notes[(int)$note['noteable_id']] = (string)$note['text'];
+        }
+        Log::debug(sprintf('Enrich with %d note(s)', count($this->notes)));
+    }
+
+    private function appendCollectedData(): void
+    {
+        $this->collection = $this->collection->map(function (BudgetLimit $item) {
+            $id         = (int)$item->id;
+            $meta       = [
+                'notes'    => $this->notes[$id] ?? null,
+                'spent'    => $this->expenses[$id] ?? [],
+                'pc_spent' => $this->pcExpenses[$id] ?? [],
+            ];
+            $item->meta = $meta;
+
+            return $item;
+        });
+    }
+
+    private function collectBudgets(): void
+    {
+        $budgetIds     = $this->collection->pluck('budget_id')->unique()->toArray();
+        $this->budgets = Budget::whereIn('id', $budgetIds)->get();
+
+        $repository    = app(OperationsRepository::class);
+        $repository->setUser($this->user);
+        $expenses      = $repository->collectExpenses($this->start, $this->end, null, $this->budgets, null);
+
+        /** @var BudgetLimit $budgetLimit */
+        foreach ($this->collection as $budgetLimit) {
+            $id                  = (int)$budgetLimit->id;
+            $filteredExpenses    = $repository->sumCollectedExpenses($expenses, $budgetLimit->start_date, $budgetLimit->end_date, $budgetLimit->transactionCurrency, false);
+            $this->expenses[$id] = array_values($filteredExpenses);
+
+            if (true === $this->convertToPrimary && $budgetLimit->transactionCurrency->id !== $this->primaryCurrency->id) {
+                $pcFilteredExpenses    = $repository->sumCollectedExpenses($expenses, $budgetLimit->start_date, $budgetLimit->end_date, $budgetLimit->transactionCurrency, true);
+                $this->pcExpenses[$id] = array_values($pcFilteredExpenses);
+            }
+            if (true === $this->convertToPrimary && $budgetLimit->transactionCurrency->id === $this->primaryCurrency->id) {
+                $this->pcExpenses[$id] = $this->expenses[$id] ?? [];
+            }
+        }
+    }
+}

app/Transformers/AccountTransformer.php

@@ -113,10 +113,13 @@ class AccountTransformer extends AbstractTransformer
 
             // currency is object specific or primary, already determined above.
             'currency_id'                     => (string) $currency['id'],
+            'currency_name'                   => $currency['name'],
             'currency_code'                   => $currency['code'],
             'currency_symbol'                 => $currency['symbol'],
             'currency_decimal_places'         => $currency['decimal_places'],
+
             'primary_currency_id'             => (string) $this->primary->id,
+            'primary_currency_name'           => $this->primary->name,
             'primary_currency_code'           => $this->primary->code,
             'primary_currency_symbol'         => $this->primary->symbol,
             'primary_currency_decimal_places' => $this->primary->decimal_places,

app/Transformers/AvailableBudgetTransformer.php

@@ -51,11 +51,11 @@ class AvailableBudgetTransformer extends AbstractTransformer
     public function transform(AvailableBudget $availableBudget): array
     {
         $currency = $availableBudget->transactionCurrency;
-        $amount   = app('steam')->bcround($availableBudget->amount, $currency->decimal_places);
+        $amount   = Steam::bcround($availableBudget->amount, $currency->decimal_places);
         $pcAmount = null;
 
         if ($this->convertToPrimary) {
-            $pcAmount = app('steam')->bcround($availableBudget->native_amount, $this->primary->decimal_places);
+            $pcAmount = Steam::bcround($availableBudget->native_amount, $this->primary->decimal_places);
         }
 
         return [
@@ -66,16 +66,17 @@ class AvailableBudgetTransformer extends AbstractTransformer
             // currencies according to 6.3.0
             'object_has_currency_setting'     => true,
             'currency_id'                     => (string) $currency->id,
+            'currency_name'                   => $currency->name,
             'currency_code'                   => $currency->code,
             'currency_symbol'                 => $currency->symbol,
             'currency_decimal_places'         => $currency->decimal_places,
 
             'primary_currency_id'             => (string) $this->primary->id,
+            'primary_currency_name'           => $this->primary->name,
             'primary_currency_code'           => $this->primary->code,
             'primary_currency_symbol'         => $this->primary->symbol,
             'primary_currency_decimal_places' => $this->primary->decimal_places,
 
-
             'amount'                          => $amount,
             'pc_amount'                       => $pcAmount,
             'start'                           => $availableBudget->start_date->toAtomString(),

app/Transformers/BillTransformer.php

@@ -60,11 +60,13 @@ class BillTransformer extends AbstractTransformer
             // currencies according to 6.3.0
             'object_has_currency_setting'     => true,
             'currency_id'                     => (string) $bill->transaction_currency_id,
+            'currency_name'                   => $currency->name,
             'currency_code'                   => $currency->code,
             'currency_symbol'                 => $currency->symbol,
             'currency_decimal_places'         => $currency->decimal_places,
 
             'primary_currency_id'             => (string) $this->primary->id,
+            'primary_currency_name'           => $this->primary->name,
             'primary_currency_code'           => $this->primary->code,
             'primary_currency_symbol'         => $this->primary->symbol,
             'primary_currency_decimal_places' => $this->primary->decimal_places,

app/Transformers/BudgetLimitTransformer.php

@@ -26,10 +26,8 @@ namespace FireflyIII\Transformers;
 
 use FireflyIII\Models\BudgetLimit;
 use FireflyIII\Models\TransactionCurrency;
-use FireflyIII\Repositories\Budget\BudgetLimitRepositoryInterface;
-use FireflyIII\Repositories\Budget\OperationsRepository;
 use FireflyIII\Support\Facades\Amount;
-use Illuminate\Support\Collection;
+use FireflyIII\Support\Facades\Steam;
 use League\Fractal\Resource\Item;
 
 /**
@@ -42,11 +40,11 @@ class BudgetLimitTransformer extends AbstractTransformer
             'budget',
         ];
     protected bool                $convertToPrimary;
-    protected TransactionCurrency $primary;
+    protected TransactionCurrency $primaryCurrency;
 
     public function __construct()
     {
-        $this->primary          = Amount::getPrimaryCurrency();
+        $this->primaryCurrency  = Amount::getPrimaryCurrency();
         $this->convertToPrimary = Amount::convertToPrimary();
     }
 
@@ -65,39 +63,19 @@ class BudgetLimitTransformer extends AbstractTransformer
      */
     public function transform(BudgetLimit $budgetLimit): array
     {
-        $repository            = app(OperationsRepository::class);
-        $limitRepos            = app(BudgetLimitRepositoryInterface::class);
-        $repository->setUser($budgetLimit->budget->user);
-        $limitRepos->setUser($budgetLimit->budget->user);
-        $expenses              = $repository->sumExpenses(
-            $budgetLimit->start_date,
-            $budgetLimit->end_date,
-            null,
-            new Collection([$budgetLimit->budget]),
-            $budgetLimit->transactionCurrency
-        );
-        $currency              = $budgetLimit->transactionCurrency;
-        $amount                = $budgetLimit->amount;
-        $notes                 = $limitRepos->getNoteText($budgetLimit);
-        $currencyDecimalPlaces = 2;
-        $currencyId            = null;
-        $currencyName          = null;
-        $currencyCode          = null;
-        $currencySymbol        = null;
-        if (null !== $currency) {
-            $amount                = $budgetLimit->amount;
-            $currencyId            = $currency->id;
-            $currencyName          = $currency->name;
-            $currencyCode          = $currency->code;
-            $currencySymbol        = $currency->symbol;
-            $currencyDecimalPlaces = $currency->decimal_places;
-        }
-        $amount                = app('steam')->bcround($amount, $currencyDecimalPlaces);
-        $primary               = $this->primary;
-        if (!$this->convertToPrimary) {
-            $primary = null;
-        }
 
+        $currency = $budgetLimit->transactionCurrency;
+        if (null === $currency) {
+            $currency = $this->primaryCurrency;
+        }
+        $amount   = Steam::bcround($budgetLimit->amount, $currency->decimal_places);
+        $pcAmount = null;
+        if ($this->convertToPrimary && $currency->id === $this->primaryCurrency->id) {
+            $pcAmount = $amount;
+        }
+        if ($this->convertToPrimary && $currency->id !== $this->primaryCurrency->id) {
+            $pcAmount = Steam::bcround($budgetLimit->native_amount, $this->primaryCurrency->decimal_places);
+        }
 
         return [
             'id'                              => (string)$budgetLimit->id,
@@ -106,20 +84,28 @@ class BudgetLimitTransformer extends AbstractTransformer
             'start'                           => $budgetLimit->start_date->toAtomString(),
             'end'                             => $budgetLimit->end_date->endOfDay()->toAtomString(),
             'budget_id'                       => (string)$budgetLimit->budget_id,
-            'currency_id'                     => (string)$currencyId,
-            'currency_code'                   => $currencyCode,
-            'currency_name'                   => $currencyName,
-            'currency_decimal_places'         => $currencyDecimalPlaces,
-            'currency_symbol'                 => $currencySymbol,
-            'primary_currency_id'             => $primary instanceof TransactionCurrency ? (string)$primary->id : null,
-            'primary_currency_code'           => $primary?->code,
-            'primary_currency_symbol'         => $primary?->symbol,
-            'primary_currency_decimal_places' => $primary?->decimal_places,
+
+            // currency settings according to 6.3.0
+            'object_has_currency_setting'     => true,
+
+            'currency_id'                     => (string)$currency->id,
+            'currency_name'                   => $currency->name,
+            'currency_code'                   => $currency->code,
+            'currency_symbol'                 => $currency->symbol,
+            'currency_decimal_places'         => $currency->decimal_places,
+
+            'primary_currency_id'             => (int)$this->primaryCurrency->id,
+            'primary_currency_name'           => $this->primaryCurrency->name,
+            'primary_currency_code'           => $this->primaryCurrency->code,
+            'primary_currency_symbol'         => $this->primaryCurrency->symbol,
+            'primary_currency_decimal_places' => $this->primaryCurrency->decimal_places,
+
             'amount'                          => $amount,
-            'pc_amount'                       => $this->convertToPrimary ? app('steam')->bcround($budgetLimit->native_amount, $primary->decimal_places) : null,
+            'pc_amount'                       => $pcAmount,
             'period'                          => $budgetLimit->period,
-            'spent'                           => $expenses[$currencyId]['sum'] ?? '0', // will be in primary currency if convertToPrimary.
-            'notes'                           => '' === $notes ? null : $notes,
+            'spent'                           => $budgetLimit->meta['spent'],
+            'pc_spent'                        => $budgetLimit->meta['pc_spent'],
+            'notes'                           => $budgetLimit->meta['notes'],
             'links'                           => [
                 [
                     'rel' => 'self',

app/Transformers/BudgetTransformer.php

@@ -27,10 +27,8 @@ namespace FireflyIII\Transformers;
 use FireflyIII\Enums\AutoBudgetType;
 use FireflyIII\Models\Budget;
 use FireflyIII\Models\TransactionCurrency;
-use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
-use FireflyIII\Repositories\Budget\OperationsRepositoryInterface;
 use FireflyIII\Support\Facades\Amount;
-use Illuminate\Support\Collection;
+use FireflyIII\Support\Facades\Steam;
 use Symfony\Component\HttpFoundation\ParameterBag;
 
 /**
@@ -38,21 +36,23 @@ use Symfony\Component\HttpFoundation\ParameterBag;
  */
 class BudgetTransformer extends AbstractTransformer
 {
-    private readonly bool                          $convertToPrimary;
-    private readonly TransactionCurrency           $primary;
-    private readonly OperationsRepositoryInterface $opsRepository;
-    private readonly BudgetRepositoryInterface     $repository;
+    private readonly bool                $convertToPrimary;
+    private readonly TransactionCurrency $primaryCurrency;
+    private array                        $types;
 
     /**
      * BudgetTransformer constructor.
      */
     public function __construct()
     {
-        $this->opsRepository    = app(OperationsRepositoryInterface::class);
-        $this->repository       = app(BudgetRepositoryInterface::class);
         $this->parameters       = new ParameterBag();
-        $this->primary          = Amount::getPrimaryCurrency();
+        $this->primaryCurrency  = Amount::getPrimaryCurrency();
         $this->convertToPrimary = Amount::convertToPrimary();
+        $this->types            = [
+            AutoBudgetType::AUTO_BUDGET_RESET->value    => 'reset',
+            AutoBudgetType::AUTO_BUDGET_ROLLOVER->value => 'rollover',
+            AutoBudgetType::AUTO_BUDGET_ADJUSTED->value => 'adjusted',
+        ];
     }
 
     /**
@@ -60,69 +60,51 @@ class BudgetTransformer extends AbstractTransformer
      */
     public function transform(Budget $budget): array
     {
-        $this->opsRepository->setUser($budget->user);
-        $start      = $this->parameters->get('start');
-        $end        = $this->parameters->get('end');
-        $autoBudget = $this->repository->getAutoBudget($budget);
-        $spent      = [];
-        if (null !== $start && null !== $end) {
-            $spent = $this->beautify($this->opsRepository->sumExpenses($start, $end, null, new Collection([$budget])));
-        }
 
         // info for auto budget.
-        $abType     = null;
-        $abAmount   = null;
-        $abPrimary  = null;
-        $abPeriod   = null;
-        $notes      = $this->repository->getNoteText($budget);
+        $abType    = null;
+        $abAmount  = null;
+        $abPrimary = null;
+        $abPeriod  = null;
 
-        $types      = [
-            AutoBudgetType::AUTO_BUDGET_RESET->value    => 'reset',
-            AutoBudgetType::AUTO_BUDGET_ROLLOVER->value => 'rollover',
-            AutoBudgetType::AUTO_BUDGET_ADJUSTED->value => 'adjusted',
-        ];
-        $currency   = $autoBudget?->transactionCurrency;
-        $primary    = $this->primary;
-        if (!$this->convertToPrimary) {
-            $primary = null;
-        }
-        if (null === $autoBudget) {
-            $currency = $primary;
-        }
-        if (null !== $autoBudget) {
-            $abType    = $types[$autoBudget->auto_budget_type];
-            $abAmount  = app('steam')->bcround($autoBudget->amount, $currency->decimal_places);
-            $abPrimary = $this->convertToPrimary ? app('steam')->bcround($autoBudget->native_amount, $primary->decimal_places) : null;
-            $abPeriod  = $autoBudget->period;
+        $currency  = $budget->meta['currency'] ?? null;
+
+        if (null !== $budget->meta['auto_budget']) {
+            $abType    = $this->types[$budget->meta['auto_budget']['type']];
+            $abAmount  = Steam::bcround($budget->meta['auto_budget']['amount'], $currency->decimal_places);
+            $abPrimary = $this->convertToPrimary ? Steam::bcround($budget->meta['auto_budget']['pc_amount'], $this->primaryCurrency->decimal_places) : null;
+            $abPeriod  = $budget->meta['auto_budget']['period'];
         }
 
         return [
-            'id'                              => (string) $budget->id,
+            'id'                              => (string)$budget->id,
             'created_at'                      => $budget->created_at->toAtomString(),
             'updated_at'                      => $budget->updated_at->toAtomString(),
             'active'                          => $budget->active,
             'name'                            => $budget->name,
             'order'                           => $budget->order,
-            'notes'                           => $notes,
+            'notes'                           => $budget->meta['notes'],
             'auto_budget_type'                => $abType,
             'auto_budget_period'              => $abPeriod,
 
-            'currency_id'                     => null === $autoBudget ? null : (string) $autoBudget->transactionCurrency->id,
-            'currency_code'                   => $autoBudget?->transactionCurrency->code,
-            'currency_name'                   => $autoBudget?->transactionCurrency->name,
-            'currency_decimal_places'         => $autoBudget?->transactionCurrency->decimal_places,
-            'currency_symbol'                 => $autoBudget?->transactionCurrency->symbol,
+            // new currency settings.
+            'object_has_currency_setting'     => null !== $budget->meta['currency'],
+            'currency_id'                     => null === $currency ? null : (string)$currency->id,
+            'currency_code'                   => $currency?->code,
+            'currency_name'                   => $currency?->name,
+            'currency_symbol'                 => $currency?->symbol,
+            'currency_decimal_places'         => $currency?->decimal_places,
 
-            'primary_currency_id'             => $primary instanceof TransactionCurrency ? (string) $primary->id : null,
-            'primary_currency_code'           => $primary?->code,
-            'primary_currency_symbol'         => $primary?->symbol,
-            'primary_currency_decimal_places' => $primary?->decimal_places,
-
-            // amount and primary currency amount if present.
+            'primary_currency_id'             => (string)$this->primaryCurrency->id,
+            'primary_currency_name'           => $this->primaryCurrency->name,
+            'primary_currency_code'           => $this->primaryCurrency->code,
+            'primary_currency_symbol'         => $this->primaryCurrency->symbol,
+            'primary_currency_decimal_places' => $this->primaryCurrency->decimal_places,
 
             'auto_budget_amount'              => $abAmount,
             'pc_auto_budget_amount'           => $abPrimary,
-            'spent'                           => $spent, // always in primary currency.
+            'spent'                           => $this->beautify($budget->meta['spent']), // always in primary currency.
+            'pc_spent'                        => $this->beautify($budget->meta['pc_spent']), // always in primary currency.
             'links'                           => [
                 [
                     'rel' => 'self',
@@ -136,7 +118,7 @@ class BudgetTransformer extends AbstractTransformer
     {
         $return = [];
         foreach ($array as $data) {
-            $data['sum'] = app('steam')->bcround($data['sum'], (int) $data['currency_decimal_places']);
+            $data['sum'] = Steam::bcround($data['sum'], (int)$data['currency_decimal_places']);
             $return[]    = $data;
         }
 

app/Transformers/CategoryTransformer.php

@@ -99,7 +99,7 @@ class CategoryTransformer extends AbstractTransformer
     {
         $return = [];
         foreach ($array as $data) {
-            $data['sum'] = app('steam')->bcround($data['sum'], (int)$data['currency_decimal_places']);
+            $data['sum'] = Steam::bcround($data['sum'], (int)$data['currency_decimal_places']);
             $return[]    = $data;
         }
 

app/Transformers/PiggyBankEventTransformer.php

@@ -75,7 +75,7 @@ class PiggyBankEventTransformer extends AbstractTransformer
             'id'                      => (string) $event->id,
             'created_at'              => $event->created_at?->toAtomString(),
             'updated_at'              => $event->updated_at?->toAtomString(),
-            'amount'                  => app('steam')->bcround($event->amount, $currency->decimal_places),
+            'amount'                  => Steam::bcround($event->amount, $currency->decimal_places),
             'currency_id'             => (string) $currency->id,
             'currency_code'           => $currency->code,
             'currency_symbol'         => $currency->symbol,

app/Transformers/PiggyBankTransformer.php

@@ -88,9 +88,9 @@ class PiggyBankTransformer extends AbstractTransformer
         if (0 !== bccomp($targetAmount, '0')) { // target amount is not 0.00
             $leftToSave   = bcsub($piggyBank->target_amount, $currentAmount);
             $percentage   = (int) bcmul(bcdiv($currentAmount, $targetAmount), '100');
-            $targetAmount = app('steam')->bcround($targetAmount, $currency->decimal_places);
-            $leftToSave   = app('steam')->bcround($leftToSave, $currency->decimal_places);
-            $savePerMonth = app('steam')->bcround($this->piggyRepos->getSuggestedMonthlyAmount($piggyBank), $currency->decimal_places);
+            $targetAmount = Steam::bcround($targetAmount, $currency->decimal_places);
+            $leftToSave   = Steam::bcround($leftToSave, $currency->decimal_places);
+            $savePerMonth = Steam::bcround($this->piggyRepos->getSuggestedMonthlyAmount($piggyBank), $currency->decimal_places);
         }
         $startDate        = $piggyBank->start_date?->format('Y-m-d');
         $targetDate       = $piggyBank->target_date?->format('Y-m-d');

app/Transformers/RecurrenceTransformer.php

@@ -193,10 +193,10 @@ class RecurrenceTransformer extends AbstractTransformer
                 $destinationType = $destinationAccount->accountType->type;
                 $destinationIban = $destinationAccount->iban;
             }
-            $amount                = app('steam')->bcround($transaction->amount, $transaction->transactionCurrency->decimal_places);
+            $amount                = Steam::bcround($transaction->amount, $transaction->transactionCurrency->decimal_places);
             $foreignAmount         = null;
             if (null !== $transaction->foreign_currency_id && null !== $transaction->foreign_amount) {
-                $foreignAmount = app('steam')->bcround($transaction->foreign_amount, $foreignCurrencyDp);
+                $foreignAmount = Steam::bcround($transaction->foreign_amount, $foreignCurrencyDp);
             }
             $transactionArray      = [
                 'id'                              => (string) $transaction->id,

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-08-03',
-    'build_time'                   => 1754232243,
+    'version'                      => 'develop/2025-08-04',
+    'build_time'                   => 1754278851,
     'api_version'                  => '2.1.0', // field is no longer used.
     'db_version'                   => 26,
 

resources/assets/v1/src/locales/pl.json

@@ -3,8 +3,8 @@
         "administrations_page_title": "Ustawienia finansowe",
         "administrations_index_menu": "Ustawienia finansowe",
         "expires_at": "Expires at",
-        "temp_administrations_introduction": "Firefly III will soon get the ability to manage multiple financial administrations. Right now, you only have the one. You can set the title of this administration and its primary currency. This replaces the previous setting where you would set your \"default currency\". This setting is now tied to the financial administration and can be different per administration.",
-        "administration_currency_form_help": "It may take a long time for the page to load if you change the primary currency because transaction may need to be converted to your (new) primary currency.",
+        "temp_administrations_introduction": "Firefly III wkr\u00f3tce uzyska mo\u017cliwo\u015b\u0107 zarz\u0105dzania wieloma ustawieniami finansowymi. W tej chwili jest tylko jedno domy\u015blne ustawienie. Mo\u017cesz ustawi\u0107 jego tytu\u0142 i walut\u0119 g\u0142\u00f3wn\u0105. To zast\u0119puje poprzednie ustawienia, w kt\u00f3rym mo\u017cna by\u0142o ustawi\u0107 \"domy\u015bln\u0105 walut\u0119\". Jest ona obecnie powi\u0105zana z wybranym ustawieniem finansowym i mo\u017ce by\u0107 zmienione w tej zak\u0142adce.",
+        "administration_currency_form_help": "Wczytywanie strony mo\u017ce zaj\u0105\u0107 du\u017co czasu, je\u015bli zmienisz walut\u0119 g\u0142\u00f3wn\u0105, poniewa\u017c transakcja mo\u017ce wymaga\u0107 przewalutowania na (now\u0105) walut\u0119 g\u0142\u00f3wn\u0105.",
         "administrations_page_edit_sub_title_js": "Edytuj ustawienia finansowe \"{title}\"",
         "table": "Tabela",
         "welcome_back": "Co jest grane?",
@@ -102,7 +102,7 @@
         "profile_oauth_client_secret_title": "Sekret klienta",
         "profile_oauth_client_secret_expl": "Oto tw\u00f3j nowy sekret klienta. Jest to jedyny raz, gdy zostanie wy\u015bwietlony, wi\u0119c nie zgub go! Mo\u017cesz teraz u\u017cy\u0107 tego sekretu, aby wykona\u0107 zapytania API.",
         "profile_oauth_confidential": "Poufne",
-        "profile_oauth_confidential_help": "Require the client to authenticate with a secret. Confidential clients can hold credentials in a secure way without exposing them to unauthorized parties. Public applications, such as primary desktop or JavaScript SPA applications, are unable to hold secrets securely.",
+        "profile_oauth_confidential_help": "Wymagaj od klienta uwierzytelnienia za pomoc\u0105 sekretu. Poufni klienci mog\u0105 przechowywa\u0107 po\u015bwiadczenia w bezpieczny spos\u00f3b bez nara\u017cania ich na dost\u0119p przez nieuprawnione strony. Publiczne aplikacje, takie jak natywne aplikacje desktopowe lub JavaScript SPA, nie s\u0105 w stanie bezpiecznie trzyma\u0107 sekret\u00f3w.",
         "multi_account_warning_unknown": "W zale\u017cno\u015bci od rodzaju transakcji, kt\u00f3r\u0105 tworzysz, konto \u017ar\u00f3d\u0142owe i\/lub docelowe kolejnych podzia\u0142\u00f3w mo\u017ce zosta\u0107 ustawione na konto zdefiniowane w pierwszym podziale transakcji.",
         "multi_account_warning_withdrawal": "Pami\u0119taj, \u017ce konto \u017ar\u00f3d\u0142owe kolejnych podzia\u0142\u00f3w zostanie ustawione na konto zdefiniowane w pierwszym podziale wyp\u0142aty.",
         "multi_account_warning_deposit": "Pami\u0119taj, \u017ce konto docelowe kolejnych podzia\u0142\u00f3w zostanie ustawione na konto zdefiniowane w pierwszym podziale wp\u0142aty.",
@@ -154,7 +154,7 @@
         "url": "URL",
         "active": "Aktywny",
         "interest_date": "Data odsetek",
-        "administration_currency": "Waluta podstawowa",
+        "administration_currency": "Waluta g\u0142\u00f3wna",
         "title": "Tytu\u0142",
         "date": "Data",
         "book_date": "Data ksi\u0119gowania",
@@ -174,7 +174,7 @@
     "list": {
         "title": "Tytu\u0142",
         "active": "Jest aktywny?",
-        "primary_currency": "Waluta podstawowa",
+        "primary_currency": "Waluta g\u0142\u00f3wna",
         "trigger": "Wyzwalacz",
         "response": "Odpowied\u017a",
         "delivery": "Dor\u0119czenie",

resources/views/budgets/edit.twig

@@ -34,6 +34,7 @@
                         {{ CurrencyForm.currencyList('auto_budget_currency_id', autoBudget.transaction_currency_id) }}
                         {{ ExpandedForm.amountNoCurrency('auto_budget_amount', preFilled.auto_budget_amount) }}
                         {{ ExpandedForm.select('auto_budget_period', autoBudgetPeriods, autoBudget.period) }}
+                        {{ ExpandedForm.textarea('notes',preFilled.notes,{helpText: trans('firefly.field_supports_markdown')}) }}
                         {{ ExpandedForm.file('attachments[]', {'multiple': 'multiple','helpText': trans('firefly.upload_max_file_size', {'size': uploadSize|filesize}) }) }}
                     </div>
                 </div>