bank edit

bank modify

Swift.DAL/Remittance/Transaction/ModifyTransactionDao.cs

@@ -207,6 +207,14 @@ namespace Swift.DAL.BL.Remit.Transaction
             return GetSingleResult(sql);
         }
 
+        public string SelectBankName(string user, string tranId)
+        {
+            string sql = "EXEC [proc_modifyTXN]";
+            sql += "  @flag = 'branchId'";
+            sql += ", @user = " + FilterString(user);
+            sql += ", @tranId = " + FilterString(tranId);
+            return GetSingleResult(sql);
+        }
         public DbResult TranViewLog(
                          string user
                         , string tranId

Swift.web/AgentNew/Administration/CustomerSetup/CustomerRegistration/Manage.aspx

@@ -38,7 +38,7 @@
         }
 
         .lowercase {
-            text-transform: lowercase !important;
+            text-transform: none !important;
         }
     </style>
     <script type="text/javascript">

Swift.web/AgentNew/SendTxn/SendIntlReceipt.aspx.cs

@@ -91,7 +91,7 @@ namespace Swift.web.AgentNew.SendTxn
                     createdBy.Text = sRow["companyaddress"].ToString();
                     approvedDate.Text = DateTime.Parse(sRow["createdDate"].ToString()).ToString("yyyy-MM-dd hh:mm:ss tt");
                     cAmt.Text = GetStatic.ShowDecimal(sRow["cAmt"].ToString()) + "&nbsp" + sRow["collCurr"].ToString();
-                    serviceCharge.Text = GetStatic.ShowDecimal(sRow["serviceCharge"].ToString()) + "&nbsp" + sRow["collCurr"].ToString();
+                    serviceCharge.Text = GetStatic.ShowTwoDecimal(sRow["serviceCharge"].ToString()) + "&nbsp" + sRow["collCurr"].ToString();
                     tAmt.Text = GetStatic.ShowDecimal(sRow["tAmt"].ToString()) + "&nbsp" + sRow["collCurr"].ToString();
                     exRate.Text = sRow["exRate"].ToString() + "&nbsp" + sRow["payoutCurr"].ToString();
                     pAmt.Text = GetStatic.ShowDecimal(sRow["pAmt"].ToString()) + "&nbsp" + sRow["payoutCurr"].ToString();

Swift.web/Library/GetStatic.cs

@@ -1836,6 +1836,13 @@ namespace Swift.web.Library
                 return strVal;
         }
 
+        public static String ShowTwoDecimal(String strVal)
+        {
+            if (strVal != "")
+                return double.Parse(strVal).ToString("0.00");
+            else
+                return strVal;
+        }
         public static String ShowDecimal(String strVal)
         {
             if (strVal != "")

Swift.web/MobileRemit/Admin/Operation/EditCustomerForApproval.aspx

@@ -55,6 +55,10 @@
             height: 300px;
             width: 400px
         }
