From 0eb37b1c3bff821e9f5a93e5a87963a5860bc886 Mon Sep 17 00:00:00 2001 From: shakun Date: Sat, 14 Oct 2023 14:06:39 +0545 Subject: [PATCH] add membership id --- .../Helper/LoginUserInfo.cs | 1 + .../Models/HomeModel/HomeModel.cs | 1 + .../Models/TransactionModel/ExrateResponse.cs | 1 + .../Controllers/AccountController.cs | 3 +- .../ReceiverInformationController.cs | 2 +- .../Views/Customer/CustomerProfile.cshtml | 199 +++++++++--------- .../CustomerOnlineV2/Views/Home/Index.cshtml | 17 +- .../Views/Shared/_Layout.cshtml | 4 +- .../Views/Transaction/SendMoney.cshtml | 28 ++- .../CustomerOnlineV2/wwwroot/js/Custom.js | 1 + 10 files changed, 130 insertions(+), 127 deletions(-) diff --git a/CustomerOnlineV2/CustomerOnlineV2.Common/Helper/LoginUserInfo.cs b/CustomerOnlineV2/CustomerOnlineV2.Common/Helper/LoginUserInfo.cs index 49dd048..5586f1c 100644 --- a/CustomerOnlineV2/CustomerOnlineV2.Common/Helper/LoginUserInfo.cs +++ b/CustomerOnlineV2/CustomerOnlineV2.Common/Helper/LoginUserInfo.cs @@ -17,6 +17,7 @@ namespace CustomerOnlineV2.Common.Helper model.FullName = claimIdentity.FindFirst(x => x.Type == "FullName").Value; model.ForceChangePassword = Convert.ToBoolean(claimIdentity.FindFirst(x => x.Type == "ForceChangePassword").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.RememberMe = Convert.ToBoolean(claimIdentity.FindFirst(x => x.Type == "RememberMe").Value); model.SessionId = claimIdentity.FindFirst(x => x.Type == "SessionId").Value; diff --git a/CustomerOnlineV2/CustomerOnlineV2.Common/Models/HomeModel/HomeModel.cs b/CustomerOnlineV2/CustomerOnlineV2.Common/Models/HomeModel/HomeModel.cs index b016a35..171fc81 100644 --- a/CustomerOnlineV2/CustomerOnlineV2.Common/Models/HomeModel/HomeModel.cs +++ b/CustomerOnlineV2/CustomerOnlineV2.Common/Models/HomeModel/HomeModel.cs @@ -52,6 +52,7 @@ public string? acAmt { get; set; } public string? pCountry { get; set;} public string? receiverName { get; set;} + public string? Rate { get; set; } public string? recAccountNum { get; set;} } diff --git a/CustomerOnlineV2/CustomerOnlineV2.Common/Models/TransactionModel/ExrateResponse.cs b/CustomerOnlineV2/CustomerOnlineV2.Common/Models/TransactionModel/ExrateResponse.cs index c4b02fc..ea5a7a2 100644 --- a/CustomerOnlineV2/CustomerOnlineV2.Common/Models/TransactionModel/ExrateResponse.cs +++ b/CustomerOnlineV2/CustomerOnlineV2.Common/Models/TransactionModel/ExrateResponse.cs @@ -128,6 +128,7 @@ namespace CustomerOnlineV2.Common.Models.TransactionModel public string? ForexSessionId { get; set; } public string? SchemeId { get; set; } public string? TpExRate { get; set; } + public string? DiscountFee { get; set; } } public class SendMoneyRequestModel diff --git a/CustomerOnlineV2/CustomerOnlineV2/Controllers/AccountController.cs b/CustomerOnlineV2/CustomerOnlineV2/Controllers/AccountController.cs index cd23d21..cc347cc 100644 --- a/CustomerOnlineV2/CustomerOnlineV2/Controllers/AccountController.cs +++ b/CustomerOnlineV2/CustomerOnlineV2/Controllers/AccountController.cs @@ -73,7 +73,8 @@ namespace CustomerOnlineV2.Controllers new Claim("Email", result.Email), new Claim("RememberMe", loginModel.RememberMe.ToString()), 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); diff --git a/CustomerOnlineV2/CustomerOnlineV2/Controllers/ReceiverInformationController.cs b/CustomerOnlineV2/CustomerOnlineV2/Controllers/ReceiverInformationController.cs index e59cc29..50d95d1 100644 --- a/CustomerOnlineV2/CustomerOnlineV2/Controllers/ReceiverInformationController.cs +++ b/CustomerOnlineV2/CustomerOnlineV2/Controllers/ReceiverInformationController.cs @@ -73,7 +73,7 @@ namespace CustomerOnlineV2.Controllers { var loginDetails = HttpContext.GetLoginDetails(); - return await _receiverBusiness.UpdateReceiverById(model, id, loginDetails.UserName); + return await _receiverBusiness.UpdateReceiverById(model, id, loginDetails.UserId); } } } diff --git a/CustomerOnlineV2/CustomerOnlineV2/Views/Customer/CustomerProfile.cshtml b/CustomerOnlineV2/CustomerOnlineV2/Views/Customer/CustomerProfile.cshtml index 2ff980e..8dec9e8 100644 --- a/CustomerOnlineV2/CustomerOnlineV2/Views/Customer/CustomerProfile.cshtml +++ b/CustomerOnlineV2/CustomerOnlineV2/Views/Customer/CustomerProfile.cshtml @@ -36,7 +36,7 @@
- @* *@ + @* *@
@@ -70,8 +70,8 @@

