IME-LONDON
/
CustomerPortal
8
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity
Browse Source

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

feature/19315_Customer-Registration-new
Dinesh 11 months ago
parent
7de77e20ff 7b1c83482c
commit
fbbb86b98c
5 changed files with 59 additions and 30 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 10
      CustomerOnlineV2/CustomerOnlineV2.Business/Business/AccountBusiness/AccountBusiness.cs
  2. 3
      CustomerOnlineV2/CustomerOnlineV2.Repository/Repository/AccountRepository/AccountRepository.cs
  3. 23
      CustomerOnlineV2/CustomerOnlineV2/Controllers/AccountController.cs
  4. 50
      CustomerOnlineV2/CustomerOnlineV2/Views/Account/VerifyOTP.cshtml
  5. 3
      CustomerOnlineV2/CustomerOnlineV2/Views/Customer/CustomerRegistration.cshtml

10
CustomerOnlineV2/CustomerOnlineV2.Business/Business/AccountBusiness/AccountBusiness.cs
View File

@ -165,10 +165,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>();
@ -221,7 +219,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
@ -254,13 +252,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 };
}

3
CustomerOnlineV2/CustomerOnlineV2.Repository/Repository/AccountRepository/AccountRepository.cs
View File

@ -138,7 +138,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()
};
}
public async Task<JsonRxResponse> SubmitOTP(RequestOTPModel requestOTPModel, LoginResponse logindetails)

23
CustomerOnlineV2/CustomerOnlineV2/Controllers/AccountController.cs
View File

@ -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,30 @@ 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 +252,7 @@ namespace CustomerOnlineV2.Controllers
{
try
{
ViewBag.ResponseCode = "";
var loginDetails = HttpContext.GetLoginDetails();
if (string.IsNullOrEmpty(loginDetails.UserName))
@ -268,14 +277,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 });
}
}
}

50
CustomerOnlineV2/CustomerOnlineV2/Views/Account/VerifyOTP.cshtml
View File

@ -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,37 @@
$(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 +234,29 @@
},
async: true,
success: function (response) {
debugger;
if (response.errorCode == 0) {
debugger
ShowAlertMessage(response.errorCode, response.msg);
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
});
}
});
}

3
CustomerOnlineV2/CustomerOnlineV2/Views/Customer/CustomerRegistration.cshtml
View File

@ -592,7 +592,8 @@
}
// window.location.replace("/account/index");
ShowAlertMessage(response.errorCode, response.msg, "/account/index");
ShowAlertMessage(response.errorCode, response.msg, "/Account/VerifyOTP");
// ShowAlertMessage(response.errorCode, response.msg, "/account/index");
},

Write Preview
Loading…
Cancel
Save