diff --git a/CustomerOnlineV2/CustomerOnlineV2.Business/Business/TransactionBusiness/ITransactionBusiness.cs b/CustomerOnlineV2/CustomerOnlineV2.Business/Business/TransactionBusiness/ITransactionBusiness.cs index d8faf1d..127b19a 100644 --- a/CustomerOnlineV2/CustomerOnlineV2.Business/Business/TransactionBusiness/ITransactionBusiness.cs +++ b/CustomerOnlineV2/CustomerOnlineV2.Business/Business/TransactionBusiness/ITransactionBusiness.cs @@ -16,5 +16,6 @@ namespace CustomerOnlineV2.Business.Business.TransactionBusiness Task UpdateTranData(TrustPaymentRequest tranData, LoginResponse loginDetails); Task GetTranData(LoginResponse loginDetails); Task GetTransactionReportList(LoginResponse loginDetails, CustomerTransaction model); + Task GetRewardPoints(LoginResponse loginDetails); } } diff --git a/CustomerOnlineV2/CustomerOnlineV2.Business/Business/TransactionBusiness/TransactionBusiness.cs b/CustomerOnlineV2/CustomerOnlineV2.Business/Business/TransactionBusiness/TransactionBusiness.cs index bd3c9b0..c2b8837 100644 --- a/CustomerOnlineV2/CustomerOnlineV2.Business/Business/TransactionBusiness/TransactionBusiness.cs +++ b/CustomerOnlineV2/CustomerOnlineV2.Business/Business/TransactionBusiness/TransactionBusiness.cs @@ -345,5 +345,9 @@ namespace CustomerOnlineV2.Business.Business.TransactionBusiness { return await _transactionRepo.GetTransactionReportList(loginDetails, model); } + public async Task GetRewardPoints(LoginResponse loginDetails) + { + return (CustomerNotificationModel)await _transactionRepo.GetRewardPoints(loginDetails); + } } } diff --git a/CustomerOnlineV2/CustomerOnlineV2.Common/Models/TransactionModel/ExrateResponse.cs b/CustomerOnlineV2/CustomerOnlineV2.Common/Models/TransactionModel/ExrateResponse.cs index ea5a7a2..640d9e3 100644 --- a/CustomerOnlineV2/CustomerOnlineV2.Common/Models/TransactionModel/ExrateResponse.cs +++ b/CustomerOnlineV2/CustomerOnlineV2.Common/Models/TransactionModel/ExrateResponse.cs @@ -129,6 +129,7 @@ namespace CustomerOnlineV2.Common.Models.TransactionModel public string? SchemeId { get; set; } public string? TpExRate { get; set; } public string? DiscountFee { get; set; } + public string? SourceOfFund { get; set; } } public class SendMoneyRequestModel diff --git a/CustomerOnlineV2/CustomerOnlineV2.Repository/Repository/TransactionRepository/ITransactionRepository.cs b/CustomerOnlineV2/CustomerOnlineV2.Repository/Repository/TransactionRepository/ITransactionRepository.cs index 253860b..311ea4c 100644 --- a/CustomerOnlineV2/CustomerOnlineV2.Repository/Repository/TransactionRepository/ITransactionRepository.cs +++ b/CustomerOnlineV2/CustomerOnlineV2.Repository/Repository/TransactionRepository/ITransactionRepository.cs @@ -13,5 +13,6 @@ namespace CustomerOnlineV2.Repository.Repository.TransactionRepository Task UpdateTranData(TrustPaymentRequest tranData, LoginResponse loginDetails); Task GetTranData(LoginResponse loginDetails); Task GetTransactionReportList(LoginResponse loginDetails, CustomerTransaction model); + Task GetRewardPoints(LoginResponse loginDetails); } } diff --git a/CustomerOnlineV2/CustomerOnlineV2.Repository/Repository/TransactionRepository/TransactionRepository.cs b/CustomerOnlineV2/CustomerOnlineV2.Repository/Repository/TransactionRepository/TransactionRepository.cs index 7a8c774..b16fe1b 100644 --- a/CustomerOnlineV2/CustomerOnlineV2.Repository/Repository/TransactionRepository/TransactionRepository.cs +++ b/CustomerOnlineV2/CustomerOnlineV2.Repository/Repository/TransactionRepository/TransactionRepository.cs @@ -378,6 +378,66 @@ namespace CustomerOnlineV2.Repository.Repository.TransactionRepository } return await Task.FromResult(_response); } + + public async Task GetRewardPoints(LoginResponse loginDetails) + { + CustomerNotificationModel _response = new CustomerNotificationModel(); + try + { + var sql = "EXEC mobile_proc_customerMaster"; + sql += " @Flag = " + _connHelper.FilterString("get-invite-details"); + // sql += ",@User = " + _connHelper.FilterString(loginDetails.UserName); + sql += ",@sourceCustomerId = " + _connHelper.FilterString(loginDetails.UserId); + _logger.LogDebug("HOMEREPOSITORY | GETREWARDPOINTS | 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 | GETREWARDPOINTS | 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 NotificationModel + { + //Id = Convert.ToString(item["rowId"]), + //Title = Convert.ToString(item["REWARD_TYPE"]), + RewardAmount = Convert.ToString(item["REWARD_AMOUNT"]), + //CustomerName = Convert.ToString(item["CUSTOMER_NAME"]), + //Date = Convert.ToString(item["CREATED_DATE"]), + RewardPoints = Convert.ToString(item["REWARD_POINTS"]), + ReferralCode = loginDetails.MembershipId, + //ReferralCode = Convert.ToString(item["REFERRAL_CODE"]), + //IsRead = Convert.ToString(item["isRead"]), + //Type = Convert.ToString(item["type"]), + //SentId = Convert.ToString(item["sentId"]), + // Category = Convert.ToString(item["category"]), + //url = Convert.ToString(item["url"]), + //IsClickable = Convert.ToString(item["isClickable"]) + // notificationCount = Convert.ToString(item["notificationCount"]) + }); + } + _response.NotificationModel = obj; + } + } + catch (Exception ex) + { + _response.ResponseCode = ResponseHelper.EXCEPTION; + _response.ResponseMessage = "Exception occured: " + ex.Message; + + _logger.LogError("HOMEREPOSITORY | GETREWARDPOINTS | EXCEPTION | " + JsonConvert.SerializeObject(_response)); + } + return await Task.FromResult(_response); + } } } diff --git a/CustomerOnlineV2/CustomerOnlineV2/Controllers/TransactionController.cs b/CustomerOnlineV2/CustomerOnlineV2/Controllers/TransactionController.cs index 6dd0935..69a7272 100644 --- a/CustomerOnlineV2/CustomerOnlineV2/Controllers/TransactionController.cs +++ b/CustomerOnlineV2/CustomerOnlineV2/Controllers/TransactionController.cs @@ -44,6 +44,7 @@ namespace CustomerOnlineV2.Controllers [Authorization("SendMoney")] public IActionResult SendMoney() { + return View(); } @@ -228,6 +229,14 @@ namespace CustomerOnlineV2.Controllers return await _transactionBusiness.GetTranData(loginDetails); } - + [HttpPost] + [ValidateAntiForgeryToken] + [Authorization("GetRewardDetails")] + public async Task GetRewardDetails() + { + var loginDetails = HttpContext.GetLoginDetails(); + return await _transactionBusiness.GetRewardPoints(loginDetails); + } + } } diff --git a/CustomerOnlineV2/CustomerOnlineV2/Views/Transaction/SendMoney.cshtml b/CustomerOnlineV2/CustomerOnlineV2/Views/Transaction/SendMoney.cshtml index b8e2dce..ea97015 100644 --- a/CustomerOnlineV2/CustomerOnlineV2/Views/Transaction/SendMoney.cshtml +++ b/CustomerOnlineV2/CustomerOnlineV2/Views/Transaction/SendMoney.cshtml @@ -66,16 +66,22 @@ +
- - + +
+
+
+

Your available amount:

+
+
@@ -97,6 +103,16 @@
+
+
+
+
+ + +
+
+
+
@@ -194,6 +210,7 @@ @section Scripts{