uppal/cgrates
1
0
Fork 1
mirror of https://github.com/cgrates/cgrates.git synced 2026-02-22 15:48:44 +05:00
Code Issues Packages Projects Releases Wiki Activity

Merge fixes

Browse Source
This commit is contained in:
DanB
2017-11-21 19:27:55 +01:00
parent 4afd5cc3f5 219d6ab6c5
commit 3cebd29e52
153 changed files with 3691 additions and 3646 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
engine/tp_reader.go
View File

@@ -599,7 +599,7 @@ func (tpr *TpReader) LoadActions() (err error) {
}
if tpact.Units != "" && tpact.Units != utils.ANY {
vf, err := utils.ParseBalanceFilterValue(tpact.Units)
vf, err := utils.ParseBalanceFilterValue(tpact.BalanceType, tpact.Units)
if err != nil {
return err
}
@@ -738,7 +738,7 @@ func (tpr *TpReader) LoadActionTriggers() (err error) {
if err != nil {
return err
}
minSleep, err := utils.ParseDurationWithSecs(atr.MinSleep)
minSleep, err := utils.ParseDurationWithNanosecs(atr.MinSleep)
if err != nil {
return err
}
@@ -937,7 +937,7 @@ func (tpr *TpReader) LoadAccountActionsFiltered(qriedAA *utils.TPAccountActions)
for key, atrsLst := range atrs {
atrs := make([]*ActionTrigger, len(atrsLst))
for idx, atr := range atrsLst {
minSleep, _ := utils.ParseDurationWithSecs(atr.MinSleep)
minSleep, _ := utils.ParseDurationWithNanosecs(atr.MinSleep)
expTime, _ := utils.ParseTimeDetectLayout(atr.ExpirationDate, tpr.timezone)
actTime, _ := utils.ParseTimeDetectLayout(atr.ActivationDate, tpr.timezone)
if atr.UniqueID == "" {
@@ -1061,7 +1061,7 @@ func (tpr *TpReader) LoadAccountActionsFiltered(qriedAA *utils.TPAccountActions)
}
if tpact.Units != "" && tpact.Units != utils.ANY {
vf, err := utils.ParseBalanceFilterValue(tpact.Units)
vf, err := utils.ParseBalanceFilterValue(tpact.BalanceType, tpact.Units)
if err != nil {
return err
}
@@ -1271,7 +1271,7 @@ func (tpr *TpReader) LoadCdrStatsFiltered(tag string, save bool) (err error) {
for _, atrsLst := range atrsM {
atrs := make([]*ActionTrigger, len(atrsLst))
for idx, atr := range atrsLst {
minSleep, _ := utils.ParseDurationWithSecs(atr.MinSleep)
minSleep, _ := utils.ParseDurationWithNanosecs(atr.MinSleep)
expTime, _ := utils.ParseTimeDetectLayout(atr.ExpirationDate, tpr.timezone)
actTime, _ := utils.ParseTimeDetectLayout(atr.ActivationDate, tpr.timezone)
if atr.UniqueID == "" {
@@ -1404,7 +1404,7 @@ func (tpr *TpReader) LoadCdrStatsFiltered(tag string, save bool) (err error) {
}
if tpact.Units != "" && tpact.Units != utils.ANY {
vf, err := utils.ParseBalanceFilterValue(tpact.Units)
vf, err := utils.ParseBalanceFilterValue(tpact.BalanceType, tpact.Units)
if err != nil {
return err
}