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

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
master
Shakun Shrestha 3 months ago
parent
7aaca9050d
commit
05fe0cb3dc
12 changed files with 119 additions and 32 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. 8
      Swift.DAL/OnlineAgent/OnlineCustomerDao.cs
  2. 79
      Swift.web/DashboardV2/Dashboard2.aspx
  3. 5
      Swift.web/MobileRemit/Admin/Operation/EditCustomerForApproval.aspx
  4. 1
      Swift.web/MobileRemit/Admin/Reports/CustomerRegistrationStatus.aspx
  5. 16
      Swift.web/MobileRemit/Admin/Reports/CustomerRegistrationStatus.aspx.cs
  6. 1
      Swift.web/MobileRemit/Admin/Reports/CustomerRegistrationStatus.aspx.designer.cs
  7. 2
      Swift.web/Remit/ThirdPartyTXN/InboundApiLog/InboundLog.aspx.cs
  8. 2
      Swift.web/Remit/ThirdPartyTXN/InboundApiLog/InboundLogList.aspx.cs
  9. 2
      Swift.web/Remit/ThirdPartyTXN/MobileApiLog/MobileApiLogList.aspx.cs
  10. 11
      Swift.web/Remit/Transaction/ApproveTxn/ApproveInwardRemitance.aspx.cs
  11. 6
      Swift.web/Remit/Transaction/Reports/TransactionNew/TranReport.aspx.cs

8
Swift.DAL/OnlineAgent/OnlineCustomerDao.cs
View File

@ -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]);
}
}
}

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

@ -63,9 +63,11 @@
z-index: 9999;
background: url("../Images/loading_icon.gif") center no-repeat #fff;
}
.footer-text {
color: white;
}
.auto-style1 {
flex: 0 0 auto;
width: 100%;
@ -479,6 +481,7 @@
</div>
</div>
</div>
<div class="col-xl-6" id="customerKycStatusList" runat="server">
<div class="card">
<div class="card-body p-0" style="min-height: 267px !important;">
@ -488,6 +491,7 @@
<i class="uil uil-ellipsis-v"></i>
</a>
<div class="dropdown-menu dropdown-menu-end">
<!-- item-->
<a href="javascript:void(0);" class="dropdown-item">
<i class="uil uil-refresh me-2"></i>Refresh
</a>
@ -495,6 +499,7 @@
</div>
<h5 class="card-title header-title mb-0">Customer KYC Status</h5>
</div>
<!-- stat 1 -->
<div class="form-content p-0">
<div class="list-group drop-reveal-list">
<a href="../MobileRemit/Admin/Operation/VerifyMobileCustomer.aspx?kycStatus=PROCESSING" target="_blank" class="list-group-item list-group-item-action border-top-0">
@ -511,6 +516,7 @@
<i class="las la-money-bill-wave-alt"></i>
</span>
</div>
<!-- end msg-body -->
</a>
<a href="../MobileRemit/Admin/Operation/VerifyMobileCustomer.aspx?kycStatus=NOT_COMPLETED" target="_blank" class="list-group-item list-group-item-action">
<div class="msg-body d-flex align-items-center">
@ -526,6 +532,7 @@
<i class='uil uil-refresh'></i>
</span>
</div>
<!-- end msg-body -->
</a>
<a href="../MobileRemit/Admin/Operation/VerifyMobileCustomer.aspx?kycStatus=COMPLETED" target="_blank" class="list-group-item list-group-item-action">
<div class="msg-body d-flex align-items-center">
@ -541,21 +548,78 @@
<i class='uil uil-refresh'></i>
</span>
</div>
<!-- end msg-body -->
</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 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 class="col-xl-6" id="userwiseDailyTxnRoleDiv" runat="server">
<%-- <div class="col-md-6">
<div class="panel panel-default recent-activites">
<!-- Start .panel -->
<div class="panel-heading">
<h5 class="card-title header-title mb-0">Partner Wise Settlement Rate</h5>
<div class="panel-actions">
</div>
</div>
<div class="panel-body pad-0 holder" style="height: 200px !important; font-size: 14px;" id="tblExRate" runat="server">
<table class="table table-responsive table-bordered">
<thead>
<tr>
<th>S.No.</th>
<th>Partner</th>
<th>Ex Rate</th>
<th>Payer</th>
<th>Payment Modes</th>
</tr>
</thead>
<tbody>
<tr>
<td colspan="5">No data to display</td>
</tr>
</tbody>
</table>
</div>
</div>
</div>--%>
<div class="col-md-6" id="exRateDiv" runat="server">
<div class="card">
<div class="card-body p-0">
<div class="card-body p-0">
<div class="p-3">
<div class="dropdown float-end">
<a href="#" class="dropdown-toggle arrow-none text-muted" data-bs-toggle="dropdown" aria-expanded="false">
<i class="uil uil-ellipsis-v"></i>
</a>
<div class="dropdown-menu dropdown-menu-end">
<!-- item-->
<a href="javascript:void(0);" class="dropdown-item">
<i class="uil uil-refresh me-2"></i>Refresh
</a>
</div>
</div>
<h5 class="card-title header-title mb-0">Partner Wise Settlement Rate</h5>
</div>
<div class="d-flex p-3 border-bottom" style="height: 200px !important; font-size: 14px;" id="tblExRate" runat="server">
<table class="table table-responsive table-bordered">
<thead>
<tr>
<th>S.No.</th>
<th>Partner</th>
<th>Ex Rate</th>
<th>Payer</th>
<th>Payment Modes</th>
</tr>
</thead>
<tbody>
<tr>
<td colspan="5">No data to display</td>
</tr>
</tbody>
</table>
</div>
</div>
</div>
@ -587,7 +651,6 @@
</div>
</div>
</div>--%>
</div>
<!-- end row -->
</div>

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

@ -59,7 +59,6 @@
.lowercase {
text-transform: none !important;
}
}
</style>
<script>
$(document).ready(function () {
@ -752,7 +751,7 @@
return true;
}
function CheckFormValidation() {
// debugger;
debugger;
var reqField = "";
var val = $("#<% =hdnCustomerId.ClientID%>").val();
var customerType = $("#<% =ddlCustomerType.ClientID%>").val();
@ -1686,7 +1685,7 @@
</div>
</div>
</div>
</div>

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

@ -163,6 +163,7 @@
<%-- <asp:Button ID="btnUpdate" runat="server" CssClass="btn btn-primary m-t-25" Text="Update" OnClick="update_Click" />--%>
<asp:Button ID="btnReset" runat="server" CssClass="btn btn-primary m-t-25" Text="Reset KYC" OnClick="reset_Click" />
<asp:Button ID="btnActivate" runat="server" CssClass="btn btn-primary m-t-25" Text="Activate" OnClick="activate_Click" />
<asp:Button ID="btnMove" runat="server" CssClass="btn btn-primary m-t-25" Text="Manual Verify" OnClick="move_Click" />
</div>
</div>
</div>

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

@ -105,6 +105,8 @@ namespace Swift.web.MobileRemit.Admin.Reports
cusData.Visible = true;
registrationTypeDiv.Visible = true;
if (customerDetails.Columns.Contains("createdFrom"))
{
if ((customerDetails.Rows[0]["createdFrom"].ToString() == "C") || (customerDetails.Rows[0]["createdFrom"].ToString() == "O"))
{
if(customerDetails.Rows[0]["mobileApprovedDate"].ToString() == "")
@ -112,6 +114,7 @@ namespace Swift.web.MobileRemit.Admin.Reports
btnActivate.Enabled = true;
}
}
}
else
{
btnActivate.Enabled = false;
@ -265,5 +268,18 @@ namespace Swift.web.MobileRemit.Admin.Reports
GetStatic.AlertMessage(this, dbRes.Msg);
}
}
protected void move_Click(object sender, EventArgs e)
{
string email = txtSearchData.Value.Split('|')[2];
var dbResult = _cd.MoveCustomer(email, GetStatic.GetUser());
if (dbResult.ErrorCode == "1")
{
GetStatic.AlertMessage(this.Page, dbResult.Msg);
}
else
{
GetStatic.AlertMessage(this.Page, "Customer KYC has been successfully cleared.");
}
}
}
}

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

