#24416 Country Wise Margin Setup

#24827  Promotional Rate Feature

Business/Mobile/IMobileServices.cs

@@ -93,7 +93,7 @@ namespace Business.Mobile
 
         JsonRxResponse CheckInfoAgree(string username);
 
-        JsonRxResponse GetFieldsByProduct(MappingType type, string customer);
+        JsonRxResponse GetFieldsByProduct(MappingType type, string customer, string receiverId);
         JsonRxResponse ValidateReferralCode(string referralCode);
 
         //JsonRxResponse QueryAddress(string postCode);

Business/Mobile/MobileServices.cs

@@ -350,7 +350,10 @@ namespace Business.Mobile
                     bodyMappings.Add(new Notify.Mapping() { SValue = "MobileNo", SText = userDetails.Mobile });
                     bodyMappings.Add(new Notify.Mapping() { SValue = "Address", SText = userDetails.Address });
                     bodyMappings.Add(new Notify.Mapping() { SValue = "EMAIL_ID", SText = userDetails.Email });
-                    bodyMappings.Add(new Notify.Mapping() { SValue = "RegisteredDate", SText = userDetails.RegisteredDate.ToString("dd/MM/YYYY") });
+                    bodyMappings.Add(new Notify.Mapping() { SValue = "RegisteredDate", SText = Convert.ToString(userDetails.RegisteredDate) });
+                    bodyMappings.Add(new Notify.Mapping() { SValue = "rewardPoint", SText = userDetails.TotalPoints });
+                    bodyMappings.Add(new Notify.Mapping() { SValue = "RegReward", SText = userDetails.RegPoints });
+                    bodyMappings.Add(new Notify.Mapping() { SValue = "TranReward", SText = userDetails.TranPoints });
 
                     SendNotificationRequest request = new SendNotificationRequest()
                     {
@@ -724,6 +727,27 @@ namespace Business.Mobile
                 }
 
                 var rep = _requestServices.RegisterKYC(custKyc);
+                SendNotificationRequest pushNotificationRequest = new SendNotificationRequest()
+                {
+                    IsBulkNotification = false,
+                    UserName = custKyc.userId,
+                    ProcessId = Guid.NewGuid().ToString(),
+                    ProviderId = "RegisterKYC",
+                    NotificationTypeId = NOTIFICATION_TYPE.PUSH_NOTIFICATION.ToString(),
+                    Recipients = new List<RecipientViewModel>()
+                            {
+                                new RecipientViewModel()
+                                    {
+                                            NotificationContent =  new NotificationDTO() {
+                                            Body = "Thank you for signing up with IME London. You can continue to send transactions while your KYC is being processed, even though it is currently in processing.",
+                                            Title = "KYC Processing",
+                                            },
+                                            Address= rep.Extra2,
+                                            DeviceType = rep.Extra3
+                                    }
+                            },
+                    Language = Convert.ToString(CallContext.GetData(Constants.Language))
+                };
                 Log.Debug("RegisterKYC | DB RESPONSE" + JsonConvert.SerializeObject(rep));
 
 
@@ -2935,7 +2959,7 @@ namespace Business.Mobile
         }
 
 
