merge

CustomerOnlineV2/CustomerOnlineV2.Business/Business/AccountBusiness/AccountBusiness.cs

@@ -135,10 +135,8 @@ namespace CustomerOnlineV2.Business.Business.AccountBusiness
                 {
                     bool emailSent = false;
                     bool smsSent = false;
-                    if (requestOTPModel.userId.IsValidEmail())
-                    {
 
-                        if (!string.IsNullOrEmpty(jsonRx.ErrorCode) && jsonRx.ErrorCode.Equals("0"))
+                        if (!string.IsNullOrEmpty(jsonRx.ErrorCode) && (jsonRx.ErrorCode.Equals("0") && jsonRx.Extra3.Equals("100")))
                         {
                             List<Mapping> bodyMappings = new List<Mapping>();
 
@@ -191,7 +189,7 @@ namespace CustomerOnlineV2.Business.Business.AccountBusiness
 
                                 StringBuilder s = new StringBuilder();
                                 s.AppendLine($"Dear {jsonRx.Extra}");
-                                s.AppendLine($"Your OTP code for Customer  Registration is {requestOTPModel.OTP}.");
+                                s.AppendLine($"Your OTP code for Customer  Registration is {jsonRx.Id}.");
                                 s.AppendLine("Regards, IME London");
 
                                 SMSRequestModel _req = new SMSRequestModel
@@ -224,13 +222,13 @@ namespace CustomerOnlineV2.Business.Business.AccountBusiness
                                 return jsonRx;
                             }
                         }
-                    }
+                    
                     
                 }
                 else
                 {
                     jsonRx.ErrorCode = "1";
-                    return new JsonRxResponse { ErrorCode = jsonRx.ErrorCode, Msg = jsonRx.Msg };
+                    return new JsonRxResponse { ErrorCode = jsonRx.ErrorCode, Msg = jsonRx.Msg , Id= jsonRx.Id, Extra3= jsonRx.Extra3 };
 
                 }
 

CustomerOnlineV2/CustomerOnlineV2.Common/Models/HomeModel/HomeModel.cs

@@ -73,6 +73,7 @@ namespace CustomerOnlineV2.Common.Models.HomeModel
     {
         public string Flag { get; set; }
         public string Value { get; set; }
+        public string country { get; set; }
     }
 
     public class CommonDropDownList

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

@@ -140,7 +140,8 @@ namespace CustomerOnlineV2.Repository.Repository.AccountRepository
                 Msg = _dbRes.ResponseMessage,
                 Id = _dbRes.Id,
                 Extra = _dbRes.Extra,
-                Extra2 = _dbRes.Extra2
+                Extra2 = _dbRes.Extra2,
+                Extra3= _dbRes.ResponseCode.ToString()
             };
         }
 

CustomerOnlineV2/CustomerOnlineV2.Repository/Repository/ReceiverRepository/ReceiverRepository.cs

@@ -42,8 +42,8 @@ namespace CustomerOnlineV2.Repository.Repository.ReceiverRepository
                 sql += ",@lastName1 =" + _connHelper.FilterString(model.lastName1);
                 sql += ",@lastName2 =" + _connHelper.FilterString(model.lastName2);
                 sql += ",@address =" + _connHelper.FilterString(model.Address);
-                //sql += ",@city =" + _connHelper.FilterString(model.city);
-                //sql += ",@homePhone =" + _connHelper.FilterString(model.ContactNo);
+                sql += ",@city =" + _connHelper.FilterString(model.City);
+                sql += ",@homePhone =" + _connHelper.FilterString(model.homePhone);
                 sql += ",@mobile =" + _connHelper.FilterString(model.Mobile);
                 sql += ",@relationship =" + _connHelper.FilterString(model.Relationship);
                 sql += ",@placeOfIssue =" + _connHelper.FilterString(model.placeOfIssue);
@@ -192,7 +192,7 @@ namespace CustomerOnlineV2.Repository.Repository.ReceiverRepository
                             Relationship = Convert.ToString(item["relationship"]),
                             Country = Convert.ToString(item["Country"]),
                             Address = Convert.ToString(item["address"]),
-                            State = Convert.ToString(item["city"]),
+                            City = Convert.ToString(item["city"]),
                             zipCode = Convert.ToString(item["zipCode"]),
                             Mobile = Convert.ToString(item["Mobile"]),
                             Email = Convert.ToString(item["email"]),
