Merge branch 'develop' into develop

This commit is contained in:
alex6480
2021-06-15 15:25:07 +02:00
committed by GitHub
390 changed files with 2488 additions and 2678 deletions

View File

@@ -24,7 +24,7 @@
{{ $t('form.account_role') }}
</div>
<div class="input-group" v-if="loading">
<i class="fas fa-spinner fa-spin"></i>
<span class="fas fa-spinner fa-spin"></span>
</div>
<div class="input-group" v-if="!loading">
<select
@@ -90,6 +90,3 @@ export default {
}
</script>
<style scoped>
</style>

View File

@@ -334,6 +334,3 @@ export default {
}
</script>
<style scoped>
</style>

View File

@@ -24,7 +24,7 @@
{{ $t('form.currency_id') }}
</div>
<div class="input-group" v-if="loading">
<i class="fas fa-spinner fa-spin"></i>
<span class="fas fa-spinner fa-spin"></span>
</div>
<div class="input-group" v-if="!loading">
<select
@@ -110,6 +110,3 @@ export default {
}
</script>
<style scoped>
</style>

View File

@@ -24,7 +24,7 @@
<div class="card card-default card-danger">
<div class="card-header">
<h3 class="card-title">
<i class="fas fa-exclamation-triangle"></i>
<span class="fas fa-exclamation-triangle"></span>
{{ $t('firefly.delete_account') }}
</h3>
</div>
@@ -57,7 +57,7 @@
</p>
<p v-if="loading || deleting || deleted" class="text-center">
<i class="fas fa-spinner fa-spin"></i>
<span class="fas fa-spinner fa-spin"></span>
</p>
</div>
@@ -180,6 +180,3 @@ export default {
}
</script>
<style scoped>
</style>

View File

@@ -28,6 +28,3 @@ export default {
}
</script>
<style scoped>
</style>

View File

