From 984aa02e35353c7a9454edc995f2e90738b0fc7c Mon Sep 17 00:00:00 2001 From: JC5 Date: Sun, 17 Aug 2025 16:56:00 +0200 Subject: [PATCH] =?UTF-8?q?=F0=9F=A4=96=20Auto=20commit=20for=20release=20?= =?UTF-8?q?'develop'=20on=202025-08-17?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Enrichments/BudgetLimitEnrichment.php | 20 ++++++++++--------- config/firefly.php | 2 +- resources/assets/v1/src/locales/de.json | 10 +++++----- resources/assets/v1/src/locales/fr.json | 10 +++++----- 4 files changed, 22 insertions(+), 20 deletions(-) diff --git a/app/Support/JsonApi/Enrichments/BudgetLimitEnrichment.php b/app/Support/JsonApi/Enrichments/BudgetLimitEnrichment.php index e84afbe983..787f3c7844 100644 --- a/app/Support/JsonApi/Enrichments/BudgetLimitEnrichment.php +++ b/app/Support/JsonApi/Enrichments/BudgetLimitEnrichment.php @@ -75,8 +75,8 @@ class BudgetLimitEnrichment implements EnrichmentInterface private function collectIds(): void { - $this->start = $this->collection->min('start_date') ?? Carbon::now()->startOfMonth(); - $this->end = $this->collection->max('end_date') ?? Carbon::now()->endOfMonth(); + $this->start = $this->collection->min('start_date') ?? Carbon::now()->startOfMonth(); + $this->end = $this->collection->max('end_date') ?? Carbon::now()->endOfMonth(); /** @var BudgetLimit $limit */ foreach ($this->collection as $limit) { @@ -93,9 +93,10 @@ class BudgetLimitEnrichment implements EnrichmentInterface 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']; } @@ -127,9 +128,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) { @@ -158,9 +159,10 @@ class BudgetLimitEnrichment implements EnrichmentInterface private function stringifyIds(): void { - $this->expenses = array_map(function ($first) { + $this->expenses = array_map(function ($first) { return array_map(function ($second) { $second['currency_id'] = (string)($second['currency_id'] ?? 0); + return $second; }, $first); }, $this->expenses); @@ -168,9 +170,9 @@ class BudgetLimitEnrichment implements EnrichmentInterface $this->pcExpenses = array_map(function ($first) { return array_map(function ($second) { $second['currency_id'] = (string)($second['currency_id'] ?? 0); + return $second; }, $first); }, $this->expenses); } - } diff --git a/config/firefly.php b/config/firefly.php index bffdeb9878..f5dcceb682 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-08-17', - 'build_time' => 1755424098, + 'build_time' => 1755442451, 'api_version' => '2.1.0', // field is no longer used. 'db_version' => 26, diff --git a/resources/assets/v1/src/locales/de.json b/resources/assets/v1/src/locales/de.json index 35b1c49748..18ee0b7ab4 100644 --- a/resources/assets/v1/src/locales/de.json +++ b/resources/assets/v1/src/locales/de.json @@ -110,13 +110,13 @@ "webhook_trigger_STORE_TRANSACTION": "Nach Erstellen einer Buchung", "webhook_trigger_UPDATE_TRANSACTION": "Nach Aktualisierung einer Buchung", "webhook_trigger_DESTROY_TRANSACTION": "Nach dem L\u00f6schen einer Buchung", - "webhook_trigger_STORE_BUDGET": "After budget creation", - "webhook_trigger_UPDATE_BUDGET": "After budget update", - "webhook_trigger_DESTROY_BUDGET": "After budget delete", - "webhook_trigger_STORE_UPDATE_BUDGET_LIMIT": "After budgeted amount change", + "webhook_trigger_STORE_BUDGET": "Nach der Erstellung des Budgets", + "webhook_trigger_UPDATE_BUDGET": "Nach der Aktualisierung des Budgets", + "webhook_trigger_DESTROY_BUDGET": "Nach dem L\u00f6schen des Budgets", + "webhook_trigger_STORE_UPDATE_BUDGET_LIMIT": "Nach dem \u00c4ndern des budgetierten Betrags", "webhook_response_TRANSACTIONS": "Buchungsdetails", "webhook_response_ACCOUNTS": "Kontodetails", - "webhook_response_NONE": "No details", + "webhook_response_NONE": "Keine Details", "webhook_delivery_JSON": "JSON", "actions": "Aktionen", "meta_data": "Metadaten", diff --git a/resources/assets/v1/src/locales/fr.json b/resources/assets/v1/src/locales/fr.json index 6b9bdd822d..0f56cf55b0 100644 --- a/resources/assets/v1/src/locales/fr.json +++ b/resources/assets/v1/src/locales/fr.json @@ -110,13 +110,13 @@ "webhook_trigger_STORE_TRANSACTION": "Apr\u00e8s la cr\u00e9ation de l'op\u00e9ration", "webhook_trigger_UPDATE_TRANSACTION": "Apr\u00e8s la mise \u00e0 jour de l'op\u00e9ration", "webhook_trigger_DESTROY_TRANSACTION": "Apr\u00e8s la suppression de l'op\u00e9ration", - "webhook_trigger_STORE_BUDGET": "After budget creation", - "webhook_trigger_UPDATE_BUDGET": "After budget update", - "webhook_trigger_DESTROY_BUDGET": "After budget delete", - "webhook_trigger_STORE_UPDATE_BUDGET_LIMIT": "After budgeted amount change", + "webhook_trigger_STORE_BUDGET": "Apr\u00e8s la cr\u00e9ation du budget", + "webhook_trigger_UPDATE_BUDGET": "Apr\u00e8s la mise \u00e0 jour du budget", + "webhook_trigger_DESTROY_BUDGET": "Apr\u00e8s la suppression du budget", + "webhook_trigger_STORE_UPDATE_BUDGET_LIMIT": "Apr\u00e8s le changement du montant budg\u00e9tis\u00e9", "webhook_response_TRANSACTIONS": "D\u00e9tails de l'op\u00e9ration", "webhook_response_ACCOUNTS": "D\u00e9tails du compte", - "webhook_response_NONE": "No details", + "webhook_response_NONE": "Aucun d\u00e9tail", "webhook_delivery_JSON": "JSON", "actions": "Actions", "meta_data": "M\u00e9tadonn\u00e9es",