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

add membership id

feature/19315_Customer-Registration
shakun 11 months ago
parent
54952cdd4d
commit
0eb37b1c3b
10 changed files with 130 additions and 127 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      CustomerOnlineV2/CustomerOnlineV2.Common/Helper/LoginUserInfo.cs
  2. 1
      CustomerOnlineV2/CustomerOnlineV2.Common/Models/HomeModel/HomeModel.cs
  3. 1
      CustomerOnlineV2/CustomerOnlineV2.Common/Models/TransactionModel/ExrateResponse.cs
  4. 3
      CustomerOnlineV2/CustomerOnlineV2/Controllers/AccountController.cs
  5. 2
      CustomerOnlineV2/CustomerOnlineV2/Controllers/ReceiverInformationController.cs
  6. 45
      CustomerOnlineV2/CustomerOnlineV2/Views/Customer/CustomerProfile.cshtml
  7. 17
      CustomerOnlineV2/CustomerOnlineV2/Views/Home/Index.cshtml
  8. 4
      CustomerOnlineV2/CustomerOnlineV2/Views/Shared/_Layout.cshtml
  9. 28
      CustomerOnlineV2/CustomerOnlineV2/Views/Transaction/SendMoney.cshtml
  10. 1
      CustomerOnlineV2/CustomerOnlineV2/wwwroot/js/Custom.js

1
CustomerOnlineV2/CustomerOnlineV2.Common/Helper/LoginUserInfo.cs
View File

@ -17,6 +17,7 @@ namespace CustomerOnlineV2.Common.Helper
model.FullName = claimIdentity.FindFirst(x => x.Type == "FullName").Value; model.FullName = claimIdentity.FindFirst(x => x.Type == "FullName").Value;
model.ForceChangePassword = Convert.ToBoolean(claimIdentity.FindFirst(x => x.Type == "ForceChangePassword").Value); model.ForceChangePassword = Convert.ToBoolean(claimIdentity.FindFirst(x => x.Type == "ForceChangePassword").Value);
model.MobileNumber = claimIdentity.FindFirst(x => x.Type == "MobileNumber").Value; model.MobileNumber = claimIdentity.FindFirst(x => x.Type == "MobileNumber").Value;
model.MembershipId = claimIdentity.FindFirst(x => x.Type == "MembershipId").Value;
model.Email = claimIdentity.FindFirst(x => x.Type == "Email").Value; model.Email = claimIdentity.FindFirst(x => x.Type == "Email").Value;
model.RememberMe = Convert.ToBoolean(claimIdentity.FindFirst(x => x.Type == "RememberMe").Value); model.RememberMe = Convert.ToBoolean(claimIdentity.FindFirst(x => x.Type == "RememberMe").Value);
model.SessionId = claimIdentity.FindFirst(x => x.Type == "SessionId").Value; model.SessionId = claimIdentity.FindFirst(x => x.Type == "SessionId").Value;

1
CustomerOnlineV2/CustomerOnlineV2.Common/Models/HomeModel/HomeModel.cs
View File

@ -52,6 +52,7 @@
public string? acAmt { get; set; } public string? acAmt { get; set; }
public string? pCountry { get; set;} public string? pCountry { get; set;}
public string? receiverName { get; set;} public string? receiverName { get; set;}
public string? Rate { get; set; }
public string? recAccountNum { get; set;} public string? recAccountNum { get; set;}
} }

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

@ -128,6 +128,7 @@ namespace CustomerOnlineV2.Common.Models.TransactionModel
public string? ForexSessionId { get; set; } public string? ForexSessionId { get; set; }
public string? SchemeId { get; set; } public string? SchemeId { get; set; }
public string? TpExRate { get; set; } public string? TpExRate { get; set; }
public string? DiscountFee { get; set; }
} }
public class SendMoneyRequestModel public class SendMoneyRequestModel

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

@ -73,7 +73,8 @@ namespace CustomerOnlineV2.Controllers
new Claim("Email", result.Email), new Claim("Email", result.Email),
new Claim("RememberMe", loginModel.RememberMe.ToString()), new Claim("RememberMe", loginModel.RememberMe.ToString()),
new Claim("SessionId", result.SessionId), new Claim("SessionId", result.SessionId),
new Claim("UserId", result.UserId)
new Claim("UserId", result.UserId),
new Claim("MembershipId", result.MembershipId)
}; };
var claimsIdentity = new ClaimsIdentity(claims, CookieAuthenticationDefaults.AuthenticationScheme); var claimsIdentity = new ClaimsIdentity(claims, CookieAuthenticationDefaults.AuthenticationScheme);

2
CustomerOnlineV2/CustomerOnlineV2/Controllers/ReceiverInformationController.cs
View File

@ -73,7 +73,7 @@ namespace CustomerOnlineV2.Controllers
{ {
var loginDetails = HttpContext.GetLoginDetails(); var loginDetails = HttpContext.GetLoginDetails();
return await _receiverBusiness.UpdateReceiverById(model, id, loginDetails.UserName);
return await _receiverBusiness.UpdateReceiverById(model, id, loginDetails.UserId);
} }
} }
} }