-        public JsonRxResponse GetFieldsByProduct(Common.Model.Config.MappingType type, string customerId)
+        public JsonRxResponse GetFieldsByProduct(Common.Model.Config.MappingType type, string customerId, string receiverId)
         {
             JsonRxResponse jsonRx = new JsonRxResponse
             {
@@ -2963,7 +2987,7 @@ namespace Business.Mobile
                 else if (type == Common.Model.Config.MappingType.REWARD_POINT)
                 {
                     var response1 = _requestServices.GetRewardFee(customerId);
-                    response1.PaymentOptions = new PaymentOptions() { Options = GetPaymentMethods(), HeaderText = "How do like to pay?" };
+                    response1.PaymentOptions = new PaymentOptions() { Options = GetPaymentMethods(receiverId), HeaderText = "How do like to pay?" };
 
                     if (response1 != null)
                     {
@@ -3023,9 +3047,9 @@ namespace Business.Mobile
         }
 
 
-        public List<Option> GetPaymentMethods()
+        public List<Option> GetPaymentMethods(string receiverId)
         {
-            var paymentMethods = _requestServices.GetPaymentMethod();
+            var paymentMethods = _requestServices.GetPaymentMethod(receiverId);
             List<Option> options;
             string mappingPath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, ConfigurationManager.AppSettings["PaymentConfigFilePath"].ToString());
             using (StreamReader reader = File.OpenText(mappingPath))

Business/MobileV2/MobileV2Business.cs

@@ -68,20 +68,26 @@ namespace Business.Mobile
 
                 dashBoardV2.bannerImages.Add(new BannerImages()
                 {
-                    fileName = "image-1.jpg",
-                    filePath = "https://uat.imelondon.co.uk:1081/images/banners/Imebanner.jpg",
+                    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 = "lawson.jpg",
-                    filePath = "https://uat.imelondon.co.uk:1081/images/banners/demologoBanner.png",
+                    fileName = "two.jpg",
+                    filePath = "https://mobile.imelondon.co.uk:2086/images/banners/2.png",
+                    fileTitle = "file1",
+                    Redirect = false
+                });
+                dashBoardV2.bannerImages.Add(new BannerImages()
+                {
+                    fileName = "three.jpg",
+                    filePath = "https://mobile.imelondon.co.uk:2086/images/banners/3.png",
                     fileTitle = "file1",
                     Redirect = false
                 });
-
                 //dashBoardV2.bannerImages.Add(new BannerImages()
                 //{
                 //    fileName = "JME.png",

Common/Model/RewardPoints.cs

@@ -15,6 +15,9 @@ namespace Common.Model
         public string InviteMessageBody { get; set; }
         public string SourceCustomerId { get; set; }
         public string ShowShareBtn { get; set; }
+        public string RewardPts { get; set; }
+        public string RegReward { get; set; }
+        public string TranReward { get; set; }
         //public string MembershipId { get; set; }
         public List<RewardDetails> Details { get; set; }
     }

Common/Model/UserDetails.cs

@@ -17,6 +17,9 @@ namespace Common.Model
         public string Mobile { get; set; }
         public string Address { get; set; }
         public string Email { get; set; }
-        public DateTime RegisteredDate { get; set; }
+        public string RegisteredDate { get; set; }
+        public string TotalPoints { get; set; }
+        public string RegPoints { get; set; }
+        public string TranPoints { get; set; }
     }
 }

JsonRx/ApiV3/SendTransactionController.cs

@@ -88,6 +88,8 @@ namespace JsonRx.ApiV3
             Log.Debug("DynamicReceiverField details.");
             dynamicReceiverRequest.deviceType = Util.GetDeviceType(Request);
             JsonRxResponse res = _requestServices.DynamicReceiverField(dynamicReceiverRequest, customer);
+
+
             return Ok(res);
         }
 
@@ -114,7 +116,7 @@ namespace JsonRx.ApiV3
             if (Enum.IsDefined(typeof(MappingType), type)
              || Enum.IsDefined(typeof(MappingType), mappingTypeInt))
             {
-                res = _requestServices.GetFieldsByProduct(type, customer);
+                res = _requestServices.GetFieldsByProduct(type, customer, receiverId);
 
                 if (type == Common.Model.Config.MappingType.REWARD_POINT)
                 {

JsonRx/Config/ResponseMsg.json

@@ -1871,7 +1871,7 @@
     },
     {
         "Key": "INVITE_MESSAGE_TITLE",
-        "Message": "Receive a FREE 5£ bonus credit as Reward amount",
+        "Message": "Receive a FREE @rewardPoint £ bonus credit as Reward amount",
         "Lang": "en"
     },
     {
@@ -1901,7 +1901,7 @@
     },
     {
         "Key": "INVITE_MESSAGE_BODY",
-        "Message": "You and your friend will each be given £5.00 in bonus credit. Get £1 after they successfully register, and £4 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. Get £ @RegReward after they successfully register, and £ @TranReward after their first transaction. There may be minimum send requirements. Terms and Conditions.",
         "Lang": "en"
     },
     {

JsonRx/Web.config

@@ -14,10 +14,13 @@
     <!--<add name="LogDB" connectionString="server=77.68.15.91\MSSQLSERVER01,1434;Database=LogDb;uid=sa;pwd=DbAmin123;" providerName="system.data.sqlclient" />
     <add name="RemittanceDB" connectionString="server=77.68.15.91\MSSQLSERVER01,1434;Database=FastMoneyPro_Remit;uid=sa;pwd=DbAmin123; Max Pool Size=1000;" providerName="system.data.sqlclient" />-->
 
-    <add name="LogDB" connectionString="server=77.68.90.58,1433;Database=LogDb;uid=sa;pwd=zUge=i-W[8;" providerName="system.data.sqlclient" />
-    <add name="RemittanceDB" connectionString="server=77.68.90.58,1433;Database=FastMoneyPro_Remit;uid=sa;pwd=zUge=i-W[8; Max Pool Size=1000;" providerName="system.data.sqlclient" />
+    <!--<add name="LogDB" connectionString="server=77.68.90.58,1433;Database=LogDb;uid=sa;pwd=zUge=i-W[8;" providerName="system.data.sqlclient" />
+    <add name="RemittanceDB" connectionString="server=77.68.90.58,1433;Database=FastMoneyPro_Remit;uid=sa;pwd=zUge=i-W[8; Max Pool Size=1000;" providerName="system.data.sqlclient" />-->
     <!--<add name="LogDB" connectionString="server=34.92.161.102;Database=logdb;uid=remituserjme;pwd=r3M!tU5Er@jM3r3Mit#?; Max Pool Size=1000;" providerName="system.data.sqlclient" />
     <add name="RemittanceDB" connectionString="server=34.92.161.102;Database=FastMoneyPro_Remit;uid=remituserjme;pwd=r3M!tU5Er@jM3r3Mit#?; Max Pool Size=1000;" providerName="system.data.sqlclient" />-->
+
+    <add name="LogDB" connectionString="server=192.168.53.21;Database=LogDb;uid=user_uat;pwd=P@ssw0rd;" providerName="system.data.sqlclient" />
+    <add name="RemittanceDB" connectionString="server=192.168.53.21;Database=FastMoneyPro_Remit;uid=user_uat;pwd=P@ssw0rd; Max Pool Size=1000;;" providerName="system.data.sqlclient" />
   </connectionStrings>
   <appSettings>
     <!--Third Party Details -->

Repository/Mobile/IMobileServicesRepo.cs

@@ -102,6 +102,6 @@ namespace Repository.Mobile
         JsonRxResponse ValidateReferralCode(string referralCode);
         UserDetails GetUserDetails(string email);
        //ataSet StaticQueryAddress();
-        List<KeyValues> GetPaymentMethod();
+        List<KeyValues> GetPaymentMethod(string receiverId);
     }
 }

