diff --git a/GMENepal/GMENepalAPIService/GMENepalAPI.cs b/GMENepal/GMENepalAPIService/GMENepalAPI.cs index 1ca3ef8..ee31f41 100644 --- a/GMENepal/GMENepalAPIService/GMENepalAPI.cs +++ b/GMENepal/GMENepalAPIService/GMENepalAPI.cs @@ -264,7 +264,7 @@ namespace GMENepal.GMENepalAPIService return _response; } - else if (gS.PaymentMethod.ToLower() == "w" && (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,16 +274,35 @@ namespace GMENepal.GMENepalAPIService } else { - 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, ""); - - _response.Extra = exRateBank.ExRate; + AccountValidate accValidate = new AccountValidate + { + BankCode = gS.BankCode, + AccountNumber = gS.BankAccountNumber, + ReceiverName = gS.BeneName, + ControlNo = gS.ControlNo, + PaymentMode = gS.PaymentMethod + }; + + var response = AccountValidation(accValidate); + + if (response.ResponseCode.Equals("0") || response.ResponseCode.Equals("100")) + { + 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, ""); + + _response.Extra = exRateBank.ExRate; + } + else + { + _response.ResponseCode = response.ResponseCode; + _response.Msg = response.Msg; + } } _log.Info("SendTransaction | RESPONSE :" + JsonConvert.SerializeObject(model).ToString());