+
+        .lowercase {
+            text-transform: none !important;
+        }
     </style>
     <script>
         $(document).ready(function () {
@@ -82,8 +86,8 @@
             $("#editSelfie").click(function () {
                 $("#uploadcustomerSelfieDiv2").show();
             })
-         
-            
+
+
             /*   $("#" + mId + "occupation").change(function () {*/
             $("#occupation").change(function () {
                 $("#divOccupation").hide();
@@ -326,7 +330,7 @@
                 ParseCustomerData(response);
                 PopulateImage();
                 PopulateSignature();
-               
+
                 //DisableFields();
                 ChangeOrganisationType();
             }).fail(function () {
@@ -404,7 +408,7 @@
                     $('#<%=hdnreg_additional_id2CdId.ClientID%>').val(url4.FileName + '|' + url4.CdId);
                 }
                 else
-                   $("#divAdditional_id2").hide();
+                    $("#divAdditional_id2").hide();
 
                 debugger;
                 const filtered = data.filter(item => item.isEkyc === true);
@@ -412,10 +416,10 @@
                 if (filtered != null) {
 
                     var selfie = filtered.filter(item => item.DocumentName === "Customer Selfie")[0];
-                  
+
                     if (selfie) {
-                        
-                     /*   $("#customerSelfieDiv").show();*/
+
+                        /*   $("#customerSelfieDiv").show();*/
                         $("#imgselfieId").attr("src", selfie.ImageUrl);
                         editSelfieCrop.setAttribute('onclick', 'documentCrop( " ' + selfie.FileName + ' ", " ' + selfie.CdId + ' " , " ' + filtered.FileType + ' " , this.id )');
 
@@ -429,9 +433,9 @@
                     }
                     else
                         /*$("#customerSelfieDiv").hide();*/
-                   
 
-                    var facePicture = filtered.filter(item => item.DocumentName === "Face Picture")[0];
+
+                        var facePicture = filtered.filter(item => item.DocumentName === "Face Picture")[0];
                     if (facePicture) {
                         $("#FacePictureDiv").show();
 
@@ -478,7 +482,7 @@
                     }
                 }
                 else {
-                   // $("#customerSelfieDiv").hide();
+                    // $("#customerSelfieDiv").hide();
                     //$("#FacePictureDiv").hide();
                     $("#AdditionalIDFront2Div").hide();
                     $("#IDFrontFeatureDiv").hide();
@@ -747,7 +751,7 @@
             return true;
         }
         function CheckFormValidation() {
-             debugger;
+            debugger;
             var reqField = "";
             var val = $("#<% =hdnCustomerId.ClientID%>").val();
             var customerType = $("#<% =ddlCustomerType.ClientID%>").val();
@@ -1207,7 +1211,7 @@
                                             <div class="col-md-4 col-sm-4">
                                                 <div class="form-group">
                                                     <label>City:<span class="errormsg">*</span></label>
-                                                    <asp:TextBox ID="city" runat="server"  placeholder="City" CssClass="form-control required" />
+                                                    <asp:TextBox ID="city" runat="server" placeholder="City" CssClass="form-control required" />
                                                 </div>
                                             </div>
                                             <%--<div class="col-md-4 col-sm-4">
@@ -1226,14 +1230,14 @@
                                                 <div class="form-group">
                                                     <label>Address 1:<span class="errormsg">*</span> </label>
                                                     <input style="display: none" type="text" name="txtAdditionalAddress1" />
-                                                    <asp:TextBox  name="address1" ID="address1" runat="server" placeholder="Address 1" CssClass="form-control required" />
+                                                    <asp:TextBox name="address1" ID="address1" runat="server" placeholder="Address 1" CssClass="form-control required" />
                                                 </div>
                                             </div>
                                             <div class="col-md-4 col-sm-4">
                                                 <div class="form-group">
                                                     <label>Address 2:</label>
                                                     <input style="display: none" type="text" name="txtAdditionalAddress2" />
-                                                    <asp:TextBox  name="txtAdditionalAddress" ID="txtAdditionalAddress" runat="server" placeholder="Address 2" CssClass="form-control" />
+                                                    <asp:TextBox name="txtAdditionalAddress" ID="txtAdditionalAddress" runat="server" placeholder="Address 2" CssClass="form-control" />
                                                 </div>
                                             </div>
 
@@ -1267,14 +1271,14 @@
                                             <div class="col-md-4 col-sm-4">
                                                 <div class="form-group">
                                                     <label>E-Mail ID:</label>
-                                                    <asp:TextBox ID="email" autocomplete="stopdoingthat" runat="server" placeholder="Email" CssClass="form-control" />
+                                                    <asp:TextBox ID="email" autocomplete="stopdoingthat" runat="server" placeholder="Email" CssClass="form-control lowercase" />
                                                     <asp:RegularExpressionValidator ID="rev1" runat="server" Display="Dynamic"
                                                         ErrorMessage="Invalid Email Id!" ForeColor="Red" SetFocusOnError="True" ValidationGroup="send"
                                                         ValidationExpression="\w+([-+.']\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*" CssClass="inv"
                                                         ControlToValidate="email"></asp:RegularExpressionValidator>
                                                 </div>
                                             </div>
-                                            
+
                                             <div class="col-md-4 col-sm-4">
                                                 <div class="form-group">
                                                     <label>Telephone No.:</label>
@@ -1476,7 +1480,7 @@
                                                         </div>
                                                     </div>
                                                 </div>
-                                        
+
                                                 <div class="row" id="signatureDiv" runat="server" style="display: none">
                                                     <div class="col-md-6">
                                                         <label class="control-label">Customer Signature:</label>
@@ -1506,7 +1510,7 @@
                                                 <div class="panel panel-default clearfix m-b-20">
                                                     <div class="panel-heading">Document Information</div>
                                                     <div class="panel-body">
-                                                        <div class="col-md-6"  id="divreg_front_id" >
+                                                        <div class="col-md-6" id="divreg_front_id">
                                                             <div class="form-group">
                                                                 <label id="lblreg_front_id">
                                                                     <asp:Localize runat="server" meta:resourcekey="Register_040" Text="ID Front"></asp:Localize></label>
@@ -1642,7 +1646,7 @@
                                                                 </div>
                                                             </div>
                                                         </div>
-                                                           
+
                                                         <div class="col-md-6" id="customerSelfieDiv">
                                                             <div class="form-group">
                                                                 <label>Customer Selfie</label>
@@ -1656,7 +1660,7 @@
                                                                     </div>
                                                                 </div>
                                                             </div>
-                                                              <div class="form-group" id="uploadcustomerSelfieDiv2">
+                                                            <div class="form-group" id="uploadcustomerSelfieDiv2">
                                                                 <div class="file-upload" id="facePictureId">
                                                                     <asp:FileUpload ID="reg_customerSelfie" type="file" runat="server" class="uploadbutton" accept="image/*" meta:resourcekey="reg_back_idResource1" />
                                                                     <%--<input type="file" name="reg-back-id" id="reg-back-id" required="required" class="uploadbutton" accept="image/*" />--%>
@@ -1671,7 +1675,7 @@
                                                         <div class="col-md-6" style="display: none;" id="FacePictureDiv">
                                                             <div class="form-group">
                                                                 <label>Customer Face Picture</label>
-                                                                <input type="button" id="editFacePicture"  style="display: none;" class="btn btn-info" value="Edit Face Picture" />
+                                                                <input type="button" id="editFacePicture" style="display: none;" class="btn btn-info" value="Edit Face Picture" />
                                                                 <input type="button" id="editFacePictureCrop" class="btn btn-warning" value="Crop" />
                                                                 <input type="button" id="undoFacePicture" style="display: none;" class="btn btn-primary" value="Undo" />
                                                                 <div>
@@ -1681,10 +1685,10 @@
                                                                     </div>
                                                                 </div>
                                                             </div>
-                                                           
+
                                                         </div>
 
-                                                     
+
                                                     </div>
                                                 </div>
                                                 <div class="panel panel-default clearfix m-b-20">

Swift.web/MobileRemit/Admin/Operation/ManageActivate.aspx

@@ -146,7 +146,7 @@
         });
 
         $(document).ready(function () {
-            $("#<%=verificationTypeNo.ClientID%>").on("change", function () {
+          <%--  $("#<%=verificationTypeNo.ClientID%>").on("change", function () {
                 var idtype = $("#<%=idType.ClientID%>").val();
                 if (idtype.split('|')[0] == 11168 && idtype != '') {
                     var idNumber = $("#<%=verificationTypeNo.ClientID%>").val();
@@ -160,7 +160,7 @@
                         return false;
                     }
                 }
-            });
+            });--%>
             $('#chkSkip').click(function () {
                 if ($(this).is(':checked')) {
                     $("#<%=email.ClientID%>").removeClass("required");

Swift.web/Payment/trans_payment_success.aspx

@@ -8,6 +8,7 @@
     <script src="//netdna.bootstrapcdn.com/bootstrap/3.0.0/js/bootstrap.min.js"></script>
     <script src="//code.jquery.com/jquery-1.11.1.min.js"></script>
     <link href="../Bootstrap/css/font-awesome.min.css" rel="stylesheet" />
+  <script defer src="https://use.fontawesome.com/releases/v5.0.8/js/all.js" integrity="sha384-SlE991lGASHoBfWbelyBPLsUlwY1GwNDJo3jSJO04KZ33K2bwfV9YBauFfnzvynJ" crossorigin="anonymous"></script>
     <style>
         body {
             margin-top: 20px;

Swift.web/Remit/Administration/CustomerRegistration/Manage.aspx

@@ -50,7 +50,7 @@
             color: #FA4345;
         }
          .lowercase {
-            text-transform: lowercase !important;
+            text-transform: none !important;
         }
         .doc {
             height: 300px;
@@ -199,7 +199,7 @@
             });
         });
         $(document).ready(function () {
-            $("#<%=verificationTypeNo.ClientID%>").on("change", function () {
+          <%--  $("#<%=verificationTypeNo.ClientID%>").on("change", function () {
                 var idtype = $("#<%=idType.ClientID%>").val();
                 if (idtype.split('|')[0] == 11168 && idtype != '') {
                     var idNumber = $("#<%=verificationTypeNo.ClientID%>").val();
@@ -213,7 +213,7 @@
                         return false;
                     }
                 }
-            });
+            });--%>
             $('#chkSkip').click(function () {
                 if ($(this).is(':checked')) {
                     $("#<%=email.ClientID%>").removeClass("required");

Swift.web/Remit/Administration/CustomerRegistration/Manage.aspx.cs

@@ -280,7 +280,7 @@ namespace Swift.web.Remit.Administration.CustomerRegistration
             string trimmedlastName = lastName.Text.Trim() == "" ? null : lastName.Text.Trim();
 
             string occupationVal = occupationHidden.Value;
-            string additionalAddress = hdnAdditionalAddress.Value;
+            string additionalAddress = txtAdditionalAddress.Text;
             string city = cityHidden.Value;
 
             OnlineCustomerModel customerModel = new OnlineCustomerModel()
@@ -293,7 +293,7 @@ namespace Swift.web.Remit.Administration.CustomerRegistration
                 customerType = ddlCustomerType.SelectedValue,
                 country = countryList.Text,
                 AdditionalAddress = additionalAddress, //txtAdditionalAddress.Text,
-                address = additionalAddress,
+                address = address1.Text,
                 zipCode = zipCode.Text,
                 street = hf_editable_townArea.Value,
                 city = city, //cityHidden.Value,

Swift.web/Remit/Administration/CustomerSetup/Manage.aspx

@@ -26,7 +26,7 @@
     <script>
 
         $(document).ready(function () {
-            $("#<%=verificationTypeNo.ClientID%>").on("change", function () {
+          <%--  $("#<%=verificationTypeNo.ClientID%>").on("change", function () {
                 var idtype = $("#<%=idType.ClientID%>").val();
                 if (idtype.split('|')[0] == 11168 && idtype != '') {
                     var idNumber = $("#<%=verificationTypeNo.ClientID%>").val();
@@ -40,7 +40,7 @@
                         return false;
                     }
                 }
-            });
+            });--%>
             $("#<%=zipCode.ClientID%>").keyup(function () {
                 var len = $(this).val().length;
                 if (len == '7') {

Swift.web/Remit/Administration/CustomerSetup/ManageNew.aspx

@@ -59,7 +59,7 @@
 
         $(document).ready(function () {
 
-            $("#<%=verificationTypeNo.ClientID%>").on("change", function () {
+           <%-- $("#<%=verificationTypeNo.ClientID%>").on("change", function () {
                 var idtype = $("#<%=idType.ClientID%>").val();
                 if (idtype.split('|')[0] == 11168 && idtype != '') {
                     var idNumber = $("#<%=verificationTypeNo.ClientID%>").val();
@@ -73,7 +73,7 @@
                         return false;
                     }
                 }
-            });
+            });--%>
             $("#<%=idType.ClientID%>").on("change", function () {
                 $("#<%=verificationTypeNo.ClientID%>").val('');
                 var idTypeValue = $("#<%=idType.ClientID%>").val().split('|')[0];

Swift.web/Remit/Transaction/Modify/ModifyLocation.aspx

@@ -98,7 +98,7 @@
                                     AutoPostBack="True" onselectedindexchanged="ddlBank_SelectedIndexChanged"></asp:DropDownList>
                             </td>
                         </tr>
-                        <tr>
+                        <tr id="bankBranch" runat="server">
                             <td  nowrap="nowrap">
                                 <div align="right"> Branch : </div>
                             </td>

Swift.web/Remit/Transaction/Modify/ModifyLocation.aspx.cs

@@ -19,6 +19,15 @@ namespace Swift.web.Remit.Transaction.Modify
             {
                 DisplayLabel();
                 lblOldValue.Text = getOldValue();
+                var countryId = GetStatic.ReadQueryString("pCountryId","");
+                if(countryId == "151")
+                {
+                    bankBranch.Visible = false;
+                }
+                else
+                {
+                    bankBranch.Visible = true;
+                }
             }
         }
         private void Authenticate()
@@ -27,6 +36,8 @@ namespace Swift.web.Remit.Transaction.Modify
         }
         private void DisplayLabel()
         {
+            var countryId = GetStatic.ReadQueryString("pCountryId", "");
+            var user = GetStatic.GetUser();
             lblFieldName.Text = GetLabel();
             if (getFieldName() == "pAgentLocation")//paying agent location
             {
@@ -43,13 +54,13 @@ namespace Swift.web.Remit.Transaction.Modify
             {
                 showBranch.Visible = true;
                 rptShowOther.Visible = false;
-                sd.SetDDL(ref ddlBank, "EXEC proc_agentMaster @flag = 'bankList'", "agentId", "agentName", "", "Select");
+                sd.SetDDL(ref ddlBank, "EXEC proc_agentMaster @flag = 'bankList' ,@pCountryId = " + countryId + "", "agentId", "agentName", "", "Select");
             }
 
             if (getFieldName() == "BranchName")//bank branch
             {
-                string BankId = mtd.SelectBankNameById(GetStatic.GetUser(), GetTranId().ToString());
-                sd.SetDDL(ref ddlNewValue, "EXEC proc_agentMaster @flag = 'bbl', @parentId = " + BankId + "", "agentId", "agentName", "", "Select");
+                string BankId = mtd.SelectBankName(GetStatic.GetUser(), GetTranId().ToString());
+                sd.SetDDL(ref ddlNewValue, "EXEC PROC_API_BANK_BRANCH_SETUP @flag = 'getBranch-new', @CountryId = " + countryId + " ,@PaymentMethod = '2' ,@user = " + user + " ,@bankId = " + BankId + "",  "agentId", "agentName", "", "Select");
             }
             if (getFieldName() == "pBranchName")//paying Branch
             {
@@ -139,9 +150,13 @@ namespace Swift.web.Remit.Transaction.Modify
 
         protected void ddlBank_SelectedIndexChanged(object sender, EventArgs e)
         {
+            var countryId = GetStatic.ReadQueryString("pCountryId", "");
+            var user = GetStatic.GetUser();
             if (ddlBank.Text != "")
             {
-                sd.SetDDL(ref ddlBranch, "EXEC proc_agentMaster @flag = 'bbl', @parentId = " + ddlBank.Text + "", "agentId", "agentName", "", "Select");
+                sd.SetDDL(ref ddlBranch, "EXEC PROC_API_BANK_BRANCH_SETUP @flag = 'getBranch-new', @CountryId = " + countryId + " ,@PaymentMethod = '2' ,@user = " + user + " ,@bankId = " + ddlBank.Text + "", "agentId", "agentName", "", "Select");
+
+                //sd.SetDDL(ref ddlBranch, "EXEC proc_agentMaster @flag = 'bbl', @parentId = " + ddlBank.Text + "", "agentId", "agentName", "", "Select");
             }
         }
     }

Swift.web/Remit/Transaction/Modify/ModifyLocation.aspx.designer.cs

@@ -7,11 +7,13 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace Swift.web.Remit.Transaction.Modify {
-    
-    
-    public partial class ModifyLocation {
-        
+namespace Swift.web.Remit.Transaction.Modify
+{
+
+
+    public partial class ModifyLocation
+    {
+
         /// <summary>
         /// Head1 control.
         /// </summary>
@@ -20,7 +22,7 @@ namespace Swift.web.Remit.Transaction.Modify {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlHead Head1;
-        
+
         /// <summary>
         /// Base1 control.
         /// </summary>
@@ -29,7 +31,7 @@ namespace Swift.web.Remit.Transaction.Modify {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlGenericControl Base1;
-        
+
         /// <summary>
         /// form1 control.
         /// </summary>
@@ -38,7 +40,7 @@ namespace Swift.web.Remit.Transaction.Modify {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-        
+
         /// <summary>
         /// sc control.
         /// </summary>
@@ -47,7 +49,7 @@ namespace Swift.web.Remit.Transaction.Modify {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.ScriptManager sc;
-        
+
         /// <summary>
         /// hddField control.
         /// </summary>
@@ -56,7 +58,7 @@ namespace Swift.web.Remit.Transaction.Modify {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.HiddenField hddField;
-        
+
         /// <summary>
         /// hddOldValue control.
         /// </summary>
@@ -65,7 +67,7 @@ namespace Swift.web.Remit.Transaction.Modify {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.HiddenField hddOldValue;
-        
+
         /// <summary>
         /// hdnValueType control.
         /// </summary>
@@ -74,7 +76,7 @@ namespace Swift.web.Remit.Transaction.Modify {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.HiddenField hdnValueType;
-        
+
         /// <summary>
         /// lblMsg control.
         /// </summary>
@@ -83,7 +85,7 @@ namespace Swift.web.Remit.Transaction.Modify {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label lblMsg;
-        
+
         /// <summary>
         /// lblFieldName control.
         /// </summary>
@@ -92,7 +94,7 @@ namespace Swift.web.Remit.Transaction.Modify {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label lblFieldName;
-        
+
         /// <summary>
         /// lblOldValue control.
         /// </summary>
@@ -101,7 +103,7 @@ namespace Swift.web.Remit.Transaction.Modify {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label lblOldValue;
-        
+
         /// <summary>
         /// rptShowOther control.
         /// </summary>
@@ -110,7 +112,7 @@ namespace Swift.web.Remit.Transaction.Modify {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlGenericControl rptShowOther;
-        
+
         /// <summary>
         /// ddlNewValue control.
         /// </summary>
@@ -119,7 +121,7 @@ namespace Swift.web.Remit.Transaction.Modify {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.DropDownList ddlNewValue;
-        
+
         /// <summary>
         /// showBranch control.
         /// </summary>
@@ -128,7 +130,7 @@ namespace Swift.web.Remit.Transaction.Modify {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlGenericControl showBranch;
-        
+
         /// <summary>
         /// ddlBank control.
         /// </summary>
@@ -137,7 +139,16 @@ namespace Swift.web.Remit.Transaction.Modify {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.DropDownList ddlBank;
-        
+
+        /// <summary>
+        /// bankBranch control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlTableRow bankBranch;
+
         /// <summary>
         /// ddlBranch control.
         /// </summary>
@@ -146,7 +157,7 @@ namespace Swift.web.Remit.Transaction.Modify {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.DropDownList ddlBranch;
-        
+
         /// <summary>
         /// rptAccountNo control.
         /// </summary>
@@ -155,7 +166,7 @@ namespace Swift.web.Remit.Transaction.Modify {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlGenericControl rptAccountNo;
-        
+
         /// <summary>
         /// txtNewValue control.
         /// </summary>
@@ -164,7 +175,7 @@ namespace Swift.web.Remit.Transaction.Modify {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.TextBox txtNewValue;
-        
+
         /// <summary>
         /// rptBranch control.
         /// </summary>
@@ -173,7 +184,7 @@ namespace Swift.web.Remit.Transaction.Modify {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlGenericControl rptBranch;
-        
+
         /// <summary>
         /// hdnBranchName control.
         /// </summary>
@@ -182,7 +193,7 @@ namespace Swift.web.Remit.Transaction.Modify {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.HiddenField hdnBranchName;
-        
+
         /// <summary>
         /// hdnBranchId control.
         /// </summary>
@@ -191,7 +202,7 @@ namespace Swift.web.Remit.Transaction.Modify {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.HiddenField hdnBranchId;
-        
+
         /// <summary>
         /// btnUpdate control.
         /// </summary>

Swift.web/Remit/Transaction/Modify/ModifyTran.aspx

@@ -133,6 +133,25 @@
             "&oldValue=" + oldValue +
             "&tranId=" + tranId +
             "&pCountryId=" + pCountryId;
+
+
+        var id = PopUpWindow(url, "");
+        if (id == "undefined" || id == null || id == "") {
+        }
+        else {
+            GetElement("<%=btnReloadDetail.ClientID %>").click();
+        }
+        return false;
+    }
+
+    function EditBranchName(label, fieldName, oldValue, tranId, pCountryId) {
+        var url = "ModifyLocation.aspx?label=" + label +
+            "&fieldName=" + fieldName +
+            "&oldValue=" + oldValue +
+            "&tranId=" + tranId +
+            "&pCountryId=" + pCountryId;
+
+
         var id = PopUpWindow(url, "");
         if (id == "undefined" || id == null || id == "") {
         }

Swift.web/Remit/Transaction/ReprintVoucher/SendIntlReceipt.aspx.cs

@@ -111,7 +111,7 @@ namespace Swift.web.Remit.Transaction.ReprintVoucher
                     createdBy.Text = sRow["createdBy"].ToString();
                     approvedDate.Text = DateTime.Parse(sRow["createdDate"].ToString()).ToString("yyyy-MM-dd hh:mm:ss tt");
                     cAmt.Text = GetStatic.ShowDecimal(sRow["cAmt"].ToString()) + "&nbsp" + sRow["collCurr"].ToString();
-                    serviceCharge.Text = GetStatic.ShowDecimal(sRow["serviceCharge"].ToString()) + "&nbsp" + sRow["collCurr"].ToString();
+                    serviceCharge.Text = GetStatic.ShowTwoDecimal(sRow["serviceCharge"].ToString()) + "&nbsp" + sRow["collCurr"].ToString();
                     tAmt.Text = GetStatic.ShowDecimal(sRow["tAmt"].ToString()) + "&nbsp" + sRow["collCurr"].ToString();
                     exRate.Text = sRow["exRate"].ToString() + "&nbsp" + sRow["payoutCurr"].ToString();
                     pAmt.Text = GetStatic.ShowDecimal(sRow["pAmt"].ToString()) + "&nbsp" + sRow["payoutCurr"].ToString();

Swift.web/Remit/UserControl/UcTransaction.ascx

@@ -861,7 +861,7 @@
                                     <asp:Label ID="bankName" runat="server"></asp:Label>
                                 </td>
                             </tr>
-                            <tr id="trBranch">
+                            <tr id="trBranch" runat="server">
                                 <td>Branch Name: </td>
                                 <td class="text">
                                     <asp:Label ID="branchName" runat="server"></asp:Label>

Swift.web/Remit/UserControl/UcTransaction.ascx.cs

@@ -265,7 +265,7 @@ namespace Swift.web.Remit.UserControl
                         {
                             accountNo.Text = GetLinkTextForModification("Account No", "accountNo", tRow);
                               bankName.Text = GetLinkBankPayoutLocation("Bank Name", "BankName", tRow);
-                               branchName.Text = GetLinkTextForModification("Branch Name", "pBranchName", tRow);
+                               branchName.Text = GetLinkBankPayoutLocation("Branch Name", "pBranchName", tRow);
                         }
                     }
                     else
@@ -338,7 +338,7 @@ namespace Swift.web.Remit.UserControl
                         {
                             accountNo.Text = GetLinkPayoutLocation("Account Number", "accountNo", tRow);
                             bankName.Text = GetLinkBankPayoutLocation("Bank Name", "BankName", tRow);
-                            branchName.Text = GetLinkPayoutLocation("Branch Name", "BranchName", tRow);
+                            branchName.Text = GetLinkBankPayoutLocation("Branch Name", "BranchName", tRow);
                             pBranchName.Text = GetLinkPayoutLocation("Paying Branch", "pBranchName", tRow);
                             pAgentLocation.Text = tRow["pAgentLocation"].ToString();
                         }
@@ -364,6 +364,15 @@ namespace Swift.web.Remit.UserControl
                     pBranchName.Text = tRow["pBranchName"].ToString();
                     pAgentLocation.Text = tRow["pAgentLocation"].ToString();
 
+                    if (tRow["rCountryName"].ToString().ToLower() == "nepal")
+                    {
+                        trBranch.Visible = false;
+                    }
+                    else
+                    {
+                        trBranch.Visible = true;
+                    }
+
                     pAgentName.Text = tRow["pAgentName"].ToString();
                     modeOfPayment.Text = tRow["paymentMethod"].ToString();
                     modeOfDeposit.Text = tRow["depositType"].ToString();
@@ -445,7 +454,7 @@ namespace Swift.web.Remit.UserControl
                         trNameAsPerBank.Visible = true;
                         lblNameAsPerBank.Text = tRow["receiverNameAlt"].ToString();
                     }
-
+                    
                 }
                 if (displayType != "cancelpartner")
                 {
@@ -847,6 +856,7 @@ namespace Swift.web.Remit.UserControl
         public string GetLinkBankPayoutLocation(string label, string fieldName, DataRow dr)
         {
             string fieldValue = dr[fieldName].ToString().Trim();
+
             var str = "<a href=# title='Edit Record'><div class = \"link\" onclick = \"EditBankName('" + label + "', '" + fieldName + "', '" + fieldValue + "','" + hddTranId.Value + "','" + dr["pCountryId"] + "')\">" +
               fieldValue + "<img border=0 src=\"/Images/edit.gif\"/></a></div>";
             return str;
@@ -1627,7 +1637,7 @@ namespace Swift.web.Remit.UserControl
                         {
                             accountNo.Text = GetLinkTextForModification("Account No", "accountNo", tRow);
                             bankName.Text = GetLinkBankPayoutLocation("Bank Name", "BankName", tRow);
-                            branchName.Text = GetLinkTextForModification("Branch Name", "pBranchName", tRow);
+                            branchName.Text = GetLinkBankPayoutLocation("Branch Name", "pBranchName", tRow);
                         }
                     }
                     else
@@ -1685,7 +1695,7 @@ namespace Swift.web.Remit.UserControl
                         {
                             accountNo.Text = GetLinkPayoutLocation("Account Number", "accountNo", tRow);
                             bankName.Text = GetLinkBankPayoutLocation("Bank Name", "BankName", tRow);
-                            branchName.Text = GetLinkPayoutLocation("Branch Name", "BranchName", tRow);
+                            branchName.Text = GetLinkBankPayoutLocation("Branch Name", "BranchName", tRow);
                             pBranchName.Text = GetLinkPayoutLocation("Paying Branch", "pBranchName", tRow);
                             pAgentLocation.Text = tRow["pAgentLocation"].ToString();
                         }
@@ -2102,7 +2112,7 @@ namespace Swift.web.Remit.UserControl
                                     {
                                             NotificationContent =  new NotificationDTO() {
                                             Body = comments,
-                                            Title = "JME",
+                                            Title = "IME LONDON",
                                              MessageType = "INFO",
                                               ClickActivity = "OPEN_ACTIVITY_NOTIFICATION"
                                             },

Swift.web/Remit/UserControl/UcTransaction.ascx.designer.cs

@@ -878,6 +878,15 @@ namespace Swift.web.Remit.UserControl
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label bankName;
 
+        /// <summary>
+        /// trBranch control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlTableRow trBranch;
+
         /// <summary>
         /// branchName control.
         /// </summary>