Merge pull request #11860 from firefly-iii/develop

🤖 Automatically merge the PR into the main branch.

app/Api/V1/Controllers/System/ConfigurationController.php

@@ -77,10 +77,18 @@ class ConfigurationController extends Controller
         $staticData = $this->getStaticConfiguration();
         $return     = [];
         foreach ($dynamicData as $key => $value) {
-            $return[] = ['title'    => sprintf('configuration.%s', $key), 'value'    => $value, 'editable' => true];
+            $return[] = [
+                'title'    => sprintf('configuration.%s', $key),
+                'value'    => $value,
+                'editable' => true,
+            ];
         }
         foreach ($staticData as $key => $value) {
-            $return[] = ['title'    => $key, 'value'    => $value, 'editable' => false];
+            $return[] = [
+                'title'    => $key,
+                'value'    => $value,
+                'editable' => false,
+            ];
         }
 
         return response()->api($return);
@@ -95,18 +103,30 @@ class ConfigurationController extends Controller
         $dynamic  = $this->getDynamicConfiguration();
         $shortKey = str_replace('configuration.', '', $configKey);
         if (str_starts_with($configKey, 'configuration.')) {
-            $data = ['title'    => $configKey, 'value'    => $dynamic[$shortKey], 'editable' => true];
+            $data = [
+                'title'    => $configKey,
+                'value'    => $dynamic[$shortKey],
+                'editable' => true,
+            ];
 
             return response()->api(['data' => $data])->header('Content-Type', self::JSON_CONTENT_TYPE);
         }
         if (str_starts_with($configKey, 'webhook.')) {
-            $data = ['title'    => $configKey, 'value'    => $this->getWebhookConfiguration($configKey), 'editable' => false];
+            $data = [
+                'title'    => $configKey,
+                'value'    => $this->getWebhookConfiguration($configKey),
+                'editable' => false,
+            ];
 
             return response()->api(['data' => $data])->header('Content-Type', self::JSON_CONTENT_TYPE);
         }
 
         // fallback
-        $data     = ['title'    => $configKey, 'value'    => config($shortKey), 'editable' => false];
+        $data     = [
+            'title'    => $configKey,
+            'value'    => config($shortKey),
+            'editable' => false,
+        ];
 
         return response()->api(['data' => $data])->header('Content-Type', self::JSON_CONTENT_TYPE);
     }
@@ -134,7 +154,11 @@ class ConfigurationController extends Controller
 
         // get updated config:
         $newConfig = $this->getDynamicConfiguration();
-        $data      = ['title'    => $name, 'value'    => $newConfig[$shortName], 'editable' => true];
+        $data      = [
+            'title'    => $name,
+            'value'    => $newConfig[$shortName],
+            'editable' => true,
+        ];
 
         return response()->api(['data' => $data])->header('Content-Type', self::CONTENT_TYPE);
     }
@@ -146,16 +170,30 @@ class ConfigurationController extends Controller
      */
     private function getDynamicConfiguration(): array
     {
-        $isDemoSite  = FireflyConfig::get('is_demo_site');
-        $updateCheck = FireflyConfig::get('permission_update_check');
-        $lastCheck   = FireflyConfig::get('last_update_check');
-        $singleUser  = FireflyConfig::get('single_user_mode');
+        $isDemoSite            = FireflyConfig::get('is_demo_site', false);
+        $updateCheck           = FireflyConfig::get('permission_update_check', -1);
+        $singleUser            = FireflyConfig::get('single_user_mode', true);
+        $lastCheck             = FireflyConfig::get('last_update_check', 1);
+        $enableExchangeRates   = FireflyConfig::get('enable_exchange_rates', config('cer.enabled'));
+        $useRunningBalance     = FireflyConfig::get('use_running_balance', true);
+        $enableExternalMap     = FireflyConfig::get('enable_external_map', false);
+        $enableExternalRates   = FireflyConfig::get('enable_external_rates', false);
+        $allowWebhooks         = FireflyConfig::get('allow_webhooks', false);
+        $enableBatchProcessing = FireflyConfig::get('enable_batch_processing', false);
+        $validUrlProtocols     = FireflyConfig::get('valid_url_protocols', 'http,https');
 
         return [
             'is_demo_site'            => $isDemoSite?->data,
             'permission_update_check' => null === $updateCheck ? null : (int) $updateCheck->data,
-            'last_update_check'       => null === $lastCheck ? null : (int) $lastCheck->data,
             'single_user_mode'        => $singleUser?->data,
+            'last_update_check'       => null === $lastCheck ? null : (int) $lastCheck->data,
+            'enable_exchange_rates'   => $enableExchangeRates?->data,
+            'use_running_balance'     => $useRunningBalance?->data,
+            'enable_external_map'     => $enableExternalMap?->data,
+            'enable_external_rates'   => $enableExternalRates?->data,
+            'allow_webhooks'          => $allowWebhooks?->data,
+            'enable_batch_processing' => $enableBatchProcessing?->data,
+            'valid_url_protocols'     => $validUrlProtocols?->data ?? 'http,https',
         ];
     }
 

