1. Promo Code

2. BANK Setup (Edit and Delete Function)
3. TXN Limit Threshold (Card Payment)
4. Resend TXN Feature

Swift.DAL/Agentpanel/Domain/IRHTranDetail.cs

@@ -158,6 +158,8 @@
         public string rewardAmt { get; set; }
         public string paymentOption { get; set; }
         public string siteReference { get; set; }
+        public string isPromoCode { get; set; }
+        public string rowId { get; set; }
     }
 
     public class IRHTranDetailNew

Swift.DAL/Agentpanel/Send/SendTranIRHDao.cs

@@ -405,7 +405,7 @@ namespace Swift.DAL.BL.AgentPanel.Send
 
         public DataTable GetExRate(string user, string sCountryId, string sSuperAgent, string sAgent, string sBranch, string collCurr,
                                         string pCountryId, string pAgent, string pCurr, string deliveryMethod, string cAmt, string pAmt,
-                                        string schemeCode, string senderId, string introducer, string sessionId, string couponId, string tpExRate, string rewardAmt, string isManualSc = "", 
+                                        string schemeCode, string senderId, string introducer, string sessionId, string couponId, string tpExRate, string rewardAmt, string customerId, string isManualSc = "", 
                                         string sc = "", string calcBy = "", string payoutPartner = "")
         {
             var sql = "EXEC proc_sendIRH @flag = 'exRate'";
@@ -427,6 +427,7 @@ namespace Swift.DAL.BL.AgentPanel.Send
             sql += ", @couponTranNo = " + FilterString(couponId);
             sql += ", @tpExRate = " + FilterString(tpExRate);
             sql += ", @rewardAmt = " + FilterString(rewardAmt);
+            sql += ", @customerId = " + FilterString(customerId);
             sql += ", @isManualSc = " + FilterString(isManualSc);
             sql += ", @partnerId = " + FilterString(payoutPartner);
             sql += ", @manualSc = " + FilterString(sc);
@@ -475,7 +476,7 @@ namespace Swift.DAL.BL.AgentPanel.Send
                                         string pCountryId, string pAgent, string pCurr, string deliveryMethod, string cAmt, string pAmt,
                                         string schemeCode, string senderId, string sessionId, string couponId
                                         , string isManualSc, string sc
-                                        , string exRateTp, string pCurrTp, string calcBy, string introducer, string rewardAmt, string payoutPartner = "")
+                                        , string exRateTp, string pCurrTp, string calcBy, string introducer, string rewardAmt, string customerId, string payoutPartner = "")
         {
             var sql = "EXEC proc_sendIRHTP @flag = 'exRate'";
             sql += ", @user = " + FilterString(user);
@@ -500,6 +501,7 @@ namespace Swift.DAL.BL.AgentPanel.Send
             sql += ", @partnerId = " + FilterString(payoutPartner);
             sql += ", @manualSc = " + FilterString(sc);
             sql += ", @rewardAmt = " + FilterString(rewardAmt);
+            sql += ", @customerId = " + FilterString(customerId);
             sql += ", @introducer = " + FilterString(introducer);
             //sql += ", @calcBy = " + FilterString(calcBy);
 
@@ -782,6 +784,8 @@ namespace Swift.DAL.BL.AgentPanel.Send
             sql += ", @portOfShipment = " + FilterString(trn.portOfShipment);
             sql += ", @calculatedOriginalSc = " + FilterString(trn.calcOriginalSc);
             sql += ", @rewardAmt = " + FilterString(trn.rewardAmt);
+            sql += ", @isPromoCode = " + FilterString(trn.isPromoCode);
+            sql += ", @promoRowId = " + FilterString(trn.rowId);
 
             var ds = ExecuteDataset(sql);
             if (ds == null || ds.Tables.Count == 0)
@@ -1003,6 +1007,7 @@ namespace Swift.DAL.BL.AgentPanel.Send
             sql += ", @tpExRate = " + FilterString(trn.tpExRate);
             sql += ", @calculatedOriginalSc = " + FilterString(trn.calcOriginalSc);
             sql += ", @rewardAmt = " + FilterString(trn.rewardAmt);
+            sql += ", @isPromoCode = " + FilterString(trn.isPromoCode);
             var ds = ExecuteDataset(sql);
             if (ds == null || ds.Tables.Count == 0)
                 return null;
@@ -1298,6 +1303,9 @@ namespace Swift.DAL.BL.AgentPanel.Send
             sql += ", @trackBy = " + FilterString(trn.trackBy);
             sql += ", @nameAsPerBank = " + FilterString(trn.nameAsPerBank);
             sql += ", @calculatedOriginalSc = " + FilterString(trn.calcOriginalSc);
+            sql += ", @calculatedOriginalSc = " + FilterString(trn.calcOriginalSc);
+            sql += ", @isPromoCode = " + FilterString(trn.isPromoCode);
+            sql += ", @promoRowId = " + FilterString(trn.rowId);
 
             return ParseDbResultV2(sql);
         }
@@ -1451,6 +1459,8 @@ namespace Swift.DAL.BL.AgentPanel.Send
             sql += ", @paymentOption = " + FilterString(trn.paymentOption);
             sql += ", @siteReference = " + FilterString(trn.siteReference);
             sql += ", @rewardAmt = " + FilterString(trn.rewardAmt);
+            sql += ", @isPromoCode = " + FilterString(trn.isPromoCode);
+            sql += ", @promoRowId = " + FilterString(trn.rowId);
 
             return ParseDbResult(sql);
         }

Swift.DAL/Remittance/APIPartner/APIPartnerDao.cs

@@ -72,7 +72,7 @@ namespace Swift.DAL.Remittance.APIPartner
 
         public DbResult InsertUpdatePromotion(string user, string flag, string rowId, string promotionCode, string promotionMsg
                             , string promotionType, string country, string paymentMethod, string isActive, string startDt
-                            , string endDt, string promotionAmount)
+                            , string endDt, string promotionAmount, string minAmt)
         {
             var sql = "EXEC PROC_PROMOTIONAL_CAMPAIGN @flag = '" + flag + "'";
             sql += ", @user = " + FilterString(user);
@@ -86,6 +86,7 @@ namespace Swift.DAL.Remittance.APIPartner
             sql += ", @IS_ACTIVE = " + FilterString(isActive);
             sql += ", @START_DT = " + FilterString(startDt);
             sql += ", @END_DT = " + FilterString(endDt);
+            sql += ", @MIN_AMT = " + FilterString(minAmt);
 
             return ParseDbResult(sql);
         }

Swift.DAL/Remittance/Transaction/TranAgentReportDao.cs

@@ -542,7 +542,7 @@ namespace Swift.DAL.BL.Remit.Transaction
             return ParseReportResult(sql);
         }
 
-        public DataTable TxnReport(string user, string pCountry, string pAgent, string depositType, string orderBy, string status, string paymentType, string dateField, string from, string to, string transType, string displayTranNo, string searchBy, string searchByValue, string pageNumber, string pageSize, string rptType, string tFrom, string postCode)
+        public DataTable TxnReport(string user, string pCountry, string pAgent, string depositType, string orderBy, string status, string paymentType, string dateField, string from, string to, string transType, string displayTranNo, string searchBy, string searchByValue, string pageNumber, string pageSize, string rptType, string tFrom, string postCode, string promoCode)
         {
             string sql = "EXEC PROC_TRANSACTION_REPORT ";
             sql += " @user=" + FilterString(user);
@@ -564,6 +564,7 @@ namespace Swift.DAL.BL.Remit.Transaction
             sql += ", @rptType = " + FilterString(rptType);
             sql += ", @transactionFrom = " + FilterString(tFrom);
             sql += ", @postCode = " + FilterString(postCode);
+            sql += ", @promoCode = " + FilterString(promoCode);
 
             var dt = ExecuteDataTable(sql);
             return dt;

Swift.DAL/Remittance/Transaction/UpdateBranchDao.cs

@@ -58,9 +58,11 @@ namespace Swift.DAL.Remittance.Transaction
 
         }
 
-        public DataTable InsertBank(string user, string flag, string countryId, string paymentMode, string bankName, string pCurrency,string bankState, string bankDistrict,string bankAddress,string bankPhone,string bankEmail , string isActive)
+        public DataTable InsertOrUpdateBank(string user, string flag, string recordId, string countryId, string paymentMode, string bankName, string pCurrency, string bankState, string bankDistrict, string bankAddress, string bankPhone, string bankEmail, string isActive)
         {
-            var sql = "EXEC Proc_UpdateBranchCode @flag =" + FilterString(flag);
+            string sql;
+                sql = "EXEC Proc_UpdateBranchCode @flag = " + FilterString(flag);
+                sql += ", @bankId = " + FilterString(recordId);
             sql += ", @pCountryName = " + FilterString(countryId);
             sql += ", @pMode = " + FilterString(paymentMode);
             sql += ", @bankName = " + FilterString(bankName);
@@ -70,7 +72,7 @@ namespace Swift.DAL.Remittance.Transaction
             sql += ", @bankDistrict = " + FilterString(bankDistrict);
             sql += ", @bankPhone = " + FilterString(bankPhone);
             sql += ", @bankEmail = " + FilterString(bankEmail);
-            sql += ", @IS_ACTIVE = " + FilterString(isActive);
+                sql += ", @is_Active = " + FilterString(isActive);
             sql += ", @user = " + FilterString(user);
 
             var ds = ExecuteDataset(sql);
@@ -79,9 +81,11 @@ namespace Swift.DAL.Remittance.Transaction
             return ds.Tables[0];
 
         }
-        public DataTable InsertBankMapping(string user, string flag, string countryId, string parnerId, string bankId, string pMode, string bankCode1, string bankCode2, string pCurrency, string bAddress , string isActive)
+        public DataTable InsertOrUpdateBankMapping(string user, string flag, string recordId, string countryId, string parnerId, string bankId, string pMode, string bankCode1, string bankCode2, string pCurrency, string bAddress, string isActive)
         {
-            var sql = "EXEC Proc_UpdateBranchCode @flag =" + FilterString(flag);
+            string sql;
+            sql = "EXEC Proc_UpdateBranchCode @flag = " + FilterString(flag);
+            sql += ", @bankId = " + FilterString(recordId);
             sql += ", @pCountryName = " + FilterString(countryId);
             sql += ", @partnerId = " + FilterString(parnerId);
             sql += ", @bankName = " + FilterString(bankId);
@@ -90,7 +94,7 @@ namespace Swift.DAL.Remittance.Transaction
             sql += ", @bankCode1 = " + FilterString(bankCode1);
             sql += ", @bankCode2 = " + FilterString(bankCode2);
             sql += ", @bankAddress = " + FilterString(bAddress);
-            sql += ", @IS_ACTIVE = " + FilterString(isActive);
+             sql += ", @is_Active = " + FilterString(isActive);
             sql += ", @user = " + FilterString(user);
 
             var ds = ExecuteDataset(sql);
@@ -118,10 +122,32 @@ namespace Swift.DAL.Remittance.Transaction
             return ds.Tables[0];
         }
 
-        public DataRow SelectById(string bankId, string user)
+        public DataRow EditBankMappingSelectById(string bankId, string user)
+        {
+            string sql = "EXEC Proc_UpdateBranchCode";
+            sql += " @flag = 'editBankMapping'";
+            sql += ", @user = " + FilterString(user);
+            sql += ", @bankId = " + FilterString(bankId);
+            DataSet ds = ExecuteDataset(sql);
+            if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0)
+                return null;
+            return ds.Tables[0].Rows[0];
+        }
+        public DataRow EditBankSelectById(string bankId, string user)
         {
             string sql = "EXEC Proc_UpdateBranchCode";
-            sql += " @flag = 'Edit'";
+            sql += " @flag = 'editBank'";
+            sql += ", @user = " + FilterString(user);
+            sql += ", @bankId = " + FilterString(bankId);
+            DataSet ds = ExecuteDataset(sql);
+            if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0)
+                return null;
+            return ds.Tables[0].Rows[0];
+        }
+        public DataRow EditBranchSelectById(string bankId, string user)
+        {
+            string sql = "EXEC Proc_UpdateBranchCode";
+            sql += " @flag = 'editBranch'";
             sql += ", @user = " + FilterString(user);
             sql += ", @bankId = " + FilterString(bankId);
 
@@ -175,5 +201,78 @@ namespace Swift.DAL.Remittance.Transaction
                 return null;
             return ds.Tables[0];
         }
+        public DbResult EnableDisableBank(string rowId, string user, string isActive)
+        {
+            var sql = "EXEC PROC_API_BANK_BRANCH_SETUP @flag = 'enable-disable-bankNew'";
+
+            sql += ", @user = " + FilterString(user);
+            sql += ", @rowId = " + FilterString(rowId);
+            sql += ", @IsActive = " + FilterString(isActive);
+
+            return ParseDbResult(sql);
+        }
+
+
+        public DataTable GetPartnerName(string partnerId)
+        {
+            var sql = "EXEC Proc_UpdateBranchCode @flag = 'GetPartnetName'";
+            //sql += " @Flag = 'GetPartnetName'";
+            sql += ", @Partnerid = " + FilterString(partnerId);
+
+            var ds = ExecuteDataset(sql);
+
+            if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0)
+                return null;
+            return ds.Tables[0];
+        }
+
+        public DataTable GetMasterID(string bankName)
+        {
+            var sql = "EXEC Proc_UpdateBranchCode @flag = 'GetbankMasterId'";
+            //sql += " @Flag = 'GetPartnetName'";
+            sql += ", @Partnerid = " + FilterString(bankName);
+
+            var ds = ExecuteDataset(sql);
+
+            if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0)
+                return null;
+            return ds.Tables[0];
+        }
+        public DbResult EnableDisableBankBranch(string rowId, string user, string isActive)
+        {
+            var sql = "EXEC PROC_API_BANK_BRANCH_SETUP @flag = 'enable-disable-bankBranch'";
+
+            sql += ", @user = " + FilterString(user);
+            sql += ", @rowId = " + FilterString(rowId);
+            sql += ", @IsActive = " + FilterString(isActive);
+
+            return ParseDbResult(sql);
+        }
+
+        public DbResult DeleteBankMapping(string bankId, string user)
+        {
+            string sql = "EXEC Proc_UpdateBranchCode";
+            sql += " @flag ='deleteBankMapping'";
+            sql += ",@bankId =" + FilterString(bankId);
+            sql += ",@user =" + FilterString(user);
+            return ParseDbResult(sql);
+        }
+        public DbResult DeleteBank(string bankId, string user)
+        {
+            string sql = "EXEC Proc_UpdateBranchCode";
+            sql += " @flag ='deleteBank'";
+            sql += ",@bankId =" + FilterString(bankId);
+            sql += ",@user =" + FilterString(user);
+            return ParseDbResult(sql);
+        }
+        public DbResult DeleteBranch(string branchId, string user)
+        {
+            string sql = "EXEC Proc_UpdateBranchCode";
+            sql += " @flag ='deleteBranch'";
+            sql += ",@bankId =" + FilterString(branchId);
+            sql += ",@user =" + FilterString(user);
+            return ParseDbResult(sql);
+        }
+
     }
 }

Swift.web/AgentNew/AgentSend/SendV2.aspx.cs

@@ -997,6 +997,7 @@ namespace Swift.web.AgentNew.AgentSend
                      , GetStatic.GetSessionId()
                      , couponId
                      , rewardAmt
+                     ,""
                      , isManualSc
                      , sc);
 

Swift.web/AgentNew/SendOnBehalf/SendV2.aspx.cs

@@ -937,7 +937,8 @@ namespace Swift.web.AgentNew.SendOnBehalf
                      , couponId
                      , isManualSc
                      , sc
-                     , rewardAmt);
+                     , rewardAmt
+                     , "");
 
             Response.ContentType = "text/plain";
             var json = DataTableToJson(dt);

Swift.web/AgentNew/SendTxn/Confirm.aspx

@@ -691,6 +691,8 @@
                             <asp:HiddenField ID="hddImgURL" runat="server" />
                             <asp:HiddenField ID="isDisplaySignature" runat="server" />
                             <asp:HiddenField ID="hddXMLCDDI" runat="server" />
+                            <asp:HiddenField ID="hdnIsPromoCode" runat="server" />
+                            <asp:HiddenField ID="hdnRowId" runat="server" />
                         </div>
                     </div>
                 </div>

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

@@ -99,6 +99,8 @@ namespace Swift.web.AgentNew.SendTxn
         private readonly string exRateOffer = GetStatic.ReadQueryString("exRateOffer", "");
         private readonly string _couponId = GetStatic.ReadQueryString("couponId", "");
         private readonly string _rewardAmt = GetStatic.ReadQueryString("rewardAmt", "");
+        private readonly string _isPromoCode = GetStatic.ReadQueryString("isPromoCode", "");
+        private readonly string _rowId = GetStatic.ReadQueryString("rowId", "");
 
         private readonly string _pLocation = GetStatic.ReadQueryString("pLocation", "");
         private readonly string _pLocationText = GetStatic.ReadQueryString("pLocationText", "");
@@ -327,6 +329,8 @@ namespace Swift.web.AgentNew.SendTxn
             total.Text = GetStatic.ShowDecimal(_cAmt.ToString());
 
             rewardAmt.Text = _rewardAmt;
