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

modify bank

Prod
shakun 10 months ago
parent
0e3e1a5401
commit
53af4028eb
16 changed files with 118 additions and 33 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. 2
      Swift.DAL/Remittance/RemittanceDao.cs
  2. 3
      Swift.DAL/Remittance/Transaction/ModifyTransactionDao.cs
  3. 4
      Swift.web/AgentPanel/ResetPassword/ResetPassword.aspx.cs
  4. 2
      Swift.web/Css/receipt.css
  5. 6
      Swift.web/DashboardV2/Dashboard2.aspx.cs
  6. 2
      Swift.web/Library/GetStatic.cs
  7. 2
      Swift.web/Library/PasswordGenerator.cs
  8. 2
      Swift.web/MobileRemit/Admin/Operation/VerifyMobileCustomer.aspx.cs
  9. 2
      Swift.web/Remit/Transaction/Agent/Modify/Modify.aspx.cs
  10. 2
      Swift.web/Remit/Transaction/Modify/ModifyLocation.aspx.cs
  11. 14
      Swift.web/Remit/Transaction/Modify/ModifyTran.aspx
  12. 2
      Swift.web/Remit/Transaction/ModifyPayoutLocation/Modify.aspx.cs
  13. 10
      Swift.web/Remit/Transaction/Reports/TransactionNew/TranReport.aspx
  14. 71
      Swift.web/Remit/Transaction/Reports/TransactionNew/TranReport.aspx.cs
  15. 6
      Swift.web/Remit/Transaction/ReprintVoucher/SendIntlReceipt.aspx.cs
  16. 21
      Swift.web/Remit/UserControl/UcTransaction.ascx.cs

2
Swift.DAL/Remittance/RemittanceDao.cs
View File

@ -51,7 +51,7 @@ namespace Swift.DAL.SwiftDAL
{
OpenConnection();
da = new SqlDataAdapter(sql, _connection);
da.SelectCommand.CommandTimeout = 230;
da.SelectCommand.CommandTimeout = GetCommandTimeOut();
da.Fill(ds);
da.Dispose();

3
Swift.DAL/Remittance/Transaction/ModifyTransactionDao.cs
View File

@ -180,7 +180,7 @@ namespace Swift.DAL.BL.Remit.Transaction
return ds;
}
public DbResult UpdateTransactionPayoutLocation(string user, string tranId, string fieldName, string oldValue,
string newDdlValue, string bankName, string branchName, string isApi,string sessionId)
string newDdlValue, string bankName, string branchName, string isApi,string sessionId, string pCountryId)
{
string sql = "EXEC [proc_modifyTXN]";
sql += " @flag = 'u'";
@ -193,6 +193,7 @@ namespace Swift.DAL.BL.Remit.Transaction
sql += ", @branchNewName = " + FilterString(branchName);
sql += ", @isAPI = " + FilterString(isApi);
sql += ", @sessionId = " + FilterString(sessionId);
sql += ", @pCountryId = " + FilterString(pCountryId);
return ParseDbResult(ExecuteDataset(sql).Tables[0]);
}

4
Swift.web/AgentPanel/ResetPassword/ResetPassword.aspx.cs
View File