@ -141,6 +141,7 @@ namespace Swift.web.MobileRemit.Admin.Reports
protected global::System.Web.UI.WebControls.Button btnActivate;
/// <summary>
protected global::System.Web.UI.WebControls.Button btnMove;
/// moreData control.
/// </summary>
/// <remarks>

2
Swift.web/Remit/ThirdPartyTXN/InboundApiLog/InboundLog.aspx.cs
View File

@ -12,7 +12,7 @@ namespace Swift.web.Remit.ThirdPartyTXN.InboundApiLog
public partial class InboundLog : System.Web.UI.Page
{
private readonly ApiLogDao _apiLog = new ApiLogDao();
private const string ViewFunctionId = "20172000";
private const string ViewFunctionId = "90600000";
private readonly RemittanceLibrary _sl = new RemittanceLibrary();
protected void Page_Load(object sender, EventArgs e)

2
Swift.web/Remit/ThirdPartyTXN/InboundApiLog/InboundLogList.aspx.cs
View File

@ -13,7 +13,7 @@ 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 const string ViewFunctionId = "90600000";
private string sql;
private readonly SwiftGrid _grid = new SwiftGrid();
private readonly RemittanceLibrary _sl = new RemittanceLibrary();

2
Swift.web/Remit/ThirdPartyTXN/MobileApiLog/MobileApiLogList.aspx.cs
View File

@ -13,7 +13,7 @@ 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 const string ViewFunctionId = "90610000";
private string sql;
private readonly SwiftGrid _grid = new SwiftGrid();
private readonly RemittanceLibrary _sl = new RemittanceLibrary();

11
Swift.web/Remit/Transaction/ApproveTxn/ApproveInwardRemitance.aspx.cs
View File

@ -14,11 +14,10 @@ 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 const string ViewFunctionId = "90500000";
private const string ApproveSingleFunctionId = "90500001";
private const string RejectFuntionId = "90500002";
private readonly StaticDataDdl _sdd = new StaticDataDdl();
private readonly RemittanceLibrary _sl = new RemittanceLibrary();
protected void Page_Load(object sender, EventArgs e)
@ -98,7 +97,7 @@ namespace Swift.web.Remit.Transaction.ApproveTxn
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))
{

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

@ -181,15 +181,15 @@ namespace Swift.web.Remit.Transaction.Reports.TransactionNew
for (int i = 0; i < partnerTable.Columns.Count; i++)
{
if (i == 14 || i == 16 || i == 17 || i == 18 || i == 23 || i == 24)
if (i == 17 || i == 19 || i == 20|| i == 21 || i == 22 || i == 24 || i == 27)
{
decimal total = partnerTable.AsEnumerable()
.Sum(row => decimal.TryParse(row[i].ToString(), out decimal val) ? val : 0);
if(i == 14)
if(i == 17)
{
strTable.Append("<td align=\"left\"><b>" + total + "</b></td>");
}
else if (i == 22)
else if (i == 26)
{
strTable.Append("<td align=\"left\"><b>" + total + " USD</b></td>");
}

Write Preview
Loading…
Cancel
Save