From ac1addb6e99e96ab86a474461b17e098ce565b60 Mon Sep 17 00:00:00 2001 From: TeoV Date: Mon, 18 May 2020 13:00:16 +0300 Subject: [PATCH] Uniformize the logic in model_helpers.go --- engine/model_helpers.go | 10 ++++------ packages/debian/changelog | 2 ++ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/engine/model_helpers.go b/engine/model_helpers.go index bf8c2e19b..917461468 100644 --- a/engine/model_helpers.go +++ b/engine/model_helpers.go @@ -1816,14 +1816,12 @@ func (tps TpSuppliers) AsTPSuppliers() (result []*utils.TPSupplierProfile) { sup, found := suppliersMap[tenID][supID] if !found { sup = &utils.TPSupplier{ - ID: tp.SupplierID, - Weight: tp.SupplierWeight, - Blocker: tp.SupplierBlocker, + ID: tp.SupplierID, + Weight: tp.SupplierWeight, + Blocker: tp.SupplierBlocker, + SupplierParameters: tp.SupplierParameters, } } - if tp.SupplierParameters != utils.EmptyString { - sup.SupplierParameters = tp.SupplierParameters - } if tp.SupplierFilterIDs != utils.EmptyString { supFilterSplit := strings.Split(tp.SupplierFilterIDs, utils.INFIELD_SEP) sup.FilterIDs = append(sup.FilterIDs, supFilterSplit...) diff --git a/packages/debian/changelog b/packages/debian/changelog index 125da05ed..8ff4f9eca 100644 --- a/packages/debian/changelog +++ b/packages/debian/changelog @@ -1,5 +1,7 @@ cgrates (0.10.2~dev) UNRELEASED; urgency=medium + * [SupplierS] Uniformize the logic in model_helpers.go + -- DanB Tue, 12 May 2020 13:08:15 +0300 cgrates (0.10.1) UNRELEASED; urgency=medium