diff --git a/Swift.DAL/Remittance/SyncDao/BankBranchDao.cs b/Swift.DAL/Remittance/SyncDao/BankBranchDao.cs index 9a4925b..5757928 100644 --- a/Swift.DAL/Remittance/SyncDao/BankBranchDao.cs +++ b/Swift.DAL/Remittance/SyncDao/BankBranchDao.cs @@ -19,6 +19,19 @@ namespace Swift.DAL.Remittance.SyncDao return ParseDbResult(sql); } + + public DbResult EnableDisablePayer(string rowId, string user, string isActive) + { + var sql = "EXEC PROC_API_BANK_BRANCH_SETUP @flag = 'enable-disable-Payer'"; + + sql += ", @user = " + FilterString(user); + sql += ", @rowId = " + FilterString(rowId); + sql += ", @IsActive = " + FilterString(isActive); + + return ParseDbResult(sql); + } + + public DbResult EnableDisableBankBranch(string rowId, string user, string isActive) { var sql = "EXEC PROC_API_BANK_BRANCH_SETUP @flag = 'enable-disable-bankBranch'"; diff --git a/Swift.DAL/Remittance/Transaction/UpdateBranchDao.cs b/Swift.DAL/Remittance/Transaction/UpdateBranchDao.cs index a3f9040..40d4d0a 100644 --- a/Swift.DAL/Remittance/Transaction/UpdateBranchDao.cs +++ b/Swift.DAL/Remittance/Transaction/UpdateBranchDao.cs @@ -102,6 +102,29 @@ namespace Swift.DAL.Remittance.Transaction return null; return ds.Tables[0]; + } + public DataTable InsertOrUpdatePayerMapping(string user, string flag, string recordId, string countryId, string parnerId, string bankId, string pMode, string payerName, string payerCode, string PbranchName, string pBranchCode, string bAddress, string isActive) + { + string sql; + sql = "EXEC Proc_UpdateBranchCode @flag = " + FilterString(flag); + sql += ", @bankId = " + FilterString(recordId); + sql += ", @payerName = " + FilterString(payerName); + sql += ", @bankName = " + FilterString(bankId); + sql += ", @pCountryName = " + FilterString(countryId); + sql += ", @payerCode = " + FilterString(payerCode); + sql += ", @branchName = " + FilterString(PbranchName); + sql += ", @branchCode = " + FilterString(pBranchCode); + sql += ", @branchAddress = " + FilterString(bAddress); + sql += ", @pMode = " + FilterString(pMode); + sql += ", @partnerId = " + FilterString(parnerId); + sql += ", @is_Active = " + FilterString(isActive); + sql += ", @user = " + FilterString(user); + + var ds = ExecuteDataset(sql); + if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0) + return null; + return ds.Tables[0]; + } public DataTable UpdateBankMapping(string user, string flag, string countryId, string parnerId, string bankId, string pMode, string bankCode1, string bankCode2, string pCurrency, string bAddress) { @@ -133,6 +156,17 @@ namespace Swift.DAL.Remittance.Transaction return null; return ds.Tables[0].Rows[0]; } + public DataRow EditPayerMappingSelectById(string bankId, string user) + { + string sql = "EXEC Proc_UpdateBranchCode"; + sql += " @flag = 'editPayerMapping'"; + sql += ", @user = " + FilterString(user); + sql += ", @bankId = " + FilterString(bankId); + DataSet ds = ExecuteDataset(sql); + if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0) + return null; + return ds.Tables[0].Rows[0]; + } public DataRow EditBankSelectById(string bankId, string user) { string sql = "EXEC Proc_UpdateBranchCode"; @@ -273,6 +307,15 @@ namespace Swift.DAL.Remittance.Transaction sql += ",@user =" + FilterString(user); return ParseDbResult(sql); } + public DbResult DeletePayerMapping(string bankId, string user) + { + string sql = "EXEC Proc_UpdateBranchCode"; + sql += " @flag ='deletePayerMapping'"; + sql += ",@bankId =" + FilterString(bankId); + sql += ",@user =" + FilterString(user); + return ParseDbResult(sql); + } + } } diff --git a/Swift.web/DashboardV2/Dashboard2.aspx.orig b/Swift.web/DashboardV2/Dashboard2.aspx.orig new file mode 100644 index 0000000..5967649 --- /dev/null +++ b/Swift.web/DashboardV2/Dashboard2.aspx.orig @@ -0,0 +1,810 @@ +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="Dashboard2.aspx.cs" Inherits="Swift.web.DashboardV2.Dashboard2" Async="true" %> + + + + + + Dashboard V2 + + + + + + + + + + + <%--Loading icon--%> + + + +
+ <%----%> +
+ <%--
--%> + +
+
+
+ +
+ + +
+
+
+

