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

Fix agent ddl issue

feature/19315_Customer-Registration-new
shakun 11 months ago
parent
5483ac9395
commit
ed97b85f47
4 changed files with 90 additions and 122 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      CustomerOnlineV2/CustomerOnlineV2.Repository/Repository/ReceiverRepository/ReceiverRepository.cs
  2. 4
      CustomerOnlineV2/CustomerOnlineV2/Views/Account/Index.cshtml
  3. 2
      CustomerOnlineV2/CustomerOnlineV2/Views/Account/ResetPassword.cshtml
  4. 200
      CustomerOnlineV2/CustomerOnlineV2/Views/ReceiverInformation/Receiver.cshtml

6
CustomerOnlineV2/CustomerOnlineV2.Repository/Repository/ReceiverRepository/ReceiverRepository.cs
View File

@ -166,7 +166,7 @@ namespace CustomerOnlineV2.Repository.Repository.ReceiverRepository
try try
{ {
var sql = "EXEC PROC_DYNAMIC_TABLE"; var sql = "EXEC PROC_DYNAMIC_TABLE";
sql += " @Flag = " + _connHelper.FilterString("edit-customer");
sql += " @Flag = " + _connHelper.FilterString("editReceiver-detail");
sql += ",@id = " + _connHelper.FilterString(id); sql += ",@id = " + _connHelper.FilterString(id);
_logger.LogDebug("RECEIVERREPOSITORY | EDITRECEIVER | SQL | " + sql); _logger.LogDebug("RECEIVERREPOSITORY | EDITRECEIVER | SQL | " + sql);
var dt = _connHelper.ExecuteDataTable(sql); var dt = _connHelper.ExecuteDataTable(sql);
@ -198,8 +198,8 @@ namespace CustomerOnlineV2.Repository.Repository.ReceiverRepository
Email = Convert.ToString(item["email"]), Email = Convert.ToString(item["email"]),
idType = Convert.ToString(item["idType"]), idType = Convert.ToString(item["idType"]),
idNumber = Convert.ToString(item["idNumber"]), idNumber = Convert.ToString(item["idNumber"]),
bankName = Convert.ToString(item["bankName"]),
bankLocation = Convert.ToString(item["bank"]),
bankName = Convert.ToString(item["bank"]),
bankLocation = Convert.ToString(item["branch"]),
receiverAccountNumber = Convert.ToString(item["accountNum"]), receiverAccountNumber = Convert.ToString(item["accountNum"]),
paymentMode = Convert.ToString(item["paymentMode"]), paymentMode = Convert.ToString(item["paymentMode"]),
}); });

4
CustomerOnlineV2/CustomerOnlineV2/Views/Account/Index.cshtml
View File

@ -9,6 +9,7 @@
<meta charset="utf-8" /> <meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" />
<base href="~/" /> <base href="~/" />
<link href="@Url.Content("~/Content/styles.css")" rel="stylesheet" type="text/css" />
<link href="~/vendor/bootstrap/css/bootstrap.min.css" rel="stylesheet" /> <link href="~/vendor/bootstrap/css/bootstrap.min.css" rel="stylesheet" />
<link href="~/vendor/font-awesome/css/all.min.css" rel="stylesheet" /> <link href="~/vendor/font-awesome/css/all.min.css" rel="stylesheet" />
<link href="~/vendor/bootstrap-select/css/bootstrap-select.min.css" rel="stylesheet" /> <link href="~/vendor/bootstrap-select/css/bootstrap-select.min.css" rel="stylesheet" />
@ -30,7 +31,8 @@
============================= --> ============================= -->
<div class="logo me-3"> <div class="logo me-3">
<a class="d-flex" href="/" title="Money - HTML Template"> <a class="d-flex" href="/" title="Money - HTML Template">
<img src="images/imelondon.svg" height="35" alt="IME London - Logo" />
@* <img src="images/imelondon.svg" height="35" alt="IME London - Logo" />
*@ <img src="@Url.Content("~/images/imelondon.svg")" height="35" alt="IME London - Logo" />
</a> </a>
</div> </div>
<!-- Logo end --> <!-- Logo end -->

