From 768fcde9f9e2e54301fc265739b331ae259212fd Mon Sep 17 00:00:00 2001
From: porosnicuadrian <adrian.porosnicu@itsyscom.com>
Date: Thu, 14 Oct 2021 08:21:38 +0300
Subject: [PATCH] Rermoved case in NewDecimalFromUsage

---
 utils/account.go |  8 +++-----
 utils/decimal.go | 13 ++-----------
 2 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/utils/account.go b/utils/account.go
index 5b5c343ad..20ee58865 100644
--- a/utils/account.go
+++ b/utils/account.go
@@ -595,17 +595,15 @@ func (ext *APICostIncrement) AsCostIncrement() (cIncr *CostIncrement, err error)
 	cIncr = &CostIncrement{
 		FilterIDs: ext.FilterIDs,
 	}
-	if ext.Increment != EmptyString {
-		if cIncr.Increment, err = NewDecimalFromUsage(ext.Increment); err != nil {
-			return nil, err
-		}
-	}
 	if ext.FixedFee != nil {
 		cIncr.FixedFee = NewDecimalFromFloat64(*ext.FixedFee)
 	}
 	if ext.RecurrentFee != nil {
 		cIncr.RecurrentFee = NewDecimalFromFloat64(*ext.RecurrentFee)
 	}
+	if ext.Increment != EmptyString {
+		cIncr.Increment, err = NewDecimalFromUsage(ext.Increment)
+	}
 	return
 }
 
diff --git a/utils/decimal.go b/utils/decimal.go
index 176638e09..3a403774e 100644
--- a/utils/decimal.go
+++ b/utils/decimal.go
@@ -110,23 +110,14 @@ func NewDecimalFromUsage(u string) (d *Decimal, err error) {
 	case u == EmptyString:
 		d = NewDecimal(0, 0)
 	//"ns", "us" (or "µs"), "ms", "s", "m", "h"
-	case strings.HasSuffix(u, NsSuffix), strings.HasSuffix(u, UsSuffix), strings.HasSuffix(u, µSuffix), strings.HasSuffix(u, MsSuffix),
-		strings.HasSuffix(u, SSuffix), strings.HasSuffix(u, MSuffix), strings.HasSuffix(u, HSuffix):
+	case strings.HasSuffix(u, SSuffix), strings.HasSuffix(u, MSuffix), strings.HasSuffix(u, HSuffix):
 		var tm time.Duration
 		if tm, err = time.ParseDuration(u); err != nil {
 			return
 		}
 		d = NewDecimal(int64(tm), 0)
-	case strings.Contains(u, NestingSep):
-		if d, err = NewDecimalFromString(u); err != nil {
-			return nil, err
-		}
 	default:
-		var i int64
-		if i, err = strconv.ParseInt(u, 10, 64); err != nil {
-			return
-		}
-		d = NewDecimal(i, 0)
+		d, err = NewDecimalFromString(u)
 	}
 	return
 }