45
CustomerOnlineV2/CustomerOnlineV2/Views/Customer/CustomerProfile.cshtml
View File

@ -110,7 +110,6 @@
</div> </div>
</div> </div>
<!-- Edit Details Modal --> <!-- Edit Details Modal -->
<!-- Personal Details End --> <!-- Personal Details End -->
<!-- Account Settings --> <!-- Account Settings -->
<div class="bg-white shadow-sm rounded p-4 mb-4"> <div class="bg-white shadow-sm rounded p-4 mb-4">
@ -271,27 +270,25 @@
</div> *@ </div> *@
<div class="col-12 col-sm-6"> <div class="col-12 col-sm-6">
<label for="zipCode" class="form-label">Id Type</label> <label for="zipCode" class="form-label">Id Type</label>
<select class="form-select" asp-for="idType" asp-items="@CustomerOnlineV2.Helper.HelperClass.GetDropdownData("getIdType", true)">
<select class="form-select" id="idType" asp-items="@CustomerOnlineV2.Helper.HelperClass.GetDropdownData("getIdType", true)" required>
</select> </select>
</div> </div>
<div class="col-12 col-sm-6"> <div class="col-12 col-sm-6">
<label for="input-zone" class="form-label">Id Number</label> <label for="input-zone" class="form-label">Id Number</label>
<input type="text" class="form-control" asp-for="idNumber"/>
<input type="text" class="form-control" id="idNumber"/>
</div> </div>
<div class="col-12 col-sm-6"> <div class="col-12 col-sm-6">
<label for="input-zone" class="form-label">Id Issue Country</label> <label for="input-zone" class="form-label">Id Issue Country</label>
<select class="form-select" asp-for="nativeCountry" asp-items="@CustomerOnlineV2.Helper.HelperClass.GetDropdownData("allCountrylist", true)">
<select class="form-select" id="nativeCountry" asp-items="@CustomerOnlineV2.Helper.HelperClass.GetDropdownData("allCountrylist", true)" required>
</select> </select>
</div> </div>
<div class="col-12 col-sm-6"> <div class="col-12 col-sm-6">
<label for="input-zone" class="form-label">Id Issue Date</label> <label for="input-zone" class="form-label">Id Issue Date</label>
<input type="date" class="form-control" asp-for="idIssueDate"/>
<input type="date" class="form-control" id="idIssueDate" required/>
</div> </div>
<div class="col-12 col-sm-6"> <div class="col-12 col-sm-6">
<label for="input-zone" class="form-label">Id Expiry Date</label> <label for="input-zone" class="form-label">Id Expiry Date</label>
<input type="date" class="form-control"asp-for="idExpiryDate"/>
<input type="date" class="form-control" id="idExpiryDate" required/>
</div> </div>
@ -576,7 +573,6 @@
$('#pCity').val(city); $('#pCity').val(city);
$('#pAddress1').val(Address1); $('#pAddress1').val(Address1);
$('#apiDataPopup').modal('hide'); $('#apiDataPopup').modal('hide');
event.preventDefault(); event.preventDefault();
@ -644,9 +640,6 @@
city: $("#pCity").val(), city: $("#pCity").val(),
address: $("#pAddress1").val(), address: $("#pAddress1").val(),
address2: $("#pAddress2").val(), address2: $("#pAddress2").val(),
}, },
success: function (response) { success: function (response) {
if (response.responseCode != 0) { if (response.responseCode != 0) {
@ -681,18 +674,17 @@
}, },
success: function (data) {
debugger;
if (data === 1) {
alert("Updated Successfully");
success: function (response) {
if (response.responseCode != 0) {
ShowAlertMessageErrorOnly(data, response.responseMessage);
return false;
} }
ShowAlertMessage("0", "Document Updated successfully.");
}, },
error: function (data) { error: function (data) {
alert("Sorry Couldn't be updated");
ShowAlertMessageErrorOnly(1, "Error ocurred during update!");
} }
} }
); );
@ -724,25 +716,22 @@
success: function (response) { success: function (response) {
if (response.responseCode != 0) { if (response.responseCode != 0) {
ShowAlertMessage(response.responseCode, response.responseMessage);
//ShowAlertMessage("Receiver Successfully created")
ShowAlertMessageErrorOnly(data, response.responseMessage);
return;
return false;
} }
// clearFields();
// $('#Country').focus();
$('#message').text('Data successfully submitted');
ShowAlertMessage("0", "Document Add successfully.");
// window.location.replace("/home");
}, },
error: function () {
return null;
error: function (data) {
ShowAlertMessageErrorOnly(1, "Error ocurred during update!");
} }
}); });
} }
</script> </script>

17
CustomerOnlineV2/CustomerOnlineV2/Views/Home/Index.cshtml
View File

