differenet function for parsing trigger dates

This commit is contained in:
Radu Ioan Fericean
2016-02-05 16:50:47 +02:00
parent c4d70d4fea
commit bab8f9d86d
2 changed files with 6 additions and 6 deletions

View File

@@ -218,14 +218,14 @@ func (self *ApierV1) SetAccountActionTriggers(attr AttrSetAccountActionTriggers,
at.MinSleep = minSleep
}
if attr.ExpirationDate != nil {
expTime, err := utils.ParseDate(*attr.ExpirationDate)
expTime, err := utils.ParseTimeDetectLayout(*attr.ExpirationDate)
if err != nil {
return 0, err
}
at.ExpirationDate = expTime
}
if attr.ActivationDate != nil {
actTime, err := utils.ParseDate(*attr.ActivationDate)
actTime, err := utils.ParseTimeDetectLayout(*attr.ActivationDate)
if err != nil {
return 0, err
}

View File

@@ -797,8 +797,8 @@ func (tpr *TpReader) LoadAccountActionsFiltered(qriedAA *TpAccountAction) error
for idx, apiAtr := range atrsLst {
minSleep, _ := utils.ParseDurationWithSecs(apiAtr.MinSleep)
balanceExpTime, _ := utils.ParseDate(apiAtr.BalanceExpirationDate)
expTime, _ := utils.ParseDate(apiAtr.ExpirationDate)
actTime, _ := utils.ParseDate(apiAtr.ActivationDate)
expTime, _ := utils.ParseTimeDetectLayout(apiAtr.ExpirationDate, tpr.timezone)
actTime, _ := utils.ParseTimeDetectLayout(apiAtr.ActivationDate, tpr.timezone)
if apiAtr.UniqueID == "" {
apiAtr.UniqueID = utils.GenUUID()
}
@@ -1030,8 +1030,8 @@ func (tpr *TpReader) LoadCdrStatsFiltered(tag string, save bool) (err error) {
for idx, apiAtr := range atrsLst {
minSleep, _ := utils.ParseDurationWithSecs(apiAtr.MinSleep)
balanceExpTime, _ := utils.ParseDate(apiAtr.BalanceExpirationDate)
expTime, _ := utils.ParseDate(apiAtr.ExpirationDate)
actTime, _ := utils.ParseDate(apiAtr.ActivationDate)
expTime, _ := utils.ParseTimeDetectLayout(apiAtr.ExpirationDate, tpr.timezone)
actTime, _ := utils.ParseTimeDetectLayout(apiAtr.ActivationDate, tpr.timezone)
if apiAtr.UniqueID == "" {
apiAtr.UniqueID = utils.GenUUID()
}