From b4e3f279892382424765ef92535c97616aa97505 Mon Sep 17 00:00:00 2001
From: shakun <shakun.shrestha@gmeremit.com.np>
Date: Sat, 7 Oct 2023 09:11:46 +0545
Subject: [PATCH] Merge branch 'feature/19315_Customer-Registration-new' into
 feature/19315_Customer-Registration

# Conflicts:
#	CustomerOnlineV2/CustomerOnlineV2.Business/Business/HomeBusiness/HomeBusiness.cs
#	CustomerOnlineV2/CustomerOnlineV2.Common/Models/HomeModel/HomeModel.cs
#	CustomerOnlineV2/CustomerOnlineV2.Repository/Repository/HomeRepository/HomeRepository.cs
#	CustomerOnlineV2/CustomerOnlineV2/Controllers/HomeController.cs
#	CustomerOnlineV2/CustomerOnlineV2/Views/Customer/CustomerRegistration.cshtml
---
 .../RegisterBusiness/IRegisterBusiness.cs     |   5 +-
 .../RegisterBusiness/RegisterBusiness.cs      |   5 +-
 .../Models/AccountModel/AccountModel.cs       |   1 +
 .../RegisterModel/UserRegisterResponse.cs     |   1 +
 .../RegisterRepository/IRegisterRepository.cs |   5 +-
 .../RegisterRepository/RegisterRepository.cs  |  19 +-
 .../Controllers/CustomerController.cs         |  12 +-
 .../Controllers/TransactionController.cs      |   3 +-
 .../Customer/CustomerRegistration.cshtml      | 278 +++++++++---------
 .../Views/Shared/_Layout.cshtml               |   2 +-
 .../Views/Transaction/Payment.cshtml          |  32 +-
 .../Views/Transaction/SendMoney.cshtml        |   2 +-
 12 files changed, 202 insertions(+), 163 deletions(-)

diff --git a/CustomerOnlineV2/CustomerOnlineV2.Business/Business/RegisterBusiness/IRegisterBusiness.cs b/CustomerOnlineV2/CustomerOnlineV2.Business/Business/RegisterBusiness/IRegisterBusiness.cs
index 224dc40..6a02474 100644
--- a/CustomerOnlineV2/CustomerOnlineV2.Business/Business/RegisterBusiness/IRegisterBusiness.cs
+++ b/CustomerOnlineV2/CustomerOnlineV2.Business/Business/RegisterBusiness/IRegisterBusiness.cs
@@ -1,4 +1,5 @@
-using CustomerOnlineV2.Common.Models.RegisterModel;
+using CustomerOnlineV2.Common.Models;
+using CustomerOnlineV2.Common.Models.RegisterModel;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -9,7 +10,7 @@ namespace CustomerOnlineV2.Business.Business.RegisterBusiness
 {
     public interface IRegisterBusiness
     {
-        Task<OnlineCustomerRegisterModel> AddCustomers(OnlineCustomerRegisterModel register);
+        Task<CommonResponse> AddCustomers(OnlineCustomerRegisterModel register);
         Task<AddressListResponse> GetAddressList(AddressRequest addressRequest);
     }
 }
diff --git a/CustomerOnlineV2/CustomerOnlineV2.Business/Business/RegisterBusiness/RegisterBusiness.cs b/CustomerOnlineV2/CustomerOnlineV2.Business/Business/RegisterBusiness/RegisterBusiness.cs
index 9a9ae7c..e194175 100644
--- a/CustomerOnlineV2/CustomerOnlineV2.Business/Business/RegisterBusiness/RegisterBusiness.cs
+++ b/CustomerOnlineV2/CustomerOnlineV2.Business/Business/RegisterBusiness/RegisterBusiness.cs
@@ -1,4 +1,5 @@
 using CustomerOnlineV2.Api.API.TPApi;
+using CustomerOnlineV2.Common.Models;
 using CustomerOnlineV2.Common.Models.RegisterModel;
 using CustomerOnlineV2.Repository.Repository.RegisterRepository;
 using Microsoft.Extensions.Logging;
@@ -26,9 +27,9 @@ namespace CustomerOnlineV2.Business.Business.RegisterBusiness
             _registerRepository = registerRepository;
 
         }
-        public async Task<OnlineCustomerRegisterModel> AddCustomers(OnlineCustomerRegisterModel register)
+        public async Task<CommonResponse> AddCustomers(OnlineCustomerRegisterModel register)
         {
-            var model1 = await _registerRepository.GetRegisterDetails(register);
+            var model1 = await _registerRepository.AddRegisterDetails(register);
             return model1;
         }
 
diff --git a/CustomerOnlineV2/CustomerOnlineV2.Common/Models/AccountModel/AccountModel.cs b/CustomerOnlineV2/CustomerOnlineV2.Common/Models/AccountModel/AccountModel.cs
index f92ae68..ddbd3fd 100644
--- a/CustomerOnlineV2/CustomerOnlineV2.Common/Models/AccountModel/AccountModel.cs
+++ b/CustomerOnlineV2/CustomerOnlineV2.Common/Models/AccountModel/AccountModel.cs
@@ -18,6 +18,7 @@ namespace CustomerOnlineV2.Common.Models.AccountModel
 
     public class ForceChangePasswordModel
     {
+        public string? OldPassword { get; set; }
         public string? NewPassword { get; set; }
         public string? ConfirmNewPassword { get; set; }
         public string? IpAddress { get; set; }
diff --git a/CustomerOnlineV2/CustomerOnlineV2.Common/Models/RegisterModel/UserRegisterResponse.cs b/CustomerOnlineV2/CustomerOnlineV2.Common/Models/RegisterModel/UserRegisterResponse.cs
index 41b341f..8791d6d 100644
--- a/CustomerOnlineV2/CustomerOnlineV2.Common/Models/RegisterModel/UserRegisterResponse.cs
+++ b/CustomerOnlineV2/CustomerOnlineV2.Common/Models/RegisterModel/UserRegisterResponse.cs
@@ -112,5 +112,6 @@ namespace CustomerOnlineV2.Common.Models.RegisterModel
         public string? isActive { get; set; }
         public string? islocked { get; set; }
         public string? sessionId { get; set; }
+        public string? AboutUs { get; set; }
     }                
     }
