diff --git a/Swift.DAL/Remittance/Transaction/ApiLogDao.cs b/Swift.DAL/Remittance/Transaction/ApiLogDao.cs
index d7acd4a..c4585f8 100644
--- a/Swift.DAL/Remittance/Transaction/ApiLogDao.cs
+++ b/Swift.DAL/Remittance/Transaction/ApiLogDao.cs
@@ -10,7 +10,11 @@ namespace Swift.DAL.Remittance.Transaction
var sql = "EXEC proc_ApiLogs @flag='a',@rowId=" + FilterString(id);
return ExecuteDataRow(sql);
}
-
+ public DataRow GetInboundApiLogRecord(string id)
+ {
+ var sql = "EXEC proc_inboundApiLogs @flag='a',@rowId=" + FilterString(id);
+ return ExecuteDataRow(sql);
+ }
public DataRow GetKFTCLogRecord(string id,string User)
{
var sql = "EXEC proc_KFTCApiLogs @flag='a',@rowId=" + FilterString(id);
diff --git a/Swift.DAL/Remittance/Transaction/ApproveInwardTransactionDao.cs b/Swift.DAL/Remittance/Transaction/ApproveInwardTransactionDao.cs
new file mode 100644
index 0000000..cc99be1
--- /dev/null
+++ b/Swift.DAL/Remittance/Transaction/ApproveInwardTransactionDao.cs
@@ -0,0 +1,92 @@
+using Swift.DAL.SwiftDAL;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Swift.DAL.Remittance.Transaction
+{
+ public class ApproveInwardTransactionDao : RemittanceDao
+ {
+ public DataSet GetHoldedTXNListAdmin(string user, string branch, string id, string country, string sender, string receiver
+ , string amt, string branchId, string userType, string flag,
+ string txnDate, string txnUser, string controlNo, string controlNo1, string txnType, string sendCountry, string sendAgent, string sendBranch)
+ {
+ string sql = "EXEC proc_ApproveInwardHoldedTXN ";
+ sql += " @flag = " + FilterString(flag);
+ sql += ", @user = " + FilterString(user);
+ sql += ", @id = " + FilterString(id);
+ sql += ", @branch = " + FilterString(branch);
+ sql += ", @country = " + FilterString(country);
+ sql += ", @sender = " + FilterString(sender);
+ sql += ", @receiver = " + FilterString(receiver);
+ sql += ", @amt = " + FilterString(amt);
+ sql += ", @branchId = " + FilterString(branchId);
+ sql += ", @userType = " + FilterString(userType);
+ sql += ", @txnDate = " + FilterString(txnDate);
+ sql += ", @txncreatedBy = " + FilterString(txnUser);
+ sql += ", @ControlNo = " + FilterString(controlNo);
+ sql += ", @tpControlNo2 = " + FilterString(controlNo1);
+ sql += ", @txnType = " + FilterString(txnType);
+ sql += ", @sendCountry = " + FilterString(sendCountry);
+ sql += ", @sendAgent = " + FilterString(sendAgent);
+ sql += ", @sendBranch = " + FilterString(sendBranch);
+ return ExecuteDataset(sql);
+ }
+
+
+ public DbResult ApproveAllHoldedTXN(string user, string idList)
+ {
+ var sb = new StringBuilder("");
+ var list = idList.Split(',');
+ foreach (var itm in list)
+ {
+ sb.Append("
");
+ }
+ sb.Append("");
+
+ var sql = "EXEC proc_ApproveInwardHoldedTXN @flag = 'approve-all'";
+ sql += ", @user = " + FilterString(user);
+ sql += ", @idList = " + FilterString(sb.ToString());
+ return ParseDbResult(sql);
+ }
+
+ public DataSet GetHoldAdminTransactionSummary(string user, string branchId, string userType)
+ {
+ string sql = "EXEC proc_ApproveInwardHoldedTXN ";
+ sql += " @flag = 's_admin_txn_summary'";
+ sql += ", @user = " + FilterString(user);
+ sql += ", @branchId = " + FilterString(branchId);
+ sql += ", @userType = " + FilterString(userType);
+ return ExecuteDataset(sql);
+ }
+ public DbResult GetTxnApproveDataIMEPay(string user, string id)
+ {
+ var sql = "EXEC proc_ApproveInwardHoldedTXN @flag = 'get-info-imepay'";
+ sql += ", @user = " + FilterString(user);
+ sql += ", @id = " + FilterString(id);
+ var drDb = ParseDbResultNew(sql);
+ return drDb;
+ }
+ public DbResult ApproveHoldedTXN(string user, string id)
+ {
+ var sql = "EXEC proc_ApproveInwardHoldedTXN @flag = 'approve'";
+ sql += ", @user = " + FilterString(user);
+ sql += ", @id = " + FilterString(id);
+ var drDb = ParseDbResult(sql);
+ return drDb;
+ }
+ public DbResult RejectHoldedTXN(string user, string id, string controlNO = "", string remarks = "")
+ {
+ var sql = "EXEC proc_ApproveInwardHoldedTXN @flag = 'reject'";
+ sql += ", @user = " + FilterString(user);
+ sql += ", @id = " + FilterString(id);
+ sql += ", @remarks = " + FilterString(remarks);
+ sql += ", @ControlNo = " + FilterString(controlNO);
+
+ return ParseDbResult(sql);
+ }
+ }
+}
diff --git a/Swift.DAL/Remittance/Transaction/TranAgentReportDao.cs b/Swift.DAL/Remittance/Transaction/TranAgentReportDao.cs
index 10ff213..1d73fb3 100644
--- a/Swift.DAL/Remittance/Transaction/TranAgentReportDao.cs
+++ b/Swift.DAL/Remittance/Transaction/TranAgentReportDao.cs
@@ -542,13 +542,15 @@ namespace Swift.DAL.BL.Remit.Transaction
return ParseReportResult(sql);
}
- public DataTable TxnReport(string user, string pCountry, string pAgent, string depositType, string orderBy, string status, string paymentType, string dateField, string from, string to, string transType, string displayTranNo, string searchBy, string searchByValue, string pageNumber, string pageSize, string rptType, string tFrom, string postCode, string promoCode)
+ public DataTable TxnReport(string user, string pCountry, string pAgent, string sCountry, string depositType,string remitTYpe, string orderBy, string status, string paymentType, string dateField, string from, string to, string transType, string displayTranNo, string searchBy, string searchByValue, string pageNumber, string pageSize, string rptType, string tFrom, string postCode, string promoCode)
{
string sql = "EXEC PROC_TRANSACTION_REPORT ";
sql += " @user=" + FilterString(user);
sql += ", @pCountry = " + FilterString(pCountry);
sql += ", @pAgent = " + FilterString(pAgent);
+ sql += ", @sCountry = " + FilterString(sCountry);
sql += ", @depositType = " + FilterString(depositType);
+ sql += ", @remitTYpe = " + FilterString(remitTYpe);
sql += ", @orderBy = " + FilterString(orderBy);
sql += ", @status = " + FilterString(status);
sql += ", @paymentType = " + FilterString(paymentType);
diff --git a/Swift.DAL/Swift.DAL.csproj b/Swift.DAL/Swift.DAL.csproj
index b7b819f..48128eb 100644
--- a/Swift.DAL/Swift.DAL.csproj
+++ b/Swift.DAL/Swift.DAL.csproj
@@ -383,6 +383,7 @@
+
diff --git a/Swift.web/DashboardV2/Dashboard2.aspx b/Swift.web/DashboardV2/Dashboard2.aspx
index 849efaa..b02e84c 100644
--- a/Swift.web/DashboardV2/Dashboard2.aspx
+++ b/Swift.web/DashboardV2/Dashboard2.aspx
@@ -542,6 +542,20 @@
+
+
+
+ <%--
+
+
diff --git a/Swift.web/MobileRemit/Admin/Operation/EditCustomerForApproval.aspx b/Swift.web/MobileRemit/Admin/Operation/EditCustomerForApproval.aspx
index 13e48af..d724458 100644
--- a/Swift.web/MobileRemit/Admin/Operation/EditCustomerForApproval.aspx
+++ b/Swift.web/MobileRemit/Admin/Operation/EditCustomerForApproval.aspx
@@ -59,6 +59,7 @@
.lowercase {
text-transform: none !important;
}
+ }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+