IME-LONDON
/
CustomerPortal
8
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity
Browse Source

latest code

feature/19315_Customer-Registration-new
shakun 11 months ago
parent
786e267f5e
commit
d7c2642381
10 changed files with 480 additions and 18 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 28
      CustomerOnlineV2/CustomerOnlineV2.Common/Models/TransactionModel/ExrateResponse.cs
  2. 27
      CustomerOnlineV2/CustomerOnlineV2.Repository/Repository/TransactionRepository/TransactionRepository.cs
  3. 7
      CustomerOnlineV2/CustomerOnlineV2/Controllers/AccountController.cs
  4. 15
      CustomerOnlineV2/CustomerOnlineV2/Controllers/TransactionController.cs
  5. 20
      CustomerOnlineV2/CustomerOnlineV2/Views/Account/ForceChangePassword.cshtml
  6. 8
      CustomerOnlineV2/CustomerOnlineV2/Views/Transaction/Receipt.cshtml
  7. 194
      CustomerOnlineV2/CustomerOnlineV2/Views/Transaction/ReceiptTran.cshtml
  8. 197
      CustomerOnlineV2/CustomerOnlineV2/Views/Transaction/TranPaySuccess.cshtml
  9. 2
      CustomerOnlineV2/CustomerOnlineV2/Views/TransactionReport/TranReport.cshtml
  10. BIN
      DB/PROC_DROPDOWN_LIST.sql

28
CustomerOnlineV2/CustomerOnlineV2.Common/Models/TransactionModel/ExrateResponse.cs
View File

@ -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

27
CustomerOnlineV2/CustomerOnlineV2.Repository/Repository/TransactionRepository/TransactionRepository.cs
View File

@ -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"]);
}

7
CustomerOnlineV2/CustomerOnlineV2/Controllers/AccountController.cs
View File

@ -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();
}
}

15
CustomerOnlineV2/CustomerOnlineV2/Controllers/TransactionController.cs
View File

@ -93,8 +93,19 @@ namespace CustomerOnlineV2.Controllers
}
return View(_response);
}
[Authorization("SendMoney")]
public async Task<IActionResult> 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")]

20
CustomerOnlineV2/CustomerOnlineV2/Views/Account/ForceChangePassword.cshtml
View File

@ -83,7 +83,7 @@
<div class="text-3">You need to change your password to keep your account secure.</div>
<p class="sec-subtitle"></p>
</div>
<form asp-controller="Account" id="force-change-pwd" asp-action="ForceChangePassword" method="post" novalidate>
<form asp-controller="Account" id="force-change-pwd" asp-action="ForceChangePassword" method="post">
<div class="form-floating mb-3">
<input type="password" class="form-control" asp-for="OldPassword" placeholder="IMe12312@3asdfk43933" required>
<label for="floatingInput">Old Password</label>
@ -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'
});
}

8
CustomerOnlineV2/CustomerOnlineV2/Views/Transaction/Receipt.cshtml
View File

@ -35,16 +35,16 @@
<table class="table no-border" style="text-align:center;">
<tr>
<td>
@* <strong>Status:</strong> *@
<strong>Transaction Status:</strong>
<span id="MainContent_lblStatusDetail">@Model.Status</span>
</td>
</tr>
<tr>
<td style="font-size:18px;">
@* <strong>
Amount :
</strong> *@
<strong>
Receive Amount :
</strong>
<span>@Utilities.ShowDecimal(Model.PayoutAmount) @Model.PayoutCurr</span>
</td>
</tr>

194
CustomerOnlineV2/CustomerOnlineV2/Views/Transaction/ReceiptTran.cshtml
View File

