diff --git a/Business/BusinessLogic/Address/ServiceApi.cs b/Business/BusinessLogic/Address/ServiceApi.cs index 5a8967b..586b507 100644 --- a/Business/BusinessLogic/Address/ServiceApi.cs +++ b/Business/BusinessLogic/Address/ServiceApi.cs @@ -56,7 +56,7 @@ namespace Business.BusinessLogic.Address TPResponse rxResponse = new TPResponse() { ResponseCode = "1", Msg = "No Data found" }; var results = serviceApi.Find_v1_10(postCode); - Log.Debug(Newtonsoft.Json.JsonConvert.SerializeObject(results)); + //Log.Debug(Newtonsoft.Json.JsonConvert.SerializeObject(results)); if (results != null && results.Any()) { diff --git a/GMENepal/GMENepalAPIService/GMENepalAPI.cs b/GMENepal/GMENepalAPIService/GMENepalAPI.cs index d4878b8..1ca3ef8 100644 --- a/GMENepal/GMENepalAPIService/GMENepalAPI.cs +++ b/GMENepal/GMENepalAPIService/GMENepalAPI.cs @@ -69,7 +69,7 @@ namespace GMENepal.GMENepalAPIService _log.Info("ConfirmTransaction | REQUEST :" + JsonConvert.SerializeObject(releaseRequest)); var res = _fastMoneyWeb.ConfirmTransaction(PartnerId, UserName, Password, releaseRequest.TfPin, releaseRequest.TxnId); - + _log.Info("ConfirmTransaction | RESPONSE :" + JsonConvert.SerializeObject(res)); _response.Data = response; @@ -94,7 +94,7 @@ namespace GMENepal.GMENepalAPIService if (accValidate.BankCode.ToLower() == "imepay" || accValidate.BankCode.ToLower() == "khalti") { WalletUserDetailResponse walletResponse = _fastMoneyWeb.GetWalletDetails(PartnerId, UserName, Password, accValidate.BankCode.ToUpper() - , accValidate.AccountNumber,"", GetAccValidateSignature(accValidate)); + , accValidate.AccountNumber, "", GetAccValidateSignature(accValidate)); response.ErrorCode = walletResponse.ResponseCode; response.Msg = walletResponse.ResponseMessage; response.Extra = walletResponse.FullName; @@ -103,7 +103,7 @@ namespace GMENepal.GMENepalAPIService else { response = _fastMoneyWeb.AccountValidation(UserName, Password, accValidate.BankCode, accValidate.AccountNumber - , accValidate.ReceiverName,""); + , accValidate.ReceiverName, ""); } _log.Info("AccountValidation | RESPONSE :" + JsonConvert.SerializeObject(response).ToString()); @@ -232,39 +232,39 @@ namespace GMENepal.GMENepalAPIService if (_response == null) { _response = new TPResponse(); - + var dt = gS.TransactionDate.Split('-'); string dateTxn = dt[1] + "-" + dt[2] + "-" + dt[0]; _log.Info("SendTransaction | REQUEST :" + JsonConvert.SerializeObject(gS).ToString()); - if(gS.PaymentMethod.ToLower() == "cash payment") + if (gS.PaymentMethod.ToLower() == "c") { _response = new TPResponse(); var exRate = _fastMoneyWeb.GetCalculation( gS.PartnerId, gS.UserName, gS.Password, gS.SessionId, "", - gS.SendingAmount, gS.PaymentMethod, gS.BeneCountry, gS.CalculateBy + "1000", "C", gS.BeneCountry, "P" ); _log.Info("GetExRate | RESPONSE :" + JsonConvert.SerializeObject(model).ToString()); var exConfirmId = exRate.ExConfirmId; - sendMoneyRes = _fastMoneyWeb.SendMoney(PartnerId, UserName, Password, gS.SessionId, exConfirmId, gS.MembershipId, gS.CustomerName, gS.CustomerAddress, + sendMoneyRes = _fastMoneyWeb.SendMoney(PartnerId, UserName, Password, gS.ControlNo, exConfirmId, gS.MembershipId, gS.CustomerName, gS.CustomerAddress, gS.CustomerContact, gS.CustomerCity, gS.CustomerCountry, gS.CustomerIdType, gS.CustomerIdNumber, gS.BeneName, gS.BeneAddress, gS.BeneContact, gS.BeneCity , gS.BeneCountry, gS.Profession, gS.IncomeSource, gS.Relationship, gS.PurposeOfRemittance, gS.SendingAmount, gS.ReceivingAmount, gS.PaymentMethod - , gS.BankCode, gS.BankName, gS.BankBranchName, gS.BankAccountNumber, gS.TransactionDate, gS.CalculateBy, gS.FreeCharge); - _log.Info("SendTransaction | RESPONSE :" + JsonConvert.SerializeObject(model).ToString()); + , gS.BankCode, gS.BankName, gS.BankBranchName, gS.BankAccountNumber, dateTxn, gS.CalculateBy, gS.FreeCharge); + _log.Info("SendTransaction | RESPONSE :" + JsonConvert.SerializeObject(sendMoneyRes).ToString()); _response.ResponseCode = sendMoneyRes.ErrorCode; _response.Msg = sendMoneyRes.Message; - _response.Extra = sendMoneyRes.ExRate; - _response.Extra2 = sendMoneyRes.SendingAmount; - _response.Id = sendMoneyRes.ReceivingAmount; + _response.Extra = exRate.UsdVsNpr; + _response.Extra2 = sendMoneyRes.PinNo; + _response.Id = sendMoneyRes.TranId; _response.Data = sendMoneyRes; return _response; } - if (gS.BankCode.ToLower() == "imepay" || gS.BankCode.ToLower() == "khalti") + else if (gS.PaymentMethod.ToLower() == "w" && (gS.BankCode.ToLower() == "imepay" || gS.BankCode.ToLower() == "khalti")) { model = _fastMoneyWeb.RealTimeWalletDeposit(PartnerId, UserName, Password, gS.BankCode, gS.CustomerName, gS.CustomerAddress , gS.CustomerContact, gS.CustomerCountry, gS.CustomerIdType, gS.CustomerIdNumber, gS.BeneName, gS.BeneAddress @@ -274,19 +274,23 @@ namespace GMENepal.GMENepalAPIService } else { - model = _fastMoneyWeb.ProcessBankDeposit(gS.PartnerId, gS.UserName, gS.Password, gS.ControlNo, gS.ExConfirmId + var exRateBank = _fastMoneyWeb.GetCalculation(gS.PartnerId, gS.UserName, gS.Password, gS.SessionId, "", "1000", "B", gS.BeneCountry, "P"); + + model = _fastMoneyWeb.ProcessBankDeposit(gS.PartnerId, gS.UserName, gS.Password, gS.ControlNo, exRateBank.ExConfirmId , gS.MembershipId, gS.CustomerName, gS.CustomerAddress, gS.CustomerContact, gS.CustomerCity, gS.CustomerCountry , gS.CustomerIdType, gS.CustomerIdNumber, gS.BeneName, gS.BeneAddress, gS.BeneContact, gS.BeneCity, gS.BeneCountry, gS.Profession , gS.IncomeSource, gS.Relationship, gS.PurposeOfRemittance, gS.SendingAmount, gS.ReceivingAmount, gS.PaymentMethod, gS.BankCode , gS.BankName, gS.BankAccountNumber, dateTxn, gS.CalculateBy, gS.FreeCharge, gS.ControlNo, gS.PayoutCurrency, gS.ReceiverCostRate - , gS.SenderCostRate, gS.Signature,""); + , gS.SenderCostRate, gS.Signature, ""); + + _response.Extra = exRateBank.ExRate; } - + _log.Info("SendTransaction | RESPONSE :" + JsonConvert.SerializeObject(model).ToString()); - + _response.ResponseCode = model.ErrorCode; _response.Msg = model.Msg; - _response.Extra = model.Extra; + _response.Extra2 = model.Extra2; _response.Id = model.Id; _response.Data = model; @@ -298,7 +302,7 @@ namespace GMENepal.GMENepalAPIService } return _response; } - + private TPResponse GetTxnStatus(GetStatus getStatus) { @@ -404,7 +408,7 @@ namespace GMENepal.GMENepalAPIService } return _response; } - + #region dataMapping @@ -430,7 +434,7 @@ namespace GMENepal.GMENepalAPIService return new GMEGetCalculationRequest() { CalculateBy = eR.CalcBy, - PaymentMethod = eR.PaymentType=="Wallet" ? "W": eR.PaymentType, + PaymentMethod = eR.PaymentType == "Wallet" ? "W" : eR.PaymentType, ReceivingAgentId = eR.PAgentName, ReceivingCountry = eR.PCountryName, RemitAmount = eR.CalcBy == "C" ? eR.CAmount.ToString() : eR.PAmount.ToString() @@ -485,7 +489,7 @@ namespace GMENepal.GMENepalAPIService { string sign = ""; if (sT.Agent.PBankId.ToLower() == "imepay" || sT.Agent.PBankId.ToLower() == "khalti") - sign = GMEKey +PartnerId + UserName + Password + sT.Receiver.RAccountNo + sT.Transaction.PAmt; + sign = GMEKey + PartnerId + UserName + Password + sT.Receiver.RAccountNo + sT.Transaction.PAmt; else sign = GMEKey + UserName + Password + sT.Transaction.JMEControlNo + sT.Transaction.PAmt + sT.Receiver.RAccountNo + sT.Agent.PBankId; diff --git a/ThirdPartyAPIs/App_Data/Templates/BASIC_REGISTRATION_EMAIL.html b/ThirdPartyAPIs/App_Data/Templates/BASIC_REGISTRATION_EMAIL.html index e47cab8..47874dc 100644 --- a/ThirdPartyAPIs/App_Data/Templates/BASIC_REGISTRATION_EMAIL.html +++ b/ThirdPartyAPIs/App_Data/Templates/BASIC_REGISTRATION_EMAIL.html @@ -13,42 +13,7 @@
Dear {CustomerName}, -

