Firefly III: a personal finances manager
PHP accountingbudgetbudgetingbudgetscash-flowcashflowcredit-carddockerexpensesfinancefinancesfinanciallinuxmoneypaycheckpersonal-financephpphp7
Move menu items over.
James Colec040a3b17c55
diff --git a/app/Support/JsonApi/Enrichments/AccountEnrichment.php b/app/Support/JsonApi/Enrichments/AccountEnrichment.phpindex 4ed99bdac4..aa6463556c 100644--- a/app/Support/JsonApi/Enrichments/AccountEnrichment.php+++ b/app/Support/JsonApi/Enrichments/AccountEnrichment.php@@ -195,6 +195,7 @@ class AccountEnrichment implements EnrichmentInterfaceif (array_key_exists($id, $this->locations)) {$meta['location'] = $this->locations[$id];}+if (array_key_exists($id, $this->meta)) {foreach ($this->meta[$id] as $name => $value) {$meta[$name] = $value;@@ -349,8 +350,7 @@ class AccountEnrichment implements EnrichmentInterface])->whereIn('account_id', $this->ids)->get(['account_meta.id', 'account_meta.account_id', 'account_meta.name', 'account_meta.data'])- ->toArray()- ;+ ->toArray();/** @var array $entry */foreach ($set as $entry) {diff --git a/config/translations.php b/config/translations.phpindex 5b5a599068..35cd1937b0 100644--- a/config/translations.php+++ b/config/translations.php@@ -65,6 +65,8 @@ return ['you_create_withdrawal','you_create_deposit','wait_loading_page',+ 'save_transaction_working',+ 'save_links_working','withdrawal','i_owe_amount','intro_next_label',diff --git a/resources/assets/v3/js/pages/transactions/create.js b/resources/assets/v3/js/pages/transactions/create.jsindex ffa668f620..1945a845d1 100644--- a/resources/assets/v3/js/pages/transactions/create.js+++ b/resources/assets/v3/js/pages/transactions/create.js@@ -378,7 +378,8 @@ let create = function () {save() {this.notifications.error.show = false;this.notifications.success.show = false;- this.notifications.wait.show = false;+ this.notifications.wait.show = true;+ this.notifications.wait.text = i18next.t("firefly.save_transaction_working");this.formStates.isSubmitting = true;for (let i in this.entries) {diff --git a/resources/assets/v3/js/pages/transactions/shared/process-transaction-links.js b/resources/assets/v3/js/pages/transactions/shared/process-transaction-links.jsindex d47c3a1489..1dada60123 100644--- a/resources/assets/v3/js/pages/transactions/shared/process-transaction-links.js+++ b/resources/assets/v3/js/pages/transactions/shared/process-transaction-links.js@@ -2,6 +2,8 @@ import PostLink from "../../../api/model/transaction-link/post.js";import PutLink from "../../../api/model/transaction-link/put.js";export function processTransactionLinks(transactions) {+ this.notifications.wait.show = true;+ this.notifications.wait.text = i18next.t('firefly.save_links_working');let count = 0;for (let i = 0; i < transactions.length; i++) {if (Object.hasOwn(transactions, i) && Object.hasOwn(this.links, i)) {diff --git a/resources/assets/v3/js/pages/transactions/shared/redirect-after-transaction-links.js b/resources/assets/v3/js/pages/transactions/shared/redirect-after-transaction-links.jsindex f5db70f60b..6884979e36 100644--- a/resources/assets/v3/js/pages/transactions/shared/redirect-after-transaction-links.js+++ b/resources/assets/v3/js/pages/transactions/shared/redirect-after-transaction-links.js@@ -15,5 +15,6 @@ export function redirectAfterTransactionLinks(oldI, oldJ) {if (true === completed) {this.formStates.storedLinks = completed;this.showMessageOrRedirectUser();+ this.notifications.wait.show = false;}}diff --git a/resources/assets/v3/js/support/load-translations.js b/resources/assets/v3/js/support/load-translations.jsindex 12a08a3176..9b934aaf39 100644--- a/resources/assets/v3/js/support/load-translations.js+++ b/resources/assets/v3/js/support/load-translations.js@@ -27,12 +27,12 @@ let loaded = false;function loadTranslations(language, locale) {if (false === loaded) {- console.log('Will load languages', language, locale);- let devMode = true;+ // console.log('Will load languages', language, locale);+ let devMode = false;loaded = true;const expireTime = devMode ? 1 : 7 * 24 * 60 * 60 * 1000;let unique = [...new Set([language, locale, "en-US"])];- console.log('Set of languages', unique);+ // console.log('Set of languages', unique);let options = {supportedLngs: unique,load: "all",@@ -53,7 +53,7 @@ function loadTranslations(language, locale) {],},};- console.log(options);+ // console.log(options);return i18next.use(ChainedBackend).init(options);}diff --git a/resources/assets/v3/sass/app.scss b/resources/assets/v3/sass/app.scssindex 006eaad93f..c84e5371cd 100644--- a/resources/assets/v3/sass/app.scss+++ b/resources/assets/v3/sass/app.scss@@ -86,6 +86,9 @@ html[data-bs-theme="dark"] .money-transfer {color: #0bc1e5 !important;}+// move over the sub menu things.+.sub-nav-item {padding-left:1em;}+// some print rules@media print {a[href]::after {diff --git a/resources/lang/en_US/firefly.php b/resources/lang/en_US/firefly.phpindex 304027c623..dc18ea9212 100644--- a/resources/lang/en_US/firefly.php+++ b/resources/lang/en_US/firefly.php@@ -240,6 +240,8 @@ return ['expected_total' => 'expected total','reconciliation_account_name' => ':name reconciliation (:currency)','saved' => 'Saved',+ 'save_transaction_working' => 'Firefly III is storing your transaction. Please wait.',+ 'save_links_working' => 'Firefly III is storing your transaction links. Please wait.','save' => 'Save','advanced_options' => 'Advanced options','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!',diff --git a/resources/views/components/layout/sidebar.blade.php b/resources/views/components/layout/sidebar.blade.phpindex 3e3fb9eab4..7780efaec4 100644--- a/resources/views/components/layout/sidebar.blade.php+++ b/resources/views/components/layout/sidebar.blade.php@@ -70,25 +70,25 @@</p></a><ul class="nav nav-treeview">- <li class="nav-item">+ <li class="nav-item sub-nav-item"><a href="{{ route('transactions.index', ['withdrawal']) }}" class="nav-link {{ menu_sub_item_active('transactions.index','withdrawal') }}"><em class="nav-icon bi bi-arrow-left"></em><p>{{ __('firefly.expenses') }}</p></a></li>- <li class="nav-item">+ <li class="nav-item sub-nav-item"><a href="{{ route('transactions.index', ['deposit']) }}" class="nav-link {{ menu_sub_item_active('transactions.index','deposit') }}"><em class="nav-icon bi bi-arrow-right"></em><p>{{ __('firefly.income') }}</p></a></li>- <li class="nav-item">+ <li class="nav-item sub-nav-item"><a href="{{ route('transactions.index', ['transfers']) }}" class="nav-link {{ menu_sub_item_active('transactions.index','transfers') }}"><em class="nav-icon bi bi-arrow-left-right"></em><p>{{ __('firefly.transfers') }}</p></a></li>- <li class="nav-item">+ <li class="nav-item sub-nav-item"><a href="{{ route('transactions.index', ['all']) }}" class="nav-link {{ menu_sub_item_active('transactions.index','all') }}"><em class="nav-icon bi bi-arrow-repeat"></em><p>{{ __('firefly.all_transactions') }}</p>@@ -105,20 +105,20 @@</p></a><ul class="nav nav-treeview">- <li class="nav-item">+ <li class="nav-item sub-nav-item"><a href="{{ route('rules.index') }}" class="nav-link {{ menu_item_active_partial('rules.') }} {{ menu_item_active_partial('rule-groups.') }}"><em class="nav-icon bi bi-shuffle"></em><p>{{__('firefly.rules')}}</p></a></li>- <li class="nav-item">+ <li class="nav-item sub-nav-item"><a href="{{ route('recurring.index') }}" class="nav-link {{ menu_item_active_partial('recurring.') }}"><em class="nav-icon bi bi-paint-bucket"></em><p>{{__('firefly.recurrences') }}</p></a></li>@if(true === $featuringWebhooks)- <li class="nav-item">+ <li class="nav-item sub-nav-item"><a href="{{ route('webhooks.index') }}" class="nav-link {{ menu_item_active_partial('webhooks.') }}"><em class="nav-icon bi bi-lightning"></em><p>{{ __('firefly.webhooks') }}</p>@@ -126,7 +126,7 @@</li>@endif@if(false === $featuringWebhooks)- <li class="nav-item">+ <li class="nav-item sub-nav-item"><span class="nav-link"><em class="nav-icon bi bi-lightning"></em><p>{{ __('firefly.webhooks') }} ({{ trans('firefly.webhooks_menu_disabled') }})</p>@@ -145,25 +145,25 @@</p></a><ul class="nav nav-treeview">- <li class="nav-item">+ <li class="nav-item sub-nav-item"><a href="{{ route('accounts.index', ['asset']) }}" class="nav-link {{ menu_sub_item_active('accounts.index','asset') }}"><em class="nav-icon bi bi-cash"></em><p>{{ __('firefly.asset_accounts') }}</p></a></li>- <li class="nav-item">+ <li class="nav-item sub-nav-item"><a href="{{ route('accounts.index', ['expense']) }}" class="nav-link {{ menu_sub_item_active('accounts.index','expense') }}"><em class="nav-icon bi bi-cart"></em><p>{{trans('firefly.expense_accounts')}}</p></a></li>- <li class="nav-item">+ <li class="nav-item sub-nav-item"><a href="{{ route('accounts.index', ['revenue']) }}" class="nav-link {{ menu_sub_item_active('accounts.index','revenue') }}"><em class="nav-icon bi bi-box-arrow-down"></em><p>{{ __('firefly.revenue_accounts') }}</p></a></li>- <li class="nav-item">+ <li class="nav-item sub-nav-item"><a href="{{ route('accounts.index', ['liabilities']) }}" class="nav-link {{ menu_sub_item_active('accounts.index','liabilities') }}"><em class="nav-icon bi bi-ticket-detailed"></em><p>{{ __('firefly.liabilities_accounts') }}</p>@@ -181,19 +181,19 @@</p></a><ul class="nav nav-treeview">- <li class="nav-item">+ <li class="nav-item sub-nav-item"><a href="{{ route('categories.index') }}" class="nav-link {{ menu_item_active_partial('categories.') }}"><em class="nav-icon bi bi-bookmark"></em><p>{{trans('firefly.categories')}}</p></a></li>- <li class="nav-item">+ <li class="nav-item sub-nav-item"><a href="{{ route('tags.index') }}" class="nav-link {{ menu_item_active_partial('tags.') }}"><em class="nav-icon bi bi-tag"></em><p>{{trans('firefly.tags')}}</p></a></li>- <li class="nav-item">+ <li class="nav-item sub-nav-item"><a href="{{ route('object-groups.index') }}" class="nav-link {{ menu_item_active_partial('object-groups.') }}"><em class="nav-icon bi bi-envelope"></em><p>{{trans('firefly.object_groups_menu_bar')}}</p>diff --git a/resources/views/components/transaction/split.blade.php b/resources/views/components/transaction/split.blade.phpindex bec5b3ad10..ed16b58dbb 100644--- a/resources/views/components/transaction/split.blade.php+++ b/resources/views/components/transaction/split.blade.php@@ -125,7 +125,17 @@@click="removeSplit(index)">{{ __('firefly.transaction_remove_split') }}</button></template><button class="btn btn-success text-white" :disabled="formStates.isSubmitting"- @click="save()">{{ __('firefly.submit') }}</button>+ @click="save()">+ <template x-if="!formStates.isSubmitting">+ <span>{{ __('firefly.submit') }}</span>+ </template>+ <template x-if="formStates.isSubmitting">+ <div class="spinner-border spinner-border-sm" role="status">+ <span class="visually-hidden">{{ __('firefly.thinking') }}</span>+ </div>+ </template>++ </button></div></div></div>