Firefly III: a personal finances manager
PHP accountingbudgetbudgetingbudgetscash-flowcashflowcredit-carddockerexpensesfinancefinancesfinanciallinuxmoneypaycheckpersonal-financephpphp7
Feature popup
Sander Dorigo17ce9ef3582a
diff --git a/app/Console/Commands/Correction/CorrectsGroupAccounts.php b/app/Console/Commands/Correction/CorrectsGroupAccounts.phpindex 8531f929e3..c0c1a8d7aa 100644--- a/app/Console/Commands/Correction/CorrectsGroupAccounts.php+++ b/app/Console/Commands/Correction/CorrectsGroupAccounts.php@@ -57,7 +57,7 @@ class CorrectsGroupAccounts extends Command// DB::raw('COUNT(transaction_group_id) as the_count'),// ]);- $groups = TransactionJournal::query()+ $groups = TransactionJournal::query() // @phpstan-ignore-line->groupBy('transaction_group_id')->havingRaw('the_count > 1')->get([diff --git a/resources/assets/v3/js/boot/bootstrap.js b/resources/assets/v3/js/boot/bootstrap.jsindex 7984f52841..23c8b927f3 100644--- a/resources/assets/v3/js/boot/bootstrap.js+++ b/resources/assets/v3/js/boot/bootstrap.js@@ -37,7 +37,6 @@ import i18next from "i18next";window.bootstrapped = false;window.store = store;window.Alpine = Alpine;-window.axios = axios;window.axios.defaults.headers.common["X-Requested-With"] = "XMLHttpRequest";diff --git a/resources/assets/v3/js/pages/dashboard/dashboard.js b/resources/assets/v3/js/pages/dashboard/dashboard.jsindex 6e1ee04276..b2f02e8a42 100644--- a/resources/assets/v3/js/pages/dashboard/dashboard.js+++ b/resources/assets/v3/js/pages/dashboard/dashboard.js@@ -26,6 +26,7 @@ import Alpine from "@alpinejs/csp";import Get from "../../api/model/piggy-bank/get.js";import formatMoney from "../../util/format-money.js";import { getVariable } from "../../store/get-variable.js";+import { getVariables } from "../../store/get-variables.js";import { drawMultiCurrencyChart } from "../../shared/draw-chart.js";import format from "../../util/format.js";@@ -35,6 +36,20 @@ let index = function () {anonymous: false,loadingPiggyBanks: true,init() {+ // only if no tour!+ if(!window.showTour) {+ // get config, then get preference.+ const version = document.head.querySelector('meta[name="x-firefly-iii-version"]').content;+ const whatsNewDialog = 'wn_' + version;+ const lastTimeDialog = 'lt_' + version;+ getVariables([whatsNewDialog, lastTimeDialog]).then((values) => {+ alert(whatsNewDialog + ' is ' + values.whatsNewDialog);+ alert(lastTimeDialog + ' is ' + values.lastTimeDialog);+ });++ }++getVariable("anonymous").then((value) => {let start = new Date(window.store.get("start"));let end = new Date(window.store.get("end"));diff --git a/resources/views/layout/v3/session.blade.php b/resources/views/layout/v3/session.blade.phpindex deb327946c..75aeda6a68 100644--- a/resources/views/layout/v3/session.blade.php+++ b/resources/views/layout/v3/session.blade.php@@ -7,6 +7,7 @@<meta name="robots" content="noindex, nofollow, noarchive, noodp, NoImageIndex, noydir"><meta name="apple-mobile-web-app-capable" content="yes"><meta name="mobile-web-app-capable" content="yes">+ <meta name="x-firefly-iii-version" content="{{ str_replace('/','-',$FF_VERSION) }}"><!--(SESSION)If the base href URL begins with "http://" but you are sure it should start with "https://",