diff --git a/Common/Models/ExchangeRate/ExRateResponse.cs b/Common/Models/ExchangeRate/ExRateResponse.cs index 9fb2b23..26a94b1 100644 --- a/Common/Models/ExchangeRate/ExRateResponse.cs +++ b/Common/Models/ExchangeRate/ExRateResponse.cs @@ -47,5 +47,9 @@ public string ModeOfPaymentName { get; set; } public bool isSCExcluded { get; set; } public string discountedFee { get; set; } + public string isPromoCode { get; set; } + public string promoRowId { get; set; } + public string promoCode { get; set; } + public string promotionalRate { get; set; } } } \ No newline at end of file diff --git a/Common/Models/SendTransaction/SendTransactionMobile.cs b/Common/Models/SendTransaction/SendTransactionMobile.cs index 8bc2cb6..1e460b4 100644 --- a/Common/Models/SendTransaction/SendTransactionMobile.cs +++ b/Common/Models/SendTransaction/SendTransactionMobile.cs @@ -37,6 +37,9 @@ namespace Common.Models.SendTransactionMobile public string ScDiscount { get; set; } public string SchemeId { get; set; } public string DiscountedFee { get; set; } + public string isPromoCode { get; set; } + public string promoRowId { get; set; } + public string promoCode { get; set; } } public class ReceiverInfo diff --git a/Repository/DAO/ThirdParty/ThirdPartyRepo.cs b/Repository/DAO/ThirdParty/ThirdPartyRepo.cs index 3698b81..86abfdc 100644 --- a/Repository/DAO/ThirdParty/ThirdPartyRepo.cs +++ b/Repository/DAO/ThirdParty/ThirdPartyRepo.cs @@ -72,6 +72,9 @@ namespace Repository.DAO.ThirdParty sql.AppendLine(", @portOfShipment = " + FilterString(txn.CDDI.PortOfShipment)); sql.AppendLine(", @discountedFee = " + FilterString(txn.DiscountedFee)); sql.AppendLine(", @requestedBy = " + FilterString(txn.RequestedBy)); + sql.AppendLine(", @isPromoCode = " + FilterString(txn.isPromoCode)); + sql.AppendLine(", @promoRowId = " + FilterString(txn.promoRowId)); + sql.AppendLine(", @promoCode = " + FilterString(txn.promoCode)); _log.Debug("OnlineOrMobileSendTransaction | SQL: " + sql.ToString()); TPResponse res = ParseDbResult(sql); _log.Debug("OnlineOrMobileSendTransaction | DB Response: " + JsonConvert.SerializeObject(res)); @@ -666,6 +669,10 @@ namespace Repository.DAO.ThirdParty exRateResponse.tpPCurr = Convert.ToString(dt.Rows[0]["tpPCurr"]); exRateResponse.ForexSessionId = Convert.ToString(dt.Rows[0]["ForexSessionId"]); exRateResponse.discountedFee = Convert.ToString(dt.Rows[0]["discountedFee"]); + exRateResponse.isPromoCode = Convert.ToString(dt.Rows[0]["isPromoCode"]); + exRateResponse.promoRowId = Convert.ToString(dt.Rows[0]["promoRowId"]); + exRateResponse.promoCode = Convert.ToString(dt.Rows[0]["promoCode"]); + exRateResponse.promotionalRate = Convert.ToString(dt.Rows[0]["promotionalRate"]); exRateResponse.isSCExcluded = false; var countriesList = model.SCExcludedCountries.Split(','); diff --git a/TPServices/GCC/Services/GCCAPI.cs b/TPServices/GCC/Services/GCCAPI.cs index 2c43d8f..118d286 100644 --- a/TPServices/GCC/Services/GCCAPI.cs +++ b/TPServices/GCC/Services/GCCAPI.cs @@ -229,14 +229,14 @@ namespace TPService.GCC.Services try { - //_log.Info("SendTransferRequest | REQUEST :" + JsonConvert.SerializeObject(mapreq)); - _log.Info("SendTransferRequest | REQUEST :" + ObjectToXML(mapreq)); + _log.Info("SendTransferRequest | REQUEST :" + JsonConvert.SerializeObject(mapreq)); + // _log.Info("SendTransferRequest | REQUEST :" + ObjectToXML(mapreq)); SendTransferResponse res = _sendAPI.SendTransfer(mapreq); - _log.Info("SendTransferResponse | RESPONSE :" + ObjectToXML(res)); - // _log.Info("SendTransferResponse | RESPONSE :" + JsonConvert.SerializeObject(res)); + // _log.Info("SendTransferResponse | RESPONSE :" + ObjectToXML(res)); + _log.Info("SendTransferResponse | RESPONSE :" + JsonConvert.SerializeObject(res)); _response.ResponseCode = res.ResponseCode == "001" ? "0" : "1"; _response.Id = res.TransactionNo; @@ -315,7 +315,9 @@ namespace TPService.GCC.Services //SenderEmail = sT.Sender.SEmail, SenderZipCode ="", //sT.Sender.SZipCode, SenderAddress = sT.Sender.SAddress, + IncomeSourceCode = sT.Sender.SourceOfFund, TransactionNo = "",//sT.TranId.ToString(), + OriginCountryCode = "GB" }; }