diff --git a/Swift.DAL/Agentpanel/Domain/IRHTranDetail.cs b/Swift.DAL/Agentpanel/Domain/IRHTranDetail.cs index 43c528d..547d9dc 100644 --- a/Swift.DAL/Agentpanel/Domain/IRHTranDetail.cs +++ b/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 diff --git a/Swift.DAL/Agentpanel/Send/SendTranIRHDao.cs b/Swift.DAL/Agentpanel/Send/SendTranIRHDao.cs index 8b36108..8cc2333 100644 --- a/Swift.DAL/Agentpanel/Send/SendTranIRHDao.cs +++ b/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); } diff --git a/Swift.DAL/Remittance/APIPartner/APIPartnerDao.cs b/Swift.DAL/Remittance/APIPartner/APIPartnerDao.cs index e561b60..03cc44d 100644 --- a/Swift.DAL/Remittance/APIPartner/APIPartnerDao.cs +++ b/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); } diff --git a/Swift.DAL/Remittance/Transaction/TranAgentReportDao.cs b/Swift.DAL/Remittance/Transaction/TranAgentReportDao.cs index 80aca77..10ff213 100644 --- a/Swift.DAL/Remittance/Transaction/TranAgentReportDao.cs +++ b/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; diff --git a/Swift.DAL/Remittance/Transaction/UpdateBranchDao.cs b/Swift.DAL/Remittance/Transaction/UpdateBranchDao.cs index a0cda70..a3f9040 100644 --- a/Swift.DAL/Remittance/Transaction/UpdateBranchDao.cs +++ b/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); + } + } } diff --git a/Swift.web/AgentNew/AgentSend/SendV2.aspx.cs b/Swift.web/AgentNew/AgentSend/SendV2.aspx.cs index c9b654d..3942fea 100644 --- a/Swift.web/AgentNew/AgentSend/SendV2.aspx.cs +++ b/Swift.web/AgentNew/AgentSend/SendV2.aspx.cs @@ -997,6 +997,7 @@ namespace Swift.web.AgentNew.AgentSend , GetStatic.GetSessionId() , couponId , rewardAmt + ,"" , isManualSc , sc); diff --git a/Swift.web/AgentNew/SendOnBehalf/SendV2.aspx.cs b/Swift.web/AgentNew/SendOnBehalf/SendV2.aspx.cs index 07f419b..bfd06ae 100644 --- a/Swift.web/AgentNew/SendOnBehalf/SendV2.aspx.cs +++ b/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); diff --git a/Swift.web/AgentNew/SendTxn/Confirm.aspx b/Swift.web/AgentNew/SendTxn/Confirm.aspx index 815adbb..b03fd30 100644 --- a/Swift.web/AgentNew/SendTxn/Confirm.aspx +++ b/Swift.web/AgentNew/SendTxn/Confirm.aspx @@ -691,6 +691,8 @@ + + diff --git a/Swift.web/AgentNew/SendTxn/Confirm.aspx.cs b/Swift.web/AgentNew/SendTxn/Confirm.aspx.cs index e6bba59..96b9e0b 100644 --- a/Swift.web/AgentNew/SendTxn/Confirm.aspx.cs +++ b/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; diff --git a/Swift.web/AgentNew/SendTxn/Confirm.aspx.designer.cs b/Swift.web/AgentNew/SendTxn/Confirm.aspx.designer.cs index 03d937e..0384d79 100644 --- a/Swift.web/AgentNew/SendTxn/Confirm.aspx.designer.cs +++ b/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. /// protected global::System.Web.UI.WebControls.HiddenField hddXMLCDDI; + protected global::System.Web.UI.WebControls.HiddenField hdnIsPromoCode; + protected global::System.Web.UI.WebControls.HiddenField hdnRowId; } } diff --git a/Swift.web/AgentNew/SendTxn/SendV2.aspx.cs b/Swift.web/AgentNew/SendTxn/SendV2.aspx.cs index c58a6ba..46aeabb 100644 --- a/Swift.web/AgentNew/SendTxn/SendV2.aspx.cs +++ b/Swift.web/AgentNew/SendTxn/SendV2.aspx.cs @@ -993,7 +993,7 @@ namespace Swift.web.AgentNew.SendTxn var pCountryFv = GetStatic.ReadFormData("pCountry", ""); var pBankType = GetStatic.ReadFormData("pBankType", ""); var dt = st.GetAgentSetting(GetStatic.GetUser(), pCountryFv, pAgentFv, pModeFv, pBankType); - Response.ContentType = "text/plain"; + Response.ContentType = "text/plain"; var json = DataTableToJson(dt); Response.Write(json); Response.End(); @@ -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,8 +1263,9 @@ namespace Swift.web.AgentNew.SendTxn , exRate.CalcBy , exRate.Introducer , exRate.RewardAmt + , exRate.CustomerId , exRate.ProviderId - + ); } else @@ -1289,6 +1291,7 @@ namespace Swift.web.AgentNew.SendTxn , exRate.ForexSessionId , exRate.TpExRate , exRate.RewardAmt + , exRate.CustomerId , Request.Form["isManualSc"] , exRate.ManualSc , exRate.CalcBy diff --git a/Swift.web/AgentNew/SendTxn/SendV2.aspx.designer.cs b/Swift.web/AgentNew/SendTxn/SendV2.aspx.designer.cs index 5ec4c35..bc09bdd 100644 --- a/Swift.web/AgentNew/SendTxn/SendV2.aspx.designer.cs +++ b/Swift.web/AgentNew/SendTxn/SendV2.aspx.designer.cs @@ -194,6 +194,33 @@ namespace Swift.web.AgentNew.SendTxn /// protected global::System.Web.UI.WebControls.HiddenField additionalAddressNotFound; + /// + /// hdnRewardAmt control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.HiddenField hdnRewardAmt; + + /// + /// hdnIsPromoCode control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.HiddenField hdnIsPromoCode; + + /// + /// hdnRowId control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.HiddenField hdnRowId; + /// /// txtSendFirstName control. /// diff --git a/Swift.web/AgentNew/Transaction/ApproveAgentTransaction/SendMoneyRequest.aspx.cs b/Swift.web/AgentNew/Transaction/ApproveAgentTransaction/SendMoneyRequest.aspx.cs index 053f560..bf176c1 100644 --- a/Swift.web/AgentNew/Transaction/ApproveAgentTransaction/SendMoneyRequest.aspx.cs +++ b/Swift.web/AgentNew/Transaction/ApproveAgentTransaction/SendMoneyRequest.aspx.cs @@ -308,6 +308,7 @@ namespace Swift.web.AgentNew.Transaction.ApproveAgentTransaction , "N" ,"" ,exRate.RewardAmt + , "" ); } diff --git a/Swift.web/AgentNew/js/SendTxn/agentAndLocation.js b/Swift.web/AgentNew/js/SendTxn/agentAndLocation.js index 709784e..b8ba609 100644 --- a/Swift.web/AgentNew/js/SendTxn/agentAndLocation.js +++ b/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); diff --git a/Swift.web/AgentNew/js/SendTxn/sendTxnInfo.js b/Swift.web/AgentNew/js/SendTxn/sendTxnInfo.js index 4cd9368..2105c73 100644 --- a/Swift.web/AgentNew/js/SendTxn/sendTxnInfo.js +++ b/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]); } } diff --git a/Swift.web/AgentNew/js/SendTxn/usableunctions.js b/Swift.web/AgentNew/js/SendTxn/usableunctions.js index 1837390..7e83f75 100644 --- a/Swift.web/AgentNew/js/SendTxn/usableunctions.js +++ b/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) { diff --git a/Swift.web/AgentPanel/International/SendMoney/Send.aspx.cs b/Swift.web/AgentPanel/International/SendMoney/Send.aspx.cs index 4c59916..73c1bf4 100644 --- a/Swift.web/AgentPanel/International/SendMoney/Send.aspx.cs +++ b/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"; diff --git a/Swift.web/AgentPanel/International/SendMoney/SendV2.aspx.cs b/Swift.web/AgentPanel/International/SendMoney/SendV2.aspx.cs index 86290f4..74b6f6c 100644 --- a/Swift.web/AgentPanel/International/SendMoney/SendV2.aspx.cs +++ b/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"; diff --git a/Swift.web/AgentPanel/International/SendMoneyv2/SendV2.aspx.cs b/Swift.web/AgentPanel/International/SendMoneyv2/SendV2.aspx.cs index f67fbb9..90c0914 100644 --- a/Swift.web/AgentPanel/International/SendMoneyv2/SendV2.aspx.cs +++ b/Swift.web/AgentPanel/International/SendMoneyv2/SendV2.aspx.cs @@ -937,6 +937,7 @@ namespace Swift.web.AgentPanel.International.SendMoneyv2 , GetStatic.GetSessionId() , couponId , rewardAmt + ,"" , isManualSc , sc); diff --git a/Swift.web/AgentPanel/International/SendOnBehalf/SendV2.aspx.cs b/Swift.web/AgentPanel/International/SendOnBehalf/SendV2.aspx.cs index 9c81586..2507512 100644 --- a/Swift.web/AgentPanel/International/SendOnBehalf/SendV2.aspx.cs +++ b/Swift.web/AgentPanel/International/SendOnBehalf/SendV2.aspx.cs @@ -936,6 +936,7 @@ namespace Swift.web.AgentPanel.International.SendOnBehalf , GetStatic.GetSessionId() , couponId , rewardAmt + , "" , isManualSc , sc); diff --git a/Swift.web/AgentPanel/Send/SendTransaction/Send.aspx.cs b/Swift.web/AgentPanel/Send/SendTransaction/Send.aspx.cs index f13f65f..2a7839e 100644 --- a/Swift.web/AgentPanel/Send/SendTransaction/Send.aspx.cs +++ b/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"; diff --git a/Swift.web/Remit/Administration/CountrySetup/PromotionalRateSetup/List.aspx.cs b/Swift.web/Remit/Administration/CountrySetup/PromotionalRateSetup/List.aspx.cs index 5bda71d..bbaa974 100644 --- a/Swift.web/Remit/Administration/CountrySetup/PromotionalRateSetup/List.aspx.cs +++ b/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); diff --git a/Swift.web/Remit/Administration/CountrySetup/PromotionalRateSetup/Manage.aspx b/Swift.web/Remit/Administration/CountrySetup/PromotionalRateSetup/Manage.aspx index 742503b..e43dff4 100644 --- a/Swift.web/Remit/Administration/CountrySetup/PromotionalRateSetup/Manage.aspx +++ b/Swift.web/Remit/Administration/CountrySetup/PromotionalRateSetup/Manage.aspx @@ -99,6 +99,17 @@ +
+ +
+ + + +
+
@@ -255,10 +255,13 @@
+
-

