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

Merge branch 'staging' of http://202.166.220.79:3000/IME-LONDON/WEB_CORE into feature/Redmine-16525-Cosmetic_Changes 

# Conflicts:
#	Swift.web/Library/GetStatic.cs
#	Swift.web/MobileRemit/Admin/Reports/CustomerRegistrationStatus.aspx.cs
#	Swift.web/Remit/Transaction/Reports/TransactionNew/TranReport.aspx.cs
feature/Redmine-16525-Cosmetic_Changes
Leeza Baidar 2 months ago
parent
878e97126f 564b0a14a2
commit
c1bd54c6c6
24 changed files with 375 additions and 319 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 21
      Swift.DAL/Remittance/Transaction/TranAgentReportDao.cs
  2. 24
      Swift.DAL/Remittance/Transaction/UpdateBranchDao.cs
  3. 2
      Swift.DAL/app.config
  4. 8
      Swift.web/DashboardV2/Dashboard2.aspx
  5. 2
      Swift.web/DashboardV2/Dashboard2.aspx.cs
  6. 2
      Swift.web/DashboardV2/assets/js/dashboardv2.js
  7. 1
      Swift.web/Library/GetStatic.cs
  8. 2
      Swift.web/Library/PasswordGenerator.cs
  9. 1
      Swift.web/MobileRemit/Admin/Operation/EditCustomerForActivation.aspx.cs
  10. 2
      Swift.web/MobileRemit/Admin/Operation/EditCustomerForApproval.aspx
  11. 20
      Swift.web/MobileRemit/Admin/PushNotification/ManageBroadCast.aspx
  12. 1
      Swift.web/MobileRemit/Admin/Reports/CustomerRegistrationStatus.aspx.cs
  13. 9
      Swift.web/Remit/Administration/CustomerRegistration/Manage.aspx.cs
  14. 2
      Swift.web/Remit/TPSetup/BankAndBranchSetup/BankList.aspx.cs
  15. 3
      Swift.web/Remit/TPSetup/BankAndBranchSetup/ListBranch.aspx.cs
  16. 3
      Swift.web/Remit/TPSetup/BankAndBranchSetup/NewBankList.aspx.cs
  17. 1
      Swift.web/Remit/Transaction/Reports/TransactionNew/Mange.aspx.cs
  18. 17
      Swift.web/Remit/UserControl/UcTransaction.ascx
  19. 3
      Swift.web/Remit/UserControl/UcTransaction.ascx.cs
  20. 27
      Swift.web/Remit/UserControl/UcTransaction.ascx.designer.cs
  21. 36
      Swift.web/Swift.web.csproj
  22. 3
      Swift.web/Web.config

21
Swift.DAL/Remittance/Transaction/TranAgentReportDao.cs
View File