@ -30,6 +30,14 @@
</a> </a>
</div> </div>
</div> </div>
<div class="col-sm-6 col-md-3">
<div class="border rounded text-center">
<a href="/ReceiverInformation/Receiver">
<span class="d-block text-10 text-light mt-1 mb-1"><img src="images/menu7.jpg" height="80"></span>
<p class="text-2 text-strong">Add Receiver</p>
</a>
</div>
</div>
@* <div class="col-sm-6 col-md-3"> @* <div class="col-sm-6 col-md-3">
<div class="border rounded text-center"> <div class="border rounded text-center">
<a href="#"> <a href="#">
@ -70,14 +78,7 @@
</a> </a>
</div> </div>
</div> </div>
<div class="col-sm-6 col-md-3">
<div class="border rounded text-center">
<a href="#">
<span class="d-block text-10 text-light mt-1 mb-1"><img src="images/menu7.jpg" height="80"></span>
<p class="text-2 text-strong">Bill Payment</p>
</a>
</div>
</div> *@
*@
<div class="col-sm-6 col-md-3"> <div class="col-sm-6 col-md-3">
<div class="border rounded text-center"> <div class="border rounded text-center">
<a href="#"> <a href="#">

4
CustomerOnlineV2/CustomerOnlineV2/Views/Shared/_Layout.cshtml
View File

@ -28,7 +28,7 @@
var mobileNumber = userInfo.MobileNumber; var mobileNumber = userInfo.MobileNumber;
var email = userInfo.Email; var email = userInfo.Email;
var userId = userInfo.UserId; var userId = userInfo.UserId;
var membershipId = userInfo.MembershipId;
var errorMessage = Context.Request.Cookies["ErrorMessage"]; var errorMessage = Context.Request.Cookies["ErrorMessage"];
var errorCode = Context.Request.Cookies["ErrorCode"]; var errorCode = Context.Request.Cookies["ErrorCode"];
@ -150,7 +150,7 @@
</div> </div>
</div> </div>
<p class="text-3 fw-500 mb-2">Hello, @firstName</p> <p class="text-3 fw-500 mb-2">Hello, @firstName</p>
<p class="text-3 fw-500 mb-2">User Id : <span>@userId</span></p>
<p class="text-3 fw-500 mb-2">User Id : <span><strong>@membershipId</strong></span></p>

28
CustomerOnlineV2/CustomerOnlineV2/Views/Transaction/SendMoney.cshtml
View File

@ -72,7 +72,7 @@
<div class="mb-3"> <div class="mb-3">
<div class="form-floating mb-3"> <div class="form-floating mb-3">
<input type="text" asp-for="PromoCode" maxlength="10" class="form-control" placeholder=""> <input type="text" asp-for="PromoCode" maxlength="10" class="form-control" placeholder="">
<label for="floatingInput">I Have Promo Code (Optional)</label>
<label id="lblReward"></label>
</div> </div>
</div> </div>
</div> </div>
@ -132,35 +132,43 @@
</div> </div>
<table class="table"> <table class="table">
<tr> <tr>
<td>Send Amount :</td>
<td>Collected Amount :</td>
<td> <td>
<strong><span id="collAmount">0.00 GBP</span></strong> <strong><span id="collAmount">0.00 GBP</span></strong>
</td> </td>
</tr> </tr>
<tr> <tr>
<td>Exchange Rate :</td>
<td>Service Fee :</td>
<td> <td>
<strong><span id="exRate">0.00</span></strong>
<strong><span id="sCharge">0.00 GBP</span></strong>
</td> </td>
</tr> </tr>
<tr> <tr>
<td>Transfer Fee :</td>
<td>Reward Amount Used :</td>
<td> <td>
<strong><span id="sCharge">0.00 GBP</span></strong>
<strong><span id="rewardPoint">0.00 GBP</span></strong>
</td> </td>
</tr> </tr>
<tr> <tr>
<td>Reveiver will get (<label id="pCurrency">XXX</label>) :</td>
<td>Total Sent Amount :</td>
<td> <td>
<strong><span id="payoutAmount">0.00</span></strong>
<strong><span id="tamt">0.00 GBP</span></strong>
</td>
</tr>
<tr>
<td>Exchange Rate :</td>
<td>
<strong><span id="exRate">0.00</span></strong>
</td> </td>
</tr> </tr>
<tr> <tr>
<td>Total to Pay :</td>
<td>Total Payout Amount(<label id="pCurrency">XXX</label>) :</td>
<td> <td>
<strong><span id="tAmt">0.00 GBP</span></strong>
<strong><span id="payoutAmount">0.00</span></strong>
</td> </td>
</tr> </tr>
</table> </table>
</div> </div>
</div> </div>

1
CustomerOnlineV2/CustomerOnlineV2/wwwroot/js/Custom.js
View File

@ -110,6 +110,7 @@ function ShowAlertMessageErrorOnly(errorCode, errorMessage) {
else { else {
iziToast.info({ iziToast.info({
title: 'Info', title: 'Info',
timeout: 1000,
message: errorMessage message: errorMessage
}); });
} }

Write Preview
Loading…
Cancel
Save