#24416 Country Wise Margin Setup

#24827  Promotional Rate Feature

CustomerOnlineV2/CustomerOnlineV2.Common/Models/AccountModel/AccountModel.cs

@@ -51,6 +51,9 @@ namespace CustomerOnlineV2.Common.Models.AccountModel
         public bool IsEmailVerified { get; set; }
 
         public string? Selfiepath { get; set; }
+        public string? TotalPoints { get; set;}
+        public string? RegPoints { get; set; }
+        public string? TranPoints { get; set; }
     }
     public class VerifyOtpModel
     {

CustomerOnlineV2/CustomerOnlineV2.Repository/Repository/AccountRepository/AccountRepository.cs

@@ -59,6 +59,9 @@ namespace CustomerOnlineV2.Repository.Repository.AccountRepository
                         _response.SessionId = model.SessionId;
                         _response.IsEmailVerified = Convert.ToBoolean(dr["IsEmailVerified"]);     
                         _response.Selfiepath = Convert.ToString(dr["SelfieDoc"]);
+                        _response.TotalPoints = Convert.ToString(dr["TotalPoints"]);
+                        _response.RegPoints = Convert.ToString(dr["RegPoints"]);
+                        _response.TranPoints = Convert.ToString(dr["TranPoints"]);
                     }
                 }
             }

CustomerOnlineV2/CustomerOnlineV2.Repository/obj/Debug/net7.0/CustomerOnlineV2.Repository.AssemblyInfo.cs