@ -393,7 +393,26 @@ namespace Swift.DAL.BL.Remit.Transaction
return ParseReportResult(sql); return ParseReportResult(sql);
} }
//public ReportResult GetCustomerRegistrationReport(string user, string flag, string fromDate, string toDate)
//{
// var sql = "PROC_REGISTRATION_REPORT ";
// sql += "@flag =" + FilterString(flag); ;
// sql += ",@user=" + FilterString(user);
// sql += ",@FROM_DATE=" + FilterString(fromDate);
// sql += ",@TO_DATE=" + FilterString(toDate);
// return ParseReportResult(sql);
//}
//public ReportResult GetLowTxnReport(string user, string flag, string toDate, string postCode, string txnCountType, string txnCount)
//{
// var sql = "proc_low_txn_report ";
// sql += "@flag =" + FilterString(flag); ;
// sql += ",@user=" + FilterString(user);
// sql += ",@toDate=" + FilterString(toDate);
// sql += ",@postCode=" + FilterString(postCode);
// sql += ",@txnCountType=" + FilterString(txnCountType);
// sql += ",@txnCount=" + FilterString(txnCount);
// return ParseReportResult(sql);
//}
public ReportResult GetDisabledCustomersReport(string user, string flag, string fromDate, string toDate) public ReportResult GetDisabledCustomersReport(string user, string flag, string fromDate, string toDate)
{ {
var sql = "PROC_REGISTRATION_REPORT "; var sql = "PROC_REGISTRATION_REPORT ";

24
Swift.DAL/Remittance/Transaction/UpdateBranchDao.cs
View File

@ -60,8 +60,6 @@ namespace Swift.DAL.Remittance.Transaction
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) 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; string sql;
// Insert operation
sql = "EXEC Proc_UpdateBranchCode @flag = " + FilterString(flag); sql = "EXEC Proc_UpdateBranchCode @flag = " + FilterString(flag);
sql += ", @bankId = " + FilterString(recordId); sql += ", @bankId = " + FilterString(recordId);
sql += ", @pCountryName = " + FilterString(countryId); sql += ", @pCountryName = " + FilterString(countryId);
@ -83,7 +81,6 @@ namespace Swift.DAL.Remittance.Transaction
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) 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; string sql;
// Insert operation
sql = "EXEC Proc_UpdateBranchCode @flag = " + FilterString(flag); sql = "EXEC Proc_UpdateBranchCode @flag = " + FilterString(flag);
sql += ", @bankId = " + FilterString(recordId); sql += ", @bankId = " + FilterString(recordId);
sql += ", @pCountryName = " + FilterString(countryId); sql += ", @pCountryName = " + FilterString(countryId);
@ -127,26 +124,22 @@ namespace Swift.DAL.Remittance.Transaction
sql += " @flag = 'editBankMapping'"; sql += " @flag = 'editBankMapping'";
sql += ", @user = " + FilterString(user); sql += ", @user = " + FilterString(user);
sql += ", @bankId = " + FilterString(bankId); sql += ", @bankId = " + FilterString(bankId);
DataSet ds = ExecuteDataset(sql); DataSet ds = ExecuteDataset(sql);
if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0) if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0)
return null; return null;
return ds.Tables[0].Rows[0]; return ds.Tables[0].Rows[0];
} }
public DataRow EditBankSelectById(string bankId, string user) public DataRow EditBankSelectById(string bankId, string user)
{ {
string sql = "EXEC Proc_UpdateBranchCode"; string sql = "EXEC Proc_UpdateBranchCode";
sql += " @flag = 'editBank'"; sql += " @flag = 'editBank'";
sql += ", @user = " + FilterString(user); sql += ", @user = " + FilterString(user);
sql += ", @bankId = " + FilterString(bankId); sql += ", @bankId = " + FilterString(bankId);
DataSet ds = ExecuteDataset(sql); DataSet ds = ExecuteDataset(sql);
if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0) if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0)
return null; return null;
return ds.Tables[0].Rows[0]; return ds.Tables[0].Rows[0];
} }
public DataRow EditBranchSelectById(string bankId, string user) public DataRow EditBranchSelectById(string bankId, string user)
{ {
string sql = "EXEC Proc_UpdateBranchCode"; string sql = "EXEC Proc_UpdateBranchCode";
@ -254,23 +247,6 @@ namespace Swift.DAL.Remittance.Transaction
return ParseDbResult(sql); return ParseDbResult(sql);
} }
//public DbResult Delete(string user, string rowId)
//{
// var sql = "EXEC PROC_REFERALSETUP @flag = 'delete'";
// sql += ", @user = " + FilterString(user);
// sql += ", @rowId = " + FilterString(rowId);
// return ParseDbResult(sql);
//}
//public DbResult Delete(string acct_id, string user)
//{
// string sql = "EXEC PROC_API_BANK_BRANCH_SETUP";
// sql += " @flag ='delete'";
// sql += ", @bankId" + FilterString(acct_id);
// sql += ", @user=" + FilterString(user);
// return ParseDbResult(ExecuteDataset(sql).Tables[0]);
//}
public DbResult DeleteBankMapping(string bankId, string user) public DbResult DeleteBankMapping(string bankId, string user)
{ {
string sql = "EXEC Proc_UpdateBranchCode"; string sql = "EXEC Proc_UpdateBranchCode";

2
Swift.DAL/app.config
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<configuration> <configuration>
<configSections> <configSections>
</configSections> </configSections>

8
Swift.web/DashboardV2/Dashboard2.aspx
View File

@ -67,6 +67,7 @@
.footer-text { .footer-text {
color: white; color: white;
} }
.auto-style1 { .auto-style1 {
flex: 0 0 auto; flex: 0 0 auto;
width: 100%; width: 100%;
@ -546,13 +547,7 @@
</div> </div>
<!-- end msg-body --> <!-- end msg-body -->
</a> </a>
<div class="msg-body d-flex align-items-center">
<div class="icon-element bg-10 flex-shrink-0 mr-3 ml-0">
<i class='uil uil-bell'></i>
</div> </div>
<div class="msg-content w-100" style="margin-left: 10px;">
<h3 class="title pb-1" style="font-size: 14px !important;">KYC Completed</h3>
<p class="msg-text" style="color: red;" id="kycCompletedCust">0</p>
</div> </div>
</div> </div>
</div> </div>
@ -685,7 +680,6 @@
</div> </div>
</div> </div>
</div> </div>
</form> </form>
<script src="assets/js/vendor.min.js"></script> <script src="assets/js/vendor.min.js"></script>
<script src="assets/Vendor/moment/min/moment.min.js"></script> <script src="assets/Vendor/moment/min/moment.min.js"></script>

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

@ -70,8 +70,6 @@ namespace Swift.web.DashboardV2
// complianceOfacRoleDiv.Attributes.Add("style", "display:none;"); // complianceOfacRoleDiv.Attributes.Add("style", "display:none;");
////if (!sl.HasRight(AgentwiseNumberRole)) ////if (!sl.HasRight(AgentwiseNumberRole))
//// agentWiseTxnRoleDiv.Attributes.Add("style", "display:none;"); //// agentWiseTxnRoleDiv.Attributes.Add("style", "display:none;");
//if (!sl.HasRight(UserwiseNumberRole))
// userwiseDailyTxnRoleDiv.Attributes.Add("style", "display:none;");
//if (!sl.HasRight(customerKycStatus)) //if (!sl.HasRight(customerKycStatus))
// customerKycStatusList.Attributes.Add("style", "display:none;"); // customerKycStatusList.Attributes.Add("style", "display:none;");
//if (!sl.HasRight(LawsonSummaryRole)) //if (!sl.HasRight(LawsonSummaryRole))

2
Swift.web/DashboardV2/assets/js/dashboardv2.js
View File

@ -125,11 +125,9 @@ function LoadChartData() {
$('#mobileCustomerCount').text(Response.CustomerData.MobileCustomers); $('#mobileCustomerCount').text(Response.CustomerData.MobileCustomers);
$('#mobileCustomerCount').text(Response.CustomerData.MobileCustomers); $('#mobileCustomerCount').text(Response.CustomerData.MobileCustomers);
//KYC Status
$('#kycProcessingCust').text(Response.KycStatus.KycProcessing); $('#kycProcessingCust').text(Response.KycStatus.KycProcessing);
$('#kycNotCompletedCust').text(Response.KycStatus.KycNotCompleted); $('#kycNotCompletedCust').text(Response.KycStatus.KycNotCompleted);
$('#kycCompletedCust').text(Response.KycStatus.KycCompleted); $('#kycCompletedCust').text(Response.KycStatus.KycCompleted);
//Agent wise transaction show //Agent wise transaction show
//let html = ''; //let html = '';
//if (AgentWiseTxn.length > 0) { //if (AgentWiseTxn.length > 0) {

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

@ -22,6 +22,7 @@ using System.Xml.Serialization;
using SelectPdf; using SelectPdf;
using Newtonsoft.Json; using Newtonsoft.Json;
using System.Linq; using System.Linq;
using System.Security.Cryptography;
//using SelectPdf; //using SelectPdf;

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

@ -84,9 +84,9 @@ namespace Swift.web.Library
{ {
password += rand.Next(0, 10); password += rand.Next(0, 10);
} }
return password; return password;
} }
} }
} }

