From 5149087b365fd878c605851c8c3b26f9012c1838 Mon Sep 17 00:00:00 2001 From: Leeza Baidar Date: Sun, 8 Oct 2023 13:05:11 +0545 Subject: [PATCH] view txn and view receiver changes --- .../Business/HomeBusiness/HomeBusiness.cs | 5 + .../Business/HomeBusiness/IHomeBusiness.cs | 1 + .../ReceiverBusiness/IReceiverBusiness.cs | 6 +- .../ReceiverBusiness/ReceiverBusiness.cs | 12 +- .../ITransactionBusiness.cs | 2 + .../TransactionBusiness.cs | 8 +- .../Models/HomeModel/HomeModel.cs | 2 + .../HomeRepository/HomeRepository.cs | 49 +++++ .../HomeRepository/IHomeRepository.cs | 1 + .../ReceiverRepository/IReceiverRepository.cs | 6 +- .../ReceiverRepository/ReceiverRepository.cs | 59 +++++- .../ITransactionRepository.cs | 2 + .../TransactionRepository.cs | 52 +++++ .../Controllers/HomeController.cs | 11 + .../ReceiverInformationController.cs | 15 ++ .../Controllers/TransactionController.cs | 20 ++ .../CustomerOnlineV2/Views/Home/Index.cshtml | 4 +- .../ViewReceiverList.cshtml | 172 ++++++++++++++++ .../Views/Transaction/ViewAllTxn.cshtml | 194 ++++++++++++++++++ 19 files changed, 607 insertions(+), 14 deletions(-) create mode 100644 CustomerOnlineV2/CustomerOnlineV2/Views/ReceiverInformation/ViewReceiverList.cshtml create mode 100644 CustomerOnlineV2/CustomerOnlineV2/Views/Transaction/ViewAllTxn.cshtml diff --git a/CustomerOnlineV2/CustomerOnlineV2.Business/Business/HomeBusiness/HomeBusiness.cs b/CustomerOnlineV2/CustomerOnlineV2.Business/Business/HomeBusiness/HomeBusiness.cs index 73443f6..ee5d43d 100644 --- a/CustomerOnlineV2/CustomerOnlineV2.Business/Business/HomeBusiness/HomeBusiness.cs +++ b/CustomerOnlineV2/CustomerOnlineV2.Business/Business/HomeBusiness/HomeBusiness.cs @@ -40,5 +40,10 @@ namespace CustomerOnlineV2.Business.Business.HomeBusiness { return await _homeRepo.GetReceiverDetailById(id); } + + public async Task GetAllReceiverList(LoginResponse loginDetails) + { + return await _homeRepo.GetAllReceiverList(loginDetails); + } } } diff --git a/CustomerOnlineV2/CustomerOnlineV2.Business/Business/HomeBusiness/IHomeBusiness.cs b/CustomerOnlineV2/CustomerOnlineV2.Business/Business/HomeBusiness/IHomeBusiness.cs index d22b12a..85b7390 100644 --- a/CustomerOnlineV2/CustomerOnlineV2.Business/Business/HomeBusiness/IHomeBusiness.cs +++ b/CustomerOnlineV2/CustomerOnlineV2.Business/Business/HomeBusiness/IHomeBusiness.cs @@ -10,5 +10,6 @@ namespace CustomerOnlineV2.Business.Business.HomeBusiness Task GetDDLList(CommonDropDownModel model, LoginResponse loginDetails); Task GetTranDetailById(string tranId); Task GetReceiverDetailById(string id); + Task GetAllReceiverList(LoginResponse loginDetails); } } diff --git a/CustomerOnlineV2/CustomerOnlineV2.Business/Business/ReceiverBusiness/IReceiverBusiness.cs b/CustomerOnlineV2/CustomerOnlineV2.Business/Business/ReceiverBusiness/IReceiverBusiness.cs index df50efc..9c2519b 100644 --- a/CustomerOnlineV2/CustomerOnlineV2.Business/Business/ReceiverBusiness/IReceiverBusiness.cs +++ b/CustomerOnlineV2/CustomerOnlineV2.Business/Business/ReceiverBusiness/IReceiverBusiness.cs @@ -1,4 +1,6 @@ -using CustomerOnlineV2.Common.Models.ReceiverModel; +using CustomerOnlineV2.Common.Models.AccountModel; +using CustomerOnlineV2.Common.Models.HomeModel; +using CustomerOnlineV2.Common.Models.ReceiverModel; using System; using System.Collections.Generic; using System.Linq; @@ -10,5 +12,7 @@ namespace CustomerOnlineV2.Business.Business.ReceiverBusiness public interface IReceiverBusiness { Task Receivers(ReceiverInformationModel model, string id, string user); + // Task GetCustomerReceiverList(LoginResponse loginDetails); + Task GetAllReceiverList(LoginResponse loginDetails); } } diff --git a/CustomerOnlineV2/CustomerOnlineV2.Business/Business/ReceiverBusiness/ReceiverBusiness.cs b/CustomerOnlineV2/CustomerOnlineV2.Business/Business/ReceiverBusiness/ReceiverBusiness.cs index 2d82618..907148c 100644 --- a/CustomerOnlineV2/CustomerOnlineV2.Business/Business/ReceiverBusiness/ReceiverBusiness.cs +++ b/CustomerOnlineV2/CustomerOnlineV2.Business/Business/ReceiverBusiness/ReceiverBusiness.cs @@ -1,5 +1,7 @@ using CustomerOnlineV2.Common.Helper; using CustomerOnlineV2.Common.Models; +using CustomerOnlineV2.Common.Models.AccountModel; +using CustomerOnlineV2.Common.Models.HomeModel; using CustomerOnlineV2.Common.Models.ReceiverModel; using CustomerOnlineV2.Common.Models.TransactionModel; using CustomerOnlineV2.Repository.Repository.ReceiverRepository; @@ -24,16 +26,14 @@ namespace CustomerOnlineV2.Business.Business.ReceiverBusiness public async Task Receivers(ReceiverInformationModel model , string id, string user) { - - - var model1 = await _receiverRepository.GetReceiverDetails(model , id, user) ; return model1; } - - + public async Task GetAllReceiverList(LoginResponse loginDetails) + { + return await _receiverRepository.GetAllReceiverList(loginDetails); + } } - } diff --git a/CustomerOnlineV2/CustomerOnlineV2.Business/Business/TransactionBusiness/ITransactionBusiness.cs b/CustomerOnlineV2/CustomerOnlineV2.Business/Business/TransactionBusiness/ITransactionBusiness.cs index 88f07f6..3ac1abf 100644 --- a/CustomerOnlineV2/CustomerOnlineV2.Business/Business/TransactionBusiness/ITransactionBusiness.cs +++ b/CustomerOnlineV2/CustomerOnlineV2.Business/Business/TransactionBusiness/ITransactionBusiness.cs @@ -1,4 +1,5 @@ using CustomerOnlineV2.Common.Models.AccountModel; +using CustomerOnlineV2.Common.Models.HomeModel; using CustomerOnlineV2.Common.Models.TransactionModel; using System.Threading.Tasks; @@ -11,5 +12,6 @@ namespace CustomerOnlineV2.Business.Business.TransactionBusiness Task GetTransactionDetails(string id, LoginResponse loginDetails); Task GetReceiptData(string id, LoginResponse loginDetails); Task saveTranData(TrustPaymentRequest tranData, LoginResponse loginDetails); + Task GetTranData(LoginResponse loginDetails); } } diff --git a/CustomerOnlineV2/CustomerOnlineV2.Business/Business/TransactionBusiness/TransactionBusiness.cs b/CustomerOnlineV2/CustomerOnlineV2.Business/Business/TransactionBusiness/TransactionBusiness.cs index d4811bc..a733322 100644 --- a/CustomerOnlineV2/CustomerOnlineV2.Business/Business/TransactionBusiness/TransactionBusiness.cs +++ b/CustomerOnlineV2/CustomerOnlineV2.Business/Business/TransactionBusiness/TransactionBusiness.cs @@ -2,6 +2,7 @@ using CustomerOnlineV2.Common.Helper; using CustomerOnlineV2.Common.Models; using CustomerOnlineV2.Common.Models.AccountModel; +using CustomerOnlineV2.Common.Models.HomeModel; using CustomerOnlineV2.Common.Models.TransactionModel; using CustomerOnlineV2.Repository.Repository.TransactionRepository; using Microsoft.Extensions.Logging; @@ -79,7 +80,7 @@ namespace CustomerOnlineV2.Business.Business.TransactionBusiness SIpAddress = sendMoneyRequest.IpAddress, IsRealtime = "false", RequestBy = "mobile", - Receiver = new ReceiverModel { ReceiverId = sendMoneyRequest.Receiver }, + Receiver = new Common.Models.TransactionModel.ReceiverModel { ReceiverId = sendMoneyRequest.Receiver }, CDDI = new CDDIModel { PurposeOfRemittance = sendMoneyRequest.PurposeOfRemit, @@ -331,5 +332,10 @@ namespace CustomerOnlineV2.Business.Business.TransactionBusiness } return _response; } + + public async Task GetTranData(LoginResponse loginDetails) + { + return await _transactionRepo.GetTranData(loginDetails); + } } } diff --git a/CustomerOnlineV2/CustomerOnlineV2.Common/Models/HomeModel/HomeModel.cs b/CustomerOnlineV2/CustomerOnlineV2.Common/Models/HomeModel/HomeModel.cs index 3f08606..9508e3a 100644 --- a/CustomerOnlineV2/CustomerOnlineV2.Common/Models/HomeModel/HomeModel.cs +++ b/CustomerOnlineV2/CustomerOnlineV2.Common/Models/HomeModel/HomeModel.cs @@ -51,6 +51,8 @@ public string? serviceCharge { get; set; } public string? acAmt { get; set; } public string? pCountry { get; set;} + public string? receiverName { get; set;} + public string? recAccountNum { get; set;} } public class CommonDropDownModel diff --git a/CustomerOnlineV2/CustomerOnlineV2.Repository/Repository/HomeRepository/HomeRepository.cs b/CustomerOnlineV2/CustomerOnlineV2.Repository/Repository/HomeRepository/HomeRepository.cs index ba4a276..ffacbc8 100644 --- a/CustomerOnlineV2/CustomerOnlineV2.Repository/Repository/HomeRepository/HomeRepository.cs +++ b/CustomerOnlineV2/CustomerOnlineV2.Repository/Repository/HomeRepository/HomeRepository.cs @@ -266,5 +266,54 @@ namespace CustomerOnlineV2.Repository.Repository.HomeRepository } return await Task.FromResult(_response); } + + public async Task GetAllReceiverList(LoginResponse loginDetails) + { + CustomerReceiverModel _response = new CustomerReceiverModel(); + try + { + var sql = "EXEC PROC_DYNAMIC_TABLE"; + sql += " @Flag = " + _connHelper.FilterString("CustomerReceiver-all"); + sql += ",@User = " + _connHelper.FilterString(loginDetails.UserName); + sql += ",@id = " + _connHelper.FilterString(loginDetails.UserId); + _logger.LogDebug("HOMEREPOSITORY | GETRECEIVERLIST | SQL | " + sql); + var dt = _connHelper.ExecuteDataTable(sql); + + if (dt == null || dt.Rows.Count <= 0) + { + _response.ResponseCode = ResponseHelper.FAILED; + _response.ResponseMessage = "DB Null Error!"; + + _logger.LogError("HOMEREPOSITORY | GETRECEIVERLIST | DB RESPONSE | " + JsonConvert.SerializeObject(_response)); + } + else + { + _response.ResponseCode = Convert.ToInt16(dt.Rows[0]["errorCode"]); + _response.ResponseMessage = Convert.ToString(dt.Rows[0]["msg"]); + + List obj = new List(); + foreach (DataRow item in dt.Rows) + { + obj.Add(new ReceiverModel + { + Id = Convert.ToString(item["Id"]), + Name = Convert.ToString(item["Name"]), + Mobile = Convert.ToString(item["Mobile"]), + Country = Convert.ToString(item["Country"]), + TransactionType = Convert.ToString(item["TransactionType"]) + }); + } + _response.ReceiverModel = obj; + } + } + catch (Exception ex) + { + _response.ResponseCode = ResponseHelper.EXCEPTION; + _response.ResponseMessage = "Exception occured: " + ex.Message; + + _logger.LogError("HOMEREPOSITORY | GETRECEIVERLIST | EXCEPTION | " + JsonConvert.SerializeObject(_response)); + } + return await Task.FromResult(_response); + } } } diff --git a/CustomerOnlineV2/CustomerOnlineV2.Repository/Repository/HomeRepository/IHomeRepository.cs b/CustomerOnlineV2/CustomerOnlineV2.Repository/Repository/HomeRepository/IHomeRepository.cs index 94fcb23..95df3bb 100644 --- a/CustomerOnlineV2/CustomerOnlineV2.Repository/Repository/HomeRepository/IHomeRepository.cs +++ b/CustomerOnlineV2/CustomerOnlineV2.Repository/Repository/HomeRepository/IHomeRepository.cs @@ -10,5 +10,6 @@ namespace CustomerOnlineV2.Repository.Repository.HomeRepository Task GetDDLList(CommonDropDownModel model, LoginResponse loginDetails); Task GetTranDetailById(string id); Task GetReceiverDetailById(string id); + Task GetAllReceiverList(LoginResponse loginDetails); } } diff --git a/CustomerOnlineV2/CustomerOnlineV2.Repository/Repository/ReceiverRepository/IReceiverRepository.cs b/CustomerOnlineV2/CustomerOnlineV2.Repository/Repository/ReceiverRepository/IReceiverRepository.cs index 3803062..4171cf7 100644 --- a/CustomerOnlineV2/CustomerOnlineV2.Repository/Repository/ReceiverRepository/IReceiverRepository.cs +++ b/CustomerOnlineV2/CustomerOnlineV2.Repository/Repository/ReceiverRepository/IReceiverRepository.cs @@ -1,4 +1,6 @@ -using CustomerOnlineV2.Common.Models.ReceiverModel; +using CustomerOnlineV2.Common.Models.AccountModel; +using CustomerOnlineV2.Common.Models.HomeModel; +using CustomerOnlineV2.Common.Models.ReceiverModel; using System; using System.Collections.Generic; using System.Linq; @@ -13,5 +15,7 @@ namespace CustomerOnlineV2.Repository.Repository.ReceiverRepository { // Task GetReceiverDetails(ReceiverInformationModel model); Task GetReceiverDetails(ReceiverInformationModel model, string id, string user); + //Task GetCustomerReceiverList(LoginResponse loginDetails); + Task GetAllReceiverList(LoginResponse loginDetails); } } diff --git a/CustomerOnlineV2/CustomerOnlineV2.Repository/Repository/ReceiverRepository/ReceiverRepository.cs b/CustomerOnlineV2/CustomerOnlineV2.Repository/Repository/ReceiverRepository/ReceiverRepository.cs index ef56cdc..9209d15 100644 --- a/CustomerOnlineV2/CustomerOnlineV2.Repository/Repository/ReceiverRepository/ReceiverRepository.cs +++ b/CustomerOnlineV2/CustomerOnlineV2.Repository/Repository/ReceiverRepository/ReceiverRepository.cs @@ -1,20 +1,26 @@ using CustomerOnlineV2.Common.Models; +using CustomerOnlineV2.Common.Models.AccountModel; +using CustomerOnlineV2.Common.Models.HomeModel; using CustomerOnlineV2.Common.Models.ReceiverModel; using CustomerOnlineV2.Repository.ConnectionHelper; +using Microsoft.Extensions.Logging; +using Newtonsoft.Json; +using System.Data; namespace CustomerOnlineV2.Repository.Repository.ReceiverRepository { public class ReceiverRepository : IReceiverRepository { - //private readonly ILogger _logger; + private readonly ILogger _logger; private readonly IConnectionHelper _connHelper; - public ReceiverRepository( IConnectionHelper connHelper) + public ReceiverRepository(ILogger logger, IConnectionHelper connHelper) { _connHelper = connHelper; + _logger = logger; } - + public async Task GetReceiverDetails(ReceiverInformationModel model, string id , string user ) { //ReceiverInformationModel _response = new ReceiverInformationModel(); @@ -104,6 +110,53 @@ namespace CustomerOnlineV2.Repository.Repository.ReceiverRepository //return await _response; } + public async Task GetAllReceiverList(LoginResponse loginDetails) + { + CustomerReceiverModel _response = new CustomerReceiverModel(); + try + { + var sql = "EXEC PROC_DYNAMIC_TABLE"; + sql += " @Flag = " + _connHelper.FilterString("CustomerReceiver-all"); + sql += ",@User = " + _connHelper.FilterString(loginDetails.UserName); + sql += ",@id = " + _connHelper.FilterString(loginDetails.UserId); + _logger.LogDebug("RECEIVERREPOSITORY | GETRECEIVERLIST | SQL | " + sql); + var dt = _connHelper.ExecuteDataTable(sql); + + if (dt == null || dt.Rows.Count <= 0) + { + _response.ResponseCode = ResponseHelper.FAILED; + _response.ResponseMessage = "DB Null Error!"; + _logger.LogError("RECEIVERREPOSITORY | GETRECEIVERLIST | DB RESPONSE | " + JsonConvert.SerializeObject(_response)); + } + else + { + _response.ResponseCode = Convert.ToInt16(dt.Rows[0]["errorCode"]); + _response.ResponseMessage = Convert.ToString(dt.Rows[0]["msg"]); + + List obj = new List(); + foreach (DataRow item in dt.Rows) + { + obj.Add(new ReceiverModel + { + Id = Convert.ToString(item["Id"]), + Name = Convert.ToString(item["Name"]), + Mobile = Convert.ToString(item["Mobile"]), + Country = Convert.ToString(item["Country"]), + TransactionType = Convert.ToString(item["TransactionType"]) + }); + } + _response.ReceiverModel = obj; + } + } + catch (Exception ex) + { + _response.ResponseCode = ResponseHelper.EXCEPTION; + _response.ResponseMessage = "Exception occured: " + ex.Message; + + _logger.LogError("RECEIVERREPOSITORY | GETRECEIVERLIST | EXCEPTION | " + JsonConvert.SerializeObject(_response)); + } + return await Task.FromResult(_response); + } } } diff --git a/CustomerOnlineV2/CustomerOnlineV2.Repository/Repository/TransactionRepository/ITransactionRepository.cs b/CustomerOnlineV2/CustomerOnlineV2.Repository/Repository/TransactionRepository/ITransactionRepository.cs index af17720..c5fe597 100644 --- a/CustomerOnlineV2/CustomerOnlineV2.Repository/Repository/TransactionRepository/ITransactionRepository.cs +++ b/CustomerOnlineV2/CustomerOnlineV2.Repository/Repository/TransactionRepository/ITransactionRepository.cs @@ -1,4 +1,5 @@ using CustomerOnlineV2.Common.Models.AccountModel; +using CustomerOnlineV2.Common.Models.HomeModel; using CustomerOnlineV2.Common.Models.TransactionModel; namespace CustomerOnlineV2.Repository.Repository.TransactionRepository @@ -9,5 +10,6 @@ namespace CustomerOnlineV2.Repository.Repository.TransactionRepository Task GetTransactionDetails(string id, LoginResponse loginDetails); Task GetReceiptData(string id, LoginResponse loginDetails); Task saveTranData(TrustPaymentRequest tranData, LoginResponse loginDetails); + Task GetTranData(LoginResponse loginDetails); } } diff --git a/CustomerOnlineV2/CustomerOnlineV2.Repository/Repository/TransactionRepository/TransactionRepository.cs b/CustomerOnlineV2/CustomerOnlineV2.Repository/Repository/TransactionRepository/TransactionRepository.cs index 4cd51eb..9016a41 100644 --- a/CustomerOnlineV2/CustomerOnlineV2.Repository/Repository/TransactionRepository/TransactionRepository.cs +++ b/CustomerOnlineV2/CustomerOnlineV2.Repository/Repository/TransactionRepository/TransactionRepository.cs @@ -4,6 +4,8 @@ using CustomerOnlineV2.Common.Models; using CustomerOnlineV2.Repository.ConnectionHelper; using Microsoft.Extensions.Logging; using Newtonsoft.Json; +using CustomerOnlineV2.Common.Models.HomeModel; +using System.Data; namespace CustomerOnlineV2.Repository.Repository.TransactionRepository { @@ -216,5 +218,55 @@ namespace CustomerOnlineV2.Repository.Repository.TransactionRepository } return await Task.FromResult(_response); } + + public async Task GetTranData(LoginResponse loginDetails) + { + CustomerTransactionList _response = new CustomerTransactionList(); + try + { + var sql = "EXEC PROC_DYNAMIC_TABLE"; + sql += " @Flag = " + _connHelper.FilterString("CustomerTxn-all"); + sql += ",@User = " + _connHelper.FilterString(loginDetails.UserName); + sql += ",@id = " + _connHelper.FilterString(loginDetails.UserId); + _logger.LogDebug("HOMEREPOSITORY | GETTRANDATA | SQL | " + sql); + var dt = _connHelper.ExecuteDataTable(sql); + + if (dt == null || dt.Rows.Count <= 0) + { + _response.ResponseCode = ResponseHelper.FAILED; + _response.ResponseMessage = "DB Null Error!"; + + _logger.LogError("HOMEREPOSITORY | GETTRANDATA | DB RESPONSE | " + JsonConvert.SerializeObject(_response)); + } + else + { + _response.ResponseCode = Convert.ToInt16(dt.Rows[0]["errorCode"]); + _response.ResponseMessage = Convert.ToString(dt.Rows[0]["msg"]); + + List obj = new List(); + foreach (DataRow item in dt.Rows) + { + obj.Add(new CustomerTransaction + { + Id = Convert.ToString(item["Id"]), + Amount = Convert.ToString(item["Amount"]), + receiverName = Convert.ToString(item["recName"]), + recAccountNum = Convert.ToString(item["recAccNum"]), + PaymentMethod = Convert.ToString(item["PaymentMethod"]), + pCountry = Convert.ToString(item["pcOuntry"]), + }); + } + _response.CustomerTransaction = obj; + } + } + catch (Exception ex) + { + _response.ResponseCode = ResponseHelper.EXCEPTION; + _response.ResponseMessage = "Exception occured: " + ex.Message; + + _logger.LogError("HOMEREPOSITORY | GETTRANDATA | EXCEPTION | " + JsonConvert.SerializeObject(_response)); + } + return await Task.FromResult(_response); + } } } diff --git a/CustomerOnlineV2/CustomerOnlineV2/Controllers/HomeController.cs b/CustomerOnlineV2/CustomerOnlineV2/Controllers/HomeController.cs index 6232a6e..88798ea 100644 --- a/CustomerOnlineV2/CustomerOnlineV2/Controllers/HomeController.cs +++ b/CustomerOnlineV2/CustomerOnlineV2/Controllers/HomeController.cs @@ -8,6 +8,7 @@ using Microsoft.AspNetCore.Authentication; using Microsoft.AspNetCore.Authorization; using CustomerOnlineV2.Common.Models.HomeModel; using CustomerOnlineV2.Authorization; +using CustomerOnlineV2.Common.Models.ReceiverModel; namespace CustomerOnlineV2.Controllers { @@ -87,5 +88,15 @@ namespace CustomerOnlineV2.Controllers { return await _homeBusiness.GetReceiverDetailById(id); } + + [HttpPost] + [ValidateAntiForgeryToken] + [Authorization("GetAllReceiver")] + public async Task GetAllReceiver() + { + var loginDetails = HttpContext.GetLoginDetails(); + + return await _homeBusiness.GetAllReceiverList(loginDetails); + } } } \ No newline at end of file diff --git a/CustomerOnlineV2/CustomerOnlineV2/Controllers/ReceiverInformationController.cs b/CustomerOnlineV2/CustomerOnlineV2/Controllers/ReceiverInformationController.cs index 906f1f0..1cb0d19 100644 --- a/CustomerOnlineV2/CustomerOnlineV2/Controllers/ReceiverInformationController.cs +++ b/CustomerOnlineV2/CustomerOnlineV2/Controllers/ReceiverInformationController.cs @@ -1,6 +1,7 @@ using CustomerOnlineV2.Authorization; using CustomerOnlineV2.Business.Business.ReceiverBusiness; using CustomerOnlineV2.Common.Helper; +using CustomerOnlineV2.Common.Models.HomeModel; using CustomerOnlineV2.Common.Models.ReceiverModel; using Microsoft.AspNetCore.Mvc; using Controller = Microsoft.AspNetCore.Mvc.Controller; @@ -38,6 +39,20 @@ namespace CustomerOnlineV2.Controllers return receiver1; } + [Authorization("ViewReceiverList")] + public IActionResult ViewReceiverList() + { + return View(); + } + + [HttpPost] + [ValidateAntiForgeryToken] + [Authorization("GetAllReceiver")] + public async Task GetReceiverListAll() + { + var loginDetails = HttpContext.GetLoginDetails(); + return await _receiverBusiness.GetAllReceiverList(loginDetails); + } } } diff --git a/CustomerOnlineV2/CustomerOnlineV2/Controllers/TransactionController.cs b/CustomerOnlineV2/CustomerOnlineV2/Controllers/TransactionController.cs index bec7b63..b825cb4 100644 --- a/CustomerOnlineV2/CustomerOnlineV2/Controllers/TransactionController.cs +++ b/CustomerOnlineV2/CustomerOnlineV2/Controllers/TransactionController.cs @@ -8,6 +8,8 @@ using CustomerOnlineV2.Authorization; using System.Text; using System.Security.Cryptography; using NuGet.Protocol.Plugins; +using CustomerOnlineV2.Common.Models.HomeModel; +using CustomerOnlineV2.Common.Models.AccountModel; namespace CustomerOnlineV2.Controllers { @@ -222,5 +224,23 @@ namespace CustomerOnlineV2.Controllers { return View(); } + + [Authorization("ViewAllTxn")] + public IActionResult ViewAllTxn() + { + return View(); + } + + [HttpPost] + [ValidateAntiForgeryToken] + [Authorization("GetAllTxnList")] + public async Task GetAllTxnList() + { + var loginDetails = HttpContext.GetLoginDetails(); + + return await _transactionBusiness.GetTranData(loginDetails); + } + + } } diff --git a/CustomerOnlineV2/CustomerOnlineV2/Views/Home/Index.cshtml b/CustomerOnlineV2/CustomerOnlineV2/Views/Home/Index.cshtml index 156b0be..a509abc 100644 --- a/CustomerOnlineV2/CustomerOnlineV2/Views/Home/Index.cshtml +++ b/CustomerOnlineV2/CustomerOnlineV2/Views/Home/Index.cshtml @@ -179,7 +179,7 @@
- View all Transactions + View all Transactions
@@ -276,7 +276,7 @@
- View all Receivers + View all Receivers
diff --git a/CustomerOnlineV2/CustomerOnlineV2/Views/ReceiverInformation/ViewReceiverList.cshtml b/CustomerOnlineV2/CustomerOnlineV2/Views/ReceiverInformation/ViewReceiverList.cshtml new file mode 100644 index 0000000..36ae7c3 --- /dev/null +++ b/CustomerOnlineV2/CustomerOnlineV2/Views/ReceiverInformation/ViewReceiverList.cshtml @@ -0,0 +1,172 @@ +@using CustomerOnlineV2.Common.Helper +@{ + Layout = "_Layout2"; +} + + + + + + + + + + +
+
+
+ + + +
+ + + + +
+ +
+
+ + + + +
+ +
+

My Receivers

+
+
+
Add Receivers | Send Money
+
+ + +
+
+
Name
+
Re-Send
+
Country
+
Transaction Type
+
+
+ + +
+
+
+
+
Re-Send
+
+
+
+
+
+ + + +
+
+ + + + + +
+ + +
+
+
+
+
+
+

+ IME London is a product of Subhida UK Limited, Pentax House,South Hill Avenue, South Harrow, London, H2A 0D + + Company Registration No. 06432399 Subhida UK Ltd is authorized and regulated by the Financial Conduct + Authority (FCA)
under the Payment Service Regulations 2017. FCA Registration No. 576127 HMRC Registration No. XYML000000119350 +

+ +
+
+
+
+
+
+

© IME London, 2023

+
+ +
+
+
+
+
+ +
+ + + + + + +@section scripts{ + + +} \ No newline at end of file diff --git a/CustomerOnlineV2/CustomerOnlineV2/Views/Transaction/ViewAllTxn.cshtml b/CustomerOnlineV2/CustomerOnlineV2/Views/Transaction/ViewAllTxn.cshtml new file mode 100644 index 0000000..6b38380 --- /dev/null +++ b/CustomerOnlineV2/CustomerOnlineV2/Views/Transaction/ViewAllTxn.cshtml @@ -0,0 +1,194 @@ +@using CustomerOnlineV2.Common.Helper +@{ + Layout = "_Layout2"; +} + + + + + + + + + + +
+
+
+ + + +
+ +
+ +
+
+ + + + +
+ +
+

Transactions Details

+
+
+
Add Receivers | Send Money
+
+ + +
+
+
Receiver Details
+
Amount
+
Repeat
+
Country
+
Transaction Type
+
+
+ + +
+ +
+
+
+
+ +
+
+
+
+
+ + + +
+
+ + +
+ + +
+
+ + +
+ +
+
+
+

+ IME London is a product of Subhida UK Limited, Pentax House,South Hill Avenue, South Harrow, London, H2A 0D + + Company Registration No. 06432399 Subhida UK Ltd is authorized and regulated by the Financial Conduct + Authority (FCA)
under the Payment Service Regulations 2017. FCA Registration No. 576127 HMRC Registration No. XYML000000119350 +

+ +
+
+
+ +
+
+
+

© IME London, 2023

+
+ +
+
+
+
+
+ +
+ + + + + + + + + + + + + + + + +@section scripts{ + + +}