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

Some intermittent changes to storing journals.

Browse Source
This commit is contained in:
James Cole
2018-02-24 09:17:15 +01:00
parent 1a721ac6b5
commit 166cdad58b
2 changed files with 30 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -46,10 +46,12 @@ class JournalFormRequest extends Request
*/
public function getJournalData()
{
var_dump($this->all());
$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:
@@ -65,15 +67,16 @@ class JournalFormRequest extends Request
// journal data:
'description' => $this->string('description'),
'piggy_bank_id' => $this->integer('piggy_bank_id'),
'piggy_bank_name' => null,
'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'),
//'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' => [
@@ -98,6 +101,18 @@ class JournalFormRequest extends Request
],
],
];
switch ($data['type']) {
case 'withdrawal':
$data['transactions'][0]['currency_id'] = $this->integer('source_currency_id');
break;
case 'deposit':
$data['transactions'][0]['currency_id'] = $this->integer('destination_currency_id');
break;
case 'transfer':
$data['transactions'][0]['currency_id'] = $this->integer('destination_currency_id');
break;
}
return $data;
}