IME-LONDON
/
WEB_CORE
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

#19331 changes for transaction report

Ime-london-webcore
Leeza Baidar 12 months ago
parent
a0093b3b23
commit
5162a79fa6
6 changed files with 56 additions and 10 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 17
      Swift.web/AgentNew/Reports/TransactionReport/Manage.aspx
  2. 6
      Swift.web/AgentNew/Reports/TransactionReport/Manage.aspx.cs
  3. 9
      Swift.web/AgentNew/Reports/TransactionReport/Manage.aspx.designer.cs
  4. 17
      Swift.web/Remit/Transaction/Reports/TransactionNew/Mange.aspx
  5. 8
      Swift.web/Remit/Transaction/Reports/TransactionNew/Mange.aspx.cs
  6. 9
      Swift.web/Remit/Transaction/Reports/TransactionNew/Mange.aspx.designer.cs

17
Swift.web/AgentNew/Reports/TransactionReport/Manage.aspx
View File

@ -22,7 +22,7 @@
country = GetElement("<% = pCountry.ClientID%>").options[GetElement("<% = pCountry.ClientID%>").selectedIndex].text;
}
var agent = GetValue("<% =pAgent.ClientID %>");
var sBranch = GetValue("<% =Sbranch.ClientID %>");
<%--var sBranch = GetValue("<% =Sbranch.ClientID %>");--%>
<%-- var depositType = GetValue("<% =depositType.ClientID %>");--%>
<%-- var depositType = GetValue("<%4 =depositType.ClientID %>");--%>
var depositType = "";
@ -50,7 +50,7 @@
var url = "../Reports.aspx?reportName=txnReport&pCountry=" + country +
//var url = "../Reports.aspx?reportName=40111600&pCountry=" + country +
"&pAgent=" + agent +
"&sBranch=" + sBranch +
//"&sBranch=" + sBranch +
"&depositType=" + depositType +
"&searchBy=" + searchBy +
"&searchByValue=" + searchByValue +
@ -112,14 +112,14 @@
<asp:ListItem Value="">All</asp:ListItem>
</asp:DropDownList>
</div>
<div class="col-md-3 form-group">
<div class="col-md-3 form-group" style="display: none;">
<label>Branch Name:</label>
</div>
<div class="col-md-9 form-group">
<div class="col-md-9 form-group" style="display: none;">
<asp:DropDownList ID="Sbranch" runat="server" CssClass="form-control">
</asp:DropDownList>
</div>
<div class="col-md-3 form-group">
<div class="col-md-3 form-group" >
<label>Search By:</label>
</div>
<div class="col-md-4 form-group">
@ -170,6 +170,13 @@
<asp:DropDownList runat="server" ID="paymentType" CssClass="form-control">
</asp:DropDownList>
</div>
<div class="col-md-3 form-group">
<label>Payment Option:</label>
</div>
<div class="col-md-9 form-group">
<asp:DropDownList runat="server" ID="depositType" CssClass="form-control">
</asp:DropDownList>
</div>
<div class="col-md-3 form-group">
<label>Transaction From :</label>
</div>

6
Swift.web/AgentNew/Reports/TransactionReport/Manage.aspx.cs
View File