+
+
+
+
+
+ +
+
+
+
+ + <%-- +
+ + + Email + + + + Print + +
+ + + Re-Generate + +
--%> +
+
+
+
+
+
+
+
+ +
+
+
+
+
+
+ Today's Sent +

+ +

+
+
+
+ +
+
+
+
+
+
+
+
+
+
+ TODAY'S Paid +

+ +

+
+
+
+ +
+
+
+
+
+
+
+
+
+
+ TODAY'S Mobile Txn +

+ +

+
+
+
+ +
+
+
+
+
+
+
+
+
+
+ TODAY'S REG +

+ +

+
+
+
+ +
+
+
+
+
+ +
+
+
+
+
+ TODAY'S MOB REG +

+ +

+
+
+
+ +
+
+
+
+
+ +
+
+
+
+
+ TODAY'S MOB Activated +

+ +

+
+
+
+ +
+
+
+
+
+
+ +
+
+
+
+ +
Transaction Statics
+ +
+
+
+
+
+
+
+
+ +
+ + + Refresh + +
+
+ +
Branch Transaction
+
+
+
+
+ + + + <%--
+
+
+ +
Lawson Card Summary
+
+ + + + + + + + + + + + + +
S. No.DescriptionCount
No data to display!
+
+
+
+
--%> + <%--
+
+
+ +
AGENT WISE NUMBER OF TRANSACTIONS FOR CURRENT MONTH
+
+ + + + + + + + + + + + + + +
S. No.Agent NameCurrent MonthPrevious Month
No data to display!
+
+
+
+
--%> + +
+
+
+
+
+ +
+ + + Refresh + +
+
+ +
Customers Overview
+
+ + +
+
+

0

+ Total Customers +
+ +
+ + +
+
+

0

+ Total Mobile Customers +
+ +
+
+
+
+ + +<<<<<<< HEAD +======= + +>>>>>>> f60ba48f84f967ec8ff6740839bb64177be76f8c + + <%--
+
+>>>>>>> f60ba48f84f967ec8ff6740839bb64177be76f8c + +
+
+
+
+
+ <%--
+
+ +
+
Partner Wise Settlement Rate
+
+
+
+
+ + + + + + + + + + + + + + + +
S.No.PartnerEx RatePayerPayment Modes
No data to display
+
+
+
--%> +
+
+
+
+
+
+ +
+ + + Refresh + +
+
+ +
Partner Wise Settlement Rate
+
+ +
+ + + + + + + + + + + + + + + +
S.No.PartnerEx RatePayerPayment Modes
No data to display
+
+
+
+
+
+ <%--
+
+
+ +
USERWISE DAILY TRANSACTIONS
+
+ + + + + + + + + + + + + +
S. No.User NameTransaction Count
No data to display!
+
+
+
+
--%> +<<<<<<< HEAD +======= + + + + + + + + + + +>>>>>>> f60ba48f84f967ec8ff6740839bb64177be76f8c + + + + + + + +<<<<<<< HEAD + +