Browse Source

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

feature/19315_Customer-Registration
Leeza Baidar 11 months ago
parent
commit
4279b182a9
  1. 31
      CustomerOnlineV2/CustomerOnlineV2.Common/Models/Notification/PasswordGenerator.cs
  2. 9
      CustomerOnlineV2/CustomerOnlineV2.Common/Models/Notification/SendNotificationRequest.cs
  3. 2
      CustomerOnlineV2/CustomerOnlineV2.Common/Models/ResponseHelper.cs
  4. 2
      CustomerOnlineV2/CustomerOnlineV2.Repository/Repository/AccountRepository/AccountRepository.cs
  5. 16
      CustomerOnlineV2/CustomerOnlineV2.Repository/Repository/HomeRepository/HomeRepository.cs
  6. 26
      CustomerOnlineV2/CustomerOnlineV2.Repository/Repository/RegisterRepository/RegisterRepository.cs
  7. 2
      CustomerOnlineV2/CustomerOnlineV2/Controllers/CustomerController.cs
  8. 139
      CustomerOnlineV2/CustomerOnlineV2/Views/Account/ResetPassword.cshtml
  9. 160
      CustomerOnlineV2/CustomerOnlineV2/Views/Customer/CustomerRegistration.cshtml
  10. 16
      CustomerOnlineV2/CustomerOnlineV2/Views/ReceiverInformation/Receiver.cshtml
  11. 3
      CustomerOnlineV2/CustomerOnlineV2/Views/Shared/_Layout.cshtml
  12. 18
      CustomerOnlineV2/CustomerOnlineV2/wwwroot/js/Custom.js
  13. BIN
      DB/PROC_DYNAMIC_TABLE.sql

31
CustomerOnlineV2/CustomerOnlineV2.Common/Models/Notification/PasswordGenerator.cs

@ -0,0 +1,31 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace CustomerOnlineV2.Common.Models.Notification
{
public class PasswordGenerator
{
public class PasswordOptions
{
public int RequiredLength { get; set; }
public int RequiredUniqueChars { get; set; }
public bool RequireLowercase { get; set; }
public bool RequireDigit { get; set; }
public bool RequireUppercase { get; set; }
public bool RequireNonAlphanumeric { get; set; }
}
}
public class Mapping
{
public string SValue { get; set; }
public string SText { get; set; }
public string DValue { get; set; }
public string DText { get; set; }
}
}

9
CustomerOnlineV2/CustomerOnlineV2.Common/Models/Notification/SendNotificationRequest.cs

@ -6,7 +6,7 @@ using System.Threading.Tasks;
namespace CustomerOnlineV2.Common.Models.Notification
{
public class SendNotificationRequest
public class SendNotificationRequest: CommonRequest
{
public string NotificationTypeId { get; set; }
@ -20,4 +20,11 @@ namespace CustomerOnlineV2.Common.Models.Notification
public string Language { get; set; }
}
public class CommonRequest
{
public string ProcessId { get; set; }
public string UserName { get; set; }
public string ProviderId { get; set; }
public string SessionId { get; set; }
}
}

2
CustomerOnlineV2/CustomerOnlineV2.Common/Models/ResponseHelper.cs

@ -4,6 +4,7 @@
{
public const int SUCCESS = 0;
public const int FAILED = 1;
public const int NORECORD = 2;
public const int EXCEPTION = 999;
public const int SUSPICIOUS = 2;
}
@ -12,6 +13,7 @@
{
public const string SUCCESS = "Success!";
public const string FAILED = "Failed!";
public const string NORECORD = "No Records(s)";
public const string EXCEPTION = "Exception occured in the system, please contact HO!";
public const string SUSPICIOUS = "Transaction is in suspicious, please contact HO!";
}

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