@ -0,0 +1,194 @@
@model CustomerOnlineV2.Common.Models.TransactionModel.TransactionDetailModel
@using CustomerOnlineV2.Common.Helper
@{
Layout = "_Layout2";
}
<style>
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;
}
</style>
<div class="container">
<div class="row">
<!-- Middle Panel -->
<div class="col-md-6">
<div class="mb-4">
<h3 class="fw-400">Transaction Details</h3>
<p>Refer us to your friends and become one of IME London Remit's Preferred Clients!</p>
</div>
<div class="card">
<div class="card-body p-2">
<table class="table no-border" style="text-align:center;">
<tr>
<td>
@* <strong>Status:</strong> *@
<span id="MainContent_lblStatusDetail">@Model.Status</span>
</td>
</tr>
<tr>
<td style="font-size:18px;">
@* <strong>
Amount :
</strong> *@
<span> @Model.PayoutCurr</span>
</td>
</tr>
<tr>
<td>
<strong>Send To:</strong>
<span id="MainContent_lblBenficiaryName">@Model.ReceiverName</span>
<br>
</td>
</tr>
<tr>
<td>
<strong>Reference Number:</strong>
<span id="MainContent_lblTxnID">@Model.ControlNo</span>
</td>
</tr>
<tr>
<td>
<strong>Transaction ID:</strong>
<span id="MainContent_lblTxnID">@Model.TransactionId</span>
</td>
</tr>
</table>
<hr class="mx-n4 mb-4">
<div class="px-4">
<span class="me-2">
<strong class="me-2">To: </strong>
<i class=" currency-flag currency-flag-npr me-1"></i>
</span>
<span>@Model.PCountry</span>
<table class="table">
<tr>
<td>
Transaction Date:
</td>
<td>
<strong><span id="MainContent_lblTxnDate">@Model.CreatedDate</span></strong>
</td>
</tr>
<tr>
<td>Receiver Name:</td>
<td>
<strong><span id="MainContent_lblBenficiaryName">@Model.ReceiverName</span></strong>
</td>
</tr>
<tr>
<td>Address:</td>
<td>
<strong><span id="MainContent_lblReceiverAddress">@Model.ReceiverAddress</span></strong>
</td>
</tr>
<tr>
<td>Collected Amount :</td>
<td>
<strong><span> @Model.CollectionCurrency</span></strong>
</td>
</tr>
<tr>
<td>Service Fee :</td>
<td>
<strong><span>@Model.TotalToPay, @Model.CollectionCurrency</span></strong>
</td>
</tr>
<tr>
<td>Reward Amount Used :</td>
<td>
<strong><span>@Model.PromotionDiscount</span></strong>
</td>
</tr>
<tr>
<td>Total Sent Amount :</td>
<td>
<strong><span>@Model.SendAmount @Model.CollectionCurrency</span></strong>
</td>
</tr>
<tr>
<td>Exchange Rate :</td>
<td>
<strong><span>@Model.ExRate</span></strong>
</td>
</tr>
<tr>
<td>Total Payout Amount :</td>
<td>
<strong><span>@Model.PayoutAmount @Model.PayoutCurr</span></strong>
</td>
</tr>
<tr>
<td>Delivery Method :</td>
<td>
<strong><span>@Model.DeliveryMethod</span></strong>
</td>
</tr>
<tr>
<td>Bank Name :</td>
<td>
<strong><span>@Model.BankName</span></strong>
</td>
</tr>
<tr>
<td>Bank Branch :</td>
<td>
<strong><span>@Model.BankBranch</span></strong>
</td>
</tr>
<tr>
<td>Bank Account No :</td>
<td>
<strong><span>@Model.AccountNumber</span></strong>
</td>
</tr>
<tr>
<td>Purpose of Remittance :</td>
<td>
<strong><span>@Model.PurposeOfRemit</span></strong>
</td>
</tr>
@* <tr>
<td>
<i>Promotion Premium Rate* :</i>
</td>
<td>
<strong><span>@Model.PromotionPremiumRate</span></strong>
</td>
</tr> *@
<tr>
<td>Paid by :</td>
<td>
<strong><span>@Model.PaidBy</span></strong>
</td>
</tr>
</table>
</div>
</div>
</div>
</div>
</div>
</div>

197
CustomerOnlineV2/CustomerOnlineV2/Views/Transaction/TranPaySuccess.cshtml
View File

