From 7aaca9050d6ada46f550e14de696300fd1239a53 Mon Sep 17 00:00:00 2001 From: Shakun Shrestha Date: Thu, 6 Jun 2024 00:27:26 +0545 Subject: [PATCH 1/6] V7 Feature #30199: Regarding Freezing Header in TXN Report Actions Feature #30239: Add ID Status ( Expire or Active ) in Cust Reg Report Actions Feature #30994: Add num of receiver filter in Customer Registration Report Actions Story #27925: Inbound Api for Ime London Actions Task #29651: Menu for Inward Remittance --- Swift.DAL/Remittance/Transaction/ApiLogDao.cs | 6 +- .../ApproveInwardTransactionDao.cs | 92 ++++ .../Transaction/TranAgentReportDao.cs | 4 +- Swift.DAL/Swift.DAL.csproj | 1 + Swift.web/DashboardV2/Dashboard2.aspx | 14 + .../Operation/EditCustomerForApproval.aspx | 5 +- .../PushNotification/ManageBroadCast.aspx | 18 +- .../CustomerRegistration/Manage.aspx.cs | 1 + .../Administration/CustomerSetup/List.aspx.cs | 1 + .../InboundApiLog/InboundLog.aspx | 117 +++++ .../InboundApiLog/InboundLog.aspx.cs | 47 ++ .../InboundApiLog/InboundLog.aspx.designer.cs | 116 +++++ .../InboundApiLog/InboundLogList.aspx | 70 +++ .../InboundApiLog/InboundLogList.aspx.cs | 80 ++++ .../InboundLogList.aspx.designer.cs | 35 ++ .../MobileApiLog/MobileApiLogList.aspx | 71 +++ .../MobileApiLog/MobileApiLogList.aspx.cs | 81 ++++ .../MobileApiLogList.aspx.designer.cs | 35 ++ .../ApproveTxn/ApproveInwardRemitance.aspx | 304 +++++++++++++ .../ApproveTxn/ApproveInwardRemitance.aspx.cs | 409 ++++++++++++++++++ .../ApproveInwardRemitance.aspx.designer.cs | 260 +++++++++++ .../PromotionalCampaign/Manage.aspx | 2 +- .../Reports/TransactionNew/Mange.aspx | 28 +- .../Reports/TransactionNew/Mange.aspx.cs | 2 + .../TransactionNew/Mange.aspx.designer.cs | 18 + .../Reports/TransactionNew/TranReport.aspx | 15 + .../Reports/TransactionNew/TranReport.aspx.cs | 9 +- .../Remit/UserControl/UcTransaction.ascx | 28 ++ .../Remit/UserControl/UcTransaction.ascx.cs | 5 + .../UcTransaction.ascx.designer.cs | 63 +++ Swift.web/Swift.web.csproj | 32 ++ Swift.web/js/swift_calendar.js | 51 +++ Swift.web/ui/css/style.css | 3 +- 33 files changed, 2001 insertions(+), 22 deletions(-) create mode 100644 Swift.DAL/Remittance/Transaction/ApproveInwardTransactionDao.cs create mode 100644 Swift.web/Remit/ThirdPartyTXN/InboundApiLog/InboundLog.aspx create mode 100644 Swift.web/Remit/ThirdPartyTXN/InboundApiLog/InboundLog.aspx.cs create mode 100644 Swift.web/Remit/ThirdPartyTXN/InboundApiLog/InboundLog.aspx.designer.cs create mode 100644 Swift.web/Remit/ThirdPartyTXN/InboundApiLog/InboundLogList.aspx create mode 100644 Swift.web/Remit/ThirdPartyTXN/InboundApiLog/InboundLogList.aspx.cs create mode 100644 Swift.web/Remit/ThirdPartyTXN/InboundApiLog/InboundLogList.aspx.designer.cs create mode 100644 Swift.web/Remit/ThirdPartyTXN/MobileApiLog/MobileApiLogList.aspx create mode 100644 Swift.web/Remit/ThirdPartyTXN/MobileApiLog/MobileApiLogList.aspx.cs create mode 100644 Swift.web/Remit/ThirdPartyTXN/MobileApiLog/MobileApiLogList.aspx.designer.cs create mode 100644 Swift.web/Remit/Transaction/ApproveTxn/ApproveInwardRemitance.aspx create mode 100644 Swift.web/Remit/Transaction/ApproveTxn/ApproveInwardRemitance.aspx.cs create mode 100644 Swift.web/Remit/Transaction/ApproveTxn/ApproveInwardRemitance.aspx.designer.cs diff --git a/Swift.DAL/Remittance/Transaction/ApiLogDao.cs b/Swift.DAL/Remittance/Transaction/ApiLogDao.cs index d7acd4a..c4585f8 100644 --- a/Swift.DAL/Remittance/Transaction/ApiLogDao.cs +++ b/Swift.DAL/Remittance/Transaction/ApiLogDao.cs @@ -10,7 +10,11 @@ namespace Swift.DAL.Remittance.Transaction var sql = "EXEC proc_ApiLogs @flag='a',@rowId=" + FilterString(id); return ExecuteDataRow(sql); } - + public DataRow GetInboundApiLogRecord(string id) + { + var sql = "EXEC proc_inboundApiLogs @flag='a',@rowId=" + FilterString(id); + return ExecuteDataRow(sql); + } public DataRow GetKFTCLogRecord(string id,string User) { var sql = "EXEC proc_KFTCApiLogs @flag='a',@rowId=" + FilterString(id); diff --git a/Swift.DAL/Remittance/Transaction/ApproveInwardTransactionDao.cs b/Swift.DAL/Remittance/Transaction/ApproveInwardTransactionDao.cs new file mode 100644 index 0000000..cc99be1 --- /dev/null +++ b/Swift.DAL/Remittance/Transaction/ApproveInwardTransactionDao.cs @@ -0,0 +1,92 @@ +using Swift.DAL.SwiftDAL; +using System; +using System.Collections.Generic; +using System.Data; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Swift.DAL.Remittance.Transaction +{ + public class ApproveInwardTransactionDao : RemittanceDao + { + public DataSet GetHoldedTXNListAdmin(string user, string branch, string id, string country, string sender, string receiver + , string amt, string branchId, string userType, string flag, + string txnDate, string txnUser, string controlNo, string controlNo1, string txnType, string sendCountry, string sendAgent, string sendBranch) + { + string sql = "EXEC proc_ApproveInwardHoldedTXN "; + sql += " @flag = " + FilterString(flag); + sql += ", @user = " + FilterString(user); + sql += ", @id = " + FilterString(id); + sql += ", @branch = " + FilterString(branch); + sql += ", @country = " + FilterString(country); + sql += ", @sender = " + FilterString(sender); + sql += ", @receiver = " + FilterString(receiver); + sql += ", @amt = " + FilterString(amt); + sql += ", @branchId = " + FilterString(branchId); + sql += ", @userType = " + FilterString(userType); + sql += ", @txnDate = " + FilterString(txnDate); + sql += ", @txncreatedBy = " + FilterString(txnUser); + sql += ", @ControlNo = " + FilterString(controlNo); + sql += ", @tpControlNo2 = " + FilterString(controlNo1); + sql += ", @txnType = " + FilterString(txnType); + sql += ", @sendCountry = " + FilterString(sendCountry); + sql += ", @sendAgent = " + FilterString(sendAgent); + sql += ", @sendBranch = " + FilterString(sendBranch); + return ExecuteDataset(sql); + } + + + public DbResult ApproveAllHoldedTXN(string user, string idList) + { + var sb = new StringBuilder(""); + var list = idList.Split(','); + foreach (var itm in list) + { + sb.Append(""); + } + sb.Append(""); + + var sql = "EXEC proc_ApproveInwardHoldedTXN @flag = 'approve-all'"; + sql += ", @user = " + FilterString(user); + sql += ", @idList = " + FilterString(sb.ToString()); + return ParseDbResult(sql); + } + + public DataSet GetHoldAdminTransactionSummary(string user, string branchId, string userType) + { + string sql = "EXEC proc_ApproveInwardHoldedTXN "; + sql += " @flag = 's_admin_txn_summary'"; + sql += ", @user = " + FilterString(user); + sql += ", @branchId = " + FilterString(branchId); + sql += ", @userType = " + FilterString(userType); + return ExecuteDataset(sql); + } + public DbResult GetTxnApproveDataIMEPay(string user, string id) + { + var sql = "EXEC proc_ApproveInwardHoldedTXN @flag = 'get-info-imepay'"; + sql += ", @user = " + FilterString(user); + sql += ", @id = " + FilterString(id); + var drDb = ParseDbResultNew(sql); + return drDb; + } + public DbResult ApproveHoldedTXN(string user, string id) + { + var sql = "EXEC proc_ApproveInwardHoldedTXN @flag = 'approve'"; + sql += ", @user = " + FilterString(user); + sql += ", @id = " + FilterString(id); + var drDb = ParseDbResult(sql); + return drDb; + } + public DbResult RejectHoldedTXN(string user, string id, string controlNO = "", string remarks = "") + { + var sql = "EXEC proc_ApproveInwardHoldedTXN @flag = 'reject'"; + sql += ", @user = " + FilterString(user); + sql += ", @id = " + FilterString(id); + sql += ", @remarks = " + FilterString(remarks); + sql += ", @ControlNo = " + FilterString(controlNO); + + return ParseDbResult(sql); + } + } +} diff --git a/Swift.DAL/Remittance/Transaction/TranAgentReportDao.cs b/Swift.DAL/Remittance/Transaction/TranAgentReportDao.cs index 10ff213..1d73fb3 100644 --- a/Swift.DAL/Remittance/Transaction/TranAgentReportDao.cs +++ b/Swift.DAL/Remittance/Transaction/TranAgentReportDao.cs @@ -542,13 +542,15 @@ 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, string promoCode) + 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); sql += ", @pCountry = " + FilterString(pCountry); sql += ", @pAgent = " + FilterString(pAgent); + sql += ", @sCountry = " + FilterString(sCountry); sql += ", @depositType = " + FilterString(depositType); + sql += ", @remitTYpe = " + FilterString(remitTYpe); sql += ", @orderBy = " + FilterString(orderBy); sql += ", @status = " + FilterString(status); sql += ", @paymentType = " + FilterString(paymentType); diff --git a/Swift.DAL/Swift.DAL.csproj b/Swift.DAL/Swift.DAL.csproj index b7b819f..48128eb 100644 --- a/Swift.DAL/Swift.DAL.csproj +++ b/Swift.DAL/Swift.DAL.csproj @@ -383,6 +383,7 @@ + diff --git a/Swift.web/DashboardV2/Dashboard2.aspx b/Swift.web/DashboardV2/Dashboard2.aspx index 849efaa..b02e84c 100644 --- a/Swift.web/DashboardV2/Dashboard2.aspx +++ b/Swift.web/DashboardV2/Dashboard2.aspx @@ -542,6 +542,20 @@ +
+
+ +
+
+

