kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-21 19:47:48 +00:00
Code Issues Projects Releases Wiki Activity

Use correct method for key.

Browse Source
This commit is contained in:
James Cole
2020-08-02 18:43:58 +02:00
parent 8dd315d7d6
commit 839ba9d109
5 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/Factory/TransactionJournalFactory.php
View File

@@ -596,8 +596,8 @@ class TransactionJournalFactory
$this->accountValidator->setTransactionType($transactionType); $this->accountValidator->setTransactionType($transactionType);
// validate source account. // validate source account.
$sourceId = array_key_exists('source_id', $data) ? (int) $data['source_id'] : null; $sourceId = property_exists($data, 'source_id') ? (int) $data['source_id'] : null;
$sourceName = array_key_exists('source_name', $data) ? (string) $data['source_name'] : null; $sourceName = property_exists($data, 'source_name') ? (string) $data['source_name'] : null;
$validSource = $this->accountValidator->validateSource($sourceId, $sourceName, null); $validSource = $this->accountValidator->validateSource($sourceId, $sourceName, null);
// do something with result: // do something with result:
@@ -606,8 +606,8 @@ class TransactionJournalFactory
} }
Log::debug('Source seems valid.'); Log::debug('Source seems valid.');
// validate destination account // validate destination account
$destinationId = array_key_exists('destination_id', $data) ? (int) $data['destination_id'] : null; $destinationId = property_exists($data, 'destination_id') ? (int) $data['destination_id'] : null;
$destinationName = array_key_exists('destination_name', $data) ? (string) $data['destination_name'] : null; $destinationName = property_exists($data, 'destination_name') ? (string) $data['destination_name'] : null;
$validDestination = $this->accountValidator->validateDestination($destinationId, $destinationName, null); $validDestination = $this->accountValidator->validateDestination($destinationId, $destinationName, null);
// do something with result: // do something with result:
if (false === $validDestination) { if (false === $validDestination) {

2
public/v1/js/create_transaction.js vendored
View File

File diff suppressed because one or more lines are too long

2
public/v1/js/edit_transaction.js vendored
View File

File diff suppressed because one or more lines are too long

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

@@ -129,12 +129,6 @@
:error="transaction.errors.budget_id" :error="transaction.errors.budget_id"
:no_budget="$t('firefly.none_in_select_list')" :no_budget="$t('firefly.none_in_select_list')"
></budget> ></budget>
<bill
:transactionType="transactionType"
v-model="transaction.bill"
:error="transaction.errors.bill_id"
:no_bill="$t('firefly.none_in_select_list')"
></bill>
<category <category
:transactionType="transactionType" :transactionType="transactionType"
v-model="transaction.category" v-model="transaction.category"
@@ -150,6 +144,12 @@
v-model="transaction.tags" v-model="transaction.tags"
:error="transaction.errors.tags" :error="transaction.errors.tags"
></tags> ></tags>
<bill
:transactionType="transactionType"
v-model="transaction.bill"
:error="transaction.errors.bill_id"
:no_bill="$t('firefly.none_in_select_list')"
></bill>
<custom-transaction-fields <custom-transaction-fields
v-model="transaction.custom_fields" v-model="transaction.custom_fields"
:error="transaction.errors.custom_errors" :error="transaction.errors.custom_errors"

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

@@ -148,12 +148,6 @@
:error="transaction.errors.budget_id" :error="transaction.errors.budget_id"
:no_budget="$t('firefly.none_in_select_list')" :no_budget="$t('firefly.none_in_select_list')"
></budget> ></budget>
<bill
:transactionType="transactionType"
v-model="transaction.bill"
:error="transaction.errors.bill_id"
:no_bill="$t('firefly.none_in_select_list')"
></bill>
<category <category
:transactionType="transactionType" :transactionType="transactionType"
v-model="transaction.category" v-model="transaction.category"
@@ -165,6 +159,12 @@
v-model="transaction.tags" v-model="transaction.tags"
:error="transaction.errors.tags" :error="transaction.errors.tags"
></tags> ></tags>
<bill
:transactionType="transactionType"
v-model="transaction.bill"
:error="transaction.errors.bill_id"
:no_bill="$t('firefly.none_in_select_list')"
></bill>
<custom-transaction-fields <custom-transaction-fields
v-model="transaction.custom_fields" v-model="transaction.custom_fields"
:error="transaction.errors.custom_errors" :error="transaction.errors.custom_errors"