#edit bank name and branch

Swift.DAL/Remittance/Transaction/ModifyTransactionDao.cs

@@ -207,6 +207,16 @@ 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/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

@@ -135,6 +135,23 @@
             "&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/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")
                 {
@@ -1628,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
@@ -1686,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();
                         }

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>