diff --git a/CustomerOnlineV2/CustomerOnlineV2.Common/Models/ReceiverModel/ReceiverInformationModel.cs b/CustomerOnlineV2/CustomerOnlineV2.Common/Models/ReceiverModel/ReceiverInformationModel.cs index d8b4db1..a053e10 100644 --- a/CustomerOnlineV2/CustomerOnlineV2.Common/Models/ReceiverModel/ReceiverInformationModel.cs +++ b/CustomerOnlineV2/CustomerOnlineV2.Common/Models/ReceiverModel/ReceiverInformationModel.cs @@ -19,12 +19,14 @@ namespace CustomerOnlineV2.Common.Models.ReceiverModel public string? Country { get; set; } public string? Address { get; set; } public string? State { get; set; } + public string? City { get; set; } public string? zipCode { get; set; } public string? Email { get; set; } public string? homePhone { get; set; } public string? workPhone { get; set; } public string? Mobile { get; set; } public string? Relationship { get; set; } + public string? RelationshipId { get; set; } public string? District { get; set; } public string? purposeOfRemit { get; set; } public string? receiverType { get; set; } diff --git a/CustomerOnlineV2/CustomerOnlineV2.Repository/Repository/ReceiverRepository/ReceiverRepository.cs b/CustomerOnlineV2/CustomerOnlineV2.Repository/Repository/ReceiverRepository/ReceiverRepository.cs index a5963e6..c120824 100644 --- a/CustomerOnlineV2/CustomerOnlineV2.Repository/Repository/ReceiverRepository/ReceiverRepository.cs +++ b/CustomerOnlineV2/CustomerOnlineV2.Repository/Repository/ReceiverRepository/ReceiverRepository.cs @@ -219,14 +219,14 @@ namespace CustomerOnlineV2.Repository.Repository.ReceiverRepository return await Task.FromResult(_response); } - public async Task UpdateReceiverById(ReceiverInformationModel model, string id, string user) + public async Task UpdateReceiverById(ReceiverInformationModel model, string id, string userid) { try { - var sql = "EXEC PROC_DYNAMIC_TABLE"; - sql += " @flag = " + _connHelper.FilterString("update-customer"); - sql += ",@id = " + _connHelper.FilterString(id); - sql += ",@user = " + _connHelper.FilterString(user); + var sql = "EXEC PROC_MOBILE_RECEIVER_INFORMATION "; + sql += " @flag = " + _connHelper.FilterString("modify"); + sql += ",@receiverId = " + _connHelper.FilterString(id); + sql += ",@customerId = " + _connHelper.FilterString(userid); sql += ",@country =" + _connHelper.FilterString(model.Country); sql += ",@email =" + _connHelper.FilterString(model.Email); sql += ",@firstName =" + _connHelper.FilterString(model.firstName); @@ -236,6 +236,7 @@ namespace CustomerOnlineV2.Repository.Repository.ReceiverRepository sql += ",@address =" + _connHelper.FilterString(model.Address); sql += ",@mobile =" + _connHelper.FilterString(model.Mobile); sql += ",@relationship =" + _connHelper.FilterString(model.Relationship); + sql += ",@relationship =" + _connHelper.FilterString(model.RelationshipId); sql += ",@idType =" + _connHelper.FilterString(model.idType); sql += ",@idNumber =" + _connHelper.FilterString(model.idNumber); sql += ",@paymentMode =" + _connHelper.FilterString(model.paymentMode); @@ -243,6 +244,8 @@ namespace CustomerOnlineV2.Repository.Repository.ReceiverRepository sql += ",@bankLocation =" + _connHelper.FilterString(model.bankLocation); sql += ",@bankName =" + _connHelper.FilterString(model.bankName); sql += ",@receiverAccountNo =" + _connHelper.FilterString(model.receiverAccountNumber); + sql += " ,@city = " + _connHelper.FilterString(model.City); + sql += " ,@district = " + _connHelper.FilterString(model.District); var dt = _connHelper.ExecuteDataTable(sql); if (dt == null || dt.Rows.Count <= 0) diff --git a/CustomerOnlineV2/CustomerOnlineV2/Views/ReceiverInformation/Receiver.cshtml b/CustomerOnlineV2/CustomerOnlineV2/Views/ReceiverInformation/Receiver.cshtml index a9fb6fb..d19ee35 100644 --- a/CustomerOnlineV2/CustomerOnlineV2/Views/ReceiverInformation/Receiver.cshtml +++ b/CustomerOnlineV2/CustomerOnlineV2/Views/ReceiverInformation/Receiver.cshtml @@ -100,27 +100,27 @@
- - + +
- -
- - + +
-
+ @*
- - + +
+
*@
+
@@ -135,9 +135,7 @@
-
-
@@ -156,7 +154,10 @@
-
+
+
+ + @*
@@ -167,7 +168,7 @@
-
+
*@
@@ -315,7 +316,12 @@ } else { event.preventDefault(); - Receiver(); + + var editFlag = '@editFlag'; + if (editFlag) + UpdateReceiver(); + else + Receiver(); } form.classList.add('was-validated') }, false) @@ -382,22 +388,34 @@ success: function (response) { EnableReceiveButton(); if (response.responseCode != 0) { - ShowAlertMessage(response.responseCode, response.responseMessage); - //ShowAlertMessage("Receiver Successfully created") + ShowAlertMessageErrorOnly(data, response.responseMessage); - return; + return false; } - clearFields(); + ShowAlertMessage("0", "Receiver Created successfully."); - $('#Country').focus(); - $('#message').text('Data successfully submitted'); window.location.replace("/home"); }, - error: function () { - return null; + error: function (data) { + ShowAlertMessageErrorOnly(1, "Error ocurred during create!"); } + // success: function (response) { + // EnableReceiveButton(); + // if (response.responseCode != 0) { + // ShowAlertMessage(response.responseCode, response.responseMessage); + // //ShowAlertMessage("Receiver Successfully created") + // return; + // } + // clearFields(); + // $('#Country').focus(); + // $('#message').text('Data successfully submitted'); + // window.location.replace("/home"); + // }, + // error: function () { + // return null; + // } }); } @@ -462,7 +480,7 @@ let mobile = result.mobile; const prefix = '+977'; if (mobile.startsWith(prefix)) { - mobileNum = mobile.slice(prefix.length); + mobile = mobile.slice(prefix.length); } $('#Country option[value="' + result.country + '"]').attr('selected', 'selected'); $('#firstName').val(result.firstName); @@ -471,7 +489,7 @@ $('#Relationship option[value="' + result.relationship + '"]').attr('selected', 'selected'); $('#Address').val(result.address); $('#State').val(result.state); - $('#Mobile').val(mobileNum); + $('#Mobile').val(mobile); $('#Email').val(result.email); $('#zipCode').val(result.zipCode); $('#idNumber').val(result.idNumber); @@ -516,46 +534,48 @@ }; } - document.getElementById('btnUpdateReceiver').addEventListener('click', function () { + function UpdateReceiver() { + document.getElementById('btnUpdateReceiver').addEventListener('click', function () { + + let updatedData = { + Country: $('#Country').val(), + firstName: $('#firstName').val(), + middleName: $('#middleName').val(), + lastName1: $('#lastName1').val(), + Relationship: $('#Relationship').val(), + Address: $('#Address').val(), + State: $('#State').val(), + Mobile: $('#Mobile').val(), + Email: $('#Email').val(), + zipCode: $('#zipCode').val(), + idNumber: $('#idNumber').val(), + createdDate: $('#createdDate').val(), + idExpairyDate: $('#idExpairyDate').val(), + bankLocation: $('#bankLocation').val(), + receiverAccountNumber: $('#receiverAccountNumber').val(), + bankName: $('#bankName').val(), + paymentMode: $('#paymentMode').val(), + idType: $('#idType').val() + }; - let updatedData = { - Country: $('#Country').val(), - firstName: $('#firstName').val(), - middleName: $('#middleName').val(), - lastName1: $('#lastName1').val(), - Relationship: $('#Relationship').val(), - Address: $('#Address').val(), - State: $('#State').val(), - Mobile: $('#Mobile').val(), - Email: $('#Email').val(), - zipCode: $('#zipCode').val(), - idNumber: $('#idNumber').val(), - createdDate: $('#createdDate').val(), - idExpairyDate: $('#idExpairyDate').val(), - bankLocation: $('#bankLocation').val(), - receiverAccountNumber: $('#receiverAccountNumber').val(), - bankName: $('#bankName').val(), - paymentMode: $('#paymentMode').val(), - idType: $('#idType').val() - }; + $.ajax({ + type: 'POST', + // contentType: 'application/json; charset=utf-8', + url: '/ReceiverInformation/UpdateReceiver/' + '@receiverId', + data: updatedData, - $.ajax({ - type: 'POST', - // contentType: 'application/json; charset=utf-8', - url: '/ReceiverInformation/UpdateReceiver/' + receiverId, - data: updatedData, - - success: function (response) { - console.log('Customer updated successfully:', response); - $('#message').text('Customer updated successfully'); - window.location.replace("/home"); - }, - error: function () { - console.error('Error updating customer.'); - } - }); + success: function (response) { + console.log('Customer updated successfully:', response); + $('#message').text('Customer updated successfully'); + window.location.replace("/home"); + }, + error: function () { + console.error('Error updating customer.'); + } + }); - }); + }); + } }