Diameter AsSMGenericEvent to support metahandlers as well as constant values

engine/cdrs.go

@@ -273,7 +273,7 @@ func (self *CdrServer) deriveCdrs(storedCdr *StoredCdr) ([]*StoredCdr, error) {
 		return cdrRuns, nil
 	}
 	attrsDC := &utils.AttrDerivedChargers{Tenant: storedCdr.Tenant, Category: storedCdr.Category, Direction: storedCdr.Direction,
-		Account: storedCdr.Account, Subject: storedCdr.Subject}
+		Account: storedCdr.Account, Subject: storedCdr.Subject, Destination: storedCdr.Destination}
 	var dcs utils.DerivedChargers
 	if err := self.rater.GetDerivedChargers(attrsDC, &dcs); err != nil {
 		utils.Logger.Err(fmt.Sprintf("Could not get derived charging for cgrid %s, error: %s", storedCdr.CgrId, err.Error()))
@@ -289,6 +289,7 @@ func (self *CdrServer) deriveCdrs(storedCdr *StoredCdr) ([]*StoredCdr, error) {
 			}
 		}
 		if !matchingAllFilters { // Do not process the derived charger further if not all filters were matched
+
 			continue
 		}
 		dcReqTypeFld, _ := utils.NewRSRField(dc.ReqTypeField)

engine/handler_derivedcharging.go

@@ -19,6 +19,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>
 package engine
 
 import (
+	"fmt"
 	"github.com/cgrates/cgrates/cache2go"
 	"github.com/cgrates/cgrates/utils"
 )

engine/suretax.go

@@ -195,7 +195,6 @@ func SureTaxProcessCdr(cdr *StoredCdr) error {
 	if err != nil {
 		return err
 	}
-	utils.Logger.Debug(fmt.Sprintf("NewSureTaxRequest: %s\n", string(jsnContent)))
 	resp, err := sureTaxClient.Post(stCfg.Url, "application/json", bytes.NewBuffer(jsnContent))
 	if err != nil {
 		return err