shihaam/akaunting
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Reconciliations multi currency and calculate fixed.

Browse Source
This commit is contained in:
Cüneyt Şentürk
2020-06-08 19:08:13 +03:00
parent a884e06b72
commit d4923b4414
7 changed files with 118 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
resources/assets/js/components/AkauntingMoney.vue
View File

@ -10,7 +10,7 @@
</span>
</div>
<money :name="name" @input="input" :placeholder="placeholder" v-bind="money" :value="value" :disabled="disabled" :masked="masked" class="form-control"></money>
<money :name="name" @input="input" :placeholder="placeholder" v-bind="money" :value="model" :disabled="disabled" :masked="masked" class="form-control"></money>
</div>
<div class="invalid-feedback d-block" v-if="error" v-html="error"></div>
@ -133,10 +133,14 @@ export default {
change() {
//this.$emit('change', this.model);
//this.$emit('interface', this.model);
this.$emit('input', this.model);
},
input(event) {
this.model = event;
this.$emit('input', event);
//this.$emit('change', this.model);
//this.$emit('interface', this.model);
}
@ -144,6 +148,10 @@ export default {
watch: {
dynamicCurrency: function (currency) {
if (!currency) {
return;
}
this.money = {
decimal: currency.decimal_mark,
thousands: currency.thousands_separator,

20
resources/assets/js/views/banking/reconciliations.js vendored
View File

@ -40,7 +40,9 @@ const app = new Vue({
},
mounted() {
this.totals.closing_balance = parseFloat(document.getElementById('closing_balance').value);
if (document.getElementById('closing_balance') != null) {
this.totals.closing_balance = parseFloat(document.getElementById('closing_balance').value);
}
},
methods:{
@ -59,10 +61,13 @@ const app = new Vue({
let transactions = this.form.transactions;
let cleared_amount = 0;
let closing_balance = parseFloat(this.form.closing_balance);
let difference = 0;
let income_total = 0;
let expense_total = 0;
this.totals.closing_balance = closing_balance;
if (transactions) {
// get all transactions.
Object.keys(transactions).forEach(function(transaction) {
@ -79,10 +84,17 @@ const app = new Vue({
}
});
cleared_amount = parseFloat(this.form.opening_balance) + parseFloat(income_total - expense_total);
let transaction_total = income_total - expense_total;
cleared_amount = parseFloat(this.form.opening_balance) + transaction_total;
}
difference = parseFloat(this.form.closing_balance) - cleared_amount;
if (cleared_amount > 0) {
difference = parseFloat(this.form.closing_balance) - parseFloat(cleared_amount);
} else {
difference = parseFloat(this.form.closing_balance) + parseFloat(cleared_amount);
}
if (difference != 0) {
this.difference = 'table-danger';
@ -92,7 +104,7 @@ const app = new Vue({
this.reconcile = false;
}
this.totals.cleared_amount = cleared_amount;
this.totals.cleared_amount = parseFloat(cleared_amount);
this.totals.difference = difference;
},