Browse Source

latest fix

feature/19315_Customer-Registration-new
shakun 10 months ago
parent
commit
f2f13211df
  1. 7
      CustomerOnlineV2/CustomerOnlineV2.Business/Business/AccountBusiness/AccountBusiness.cs
  2. 2
      CustomerOnlineV2/CustomerOnlineV2.Repository/Repository/RegisterRepository/RegisterRepository.cs
  3. 2
      CustomerOnlineV2/CustomerOnlineV2/Controllers/AccountController.cs
  4. 1
      CustomerOnlineV2/CustomerOnlineV2/Controllers/CustomerController.cs
  5. 6
      CustomerOnlineV2/CustomerOnlineV2/Helper/HelperClass.cs
  6. 1
      CustomerOnlineV2/CustomerOnlineV2/Views/Account/ForceChangePassword.cshtml
  7. 4
      CustomerOnlineV2/CustomerOnlineV2/Views/Account/ResetPassword.cshtml
  8. 1
      CustomerOnlineV2/CustomerOnlineV2/Views/Account/VerifyOTP.cshtml
  9. 8
      CustomerOnlineV2/CustomerOnlineV2/Views/Customer/CustomerProfile.cshtml
  10. 1
      CustomerOnlineV2/CustomerOnlineV2/Views/Home/Index.cshtml
  11. 14
      CustomerOnlineV2/CustomerOnlineV2/Views/ReceiverInformation/Receiver.cshtml
  12. 2
      CustomerOnlineV2/CustomerOnlineV2/Views/TransactionReport/TranReport.cshtml

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

@ -101,6 +101,8 @@ namespace CustomerOnlineV2.Business.Business.AccountBusiness
}
try
{
if (!string.IsNullOrEmpty(res.Extra3))
{
string ProcessId = Guid.NewGuid().ToString().Replace("-", "") + ":sendSms";
var mobileNo = getSenderFormattedNumber(res.Extra3);
@ -130,6 +132,11 @@ namespace CustomerOnlineV2.Business.Business.AccountBusiness
_logger.LogDebug("SendNotification.SMS | RESPONSE : " + JsonConvert.SerializeObject(_resp));
smsSent = true;
}
else
{
_logger.LogDebug("SendNotification.SMS | Mobile Number is empty." );
}
}
catch (Exception smsException)
{

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

@ -61,7 +61,7 @@ namespace CustomerOnlineV2.Repository.Repository.RegisterRepository
sql += ",@custAdd2 =" + _connHelper.FilterString(model.address2);
sql += ",@onlineUser =" + _connHelper.FilterString("true");
sql += ",@serviceUsedFor =" + _connHelper.FilterString("on");
sql += ",@createdFrom =" + _connHelper.FilterString("W");
var dt = _connHelper.ExecuteDataTable(sql);

2
CustomerOnlineV2/CustomerOnlineV2/Controllers/AccountController.cs

@ -191,7 +191,7 @@ namespace CustomerOnlineV2.Controllers
}
else
{
ViewBag.ResponseCode = response.ResponseCode;
ViewBag.ResponseCode = "1";
ViewBag.ResponseMessage = response.ResponseMessage;
_logger.LogError("ACCOUNTCONTROLLER | LOGIN | ERROR OCCURED | " + JsonConvert.SerializeObject(response));
return View();

1
CustomerOnlineV2/CustomerOnlineV2/Controllers/CustomerController.cs

@ -51,6 +51,7 @@ namespace CustomerOnlineV2.Controllers
// using (LogContext.PushProperty("DebugId", addressRequest.ProcessId))
// {
// _logger.LogInformation($"GETADDRESSLIST | ADDRESSLIST | REQUEST | {JsonConvert.SerializeObject(addressRequest)}");
register.fullName = Helper.HelperClass.GetFullName(register.firstName, register.middleName, register.lastName1);
var register1 = await _registerBusiness.AddCustomers(register);
return register1;

6
CustomerOnlineV2/CustomerOnlineV2/Helper/HelperClass.cs

@ -75,5 +75,11 @@ namespace CustomerOnlineV2.Helper
SetCookies("ErrorCode", response.ResponseCode.ToString(), null, 15, httpContext.Response);
SetCookies("ErrorMessage", response.ResponseMessage, null, 15, httpContext.Response);
}
public static string GetFullName(string fname, string mname, string lname)
{
string fullName = string.Empty;
fullName = string.Format("{0} {1}", (!string.IsNullOrEmpty(mname)) ? fname + " " + mname : fname, lname);
return fullName;
}
}
}

1
CustomerOnlineV2/CustomerOnlineV2/Views/Account/ForceChangePassword.cshtml

@ -106,6 +106,7 @@
</div>
</div>
</form>
<div class="mt-3"><a id="loginNow" class="" href="/Account/Index">Login Now</a></div>
</div>
</div>
<div class="col-md-5 ps-0">

4
CustomerOnlineV2/CustomerOnlineV2/Views/Account/ResetPassword.cshtml