@@ -45,7 +45,7 @@
:sort-desc.sync="sortDesc"
>
<template #table-busy>
<i class="fas fa-spinner fa-spin"></i>
<span class="fas fa-spinner fa-spin"></span>
</template>
<template #cell(name)="data">
<a :class="false === data.item.active ? 'text-muted' : ''" :href="'./accounts/show/' + data.item.id" :title="data.value">{{ data.value }}</a>
@@ -55,7 +55,7 @@
</template>
<template #cell(last_activity)="data">
<span v-if="'asset' === type && 'loading' === data.item.last_activity">
<i class="fas fa-spinner fa-spin"></i>
<span class="fas fa-spinner fa-spin"></span>
</span>
<span v-if="'asset' === type && 'none' === data.item.last_activity" class="text-muted">
{{ $t('firefly.never') }}
@@ -105,7 +105,7 @@
}}
</span>
<span v-if="'asset' === type && 'loading' === data.item.balance_diff">
<i class="fas fa-spinner fa-spin"></i>
<span class="fas fa-spinner fa-spin"></span>
</span>
<span v-if="'asset' === type && 'loading' !== data.item.balance_diff">
(<span class="text-success" v-if="parseFloat(data.item.balance_diff) > 0">{{
@@ -137,9 +137,9 @@
{{ $t('firefly.actions') }}
</button>
<div class="dropdown-menu" :aria-labelledby="'dropdownMenuButton' + data.item.id">
<a class="dropdown-item" :href="'./accounts/edit/' + data.item.id"><i class="fa fas fa-pencil-alt"></i> {{ $t('firefly.edit') }}</a>
<a class="dropdown-item" :href="'./accounts/delete/' + data.item.id"><i class="fa far fa-trash"></i> {{ $t('firefly.delete') }}</a>
<a v-if="'asset' === type" class="dropdown-item" :href="'./accounts/reconcile/' + data.item.id + '/index'"><i class="fas fa-check"></i>
<a class="dropdown-item" :href="'./accounts/edit/' + data.item.id"><span class="fa fas fa-pencil-alt"></span> {{ $t('firefly.edit') }}</a>
<a class="dropdown-item" :href="'./accounts/delete/' + data.item.id"><span class="fa far fa-trash"></span> {{ $t('firefly.delete') }}</a>
<a v-if="'asset' === type" class="dropdown-item" :href="'./accounts/reconcile/' + data.item.id + '/index'"><span class="fas fa-check"></span>
{{ $t('firefly.reconcile_this_account') }}</a>
</div>
</div>
@@ -149,7 +149,7 @@
</div>
<div class="card-footer">
<a :href="'./accounts/create/' + type" class="btn btn-success" :title="$t('firefly.create_new_' + type)">{{ $t('firefly.create_new_' + type) }}</a>
<a href="#" class="btn btn-info"><i class="fas fa-sync"></i></a>
<a href="#" class="btn btn-info"><span class="fas fa-sync"></span></a>
</div>
</div>
</div>
@@ -309,7 +309,7 @@ export default {
this.accounts[i].order = newOrder;
let url = './api/v1/accounts/' + current.id;
axios.put(url, {order: newOrder}).then(response => {
// TODO should update local account list, not refresh the whole thing.
// See reference nr. 8
this.getAccountList();
});
}
@@ -485,7 +485,7 @@ export default {
//
// allAccounts.push(acct);
// if ('asset' === this.type) {
// // TODO
// See reference nr. 9
// //this.getAccountBalanceDifference(this.allAccounts.length - 1, current);
// //this.getAccountLastActivity(this.allAccounts.length - 1, current);
// }

View File

@@ -88,6 +88,3 @@ export default {
}
</script>
<style scoped>
</style>

View File

@@ -35,7 +35,7 @@
/>
<div class="input-group-append">
<div class="input-group-text">%</div>
<button class="btn btn-outline-secondary" tabindex="-1" type="button"><i class="far fa-trash-alt"></i></button>
<button class="btn btn-outline-secondary" tabindex="-1" type="button"><span class="far fa-trash-alt"></span></button>
</div>
</div>
<span v-if="errors.length > 0">
@@ -68,6 +68,3 @@ name: "Interest",
}
</script>
<style scoped>
</style>

View File

@@ -24,7 +24,7 @@
{{ $t('form.interest_period') }}
</div>
<div class="input-group" v-if="loading">
<i class="fas fa-spinner fa-spin"></i>
<span class="fas fa-spinner fa-spin"></span>
</div>
<div class="input-group" v-if="!loading">
<select
@@ -91,6 +91,3 @@ export default {
}
</script>
<style scoped>
</style>

View File

@@ -33,7 +33,7 @@
type="number" step="any" min="0"
/>
<div class="input-group-append">
<button class="btn btn-outline-secondary" tabindex="-1" type="button"><i class="far fa-trash-alt"></i></button>
<button class="btn btn-outline-secondary" tabindex="-1" type="button"><span class="far fa-trash-alt"></span></button>
</div>
</div>
<span v-if="errors.length > 0">
@@ -66,6 +66,3 @@ export default {
}
</script>
<style scoped>
</style>

View File

@@ -33,7 +33,7 @@
type="date"
/>
<div class="input-group-append">
<button class="btn btn-outline-secondary" tabindex="-1" type="button"><i class="far fa-trash-alt"></i></button>
<button class="btn btn-outline-secondary" tabindex="-1" type="button"><span class="far fa-trash-alt"></span></button>
</div>
</div>
<span v-if="errors.length > 0">
@@ -66,6 +66,3 @@ export default {
}
</script>
<style scoped>
</style>

View File

@@ -69,6 +69,3 @@ export default {
}
</script>
<style scoped>
</style>

View File

@@ -24,7 +24,7 @@
{{ $t('form.liability_type') }}
</div>
<div class="input-group" v-if="loading">
<i class="fas fa-spinner fa-spin"></i>
<span class="fas fa-spinner fa-spin"></span>
</div>
<div class="input-group" v-if="!loading">
<select
@@ -91,6 +91,3 @@ export default {
}
</script>
<style scoped>
</style>

View File

@@ -30,6 +30,3 @@ export default {
}
</script>
<style scoped>
</style>

View File

@@ -111,6 +111,3 @@ export default {
}
</script>
<style scoped>
</style>

View File

@@ -173,6 +173,3 @@ export default {
}
</script>
<style scoped>
</style>

View File

@@ -28,6 +28,3 @@ export default {
}
</script>
<style scoped>
</style>

View File

@@ -116,6 +116,3 @@ export default {
}
</script>
<style scoped>
</style>

View File

@@ -40,7 +40,7 @@
</table>
</div>
<div class="card-footer">
<a class="btn btn-default button-sm" href="./budgets"><i class="far fa-money-bill-alt"></i> {{ $t('firefly.go_to_budgets') }}</a>
<a class="btn btn-default button-sm" href="./budgets"><span class="far fa-money-bill-alt"></span> {{ $t('firefly.go_to_budgets') }}</a>
</div>
</div>
</template>
@@ -60,6 +60,3 @@ export default {
}
</script>
<style scoped>
</style>

View File

@@ -52,6 +52,3 @@ export default {
}
</script>
<style scoped>
</style>

View File

@@ -41,16 +41,16 @@
<button
:title="$t('firefly.custom_period')" class="btn btn-secondary btn-sm"
@click="togglePopover({ placement: 'auto-start', positionFixed: true })"
><i class="fas fa-calendar-alt"></i></button>
><span class="fas fa-calendar-alt"></span></button>
<button :title="$t('firefly.reset_to_current')"
class="btn btn-secondary"
@click="resetDate"
><i class="fas fa-history"></i></button>
><span class="fas fa-history"></span></button>
<button id="dropdownMenuButton" :title="$t('firefly.select_period')" aria-expanded="false" aria-haspopup="true"
class="btn btn-secondary dropdown-toggle"
data-toggle="dropdown"
type="button">
<i class="fas fa-list"></i>
<span class="fas fa-list"></span>
</button>
<div aria-labelledby="dropdownMenuButton" class="dropdown-menu">
<a v-for="period in periods" class="dropdown-item" href="#" @click="customDate(period.start, period.end)">{{ period.title }}</a>
@@ -324,7 +324,7 @@ export default {
let today = new Date(this.range.start);
let start;
let end;
let title = 'todo';
let title = 'tbd';
let half = 1;
// its currently first half of year:

View File

@@ -28,14 +28,14 @@
<canvas id="canvas" ref="canvas" width="400" height="400"></canvas>
</div>
<div v-if="loading && !error" class="text-center">
<i class="fas fa-spinner fa-spin"></i>
<span class="fas fa-spinner fa-spin"></span>
</div>
<div v-if="error" class="text-center">
<i class="fas fa-exclamation-triangle text-danger"></i>
<span class="fas fa-exclamation-triangle text-danger"></span>
</div>
</div>
<div class="card-footer">
<a class="btn btn-default button-sm" href="./accounts/asset"><i class="far fa-money-bill-alt"></i> {{ $t('firefly.go_to_asset_accounts') }}</a>
<a class="btn btn-default button-sm" href="./accounts/asset"><span class="far fa-money-bill-alt"></span> {{ $t('firefly.go_to_asset_accounts') }}</a>
</div>
</div>
</template>

View File

@@ -26,7 +26,7 @@
<div class="card">
<div class="card-body">
<div class="text-center">
<i class="fas fa-spinner fa-spin"></i>
<span class="fas fa-spinner fa-spin"></span>
</div>
</div>
</div>
@@ -39,7 +39,7 @@
<div class="card">
<div class="card-body">
<div class="text-center">
<i class="fas fa-exclamation-triangle text-danger"></i>
<span class="fas fa-exclamation-triangle text-danger"></span>
</div>
</div>
</div>
@@ -179,6 +179,3 @@ export default {
}
</script>
<style scoped>
</style>

View File

@@ -26,13 +26,13 @@
<!-- body if loading -->
<div v-if="loading && !error" class="card-body">
<div class="text-center">
<i class="fas fa-spinner fa-spin"></i>
<span class="fas fa-spinner fa-spin"></span>
</div>
</div>
<!-- body if error -->
<div v-if="error" class="card-body">
<div class="text-center">
<i class="fas fa-exclamation-triangle text-danger"></i>
<span class="fas fa-exclamation-triangle text-danger"></span>
</div>
</div>
<!-- body if normal -->
@@ -71,7 +71,7 @@
</table>
</div>
<div class="card-footer">
<a class="btn btn-default button-sm" href="./bills"><i class="far fa-money-bill-alt"></i> {{ $t('firefly.go_to_bills') }}</a>
<a class="btn btn-default button-sm" href="./bills"><span class="far fa-money-bill-alt"></span> {{ $t('firefly.go_to_bills') }}</a>
</div>
</div>
</template>

View File

@@ -56,7 +56,7 @@
<div class="card">
<div class="card-body">
<div class="text-center">
<i class="fas fa-spinner fa-spin"></i>
<span class="fas fa-spinner fa-spin"></span>
</div>
</div>
</div>
@@ -265,6 +265,3 @@ export default {
}
</script>
<style scoped>
</style>

View File

@@ -26,13 +26,13 @@
<!-- body if loading -->
<div v-if="loading && !error" class="card-body">
<div class="text-center">
<i class="fas fa-spinner fa-spin"></i>
<span class="fas fa-spinner fa-spin"></span>
</div>
</div>
<!-- body if error -->
<div v-if="error" class="card-body">
<div class="text-center">
<i class="fas fa-exclamation-triangle text-danger"></i>
<span class="fas fa-exclamation-triangle text-danger"></span>
</div>
</div>
<!-- body if normal -->
@@ -248,6 +248,3 @@ export default {
}
</script>
<style scoped>
</style>

View File

@@ -26,13 +26,13 @@
<!-- body if loading -->
<div v-if="loading && !error" class="card-body">
<div class="text-center">
<i class="fas fa-spinner fa-spin"></i>
<span class="fas fa-spinner fa-spin"></span>
</div>
</div>
<!-- body if error -->
<div v-if="error" class="card-body">
<div class="text-center">
<i class="fas fa-exclamation-triangle text-danger"></i>
<span class="fas fa-exclamation-triangle text-danger"></span>
</div>
</div>
<!-- body if normal -->
@@ -67,7 +67,7 @@
</table>
</div>
<div class="card-footer">
<a class="btn btn-default button-sm" href="./transactions/deposit"><i class="far fa-money-bill-alt"></i> {{ $t('firefly.go_to_deposits') }}</a>
<a class="btn btn-default button-sm" href="./transactions/deposit"><span class="far fa-money-bill-alt"></span> {{ $t('firefly.go_to_deposits') }}</a>
</div>
</div>
</template>
@@ -79,7 +79,7 @@ import format from "date-fns/format";
const {mapState, mapGetters, mapActions, mapMutations} = createNamespacedHelpers('dashboard/index')
// TODO same as credit list but reversed
// See reference nr. 2
export default {
name: "MainCreditList",

View File

@@ -26,13 +26,13 @@
<!-- body if loading -->
<div v-if="loading && !error" class="card-body">
<div class="text-center">
<i class="fas fa-spinner fa-spin"></i>
<span class="fas fa-spinner fa-spin"></span>
</div>
</div>
<!-- body if error -->
<div v-if="error" class="card-body">
<div class="text-center">
<i class="fas fa-exclamation-triangle text-danger"></i>
<span class="fas fa-exclamation-triangle text-danger"></span>
</div>
</div>
<!-- body if normal -->
@@ -67,7 +67,7 @@
</table>
</div>
<div class="card-footer">
<a class="btn btn-default button-sm" href="./transactions/withdrawal"><i class="far fa-money-bill-alt"></i> {{ $t('firefly.go_to_withdrawals') }}</a>
<a class="btn btn-default button-sm" href="./transactions/withdrawal"><span class="far fa-money-bill-alt"></span> {{ $t('firefly.go_to_withdrawals') }}</a>
</div>
</div>
</template>

View File

@@ -27,13 +27,13 @@
<!-- body if loading -->
<div v-if="loading && !error" class="card-body">
<div class="text-center">
<i class="fas fa-spinner fa-spin"></i>
<span class="fas fa-spinner fa-spin"></span>
</div>
</div>
<!-- body if error -->
<div v-if="error" class="card-body">
<div class="text-center">
<i class="fas fa-exclamation-triangle text-danger"></i>
<span class="fas fa-exclamation-triangle text-danger"></span>
</div>
</div>
<!-- body if normal -->
@@ -81,7 +81,7 @@
</table>
</div>
<div class="card-footer">
<a class="btn btn-default button-sm" href="./piggy-banks"><i class="far fa-money-bill-alt"></i> {{ $t('firefly.go_to_piggies') }}</a>
<a class="btn btn-default button-sm" href="./piggy-banks"><span class="far fa-money-bill-alt"></span> {{ $t('firefly.go_to_piggies') }}</a>
</div>
</div>
</template>
@@ -127,6 +127,3 @@ export default {
}
</script>
<style scoped>
</style>

View File

@@ -22,12 +22,12 @@
<div class="row">
<div class="col" v-if="0 !== prefCurrencyBalances.length || 0 !== notPrefCurrencyBalances.length">
<div class="info-box">
<span class="info-box-icon"><i class="far fa-bookmark text-info"></i></span>
<span class="info-box-icon"><span class="far fa-bookmark text-info"></span></span>
<div class="info-box-content">
<span v-if="!loading && !error" class="info-box-text">{{ $t("firefly.balance") }}</span>
<span v-if="loading && !error" class="info-box-text"><i class="fas fa-spinner fa-spin"></i></span>
<span v-if="error" class="info-box-text"><i class="fas fa-exclamation-triangle text-danger"></i></span>
<span v-if="loading && !error" class="info-box-text"><span class="fas fa-spinner fa-spin"></span></span>
<span v-if="error" class="info-box-text"><span class="fas fa-exclamation-triangle text-danger"></span></span>
<!-- balance in preferred currency -->
<span v-for="balance in prefCurrencyBalances" :title="balance.sub_title" class="info-box-number">{{ balance.value_parsed }}</span>
<span v-if="0 === prefCurrencyBalances.length" class="info-box-number">&nbsp;</span>
@@ -47,12 +47,12 @@
<div class="col" v-if="0!==prefBillsUnpaid.length || 0 !== notPrefBillsUnpaid.length">
<div class="info-box">
<span class="info-box-icon"><i class="far fa-calendar-alt text-teal"></i></span>
<span class="info-box-icon"><span class="far fa-calendar-alt text-teal"></span></span>
<div class="info-box-content">
<span v-if="!loading && !error" class="info-box-text">{{ $t('firefly.bills_to_pay') }}</span>
<span v-if="loading && !error" class="info-box-text"><i class="fas fa-spinner fa-spin"></i></span>
<span v-if="error" class="info-box-text"><i class="fas fa-exclamation-triangle text-danger"></i></span>
<span v-if="loading && !error" class="info-box-text"><span class="fas fa-spinner fa-spin"></span></span>
<span v-if="error" class="info-box-text"><span class="fas fa-exclamation-triangle text-danger"></span></span>
<!-- bills unpaid, in preferred currency. -->
<span v-for="balance in prefBillsUnpaid" class="info-box-number">{{ balance.value_parsed }}</span>
@@ -72,12 +72,12 @@
<!-- left to spend -->
<div class="col" v-if="0 !== prefLeftToSpend.length || 0 !== notPrefLeftToSpend.length">
<div class="info-box">
<span class="info-box-icon"><i class="fas fa-money-bill text-success"></i></span>
<span class="info-box-icon"><span class="fas fa-money-bill text-success"></span></span>
<div class="info-box-content">
<span v-if="!loading && !error" class="info-box-text">{{ $t('firefly.left_to_spend') }}</span>
<span v-if="loading && !error" class="info-box-text"><i class="fas fa-spinner fa-spin"></i></span>
<span v-if="error" class="info-box-text"><i class="fas fa-exclamation-triangle text-danger"></i></span>
<span v-if="loading && !error" class="info-box-text"><span class="fas fa-spinner fa-spin"></span></span>
<span v-if="error" class="info-box-text"><span class="fas fa-exclamation-triangle text-danger"></span></span>
<!-- left to spend in preferred currency -->
<span v-for="left in prefLeftToSpend" :title="left.sub_title" class="info-box-number">{{ left.value_parsed }}</span>
<span v-if="0 === prefLeftToSpend.length" class="info-box-number">&nbsp;</span>
@@ -99,12 +99,12 @@
<!-- net worth -->
<div class="col" v-if="0 !== notPrefNetWorth.length || 0 !== prefNetWorth.length">
<div class="info-box">
<span class="info-box-icon"><i class="fas fa-money-bill text-success"></i></span>
<span class="info-box-icon"><span class="fas fa-money-bill text-success"></span></span>
<div class="info-box-content">
<span v-if="!loading && !error" class="info-box-text">{{ $t('firefly.net_worth') }}</span>
<span v-if="loading && !error" class="info-box-text"><i class="fas fa-spinner fa-spin"></i></span>
<span v-if="error" class="info-box-text"><i class="fas fa-exclamation-triangle text-danger"></i></span>
<span v-if="loading && !error" class="info-box-text"><span class="fas fa-spinner fa-spin"></span></span>
<span v-if="error" class="info-box-text"><span class="fas fa-exclamation-triangle text-danger"></span></span>
<span v-for="nw in prefNetWorth" :title="nw.sub_title" class="info-box-number">{{ nw.value_parsed }}</span>
<span v-if="0===prefNetWorth.length">&nbsp;</span>
<div class="progress bg-success">

View File

@@ -77,6 +77,3 @@ export default {
}
</script>
<style scoped>
</style>

View File

@@ -81,6 +81,3 @@ export default {
}
</script>
<style scoped>
</style>

View File

@@ -185,6 +185,3 @@ export default {
}
</script>
<style scoped>
</style>

View File

@@ -34,7 +34,7 @@
:step="fieldStep"
/>
<div class="input-group-append">
<button class="btn btn-outline-secondary" tabindex="-1" type="button"><i class="far fa-trash-alt"></i></button>
<button class="btn btn-outline-secondary" tabindex="-1" type="button"><span class="far fa-trash-alt"></span></button>
</div>
</div>
<span v-if="errors.length > 0">
@@ -94,6 +94,3 @@ export default {
}
</script>
<style scoped>
</style>

View File

@@ -78,6 +78,3 @@ name: "GenericTextarea",
}
</script>
<style scoped>
</style>

View File

@@ -108,6 +108,3 @@ export default {
}
</script>
<style scoped>
</style>

View File

@@ -21,8 +21,8 @@
<div v-if="message.length > 0" :class="'alert alert-' + type + ' alert-dismissible'">
<button aria-hidden="true" class="close" data-dismiss="alert" type="button">×</button>
<h5>
<i v-if="'danger' === type" class="icon fas fa-ban"></i>
<i v-if="'success' === type" class="icon fas fa-thumbs-up"></i>
<span v-if="'danger' === type" class="icon fas fa-ban"></span>
<span v-if="'success' === type" class="icon fas fa-thumbs-up"></span>
<span v-if="'danger' === type">{{ $t("firefly.flash_error") }}</span>
<span v-if="'success' === type">{{ $t("firefly.flash_success") }}</span>
</h5>

View File

@@ -56,7 +56,7 @@ const getters = {
return state.transactionType;
},
accountToTransaction: state => {
// TODO better architecture here, does not need the store.
// See reference nr. 1
// possible API point!!
return state.accountToTransaction;
},

View File

@@ -23,7 +23,7 @@
<alert :message="errorMessage" type="danger"/>
<alert :message="successMessage" type="success"/>
<form @submit="submitTransaction" autocomplete="off">
<SplitPills :transactions="transactions"/>
<SplitPills :transactions="transactions" :count="transactions.length"/>
<div class="tab-content">
<SplitForm
v-for="(transaction, index) in this.transactions"
@@ -69,7 +69,7 @@
<div class="text-xs d-none d-lg-block d-xl-block">
&nbsp;
</div>
<button type="button" class="btn btn-outline-primary btn-block" @click="addTransactionArray"><i class="far fa-clone"></i> {{
<button type="button" class="btn btn-outline-primary btn-block" @click="addTransactionArray"><span class="far fa-clone"></span> {{
$t('firefly.add_another_split')
}}
</button>
@@ -79,8 +79,8 @@
&nbsp;
</div>
<button :disabled="!enableSubmit" class="btn btn-success btn-block" @click="submitTransaction">
<span v-if="enableSubmit"><i class="far fa-save"></i> {{ $t('firefly.store_transaction') }}</span>
<span v-if="!enableSubmit"><i class="fas fa-spinner fa-spin"></i></span>
<span v-if="enableSubmit"><span class="far fa-save"></span> {{ $t('firefly.store_transaction') }}</span>
<span v-if="!enableSubmit"><span class="fas fa-spinner fa-spin"></span></span>
</button>
</div>
</div>
@@ -492,7 +492,7 @@ export default {
}
// submit transaction link:
promises.push(axios.post('./api/v1/transaction_links', currentLink).then(response => {
// TODO error handling.
// See reference nr. 4
}));
}
}
@@ -898,6 +898,3 @@ export default {
}
</script>
<style scoped>
</style>

View File

@@ -79,7 +79,7 @@
<div class="text-xs d-none d-lg-block d-xl-block">
&nbsp;
</div>
<button type="button" class="btn btn-outline-primary btn-block" @click="addTransaction"><i class="far fa-clone"></i>
<button type="button" class="btn btn-outline-primary btn-block" @click="addTransaction"><span class="far fa-clone"></span>
{{ $t('firefly.add_another_split') }}
</button>
</div>
@@ -88,8 +88,8 @@
&nbsp;
</div>
<button :disabled="!enableSubmit" class="btn btn-info btn-block" @click="submitTransaction">
<span v-if="enableSubmit"><i class="far fa-save"></i> {{ $t('firefly.update_transaction') }}</span>
<span v-if="!enableSubmit"><i class="fas fa-spinner fa-spin"></i></span>
<span v-if="enableSubmit"><span class="far fa-save"></span> {{ $t('firefly.update_transaction') }}</span>
<span v-if="!enableSubmit"><span class="fas fa-spinner fa-spin"></span></span>
</button>
</div>
</div>
@@ -298,7 +298,7 @@ export default {
if (0 === index) {
this.transactionType = array.type.charAt(0).toUpperCase() + array.type.slice(1);
// TODO here you may need to catch stuff like loan/debt/mortgage
// See reference nr. 5
this.sourceAllowedTypes = [array.source_type];
this.destinationAllowedTypes = [array.destination_type];
this.date = array.date.substring(0, 16);
@@ -938,7 +938,7 @@ export default {
return JSON.stringify(compare);
},
// uploadAttachments: function (result) {
// //console.log('TODO, upload attachments.');
// See reference nr. 6
// if (0 === Object.keys(result).length) {
//
// for (let i in this.transactions) {
@@ -1172,7 +1172,7 @@ export default {
for (let i in this.transactions) {
if (this.transactions.hasOwnProperty(i) && /^0$|^[1-9]\d*$/.test(i) && i <= 4294967294) {
if (this.transactions.hasOwnProperty(i)) {
// TODO
// See reference nr. 7
}
}
}
@@ -1182,6 +1182,3 @@ export default {
}
</script>
<style scoped>
</style>

View File

@@ -46,17 +46,17 @@
:sort-compare="tableSortCompare"
>
<template #table-busy>
<i class="fa fa-spinner"></i>
<span class="fa fa-spinner"></span>
</template>
<template #cell(type)="data">
<span v-if="! data.item.split || data.item.split_parent === null">
<i class="fas fa-long-arrow-alt-right" v-if="'deposit' === data.item.type"></i>
<i class="fas fa-long-arrow-alt-left" v-else-if="'withdrawal' === data.item.type"></i>
<i class="fas fa-long-arrows-alt-h" v-else-if="'transfer' === data.item.type"></i>
<span class="fas fa-long-arrow-alt-right" v-if="'deposit' === data.item.type"></span>
<span class="fas fa-long-arrow-alt-left" v-else-if="'withdrawal' === data.item.type"></span>
<span class="fas fa-long-arrows-alt-h" v-else-if="'transfer' === data.item.type"></span>
</span>
</template>
<template #cell(description)="data">
<span><i class="fas fa-angle-right" v-if="data.item.split && data.item.split_parent !== null"></i></span>
<span><span class="fas fa-angle-right" v-if="data.item.split && data.item.split_parent !== null"></span></span>
<a :class="false === data.item.active ? 'text-muted' : ''" :href="'./transactions/show/' + data.item.id" :title="data.value">{{
data.value
}}</a>
@@ -93,8 +93,8 @@
{{ $t('firefly.actions') }}
</button>
<div class="dropdown-menu" :aria-labelledby="'dropdownMenuButton' + data.item.id">
<a class="dropdown-item" :href="'./transactions/edit/' + data.item.id"><i class="fa fas fa-pencil-alt"></i> {{ $t('firefly.edit') }}</a>
<a class="dropdown-item" :href="'./transactions/delete/' + data.item.id"><i class="fa far fa-trash"></i> {{ $t('firefly.delete') }}</a>
<a class="dropdown-item" :href="'./transactions/edit/' + data.item.id"><span class="fa fas fa-pencil-alt"></span> {{ $t('firefly.edit') }}</a>
<a class="dropdown-item" :href="'./transactions/delete/' + data.item.id"><span class="fa far fa-trash"></span> {{ $t('firefly.delete') }}</a>
</div>
</div>
</div>
@@ -117,7 +117,7 @@
<div class="card-footer">
<a :href="'./transactions/create/' + type" class="btn btn-success"
:title="$t('firefly.create_new_transaction')">{{ $t('firefly.create_new_transaction') }}</a>
<a href="#" class="btn btn-info"><i class="fas fa-sync"></i></a>
<a href="#" class="btn btn-info"><span class="fas fa-sync"></span></a>
</div>
</div>
</div>
@@ -254,10 +254,10 @@ export default {
api.get('./api/v1/transactions?type=' + this.type + '&page=' + page + "&start=" + startStr + "&end=" + endStr)
.then(response => {
let currentPage = parseInt(response.data.meta.pagination.current_page);
let totalPages = parseInt(response.data.meta.pagination.total_pages);
//let currentPage = parseInt(response.data.meta.pagination.current_page);
//let totalPages = parseInt(response.data.meta.pagination.total_pages);
this.total = parseInt(response.data.meta.pagination.total);
console.log('total is ' + this.total);
//console.log('total is ' + this.total);
this.transactions.push(...response.data.data);
// if (currentPage < totalPage) {
// let nextPage = currentPage + 1;

View File

@@ -29,7 +29,7 @@
<span v-if="count > 1">({{ index + 1 }} / {{ count }}) </span>
</h3>
<div v-if="count>1" class="card-tools">
<button type="button" class="btn btn-danger btn-xs" @click="removeTransaction"><i class="fas fa-trash-alt"></i></button>
<button type="button" class="btn btn-danger btn-xs" @click="removeTransaction"><span class="fas fa-trash-alt"></span></button>
</div>
</div>

View File

@@ -41,6 +41,3 @@ export default {
}
</script>
<style scoped>
</style>

View File

@@ -50,7 +50,7 @@
</template>
<template slot="append">
<div class="input-group-append">
<button class="btn btn-outline-secondary" tabindex="-1" type="button" v-on:click="clearAccount"><i class="far fa-trash-alt"></i></button>
<button class="btn btn-outline-secondary" tabindex="-1" type="button" v-on:click="clearAccount"><span class="far fa-trash-alt"></span></button>
</div>
</template>
</vue-typeahead-bootstrap>

View File

@@ -112,6 +112,3 @@ export default {
}
</script>
<style scoped>
</style>

View File

@@ -138,6 +138,3 @@ export default {
}
</script>
<style scoped>
</style>

View File

@@ -38,7 +38,7 @@
>
<template slot="append">
<div class="input-group-append">
<button class="btn btn-outline-secondary" tabindex="-1" type="button" v-on:click="clearCategory"><i class="far fa-trash-alt"></i></button>
<button class="btn btn-outline-secondary" tabindex="-1" type="button" v-on:click="clearCategory"><span class="far fa-trash-alt"></span></button>
</div>
</template>
</vue-typeahead-bootstrap>

View File

@@ -34,7 +34,7 @@
>
<template slot="append">
<div class="input-group-append">
<button class="btn btn-outline-secondary" tabindex="-1" type="button" v-on:click="clearDescription"><i class="far fa-trash-alt"></i></button>
<button class="btn btn-outline-secondary" tabindex="-1" type="button" v-on:click="clearDescription"><span class="far fa-trash-alt"></span></button>
</div>
</template>
</vue-typeahead-bootstrap>

View File

@@ -32,7 +32,7 @@
type="url"
/>
<div class="input-group-append">
<button class="btn btn-outline-secondary" tabindex="-1" type="button"><i class="far fa-trash-alt"></i></button>
<button class="btn btn-outline-secondary" tabindex="-1" type="button"><span class="far fa-trash-alt"></span></button>
</div>
</div>
</div>
@@ -71,6 +71,3 @@ export default {
}
</script>
<style scoped>
</style>

View File

@@ -94,6 +94,3 @@ export default {
}
</script>
<style scoped>
</style>

View File

@@ -124,6 +124,3 @@ export default {
}
</script>
<style scoped>
</style>

View File

@@ -36,7 +36,7 @@
>
<template slot="append">
<div class="input-group-append">
<button class="btn btn-outline-secondary" tabindex="-1" type="button" v-on:click="clearDescription"><i class="far fa-trash-alt"></i></button>
<button class="btn btn-outline-secondary" tabindex="-1" type="button" v-on:click="clearDescription"><span class="far fa-trash-alt"></span></button>
</div>
</template>
</vue-typeahead-bootstrap>
@@ -99,6 +99,3 @@ export default {
}
</script>
<style scoped>
</style>

View File

@@ -32,7 +32,7 @@
type="text"
/>
<div class="input-group-append">
<button class="btn btn-outline-secondary" tabindex="-1" type="button"><i class="far fa-trash-alt"></i></button>
<button class="btn btn-outline-secondary" tabindex="-1" type="button"><span class="far fa-trash-alt"></span></button>
</div>
</div>
</div>

View File

@@ -27,7 +27,7 @@
<div class="row">
<div class="col">
<p v-if="links.length === 0">
<button type="button" class="btn btn-default btn-xs" data-target="#linkModal" @click="resetModal" data-toggle="modal"><i class="fas fa-plus"></i> Add transaction link</button>
<button type="button" class="btn btn-default btn-xs" data-target="#linkModal" @click="resetModal" data-toggle="modal"><span class="fas fa-plus"></span> Add transaction link</button>
</p>
<ul v-if="links.length > 0" class="list-group">
<li v-for="(transaction, index) in links" class="list-group-item" v-bind:key="index">
@@ -59,12 +59,12 @@
}}</span>)
</span>
<div class="btn-group btn-group-xs float-right">
<button type="button" class="btn btn-xs btn-danger" @click="removeLink(index)" tabindex="-1"><i class="far fa-trash-alt"></i></button>
<button type="button" class="btn btn-xs btn-danger" @click="removeLink(index)" tabindex="-1"><span class="far fa-trash-alt"></span></button>
</div>
</li>
</ul>
<div v-if="links.length > 0" class="form-text">
<button type="button" class="btn btn-default" @click="resetModal" data-target="#linkModal" data-toggle="modal"><i class="fas fa-plus"></i></button>
<button type="button" class="btn btn-default" @click="resetModal" data-target="#linkModal" data-toggle="modal"><span class="fas fa-plus"></span></button>
</div>
</div>
</div>
@@ -96,7 +96,7 @@
<input id="query" v-model="query" autocomplete="off" class="form-control" maxlength="255" name="search"
placeholder="Search query" type="text">
<div class="input-group-append">
<button class="btn btn-default" type="submit"><i class="fas fa-search"></i> Search</button>
<button class="btn btn-default" type="submit"><span class="fas fa-search"></span> Search</button>
</div>
</div>
</form>
@@ -104,7 +104,7 @@
</div>
<div class="row">
<div class="col">
<span v-if="searching"><i class="fas fa-spinner fa-spin"></i></span>
<span v-if="searching"><span class="fas fa-spinner fa-spin"></span></span>
<h4 v-if="searchResults.length > 0">{{ $t('firefly.search_results') }}</h4>
<table v-if="searchResults.length > 0" class="table table-sm">
<caption style="display:none;">{{ $t('firefly.search_results') }}</caption>
@@ -185,7 +185,7 @@
<script>
const lodashClonedeep = require('lodash.clonedeep');
// TODO error handling
// See reference nr. 3
export default {
props: ['index', 'value', 'errors', 'customFields'],
name: "TransactionLinks",

View File

@@ -106,6 +106,3 @@ export default {
}
</script>
<style scoped>
</style>

View File

@@ -94,6 +94,3 @@ export default {
}
</script>
<style scoped>
</style>

View File

@@ -86,6 +86,3 @@ export default {
}
</script>
<style scoped>
</style>

View File

@@ -166,6 +166,3 @@ export default {
}
</script>
<style scoped>
</style>

View File

@@ -72,6 +72,3 @@ export default {
}
</script>
<style scoped>
</style>