kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-16 17:33:45 +00:00
Code Issues Projects Releases Wiki Activity

Update edit and submit routines for transactions.

Browse Source
This commit is contained in:
James Cole
2018-02-24 14:31:20 +01:00
parent ac66e89edb
commit 211caa07dc
7 changed files with 440 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
app/Http/Requests/JournalFormRequest.php
View File

@@ -46,14 +46,13 @@ class JournalFormRequest extends Request
*/
public function getJournalData()
{
var_dump($this->all());
$data = [
$currencyId = $this->integer('amount_currency_id_amount');
$data = [
'type' => $this->get('what'), // type. can be 'deposit', 'withdrawal' or 'transfer'
'date' => $this->date('date'),
'tags' => explode(',', $this->string('tags')),
'user' => auth()->user()->id,
// all custom fields:
'interest_date' => $this->date('interest_date'),
'book_date' => $this->date('book_date'),
@@ -71,13 +70,6 @@ class JournalFormRequest extends Request
'bill_id' => null,
'bill_name' => null,
// native amount and stuff like that:
//'currency_id' => $this->integer('amount_currency_id_amount'),
//'amount' => $this->string('amount'),
//'native_amount' => $this->string('native_amount'),
//'source_amount' => $this->string('source_amount'),
//'destination_amount' => $this->string('destination_amount'),
// transaction data:
'transactions' => [
[
@@ -101,15 +93,41 @@ class JournalFormRequest extends Request
],
],
];
switch ($data['type']) {
switch (strtolower($data['type'])) {
case 'withdrawal':
$data['transactions'][0]['currency_id'] = $this->integer('source_currency_id');
$sourceCurrency = $this->integer('source_account_currency');
$data['transactions'][0]['currency_id'] = $sourceCurrency;
$data['transactions'][0]['destination_id'] = null; // clear destination ID (transfer)
if ($sourceCurrency !== $currencyId) {
// user has selected a foreign currency.
$data['transactions'][0]['foreign_currency_id'] = $currencyId;
$data['transactions'][0]['foreign_amount'] = $this->string('amount');
$data['transactions'][0]['amount'] = $this->string('native_amount');
}
break;
case 'deposit':
$data['transactions'][0]['currency_id'] = $this->integer('destination_currency_id');
$destinationCurrency = $this->integer('destination_account_currency');
$data['transactions'][0]['currency_id'] = $destinationCurrency;
$data['transactions'][0]['source_id'] = null; // clear destination ID (transfer)
if ($destinationCurrency !== $currencyId) {
// user has selected a foreign currency.
$data['transactions'][0]['foreign_currency_id'] = $currencyId;
$data['transactions'][0]['foreign_amount'] = $this->string('amount');
$data['transactions'][0]['amount'] = $this->string('native_amount');
}
break;
case 'transfer':
$data['transactions'][0]['currency_id'] = $this->integer('destination_currency_id');
// by default just assume source currency
$sourceCurrency = $this->integer('source_account_currency');
$destinationCurrency = $this->integer('destination_account_currency');
$data['transactions'][0]['currency_id'] = $sourceCurrency;
if ($sourceCurrency !== $destinationCurrency) {
// user has selected a foreign currency.
$data['transactions'][0]['foreign_currency_id'] = $destinationCurrency;
$data['transactions'][0]['foreign_amount'] = $this->string('destination_amount');
$data['transactions'][0]['amount'] = $this->string('source_amount');
}
break;
}