@ -111,7 +111,9 @@ namespace Swift.web.AgentPanel.ResetPassword
else if (resetpassword == "Password")
{
PasswordReset pwdReset = new PasswordReset();
var randomPassword = PasswordGenerator.GenerateRandomPassword();
Random generator = new Random();
var randomPassword = generator.Next(0, 1000000).ToString("D6");
pwdReset.RandomPassword = randomPassword;
JsonResponse _resp = _cd.ResetPasswordMobile(new PasswordReset()
{

2
Swift.web/Css/receipt.css
View File

@ -1,5 +1,5 @@
.receipt * {
font-size: 11px;
font-size: 13px;
}
.receipt p {

6
Swift.web/DashboardV2/Dashboard2.aspx.cs
View File

@ -370,9 +370,9 @@ namespace Swift.web.DashboardV2
{
data.KycStatus = new KycStatus
{
KycNotCompleted = Convert.ToString(ds.Tables[7].Rows[0]["Count"]),
KycProcessing = Convert.ToString(ds.Tables[7].Rows[1]["Count"]),
KycCompleted = Convert.ToString(ds.Tables[7].Rows[2]["Count"])
KycNotCompleted = Convert.ToString(ds.Tables[7].Rows[0]["kycNotCompleted"]),
KycProcessing = Convert.ToString(ds.Tables[7].Rows[0]["kycProcessing"]),
KycCompleted = Convert.ToString(ds.Tables[7].Rows[0]["kycCompleted"])
};
}
catch (Exception ex)

2
Swift.web/Library/GetStatic.cs
View File

@ -2652,5 +2652,7 @@ namespace Swift.web.Library
{
return MimeTypes.MimeTypeMap.GetExtension(contentType);
}
}
}

2
Swift.web/Library/PasswordGenerator.cs
View File

@ -74,6 +74,8 @@ namespace Swift.web.Library
return new string(chars.ToArray());
}
}
}

2
Swift.web/MobileRemit/Admin/Operation/VerifyMobileCustomer.aspx.cs
View File

@ -118,7 +118,7 @@ namespace Swift.web.MobileRemit.Admin.Operation
//}
if (kycStatus == "NOT_COMPLETED" || kycStatus == "PROCESSING")
{
customLinkText.Append("&nbsp;<a class=\"btn btn-xs btn-primary\" title=\"Edit\" href=\"/MobileRemit/Admin/Operation/EditCustomerForApproval.aspx?customerId=@customerId&requestFrom=mobile&m=ap&type=approve\"><i class=\"fa fa-pencil\"></i></a>");
customLinkText.Append("&nbsp;<a class=\"btn btn-xs btn-primary\" title=\"Edit\" href=\"/MobileRemit/Admin/Operation/EditCustomerForApproval.aspx?customerId=@customerId&requestFrom=agent&m=ap&type=approve\"><i class=\"fa fa-pencil\"></i></a>");
}
_grid.CustomLinkText = customLinkText.ToString();
string sql = "EXEC [proc_customerKYC] @flag = 'filterByKycStatus',@kycStatus='" + Request.QueryString["kycStatus"] + "' ";

2
Swift.web/Remit/Transaction/Agent/Modify/Modify.aspx.cs
View File

@ -111,6 +111,7 @@ namespace Swift.web.Remit.Transaction.Agent.Modify
private void OnUpdate()
{
string newValue = "";
string pCountryId = GetStatic.ReadQueryString("pCountryId", "");
if (getFieldName() == "accountNo")
newValue = txtNewValue.Text;
@ -143,6 +144,7 @@ namespace Swift.web.Remit.Transaction.Agent.Modify
, ddlBranch.Text
, GetStatic.GetIsApiFlag()
, GetStatic.GetSessionId()
, pCountryId
);
ManageMessage(dbResult);
}

2
Swift.web/Remit/Transaction/Modify/ModifyLocation.aspx.cs
View File

@ -88,6 +88,7 @@ namespace Swift.web.Remit.Transaction.Modify
private void OnUpdate()
{
string newValue = "";
string pCountryId = GetStatic.ReadQueryString("pCountryId", "");
if (getFieldName() == "accountNo")
newValue = txtNewValue.Text;
@ -120,6 +121,7 @@ namespace Swift.web.Remit.Transaction.Modify
, ddlBranch.Text
, GetStatic.GetIsApiFlag()
, GetStatic.GetSessionId()
, pCountryId
);
ManageMessage(dbResult);
}

14
Swift.web/Remit/Transaction/Modify/ModifyTran.aspx
View File

