Firefly III: a personal finances manager
PHP accountingbudgetbudgetingbudgetscash-flowcashflowcredit-carddockerexpensesfinancefinancesfinanciallinuxmoneypaycheckpersonal-financephpphp7
Fix #11102
James Colef5806ea6deb1
diff --git a/app/Http/Controllers/Controller.php b/app/Http/Controllers/Controller.phpindex 534acf8488..1f39963a53 100644--- a/app/Http/Controllers/Controller.php+++ b/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();diff --git a/app/Http/Controllers/JavascriptController.php b/app/Http/Controllers/JavascriptController.phpindex c5beecfeb4..217a400006 100644--- a/app/Http/Controllers/JavascriptController.php+++ b/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,diff --git a/app/Support/Amount.php b/app/Support/Amount.phpindex 98e8aa284c..22e44a1316 100644--- a/app/Support/Amount.php+++ b/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;diff --git a/app/Support/Steam.php b/app/Support/Steam.phpindex 586ecd4a7b..2dfc48ee3f 100644--- a/app/Support/Steam.php+++ b/app/Support/Steam.php@@ -627,6 +627,19 @@ class Steamreturn $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 [diff --git a/config/firefly.php b/config/firefly.phpindex b5e0be9d48..4801282895 100644--- a/config/firefly.php+++ b/config/firefly.php@@ -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',@@ -409,7 +410,7 @@ return [],- 'rule-actions' => [+ 'rule-actions' => ['set_category' => SetCategory::class,'clear_category' => ClearCategory::class,'set_budget' => SetBudget::class,@@ -443,7 +444,7 @@ return [// 'set_foreign_amount' => SetForeignAmount::class,// 'set_foreign_currency' => SetForeignCurrency::class,],- 'context-rule-actions' => [+ 'context-rule-actions' => ['set_category','set_budget','add_tag',@@ -462,13 +463,13 @@ return ['convert_transfer',],- 'test-triggers' => [+ 'test-triggers' => ['limit' => 10,'range' => 200,],// expected source types for each transaction type, in order of preference.- 'expected_source_types' => [+ 'expected_source_types' => ['source' => [TransactionTypeEnum::WITHDRAWAL->value => [AccountTypeEnum::ASSET->value, AccountTypeEnum::LOAN->value, AccountTypeEnum::DEBT->value, AccountTypeEnum::MORTGAGE->value],TransactionTypeEnum::DEPOSIT->value => [AccountTypeEnum::LOAN->value, AccountTypeEnum::DEBT->value, AccountTypeEnum::MORTGAGE->value, AccountTypeEnum::REVENUE->value, AccountTypeEnum::CASH->value],@@ -513,7 +514,7 @@ return [TransactionTypeEnum::LIABILITY_CREDIT->value => [AccountTypeEnum::LIABILITY_CREDIT->value, AccountTypeEnum::LOAN->value, AccountTypeEnum::DEBT->value, AccountTypeEnum::MORTGAGE->value],],],- 'allowed_opposing_types' => [+ 'allowed_opposing_types' => ['source' => [AccountTypeEnum::ASSET->value => [AccountTypeEnum::ASSET->value,@@ -603,7 +604,7 @@ return [],],// depending on the account type, return the allowed transaction types:- 'allowed_transaction_types' => [+ 'allowed_transaction_types' => ['source' => [AccountTypeEnum::ASSET->value => [TransactionTypeEnum::WITHDRAWAL->value,@@ -672,7 +673,7 @@ return [],// having the source + dest will tell you the transaction type.- 'account_to_transaction' => [+ 'account_to_transaction' => [AccountTypeEnum::ASSET->value => [AccountTypeEnum::ASSET->value => TransactionTypeEnum::TRANSFER->value,AccountTypeEnum::CASH->value => TransactionTypeEnum::WITHDRAWAL->value,@@ -737,7 +738,7 @@ return [],// allowed source -> destination accounts.- 'source_dests' => [+ 'source_dests' => [TransactionTypeEnum::WITHDRAWAL->value => [AccountTypeEnum::ASSET->value => [AccountTypeEnum::EXPENSE->value, AccountTypeEnum::LOAN->value, AccountTypeEnum::DEBT->value, AccountTypeEnum::MORTGAGE->value, AccountTypeEnum::CASH->value],AccountTypeEnum::LOAN->value => [AccountTypeEnum::EXPENSE->value, AccountTypeEnum::CASH->value],@@ -776,7 +777,7 @@ return [],],// if you add fields to this array, don't forget to update the export routine (ExportDataGenerator).- 'journal_meta_fields' => [+ 'journal_meta_fields' => [// sepa'sepa_cc','sepa_ct_op',@@ -810,47 +811,47 @@ return ['recurrence_count','recurrence_date',],- 'webhooks' => [+ 'webhooks' => ['max_attempts' => env('WEBHOOK_MAX_ATTEMPTS', 3),],- 'can_have_virtual_amounts' => [AccountTypeEnum::ASSET->value],- 'can_have_opening_balance' => [AccountTypeEnum::ASSET->value, AccountTypeEnum::LOAN->value, AccountTypeEnum::DEBT->value, AccountTypeEnum::MORTGAGE->value],- 'dynamic_creation_allowed' => [+ 'can_have_virtual_amounts' => [AccountTypeEnum::ASSET->value],+ 'can_have_opening_balance' => [AccountTypeEnum::ASSET->value, AccountTypeEnum::LOAN->value, AccountTypeEnum::DEBT->value, AccountTypeEnum::MORTGAGE->value],+ 'dynamic_creation_allowed' => [AccountTypeEnum::EXPENSE->value,AccountTypeEnum::REVENUE->value,AccountTypeEnum::INITIAL_BALANCE->value,AccountTypeEnum::RECONCILIATION->value,AccountTypeEnum::LIABILITY_CREDIT->value,],- 'valid_asset_fields' => ['account_role', 'account_number', 'currency_id', 'BIC', 'include_net_worth'],- 'valid_cc_fields' => ['account_role', 'cc_monthly_payment_date', 'cc_type', 'account_number', 'currency_id', 'BIC', 'include_net_worth'],- 'valid_account_fields' => ['account_number', 'currency_id', 'BIC', 'interest', 'interest_period', 'include_net_worth', 'liability_direction'],+ 'valid_asset_fields' => ['account_role', 'account_number', 'currency_id', 'BIC', 'include_net_worth'],+ 'valid_cc_fields' => ['account_role', 'cc_monthly_payment_date', 'cc_type', 'account_number', 'currency_id', 'BIC', 'include_net_worth'],+ 'valid_account_fields' => ['account_number', 'currency_id', 'BIC', 'interest', 'interest_period', 'include_net_worth', 'liability_direction'],// dynamic date ranges are as follows:- 'dynamic_date_ranges' => ['last7', 'last30', 'last90', 'last365', 'MTD', 'QTD', 'YTD'],+ 'dynamic_date_ranges' => ['last7', 'last30', 'last90', 'last365', 'MTD', 'QTD', 'YTD'],- 'allowed_sort_parameters' => [+ 'allowed_sort_parameters' => ['Account' => ['id', 'order', 'name', 'iban', 'active', 'account_type_id',- 'current_balance',- 'pc_current_balance',- 'opening_balance',- 'pc_opening_balance',- 'virtual_balance',- 'pc_virtual_balance',- 'debt_amount',- 'pc_debt_amount',- 'balance_difference',- 'pc_balance_difference',+ 'current_balance',+ 'pc_current_balance',+ 'opening_balance',+ 'pc_opening_balance',+ 'virtual_balance',+ 'pc_virtual_balance',+ 'debt_amount',+ 'pc_debt_amount',+ 'balance_difference',+ 'pc_balance_difference',],],- 'allowed_db_sort_parameters' => [+ 'allowed_db_sort_parameters' => ['Account' => ['id', 'order', 'name', 'iban', 'active', 'account_type_id'],],// preselected account lists possibilities:- 'preselected_accounts' => ['all', 'assets', 'liabilities'],+ 'preselected_accounts' => ['all', 'assets', 'liabilities'],// allowed to store a piggy bank in:- 'piggy_bank_account_types' => [AccountTypeEnum::ASSET->value, AccountTypeEnum::LOAN->value, AccountTypeEnum::DEBT->value, AccountTypeEnum::MORTGAGE->value],+ 'piggy_bank_account_types' => [AccountTypeEnum::ASSET->value, AccountTypeEnum::LOAN->value, AccountTypeEnum::DEBT->value, AccountTypeEnum::MORTGAGE->value],];diff --git a/public/v1/js/ff/charts.defaults.js b/public/v1/js/ff/charts.defaults.jsindex 4bb308ee26..4bd57b5445 100644--- a/public/v1/js/ff/charts.defaults.js+++ b/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;}}},diff --git a/public/v1/js/ff/firefly.js b/public/v1/js/ff/firefly.jsindex 442fd820d1..846971fb5b 100644--- a/public/v1/js/ff/firefly.js+++ b/public/v1/js/ff/firefly.js@@ -47,7 +47,6 @@ function parseToLocalDates() {$(function () {"use strict";-configAccounting(currencySymbol);// on submit of logout button:diff --git a/public/v1/js/ff/help.js b/public/v1/js/ff/help.jsindex 36998bbfea..30c0f76c0f 100644--- a/public/v1/js/ff/help.js+++ b/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);diff --git a/resources/lang/en_US/firefly.php b/resources/lang/en_US/firefly.phpindex f530ea76e0..d06840a2d2 100644--- a/resources/lang/en_US/firefly.php+++ b/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',diff --git a/resources/views/budgets/index.twig b/resources/views/budgets/index.twigindex 73b8814968..4ee60e68a4 100644--- a/resources/views/budgets/index.twig+++ b/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>diff --git a/resources/views/javascript/variables.twig b/resources/views/javascript/variables.twigindex 37c6ab8c13..68714d7537 100644--- a/resources/views/javascript/variables.twig+++ b/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') }}";diff --git a/resources/views/layout/default.twig b/resources/views/layout/default.twigindex a20ed1b060..db253c4ec8 100644--- a/resources/views/layout/default.twig+++ b/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("") }}">