Merge branch 'master' of http://202.166.220.79:3000/IME-LONDON/MOBILE_API into feature/Redmine-17825-Email_Template

# Conflicts:
#	JsonRx/Config/ResponseMsg.json

Business/MobileV2/MobileV2Business.cs

@@ -66,43 +66,35 @@ namespace Business.Mobile
                 dashBoardV2.loginResponse = (LoginResponse)customer.Data;
                 dashBoardV2.bannerImages = new List<BannerImages>();
 
+                //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";

Common/Model/TranHistoryResponse.cs

@@ -33,5 +33,7 @@
         public string ColorCode { get; set; }
 
         public string TextCode { get; set; }
+
+        public string ReceiverId { get; set; }
     }
 }

JsonRx/Config/ResponseMsg.json

@@ -1906,7 +1906,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"
   },
   {

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);