@@ -276,9 +276,9 @@ namespace CustomerOnlineV2.Repository.Repository.ReceiverRepository
             {
                 var sql = "EXEC proc_sendPageLoadData";
                 sql += " @Flag  = " + _connHelper.FilterString("rec-select-agent");
-                sql += ", @param  = " + _connHelper.FilterString("Bank Deposit");
+                sql += ", @param  = " + _connHelper.FilterString(model.Value);
                 sql += " ,@CountryId = " + _connHelper.FilterString("233");
-                sql += " ,@pCountryId = " + _connHelper.FilterString("151");
+                sql += " ,@pCountryId = " + _connHelper.FilterString(model.country);
 
 
                 _logger.LogDebug("RECEIVERREPOSITORY | GETDDAGENTLLIST | SQL | " + sql);

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

@@ -55,6 +55,7 @@ namespace CustomerOnlineV2.Repository.Repository.RegisterRepository
                 sql += ",@occupation =" + _connHelper.FilterString(model.occupation);
                 sql += ",@custNativecountry =" + _connHelper.FilterString(model.nativeCountry);
                 sql += ",@zipCode =" + _connHelper.FilterString(model.postalCode);
+                sql += ",@custCity =" + _connHelper.FilterString(model.city);
                 sql += ",@custAdd1 =" + _connHelper.FilterString(model.address);
                 sql += ",@custAdd2 =" + _connHelper.FilterString(model.address2);
                 sql += ",@onlineUser  =" + _connHelper.FilterString("true");

CustomerOnlineV2/CustomerOnlineV2/Controllers/AccountController.cs

@@ -193,6 +193,7 @@ namespace CustomerOnlineV2.Controllers
             }
         }
 
+        [Authorization("VerifyOTP")]
         public async Task<IActionResult> VerifyOTP(RequestOTPModel requestOTPModel)
         {
             requestOTPModel.sessionId = Guid.NewGuid().ToString().Replace("-", "");
@@ -209,23 +210,32 @@ namespace CustomerOnlineV2.Controllers
                     requestOTPModel.requestFor = "REGISTER";
                     Log.Debug("RequestOTP | REQUEST : " + JsonConvert.SerializeObject(requestOTPModel));
                     var staticDataResponse = _accountBusiness.RequestOTP(requestOTPModel);
-                    if (staticDataResponse.ErrorCode == "0")
-                    {
+
                         var viewModel = new VerifyOtpModel
                         {
                             Email = userEmail,
                             otp = "",
                         };
+                    if (staticDataResponse.ErrorCode == "0" && staticDataResponse.Extra3.Equals("100"))
+                    {
                         ViewBag.ResponseCode = "0";
                         ViewBag.ResponseMessage = "OTP has been sent.";
                         return View(viewModel);
                     }
                     else
                     {
+                        if (staticDataResponse.Extra3.Equals("103"))
+                        {
+                            ViewBag.ResponseCode = "103";
+                            ViewBag.ResponseMessage = "OTP already has been sent.";
+                            return View(viewModel);
+                        }
+
+
                         ViewBag.ResponseCode = staticDataResponse.ErrorCode;
                         ViewBag.ResponseMessage = staticDataResponse.Msg;
                         _logger.LogError("ACCOUNTCONTROLLER | REQUESTOTP | ERROR OCCURED | " + JsonConvert.SerializeObject(staticDataResponse));
-                        return View();
+                        return View(viewModel);
                     }
                 }
                 return View("ErrorViewName");
@@ -244,6 +254,7 @@ namespace CustomerOnlineV2.Controllers
         {
             try
             {
+                ViewBag.ResponseCode = "";
                 var loginDetails = HttpContext.GetLoginDetails();
 
                 if (string.IsNullOrEmpty(loginDetails.UserName))
@@ -268,14 +279,14 @@ namespace CustomerOnlineV2.Controllers
                     if (response.ErrorCode == "0")
                     {
                         Log.Debug("ACCOUNTCONTROLLER | SubmitOTP | REQUEST ARRIVED | " + loginDetails.Email);
-                        return RedirectToAction("Index", "Home");
+                        return Ok(new { ErrorCode = response.ErrorCode, ResponseMessage = response.Msg });
                     }
                     else
                     {
-                        ViewBag.ResponseCode = response.ErrorCode;
-                        ViewBag.ResponseMessage = response.Msg;
+                        //ViewBag.ResponseCode = response.ErrorCode;
+                        //ViewBag.ResponseMessage = response.Msg;
                         _logger.LogError("ACCOUNTCONTROLLER | LOGIN | ERROR OCCURRED | " + JsonConvert.SerializeObject(response));
-                        return View();
+                       return Ok(new { ErrorCode = response.ErrorCode, ResponseMessage =response.Msg });
                     }
                 }
             }

CustomerOnlineV2/CustomerOnlineV2/Controllers/ReceiverInformationController.cs

@@ -77,8 +77,8 @@ namespace CustomerOnlineV2.Controllers
         }
         [HttpPost]
         [ValidateAntiForgeryToken]
