diff --git a/JMEAgentSystem/Scripts/SendTxnJs/SendMoneyRequest.js b/JMEAgentSystem/Scripts/SendTxnJs/SendMoneyRequest.js index fcdc4cc..87554d2 100644 --- a/JMEAgentSystem/Scripts/SendTxnJs/SendMoneyRequest.js +++ b/JMEAgentSystem/Scripts/SendTxnJs/SendMoneyRequest.js @@ -35,7 +35,6 @@ $(document).ready(function () { dataType: 'JSON', type: 'POST', success: function (response) { - debugger $("#searchCustomer").removeAttr("disabled"); if (response[0].errorCode === 0) { $('#step2SendRemittance').show(); @@ -839,31 +838,46 @@ function ValidateDetails() { // $("#branchRequired").hide(); //} let purposeValue = $("#" + mId + "purpose option:selected").val(); - if (purposeValue == '11347') { + if (purposeValue === '11347') { reqField += "purposeOther,"; } let relationValue = $("#" + mId + "relationship option:selected").val(); - if (relationValue == '11339') { + if (relationValue === '11339') { reqField += "otherRelationshipTextBox,"; } if (ValidRequiredFieldWithDoc(reqField) === false) { return false; } else { - debugger var pMode = $("#" + mId + "pMode").val(); var pAgent = $("#" + mId + "pAgent").val(); var pbranch = $("#" + mId + "branch").val(); - if (pMode == "2") { - if (pAgent == '' || pAgent == undefined || pAgent == null) { + var accountNo = $("#" + mId + "accountNo").val(); + if (pMode === "2") { + if (pAgent === '' || pAgent === undefined || pAgent === null) { $("#" + mId + "pAgent").css('background-color', '#FFCCD2'); swal('Required Field(s)\n _____________________________ \n The red fields are required!'); - return false + return false; + } + if (accountNo === '' || accountNo === undefined || accountNo === null) { + $("#" + mId + "accountNo").css('background-color', '#FFCCD2'); + swal('Required Field(s)\n _____________________________ \n The red fields are required!'); + return false; } } debugger $("#" + mId + "hddPmode").val(pMode); $("#" + mId + "hddPagent").val(pAgent); $("#" + mId + "hddpBranch").val(pbranch); + + var country = $("#" + mId + "pCountry option:selected ").text(); + + $("#" + mId + "hddPagentName").val($("#" + mId + "pAgent option:selected").text()); + if (country.toUpperCase() === 'NEPAL' || country.toUpperCase() === 'VIETNAM') { + $("#" + mId + "hddPBranchName").val($("#" + mId + "branch_manual").val()); + } + else { + $("#" + mId + "hddPBranchName").val($("#" + mId + "branch option:selected").text()); + } return true; } } diff --git a/JMEAgentSystem/WebPages/BenificiaryRegistration/Manage.aspx.cs b/JMEAgentSystem/WebPages/BenificiaryRegistration/Manage.aspx.cs index da4f93b..b8e20e2 100644 --- a/JMEAgentSystem/WebPages/BenificiaryRegistration/Manage.aspx.cs +++ b/JMEAgentSystem/WebPages/BenificiaryRegistration/Manage.aspx.cs @@ -3,7 +3,6 @@ using Business.Customer; using Business.ReferralReports; using Common.Helper; using Common.Model.BenificiaryModel; -using Common.Model.ReferralReports; using Common.Utility; using JMEAgentSystem.Library.Remittance; using Newtonsoft.Json; @@ -16,9 +15,7 @@ using System.Data; using System.Linq; using System.Reflection; using System.Text; -using System.Web; using System.Web.Script.Serialization; -using System.Web.UI; using System.Web.UI.WebControls; namespace JMEAgentSystem.WebPages.BenificiaryRegistration diff --git a/JMEAgentSystem/WebPages/CustomerRegistration/PrintDetails.aspx.cs b/JMEAgentSystem/WebPages/CustomerRegistration/PrintDetails.aspx.cs index 96c4751..7b84c67 100644 --- a/JMEAgentSystem/WebPages/CustomerRegistration/PrintDetails.aspx.cs +++ b/JMEAgentSystem/WebPages/CustomerRegistration/PrintDetails.aspx.cs @@ -2,13 +2,8 @@ using Business.Customer; using Common.Helper; using System; -using System.Collections.Generic; using System.Data; -using System.Linq; using System.Text; -using System.Web; -using System.Web.UI; -using System.Web.UI.WebControls; namespace JMEAgentSystem.WebPages.CustomerRegistration { diff --git a/JMEAgentSystem/WebPages/GetFileView.ashx.cs b/JMEAgentSystem/WebPages/GetFileView.ashx.cs index cf223bd..c6ad98f 100644 --- a/JMEAgentSystem/WebPages/GetFileView.ashx.cs +++ b/JMEAgentSystem/WebPages/GetFileView.ashx.cs @@ -28,7 +28,8 @@ namespace JMEAgentSystem.WebPages var membershipNo = context.Request.QueryString["membershipNo"]; var fileName = context.Request.QueryString["fileName"]; DateTime txnDate = Convert.ToDateTime(registerDate); - imgPath = GetStatic.GetCustomerFilePath() + "CustomerDocument\\" + registerDate.Replace("-", "\\") + "\\" + membershipNo + "\\" + fileName; + //imgPath = GetStatic.GetCustomerFilePath() + "CustomerDocument\\" + registerDate.Replace("-", "\\") + "\\" + membershipNo + "\\" + fileName; + imgPath = Path.Combine(GetStatic.GetCustomerFilePath(), "CustomerDocument", registerDate.Replace("-", "/"), membershipNo, fileName); if (File.Exists(imgPath)) { diff --git a/JMEAgentSystem/WebPages/SendTxn/PrintSendMoneyRequestDetails.aspx b/JMEAgentSystem/WebPages/SendTxn/PrintSendMoneyRequestDetails.aspx index f90cf0c..2022c41 100644 --- a/JMEAgentSystem/WebPages/SendTxn/PrintSendMoneyRequestDetails.aspx +++ b/JMEAgentSystem/WebPages/SendTxn/PrintSendMoneyRequestDetails.aspx @@ -27,10 +27,10 @@ - Receiver Information + Beneficiary Information - Receiver Fullname: + Beneficiary Fullname: diff --git a/JMEAgentSystem/WebPages/SendTxn/SendTxnRequest.aspx b/JMEAgentSystem/WebPages/SendTxn/SendTxnRequest.aspx index 92d0581..00a323e 100644 --- a/JMEAgentSystem/WebPages/SendTxn/SendTxnRequest.aspx +++ b/JMEAgentSystem/WebPages/SendTxn/SendTxnRequest.aspx @@ -251,8 +251,10 @@ - + + +