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

Clarifies #751

Browse Source
This commit is contained in:
James Cole 2017-08-12 06:44:00 +02:00
parent 716af4ed93
commit 2e6d1f3642
No known key found for this signature in database
GPG Key ID: C16961E655E74B5E
1 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
app/Export/Entry/Entry.php
View File

@ -45,11 +45,11 @@ final class Entry
public $transaction_type; public $transaction_type;
public $source_account_id; public $asset_account_id;
public $source_account_name; public $asset_account_name;
public $destination_account_id; public $opposing_account_id;
public $destination_account_name; public $opposing_account_name;
public $budget_id; public $budget_id;
public $budget_name; public $budget_name;
@ -71,21 +71,21 @@ final class Entry
*/ */
public static function fromObject($object): Entry public static function fromObject($object): Entry
{ {
$entry = new self; $entry = new self;
$entry->journal_id = $object->transaction_journal_id; $entry->journal_id = $object->transaction_journal_id;
$entry->description = Steam::decrypt(intval($object->journal_encrypted), $object->journal_description); $entry->description = Steam::decrypt(intval($object->journal_encrypted), $object->journal_description);
$entry->amount = $object->amount; $entry->amount = $object->amount;
$entry->date = $object->date; $entry->date = $object->date;
$entry->transaction_type = $object->transaction_type; $entry->transaction_type = $object->transaction_type;
$entry->currency_code = $object->transaction_currency_code; $entry->currency_code = $object->transaction_currency_code;
$entry->source_account_id = $object->account_id; $entry->asset_account_id = $object->account_id;
$entry->source_account_name = Steam::decrypt(intval($object->account_name_encrypted), $object->account_name); $entry->asset_account_name = Steam::decrypt(intval($object->account_name_encrypted), $object->account_name);
$entry->destination_account_id = $object->opposing_account_id; $entry->opposing_account_id = $object->opposing_account_id;
$entry->destination_account_name = Steam::decrypt(intval($object->opposing_account_encrypted), $object->opposing_account_name); $entry->opposing_account_name = Steam::decrypt(intval($object->opposing_account_encrypted), $object->opposing_account_name);
$entry->category_id = $object->category_id ?? ''; $entry->category_id = $object->category_id ?? '';
$entry->category_name = $object->category_name ?? ''; $entry->category_name = $object->category_name ?? '';
$entry->budget_id = $object->budget_id ?? ''; $entry->budget_id = $object->budget_id ?? '';
$entry->budget_name = $object->budget_name ?? ''; $entry->budget_name = $object->budget_name ?? '';
// update description when transaction description is different: // update description when transaction description is different:
if (!is_null($object->description) && $object->description !== $entry->description) { if (!is_null($object->description) && $object->description !== $entry->description) {