2
CustomerOnlineV2/CustomerOnlineV2/Views/Account/ResetPassword.cshtml
View File

@ -204,7 +204,7 @@
async: true, async: true,
success: function (response) { success: function (response) {
debugger;
if (response.responseCode != 0) { if (response.responseCode != 0) {
ShowAlertMessage(response.responseCode, response.responseMessage); ShowAlertMessage(response.responseCode, response.responseMessage);
//ShowAlertMessage("Receiver Successfully created") //ShowAlertMessage("Receiver Successfully created")

200
CustomerOnlineV2/CustomerOnlineV2/Views/ReceiverInformation/Receiver.cshtml
View File

@ -11,16 +11,12 @@
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<head> <head>
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/intl-tel-input/12.1.5/css/intlTelInput.css"> <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/intl-tel-input/12.1.5/css/intlTelInput.css">
<link rel="stylesheet" href="./intlmask.css"> <link rel="stylesheet" href="./intlmask.css">
<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.1.1/jquery.min.js"></script> <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.1.1/jquery.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/intl-tel-input/12.1.5/js/intlTelInput.min.js"></script> <script src="https://cdnjs.cloudflare.com/ajax/libs/intl-tel-input/12.1.5/js/intlTelInput.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/intl-tel-input/12.1.5/js/utils.js"></script> <script src="https://cdnjs.cloudflare.com/ajax/libs/intl-tel-input/12.1.5/js/utils.js"></script>
<script src="./intlmask.js"></script> <script src="./intlmask.js"></script>
<style> <style>
input::-webkit-outer-spin-button, input::-webkit-outer-spin-button,
input::-webkit-inner-spin-button { input::-webkit-inner-spin-button {
@ -109,13 +105,13 @@
<div class="col-md-3"> <div class="col-md-3">
<div class="mb-3"> <div class="mb-3">
<label class="form-label">City *</label> <label class="form-label">City *</label>
<input type="text" asp-for="City" class="form-control required" placeholder="City/Town*" required/>
<input type="text" asp-for="City" class="form-control required" placeholder="City/Town*" required />
</div> </div>
</div> </div>
<div class="col-md-3"> <div class="col-md-3">
<div class="mb-3"> <div class="mb-3">
<label class="form-label">Mobile Number</label> <label class="form-label">Mobile Number</label>
<input type="tel" asp-for="Mobile" name="Mobile" class="form-control required" required/>
<input type="tel" asp-for="Mobile" name="Mobile" class="form-control required" required />
</div> </div>
</div> </div>
<div class="col-md-3"> <div class="col-md-3">
@ -139,7 +135,8 @@
<div class="col-md-3"> <div class="col-md-3">
<div class="mb-3"> <div class="mb-3">
<label class="form-label">Payment Mode *</label> <label class="form-label">Payment Mode *</label>
<select asp-for="paymentMode" class="form-select" asp-items="@CustomerOnlineV2.Helper.HelperClass.GetDropdownData("pMode", true)" required>
@* <select asp-for="paymentMode" class="form-select" asp-items="@CustomerOnlineV2.Helper.HelperClass.GetDropdownData("pMode", true)" required> *@
<select asp-for="paymentMode" class="form-select" required>
@* <option selected="selected" value="">Select Payment Mode</option> @* <option selected="selected" value="">Select Payment Mode</option>
<option value="1">Cash Payment</option> <option value="1">Cash Payment</option>
<option value="2">Bank Deposit</option> <option value="2">Bank Deposit</option>
@ -207,6 +204,7 @@
<div class="col-md-3"> <div class="col-md-3">
<div class="mb-3"> <div class="mb-3">
<label class="form-label">Agent/Bank *</label> <label class="form-label">Agent/Bank *</label>
<select class="form-select form-control" asp-for="bankName"> <select class="form-select form-control" asp-for="bankName">
</select> </select>
</div> </div>
@ -247,6 +245,7 @@
</div> </div>
</div> </div>
</div> </div>
<script> <script>
(function () { (function () {
'use strict' 'use strict'
@ -278,58 +277,49 @@
var editFlag = '@editFlag'; var editFlag = '@editFlag';
var receiverId = '@receiverId'; var receiverId = '@receiverId';
editReceiver(editFlag, receiverId); editReceiver(editFlag, receiverId);
$('#Country').change(function () {
});
if ($(this).val() != '') {
PopulateDDL('paymentMode', 'pMode', $(this.val(), true, '');
$('#Country').change(function () {
}
else {
$('#paymentMode').empty();
if ($(this).val() != '') {
PopulateDDL('paymentMode', 'pMode', $(this).val(), true, '');
}
});
// $('#paymentMode').change(function () {
}
else {
$('#paymentMode').empty();
// if ($(this).val() != '') {
}
});
// PopulateAgentDDL('bankName', 'rec-select-agent', $(this).val(), true, '');
// }
// else {
// //$('#paymentMode').empty();
// // $('#Relationship').empty();
// //$('#idType').empty();
// $('#bankName').empty();
// }
// });
$('#paymentMode').change(function () {
$('#paymentMode').change(function () {
if ($(this).val() 1= '') {
if ($(this).val() != '') {
PopulateAgentDDL('bankName', 'rec-select-agent', $(this).val(), true, '');
}
else {
//$('#paymentMode').empty();
// $('#Relationship').empty();
//$('#idType').empty();
$('#bankName').empty();
}
});
PopulateAgentDDL();
}
else {
//$('#paymentMode').empty();
// $('#Relationship').empty();
//$('#idType').empty();
$('#bankName').empty();
}
});
function PopulateAgentDDL() {
function PopulateAgentDDL(id, flag, Country, pCountryid, value, countryId, showSelectOption, selectedVal) {
;
let pmode = $('#paymentMode option:selected').text();
let pCountryid = $('#Country option:selected').val();
let Data = { let Data = {
Flag: flag,
Country: Country,
pCountry: pCountryid,
Value: value,
CountryId: countryId
Flag: 'rec- select - agent',
Country: pCountryid,
Value: pmode,
}; };
$.ajax( $.ajax(
@ -343,77 +333,45 @@
}, },
async: false, async: false,
success: function (response) { success: function (response) {
PopulateDDLMain(response, id, showSelectOption, selectedVal);
PopulateDDLMain(response, 'bankName', true, '');
}, },
error: function () { error: function () {
return null; return null;
} }
}); });
};
// $('#ReceiverForm')
// .find('[name="Mobile"]')
// .intlTelInput({
// utilsScript: "https://cdnjs.cloudflare.com/ajax/libs/intl-tel-input/12.1.5/js/utils.js",
// autoPlaceholder: true,
// initialCountry: "us",
// geoIpLookup: "auto",
// });
// $('#paymentMode').change(function () {
// ;
// if ($(this).val() != '') {
// // PopulateDDL('paymentMode', 'pMode', $(this).val(), true, '');
// //PopulateDDL('Relationship', 'getRelation', $(this).val(), true, '');
// //PopulateDDL('idType', 'getIdType', $(this).val(), true, '');
// PopulateDDL('bankName', 'select-agent', $(this).val(), true, '');
// }
// else// {
// // $('#DeliveryMethod').empty();
// // $('#Relationship').empty();
// //$('#idType').empty();
// $('#bankName').empty();
// }
// });
}
});
function PopulateAgentDDL(id, flag, Country, pCountryid, value, countryId, showSelectOption, selectedVal) {
;
let Data = {
Flag: flag,
Country: Country,
pCountry: pCountryid,
Value: value,
CountryId: countryId
};
$.ajax(
{
type: 'POST',
url: '/ReceiverInformation/GetDDAgentLList',
data: Data,
headers: {
"RequestVerificationToken":
$('input[name="__RequestVerificationToken"]').val()
},
async: false,
success: function (response) {
PopulateDDLMain(response, id, showSelectOption, selectedVal);
},
error: function () {
return null;
}
});
};
// function PopulateAgentDDL(id, flag, Country, pCountryid, value, countryId, showSelectOption, selectedVal) {
// ;
// let Data = {
// Flag: flag,
// Country: Country,
// pCountry: pCountryid,
// Value: value,
// CountryId: countryId
// };
// $.ajax(
// {
// type: 'POST',
// url: '/ReceiverInformation/GetDDAgentLList',
// data: Data,
// headers: {
// "RequestVerificationToken":
// $('input[name="__RequestVerificationToken"]').val()
// },
// async: false,
// success: function (response) {
// PopulateDDLMain(response, id, showSelectOption, selectedVal);
// },
// error: function () {
// return null;
// }
// });
// };
function Receiver() { function Receiver() {
@ -566,7 +524,7 @@
// }); // });
function editReceiver(editFlag, receiverId) { function editReceiver(editFlag, receiverId) {
if (editFlag === 'Y') { if (editFlag === 'Y') {
$('#btnUpdateReceiver').show(); $('#btnUpdateReceiver').show();
$('#btnReceive').hide(); $('#btnReceive').hide();
@ -577,14 +535,19 @@
url: '/ReceiverInformation/EditReceiver/' + receiverId, url: '/ReceiverInformation/EditReceiver/' + receiverId,
success: function (data) { success: function (data) {
var result = data.receiverInformationModel[0]; var result = data.receiverInformationModel[0];
let mobile = result.mobile; let mobile = result.mobile;
const prefix = '+977'; const prefix = '+977';
if (mobile.startsWith(prefix)) { if (mobile.startsWith(prefix)) {
mobile = mobile.slice(prefix.length); mobile = mobile.slice(prefix.length);
} }
$('#Country option[value="' + result.country + '"]').attr('selected', 'selected'); $('#Country option[value="' + result.country + '"]').attr('selected', 'selected');
PopulateDDL('paymentMode', 'pMode', $('#Country option:selected').val(), true, '');
$('#firstName').val(result.firstName); $('#firstName').val(result.firstName);
$('#middleName').val(result.middleName); $('#middleName').val(result.middleName);
$('#lastName1').val(result.lastName1); $('#lastName1').val(result.lastName1);
@ -597,12 +560,20 @@
$('#idNumber').val(result.idNumber); $('#idNumber').val(result.idNumber);
$('#createdDate').val(result.createdDate); $('#createdDate').val(result.createdDate);
$('#idExpairyDate').val(result.idExpairyDate); $('#idExpairyDate').val(result.idExpairyDate);
$('#bankLocation').val(result.bankLocation);
$('#receiverAccountNumber').val(result.receiverAccountNumber);
$('#bankName').val(result.bankName);
$('#paymentMode option[value="' + result.paymentMode + '"]').attr('selected', 'selected'); $('#paymentMode option[value="' + result.paymentMode + '"]').attr('selected', 'selected');
$('#idType option[value="' + result.idType + '"]').attr('selected', 'selected'); $('#idType option[value="' + result.idType + '"]').attr('selected', 'selected');
PopulateAgentDDL();
$('#bankLocation').val(result.bankLocation);
$('#receiverAccountNumber').val(result.receiverAccountNumber);
$('#bankName option[value="' + result.bankName + '"]').attr('selected', 'selected');
// $('#bankName').val(result.bankName);
console.log('Received data:', data); console.log('Received data:', data);
}, },
error: function () { error: function () {
@ -640,7 +611,7 @@
document.getElementById('btnUpdateReceiver').addEventListener('click', function () { document.getElementById('btnUpdateReceiver').addEventListener('click', function () {
let updatedData = { let updatedData = {
Country: $('#Country option:selected').html(),
Country: $('#Country option:selected').html(),
firstName: $('#firstName').val(), firstName: $('#firstName').val(),
middleName: $('#middleName').val(), middleName: $('#middleName').val(),
lastName1: $('#lastName1').val(), lastName1: $('#lastName1').val(),
@ -680,12 +651,7 @@
} }
</script> </script>
</body> </body>
</html> </html>
@* @section Scripts{ @* @section Scripts{
} *@ } *@
Write Preview
Loading…
Cancel
Save