Repository/Mobile/MobileServicesRepo.cs

@@ -204,10 +204,11 @@ namespace Repository.Mobile
             };
         }
 
-        public List<KeyValues> GetPaymentMethod()
+        public List<KeyValues> GetPaymentMethod(string receiverId)
         {
             List<KeyValues> lst = new List<KeyValues>();
-            var sql = "EXEC mobile_proc_customerMaster @flag='get-payment-method'";
+            var sql = "EXEC proc_countryRateMaster @flag='getListById'";
+            sql += ", @receiverId = " + _dao.FilterString(receiverId);
             var dt = _dao.ExecuteDataTable(sql);
 
             foreach (DataRow row in dt.Rows)
@@ -1411,7 +1412,10 @@ namespace Repository.Mobile
                 userDetails.LastName = row["Lastname1"].ToString();
                 userDetails.Email = row["email"].ToString();
                 userDetails.Address = row["address"].ToString();
-                userDetails.RegisteredDate = DateTime.Parse(row["createdDate"].ToString());
+                userDetails.RegisteredDate = row["createdDate"].ToString();
+                userDetails.TotalPoints = row["TotalPoints"].ToString();
+                userDetails.RegPoints = row["RegPoints"].ToString();
+                userDetails.TranPoints = row["TranPoints"].ToString();
             }
             return userDetails;
         }
@@ -3118,10 +3122,16 @@ namespace Repository.Mobile
                 r.InviteCode = dt.Rows[0]["inviteCode"].ToString();
                 r.TotalReferral = dt.Rows[0]["totalReferral"].ToString();
                 r.RewardMoney = string.Format("{0:0.##}", dt.Rows[0]["rewardMoney"].ToString());
-                r.InviteMessageTitle = Utilities.GetLanguageMapping("INVITE_MESSAGE_TITLE", lang).Message;
-                r.InviteMessageBody = Utilities.GetLanguageMapping("INVITE_MESSAGE_BODY", lang).Message;
+                r.InviteMessageTitle = Utilities.GetLanguageMapping("INVITE_MESSAGE_TITLE", lang).Message.Replace("@rewardPoint", dt.Rows[0]["totalPoints"].ToString());
+                r.InviteMessageBody = Utilities.GetLanguageMapping("INVITE_MESSAGE_BODY", lang).Message
+                                        .Replace("@rewardAmount", dt.Rows[0]["totalPoints"].ToString())
+                                        .Replace("@RegReward", dt.Rows[0]["regPoints"].ToString())
+                                        .Replace("@TranReward", dt.Rows[0]["tranPoints"].ToString());
                 r.SourceCustomerId = dt.Rows[0]["sourceCustomerId"].ToString();
                 r.ShowShareBtn = ConfigurationManager.AppSettings["ShowShareBtn"].ToString();
+                r.RewardPts = dt.Rows[0]["totalPoints"].ToString();
+                r.RegReward = dt.Rows[0]["regPoints"].ToString();
+                r.TranReward = dt.Rows[0]["tranPoints"].ToString();
 
                 var rewardDetails = new List<RewardDetails>();
                 foreach (DataRow row1 in ds.Tables[1].Rows)