IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2024-11-28 03:34:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

New saving acount function, supports account numbers with chars and make it easier to link when account numbers are the same but name are different

Browse Source
This commit is contained in:
Ruben Verhoef 2020-03-26 20:51:07 +01:00
parent 8c552b8fa8
commit 8cfe0af502
1 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
app/Import/Specifics/IngDescription.php
View File

@ -150,16 +150,23 @@ class IngDescription implements SpecificInterface
private function MoveSavingsAccount(): void private function MoveSavingsAccount(): void
{ {
$matches = []; $matches = [];
if ('' === (string) $this->row[3]) {
if (preg_match('/(Naar|Van) (.*rekening) ([0-9]+)/', $this->row[8], $matches)) { if (preg_match('/(Naar|Van) (.*rekening) ([A-Za-z0-9]+)/', $this->row[8], $matches)) { // Search for saving acount at 'Mededelingen' column
$matches[3] = sprintf("%010d", $matches[3]); $this->row[1] = $this->row[1] . ' ' . $matches[2] . ' ' . $matches[3]; // Current name + Saving acount name + Acount number
$this->row[1] = $matches[2]; // Savings account name if ('' === (string) $this->row[3]) { // if Saving account number does not yet exists
$this->row[3] = $matches[3]; // Savings account number $this->row[3] = $matches[3]; // Copy savings account number
$this->row[8] = preg_replace('/(Naar|Van) (.*rekening) ([0-9]+)/', '', $this->row[8]); // Remove the savings account content from description }
} elseif (preg_match('/(Naar|Van) (.*rekening) ([0-9]+)/', $this->row[1], $matches)) { $this->row[8] = preg_replace('/(Naar|Van) (.*rekening) ([A-Za-z0-9]+)/', '', $this->row[8]); // Remove the savings account content from description
$matches[3] = sprintf("%010d", $matches[3]); } elseif (preg_match('/(Naar|Van) (.*rekening) ([A-Za-z0-9]+)/', $this->row[1], $matches)) { // Search for saving acount at 'Naam / Omschrijving' column
$this->row[1] = $matches[2]; // Savings account name $this->row[1] = $matches[2] . ' ' . $matches[3]; // Saving acount name + Acount number
$this->row[3] = $matches[3]; // Savings account number if ('' === (string) $this->row[3]) { // if Saving account number does not yet exists
$this->row[3] = $matches[3]; // Copy savings account number
}
}
if ('' !== (string)$this->row[3]) { // if Saving account number exists
if (! preg_match('/[A-Za-z]/', $this->row[3])) { // if Saving account number has no characters
$this->row[3] = sprintf("%010d", $this->row[3]); // Make the number 10 digits
} }
} }
} }