changelog.md

@@ -3,6 +3,29 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## 6.5.2 - 2026-03-04
+
+### Changed
+
+- [PR 11825](https://github.com/firefly-iii/firefly-iii/pull/11825) (Fix account transaction type filtering) reported by @mgrove36
+- [PR 11833](https://github.com/firefly-iii/firefly-iii/pull/11833) (Convert to primary currency for category charts) reported by @dakennguyen
+- [PR 11835](https://github.com/firefly-iii/firefly-iii/pull/11835) (Convert to primary currency for tag charts) reported by @dakennguyen
+- [PR 11836](https://github.com/firefly-iii/firefly-iii/pull/11836) (Convert to primary currency for reportPeriodChart) reported by @dakennguyen
+- [PR 11837](https://github.com/firefly-iii/firefly-iii/pull/11837) (Convert to primary currency for transaction charts) reported by @dakennguyen
+
+### Fixed
+
+- [Issue 11812](https://github.com/firefly-iii/firefly-iii/issues/11812) (Using batch mode, some imported transactions aren't checked by rules) reported by @JC5
+- [Issue 11814](https://github.com/firefly-iii/firefly-iii/issues/11814) (Budget : error with CRON after switch user range view) reported by @fabienfitoussi
+- [Issue 11829](https://github.com/firefly-iii/firefly-iii/issues/11829) (User overview in settings shows 500) reported by @JC5
+- [Issue 11847](https://github.com/firefly-iii/firefly-iii/issues/11847) (Wrong attachment indicator when listing records by tags) reported by @jgmm81
+- Better check on renamed accounts, thanks @Kage1
+
+### API
+
+- [Issue 11822](https://github.com/firefly-iii/firefly-iii/issues/11822) (API - account transaction type filtering) reported by @mgrove36
+- [Issue 11842](https://github.com/firefly-iii/firefly-iii/issues/11842) (API: `/api/v1/configuration` always returns unauthenticated for v6.5.1) reported by @dreautall
+
 ## 6.5.1 - 2026-02-28
 
 > [!IMPORTANT]  

config/firefly.php

@@ -78,8 +78,8 @@ return [
         'running_balance_column' => (bool)envNonEmpty('USE_RUNNING_BALANCE', true), // this is only the default value, is not used.
         // see cer.php for exchange rates feature flag.
     ],
-    'version'                              => 'develop/2026-03-03',
-    'build_time'                           => 1772514431,
+    'version'                              => '6.5.2',
+    'build_time'                           => 1772516401,
     'api_version'                          => '2.1.0', // field is no longer used.
     'db_version'                           => 28, // field is no longer used.
 

routes/api.php

@@ -727,8 +727,8 @@ Route::group(
     ],
     static function (): void {
         Route::get('', ['uses' => 'ConfigurationController@index', 'as' => 'index']);
-        Route::get('{eitherConfigKey}', ['uses' => 'ConfigurationController@show', 'as' => 'show']);
         Route::put('{dynamicConfigKey}', ['uses' => 'ConfigurationController@update', 'as' => 'update']);
+        Route::get('{eitherConfigKey}', ['uses' => 'ConfigurationController@show', 'as' => 'show']);
     }
 );
 // Users API routes: