diff --git a/CustomerOnlineV2/CustomerOnlineV2.Common/Models/TransactionModel/ExrateResponse.cs b/CustomerOnlineV2/CustomerOnlineV2.Common/Models/TransactionModel/ExrateResponse.cs index d0f7dc3..89116fd 100644 --- a/CustomerOnlineV2/CustomerOnlineV2.Common/Models/TransactionModel/ExrateResponse.cs +++ b/CustomerOnlineV2/CustomerOnlineV2.Common/Models/TransactionModel/ExrateResponse.cs @@ -201,6 +201,34 @@ namespace CustomerOnlineV2.Common.Models.TransactionModel public string? SenderName { get; set; } public string? PCountry { get; set; } public string? TransactionId { get; set; } + public string? CreatedDate { get; set; } + public string? ReceiverAddress { get; set; } + public string? DeliveryMethod { get; set; } + public string? BankName { get; set; } + public string? BankBranch { get; set; } + public string? AccountNumber { get; set; } + public string? PurposeOfRemit { get; set; } + public string? Status { get; set; } + public string? PayoutAmount { get; set; } + public string? PayoutCurr { get; set; } + public string? ExRate { get; set; } + public string? PromotionPremiumRate { get; set; } + public string? SendAmount { get; set; } + public string? CollectionCurrency { get; set; } + public string? TransferFee { get; set; } + public string? PromotionDiscount { get; set; } + public string? TotalToPay { get; set; } + public string? PaidBy { get; set; } + public string? Zipcode { get; set; } + public string? Firstname { get; set; } + public string? Lastname1 { get; set; } + + public string? Address { get; set; } + public string? Mobile { get; set; } + public string? City { get; set; } + public string? RecFirstName { get; set; } + public string? RecMiddleName { get; set; } + public string? RecLastName { get; set; } } public class TransactionDetailModel : CommonResponse diff --git a/CustomerOnlineV2/CustomerOnlineV2.Repository/Repository/TransactionRepository/TransactionRepository.cs b/CustomerOnlineV2/CustomerOnlineV2.Repository/Repository/TransactionRepository/TransactionRepository.cs index cfd3a16..9e11093 100644 --- a/CustomerOnlineV2/CustomerOnlineV2.Repository/Repository/TransactionRepository/TransactionRepository.cs +++ b/CustomerOnlineV2/CustomerOnlineV2.Repository/Repository/TransactionRepository/TransactionRepository.cs @@ -259,6 +259,33 @@ namespace CustomerOnlineV2.Repository.Repository.TransactionRepository _response.SenderName = Convert.ToString(dt.Rows[0]["SenderName"]); _response.TransactionId = Convert.ToString(dt.Rows[0]["id"]); _response.PCountry = Convert.ToString(dt.Rows[0]["pCountry"]); + _response.CreatedDate = Convert.ToString(dt.Rows[0]["createdDate"]); + _response.RecFirstName = Convert.ToString(dt.Rows[0]["recFName"]); + _response.RecMiddleName = Convert.ToString(dt.Rows[0]["recMidName"]); + _response.RecLastName = Convert.ToString(dt.Rows[0]["recLName"]); + _response.ReceiverAddress = Convert.ToString(dt.Rows[0]["raddress"]); + _response.DeliveryMethod = Convert.ToString(dt.Rows[0]["paymentMethod"]); + _response.BankName = Convert.ToString(dt.Rows[0]["pbankname"]); + _response.BankBranch = Convert.ToString(dt.Rows[0]["pbankBranchName"]); + _response.AccountNumber = Convert.ToString(dt.Rows[0]["accountNo"]); + _response.PurposeOfRemit = Convert.ToString(dt.Rows[0]["purposeofremit"]); + _response.Status = Convert.ToString(dt.Rows[0]["status"]); + _response.PayoutAmount = Convert.ToString(dt.Rows[0]["pamt"]); + _response.PayoutCurr = Convert.ToString(dt.Rows[0]["payoutCurr"]); + _response.ExRate = Convert.ToString(dt.Rows[0]["customerRate"]); + _response.PromotionPremiumRate = Convert.ToString(dt.Rows[0]["PromotionPremiumRate"]); + _response.SendAmount = Convert.ToString(dt.Rows[0]["tamt"]); + _response.CollectionCurrency = Convert.ToString(dt.Rows[0]["collCurr"]); + _response.TransferFee = Convert.ToString(dt.Rows[0]["servicecharge"]); + _response.PromotionDiscount = Convert.ToString(dt.Rows[0]["PromotionDiscount"]); + _response.TotalToPay = Convert.ToString(dt.Rows[0]["camt"]); + _response.PaidBy = Convert.ToString(dt.Rows[0]["collMode"]); + _response.Zipcode = Convert.ToString(dt.Rows[0]["zipcode"]); + _response.Firstname = Convert.ToString(dt.Rows[0]["firstname"]); + _response.Lastname1 = Convert.ToString(dt.Rows[0]["lastname1"]); + _response.Address = Convert.ToString(dt.Rows[0]["address"]); + _response.City = Convert.ToString(dt.Rows[0]["city"]); + _response.Mobile = Convert.ToString(dt.Rows[0]["mobile"]); } diff --git a/CustomerOnlineV2/CustomerOnlineV2/Controllers/AccountController.cs b/CustomerOnlineV2/CustomerOnlineV2/Controllers/AccountController.cs index 29ca44d..5cf6237 100644 --- a/CustomerOnlineV2/CustomerOnlineV2/Controllers/AccountController.cs +++ b/CustomerOnlineV2/CustomerOnlineV2/Controllers/AccountController.cs @@ -144,13 +144,16 @@ namespace CustomerOnlineV2.Controllers { Log.Debug("ACCOUNTCONTROLLER | CHANGEPASSWORD | REQUEST ARRIVED | " + logindetails.UserName); HttpContext.SignOutAsync(CookieAuthenticationDefaults.AuthenticationScheme); - return RedirectToAction("Index", "Account"); + // return RedirectToAction("Index", "Account"); + ViewBag.ResponseCode = response.ResponseCode; + ViewBag.ResponseMessage = "Password has been changed successfully."; + return View(); } else { ViewBag.ResponseCode = response.ResponseCode; ViewBag.ResponseMessage = response.ResponseMessage; - _logger.LogError("ACCOUNTCONTROLLER | LOGIN | ERROR OCCURED | " + JsonConvert.SerializeObject(response)); + _logger.LogError("ACCOUNTCONTROLLER | CHANGEPASSWORD | ERROR OCCURED | " + JsonConvert.SerializeObject(response)); return View(); } } diff --git a/CustomerOnlineV2/CustomerOnlineV2/Controllers/TransactionController.cs b/CustomerOnlineV2/CustomerOnlineV2/Controllers/TransactionController.cs index 6686957..d426301 100644 --- a/CustomerOnlineV2/CustomerOnlineV2/Controllers/TransactionController.cs +++ b/CustomerOnlineV2/CustomerOnlineV2/Controllers/TransactionController.cs @@ -93,8 +93,19 @@ namespace CustomerOnlineV2.Controllers } return View(_response); } - - + [Authorization("SendMoney")] + public async Task ReceiptTran([FromQuery] string id) + { + TransactionDetailModel _response = new TransactionDetailModel(); + var loginDetails = HttpContext.GetLoginDetails(); + using (LogContext.PushProperty("DebugId", id)) + { + _logger.LogInformation($"TRANSACTIONSERVICE | GETRECEIPTDATA | REQUEST | {id}"); + _response = await _transactionBusiness.GetReceiptData(id, loginDetails); + _logger.LogInformation($"TRANSACTIONSERVICE | GETRECEIPTDATA | RESPONSE | {JsonConvert.SerializeObject(_response)}"); + } + return View(_response); + } [Authorization("Payment")] // [Authorization("SendMoney")] diff --git a/CustomerOnlineV2/CustomerOnlineV2/Views/Account/ForceChangePassword.cshtml b/CustomerOnlineV2/CustomerOnlineV2/Views/Account/ForceChangePassword.cshtml index b2e65d3..8c4be7e 100644 --- a/CustomerOnlineV2/CustomerOnlineV2/Views/Account/ForceChangePassword.cshtml +++ b/CustomerOnlineV2/CustomerOnlineV2/Views/Account/ForceChangePassword.cshtml @@ -83,7 +83,7 @@
You need to change your password to keep your account secure.

-
+
@@ -192,8 +192,24 @@ $(document).ready(function () { - debugger; + + if ('@ViewBag.ResponseCode' == '0') { + iziToast.success({ + title: 'OK', + message: '@ViewBag.ResponseMessage', + timeout: 1000, + onClosed: function () { + window.location.replace("account/index"); + } + }); + } + else if ('@ViewBag.ResponseCode' == '1') { + iziToast.error({ + title: 'Error', + message: '@ViewBag.ResponseMessage' + }); + } diff --git a/CustomerOnlineV2/CustomerOnlineV2/Views/Transaction/Receipt.cshtml b/CustomerOnlineV2/CustomerOnlineV2/Views/Transaction/Receipt.cshtml index af3a677..30a4997 100644 --- a/CustomerOnlineV2/CustomerOnlineV2/Views/Transaction/Receipt.cshtml +++ b/CustomerOnlineV2/CustomerOnlineV2/Views/Transaction/Receipt.cshtml @@ -35,16 +35,16 @@ diff --git a/CustomerOnlineV2/CustomerOnlineV2/Views/Transaction/ReceiptTran.cshtml b/CustomerOnlineV2/CustomerOnlineV2/Views/Transaction/ReceiptTran.cshtml new file mode 100644 index 0000000..4477d60 --- /dev/null +++ b/CustomerOnlineV2/CustomerOnlineV2/Views/Transaction/ReceiptTran.cshtml @@ -0,0 +1,194 @@ +@model CustomerOnlineV2.Common.Models.TransactionModel.TransactionDetailModel +@using CustomerOnlineV2.Common.Helper + +@{ + Layout = "_Layout2"; +} + +
+
+ +
+
+

Transaction Details

+

Refer us to your friends and become one of IME London Remit's Preferred Clients!

+
+
+
+ +
- @* Status: *@ + Transaction Status: @Model.Status
- @* - Amount : - *@ + + Receive Amount : + @Utilities.ShowDecimal(Model.PayoutAmount) @Model.PayoutCurr
+ + + + + + + + + + + + + + + + + + +
+ @* Status: *@ + + @Model.Status +
+ @* + Amount : + *@ + @Model.PayoutCurr +
+ Send To: + @Model.ReceiverName +
+
+ Reference Number: + @Model.ControlNo +
+ Transaction ID: + @Model.TransactionId +
+
+
+ + To: + + + @Model.PCountry + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @* + + + *@ + + + + + + + + + +
+ Transaction Date: + + @Model.CreatedDate +
Receiver Name: + @Model.ReceiverName +
Address: + @Model.ReceiverAddress +
Collected Amount : + @Model.CollectionCurrency +
Service Fee : + @Model.TotalToPay, @Model.CollectionCurrency +
Reward Amount Used : + @Model.PromotionDiscount +
Total Sent Amount : + @Model.SendAmount @Model.CollectionCurrency +
Exchange Rate : + @Model.ExRate +
Total Payout Amount : + @Model.PayoutAmount @Model.PayoutCurr +
Delivery Method : + @Model.DeliveryMethod +
Bank Name : + @Model.BankName +
Bank Branch : + @Model.BankBranch +
Bank Account No : + @Model.AccountNumber +
Purpose of Remittance : + @Model.PurposeOfRemit +
+ Promotion Premium Rate* : + + @Model.PromotionPremiumRate +
Paid by : + @Model.PaidBy +
+
+
+ + + + \ No newline at end of file diff --git a/CustomerOnlineV2/CustomerOnlineV2/Views/Transaction/TranPaySuccess.cshtml b/CustomerOnlineV2/CustomerOnlineV2/Views/Transaction/TranPaySuccess.cshtml index 2d5a6f3..d173c5e 100644 --- a/CustomerOnlineV2/CustomerOnlineV2/Views/Transaction/TranPaySuccess.cshtml +++ b/CustomerOnlineV2/CustomerOnlineV2/Views/Transaction/TranPaySuccess.cshtml @@ -1,4 +1,6 @@ -@{ +@using CustomerOnlineV2.Common.Helper + +@{ Layout = null; } @@ -22,6 +24,22 @@ -webkit-appearance: none; margin: 0; } + + table.no-border { + border-collapse: collapse; + background-color: #262262; + color: white; + } + + table.no-border, + table.no-border thead, + table.no-border tbody, + table.no-border tfoot, + table.no-border tr, + table.no-border td, + table.no-border th { + border: none !important; + }
@@ -29,27 +47,192 @@
-
+
- +

Success!

Transaction Payment Complete

- - + +
-

You've Succesfully sent See transaction details under Transactions Details

-
+ @*

You've Succesfully sent See transaction details under Transactions Details

+ *@
+
+
+
+
+ + + + + + + + + + + + + + + + + + + + +
+ Transaction Status: + + @Model.Status +
+ + Receive Amount : + + @Utilities.ShowDecimal(Model.PayoutAmount) @Model.PayoutCurr +
+ Send To: + @Model.ReceiverName +
+
+ Reference Number: + @Model.ControlNo +
+ Transaction ID: + @Model.TransactionId +
+
+
+ + To: + + + @Model.PCountry + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @* + + + *@ + + + + + + + + + +
+ Transaction Date: + + @Model.CreatedDate +
Receiver Name: + @Model.ReceiverName +
Address: + @Model.ReceiverAddress +
Collected Amount : + @Utilities.ShowDecimal(Model.TotalToPay) @Model.CollectionCurrency +
Service Fee : + @Utilities.ShowDecimal(Model.TransferFee) @Model.CollectionCurrency +
Reward Amount Used : + @Model.PromotionDiscount +
Total Sent Amount : + @Utilities.ShowDecimal(Model.SendAmount) @Model.CollectionCurrency +
Exchange Rate : + @Model.ExRate +
Total Payout Amount : + @Utilities.ShowDecimal(Model.PayoutAmount) @Model.PayoutCurr +
Delivery Method : + @Model.DeliveryMethod +
Bank Name : + @Model.BankName +
Bank Branch : + @Model.BankBranch +
Bank Account No : + @Model.AccountNumber +
Purpose of Remittance : + @Model.PurposeOfRemit +
+ Promotion Premium Rate* : + + @Model.PromotionPremiumRate +
Paid by : + @Model.PaidBy +
+
+
+
+
+
+
diff --git a/CustomerOnlineV2/CustomerOnlineV2/Views/TransactionReport/TranReport.cshtml b/CustomerOnlineV2/CustomerOnlineV2/Views/TransactionReport/TranReport.cshtml index 4b9167a..f5e3264 100644 --- a/CustomerOnlineV2/CustomerOnlineV2/Views/TransactionReport/TranReport.cshtml +++ b/CustomerOnlineV2/CustomerOnlineV2/Views/TransactionReport/TranReport.cshtml @@ -57,7 +57,7 @@
S.N
Transaction Date
Receiver Name
-
Contact No
+
Control No
Collected Amount
Total Sent Amount
Delivery Method
diff --git a/DB/PROC_DROPDOWN_LIST.sql b/DB/PROC_DROPDOWN_LIST.sql index 38a2f59..901a4e0 100644 Binary files a/DB/PROC_DROPDOWN_LIST.sql and b/DB/PROC_DROPDOWN_LIST.sql differ