@ -127,5 +127,19 @@
}
return false;
}
function EditBankName(label, fieldName, oldValue, tranId, pCountryId) {
var url = "ModifyLocation.aspx?label=" + label +
"&fieldName=" + fieldName +
"&oldValue=" + oldValue +
"&tranId=" + tranId +
"&pCountryId=" + pCountryId;
var id = PopUpWindow(url, "");
if (id == "undefined" || id == null || id == "") {
}
else {
GetElement("<%=btnReloadDetail.ClientID %>").click();
}
return false;
}
</script>
</html>

2
Swift.web/Remit/Transaction/ModifyPayoutLocation/Modify.aspx.cs
View File

@ -87,6 +87,7 @@ namespace Swift.web.Remit.Transaction.ModifyPayoutLocation
private void OnUpdate()
{
string newValue = "";
string pCountryId = GetStatic.ReadQueryString("pCountryId", "");
if (getFieldName() == "accountNo")
newValue = txtNewValue.Text;
@ -119,6 +120,7 @@ namespace Swift.web.Remit.Transaction.ModifyPayoutLocation
, ddlBranch.Text
, GetStatic.GetIsApiFlag()
, GetStatic.GetSessionId()
, pCountryId
);
ManageMessage(dbResult);
}

10
Swift.web/Remit/Transaction/Reports/TransactionNew/TranReport.aspx
View File

@ -35,6 +35,14 @@
.paystatus-Cancel {
background-color: red;
}
.paystatus-ofac {
color: white;
background-color: darkred;
}
.paystatus-compliance {
color: white;
background-color: darkred;
}
.exportImg {
padding-left: 26px;
padding-top: 10px;
@ -75,7 +83,7 @@
<div class="col-md-12">
<div class="panel panel-default">
<div runat="server" id="exportDiv" class="exportImg">
<img alt="Export to Excel" title="Export to Excel" style="cursor: pointer; height: 20px; width: 15px; " onclick=" javascript:downloadInNewWindow('<% =Request.Url.AbsoluteUri + "&mode=download"%>');" src="../../../../Images/excel.gif" border="0" />
<img alt="Export to Excel" title="Export to Excel" style="cursor: pointer; height: 20px; width: 15px;" onclick=" javascript:downloadInNewWindow('<% =Request.Url.AbsoluteUri + "&mode=download"%>');" src="../../../../Images/excel.gif" border="0" />
</div>
<div class="panel-body">
<div id="rpt_grid" runat="server" class="gridDiv" enableviewstate="false"></div>

71
Swift.web/Remit/Transaction/Reports/TransactionNew/TranReport.aspx.cs
View File

@ -102,46 +102,83 @@ namespace Swift.web.Remit.Transaction.Reports.TransactionNew
strTable.Append("<table class='table table-responsive table-bordered'>");
strTable.Append("<tr>");
strTable.Append("<th>SN</th>");
foreach (DataColumn col in partnerTable.Columns)
{
strTable.Append("<th><div align=\"left\">" + col.ColumnName + "</div></th>");
}
strTable.Append("</tr>");
int sn = 1;
foreach (DataRow row in partnerTable.Rows)
{
string payStatusClass = GetPayStatus(row["PAYSTATUS"].ToString());
strTable.Append("<tr class=\"" + payStatusClass + "\">");
string payStatus = row["PAYSTATUS"].ToString();
string tranStatus = row["TRANSTATUS"].ToString();
foreach (var item in row.ItemArray)
if (payStatus.ToLower().Equals("unpaid"))
{
strTable.Append("<td align=\"left\">" + item.ToString() + "</td>");
string payStatusClass = "";
if (tranStatus.ToLower().Equals("ofac hold") ||
tranStatus.ToLower().Equals("compliance hold") ||
tranStatus.ToLower().Equals("ofac/compliance hold"))
{
payStatusClass = GetPayStatus(tranStatus);
}
else
{
payStatusClass = GetPayStatus(payStatus);
}
strTable.Append("<tr class=\"" + payStatusClass + "\">");
strTable.Append("<td align=\"left\">" + sn + "</td>");
foreach (var item in row.ItemArray)
{
strTable.Append("<td align=\"left\">" + item.ToString() + "</td>");
}
strTable.Append("</tr>");
}
strTable.Append("</tr>");
else
{
string payStatusClass = GetPayStatus(payStatus);
strTable.Append("<tr class=\"" + payStatusClass + "\">");
strTable.Append("<td align=\"left\">" + sn + "</td>");
foreach (var item in row.ItemArray)
{
strTable.Append("<td align=\"left\">" + item.ToString() + "</td>");
}
strTable.Append("</tr>");
}
sn++;
}
combinedTables.Append(strTable.ToString());
combinedTables.Append("<tr>");
combinedTables.Append("<td align=\"left\"><b>Total</b></td>");
strTable.Append("<tr>");
strTable.Append("<td align=\"left\"><b>Total</b></td>");
for (int i = 1; i < partnerTable.Columns.Count; i++)
for (int i = 0; i < partnerTable.Columns.Count; i++)
{
if (i == 13 || i == 15 || i == 16 || i == 17 || i == 21)
if (i == 13 || i == 15 || i == 16 || i == 17 || i == 21 || i == 22)
{
decimal total = partnerTable.AsEnumerable()
.Sum(row => decimal.TryParse(row[i].ToString(), out decimal val) ? val : 0);
combinedTables.Append("<td align=\"left\">" + total + "</td>");
strTable.Append("<td align=\"left\">" + total + "</td>");
}
else
{
combinedTables.Append("<td align=\"left\"></td>");
strTable.Append("<td align=\"left\"></td>");
}
}
combinedTables.Append("</tr>");
combinedTables.Append("</table>");
strTable.Append("</tr>");
strTable.Append("</table>");
combinedTables.Append(strTable.ToString());
}
rpt_grid.InnerHtml = combinedTables.ToString();
@ -162,6 +199,12 @@ 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";
case "ofac/compliance hold":
return "paystatus-compliance";
default:
return "";
}