- Thank you for registering with IME London. We are overjoyed to have you join our community of users from around the world who are streamlining and improving the way they send and receive money internationally.
- Prepare yourself for a never-before-seen level of rapid, secure, and convenient remittance.
-

- -

- You can now start sending money to your loved ones.
- -

- -

- Please use the Referral CODE XXXX to Invite your friends and get 10 £ as our signing gift.
- ** Terms and Condition applied -

- -

- Your account details:
-

    -
  1. Customer ID: {CustomerId}
  2. -
  3. User ID: {UserId}
  4. -
  5. First Name: {FirstName}
  6. -
  7. Middle Name: {MiddleName}
  8. -
  9. Last Name: {LastName}
  10. -
  11. Mobile Number: {MobileNo}
  12. -
  13. Address: {Address}
  14. -
  15. Email: {EMAIL_ID}
  16. -
  17. Registered Date: {RegisteredDate}
  18. -
-

- -

- We appreciate your decision to choose IME London to transform the way you manage international money transfers. Your path to smooth remittance begins right now!
-

-
-

- Thank you!
+ <{{{tanble> IME London Team

diff --git a/ThirdPartyAPIs/Web.config b/ThirdPartyAPIs/Web.config index 9c87aef..0e1f214 100644 --- a/ThirdPartyAPIs/Web.config +++ b/ThirdPartyAPIs/Web.config @@ -15,8 +15,10 @@ - - + + + @@ -51,9 +53,9 @@ --> - + - + @@ -101,7 +103,7 @@ - +