Skip to content

Open source personal finance application

update 3.2.4

ilkomecbcff47eab8a
diff --git a/components/layout/LayoutMobile.vue b/components/layout/LayoutMobile.vue
index ebf04b4b..5f8ca056 100644
--- a/components/layout/LayoutMobile.vue
+++ b/components/layout/LayoutMobile.vue
@@ -173,7 +173,7 @@ export default {
//- Modals
CategoryModal(:slider="slider")
CurrencyModal
- TrnForm
+ TrnForm(v-if="$store.getters['wallets/hasWallets'] && $store.getters['categories/hasCategories']")
TrnModal
WalletModal(:slider="slider")
CategoryStatModal
diff --git a/components/layout/LayoutPc.vue b/components/layout/LayoutPc.vue
index 50d6e90d..06ac2408 100644
--- a/components/layout/LayoutPc.vue
+++ b/components/layout/LayoutPc.vue
@@ -17,12 +17,15 @@ export default {
<template lang="pug">
.layout
- .createTrnBtn(@click="$store.dispatch('trnForm/openTrnForm', { action: 'create' })"): .mdi.mdi-plus
+ .createTrnBtn(
+ v-if="$store.getters['wallets/hasWallets'] && $store.getters['categories/hasCategories']"
+ @click="$store.dispatch('trnForm/openTrnForm', { action: 'create' })"
+ ): .mdi.mdi-plus
//- modals
CategoryModal
CurrencyModal
- TrnForm
+ TrnForm(v-if="$store.getters['wallets/hasWallets'] && $store.getters['categories/hasCategories']")
TrnModal
WalletModal
diff --git a/components/trnForm/TrnFormModalCats.vue b/components/trnForm/TrnFormModalCats.vue
index 2d5743b6..f509a10b 100644
--- a/components/trnForm/TrnFormModalCats.vue
+++ b/components/trnForm/TrnFormModalCats.vue
@@ -86,7 +86,7 @@ TrnFormModal(
.swiper-slide
.scrollBlock.waitForScroll(
- v-if="$store.getters['categories/lastUsedCategoriesIdsByDate'].length > 0"
+ v-if="$store.getters['categories/lastUsedCategoriesIdsByDate'] && $store.getters['categories/lastUsedCategoriesIdsByDate'].length > 0"
:style="modalStyle"
)
.marginBottom
@@ -99,7 +99,7 @@ TrnFormModal(
.swiper-slide
.scrollBlock.waitForScroll(
- v-if="$store.getters['categories/quickSelectorCategoriesIds'].length"
+ v-if="$store.getters['categories/quickSelectorCategoriesIds'] && $store.getters['categories/quickSelectorCategoriesIds'].length"
:style="modalStyle"
)
.marginBottom
diff --git a/package.json b/package.json
index 291f33c7..76fb3601 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "finapp",
- "version": "3.2.3",
+ "version": "3.2.4",
"scripts": {
"dev": "cross-env NUXT_HOST=0.0.0.0 nuxt",
"build": "nuxt build",
diff --git a/store/categories/getters.js b/store/categories/getters.js
index cf8107de..6bba0367 100644
--- a/store/categories/getters.js
+++ b/store/categories/getters.js
@@ -72,6 +72,8 @@ export default {
},
lastUsedCategoriesIdsByDate (state, getters, rootState, rootGetters) {
+ if (!getters.hasCategories) { return [] }
+
const trns = rootState.trns.items
const sortedTrnsIds = rootGetters['trns/sortedTrnsIds']
const transferCategoryId = getters.transferCategoryId
@@ -112,11 +114,10 @@ export default {
})
},
- transferCategoryId (state, getters,) {
+ transferCategoryId (state, getters) {
if (!getters.hasCategories) { return null }
return Object.keys(state.items)
- .find(id => state.items[id].name === 'Перевод' ||
- state.items[id].name === 'Transfer')
+ .find(id => state.items[id].name === 'Перевод' || state.items[id].name === 'Transfer') || false
}
}
diff --git a/store/stat/getters.js b/store/stat/getters.js
index aed32057..968320ea 100644
--- a/store/stat/getters.js
+++ b/store/stat/getters.js
@@ -100,7 +100,8 @@ export default {
const categories = rootState.categories.items
const trnCategoryId = trns[trnId].categoryId
if (!categories[trnCategoryId]) {
- console.log('no category', trnId, trns[trnId], categories[trnCategoryId])
+ console.log('no category for trn', trnId, trns[trnId], categories[trnCategoryId])
+ console.log(`https://finapp-17474.firebaseio.com/users/${rootState.user.user.uid}/trns/${trnId}`)
return trnCategoryId
}
const trnCategoryParentId = categories[trnCategoryId].parentId
diff --git a/store/trnForm/actions.js b/store/trnForm/actions.js
index 7bc5f5ca..c16ff6f5 100644
--- a/store/trnForm/actions.js
+++ b/store/trnForm/actions.js
@@ -13,7 +13,7 @@ export default {
commit('openTrnForm')
switch (action) {
case 'create':
- if (rootGetters['trns/hasTrns']) {
+ if (rootGetters['trns/hasTrns'] && rootState.trns.items[rootGetters['trns/lastCreatedTrnId']]) {
const lastTrn = rootState.trns.items[rootGetters['trns/lastCreatedTrnId']]
commit('setTrnFormValues', {
amount: '0',