diff --git a/Business/BusinessLogic/SMSApiService/SMSService.cs b/Business/BusinessLogic/SMSApiService/SMSService.cs index bb1f4ba..0d5818c 100644 --- a/Business/BusinessLogic/SMSApiService/SMSService.cs +++ b/Business/BusinessLogic/SMSApiService/SMSService.cs @@ -44,6 +44,7 @@ namespace Business.BusinessLogic.SMSApiService "?username=" + _userName + "&password=" + _password + "&number=" + model.MobileNumber + "&message=" + HttpUtility.UrlEncode(model.SMSBody) + "&orig=" + HttpUtility.UrlEncode(_senderId); + _log.Debug(url); HttpWebRequest request = (HttpWebRequest)WebRequest.Create(url); HttpWebResponse response = (HttpWebResponse)request.GetResponse(); Stream resStream = response.GetResponseStream(); diff --git a/Common/Models/Enums/GeneralEnum.cs b/Common/Models/Enums/GeneralEnum.cs index 32286e0..0d3b1dd 100644 --- a/Common/Models/Enums/GeneralEnum.cs +++ b/Common/Models/Enums/GeneralEnum.cs @@ -70,9 +70,7 @@ namespace Common.Models.Enums TF_NO_BALANCE = 16, - CUSTOMER_MOBILE_NOT_REGISTER = 17, - CUSTOMER_LAWSON_REGISTER = 18, - CUSTOMER_REFERRAL_500 = 19 + NEW_REGISTER_WELCOME = 17, } public enum JWTType diff --git a/Common/Models/RequestResponse/TPResponse.cs b/Common/Models/RequestResponse/TPResponse.cs index c300e88..37299e6 100644 --- a/Common/Models/RequestResponse/TPResponse.cs +++ b/Common/Models/RequestResponse/TPResponse.cs @@ -12,6 +12,7 @@ namespace Common.Models.RequestResponse public string Extra2 { get; set; } public string Extra3 { get; set; } + public string Extra4 { get; set; } public void SetResponse(string responseCode, string msg, string id) { ResponseCode = responseCode; diff --git a/Common/Utility/GetStatic.cs b/Common/Utility/GetStatic.cs index 581fab6..b14f7cb 100644 --- a/Common/Utility/GetStatic.cs +++ b/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 = ""; diff --git a/GMENepal/GMENepalAPIService/GMENepalAPI.cs b/GMENepal/GMENepalAPIService/GMENepalAPI.cs index c03923d..d1ef6f1 100644 --- a/GMENepal/GMENepalAPIService/GMENepalAPI.cs +++ b/GMENepal/GMENepalAPIService/GMENepalAPI.cs @@ -298,12 +298,12 @@ namespace GMENepal.GMENepalAPIService , gS.BankName, gS.BankAccountNumber, dateTxn, gS.CalculateBy, gS.FreeCharge, gS.ControlNo, gS.PayoutCurrency, gS.ReceiverCostRate , gS.SenderCostRate, gS.Signature, ""); - _response.Extra = exRateBank.ExRate; + _response.Extra = exRateBank.UsdVsNpr; } else { ThirdPartyRepo thirdPartyRepo = new ThirdPartyRepo(); - var resp = thirdPartyRepo.SyncTxnAsComment(sendTransaction.ProviderId, sendTransaction.TranId.ToString(), gS.ControlNo, "", response.Msg); + thirdPartyRepo.SyncTxnAsComment(sendTransaction.ProviderId, sendTransaction.TranId.ToString(), gS.ControlNo, "", response.Msg); _response.ResponseCode = response.ResponseCode; _response.Msg = response.Msg; @@ -506,7 +506,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*/ }; } diff --git a/Repository/DAO/Application/ApplicationDAO.cs b/Repository/DAO/Application/ApplicationDAO.cs index 6ca9f4e..5414796 100644 --- a/Repository/DAO/Application/ApplicationDAO.cs +++ b/Repository/DAO/Application/ApplicationDAO.cs @@ -206,6 +206,10 @@ namespace Repository.DAO.Application { res.Extra3 = dt.Rows[0][5].ToString(); } + if (dt.Columns.Count > 6) + { + res.Extra4 = dt.Rows[0][6].ToString(); + } } return res; } diff --git a/Repository/DAO/ThirdParty/ThirdPartyRepo.cs b/Repository/DAO/ThirdParty/ThirdPartyRepo.cs index d09c526..2ce9778 100644 --- a/Repository/DAO/ThirdParty/ThirdPartyRepo.cs +++ b/Repository/DAO/ThirdParty/ThirdPartyRepo.cs @@ -71,6 +71,7 @@ namespace Repository.DAO.ThirdParty sql.AppendLine(", @goodsType = " + FilterString(txn.CDDI.GoodsType)); sql.AppendLine(", @portOfShipment = " + FilterString(txn.CDDI.PortOfShipment)); sql.AppendLine(", @discountedFee = " + FilterString(txn.DiscountedFee)); + sql.AppendLine(", @requestedBy = " + FilterString(txn.RequestedBy)); _log.Debug("OnlineOrMobileSendTransaction | SQL: " + sql.ToString()); TPResponse res = ParseDbResult(sql); _log.Debug("OnlineOrMobileSendTransaction | DB Response: " + JsonConvert.SerializeObject(res)); @@ -640,7 +641,7 @@ namespace Repository.DAO.ThirdParty exRateResponse.amountLimitPerTran = Convert.ToString(dt.Rows[0]["amountLimitPerTran"]); 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,9 +677,11 @@ namespace Repository.DAO.ThirdParty } } - 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); } tPResponse.Data = exRateResponse; @@ -1011,7 +1014,7 @@ namespace Repository.DAO.ThirdParty return ParseDbResult(sb); } - public TPResponse SyncTxnAsComment(string provider, string tranId, string ControlNo, string status, string msg) + public void SyncTxnAsComment(string provider, string tranId, string ControlNo, string status, string msg) { string sql = "EXEC PROC_TP_TXN_PUSH @flag='add-job-txn-comment'"; sql += ",@PROVIDER = " + FilterString(provider); @@ -1020,7 +1023,7 @@ namespace Repository.DAO.ThirdParty sql += ",@status = " + FilterString(status); sql += ",@user = " + FilterString("TxnPushJob"); StringBuilder sb = new StringBuilder(sql); - return ParseDbResult(sb); + ExecuteDataset(sb); } } } \ No newline at end of file diff --git a/ThirdPartyAPIs/App_Data/Templates/BANK_TRANSFER_TXN_CLEARED.html b/ThirdPartyAPIs/App_Data/Templates/BANK_TRANSFER_TXN_CLEARED.html index 3235301..0721bec 100644 --- a/ThirdPartyAPIs/App_Data/Templates/BANK_TRANSFER_TXN_CLEARED.html +++ b/ThirdPartyAPIs/App_Data/Templates/BANK_TRANSFER_TXN_CLEARED.html @@ -2,14 +2,15 @@ -
-
- IME London +
+
+ imelondon + imelondon
+
-
Dear {CustomerName}, @@ -28,54 +29,54 @@ - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + +
Payout Country:{PayoutCountry}Payout Country : {PayoutCountry}
Beneficiary Name:{BeneName}Receiver Name : {BeneName}
Transfer Type:{TransferType}Transfer Type : {TransferType}
Bank Name:{BankName}Bank Name : {BankName}
Bank Branch:{BankBranch}Bank Branch : {BankBranch}
Bank Account No:{AccNum}Bank Account No : {AccNum}
Payout Amount:{PayoutAmt}Payout Amount : {PayoutAmt}
Transfer Amount:{TransferAmt}Transfer Amount : {TransferAmt}
Exchange Rate:{ExRate}Exchange Rate : {ExRate}
Fee:{Fee}Fee : {Fee}
Discount:{Discount}Discount : {Discount}
Total Amount:{TotalAmt}Total Amount : {TotalAmt}
Transaction Date:{TxnDate}Transaction Date : {TxnDate}
@@ -86,7 +87,7 @@