1
Swift.web/MobileRemit/Admin/Operation/EditCustomerForActivation.aspx.cs
View File

@ -477,5 +477,6 @@ namespace Swift.web.MobileRemit.Admin.Operation
return jsonResponse; return jsonResponse;
} }
} }
} }

2
Swift.web/MobileRemit/Admin/Operation/EditCustomerForApproval.aspx
View File

@ -1645,7 +1645,6 @@
</div> </div>
</div> </div>
</div> </div>
<div class="col-md-6" id="customerSelfieDiv"> <div class="col-md-6" id="customerSelfieDiv">
<div class="form-group"> <div class="form-group">
<label>Customer Selfie</label> <label>Customer Selfie</label>
@ -1687,7 +1686,6 @@
</div> </div>
</div> </div>
</div> </div>
<div class="panel panel-default clearfix m-b-20"> <div class="panel panel-default clearfix m-b-20">

20
Swift.web/MobileRemit/Admin/PushNotification/ManageBroadCast.aspx
View File

@ -163,16 +163,16 @@
<div class="form-group"> <div class="form-group">
<asp:DropDownList ID="ddlCustomerType" runat="server" CssClass="form-control" Style="margin-bottom: 5px;"></asp:DropDownList> <asp:DropDownList ID="ddlCustomerType" runat="server" CssClass="form-control" Style="margin-bottom: 5px;"></asp:DropDownList>
</div> </div>
</div>
<div class="col-md-6"> <div class="col-md-6">
<uc1:SwiftTextBox runat="server" ID="txtSearchData" Category="remit-searchCustomerForPushNotif" CssClass="form-control required" Param1="@GetCustomerSearchType()" Title="Blank for All" /> <uc1:SwiftTextBox runat="server" ID="txtSearchData" Category="remit-searchCustomerForPushNotif" CssClass="form-control required" Param1="@GetCustomerSearchType()" Title="Blank for All" />
</div> </div>
<div class="col-md-6"> <div class="col-md-6">
<div class="form-group">
<asp:DropDownList ID="ddlNativeCountry" runat="server" CssClass="form-control" Style="margin-bottom: 5px;"></asp:DropDownList>
</div>
</div> </div>
</div> </div>
<div class="col-md-4">
<div class="form-group">
<asp:DropDownList ID="ddlNativeCountry" runat="server" CssClass="form-control" Style="margin-bottom: 5px;">
</asp:DropDownList>
</div> </div>
</div> </div>
</div>--%> </div>--%>
@ -185,18 +185,12 @@
<div class="col-md-4 form-group"> <div class="col-md-4 form-group">
<uc1:SwiftTextBox runat="server" ID="txtSearchData" Category="remit-searchCustomerForPushNotif" CssClass="form-control required" Param1="@GetCustomerSearchType()" Title="Blank for All" /> <uc1:SwiftTextBox runat="server" ID="txtSearchData" Category="remit-searchCustomerForPushNotif" CssClass="form-control required" Param1="@GetCustomerSearchType()" Title="Blank for All" />
</div> </div>
<div class="col-md-6">
<div class="col-md-4">
<div class="form-group"> <div class="form-group">
<asp:DropDownList ID="ddlNativeCountry" runat="server" CssClass="form-control" Style="margin-bottom: 5px;"></asp:DropDownList> <asp:DropDownList ID="ddlNativeCountry" runat="server" CssClass="form-control" Style="margin-bottom: 5px;"></asp:DropDownList>
</div> </div>
</div> </div>
<%--<div class="col-md-4">
<div class="form-group">
<asp:TextBox ID="txtPostCode" AutoComplete="off" runat="server" CssClass="form-control"></asp:TextBox>
</div>
</div>--%>
</div> </div>
<div class="row" id="divPostCode" runat="server"> <div class="row" id="divPostCode" runat="server">
<div class="col-md-3 form-group"> <div class="col-md-3 form-group">
<label id="lblPostCode" style="display: none;">Post Code :</label> <label id="lblPostCode" style="display: none;">Post Code :</label>
@ -233,6 +227,10 @@
</div> </div>
</div> </div>
</div> </div>
</div>
</div>
<div class="row"> <div class="row">
</div> </div>
<div class="row"> <div class="row">