diff --git a/CustomerOnlineV2/CustomerOnlineV2.Repository/Repository/RegisterRepository/IRegisterRepository.cs b/CustomerOnlineV2/CustomerOnlineV2.Repository/Repository/RegisterRepository/IRegisterRepository.cs
index d8d4c93..37b83da 100644
--- a/CustomerOnlineV2/CustomerOnlineV2.Repository/Repository/RegisterRepository/IRegisterRepository.cs
+++ b/CustomerOnlineV2/CustomerOnlineV2.Repository/Repository/RegisterRepository/IRegisterRepository.cs
@@ -1,4 +1,5 @@
-using CustomerOnlineV2.Common.Models.RegisterModel;
+using CustomerOnlineV2.Common.Models;
+using CustomerOnlineV2.Common.Models.RegisterModel;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -9,6 +10,6 @@ namespace CustomerOnlineV2.Repository.Repository.RegisterRepository
 {
     public interface IRegisterRepository
     {
-        Task<OnlineCustomerRegisterModel> GetRegisterDetails(OnlineCustomerRegisterModel register);
+        Task<CommonResponse> AddRegisterDetails(OnlineCustomerRegisterModel register);
     }
 }
diff --git a/CustomerOnlineV2/CustomerOnlineV2.Repository/Repository/RegisterRepository/RegisterRepository.cs b/CustomerOnlineV2/CustomerOnlineV2.Repository/Repository/RegisterRepository/RegisterRepository.cs
index 081ab62..87f0217 100644
--- a/CustomerOnlineV2/CustomerOnlineV2.Repository/Repository/RegisterRepository/RegisterRepository.cs
+++ b/CustomerOnlineV2/CustomerOnlineV2.Repository/Repository/RegisterRepository/RegisterRepository.cs
@@ -19,7 +19,7 @@ namespace CustomerOnlineV2.Repository.Repository.RegisterRepository
             _connHelper = connHelper;
         }
 
-        public async Task<OnlineCustomerRegisterModel> GetRegisterDetails(OnlineCustomerRegisterModel model)
+        public async Task<CommonResponse> AddRegisterDetails(OnlineCustomerRegisterModel model)
         {
             try
             {
@@ -35,7 +35,7 @@ namespace CustomerOnlineV2.Repository.Repository.RegisterRepository
                 sql += ",@middleName =" + _connHelper.FilterString(model.middleName);
                 sql += ",@lastName1 =" + _connHelper.FilterString(model.lastName1);
                 sql += ",@lastName2 =" + _connHelper.FilterString(model.lastName2);
-                sql += ",@custAdd1 =" + _connHelper.FilterString(model.address);
+                //sql += ",@city =" + _connHelper.FilterString(model.city);
                 sql += ",@sourceOfFound =" + _connHelper.FilterString(model.sourceOfFound);
                 sql += ",@custMobile =" + _connHelper.FilterString(model.mobile);
                 sql += ",@custGender =" + _connHelper.FilterString(model.gender);
@@ -47,8 +47,9 @@ namespace CustomerOnlineV2.Repository.Repository.RegisterRepository
                 sql += ",@custDOB =" + _connHelper.FilterString(model.dob);
                 sql += ",@occupation =" + _connHelper.FilterString(model.occupation);
                 sql += ",@custNativecountry =" + _connHelper.FilterString(model.nativeCountry);
-                //sql += ",@CreatedFrom  =" + _connHelper.FilterString("O");
-
+                sql += ",@zipCode =" + _connHelper.FilterString(model.postalCode);
+                sql += ",@custAdd1 =" + _connHelper.FilterString(model.address);
+                sql += ",@custAdd2 =" + _connHelper.FilterString(model.address2);
 
 
 
@@ -63,14 +64,16 @@ namespace CustomerOnlineV2.Repository.Repository.RegisterRepository
                     model.ResponseCode = ResponseHelper.FAILED;
                     model.ResponseMessage = "DB Null Error!";
 
-                    
                 }
-                else
+                else if (dt.Rows[0]["ErrorCode"].Equals("0"))
                 {
                     model.ResponseCode = ResponseHelper.SUCCESS;
                     model.ResponseMessage = ResponseMessageHelper.SUCCESS;
-
-              
+                }
+                else
+                {
+                    model.ResponseCode = ResponseHelper.FAILED;
+                    model.ResponseMessage = dt.Rows[0]["Msg"].ToString();
                 }
             }
             catch (Exception ex)
