Merge pull request #11106 from firefly-iii/release-1761394994

🤖 Automatically merge the PR into the develop branch.

app/Http/Controllers/Controller.php

@@ -131,6 +131,7 @@ abstract class Controller extends BaseController
                 $this->primaryCurrency   = null;
                 // get shown-intro-preference:
                 if (auth()->check()) {
+                    View::share('anonymous', Steam::anonymous());
                     $this->primaryCurrency  = Amount::getPrimaryCurrency();
                     $language               = Steam::getLanguage();
                     $locale                 = Steam::getLocale();

app/Http/Controllers/JavascriptController.php

@@ -30,6 +30,7 @@ use FireflyIII\Models\Account;
 use FireflyIII\Models\TransactionCurrency;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
+use FireflyIII\Support\Facades\Steam;
 use FireflyIII\Support\Http\Controllers\GetConfigurationData;
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;
@@ -114,6 +115,7 @@ class JavascriptController extends Controller
             'currencyCode'         => $currency->code,
             'currencySymbol'       => $currency->symbol,
             'accountingLocaleInfo' => $accounting,
+            'anonymous'            => var_export(Steam::anonymous(), true),
             'language'             => $lang,
             'dateRangeTitle'       => $dateRange['title'],
             'locale'               => $locale,

app/Support/Amount.php

@@ -163,6 +163,7 @@ class Amount
      */
     public function formatFlat(string $symbol, int $decimalPlaces, string $amount, ?bool $coloured = null): string
     {
+        $amount  = Steam::anonymous() ? '0' : $amount;
         $locale  = Steam::getLocale();
         $rounded = Steam::bcround($amount, $decimalPlaces);
         $coloured ??= true;

app/Support/Steam.php

@@ -627,6 +627,19 @@ class Steam
         return $locale;
     }
 
+    public function anonymous(): bool // get preference
+    {
+        $singleton = PreferencesSingleton::getInstance();
+        $cached    = $singleton->getPreference('anonymous');
+        if (null !== $cached) {
+            return $cached;
+        }
+        $anonymous = app('preferences')->get('anonymous', config('firefly.default_preferences.anonymous', false))->data;
+        $singleton->setPreference('anonymous', $anonymous);
+
+        return $anonymous;
+    }
+
     public function getLocaleArray(string $locale): array
     {
         return [

config/firefly.php

@@ -79,7 +79,7 @@ return [
         // see cer.php for exchange rates feature flag.
     ],
     'version'                      => 'develop/2025-10-25',
-    'build_time'                   => 1761383422,
+    'build_time'                   => 1761394881,
     'api_version'                  => '2.1.0', // field is no longer used.
     'db_version'                   => 28, // field is no longer used.
 
@@ -182,6 +182,7 @@ return [
     'darkMode'                     => 'browser',
     'list_length'                  => 10, // to be removed if v1 is cancelled.
     'default_preferences'          => [
+        'anonymous'          => false,
         'frontpageAccounts'  => [],
         'listPageSize'       => 50,
         'currencyPreference' => 'EUR',

database/migrations/2025_09_25_175248_create_period_statistics.php

@@ -11,34 +11,36 @@ return new class extends Migration
      */
     public function up(): void
     {
-        Schema::create('period_statistics', function (Blueprint $table) {
-            $table->id();
-            $table->timestamps();
+        if (!Schema::hasTable('period_statistics')) {
+            Schema::create('period_statistics', function (Blueprint $table) {
+                $table->id();
+                $table->timestamps();
 
-            // reference to user group id.
-            $table->bigInteger('user_group_id', false, true);
+                // reference to user group id.
+                $table->bigInteger('user_group_id', false, true);
 
-            $table->integer('primary_statable_id', false, true)->nullable();
-            $table->string('primary_statable_type', 255)->nullable();
+                $table->integer('primary_statable_id', false, true)->nullable();
+                $table->string('primary_statable_type', 255)->nullable();
 
-            $table->integer('secondary_statable_id', false, true)->nullable();
-            $table->string('secondary_statable_type', 255)->nullable();
+                $table->integer('secondary_statable_id', false, true)->nullable();
+                $table->string('secondary_statable_type', 255)->nullable();
 
-            $table->integer('tertiary_statable_id', false, true)->nullable();
-            $table->string('tertiary_statable_type', 255)->nullable();
+                $table->integer('tertiary_statable_id', false, true)->nullable();
+                $table->string('tertiary_statable_type', 255)->nullable();
 
-            $table->integer('transaction_currency_id', false, true);
-            $table->foreign('transaction_currency_id')->references('id')->on('transaction_currencies')->onDelete('cascade');
+                $table->integer('transaction_currency_id', false, true);
+                $table->foreign('transaction_currency_id')->references('id')->on('transaction_currencies')->onDelete('cascade');
 
-            $table->dateTime('start')->nullable();
-            $table->string('start_tz', 50)->nullable();
-            $table->dateTime('end')->nullable();
-            $table->string('end_tz', 50)->nullable();
-            $table->string('type',255);
-            $table->integer('count', false, true)->default(0);
-            $table->decimal('amount', 32, 12);
-            $table->foreign('user_group_id')->references('id')->on('user_groups')->onDelete('cascade');
-        });
+                $table->dateTime('start')->nullable();
+                $table->string('start_tz', 50)->nullable();
+                $table->dateTime('end')->nullable();
+                $table->string('end_tz', 50)->nullable();
+                $table->string('type', 255);
+                $table->integer('count', false, true)->default(0);
+                $table->decimal('amount', 32, 12);
+                $table->foreign('user_group_id')->references('id')->on('user_groups')->onDelete('cascade');
+            });
+        }
     }
 
     /**

public/v1/js/ff/charts.defaults.js

@@ -42,13 +42,11 @@ function formatLabel(str, maxwidth) {
             if (concat.length > maxwidth) {
                 sections.push(temp);
                 temp = "";
-            }
-            else {
+            } else {
                 if (index === (words.length - 1)) {
                     sections.push(concat);
                     return;
-                }
-                else {
+                } else {
                     temp = concat;
                     return;
                 }
@@ -62,8 +60,7 @@ function formatLabel(str, maxwidth) {
 
         if (item.length < maxwidth) {
             temp = item;
-        }
-        else {
+        } else {
             sections.push(item);
         }
 
@@ -98,9 +95,11 @@ var defaultChartOptions = {
             ticks: {
                 callback: function (tickValue) {
                     "use strict";
+                    if (anonymous) {
+                        return accounting.formatMoney(0);
+                    }
                     // use first symbol or null:
                     return accounting.formatMoney(tickValue);
-
                 },
                 beginAtZero: true
             }
@@ -112,8 +111,11 @@ var defaultChartOptions = {
         callbacks: {
             label: function (tooltipItem, data) {
                 "use strict";
-                return data.datasets[tooltipItem.datasetIndex].label + ': ' +
-                       accounting.formatMoney(tooltipItem.yLabel, data.datasets[tooltipItem.datasetIndex].currency_symbol);
+                var string = accounting.formatMoney(tooltipItem.yLabel, data.datasets[tooltipItem.datasetIndex].currency_symbol);
+                if (anonymous) {
+                    string = accounting.formatMoney(0);
+                }
+                return data.datasets[tooltipItem.datasetIndex].label + ': ' + string;
             }
         }
     }
@@ -125,7 +127,11 @@ var pieOptionsWithCurrency = {
             label: function (tooltipItem, data) {
                 "use strict";
                 var value = data.datasets[0].data[tooltipItem.index];
-                return data.labels[tooltipItem.index] + ': ' + accounting.formatMoney(value, data.datasets[tooltipItem.datasetIndex].currency_symbol[tooltipItem.index]);
+                var string = accounting.formatMoney(value, data.datasets[tooltipItem.datasetIndex].currency_symbol[tooltipItem.index]);
+                if (anonymous) {
+                    string = accounting.formatMoney(0);
+                }
+                return data.labels[tooltipItem.index] + ': ' + string;
             }
         }
     },
@@ -139,7 +145,11 @@ var defaultPieOptions = {
             label: function (tooltipItem, data) {
                 "use strict";
                 var value = data.datasets[0].data[tooltipItem.index];
-                return data.labels[tooltipItem.index] + ': ' + accounting.formatMoney(value);
+                var string = accounting.formatMoney(value);
+                if (anonymous) {
+                    string = accounting.formatMoney(0);
+                }
+                return data.labels[tooltipItem.index] + ': ' + string;
             }
         }
     },
@@ -153,7 +163,11 @@ var neutralDefaultPieOptions = {
             label: function (tooltipItem, data) {
                 "use strict";
                 var value = data.datasets[0].data[tooltipItem.index];
-                return data.labels[tooltipItem.index] + ': ' + accounting.formatMoney(value, '¤');
+                var string = accounting.formatMoney(value, '¤');
+                if(anonymous) {
+                    string = accounting.formatMoney(0);
+                }
+                return data.labels[tooltipItem.index] + ': ' + string;
             }
         }
     },

public/v1/js/ff/firefly.js

@@ -47,7 +47,6 @@ function parseToLocalDates() {
 $(function () {
     "use strict";
 
-
     configAccounting(currencySymbol);
 
     // on submit of logout button:

public/v1/js/ff/help.js

@@ -17,13 +17,42 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-/** global: token, helpPageTitle */
+/** global: token, helpPageTitle, anonymous */
 $(function () {
     "use strict";
     $('#help').click(showHelp);
+    $('#anonymous').click(changeAnonymity)
 
 });
 
+function submitAnonymity(value) {
+    $.ajax({
+        url: 'api/v1/preferences/anonymous',
+        data: JSON.stringify({data: value}),
+        type: 'PUT',
+        headers: {
+            'Content-Type': 'application/json',
+            'X-CSRF-Token': $('meta[name="csrf-token"]').attr('content'),
+        },
+    });
+}
+
+function changeAnonymity(e) {
+    if (anonymous) {
+        console.log('Will DISABLE.');
+        submitAnonymity(false);
+        alert(anonymous_warning_off_txt);
+        window.location.reload(true);
+    }
+    if (!anonymous) {
+        console.log('Will ENABLE.');
+        submitAnonymity(true);
+        alert(anonymous_warning_on_txt);
+        window.location.reload(true);
+    }
+    return false;
+}
+
 function showHelp(e) {
     "use strict";
     var target = $(e.target);

resources/lang/en_US/firefly.php

@@ -235,6 +235,8 @@ return [
     'advanced_options_explain'                  => 'Some pages in Firefly III have advanced options hidden behind this button. This page doesn\'t have anything fancy here, but do check out the others!',
     'here_be_dragons'                           => 'Hic sunt dracones',
     'bad_date_transaction'                      => 'Firefly III has detected you have transactions from before the year 1970. Please correct these transactions at your earliest convenience.',
+    'anonymous_warning_on'                      => 'For your privacy, all amounts are now displayed as "zero". Warning: text input boxes may still show the original amounts!',
+    'anonymous_warning_off'                     => 'Amounts will be visible again. Please be mindful of your surroundings.',
 
     // Webhooks
     'webhooks'                                  => 'Webhooks',

resources/views/budgets/index.twig

@@ -267,9 +267,14 @@
                                             <div class="input-group">
                                                 <div class="input-group-addon">{{ primaryCurrency.symbol }}</div>
                                                 <input type="hidden" name="balance_currency_id" value="{{ primaryCurrency.id }}"/>
+                                                {% if not anonymous %}
                                                 <input class="form-control budget_amount" data-original="0" data-id="{{ budget.id }}"
                                                        data-currency="{{ primaryCurrency.id }}" data-limit="0" value="0" autocomplete="off" min="0" name="amount"
                                                        type="number">
+                                                {% endif %}
+                                                {% if anonymous %}
+                                                ---
+                                                {% endif %}
                                             </div>
                                             <span class="text-danger budget_warning" data-id="{{ budget.id }}" data-budgetLimit="{{ budgetLimit.id }}"
                                                   style="display:none;"></span>
@@ -283,10 +288,15 @@
                                                 {% endif %}
                                                 <div class="input-group bl_entry" data-budget-limit-id="{{ budgetLimit.id }}">
                                                     <div class="input-group-addon">{{ budgetLimit.currency_symbol }}</div>
+                                                    {% if not anonymous %}
                                                     <input class="form-control budget_amount" data-original="{{ budgetLimit.amount }}"
                                                            data-id="{{ budget.id }}" data-limit="{{ budgetLimit.id }}" value="{{ budgetLimit.amount }}"
                                                            autocomplete="off"
                                                            min="0" name="amount" type="number">
+                                                    {% endif %}
+                                                    {% if anonymous %}
+                                                        ---
+                                                    {% endif %}
                                                     <div class="input-group-btn">
                                                         <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true"
                                                                 aria-expanded="false"><span class="caret"></span></button>

resources/views/javascript/variables.twig

@@ -26,6 +26,7 @@ ranges: ranges
 };
 
 var uid = "{{ uid }}";
+var anonymous = {{ anonymous }};
 var language = "{{ language|escape }}";
 var locale = "{{ locale|escape }}";
 var currencyCode = '{{ currencyCode|escape('js') }}';
@@ -51,6 +52,9 @@ var acc_config_new = {format: accountingConfig};
 var helpPageTitle = "{{ trans('firefly.help_for_this_page')|escape('js') }}";
 var helpPageBody = "{{ trans('firefly.help_for_this_page_body')|escape('js') }}";
 
+var anonymous_warning_on_txt = "{{ trans('firefly.anonymous_warning_on')|escape('js') }}";
+var anonymous_warning_off_txt= "{{ trans('firefly.anonymous_warning_off')|escape('js') }}";
+
 var edit_selected_txt = "{{ trans('firefly.mass_edit')|escape('js') }}";
 var edit_bulk_selected_txt = "{{ trans('firefly.bulk_edit')|escape('js') }}";
 var delete_selected_txt = "{{ trans('firefly.mass_delete')|escape('js') }}";

resources/views/layout/default.twig

@@ -111,7 +111,16 @@
             </a>
             <div class="navbar-custom-menu">
                 <ul class="nav navbar-nav">
-
+                    <li class="hidden-sm hidden-xs">
+                        <a href="#" id="anonymous">
+                            {% if anonymous %}
+                                <span class="text-danger fa fa-eye-slash"></span>
+                            {% endif %}
+                            {% if not anonymous %}
+                                <span class="text-success fa fa-eye"></span>
+                            {% endif %}
+                        </a>
+                    </li>
                     <li class="hidden-sm hidden-xs">
                         <a href="#" id="help" data-route="{{ original_route_name }}"
                            data-extra="{{ objectType|default("") }}">