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

Fix split deposit.

Browse Source
This commit is contained in:
James Cole
2016-07-26 20:26:46 +02:00
parent 90865a5284
commit ce191fa6d3
5 changed files with 168 additions and 167 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/Crud/Split/Journal.php
View File

@@ -105,9 +105,6 @@ class Journal implements JournalInterface
*/ */
public function updateJournal(TransactionJournal $journal, array $data): TransactionJournal public function updateJournal(TransactionJournal $journal, array $data): TransactionJournal
{ {
echo '<pre>';
print_r($data);
$journal->description = $data['journal_description']; $journal->description = $data['journal_description'];
$journal->transaction_currency_id = $data['journal_currency_id']; $journal->transaction_currency_id = $data['journal_currency_id'];
$journal->date = $data['date']; $journal->date = $data['date'];
@@ -167,7 +164,8 @@ class Journal implements JournalInterface
{ {
$destinationAccount = Account::where('user_id', $this->user->id)->where('id', $data['destination_account_id'])->first(['accounts.*']); $destinationAccount = Account::where('user_id', $this->user->id)->where('id', $data['destination_account_id'])->first(['accounts.*']);
if (strlen($data['source_account_name']) > 0) {
if (isset($data['source_account_name']) && strlen($data['source_account_name']) > 0) {
$sourceType = AccountType::where('type', 'Revenue account')->first(); $sourceType = AccountType::where('type', 'Revenue account')->first();
$sourceAccount = Account::firstOrCreateEncrypted( $sourceAccount = Account::firstOrCreateEncrypted(
['user_id' => $this->user->id, 'account_type_id' => $sourceType->id, 'name' => $data['source_account_name'], 'active' => 1] ['user_id' => $this->user->id, 'account_type_id' => $sourceType->id, 'name' => $data['source_account_name'], 'active' => 1]

12
app/Http/Requests/SplitJournalFormRequest.php
View File

@@ -59,14 +59,10 @@ class SplitJournalFormRequest extends Request
'amount' => round($this->get('amount')[$index], 2), 'amount' => round($this->get('amount')[$index], 2),
'budget_id' => $this->get('budget_id')[$index] ? intval($this->get('budget_id')[$index]) : 0, 'budget_id' => $this->get('budget_id')[$index] ? intval($this->get('budget_id')[$index]) : 0,
'category' => $this->get('category')[$index] ?? '', 'category' => $this->get('category')[$index] ?? '',
'source_account_id' => intval($this->get('journal_source_account_id')), 'source_account_id' => isset($this->get('source_account_id')[$index]) ? intval($this->get('source_account_id')[$index]) : intval($this->get('journal_source_account_id')),
'source_account_name' => $this->get('journal_source_account_name'), 'source_account_name' => $this->get('source_account_name')[$index] ?? '',
'piggy_bank_id' => isset($this->get('piggy_bank_id')[$index]) 'piggy_bank_id' => isset($this->get('piggy_bank_id')[$index]) ? intval($this->get('piggy_bank_id')[$index]) : 0,
? intval($this->get('piggy_bank_id')[$index]) 'destination_account_id' => isset($this->get('destination_account_id')[$index]) ? intval($this->get('destination_account_id')[$index]) : intval($this->get('journal_destination_account_id')),
: 0,
'destination_account_id' => isset($this->get('destination_account_id')[$index])
? intval($this->get('destination_account_id')[$index])
: intval($this->get('journal_destination_account_id')),
'destination_account_name' => $this->get('destination_account_name')[$index] ?? '', 'destination_account_name' => $this->get('destination_account_name')[$index] ?? '',
]; ];
$data['transactions'][] = $transaction; $data['transactions'][] = $transaction;

1
resources/lang/en_US/list.php
View File

@@ -29,6 +29,7 @@ return [
'lastMatch' => 'Last match', 'lastMatch' => 'Last match',
'split_number' => 'Split #', 'split_number' => 'Split #',
'destination' => 'Destination', 'destination' => 'Destination',
'source' => 'Source',
'expectedMatch' => 'Expected match', 'expectedMatch' => 'Expected match',
'automatch' => 'Auto match?', 'automatch' => 'Auto match?',
'repeat_freq' => 'Repeats', 'repeat_freq' => 'Repeats',

5
resources/views/split/journals/create.twig
View File

@@ -85,9 +85,12 @@
<tr> <tr>
<th>{{ trans('list.split_number') }}</th> <th>{{ trans('list.split_number') }}</th>
<th>{{ trans('list.description') }}</th> <th>{{ trans('list.description') }}</th>
{% if preFilled.what == 'withdrawal' or preFilled.what == 'deposit' %} {% if preFilled.what == 'withdrawal' %}
<th>{{ trans('list.destination') }}</th> <th>{{ trans('list.destination') }}</th>
{% endif %} {% endif %}
{% if preFilled.what == 'deposit' %}
<th>{{ trans('list.source') }}</th>
{% endif %}
<th>{{ trans('list.amount') }}</th> <th>{{ trans('list.amount') }}</th>
{% if preFilled.what == 'withdrawal' %} {% if preFilled.what == 'withdrawal' %}
<th>{{ trans('list.budget') }}</th> <th>{{ trans('list.budget') }}</th>

5
resources/views/split/journals/edit.twig
View File

@@ -94,9 +94,12 @@
<th>{{ trans('list.description') }}</th> <th>{{ trans('list.description') }}</th>
<!-- withdrawal and deposit have a destination. --> <!-- withdrawal and deposit have a destination. -->
{% if preFilled.what == 'withdrawal' or preFilled.what == 'deposit' %} {% if preFilled.what == 'withdrawal' %}
<th>{{ trans('list.destination') }}</th> <th>{{ trans('list.destination') }}</th>
{% endif %} {% endif %}
{% if preFilled.what == 'deposit' %}
<th>{{ trans('list.source') }}</th>
{% endif %}
<th>{{ trans('list.amount') }}</th> <th>{{ trans('list.amount') }}</th>