diff --git a/CustomerOnlineV2/CustomerOnlineV2/Controllers/CustomerController.cs b/CustomerOnlineV2/CustomerOnlineV2/Controllers/CustomerController.cs
index 5c8a02a..7d4a421 100644
--- a/CustomerOnlineV2/CustomerOnlineV2/Controllers/CustomerController.cs
+++ b/CustomerOnlineV2/CustomerOnlineV2/Controllers/CustomerController.cs
@@ -6,11 +6,8 @@ using CustomerOnlineV2.Common.Models.ReceiverModel;
 using CustomerOnlineV2.Common.Models.RegisterModel;
 using CustomerOnlineV2.Common.Models.TransactionModel;
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.DotNet.Scaffolding.Shared.Messaging;
-using Microsoft.Win32;
 using Newtonsoft.Json;
 using Serilog.Context;
-using System.Reflection;
 
 namespace CustomerOnlineV2.Controllers
 {
@@ -39,20 +36,17 @@ namespace CustomerOnlineV2.Controllers
         [HttpPost]
         [Authorization("AddCustomer")]
         [ValidateAntiForgeryToken]
-        public async Task<IActionResult> AddCustomer(OnlineCustomerRegisterModel register)
+        public async Task<CommonResponse> AddCustomer(OnlineCustomerRegisterModel register)
         {
 
-            if (!ModelState.IsValid)
-            {
+
                 
                 var register1 = await _registerBusiness.AddCustomers(register);
-                return View("CustomerRegistation", register1);
-            }
+            return register1;
 
            
             //return register1;
             //return register;
-            return RedirectToPage("Index");
             //return RedirectToAction("Success");
         }
 
diff --git a/CustomerOnlineV2/CustomerOnlineV2/Controllers/TransactionController.cs b/CustomerOnlineV2/CustomerOnlineV2/Controllers/TransactionController.cs
index bec7b63..6b7daa5 100644
--- a/CustomerOnlineV2/CustomerOnlineV2/Controllers/TransactionController.cs
+++ b/CustomerOnlineV2/CustomerOnlineV2/Controllers/TransactionController.cs
@@ -93,6 +93,7 @@ namespace CustomerOnlineV2.Controllers
             return View(_response);
         }
 