6
Swift.web/Remit/Transaction/ReprintVoucher/SendIntlReceipt.aspx.cs
View File

@ -110,9 +110,9 @@ namespace Swift.web.Remit.Transaction.ReprintVoucher
controlNo.Text = sRow["controlNo"].ToString();
createdBy.Text = sRow["createdBy"].ToString();
approvedDate.Text = DateTime.Parse(sRow["createdDate"].ToString()).ToString("yyyy-MM-dd hh:mm:ss tt");
cAmt.Text = GetStatic.ShowWithoutDecimal(sRow["cAmt"].ToString()) + "&nbsp" + sRow["collCurr"].ToString();
serviceCharge.Text = GetStatic.ShowWithoutDecimal(sRow["serviceCharge"].ToString()) + "&nbsp" + sRow["collCurr"].ToString();
tAmt.Text = GetStatic.ShowWithoutDecimal(sRow["tAmt"].ToString()) + "&nbsp" + sRow["collCurr"].ToString();
cAmt.Text = GetStatic.ShowDecimal(sRow["cAmt"].ToString()) + "&nbsp" + sRow["collCurr"].ToString();
serviceCharge.Text = GetStatic.ShowDecimal(sRow["serviceCharge"].ToString()) + "&nbsp" + sRow["collCurr"].ToString();
tAmt.Text = GetStatic.ShowDecimal(sRow["tAmt"].ToString()) + "&nbsp" + sRow["collCurr"].ToString();
exRate.Text = sRow["exRate"].ToString() + "&nbsp" + sRow["payoutCurr"].ToString();
pAmt.Text = GetStatic.ShowDecimal(sRow["pAmt"].ToString()) + "&nbsp" + sRow["payoutCurr"].ToString();
depositType.Text = (sRow["collMode"].ToString()) == "Bank Deposit" ? "JP Post" : sRow["collMode"].ToString();

21
Swift.web/Remit/UserControl/UcTransaction.ascx.cs
View File