-        [Authorization("GetDDLList")]
-        public async Task<CommonDropDownList> GetDDLList(CommonDropDownModel model)
+        [Authorization("GetDDAgentLList")]
+        public async Task<CommonDropDownList> GetDDAgentLList(CommonDropDownModel model )
         {
             var loginDetails = HttpContext.GetLoginDetails();
             return await _receiverBusiness.GetDDLList(model, loginDetails);

CustomerOnlineV2/CustomerOnlineV2/Views/Account/ForceChangePassword.cshtml

@@ -194,7 +194,9 @@
         $(document).ready(function () {
             debugger;
          
-            // Select the password and confirmPassword input fields
+      
+
+
             var passwordField = $("#NewPassword");
             var confirmPasswordField = $("#ConfirmNewPassword");
 
@@ -210,8 +212,9 @@
                 var password = passwordField.val();
 
                 if (passwordRegex.test(password)) {
-                    passwordValidation.text("Valid password").css("color", "green");
+                    passwordValidation.text("Valid password").removeClass("text-danger").addClass("text-success");
                 } else {
+                    passwordValidation.text("Valid password").removeClass("text-success").addClass("text-danger");
                     passwordValidation.text("Password should contain at least one special character (*&%$), one uppercase, one lowercase and min of 8 characters").css("color", "red");
                 }
             });
@@ -221,11 +224,13 @@
                 var confirmPassword = confirmPasswordField.val();
 
                 if (password === confirmPassword) {
-                    confirmPasswordValidation.text("Passwords match").css("color", "green");
+                    confirmPasswordValidation.text("Passwords match").removeClass("text-danger").addClass("text-success");
                 } else {
-                    confirmPasswordValidation.text("Passwords do not match").css("color", "red");
+
+                    confirmPasswordValidation.text("Passwords do not match").removeClass("text-success").addClass("text-danger");
                 }
             });
+
         })
 
 

CustomerOnlineV2/CustomerOnlineV2/Views/Account/VerifyOTP.cshtml

@@ -86,7 +86,7 @@
                                 </div>
 
                                 <div class="form-floating mb-1">
-                                    <input type="text" class="form-control" asp-for="otp">
+                                    <input type="text" class="form-control" asp-for="otp" required>
                                     <label for="floatingInput">OTP</label>
                                 </div>
 
@@ -107,7 +107,7 @@
                                 <div class="col-lg-8 mt-4">
                                     <div class="row">
                                         <div class="col-md-4 mb-3">
-                                            <button type="submit" id="btnSubmit" onclick="SubmitOTP()" class="btn btn-primary btn-sumbit-blue" style="width: 100%;">
+                                            <button type="button" id="btnSubmit" onclick="SubmitOTP()" class="btn btn-primary btn-sumbit-blue" style="width: 100%;">
                                                 <span class="resetText">Submit</span>&nbsp;<div class="spinner-border text-success loading" role="status" style="display:none;"></div> <i class="fa fa-window-maximize px-2 loginText" aria-hidden="true"></i>
                                             </button>
                                         </div>