@ -21,6 +21,7 @@ namespace Swift.web.AgentNew.Reports.TransactionReport
{
PopulateBenificiary();
PopulatePaymentType();
PopulatePaymentOption();
sl.SetPayStatusDdl(ref status, "", "All");
PopulateTranStatus();
frmDate.Text = DateTime.Now.ToString("yyyy-MM-dd");
@ -76,6 +77,11 @@ namespace Swift.web.AgentNew.Reports.TransactionReport
sl.SetDDL(ref paymentType, sql, "serviceTypeId", "typeTitle", "", "All");
}
private void PopulatePaymentOption()
{
sl.SetDDL(ref depositType, "EXEC proc_online_dropDownList @flag='paymentMode',@user='" + GetStatic.GetUser() + "'", "detailDesc", "detailTitle", "", "All");
}
protected void status_SelectedIndexChanged(object sender, EventArgs e)
{
PopulateTranStatus();

9
Swift.web/AgentNew/Reports/TransactionReport/Manage.aspx.designer.cs
View File

@ -95,6 +95,15 @@ namespace Swift.web.AgentNew.Reports.TransactionReport
/// </remarks>
protected global::System.Web.UI.WebControls.DropDownList paymentType;
/// <summary>
/// depositType control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.DropDownList depositType;
/// <summary>
/// tFrom control.
/// </summary>

17
Swift.web/Remit/Transaction/Reports/TransactionNew/Mange.aspx
View File

@ -39,10 +39,10 @@
country = GetElement("<% = pCountry.ClientID%>").options[GetElement("<% = pCountry.ClientID%>").selectedIndex].text;
}
var agent = GetValue("<% =pAgent.ClientID %>");
var sBranch = GetValue("<% =Sbranch.ClientID %>").split('|')[0];
<%--var sBranch = GetValue("<% =Sbranch.ClientID %>").split('|')[0];--%>
<%-- var depositType = GetValue("<% =depositType.ClientID %>");--%>
<%-- var depositType = GetValue("<%4 =depositType.ClientID %>");--%>
var depositType = "";
var depositType = GetValue("<% =depositType.ClientID %>");
var orderBy = GetValue("<% =orderBy.ClientID %>");
var status = GetValue("<% =status.ClientID %>");
@ -65,7 +65,7 @@
var url = "../../../../AgentNew/Reports/Reports.aspx?reportName=txnReport&pCountry=" + country +
//var url = "../Reports.aspx?reportName=40111600&pCountry=" + country +
"&pAgent=" + agent +
"&sBranch=" + sBranch +
//"&sBranch=" + sBranch +
"&depositType=" + depositType +
"&searchBy=" + searchBy +
"&searchByValue=" + searchByValue +
@ -129,10 +129,10 @@
<asp:ListItem Value="">All</asp:ListItem>
</asp:DropDownList>
</div>
<div class="col-md-3 form-group">
<div class="col-md-3 form-group" style="display: none;">
<label>Branch Name:</label>
</div>
<div class="col-md-9 form-group">
<div class="col-md-9 form-group" style="display: none;">
<asp:DropDownList ID="Sbranch" runat="server" CssClass="form-control">
</asp:DropDownList>
</div>
@ -186,6 +186,13 @@
<div class="col-md-9 form-group">
<asp:DropDownList runat="server" ID="paymentType" CssClass="form-control">
</asp:DropDownList>
</div>
<div class="col-md-3 form-group">
<label>Payment Option:</label>
</div>
<div class="col-md-9 form-group">
<asp:DropDownList runat="server" ID="depositType" CssClass="form-control">
</asp:DropDownList>
</div>
<div class="col-md-3 form-group">
<label>Transaction From :</label>

8
Swift.web/Remit/Transaction/Reports/TransactionNew/Mange.aspx.cs
View File

@ -26,6 +26,7 @@ namespace Swift.web.Remit.Transaction.Reports.TransactionNew
{
PopulateBenificiary();
PopulatePaymentType();
PopulatePaymentOption();
sl.SetPayStatusDdl(ref status, "", "All");
PopulateTranStatus();
frmDate.Text = DateTime.Now.ToString("yyyy-MM-dd");
@ -62,6 +63,7 @@ namespace Swift.web.Remit.Transaction.Reports.TransactionNew
{
var label = "";
if (status.Text.ToLower().Equals("unpaid") || string.IsNullOrWhiteSpace(status.Text))
if (status.Text.ToLower().Equals("unpaid") || string.IsNullOrWhiteSpace(status.Text))
{
label = "All";
@ -81,6 +83,12 @@ namespace Swift.web.Remit.Transaction.Reports.TransactionNew
sl.SetDDL(ref paymentType, sql, "serviceTypeId", "typeTitle", "", "All");
}
private void PopulatePaymentOption()
{
sl.SetDDL(ref depositType, "EXEC proc_online_dropDownList @flag='paymentMode',@user='" + GetStatic.GetUser() + "'", "detailDesc", "detailTitle", "", "All");
}
protected void status_SelectedIndexChanged(object sender, EventArgs e)
{
PopulateTranStatus();

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

@ -104,6 +104,15 @@ namespace Swift.web.Remit.Transaction.Reports.TransactionNew
/// </remarks>
protected global::System.Web.UI.WebControls.DropDownList paymentType;
/// <summary>
/// depositType control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.DropDownList depositType;
/// <summary>
/// tFrom control.
/// </summary>

Write Preview
Loading…
Cancel
Save