kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-29 18:20:01 +00:00
Code Issues Projects Releases Wiki Activity

Rules will now fire for a store-action. And fail.

Browse Source
This commit is contained in:
James Cole
2016-01-13 07:30:11 +01:00
parent 98b272383f
commit 0dc74d9d14
3 changed files with 29 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
app/Models/Rule.php
View File

@@ -9,7 +9,7 @@
namespace FireflyIII\Models;
use Crypt;
use Illuminate\Database\Eloquent\Builder;
use Illuminate\Database\Eloquent\Model;
/**
@@ -34,7 +34,6 @@ use Illuminate\Database\Eloquent\Model;
*/
class Rule extends Model
{
/**
* @return \Illuminate\Database\Eloquent\Relations\BelongsTo
*/
@@ -67,5 +66,23 @@ class Rule extends Model
return $this->hasMany('FireflyIII\Models\RuleTrigger');
}
/**
* @param $query
* @param $triggerType
* @param null $triggerValue
*
* @return Builder
*/
public function scopeHasTrigger(Builder $query, $triggerType, $triggerValue = null)
{
$query->leftJoin('rule_triggers', 'rules.id', '=', 'rule_triggers.rule_id');
$query->where('rule_triggers.trigger_type', $triggerType);
if (!is_null($triggerValue)) {
$query->where('rule_triggers.trigger_value', $triggerValue);
}
return $query;
}
}