@ -264,8 +264,8 @@ namespace Swift.web.Remit.UserControl
if (tRow["paymentMethod"].ToString().ToUpper() == "BANK DEPOSIT")
{
accountNo.Text = GetLinkTextForModification("Account No", "accountNo", tRow);
// bankName.Text = GetLinkTextForModification("Bank Name", "BankName", tRow);
// branchName.Text = GetLinkTextForModification("Branch Name", "pBranchName", tRow);
bankName.Text = GetLinkBankPayoutLocation("Bank Name", "BankName", tRow);
branchName.Text = GetLinkTextForModification("Branch Name", "pBranchName", tRow);
}
}
else
@ -337,7 +337,7 @@ namespace Swift.web.Remit.UserControl
//modify mode & bank deposit mode
{
accountNo.Text = GetLinkPayoutLocation("Account Number", "accountNo", tRow);
bankName.Text = GetLinkPayoutLocation("Bank Name", "BankName", tRow);
bankName.Text = GetLinkBankPayoutLocation("Bank Name", "BankName", tRow);
branchName.Text = GetLinkPayoutLocation("Branch Name", "BranchName", tRow);
pBranchName.Text = GetLinkPayoutLocation("Paying Branch", "pBranchName", tRow);
pAgentLocation.Text = tRow["pAgentLocation"].ToString();
@ -359,8 +359,8 @@ namespace Swift.web.Remit.UserControl
//branchName.Text = tRow["BranchName"].ToString();
//pBranchName.Text = tRow["pBranchName"].ToString();
}
bankName.Text = tRow["BankName"].ToString();
branchName.Text = tRow["BranchName"].ToString();
//bankName.Text = tRow["BankName"].ToString();
//branchName.Text = tRow["BranchName"].ToString();
pBranchName.Text = tRow["pBranchName"].ToString();
pAgentLocation.Text = tRow["pAgentLocation"].ToString();
@ -844,6 +844,13 @@ namespace Swift.web.Remit.UserControl
dr[fieldName] + "<img border=0 src=\"/Images/edit.gif\"/></a></div>";
return str;
}
public string GetLinkBankPayoutLocation(string label, string fieldName, DataRow dr)
{
string fieldValue = dr[fieldName].ToString().Trim();
var str = "<a href=# title='Edit Record'><div class = \"link\" onclick = \"EditBankName('" + label + "', '" + fieldName + "', '" + fieldValue + "','" + hddTranId.Value + "','" + dr["pCountryId"] + "')\">" +
fieldValue + "<img border=0 src=\"/Images/edit.gif\"/></a></div>";
return str;
}
public void SearchData()
{
@ -1619,7 +1626,7 @@ namespace Swift.web.Remit.UserControl
if (tRow["paymentMethod"].ToString().ToUpper() == "BANK DEPOSIT")
{
accountNo.Text = GetLinkTextForModification("Account No", "accountNo", tRow);
bankName.Text = GetLinkTextForModification("Bank Name", "BankName", tRow);
bankName.Text = GetLinkBankPayoutLocation("Bank Name", "BankName", tRow);
branchName.Text = GetLinkTextForModification("Branch Name", "pBranchName", tRow);
}
}
@ -1677,7 +1684,7 @@ namespace Swift.web.Remit.UserControl
//modify mode & bank deposit mode
{
accountNo.Text = GetLinkPayoutLocation("Account Number", "accountNo", tRow);
bankName.Text = GetLinkPayoutLocation("Bank Name", "BankName", tRow);
bankName.Text = GetLinkBankPayoutLocation("Bank Name", "BankName", tRow);
branchName.Text = GetLinkPayoutLocation("Branch Name", "BranchName", tRow);
pBranchName.Text = GetLinkPayoutLocation("Paying Branch", "pBranchName", tRow);
pAgentLocation.Text = tRow["pAgentLocation"].ToString();

Write Preview
Loading…
Cancel
Save