@@ -14,7 +14,7 @@ using System.Reflection;
 [assembly: System.Reflection.AssemblyCompanyAttribute("CustomerOnlineV2.Repository")]
 [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
 [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+f897977e68c0ded40cb056fdd49d8487e8fee1a5")]
 [assembly: System.Reflection.AssemblyProductAttribute("CustomerOnlineV2.Repository")]
 [assembly: System.Reflection.AssemblyTitleAttribute("CustomerOnlineV2.Repository")]
 [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

CustomerOnlineV2/CustomerOnlineV2.Repository/obj/Debug/net7.0/CustomerOnlineV2.Repository.AssemblyInfoInputs.cache

@@ -1 +1 @@
-8ab5dae507d4e1287a54d87026592da21e49e4d6
+6b412bc53dff889aa87ef98df9f537aa4767b20abd23b51c94d94f8500b30e8b

CustomerOnlineV2/CustomerOnlineV2.Repository/obj/Debug/net7.0/CustomerOnlineV2.Repository.GeneratedMSBuildEditorConfig.editorconfig

@@ -9,3 +9,5 @@ build_property.EnforceExtendedAnalyzerRules =
 build_property._SupportedPlatformList = Linux,macOS,Windows
 build_property.RootNamespace = CustomerOnlineV2.Repository
 build_property.ProjectDir = D:\Office\SourceCodes\git-repo\IME_LONDON\Repos\CustomerPortal\CustomerOnlineV2\CustomerOnlineV2.Repository\
+build_property.EnableComHosting = 
+build_property.EnableGeneratedComInterfaceComImportInterop = 

CustomerOnlineV2/CustomerOnlineV2/Controllers/AccountController.cs

@@ -76,7 +76,10 @@ namespace CustomerOnlineV2.Controllers
                             new Claim("SessionId", result.SessionId),
                             new Claim("UserId", result.UserId),
                             new Claim("MembershipId", result.MembershipId),
-                            //new Claim("SelfieDoc", Convert.ToString(result.Selfiepath)),
+                            new Claim("SelfieDoc", Convert.ToString(result.Selfiepath)),
+                            new Claim("TotalPoints", result.TotalPoints),
+                            new Claim("RegPoints", result.RegPoints),
+                            new Claim("TranPoints", result.TranPoints),
                         };
 
                         var claimsIdentity = new ClaimsIdentity(claims, CookieAuthenticationDefaults.AuthenticationScheme);

CustomerOnlineV2/CustomerOnlineV2/Properties/PublishProfiles/FolderProfile.pubxml.user

@@ -5,7 +5,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
 <Project>
   <PropertyGroup>
     <_PublishTargetUrl>D:\Publish\Imelondon\New folder</_PublishTargetUrl>
-    <History>True|2024-01-07T20:03:51.6977336Z;True|2024-01-04T16:57:00.8366880+05:45;True|2024-01-04T16:39:14.5116891+05:45;True|2023-12-29T16:17:33.3592875+05:45;True|2023-12-28T15:22:54.5509910+05:45;True|2023-12-27T21:20:24.7590400+05:45;True|2023-12-20T21:29:37.0436015+05:45;True|2023-12-08T13:46:34.5508826+05:45;True|2023-12-08T13:22:59.7907396+05:45;True|2023-12-08T13:16:18.2446566+05:45;True|2023-12-08T01:36:46.4929190+05:45;True|2023-12-01T14:29:54.6987204+05:45;True|2023-12-01T13:48:23.4841029+05:45;True|2023-12-01T00:12:04.2288558+05:45;True|2023-11-30T23:51:56.2008888+05:45;True|2023-11-30T23:49:36.9385794+05:45;True|2023-11-30T23:46:46.8847879+05:45;True|2023-11-30T23:46:03.6979693+05:45;True|2023-11-30T23:44:27.3157126+05:45;True|2023-11-30T23:33:55.0600332+05:45;False|2023-11-30T23:32:36.1977723+05:45;True|2023-11-30T23:26:29.2113993+05:45;True|2023-11-30T23:04:07.5067771+05:45;True|2023-11-29T01:51:42.3247259+05:45;True|2023-11-28T23:34:50.6877537+05:45;True|2023-11-28T23:31:23.9257392+05:45;True|2023-11-28T17:22:07.3908940+05:45;True|2023-11-28T16:44:59.6364591+05:45;True|2023-11-28T16:39:13.8831139+05:45;True|2023-11-28T16:35:01.7962202+05:45;True|2023-11-28T15:54:09.3703564+05:45;True|2023-11-28T13:17:36.9582579+05:45;True|2023-11-28T11:06:56.1393117+05:45;True|2023-11-27T21:26:39.4737693+05:45;True|2023-11-27T20:27:44.8267131+05:45;True|2023-11-27T15:15:02.7845576+05:45;True|2023-11-27T15:14:24.7414474+05:45;True|2023-11-27T15:12:20.8631275+05:45;True|2023-11-27T14:53:12.8806451+05:45;True|2023-11-27T14:44:42.3370519+05:45;True|2023-11-27T14:03:02.0808830+05:45;True|2023-11-26T22:29:14.7842119+05:45;True|2023-11-26T22:26:41.5591080+05:45;True|2023-11-26T22:24:00.1770904+05:45;True|2023-11-26T22:20:37.2082479+05:45;True|2023-11-26T12:54:30.6489713+05:45;True|2023-11-25T09:37:52.6378019+05:45;True|2023-11-24T23:46:21.5762377+05:45;True|2023-11-24T23:40:44.7042923+05:45;True|2023-11-24T22:26:01.6024702+05:45;True|2023-11-24T22:11:31.5563357+05:45;True|2023-11-23T20:11:39.9968178+05:45;True|2023-11-23T19:11:12.3226825+05:45;True|2023-11-23T14:34:53.3821861+05:45;True|2023-11-22T21:49:39.4855996+05:45;True|2023-11-22T00:55:02.7339322+05:45;True|2023-11-22T00:35:33.7932258+05:45;True|2023-11-22T00:06:39.0977881+05:45;True|2023-11-21T16:56:40.9165139+05:45;True|2023-11-21T16:55:43.5238508+05:45;True|2023-11-21T13:06:42.6334262+05:45;True|2023-11-21T13:05:56.8163644+05:45;True|2023-11-21T01:30:01.6294845+05:45;True|2023-11-21T01:25:46.8788948+05:45;True|2023-11-21T01:18:10.9400288+05:45;True|2023-11-20T17:46:52.6414077+05:45;False|2023-11-20T17:46:20.7035330+05:45;True|2023-11-20T16:17:17.6490092+05:45;True|2023-11-19T23:00:54.1411776+05:45;True|2023-11-19T15:41:16.8030592+05:45;True|2023-11-19T15:27:21.5495440+05:45;True|2023-11-19T12:52:51.4532176+05:45;True|2023-11-17T19:30:12.1934196+05:45;True|2023-11-16T23:07:05.3180955+05:45;True|2023-11-16T23:02:00.4838743+05:45;True|2023-11-16T22:59:08.9347336+05:45;True|2023-11-16T22:55:10.4213631+05:45;True|2023-11-16T22:43:21.8981804+05:45;True|2023-11-14T17:28:08.3885160+05:45;True|2023-11-14T17:22:29.1626336+05:45;True|2023-11-14T17:04:07.2972823+05:45;True|2023-11-11T20:35:29.2080326+05:45;True|2023-11-11T20:32:15.2845349+05:45;True|2023-11-10T16:47:06.4019617+05:45;False|2023-11-10T13:51:28.3018175+05:45;True|2023-11-10T02:19:03.5340681+05:45;True|2023-11-10T01:20:14.2700570+05:45;True|2023-11-09T21:01:27.9875543+05:45;True|2023-11-09T20:59:19.5230056+05:45;True|2023-11-09T18:16:23.7470131+05:45;False|2023-11-09T18:16:03.5500533+05:45;True|2023-11-09T18:09:25.9299204+05:45;True|2023-11-09T15:14:04.7264848+05:45;True|2023-11-09T15:11:19.0085135+05:45;True|2023-11-09T15:07:24.6950375+05:45;True|2023-11-09T00:57:27.0432228+05:45;True|2023-11-09T00:52:22.0688681+05:45;True|2023-11-08T23:45:10.1218798+05:45;True|2023-11-08T23:42:07.1091081+05:45;True|2023-11-08T23:36:21.1551855+05:45;</History>
+    <History>True|2024-02-06T20:16:12.0346310Z;True|2024-02-07T01:51:08.9857661+05:45;True|2024-01-31T14:53:26.7904025+05:45;True|2024-01-31T14:32:11.2632740+05:45;True|2024-01-25T22:32:43.7997432+05:45;True|2024-01-08T01:48:51.6977336+05:45;True|2024-01-04T16:57:00.8366880+05:45;True|2024-01-04T16:39:14.5116891+05:45;True|2023-12-29T16:17:33.3592875+05:45;True|2023-12-28T15:22:54.5509910+05:45;True|2023-12-27T21:20:24.7590400+05:45;True|2023-12-20T21:29:37.0436015+05:45;True|2023-12-08T13:46:34.5508826+05:45;True|2023-12-08T13:22:59.7907396+05:45;True|2023-12-08T13:16:18.2446566+05:45;True|2023-12-08T01:36:46.4929190+05:45;True|2023-12-01T14:29:54.6987204+05:45;True|2023-12-01T13:48:23.4841029+05:45;True|2023-12-01T00:12:04.2288558+05:45;True|2023-11-30T23:51:56.2008888+05:45;True|2023-11-30T23:49:36.9385794+05:45;True|2023-11-30T23:46:46.8847879+05:45;True|2023-11-30T23:46:03.6979693+05:45;True|2023-11-30T23:44:27.3157126+05:45;True|2023-11-30T23:33:55.0600332+05:45;False|2023-11-30T23:32:36.1977723+05:45;True|2023-11-30T23:26:29.2113993+05:45;True|2023-11-30T23:04:07.5067771+05:45;True|2023-11-29T01:51:42.3247259+05:45;True|2023-11-28T23:34:50.6877537+05:45;True|2023-11-28T23:31:23.9257392+05:45;True|2023-11-28T17:22:07.3908940+05:45;True|2023-11-28T16:44:59.6364591+05:45;True|2023-11-28T16:39:13.8831139+05:45;True|2023-11-28T16:35:01.7962202+05:45;True|2023-11-28T15:54:09.3703564+05:45;True|2023-11-28T13:17:36.9582579+05:45;True|2023-11-28T11:06:56.1393117+05:45;True|2023-11-27T21:26:39.4737693+05:45;True|2023-11-27T20:27:44.8267131+05:45;True|2023-11-27T15:15:02.7845576+05:45;True|2023-11-27T15:14:24.7414474+05:45;True|2023-11-27T15:12:20.8631275+05:45;True|2023-11-27T14:53:12.8806451+05:45;True|2023-11-27T14:44:42.3370519+05:45;True|2023-11-27T14:03:02.0808830+05:45;True|2023-11-26T22:29:14.7842119+05:45;True|2023-11-26T22:26:41.5591080+05:45;True|2023-11-26T22:24:00.1770904+05:45;True|2023-11-26T22:20:37.2082479+05:45;True|2023-11-26T12:54:30.6489713+05:45;True|2023-11-25T09:37:52.6378019+05:45;True|2023-11-24T23:46:21.5762377+05:45;True|2023-11-24T23:40:44.7042923+05:45;True|2023-11-24T22:26:01.6024702+05:45;True|2023-11-24T22:11:31.5563357+05:45;True|2023-11-23T20:11:39.9968178+05:45;True|2023-11-23T19:11:12.3226825+05:45;True|2023-11-23T14:34:53.3821861+05:45;True|2023-11-22T21:49:39.4855996+05:45;True|2023-11-22T00:55:02.7339322+05:45;True|2023-11-22T00:35:33.7932258+05:45;True|2023-11-22T00:06:39.0977881+05:45;True|2023-11-21T16:56:40.9165139+05:45;True|2023-11-21T16:55:43.5238508+05:45;True|2023-11-21T13:06:42.6334262+05:45;True|2023-11-21T13:05:56.8163644+05:45;True|2023-11-21T01:30:01.6294845+05:45;True|2023-11-21T01:25:46.8788948+05:45;True|2023-11-21T01:18:10.9400288+05:45;True|2023-11-20T17:46:52.6414077+05:45;False|2023-11-20T17:46:20.7035330+05:45;True|2023-11-20T16:17:17.6490092+05:45;True|2023-11-19T23:00:54.1411776+05:45;True|2023-11-19T15:41:16.8030592+05:45;True|2023-11-19T15:27:21.5495440+05:45;True|2023-11-19T12:52:51.4532176+05:45;True|2023-11-17T19:30:12.1934196+05:45;True|2023-11-16T23:07:05.3180955+05:45;True|2023-11-16T23:02:00.4838743+05:45;True|2023-11-16T22:59:08.9347336+05:45;True|2023-11-16T22:55:10.4213631+05:45;True|2023-11-16T22:43:21.8981804+05:45;True|2023-11-14T17:28:08.3885160+05:45;True|2023-11-14T17:22:29.1626336+05:45;True|2023-11-14T17:04:07.2972823+05:45;True|2023-11-11T20:35:29.2080326+05:45;True|2023-11-11T20:32:15.2845349+05:45;True|2023-11-10T16:47:06.4019617+05:45;False|2023-11-10T13:51:28.3018175+05:45;True|2023-11-10T02:19:03.5340681+05:45;True|2023-11-10T01:20:14.2700570+05:45;True|2023-11-09T21:01:27.9875543+05:45;True|2023-11-09T20:59:19.5230056+05:45;True|2023-11-09T18:16:23.7470131+05:45;False|2023-11-09T18:16:03.5500533+05:45;True|2023-11-09T18:09:25.9299204+05:45;True|2023-11-09T15:14:04.7264848+05:45;True|2023-11-09T15:11:19.0085135+05:45;True|2023-11-09T15:07:24.6950375+05:45;</History>
     <LastFailureDetails />
   </PropertyGroup>
 </Project>

CustomerOnlineV2/CustomerOnlineV2/Views/Customer/CustomerProfile.cshtml

@@ -308,11 +308,11 @@
                                         </div>
                                         <div class="col-12 col-sm-6">
                                             <label for="input-zone" class="form-label ">Id Issue Date</label>
-                                            <input type="text" class="form-control datepicker" id="idIssueDate" placeholder="dd/mm/yyyy" required />
+                                            <input type="text" class="form-control date datepicker" id="idIssueDate"  required />
                                         </div>
                                         <div class="col-12 col-sm-6">
                                             <label for="input-zone" class="form-label">Id Expiry Date</label>
-                                            <input type="text" class="form-control picker" id="idExpiryDate" placeholder="dd/mm/yyyy" required />
+                                            <input type="text" class="form-control date picker" id="idExpiryDate" required />
                                         </div>
 
 
@@ -449,7 +449,15 @@
                 dateFormat: "dd/mm/yy",
                 changeMonth: true,
                 changeYear: true,
-                yearRange: "-100:+0",
+                yearRange: "-50:+0",
+                showOn: "focus",
+                defaultDate: null,
+                beforeShow: function (input, inst) {
+                    var rect = input.getBoundingClientRect();
+                    setTimeout(function () {
+                        inst.dpDiv.css({ top: rect.bottom + "px", left: rect.left + "px" });
+                    }, 0);
+                }
                 // showOn: "both",
                 // buttonText: '<i class="icon-calendar"></i>',
             });
