kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-03 11:08:28 +00:00
Code Issues Projects Releases Wiki Activity

Budget box is back.

Browse Source
This commit is contained in:
James Cole
2019-08-18 09:07:08 +02:00
parent ccc12171d6
commit a7b2fbbf10
4 changed files with 8 additions and 6 deletions
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

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

@@ -22,7 +22,7 @@
<template>
<div class="form-group"
v-bind:class="{ 'has-error': hasError()}"
v-if="typeof this.transactionType === 'undefined' || this.transactionType === 'Withdrawal' || this.transactionType === '' || null === this.transactionType">
v-if="typeof this.transactionType === 'undefined' || this.transactionType === 'withdrawal' || this.transactionType === 'Withdrawal' || this.transactionType === '' || null === this.transactionType">
<div class="col-sm-12">
<select name="budget[]" ref="budget" @input="handleInput" class="form-control"
v-if="this.budgets.length > 0">

2
resources/assets/js/components/transactions/CustomDate.vue
View File

@@ -29,7 +29,7 @@
<input type="date" class="form-control" :name="name"
:title="title" autocomplete="off"
ref="date"
:value="value.substr(0,10)" @input="handleInput"
:value="value ? value.substr(0,10): ''" @input="handleInput"
:placeholder="title">
<ul class="list-unstyled" v-for="error in this.error">
<li class="text-danger">{{ error }}</li>

8
resources/assets/js/components/transactions/ForeignAmountSelect.vue
View File

@@ -19,7 +19,7 @@
-->
<template>
<div class="form-group" v-bind:class="{ 'has-error': hasError()}">
<div class="form-group" v-bind:class="{ 'has-error': hasError()}" v-if="this.enabledCurrencies.length > 1">
<div class="col-sm-4">
<select class="form-control" ref="currency_select" name="foreign_currency[]"
v-if="this.enabledCurrencies.length > 0" @input="handleInput">
@@ -136,8 +136,10 @@
];
for (const key in res.data) {
if (res.data.hasOwnProperty(key) && /^0$|^[1-9]\d*$/.test(key) && key <= 4294967294) {
this.currencies.push(res.data[key]);
this.enabledCurrencies.push(res.data[key]);
if (res.data[key].enabled) {
this.currencies.push(res.data[key]);
this.enabledCurrencies.push(res.data[key]);
}
}
}
});