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;
     }
 }

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

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
 {

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))
                 {

JMEAgentSystem/WebPages/SendTxn/PrintSendMoneyRequestDetails.aspx

@@ -27,10 +27,10 @@
 
                 </tr>
                 <tr>
-                    <td class="tg-7btt" colspan="6">Receiver Information</td>
+                    <td class="tg-7btt" colspan="6">Beneficiary Information</td>
                 </tr>
                 <tr>
-                    <td class="tg-fymr">Receiver Fullname:</td>
+                    <td class="tg-fymr">Beneficiary Fullname:</td>
                     <td class="tg-0pky" runat="server" id="recFullName" colspan="5"></td>
                 </tr>
                 <tr>

JMEAgentSystem/WebPages/SendTxn/SendTxnRequest.aspx

@@ -251,8 +251,10 @@
             </div>
         </div>
     </div>
-    </div>
     <asp:HiddenField ID="hddImgURL" runat="server" />
+    
+    <asp:HiddenField runat="server" ID="hddPagentName" />
+    <asp:HiddenField runat="server" ID="hddPBranchName" />
 </asp:Content>
 <asp:Content ID="Content2" ContentPlaceHolderID="Script" runat="server">
     <style>

JMEAgentSystem/WebPages/SendTxn/SendTxnRequest.aspx.cs

@@ -354,7 +354,9 @@ namespace JMEAgentSystem.WebPages.SendTxn
                 RelationShip = relationShipId,
                 OtherRelationShip = otherRelation,
                 ReferralName = referralNameValue,
-                BranchManual = branch_manual.Text
+                BranchManual = branch_manual.Text,
+                bankName = hddPagentName.Value,
+                branchName = hddpBranch.Value
             };
 
             var result = st.SaveSendRequest(GetStatic.GetUser(), sendTxn);

JMEAgentSystem/WebPages/SendTxn/SendTxnRequest.aspx.designer.cs

@@ -389,5 +389,23 @@ namespace JMEAgentSystem.WebPages.SendTxn {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.HiddenField hddImgURL;
+        
+        /// <summary>
+        /// hddPagentName control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.HiddenField hddPagentName;
+        
+        /// <summary>
+        /// hddPBranchName control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.HiddenField hddPBranchName;
     }
 }