From a9e4a35601269dfdbaa83c8b81ccd98dba3949af Mon Sep 17 00:00:00 2001 From: DanB Date: Wed, 30 Nov 2016 11:37:42 +0100 Subject: [PATCH] ApierV2.ExportCdrsToFile with RoundingDecimals option --- apier/v2/cdre.go | 6 +++++- utils/apitpdata.go | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/apier/v2/cdre.go b/apier/v2/cdre.go index 62b8ba78f..1bb81457e 100644 --- a/apier/v2/cdre.go +++ b/apier/v2/cdre.go @@ -102,8 +102,12 @@ func (self *ApierV2) ExportCdrsToFile(attr utils.AttrExportCdrsToFile, reply *ut *reply = utils.ExportedFileCdrs{ExportedFilePath: ""} return nil } + roundingDecimals := self.Config.RoundingDecimals + if attr.RoundingDecimals != nil { + roundingDecimals = *attr.RoundingDecimals + } cdrexp, err := cdre.NewCdrExporter(cdrs, self.CdrDb, exportTemplate, cdrFormat, fieldSep, ExportID, dataUsageMultiplyFactor, SMSUsageMultiplyFactor, - MMSUsageMultiplyFactor, genericUsageMultiplyFactor, costMultiplyFactor, self.Config.RoundingDecimals, self.Config.HttpSkipTlsVerify) + MMSUsageMultiplyFactor, genericUsageMultiplyFactor, costMultiplyFactor, roundingDecimals, self.Config.HttpSkipTlsVerify) if err != nil { return utils.NewErrServerError(err) } diff --git a/utils/apitpdata.go b/utils/apitpdata.go index 3fe8659ef..650a80d68 100644 --- a/utils/apitpdata.go +++ b/utils/apitpdata.go @@ -1096,6 +1096,7 @@ type AttrExportCdrsToFile struct { MMSUsageMultiplyFactor *float64 // Multiply mms usage before export (eg: convert from MMS unit to call duration for some billing systems) GenericUsageMultiplyFactor *float64 // Multiply generic usage before export (eg: convert from GENERIC unit to call duration for some billing systems) CostMultiplyFactor *float64 // Multiply the cost before export, eg: apply VAT + RoundingDecimals *int // force rounding to this value Verbose bool // Disable CgrIds reporting in reply/ExportedCgrIds and reply/UnexportedCgrIds RPCCDRsFilter // Inherit the CDR filter attributes }