#34488 service charge

RemitInboundAPI/RemitInboundAPI.Business/Helper/ValidationHelper/SendTransactionValidationHelper.cs

@@ -45,10 +45,10 @@ namespace RemitInboundAPI.Business.Helper.ValidationHelper
             {
                 _response = new ApiResponse(ResponseHelper.FAILED, "PayoutAmount can not be empty.");
             }
-            else if (string.IsNullOrEmpty(model.RemittanceDetails.ServiceCharge))
-            {
-                _response = new ApiResponse(ResponseHelper.FAILED, "ServiceCharge can not be empty.");
-            }
+            //else if (string.IsNullOrEmpty(model.RemittanceDetails.ServiceCharge))
+            //{
+            //    _response = new ApiResponse(ResponseHelper.FAILED, "ServiceCharge can not be empty.");
+            //}
             else if (string.IsNullOrEmpty(model.RemittanceDetails.ExchangeRate))
             {
                 _response = new ApiResponse(ResponseHelper.FAILED, "ExchangeRate can not be empty.");

RemitInboundAPI/RemitInboundAPI.Common/Model/RemitModel/ExRateModel.cs

@@ -156,7 +156,7 @@ namespace RemitInboundAPI.Common.Model.RemitModel
         [Required]
         public string? TransferAmount { get; set; }
         public string? PayoutAmount { get; set; }
-        [Required]
+       
         public string? ServiceCharge { get; set; }
         [Required]
         public string? ExchangeRate { get; set; }

RemitInboundAPI/RemitInboundAPI.Repository/Repository/RemitRepository/RemitRepository.cs

@@ -100,7 +100,7 @@ namespace RemitInboundAPI.Repository.Repository.RemitRepository
                 sql += ", @CollectionAmount = " + _connHelper.FilterString(model.RemittanceDetails.CollectionAmount);
                 sql += ", @TransferAmount = " + _connHelper.FilterString(model.RemittanceDetails.TransferAmount);
                 sql += ", @PayoutAmount = " + _connHelper.FilterString(model.RemittanceDetails.PayoutAmount);
-                sql += ", @ServiceCharge = " + _connHelper.FilterString(model.RemittanceDetails.ServiceCharge);
+                //sql += ", @ServiceCharge = " + _connHelper.FilterString(model.RemittanceDetails.ServiceCharge);
                 sql += ", @ExchangeRate = " + _connHelper.FilterString(model.RemittanceDetails.ExchangeRate);
                 sql += ", @RemittancePurpose = " + _connHelper.FilterString(model.RemittanceDetails.RemittancePurpose);
                 sql += ", @SourceOfFund = " + _connHelper.FilterString(model.RemittanceDetails.SourceOfFund);
@@ -150,6 +150,7 @@ namespace RemitInboundAPI.Repository.Repository.RemitRepository
                         Status = Convert.ToString(_transactionResponse["TranStatus"]),
                         //SendingCommission = Utilities.ShowDecimal(Convert.ToString(_transactionResponse["SendingCommission"])),
                         //SendingCommissionCurrency = Convert.ToString(_transactionResponse["SendingCommissionCurrency"]),
+                        ServiceCharge = Utilities.ShowDecimal(Convert.ToString(_transactionResponse["serviceCharge"])),
                         CollectionAmount = Utilities.ShowDecimal(Convert.ToString(_transactionResponse["CollectionAmount"])),
                         TransferAmount = Utilities.ShowDecimal(Convert.ToString(_transactionResponse["TransferAmount"])),
                         PayoutAmount = Utilities.ShowDecimal(Convert.ToString(_transactionResponse["PayoutAmount"])),