diff --git a/Swift.DAL/Remittance/Transaction/TranAgentReportDao.cs b/Swift.DAL/Remittance/Transaction/TranAgentReportDao.cs index e1054f0..b38b290 100644 --- a/Swift.DAL/Remittance/Transaction/TranAgentReportDao.cs +++ b/Swift.DAL/Remittance/Transaction/TranAgentReportDao.cs @@ -548,7 +548,7 @@ namespace Swift.DAL.BL.Remit.Transaction return ParseReportResult(sql); } - public DataTable TxnReport(string user, string pCountry, string pAgent, string sCountry, string depositType,string remitTYpe, 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) + public DataTable TxnReport(string user, string pCountry, string pAgent, string sCountry, string depositType,string remitTYpe, 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); @@ -571,6 +571,8 @@ namespace Swift.DAL.BL.Remit.Transaction sql += ", @pageSize = " + FilterString(pageSize); 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 5050018..ee6a9cd 100644 --- a/Swift.DAL/Remittance/Transaction/UpdateBranchDao.cs +++ b/Swift.DAL/Remittance/Transaction/UpdateBranchDao.cs @@ -175,119 +175,6 @@ namespace Swift.DAL.Remittance.Transaction return ds.Tables[0]; } - 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) - { - 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); - sql += ", @sCurrency = " + FilterString(pCurrency); - sql += ", @bankState = " + FilterString(bankState); - sql += ", @bankAddress = " + FilterString(bankAddress); - sql += ", @bankDistrict = " + FilterString(bankDistrict); - sql += ", @bankPhone = " + FilterString(bankPhone); - sql += ", @bankEmail = " + FilterString(bankEmail); - sql += ", @is_Active = " + FilterString(isActive); - sql += ", @user = " + FilterString(user); - - 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 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) - { - 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); - sql += ", @sCurrency = " + FilterString(pCurrency); - sql += ", @pMode = " + FilterString(pMode); - sql += ", @bankCode1 = " + FilterString(bankCode1); - sql += ", @bankCode2 = " + FilterString(bankCode2); - sql += ", @bankAddress = " + FilterString(bAddress); - sql += ", @is_Active = " + FilterString(isActive); - sql += ", @user = " + FilterString(user); - - 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 UpdateBankMapping(string user, string flag, string countryId, string parnerId, string bankId, string pMode, string bankCode1, string bankCode2, string pCurrency, string bAddress) - { - var sql = "EXEC Proc_UpdateBranchCode @flag =" + FilterString(flag); - sql += ", @pCountryName = " + FilterString(countryId); - sql += ", @partnerId = " + FilterString(parnerId); - sql += ", @bankName = " + FilterString(bankId); - sql += ", @sCurrency = " + FilterString(pCurrency); - sql += ", @pMode = " + FilterString(pMode); - sql += ", @bankCode1 = " + FilterString(bankCode1); - sql += ", @bankCode2 = " + FilterString(bankCode2); - sql += ", @bankAddress = " + FilterString(bAddress); - sql += ", @user = " + FilterString(user); - - var ds = ExecuteDataset(sql); - if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0) - return null; - return ds.Tables[0]; - } - - 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 = '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); - - 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 DataTable LoadBankMaster(string sCountryid, string pCountry, string collMode, string flag, string user) - { - var sql = "EXEC Proc_UpdateBranchCode @flag =" + FilterString(flag); - sql += ", @countryId = " + FilterString(sCountryid); - sql += ", @pCountryId = " + FilterString(pCountry); - sql += ", @param = " + FilterString(collMode); - sql += ", @user = " + FilterString(user); - - 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 LoadBank(string sCountryid, string pCountry, string collMode, string partnerId, string flag, string user) { //var sql = "EXEC proc_dropDownLists @flag = 'collModeByCountry'"; diff --git a/Swift.web/Remit/Transaction/Reports/TransactionNew/TranReport.aspx.cs b/Swift.web/Remit/Transaction/Reports/TransactionNew/TranReport.aspx.cs index a3021ef..434b1c1 100644 --- a/Swift.web/Remit/Transaction/Reports/TransactionNew/TranReport.aspx.cs +++ b/Swift.web/Remit/Transaction/Reports/TransactionNew/TranReport.aspx.cs @@ -58,7 +58,7 @@ namespace Swift.web.Remit.Transaction.Reports.TransactionNew var mode = GetStatic.ReadQueryString("mode", ""); var postCode = GetStatic.ReadQueryString("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); + var dt = _obj.TxnReport(GetStatic.GetUser(), country, pAgent, sCountry, depositType, remitTYpe, orderBy, status, paymentType, dateField, from, to, transType, displayTranNo, searchBy, searchByValue, pageNumber, GetStatic.GetReportPagesize(), rptType, tFrom, postCode, promoCode); if (dt == null) return; diff --git a/Swift.web/RemittanceSystem/RemittanceReports/DynamicReport/DynamicReportView.aspx.cs b/Swift.web/RemittanceSystem/RemittanceReports/DynamicReport/DynamicReportView.aspx.cs index 69f45c4..26e2a57 100644 --- a/Swift.web/RemittanceSystem/RemittanceReports/DynamicReport/DynamicReportView.aspx.cs +++ b/Swift.web/RemittanceSystem/RemittanceReports/DynamicReport/DynamicReportView.aspx.cs @@ -169,14 +169,7 @@ namespace Swift.web.RemittanceSystem.RemittanceReports.DynamicReport return (new TranAgentReportDao().GetLowTxnReport(GetStatic.GetUser(), "txn-report", fromDate, postCode, txnCountType, txnCount)); } - private ReportResult PrepareLowTxnReport() - { - string fromDate = GetStatic.ReadQueryString("from", ""); - string postCode = GetStatic.ReadQueryString("postCode", ""); - string txnCountType = GetStatic.ReadQueryString("txnCountType", ""); - string txnCount = GetStatic.ReadQueryString("txnCount", ""); - return (new TranAgentReportDao().GetLowTxnReport(GetStatic.GetUser(), "txn-report", fromDate, postCode, txnCountType, txnCount)); - } + private void PrintHead() { Page.Title = reportResult.ReportHead;