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

Unset transaction source so the duplicate detector keeps working.

Browse Source
This commit is contained in:
James Cole 2018-09-06 07:40:56 +02:00
parent b855c54e81
commit 4ef663669c
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Import/Storage/ImportArrayStorage.php
View File

@ -190,7 +190,7 @@ class ImportArrayStorage
*/ */
private function getHash(array $transaction): string private function getHash(array $transaction): string
{ {
unset($transaction['importHashV2']); unset($transaction['importHashV2'], $transaction['original-source']);
$json = json_encode($transaction); $json = json_encode($transaction);
if (false === $json) { if (false === $json) {
/** @noinspection ForgottenDebugOutputInspection */ /** @noinspection ForgottenDebugOutputInspection */

8
tests/Unit/Support/Import/Routine/Spectre/StageImportDataHandlerTest.php
View File

@ -360,7 +360,7 @@ class StageImportDataHandlerTest extends TestCase
'piggy_bank_name' => null, 'piggy_bank_name' => null,
'bill_id' => null, 'bill_id' => null,
'bill_name' => null, 'bill_name' => null,
'original-source' => sprintf('spectre-v%s', config('firefly.version')), 'original-source' => sprintf('spectre-v%s', config('firefly.version')),
// transaction data: // transaction data:
'transactions' => [ 'transactions' => [
@ -398,7 +398,7 @@ class StageImportDataHandlerTest extends TestCase
'piggy_bank_name' => null, 'piggy_bank_name' => null,
'bill_id' => null, 'bill_id' => null,
'bill_name' => null, 'bill_name' => null,
'original-source' => sprintf('spectre-v%s', config('firefly.version')), 'original-source' => sprintf('spectre-v%s', config('firefly.version')),
// transaction data: // transaction data:
'transactions' => [ 'transactions' => [
@ -558,7 +558,7 @@ class StageImportDataHandlerTest extends TestCase
'piggy_bank_name' => null, 'piggy_bank_name' => null,
'bill_id' => null, 'bill_id' => null,
'bill_name' => null, 'bill_name' => null,
'original-source' => sprintf('spectre-v%s', config('firefly.version')), 'original-source' => sprintf('spectre-v%s', config('firefly.version')),
// transaction data: // transaction data:
'transactions' => [ 'transactions' => [
@ -596,7 +596,7 @@ class StageImportDataHandlerTest extends TestCase
'piggy_bank_name' => null, 'piggy_bank_name' => null,
'bill_id' => null, 'bill_id' => null,
'bill_name' => null, 'bill_name' => null,
'original-source' => sprintf('spectre-v%s', config('firefly.version')), 'original-source' => sprintf('spectre-v%s', config('firefly.version')),
// transaction data: // transaction data:
'transactions' => [ 'transactions' => [