Merge branch 'feature/19315_Customer-Registration' of http://202.166.220.79:3000/IME-LONDON/CustomerPortal into feature/19315_Customer-Registration

CustomerOnlineV2/CustomerOnlineV2.Business/Business/RegisterBusiness/RegisterBusiness.cs

@@ -37,15 +37,15 @@ namespace CustomerOnlineV2.Business.Business.RegisterBusiness
                     List<Mapping> bodyMappings = new List<Notify.Mapping>();
 
                     bodyMappings.Add(new Mapping() { SValue = "CustomerName", SText = register.fullName });
-                    bodyMappings.Add(new Mapping() { SValue = "CustomerId", SText = "" });
-                    bodyMappings.Add(new Mapping() { SValue = "UserId", SText = register.membershipId });
+                    bodyMappings.Add(new Mapping() { SValue = "CustomerId", SText = model1.Id });
+                    bodyMappings.Add(new Mapping() { SValue = "UserId", SText = model1.Extra });
                     bodyMappings.Add(new Mapping() { SValue = "FirstName", SText = register.firstName });
                     bodyMappings.Add(new Mapping() { SValue = "MiddleName", SText = register.middleName });
                     bodyMappings.Add(new Mapping() { SValue = "LastName", SText = register.lastName1 });
                     bodyMappings.Add(new Mapping() { SValue = "MobileNo", SText = register.mobile });
                     bodyMappings.Add(new Mapping() { SValue = "Address", SText = register.address });
                     bodyMappings.Add(new Mapping() { SValue = "EMAIL_ID", SText = register.email });
-                    bodyMappings.Add(new Mapping() { SValue = "RegisteredDate", SText = "" });
+                    bodyMappings.Add(new Mapping() { SValue = "RegisteredDate", SText = DateTime.Now.ToString("dd/MM/yyyy") });
 
                     SendNotificationRequest request = new SendNotificationRequest()
                     {

CustomerOnlineV2/CustomerOnlineV2.Repository/Repository/RegisterRepository/RegisterRepository.cs

@@ -63,6 +63,7 @@ namespace CustomerOnlineV2.Repository.Repository.RegisterRepository
 
                 var dt = _connHelper.ExecuteDataTable(sql);
 
+                var r = _connHelper.ParseDbResult(dt);
 
                 if (dt == null || dt.Rows.Count <= 0)
                 {
@@ -75,6 +76,8 @@ namespace CustomerOnlineV2.Repository.Repository.RegisterRepository
                 {
                     response.ErrorCode = ResponseHelper.SUCCESS.ToString();
                     response.Msg = "Customer is registered. Proceed to login.";
+                    response.Id = r.Id;
+                    response.Extra = r.Extra2;
                 }
                 else
                 {

CustomerOnlineV2/CustomerOnlineV2/Views/Customer/CustomerRegistration.cshtml

@@ -157,7 +157,7 @@
                                                 <div class="col-md-4">
                                                     <div class="mb-4">
                                                         <div class="form-floating">
-                                                            <select class="form-select" asp-for="country" asp-items="@CustomerOnlineV2.Helper.HelperClass.GetDropdownData("allCountrylist", true)" aria-label="Floating label select example">
+                                                            <select class="form-select" asp-for="country" asp-items="@CustomerOnlineV2.Helper.HelperClass.GetDropdownData("allCountrylist", true)" aria-label="Floating label select example" required>
                                                             </select>
 
                                                             <label for="Nationality">Nationality</label>
@@ -180,7 +180,7 @@
                                                 <div class="col-md-4">
                                                     <div class="mb-4">
                                                         <div class="form-floating">
-                                                            <select class="form-select" asp-for="gender" asp-items="@CustomerOnlineV2.Helper.HelperClass.GetDropdownData("getGender", true)" aria-label="Floating label select example">
+                                                            <select class="form-select" asp-for="gender" asp-items="@CustomerOnlineV2.Helper.HelperClass.GetDropdownData("getGender", true)" aria-label="Floating label select example" required>
                                                             </select>
                                                             <label for="Gender">Gender</label>
                                                         </div>

CustomerOnlineV2/CustomerOnlineV2/Views/Customer/Notifications.cshtml

@@ -167,8 +167,8 @@
                             // '<i class="fa-solid fa-comment-exclamation" style="color: #96989c;"></i>';
                             // ' <i class="fas fa-circle-info" style="color: #3e83f9;"></i>':
                             // '<i class="fas fa-circle-info" style="color: #878787;"></i>';
-                            '<i class="fa-info-circle" style = "color: #3e83f9;" > </i>' :
-                            '< i class="fa-info-circle" style = "color: #8b8d8b;" > </i>';
+                            '<i class="fa fa-info-circle" style = "color: #3e83f9;" > </i>' :
+                            '< i class="fa fa-info-circle" style = "color: #8b8d8b;" > </i>';
                     } else if (d.category === 'ERROR') {
                         iconHtml = d.isRead ?
                             // '<i class="fa-solid fa-triangle-exclamation" style="color: #de2121;"></i>' :