If there is any mistake in the details and needs correction, Please contact us.

- Once the transaction is approved by us, you will receive an email with the Pin number which should be forwarded to your receiver.
+ Once the transaction is approved by us, you will receive an email with the Reference number which should be forwarded to your receiver.

diff --git a/ThirdPartyAPIs/App_Data/Templates/BANK_TRANSFER_TXN_PENDING.html b/ThirdPartyAPIs/App_Data/Templates/BANK_TRANSFER_TXN_PENDING.html index 536132e..4ae9e53 100644 --- a/ThirdPartyAPIs/App_Data/Templates/BANK_TRANSFER_TXN_PENDING.html +++ b/ThirdPartyAPIs/App_Data/Templates/BANK_TRANSFER_TXN_PENDING.html @@ -3,9 +3,9 @@
-
+
@@ -14,7 +14,7 @@ Dear {CustomerName},

- Thank you for your transaction. Please kindly deposit the total amount of £XXX.00 in the following bank account. Your transaction + Thank you for your transaction. Please kindly deposit the total amount of £{CollectAmt} in the following bank account. Your transaction will be released once the amount is credited in our account with the reference number given below. If we do not get the deposit in two working days, your transaction will be cancelled. Please note that the transfer amount should exactly match with your transaction amount.
You can now start sending money to your loved ones. @@ -25,8 +25,8 @@

  1. Bank Name: CLEAR BANK
  2. Account Name: IME LONDON
    3. -
  3. Sort Code: 04-06-93
    4. -
  4. Accoutn Number: 00000151
    5. +
  5. Sort Code: 04-08-42
    6. +
  6. Accoutn Number: 00000042
  7. Reference: {CustomerName}
  8. Subhida UK Ltd is the registered name of IME London.