1
Swift.web/MobileRemit/Admin/Reports/CustomerRegistrationStatus.aspx.cs
View File

@ -220,7 +220,6 @@ namespace Swift.web.MobileRemit.Admin.Reports
protected void activate_Click(object sender, EventArgs e) protected void activate_Click(object sender, EventArgs e)
{ {
string customerId = txtSearchData.Value.Split('|')[0]; string customerId = txtSearchData.Value.Split('|')[0];
//var custompass = PasswordGenerator.GenerateRandomPassword();
var custompass = PasswordGenerator.GenerateRandomNumericPassword(); var custompass = PasswordGenerator.GenerateRandomNumericPassword();
var membershipId = Request.Form["membershipId"]; var membershipId = Request.Form["membershipId"];
var dbRes = _cd.ActivateMobileLogin(GetStatic.GetUser(), customerId, custompass, membershipId); var dbRes = _cd.ActivateMobileLogin(GetStatic.GetUser(), customerId, custompass, membershipId);

9
Swift.web/Remit/Administration/CustomerRegistration/Manage.aspx.cs
View File

@ -406,11 +406,10 @@ namespace Swift.web.Remit.Administration.CustomerRegistration
Page_Load(sender, e); Page_Load(sender, e);
return; return;
} }
private void PrintMessage(string msg)
{
GetStatic.CallBackJs1(Page, "Msg", "alert('" + msg + "');");
}
//private void PrintMessage(string msg)
//{
// GetStatic.CallBackJs1(Page, "Msg", "alert('" + msg + "');");
//}
private void PrintMessage(string msg) private void PrintMessage(string msg)
{ {
GetStatic.CallBackJs1(Page, "Msg", "alert('" + msg + "');"); GetStatic.CallBackJs1(Page, "Msg", "alert('" + msg + "');");

2
Swift.web/Remit/TPSetup/BankAndBranchSetup/BankList.aspx.cs
View File

@ -95,7 +95,6 @@ namespace Swift.web.Remit.TPSetup.BankAndBranchSetup
private void DeleteRow() private void DeleteRow()
{ {
string id = _grid.GetCurrentRowId(GridName); string id = _grid.GetCurrentRowId(GridName);
if (id == "") if (id == "")
return; return;
var user = GetStatic.GetUser(); var user = GetStatic.GetUser();
@ -111,6 +110,7 @@ namespace Swift.web.Remit.TPSetup.BankAndBranchSetup
GetStatic.AlertMessage(this, dbResult.Msg); GetStatic.AlertMessage(this, dbResult.Msg);
} }
} }
protected void btnUpdate_Click(object sender, EventArgs e) protected void btnUpdate_Click(object sender, EventArgs e)
{ {
BankBranchDao _dao = new BankBranchDao(); BankBranchDao _dao = new BankBranchDao();

3
Swift.web/Remit/TPSetup/BankAndBranchSetup/ListBranch.aspx.cs
View File

@ -94,7 +94,6 @@ namespace Swift.web.Remit.TPSetup.BankAndBranchSetup
private void DeleteRow() private void DeleteRow()
{ {
string id = _grid.GetCurrentRowId(GridName); string id = _grid.GetCurrentRowId(GridName);
if (id == "") if (id == "")
return; return;
var user = GetStatic.GetUser(); var user = GetStatic.GetUser();
@ -116,8 +115,6 @@ namespace Swift.web.Remit.TPSetup.BankAndBranchSetup
} }
protected void btnUpdate_Click(object sender, EventArgs e) protected void btnUpdate_Click(object sender, EventArgs e)
{ {
//BankBranchDao _dao = new BankBranchDao(); //BankBranchDao _dao = new BankBranchDao();

3
Swift.web/Remit/TPSetup/BankAndBranchSetup/NewBankList.aspx.cs
View File

@ -87,12 +87,9 @@ namespace Swift.web.Remit.TPSetup.BankAndBranchSetup
rpt_grid.InnerHtml = _grid.CreateGrid(sql); rpt_grid.InnerHtml = _grid.CreateGrid(sql);
} }
private void DeleteRow() private void DeleteRow()
{ {
string id = _grid.GetCurrentRowId(GridName); string id = _grid.GetCurrentRowId(GridName);
if (id == "") if (id == "")
return; return;
var user = GetStatic.GetUser(); var user = GetStatic.GetUser();

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

@ -80,7 +80,6 @@ namespace Swift.web.Remit.Transaction.Reports.TransactionNew
private void PopulateDll() private void PopulateDll()
{ {
sdd.SetDDL3(ref payoutPartner, "EXEC proc_dropDownLists @flag='partner-list'", "agentId", "agentName", "", "All"); 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 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 ddlPCountry, "EXEC proc_dropDownLists @flag='pCountry'", "countryId", "countryName", "", "All");
sl.SetDDL(ref ddlSCountry, "EXEC proc_dropDownLists @flag='sCountry'", "countryId", "countryName", "", "All"); sl.SetDDL(ref ddlSCountry, "EXEC proc_dropDownLists @flag='sCountry'", "countryId", "countryName", "", "All");

17
Swift.web/Remit/UserControl/UcTransaction.ascx
View File

@ -387,6 +387,23 @@
</table> </table>
</td> </td>
<td class="row">
<table class="table table-bordered table-striped" id="tblVerifiedLog" runat="server" visible="false">
<tr>
<td>Verified By:</td>
<td>
<asp:Label ID="verifiedBy" runat="server"></asp:Label>
</td>
</tr>
<tr>
<td>Verified Date:</td>
<td>
<asp:Label ID="verifiedDate" runat="server"></asp:Label>
</td>
</tr>
</table>
</td>
<td class="row"> <td class="row">
<table class="table table-bordered table-striped table-responsive" id="tblCreatedFrom" runat="server" visible="true"> <table class="table table-bordered table-striped table-responsive" id="tblCreatedFrom" runat="server" visible="true">
<tr> <tr>

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

@ -444,12 +444,15 @@ namespace Swift.web.Remit.UserControl
createdFrom.Text = tRow["createdFrom"].ToString(); createdFrom.Text = tRow["createdFrom"].ToString();
hddPayTokenId.Value = tRow["payTokenId"].ToString(); hddPayTokenId.Value = tRow["payTokenId"].ToString();
introducer.Text = tRow["introducer"].ToString(); introducer.Text = tRow["introducer"].ToString();
verifiedBy.Text = tRow["verifiedBy"].ToString();
verifiedDate.Text = tRow["verifiedDate"].ToString();
tblCreatedLog.Visible = createdBy.Text != ""; tblCreatedLog.Visible = createdBy.Text != "";
tblApprovedLog.Visible = approvedBy.Text != ""; tblApprovedLog.Visible = approvedBy.Text != "";
tblPaidLog.Visible = paidBy.Text != ""; tblPaidLog.Visible = paidBy.Text != "";
tblCancelRequestedLog.Visible = cancelRequestedBy.Text != ""; tblCancelRequestedLog.Visible = cancelRequestedBy.Text != "";
tblCancelApprovedLog.Visible = cancelApprovedBy.Text != ""; tblCancelApprovedLog.Visible = cancelApprovedBy.Text != "";
tblVerifiedLog.Visible = verifiedBy.Text != "";
trNameAsPerBank.Visible = false; trNameAsPerBank.Visible = false;
if (!string.IsNullOrEmpty(tRow["receiverNameAlt"].ToString())) if (!string.IsNullOrEmpty(tRow["receiverNameAlt"].ToString()))

27
Swift.web/Remit/UserControl/UcTransaction.ascx.designer.cs
View File

@ -221,6 +221,33 @@ namespace Swift.web.Remit.UserControl
/// </remarks> /// </remarks>
protected global::System.Web.UI.WebControls.Label cancelApprovedDate; protected global::System.Web.UI.WebControls.Label cancelApprovedDate;
/// <summary>
/// tblVerifiedLog control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlTable tblVerifiedLog;
/// <summary>
/// verifiedBy 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.Label verifiedBy;
/// <summary>
/// verifiedDate 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.Label verifiedDate;
/// <summary> /// <summary>
/// tblCreatedFrom control. /// tblCreatedFrom control.
/// </summary> /// </summary>

36
Swift.web/Swift.web.csproj
View File

@ -458,7 +458,6 @@
<Content Include="BillVoucher\VoucherEntry\VoucherEntry.aspx" /> <Content Include="BillVoucher\VoucherEntry\VoucherEntry.aspx" />
<Content Include="BillVoucher\VoucherUpload\Upload.aspx" /> <Content Include="BillVoucher\VoucherUpload\Upload.aspx" />
<Content Include="bin\UAParser.dll" /> <Content Include="bin\UAParser.dll" />
<Content Include="bin\UAParser.xml" />
<Content Include="Common\JPPost.css" /> <Content Include="Common\JPPost.css" />
<Content Include="Common\JPPostKYCInquiry.aspx" /> <Content Include="Common\JPPostKYCInquiry.aspx" />
<Content Include="content\images\Jcrop.gif" /> <Content Include="content\images\Jcrop.gif" />
@ -8184,6 +8183,27 @@
<Compile Include="Remit\TPSetup\BankAndBranchSetup\AddBank.aspx.designer.cs"> <Compile Include="Remit\TPSetup\BankAndBranchSetup\AddBank.aspx.designer.cs">
<DependentUpon>AddBank.aspx</DependentUpon> <DependentUpon>AddBank.aspx</DependentUpon>
</Compile> </Compile>
<Compile Include="Remit\TPSetup\BankAndBranchSetup\AddBankMapping.aspx.cs">
<DependentUpon>AddBankMapping.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="Remit\TPSetup\BankAndBranchSetup\AddBankMapping.aspx.designer.cs">
<DependentUpon>AddBankMapping.aspx</DependentUpon>
</Compile>
<Compile Include="Remit\TPSetup\BankAndBranchSetup\AddBranch.aspx.cs">
<DependentUpon>AddBranch.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="Remit\TPSetup\BankAndBranchSetup\AddBranch.aspx.designer.cs">
<DependentUpon>AddBranch.aspx</DependentUpon>
</Compile>
<Compile Include="Remit\TPSetup\BankAndBranchSetup\AddBank.aspx.cs">
<DependentUpon>AddBank.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="Remit\TPSetup\BankAndBranchSetup\AddBank.aspx.designer.cs">
<DependentUpon>AddBank.aspx</DependentUpon>
</Compile>
<Compile Include="Remit\TPSetup\BankAndBranchSetup\BankList.aspx.cs"> <Compile Include="Remit\TPSetup\BankAndBranchSetup\BankList.aspx.cs">
<DependentUpon>BankList.aspx</DependentUpon> <DependentUpon>BankList.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType> <SubType>ASPXCodeBehind</SubType>
@ -8198,6 +8218,13 @@
<Compile Include="Remit\TPSetup\BankAndBranchSetup\BranchList.aspx.designer.cs"> <Compile Include="Remit\TPSetup\BankAndBranchSetup\BranchList.aspx.designer.cs">
<DependentUpon>BranchList.aspx</DependentUpon> <DependentUpon>BranchList.aspx</DependentUpon>
</Compile> </Compile>
<Compile Include="Remit\TPSetup\BankAndBranchSetup\ListBranch.aspx.cs">
<DependentUpon>ListBranch.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="Remit\TPSetup\BankAndBranchSetup\ListBranch.aspx.designer.cs">
<DependentUpon>ListBranch.aspx</DependentUpon>
</Compile>
<Compile Include="Remit\TPSetup\BankAndBranchSetup\ManagePartnerBank.aspx.cs"> <Compile Include="Remit\TPSetup\BankAndBranchSetup\ManagePartnerBank.aspx.cs">
<DependentUpon>ManagePartnerBank.aspx</DependentUpon> <DependentUpon>ManagePartnerBank.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType> <SubType>ASPXCodeBehind</SubType>
@ -8205,6 +8232,13 @@
<Compile Include="Remit\TPSetup\BankAndBranchSetup\ManagePartnerBank.aspx.designer.cs"> <Compile Include="Remit\TPSetup\BankAndBranchSetup\ManagePartnerBank.aspx.designer.cs">
<DependentUpon>ManagePartnerBank.aspx</DependentUpon> <DependentUpon>ManagePartnerBank.aspx</DependentUpon>
</Compile> </Compile>
<Compile Include="Remit\TPSetup\BankAndBranchSetup\NewBankList.aspx.cs">
<DependentUpon>NewBankList.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="Remit\TPSetup\BankAndBranchSetup\NewBankList.aspx.designer.cs">
<DependentUpon>NewBankList.aspx</DependentUpon>
</Compile>
<Compile Include="Remit\TPSetup\BankAndBranchSetup\AddBankMapping.aspx.cs"> <Compile Include="Remit\TPSetup\BankAndBranchSetup\AddBankMapping.aspx.cs">
<DependentUpon>AddBankMapping.aspx</DependentUpon> <DependentUpon>AddBankMapping.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType> <SubType>ASPXCodeBehind</SubType>

3
Swift.web/Web.config
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0"?>
<!-- <!--
For more information on how to configure your ASP.NET application, please visit For more information on how to configure your ASP.NET application, please visit
http://go.microsoft.com/fwlink/?LinkId=169433 http://go.microsoft.com/fwlink/?LinkId=169433
@ -74,6 +74,7 @@
<!-- Stagin DB Connection --> <!-- Stagin DB Connection -->
<add key="connectionString" value="server=77.68.15.91\MSSQLSERVER01,1434;Database=FastMoneyPro_Account;uid=sa;pwd=DbAmin123" /> <add key="connectionString" value="server=77.68.15.91\MSSQLSERVER01,1434;Database=FastMoneyPro_Account;uid=sa;pwd=DbAmin123" />
<add key="RemittanceString" value="server=77.68.15.91\MSSQLSERVER01,1434;Database=FastMoneyPro_Remit;uid=sa;pwd=DbAmin123" /> <add key="RemittanceString" value="server=77.68.15.91\MSSQLSERVER01,1434;Database=FastMoneyPro_Remit;uid=sa;pwd=DbAmin123" />
<add key="RemittanceString" value="server=77.68.15.91\MSSQLSERVER01,1434;Database=FastMoneyPro_Remit;uid=user_stag;pwd=P@ssw0rd"/>
<add key="tranNoName" value="JME No"/> <add key="tranNoName" value="JME No"/>
<add key="root" value="D:\C# Projects\Personal\JME_Japan\WEB-CORE\Swift.web\"/> <add key="root" value="D:\C# Projects\Personal\JME_Japan\WEB-CORE\Swift.web\"/>
<add key="urlRoot" value="http://localhost:49640/"/> <add key="urlRoot" value="http://localhost:49640/"/>

Write Preview
Loading…
Cancel
Save