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

Fixed a bug where profiled account names would not get strtolower() and thus match nothing. Thanks to Tweakers.net user "doeners"

Browse Source
This commit is contained in:
James Cole
2016-03-19 11:23:23 +01:00
parent 8f3572f2d3
commit 7aa2565e89
8 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Rules/Triggers/FromAccountContains.php
View File

@@ -53,7 +53,7 @@ final class FromAccountContains extends AbstractTrigger implements TriggerInterf
*/ */
public function triggered(TransactionJournal $journal) public function triggered(TransactionJournal $journal)
{ {
$fromAccountName = $journal->source_account_name ?? strtolower(TransactionJournal::sourceAccount($journal)->name); $fromAccountName = strtolower($journal->source_account_name ?? TransactionJournal::sourceAccount($journal)->name);
$search = strtolower($this->triggerValue); $search = strtolower($this->triggerValue);
$strpos = strpos($fromAccountName, $search); $strpos = strpos($fromAccountName, $search);

2
app/Rules/Triggers/FromAccountEnds.php
View File

@@ -53,7 +53,7 @@ final class FromAccountEnds extends AbstractTrigger implements TriggerInterface
*/ */
public function triggered(TransactionJournal $journal) public function triggered(TransactionJournal $journal)
{ {
$name = $journal->source_account_name ?? strtolower(TransactionJournal::sourceAccount($journal)->name); $name = strtolower($journal->source_account_name ?? TransactionJournal::sourceAccount($journal)->name);
$nameLength = strlen($name); $nameLength = strlen($name);
$search = strtolower($this->triggerValue); $search = strtolower($this->triggerValue);
$searchLength = strlen($search); $searchLength = strlen($search);

4
app/Rules/Triggers/FromAccountIs.php
View File

@@ -53,7 +53,7 @@ final class FromAccountIs extends AbstractTrigger implements TriggerInterface
*/ */
public function triggered(TransactionJournal $journal) public function triggered(TransactionJournal $journal)
{ {
$name = $journal->source_account_name ?? strtolower(TransactionJournal::sourceAccount($journal)->name); $name = strtolower($journal->source_account_name ?? TransactionJournal::sourceAccount($journal)->name);
$search = strtolower($this->triggerValue); $search = strtolower($this->triggerValue);
if ($name == $search) { if ($name == $search) {
@@ -61,7 +61,7 @@ final class FromAccountIs extends AbstractTrigger implements TriggerInterface
return true; return true;
} }
Log::debug('"' . $name . '" does not equal "' . $search . '". Return false.'); Log::debug('"' . $name . '" does not equal "' . $search . '" exactly. Return false.');
return false; return false;

2
app/Rules/Triggers/FromAccountStarts.php
View File

@@ -53,7 +53,7 @@ final class FromAccountStarts extends AbstractTrigger implements TriggerInterfac
*/ */
public function triggered(TransactionJournal $journal) public function triggered(TransactionJournal $journal)
{ {
$name = $journal->source_account_name ?? strtolower(TransactionJournal::sourceAccount($journal)->name); $name = strtolower($journal->source_account_name ?? TransactionJournal::sourceAccount($journal)->name);
$search = strtolower($this->triggerValue); $search = strtolower($this->triggerValue);
$part = substr($name, 0, strlen($search)); $part = substr($name, 0, strlen($search));

2
app/Rules/Triggers/ToAccountContains.php
View File

@@ -53,7 +53,7 @@ final class ToAccountContains extends AbstractTrigger implements TriggerInterfac
*/ */
public function triggered(TransactionJournal $journal) public function triggered(TransactionJournal $journal)
{ {
$toAccountName = $journal->destination_account_name ?? strtolower(TransactionJournal::destinationAccount($journal)->name); $toAccountName = strtolower($journal->destination_account_name ?? TransactionJournal::destinationAccount($journal)->name);
$search = strtolower($this->triggerValue); $search = strtolower($this->triggerValue);
$strpos = strpos($toAccountName, $search); $strpos = strpos($toAccountName, $search);

2
app/Rules/Triggers/ToAccountEnds.php
View File

@@ -53,7 +53,7 @@ final class ToAccountEnds extends AbstractTrigger implements TriggerInterface
*/ */
public function triggered(TransactionJournal $journal) public function triggered(TransactionJournal $journal)
{ {
$toAccountName = $journal->destination_account_name ?? strtolower(TransactionJournal::destinationAccount($journal)->name); $toAccountName = strtolower($journal->destination_account_name ?? TransactionJournal::destinationAccount($journal)->name);
$toAccountNameLength = strlen($toAccountName); $toAccountNameLength = strlen($toAccountName);
$search = strtolower($this->triggerValue); $search = strtolower($this->triggerValue);
$searchLength = strlen($search); $searchLength = strlen($search);

2
app/Rules/Triggers/ToAccountIs.php
View File

@@ -53,7 +53,7 @@ final class ToAccountIs extends AbstractTrigger implements TriggerInterface
*/ */
public function triggered(TransactionJournal $journal) public function triggered(TransactionJournal $journal)
{ {
$toAccountName = $journal->destination_account_name ?? strtolower(TransactionJournal::destinationAccount($journal)->name); $toAccountName = strtolower($journal->destination_account_name ?? TransactionJournal::destinationAccount($journal)->name);
$search = strtolower($this->triggerValue); $search = strtolower($this->triggerValue);
if ($toAccountName == $search) { if ($toAccountName == $search) {

2
app/Rules/Triggers/ToAccountStarts.php
View File

@@ -53,7 +53,7 @@ final class ToAccountStarts extends AbstractTrigger implements TriggerInterface
*/ */
public function triggered(TransactionJournal $journal) public function triggered(TransactionJournal $journal)
{ {
$toAccountName = $journal->destination_account_name ?? strtolower(TransactionJournal::destinationAccount($journal)->name); $toAccountName = strtolower($journal->destination_account_name ?? TransactionJournal::destinationAccount($journal)->name);
$search = strtolower($this->triggerValue); $search = strtolower($this->triggerValue);
$part = substr($toAccountName, 0, strlen($search)); $part = substr($toAccountName, 0, strlen($search));