KYC Completed

+

0

+
+
+ + + <%--
+
+ diff --git a/Swift.web/MobileRemit/Admin/Operation/EditCustomerForApproval.aspx b/Swift.web/MobileRemit/Admin/Operation/EditCustomerForApproval.aspx index 13e48af..d724458 100644 --- a/Swift.web/MobileRemit/Admin/Operation/EditCustomerForApproval.aspx +++ b/Swift.web/MobileRemit/Admin/Operation/EditCustomerForApproval.aspx @@ -59,6 +59,7 @@ .lowercase { text-transform: none !important; } + } + + + + + + + + + + + + + + + + + + + + + + + + +
+
+
+
+
+
    +
    2. +
  2. System Security
    3. +
  3. Inbound API Log
    4. +
+
+
+
+
+
+
+
+

Inbound API Transaction Log List

+
+ +
+
+
+
+
+
+
+
+
+
+
+
+
+ + diff --git a/Swift.web/Remit/ThirdPartyTXN/InboundApiLog/InboundLogList.aspx.cs b/Swift.web/Remit/ThirdPartyTXN/InboundApiLog/InboundLogList.aspx.cs new file mode 100644 index 0000000..ffa6ab7 --- /dev/null +++ b/Swift.web/Remit/ThirdPartyTXN/InboundApiLog/InboundLogList.aspx.cs @@ -0,0 +1,80 @@ +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.ThirdPartyTXN.InboundApiLog +{ + public partial class InboundLogList : System.Web.UI.Page + { + protected const string GridName = "apiLog"; + private const string ViewFunctionId = "20172000"; + private string sql; + private readonly SwiftGrid _grid = new SwiftGrid(); + private readonly RemittanceLibrary _sl = new RemittanceLibrary(); + protected void Page_Load(object sender, EventArgs e) + { + + LoadGrid(); + } + + + private void Authenticate() + { + _sl.CheckAuthentication(ViewFunctionId); + } + + private void LoadGrid() + { + //string ddlSql = "EXEC [PROC_API_ROUTE_PARTNERS] @flag = 'agent-list'"; + string ddlSql1 = "EXEC [proc_inboundApiLogs] @flag = 'method'"; + + _grid.FilterList = new List + { + //new GridFilter("agentId", "Partner", "1:"+ddlSql, "0") + new GridFilter("agentId", "Log Type", "1:"+ddlSql1, "0") + ,new GridFilter("logby", "Log By(username)", "T") + ,new GridFilter("date", "Log date", "D") + + ,new GridFilter("controlno", "Control Number", "T") + ,new GridFilter("processid", "Process Id", "T") + }; + _grid.ColumnList = new List + { + new GridColumn("SN","SN","","T"), + new GridColumn("ProcessIdentifier", "processid", "", "T"), + new GridColumn("RequestedBy","RequestedBy","","T"), + new GridColumn("MethodName", "MethodName", "", "T"), + new GridColumn("RequestedDate", "Date", "", "D"), + new GridColumn("RequestJson", "RequestJson", "", "T"), + new GridColumn("ResponseJson", "ResponseJson", "", "T"), + new GridColumn("controlno","controlno","","T"), + }; + _grid.GridDataSource = SwiftGrid.GridDS.RemittanceDB; + _grid.GridType = 1; + _grid.GridName = GridName; + _grid.RowIdField = "rowId"; + _grid.InputPerRow = 5; + + _grid.AlwaysShowFilterForm = true; + _grid.LoadGridOnFilterOnly = true; + + _grid.AllowCustomLink = true; + _grid.CustomLinkText = Misc.GetIcon("vd", "OpenInNewWindow('InboundLog.aspx?id=@rowId')"); + _grid.CustomLinkVariables = "rowId"; + + _grid.ShowFilterForm = true; + _grid.ShowPagingBar = true; + + _grid.ThisPage = "InboundLogList.aspx"; + sql = "EXEC proc_inboundApiLogs @flag = 's'"; + _grid.SetComma(); + rpt_grid.InnerHtml = _grid.CreateGrid(sql); + } + } +} \ No newline at end of file diff --git a/Swift.web/Remit/ThirdPartyTXN/InboundApiLog/InboundLogList.aspx.designer.cs b/Swift.web/Remit/ThirdPartyTXN/InboundApiLog/InboundLogList.aspx.designer.cs new file mode 100644 index 0000000..a0eca76 --- /dev/null +++ b/Swift.web/Remit/ThirdPartyTXN/InboundApiLog/InboundLogList.aspx.designer.cs @@ -0,0 +1,35 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace Swift.web.Remit.ThirdPartyTXN.InboundApiLog +{ + + + public partial class InboundLogList + { + + /// + /// form1 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.HtmlControls.HtmlForm form1; + + /// + /// rpt_grid control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.HtmlControls.HtmlGenericControl rpt_grid; + } +} diff --git a/Swift.web/Remit/ThirdPartyTXN/MobileApiLog/MobileApiLogList.aspx b/Swift.web/Remit/ThirdPartyTXN/MobileApiLog/MobileApiLogList.aspx new file mode 100644 index 0000000..e2925a1 --- /dev/null +++ b/Swift.web/Remit/ThirdPartyTXN/MobileApiLog/MobileApiLogList.aspx @@ -0,0 +1,71 @@ +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="MobileApiLogList.aspx.cs" Inherits="Swift.web.Remit.ThirdPartyTXN.MobileApiLog.MobileApiLogList" %> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+
+
+
+
    +
    2. +
  2. System Security
    3. +
  3. Mobile API Log
    4. +
+
+
+
+
+
+
+
+

Mobile API Log List

+
+ +
+
+
+
+
+
+
+
+
+
+
+
+
+ + + diff --git a/Swift.web/Remit/ThirdPartyTXN/MobileApiLog/MobileApiLogList.aspx.cs b/Swift.web/Remit/ThirdPartyTXN/MobileApiLog/MobileApiLogList.aspx.cs new file mode 100644 index 0000000..603a628 --- /dev/null +++ b/Swift.web/Remit/ThirdPartyTXN/MobileApiLog/MobileApiLogList.aspx.cs @@ -0,0 +1,81 @@ +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.ThirdPartyTXN.MobileApiLog +{ + public partial class MobileApiLogList : System.Web.UI.Page + { + protected const string GridName = "apiLog"; + private const string ViewFunctionId = "20172000"; + private string sql; + private readonly SwiftGrid _grid = new SwiftGrid(); + private readonly RemittanceLibrary _sl = new RemittanceLibrary(); + protected void Page_Load(object sender, EventArgs e) + { + + Authenticate(); + LoadGrid(); + } + + + private void Authenticate() + { + _sl.CheckAuthentication(ViewFunctionId); + } + + private void LoadGrid() + { + //string ddlSql = "EXEC [PROC_API_ROUTE_PARTNERS] @flag = 'agent-list'"; + string ddlSql1 = "EXEC [proc_MobileApiLogs] @flag = 'method'"; + + _grid.FilterList = new List + { + //new GridFilter("agentId", "Partner", "1:"+ddlSql, "0") + new GridFilter("agentId", "Log Type", "1:"+ddlSql1, "0") + ,new GridFilter("logby", "Log By(username)", "T") + ,new GridFilter("date", "Log date", "D") + + ,new GridFilter("controlno", "Control Number", "T") + ,new GridFilter("processid", "Process Id", "T") + }; + _grid.ColumnList = new List + { + new GridColumn("SN","SN","","T"), + new GridColumn("processId", "processid", "", "T"), + new GridColumn("createdBy","RequestedBy","","T"), + new GridColumn("methodName", "MethodName", "", "T"), + new GridColumn("createdDate", "Date", "", "D"), + new GridColumn("message", "RequestJson", "", "T"), + //new GridColumn("ResponseJson", "ResponseJson", "", "T"), + new GridColumn("controlno","controlno","","T"), + }; + _grid.GridDataSource = SwiftGrid.GridDS.RemittanceDB; + _grid.GridType = 1; + _grid.GridName = GridName; + _grid.RowIdField = "rowId"; + _grid.InputPerRow = 5; + + _grid.AlwaysShowFilterForm = true; + _grid.LoadGridOnFilterOnly = true; + + _grid.AllowCustomLink = true; + //_grid.CustomLinkText = Misc.GetIcon("vd", "OpenInNewWindow('InboundLog.aspx?id=@rowId')"); + _grid.CustomLinkVariables = "rowId"; + + _grid.ShowFilterForm = true; + _grid.ShowPagingBar = true; + + _grid.ThisPage = "InboundLogList.aspx"; + sql = "EXEC proc_MobileApiLogs @flag = 's'"; + _grid.SetComma(); + rpt_grid.InnerHtml = _grid.CreateGrid(sql); + } + } +} \ No newline at end of file diff --git a/Swift.web/Remit/ThirdPartyTXN/MobileApiLog/MobileApiLogList.aspx.designer.cs b/Swift.web/Remit/ThirdPartyTXN/MobileApiLog/MobileApiLogList.aspx.designer.cs new file mode 100644 index 0000000..02189be --- /dev/null +++ b/Swift.web/Remit/ThirdPartyTXN/MobileApiLog/MobileApiLogList.aspx.designer.cs @@ -0,0 +1,35 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace Swift.web.Remit.ThirdPartyTXN.MobileApiLog +{ + + + public partial class MobileApiLogList + { + + /// + /// form1 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.HtmlControls.HtmlForm form1; + + /// + /// rpt_grid control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.HtmlControls.HtmlGenericControl rpt_grid; + } +} diff --git a/Swift.web/Remit/Transaction/ApproveTxn/ApproveInwardRemitance.aspx b/Swift.web/Remit/Transaction/ApproveTxn/ApproveInwardRemitance.aspx new file mode 100644 index 0000000..9d3b7cc --- /dev/null +++ b/Swift.web/Remit/Transaction/ApproveTxn/ApproveInwardRemitance.aspx @@ -0,0 +1,304 @@ +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="ApproveInwardRemitance.aspx.cs" Inherits="Swift.web.Remit.Transaction.ApproveTxn.ApproveInwardRemitance" %> + +<%@ Register TagPrefix="uc1" TagName="SwiftTextBox" Src="~/Component/AutoComplete/SwiftTextBox.ascx" %> + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + +
+
+
+
+

+
    +
  1. +
    2. +
  2. Transaction
    3. +
  3. Approve Inward Transaction
    4. +
+
+
+
+ +
+
+
+
+
+ +
+

+ +

+
+ + +
+
+
+
+
+ +
+
+
+
+
+ + + +
+
+ + + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+
+ +
+ +
+
+
+
+
+ + +
+
+
+
+
+
+
+ +
+
+
+
+
+
+
+
+
+
+
+ + + + diff --git a/Swift.web/Remit/Transaction/ApproveTxn/ApproveInwardRemitance.aspx.cs b/Swift.web/Remit/Transaction/ApproveTxn/ApproveInwardRemitance.aspx.cs new file mode 100644 index 0000000..c8d1e7d --- /dev/null +++ b/Swift.web/Remit/Transaction/ApproveTxn/ApproveInwardRemitance.aspx.cs @@ -0,0 +1,409 @@ +using Swift.API.Common; +using Swift.DAL.Remittance.Transaction; +using Swift.web.Library; +using Swift.DAL.SwiftDAL; +using Swift.API.ThirdPartyApiServices; +using System; +using System.Data; +using System.Linq; +using System.Text; +using System.Web.Helpers; + +namespace Swift.web.Remit.Transaction.ApproveTxn +{ + public partial class ApproveInwardRemitance : System.Web.UI.Page + { + private ApproveInwardTransactionDao at = new ApproveInwardTransactionDao(); + private const string ViewFunctionId = "20122800"; + private const string ModifyFunctionId = "20122810"; + private const string ApproveSingleFunctionId = "20122820"; + private const string ApproveMultipleFunctionId = "20122830"; + private const string RejectFuntionId = "20122840"; + private readonly StaticDataDdl _sdd = new StaticDataDdl(); + private readonly RemittanceLibrary _sl = new RemittanceLibrary(); + protected void Page_Load(object sender, EventArgs e) + { + Authenticate(); + GetStatic.AttachConfirmMsg(ref btnApprove, "Are you sure to APPROVE this transaction?"); + GetStatic.AttachConfirmMsg(ref btnApproveAll, "Are you sure to APPROVE ALL this transaction?"); + + if (!IsPostBack) + { + antiForgery.InnerHtml = AntiForgery.GetHtml().ToString(); + LoadDdl(); + LoadSendingAgent(); + LoadApproveGrid(""); + MakeNumericTextBox(); + + // _sl.SetPayStatusDdl(ref status, "", "All"); + if (!string.IsNullOrEmpty(GetCountry())) + LoadApproveGrid(GetCountry()); + LoadHoldSummary(); + + } + GetStatic.ResizeFrame(Page); + + } + private void MakeNumericTextBox() + { + Misc.MakeNumericTextbox(ref amt); + } + private void Authenticate() + { + _sdd.CheckAuthentication(ViewFunctionId); + } + private string GetCountry() + { + return GetStatic.ReadQueryString("country", ""); + } + + private void LoadDdl() + { + // _sdd.SetDDL3(ref country, "EXEC proc_dropDownListsInboundApi @flag = 'a-countrySend'", "countryId", "countryName", "", "All"); + + _sdd.SetDDL(ref country, "EXEC proc_dropDownListsInboundApi @flag='a-countrySend'", "countryId", "countryName", "", "All"); + + var sql = "EXEC proc_dropDownLists @flag = 'a-countryPay'"; + _sdd.SetDDL(ref rCountry, sql, "countryName", "countryName", "", "Select"); + } + protected void country_SelectedIndexChanged(object sender, EventArgs e) + { + LoadSendingAgent(); + // Your event handling code here + } + + + + protected void agent_SelectedIndexChanged(object sender, EventArgs e) + { + // Your event handling code here + if (!string.IsNullOrEmpty(agent.Text)) + { + var sql = "EXEC proc_dropDownListsInboundApi @flag = 'branch', @agentId=" + _sdd.FilterString(agent.Text) + " , @user=" + _sdd.FilterString(GetStatic.GetUser()); + _sdd.SetDDL(ref branch, sql, "agentId", "agentName", "", "All"); + } + else + { + branch.Items.Clear(); + } + } + private void LoadSendingAgent() + { + if (!string.IsNullOrEmpty(country.Text)) + _sdd.SetDDL(ref agent, "EXEC proc_dropDownListsInboundApi @flag = 'agentSend',@param=" + _sdd.FilterString(country.Text) + "", "agentId", "agentName", "", "All"); + } + + private void LoadApproveGrid(string sCountry) + { + bool allowApprove = _sdd.HasRight(ApproveSingleFunctionId); + bool allowMultiple = false/* _sdd.HasRight(ApproveMultipleFunctionId)*/; + bool allowReject = _sdd.HasRight(RejectFuntionId); + bool allowModify = _sdd.HasRight(ModifyFunctionId); + + if (!string.IsNullOrEmpty(sCountry)) + { + if (sCountry.ToLower() == "All") + { + // Clear the selection and load data for all countries + country.ClearSelection(); + } + else + { + // Set the selected country + country.SelectedItem.Text = sCountry; + } + // LoadSendingAgent(); + } + + //if (country.SelectedItem.Text == "" || country.SelectedItem.Text == "Select") + //{ + // //country.SelectedItem.Text = country.SelectedItem.Text; + // country.SelectedItem.Text = "All"; + //} + var ds = at.GetHoldedTXNListAdmin(GetStatic.GetUser(), branch.Text, tranNo.Text, rCountry.Text, sender.Text, receiver.Text + , amt.Text, GetStatic.GetBranch(), GetStatic.GetUserType() + , "s-admin", txnDate.Text, user.Text, ControlNo.Text, ControlNo1.Text, "I", country.SelectedItem.Text, agent.Text, branch.Text); + + var dt = ds.Tables[0]; + var sb = new StringBuilder(); + var sbHead = new StringBuilder(); + var colspanCount = 0; + int cols = dt.Columns.Count; + int cnt = 0; + sbHead.Append(""); + if (dt.Rows.Count > 0) + { + sb.Append(""); + if (allowMultiple) + { + colspanCount++; + sb.Append(""); + } + sb.Append(""); + sb.Append(""); + sb.Append(""); + sb.Append(""); + //sb.Append(""); + sb.Append(""); + sb.Append(""); + sb.Append(""); + sb.Append(""); + sb.Append(""); + sb.Append(""); + sb.Append(""); + //sb.Append(""); + //sb.Append(""); + sb.Append(""); + sb.Append(""); + + if (allowApprove) + { + colspanCount++; + sb.Append(""); + sb.Append(""); + } + if (allowApprove) + { + colspanCount++; + sb.Append(""); + } + sb.Append(""); + + foreach (DataRow dr in dt.Rows) + { + cnt = cnt + 1; + sb.AppendLine(cnt % 2 == 1 + ? "" + : ""); + if (allowMultiple) + sb.Append(""); + + sb.Append(""); + sb.Append(""); + sb.Append(""); + sb.Append(""); + //sb.Append(""); + sb.Append(""); + sb.Append(""); + sb.Append(""); + sb.Append(""); + //sb.Append(""); + //sb.Append(""); + sb.Append(""); + sb.Append(""); + + //if (allowApprove) + // sb.Append(""); + + //if (allowApprove && dr["collMode"].ToString() == "Bank Deposit") + // sb.Append(""); + //else + // sb.Append(""); + + //if (allowModify) + // sb.Append(""); + if (allowApprove || allowReject) + { + sb.Append(""); + } + sb.Append(""); + } + + btnApproveAll.Visible = allowMultiple; + } + else + { + btnApproveAll.Visible = false; + } + + sbHead.Append(""); + sbHead.Append(""); + sbHead.Append(sb.ToString()); + sbHead.Append("
"); + if (dt.Rows.Count > 0) + sb.Append(""); + sb.Append("Tran IdPIN No.Partner IdSending BranchTxn ChannelCountrySenderReceiverPayout AmtColl AmtS ChargePayment MethodPayment OptionVoucher NoTran DateUser
" + dr["id"].ToString() + "" + dr["controlNo"].ToString() + "" + dr["controlNo2"].ToString() + "" + dr["BranchName"].ToString() + "" + dr["tranType"].ToString() + "" + dr["country"].ToString() + "" + dr["sender"].ToString() + "" + dr["receiver"].ToString() + ""); + sb.Append(GetStatic.FormatData(dr["pAmt"].ToString(), "M")); + sb.Append(""); + sb.Append(GetStatic.FormatData(dr["amt"].ToString(), "M")); + sb.Append(""); + sb.Append(GetStatic.FormatData(dr["serviceCharge"].ToString(), "M")); + //sb.Append(GetStatic.FormatData(dr["serviceCharge"].ToString(), "M")); + + sb.Append("" + dr["collMode"].ToString() + "" + dr["depositType"].ToString() + "" + dr["voucherNo"].ToString() + "" + GetStatic.FormatData(dr["txnDate"].ToString(), "D") + "" + dr["txncreatedBy"].ToString() + "View DetailsView Mapping Modify Transaction"); + //var tb = Misc.MakeNumericTextbox("amt_" + dr["id"].ToString(), "amt_" + dr["id"].ToString(), "", "style='width:60px ! important'", "CheckAmount(" + dr["id"].ToString() + ", " + dr["amt"].ToString() + ");"); + //sb.Append(tb); + + if (allowApprove) + sb.Append(" "); + if (allowReject) + sb.Append(" "); + + sb.Append("
"); + sbHead.Append("" + dt.Rows.Count.ToString() + " Transaction(s) found : Approve Transaction List
"); + rptGrid.InnerHtml = sbHead.ToString(); + approveList.Visible = true; + + selfTxn.Visible = false; + if (dt.Rows.Count == 0) + { + _sl.ManageInvalidControlNoAttempt(Page, GetStatic.GetUser(), "N"); + return; + } + GetStatic.ResizeFrame(Page); + } + + + protected void btnSearch_Click(object sender, EventArgs e) + { + LoadApproveGrid(""); + } + protected void btnApproveAll_Click(object sender, EventArgs e) + { + var dr = ApproveAllTxn(); + GetStatic.PrintMessage(Page, dr); + if (dr.ErrorCode.Equals("0")) + { + LoadApproveGrid(""); + LoadHoldSummary(); + } + + + } + + private DbResult ApproveAllTxn() + { + var idList1 = GetStatic.ReadFormData("rowId", ""); + + if (string.IsNullOrWhiteSpace(idList1)) + { + var dr = new DbResult(); + dr.SetError("1", "Please select one or more transaction approve", ""); + return dr; + } + return at.ApproveAllHoldedTXN(GetStatic.GetUser(), idList1); + } + + private void LoadHoldSummary() + { + var ds = at.GetHoldAdminTransactionSummary(GetStatic.GetUser(), GetStatic.GetBranch(), GetStatic.GetUserType()); + if (ds == null || ds.Tables.Count == 0) + return; + var dt = ds.Tables[0]; + var sbHead = new StringBuilder(); + int count = 0; + if (dt.Rows.Count > 0) + { + sbHead.Append(""); + sbHead.Append(""); + sbHead.Append(""); + sbHead.Append(""); + + sbHead.Append(""); + sbHead.Append(""); + sbHead.Append(""); + sbHead.Append(""); + sbHead.Append(""); + + foreach (DataRow dr in dt.Rows) + { + sbHead.Append(""); + sbHead.Append(""); + sbHead.Append(""); + sbHead.Append(""); + sbHead.Append(""); + count = count + int.Parse(dr["txnCount"].ToString()); + } + sbHead.Append(""); + sbHead.Append(""); + sbHead.Append(""); + sbHead.Append("
HOLD Transaction Summary
S.N.Sending CountryCount
" + dr["sn"] + "" + dr["country"] + "" + dr["txnCount"] + "
Total" + count.ToString() + "
"); + txnSummary.InnerHtml = sbHead.ToString(); + } + } + protected void btnApprove_Click(object sender, EventArgs e) + { + ApproveTxn(); + } + private void ApproveTxn() + { + AntiForgery.Validate(); + //ApproveTxnMain(); + DbResult _dbRes = at.GetTxnApproveDataIMEPay(GetStatic.GetUser(), hddTranNo.Value); + if (_dbRes.ErrorCode != "0") + { + GetStatic.PrintMessage(Page, _dbRes); + return; + } + //else if (_dbRes.Extra == "True")//is realtime + if (_dbRes.Extra2 == "True")//is realtime + { + SendTransactionServices _tpSend = new SendTransactionServices(); + string ProcessId = Guid.NewGuid().ToString().Replace("-", "") + ":" + _dbRes.Extra1 + ":releaseTxn"; + var result = _tpSend.ReleaseTransaction(new TFReleaseTxnRequest() + { + TfPin = _dbRes.Id, + TxnId = _dbRes.Extra, + RequestBy = GetStatic.GetUser(), + ProviderId = _dbRes.Extra1, + ProcessId = ProcessId.Substring(ProcessId.Length - 40, 40) + }); + _dbRes.ErrorCode = result.ResponseCode; + _dbRes.Msg = result.Msg; + _dbRes.Id = ""; + + if (_dbRes.ErrorCode != "0") + { + GetStatic.PrintMessage(Page, _dbRes); + return; + } + else + { + ApproveTxnMain(); + } + } + else + { + ApproveTxnMain(); + } + } + + protected void ApproveTxnMain() + { + DbResult dbResult = at.ApproveHoldedTXN(GetStatic.GetUser(), hddTranNo.Value); + if (dbResult.ErrorCode == "0") + { + LoadApproveGrid(""); + LoadHoldSummary(); + GetStatic.PrintMessage(Page, dbResult); + return; + } + else if (dbResult.ErrorCode == "11") + { + string url = "../NewReceiptIRH.aspx?printType=&controlNo=" + dbResult.Id; + Response.Redirect(url); + } + else + { + GetStatic.PrintMessage(Page, dbResult); + return; + } + } + + protected void btnReject_Click(object sender, EventArgs e) + { + RejectTxn(); + } + private void RejectTxn() + { + var dr = at.RejectHoldedTXN(GetStatic.GetUser(), hddTranNo.Value); + GetStatic.PrintMessage(Page, dr); + if (dr.ErrorCode.Equals("0")) + { + LoadApproveGrid(""); + LoadHoldSummary(); + } + } + + } +} \ No newline at end of file diff --git a/Swift.web/Remit/Transaction/ApproveTxn/ApproveInwardRemitance.aspx.designer.cs b/Swift.web/Remit/Transaction/ApproveTxn/ApproveInwardRemitance.aspx.designer.cs new file mode 100644 index 0000000..4ca8968 --- /dev/null +++ b/Swift.web/Remit/Transaction/ApproveTxn/ApproveInwardRemitance.aspx.designer.cs @@ -0,0 +1,260 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace Swift.web.Remit.Transaction.ApproveTxn +{ + + + public partial class ApproveInwardRemitance + { + + /// + /// Head1 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.HtmlControls.HtmlHead Head1; + + /// + /// Base2 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.HtmlControls.HtmlGenericControl Base2; + + /// + /// form1 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.HtmlControls.HtmlForm form1; + + /// + /// ScriptManager1 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.ScriptManager ScriptManager1; + + /// + /// country control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.DropDownList country; + + /// + /// agent control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.DropDownList agent; + + /// + /// branch control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.DropDownList branch; + + /// + /// tranNo control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.TextBox tranNo; + + /// + /// ControlNo control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.TextBox ControlNo; + + /// + /// ControlNo1 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.TextBox ControlNo1; + + /// + /// rCountry control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.DropDownList rCountry; + + /// + /// sender control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.TextBox sender; + + /// + /// receiver control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.TextBox receiver; + + /// + /// amt control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.TextBox amt; + + /// + /// txnDate control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.TextBox txnDate; + + /// + /// user control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::Swift.web.Component.AutoComplete.SwiftTextBox user; + + /// + /// btnSearch control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Button btnSearch; + + /// + /// antiForgery control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.HtmlControls.HtmlGenericControl antiForgery; + + /// + /// approveList control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.HtmlControls.HtmlGenericControl approveList; + + /// + /// rptGrid control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.HtmlControls.HtmlGenericControl rptGrid; + + /// + /// btnApproveAll control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Button btnApproveAll; + + /// + /// selfTxn control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.HtmlControls.HtmlGenericControl selfTxn; + + /// + /// btnApprove control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Button btnApprove; + + /// + /// btnReject control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Button btnReject; + + /// + /// hddTranNo control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.HiddenField hddTranNo; + + /// + /// hdntabType control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.HiddenField hdntabType; + + /// + /// txnSummary control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.HtmlControls.HtmlGenericControl txnSummary; + } +} diff --git a/Swift.web/Remit/Transaction/PromotionalCampaign/Manage.aspx b/Swift.web/Remit/Transaction/PromotionalCampaign/Manage.aspx index 92c2185..187b44a 100644 --- a/Swift.web/Remit/Transaction/PromotionalCampaign/Manage.aspx +++ b/Swift.web/Remit/Transaction/PromotionalCampaign/Manage.aspx @@ -22,7 +22,7 @@ $(document).ready(function () { //CalTillToday("#grid_list_fromDate"); //CalTillToday("#grid_list_toDate"); - ShowCalFromToUpToToday("#startDate", "#endDate"); + ShowCalendar("#startDate", "#endDate"); $('#startDate').mask('0000-00-00'); $('#endDate').mask('0000-00-00'); }); diff --git a/Swift.web/Remit/Transaction/Reports/TransactionNew/Mange.aspx b/Swift.web/Remit/Transaction/Reports/TransactionNew/Mange.aspx index 1147e18..b175ff3 100644 --- a/Swift.web/Remit/Transaction/Reports/TransactionNew/Mange.aspx +++ b/Swift.web/Remit/Transaction/Reports/TransactionNew/Mange.aspx @@ -40,8 +40,14 @@ country = GetElement("<% = ddlPCountry.ClientID%>").options[GetElement("<% = ddlPCountry.ClientID%>").selectedIndex].text; } var agent = GetValue("<% =payoutPartner.ClientID %>"); + //var sCountry = GetValue("<% =ddlSCountry.ClientID %>"); + var sCountry = ""; + sCountry = GetValue("<% =ddlSCountry.ClientID %>"); + if (sCountry != "") { + sCountry = GetElement("<% = ddlSCountry.ClientID%>").options[GetElement("<% = ddlSCountry.ClientID%>").selectedIndex].text; + } var depositType = GetValue("<% =depositType.ClientID %>"); - + var remitTYpe = GetValue("<% =remitTYpe.ClientID %>"); var orderBy = GetValue("<% =orderBy.ClientID %>"); var status = GetValue("<% =status.ClientID %>"); var paymentType = GetValue("<% =paymentType.ClientID %>"); @@ -66,8 +72,9 @@ //var url = "../../../../AgentNew/Reports/Reports.aspx?reportName=txnReport&pCountry=" + country + //var url = "../Reports.aspx?reportName=40111600&pCountry=" + country + "&pAgent=" + agent + - //"&sBranch=" + sBranch + + "&sCountry=" + sCountry + "&depositType=" + depositType + + "&remitTYpe=" + remitTYpe + "&searchBy=" + searchBy + "&searchByValue=" + searchByValue + "&orderBy=" + orderBy + @@ -175,6 +182,23 @@
+
+
+ +
+
+ + +
+
+ +
+
+ + All + Out ward + In Ward +
diff --git a/Swift.web/Remit/Transaction/Reports/TransactionNew/Mange.aspx.cs b/Swift.web/Remit/Transaction/Reports/TransactionNew/Mange.aspx.cs index c67406e..bd33d38 100644 --- a/Swift.web/Remit/Transaction/Reports/TransactionNew/Mange.aspx.cs +++ b/Swift.web/Remit/Transaction/Reports/TransactionNew/Mange.aspx.cs @@ -80,8 +80,10 @@ namespace Swift.web.Remit.Transaction.Reports.TransactionNew private void PopulateDll() { sdd.SetDDL3(ref payoutPartner, "EXEC proc_dropDownLists @flag='partner-list'", "agentId", "agentName", "", "All"); + //sdd.SetDDL3(ref sendingPartner, "EXEC proc_dropDownLists @flag='tranType'", "id", "srouteId", "", "All"); sl.SetDDL(ref depositType, "EXEC proc_online_dropDownList @flag='paymentMode',@user='" + GetStatic.GetUser() + "'", "detailTitle", "detailTitle", "", "All"); sl.SetDDL(ref ddlPCountry, "EXEC proc_dropDownLists @flag='pCountry'", "countryId", "countryName", "", "All"); + sl.SetDDL(ref ddlSCountry, "EXEC proc_dropDownLists @flag='sCountry'", "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"); diff --git a/Swift.web/Remit/Transaction/Reports/TransactionNew/Mange.aspx.designer.cs b/Swift.web/Remit/Transaction/Reports/TransactionNew/Mange.aspx.designer.cs index 2de99a0..0a4e63b 100644 --- a/Swift.web/Remit/Transaction/Reports/TransactionNew/Mange.aspx.designer.cs +++ b/Swift.web/Remit/Transaction/Reports/TransactionNew/Mange.aspx.designer.cs @@ -86,6 +86,24 @@ namespace Swift.web.Remit.Transaction.Reports.TransactionNew /// protected global::System.Web.UI.WebControls.DropDownList ddlPCountry; + /// + /// ddlSCountry control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.DropDownList ddlSCountry; + + /// + /// remitTYpe control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.DropDownList remitTYpe; + /// /// payoutPartner control. /// diff --git a/Swift.web/Remit/Transaction/Reports/TransactionNew/TranReport.aspx b/Swift.web/Remit/Transaction/Reports/TransactionNew/TranReport.aspx index 58e236c..fd5b9ee 100644 --- a/Swift.web/Remit/Transaction/Reports/TransactionNew/TranReport.aspx +++ b/Swift.web/Remit/Transaction/Reports/TransactionNew/TranReport.aspx @@ -47,6 +47,21 @@ padding-left: 26px; padding-top: 10px; } + table { + border-collapse: collapse; + width: 100%; + } + #repTable #fixedTH th { + background-color: white; + color: black; + position: sticky; + z-index: 100; + top: 0; + border: 1px solid black; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + } <% if (GetStatic.ReadQueryString("mode", "") == "") diff --git a/Swift.web/Remit/Transaction/Reports/TransactionNew/TranReport.aspx.cs b/Swift.web/Remit/Transaction/Reports/TransactionNew/TranReport.aspx.cs index 93d39ff..434b1c1 100644 --- a/Swift.web/Remit/Transaction/Reports/TransactionNew/TranReport.aspx.cs +++ b/Swift.web/Remit/Transaction/Reports/TransactionNew/TranReport.aspx.cs @@ -40,8 +40,9 @@ namespace Swift.web.Remit.Transaction.Reports.TransactionNew string pageNumber = GetStatic.ReadQueryString("pageNumber", "1"); var country = GetStatic.ReadQueryString("pCountry", ""); var pAgent = GetStatic.ReadQueryString("pAgent", ""); - //var flag = GetStatic.ReadQueryString("flag", ""); + var sCountry = GetStatic.ReadQueryString("sCountry", ""); var depositType = GetStatic.ReadQueryString("depositType", ""); + var remitTYpe = GetStatic.ReadQueryString("remitTYpe", ""); var searchBy = GetStatic.ReadQueryString("searchBy", ""); var searchByValue = GetStatic.ReadQueryString("searchByValue", ""); var orderBy = GetStatic.ReadQueryString("orderBy", ""); @@ -57,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; @@ -113,8 +114,9 @@ namespace Swift.web.Remit.Transaction.Reports.TransactionNew StringBuilder strTable = new StringBuilder(); strTable.Append("

Payout Partner: " + payoutPartner + "

"); - strTable.Append(""); + strTable.Append("
"); + strTable.Append(""); strTable.Append(""); strTable.Append(""); @@ -123,6 +125,7 @@ namespace Swift.web.Remit.Transaction.Reports.TransactionNew strTable.Append(""); } strTable.Append(""); + strTable.Append(""); int sn = 1; diff --git a/Swift.web/Remit/UserControl/UcTransaction.ascx b/Swift.web/Remit/UserControl/UcTransaction.ascx index f6f9c4c..dc12bdc 100644 --- a/Swift.web/Remit/UserControl/UcTransaction.ascx +++ b/Swift.web/Remit/UserControl/UcTransaction.ascx @@ -387,6 +387,22 @@
SN
" + col.ColumnName + "
+ + + + + + + + + + +
Verified By: + +
Verified Date: + +
+ @@ -867,6 +883,18 @@ + + + + + + + +
Posted Date: + +
Release Date: + +
diff --git a/Swift.web/Remit/UserControl/UcTransaction.ascx.cs b/Swift.web/Remit/UserControl/UcTransaction.ascx.cs index 6e2d72c..affb70b 100644 --- a/Swift.web/Remit/UserControl/UcTransaction.ascx.cs +++ b/Swift.web/Remit/UserControl/UcTransaction.ascx.cs @@ -348,6 +348,8 @@ namespace Swift.web.Remit.UserControl accountNo.Text = tRow["accountNo"].ToString(); bankName.Text = tRow["BankName"].ToString(); branchName.Text = tRow["BranchName"].ToString(); + postDate.Text = tRow["postDate"].ToString(); + releaseDate.Text = tRow["releaseDate"].ToString(); pBranchName.Text = tRow["pBranchName"].ToString(); } } @@ -442,12 +444,15 @@ namespace Swift.web.Remit.UserControl createdFrom.Text = tRow["createdFrom"].ToString(); hddPayTokenId.Value = tRow["payTokenId"].ToString(); introducer.Text = tRow["introducer"].ToString(); + verifiedBy.Text = tRow["verifiedBy"].ToString(); + verifiedDate.Text = tRow["verifiedDate"].ToString(); tblCreatedLog.Visible = createdBy.Text != ""; tblApprovedLog.Visible = approvedBy.Text != ""; tblPaidLog.Visible = paidBy.Text != ""; tblCancelRequestedLog.Visible = cancelRequestedBy.Text != ""; tblCancelApprovedLog.Visible = cancelApprovedBy.Text != ""; + tblVerifiedLog.Visible = verifiedBy.Text != ""; trNameAsPerBank.Visible = false; if (!string.IsNullOrEmpty(tRow["receiverNameAlt"].ToString())) diff --git a/Swift.web/Remit/UserControl/UcTransaction.ascx.designer.cs b/Swift.web/Remit/UserControl/UcTransaction.ascx.designer.cs index 2426a73..24faa0e 100644 --- a/Swift.web/Remit/UserControl/UcTransaction.ascx.designer.cs +++ b/Swift.web/Remit/UserControl/UcTransaction.ascx.designer.cs @@ -221,6 +221,33 @@ namespace Swift.web.Remit.UserControl /// protected global::System.Web.UI.WebControls.Label cancelApprovedDate; + /// + /// tblVerifiedLog control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.HtmlControls.HtmlTable tblVerifiedLog; + + /// + /// verifiedBy control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Label verifiedBy; + + /// + /// verifiedDate control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Label verifiedDate; + /// /// tblCreatedFrom control. /// @@ -896,6 +923,42 @@ namespace Swift.web.Remit.UserControl /// protected global::System.Web.UI.WebControls.Label branchName; + /// + /// trPostdate control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.HtmlControls.HtmlTableRow trPostdate; + + /// + /// postDate control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Label postDate; + + /// + /// trReleaseDate control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.HtmlControls.HtmlTableRow trReleaseDate; + + /// + /// releaseDate control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Label releaseDate; + /// /// voucherDetailDiv control. /// diff --git a/Swift.web/Swift.web.csproj b/Swift.web/Swift.web.csproj index 1d6a01a..3189343 100644 --- a/Swift.web/Swift.web.csproj +++ b/Swift.web/Swift.web.csproj @@ -1383,11 +1383,15 @@ + + + + @@ -8108,6 +8112,20 @@ Manage.aspx + + InboundLog.aspx + ASPXCodeBehind + + + InboundLog.aspx + + + InboundLogList.aspx + ASPXCodeBehind + + + InboundLogList.aspx + List.aspx ASPXCodeBehind @@ -8122,6 +8140,13 @@ Manage.aspx + + MobileApiLogList.aspx + ASPXCodeBehind + + + MobileApiLogList.aspx + Manage.aspx ASPXCodeBehind @@ -8276,6 +8301,13 @@ SendV2.aspx + + ApproveInwardRemitance.aspx + ASPXCodeBehind + + + ApproveInwardRemitance.aspx + holdOnlineTxnList.aspx ASPXCodeBehind diff --git a/Swift.web/js/swift_calendar.js b/Swift.web/js/swift_calendar.js index 478de0c..a7a4f24 100644 --- a/Swift.web/js/swift_calendar.js +++ b/Swift.web/js/swift_calendar.js @@ -367,6 +367,56 @@ function ShowCalFromToUpToToday(calFrom, calTo, nom) { }); } +function ShowCalendar(calFrom, calTo, nom) { + if (nom === null || nom === "" || nom === undefined) nom = 1; + $(function () { + if (calFrom !== undefined && calFrom.length > 0) { + $(calFrom).datepicker({ + //defaultDate: "+1w", + changeMonth: true, + changeYear: true, + numberOfMonths: 1, + showOn: "both", + dateFormat: dateFormatType, + //buttonImage: imgPath, + // buttonImageOnly: true, + maxDate: "+0", + //minDate: "-2Y", + //onSelect: function (selectedDate) { + // alert('aaa'); + // $(calTo).datepicker("option", "minDate", selectedDate); + //} + }); + //var fromDateIdNameOnly = calFrom.split('#')[1]; + //document.getElementById(fromDateIdNameOnly).setAttribute("onchange", "return DateValidation('" + fromDateIdNameOnly + "','t')"); + } + if (calTo !== undefined && calTo.length > 0) { + $(calTo).datepicker({ + //defaultDate: "+1w", + changeMonth: true, + changeYear: true, + numberOfMonths: nom, + showOn: "both", + //buttonImage: imgPath, + //buttonImageOnly: true, + dateFormat: dateFormatType, + maxDate: "+10Y", + //minDate: "-2Y", + //onSelect: function (selectedDate) { + // alert('dasd'); + // $(calFrom).datepicker("option", "maxDate", selectedDate); + //} + }); + //var toDateIdNameOnly = calFrom.split('#')[1]; + //if (calTo !== undefined && calTo.length > 0) { + // document.getElementById(toDateIdNameOnly).removeAttribute("onchange"); + // toDateIdNameOnly = calTo.split("#")[1]; + // document.getElementById(toDateIdNameOnly).setAttribute("onchange", "return DateValidation('" + toDateIdNameOnly + "','t','" + toDateIdNameOnly + "')"); + // document.getElementById(toDateIdNameOnly).setAttribute("onchange", "return DateValidation('" + toDateIdNameOnly + "','t','" + toDateIdNameOnly + "')"); + //} + } + }); +} function ShowCalFromToUpToTodayForInput(calFrom, calTo, nom) { if (nom === null || nom === "" || nom === undefined) nom = 1; $(function () { @@ -393,6 +443,7 @@ function ShowCalFromToUpToTodayForInput(calFrom, calTo, nom) { //// Input Date Validation function DateValidation(id, typeVal, compareId, compareTypeVal) { + debugger var firstDate = ''; var firstId = id; var inputDate = document.getElementById(id).value; diff --git a/Swift.web/ui/css/style.css b/Swift.web/ui/css/style.css index 422d1f1..a5c6923 100644 --- a/Swift.web/ui/css/style.css +++ b/Swift.web/ui/css/style.css @@ -639,7 +639,6 @@ p { .nav-tabs > li > a { display: block; font-size: 11px; - font: Verdana; text-decoration: none; line-height: 1.3em; padding: 10px 15px; @@ -649,6 +648,8 @@ p { border-bottom: 1px solid #bbbbbb; background-color: #444d58; font-weight: bold; + top: 6px; + left: 1px; } .nav-tabs > li > a:focus, .nav > li > a:hover { From 05fe0cb3dc1b3f53ebbef8b89484977299346977 Mon Sep 17 00:00:00 2001 From: Shakun Shrestha Date: Mon, 24 Jun 2024 22:29:08 +0545 Subject: [PATCH 2/6] Feature #31064: Validate age in mobile api (not less than 18) Actions Task #31930: Referal Code Validation Actions Task #32544: Email Template changes Feature #30199: Regarding Freezing Header in TXN Report Actions Feature #30239: Add ID Status ( Expire or Active ) in Cust Reg Report Actions Feature #30994: Add num of receiver filter in Customer Registration Report Actions Feature #32024: Promotional Rate Display in Landing Page Actions Story #27925: Inbound Api for Ime London Actions Task #31894: Add Verify Information in TXN Deatils Actions Task #31896: Mobile API Log --- Swift.DAL/OnlineAgent/OnlineCustomerDao.cs | 8 ++ Swift.web/DashboardV2/Dashboard2.aspx | 95 +++++++++++++++---- .../Operation/EditCustomerForApproval.aspx | 5 +- .../Reports/CustomerRegistrationStatus.aspx | 1 + .../CustomerRegistrationStatus.aspx.cs | 16 ++++ ...ustomerRegistrationStatus.aspx.designer.cs | 1 + .../CustomerRegistration/Manage.aspx.cs | 2 +- .../InboundApiLog/InboundLog.aspx.cs | 2 +- .../InboundApiLog/InboundLogList.aspx.cs | 2 +- .../MobileApiLog/MobileApiLogList.aspx.cs | 2 +- .../ApproveTxn/ApproveInwardRemitance.aspx.cs | 11 +-- .../Reports/TransactionNew/TranReport.aspx.cs | 6 +- 12 files changed, 119 insertions(+), 32 deletions(-) diff --git a/Swift.DAL/OnlineAgent/OnlineCustomerDao.cs b/Swift.DAL/OnlineAgent/OnlineCustomerDao.cs index 2e1ef4c..8519adc 100644 --- a/Swift.DAL/OnlineAgent/OnlineCustomerDao.cs +++ b/Swift.DAL/OnlineAgent/OnlineCustomerDao.cs @@ -1553,5 +1553,13 @@ namespace Swift.DAL.OnlineAgent return ParseDbResult(sql); } + public DbResult MoveCustomer(string email, string user) + { + string sql = "Exec proc_online_core_customerSetup"; + sql += " @flag ='moveCustomer'"; + sql += ", @user=" + FilterString(user); + sql += ", @email=" + FilterString(email); + return ParseDbResult(ExecuteDataset(sql).Tables[0]); + } } } \ No newline at end of file diff --git a/Swift.web/DashboardV2/Dashboard2.aspx b/Swift.web/DashboardV2/Dashboard2.aspx index b02e84c..e73b0a2 100644 --- a/Swift.web/DashboardV2/Dashboard2.aspx +++ b/Swift.web/DashboardV2/Dashboard2.aspx @@ -63,9 +63,11 @@ z-index: 9999; background: url("../Images/loading_icon.gif") center no-repeat #fff; } - .footer-text{ + + .footer-text { color: white; } + .auto-style1 { flex: 0 0 auto; width: 100%; @@ -231,7 +233,7 @@ -
+
@@ -261,7 +263,7 @@ -
+
Today @@ -458,7 +460,7 @@
- <%-- + <%--
@@ -479,6 +481,7 @@
+
@@ -488,6 +491,7 @@
+ Refresh @@ -495,6 +499,7 @@
Customer KYC Status
+
@@ -511,6 +516,7 @@
+
@@ -526,6 +532,7 @@
+
@@ -541,21 +548,78 @@
+ -
-
-
-
-

KYC Completed

-

0

- <%--
+ <%--
+
+ +
+
Partner Wise Settlement Rate
+
+
+
+
+ + + + + + + + + + + + + + + +
S.No.PartnerEx RatePayerPayment Modes
No data to display
+
+
+
--%> +
+
+
+
+
+
+ +
+ + + Refresh +
- +
+ +
Partner Wise Settlement Rate
+
+ +
+ + + + + + + + + + + + + + + +
S.No.PartnerEx RatePayerPayment Modes
No data to display
@@ -587,7 +651,6 @@
--%> -
@@ -600,9 +663,9 @@
- IME London is a trading name of Subhida UK Ltd, Pentax House, South Hill Avenue, South Harrow, London, HA2 0DU, Company Registration No: 06432399
- Subhida UK Ltd is authorized and regulated by the Financial Conduct Authority (FCA) under the Payment Service Regulations 2017, FCA Registration No: 576127, HMRC Registration No: XYML000000119350
- © IME London, 2023 + IME London is a trading name of Subhida UK Ltd, Pentax House, South Hill Avenue, South Harrow, London, HA2 0DU, Company Registration No: 06432399
+ Subhida UK Ltd is authorized and regulated by the Financial Conduct Authority (FCA) under the Payment Service Regulations 2017, FCA Registration No: 576127, HMRC Registration No: XYML000000119350
+ © IME London, 2023
diff --git a/Swift.web/MobileRemit/Admin/Operation/EditCustomerForApproval.aspx b/Swift.web/MobileRemit/Admin/Operation/EditCustomerForApproval.aspx index d724458..9296ade 100644 --- a/Swift.web/MobileRemit/Admin/Operation/EditCustomerForApproval.aspx +++ b/Swift.web/MobileRemit/Admin/Operation/EditCustomerForApproval.aspx @@ -59,7 +59,6 @@ .lowercase { text-transform: none !important; } - } + + + + + + + + + + + + + + + + + + + +