+            hdnIsPromoCode.Value = _isPromoCode;
+            hdnRowId.Value = _rowId;
             exchangeRate.Text = _customerRate.ToString();
             payoutAmt.Text = GetStatic.ShowDecimal(_pAmt.ToString());
             payoutAmtInWords.Text = NumberToWordsConverter.NumberToWord(Convert.ToDouble(_pAmt.ToString()));
@@ -578,6 +582,10 @@ namespace Swift.web.AgentNew.SendTxn
             trn.ECustomer = _eCust;
             trn.MemberCode = _memberCode;
             trn.rewardAmt = _rewardAmt;
+            hdnIsPromoCode.Value = _isPromoCode;
+            trn.isPromoCode = _isPromoCode;
+            hdnRowId.Value = _rowId;
+            trn.rowId = _rowId;
 
             trn.SBranch = GetStatic.GetBranch();
             trn.SBranchName = GetStatic.GetBranchName();
@@ -1072,6 +1080,10 @@ namespace Swift.web.AgentNew.SendTxn
             trn.ECustomer = _eCust;
             trn.MemberCode = _memberCode;
             trn.rewardAmt = _rewardAmt;
+            hdnIsPromoCode.Value = _isPromoCode;
+            trn.isPromoCode = _isPromoCode;
+            hdnRowId.Value = _rowId;
+            trn.rowId = _rowId;
 
             trn.CancelRequestId = _cancelrequestId;
             trn.Salary = _salary;

Swift.web/AgentNew/SendTxn/Confirm.aspx.designer.cs

@@ -1003,5 +1003,7 @@ namespace Swift.web.AgentNew.SendTxn
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.WebControls.HiddenField hddXMLCDDI;
+        protected global::System.Web.UI.WebControls.HiddenField hdnIsPromoCode;
+        protected global::System.Web.UI.WebControls.HiddenField hdnRowId;
     }
 }

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

@@ -1220,6 +1220,7 @@ namespace Swift.web.AgentNew.SendTxn
             exRate.Introducer = Request.Form["introducerTxt"];
             exRate.TpExRate = Request.Form["tpExRate"];
             exRate.RewardAmt = Request.Form["rewardAmt"];
+            exRate.CustomerId = Request.Form["customerId"];
 
             if (exRate.isExRateCalcByPartner)
             {
@@ -1262,6 +1263,7 @@ namespace Swift.web.AgentNew.SendTxn
                          , exRate.CalcBy
                          , exRate.Introducer
                          , exRate.RewardAmt
+                         , exRate.CustomerId
                          , exRate.ProviderId
                          
                         );
@@ -1289,6 +1291,7 @@ namespace Swift.web.AgentNew.SendTxn
                          , exRate.ForexSessionId
                          , exRate.TpExRate
                          , exRate.RewardAmt
+                         , exRate.CustomerId
                          , Request.Form["isManualSc"]
                          , exRate.ManualSc
                          , exRate.CalcBy

Swift.web/AgentNew/SendTxn/SendV2.aspx.designer.cs

@@ -194,6 +194,33 @@ namespace Swift.web.AgentNew.SendTxn
         /// </remarks>
         protected global::System.Web.UI.WebControls.HiddenField additionalAddressNotFound;
 
+        /// <summary>
+        /// hdnRewardAmt 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 hdnRewardAmt;
+
+        /// <summary>
+        /// hdnIsPromoCode 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 hdnIsPromoCode;
+
+        /// <summary>
+        /// hdnRowId 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 hdnRowId;
+
         /// <summary>
         /// txtSendFirstName control.
         /// </summary>

Swift.web/AgentNew/Transaction/ApproveAgentTransaction/SendMoneyRequest.aspx.cs

@@ -308,6 +308,7 @@ namespace Swift.web.AgentNew.Transaction.ApproveAgentTransaction
                          , "N"
                          ,""
                          ,exRate.RewardAmt
+                         , ""
                         );
             }
 

Swift.web/AgentNew/js/SendTxn/agentAndLocation.js

