uppal/cgrates
1
0
Fork 1
mirror of https://github.com/cgrates/cgrates.git synced 2026-02-20 06:38:45 +05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/cgrates/cgrates

Browse Source
This commit is contained in:
DanB
2014-12-07 12:40:23 +01:00
parent cd81e7865a 26c6c22832
commit f583c24a6b
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
engine/balances.go
View File

@@ -68,12 +68,12 @@ func (b *Balance) MatchFilter(o *Balance) bool {
if o.DestinationId == "" {
o.DestinationId = utils.ANY
}
return b.ExpirationDate.Equal(o.ExpirationDate) &&
b.Weight == o.Weight &&
b.DestinationId == o.DestinationId &&
b.RatingSubject == o.RatingSubject &&
b.Category == o.Category &&
b.SharedGroup == o.SharedGroup
return (o.ExpirationDate.IsZero() || b.ExpirationDate.Equal(o.ExpirationDate)) &&
(o.Weight == 0 || b.Weight == o.Weight) &&
(o.DestinationId == "" || b.DestinationId == o.DestinationId) &&
(o.RatingSubject == "" || b.RatingSubject == o.RatingSubject) &&
(o.Category == "" || b.Category == o.Category) &&
(o.SharedGroup == "" || b.SharedGroup == o.SharedGroup)
}
// the default balance has no destinationid, Expirationdate or ratesubject