@@ -458,7 +466,15 @@
                 dateFormat: "dd/mm/yy",
                 changeMonth: true,
                 changeYear: true,
-                yearRange: "-0:+100",
+                yearRange: "-0:+50",
+                showOn: "focus",
+                defaultDate: null,
+                beforeShow: function (input, inst) {
+                    var rect = input.getBoundingClientRect();
+                    setTimeout(function () {
+                        inst.dpDiv.css({ top: rect.bottom + "px", left: rect.left + "px" });
+                    }, 0);
+                }
                 // showOn: "both",
                 // buttonText: '<i class="icon-calendar"></i>',
             });

CustomerOnlineV2/CustomerOnlineV2/Views/Customer/Refer.cshtml

@@ -165,11 +165,11 @@
                                                 <div class="mb-4">
                                                     <h5 class="referral-code-header">Available Reward Amount: <span id="showRewardPoints" style="color:green;"></span></h5>
                                                 </div>
-                                                <h4 class="referral-code-header">Refer Now</h4>
-                                                <p>Receive a FREE 10£ bonus credit as Reward Amount</p>
-                                                <p style="width:80%">
-                                                    You and your friend will each be given 10£ in bonus credit.
-                                                    @* <br>Get £5.00 after they successfully register, and £5 after their first transaction.</p> *@
+                                                <h2 class="referral-code-header">Refer Now</h2>
+                                                <p class="text-black fs-5">Receive a FREE £<span id="totalPoints">@User.FindFirst("TotalPoints").Value</span> bonus credit as Reward Amount</p>
+                                                @* <p>You and your friend will each be given £<span id="totalPoints">@User.FindFirst("TotalPoints").Value</span> in bonus credit. Get £<span id="totalPoints">@User.FindFirst("RegPoints").Value</span> after they successfully register, and £<span id="totalPoints">@User.FindFirst("TranPoints").Value</span> after their first transaction.</p> *@
+
+                                                <p> You and your friend will each be given <span id="totalPoints">@User.FindFirst("TotalPoints").Value</span> £ in bonus credit. There may be minimum send requirements.</p>
                                                 <p>There may be minimum send requirements.</p>
                                                 <p>
                                                     <a href="https://imelondon.co.uk/RewardPoint_Declaration.html" target="_blank">

CustomerOnlineV2/CustomerOnlineV2/Views/Transaction/SendMoney.cshtml

@@ -50,7 +50,8 @@
                                         <div class="col-md-10">
                                             <div class="mb-3">
                                                 <div class="form-floating">
-                                                    <select asp-for="SchemeId" asp-items="@CustomerOnlineV2.Helper.HelperClass.GetDropdownData("howToPay", true)" class="form-select" required></select>
+                                                    @* <select asp-for="SchemeId" asp-items="@CustomerOnlineV2.Helper.HelperClass.GetDropdownData("howToPay", true)" class="form-select" required></select> *@
+                                                    <select asp-for="SchemeId" class="form-select" required></select>
                                                     <label class="form-label">How do like to pay? </label>
                                                 </div>
                                             </div>
@@ -310,6 +311,7 @@
             $('#ReceivingCountry').change(function () {
                 if ($(this).val() != '') {
                     PopulateDDL('DeliveryMethod', 'pMode', $(this).val(), true, '');
+                    PopulateDDL('SchemeId', 'paymentOption', $(this).val(), true, '');
                    // PopulateDDL('Receiver', 'receiverList', $(this).val(), true, '');
 
                 }