Personal Details - @* - Edit + @* + Edit *@

@@ -83,17 +83,17 @@

- +

- +

- +

@@ -110,14 +110,13 @@
-

Personal Address - @* - Edit + @* + Edit *@ Edit @@ -127,10 +126,10 @@

ZipCode:

- @* - Edit + @* + Edit *@ - +

City:

@@ -139,7 +138,7 @@

Address1:

- +

@@ -159,18 +158,18 @@
- +
- - - + + +
- + - +
@@ -219,7 +218,7 @@
- +

Account Setting @@ -266,35 +265,33 @@
@*
- - + +
*@
-
- +
-
- +
- +
- +
@@ -305,13 +302,13 @@

Valid ID Card(BRP Card / Passport / Driving License)

- +

Add

- +
- @*
- + @*
+
*@
@@ -372,25 +369,25 @@

- @*
- + @*
+
*@ - @*
- + @*
+
*@
@@ -437,8 +434,8 @@
- @* - + @* + *@
@@ -483,19 +480,19 @@ @* Photo *@ - + - @*
- -
-
- -
- - - -
+ @*
+ +
+
+ +
+ + + +
*@
@@ -518,24 +515,24 @@ @section Scripts { - + } \ No newline at end of file diff --git a/CustomerOnlineV2/CustomerOnlineV2/Views/Home/Index.cshtml b/CustomerOnlineV2/CustomerOnlineV2/Views/Home/Index.cshtml index 6e7502c..574055b 100644 --- a/CustomerOnlineV2/CustomerOnlineV2/Views/Home/Index.cshtml +++ b/CustomerOnlineV2/CustomerOnlineV2/Views/Home/Index.cshtml @@ -30,6 +30,14 @@
+
+
+ + +

Add Receiver

+ +
+
@*
@@ -70,14 +78,7 @@
-
-
- - -

Bill Payment

- -
-
*@ + *@
diff --git a/CustomerOnlineV2/CustomerOnlineV2/Views/Shared/_Layout.cshtml b/CustomerOnlineV2/CustomerOnlineV2/Views/Shared/_Layout.cshtml index 65948f4..ca37298 100644 --- a/CustomerOnlineV2/CustomerOnlineV2/Views/Shared/_Layout.cshtml +++ b/CustomerOnlineV2/CustomerOnlineV2/Views/Shared/_Layout.cshtml @@ -28,7 +28,7 @@ var mobileNumber = userInfo.MobileNumber; var email = userInfo.Email; var userId = userInfo.UserId; - + var membershipId = userInfo.MembershipId; var errorMessage = Context.Request.Cookies["ErrorMessage"]; var errorCode = Context.Request.Cookies["ErrorCode"]; @@ -150,7 +150,7 @@

Hello, @firstName

-

User Id : @userId

+

User Id : @membershipId

diff --git a/CustomerOnlineV2/CustomerOnlineV2/Views/Transaction/SendMoney.cshtml b/CustomerOnlineV2/CustomerOnlineV2/Views/Transaction/SendMoney.cshtml index bbe1798..b8e2dce 100644 --- a/CustomerOnlineV2/CustomerOnlineV2/Views/Transaction/SendMoney.cshtml +++ b/CustomerOnlineV2/CustomerOnlineV2/Views/Transaction/SendMoney.cshtml @@ -72,7 +72,7 @@
- +
@@ -132,35 +132,43 @@ - + - + - + - + + + + + + - + +
Send Amount :Collected Amount : 0.00 GBP
Exchange Rate :Service Fee : - 0.00 + 0.00 GBP
Transfer Fee :Reward Amount Used : - 0.00 GBP + 0.00 GBP
Reveiver will get () :Total Sent Amount : - 0.00 + 0.00 GBP +
Exchange Rate : + 0.00
Total to Pay :Total Payout Amount() : - 0.00 GBP + 0.00
diff --git a/CustomerOnlineV2/CustomerOnlineV2/wwwroot/js/Custom.js b/CustomerOnlineV2/CustomerOnlineV2/wwwroot/js/Custom.js index 38a4198..bec010d 100644 --- a/CustomerOnlineV2/CustomerOnlineV2/wwwroot/js/Custom.js +++ b/CustomerOnlineV2/CustomerOnlineV2/wwwroot/js/Custom.js @@ -110,6 +110,7 @@ function ShowAlertMessageErrorOnly(errorCode, errorMessage) { else { iziToast.info({ title: 'Info', + timeout: 1000, message: errorMessage }); }