diff --git a/ThirdPartyAPIs/App_Data/Templates/BANK_TXN_POST.html b/ThirdPartyAPIs/App_Data/Templates/BANK_TXN_POST.html index 7dab801..d080649 100644 --- a/ThirdPartyAPIs/App_Data/Templates/BANK_TXN_POST.html +++ b/ThirdPartyAPIs/App_Data/Templates/BANK_TXN_POST.html @@ -3,9 +3,9 @@
-
+
diff --git a/ThirdPartyAPIs/App_Data/Templates/BASIC_REGISTRATION_EMAIL.html b/ThirdPartyAPIs/App_Data/Templates/BASIC_REGISTRATION_EMAIL.html index 47874dc..dc847ea 100644 --- a/ThirdPartyAPIs/App_Data/Templates/BASIC_REGISTRATION_EMAIL.html +++ b/ThirdPartyAPIs/App_Data/Templates/BASIC_REGISTRATION_EMAIL.html @@ -2,18 +2,54 @@ -
-
- IME London -
-
+
+
Dear {CustomerName}, - <{{{tanble> +

+ 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 referal code + {RefCode} + to invite your friends and get 1£ after your friend sucessfully registers and 4 £ after sending the transaction. + +
+ ** Terms and Condition applied +

+ +

+ Your account details:
+

    +
  1. Customer ID: {CustomerId}
    2. +
  2. User ID: {UserId}
    3. +
  3. First Name: {FirstName}
    4. +
  4. Middle Name: {MiddleName}
    5. +
  5. Last Name: {LastName}
    6. +
  6. Mobile Number: {MobileNo}
    7. +
  7. Address: {Address}
    8. +
  8. Email: {EMAIL_ID}
    9. +
  9. Registered Date: {RegisteredDate}
    10. +
+

+ +

+ 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!
IME London Team

diff --git a/ThirdPartyAPIs/App_Data/Templates/CASH_TXN_POST.html b/ThirdPartyAPIs/App_Data/Templates/CASH_TXN_POST.html index 876d140..56ca19a 100644 --- a/ThirdPartyAPIs/App_Data/Templates/CASH_TXN_POST.html +++ b/ThirdPartyAPIs/App_Data/Templates/CASH_TXN_POST.html @@ -3,9 +3,9 @@
-
+
diff --git a/ThirdPartyAPIs/App_Data/Templates/KYC_VERIFICATION_EMAIL.html b/ThirdPartyAPIs/App_Data/Templates/KYC_VERIFICATION_EMAIL.html index eb3f64f..ad6be9c 100644 --- a/ThirdPartyAPIs/App_Data/Templates/KYC_VERIFICATION_EMAIL.html +++ b/ThirdPartyAPIs/App_Data/Templates/KYC_VERIFICATION_EMAIL.html @@ -19,7 +19,11 @@

- Please use the Referral CODE {RefCode} to Invite your friends and get 10 £ as our signing gift.
+ Please use the referal code + {RefCode} + to invite your friends and get 1£ after your friend sucessfully registers and 4 £ after sending the transaction. + +
** Terms and Condition applied

@@ -44,7 +48,7 @@

Thank you!
- IME London Team
+ IME London Team

diff --git a/ThirdPartyAPIs/App_Data/Templates/NEW_CUSTOMER_EMAIL.html b/ThirdPartyAPIs/App_Data/Templates/NEW_CUSTOMER_EMAIL.html index 6c7fff1..bb7230e 100644 --- a/ThirdPartyAPIs/App_Data/Templates/NEW_CUSTOMER_EMAIL.html +++ b/ThirdPartyAPIs/App_Data/Templates/NEW_CUSTOMER_EMAIL.html @@ -3,9 +3,9 @@
-
+
diff --git a/ThirdPartyAPIs/App_Data/Templates/OTP_EMAIL.html b/ThirdPartyAPIs/App_Data/Templates/OTP_EMAIL.html index f86d111..fb88882 100644 --- a/ThirdPartyAPIs/App_Data/Templates/OTP_EMAIL.html +++ b/ThirdPartyAPIs/App_Data/Templates/OTP_EMAIL.html @@ -14,7 +14,7 @@

- Please contact Customer Care at 02088660307 at 9:30 AM- 6:30 PM or email to info@imelondon.co.uk if you need further assistance.
+ Please contact Customer Care at 02088660307 at 6.00 AM- 6:00 PM or email to info@imelondon.co.uk if you need further assistance.

diff --git a/ThirdPartyAPIs/Config/Mapping.json b/ThirdPartyAPIs/Config/Mapping.json index a144c93..f8f50fe 100644 --- a/ThirdPartyAPIs/Config/Mapping.json +++ b/ThirdPartyAPIs/Config/Mapping.json @@ -69,7 +69,7 @@ "Mappings": [ { "SValue": "NEW_REGISTER_WELCOME", - "SText": "You have successfully register to JME \n Remmittance System.", + "SText": "You have successfully register to IME London. Now you are able to send transaction", "DText": "Welcome", "DValue": "en" },