IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-25 18:45:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix #2945

Browse Source
This commit is contained in:
James Cole 2020-01-03 11:30:21 +01:00
parent 5b9e0319c7
commit ce44edcf63
No known key found for this signature in database
GPG Key ID: C16961E655E74B5E
4 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
public/v1/js/app.js vendored
View File

File diff suppressed because one or more lines are too long

11
resources/assets/js/components/transactions/Budget.vue
View File

@ -29,9 +29,7 @@
<div class="col-sm-12"> <div class="col-sm-12">
<select name="budget[]" ref="budget" v-model="value" @input="handleInput" class="form-control" <select name="budget[]" ref="budget" v-model="value" @input="handleInput" class="form-control"
v-if="this.budgets.length > 0"> v-if="this.budgets.length > 0">
<option v-for="cBudget in this.budgets" :label="cBudget.name" :value="cBudget.id" <option v-for="cBudget in this.budgets" :label="cBudget.name" :value="cBudget.id">{{cBudget.name}}</option>
>{{cBudget.name}}</option>
</select> </select>
<ul class="list-unstyled" v-for="error in this.error"> <ul class="list-unstyled" v-for="error in this.error">
<li class="text-danger">{{ error }}</li> <li class="text-danger">{{ error }}</li>
@ -46,8 +44,7 @@
props: ['transactionType', 'value', 'error','no_budget'], props: ['transactionType', 'value', 'error','no_budget'],
mounted() { mounted() {
this.loadBudgets(); this.loadBudgets();
// console.log('budget value'); //this.value = null === this.value ? 0 : this.value;
// console.log(this.value);
}, },
data() { data() {
return { return {
@ -68,6 +65,10 @@
{ {
name: this.no_budget, name: this.no_budget,
id: 0, id: 0,
},
{
name: this.no_budget,
id: null,
} }
]; ];
for (const key in res.data) { for (const key in res.data) {

7
resources/assets/js/components/transactions/EditTransaction.vue
View File

@ -170,6 +170,7 @@
:error="transaction.errors.category" :error="transaction.errors.category"
></category> ></category>
<tags <tags
:transactionType="transactionType"
:tags="transaction.tags" :tags="transaction.tags"
v-model="transaction.tags" v-model="transaction.tags"
:error="transaction.errors.tags" :error="transaction.errors.tags"
@ -203,7 +204,7 @@
{{ $t('firefly.after_update_create_another') }} {{ $t('firefly.after_update_create_another') }}
</label> </label>
</div> </div>
<div class="checkbox" v-if="transactionType.toLowerCase() !== 'reconciliation'"> <div class="checkbox" v-if="null !== transactionType && transactionType.toLowerCase() !== 'reconciliation'">
<label> <label>
<input v-model="storeAsNew" name="store_as_new" type="checkbox"> <input v-model="storeAsNew" name="store_as_new" type="checkbox">
{{ $t('firefly.store_as_new') }} {{ $t('firefly.store_as_new') }}
@ -301,7 +302,9 @@
} }
}, },
setTransactionType(type) { setTransactionType(type) {
this.transactionType = type; if(null !== type) {
this.transactionType = type;
}
}, },
deleteTransaction(index, event) { deleteTransaction(index, event) {
event.preventDefault(); event.preventDefault();

1
webpack.mix.js vendored
View File

@ -31,4 +31,5 @@ let mix = require('laravel-mix');
| |
*/ */
//mix.sourceMaps().js('resources/assets/js/app.js', 'public/v1/js');
mix.js('resources/assets/js/app.js', 'public/v1/js'); mix.js('resources/assets/js/app.js', 'public/v1/js');