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 for #2438

Browse Source
This commit is contained in:
James Cole 2019-08-23 13:53:05 +02:00
parent 19bd295c71
commit 633c776ebf
4 changed files with 6 additions and 59487 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Factory/TransactionJournalFactory.php
View File

@ -297,9 +297,9 @@ class TransactionJournalFactory
$foreignCurrency = $this->getCurrency($foreignCurrency, $destinationAccount); $foreignCurrency = $this->getCurrency($foreignCurrency, $destinationAccount);
$sourceCurrency = $currency; $sourceCurrency = $currency;
$destCurrency = $foreignCurrency; $destCurrency = $currency;
$sourceForeignCurrency = $foreignCurrency; $sourceForeignCurrency = $foreignCurrency;
$destForeignCurrency = $currency; $destForeignCurrency = $foreignCurrency;
} }
/** Create a basic journal. */ /** Create a basic journal. */

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

File diff suppressed because one or more lines are too long

5
resources/assets/js/components/transactions/CreateTransaction.vue
View File

@ -19,8 +19,7 @@
--> -->
<template> <template>
<form method="POST" action="#" accept-charset="UTF-8" class="form-horizontal" id="store" <form accept-charset="UTF-8" class="form-horizontal" enctype="multipart/form-data">
enctype="multipart/form-data">
<input name="_token" type="hidden" value="xxx"> <input name="_token" type="hidden" value="xxx">
<div class="row" v-if="error_message !== ''"> <div class="row" v-if="error_message !== ''">
<div class="col-lg-12"> <div class="col-lg-12">
@ -164,7 +163,7 @@
</div> </div>
</div> </div>
<div class="box-footer" v-if="transactions.length-1 === index"> <div class="box-footer" v-if="transactions.length-1 === index">
<button class="split_add_btn btn btn-primary" @click="addTransactionToArray">Add another split</button> <button class="split_add_btn btn btn-primary" type="button" @click="addTransactionToArray">Add another split</button>
</div> </div>
</div> </div>
</div> </div>

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

@ -160,7 +160,7 @@
</div> </div>
</div> </div>
<div class="box-footer" v-if="transactions.length-1 === index"> <div class="box-footer" v-if="transactions.length-1 === index">
<button class="btn btn-primary" @click="addTransaction">Add another split</button> <button class="btn btn-primary" type="button" @click="addTransaction">Add another split</button>
</div> </div>
</div> </div>
</div> </div>