@@ -183,25 +183,40 @@
 
         $(document).ready(function () {
 
-            if ('@ViewBag.ResponseCode' != '0') {
-                iziToast.error({
-                    title: 'Error',
+            if ('@ViewBag.ResponseCode' == '0') {
+                iziToast.success({
+                    title: 'OK',
                     message: '@ViewBag.ResponseMessage'
                 });
             }
-            else {
-                iziToast.success({
-                    title: 'OK',
+            else if ('@ViewBag.ResponseCode' == '103') {
+                iziToast.info({
+                    title: 'Info',
+                    message: '@ViewBag.ResponseMessage'
+                });
+            }
+            else if ('@ViewBag.ResponseCode' == '1') {
+                iziToast.error({
+                    title: 'Error',
                     message: '@ViewBag.ResponseMessage'
                 });
             }
-
         });
 
         function SubmitOTP() {
+
+       
             let email = $('#Email').val();
             let otp = $('#otp').val();
 
+
+            if (otp.length === 0) {
+                iziToast.error({
+                    title: 'Error',
+                    message: 'OTP field is required'
+                });
+                return;
+            }
             let Data = {
 
                 Email: email,
@@ -222,21 +237,28 @@
                     },
                     async: true,
                     success: function (response) {
-
+                        debugger;
                         if (response.errorCode == 0) {
-                            debugger
-                            ShowAlertMessage(response.errorCode, response.msg);
-                            window.location.replace("/home");
+                            iziToast.info({
+                                title:  'OK',                              
+                                onClosed: function () {
+                                    window.location.replace("/home");
+                                }
+                            });                           
 
                         }
                         else {
-                            debugger
-                            ShowAlertMessage(response.errorCode, response.msg);
+                            iziToast.error({
+                                title: 'Error',
+                                message: response.responseMessage
+                            });
                         }
                     },
-
                     error: function () {                    
-                        ShowAlertMessage(response.errorCode, response.msg);
+                        iziToast.error({
+                            title: 'Error',
+                            message: response.responseMessage
+                        });
                     }
                 });
         }

CustomerOnlineV2/CustomerOnlineV2/Views/Customer/CustomerRegistration.cshtml

@@ -213,7 +213,7 @@
                                                                         <tr>
                                                                             <th>SN</th>
                                                                             <th>Address1</th>
-                                                                            <th>Address2</th>
+                                                                            <th>City</th>
                                                                             <th>Action</th>
                                                                         </tr>
                                                                     </thead>
@@ -235,6 +235,14 @@
                                                         </div>
                                                     </div>
                                                 </div>
+                                                <div class="col-md-4">
+                                                    <div class="mb-4">
+                                                        <div class="form-floating">
+                                                            <input type="text" class="form-control" placeholder="City" asp-for="city">
+                                                            <label for="city">City</label>
+                                                        </div>
+                                                    </div>
+                                                </div>
                                                 <div class="col-md-4">
                                                     <div class="mb-4">
                                                         <div class="form-floating">
@@ -339,6 +347,9 @@
     <script src="~/vendor/owl.carousel/owl.carousel.min.js"></script>
     <script src="~/js/script.js"></script>
     <script src="~/vendor/toast-alert/izitoast.min.js"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery.mask/1.14.16/jquery.mask.min.js"></script>
+    <script src="https://code.jquery.com/jquery-3.6.0.min.js"></script>
+   
     @*   <script src="~/js/register-validation.js"></script> *@
 
     <script type="text/javascript">
@@ -349,7 +360,10 @@
 
         $(document).ready(function () {
            
-            $('#btnSearch').click(function (e) {
+            // $('#mobile').mask('+44 999999999', {
+            //     placeholder: " ",
+            // });
+            $(document).on('click', '#btnSearch', function (e) {
                 e.preventDefault();
                 var postalCode = $('#postalCode').val();
 
@@ -378,20 +392,19 @@
                                 var row = $('<tr>');
                                 row.append($('<td>').text(index + 1));
                                 row.append($('<td>').text(item.Address1));
-                                row.append($('<td>').text(item.Address2));
+                                row.append($('<td>').text(item.City));
 
                                 var selectButton = $('<button>')
                                     .addClass('btn btn-primary')
                                     .text('Select')
                                     .click(function (event) {
-                                        var additionalAddress = item.Address1;
-                                        var city = item.Address2;
+                                        var Address1 = item.Address1;
+                                        var city = item.City;
+
 
-                                        $('#hdnAdditionalAddress').val(additionalAddress);
-                                        $('#cityHidden').val(city);
+                                        $('#city').val(city);
 
-                                        $('#address').val(additionalAddress);
-                                        $('#address2').val(city);
+                                        $('#address').val(Address1);
                                         $('#apiDataPopup').modal('hide');
                                         event.preventDefault();
                                     });
@@ -445,6 +458,15 @@
                     confirmPasswordValidation.text("Passwords do not match").removeClass("text-success").addClass("text-danger");
                 }
             });
+            $('#mobile').keyup(function () {
+                var oldvalue = $(this).val();
+                var field = this;
+                setTimeout(function () {
+                    if (field.value.indexOf('44') !== 0) {
+                        $(field).val("44" + oldvalue);
+                    }
+                }, 1);
+            });
         });
 
 
@@ -499,6 +521,7 @@
 
             let postalCode = $('#postalCode').val();
             let address = $('#address').val();
+            let city = $('#city').val();
             let address2 = $('#address2').val();
             let idIssueDate = $('#idIssueDate').val();
             let idExpiryDate = $('#idExpiryDate').val();
@@ -519,7 +542,7 @@
                 mobile: mobile,
                 telNo: telNo,
                 occupation: occupation,
-
+                city: city,
                 address: address,
                 address2: address2,
                 idIssueDate: idIssueDate,
@@ -555,6 +578,7 @@
 
                         }
                         // window.location.replace("/account/index");
+                       // ShowAlertMessage(response.errorCode, response.msg, "/Account/VerifyOTP");
                         ShowAlertMessage(response.errorCode, response.msg, "/account/index");
                     },
 

CustomerOnlineV2/CustomerOnlineV2/Views/ReceiverInformation/Receiver.cshtml

@@ -392,19 +392,20 @@
         });
 
 
-        function PopulateAgentDDL(id, flag, pCountryid, parm, countryId, showSelectOption, selectedVal) {
+        function PopulateAgentDDL(id, flag, Country, pCountryid, value, countryId, showSelectOption, selectedVal) {
             debugger;
             let Data = {
                 Flag: flag,
+                Country:Country,
                 pCountry: pCountryid,
-                Parm: parm,
+                Value: value,
                 CountryId: countryId
             };
 
             $.ajax(
                 {
                     type: 'POST',
-                    url: '/ReceiverInformation/GetDDLList',
+                    url: '/ReceiverInformation/GetDDAgentLList',
                     data: Data,
                     headers: {
                         "RequestVerificationToken":
@@ -431,7 +432,7 @@
             let lastName1 = $('#lastName1').val();
             let Relationship = $('#Relationship').val();
             let Address = $('#Address').val();
-            let State = $('#State').val();
+            let City = $('#City').val();
             let Mobile = $('#Mobile').val();
             let Email = $('#Email').val();
             let PaymentMode = $('#paymentMode').val();
@@ -452,7 +453,7 @@
                 lastName1: lastName1,
                 Relationship: Relationship,
                 Address: Address,
-                State: State,
+                City: City,
                 Mobile: Mobile,
                 Email: Email,
                 zipCode: zipCode,
@@ -596,10 +597,10 @@
                         $('#lastName1').val(result.lastName1);
                         $('#Relationship option[value="' + result.relationship + '"]').attr('selected', 'selected');
                         $('#Address').val(result.address);
-                        $('#State').val(result.state);
+                        $('#City').val(result.city);
                         $('#Mobile').val(mobile);
                         $('#Email').val(result.email);
-                        $('#zipCode').val(result.zipCode);
+                        //$('#zipCode').val(result.city);
                         $('#idNumber').val(result.idNumber);
                         $('#createdDate').val(result.createdDate);
                         $('#idExpairyDate').val(result.idExpairyDate);
@@ -627,7 +628,7 @@
                 lastName1: $('#lastName1').val(),
                 relationship: $('#Relationship').val(),
                 address: $('#Address').val(),
-                state: $('#State').val(),
+                city: $('#City').val(),
                 mobile: $('#Mobile').val(),
                 email: $('#Email').val(),
                 zipCode: $('#zipCode').val(),
@@ -652,7 +653,7 @@
                 lastName1: $('#lastName1').val(),
                 Relationship: $('#Relationship').val(),
                 Address: $('#Address').val(),
-                State: $('#State').val(),
+                City: $('#City').val(),
                 Mobile: $('#Mobile').val(),
                 Email: $('#Email').val(),
                 zipCode: $('#zipCode').val(),

CustomerOnlineV2/CustomerOnlineV2/Views/Transaction/Success.cshtml

@@ -48,7 +48,7 @@
                                      <tr>
                                          <td>
                                             Sort Code: &nbsp;
-                                            <span>04-6-93</span>
+                                            <span>04-08-42</span>
                                             <br>
                                         </td>
                                         
@@ -56,7 +56,7 @@
                                       <tr>
                                          <td>
                                            Account Number: &nbsp;
-                                            <span>00000151</span>
+                                            <span>00000042</span>
                                             <br>
                                         </td>
                                         
@@ -78,8 +78,16 @@
                                         
                                     </tr>
                                 </table>
+                                <p>
+                                    Payment reference should be your name used during registration or unique Member Id.
+                                    <br />
+                                    Should you require any assistance , IME London Team will be happy to help.
+                                    <br />
+                                    You can keep track of your transfer from Home.
+                                </p>
                             </div>
-                            <div class="d-grid"><a href="/Transaction/SendMoney"><button class="btn btn-primary">Send Money Again</button></a></div>
+                            <h3 style="text-align:right">  <a href="/Transaction/SendMoney"><button class="btn-primary" ><i class="fa fa-save" style="color:white"> Send Again</i></button></a></h3>
+                            <h3 style="text-align:right"><a href="/Home"><button class="btn-primary"><i class="fa fa-home" style="color:white"></i> Home</button></a></h3>
                            
                         </div>
                     </div>