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

fixes

feature/19315_Customer-Registration
shakun 11 months ago
parent
c7db41971f
commit
a6e8302860
11 changed files with 381 additions and 426 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. 20
      CustomerOnlineV2/CustomerOnlineV2.Business/Business/TransactionBusiness/TransactionBusiness.cs
  2. 6
      CustomerOnlineV2/CustomerOnlineV2.Repository/Repository/ReceiverRepository/ReceiverRepository.cs
  3. 4
      CustomerOnlineV2/CustomerOnlineV2/Views/Customer/CustomerProfile.cshtml
  4. 4
      CustomerOnlineV2/CustomerOnlineV2/Views/CustomerDocument/CustomerDocument.cshtml
  5. 46
      CustomerOnlineV2/CustomerOnlineV2/Views/Home/Index.cshtml
  6. 194
      CustomerOnlineV2/CustomerOnlineV2/Views/ReceiverInformation/Receiver.cshtml
  7. 10
      CustomerOnlineV2/CustomerOnlineV2/Views/ReceiverInformation/ViewReceiverList.cshtml
  8. 28
      CustomerOnlineV2/CustomerOnlineV2/Views/Transaction/SendMoney.cshtml
  9. 13
      CustomerOnlineV2/CustomerOnlineV2/Views/Transaction/ViewAllTxn.cshtml
  10. 18
      CustomerOnlineV2/CustomerOnlineV2/Views/TransactionReport/TranReport.cshtml
  11. 2
      CustomerOnlineV2/CustomerOnlineV2/wwwroot/css/styles-login.css

20
CustomerOnlineV2/CustomerOnlineV2.Business/Business/TransactionBusiness/TransactionBusiness.cs
View File

