Format decimal

Common/Utility/GetStatic.cs

@@ -86,6 +86,13 @@ namespace Common.Utility
                 return strVal;
         }
 
+        public static String ShowTwoDecimal(String strVal)
+        {
+            if (strVal != "")
+                return double.Parse(strVal).ToString("0.00");
+            else
+                return strVal;
+        }
         public static string Truncate(this string value, int maxLength)
         {
             var returnValue = "";

GMENepal/GMENepalAPIService/GMENepalAPI.cs

@@ -482,7 +482,7 @@ namespace GMENepal.GMENepalAPIService
                 CollectionAmount = sT.Transaction.CAmt,
                 ExRate = sT.Transaction.ExRate,
                 PayoutCommCurr = "NPR",
-                CalculateBy = "C",/*sT.Transaction.CalBy*/
+                CalculateBy = "P",/*sT.Transaction.CalBy*/
                 FreeCharge = Convert.ToString(sT.Transaction.ServiceCharge) /*sT.Transaction.IsManualSc*/
             };
         }

Repository/DAO/ThirdParty/ThirdPartyRepo.cs

@@ -639,9 +639,14 @@ namespace Repository.DAO.ThirdParty
             {
                 exRateResponse.amountLimitPerDay = Convert.ToString(dt.Rows[0]["amountLimitPerDay"]);
                 exRateResponse.amountLimitPerTran = Convert.ToString(dt.Rows[0]["amountLimitPerTran"]);
+
+                //exRateResponse.collAmt = model.RequestedBy.Equals("mobile") ? GetStatic.ShowDecimal(Convert.ToString(dt.Rows[0]["collAmt"])) : Convert.ToString(dt.Rows[0]["collAmt"]);
+                //exRateResponse.pAmt = model.RequestedBy.Equals("mobile") ? GetStatic.ShowDecimal(Convert.ToString(dt.Rows[0]["pAmt"])) : Convert.ToString(dt.Rows[0]["pAmt"]);
+                //exRateResponse.sAmt = model.RequestedBy.Equals("mobile") ? GetStatic.ShowDecimal(Convert.ToString(dt.Rows[0]["sAmt"])) : Convert.ToString(dt.Rows[0]["sAmt"]);
+
                 exRateResponse.collAmt = Convert.ToString(dt.Rows[0]["collAmt"]);
                 exRateResponse.currDecimal = Convert.ToString(dt.Rows[0]["currDecimal"]);
-                exRateResponse.pAmt = Convert.ToString(dt.Rows[0]["pAmt"]);
+                exRateResponse.pAmt = GetStatic.ShowDecimal( Convert.ToString(dt.Rows[0]["pAmt"]));
                 exRateResponse.sAmt = Convert.ToString(dt.Rows[0]["sAmt"]);
                 exRateResponse.collCurr = Convert.ToString(dt.Rows[0]["collCurr"]);
                 exRateResponse.disc = Convert.ToString(dt.Rows[0]["disc"]);
@@ -676,11 +681,17 @@ namespace Repository.DAO.ThirdParty
                         exRateResponse.isSCExcluded = true;
                     }
                 }
-
-                if (exRateResponse.isSCExcluded && model.RequestedBy.ToLower().Equals("online"))
+                if (!string.IsNullOrEmpty( model.CouponCode) && model.CouponCode.ToLower().Equals("android"))
                 {
-                    exRateResponse.collAmt = Convert.ToString(Convert.ToDouble(exRateResponse.collAmt) - Convert.ToDouble(exRateResponse.scCharge));
+
+                    exRateResponse.collAmt = GetStatic.ShowDecimal(exRateResponse.collAmt);
+                    exRateResponse.sAmt = GetStatic.ShowDecimal(exRateResponse.sAmt);
+                    exRateResponse.scCharge = GetStatic.ShowTwoDecimal(exRateResponse.scCharge);
                 }
+                //if (exRateResponse.isSCExcluded && model.RequestedBy.ToLower().Equals("online"))
+                //{
+                //    exRateResponse.collAmt = Convert.ToString(Convert.ToDouble(exRateResponse.collAmt) - Convert.ToDouble(exRateResponse.scCharge));
+                //}
 
                 tPResponse.Data = exRateResponse;
             }