@ -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;
}
</style>
</head>
<div class="container">
@ -29,27 +47,192 @@
<!-- Middle Panel -->
<div class="col-lg-12">
<div class="card">
<div class="card" style="background-color: #cfdddd;">
<div class="card-body p-4">
<div class="row">
<div class="col-md-9 col-lg-7 col-xl-6 mx-auto align-items-center text-center">
<div class="my-4">
<p class="text-success text-20 lh-1"><i class="fas fa-check-circle"></i></p>
<p class="text-success text-8 fw-500 lh-1">Success!</p>
<p class="lead"> Transaction Payment Complete</p>
</div>
<p class="text-3 mb-4">You've Succesfully sent See transaction details under <a href="/Transaction/Receipt?id=@Model.TransactionId">Transactions Details</a></p>
<div class="d-grid"><a href="/Home/Index"><button class="btn btn-primary">Dashboard Page</button></a></div>
@* <p class="text-3 mb-4">You've Succesfully sent See transaction details under <a href="/Transaction/Receipt?id=@Model.TransactionId">Transactions Details</a></p>
*@ <div class="d-grid justify-content-center"><a href="/Home/Index"><button class="btn btn-primary">Dashboard Page</button></a></div>
</div>
</div>
</div>
<div class="col-md-6 mx-auto">
<div class="card">
<div class="card-body p-2">
<table class="table no-border" style="text-align:center;">
<tr>
<td>
<strong>Transaction Status:</strong>
<span id="MainContent_lblStatusDetail">@Model.Status</span>
</td>
</tr>
<tr>
<td style="font-size:18px;">
<strong>
Receive Amount :
</strong>
<span>@Utilities.ShowDecimal(Model.PayoutAmount) @Model.PayoutCurr</span>
</td>
</tr>
<tr>
<td>
<strong>Send To:</strong>
<span id="MainContent_lblBenficiaryName">@Model.ReceiverName</span>
<br>
</td>
</tr>
<tr>
<td>
<strong>Reference Number:</strong>
<span id="MainContent_lblTxnID">@Model.ControlNo</span>
</td>
</tr>
<tr>
<td>
<strong>Transaction ID:</strong>
<span id="MainContent_lblTxnID">@Model.TransactionId</span>
</td>
</tr>
</table>
<hr class="mx-n4 mb-4">
<div class="px-4">
<span class="me-2">
<strong class="me-2">To: </strong>
<i class=" currency-flag currency-flag-npr me-1"></i>
</span>
<span>@Model.PCountry</span>
<table class="table">
<tr>
<td>
Transaction Date:
</td>
<td>
<strong><span id="MainContent_lblTxnDate">@Model.CreatedDate</span></strong>
</td>
</tr>
<tr>
<td>Receiver Name:</td>
<td>
<strong><span id="MainContent_lblBenficiaryName">@Model.ReceiverName</span></strong>
</td>
</tr>
<tr>
<td>Address:</td>
<td>
<strong><span id="MainContent_lblReceiverAddress">@Model.ReceiverAddress</span></strong>
</td>
</tr>
<tr>
<td>Collected Amount :</td>
<td>
<strong><span>@Utilities.ShowDecimal(Model.TotalToPay) @Model.CollectionCurrency</span></strong>
</td>
</tr>
<tr>
<td>Service Fee :</td>
<td>
<strong><span>@Utilities.ShowDecimal(Model.TransferFee) @Model.CollectionCurrency</span></strong>
</td>
</tr>
<tr>
<td>Reward Amount Used :</td>
<td>
<strong><span>@Model.PromotionDiscount</span></strong>
</td>
</tr>
<tr>
<td>Total Sent Amount :</td>
<td>
<strong><span>@Utilities.ShowDecimal(Model.SendAmount) @Model.CollectionCurrency</span></strong>
</td>
</tr>
<tr>
<td>Exchange Rate :</td>
<td>
<strong><span>@Model.ExRate</span></strong>
</td>
</tr>
<tr>
<td>Total Payout Amount :</td>
<td>
<strong><span>@Utilities.ShowDecimal(Model.PayoutAmount) @Model.PayoutCurr</span></strong>
</td>
</tr>
<tr>
<td>Delivery Method :</td>
<td>
<strong><span>@Model.DeliveryMethod</span></strong>
</td>
</tr>
<tr>
<td>Bank Name :</td>
<td>
<strong><span>@Model.BankName</span></strong>
</td>
</tr>
<tr>
<td>Bank Branch :</td>
<td>
<strong><span>@Model.BankBranch</span></strong>
</td>
</tr>
<tr>
<td>Bank Account No :</td>
<td>
<strong><span>@Model.AccountNumber</span></strong>
</td>
</tr>
<tr>
<td>Purpose of Remittance :</td>
<td>
<strong><span>@Model.PurposeOfRemit</span></strong>
</td>
</tr>
@* <tr>
<td>
<i>Promotion Premium Rate* :</i>
</td>
<td>
<strong><span>@Model.PromotionPremiumRate</span></strong>
</td>
</tr> *@
<tr>
<td>Paid by :</td>
<td>
<strong><span>@Model.PaidBy</span></strong>
</td>
</tr>
</table>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</html>

2
CustomerOnlineV2/CustomerOnlineV2/Views/TransactionReport/TranReport.cshtml
View File

@ -57,7 +57,7 @@
<div class="col-1 col-sm-1">S.N</div>
<div class="col-2 col-sm-2">Transaction Date</div>
<div class="col-3 col-sm-2">Receiver Name</div>
<div class="col-4 col-sm-2">Contact No</div>
<div class="col-4 col-sm-2">Control No</div>
<div class="col-5 col-sm-1">Collected Amount</div>
<div class="col-6 col-sm-1">Total Sent Amount</div>
<div class="col-7 col-sm-1">Delivery Method</div>

BIN
DB/PROC_DROPDOWN_LIST.sql
View File

Write Preview
Loading…
Cancel
Save