@ -67,6 +67,7 @@ namespace CustomerOnlineV2.Business.Business.TransactionBusiness
return await _transactionRepo.GetReceiptData(id, loginDetails); return await _transactionRepo.GetReceiptData(id, loginDetails);
} }
public async Task<SendMoneySuccessModel> SaveTranData(TrustPaymentRequest tranData, LoginResponse loginDetails) public async Task<SendMoneySuccessModel> SaveTranData(TrustPaymentRequest tranData, LoginResponse loginDetails)
{ {
return await _transactionRepo.SaveTranData(tranData, loginDetails); return await _transactionRepo.SaveTranData(tranData, loginDetails);
@ -161,15 +162,15 @@ namespace CustomerOnlineV2.Business.Business.TransactionBusiness
_logger.LogError("TRANSACTIONBUSINESS | SENDMONEY.VALIDATEEXRATEREQUEST | REQUEST | " + JsonConvert.SerializeObject(_response)); _logger.LogError("TRANSACTIONBUSINESS | SENDMONEY.VALIDATEEXRATEREQUEST | REQUEST | " + JsonConvert.SerializeObject(_response));
} }
else if (sendMoneyRequest.CalcBy != "c")
{
if (sendMoneyRequest.CalcBy != "p")
else if (sendMoneyRequest.CalcBy != "c" || (sendMoneyRequest.CalcBy != "p"))
{ {
_response.ResponseCode = ResponseHelper.FAILED; _response.ResponseCode = ResponseHelper.FAILED;
_response.ResponseMessage = "Param calcBy have invalid value!"; _response.ResponseMessage = "Param calcBy have invalid value!";
_logger.LogError("TRANSACTIONBUSINESS | SENDMONEY.VALIDATEEXRATEREQUEST | REQUEST | " + JsonConvert.SerializeObject(_response)); _logger.LogError("TRANSACTIONBUSINESS | SENDMONEY.VALIDATEEXRATEREQUEST | REQUEST | " + JsonConvert.SerializeObject(_response));
}
} }
else if (string.IsNullOrEmpty(sendMoneyRequest.ReceivingCountry)) else if (string.IsNullOrEmpty(sendMoneyRequest.ReceivingCountry))
{ {
@ -272,15 +273,14 @@ namespace CustomerOnlineV2.Business.Business.TransactionBusiness
_logger.LogError("TRANSACTIONBUSINESS | DOCALCULATION.VALIDATEEXRATEREQUEST | REQUEST | " + JsonConvert.SerializeObject(_response)); _logger.LogError("TRANSACTIONBUSINESS | DOCALCULATION.VALIDATEEXRATEREQUEST | REQUEST | " + JsonConvert.SerializeObject(_response));
} }
else if (calcRequest.CalcBy != "c")
{
if (calcRequest.CalcBy != "p")
else if (calcRequest.CalcBy != "c" || calcRequest.CalcBy != "p")
{ {
_response.ResponseCode = ResponseHelper.FAILED; _response.ResponseCode = ResponseHelper.FAILED;
_response.ResponseMessage = "Param calcBy have invalid value!"; _response.ResponseMessage = "Param calcBy have invalid value!";
_logger.LogError("TRANSACTIONBUSINESS | DOCALCULATION.VALIDATEEXRATEREQUEST | REQUEST | " + JsonConvert.SerializeObject(_response)); _logger.LogError("TRANSACTIONBUSINESS | DOCALCULATION.VALIDATEEXRATEREQUEST | REQUEST | " + JsonConvert.SerializeObject(_response));
}
} }
else if (string.IsNullOrEmpty(calcRequest.ReceivingCountry)) else if (string.IsNullOrEmpty(calcRequest.ReceivingCountry))
{ {
@ -343,10 +343,8 @@ namespace CustomerOnlineV2.Business.Business.TransactionBusiness
{ {
return await _transactionRepo.GetTranData(loginDetails); return await _transactionRepo.GetTranData(loginDetails);
} }
public async Task<CustomerTransactionList> GetTransactionReportList(LoginResponse loginDetails , CustomerTransaction model)
public async Task<CustomerTransactionList> GetTransactionReportList(LoginResponse loginDetails, CustomerTransaction model)
{ {
return await _transactionRepo.GetTransactionReportList(loginDetails, model); return await _transactionRepo.GetTransactionReportList(loginDetails, model);
} }
public async Task<CustomerNotificationModel> GetRewardPoints(LoginResponse loginDetails) public async Task<CustomerNotificationModel> GetRewardPoints(LoginResponse loginDetails)

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/Customer/CustomerProfile.cshtml
View File

@ -226,7 +226,7 @@
<div class="bg-white shadow-sm rounded p-4 mb-4"> <div class="bg-white shadow-sm rounded p-4 mb-4">
<h3 class="text-5 fw-400 d-flex align-items-center mb-4"> <h3 class="text-5 fw-400 d-flex align-items-center mb-4">
Account Setting
ID Information
<a href="#edit-email" data-bs-toggle="modal" class="ms-auto text-2 text-uppercase btn-link"> <a href="#edit-email" data-bs-toggle="modal" class="ms-auto text-2 text-uppercase btn-link">
<span class="me-1"><i class="fas fa-edit"></i></span>Edit <span class="me-1"><i class="fas fa-edit"></i></span>Edit
</a> </a>
@ -538,7 +538,7 @@
}); });
function getData() { function getData() {
debugger
$.ajax({ $.ajax({
//var id; //var id;
type: 'GET', type: 'GET',

4
CustomerOnlineV2/CustomerOnlineV2/Views/CustomerDocument/CustomerDocument.cshtml
View File

@ -251,7 +251,7 @@
function FileUpload() { function FileUpload() {
;
DisableDocumentButton(); DisableDocumentButton();
@ -320,7 +320,7 @@
} }
function EnableDocumentButton() { function EnableDocumentButton() {
;
$('.ButtonTExt').show(); $('.ButtonTExt').show();
$('#btnUpload').css('cursor', 'pointer'); $('#btnUpload').css('cursor', 'pointer');
$('.loadingSend').hide(); $('.loadingSend').hide();

46
CustomerOnlineV2/CustomerOnlineV2/Views/Home/Index.cshtml
View File

@ -98,14 +98,14 @@
=============================== --> =============================== -->
<div class="transaction-title py-2 px-4"> <div class="transaction-title py-2 px-4">
<div class="row fw-00"> <div class="row fw-00">
<div class="col-1 col-sm-1">S.N</div>
<div class="col-2 col-sm-1 text-center"><span class="">Date</span></div>
<div class="col-3 col-sm-1">Payment Mode</div>
<div class="col-4 col-sm-3">Receiver Name</div>
<div class="col-5 col-sm-2"> Reference Number</div>
<div class="col-6 col-sm-1 d-none d-sm-block text-center">Status</div>
<div class="col-7 col-sm-1">Send Amount </div>
<div class="col-8 col-sm-2">Recieve Amount </div>
<div class="col-1 col-sm-1" style="width:3%; color:white">S.N</div>
<div class="col-1 col-sm-1 text-center" style="color:white"><span class="">Date</span></div>
<div class="col-3 col-sm-2" style="color:white">Payment Mode</div>
<div class="col-4 col-sm-2" style="width:13%; color:white;">Receiver Name</div>
<div class="col-5 col-sm-2" style="color:white"> Reference Number</div>
<div class="col-6 col-sm-2 d-none d-sm-block text-center" style=" color:white">Status</div>
<div class="col-7 col-sm-1" style="color:white">Send Amount </div>
<div class="col-8 col-sm-1" style="color:white">Recieve Amount </div>
</div> </div>
</div> </div>
<!-- Title End --> <!-- Title End -->
@ -212,12 +212,12 @@
=============================== --> =============================== -->
<div class="transaction-title py-2 px-4"> <div class="transaction-title py-2 px-4">
<div class="row fw-00"> <div class="row fw-00">
<div class="col-1 col-sm-1">S.N</div>
<div class="col-2 col-sm-3">Name</div>
<div class="col-3 col-sm-2">Send Transaction</div>
<div class="col-4 col-sm-2 d-none d-sm-block text-center">Country</div>
<div class="col-5 col-sm-2 text-end">Transaction Type</div>
<div class="col-6 col-sm-2">Actions</div>
<div class="col-1 col-sm-1" style="color:white">S.N</div>
<div class="col-2 col-sm-3" style="color:white">Name</div>
<div class="col-3 col-sm-2" style="color:white">Send Transaction</div>
<div class="col-4 col-sm-2 d-none d-sm-block text-center" style="color:white">Country</div>
<div class="col-5 col-sm-2 text-end" style="color:white">Transaction Type</div>
<div class="col-6 col-sm-2" style="color:white">Actions</div>
</div> </div>
</div> </div>
<!-- Title End --> <!-- Title End -->
@ -440,25 +440,25 @@
row += `<div class="transaction-item px-4 py-3" data-bs-toggle="modal" data-bs-target="#transaction-detail" onclick="getData(${d['id']})">`; row += `<div class="transaction-item px-4 py-3" data-bs-toggle="modal" data-bs-target="#transaction-detail" onclick="getData(${d['id']})">`;
row += '<div class="row align-items-center flex-row">'; row += '<div class="row align-items-center flex-row">';
row += `<div class="col-1 col-sm-1">${i + 1}</div>`;
row += `<div class="col-1 col-sm-1" style="width: 3%;">${i + 1}</div>`;
row += `<div class="col-2 col-sm-1 text-center"><span class="d-block text-1 fw-300">${d['transactionDay']}</span><span class="d-block text-1 fw-300 text-uppercase">${d['transactionMonth']}</span></div>`; row += `<div class="col-2 col-sm-1 text-center"><span class="d-block text-1 fw-300">${d['transactionDay']}</span><span class="d-block text-1 fw-300 text-uppercase">${d['transactionMonth']}</span></div>`;
row += `<div class="col-3 col-sm-1"><span class="d-block text-1">${d['pBankName']}</span><span class="text-muted">${d['paymentMethod']}</span></div>`;
row += `<div class="col-4 col-sm-3"><span class="text-nowrap">${d['receiverName']}</span></div>`;
row += `<div class="col-5 col-sm-2"><span class="text-nowrap">${d['controlNo']}</span></div>`;
row += `<div class="col-3 col-sm-2"><span class="d-block text-1">${d['pBankName']}</span><span class="text-muted">${d['paymentMethod']}</span></div>`;
row += `<div class="col-4 col-sm-2" style="width:13%;"><span class="table-responsive">${d['receiverName']}</span></div>`;
row += `<div class="col-5 col-sm-2"><span class="table-responsive">${d['controlNo']}</span></div>`;
if (d['status'].toLowerCase() == 'paid') { if (d['status'].toLowerCase() == 'paid') {
row += `<div class="col-6 col-sm-1 d-none d-sm-block text-center text-1"><span class="text-success" data-bs-toggle="tooltip" title="" data-bs-original-title="Completed"><i class="fas fa-check-circle"></i> Paid</span></div>`;
row += `<div class="col-6 col-sm-2 d-none d-sm-block text-center text-1" style="color:#008000;><span class="text-success" data-bs-toggle="tooltip" title="" data-bs-original-title="Completed"><i class="fas fa-check-circle"></i> Paid</span></div>`;
} else if (d['status'].toLowerCase() == 'cancel') { } else if (d['status'].toLowerCase() == 'cancel') {
row += `<div class="col-6 col-sm-1 d-none d-sm-block text-center text-1"><span class="text-danger" data-bs-toggle="tooltip" title="" data-bs-original-title="Cancel"><i class="fas fa-times-circle"></i> Cancel</span></div>`;
row += `<div class="col-6 col-sm-2 d-none d-sm-block text-center text-1" style="color:#FF0000;><span class="text-danger" data-bs-toggle="tooltip" title="" data-bs-original-title="Cancel"><i class="fas fa-times-circle"></i> Cancel</span></div>`;
} else if (d['status'].toLowerCase() == 'processing') { } else if (d['status'].toLowerCase() == 'processing') {
row += `<div class="col-6 col-sm-1 d-none d-sm-block text-center text-1"><span class="text-warning" data-bs-toggle="tooltip" title="In Progress">PROCESSING</span></div>`;
row += `<div class="col-6 col-sm-2 d-none d-sm-block text-center text-1" style="color:#AF804F;><span class="text-warning" data-bs-toggle="tooltip" title="In Progress">PROCESSING</span></div>`;
} }
else else
row += `<div class="col-6 col-sm-1 d-none d-sm-block text-center text-1"><span class="text-warning" data-bs-toggle="tooltip" title="Status"> ${d['status']}</span></div>`;
row += `<div class="col-6 col-sm-2 d-none d-sm-block text-center text-1" style="color:#514e82;><span class="text-warning" data-bs-toggle="tooltip" title="Status"> ${d['status']}</span></div>`;
row += `<div class="col-7 col-sm-1 text-center"><span class="d-block text-1 fw-300">${d['cAmt']}</span><span class="d-block text-1 fw-300 text-uppercase">(${d['collCurr']})</span></div>`; row += `<div class="col-7 col-sm-1 text-center"><span class="d-block text-1 fw-300">${d['cAmt']}</span><span class="d-block text-1 fw-300 text-uppercase">(${d['collCurr']})</span></div>`;
// row += `<div class="col-7 col-sm-2"><span class="text-nowrap">-${d['amount']}</span><span class="text-2 text-uppercase">(${d['pCurrency']})</span></div>`; // row += `<div class="col-7 col-sm-2"><span class="text-nowrap">-${d['amount']}</span><span class="text-2 text-uppercase">(${d['pCurrency']})</span></div>`;
//row += `<div class="col-8 col-sm-2"><span class="text-nowrap">${d['amount']}</span><span class="text-2 text-uppercase">(${d['pCurrency']})</span></div>`; //row += `<div class="col-8 col-sm-2"><span class="text-nowrap">${d['amount']}</span><span class="text-2 text-uppercase">(${d['pCurrency']})</span></div>`;
row += `<div class="col-8 col-sm-2 text-center"><span class="d-block text-1 fw-300">${d['amount']}</span><span class="d-block text-1 fw-300 text-uppercase">(${d['pCurrency']})</span></div>`;
row += `<div class="col-8 col-sm-1 text-center"><span class="d-block text-1 fw-300">${d['amount']}</span><span class="d-block text-1 fw-300 text-uppercase">(${d['pCurrency']})</span></div>`;
row += '</div>'; row += '</div>';
row += '</div>'; row += '</div>';
row += '</div>'; row += '</div>';

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

@ -17,16 +17,16 @@
<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 {
-webkit-appearance: none; -webkit-appearance: none;
margin: 0; margin: 0;
} }
</style>
</style>
</head> </head>
<body> <body>
<div id="content" class=" py-4">
<div id="content" class=" py-4">
<div class="container"> <div class="container">
<div class="row"> <div class="row">
<!-- Middle Panel --> <!-- Middle Panel -->
@ -105,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">
@ -135,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>
@ -203,81 +204,8 @@
<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" asp-items="@CustomerOnlineV2.Helper.HelperClass.GetDropdownData("rec-select-agent", true)" required>
@* <option selected="selected" value="">Select Bank</option>
asp-items="@CustomerOnlineV2.Helper.HelperClass.GetDropdownData("rec-select-agent", true)"
asp-items="@CustomerOnlineV2.Helper.HelperClass.GetDropdownData("rec-select-agent", true)"
<option value="1163">AGRICULTURAL DEVELOPMENT BANK LTD</option>
<option value="1120">APEX DEVELOPMENT BANK LTD</option>
<option value="1121">ARANIKO DEVELOPMENT BANK LTD</option>
<option value="1122">BOKLUMBINI BANK LTD</option>
<option value="1123">CENTURY BANK</option>
<option value="1124">CITIZENS BANK INTERNATIONAL LTD.</option>
<option value="1125">CIVIL BANK LTD</option>
<option value="1126">DEVA BIKAS BANK LIMITED</option>
<option value="1127">EVEREST BANK LTD</option>
<option value="1171">EXCEL DEVELOPMENT BANK LTD</option>
<option value="1172">GANDAKI BIKAS BANK LTD</option>
<option value="1128">GARIMA BIKASH BANK LIMITED</option>
<option value="1217">GENERAL FINANCE LTD</option>
<option value="1173">GLOBAL IME BANK LTD</option>
<option value="1129">GREEN DEVELOPMENT BANK LTD</option>
<option value="1220">GURKHAS FINANCE</option>
<option value="1210">HIMALAYAN BANK LTD</option>
<option value="1221">ICFC FINANCE</option>
<option value="1130">JANATA BANK NEPAL LTD</option>
<option value="1131">JHIMRUK BIKAS BANK LTD</option>
<option value="1177">JYOTI BIKASH BANK LTD</option>
<option value="1132">KAILASH BIKAS BANK LTD</option>
<option value="1133">KALINCHOWK DEVELOPMENT BANK LTD</option>
<option value="1179">KAMANA SEWA BIKASH BANK LTD</option>
<option value="1134">KANKREBIHAR DEVELOPMENT BANK LTD</option>
<option value="1135">KASTHAMANDAP DEVELOPMENT BANK LIMITED</option>
<option value="1136">KUMARI BANK LTD</option>
<option value="1137">LAXMI BANK LTD</option>
<option value="1185">LUMBINI BIKASH BANK LTD</option>
<option value="1138">MACHHAPUCHRE BANK LTD</option>
<option value="1186">MAHALAXMI BIKASH BANK LIMITED</option>
<option value="1140">MATRIBHUMI DEVELOPMENT BANK LTD</option>
<option value="1141">MEGA BANK NEPAL LTD</option>
<option value="1188">MISSION DEVELOPMENT BANK LTD</option>
<option value="1189">MUKTINATH BIKASH BANK LTD</option>
<option value="1190">NABIL BANK LTD</option>
<option value="1191">NCC BANK LTD</option>
<option value="1192">NEPAL BANGLADESH BANK LTD.</option>
<option value="1193">NEPAL BANK LIMITED</option>
<option value="1160">NEPAL INVESTMENT BANK</option>
<option value="1212">NEPAL SBI BANK LTD</option>
<option value="1142">NIC ASIA BANK LTD</option>
<option value="1213">NIRDHAN UTTHAN BANK LTD</option>
<option value="1197">NMB BANK LTD</option>
<option value="1198">OM DEVELOPMENT BANK LTD</option>
<option value="1143">PACIFIC DEVELOPMENT BANK LTD</option>
<option value="1580">Pokhara Finance</option>
<option value="1144">PRABHU BANK LTD</option>
<option value="1145">PRIME BANK LTD</option>
<option value="1214">RASTRIYA BANIJYA BANK LTD</option>
<option value="1146">RELIABLE DEVELOPMENT BANK LTD</option>
<option value="1203">SAHARA BIKASH BANK LTD</option>
<option value="1147">SAHAYOGI BIKASH BANK LTD</option>
<option value="1215">SAJHA BIKASH BANK LTD</option>
<option value="1148">SALAPA BIKAS BANK LTD</option>
<option value="1149">SANIMA BANK</option>
<option value="1150">SAPTAKOSHI DEVELOPMENT BANK LTD</option>
<option value="1219">SEWA BIKASH BANK LTD</option>
<option value="1205">SHANGRILA DEVELOPMENT BANK LTD</option>
<option value="1151">SHINE RESUNGA DEVELOPMENT BANK LTD</option>
<option value="1152">SIDDHARTHA BANK LTD</option>
<option value="1216">STANDARD CHARTERED BANK NEPAL LTD</option>
<option value="1154">SUBHECHHA BIKASH BANK LTD</option>
<option value="1155">SUNRISE BANK LTD</option>
<option value="1156">TINAU BIKASH BANK LIMITED</option>
<option value="1207">TOURISM DEVELOPMENT BANK LTD</option>
<option value="1222">TRIVENI BIKASH BANK LTD</option>
<option value="1218">VYCCU SAVING AND CREDIT CO-OPERATIVE LTD</option>
<option value="1158">YETI DEVELOPMENT BANK LTD</option>
*@
<select class="form-select form-control" asp-for="bankName">
</select> </select>
</div> </div>
</div> </div>
@ -316,7 +244,7 @@
</div> </div>
</div> </div>
</div>
</div>
<script> <script>
(function () { (function () {
@ -349,7 +277,7 @@
var editFlag = '@editFlag'; var editFlag = '@editFlag';
var receiverId = '@receiverId'; var receiverId = '@receiverId';
editReceiver(editFlag, receiverId); editReceiver(editFlag, receiverId);
});
$('#Country').change(function () { $('#Country').change(function () {
@ -370,7 +298,7 @@
if ($(this).val() != '') { if ($(this).val() != '') {
PopulateAgentDDL('bankName', 'rec-select-agent', $(this).val(), true, '');
PopulateAgentDDL();
} }
else { else {
//$('#paymentMode').empty(); //$('#paymentMode').empty();
@ -381,45 +309,17 @@
}); });
$('#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() {
let pmode = $('#paymentMode option:selected').text();
let pCountryid = $('#Country option:selected').val();
});
function PopulateAgentDDL(id, flag, Country, pCountryid, value, countryId, showSelectOption, selectedVal) {
;
let Data = { let Data = {
Flag: flag,
Country:Country,
pCountry: pCountryid,
Value: value,
CountryId: countryId
Flag: 'rec- select - agent',
Country: pCountryid,
Value: pmode,
}; };
$.ajax( $.ajax(
@ -433,16 +333,47 @@
}, },
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;
} }
}); });
};
function Receiver() {
}
// 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() {
DisableReceiveButton(); DisableReceiveButton();
@ -611,7 +542,12 @@
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);
@ -624,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 () {

10
CustomerOnlineV2/CustomerOnlineV2/Views/ReceiverInformation/ViewReceiverList.cshtml
View File

@ -45,11 +45,11 @@
=============================== --> =============================== -->
<div class="transaction-title py-2 px-4"> <div class="transaction-title py-2 px-4">
<div class="row fw-00"> <div class="row fw-00">
<div class="col-1 col-sm-1">S.N</div>
<div class="col-2 col-sm-3">Name</div>
<div class="col-3 col-sm-2">Re-Send </div>
<div class="col-4 col-sm-2">Country</div>
<div class="col-5 col-sm-2 text-end">Transaction Type</div>
<div class="col-1 col-sm-1" style="color:white">S.N</div>
<div class="col-2 col-sm-3" style="color:white">Name</div>
<div class="col-3 col-sm-2" style="color:white">Re-Send </div>
<div class="col-4 col-sm-2" style="color:white">Country</div>
<div class="col-5 col-sm-2 text-end" style="color:white">Transaction Type</div>
</div> </div>
</div> </div>
<!-- Title End --> <!-- Title End -->

28
CustomerOnlineV2/CustomerOnlineV2/Views/Transaction/SendMoney.cshtml
View File

@ -220,19 +220,24 @@
if ($(this).val() != '') { if ($(this).val() != '') {
PopulateDDL('DeliveryMethod', 'pMode', $(this).val(), true, ''); PopulateDDL('DeliveryMethod', 'pMode', $(this).val(), true, '');
PopulateDDL('Receiver', 'receiverList', $(this).val(), true, ''); PopulateDDL('Receiver', 'receiverList', $(this).val(), true, '');
} }
else { else {
$('#DeliveryMethod').empty(); $('#DeliveryMethod').empty();
$('#Receiver').empty(); $('#Receiver').empty();
} }
}); });
$('#SchemeId').on('change', function () { $('#SchemeId').on('change', function () {
var collectionAmount; var collectionAmount;
var payoutAmount; var payoutAmount;
if (isNaN(parseFloat($('#CollectAmount').val()))) if (isNaN(parseFloat($('#CollectAmount').val())))
collectionAmount = 0; collectionAmount = 0;
if (isNaN(parseFloat($('#PayoutAmount').val()))) if (isNaN(parseFloat($('#PayoutAmount').val())))
payoutAmount = 0; payoutAmount = 0;
if (collectionAmount > 0 | payoutAmount > 0) if (collectionAmount > 0 | payoutAmount > 0)
DoCalcualtion(); DoCalcualtion();
}); });
@ -243,27 +248,33 @@
} }
}); });
$('#PayoutAmount').on('change', function () {
if (!isNaN(parseFloat($(this).val())) && parseFloat($(this).val()) > 0) {
$('#hdnCalcBy').val('p');
}
});
// $('#PayoutAmount').on('change', function () {
$("#CollectAmount").blur(function () {
// console.log($(this).val());
// });
$("#CollectAmount").blur(function () {
DoCalcualtion(); DoCalcualtion();
}); });
$("#PayoutAmount").blur(function () { $("#PayoutAmount").blur(function () {
// checkdata($("#hdnCalcBy").val(), 'c'); // checkdata($("#hdnCalcBy").val(), 'c');
if (!isNaN(parseFloat($(this).val())) && parseFloat($(this).val()) > 0) {
$('#hdnCalcBy').val('p');
DoCalcualtion();
}
}); });
$("#DiscountFee").blur(function () { $("#DiscountFee").blur(function () {
DoCalcualtion(); DoCalcualtion();
}); });
$('#SchemeId').on('change', function () { $('#SchemeId').on('change', function () {
GetRewardDetails(); GetRewardDetails();
}); });
}); });
function GetRewardDetails() { function GetRewardDetails() {
$.ajax({ $.ajax({
@ -427,6 +438,7 @@
$('#hdnForexSessionId').val(response.forexSessionId); $('#hdnForexSessionId').val(response.forexSessionId);
$('#hdnProcessId').val(response.processId); $('#hdnProcessId').val(response.processId);
$('#hdnTPExRate').val(response.tpExRate); $('#hdnTPExRate').val(response.tpExRate);
}, },
error: function () { error: function () {
return null; return null;
@ -459,6 +471,7 @@
let exRate = $('#hdnExRate').val(); let exRate = $('#hdnExRate').val();
let forexSessionId = $('#hdnForexSessionId').val(); let forexSessionId = $('#hdnForexSessionId').val();
let processId = $('#hdnProcessId').val(); let processId = $('#hdnProcessId').val();
let discount = $('#DiscountFee').val(); let discount = $('#DiscountFee').val();
if (calcBy == '') { if (calcBy == '') {
@ -518,6 +531,7 @@
SchemeId: schemeId, SchemeId: schemeId,
TpExRate: tpExRate, TpExRate: tpExRate,
DiscountFee: discount DiscountFee: discount
}; };
$.ajax( $.ajax(

13
CustomerOnlineV2/CustomerOnlineV2/Views/Transaction/ViewAllTxn.cshtml
View File

@ -42,12 +42,12 @@
=============================== --> =============================== -->
<div class="transaction-title py-2 px-4"> <div class="transaction-title py-2 px-4">
<div class="row fw-00"> <div class="row fw-00">
<div class="col-1 col-sm-1">S.N</div>
<div class="col-2 col-sm-3">Receiver Details</div>
<div class="col-3 col-sm-2">Amount </div>
<div class="col-4 col-sm-2">Repeat</div>
<div class="col-5 col-sm-2">Country</div>
<div class="col-6 col-sm-2 text-end">Transaction Type</div>
<div class="col-1 col-sm-1" style="color:white">S.N</div>
<div class="col-2 col-sm-3" style="color:white">Receiver Details</div>
<div class="col-3 col-sm-2" style="color:white">Amount </div>
<div class="col-4 col-sm-2" style="color:white">Repeat</div>
<div class="col-5 col-sm-2" style="color:white">Country</div>
<div class="col-6 col-sm-2 text-end" style="color:white">Transaction Type</div>
</div> </div>
</div> </div>
<!-- Title End --> <!-- Title End -->
@ -185,7 +185,6 @@
<div class="col-1 col-sm-3"><span class="d-block text-1">${d.receiverName}</span><span class="text-muted">${d.recAccountNum}</span></div> <div class="col-1 col-sm-3"><span class="d-block text-1">${d.receiverName}</span><span class="text-muted">${d.recAccountNum}</span></div>
<div class="col-2 col-sm-2" id="payAmt">${d.amount}</div> <div class="col-2 col-sm-2" id="payAmt">${d.amount}</div>
<div class="col-2 col-sm-2"> <span class="d-block text-1"><a href="/Transaction/SendMoney">Send Transaction</a></span></div> <div class="col-2 col-sm-2"> <span class="d-block text-1"><a href="/Transaction/SendMoney">Send Transaction</a></span></div>
<div class="col-3 col-sm-2" id="recCountry">${d.pCountry}</div> <div class="col-3 col-sm-2" id="recCountry">${d.pCountry}</div>
<div class="col-4 col-sm-2 text-end" id="tranType">${d.paymentMethod}</div> <div class="col-4 col-sm-2 text-end" id="tranType">${d.paymentMethod}</div>
</div> </div>

18
CustomerOnlineV2/CustomerOnlineV2/Views/TransactionReport/TranReport.cshtml
View File

@ -54,15 +54,15 @@
=============================== --> =============================== -->
<div class="transaction-title py-2 px-4"> <div class="transaction-title py-2 px-4">
<div class="row fw-00"> <div class="row fw-00">
<div class="col-1 col-sm-1">S.N</div>
<div class="col-2 col-sm-2">Transaction Date</div>
<div class="col-3 col-sm-2">Receiver Name</div>
<div class="col-4 col-sm-2">Control No</div>
<div class="col-5 col-sm-1">Sent Amount</div>
<div class="col-6 col-sm-1">Recieve Amount</div>
<div class="col-7 col-sm-1">Delivery Method</div>
<div class="col-8 col-sm-1 text-end">Transaction Detail View</div>
<div class="col-1 col-sm-1" style="color:white">S.N</div>
<div class="col-2 col-sm-2" style="color:white">Transaction Date</div>
<div class="col-3 col-sm-2" style="color:white">Receiver Name</div>
<div class="col-4 col-sm-2" style="color:white">Control No</div>
<div class="col-5 col-sm-1" style="color:white">Sent Amount</div>
<div class="col-6 col-sm-1" style="color:white">Recieve Amount</div>
<div class="col-7 col-sm-1" style="color:white">Delivery Method</div>
<div class="col-8 col-sm-1 text-end" style="color:white">Transaction Detail View</div>
@* <div class="col-7 col-sm-1 text-end">Total Sent Amount</div> *@ @* <div class="col-7 col-sm-1 text-end">Total Sent Amount</div> *@
</div> </div>

2
CustomerOnlineV2/CustomerOnlineV2/wwwroot/css/styles-login.css
View File

@ -1526,7 +1526,7 @@ hr {
} }
.transaction-title { .transaction-title {
background-color: #f1f5f6;
background-color: #272364;
border-top: 1px solid #e9eff0; border-top: 1px solid #e9eff0;
border-bottom: 1px solid #e9eff0; border-bottom: 1px solid #e9eff0;
} }

Write Preview
Loading…
Cancel
Save