diff --git a/Swift.web/Remit/Transaction/Reports/TransactionNew/TranReport.aspx b/Swift.web/Remit/Transaction/Reports/TransactionNew/TranReport.aspx index 2b7d2d7..aeb7d43 100644 --- a/Swift.web/Remit/Transaction/Reports/TransactionNew/TranReport.aspx +++ b/Swift.web/Remit/Transaction/Reports/TransactionNew/TranReport.aspx @@ -37,6 +37,16 @@ background-color: red; } + .paystatus-ofac { + color: white; + background-color: darkred; + } + + .paystatus-compliance { + color: black; + background-color: darkred; + } + .exportImg { padding-left: 26px; padding-top: 10px; @@ -78,7 +88,7 @@
- Export to Excel');" src="../../../../Images/excel.gif" border="0" /> + Export to Excel');" src="../../../../Images/excel.gif" border="0" />
diff --git a/Swift.web/Remit/Transaction/Reports/TransactionNew/TranReport.aspx.cs b/Swift.web/Remit/Transaction/Reports/TransactionNew/TranReport.aspx.cs index f2e718f..62988d7 100644 --- a/Swift.web/Remit/Transaction/Reports/TransactionNew/TranReport.aspx.cs +++ b/Swift.web/Remit/Transaction/Reports/TransactionNew/TranReport.aspx.cs @@ -114,16 +114,47 @@ namespace Swift.web.Remit.Transaction.Reports.TransactionNew foreach (DataRow row in partnerTable.Rows) { - string payStatusClass = GetPayStatus(row["PAYSTATUS"].ToString()); - strTable.Append(""); + string payStatus = row["PAYSTATUS"].ToString(); + string tranStatus = row["TRANSTATUS"].ToString(); - strTable.Append("" + sn + ""); - - foreach (var item in row.ItemArray) + if (payStatus.ToLower().Equals("unpaid")) + { + string payStatusClass = ""; + + if (tranStatus.ToLower().Equals("ofac hold") || + tranStatus.ToLower().Equals("compliance hold") || + tranStatus.ToLower().Equals("compliance/ofac")) + { + payStatusClass = GetPayStatus(tranStatus); + } + else + { + payStatusClass = GetPayStatus(payStatus); + } + + strTable.Append(""); + strTable.Append("" + sn + ""); + + foreach (var item in row.ItemArray) + { + strTable.Append("" + item.ToString() + ""); + } + + strTable.Append(""); + } + else { - strTable.Append("" + item.ToString() + ""); + string payStatusClass = GetPayStatus(payStatus); + strTable.Append(""); + strTable.Append("" + sn + ""); + + foreach (var item in row.ItemArray) + { + strTable.Append("" + item.ToString() + ""); + } + + strTable.Append(""); } - strTable.Append(""); sn++; } @@ -170,6 +201,10 @@ namespace Swift.web.Remit.Transaction.Reports.TransactionNew // return "paystatus-Post"; case "cancel": return "paystatus-Cancel"; + case "ofac hold": + return "paystatus-ofac"; + case "compliance hold": + return "paystatus-compliance"; default: return ""; }