diff --git a/CustomerOnlineV2/CustomerOnlineV2.Business/Business/RegisterBusiness/IRegisterBusiness.cs b/CustomerOnlineV2/CustomerOnlineV2.Business/Business/RegisterBusiness/IRegisterBusiness.cs index 0ae251a..e7d283e 100644 --- a/CustomerOnlineV2/CustomerOnlineV2.Business/Business/RegisterBusiness/IRegisterBusiness.cs +++ b/CustomerOnlineV2/CustomerOnlineV2.Business/Business/RegisterBusiness/IRegisterBusiness.cs @@ -1,6 +1,7 @@ using CustomerOnlineV2.Common.Models; using CustomerOnlineV2.Common.Models.AccountModel; using CustomerOnlineV2.Common.Models.HomeModel; +using CustomerOnlineV2.Common.Models.ReceiverModel; using CustomerOnlineV2.Common.Models.RegisterModel; using System; using System.Collections.Generic; @@ -14,6 +15,8 @@ namespace CustomerOnlineV2.Business.Business.RegisterBusiness { Task AddCustomers(OnlineCustomerRegisterModel register); Task GetAddressList(AddressRequest addressRequest); + Task GetTranCustomerById(LoginResponse loginDetails); + Task UpdateCustomers(CustomerListModel customer, string Id); Task GetAllNotificationDetails(LoginResponse loginDetails); Task GetRewardPoints(LoginResponse loginDetails); } diff --git a/CustomerOnlineV2/CustomerOnlineV2.Business/Business/RegisterBusiness/RegisterBusiness.cs b/CustomerOnlineV2/CustomerOnlineV2.Business/Business/RegisterBusiness/RegisterBusiness.cs index 4305228..78f0b74 100644 --- a/CustomerOnlineV2/CustomerOnlineV2.Business/Business/RegisterBusiness/RegisterBusiness.cs +++ b/CustomerOnlineV2/CustomerOnlineV2.Business/Business/RegisterBusiness/RegisterBusiness.cs @@ -39,14 +39,22 @@ namespace CustomerOnlineV2.Business.Business.RegisterBusiness { throw new NotImplementedException(); } - + public async Task GetTranCustomerById(LoginResponse loginDetails) + { + return await _registerRepository.GetTranCustomerById(loginDetails); + } public async Task GetAllNotificationDetails(LoginResponse loginDetails) { return (CustomerNotificationModel)await _registerRepository.GetAllNotificationDetails(loginDetails); } - public async Task GetRewardPoints(LoginResponse loginDetails) + public async Task UpdateCustomers(CustomerListModel model, string id) + { + var model1 = await _registerRepository.UpdateCustomers1(model, id); + return model1; + } + public async Task GetRewardPoints(LoginResponse loginDetails) { return (CustomerNotificationModel)await _registerRepository.GetRewardPoints(loginDetails); } diff --git a/CustomerOnlineV2/CustomerOnlineV2.Repository/Repository/AccountRepository/AccountRepository.cs b/CustomerOnlineV2/CustomerOnlineV2.Repository/Repository/AccountRepository/AccountRepository.cs index 0c6a256..5cd3bb3 100644 --- a/CustomerOnlineV2/CustomerOnlineV2.Repository/Repository/AccountRepository/AccountRepository.cs +++ b/CustomerOnlineV2/CustomerOnlineV2.Repository/Repository/AccountRepository/AccountRepository.cs @@ -73,13 +73,13 @@ namespace CustomerOnlineV2.Repository.Repository.AccountRepository CommonResponse _response = new CommonResponse(); try { - var sql = "EXEC PROC_DYNAMIC_TABLE"; - sql += " @Flag = " + _connHelper.FilterString("ForceChange"); - sql += ",@UserEmail = " + _connHelper.FilterString(logindetails.UserName); + var sql = "EXEC mobile_proc_ChangePassword"; + //sql += " @Flag = " + _connHelper.FilterString("ForceChange"); + sql += ",@userName = " + _connHelper.FilterString(logindetails.UserName); sql += ",@OldPassword = " + _connHelper.FilterString(model.OldPassword); - sql += ",@Password = " + _connHelper.FilterString(model.NewPassword); - sql += ",@ConfirmPassword = " + _connHelper.FilterString(model.ConfirmNewPassword); - sql += ",@ipAddress = " + _connHelper.FilterString(model.IpAddress); + sql += ",@newPassword = " + _connHelper.FilterString(model.NewPassword); + //sql += ",@ConfirmPassword = " + _connHelper.FilterString(model.ConfirmNewPassword); + //sql += ",@ipAddress = " + _connHelper.FilterString(model.IpAddress); _logger.LogDebug("ACCOUNTREPOSITORY | CHANGEPASSWORD | SQL | " + sql); return _connHelper.ParseDbResult(sql); diff --git a/CustomerOnlineV2/CustomerOnlineV2.Repository/Repository/RegisterRepository/IRegisterRepository.cs b/CustomerOnlineV2/CustomerOnlineV2.Repository/Repository/RegisterRepository/IRegisterRepository.cs index f0d0b91..7853780 100644 --- a/CustomerOnlineV2/CustomerOnlineV2.Repository/Repository/RegisterRepository/IRegisterRepository.cs +++ b/CustomerOnlineV2/CustomerOnlineV2.Repository/Repository/RegisterRepository/IRegisterRepository.cs @@ -15,6 +15,7 @@ namespace CustomerOnlineV2.Repository.Repository.RegisterRepository Task AddRegisterDetails(OnlineCustomerRegisterModel register); Task GetTranCustomerById(LoginResponse loginDetails); Task GetAllNotificationDetails(LoginResponse loginDetails); - Task GetRewardPoints(LoginResponse loginDetails); + Task UpdateCustomers1(CustomerListModel model, string id); + Task GetRewardPoints(LoginResponse loginDetails); } } diff --git a/CustomerOnlineV2/CustomerOnlineV2.Repository/Repository/RegisterRepository/RegisterRepository.cs b/CustomerOnlineV2/CustomerOnlineV2.Repository/Repository/RegisterRepository/RegisterRepository.cs index 7525ad1..f5711d5 100644 --- a/CustomerOnlineV2/CustomerOnlineV2.Repository/Repository/RegisterRepository/RegisterRepository.cs +++ b/CustomerOnlineV2/CustomerOnlineV2.Repository/Repository/RegisterRepository/RegisterRepository.cs @@ -204,7 +204,60 @@ namespace CustomerOnlineV2.Repository.Repository.RegisterRepository } return await Task.FromResult(_response); } + public async Task UpdateCustomers1(CustomerListModel model, string id) + { + try + { + var sql = "EXEC mobile_proc_online_customerMaster_V1"; + sql += " @flag = " + _connHelper.FilterString("update-address"); + + + sql += ",@customerId =" + _connHelper.FilterString(id); + sql += ",@postalCode =" + _connHelper.FilterString(model.zipCode); + //sql += ",@nativeCountry =" + _connHelper.FilterString(model.NativeCountry); + sql += ",@address1 =" + _connHelper.FilterString(model.address); + sql += ",@address2 =" + _connHelper.FilterString(model.address2); + + + + + //_logger.LogDebug("RECEIVERREPOSITORY | GETRECEIVEDRDETAILS | SQL | " + sql); + var dt = _connHelper.ExecuteDataTable(sql); + + + if (dt == null || dt.Rows.Count <= 0) + { + model.ResponseCode = ResponseHelper.FAILED; + model.ResponseMessage = "DB Null Error!"; + + // _logger.LogError("RECEIVERREPOSITORY | GETRECEIVEDRDETAILS | DB RESPONSE | " + JsonConvert.SerializeObject(_response)); + } + else + { + model.ResponseCode = ResponseHelper.SUCCESS; + model.ResponseMessage = ResponseMessageHelper.SUCCESS; + + // _response.firstName = Convert.ToString(dt.Rows[0]["firstName"]); + // _response.middleName = Convert.ToString(dt.Rows[0]["middleName"]); + // _response.lastName1 = Convert.ToString(dt.Rows[0]["lastName1"]); + // _response.Country = Convert.ToString(dt.Rows[0]["Country"]); + // _response.Address = Convert.ToString(dt.Rows[0]["Address"]); + // _response.State = Convert.ToString(dt.Rows[0]["State"]); + } + } + catch (Exception ex) + { + model.ResponseCode = ResponseHelper.EXCEPTION; + model.ResponseMessage = "Exception occured: " + ex.Message; + + //_logger.LogError("RECEIVERREPOSITORY | GETRECEIVEDRDETAILS | EXCEPTION | " + JsonConvert.SerializeObject(_response)); + } + + return await Task.FromResult(model); + } + + public async Task GetRewardPoints(LoginResponse loginDetails) { CustomerNotificationModel _response = new CustomerNotificationModel(); diff --git a/CustomerOnlineV2/CustomerOnlineV2/Controllers/CustomerController.cs b/CustomerOnlineV2/CustomerOnlineV2/Controllers/CustomerController.cs index fa1fc71..4731b61 100644 --- a/CustomerOnlineV2/CustomerOnlineV2/Controllers/CustomerController.cs +++ b/CustomerOnlineV2/CustomerOnlineV2/Controllers/CustomerController.cs @@ -11,6 +11,7 @@ using Newtonsoft.Json; using Serilog.Context; using CustomerOnlineV2.Common.Helper; using CustomerOnlineV2.Common.Models.HomeModel; +using CustomerOnlineV2.Common.Models.ReceiverModel; namespace CustomerOnlineV2.Controllers { @@ -105,8 +106,18 @@ namespace CustomerOnlineV2.Controllers return await _registerBusiness.GetAllNotificationDetails(loginDetails); } + [HttpPost] + [Authorization("UpdateCustomer")] + + public async Task UpdateCustomer(CustomerListModel customer, string id) + { + var loginDetails = HttpContext.GetLoginDetails(); - [Authorization("Refer")] + var customer1 = await _registerBusiness.UpdateCustomers(customer, loginDetails.UserId); + return customer1; + } + + [Authorization("Refer")] public IActionResult Refer() { return View(); @@ -117,7 +128,6 @@ namespace CustomerOnlineV2.Controllers public async Task GetRewardDetails() { var loginDetails = HttpContext.GetLoginDetails(); - return await _registerBusiness.GetRewardPoints(loginDetails); } } diff --git a/CustomerOnlineV2/CustomerOnlineV2/Program.cs b/CustomerOnlineV2/CustomerOnlineV2/Program.cs index 1769ed5..1b196bd 100644 --- a/CustomerOnlineV2/CustomerOnlineV2/Program.cs +++ b/CustomerOnlineV2/CustomerOnlineV2/Program.cs @@ -1,11 +1,13 @@ using CustomerOnlineV2.Api.API.TPApi; using CustomerOnlineV2.Business.Business.AccountBusiness; +using CustomerOnlineV2.Business.Business.DocumentBusiness; using CustomerOnlineV2.Business.Business.HomeBusiness; using CustomerOnlineV2.Business.Business.ReceiverBusiness; using CustomerOnlineV2.Business.Business.RegisterBusiness; using CustomerOnlineV2.Business.Business.TransactionBusiness; using CustomerOnlineV2.Repository.ConnectionHelper; using CustomerOnlineV2.Repository.Repository.AccountRepository; +using CustomerOnlineV2.Repository.Repository.DocumentRepository; using CustomerOnlineV2.Repository.Repository.HomeRepository; using CustomerOnlineV2.Repository.Repository.ReceiverRepository; using CustomerOnlineV2.Repository.Repository.RegisterRepository; @@ -53,8 +55,8 @@ builder.Services.AddScoped(); builder.Services.AddScoped(); builder.Services.AddScoped(); - - +builder.Services.AddScoped(); +builder.Services.AddScoped(); // Learn more about configuring Swagger/OpenAPI at https://aka.ms/aspnetcore/swashbuckle builder.Services.AddEndpointsApiExplorer(); diff --git a/CustomerOnlineV2/CustomerOnlineV2/Views/Account/ForceChangePassword.cshtml b/CustomerOnlineV2/CustomerOnlineV2/Views/Account/ForceChangePassword.cshtml index 5d8d852..febf347 100644 --- a/CustomerOnlineV2/CustomerOnlineV2/Views/Account/ForceChangePassword.cshtml +++ b/CustomerOnlineV2/CustomerOnlineV2/Views/Account/ForceChangePassword.cshtml @@ -90,10 +90,12 @@
+
+
@@ -187,6 +189,35 @@ } \ No newline at end of file diff --git a/CustomerOnlineV2/CustomerOnlineV2/Views/Shared/_Layout2.cshtml b/CustomerOnlineV2/CustomerOnlineV2/Views/Shared/_Layout2.cshtml index 25016cc..00b7825 100644 --- a/CustomerOnlineV2/CustomerOnlineV2/Views/Shared/_Layout2.cshtml +++ b/CustomerOnlineV2/CustomerOnlineV2/Views/Shared/_Layout2.cshtml @@ -139,7 +139,7 @@
-
+ @*
-
+
*@