@ -77,12 +77,12 @@
@* <form action="dashboard-new.html" id="reset-form" class=""> *@
<form asp-controller="Account" id="reset-form" method="post" novalidate>
<div class="form-floating mb-3">
<input type="email" class="form-control" asp-for="Username" placeholder="name@example.com">
<input type="email" class="form-control" asp-for="Username" placeholder="name@example.com" required>
<label for="floatingInput">Email address</label>
</div>
<div class="form-floating mb-1">
<input type="date" class="form-control" asp-for="Dob">
<input type="date" class="form-control" asp-for="Dob" required>
<label for="floatingInput">Date Of Birth</label>
</div>

1
CustomerOnlineV2/CustomerOnlineV2/Views/Account/VerifyOTP.cshtml

@ -238,6 +238,7 @@
if (response.errorCode == 0) {
iziToast.info({
title: 'OK',
setTimeout:1000,
onClosed: function () {
window.location.replace("/home");
}

8
CustomerOnlineV2/CustomerOnlineV2/Views/Customer/CustomerProfile.cshtml

@ -696,7 +696,7 @@
$("#IdBackUpload").hide();
});
$("#IdFrontUpload").on('change', function (e) {
$("#IdFrontFileUpload").on('change', function (e) {
let idtype = $('#primary-IdType').val();
for (var i = 0; i < e.target.files.length; i++) {
@ -707,7 +707,7 @@
//FileUpload(idtype, '11394', 'ID_Front', 'IdFrontUpload');
});
$("#IdBackUpload").on('change', function (e) {
$("#IdBackFileUpload").on('change', function (e) {
let idtype = $('#primary-IdType').val();
for (var i = 0; i < e.target.files.length; i++) {
@ -757,8 +757,8 @@
$('#primary-IdType').val('');
$('#Add-IdType').val('');
$('#IdFrontUpload').val('');
$('#IdBackUpload').val('');
$('#IdFrontFileUpload').val('');
$('#IdBackFileUpload').val('');
$('#add_idUpload').val('');
$('#edit-doc-details').modal('hide');

1
CustomerOnlineV2/CustomerOnlineV2/Views/Home/Index.cshtml

@ -484,7 +484,6 @@
function getData(id) {
debugger;
$.ajax({
type: 'GET',
contentType: 'application/json; charset=utf-8',

14
CustomerOnlineV2/CustomerOnlineV2/Views/ReceiverInformation/Receiver.cshtml

@ -42,7 +42,7 @@
<div class="col-md-6">
<div class="mb-3" id="">
<label class="form-label">Receiver's Country</label>
<select class="form-select form-control" asp-for="Country" asp-items="@CustomerOnlineV2.Helper.HelperClass.GetDropdownData("pCountry", true)" class="form-select" required onkeydown="PaymentMethodChangeEvent">
<select class="form-select form-control" asp-for="Country" asp-items="@CustomerOnlineV2.Helper.HelperClass.GetDropdownData("allCountrylistWithCode", true)" class="form-select" required onkeydown="PaymentMethodChangeEvent">
@* <option value="BANGLADESH">BANGLADESH</option>
<option value="INDIA">INDIA</option>
<option value="SRI LANKA">SRI LANKA</option>
@ -327,7 +327,7 @@
utilsScript: "https://cdnjs.cloudflare.com/ajax/libs/intl-tel-input/12.1.5/js/utils.js",
autoPlaceholder: true,
initialCountry: "NP",
nationalMode: true,
geoIpLookup: "auto",
});
@ -335,11 +335,21 @@
});
function PopulateCountryFlagForMobileNumber() {
var getCountryId = $('#Country option:selected').val();
if (getCountryId !== null && getCountryId !== "" && getCountryId !== "0") {
var getCountry = $('#Country option:selected').text();
var code = getCountry.split('(');
code = code[1].split(')')[0];
$('#ReceiverForm').find('[name="Mobile"]').intlTelInput('setCountry', code);
}
}
$('#Country').change(function () {
if ($(this).val() != '') {
PopulateDDL('paymentMode', 'pMode', $(this).val(), true, '');
PopulateCountryFlagForMobileNumber();
}
else {
$('#paymentMode').empty();

2
CustomerOnlineV2/CustomerOnlineV2/Views/TransactionReport/TranReport.cshtml

@ -224,7 +224,7 @@
<div class="col-5 col-sm-1" id="collAmt">${d.collAmt}</div>
<div class="col-6 col-sm-1" id="PayoutAmt">${d.payoutAmt}</div>
<div class="col-7 col-sm-1" id="PayoutMode">${d.payoutMode}</div>
<div class="col-8 col-sm-2 text-center" id="tranId"><a href="/Transaction/Receipt?id=${d.tranId}" id="tranId" target="_blank"><i class="fa fa-eye" style="font-size:30px"></i></a></div>
<div class="col-8 col-sm-2 text-center" id="tranId"><a href="/Transaction/Receipt?id=${d.tranId}" id="tranId" target="_blank"><i class="fa fa-eye" style="font-size:30px"></i></a></div>
</div>
</div>`;

Loading…
Cancel
Save