Changed trigger constructor. No longer needs model AND journal, now only model. Wait for it...

This commit is contained in:
James Cole
2016-02-17 19:07:20 +01:00
parent 8024ad123e
commit 12b6791e8b
20 changed files with 347 additions and 332 deletions

View File

@@ -22,21 +22,20 @@ use Log;
*/
class AmountLess implements TriggerInterface
{
/** @var TransactionJournal */
protected $journal;
/** @var RuleTrigger */
protected $trigger;
/**
* TriggerInterface constructor.
*
* @param RuleTrigger $trigger
* @param TransactionJournal $journal
* @param RuleTrigger $trigger
*/
public function __construct(RuleTrigger $trigger, TransactionJournal $journal)
public function __construct(RuleTrigger $trigger)
{
$this->trigger = $trigger;
$this->journal = $journal;
}
/**
@@ -65,11 +64,13 @@ class AmountLess implements TriggerInterface
}
/**
* @param TransactionJournal $journal
*
* @return bool
*/
public function triggered()
public function triggered(TransactionJournal $journal)
{
$amount = $this->journal->amount_positive;
$amount = $journal->amount_positive;
$compare = $this->trigger->trigger_value;
$result = bccomp($amount, $compare, 4);
if ($result === -1) {