@ -99,7 +99,7 @@ namespace CustomerOnlineV2.Repository.Repository.AccountRepository
try
{
var sql = "EXEC JsonRx_Proc_UserRegistration @flag='pwd-reset' ";
sql += " @username = " + _connHelper.FilterString(logindetails.UserName);
sql += " ,@username = " + _connHelper.FilterString(model.Username);
sql += ", @dob = " + _connHelper.FilterString(model.Dob);
sql += ", @randomPassword = " + _connHelper.FilterString(model.RandomPassword);

16
CustomerOnlineV2/CustomerOnlineV2.Repository/Repository/HomeRepository/HomeRepository.cs

@ -34,8 +34,8 @@ namespace CustomerOnlineV2.Repository.Repository.HomeRepository
if (dt == null || dt.Rows.Count <= 0)
{
_response.ResponseCode = ResponseHelper.FAILED;
_response.ResponseMessage = "DB Null Error!";
_response.ResponseCode = ResponseHelper.NORECORD;
_response.ResponseMessage = "No Receiver(s).";
_logger.LogError("HOMEREPOSITORY | GETCUSTOMERRECEIVERLIST | DB RESPONSE | " + JsonConvert.SerializeObject(_response));
}
@ -83,8 +83,8 @@ namespace CustomerOnlineV2.Repository.Repository.HomeRepository
if (dt == null || dt.Rows.Count <= 0)
{
_response.ResponseCode = ResponseHelper.FAILED;
_response.ResponseMessage = "DB Null Error!";
_response.ResponseCode = ResponseHelper.NORECORD;
_response.ResponseMessage = "No Transaction History Found!";
_logger.LogError("HOMEREPOSITORY | GETCUSTOMERTRANSACTIONLIST | DB RESPONSE | " + JsonConvert.SerializeObject(_response));
}
@ -163,7 +163,7 @@ namespace CustomerOnlineV2.Repository.Repository.HomeRepository
try
{
var sql = "EXEC PROC_DYNAMIC_TABLE";
sql += " @Flag = " + _connHelper.FilterString("tran-detail");
sql += " @Flag = " + _connHelper.FilterString("tran-detail-all");
sql += ",@id = " + _connHelper.FilterString(tranId);
_logger.LogDebug("HOMEREPOSITORY | GETTRANSACTIONDETAIL | SQL | " + sql);
var dt = _connHelper.ExecuteDataTable(sql);
@ -187,7 +187,7 @@ namespace CustomerOnlineV2.Repository.Repository.HomeRepository
{
cAmt = Convert.ToString(item["cAmt"]),
serviceCharge = Convert.ToString(item["serviceCharge"]),
acAmt = Convert.ToString(item["acAmt"]),
acAmt = Convert.ToString(item["tAmt"]),
Amount = Convert.ToString(item["Amount"]),
PBankName = Convert.ToString(item["PBankName"]),
PaymentMethod = Convert.ToString(item["paymentMethod"]),
@ -330,8 +330,8 @@ namespace CustomerOnlineV2.Repository.Repository.HomeRepository
if (dt == null || dt.Rows.Count <= 0)
{
_response.ResponseCode = ResponseHelper.FAILED;
_response.ResponseMessage = "DB Null Error!";
_response.ResponseCode = ResponseHelper.NORECORD;
_response.ResponseMessage = "No Any Notifications";
_logger.LogError("HOMEREPOSITORY | GETCUSTOMERNOTIFLIST | DB RESPONSE | " + JsonConvert.SerializeObject(_response));
}

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

@ -32,8 +32,7 @@ namespace CustomerOnlineV2.Repository.Repository.RegisterRepository
{
var sql = "EXEC proc_online_core_customerSetup";
sql += " @flag = " + _connHelper.FilterString("customer-register-core");
//sql += ", @user = " + _connHelper.FilterString(model.ReceiverId.());
sql += ",@user = " + _connHelper.FilterString("online");
sql += ",@country =" + _connHelper.FilterString(model.country);
sql += ",@password =" + _connHelper.FilterString(model.Password);
sql += ",@custEmail =" + _connHelper.FilterString(model.email);
@ -42,7 +41,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 += ",@city =" + _connHelper.FilterString(model.city);
//sql += ",@custAdd1 =" + _connHelper.FilterString(model.address);
sql += ",@sourceOfFound =" + _connHelper.FilterString(model.sourceOfFound);
sql += ",@custMobile =" + _connHelper.FilterString(model.mobile);
sql += ",@custGender =" + _connHelper.FilterString(model.gender);
@ -57,10 +56,8 @@ namespace CustomerOnlineV2.Repository.Repository.RegisterRepository
sql += ",@zipCode =" + _connHelper.FilterString(model.postalCode);
sql += ",@custAdd1 =" + _connHelper.FilterString(model.address);
sql += ",@custAdd2 =" + _connHelper.FilterString(model.address2);
sql += ",@onlineUser =" + _connHelper.FilterString("true");
sql += ",@serviceUsedFor =" + _connHelper.FilterString("on");
var dt = _connHelper.ExecuteDataTable(sql);
@ -71,11 +68,12 @@ namespace CustomerOnlineV2.Repository.Repository.RegisterRepository
model.ResponseCode = ResponseHelper.FAILED;
model.ResponseMessage = "DB Null Error!";
}
else if (dt.Rows[0]["ErrorCode"].Equals("0"))
{
model.ResponseCode = ResponseHelper.SUCCESS;
model.ResponseMessage = ResponseMessageHelper.SUCCESS;
model.ResponseMessage = "Customer is registered. Proceed to login.";
}
else
{
@ -88,7 +86,7 @@ namespace CustomerOnlineV2.Repository.Repository.RegisterRepository
model.ResponseCode = ResponseHelper.EXCEPTION;
model.ResponseMessage = "Exception occured: " + ex.Message;
}
return await Task.FromResult(model);
@ -132,7 +130,7 @@ namespace CustomerOnlineV2.Repository.Repository.RegisterRepository
address = Convert.ToString(item["address1"]),
address2 = Convert.ToString(item["address2"]),
idType = Convert.ToString(item["idType"]),
idNumber = Convert.ToString(item["idNumber"]),
idNumber = Convert.ToString(item["idNumber"]),
idIssueDate = Convert.ToString(item["idIssueDate"]),
idExpiryDate = Convert.ToString(item["idExpiryDate"]),
nativeCountry = Convert.ToString(item["ICountryName"])
@ -189,7 +187,7 @@ namespace CustomerOnlineV2.Repository.Repository.RegisterRepository
// Category = Convert.ToString(item["category"]),
//url = Convert.ToString(item["url"]),
//IsClickable = Convert.ToString(item["isClickable"])
// notificationCount = Convert.ToString(item["notificationCount"])
// notificationCount = Convert.ToString(item["notificationCount"])
});
}
_response.NotificationModel = obj;
@ -211,13 +209,13 @@ namespace CustomerOnlineV2.Repository.Repository.RegisterRepository
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);
@ -305,6 +303,8 @@ namespace CustomerOnlineV2.Repository.Repository.RegisterRepository
return await Task.FromResult(model);
}
public async Task<CustomerNotificationModel> GetRewardPoints(LoginResponse loginDetails)
{
CustomerNotificationModel _response = new CustomerNotificationModel();

2
CustomerOnlineV2/CustomerOnlineV2/Controllers/CustomerController.cs

@ -38,7 +38,7 @@ namespace CustomerOnlineV2.Controllers
[HttpPost]
[Authorization("AddCustomer")]
//[Authorization("AddCustomer")]
[ValidateAntiForgeryToken]
public async Task<CommonResponse> AddCustomer(OnlineCustomerRegisterModel register)
{

139
CustomerOnlineV2/CustomerOnlineV2/Views/Account/ResetPassword.cshtml

@ -75,16 +75,23 @@
<p class="sec-subtitle"></p>
</div>
@* <form action="dashboard-new.html" id="reset-form" class=""> *@
<form asp-controller="Account" id="reset-form" asp-action="ResetPassword" method="post" novalidate> <div class="form-floating mb-3">
<form asp-controller="Account" id="reset-form" asp-action="ResetPassword" method="post" novalidate>
<div class="form-floating mb-3">
<input type="email" class="form-control" asp-for="Username" placeholder="name@example.com">
<label for="floatingInput">Email address</label>
</div>
<div class="form-floating mb-1">
<input type="date" class="form-control" asp-for="Dob">
<label for="floatingInput">Date Of Birth</label>
</div>
<div class="col-lg-3 mt-4">
<div class="d-grid mb-5">
@* <button class="btn btn-primary btn-sumbit-blue" type="submit">Request for link</button> *@
<button type="submit" id="BtnLogin" class="btn btn-primary btn-sumbit-blue" style="width: 250px;">
<button type="submit" id="BtnLogin" onclick="ResetPassword()" class="btn btn-primary btn-sumbit-blue" style="width: 250px;">
<span class="resetText">Reset Now</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>
@ -145,49 +152,99 @@
</div>
</div>
</footer>
</div>
<script type="text/javascript">
(function () {
'use strict'
// Fetch all the forms we want to apply custom Bootstrap validation styles to
var forms = document.querySelectorAll('#reset-form')
// Loop over them and prevent submission
Array.prototype.slice.call(forms)
.forEach(function (form) {
form.addEventListener('submit', function (event) {
if (!form.checkValidity()) {
event.preventDefault();
event.stopPropagation();
}
else {
event.preventDefault();
$('.resetText').hide();
$('#BtnLogin').css('cursor', 'not-allowed');
$('.loading').show();
$('#BtnLogin').prop('disabled', true);
$("#reset-form").submit();
function ResetPassword() {
let email = $('#email').val();
let Dob = $('#Dob').val();
let Data = {
email: email,
Dob: Dob,
};
$.ajax(
{
type: 'POST',
url: '/Account/ResetPassword',
data: Data,
processData: true,
headers: {
"RequestVerificationToken":
$('input[name="__RequestVerificationToken"]').val()
},
async: true,
success: function (response) {
if (response.responseCode != 0) {
ShowAlertMessage(response.responseCode, response.responseMessage);
//ShowAlertMessage("Receiver Successfully created")
return;
}
form.classList.add('was-validated')
}, false)
})
})();
if ('@ViewBag.ResponseCode' != '') {
if ('@ViewBag.ResponseCode' != '0') {
iziToast.error({
title: 'Error',
message: '@ViewBag.ResponseMessage'
});
}
else {
iziToast.success({
title: 'OK',
message: '@ViewBag.ResponseMessage'
// clearFields();
// $('#Country').focus();
$('#message').text('Data successfully submitted');
// window.location.replace("/home");
},
error: function () {
return null;
}
});
}
}
// (function resetMail() {
// 'use strict'
// // Fetch all the forms we want to apply custom Bootstrap validation styles to
// var forms = document.querySelectorAll('#reset-form')
// // Loop over them and prevent submission
// Array.prototype.slice.call(forms)
// .forEach(function (form) {
// form.addEventListener('submit', function (event) {
// if (!form.checkValidity()) {
// event.preventDefault();
// event.stopPropagation();
// }
// else {
// event.preventDefault();
// $('.resetText').hide();
// $('#BtnLogin').css('cursor', 'not-allowed');
// $('.loading').show();
// $('#BtnLogin').prop('disabled', true);
// $("#reset-form").submit();
// }
// form.classList.add('was-validated')
// }, false)
// })
// })();
// if ('@ViewBag.ResponseCode' != '') {
// if ('@ViewBag.ResponseCode' != '0') {
// iziToast.error({
// title: 'Error',
// message: '@ViewBag.ResponseMessage'
// });
// }
// else {
// iziToast.success({
// title: 'OK',
// message: '@ViewBag.ResponseMessage'
// });
// }
// }
</script>
</body>
</html>

160
CustomerOnlineV2/CustomerOnlineV2/Views/Customer/CustomerRegistration.cshtml

@ -98,7 +98,7 @@
</div>
</div>
</div>
<div class="col-md-4">
<div class="mb-4">
@ -110,7 +110,7 @@
<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">
ValidationExpression="^(?=.*\d)(?=.*[a-z])(?=.*[A-Z]).{8}$" ControlToValidate="txtPassword" ForeColor="Red">
<span asp-validation-for="@Model.Password" class="error"></span> *@
</div>
</div>
@ -119,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>
@ -158,9 +158,8 @@
<div class="mb-4">
<div class="form-floating">
<select class="form-select" asp-for="country" asp-items="@CustomerOnlineV2.Helper.HelperClass.GetDropdownData("allCountrylist", true)" aria-label="Floating label select example">
</select>
<label for="Nationality">Nationality</label>
</div>
</div>
@ -182,7 +181,6 @@
<div class="mb-4">
<div class="form-floating">
<select class="form-select" asp-for="gender" asp-items="@CustomerOnlineV2.Helper.HelperClass.GetDropdownData("getGender", true)" aria-label="Floating label select example">
</select>
<label for="Gender">Gender</label>
</div>
@ -256,8 +254,8 @@
</div>
</div>
</div>
<div class="row">
<div class="col-md-12">
@ -291,8 +289,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>
@ -316,7 +314,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>
@ -341,16 +339,16 @@
<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">
$(document).ready(function () {
debugger;
$(document).ready(function () {
$('#btnSearch').click(function (e) {
e.preventDefault();
var postalCode = $('#postalCode').val();
@ -412,40 +410,42 @@ $(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");
// 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,}$/;
// 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();
// 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 {
if (passwordRegex.test(password)) {
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");
}
});
}
});
confirmPasswordField.on("keyup", function () {
var password = passwordField.val();
var confirmPassword = confirmPasswordField.val();
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");
}
});
});
if (password === confirmPassword) {
confirmPasswordValidation.text("Passwords match").removeClass("text-danger").addClass("text-success");
} else {
confirmPasswordValidation.text("Passwords do not match").removeClass("text-success").addClass("text-danger");
}
});
});
(function () {
@ -480,46 +480,46 @@ $(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 address2 = $('#address2').val();
let idIssueDate = $('#idIssueDate').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,
@ -528,7 +528,7 @@ $(document).ready(function () {
ConfirmPassword: ConfirmPassword,
postalCode: postalCode,
AboutUs: aboutus
};
@ -548,20 +548,14 @@ $(document).ready(function () {
success: function (response) {
EnableRegisterButton();
if (response.responseCode != 0) {
ShowAlertMessage(response.responseCode, response.responseMessage);
ShowAlertMessageErrorOnly(response.responseCode, response.responseMessage);
//ShowAlertMessage("Receiver Successfully created")
return;
return false;
}
window.location.replace("/account/index");
ShowAlertMessage(response.responseCode, response.responseMessage);
// clearFields();
// $('#Country').focus();
// $('#message').text('Data successfully submitted');
// window.location.replace("/ReceiverInformation/Success?id=" + response.ReceiverId);
// window.location.replace("/account/index");
ShowAlertMessage(response.responseCode, response.responseMessage, "/account/index");
},
@ -602,7 +596,7 @@ $(document).ready(function () {
}
function EnableRegisterButton() {
$('.RegisterText').show();
$('#BtnRegister').css('cursor', 'pointer');
$('.loadingSend').hide();

16
CustomerOnlineV2/CustomerOnlineV2/Views/ReceiverInformation/Receiver.cshtml

@ -66,8 +66,8 @@
<div class="col-md-3">
<div class="mb-3">
<label class="form-label">Relation to Remitter</label>
<select class="form-control form-select" asp-for="Relationship">
<option value="Brother/ Sister">Brother/ Sister</option>
<select class="form-control form-select" asp-for="Relationship" asp-items="@CustomerOnlineV2.Helper.HelperClass.GetDropdownData("getRelation", true)">
@* <option value="Brother/ Sister">Brother/ Sister</option>
<option value="Business Partner">Business Partner</option>
<option value="Cousin">Cousin</option>
<option value="Friend">Friend</option>
@ -76,7 +76,7 @@
<option value="Parents">Parents</option>
<option value="Self">Self</option>
<option value="Son/Daughter">Son/Daughter</option>
<option value="Uncle/ Auntie">Uncle/ Auntie</option>
<option value="Uncle/ Auntie">Uncle/ Auntie</option> *@
</select>
</div>
</div>
@ -142,10 +142,10 @@
<div class="col-md-3">
<div class="mb-3">
<label class="form-label">ID Type</label>
<select asp-for="idType" class="form-select form-control" required>
<option value="1">Passport</option>
<select asp-for="idType" class="form-select form-control" asp-items="@CustomerOnlineV2.Helper.HelperClass.GetDropdownData("getIdType", true)" required>
@* <option value="1">Passport</option>
<option value="2">National ID Card</option>
<option value="3">Gov. ID</option>
<option value="3">Gov. ID</option> *@
</select>
</div>
@ -159,13 +159,13 @@
<div class="col-md-3">
<div class="mb-3">
<label class="form-label">ID Issued Date</label>
<input type="datetime" asp-for="createdDate" class="form-control" placeholder="DD-MM-YYYY" />
<input type="date" asp-for="createdDate" class="form-control" placeholder="DD-MM-YYYY" />
</div>
</div>
<div class="col-md-3">
<div class="mb-3">
<label class="form-label">ID Expiry Date</label>
<input type="text" asp-for="idExpairyDate" class="form-control" placeholder="DD-MM-YYYY" />
<input type="date" asp-for="idExpairyDate" class="form-control" placeholder="DD-MM-YYYY" />
</div>
</div>
</div>

3
CustomerOnlineV2/CustomerOnlineV2/Views/Shared/_Layout.cshtml

@ -242,7 +242,8 @@
async: false,
success: function (response) {
if (response.responseCode != 0) {
ShowAlertMessage(response.responseCode, response.responseMessage);
// ShowAlertMessage(response.responseCode, response.responseMessage);
return;
}
PopulateNotificationData(response);
},

18
CustomerOnlineV2/CustomerOnlineV2/wwwroot/js/Custom.js

@ -53,7 +53,7 @@ function ShowSessionAlert() {
sessionStorage.removeItem("ResponseMessage");
}
function ShowAlertMessage(errorCode, errorMessage) {
function ShowAlertMessage(errorCode, errorMessage, url) {
if (errorCode === null || errorCode === '' || errorCode === undefined)
return false;
if (errorMessage === null || errorMessage === '' || errorMessage === undefined)
@ -62,7 +62,14 @@ function ShowAlertMessage(errorCode, errorMessage) {
if (errorCode == '0') {
iziToast.success({
title: 'OK',
message: errorMessage
message: errorMessage,
position: 'topRight',
timeout: 1500,
onClosed: function () {
if (url)
window.location.replace(url);
}
});
}
else if (errorCode == '1') {
@ -74,7 +81,10 @@ function ShowAlertMessage(errorCode, errorMessage) {
else {
iziToast.info({
title: 'Info',
message: errorMessage
message: errorMessage,
onClosed: function () {
$('.loading').hide();
}
});
}
};
@ -92,6 +102,8 @@ function ShowAlertMessageErrorOnly(errorCode, errorMessage) {
if (errorCode == '1') {
iziToast.error({
title: 'Error',
position: 'topRight',
timeout: 2000,
message: errorMessage
});
}

BIN
DB/PROC_DYNAMIC_TABLE.sql

Loading…
Cancel
Save