From b915548e82be86375389c3f612a87fdcb79d1e91 Mon Sep 17 00:00:00 2001 From: JC5 Date: Mon, 4 Aug 2025 05:42:41 +0200 Subject: [PATCH] =?UTF-8?q?=F0=9F=A4=96=20Auto=20commit=20for=20release=20?= =?UTF-8?q?'develop'=20on=202025-08-04?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Models/Budget/ListController.php | 6 +-- .../Models/Budget/ShowController.php | 4 +- .../Models/Budget/StoreController.php | 6 +-- .../Models/Budget/UpdateController.php | 14 +++--- .../Models/BudgetLimit/ShowController.php | 14 +++--- .../Models/BudgetLimit/StoreController.php | 6 +-- .../Models/BudgetLimit/UpdateController.php | 6 +-- .../TransactionCurrency/ListController.php | 6 +-- app/Http/Requests/BudgetFormUpdateRequest.php | 12 ++--- .../Budget/OperationsRepository.php | 2 +- .../Budget/OperationsRepositoryInterface.php | 1 + .../JsonApi/Enrichments/BudgetEnrichment.php | 22 +++++----- .../Enrichments/BudgetLimitEnrichment.php | 20 ++++++--- app/Transformers/BudgetLimitTransformer.php | 40 ++++++++--------- app/Transformers/BudgetTransformer.php | 44 +++++++++---------- config/firefly.php | 4 +- resources/assets/v1/src/locales/pl.json | 10 ++--- 17 files changed, 113 insertions(+), 104 deletions(-) diff --git a/app/Api/V1/Controllers/Models/Budget/ListController.php b/app/Api/V1/Controllers/Models/Budget/ListController.php index e06dc7d0d5..036fa6d4ec 100644 --- a/app/Api/V1/Controllers/Models/Budget/ListController.php +++ b/app/Api/V1/Controllers/Models/Budget/ListController.php @@ -120,10 +120,10 @@ class ListController extends Controller // enrich /** @var User $admin */ - $admin = auth()->user(); - $enrichment = new BudgetLimitEnrichment(); + $admin = auth()->user(); + $enrichment = new BudgetLimitEnrichment(); $enrichment->setUser($admin); - $budgetLimits = $enrichment->enrich($budgetLimits); + $budgetLimits = $enrichment->enrich($budgetLimits); /** @var BudgetLimitTransformer $transformer */ diff --git a/app/Api/V1/Controllers/Models/Budget/ShowController.php b/app/Api/V1/Controllers/Models/Budget/ShowController.php index 3b0b603fe2..e5062863b1 100644 --- a/app/Api/V1/Controllers/Models/Budget/ShowController.php +++ b/app/Api/V1/Controllers/Models/Budget/ShowController.php @@ -91,7 +91,7 @@ class ShowController extends Controller $enrichment->setUser($admin); $enrichment->setStart($this->parameters->get('start')); $enrichment->setEnd($this->parameters->get('end')); - $budgets = $enrichment->enrich($budgets); + $budgets = $enrichment->enrich($budgets); // make paginator: $paginator = new LengthAwarePaginator($budgets, $count, $pageSize, $this->parameters->get('page')); @@ -121,7 +121,7 @@ class ShowController extends Controller $enrichment->setUser($admin); $enrichment->setStart($this->parameters->get('start')); $enrichment->setEnd($this->parameters->get('end')); - $budget = $enrichment->enrichSingle($budget); + $budget = $enrichment->enrichSingle($budget); /** @var BudgetTransformer $transformer */ $transformer = app(BudgetTransformer::class); diff --git a/app/Api/V1/Controllers/Models/Budget/StoreController.php b/app/Api/V1/Controllers/Models/Budget/StoreController.php index f0e2a175f6..b6d9e85e6c 100644 --- a/app/Api/V1/Controllers/Models/Budget/StoreController.php +++ b/app/Api/V1/Controllers/Models/Budget/StoreController.php @@ -73,10 +73,10 @@ class StoreController extends Controller // enrich /** @var User $admin */ - $admin = auth()->user(); - $enrichment = new BudgetEnrichment(); + $admin = auth()->user(); + $enrichment = new BudgetEnrichment(); $enrichment->setUser($admin); - $budget = $enrichment->enrichSingle($budget); + $budget = $enrichment->enrichSingle($budget); /** @var BudgetTransformer $transformer */ $transformer = app(BudgetTransformer::class); diff --git a/app/Api/V1/Controllers/Models/Budget/UpdateController.php b/app/Api/V1/Controllers/Models/Budget/UpdateController.php index 783aa7286c..b6524ba738 100644 --- a/app/Api/V1/Controllers/Models/Budget/UpdateController.php +++ b/app/Api/V1/Controllers/Models/Budget/UpdateController.php @@ -65,22 +65,22 @@ class UpdateController extends Controller */ public function update(UpdateRequest $request, Budget $budget): JsonResponse { - $data = $request->getAll(); - $budget = $this->repository->update($budget, $data); - $manager = $this->getManager(); + $data = $request->getAll(); + $budget = $this->repository->update($budget, $data); + $manager = $this->getManager(); // enrich /** @var User $admin */ - $admin = auth()->user(); - $enrichment = new BudgetEnrichment(); + $admin = auth()->user(); + $enrichment = new BudgetEnrichment(); $enrichment->setUser($admin); - $budget = $enrichment->enrichSingle($budget); + $budget = $enrichment->enrichSingle($budget); /** @var BudgetTransformer $transformer */ $transformer = app(BudgetTransformer::class); $transformer->setParameters($this->parameters); - $resource = new Item($budget, $transformer, 'budgets'); + $resource = new Item($budget, $transformer, 'budgets'); return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE); } diff --git a/app/Api/V1/Controllers/Models/BudgetLimit/ShowController.php b/app/Api/V1/Controllers/Models/BudgetLimit/ShowController.php index 984d5a405e..2463533c1b 100644 --- a/app/Api/V1/Controllers/Models/BudgetLimit/ShowController.php +++ b/app/Api/V1/Controllers/Models/BudgetLimit/ShowController.php @@ -88,10 +88,10 @@ class ShowController extends Controller // enrich /** @var User $admin */ - $admin = auth()->user(); - $enrichment = new BudgetLimitEnrichment(); + $admin = auth()->user(); + $enrichment = new BudgetLimitEnrichment(); $enrichment->setUser($admin); - $budgetLimits = $enrichment->enrich($budgetLimits); + $budgetLimits = $enrichment->enrich($budgetLimits); /** @var BudgetLimitTransformer $transformer */ $transformer = app(BudgetLimitTransformer::class); @@ -124,10 +124,10 @@ class ShowController extends Controller // enrich /** @var User $admin */ - $admin = auth()->user(); - $enrichment = new BudgetLimitEnrichment(); + $admin = auth()->user(); + $enrichment = new BudgetLimitEnrichment(); $enrichment->setUser($admin); - $budgetLimits = $enrichment->enrich($budgetLimits); + $budgetLimits = $enrichment->enrich($budgetLimits); /** @var BudgetLimitTransformer $transformer */ $transformer = app(BudgetLimitTransformer::class); @@ -158,7 +158,7 @@ class ShowController extends Controller $admin = auth()->user(); $enrichment = new BudgetLimitEnrichment(); $enrichment->setUser($admin); - $budgetLimit = $enrichment->enrichSingle($budgetLimit); + $budgetLimit = $enrichment->enrichSingle($budgetLimit); /** @var BudgetLimitTransformer $transformer */ $transformer = app(BudgetLimitTransformer::class); diff --git a/app/Api/V1/Controllers/Models/BudgetLimit/StoreController.php b/app/Api/V1/Controllers/Models/BudgetLimit/StoreController.php index 12f0b239b2..c3b88d69f2 100644 --- a/app/Api/V1/Controllers/Models/BudgetLimit/StoreController.php +++ b/app/Api/V1/Controllers/Models/BudgetLimit/StoreController.php @@ -77,10 +77,10 @@ class StoreController extends Controller // enrich /** @var User $admin */ - $admin = auth()->user(); - $enrichment = new BudgetLimitEnrichment(); + $admin = auth()->user(); + $enrichment = new BudgetLimitEnrichment(); $enrichment->setUser($admin); - $budgetLimit = $enrichment->enrichSingle($budgetLimit); + $budgetLimit = $enrichment->enrichSingle($budgetLimit); /** @var BudgetLimitTransformer $transformer */ $transformer = app(BudgetLimitTransformer::class); diff --git a/app/Api/V1/Controllers/Models/BudgetLimit/UpdateController.php b/app/Api/V1/Controllers/Models/BudgetLimit/UpdateController.php index 5f0dab58d2..159c3c8b49 100644 --- a/app/Api/V1/Controllers/Models/BudgetLimit/UpdateController.php +++ b/app/Api/V1/Controllers/Models/BudgetLimit/UpdateController.php @@ -83,10 +83,10 @@ class UpdateController extends Controller // enrich /** @var User $admin */ - $admin = auth()->user(); - $enrichment = new BudgetLimitEnrichment(); + $admin = auth()->user(); + $enrichment = new BudgetLimitEnrichment(); $enrichment->setUser($admin); - $budgetLimit = $enrichment->enrich($budgetLimit); + $budgetLimit = $enrichment->enrich($budgetLimit); /** @var BudgetLimitTransformer $transformer */ $transformer = app(BudgetLimitTransformer::class); diff --git a/app/Api/V1/Controllers/Models/TransactionCurrency/ListController.php b/app/Api/V1/Controllers/Models/TransactionCurrency/ListController.php index fcd9a8dcc4..fe2c34ba8e 100644 --- a/app/Api/V1/Controllers/Models/TransactionCurrency/ListController.php +++ b/app/Api/V1/Controllers/Models/TransactionCurrency/ListController.php @@ -230,10 +230,10 @@ class ListController extends Controller // enrich /** @var User $admin */ - $admin = auth()->user(); - $enrichment = new BudgetLimitEnrichment(); + $admin = auth()->user(); + $enrichment = new BudgetLimitEnrichment(); $enrichment->setUser($admin); - $budgetLimits = $enrichment->enrich($budgetLimits); + $budgetLimits = $enrichment->enrich($budgetLimits); /** @var BudgetLimitTransformer $transformer */ $transformer = app(BudgetLimitTransformer::class); diff --git a/app/Http/Requests/BudgetFormUpdateRequest.php b/app/Http/Requests/BudgetFormUpdateRequest.php index 265e9686c9..459665e50f 100644 --- a/app/Http/Requests/BudgetFormUpdateRequest.php +++ b/app/Http/Requests/BudgetFormUpdateRequest.php @@ -47,12 +47,12 @@ 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'), ]; } diff --git a/app/Repositories/Budget/OperationsRepository.php b/app/Repositories/Budget/OperationsRepository.php index a807252708..26daa4aa1e 100644 --- a/app/Repositories/Budget/OperationsRepository.php +++ b/app/Repositories/Budget/OperationsRepository.php @@ -298,7 +298,7 @@ class OperationsRepository implements OperationsRepositoryInterface, UserGroupIn return $summarizer->groupByCurrencyId($expenses, 'negative', false); } -public function sumCollectedExpensesByBudget(array $expenses, Budget $budget, bool $convertToPrimary = false): array + public function sumCollectedExpensesByBudget(array $expenses, Budget $budget, bool $convertToPrimary = false): array { Log::debug(sprintf('Start of %s.', __METHOD__)); $summarizer = new TransactionSummarizer($this->user); diff --git a/app/Repositories/Budget/OperationsRepositoryInterface.php b/app/Repositories/Budget/OperationsRepositoryInterface.php index c0d1a0e7eb..01cce862d3 100644 --- a/app/Repositories/Budget/OperationsRepositoryInterface.php +++ b/app/Repositories/Budget/OperationsRepositoryInterface.php @@ -75,6 +75,7 @@ interface OperationsRepositoryInterface ): array; 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; diff --git a/app/Support/JsonApi/Enrichments/BudgetEnrichment.php b/app/Support/JsonApi/Enrichments/BudgetEnrichment.php index f663168fc1..2de1eb1156 100644 --- a/app/Support/JsonApi/Enrichments/BudgetEnrichment.php +++ b/app/Support/JsonApi/Enrichments/BudgetEnrichment.php @@ -1,5 +1,7 @@ primaryCurrency = Amount::getPrimaryCurrency(); } - public function enrich(Collection $collection): Collection { $this->collection = $collection; @@ -50,7 +51,7 @@ class BudgetEnrichment implements EnrichmentInterface return $this->collection; } - public function enrichSingle(Model|array $model): array|Model + public function enrichSingle(array|Model $model): array|Model { Log::debug(__METHOD__); $collection = new Collection([$model]); @@ -81,9 +82,10 @@ class BudgetEnrichment implements EnrichmentInterface 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(); + ->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']; } @@ -98,10 +100,11 @@ class BudgetEnrichment implements EnrichmentInterface '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, + 'spent' => $this->spent[$id] ?? null, + 'pc_spent' => $this->pcSpent[$id] ?? null, ]; $item->meta = $meta; + return $item; }); } @@ -109,6 +112,7 @@ class BudgetEnrichment implements EnrichmentInterface 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; @@ -131,7 +135,7 @@ class BudgetEnrichment implements EnrichmentInterface $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); + $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)); @@ -149,6 +153,4 @@ class BudgetEnrichment implements EnrichmentInterface { $this->start = $start; } - - } diff --git a/app/Support/JsonApi/Enrichments/BudgetLimitEnrichment.php b/app/Support/JsonApi/Enrichments/BudgetLimitEnrichment.php index e545a2712b..bacb95bed7 100644 --- a/app/Support/JsonApi/Enrichments/BudgetLimitEnrichment.php +++ b/app/Support/JsonApi/Enrichments/BudgetLimitEnrichment.php @@ -1,5 +1,7 @@ collectNotes(); $this->collectBudgets(); $this->appendCollectedData(); + return $this->collection; } - public function enrichSingle(Model|array $model): array|Model + public function enrichSingle(array|Model $model): array|Model { Log::debug(__METHOD__); $collection = new Collection()->push($model); @@ -70,19 +73,21 @@ class BudgetLimitEnrichment implements EnrichmentInterface { $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); + $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(); + ->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']; } @@ -99,6 +104,7 @@ class BudgetLimitEnrichment implements EnrichmentInterface 'pc_spent' => $this->pcExpenses[$id] ?? [], ]; $item->meta = $meta; + return $item; }); } @@ -108,9 +114,9 @@ class BudgetLimitEnrichment implements EnrichmentInterface $budgetIds = $this->collection->pluck('budget_id')->unique()->toArray(); $this->budgets = Budget::whereIn('id', $budgetIds)->get(); - $repository = app(OperationsRepository::class); + $repository = app(OperationsRepository::class); $repository->setUser($this->user); - $expenses = $repository->collectExpenses($this->start, $this->end, null, $this->budgets, null); + $expenses = $repository->collectExpenses($this->start, $this->end, null, $this->budgets, null); /** @var BudgetLimit $budgetLimit */ foreach ($this->collection as $budgetLimit) { diff --git a/app/Transformers/BudgetLimitTransformer.php b/app/Transformers/BudgetLimitTransformer.php index e0cfe3c4a7..f518cf17d8 100644 --- a/app/Transformers/BudgetLimitTransformer.php +++ b/app/Transformers/BudgetLimitTransformer.php @@ -78,21 +78,21 @@ class BudgetLimitTransformer extends AbstractTransformer } return [ - 'id' => (string)$budgetLimit->id, - 'created_at' => $budgetLimit->created_at->toAtomString(), - 'updated_at' => $budgetLimit->updated_at->toAtomString(), - 'start' => $budgetLimit->start_date->toAtomString(), - 'end' => $budgetLimit->end_date->endOfDay()->toAtomString(), - 'budget_id' => (string)$budgetLimit->budget_id, + 'id' => (string)$budgetLimit->id, + 'created_at' => $budgetLimit->created_at->toAtomString(), + 'updated_at' => $budgetLimit->updated_at->toAtomString(), + 'start' => $budgetLimit->start_date->toAtomString(), + 'end' => $budgetLimit->end_date->endOfDay()->toAtomString(), + 'budget_id' => (string)$budgetLimit->budget_id, // currency settings according to 6.3.0 - 'object_has_currency_setting' => true, + '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, + '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, @@ -100,16 +100,16 @@ class BudgetLimitTransformer extends AbstractTransformer 'primary_currency_symbol' => $this->primaryCurrency->symbol, 'primary_currency_decimal_places' => $this->primaryCurrency->decimal_places, - 'amount' => $amount, - 'pc_amount' => $pcAmount, - 'period' => $budgetLimit->period, - 'spent' => $budgetLimit->meta['spent'], - 'pc_spent' => $budgetLimit->meta['pc_spent'], - 'notes' => $budgetLimit->meta['notes'], - 'links' => [ + 'amount' => $amount, + 'pc_amount' => $pcAmount, + 'period' => $budgetLimit->period, + 'spent' => $budgetLimit->meta['spent'], + 'pc_spent' => $budgetLimit->meta['pc_spent'], + 'notes' => $budgetLimit->meta['notes'], + 'links' => [ [ 'rel' => 'self', - 'uri' => '/budgets/limits/' . $budgetLimit->id, + 'uri' => '/budgets/limits/'.$budgetLimit->id, ], ], ]; diff --git a/app/Transformers/BudgetTransformer.php b/app/Transformers/BudgetTransformer.php index 5e64d561b7..1c7d085372 100644 --- a/app/Transformers/BudgetTransformer.php +++ b/app/Transformers/BudgetTransformer.php @@ -67,7 +67,7 @@ class BudgetTransformer extends AbstractTransformer $abPrimary = null; $abPeriod = null; - $currency = $budget->meta['currency'] ?? null; + $currency = $budget->meta['currency'] ?? null; if (null !== $budget->meta['auto_budget']) { $abType = $this->types[$budget->meta['auto_budget']['type']]; @@ -77,23 +77,23 @@ class BudgetTransformer extends AbstractTransformer } return [ - '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' => $budget->meta['notes'], - 'auto_budget_type' => $abType, - 'auto_budget_period' => $abPeriod, + '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' => $budget->meta['notes'], + 'auto_budget_type' => $abType, + 'auto_budget_period' => $abPeriod, // 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, + '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' => (string)$this->primaryCurrency->id, 'primary_currency_name' => $this->primaryCurrency->name, @@ -101,14 +101,14 @@ class BudgetTransformer extends AbstractTransformer 'primary_currency_symbol' => $this->primaryCurrency->symbol, 'primary_currency_decimal_places' => $this->primaryCurrency->decimal_places, - 'auto_budget_amount' => $abAmount, - 'pc_auto_budget_amount' => $abPrimary, - 'spent' => $this->beautify($budget->meta['spent']), // always in primary currency. - 'pc_spent' => $this->beautify($budget->meta['pc_spent']), // always in primary currency. - 'links' => [ + 'auto_budget_amount' => $abAmount, + 'pc_auto_budget_amount' => $abPrimary, + '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', - 'uri' => '/budgets/' . $budget->id, + 'uri' => '/budgets/'.$budget->id, ], ], ]; diff --git a/config/firefly.php b/config/firefly.php index c8b87902f5..0b5c3715eb 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-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, diff --git a/resources/assets/v1/src/locales/pl.json b/resources/assets/v1/src/locales/pl.json index 7b7a8526a5..18c5bf4b61 100644 --- a/resources/assets/v1/src/locales/pl.json +++ b/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",