@@ -526,7 +526,7 @@ function ApplyAgentSetting(response, pModeTxt) {
     }
 
     if (data[0].ROW_ID !== '') {
-        $('#lblCampaign').text(data[0].PROMOTIONAL_MSG + ': (' + data[0].PROMOTION_TYPE + ') ' + data[0].PROMOTION_VALUE + ' JPY');
+        $('#lblCampaign').text(data[0].PROMOTIONAL_MSG + ': (' + data[0].PROMOTION_TYPE + ') ' + data[0].PROMOTION_VALUE + ' GBP');
         $('#hddPromotionCode').val(data[0].ROW_ID);
         $('#hddPromotionAmt').val(data[0].PROMOTION_VALUE);
         $("#" + mId + "editServiceCharge").attr("disabled", true);

Swift.web/AgentNew/js/SendTxn/sendTxnInfo.js

@@ -191,28 +191,33 @@ function ClearTxnData() {
 }
 
 function CalculateTxn(amt, obj, isManualSc) {
-    debugger
+    //debugger
     var agentUser = $("#" + mId + "hddTxnRequestFromAgent").val();
     //  CheckAgentQuota(agentUser);
     checkPaymentOption();
     //alert($('#ContentPlaceHolder1_branch').val());
     var collAmt = $("#" + mId + "txtCollAmt").val();
     var payAmt = $("#" + mId + "txtPayAmt").val();
+
     if (collAmt === "" && payAmt === "") {
         alert("Please enter Amount to calculate. ");
         GetElement(mId + "txtCollAmt").focus();
         return false;
     }
     //if (payAmt === "" || payAmt === null) {
+    //    alert("Please enter Payout Amount");
+    //    GetElement(mId + "txtPayAmt").focus();
+    //    return false;
+    //}
     if ($("#" + mId + "txtCollAmt").val())
-        if (isManualSc === undefined) {
-            if ($("#" + mId + "editServiceCharge").is(':checked')) {
-                isManualSc = 'Y';
-            }
-            else {
-                isManualSc = 'N';
-            }
+    if (isManualSc === undefined) {
+        if ($("#" + mId + "editServiceCharge").is(':checked')) {
+            isManualSc = 'Y';
+        }
+        else {
+            isManualSc = 'N';
         }
+    }
 
     //if (isManualSc === undefined) {
     //    $("#" + mId + "editServiceCharge").prop("checked", false);
@@ -233,26 +238,11 @@ function CalculateTxn(amt, obj, isManualSc) {
     //    $("#" + mId + "editServiceCharge").attr('readonly');
     //}
     //else if (partnerId == '394130') {
-    //    $("#" + mId + "allowEditSC").val("N");
-    //    $("#" + mId + "editServiceCharge").attr('disabled');
-    //    $("#" + mId + "editServiceCharge").attr('readonly');
-    //}
-    //else {
-    //    $("#" + mId + "allowEditSC").val("Y");
-    //    $("#" + mId + "editServiceCharge").removeAttr('disabled');
-    //    $("#" + mId + "editServiceCharge").removeAttr('readonly');
-    //}
-
     //if ($("#" + mId + "allowEditSC").val() === 'N') {
-    //    $("#" + mId + "editServiceCharge").prop("checked", false);
-    //}
-    //else {
-    //    $("#" + mId + "editServiceCharge").prop("checked", true);
-    //}
+        $("#" + mId + "allowEditSC").val("N");
+        $("#" + mId + "editServiceCharge").attr('disabled');
+        $("#" + mId + "editServiceCharge").attr('readonly');
 
-    $("#" + mId + "allowEditSC").val("N");
-    $("#" + mId + "editServiceCharge").attr('disabled');
-    $("#" + mId + "editServiceCharge").attr('readonly');
     // var ischecked = $(this).is(':checked');
     //var ischecked = $("#" + mId + "editServiceCharge").is(':checked');
     //if (ischecked) {
@@ -324,7 +314,13 @@ function CalculateTxn(amt, obj, isManualSc) {
         GetElement(mId + "pMode").focus();
         return false;
     }
+
     //if (tpExRate === "" || tpExRate === null || tpExRate === undefined) {
+    //    alert("Please choose payment option");
+    //    GetElement(mId + "pMode").focus();
+    //    return false;
+    //}
+
     //var sAgent = $("#" + mId + "sendingAgentOnBehalfDDL option:selected").val();
     //if (sAgent === "" || sAgent === null || sAgent === undefined) {
     //    alert("Please choose Sending AgentBbranch");
@@ -407,14 +403,19 @@ function CalculateTxn(amt, obj, isManualSc) {
     //    ClearAmountFields();
     //    return false;
     //}
+    //var tpExRate = $("#" + mId + "ddlPaymentOption").val();
     //if (tpExRate == '' || tpExRate == null || tpExRate == undefined) {
+    //    alert("Payment Option must be selected.");
+    //    ClearAmountFields();
+    //    return false;
+    //}
     $("#" + mId + "hddCalcBy").val(obj);
     var dataToSend = {
         MethodName: 'CalculateTxn', pCountry: pCountry, pCountrytxt: pCountrytxt, pMode: pMode, pAgent: pAgent
         , pAgentBranch: pAgentBranch, collAmt: collAmt, payAmt: payAmt, payCurr: payCurr, collCurr: collCurr
         , pModetxt: pModetxt, senderId: senderId, schemeCode: schemeCode, couponId: couponId, isManualSc: isManualSc
         , sc: sc, payoutPartner: payoutPartner, IsExrateFromPartner: IsExrateFromPartner, PCountryCode: PCountryCode, calcBy: obj
-        , payerName: payerName, tpExRate: tpExRate, rewardAmt: rewardAmt
+        , payerName: payerName, tpExRate: tpExRate, rewardAmt: rewardAmt, customerId: customerId
     };
 
     var options =
@@ -444,8 +445,41 @@ function checkPaymentOption() {
     }
 }
 //function CheckAgentQuota(agentUser) {
+//    var dataToSend = {
+//        MethodName: 'checkAgentQuota', user: agentUser
+//    };
+//    var options =
+//    {
+//        url: 'SendV2.aspx?x=' + new Date().getTime(),
+//        data: dataToSend,
+//        dataType: 'JSON',
+//        type: 'POST',
+//        async: false,
+//        success: function (response) {
+//             var data = response;
+//          //  var data = jQuery.parseJSON(response);
+//          //  alert(data[0].ErrorCode);
+//            $("#" + mId + "lblRemainingQuota").text('Remaining Quota : ' + data[0].ErrorCode);
+//            if (data[0].ErrorCode < 1) {
+//            /*if (data[0].agentQuota == data[0].freeScCounter) {*/
+//                $("#" + mId + "lblAgentQuota").show();
+//                $("#" + mId + "allowEditSC").val("N");
+//                $("#" + mId + "editServiceCharge").removeAttr('checked');
+//                $("#" + mId + "editServiceCharge").attr("disabled", true);
+//                $("#" + mId + "lblServiceChargeAmt").attr("readonly", true);
+//                $("#" + mId + "hdnQuota").val('Y');
+//            }
+//            else{
+//                $("#" + mId + "hdnQuota").val('N');
+//                $("#" + mId + "lblAgentQuota").hide();
+//            }
+//        }
+//    };
+//    $.ajax(options);
+//}
+
 function CheckAgentQuota() {
-    debugger
+    //debugger
     var customerId = $('#finalSenderId').text();
     var dataToSend = {
         MethodName: 'checkAgentQuota', customerId: customerId
@@ -458,7 +492,6 @@ function CheckAgentQuota() {
         type: 'POST',
         async: false,
         success: function (response) {
-            debugger
             var data = response;
             //  var data = jQuery.parseJSON(response);
             //  alert(data[0].ErrorCode);
@@ -595,6 +628,7 @@ $(document).on('click', '#btnSendTxnCDDI', function () {
 });
 
 function SendTransactionMethod() {
+    debugger
     ReCalculate();
     //if ($("#" + mId + "visaStatusNotFound").val() === 'true') {
     //    var visaStatusId = $("#ContentPlaceHolder1_visaStatusDdl").val();
@@ -948,7 +982,11 @@ function SendTransactionMethod() {
     var portOfShipment = $("#" + mId + "portOfShipment").val();
     var calcOriginalSc = $("#" + mId + "hdnCalcOriginalSc").val();
     var paymentOption = $("#" + mId + "ddlPaymentOption option:selected").text().replace("Select", "");
-    var rewardAmt = $("#" + mId + "txtRewardAmt").val();
+    var rewardAmt = $("#" + mId + "hdnRewardAmt").val();
+    var isPromoCode = $("#" + mId + "hdnIsPromoCode").val();
+    var rowId = $("#" + mId + "hdnRowId").val();
+
+    
     var url = "Confirm.aspx?senderId=" + senderId +
         "&sfName=" + sfName +
         "&smName=" + smName +
@@ -1061,7 +1099,9 @@ function SendTransactionMethod() {
         "&nameAsPerBank=" + nameAsPerBank +
         "&calcOriginalSc=" + calcOriginalSc +
         "&paymentOption=" + paymentOption +
-        "&rewardAmt=" + rewardAmt;
+        "&rewardAmt=" + rewardAmt +
+        "&isPromoCode=" + isPromoCode +
+        "&rowId=" + rowId;
 
 
     var param = "dialogHeight:900px;dialogWidth:900px;dialogLeft:200;dialogTop:100;center:yes";
@@ -1114,6 +1154,7 @@ function SendTransactionMethod() {
                 }
             }
             else {
+
                 window.location.replace("/AgentNew/SendTxn/SendIntlReceipt.aspx?controlNo=" + res[2] + "&invoicePrint=" + res[3]);
             }
         }

Swift.web/AgentNew/js/SendTxn/usableunctions.js

@@ -175,6 +175,9 @@ function ParseCalculateData(response, amtType) {
         $("#" + mId + "lblServiceChargeAmt").attr("readonly", true);
     }
     $("#" + mId + "hddExRateConfirmID").val(data[0].exRateConfirmId);
+    $("#" + mId + "hdnRewardAmt").val(data[0].rewardAmt);
+    $("#" + mId + "hdnIsPromoCode").val(data[0].isPromoCode);
+    $("#" + mId + "hdnRowId").val(data[0].rowId);
 }
 
 function CheckSession1(data) {

Swift.web/AgentPanel/International/SendMoney/Send.aspx.cs

@@ -737,6 +737,7 @@ namespace Swift.web.AgentPanel.International.SendMoney
                 , GetStatic.GetSessionId()
                 , couponId
                 , rewardAmt
+                , ""
                 , "");
 
             Response.ContentType = "text/plain";

Swift.web/AgentPanel/International/SendMoney/SendV2.aspx.cs

@@ -744,6 +744,7 @@ namespace Swift.web.AgentPanel.International.SendMoney
                 , GetStatic.GetSessionId()
                 , couponId
                 , rewardAmt
+                , ""
                 , "");
 
             Response.ContentType = "text/plain";

Swift.web/AgentPanel/International/SendMoneyv2/SendV2.aspx.cs

@@ -937,6 +937,7 @@ namespace Swift.web.AgentPanel.International.SendMoneyv2
                      , GetStatic.GetSessionId()
                      , couponId
                      , rewardAmt
+                     ,""
                      , isManualSc
                      , sc);
 

Swift.web/AgentPanel/International/SendOnBehalf/SendV2.aspx.cs

@@ -936,6 +936,7 @@ namespace Swift.web.AgentPanel.International.SendOnBehalf
                      , GetStatic.GetSessionId()
                      , couponId
                      , rewardAmt
+                     , ""
                      , isManualSc
                      , sc);
 

Swift.web/AgentPanel/Send/SendTransaction/Send.aspx.cs

@@ -743,6 +743,7 @@ namespace Swift.web.AgentPanel.Send.SendTransactionIRH
                 , GetStatic.GetSessionId()
                 , couponId
                 , rewardAmt
+                , ""
                 , "");
 
             Response.ContentType = "text/plain";

Swift.web/Remit/Administration/CountrySetup/PromotionalRateSetup/List.aspx.cs

@@ -98,7 +98,8 @@ namespace Swift.web.Remit.Administration.CountrySetup.PromotionalRateSetup
                                   {
                                       new GridColumn("depositType", "Deposit Type", "", "T"),
                                       new GridColumn("margin", "Rate", "", "T"),
-                                      new GridColumn("purchaseRate", "Promotional Rate", "", "T")
+                                      new GridColumn("purchaseRate", "Promotional Rate", "", "T"),
+                                      new GridColumn("maxAmt", "Maximum Amount", "", "T")
                                   };
 
             bool allowAddEdit = swiftLibrary.HasRight(AddEditFunctionId);

Swift.web/Remit/Administration/CountrySetup/PromotionalRateSetup/Manage.aspx

@@ -99,6 +99,17 @@
                                             </asp:RequiredFieldValidator>
                                         </div>
                                     </div>
+                                    <div class="form-group">
+                                        <label class="col-lg-3 col-md-4 control-label" for="">
+                                            Maximum Amount:<span class="errormsg">*</span>
+                                        </label>
+                                        <div class="col-lg-9 col-md-8">
+                                            <asp:TextBox ID="maxAmount" runat="server" TextMode="SingleLine" CssClass="form-control"></asp:TextBox>
+                                            <asp:RequiredFieldValidator ID="RequiredFieldValidator3"
+                                                runat="server" ControlToValidate="actualRate" ValidationGroup="static" ErrorMessage="Required!" Display="Dynamic" ForeColor="Red">
+                                            </asp:RequiredFieldValidator>
+                                        </div>
+                                    </div>
                                     <div class="form-group">
                                         <label class="col-lg-3 col-md-4 control-label" for="">
                                             Is Active:            

Swift.web/Remit/Administration/CountrySetup/PromotionalRateSetup/Manage.aspx.cs

@@ -124,11 +124,12 @@ namespace Swift.web.Remit.Administration.CountrySetup.PromotionalRateSetup
                 divPromRate.Style["display"] = "block";
             }
             ddlStatus.Text = dr["isActive"].ToString();
+            maxAmount.Text = dr["maxAmt"].ToString();
         }
 
         private void Update()
         {
-            var dbResult = obj.Update(GetStatic.GetUser(), GetCountryId().ToString(), depositType.Text, actualRate.Text, promRate.Text, ddlStatus.SelectedValue);
+            var dbResult = obj.Update(GetStatic.GetUser(), GetCountryId().ToString(), depositType.Text, actualRate.Text, promRate.Text, ddlStatus.SelectedValue, maxAmount.Text);
             ManageMessage(dbResult);
         }
 

Swift.web/Remit/Administration/CountrySetup/PromotionalRateSetup/Manage.aspx.designer.cs

@@ -104,6 +104,24 @@ namespace Swift.web.Remit.Administration.CountrySetup.PromotionalRateSetup
         /// </remarks>
         protected global::System.Web.UI.WebControls.RequiredFieldValidator RequiredFieldValidator1;
 
+        /// <summary>
+        /// maxAmount 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.TextBox maxAmount;
+
+        /// <summary>
+        /// RequiredFieldValidator3 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.RequiredFieldValidator RequiredFieldValidator3;
+
         /// <summary>
         /// ddlStatus control.
         /// </summary>
@@ -113,6 +131,15 @@ namespace Swift.web.Remit.Administration.CountrySetup.PromotionalRateSetup
         /// </remarks>
         protected global::System.Web.UI.WebControls.DropDownList ddlStatus;
 
+        /// <summary>
+        /// chkPromRate 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.HtmlInputCheckBox chkPromRate;
+
         /// <summary>
         /// divPromRate control.
         /// </summary>

Swift.web/Remit/Administration/PromotionalRateDao.cs

@@ -5,7 +5,7 @@ namespace Swift.DAL.BL.Remit.Administration
 {
     public class PromotionalRateDao : RemittanceDao
     {
-        public DbResult Update(string user, string countryId, string depositType, string actualRate, string promRate, string activeStatus)
+        public DbResult Update(string user, string countryId, string depositType, string actualRate, string promRate, string activeStatus, string maxAmount)
         {
             string sql = "EXEC proc_countryRateMaster";
             sql += " @flag = 'i-rate'";
@@ -15,6 +15,7 @@ namespace Swift.DAL.BL.Remit.Administration
             sql += ", @actualRate = " + FilterString(actualRate);
             sql += ", @promRate = " + FilterString(promRate);
             sql += ", @activeStatus = " + FilterString(activeStatus);
+            sql += ", @maxAmt = " + FilterString(maxAmount);
             return ParseDbResult(ExecuteDataset(sql).Tables[0]);
         }
 

Swift.web/Remit/TPSetup/BankAndBranchSetup/AddBank.aspx

@@ -24,45 +24,7 @@
     <script src="/js/swift_autocomplete.js"></script>
     <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery.mask/1.14.15/jquery.mask.min.js" type="text/javascript"></script>
     <script type="text/javascript">
-        $(document).ready(function () {
         
-            function ParseLoadDDl(response, myDDL, recall, selectField) {
-                var data = JSON.parse(response);
-                CheckSession(data);
-                $(myDDL).empty();
-
-                var option;
-                if (selectField !== "" && selectField !== undefined) {
-                    option = document.createElement("option");
-                    option.text = selectField;
-                    option.value = "";
-                    myDDL.options.add(option);
-                }
-
-                for (var i = 0; i < data.length; i++) {
-                    option = document.createElement("option");
-
-                    option.text = data[i].AGENTNAME.toUpperCase();
-                    option.value = data[i].bankId;
-
-                    var option2 = document.createElement("option");
-                    option2.value = data[i].bankId;
-                    option2.text = data[i].FLAG;
-
-                    var option3 = document.createElement("option");
-                    option3.value = data[i].bankId;
-                    option3.text = data[i].maxPayoutLimit;
-
-                    try {
-                        myDDL.options.add(option);
-                    }
-                    catch (e) {
-                        alert(e);
-                    }
-                }
-            }
-
-        });
         function CheckSession(data) {
             if (data === undefined || data === "" || data === null)
                 return;
@@ -73,89 +35,80 @@
 
 
 
-        function CheckFormValidation(flag) {
-            var reqField;
-            if (flag == 'I') {
-                reqField = "countryDDL1,paymentModeDDL1,pCurrency,bankName1, bankState";
-            }
-            else {
-                reqField = "countryDDL1,paymentModeDDL1,pCurrency,bankName1, bankState";
-            }
 
-            if (ValidRequiredField(reqField) == false) {
+        function CheckFormValidation(flag, recordId) {
+            var reqField = "countryDDL1,paymentModeDDL1,pCurrency,bankName1"; 
+            if (flag === 'I') {
+                reqField += ",countryDDL1,paymentModeDDL1,pCurrency,bankName1";
+            }
+            // Validate required fields
+            if (!ValidRequiredField(reqField)) {
                 return false;
             }
+            // Gather data for insertion or update
+            var countryId = $("#countryDDL1").val();
+            var paymentMode = $("#paymentModeDDL1").val();
+            var pCurrency = $("#pCurrency").val();
+            var bankName = $("#bankName1").val();
+            var bankState = $("#bankState").val();
+            var bankDistrict = $("#bankDistrict").val();
+            var bankAddress = $("#bankAddress").val();
+            var bankPhone = $("#bankPhone").val();
+            var bankEmail = $("#bankEmail").val();
+            var isActive = $("#isActiveDDL").val();
+            var dataToSend = {};
             
-            if (flag == 'I') {
-                debugger;
-                var countryId = $("#countryDDL1").val();
-                var paymentMode = $("#paymentModeDDL1").val();
-                var pCurrency = $("#pCurrency").val();
-                var bankName = $("#bankName1").val();
-                var bankState = $("#bankState").val();
-                var bankDistrict = $("#bankDistrict").val();
-                var bankAddress = $("#bankAddress").val();
-                var bankPhone = $("#bankPhone").val();
-                var bankEmail = $("#bankEmail").val();
-                var isActive = $("#isActiveDDL").val();
-                //  var partnerId = $("#partnerDDL1").val();
-
-                dataToSend = { MethodName: 'InsertBank', countryId: countryId, isActive: isActive, paymentMode: paymentMode, pCurrency: pCurrency, bankName: bankName, bankState: bankState, bankDistrict:bankDistrict, bankAddress: bankAddress, bankPhone: bankPhone, bankEmail: bankEmail};
+            if (flag === 'I') {
+                dataToSend = {
+                    MethodName: 'InsertBank',
+                    countryId: countryId,
+                    isActive: isActive,
+                    paymentMode: paymentMode,
+                    pCurrency: pCurrency,
+                    bankName: bankName,
+                    bankState: bankState,
+                    bankDistrict: bankDistrict,
+                    bankAddress: bankAddress,
+                    bankPhone: bankPhone,
+                    bankEmail: bankEmail
+                };
+            }
+            else if (flag === 'U') { 
+                var recordId = $("#recordId").val();
+                dataToSend = {
+                    MethodName: 'UpdateBank',
+                    recordId: recordId,
+                    countryId: countryId,
+                    isActive: isActive,
+                    paymentMode: paymentMode,
+                    pCurrency: pCurrency,
+                    bankName: bankName,
+                    bankState: bankState,
+                    bankDistrict: bankDistrict,
+                    bankAddress: bankAddress,
+                    bankPhone: bankPhone,
+                    bankEmail: bankEmail
+                };
+            }
 
-                $.post("", dataToSend, function (response) {
-                    if (response == "") {
-                        return;
-                    }
+            $.post("", dataToSend, function (response) {
+                if (response !== "") {
                     var data = JSON.parse(response);
                     alert(data[0].Msg);
                     ClearAllFieldsInserted();
-                });
-
-            }
-            //else {
-            //    var countryId = $("#countryDDL").val();
-            //    var bankId = $("#bankDDL").val();
-            //    var branchId = $("#branchDDL").val();
-            //    var branchCode = $("#branchCode").val();
-            //    var editedBranchName = $("#editedBranchName").val();
-            //    //  var partnerId = $("#partnerDDL").val();
-
-            //    dataToSend = { MethodName: 'UpdateBranchCode', bankId: bankId, countryId: countryId, branchId: branchId, branchCode: branchCode, editedBranchName: editedBranchName };
-
-            //    $.post("", dataToSend, function (response) {
-            //        if (response == "") {
-            //            return;
-            //        }
-            //        var data = JSON.parse(response);
-            //        alert(data[0].Msg);
-            //        ClearAllFields();
-            //    });
-
-            //}
-
-
-
+                }
+            });
         }
 
-        //function ClearAllFields() {
-        //    $("#countryDDL1").val('');
-        //    $("#paymentModeDDL1").val('');
-        //    $("#pCurrency").val('');
-        //    $("#bankName1").text('');
-        //    $("#bankState").val('');
-        //    $("#bankDistrict").val('');
-        //    $("#bankAddress").text('');
-        //    $("#bankPhone").val('');
-        //    $("#bankEmail").val('');
-        //}
+
         function ClearAllFieldsInserted() {
             $("#countryDDL1").val('');
             $("#paymentModeDDL1").val('');
             $("#pCurrency").val('');
-            $("#bankName1").text('');
+            $("#bankName1").val('');
             $("#bankState").val('');
             $("#bankDistrict").val('');
-            $("#bankAddress").text('');
+            $("#bankAddress").val('');
             $("#bankPhone").val('');
             $("#bankEmail").val('');
         }
@@ -177,7 +130,7 @@
                             <li><a href="../../../Front.aspx" target="mainFrame"><i class="fa fa-home"></i></a></li>
 							<li><a href="#">Others Service</a></li>
                             <li><a href="#">Others Service</a></li>
-                           <li class="active"><a href="#">Bank List</a></li>
+                           <li class="active"><a href="#">Bank Setup</a></li>
 						<%--	<li><a href="../../../Front.aspx" target="mainFrame"><i class="fa fa-home"></i></a></li>
 							<li><a href="#" onclick="return LoadModule('adminstration')">Other Services</a></li>
                              <li><a href="#" onclick="return LoadModule('sub_administration')">Sub_Other Service</a></li>
@@ -191,10 +144,12 @@
 			<div class="listtabs">
 				<ul class="nav nav-tabs" role="tablist">
 
-                    <li><a href="BankList.aspx">Bank List</a></li>
-                    <li class="active"><a href="AddBank.aspx">Bank Setup </a></li>
-                    <li class="active"><a href="AddBankList.aspx">Bank Mapping </a></li>
-                    <li class="active"><a href="AddBranch.aspx">Branch Setup </a></li>
+                    <li><a href="NewBankList.aspx">Bank List</a></li>
+					<li class="active"><a href="AddBank.aspx">Bank Setup</a></li>
+					<li><a href="BankList.aspx">Bank Mapping List</a></li>
+					<li><a href="AddBankMapping.aspx">Bank Mapping Setup</a></li>
+                    <li><a href="ListBranch.aspx">Branch List </a></li>
+					<li><a href="AddBranch.aspx">Branch Setup </a></li>
                  <%--   <li role="presentation" class="deactive"><a href="BankList.aspx">Partner Bank List </a></li>--%>
 					<%--<li class=""><a href="BankList.aspx" aria-controls="home" role="tab" data-toggle="tab">Partner Bank List</a></li>--%>
                     <%--<li class="selected"><a href="#" aria-controls="home" role="tab" data-toggle="tab">Insert Bank</a></li>--%>
@@ -210,7 +165,7 @@
                     <div class="panel panel-default recent-activites">
                         <!-- Start .panel -->
                         <div class="panel-heading">
-                            <h4 class="panel-title">Insert Bank 
+                            <h4 class="panel-title">Bank Setup 
                             </h4>
                             <div class="panel-actions">
                                 <a href="#" class="panel-action panel-action-toggle" data-panel-toggle></a>
@@ -218,6 +173,7 @@
                         </div>
                         <div class="panel-body">
                             <!-- End .form-group  -->
+                            
                             <div class="form-group">
                                 <label class="col-lg-3 col-md-4 control-label" for="">
                                     <label>
@@ -317,10 +273,13 @@
                                         </div>
                                     </div>
                             <!-- End .form-group  -->
+                            <input type="hidden" id="recordId" name="recordId" value ="recordId" />
 
                             <div class="form-group">
                                 <div class="col-md-12 col-md-offset-3">
-                                    <input type="button" value="Save" style="width: 165px;" class="btn btn-primary m-t-25" onclick="return CheckFormValidation('I');" />
+                                    <%--<input type="button" value="Save" style="width: 165px;" class="btn btn-primary m-t-25" onclick="return CheckFormValidation('I');" />--%>
+                                    <input type="button" value="Save" style="width: 165px;" class="btn btn-primary m-t-25" onclick="return CheckFormValidation('I', $('#recordId').val());" />
+
                                 </div>
                             </div>
                             <!-- End .form-group  -->

Swift.web/Remit/TPSetup/BankAndBranchSetup/AddBank.aspx.cs

@@ -29,6 +29,10 @@ namespace Swift.web.Remit.TPSetup.BankAndBranchSetup
                 {
                     PopulateDDL();
                     PopulateDDL1();
+                    if (GetId() != "")
+                    {
+                        PopulateDataById();
+                    }
                 }
                 string reqMethod = Request.Form["MethodName"];
                 if (string.IsNullOrEmpty(reqMethod))
@@ -43,22 +47,12 @@ namespace Swift.web.Remit.TPSetup.BankAndBranchSetup
                 }
                 switch (reqMethod)
                 {
-                    //case "LoadPartner":
-                    //    LoadPartner();
-                    //    break;
-                    //case "LoadBank":
-                    //    LoadBank();
-                    //    break;
-                    //case "LoadBankBranch":
-                    //    LoadBankBranch();
-                    //    break;
-                    //case "UpdateBranchCode":
-                    //    UpdateBranchCode();
-                    //    break;
                     case "InsertBank":
-                        InsertBank();
+                        InsertOrUpdateBank(); 
+                        break;
+                    case "UpdateBank": 
+                        InsertOrUpdateBank(); 
                         break;
-
                 }
 
             }
@@ -71,21 +65,15 @@ namespace Swift.web.Remit.TPSetup.BankAndBranchSetup
 
         protected void PopulateDDL()
         {
-            //_sdd.SetDDL(ref countryDDL, "EXEC [proc_dropDownLists] @flag='r-country-list'", "countryId", "countryName", "", "Select Country");
             _sdd.SetDDL(ref countryDDL1, "EXEC [proc_dropDownLists] @flag='r-country-list'", "countryId", "countryName", "", "Select Country");
-            //_sdd.SetDDL(ref BranchDDl, "EXEC [proc_dropDownLists] @flag='branch-list'", "agentId", "agentName", "", "All");
         }
 
         protected void PopulateDDL1()
         {
-            //_sdd.SetDDL(ref countryDDL, "EXEC [proc_dropDownLists] @flag='r-country-list'", "countryId", "countryName", "", "Select Country");
             _sdd.SetDDL(ref paymentModeDDL1, "EXEC [proc_dropDownLists] @flag='paymentModelist'", "serviceTypeId", "typeTitle", "", "Select Pmode");
-            //_sdd.SetDDL(ref BranchDDl, "EXEC [proc_dropDownLists] @flag='branch-list'", "agentId", "agentName", "", "All");
         }
 
-   
-
-        private void InsertBank()
+        private void InsertOrUpdateBank()
         {
             var countryId = Request.Form["countryId"];
             var paymentMode = Request.Form["paymentMode"];
@@ -97,16 +85,63 @@ namespace Swift.web.Remit.TPSetup.BankAndBranchSetup
             var bankPhone = Request.Form["bankPhone"];
             var bankEmail = Request.Form["bankEmail"];
             var isActive = Request.Form["isActive"];
-
-
-            DataTable dt = null;
-
-            dt = _rd.InsertBank(GetStatic.GetUser(), "insertBank", countryId, paymentMode, bankName, pCurrency, bankState, bankDistrict, bankAddress,bankPhone, bankEmail, isActive);
+            //string methodName;
+            string flag;
+            //string recordId = GetId();
+            if (!string.IsNullOrEmpty(GetId()))
+            {
+                //methodName = "UpdateBank";
+                flag = "updateBank";  
+            }
+            else
+            { 
+                //methodName = "InsertBank";
+                flag = "insertBank";  
+            }
+            DataTable dt = _rd.InsertOrUpdateBank(GetStatic.GetUser(), flag, GetId(), countryId, paymentMode, bankName, pCurrency, bankState, bankDistrict, bankAddress, bankPhone, bankEmail, isActive);
             Response.ContentType = "text/plain";
             var json = DataTableToJson(dt);
             Response.Write(json);
             Response.End();
         }
+        protected string GetId()
+        {
+            return GetStatic.ReadQueryString("MASTER_BANK_ID", "");
+        }
+        private void PopulateDataById()
+        {
+            DataRow dr = _rd.EditBankSelectById(GetId(), GetStatic.GetUser());
+            if (dr == null)
+            {
+                Response.Redirect("NewBankList.aspx");
+            }
+            paymentModeDDL1.SelectedValue = dr["PAYMENT_TYPE_ID"].ToString();
+            //countryDDL1.SelectedItem.Text = dr["BANK_COUNTRY"].ToString();
+            bankName1.Text = dr["Bank_Name"].ToString();
+            pCurrency.Text = dr["SUPPORT_CURRENCY"].ToString();
+            bankState.Text = dr["Bank_State"].ToString();
+            bankDistrict.Text = dr["Bank_District"].ToString();
+            bankAddress.Text = dr["Bank_Address"].ToString();
+            bankPhone.Text = dr["BANK_PHONE"].ToString();
+            bankEmail.Text = dr["BANK_Email"].ToString();
+            isActiveDDL.SelectedValue = (dr["IS_ACTIVE"].ToString() == "True" || dr["IS_ACTIVE"].ToString() == "1") ? "1" : "0";
+            string countryName = dr["BANK_COUNTRY"].ToString().Trim();
+            bool countryFound = false;
+            foreach (ListItem item in countryDDL1.Items)
+            {
+                if (string.Equals(item.Text.Trim(), countryName, StringComparison.OrdinalIgnoreCase))
+                {
+                    countryDDL1.SelectedValue = item.Value;
+                    countryFound = true;
+                    break;
+                }
+            }
+            if (!countryFound)
+            {
+                countryDDL1.SelectedValue = "DefaultCountry";
+            }
+
+        }
         public static string DataTableToJson(DataTable table)
         {
             if (table == null)

Swift.web/Remit/TPSetup/BankAndBranchSetup/AddBankMapping.aspx

@@ -0,0 +1,392 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="AddBankMapping.aspx.cs" Inherits="Swift.web.Remit.TPSetup.BankAndBranchSetup.AddBankMapping" %>
+
+<!DOCTYPE html>
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+       <meta charset="utf-8" />
+    <meta http-equiv="X-UA-Compatible" content="IE=edge" />
+    <meta name="viewport" content="width=device-width, initial-scale=1" />
+    <meta name="description" content="" />
+    <meta name="author" content="" />
+    <!-- Bootstrap Core CSS -->
+    <link href="/ui/bootstrap/css/bootstrap.min.css" rel="stylesheet" />
+    <link href="/ui/css/datepicker-custom.css" rel="stylesheet" />
+    <link href="/js/jQuery/jquery-ui.css" rel="stylesheet" type="text/css" />
+    <link href="/ui/css/style.css" type="text/css" rel="stylesheet" />
+    <link href="/ui/font-awesome/css/font-awesome.min.css" rel="stylesheet" />
+    <script type="text/javascript" src="/ui/js/jquery.min.js"></script>
+    <script type="text/javascript" src="/ui/bootstrap/js/bootstrap.min.js"></script>
+    <script src="/js/swift_calendar.js"></script>
+    <script src="/ui/js/pickers-init.js"></script>
+    <script src="/ui/js/jquery-ui.min.js"></script>
+    <script src="/js/functions.js" type="text/javascript"> </script>
+    <script src="/js/swift_autocomplete.js"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery.mask/1.14.15/jquery.mask.min.js" type="text/javascript"></script>
+    <script type="text/javascript">
+        $(document).ready(function () {
+           
+            //$("#countryDDL1").on('change', function () {
+            //  //  ClearFieldsInserted();
+            //    var countryId = $("#countryDDL1").val();
+            //    dataToSend = { MethodName: 'LoadPartner', countryId: countryId };
+            //    dataToSend = { MethodName: 'LoadBank', countryId: countryId };
+            //    $.post("", dataToSend, function (response) {
+            //        if (response == "") {
+            //            return;
+            //        }
+            //        ParseLoadDDl(response, GetElement('bankDDL1'));
+            //        //$("#bankDDL1").val('');
+            //        $("#branchName").text('');
+            //        $("#branchName").val('');
+            //        $("#branchCodeValue").val('');
+            //    });
+
+            //});
+
+
+            $("#countryDDL1").on('change', function () {
+                var countryId = $("#countryDDL1").val();
+                // Load banks
+                var bankDataToSend = { MethodName: 'LoadBank', countryId: countryId };
+                $.post("", bankDataToSend, function (bankResponse) {
+                    if (bankResponse != "") {
+                        ParseLoadDDl(bankResponse, GetElement('bankDDL1'));
+                    }
+                });
+                // Load partners
+                var partnerDataToSend = { MethodName: 'LoadPartner', countryId: countryId };
+                $.post("", partnerDataToSend, function (partnerResponse) {
+                    if (partnerResponse != "") {
+                        ParseLoadDDl(partnerResponse, GetElement('partnerDDL1'));
+                    }
+                });
+
+                // Load banks
+                //var bankDataToSend = { MethodName: 'LoadBank', countryId: countryId };
+                //$.post("", bankDataToSend, function (bankResponse) {
+                //    if (bankResponse != "") {
+                //        ParseLoadDDl(bankResponse, GetElement('bankDDL1'));
+                //    }
+                //});
+
+            
+            });
+
+
+            $("#countryDDL1").on('change', function () {
+                //  ClearFieldsInserted();
+                var countryId = $("#countryDDL1").val();
+                dataToSend = { MethodName: 'LoadBank', countryId: countryId };
+                // dataToSend = { MethodName: 'LoadBank', countryId: countryId };
+                $.post("", dataToSend, function (response) {
+                    if (response == "") {
+                        return;
+                    }
+                    ParseLoadDDl(response, GetElement('bankDDL1'));
+                   // $("#bankDDL1").val('');
+                    $("#branchName").text('');
+                    $("#branchName").val('');
+                    $("#branchCodeValue").val('');
+                });
+
+            });
+       
+           
+            //$("#branchDDL").on('change', function () {
+            //    $("#branchCode").val('');
+            //    $("#editedBranchName").val('');
+            //    $("#branchCode").val($("#branchDDL option:selected").text().split('||')[1].trim());
+            //    $("#editedBranchName").val($("#branchDDL option:selected").text().split('||')[0].trim());
+
+            //});
+
+            function ParseLoadDDl(response, myDDL, recall, selectField) {
+                var data = JSON.parse(response);
+                CheckSession(data);
+                $(myDDL).empty();
+
+                var option;
+                if (selectField !== "" && selectField !== undefined) {
+                    option = document.createElement("option");
+                    option.text = selectField;
+                    option.value = "";
+                    myDDL.options.add(option);
+                }
+
+                for (var i = 0; i < data.length; i++) {
+                    option = document.createElement("option");
+
+                    option.text = data[i].AGENTNAME.toUpperCase();
+                    option.value = data[i].bankId;
+
+                    var option2 = document.createElement("option");
+                    option2.value = data[i].bankId;
+                    option2.text = data[i].FLAG;
+
+                    var option3 = document.createElement("option");
+                    option3.value = data[i].bankId;
+                    option3.text = data[i].maxPayoutLimit;
+
+                    try {
+                        myDDL.options.add(option);
+                    }
+                    catch (e) {
+                        alert(e);
+                    }
+                }
+            }
+
+        });
+        function CheckSession(data) {
+            if (data === undefined || data === "" || data === null)
+                return;
+            if (data[0].session_end === "1") {
+                document.location = "../../../Logout.aspx";
+            }
+        }
+ 
+
+  
+        function CheckFormValidation(flag, recordId)
+        {
+            var reqField = "countryDDL1,partnerDDL1,bankDDL1,pCurrency,paymentModeDDL"; // Common required fields
+
+            // Additional required fields for insertion
+            if (flag === 'I') {
+                reqField += ",countryDDL1,partnerDDL1,bankDDL1,pCurrency,paymentModeDDL";
+            }
+
+            // Validate required fields
+            if (!ValidRequiredField(reqField)) {
+                return false;
+            }
+
+            // Gather data for insertion or update
+            var countryId = $("#countryDDL1").val();
+            var parnerId = $("#partnerDDL1").val();
+            var bankId = $("#bankDDL1").val();
+            var pMode = $("#paymentModeDDL").val();
+            var bankCode1 = $("#bankCode1").val();
+            var bankCode2 = $("#bankCode2").val();
+            var pCurrency = $("#pCurrency").val();
+            var bAddress = $("#bAddress").val();
+            var isActive = $("#isActiveDDL").val();
+
+
+            var dataToSend = {};
+
+            // Construct data object based on flag
+            if (flag === 'I') {
+                dataToSend = {
+                    MethodName: 'InsertBank',
+                    countryId: countryId,
+                    parnerId: parnerId,
+                    bankId: bankId,
+                    pMode: pMode,
+                    bankCode1: bankCode1,
+                    bankCode2: bankCode2,
+                    pCurrency: pCurrency,
+                    //bankAddress: bankAddress,
+                    bAddress: bAddress,
+                    isActive: isActive
+                };
+            }
+            else if (flag === 'U') { // Update functionality
+                var recordId = $("#recordId").val();
+                dataToSend = {
+                    MethodName: 'UpdateBank',
+                    recordId: recordId,
+                    countryId: countryId,
+                    parnerId: parnerId,
+                    bankId: bankId,
+                    pMode: pMode,
+                    bankCode1: bankCode1,
+                    bankCode2: bankCode2,
+                    pCurrency: pCurrency,
+                    //bankAddress: bankAddress,
+                    bAddress: bAddress,
+                    isActive: isActive
+                };
+            }
+
+            // Send data to server
+            $.post("", dataToSend, function (response) {
+                if (response !== "") {
+                    var data = JSON.parse(response);
+                    alert(data[0].Msg);
+                    ClearAllFieldsInserted();
+                }
+            });
+        }
+     
+        function ClearAllFieldsInserted() {
+            $("#countryDDL1").val('');
+            $("#partnerDDL1").val('');
+            $("#bankDDL1").val('');
+            $("#paymentModeDDL").val('');
+            $("#bankCode1").val('');
+            $("#bankCode2").val('');
+            $("#pCurrency").val('');
+            $("#bAddress").val('');
+        }
+      
+    </script>
+</head>
+<body>
+     <form id="form1" runat="server">
+        <div class="page-wrapper">
+           <div class="row">
+				<div class="col-sm-12">
+					<div class="page-title">
+						<h1></h1>
+						<ol class="breadcrumb">
+							 <li><a href="../../../Front.aspx" target="mainFrame"><i class="fa fa-home"></i></a></li>
+							<li><a href="#">Others Service</a></li>
+                            <li><a href="#">Others Service</a></li>
+                           <li class="active"><a href="#">Bank Mapping Setup</a></li>
+                            <%--<li class="active"><a href="AddBank.aspx">Partner Agent/Bank List</a></li>--%>
+						</ol>
+					</div>
+				</div>
+			</div>
+            	<!-- Nav tabs -->
+			<div class="listtabs">
+				<ul class="nav nav-tabs">
+                     <li><a href="NewBankList.aspx">Bank List</a></li>
+					<li><a href="AddBank.aspx">Bank Setup</a></li>
+					<li><a href="BankList.aspx">Bank Mapping List</a></li>
+					<li  class="active"><a href="AddBankMapping.aspx">Bank Mapping Setup</a></li>
+                    <li><a href="ListBranch.aspx">Branch List </a></li>
+					<li><a href="AddBranch.aspx">Branch Setup </a></li>
+           
+				</ul>
+			</div>
+            <div class="row">
+               
+                <div class="col-md-6">
+                    <div class="panel panel-default recent-activites">
+                        <!-- Start .panel -->
+                        <div class="panel-heading">
+                            <h4 class="panel-title">Bank Mapping Setup
+                            </h4>
+                            <div class="panel-actions">
+                                <a href="#" class="panel-action panel-action-toggle" data-panel-toggle></a>
+                            </div>
+                        </div>
+                        <div class="panel-body">
+                            <!-- End .form-group  -->
+                            <div class="form-group">
+                                <label class="col-lg-3 col-md-4 control-label" for="">
+                                    <label>
+                                        Country:</label>
+                                </label>
+                                <div class="col-lg-9 col-md-8">
+                                    <asp:DropDownList ID="countryDDL1" runat="server" CssClass="form-control">
+                                    </asp:DropDownList>
+                                </div>
+                            </div>
+                            <div class="form-group">
+                                <label class="col-lg-3 col-md-4 control-label" for="">
+                                    <label>
+                                        Partner:</label>
+                                </label>
+                                <div class="col-lg-9 col-md-8">
+                                    <asp:DropDownList ID="partnerDDL1" runat="server" CssClass="form-control">
+                                    </asp:DropDownList>
+                                </div>
+                            </div>
+                            <!-- End .form-group  -->
+                            <!-- End .form-group  -->
+                            <div class="form-group">
+                                <label class="col-lg-3 col-md-4 control-label" for="">
+                                    <label>
+                                        Bank Name:</label>
+                                </label>
+                                <div class="col-lg-9 col-md-8">
+                                    <asp:DropDownList ID="bankDDL1" runat="server" CssClass="form-control">
+                                    </asp:DropDownList>
+                                </div>
+                            </div>
+                            <div class="form-group">
+                                <label class="col-lg-3 col-md-4 control-label" for="">
+                                    <label>
+                                         Paying Currency:</label>
+                                </label>
+                                <div class="col-lg-9 col-md-8">
+                                    <asp:TextBox runat="server" ID="pCurrency" CssClass="form-control"></asp:TextBox>
+                                </div>
+                            </div>
+                             <div class="form-group">
+                                <label class="col-lg-3 col-md-4 control-label" for="">
+                                    <label>
+                                        Payment Mode:</label>
+                                </label>
+                                <div class="col-lg-9 col-md-8">
+                                    <asp:DropDownList ID="paymentModeDDL" runat="server" CssClass="form-control">
+                                    </asp:DropDownList>
+                                </div>
+                            </div>
+                            <div class="form-group">
+                                <label class="col-lg-3 col-md-4 control-label" for="">
+                                    <label>
+                                        Bank Code1:</label>
+                                </label>
+                                <div class="col-lg-9 col-md-8">
+                                    <asp:TextBox runat="server" ID="bankCode1" CssClass="form-control"></asp:TextBox>
+                                </div>
+                            </div>
+                            <div class="form-group">
+                                <label class="col-lg-3 col-md-4 control-label" for="">
+                                    <label>
+                                        Bank_Code2 :</label>
+                                </label>
+                                <div class="col-lg-9 col-md-8">
+                                    <asp:TextBox runat="server" ID="bankCode2" CssClass="form-control"></asp:TextBox>
+                                </div>
+                            </div>
+
+                            
+                             <div class="form-group">
+                                <label class="col-lg-3 col-md-4 control-label" for="">
+                                    <label>
+                                        Bank Address:</label>
+                                </label>
+                                <div class="col-lg-9 col-md-8">
+                                    <asp:TextBox runat="server" ID="bAddress" CssClass="form-control"></asp:TextBox>
+                                </div>
+                            </div>
+
+                              <div class="form-group">
+                                        <label class="col-lg-3 col-md-4 control-label" for="">
+                                            <label>
+                                                Is Active:</label>
+                                        </label>
+                                        <div class="col-lg-9 col-md-8">
+                                            <asp:DropDownList ID="isActiveDDL" runat="server" CssClass="form-control">
+                                                <asp:ListItem Text="Yes" Value="1"></asp:ListItem>
+                                                <asp:ListItem Text="No" Value="0"></asp:ListItem>
+                                            </asp:DropDownList>
+                                        </div>
+                                    </div>
+                            <!-- End .form-group  -->
+                            <input type="hidden" id="recordId" name="recordId" value ="recordId" />
+                           
+
+                            <div class="form-group">
+                           <div class="col-md-12 col-md-offset-3">
+                               <%--<input type="button" value="Save" style="width: 165px;" class="btn btn-primary m-t-25" onclick="return CheckFormValidation('I');" />
+                               <input type="button" value="Update" style="width: 165px; display: none;" class="btn btn-primary m-t-25" onclick="return CheckFormValidation('U');" id="updateButton" />--%>
+                               <input type="button" value="Save" style="width: 165px;" class="btn btn-primary m-t-25" onclick="return CheckFormValidation('I', $('#recordId').val());" />
+                            </div>
+                            </div>
+
+                            <!-- End .form-group  -->
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </form>
+</body>
+</html>

Swift.web/Remit/TPSetup/BankAndBranchSetup/AddBankMapping.aspx.cs

@@ -0,0 +1,264 @@
+using Newtonsoft.Json;
+using Swift.API;
+using Swift.DAL.Remittance.Transaction;
+using Swift.web.Library;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+using System.Web;
+using System.Web.Script.Serialization;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+
+namespace Swift.web.Remit.TPSetup.BankAndBranchSetup
+{
+    public partial class AddBankMapping : System.Web.UI.Page
+    {
+
+        private const string ViewFunctionId = "20317000";
+        //private const string UpdateFunctionId = "20317010";
+        private const string AddEditFunctionId = "20300010";
+        private readonly SwiftLibrary _sl = new SwiftLibrary();
+        private readonly StaticDataDdl _sdd = new StaticDataDdl();
+        private readonly UpdateBranchDao _rd = new UpdateBranchDao();
+        protected void Page_Load(object sender, EventArgs e)
+        {
+         
+            if (!IsPostBack)
+            {
+                Authenticate();
+                if (!IsPostBack)
+                {
+                    PopulateDDL();
+                    PopulateDDL1();
+                    if (GetId() != "")
+                    {
+                         //Page.AsyncMode = true;
+                        PopulateDataById();
+                        //PopulateDDL();
+                    }
+                }
+              
+                string reqMethod = Request.Form["MethodName"];
+                if (string.IsNullOrEmpty(reqMethod))
+                {
+                    if (GetStatic.GetUser() == "")
+                    {
+                        Response.ContentType = "text/plain";
+                        Response.Write("[{\"session_end\":\"1\"}]");
+                        Response.End();
+                        return;
+                    }
+                }
+                switch (reqMethod)
+                {
+                    case "LoadPartner":
+                        LoadPartner();
+                        break;                
+                    case "LoadBank":
+                        LoadBank();
+                        break;
+
+                    //case "LoadBankBranch":
+                    //    LoadBankBranch();
+                    //    break;
+                    case "InsertBank":
+                        InsertOrUpdateBankMapping(); 
+                        break;
+                    case "UpdateBank":
+                        InsertOrUpdateBankMapping(); 
+                        break;
+
+
+                }
+            }
+        }
+        private void Authenticate()
+        {
+            _sl.CheckAuthentication(ViewFunctionId);
+            if (!_sl.HasRight(AddEditFunctionId))
+            {
+                //btnSave.Enabled = false;
+                //btnSave.Visible = false;
+            }
+        }
+
+        protected void PopulateDDL()
+        {
+            _sdd.SetDDL(ref countryDDL1, "EXEC [proc_dropDownLists] @flag='r-country-list'", "countryId", "countryName", "", "Select Country");
+
+        }
+        protected void PopulateDDL1()
+        {
+            _sdd.SetDDL(ref paymentModeDDL, "EXEC [proc_dropDownLists] @flag='paymentModelist'", "serviceTypeId", "typeTitle", "", "Select Pmode");
+        }
+        private void LoadPartner()
+        {
+            var countryId = Request.Form["countryId"];
+
+            DataTable dt = null;
+            dt = _rd.LoadPartner(GetStatic.GetCountryId(), countryId, null, "getPartnerByCountry", GetStatic.GetUser());
+            Response.ContentType = "text/plain";
+            var json = DataTableToJson(dt);
+            Response.Write(json);
+            Response.End();
+        }
+        private void LoadBank()
+        {
+            var countryId = Request.Form["countryId"];
+
+            DataTable dt = null;
+            dt = _rd.LoadBankMaster(GetStatic.GetCountryId(), countryId, null, "getBankMasterByCountry", GetStatic.GetUser());
+            Response.ContentType = "text/plain";
+            var json = DataTableToJson(dt);
+            Response.Write(json);
+            Response.End();
+        }
+
+        private void InsertOrUpdateBankMapping()
+        {
+           var countryId = Request.Form["countryId"];
+           var parnerId = Request.Form["parnerId"];
+           var bankId = Request.Form["bankId"].ToUpper();
+           var pMode = Request.Form["pMode"];
+           var bankCode1 = Request.Form["bankCode1"];
+           var bankCode2 = Request.Form["bankCode2"];
+           var pCurrency = Request.Form["pCurrency"];
+           var bAddress = Request.Form["bAddress"];
+           var isActive = Request.Form["isActive"];
+
+
+            //string methodName;
+            string flag;
+            //string recordId = GetId();
+
+            if (!string.IsNullOrEmpty(GetId()))
+            {
+
+                //methodName = "UpdateBank";
+                flag = "updateBankMapping";
+            }
+            else
+            {
+
+                //methodName = "InsertBank";
+                flag = "insertBankMapping";
+            }
+
+            DataTable dt = _rd.InsertOrUpdateBankMapping(GetStatic.GetUser(), flag, GetId(), countryId, parnerId, bankId, pMode, bankCode1, bankCode2, pCurrency, bAddress, isActive);
+            Response.ContentType = "text/plain";
+            var json = DataTableToJson(dt);
+            Response.Write(json);
+            Response.End();
+        }
+       
+
+        protected string GetId()
+        {
+            return GetStatic.ReadQueryString("BANK_ID", "");
+        }
+        private void PopulateDataById()
+        {
+            DataRow dr = _rd.EditBankMappingSelectById(GetId(), GetStatic.GetUser());
+            if (dr == null)
+            {
+                Response.Redirect("BankList.aspx");
+            }
+         
+            string cName = dr["BANK_COUNTRY"].ToString().Trim();
+            ListItem item1 = countryDDL1.Items.FindByText(cName);
+            if (item1 != null)
+            {
+                countryDDL1.SelectedValue = item1.Value;
+            }
+            else
+            {
+                countryDDL1.SelectedValue = "DefaultPartner";
+            }
+            partnerDDL1.Items.Clear();
+            bankDDL1.Items.Clear();
+
+            string partnerId = dr["API_PARTNER_ID"].ToString();
+            string partnerName = GetPartnerNameById(partnerId);
+            ListItem partnerItem = new ListItem(partnerName, partnerId);
+            partnerDDL1.Items.Add(partnerItem);
+            ListItem defaultPartnerItem = new ListItem("Select Partner", "");
+            partnerDDL1.Items.Add(defaultPartnerItem); 
+            string BankName = dr["Bank_Name"].ToString();
+            string id = GetBankNameId(BankName);
+            ListItem Item = new ListItem(BankName,id);
+            bankDDL1.Items.Add(Item);
+            ListItem defaulItem = new ListItem("Select All Banks", "");
+            bankDDL1.Items.Add(defaulItem);
+            // ListItem bankItem = new ListItem(dr["Bank_Name"].ToString(), dr["Bank_Name"].ToString());
+            // bankDDL1.Items.Add(bankItem);
+            paymentModeDDL.SelectedValue = dr["PAYMENT_TYPE_ID"].ToString();
+            bankCode1.Text = dr["bank_Code1"].ToString();
+            bankCode2.Text = dr["bank_Code2"].ToString();
+            pCurrency.Text = dr["SUPPORT_CURRENCY"].ToString();
+            bAddress.Text = dr["BANK_ADDRESS"].ToString();
+            isActiveDDL.SelectedValue = (dr["IS_ACTIVE"].ToString() == "True" || dr["IS_ACTIVE"].ToString() == "1") ? "1" : "0";
+
+        }
+
+
+        public  string GetPartnerNameById(string partnerId)
+        {
+            DataTable result = _rd.GetPartnerName(partnerId);
+
+        
+            if (result != null && result.Rows.Count > 0)
+            {
+                
+                string agentName = result.Rows[0]["AGENTNAME"].ToString();
+                return agentName;
+            }
+            else
+            {
+               
+                return string.Empty;
+            }
+        }
+
+        public string GetBankNameId(string bankn)
+        {
+            DataTable result = _rd.GetMasterID(bankn);
+
+            if (result != null && result.Rows.Count > 0)
+            {
+                string bankId = result.Rows[0]["MASTER_BANK_ID"].ToString();
+
+                return (bankId);
+            }
+            else
+            {
+                return  string.Empty;
+            }
+        }
+
+
+        public static string DataTableToJson(DataTable table)
+        {
+            if (table == null)
+                return "";
+            var list = new List<Dictionary<string, object>>();
+
+            foreach (DataRow row in table.Rows)
+            {
+                var dict = new Dictionary<string, object>();
+
+                foreach (DataColumn col in table.Columns)
+                {
+                    dict[col.ColumnName] = string.IsNullOrEmpty(row[col].ToString()) ? "" : row[col];
+                }
+                list.Add(dict);
+            }
+            var serializer = new JavaScriptSerializer();
+            string json = serializer.Serialize(list);
+            return json;
+        }
+    }
+}
+
+    

Swift.web/Remit/TPSetup/BankAndBranchSetup/AddBankMapping.aspx.designer.cs

@@ -0,0 +1,107 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated. 
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace Swift.web.Remit.TPSetup.BankAndBranchSetup
+{
+
+
+    public partial class AddBankMapping
+    {
+
+        /// <summary>
+        /// form1 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.HtmlForm form1;
+
+        /// <summary>
+        /// countryDDL1 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.DropDownList countryDDL1;
+
+        /// <summary>
+        /// partnerDDL1 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.DropDownList partnerDDL1;
+
+        /// <summary>
+        /// bankDDL1 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.DropDownList bankDDL1;
+
+        /// <summary>
+        /// pCurrency 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.TextBox pCurrency;
+
+        /// <summary>
+        /// paymentModeDDL 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.DropDownList paymentModeDDL;
+
+        /// <summary>
+        /// bankCode1 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.TextBox bankCode1;
+
+        /// <summary>
+        /// bankCode2 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.TextBox bankCode2;
+
+        /// <summary>
+        /// bAddress 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.TextBox bAddress;
+
+        /// <summary>
+        /// isActiveDDL 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.DropDownList isActiveDDL;
+    }
+}

Swift.web/Remit/TPSetup/BankAndBranchSetup/AddBranch.aspx

@@ -246,7 +246,7 @@
 							 <li><a href="../../../Front.aspx" target="mainFrame"><i class="fa fa-home"></i></a></li>
 							<li><a href="#">Others Service</a></li>
                             <li><a href="#">Others Service</a></li>
-                           <li class="active"><a href="#">Bank List</a></li>
+                           <li class="active"><a href="#">Branch Setup</a></li>
                             <%--<li class="active"><a href="AddBank.aspx">Partner Agent/Bank List</a></li>--%>
 						</ol>
 					</div>
@@ -255,10 +255,13 @@
             	<!-- Nav tabs -->
 			<div class="listtabs">
 				<ul class="nav nav-tabs">
-                    <li><a href="BankList.aspx">Bank List</a></li>
-                    <li class="active"><a href="AddBank.aspx">Bank Setup </a></li>
-                    <li class="active"><a href="AddBankList.aspx">Bank Mapping </a></li>
-                    <li class="active"><a href="AddBranch.aspx">Branch Setup </a></li>
+                    <li><a href="NewBankList.aspx">Bank List</a></li>
+					<li><a href="AddBank.aspx">Bank Setup</a></li>
+					<li><a href="BankList.aspx">Bank Mapping List</a></li>
+					<li><a href="AddBankMapping.aspx">Bank Mapping Setup</a></li>
+                    <li><a href="ListBranch.aspx">Branch List </a></li>
+					<li class="active"><a href="AddBranch.aspx">Branch Setup</a></li>
+
                     <%--<li role="presentation" class="deactive"><a href="BankList.aspx">Partner Bank List </a></li>--%>
 					<%--<li class=""><a href="BankList.aspx" aria-controls="home" role="tab" data-toggle="tab">Partner Bank List</a></li>--%>
                     <%--<li class="selected"><a href="#" aria-controls="home" role="tab" data-toggle="tab">Insert Bank</a></li>--%>
@@ -270,11 +273,12 @@
 			</div>
             <!-- end .page title-->
             <div class="row">
+               
                 <div class="col-md-6">
                     <div class="panel panel-default recent-activites">
                         <!-- Start .panel -->
                         <div class="panel-heading">
-                            <h4 class="panel-title">Update Branch Code
+                            <h4 class="panel-title">Insert Branch Name And Code
                             </h4>
                             <div class="panel-actions">
                                 <a href="#" class="panel-action panel-action-toggle" data-panel-toggle></a>
@@ -288,7 +292,7 @@
                                         Country:</label>
                                 </label>
                                 <div class="col-lg-9 col-md-8">
-                                    <asp:DropDownList ID="countryDDL" runat="server" CssClass="form-control">
+                                    <asp:DropDownList ID="countryDDL1" runat="server" CssClass="form-control">
                                     </asp:DropDownList>
                                 </div>
                             </div>
@@ -298,7 +302,7 @@
                                         Partner:</label>
                                 </label>
                                 <div class="col-lg-9 col-md-8">
-                                    <asp:DropDownList ID="partnerDDL" runat="server" CssClass="form-control">
+                                    <asp:DropDownList ID="partnerDDL1" runat="server" CssClass="form-control">
                                     </asp:DropDownList>
                                 </div>
                             </div>
@@ -310,27 +314,18 @@
                                         Bank Name:</label>
                                 </label>
                                 <div class="col-lg-9 col-md-8">
-                                    <asp:DropDownList ID="bankDDL" runat="server" CssClass="form-control">
+                                    <asp:DropDownList ID="bankDDL1" runat="server" CssClass="form-control">
                                     </asp:DropDownList>
                                 </div>
                             </div>
+
                             <div class="form-group">
                                 <label class="col-lg-3 col-md-4 control-label" for="">
                                     <label>
                                         Branch Name:</label>
                                 </label>
                                 <div class="col-lg-9 col-md-8">
-                                    <asp:DropDownList ID="branchDDL" runat="server" CssClass="form-control">
-                                    </asp:DropDownList>
-                                </div>
-                            </div>
-                            <div class="form-group">
-                                <label class="col-lg-3 col-md-4 control-label" for="">
-                                    <label>
-                                        Edited Branch Name:</label>
-                                </label>
-                                <div class="col-lg-9 col-md-8">
-                                    <asp:TextBox runat="server" ID="editedBranchName" CssClass="form-control"></asp:TextBox>
+                                    <asp:TextBox runat="server" ID="branchName" CssClass="form-control"></asp:TextBox>
                                 </div>
                             </div>
                             <div class="form-group">
@@ -339,7 +334,7 @@
                                         BRANCH_CODE1 :</label>
                                 </label>
                                 <div class="col-lg-9 col-md-8">
-                                    <asp:TextBox runat="server" ID="branchCode" CssClass="form-control"></asp:TextBox>
+                                    <asp:TextBox runat="server" ID="branchCodeValue" CssClass="form-control"></asp:TextBox>
                                 </div>
                             </div>
                             <div class="form-group">
@@ -348,7 +343,7 @@
                                                 Is Active:</label>
                                         </label>
                                         <div class="col-lg-9 col-md-8">
-                                            <asp:DropDownList ID="isActiveDDL" runat="server" CssClass="form-control">
+                                            <asp:DropDownList ID="isActiveDDL1" runat="server" CssClass="form-control">
                                                 <asp:ListItem Text="Yes" Value="1"></asp:ListItem>
                                                 <asp:ListItem Text="No" Value="0"></asp:ListItem>
                                             </asp:DropDownList>
@@ -358,18 +353,18 @@
 
                             <div class="form-group">
                                 <div class="col-md-12 col-md-offset-3">
-                                    <input type="button" value="Update" style="width: 165px;" class="btn btn-primary m-t-25" onclick="return CheckFormValidation();" />
+                                    <input type="button" value="Save" style="width: 165px;" class="btn btn-primary m-t-25" onclick="return CheckFormValidation('I');" />
                                 </div>
                             </div>
                             <!-- End .form-group  -->
                         </div>
                     </div>
                 </div>
-                <div class="col-md-6">
+                 <div class="col-md-6">
                     <div class="panel panel-default recent-activites">
                         <!-- Start .panel -->
                         <div class="panel-heading">
-                            <h4 class="panel-title">Insert Branch Name And Code
+                            <h4 class="panel-title">Update Branch Code
                             </h4>
                             <div class="panel-actions">
                                 <a href="#" class="panel-action panel-action-toggle" data-panel-toggle></a>
@@ -383,7 +378,7 @@
                                         Country:</label>
                                 </label>
                                 <div class="col-lg-9 col-md-8">
-                                    <asp:DropDownList ID="countryDDL1" runat="server" CssClass="form-control">
+                                    <asp:DropDownList ID="countryDDL" runat="server" CssClass="form-control">
                                     </asp:DropDownList>
                                 </div>
                             </div>
@@ -393,7 +388,7 @@
                                         Partner:</label>
                                 </label>
                                 <div class="col-lg-9 col-md-8">
-                                    <asp:DropDownList ID="partnerDDL1" runat="server" CssClass="form-control">
+                                    <asp:DropDownList ID="partnerDDL" runat="server" CssClass="form-control">
                                     </asp:DropDownList>
                                 </div>
                             </div>
@@ -405,18 +400,27 @@
                                         Bank Name:</label>
                                 </label>
                                 <div class="col-lg-9 col-md-8">
-                                    <asp:DropDownList ID="bankDDL1" runat="server" CssClass="form-control">
+                                    <asp:DropDownList ID="bankDDL" runat="server" CssClass="form-control">
                                     </asp:DropDownList>
                                 </div>
                             </div>
-
                             <div class="form-group">
                                 <label class="col-lg-3 col-md-4 control-label" for="">
                                     <label>
                                         Branch Name:</label>
                                 </label>
                                 <div class="col-lg-9 col-md-8">
-                                    <asp:TextBox runat="server" ID="branchName" CssClass="form-control"></asp:TextBox>
+                                    <asp:DropDownList ID="branchDDL" runat="server" CssClass="form-control">
+                                    </asp:DropDownList>
+                                </div>
+                            </div>
+                            <div class="form-group">
+                                <label class="col-lg-3 col-md-4 control-label" for="">
+                                    <label>
+                                        Edited Branch Name:</label>
+                                </label>
+                                <div class="col-lg-9 col-md-8">
+                                    <asp:TextBox runat="server" ID="editedBranchName" CssClass="form-control"></asp:TextBox>
                                 </div>
                             </div>
                             <div class="form-group">
@@ -425,7 +429,7 @@
                                         BRANCH_CODE1 :</label>
                                 </label>
                                 <div class="col-lg-9 col-md-8">
-                                    <asp:TextBox runat="server" ID="branchCodeValue" CssClass="form-control"></asp:TextBox>
+                                    <asp:TextBox runat="server" ID="branchCode" CssClass="form-control"></asp:TextBox>
                                 </div>
                             </div>
                             <div class="form-group">
@@ -434,7 +438,7 @@
                                                 Is Active:</label>
                                         </label>
                                         <div class="col-lg-9 col-md-8">
-                                            <asp:DropDownList ID="isActiveDDL1" runat="server" CssClass="form-control">
+                                            <asp:DropDownList ID="isActiveDDL" runat="server" CssClass="form-control">
                                                 <asp:ListItem Text="Yes" Value="1"></asp:ListItem>
                                                 <asp:ListItem Text="No" Value="0"></asp:ListItem>
                                             </asp:DropDownList>
@@ -444,13 +448,14 @@
 
                             <div class="form-group">
                                 <div class="col-md-12 col-md-offset-3">
-                                    <input type="button" value="Save" style="width: 165px;" class="btn btn-primary m-t-25" onclick="return CheckFormValidation('I');" />
+                                    <input type="button" value="Update" style="width: 165px;" class="btn btn-primary m-t-25" onclick="return CheckFormValidation();" />
                                 </div>
                             </div>
                             <!-- End .form-group  -->
                         </div>
                     </div>
                 </div>
+
             </div>
         </div>
     </form>

Swift.web/Remit/TPSetup/BankAndBranchSetup/AddBranch.aspx.cs

@@ -26,6 +26,10 @@ namespace Swift.web.Remit.TPSetup.BankAndBranchSetup
                 if (!IsPostBack)
                 {
                     PopulateDDL();
+                    if (GetId() != "")
+                    {
+                        PopulateDataById();
+                    }
                 }
                 string reqMethod = Request.Form["MethodName"];
                 if (string.IsNullOrEmpty(reqMethod))
@@ -141,6 +145,41 @@ namespace Swift.web.Remit.TPSetup.BankAndBranchSetup
             Response.Write(json);
             Response.End();
         }
+        protected string GetId()
+        {
+            return GetStatic.ReadQueryString("BRANCH_ID", "");
+        }
+        private void PopulateDataById()
+        {
+            DataRow dr = _rd.EditBranchSelectById(GetId(), GetStatic.GetUser());
+            if (dr == null)
+            {
+                Response.Redirect("ListBranch.aspx");
+            }
+            string cName = dr["BRANCH_COUNTRY"].ToString().Trim();
+            ListItem item1 = countryDDL.Items.FindByText(cName);
+            if (item1 != null)
+            {
+                countryDDL.SelectedValue = item1.Value;
+            }
+            else
+            {
+                countryDDL.SelectedValue = "DefaultPartner";
+            }
+            //partnerDDL.SelectedItem.Text = dr[""].ToString();
+            bankDDL.DataTextFormatString = "BANK_NAME"; // Replace with the actual field name
+            bankDDL.DataValueField = "BANK_ID";  // Replace with the actual field name
+            bankDDL.DataBind();
+
+            // Set selected value based on data row
+            bankDDL.DataValueField = dr["BANK_ID"].ToString();
+            branchDDL.DataValueField = dr["Branch_Name"].ToString();
+            editedBranchName.Text = dr["Branch_Name"].ToString();
+            branchCode.Text = dr["BRANCH_CODE1"].ToString();
+         
+            isActiveDDL.SelectedValue = (dr["IS_ACTIVE"].ToString() == "True" || dr["IS_ACTIVE"].ToString() == "1") ? "1" : "0";
+            
+        }
         public static string DataTableToJson(DataTable table)
         {
             if (table == null)

Swift.web/Remit/TPSetup/BankAndBranchSetup/AddBranch.aspx.designer.cs

@@ -24,120 +24,120 @@ namespace Swift.web.Remit.TPSetup.BankAndBranchSetup
         protected global::System.Web.UI.HtmlControls.HtmlForm form1;
 
         /// <summary>
-        /// countryDDL control.
+        /// countryDDL1 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.DropDownList countryDDL;
+        protected global::System.Web.UI.WebControls.DropDownList countryDDL1;
 
         /// <summary>
-        /// partnerDDL control.
+        /// partnerDDL1 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.DropDownList partnerDDL;
+        protected global::System.Web.UI.WebControls.DropDownList partnerDDL1;
 
         /// <summary>
-        /// bankDDL control.
+        /// bankDDL1 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.DropDownList bankDDL;
+        protected global::System.Web.UI.WebControls.DropDownList bankDDL1;
 
         /// <summary>
-        /// branchDDL control.
+        /// branchName 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.DropDownList branchDDL;
+        protected global::System.Web.UI.WebControls.TextBox branchName;
 
         /// <summary>
-        /// editedBranchName control.
+        /// branchCodeValue 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.TextBox editedBranchName;
+        protected global::System.Web.UI.WebControls.TextBox branchCodeValue;
 
         /// <summary>
-        /// branchCode control.
+        /// isActiveDDL1 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.TextBox branchCode;
+        protected global::System.Web.UI.WebControls.DropDownList isActiveDDL1;
 
         /// <summary>
-        /// isActiveDDL control.
+        /// countryDDL 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.DropDownList isActiveDDL;
+        protected global::System.Web.UI.WebControls.DropDownList countryDDL;
 
         /// <summary>
-        /// countryDDL1 control.
+        /// partnerDDL 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.DropDownList countryDDL1;
+        protected global::System.Web.UI.WebControls.DropDownList partnerDDL;
 
         /// <summary>
-        /// partnerDDL1 control.
+        /// bankDDL 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.DropDownList partnerDDL1;
+        protected global::System.Web.UI.WebControls.DropDownList bankDDL;
 
         /// <summary>
-        /// bankDDL1 control.
+        /// branchDDL 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.DropDownList bankDDL1;
+        protected global::System.Web.UI.WebControls.DropDownList branchDDL;
 
         /// <summary>
-        /// branchName control.
+        /// editedBranchName 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.TextBox branchName;
+        protected global::System.Web.UI.WebControls.TextBox editedBranchName;
 
         /// <summary>
-        /// branchCodeValue control.
+        /// branchCode 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.TextBox branchCodeValue;
+        protected global::System.Web.UI.WebControls.TextBox branchCode;
 
         /// <summary>
-        /// isActiveDDL1 control.
+        /// isActiveDDL 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.DropDownList isActiveDDL1;
+        protected global::System.Web.UI.WebControls.DropDownList isActiveDDL;
     }
 }

Swift.web/Remit/TPSetup/BankAndBranchSetup/BankList.aspx

@@ -71,7 +71,7 @@
                             <li><a href="#">Others Service</a></li>
 							<%--<li><a href="#" onclick="return LoadModule('sub_administration')">Sub_Other Service</a></li>
 							<li><a href="#" onclick="return LoadModule('sub_administration')">Sub_Other Service</a></li>--%>
-                             <li class="active"><a href="#">Bank Setup</a></li>
+                             <li class="active"><a href="#">Bank Mapping List</a></li>
 						</ol>
 					</div>
 				</div>
@@ -80,9 +80,11 @@
 			<!-- Nav tabs -->
 			<div class="listtabs">
 				<ul class="nav nav-tabs"">
-					<li class="active"><a href="BankList.aspx">Bank List</a></li>
-                    <li><a href="AddBank.aspx">Bank Setup </a></li>
-					<li><a href="AddBankList.aspx">Bank Mapping</a></li>
+					 <li><a href="NewBankList.aspx">Bank List</a></li>
+					<li><a href="AddBank.aspx">Bank Setup</a></li>
+					<li class="active"><a href="BankList.aspx">Bank Mapping List</a></li>
+					<li><a href="AddBankMapping.aspx">Bank Mapping Setup</a></li>
+					<li><a href="ListBranch.aspx">Branch List </a></li>
 					<li><a href="AddBranch.aspx">Branch Setup </a></li>
 					<%--<li  role="presentation" class="selected"><a href="#" aria-controls="home" role="tab" data-toggle="tab">Partner Bank List</a></li>
 					<li role="presentation" class="selected"><a href="AddBank.aspx" aria-controls="home" role="tab" data-toggle="tab">Insert Bank Master</a></li>

Swift.web/Remit/TPSetup/BankAndBranchSetup/BankList.aspx.cs

@@ -1,9 +1,11 @@
 using Swift.DAL.Remittance.SyncDao;
+using Swift.DAL.Remittance.Transaction;
 using Swift.web.Component.Grid;
 using Swift.web.Component.Grid.gridHelper;
 using Swift.web.Library;
 using System;
 using System.Collections.Generic;
+using System.Web;
 using System.Web.UI;
 
 namespace Swift.web.Remit.TPSetup.BankAndBranchSetup
@@ -15,6 +17,7 @@ namespace Swift.web.Remit.TPSetup.BankAndBranchSetup
         private const string AddEditFunctionId = "20300010";
         private readonly SwiftGrid _grid = new SwiftGrid();
         private readonly RemittanceLibrary swiftLibrary = new RemittanceLibrary();
+        private readonly UpdateBranchDao _branchDoa = new UpdateBranchDao();
 
         protected void Page_Load(object sender, EventArgs e)
         {
@@ -24,6 +27,7 @@ namespace Swift.web.Remit.TPSetup.BankAndBranchSetup
                 GetStatic.PrintMessage(Page);
             }
             LoadGrid();
+            DeleteRow();
         }
 
         private void Authenticate()
@@ -34,11 +38,13 @@ namespace Swift.web.Remit.TPSetup.BankAndBranchSetup
         private void LoadGrid()
         {
             string ddlSql = "EXEC [PROC_API_BANK_BRANCH_SETUP] @flag = 'API-PARTNER'";
+            string ddlSql2 = "EXEC [PROC_API_BANK_BRANCH_SETUP] @flag = 'Bank-Country'";
             string ddlSql1 = "EXEC [PROC_API_BANK_BRANCH_SETUP] @flag = 'PAYOUT-METHOD'";
 
             _grid.FilterList = new List<GridFilter>
                                   {
                                      new GridFilter("API_PARTNER", "API PARTNER", "1:"+ddlSql, "0"),
+                                     new GridFilter("BANK_COUNTRY", "COUNTRY", "1:"+ddlSql2, "0"),
                                      new GridFilter("PAYMENT_TYPE", "PAYMENT TYPE", "1:"+ddlSql1, "0"),
                                   };
 
@@ -61,14 +67,14 @@ namespace Swift.web.Remit.TPSetup.BankAndBranchSetup
             _grid.ShowPagingBar = true;
             _grid.ShowAddButton = true;
             _grid.AllowEdit = true;
-            _grid.AllowDelete = false;
+            _grid.AllowDelete = true;
             _grid.AlwaysShowFilterForm = true;
             _grid.ShowFilterForm = true;
             _grid.AllowCustomLink = true;
             _grid.SortOrder = "ASC";
             _grid.RowIdField = "BANK_ID";
             _grid.ThisPage = "BankList.aspx";
-            _grid.AddPage = "addBankList.aspx";
+            _grid.AddPage = "addBankMapping.aspx";
             //_grid.AddPage = "AddBank.aspx";
             //_grid.AddPage = "AddBank.aspx?opType=@opType";
             var branchLink = "<span class=\"action-icon\"> <btn class=\"btn btn-xs btn-success\" data-toggle=\"tooltip\" data-placement=\"top\" title = \"Bank Branch\"> <a href =\"BranchList.aspx?bankId=@BANK_ID&bankCode=@BANK_CODE1&partnerId=@API_PARTNER_ID\"><i class=\"fa fa-building-o\" ></i></a></btn></span>";
@@ -85,6 +91,24 @@ namespace Swift.web.Remit.TPSetup.BankAndBranchSetup
             rpt_grid.InnerHtml = _grid.CreateGrid(sql);
         }
 
+        private void DeleteRow()
+        {
+            string id = _grid.GetCurrentRowId(GridName);
+            if (id == "")
+                return;
+            var user = GetStatic.GetUser();
+            var dbResult = _branchDoa.DeleteBankMapping(id, user);
+            if (dbResult.ErrorCode == "0")
+            {
+                LoadGrid();
+                GetStatic.AlertMessage(this, dbResult.Msg);
+            }
+            else
+            {
+                HttpContext.Current.Session["message"] = dbResult;
+                GetStatic.AlertMessage(this, dbResult.Msg);
+            }
+        }
         protected void btnUpdate_Click(object sender, EventArgs e)
         {
             BankBranchDao _dao = new BankBranchDao();

Swift.web/Remit/TPSetup/BankAndBranchSetup/BankList.aspx.designer.cs

@@ -7,10 +7,12 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace Swift.web.Remit.TPSetup.BankAndBranchSetup {
+namespace Swift.web.Remit.TPSetup.BankAndBranchSetup
+{
 
 
-    public partial class BankList {
+    public partial class BankList
+    {
 
         /// <summary>
         /// form1 control.

Swift.web/Remit/TPSetup/BankAndBranchSetup/ListBranch.aspx

@@ -0,0 +1,125 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="ListBranch.aspx.cs" Inherits="Swift.web.Remit.TPSetup.BankAndBranchSetup.WebForm3" %>
+
+<!DOCTYPE html>
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+	<title></title>
+	<link href="/ui/bootstrap/css/bootstrap.min.css" rel="stylesheet" />
+	<link href="/ui/font-awesome/css/font-awesome.min.css" rel="stylesheet" />
+	<link href="/js/jQuery/jquery-ui.css" rel="stylesheet" type="text/css" />
+	<link href="/ui/css/style.css" rel="stylesheet" />
+	<script src="/ui/js/jquery.min.js"></script>
+	<script src="/ui/bootstrap/js/bootstrap.min.js"></script>
+	<script src="/js/Swift_grid.js" type="text/javascript"> </script>
+	<script src="/js/functions.js" type="text/javascript"></script>
+	<script src="/ui/js/jquery-ui.min.js"></script>
+	<script type="text/javascript">
+        $(document).ready(function () {
+            $("#btnSyncBank").click(function () {
+                SyncBank();
+            });
+        });
+        function PostMessageToParent() {
+            $("#btnPostBack").click();
+        }
+
+        function EnableDisable(id, bankName, isActive) {
+            var verifyText = 'Are you sure to enable for bank ' + bankName + '?';
+            if (id != '') {
+                $('#isActive').val(isActive);
+                $('#rowId').val(id);
+                if (isActive == 'YES') {
+                    verifyText = 'Are you sure to disable for bank ' + bankName + '?';
+                }
+                if (confirm(verifyText)) {
+                    $('#btnUpdate').click();
+                }
+            }
+        }
+        function SyncBank() {
+            url = "/Remit/TPSetup/PopUps/PopUpForBank.aspx";
+            var isChrome = navigator.userAgent.toLowerCase().indexOf('chrome') > -1;
+            var param = "dialogHeight:900px;dialogWidth:900px;dialogLeft:200;dialogTop:100;center:yes";
+            if (isChrome) {
+                PopUpWindow(url, param);
+                return true;
+            }
+            var id = PopUpWindow(url, param);
+
+            if (id == "undefined" || id == null || id == "") {
+            }
+            else {
+            }
+        };
+    </script>
+</head>
+<body>
+	<form id="form1" runat="server">
+		<asp:HiddenField ID="isActive" runat="server" />
+		<asp:HiddenField ID="rowId" runat="server" />
+		<asp:Button ID="btnPostBack" runat="server"  Style="display: none;" />
+		<asp:Button ID="btnUpdate" runat="server" OnClick="btnUpdate_Click" Style="display: none;" />
+		<div class="page-wrapper">
+			<div class="row">
+				<div class="col-sm-12">
+					<div class="page-title">
+						<h1></h1>
+						<ol class="breadcrumb">
+							<li><a href="../../../Front.aspx" target="mainFrame"><i class="fa fa-home"></i></a></li>
+							<li><a href="#">Others Service</a></li>
+                            <li><a href="#">Others Service</a></li>
+							<%--<li><a href="#" onclick="return LoadModule('sub_administration')">Sub_Other Service</a></li>
+							<li><a href="#" onclick="return LoadModule('sub_administration')">Sub_Other Service</a></li>--%>
+                             <li class="active"><a href="#">Bank Setup</a></li>
+						</ol>
+					</div>
+				</div>
+			</div>
+
+			<!-- Nav tabs -->
+			<div class="listtabs">
+				<ul class="nav nav-tabs"">
+					<li><a href="NewBankList.aspx">Bank List</a></li>
+					<li><a href="AddBank.aspx">Bank Setup</a></li>
+					<li><a href="BankList.aspx">Bank Mapping List</a></li>
+					<li><a href="AddBankMapping.aspx">Bank Mapping Setup</a></li>
+					<li class="active"><a href="ListBranch.aspx">Branch List </a></li>
+					<li><a href="AddBranch.aspx">Branch Setup </a></li>
+					<%--<li  role="presentation" class="selected"><a href="#" aria-controls="home" role="tab" data-toggle="tab">Partner Bank List</a></li>
+					<li role="presentation" class="selected"><a href="AddBank.aspx" aria-controls="home" role="tab" data-toggle="tab">Insert Bank Master</a></li>
+					 <li role="presentation" class="active"><a href="AddBankList.aspx" aria-controls="home" role="tab" data-toggle="tab">Insert Bank Mapping</a></li>
+					<li role="presentation" class="active"><a href="AddBranch.aspx" aria-controls="home" role="tab" data-toggle="tab">Insert Branch</a></li>--%>
+					<%--  <li><a href="ManagePartnerBank.aspx">Manage Partner Bank</a></li>--%>
+				</ul>
+			</div>
+			<!-- Tab panes -->
+			<div class="tab-content">
+				<div role="tabpanel" class="tab-pane active" id="list">
+					<!--end .row-->
+					<div class="row">
+						<div class="col-md-12">
+							<div class="panel panel-default">
+								<div class="panel-body">
+									<div id="rpt_grid" runat="server" class="gridDiv" enableviewstate="false"></div>
+								</div>
+								 <div class="panel-body">
+									<div class="col-sm-12" runat="server">
+										<div class="form-group">
+
+											<%--<asp:Button ID="btnSyncBank" runat="server" Text="Sync Bank"
+												 CssClass="btn btn-primary" />--%>
+											<%-- <asp:Button ID="Print" runat="server" CssClass="btn btn-primary m-t-25" Text="Print"  OnClick="Print_Click" />--%>
+										</div>
+									</div>
+								</div>
+							</div>
+						</div>
+					</div>
+				</div>
+			</div>
+		</div>
+	</form>
+</body>
+</html>
+

Swift.web/Remit/TPSetup/BankAndBranchSetup/ListBranch.aspx.cs

@@ -0,0 +1,131 @@
+using Swift.API;
+using Swift.DAL.Remittance.SyncDao;
+using Swift.DAL.Remittance.Transaction;
+using Swift.web.Component.Grid;
+using Swift.web.Component.Grid.gridHelper;
+using Swift.web.Library;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+
+namespace Swift.web.Remit.TPSetup.BankAndBranchSetup
+{
+    public partial class WebForm3 : System.Web.UI.Page
+    {
+        private const string GridName = "grid_list";
+        private const string ViewFunctionId = "20300000";
+        private const string AddEditFunctionId = "20300010";
+        private string DeleteFunctionId = "20201720";
+        private readonly SwiftGrid _grid = new SwiftGrid();
+        private readonly RemittanceLibrary swiftLibrary = new RemittanceLibrary();
+        private readonly UpdateBranchDao _branchDoa = new UpdateBranchDao();
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            Authenticate();
+            if (!IsPostBack)
+            {
+                GetStatic.PrintMessage(Page);
+            }
+          
+            LoadGrid();
+            DeleteRow();
+        }
+        private void Authenticate()
+        {
+            swiftLibrary.CheckAuthentication(ViewFunctionId);
+        }
+        private void LoadGrid()
+        {
+            string ddlSql = "EXEC [PROC_API_BANK_BRANCH_SETUP] @flag = 'Bank-Country'";
+            //string ddlSql1 = "EXEC [PROC_API_BANK_BRANCH_SETUP] @flag = 'Bank'";
+
+            _grid.FilterList = new List<GridFilter>
+                                  {
+                                     new GridFilter("BRANCH_COUNTRY", "COUNTRY", "1:"+ddlSql, "0"),
+                                    // new GridFilter("BANK_ID", "BANK", "1:"+ddlSql1, "0"),
+                                  };
+
+            _grid.ColumnList = new List<GridColumn>
+                                  {
+                                      new GridColumn("BRANCH_COUNTRY", "COUNTRY", "", "T"),
+                                      new GridColumn("BANK_ID", "BANK NAME", "", "T"),
+                                      new GridColumn("BRANCH_NAME", "BRANCH NAME", "100", "T"),
+                                      new GridColumn("BRANCH_CODE1", "BRANCH_CODE1", "", "T"),
+                                      new GridColumn("BRANCH_CODE2", "BRANCH_CODE2", "", "T"),
+                                      new GridColumn("IS_ACTIVE", "IS ACTIVE", "", "T"),
+
+                                  };
+            //bool allowAddEdit = swiftLibrary.HasRight(AddEditFunctionId);
+
+            _grid.GridDataSource = SwiftGrid.GridDS.RemittanceDB;
+            _grid.GridType = 1;
+            _grid.GridName = GridName;
+            _grid.ShowPagingBar = true;
+            _grid.ShowAddButton = true;
+            _grid.AllowEdit = true;
+            _grid.AllowDelete = swiftLibrary.HasRight(DeleteFunctionId);
+            _grid.AlwaysShowFilterForm = true;
+            _grid.ShowFilterForm = true;
+            _grid.AllowCustomLink = true;
+            _grid.SortOrder = "ASC";
+            _grid.RowIdField = "BRANCH_ID";
+            _grid.ThisPage = "ListBranch.aspx";
+            _grid.AddPage = "addBranch.aspx";
+            //_grid.AddPage = "AddBank.aspx";
+            //_grid.AddPage = "AddBank.aspx?opType=@opType";
+            //var branchLink = "<span class=\"action-icon\"> <btn class=\"btn btn-xs btn-success\" data-toggle=\"tooltip\" data-placement=\"top\" title = \"Bank Branch\"> <a href =\"BranchList.aspx?bankId=@BANK_ID&bankCode=@BANK_CODE1&partnerId=@API_PARTNER_ID\"><i class=\"fa fa-building-o\" ></i></a></btn></span>";
+            var link = "<a href=\"javascript:void(0);\" onclick=\"EnableDisable('@BRANCH_ID','@BRANCH_NAME','@IS_ACTIVE');\" class=\"btn btn-xs btn-primary\">Enable/Disable</a>";
+            _grid.CustomLinkVariables = "BRANCH_ID,BANK_ID,BRANCH_NAME,BRANCH_COUNTRY,BRANCH_CODE1,BRANCH_CODE2,IS_ACTIVE";
+            _grid.CustomLinkText = link;
+
+            _grid.InputPerRow = 5;
+
+            string sql = "EXEC [PROC_API_BANK_BRANCH_SETUP] @flag = 'SBranchList'";
+
+            _grid.SetComma();
+
+            rpt_grid.InnerHtml = _grid.CreateGrid(sql);
+
+        }
+   
+        private void DeleteRow()
+        {
+            string id = _grid.GetCurrentRowId(GridName);
+            if (id == "")
+                return;
+            var user = GetStatic.GetUser();
+            var dbResult = _branchDoa.DeleteBranch(id, user);
+            if (dbResult.ErrorCode == "0")
+            {
+                LoadGrid();
+                GetStatic.AlertMessage(this, dbResult.Msg);
+            }
+            else
+            {
+                HttpContext.Current.Session["message"] = dbResult;
+                GetStatic.AlertMessage(this, dbResult.Msg);
+            }
+        }
+        private string GetBankId()
+        {
+            return GetStatic.ReadQueryString("bankId", "");
+        }
+
+     
+        protected void btnUpdate_Click(object sender, EventArgs e)
+        {
+            //BankBranchDao _dao = new BankBranchDao();
+            if (!string.IsNullOrEmpty(isActive.Value))
+            {
+                var dbResult = _branchDoa.EnableDisableBankBranch(rowId.Value, GetStatic.GetUser(), isActive.Value);
+                GetStatic.SetMessage(dbResult);
+                Response.Redirect("ListBranch.aspx?bankId=" + GetBankId() + "");
+            }
+        }
+
+       
+    }
+}

Swift.web/Remit/TPSetup/BankAndBranchSetup/ListBranch.aspx.designer.cs

@@ -0,0 +1,71 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated. 
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace Swift.web.Remit.TPSetup.BankAndBranchSetup
+{
+
+
+    public partial class WebForm3
+    {
+
+        /// <summary>
+        /// form1 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.HtmlForm form1;
+
+        /// <summary>
+        /// isActive 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 isActive;
+
+        /// <summary>
+        /// rowId 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 rowId;
+
+        /// <summary>
+        /// btnPostBack 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.Button btnPostBack;
+
+        /// <summary>
+        /// btnUpdate 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.Button btnUpdate;
+
+        /// <summary>
+        /// rpt_grid 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.HtmlGenericControl rpt_grid;
+    }
+}

Swift.web/Remit/TPSetup/BankAndBranchSetup/NewBankList.aspx

@@ -0,0 +1,126 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="NewBankList.aspx.cs" Inherits="Swift.web.Remit.TPSetup.BankAndBranchSetup.NewBankList" %>
+
+<!DOCTYPE html>
+
+<!DOCTYPE html>
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+	<title></title>
+	<link href="/ui/bootstrap/css/bootstrap.min.css" rel="stylesheet" />
+	<link href="/ui/font-awesome/css/font-awesome.min.css" rel="stylesheet" />
+	<link href="/js/jQuery/jquery-ui.css" rel="stylesheet" type="text/css" />
+	<link href="/ui/css/style.css" rel="stylesheet" />
+	<script src="/ui/js/jquery.min.js"></script>
+	<script src="/ui/bootstrap/js/bootstrap.min.js"></script>
+	<script src="/js/Swift_grid.js" type="text/javascript"> </script>
+	<script src="/js/functions.js" type="text/javascript"></script>
+	<script src="/ui/js/jquery-ui.min.js"></script>
+	<script type="text/javascript">
+		$(document).ready(function () {
+			$("#btnSyncBank").click(function () {
+				SyncBank();
+			});
+		});
+		function PostMessageToParent() {
+			$("#btnPostBack").click();
+		}
+
+		function EnableDisable(id, bankName, isActive) {
+			var verifyText = 'Are you sure to enable for bank ' + bankName + '?';
+			if (id != '') {
+				$('#isActive').val(isActive);
+				$('#rowId').val(id);
+				if (isActive == 'YES') {
+					verifyText = 'Are you sure to disable for bank ' + bankName + '?';
+				}
+				if (confirm(verifyText)) {
+					$('#btnUpdate').click();
+				}
+			}
+		}
+		function SyncBank() {
+			url = "/Remit/TPSetup/PopUps/PopUpForBank.aspx";
+			var isChrome = navigator.userAgent.toLowerCase().indexOf('chrome') > -1;
+			var param = "dialogHeight:900px;dialogWidth:900px;dialogLeft:200;dialogTop:100;center:yes";
+			if (isChrome) {
+				PopUpWindow(url, param);
+				return true;
+			}
+			var id = PopUpWindow(url, param);
+
+			if (id == "undefined" || id == null || id == "") {
+			}
+			else {
+			}
+		};
+    </script>
+</head>
+<body>
+	<form id="form1" runat="server">
+		<asp:HiddenField ID="isActive" runat="server" />
+		<asp:HiddenField ID="rowId" runat="server" />
+		<asp:Button ID="btnPostBack" runat="server"  Style="display: none;" />
+		<asp:Button ID="btnUpdate" runat="server" OnClick="btnUpdate_Click" Style="display: none;" />
+		<div class="page-wrapper">
+			<div class="row">
+				<div class="col-sm-12">
+					<div class="page-title">
+						<h1></h1>
+						<ol class="breadcrumb">
+							<li><a href="../../../Front.aspx" target="mainFrame"><i class="fa fa-home"></i></a></li>
+							<li><a href="#">Others Service</a></li>
+                            <li><a href="#">Others Service</a></li>
+							<%--<li><a href="#" onclick="return LoadModule('sub_administration')">Sub_Other Service</a></li>
+							<li><a href="#" onclick="return LoadModule('sub_administration')">Sub_Other Service</a></li>--%>
+                             <li class="active"><a href="#">Bank Setup</a></li>
+						</ol>
+					</div>
+				</div>
+			</div>
+
+			<!-- Nav tabs -->
+			<div class="listtabs">
+				<ul class="nav nav-tabs"">
+					<li class="active"><a href="NewBankList.aspx">Bank List</a></li>
+					<li><a href="AddBank.aspx">Bank Setup</a></li>
+					<li><a href="BankList.aspx">Bank Mapping List</a></li>
+					<li><a href="AddBankMapping.aspx">Bank Mapping Setup</a></li>
+					<li><a href="ListBranch.aspx">Branch List </a></li>
+					<li><a href="AddBranch.aspx">Branch Setup </a></li>
+					<%--<li  role="presentation" class="selected"><a href="#" aria-controls="home" role="tab" data-toggle="tab">Partner Bank List</a></li>
+					<li role="presentation" class="selected"><a href="AddBank.aspx" aria-controls="home" role="tab" data-toggle="tab">Insert Bank Master</a></li>
+					 <li role="presentation" class="active"><a href="AddBankList.aspx" aria-controls="home" role="tab" data-toggle="tab">Insert Bank Mapping</a></li>
+					<li role="presentation" class="active"><a href="AddBranch.aspx" aria-controls="home" role="tab" data-toggle="tab">Insert Branch</a></li>--%>
+					<%--  <li><a href="ManagePartnerBank.aspx">Manage Partner Bank</a></li>--%>
+				</ul>
+			</div>
+			<!-- Tab panes -->
+			<div class="tab-content">
+				<div role="tabpanel" class="tab-pane active" id="list">
+					<!--end .row-->
+					<div class="row">
+						<div class="col-md-12">
+							<div class="panel panel-default">
+								<div class="panel-body">
+									<div id="rpt_grid" runat="server" class="gridDiv" enableviewstate="false"></div>
+								</div>
+								 <div class="panel-body">
+									<div class="col-sm-12" runat="server">
+										<div class="form-group">
+
+											<%--<asp:Button ID="btnSyncBank" runat="server" Text="Sync Bank"
+												 CssClass="btn btn-primary" />--%>
+											<%-- <asp:Button ID="Print" runat="server" CssClass="btn btn-primary m-t-25" Text="Print"  OnClick="Print_Click" />--%>
+										</div>
+									</div>
+								</div>
+							</div>
+						</div>
+					</div>
+				</div>
+			</div>
+		</div>
+	</form>
+</body>
+</html>

Swift.web/Remit/TPSetup/BankAndBranchSetup/NewBankList.aspx.cs

@@ -0,0 +1,124 @@
+using Swift.DAL.Remittance.Transaction;
+using Swift.web.Component.Grid;
+using Swift.web.Component.Grid.gridHelper;
+using Swift.web.Library;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+
+namespace Swift.web.Remit.TPSetup.BankAndBranchSetup
+{
+    public partial class NewBankList : System.Web.UI.Page
+    {
+        private const string GridName = "grid_list";
+        private const string ViewFunctionId = "20300000";
+        private const string AddEditFunctionId = "20300010";
+        private readonly SwiftGrid _grid = new SwiftGrid();
+        private readonly RemittanceLibrary swiftLibrary = new RemittanceLibrary();
+        private readonly UpdateBranchDao _branchDoa = new UpdateBranchDao();
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            Authenticate();
+            if (!IsPostBack)
+            {
+                GetStatic.PrintMessage(Page);
+            }
+            LoadGrid();
+            DeleteRow();
+        }
+
+        private void Authenticate()
+        {
+            swiftLibrary.CheckAuthentication(ViewFunctionId);
+        }
+
+        private void LoadGrid()
+        {
+            string ddlSql = "EXEC [PROC_API_BANK_BRANCH_SETUP] @flag = 'Bank-Country'";
+            string ddlSql1 = "EXEC [PROC_API_BANK_BRANCH_SETUP] @flag = 'PAYOUT-METHOD'";
+
+            _grid.FilterList = new List<GridFilter>
+                                  {
+                                     new GridFilter("BANK_COUNTRY", "COUNTRY", "1:"+ddlSql, "0"),
+                                     new GridFilter("PAYMENT_TYPE", "PAYMENT TYPE", "1:"+ddlSql1, "0"),
+                                  };
+
+            _grid.ColumnList = new List<GridColumn>
+                                  {
+                                      new GridColumn("BANK_COUNTRY", "COUNTRY", "", "T"),
+                                      new GridColumn("BANK_NAME", "BANK NAME", "100", "T"),
+                                      new GridColumn("SUPPORT_CURRENCY", "SUPPORT CURRENCY", "", "T"),
+                                      new GridColumn("PAYMENT_TYPE", "PAYMENT TYPE", "", "T"),
+                                      new GridColumn("IS_ACTIVE", "IS ACTIVE", "", "T"),
+                                      
+                                  };
+            //bool allowAddEdit = swiftLibrary.HasRight(AddEditFunctionId);
+
+            _grid.GridDataSource = SwiftGrid.GridDS.RemittanceDB;
+            _grid.GridType = 1;
+            _grid.GridName = GridName;
+            _grid.ShowPagingBar = true;
+            _grid.ShowAddButton = true;
+            _grid.AllowEdit = true;
+            _grid.AllowDelete = true;
+            _grid.AlwaysShowFilterForm = true;
+            _grid.ShowFilterForm = true;
+            _grid.AllowCustomLink = true;
+            _grid.SortOrder = "ASC";
+            _grid.RowIdField = "MASTER_BANK_ID";
+            _grid.ThisPage = "NewBankList.aspx";
+            _grid.AddPage = "addBank.aspx";
+            //_grid.AddPage = "AddBank.aspx";
+            //_grid.AddPage = "AddBank.aspx?opType=@opType";
+            //var branchLink = "<span class=\"action-icon\"> <btn class=\"btn btn-xs btn-success\" data-toggle=\"tooltip\" data-placement=\"top\" title = \"Bank Branch\"> <a href =\"BranchList.aspx?bankId=@BANK_ID&bankCode=@BANK_CODE1&partnerId=@API_PARTNER_ID\"><i class=\"fa fa-building-o\" ></i></a></btn></span>";
+            var link = "&nbsp;<a href=\"javascript:void(0);\" onclick=\"EnableDisable('@MASTER_BANK_ID','@BANK_NAME','@IS_ACTIVE');\" class=\"btn btn-xs btn-primary\">Enable/Disable</a>";
+            _grid.CustomLinkVariables = "MASTER_BANK_ID,BANK_NAME,BANK_COUNTRY,PAYMENT_TYPE,IS_ACTIVE";
+            _grid.CustomLinkText =  link;
+
+            _grid.InputPerRow = 5;
+
+            string sql = "EXEC [PROC_API_BANK_BRANCH_SETUP] @flag = 'SListNewBank'";
+
+            _grid.SetComma();
+
+            rpt_grid.InnerHtml = _grid.CreateGrid(sql);
+        }
+        private void DeleteRow()
+        {
+            string id = _grid.GetCurrentRowId(GridName);
+            if (id == "")
+                return;
+            var user = GetStatic.GetUser();
+            var dbResult = _branchDoa.DeleteBank(id, user);
+            if (dbResult.ErrorCode == "0")
+            {
+                LoadGrid();
+                GetStatic.AlertMessage(this, dbResult.Msg);
+            }
+            else
+            {
+                HttpContext.Current.Session["message"] = dbResult;
+                GetStatic.AlertMessage(this, dbResult.Msg);
+            }
+        }
+        protected void btnUpdate_Click(object sender, EventArgs e)
+        {
+            UpdateBranchDao _dao = new UpdateBranchDao();
+            if (!string.IsNullOrEmpty(isActive.Value))
+            {
+                var dbResult = _dao.EnableDisableBank(rowId.Value, GetStatic.GetUser(), isActive.Value);
+                GetStatic.SetMessage(dbResult);
+                Response.Redirect("NewBankList.aspx");
+            }
+        }
+    }
+   
+
+
+
+    
+
+}

Swift.web/Remit/TPSetup/BankAndBranchSetup/NewBankList.aspx.designer.cs

@@ -0,0 +1,71 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated. 
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace Swift.web.Remit.TPSetup.BankAndBranchSetup
+{
+
+
+    public partial class NewBankList
+    {
+
+        /// <summary>
+        /// form1 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.HtmlForm form1;
+
+        /// <summary>
+        /// isActive 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 isActive;
+
+        /// <summary>
+        /// rowId 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 rowId;
+
+        /// <summary>
+        /// btnPostBack 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.Button btnPostBack;
+
+        /// <summary>
+        /// btnUpdate 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.Button btnUpdate;
+
+        /// <summary>
+        /// rpt_grid 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.HtmlGenericControl rpt_grid;
+    }
+}

Swift.web/Remit/Transaction/PromotionalCampaign/List.aspx.cs

@@ -50,6 +50,7 @@ namespace Swift.web.Remit.Transaction.PromotionalCampaign
                                       new GridColumn("PROMOTIONAL_CODE", "PROMOTIONAL CODE", "", "T"),
                                       new GridColumn("PROMOTIONAL_MSG", "PROMOTIONAL MSG", "", "T"),
                                       new GridColumn("PROMOTION_VALUE", "PROMOTION VALUE", "", "M"),
+                                      new GridColumn("MIN_SENDING_AMT", "MIN SENDING AMT", "", "M"),
                                       new GridColumn("START_DT", "START DATE", "", "D"),
                                       new GridColumn("END_DT", "END DATE", "", "D"),
                                       new GridColumn("IS_ACTIVE", "Is Active", "", "T"),

Swift.web/Remit/Transaction/PromotionalCampaign/Manage.aspx

@@ -11,11 +11,12 @@
     <link href="/ui/font-awesome/css/font-awesome.min.css" rel="stylesheet" />
     <script src="/js/swift_grid.js" type="text/javascript"> </script>
     <script src="/js/functions.js" type="text/javascript"> </script>
+    <script src="../../../js/jQuery/jquery.min.js"></script>
     <script src="/js/swift_calendar.js" type="text/javascript"></script>
     <link href="/js/jQuery/jquery-ui.css" rel="stylesheet" type="text/css" />
-    <script src="/js/jQuery/jquery.min.js" type="text/javascript"></script>
+<%--    <script src="/js/jQuery/jquery.min.js" type="text/javascript"></script>--%>
     <script src="/js/jQuery/jquery-ui.min.js" type="text/javascript"></script>
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery.mask/1.14.15/jquery.mask.min.js" type="text/javascript"></script>
+<%--    <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery.mask/1.14.15/jquery.mask.min.js" type="text/javascript"></script>--%>
 
     <script type="text/javascript">
         $(document).ready(function () {
@@ -26,6 +27,16 @@
 			$('#endDate').mask('0000-00-00');
         });
 
+        //$(document).ready(function () {
+        //    $("#chkUse").click(function () {
+        //        if ($(this).is(":checked")) {
+        //            $("#useDiv").show();
+        //        } else {
+        //            $("#useDiv").hide();
+        //        }
+        //    });
+        //});
+
         function CheckFormValidation() {
             var reqField = "countryDDL,ddlPromotionType,promotionCode,promotionMsg,startDate,endDate,promotionAmount,";
             if (ValidRequiredField(reqField) == false) {
@@ -176,6 +187,31 @@
                                         </div>
                                     </div>
                                 </div>
+                                 <div class="col-md-6">
+                                    <div class="form-group">
+                                        <label class="col-lg-4 col-md-8 control-label" for="">
+                                            <label>
+                                                Minimum Sending Amount:</label>
+                                        </label>
+                                        <div class="col-lg-8 col-md-4">
+                                            <asp:TextBox runat="server" ID="minAmt" class="form-control"></asp:TextBox>
+                                        </div>
+                                    </div>
+                                </div>
+                                <%--<div class="col-md-6">
+                                    <div class="form-group">
+                                        <label class="col-lg-3 col-md-4 control-label">
+                                            <input type="checkbox" runat="server" id="chkUse" value="multipleUse"/> Can use multiple times?</label>
+                                    </div>
+                                    <div class="form-group" id="useDiv" runat="server" style="display: none">
+                                        <label class="col-lg-3 col-md-4 control-label" for="">
+                                            Can use multiple times: 
+                                        </label>
+                                        <div class="col-lg-9 col-md-8">
+                                            <asp:TextBox ID="useTimes" CssClass="form-control" runat="server" TextMode="SingleLine"></asp:TextBox>
+                                        </div>
+                                    </div>
+                                </div>--%>
                             </div>
                         </ContentTemplate>
                     </asp:UpdatePanel>

Swift.web/Remit/Transaction/PromotionalCampaign/Manage.aspx.cs

@@ -71,7 +71,7 @@ namespace Swift.web.Remit.Transaction.PromotionalCampaign
 
             DbResult _dbRes = _apiDao.InsertUpdatePromotion(GetStatic.GetUser(), flag, GetId(), promotionCode.Text, promotionMsg.Text,
                                 ddlPromotionType.SelectedValue, countryDDL.SelectedValue, payoutMethodDDL.SelectedValue, isActiveDDL.SelectedValue,
-                                startDate.Text, endDate.Text, promotionAmount.Text);
+                                startDate.Text, endDate.Text, promotionAmount.Text, minAmt.Text);
 
             if (_dbRes.ErrorCode != "0")
             {

Swift.web/Remit/Transaction/PromotionalCampaign/Manage.aspx.designer.cs

@@ -7,10 +7,12 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace Swift.web.Remit.Transaction.PromotionalCampaign {
+namespace Swift.web.Remit.Transaction.PromotionalCampaign
+{
 
 
-    public partial class Manage {
+    public partial class Manage
+    {
 
         /// <summary>
         /// Base1 control.
@@ -129,6 +131,15 @@ namespace Swift.web.Remit.Transaction.PromotionalCampaign {
         /// </remarks>
         protected global::System.Web.UI.WebControls.DropDownList isActiveDDL;
 
+        /// <summary>
+        /// minAmt 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.TextBox minAmt;
+
         /// <summary>
         /// btnSave control.
         /// </summary>

Swift.web/Remit/Transaction/Reports/TransactionNew/Mange.aspx

@@ -53,6 +53,8 @@
             var searchByValue = GetValue("<% =searchByValue.ClientID %>");
             var tFrom = GetValue("<% =transactionFrom.ClientID %>");
             var postCode = GetValue("<% =postCode.ClientID %>");
+            var promoCode = GetValue("<% =ddlPromotionCode.ClientID %>");
+
             var displayTranNo = "";
             if ($('#displayTranNo:checkbox:checked').length > 0) {
                 displayTranNo = "Y";
@@ -78,7 +80,8 @@
                 "&rptType=" + rptType +
                 "&displayTranNo=" + displayTranNo +
                 "&tFrom=" + tFrom +
-                "&postCode=" + postCode;
+                "&postCode=" + postCode +
+                "&promoCode=" + promoCode;
 
             OpenInNewWindow(url);
         }
@@ -215,6 +218,13 @@
                                     <asp:DropDownList runat="server" ID="transactionFrom" CssClass="form-control">
                                     </asp:DropDownList>
                                 </div>
+                                <div class="col-md-3 form-group">
+                                    <label>Promotion Code:</label>
+                                </div>
+                                <div class="col-md-9 form-group">
+                                    <asp:DropDownList runat="server" ID="ddlPromotionCode" CssClass="form-control">
+                                    </asp:DropDownList>
+                                </div>
                                 <div class="col-md-3 form-group">
                                     <label>Post Code :</label>
                                 </div>

Swift.web/Remit/Transaction/Reports/TransactionNew/Mange.aspx.cs

@@ -84,6 +84,7 @@ namespace Swift.web.Remit.Transaction.Reports.TransactionNew
             sl.SetDDL(ref ddlPCountry, "EXEC proc_dropDownLists @flag='pCountry'", "countryId", "countryName", "", "All");
             sl.SetDDL(ref paymentType, "EXEC proc_online_dropDownList @flag='paymentType'", "detailDesc", "detailTitle", "", "All");
             sl.SetDDL(ref transactionFrom, "EXEC proc_online_dropDownList @flag='transactionFrom'", "detailDesc", "detailTitle", "", "All");
+            sl.SetDDL(ref ddlPromotionCode, "EXEC proc_online_dropDownList @flag='promoCode'", "detailTitle", "detailTitle", "", "All");
         }
 
         //private void PopulatePaymentType()

Swift.web/Remit/Transaction/Reports/TransactionNew/Mange.aspx.designer.cs

@@ -140,6 +140,15 @@ namespace Swift.web.Remit.Transaction.Reports.TransactionNew
         /// </remarks>
         protected global::System.Web.UI.WebControls.DropDownList transactionFrom;
 
+        /// <summary>
+        /// ddlPromotionCode 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.DropDownList ddlPromotionCode;
+
         /// <summary>
         /// postCode control.
         /// </summary>

Swift.web/Remit/Transaction/Reports/TransactionNew/TranReport.aspx.cs

@@ -56,7 +56,8 @@ namespace Swift.web.Remit.Transaction.Reports.TransactionNew
             var tFrom = GetStatic.ReadQueryString("tFrom", "");
             var mode = GetStatic.ReadQueryString("mode", "");
             var postCode = GetStatic.ReadQueryString("postCode", "");
-            var dt = _obj.TxnReport(GetStatic.GetUser(), country, pAgent, depositType, orderBy, status, paymentType, dateField, from, to, transType, displayTranNo, searchBy, searchByValue, pageNumber, GetStatic.GetReportPagesize(), rptType, tFrom, postCode);
+            var promoCode = GetStatic.ReadQueryString("promoCode", "");
+            var dt = _obj.TxnReport(GetStatic.GetUser(), country, pAgent, depositType, orderBy, status, paymentType, dateField, from, to, transType, displayTranNo, searchBy, searchByValue, pageNumber, GetStatic.GetReportPagesize(), rptType, tFrom, postCode, promoCode);
 
             if (dt == null)
                 return;
@@ -185,7 +186,7 @@ namespace Swift.web.Remit.Transaction.Reports.TransactionNew
                         {
                             strTable.Append("<td align=\"left\"><b>" + total + "</b></td>");
                         }
-                        else if (i == 23)
+                        else if (i == 22)
                         {
                             strTable.Append("<td align=\"left\"><b>" + total + " USD</b></td>");
                         }

Swift.web/Responsive/Send/SendV2.aspx.cs

@@ -866,6 +866,7 @@ namespace Swift.web.Responsive.Send.SendMoneyv2
             , GetStatic.GetSessionId()
             , couponId
             , rewardAmt
+            , ""
             , isManualSc
             , sc);
 

Swift.web/Swift.web.csproj

@@ -1384,8 +1384,10 @@
     <Content Include="Remit\AgeingReport\OutstandingReport.aspx" />
     <Content Include="Remit\AgeingReport\SearchOutstanding.aspx" />
     <Content Include="Remit\TPSetup\BankAndBranchSetup\AddBank.aspx" />
-    <Content Include="Remit\TPSetup\BankAndBranchSetup\AddBankList.aspx" />
+    <Content Include="Remit\TPSetup\BankAndBranchSetup\AddBankMapping.aspx" />
     <Content Include="Remit\TPSetup\BankAndBranchSetup\AddBranch.aspx" />
+    <Content Include="Remit\TPSetup\BankAndBranchSetup\ListBranch.aspx" />
+    <Content Include="Remit\TPSetup\BankAndBranchSetup\NewBankList.aspx" />
     <Content Include="Remit\Transaction\ApproveTxn\holdTxnListMobile.aspx" />
     <Content Include="Remit\Transaction\CancelPartnerTxn\CancelPartnerTxn.aspx" />
     <Content Include="Remit\Transaction\ModifyRequest\Search.aspx" />
@@ -8134,12 +8136,12 @@
     <Compile Include="Remit\TPSetup\BankAndBranchSetup\AddBank.aspx.designer.cs">
       <DependentUpon>AddBank.aspx</DependentUpon>
     </Compile>
-    <Compile Include="Remit\TPSetup\BankAndBranchSetup\AddBankList.aspx.cs">
-      <DependentUpon>AddBankList.aspx</DependentUpon>
+    <Compile Include="Remit\TPSetup\BankAndBranchSetup\AddBankMapping.aspx.cs">
+      <DependentUpon>AddBankMapping.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
     </Compile>
-    <Compile Include="Remit\TPSetup\BankAndBranchSetup\AddBankList.aspx.designer.cs">
-      <DependentUpon>AddBankList.aspx</DependentUpon>
+    <Compile Include="Remit\TPSetup\BankAndBranchSetup\AddBankMapping.aspx.designer.cs">
+      <DependentUpon>AddBankMapping.aspx</DependentUpon>
     </Compile>
     <Compile Include="Remit\TPSetup\BankAndBranchSetup\AddBranch.aspx.cs">
       <DependentUpon>AddBranch.aspx</DependentUpon>
@@ -8162,6 +8164,13 @@
     <Compile Include="Remit\TPSetup\BankAndBranchSetup\BranchList.aspx.designer.cs">
       <DependentUpon>BranchList.aspx</DependentUpon>
     </Compile>
+    <Compile Include="Remit\TPSetup\BankAndBranchSetup\ListBranch.aspx.cs">
+      <DependentUpon>ListBranch.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="Remit\TPSetup\BankAndBranchSetup\ListBranch.aspx.designer.cs">
+      <DependentUpon>ListBranch.aspx</DependentUpon>
+    </Compile>
     <Compile Include="Remit\TPSetup\BankAndBranchSetup\ManagePartnerBank.aspx.cs">
       <DependentUpon>ManagePartnerBank.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
@@ -8169,6 +8178,13 @@
     <Compile Include="Remit\TPSetup\BankAndBranchSetup\ManagePartnerBank.aspx.designer.cs">
       <DependentUpon>ManagePartnerBank.aspx</DependentUpon>
     </Compile>
+    <Compile Include="Remit\TPSetup\BankAndBranchSetup\NewBankList.aspx.cs">
+      <DependentUpon>NewBankList.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="Remit\TPSetup\BankAndBranchSetup\NewBankList.aspx.designer.cs">
+      <DependentUpon>NewBankList.aspx</DependentUpon>
+    </Compile>
     <Compile Include="Remit\TPSetup\PartnerSetup\List.aspx.cs">
       <DependentUpon>List.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>