Update Branch Code +

Insert Branch Name And Code

@@ -288,7 +292,7 @@ Country:
- +
@@ -298,7 +302,7 @@ Partner:
- +
@@ -310,27 +314,18 @@ Bank Name:
- +
+
- - -
-
-
- -
- +
@@ -339,7 +334,7 @@ BRANCH_CODE1 :
- +
@@ -348,7 +343,7 @@ Is Active:
- + @@ -358,18 +353,18 @@
- +
-
+
-

Insert Branch Name And Code +

Update Branch Code

@@ -383,7 +378,7 @@ Country:
- +
@@ -393,7 +388,7 @@ Partner:
- +
@@ -405,18 +400,27 @@ Bank Name:
- +
-
- + + +
+
+
+ +
+
@@ -425,7 +429,7 @@ BRANCH_CODE1 :
- +
@@ -434,7 +438,7 @@ Is Active:
- + @@ -444,13 +448,14 @@
- +
+
diff --git a/Swift.web/Remit/TPSetup/BankAndBranchSetup/AddBranch.aspx.cs b/Swift.web/Remit/TPSetup/BankAndBranchSetup/AddBranch.aspx.cs index 0498712..aed04cb 100644 --- a/Swift.web/Remit/TPSetup/BankAndBranchSetup/AddBranch.aspx.cs +++ b/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) diff --git a/Swift.web/Remit/TPSetup/BankAndBranchSetup/AddBranch.aspx.designer.cs b/Swift.web/Remit/TPSetup/BankAndBranchSetup/AddBranch.aspx.designer.cs index c26c5ee..9608e5a 100644 --- a/Swift.web/Remit/TPSetup/BankAndBranchSetup/AddBranch.aspx.designer.cs +++ b/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; /// - /// countryDDL control. + /// countryDDL1 control. /// /// /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. /// - protected global::System.Web.UI.WebControls.DropDownList countryDDL; + protected global::System.Web.UI.WebControls.DropDownList countryDDL1; /// - /// partnerDDL control. + /// partnerDDL1 control. /// /// /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. /// - protected global::System.Web.UI.WebControls.DropDownList partnerDDL; + protected global::System.Web.UI.WebControls.DropDownList partnerDDL1; /// - /// bankDDL control. + /// bankDDL1 control. /// /// /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. /// - protected global::System.Web.UI.WebControls.DropDownList bankDDL; + protected global::System.Web.UI.WebControls.DropDownList bankDDL1; /// - /// branchDDL control. + /// branchName control. /// /// /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. /// - protected global::System.Web.UI.WebControls.DropDownList branchDDL; + protected global::System.Web.UI.WebControls.TextBox branchName; /// - /// editedBranchName control. + /// branchCodeValue control. /// /// /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. /// - protected global::System.Web.UI.WebControls.TextBox editedBranchName; + protected global::System.Web.UI.WebControls.TextBox branchCodeValue; /// - /// branchCode control. + /// isActiveDDL1 control. /// /// /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. /// - protected global::System.Web.UI.WebControls.TextBox branchCode; + protected global::System.Web.UI.WebControls.DropDownList isActiveDDL1; /// - /// isActiveDDL control. + /// countryDDL control. /// /// /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. /// - protected global::System.Web.UI.WebControls.DropDownList isActiveDDL; + protected global::System.Web.UI.WebControls.DropDownList countryDDL; /// - /// countryDDL1 control. + /// partnerDDL control. /// /// /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. /// - protected global::System.Web.UI.WebControls.DropDownList countryDDL1; + protected global::System.Web.UI.WebControls.DropDownList partnerDDL; /// - /// partnerDDL1 control. + /// bankDDL control. /// /// /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. /// - protected global::System.Web.UI.WebControls.DropDownList partnerDDL1; + protected global::System.Web.UI.WebControls.DropDownList bankDDL; /// - /// bankDDL1 control. + /// branchDDL control. /// /// /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. /// - protected global::System.Web.UI.WebControls.DropDownList bankDDL1; + protected global::System.Web.UI.WebControls.DropDownList branchDDL; /// - /// branchName control. + /// editedBranchName control. /// /// /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. /// - protected global::System.Web.UI.WebControls.TextBox branchName; + protected global::System.Web.UI.WebControls.TextBox editedBranchName; /// - /// branchCodeValue control. + /// branchCode control. /// /// /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. /// - protected global::System.Web.UI.WebControls.TextBox branchCodeValue; + protected global::System.Web.UI.WebControls.TextBox branchCode; /// - /// isActiveDDL1 control. + /// isActiveDDL control. /// /// /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. /// - protected global::System.Web.UI.WebControls.DropDownList isActiveDDL1; + protected global::System.Web.UI.WebControls.DropDownList isActiveDDL; } } diff --git a/Swift.web/Remit/TPSetup/BankAndBranchSetup/BankList.aspx b/Swift.web/Remit/TPSetup/BankAndBranchSetup/BankList.aspx index 16cb903..76bca2b 100644 --- a/Swift.web/Remit/TPSetup/BankAndBranchSetup/BankList.aspx +++ b/Swift.web/Remit/TPSetup/BankAndBranchSetup/BankList.aspx @@ -71,7 +71,7 @@
  • Others Service
    • <%--
  • Sub_Other Service
  • Sub_Other Service
    • --%> -
  • Bank Setup
    • +
  • Bank Mapping List
    • @@ -80,9 +80,11 @@
      -
    • Bank List
      • -
    • Bank Setup
      • -
    • Bank Mapping
      • +
    • Bank List
      • +
    • Bank Setup
      • +
    • Bank Mapping List
      • +
    • Bank Mapping Setup
      • +
    • Branch List
    • Branch Setup
      • <%-- diff --git a/Swift.web/Remit/TPSetup/BankAndBranchSetup/BankList.aspx.cs b/Swift.web/Remit/TPSetup/BankAndBranchSetup/BankList.aspx.cs index 445f19d..686f837 100644 --- a/Swift.web/Remit/TPSetup/BankAndBranchSetup/BankList.aspx.cs +++ b/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 { 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 = " "; @@ -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(); diff --git a/Swift.web/Remit/TPSetup/BankAndBranchSetup/BankList.aspx.designer.cs b/Swift.web/Remit/TPSetup/BankAndBranchSetup/BankList.aspx.designer.cs index 1a64ac0..4adddd2 100644 --- a/Swift.web/Remit/TPSetup/BankAndBranchSetup/BankList.aspx.designer.cs +++ b/Swift.web/Remit/TPSetup/BankAndBranchSetup/BankList.aspx.designer.cs @@ -7,11 +7,13 @@ // //------------------------------------------------------------------------------ -namespace Swift.web.Remit.TPSetup.BankAndBranchSetup { - - - public partial class BankList { - +namespace Swift.web.Remit.TPSetup.BankAndBranchSetup +{ + + + public partial class BankList + { + /// /// form1 control. /// @@ -20,7 +22,7 @@ namespace Swift.web.Remit.TPSetup.BankAndBranchSetup { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.HtmlControls.HtmlForm form1; - + /// /// isActive control. /// @@ -29,7 +31,7 @@ namespace Swift.web.Remit.TPSetup.BankAndBranchSetup { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.HiddenField isActive; - + /// /// rowId control. /// @@ -38,7 +40,7 @@ namespace Swift.web.Remit.TPSetup.BankAndBranchSetup { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.HiddenField rowId; - + /// /// btnPostBack control. /// @@ -47,7 +49,7 @@ namespace Swift.web.Remit.TPSetup.BankAndBranchSetup { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.Button btnPostBack; - + /// /// btnUpdate control. /// @@ -56,7 +58,7 @@ namespace Swift.web.Remit.TPSetup.BankAndBranchSetup { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.Button btnUpdate; - + /// /// rpt_grid control. /// @@ -65,7 +67,7 @@ namespace Swift.web.Remit.TPSetup.BankAndBranchSetup { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.HtmlControls.HtmlGenericControl rpt_grid; - + /// /// btnSyncBank control. /// diff --git a/Swift.web/Remit/TPSetup/BankAndBranchSetup/ListBranch.aspx b/Swift.web/Remit/TPSetup/BankAndBranchSetup/ListBranch.aspx new file mode 100644 index 0000000..f8d8d4a --- /dev/null +++ b/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" %> + + + + + + + + + + + + + + + + + + +
      + + +