From b31fb64bc85d65537efce119f8d4d9079d09a002 Mon Sep 17 00:00:00 2001 From: shakun Date: Wed, 27 Mar 2024 01:36:06 +0545 Subject: [PATCH] 1. Promo Code 4. Resend TXN Feature --- Business/MobileV2/MobileV2Business.cs | 38 ++++++++++--------------- Business/SendMoney/SendMoneyBusiness.cs | 9 ++++-- Common/Model/ExRateCalculateRequest.cs | 2 +- Common/Model/MobileRemitRequest.cs | 3 ++ Common/Model/TPSendMoney/TpSendMoney.cs | 3 ++ Common/Model/TranHistoryResponse.cs | 2 ++ JsonRx/Config/ResponseMsg.json | 2 +- Repository/MobileV2/MobileV2Repo.cs | 1 + 8 files changed, 32 insertions(+), 28 deletions(-) diff --git a/Business/MobileV2/MobileV2Business.cs b/Business/MobileV2/MobileV2Business.cs index 4a11248..4ed8d1b 100644 --- a/Business/MobileV2/MobileV2Business.cs +++ b/Business/MobileV2/MobileV2Business.cs @@ -66,43 +66,35 @@ namespace Business.Mobile dashBoardV2.loginResponse = (LoginResponse)customer.Data; dashBoardV2.bannerImages = new List(); + //dashBoardV2.bannerImages.Add(new BannerImages() + //{ + // fileName = "one.jpg", + // filePath = "https://mobile.imelondon.co.uk:2086/images/banners/1.png", + // fileTitle = "file1", + // Redirect = true, + // RedirectURL = "https://imelondon.co.uk/" + //}); dashBoardV2.bannerImages.Add(new BannerImages() { - fileName = "one.jpg", - filePath = "https://mobile.imelondon.co.uk:2086/images/banners/1.png", + fileName = "two.jpg", + filePath = "https://mobile.imelondon.co.uk:2086/images/banners/2.png", fileTitle = "file1", - Redirect = true, - RedirectURL = "https://imelondon.co.uk/" + Redirect = false }); dashBoardV2.bannerImages.Add(new BannerImages() { - fileName = "two.jpg", - filePath = "https://mobile.imelondon.co.uk:2086/images/banners/2.png", + fileName = "four.jpg", + filePath = "https://mobile.imelondon.co.uk:2086/images/banners/4.png", fileTitle = "file1", Redirect = false }); dashBoardV2.bannerImages.Add(new BannerImages() { - fileName = "three.jpg", - filePath = "https://mobile.imelondon.co.uk:2086/images/banners/3.png", + fileName = "five.jpg", + filePath = "https://mobile.imelondon.co.uk:2086/images/banners/5.png", fileTitle = "file1", Redirect = false }); - //dashBoardV2.bannerImages.Add(new BannerImages() - //{ - // fileName = "JME.png", - // filePath = "https://staging.japanremit.com:1083/images/banners/jme.png", - // fileTitle = "JME LOGO", - // Redirect = true, - // RedirectURL = "https://japanremit.com" - //}); - //dashBoardV2.bannerImages.Add(new BannerImages() - //{ - // fileName = "image-4.jpg", - // filePath = "https://staging.japanremit.com:1083/images/banners/image-41.jpg", - // fileTitle = "file4", - // Redirect = false - //}); jsonResult.ErrorCode = "0"; jsonResult.Msg = "Success"; diff --git a/Business/SendMoney/SendMoneyBusiness.cs b/Business/SendMoney/SendMoneyBusiness.cs index 34445b4..77e780c 100644 --- a/Business/SendMoney/SendMoneyBusiness.cs +++ b/Business/SendMoney/SendMoneyBusiness.cs @@ -183,7 +183,8 @@ namespace Business.SendMoney SessionId = Guid.NewGuid().ToString(), tPExRate = m.tpExRate, UserName = m.userId, - DiscountedFee = Convert.ToDecimal(string.IsNullOrEmpty(m.discountedFee) ? "0" : m.discountedFee) + //DiscountedFee = Convert.ToDecimal(string.IsNullOrEmpty(m.discountedFee) ? "0" : m.discountedFee) + DiscountedFee = m.discountedFee ?? "0" }; Log.Debug("Calculate | DATA SENT TO TPAPI : " + JsonConvert.SerializeObject(model)); @@ -495,8 +496,10 @@ namespace Business.SendMoney TransferAmt = model.TransferAmt, UserName = model.User, DiscountedFee = model.DiscountedFee, - SiteId = ConfigurationManager.AppSettings["sitereference"].ToString() - + SiteId = ConfigurationManager.AppSettings["sitereference"].ToString(), + isPromoCode = model.isPromoCode, + promoRowId = model.promoRowId, + promoCode = model.promoCode }; diff --git a/Common/Model/ExRateCalculateRequest.cs b/Common/Model/ExRateCalculateRequest.cs index 8bea140..62629db 100644 --- a/Common/Model/ExRateCalculateRequest.cs +++ b/Common/Model/ExRateCalculateRequest.cs @@ -91,7 +91,7 @@ namespace Common.Model public bool IsExRateCalcByPartner { get; set; } public string tPExRate { get; set; } public string ProcessFor { get; set; } - public decimal DiscountedFee { get; set; } + public string DiscountedFee { get; set; } public string schemeAppliedMsg { get; set; } public string SchemeId { get; set; } diff --git a/Common/Model/MobileRemitRequest.cs b/Common/Model/MobileRemitRequest.cs index f5a5c37..171f262 100644 --- a/Common/Model/MobileRemitRequest.cs +++ b/Common/Model/MobileRemitRequest.cs @@ -44,5 +44,8 @@ public string PortOfShipment { get; set; } public string DiscountedFee { get; set; } + public string isPromoCode { get; set; } + public string promoRowId { get; set; } + public string promoCode { get; set; } } } \ No newline at end of file diff --git a/Common/Model/TPSendMoney/TpSendMoney.cs b/Common/Model/TPSendMoney/TpSendMoney.cs index e347551..d22653a 100644 --- a/Common/Model/TPSendMoney/TpSendMoney.cs +++ b/Common/Model/TPSendMoney/TpSendMoney.cs @@ -30,6 +30,9 @@ 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 string SiteId { get; set; } public string Token { get; set; } diff --git a/Common/Model/TranHistoryResponse.cs b/Common/Model/TranHistoryResponse.cs index a0930fa..1e96628 100644 --- a/Common/Model/TranHistoryResponse.cs +++ b/Common/Model/TranHistoryResponse.cs @@ -33,5 +33,7 @@ public string ColorCode { get; set; } public string TextCode { get; set; } + + public string ReceiverId { get; set; } } } \ No newline at end of file diff --git a/JsonRx/Config/ResponseMsg.json b/JsonRx/Config/ResponseMsg.json index 8792386..872beac 100644 --- a/JsonRx/Config/ResponseMsg.json +++ b/JsonRx/Config/ResponseMsg.json @@ -1901,7 +1901,7 @@ }, { "Key": "INVITE_MESSAGE_BODY", - "Message": "You and your friend will each be given £ @rewardAmount in bonus credit. Get £ @RegReward after they successfully register, and £ @TranReward after their first transaction. There may be minimum send requirements. Terms and Conditions.", + "Message": "You and your friend will each be given @rewardAmount £ in bonus credit. There may be minimum send requirements.", "Lang": "en" }, { diff --git a/Repository/MobileV2/MobileV2Repo.cs b/Repository/MobileV2/MobileV2Repo.cs index 1f4b819..2b0e03a 100644 --- a/Repository/MobileV2/MobileV2Repo.cs +++ b/Repository/MobileV2/MobileV2Repo.cs @@ -158,6 +158,7 @@ namespace Repository.MobileV2 ColorIcon = GetColor(dr["payStatus"].ToString()), ColorCode = GetColorCode(dr["payStatus"].ToString()), TextCode= GetTextCode(dr["payStatus"].ToString()), + ReceiverId = Convert.ToString(dr["Receiverid"]) // PayoutAgent = Convert.ToString(dr["PayoutAgent"]), }; myTransferDto.RecentTransactions.Add(tranHistoryResponse);