+        [Authorization("Payment")]
        // [Authorization("SendMoney")]
         public async Task<IActionResult> Payment([FromQuery] string id)
         {
@@ -108,7 +109,7 @@ namespace CustomerOnlineV2.Controllers
                 _request.sitereference = "test_subhidauk71992";
                 _request.stprofile = "default";
                 _request.currencyiso3a = "GBP";
-                _request.orderreference = Guid.NewGuid().ToString(); 
+                _request.orderreference = _tranresponse.ControlNo;
                 _request.mainamount = _tranresponse.TotalToPay;
                 _request.billingfirstname = _tranresponse.Firstname;
                 _request.billinglastname = _tranresponse.Lastname1;
diff --git a/CustomerOnlineV2/CustomerOnlineV2/Views/Customer/CustomerRegistration.cshtml b/CustomerOnlineV2/CustomerOnlineV2/Views/Customer/CustomerRegistration.cshtml
index 9c86680..f8fef41 100644
--- a/CustomerOnlineV2/CustomerOnlineV2/Views/Customer/CustomerRegistration.cshtml
+++ b/CustomerOnlineV2/CustomerOnlineV2/Views/Customer/CustomerRegistration.cshtml
@@ -16,6 +16,7 @@
     <link href="~/vendor/owl.carousel/owl.carousel.min.css" rel="stylesheet" />
     <link href="~/css/styles-login.css" rel="stylesheet" />
     <link href="~/vendor/toast-alert/izitoast.min.css" rel="stylesheet" />
+    <script src="~/js/custom.js"></script>
     <link rel="icon" type="image/png" href="favicon.png" />
     <style>
         input::-webkit-outer-spin-button,
@@ -37,7 +38,7 @@
                         <!-- Logo
                         ============================= -->
                         <div class="logo me-3">
-                            <a class="d-flex" href="index.html" title="Money - HTML Template">
+                            <a class="d-flex" href="home/index" title="Money - HTML Template">
                                 <img src="images/imelondon.svg" height="35" alt="IME London - Logo" />
                             </a>
                         </div>
@@ -52,8 +53,8 @@
                             <div id="header-nav" class="collapse navbar-collapse">
                                 <ul class="navbar-nav me-auto">
 
-                                    <li><a href="faq.html">Help</a></li>
-                                    <li><a href="how-it-works.html">How It Works</a></li>
+                                    <li><a href="https://imelondon.co.uk/faqs" target="_blank">Help</a></li>
+                                    <li><a href="https://imelondon.co.uk/how-it-works" target="_blank">How It Works</a></li>
                                     <li><a href="#">Register Now</a></li>
                                 </ul>
                             </div>
@@ -97,7 +98,7 @@
                                                         </div>
                                                     </div>
                                                 </div>
-                                        
+
 
                                                 <div class="col-md-4">
                                                     <div class="mb-4">
@@ -107,9 +108,9 @@
                                                             <input type="password" class="form-control" asp-for="Password">
                                                             <span id="password-validation" class="text-danger"></span>
                                                             <label asp-for="Password"></label>
-@* 
-                                                             <input type="password" class="form-control" asp:RegularExpressionValidator asp-for="Password" runat="server" ErrorMessage="Invalid Password Charecters"
-                                                                   ValidationExpression="^(?=.*\d)(?=.*[a-z])(?=.*[A-Z]).{8}$" ControlToValidate="txtPassword" ForeColor="Red">
+                                                            @*
+                                                            <input type="password" class="form-control" asp:RegularExpressionValidator asp-for="Password" runat="server" ErrorMessage="Invalid Password Charecters"
+                                                            ValidationExpression="^(?=.*\d)(?=.*[a-z])(?=.*[A-Z]).{8}$" ControlToValidate="txtPassword" ForeColor="Red">
                                                             <span asp-validation-for="@Model.Password" class="error"></span> *@
                                                         </div>
                                                     </div>
@@ -118,14 +119,14 @@
                                                     <div class="mb-4">
                                                         <div class="form-floating">
 
-                                                            <input type="password" class="form-control" asp-for="ConfirmPassword" >
+                                                            <input type="password" class="form-control" asp-for="ConfirmPassword">
                                                             <span id="confirm-password-validation" class="text-danger"></span>
                                                             <label asp-for="ConfirmPassword"></label>
 
-                                                         @*    <input type="password" class="form-control" asp:RegularExpressionValidator asp-for="ConfirmPassword" runat="server" ErrorMessage="Invalid Password Charecters"
-                                                                   ValidationExpression="^(?=.*\d)(?=.*[a-z])(?=.*[A-Z]).{8}$" ControlToValidate="txtPassword" ForeColor="Red">
-                                                            <span asp-validation-for="@Model.ConfirmPassword" class="error"></span> 
-                                                             <label for="ConfirmPassword">Re-Type Password</label>  *@
+                                                            @*    <input type="password" class="form-control" asp:RegularExpressionValidator asp-for="ConfirmPassword" runat="server" ErrorMessage="Invalid Password Charecters"
+                                                            ValidationExpression="^(?=.*\d)(?=.*[a-z])(?=.*[A-Z]).{8}$" ControlToValidate="txtPassword" ForeColor="Red">
+                                                            <span asp-validation-for="@Model.ConfirmPassword" class="error"></span>
+                                                            <label for="ConfirmPassword">Re-Type Password</label>  *@
                                                         </div>
                                                     </div>
                                                 </div>
@@ -141,7 +142,7 @@
                                                 <div class="col-md-4">
                                                     <div class="mb-4">
                                                         <div class="form-floating mb-3">
-                                                            <input type="text" asp-for = "firstName" class="form-control" required>
+                                                            <input type="text" asp-for="firstName" class="form-control" required>
                                                             <label for="floatingInput">First Name</label>
                                                         </div>
                                                     </div>
@@ -162,25 +163,25 @@
                                                         </div>
                                                     </div>
                                                 </div>
-                                                <div class="col-md-4">
-                                                    <div class="mb-4">
-                                                        <div class="form-floating">
-                                                            <input type="password" class="form-control"  asp-for="Password">
-                                                            <span id="confirm-password-validation" class="text-danger"></span>
-                                                            <label for="floatingPassword">Password</label>
-                                                        </div>
-                                                    </div>
+                                                @*  <div class="col-md-4">
+                                                <div class="mb-4">
+                                                <div class="form-floating">
+                                                <input type="password" class="form-control"  asp-for="Password">
+                                                <span id="confirm-password-validation" class="text-danger"></span>
+                                                <label for="floatingPassword">Password</label>
+                                                </div>
                                                 </div>
+                                                </div> *@
                                                 <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">
-                                                             @*    <option selected></option>
+                                                                @*    <option selected></option>
                                                                 <option value="1">Nepal</option>
                                                                 <option value="2">India</option>
                                                                 <option value="3">Pakistan</option> *@
                                                             </select>
-                                                          @*   select class="form-select form-control" asp-for="Country" asp-items="@CustomerOnlineV2.Helper.HelperClass.GetDropdownData("allCountrylist", true)" class="form-select" required onkeydown="PaymentMethodChangeEvent"> *@
+                                                            @*   select class="form-select form-control" asp-for="Country" asp-items="@CustomerOnlineV2.Helper.HelperClass.GetDropdownData("allCountrylist", true)" class="form-select" required onkeydown="PaymentMethodChangeEvent"> *@
                                                             <label for="Nationality">Nationality</label>
                                                         </div>
                                                     </div>
@@ -189,7 +190,7 @@
                                                     <div class="mb-4">
                                                         <div class="form-floating">
                                                             <select class="form-select" asp-for="idType" aria-label="Floating label select example" asp-items="@CustomerOnlineV2.Helper.HelperClass.GetDropdownData("getIdType", true)" required>
-                                                               @*  <option value="" selected></option>
+                                                                @*  <option value="" selected></option>
                                                                 <option value="Bank Statement">Bank Statement</option>
                                                                 <option value="DRIVER LICENSE">Driver License</option>
                                                                 <option value="EEA national Id Card">EEA national Id Card</option>
@@ -206,7 +207,7 @@
                                                 <div class="col-md-4">
                                                     <div class="mb-4">
                                                         <div class="form-floating">
-                                                            <input type="text" class="form-control" asp-for= "idNumber" placeholder="Password">
+                                                            <input type="text" class="form-control" asp-for="idNumber" placeholder="Password">
                                                             <label for="IdNUmber">Id Number</label>
                                                         </div>
                                                     </div>
@@ -215,11 +216,11 @@
                                                     <div class="mb-0">
                                                         <div class="input-group flex-nowrap">
                                                             <div class="form-floating flex-grow-1">
-                                                                <input type="date"  asp-for = "dob" class="datepicker-here form-control date-of-birth" placeholder="dd/mm/yyyy" aria-describedby="basic-addon2" required />
+                                                                <input type="date" asp-for="dob" class="datepicker-here form-control date-of-birth" placeholder="dd/mm/yyyy" aria-describedby="basic-addon2" required />
                                                                 <label for="DateOfBirth" class="form-label">Date Of Birth</label>
                                                             </div>
-                                                          @*   <span class="input-group-text px-4">
-                                                                <i class="fa fa-calendar"></i>
+                                                            @*   <span class="input-group-text px-4">
+                                                            <i class="fa fa-calendar"></i>
                                                             </span> *@
                                                         </div>
                                                     </div>
@@ -228,7 +229,7 @@
                                                     <div class="mb-4">
                                                         <div class="form-floating">
                                                             <select class="form-select" asp-for="nativeCountry" asp-items="@CustomerOnlineV2.Helper.HelperClass.GetDropdownData("allCountrylist", true)" aria-label="Floating label select example">
-                                                             @*    <option selected></option>
+                                                                @*    <option selected></option>
                                                                 <option value="1">Nepal</option>
                                                                 <option value="2">India</option>
                                                                 <option value="3">Pakistan</option> *@
@@ -269,8 +270,8 @@
                                                                 <input type="date" asp-for="idIssueDate" class="datepicker-here form-control issue-date" placeholder="dd/mm/yyyy" aria-describedby="basic-addon2" />
                                                                 <label for="IdIssue" class="form-label">Id Issue Date</label>
                                                             </div>
-                                                          @*   <span class="input-group-text px-4">
-                                                                <i class="fa fa-calendar"></i>
+                                                            @*   <span class="input-group-text px-4">
+                                                            <i class="fa fa-calendar"></i>
                                                             </span> *@
                                                         </div>
                                                     </div>
@@ -282,8 +283,8 @@
                                                                 <input type="date" asp-for="idExpiryDate" class="datepicker-here form-control expire-date" placeholder="dd/mm/yyyy" aria-describedby="basic-addon2" />
                                                                 <label for="IdExpire" class="form-label">Id Expire Date</label>
                                                             </div>
-                                                           @*  <span class="input-group-text px-4">
-                                                                <i class="fa fa-calendar"></i>
+                                                            @*  <span class="input-group-text px-4">
+                                                            <i class="fa fa-calendar"></i>
                                                             </span> *@
                                                         </div>
                                                     </div>
@@ -301,7 +302,7 @@
                                                     <div class="mb-4">
                                                         <div class="form-floating">
                                                             <select class="form-select" asp-for="nativeCountry" asp-items="@CustomerOnlineV2.Helper.HelperClass.GetDropdownData("allCountrylist", true)" aria-label="Floating label select example" required>
-                                                               @*  <option selected></option>
+                                                                @*  <option selected></option>
                                                                 <option value="1">Nepal</option>
                                                                 <option value="2">India</option>
                                                                 <option value="3">Pakistan</option> *@
@@ -310,38 +311,38 @@
                                                         </div>
                                                     </div>
                                                 </div>
-                                                <div class="col-md-4">
-                                                    <div class="mb-4">
-                                                        <div class="form-floating">
-                                                            <input type="text" class="form-control" id="CountryAddress1" placeholder="Address 1" asp-for="address">
-                                                            <label for="CountryAddress1">Address 1</label>
-                                                        </div>
-                                                    </div>
+                                                @*           <div class="col-md-4">
+                                                <div class="mb-4">
+                                                <div class="form-floating">
+                                                <input type="text" class="form-control" id="CountryAddress1" placeholder="Address 1" asp-for="address">
+                                                <label for="CountryAddress1">Address 1</label>
+                                                </div>
+                                                </div>
                                                 </div>
                                                 <div class="col-md-4">
-                                                    <div class="mb-4">
-                                                        <div class="form-floating">
-                                                            <input type="text" class="form-control" id="CountryAddress2" placeholder="Address 2" asp-for="address2">
-                                                            <label for="CountryAddress2">Address 2</label>
-                                                        </div>
-                                                    </div>
+                                                <div class="mb-4">
+                                                <div class="form-floating">
+                                                <input type="text" class="form-control" id="CountryAddress2" placeholder="Address 2" asp-for="address2">
+                                                <label for="CountryAddress2">Address 2</label>
                                                 </div>
+                                                </div>
+                                                </div> *@
                                                 <div class="col-md-4">
                                                     <div class="mb-4">
                                                         <div class="form-floating">
                                                             <div class="input-group flex-nowrap">
                                                                 <div class="form-floating flex-grow-1">
-                                                                    <input type="text" class="form-control" id="PostalZipCode" placeholder="Postal/Zip Code" asp-for="postalCode">
-                                                                    <label for="PostalZipCode">Postal/Zip Code</label>
+                                                                    <input type="text" class="form-control" placeholder="Postal/Zip Code" asp-for="postalCode">
+                                                                    <label for="postalCode">Postal/Zip Code</label>
                                                                 </div>
                                                                 <span class="input-group-text px-2">
-                                                                <button class="btn-choose bg-transparent text-white border-0" id="btnSearch" type="button">Lookup</button>
+                                                                    <button class="btn-choose bg-transparent text-white border-0" id="btnSearch" type="button">Lookup</button>
                                                                 </span>
                                                             </div>
                                                         </div>
                                                     </div>
                                                 </div>
-                                                <div id="apiDataPopup" class="modal fade" role="dialog">
+                                                <div id="apiDataPopup" class="modal" role="dialog">
                                                     <div class="modal-dialog">
                                                         <div class="modal-content">
                                                             <div class="modal-header">
@@ -362,7 +363,7 @@
                                                                 </table>
                                                             </div>
                                                             <div class="modal-footer">
-                                                                <button type="button" class="btn btn-primary" data-dismiss="modal">Close</button>
+                                                                <button type="button" class="btn btn-primary" data-bs-dismiss="modal">Close</button>
                                                             </div>
                                                         </div>
                                                     </div>
@@ -370,16 +371,16 @@
                                                 <div class="col-md-4">
                                                     <div class="mb-4">
                                                         <div class="form-floating">
-                                                            <input type="text" class="form-control" id="Address1" placeholder="Address 1">
-                                                            <label for="Address1">Address 1</label>
+                                                            <input type="text" class="form-control" placeholder="Address 1" asp-for="address">
+                                                            <label for="address">Address 1</label>
                                                         </div>
                                                     </div>
                                                 </div>
                                                 <div class="col-md-4">
                                                     <div class="mb-4">
                                                         <div class="form-floating">
-                                                            <input type="text" class="form-control" id="Address2" placeholder="Address 2">
-                                                            <label for="Address2">Address 2</label>
+                                                            <input type="text" class="form-control" placeholder="Address 2" asp-for="address2">
+                                                            <label for="address2">Address 2</label>
                                                         </div>
                                                     </div>
                                                 </div>
@@ -411,8 +412,8 @@
                                                 <div class="col-md-4">
                                                     <div class="mb-4">
                                                         <div class="form-floating">
-                                                            <select class="form-select" asp-for="occupation"  asp-items="@CustomerOnlineV2.Helper.HelperClass.GetDropdownData("getOccuptttion", true)">
-                                                               @*  <option selected></option>
+                                                            <select class="form-select" asp-for="occupation" asp-items="@CustomerOnlineV2.Helper.HelperClass.GetDropdownData("getOccuptttion", true)">
+                                                                @*  <option selected></option>
                                                                 <option value="Retired">Retired</option>
                                                                 <option value="Security Officer">Security Officer</option>
                                                                 <option value="Unemployed">Unemployed</option>
@@ -426,7 +427,7 @@
                                                     <div class="mb-4">
                                                         <div class="form-floating">
                                                             <select class="form-select" asp-for="sourceOfFound" asp-items="@CustomerOnlineV2.Helper.HelperClass.GetDropdownData("getSourceOfFound", true)">
-                                                             @*    <option selected></option>
+                                                                @*    <option selected></option>
                                                                 <option value="Business Income">Business Income</option>
                                                                 <option value="Investment">Investment</option>
                                                                 <option value="Loan">Loan</option>
@@ -442,7 +443,7 @@
                                                 <div class="col-md-8">
                                                     <div class="mb-4">
                                                         <div class="form-floating">
-                                                            <select class="form-select" id="AboutUS" >
+                                                            <select class="form-select" id="AboutUS">
                                                                 <option selected></option>
                                                                 <option value="Facebook/Social Media">Facebook/Social Media</option>
                                                                 <option value="Family or Friend">Family or Friend</option>
@@ -463,7 +464,7 @@
                                             <div class="mb-4">
                                                 <div class="form-check d-flex align-items-center">
                                                     <input class="form-check-input me-2" type="checkbox" id="Terms">
-                                                    <label class="form-check-label" for="Terms">I agree to IME London <a href="#" target="_blank">Terms &amp; Conditions</a> and <a href="#" target="_blank">Privacy Policy</a>.</label>
+                                                    <label class="form-check-label" for="Terms">I agree to IME London <a href="https://imelondon.co.uk/terms-and-conditions" target="_blank">Terms &amp; Conditions</a> and <a href="https://imelondon.co.uk/privacy-policy" target="_blank">Privacy Policy</a>.</label>
                                                 </div>
                                             </div>
                                         </div>
@@ -472,7 +473,8 @@
 
                                                 @* <button class="btn btn-lg btn-primary" type="submit">Register <i class="fa fa-window-maximize px-2" aria-hidden="true"></i></button> *@
                                                 <button type="submit" id="BtnRegister" class="btn btn-lg btn-primary" style="width: 250px;">
-                                                    <span class="RegisterText">Register</span>&nbsp;<div class="spinner-border text-success loading" role="status" style="display:none;"></div> </button>
+                                                    <span class="RegisterText">Register</span>&nbsp;<div class="spinner-border text-success loading" role="status" style="display:none;"></div>
+                                                </button>
                                             </div>
                                         </div>
                                     </div>
@@ -480,7 +482,7 @@
 
 
 
-                                <div class="mt-3"> Already registered ? <a class="" href="login-new.html">Login Now</a></div>
+                                <div class="mt-3"> Already registered ? <a class="" href="account/index">Login Now</a></div>
 
                             </div>
                         </div>
@@ -489,8 +491,8 @@
                 </div>
             </section>
             <!-- Who we are end -->
-        <input type="hidden" id="hdnAdditionalAddress" name="hdnAdditionalAddress" value="initial value" />
-        <input type="hidden" id="cityHidden" name="cityHidden" value="initial value" />
+            <input type="hidden" id="hdnAdditionalAddress" name="hdnAdditionalAddress" value="initial value" />
+            <input type="hidden" id="cityHidden" name="cityHidden" value="initial value" />
 
 
         </div>
@@ -514,7 +516,7 @@
             </div>
         </footer>
     </div>
-        <!-- Content end -->
+    <!-- Content end -->
 
 
     <a id="back-to-top" data-bs-toggle="tooltip" title="Back to Top" href="javascript:void(0)"><i class="fa fa-chevron-up"></i></a>
@@ -539,7 +541,7 @@
     <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="~/js/register-validation.js"></script>
+  @*   <script src="~/js/register-validation.js"></script> *@
 
     <script type="text/javascript">
 
@@ -567,12 +569,11 @@
         // });
 
 
-$(document).ready(function () {
+        $(document).ready(function () {
             debugger;
             $('#btnSearch').click(function (e) {
                 e.preventDefault();
-                e.preventDefault();
-                var postalCode = $('#PostalZipCode').val();
+                var postalCode = $('#postalCode').val();
 
                 if (!postalCode || postalCode == "" || postalCode == null) {
                     alert("Postal cannot be empty");
@@ -611,8 +612,8 @@ $(document).ready(function () {
                                         $('#hdnAdditionalAddress').val(additionalAddress);
                                         $('#cityHidden').val(city);
 
-                                        $('#Address1').val(additionalAddress);
-                                        $('#Address2').val(city);
+                                        $('#address').val(additionalAddress);
+                                        $('#address2').val(city);
                                         $('#apiDataPopup').modal('hide');
                                         event.preventDefault();
                                     });
@@ -631,40 +632,40 @@ $(document).ready(function () {
                     }
                 });
             });
-       
-    // Select the password and confirmPassword input fields
-    var passwordField = $("#Password");
-    var confirmPasswordField = $("#ConfirmPassword");
-
-    // Select the password and confirmPassword validation elements
-    var passwordValidation = $("#password-validation");
-    var confirmPasswordValidation = $("#confirm-password-validation");
-
-    // Password regex: Minimum 8 characters, at least one uppercase letter, one lowercase letter, and one number
-    var passwordRegex = /^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)[A-Za-z\d@('@')$#!%*?&]{8,}$/;
-
-    // Add event handlers to the password and confirmPassword fields
-    passwordField.on("keyup", function () {
-        var password = passwordField.val();
-
-        if (passwordRegex.test(password)) {
-            passwordValidation.text("Valid password").css("color", "green");
-        } else {
-            passwordValidation.text("Invalid password").css("color", "red");
-        }
-    });
 
-    confirmPasswordField.on("keyup", function () {
-        var password = passwordField.val();
-        var confirmPassword = confirmPasswordField.val();
+            // Select the password and confirmPassword input fields
+            var passwordField = $("#Password");
+            var confirmPasswordField = $("#ConfirmPassword");
 
-        if (password === confirmPassword) {
-            confirmPasswordValidation.text("Passwords match").css("color", "green");
-        } else {
-            confirmPasswordValidation.text("Passwords do not match").css("color", "red");
-        }
-    });
-});
+            // Select the password and confirmPassword validation elements
+            var passwordValidation = $("#password-validation");
+            var confirmPasswordValidation = $("#confirm-password-validation");
+
+            // Password regex: Minimum 8 characters, at least one uppercase letter, one lowercase letter, and one number
+            var passwordRegex = /^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)[A-Za-z\d@('@')$#!%*?&]{8,}$/;
+
+            // Add event handlers to the password and confirmPassword fields
+            passwordField.on("keyup", function () {
+                var password = passwordField.val();
+
+                if (passwordRegex.test(password)) {
+                    passwordValidation.text("Valid password").css("color", "green");
+                } else {
+                    passwordValidation.text("Password should contain at least one special character (*&%$), one uppercase, one lowercase and min of 8 characters").css("color", "red");
+                }
+            });
+
+            confirmPasswordField.on("keyup", function () {
+                var password = passwordField.val();
+                var confirmPassword = confirmPasswordField.val();
+
+                if (password === confirmPassword) {
+                    confirmPasswordValidation.text("Passwords match").css("color", "green");
+                } else {
+                    confirmPasswordValidation.text("Passwords do not match").css("color", "red");
+                }
+            });
+        });
 
 
         (function () {
@@ -699,54 +700,53 @@ $(document).ready(function () {
 
 
             let email = $('#email').val();
-            let country          = $('#country').val();
-            let firstName        = $('#firstName').val();
+            let country = $('#country').val();
+            let firstName = $('#firstName').val();
             let Password = $('#Password').val();
             let ConfirmPassword = $('#ConfirmPassword').val();
-            let middleName       = $('#middleName').val();
-            let lastName1        = $('#lastName1').val();
-            let idType           = $('#idType').val();
-            let idNumber         = $('#idNumber').val();
-            let dob              = $('#dob').val();
-            let nativeCountry    = $('#nativeCountry').val();
-            let gender           = $('#gender').val();
+            let middleName = $('#middleName').val();
+            let lastName1 = $('#lastName1').val();
+            let idType = $('#idType').val();
+            let idNumber = $('#idNumber').val();
+            let dob = $('#dob').val();
+            let nativeCountry = $('#nativeCountry').val();
+            let gender = $('#gender').val();
             let mobile = $('#mobile').val();
-            let telNo            = $('#telNo').val();
-            let occupation       = $('#occupation').val();
+            let telNo = $('#telNo').val();
+            let occupation = $('#occupation').val();
             let customerPassword = $('#customerPassword').val();
 
-           
+
+            let postalCode = $('#postalCode').val();
             let address = $('#address').val();
-             let idIssueDate = $('#idIssueDate').val();
+            let address2 = $('#address2').val();
+            let idIssueDate = $('#idIssueDate').val();
             let idExpiryDate = $('#idExpiryDate').val();
-           
+            let aboutus = $('#AboutUS').val();
 
             let Data = {
 
                 email: email,
-               country         : country ,      
-               firstName       : firstName ,    
-               middleName      : middleName,    
-               lastName1       : lastName1,     
-               idType          : idType ,       
-               idNumber        : idNumber ,     
-               dob             : dob,           
-               nativeCountry   : nativeCountry ,
-               gender          : gender  ,
+                country: country,
+                firstName: firstName,
+                middleName: middleName,
+                lastName1: lastName1,
+                idType: idType,
+                idNumber: idNumber,
+                dob: dob,
+                nativeCountry: nativeCountry,
+                gender: gender,
                 mobile: mobile,
-                telNo           : telNo,        
-               occupation      : occupation ,   
-                
+                telNo: telNo,
+                occupation: occupation,
                 address: address,
+                address2: address2,
                 idIssueDate: idIssueDate,
                 idExpiryDate: idExpiryDate,
                 Password: Password,
                 ConfirmPassword: ConfirmPassword,
-                customerPassword: customerPassword,
-            
-            
-
-
+                postalCode: postalCode,
+                AboutUs: aboutus
             };
 
             $.ajax(
@@ -762,6 +762,8 @@ $(document).ready(function () {
                     },
                     async: true,
                     success: function (response) {
+
+                        
                         EnableRegisterButton();
                         if (response.responseCode != 0) {
                             ShowAlertMessage(response.responseCode, response.responseMessage);
@@ -771,6 +773,10 @@ $(document).ready(function () {
 
                         }
 
+                     
+
+                         window.location.replace("/account/index");
+                        ShowAlertMessage(response.responseCode, response.responseMessage);
                         // clearFields();
 
                         // $('#Country').focus();
@@ -816,7 +822,7 @@ $(document).ready(function () {
         }
 
         function EnableRegisterButton() {
-            debugger;
+        
             $('.RegisterText').show();
             $('#BtnRegister').css('cursor', 'pointer');
             $('.loadingSend').hide();
diff --git a/CustomerOnlineV2/CustomerOnlineV2/Views/Shared/_Layout.cshtml b/CustomerOnlineV2/CustomerOnlineV2/Views/Shared/_Layout.cshtml
index 8a250f0..59973e1 100644
--- a/CustomerOnlineV2/CustomerOnlineV2/Views/Shared/_Layout.cshtml
+++ b/CustomerOnlineV2/CustomerOnlineV2/Views/Shared/_Layout.cshtml
@@ -154,7 +154,7 @@
                                         <i class="fas fa-edit"></i>
                                     </a>
                                     <div class="">
-                                        <a href="document-upload.html" class="px-1 text-3">Upload Documents</a>|<a href="profile.html" class="px-1 text-3">Edit Profile</a>
+                                        <a href="/CustomerDocument/CustomerDocument" class="px-1 text-3">Upload Documents</a>|<a href="profile.html" class="px-1 text-3">Edit Profile</a>
                                     </div>
                                 </p>
 
diff --git a/CustomerOnlineV2/CustomerOnlineV2/Views/Transaction/Payment.cshtml b/CustomerOnlineV2/CustomerOnlineV2/Views/Transaction/Payment.cshtml
index 804af44..1b11b99 100644
--- a/CustomerOnlineV2/CustomerOnlineV2/Views/Transaction/Payment.cshtml
+++ b/CustomerOnlineV2/CustomerOnlineV2/Views/Transaction/Payment.cshtml
@@ -4,10 +4,39 @@
 
 
 <head>
+    <style>
+        .loader {
+            position: fixed;
+            left: 0px;
+            top: 0px;
+            width: 100%;
+            height: 100%;
+            z-index: 9999;
+            background: url('/images/loading.gif') 50% 50% no-repeat rgb(249,249,249);
+           
+        }
+    </style>
+       <script src="~/lib/jquery/dist/jquery.min.js"></script>
+      <script>
+          $(document).ready(function () {
+              //Id of your button control either it is server  control or simple html control
 
+            $(".loader").fadeOut("slow");
+
+              $("[id*='btn_submit']").click();
+
+
+
+          });
+
+
+    </script>
+  
 </head>
 
 <body>
+    <div class="loader"></div>
+
     <form id="Customer-form" method="post" action="https://payments.securetrading.net/process/payments/choice">
         <input asp-for="sitereference" name="sitereference" type="hidden" />
         <input asp-for="stprofile" name="stprofile" value="default" type="hidden" />
@@ -43,7 +72,8 @@
         <input asp-for="sitesecurity" name="sitesecurity" type="hidden" />
 
         <input asp-for="merchantemail" name="merchantemail" value="shakun@japanremit.com" type="hidden" />
-        <input type="submit" id="btn_submit" />
+        @Html.AntiForgeryToken()
+        <input type="submit" id="btn_submit"  style="display:none;" />
     </form>
    @*  <form method="POST" action="https://payments.securetrading.net/process/payments/choice">
         <input type="hidden" name="version" value="2">
diff --git a/CustomerOnlineV2/CustomerOnlineV2/Views/Transaction/SendMoney.cshtml b/CustomerOnlineV2/CustomerOnlineV2/Views/Transaction/SendMoney.cshtml
index 4fdd73e..bbe1798 100644
--- a/CustomerOnlineV2/CustomerOnlineV2/Views/Transaction/SendMoney.cshtml
+++ b/CustomerOnlineV2/CustomerOnlineV2/Views/Transaction/SendMoney.cshtml
@@ -466,7 +466,7 @@
                        // window.location.replace("/Transaction/Payment?id=" + response.transactionId);
                         var selectedSchemeId = $('#SchemeId').val();
                         if (selectedSchemeId === 'DEBIT_CARD') {
-                            window.location.replace("/Transaction/Payment?id=" + response.transactionId);
+                        window.location.replace("/Transaction/Payment?id=" + response.transactionId);
                         } else {
                             window.location.replace("/Transaction/Success?id=" + response.transactionId);
                         }