diff --git a/CustomerOnlineV2/CustomerOnlineV2.Business/Business/DocumentBusiness/DocumentBusiness.cs b/CustomerOnlineV2/CustomerOnlineV2.Business/Business/DocumentBusiness/DocumentBusiness.cs new file mode 100644 index 0000000..fd08c6e --- /dev/null +++ b/CustomerOnlineV2/CustomerOnlineV2.Business/Business/DocumentBusiness/DocumentBusiness.cs @@ -0,0 +1,35 @@ +using CustomerOnlineV2.Common.Models.DocumentModel; +using CustomerOnlineV2.Repository.Repository.DocumentRepository; +using CustomerOnlineV2.Repository.Repository.ReceiverRepository; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Reflection; +using System.Text; +using System.Threading.Tasks; + +namespace CustomerOnlineV2.Business.Business.DocumentBusiness +{ + public class DocumentBusiness : IDocumentBusiness + { + + + private readonly IDocumentRepository _docRepository; + + + public DocumentBusiness(IDocumentRepository docRepository) + { + + _docRepository = docRepository; + + } + + public string WebRootPath => throw new NotImplementedException(); + + public async Task Document(CustomerDocumentModel doc, string Id, string user) + { + var model1 = await _docRepository.GetDocument(doc, Id, user); + return model1; + } + } +} diff --git a/CustomerOnlineV2/CustomerOnlineV2.Business/Business/DocumentBusiness/IDocumentBusiness.cs b/CustomerOnlineV2/CustomerOnlineV2.Business/Business/DocumentBusiness/IDocumentBusiness.cs new file mode 100644 index 0000000..ee213b3 --- /dev/null +++ b/CustomerOnlineV2/CustomerOnlineV2.Business/Business/DocumentBusiness/IDocumentBusiness.cs @@ -0,0 +1,11 @@ +using CustomerOnlineV2.Common.Models.DocumentModel; + +namespace CustomerOnlineV2.Business.Business.DocumentBusiness +{ + public interface IDocumentBusiness + { + string WebRootPath { get; } + + Task Document(CustomerDocumentModel doc, string userId, string userName); + } +} \ No newline at end of file diff --git a/CustomerOnlineV2/CustomerOnlineV2.Business/Business/TransactionBusiness/ITransactionBusiness.cs b/CustomerOnlineV2/CustomerOnlineV2.Business/Business/TransactionBusiness/ITransactionBusiness.cs index 3ac1abf..cf14315 100644 --- a/CustomerOnlineV2/CustomerOnlineV2.Business/Business/TransactionBusiness/ITransactionBusiness.cs +++ b/CustomerOnlineV2/CustomerOnlineV2.Business/Business/TransactionBusiness/ITransactionBusiness.cs @@ -11,7 +11,9 @@ namespace CustomerOnlineV2.Business.Business.TransactionBusiness Task SendMoney(SendTransactionModel sendMoneyRequest, LoginResponse loginDetails); Task GetTransactionDetails(string id, LoginResponse loginDetails); Task GetReceiptData(string id, LoginResponse loginDetails); - Task saveTranData(TrustPaymentRequest tranData, LoginResponse loginDetails); - Task GetTranData(LoginResponse loginDetails); + Task SaveTranData(TrustPaymentRequest tranData, LoginResponse loginDetails); + + Task UpdateTranData(TrustPaymentRequest tranData, LoginResponse loginDetails); + Task GetTranData(LoginResponse loginDetails); } } diff --git a/CustomerOnlineV2/CustomerOnlineV2.Business/Business/TransactionBusiness/TransactionBusiness.cs b/CustomerOnlineV2/CustomerOnlineV2.Business/Business/TransactionBusiness/TransactionBusiness.cs index a733322..05b3080 100644 --- a/CustomerOnlineV2/CustomerOnlineV2.Business/Business/TransactionBusiness/TransactionBusiness.cs +++ b/CustomerOnlineV2/CustomerOnlineV2.Business/Business/TransactionBusiness/TransactionBusiness.cs @@ -67,11 +67,16 @@ namespace CustomerOnlineV2.Business.Business.TransactionBusiness return await _transactionRepo.GetReceiptData(id, loginDetails); } - public async Task saveTranData(TrustPaymentRequest tranData, LoginResponse loginDetails) + + public async Task SaveTranData(TrustPaymentRequest tranData, LoginResponse loginDetails) { - return await _transactionRepo.saveTranData(tranData, loginDetails); + return await _transactionRepo.SaveTranData(tranData, loginDetails); } + public async Task UpdateTranData(TrustPaymentRequest tranData, LoginResponse loginDetails) + { + return await _transactionRepo.UpdateTranData(tranData, loginDetails); + } private SendMoneyRequestModel GenerateSendMoneyParams(SendTransactionModel sendMoneyRequest, LoginResponse loginDetails) { return new SendMoneyRequestModel diff --git a/CustomerOnlineV2/CustomerOnlineV2.Common/Models/DocumentModel/CustomerDocumentModel.cs b/CustomerOnlineV2/CustomerOnlineV2.Common/Models/DocumentModel/CustomerDocumentModel.cs new file mode 100644 index 0000000..1950b2d --- /dev/null +++ b/CustomerOnlineV2/CustomerOnlineV2.Common/Models/DocumentModel/CustomerDocumentModel.cs @@ -0,0 +1,23 @@ +using Microsoft.AspNetCore.Http; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace CustomerOnlineV2.Common.Models.DocumentModel +{ + public class CustomerDocumentModel: CommonResponse + { + public string? cdid { get; set; } + public string? customerId { get; set; } + public string? fileName { get; set;} + public string? description { get; set; } + public string? fileType { get; set; } + public string? documentType { get; set; } + public string? user { get; set;} + public string? sessionId { get; set; } + public IFormFile? File { get; set; } + public object? FormFile { get; set; } + } +} diff --git a/CustomerOnlineV2/CustomerOnlineV2.Repository/Repository/AccountRepository/AccountRepository.cs b/CustomerOnlineV2/CustomerOnlineV2.Repository/Repository/AccountRepository/AccountRepository.cs index 8a2b7b6..0c6a256 100644 --- a/CustomerOnlineV2/CustomerOnlineV2.Repository/Repository/AccountRepository/AccountRepository.cs +++ b/CustomerOnlineV2/CustomerOnlineV2.Repository/Repository/AccountRepository/AccountRepository.cs @@ -76,6 +76,7 @@ namespace CustomerOnlineV2.Repository.Repository.AccountRepository var sql = "EXEC PROC_DYNAMIC_TABLE"; sql += " @Flag = " + _connHelper.FilterString("ForceChange"); sql += ",@UserEmail = " + _connHelper.FilterString(logindetails.UserName); + sql += ",@OldPassword = " + _connHelper.FilterString(model.OldPassword); sql += ",@Password = " + _connHelper.FilterString(model.NewPassword); sql += ",@ConfirmPassword = " + _connHelper.FilterString(model.ConfirmNewPassword); sql += ",@ipAddress = " + _connHelper.FilterString(model.IpAddress); diff --git a/CustomerOnlineV2/CustomerOnlineV2.Repository/Repository/DocumentRepository/DocumentRepository.cs b/CustomerOnlineV2/CustomerOnlineV2.Repository/Repository/DocumentRepository/DocumentRepository.cs new file mode 100644 index 0000000..352020a --- /dev/null +++ b/CustomerOnlineV2/CustomerOnlineV2.Repository/Repository/DocumentRepository/DocumentRepository.cs @@ -0,0 +1,90 @@ +using CustomerOnlineV2.Common.Models; +using CustomerOnlineV2.Common.Models.DocumentModel; +using CustomerOnlineV2.Repository.ConnectionHelper; + +namespace CustomerOnlineV2.Repository.Repository.DocumentRepository +{ + + + public class DocumentRepository : IDocumentRepository + { + + private readonly IConnectionHelper _connHelper; + + public DocumentRepository(IConnectionHelper connHelper) + { + _connHelper = connHelper; + } + //public void ExecuteStoredProcedure(string fileName) + //{ + // // try + // // { + // // string sql = "exec proc_customerDocumentType"; + // // if (cdId != "") + // // { + // // sql += " @flag ='u'"; + // // } + // // else + // // { + // // sql += " @flag ='i'"; + // // } + // // sql += ",@customerId =" + FilterString(customerId); + // // sql += ",@cdId =" + FilterString(cdId); + // // sql += ",@fileName =" + FilterString(fileName); + // // sql += ",@fileDescription =" + FilterString(fileDescription); + // // sql += ",@fileType =" + FilterString(fileType); + // // sql += ",@documentType =" + FilterString(documentType); + // // sql += ",@user =" + FilterString(user); + // // sql += ",@rowIdField =" + FilterString(sessionId); + // // } + // //catch (Exception ex) + // // { + // // ex.Message(w) + // // } + //} + + public async Task GetDocument(CustomerDocumentModel doc, string id, string user) + { + try + { + var sql = "exec proc_customerDocumentType"; + sql += " @flag = " + _connHelper.FilterString("i"); + sql += ",@customerId =" + _connHelper.FilterString(id); + sql += ",@user = " + _connHelper.FilterString(user); + //sql += ",@cdId =" + _connHelper.FilterString(doc.cdid); + sql += ",@fileName =" + _connHelper.FilterString(doc.fileName); + sql += ",@fileDescription =" + _connHelper.FilterString(doc.description); + sql += ",@fileType =" + _connHelper.FilterString(doc.fileType); + sql += ",@documentType =" + _connHelper.FilterString(doc.documentType); + sql += ",@rowIdField =" + _connHelper.FilterString(doc.sessionId); + + var dt = _connHelper.ExecuteDataTable(sql); + if (dt == null || dt.Rows.Count <= 0) + { + doc.ResponseCode = ResponseHelper.FAILED; + doc.ResponseMessage = "DB Null Error!"; + + + } + else + { + doc.ResponseCode = ResponseHelper.SUCCESS; + doc.ResponseMessage = ResponseMessageHelper.SUCCESS; + + + } + } + catch (Exception ex) + { + doc.ResponseCode = ResponseHelper.EXCEPTION; + doc.ResponseMessage = "Exception occured: " + ex.Message; + + } + + return await Task.FromResult(doc); + + + } + } + +} diff --git a/CustomerOnlineV2/CustomerOnlineV2.Repository/Repository/DocumentRepository/IDocumentRepository.cs b/CustomerOnlineV2/CustomerOnlineV2.Repository/Repository/DocumentRepository/IDocumentRepository.cs new file mode 100644 index 0000000..b5635f6 --- /dev/null +++ b/CustomerOnlineV2/CustomerOnlineV2.Repository/Repository/DocumentRepository/IDocumentRepository.cs @@ -0,0 +1,10 @@ +using CustomerOnlineV2.Common.Models.DocumentModel; + +namespace CustomerOnlineV2.Repository.Repository.DocumentRepository +{ + public interface IDocumentRepository + { + //void ExecuteStoredProcedure(string fileName); + Task GetDocument(CustomerDocumentModel doc, string? id, string? user); + } +} \ No newline at end of file diff --git a/CustomerOnlineV2/CustomerOnlineV2.Repository/Repository/TransactionRepository/ITransactionRepository.cs b/CustomerOnlineV2/CustomerOnlineV2.Repository/Repository/TransactionRepository/ITransactionRepository.cs index c5fe597..a24d62e 100644 --- a/CustomerOnlineV2/CustomerOnlineV2.Repository/Repository/TransactionRepository/ITransactionRepository.cs +++ b/CustomerOnlineV2/CustomerOnlineV2.Repository/Repository/TransactionRepository/ITransactionRepository.cs @@ -9,7 +9,8 @@ namespace CustomerOnlineV2.Repository.Repository.TransactionRepository Task GetPayoutDetails(SendTransactionModel calcRequest, LoginResponse loginDetails); Task GetTransactionDetails(string id, LoginResponse loginDetails); Task GetReceiptData(string id, LoginResponse loginDetails); - Task saveTranData(TrustPaymentRequest tranData, LoginResponse loginDetails); - Task GetTranData(LoginResponse loginDetails); + Task SaveTranData(TrustPaymentRequest tranData, LoginResponse loginDetails); + Task UpdateTranData(TrustPaymentRequest tranData, LoginResponse loginDetails); + Task GetTranData(LoginResponse loginDetails); } } diff --git a/CustomerOnlineV2/CustomerOnlineV2.Repository/Repository/TransactionRepository/TransactionRepository.cs b/CustomerOnlineV2/CustomerOnlineV2.Repository/Repository/TransactionRepository/TransactionRepository.cs index 9016a41..b824d27 100644 --- a/CustomerOnlineV2/CustomerOnlineV2.Repository/Repository/TransactionRepository/TransactionRepository.cs +++ b/CustomerOnlineV2/CustomerOnlineV2.Repository/Repository/TransactionRepository/TransactionRepository.cs @@ -92,9 +92,12 @@ namespace CustomerOnlineV2.Repository.Repository.TransactionRepository _response.ControlNo = Convert.ToString(dt.Rows[0]["ControlNo"]); _response.CollectAmount = Convert.ToString(dt.Rows[0]["camt"]); + _response.TransferAmount = Convert.ToString(dt.Rows[0]["tAmt"]); _response.CollectCurrency = Convert.ToString(dt.Rows[0]["collCurr"]); _response.ReceiverName = Convert.ToString(dt.Rows[0]["receivername"]); + _response.SenderName = Convert.ToString(dt.Rows[0]["SenderName"]); _response.TransactionId = Convert.ToString(dt.Rows[0]["id"]); + _response.PCountry = Convert.ToString(dt.Rows[0]["pCountry"]); } } catch (Exception ex) @@ -139,7 +142,7 @@ namespace CustomerOnlineV2.Repository.Repository.TransactionRepository _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]["address"]); + _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"]); @@ -173,14 +176,52 @@ namespace CustomerOnlineV2.Repository.Repository.TransactionRepository } return await Task.FromResult(_response); } + public async Task SaveTranData(TrustPaymentRequest tranData, LoginResponse loginDetails) + { + SendMoneySuccessModel _response = new SendMoneySuccessModel(); + try + { + var sql = "EXEC proc_trust_payment"; + sql += " @Flag = " + _connHelper.FilterString("i-details"); + sql += ",@UserEmail = " + _connHelper.FilterString(loginDetails.UserName); + sql += ",@refId = " + _connHelper.FilterString(Guid.NewGuid().ToString()); + sql += ",@sitereference = " + _connHelper.FilterString(tranData.sitereference); + sql += ",@tranid = " + _connHelper.FilterString(tranData.tranId); + sql += ",@customerid = " + _connHelper.FilterString(loginDetails.UserId); + sql += ",@orderreference = " + _connHelper.FilterString(tranData.orderreference); + sql += ",@token = " + _connHelper.FilterString(tranData.token); - public async Task saveTranData(TrustPaymentRequest tranData, LoginResponse loginDetails) + _logger.LogDebug("TRANSACTIONREPOSITORY | SaveTranData | 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("TRANSACTIONREPOSITORY | SaveTranData | DB RESPONSE | " + JsonConvert.SerializeObject(_response)); + } + else + { + + } + } + catch (Exception ex) + { + _response.ResponseCode = ResponseHelper.EXCEPTION; + _response.ResponseMessage = "Exception occured: " + ex.Message; + _logger.LogError("saveTranData | EXCEPTION | " + ex.ToString()); + } + return await Task.FromResult(_response); + } + + public async Task UpdateTranData(TrustPaymentRequest tranData, LoginResponse loginDetails) { TrustPaymentRequest _response = new TrustPaymentRequest(); try { - var sql = "EXEC PROC_DYNAMIC_TABLE"; - sql += " @Flag = " + _connHelper.FilterString("save-trandetail"); + var sql = "EXEC proc_trust_payment"; + sql += " @Flag = " + _connHelper.FilterString("u-details"); sql += ",@UserEmail = " + _connHelper.FilterString(loginDetails.UserName); sql += ",@id = " + _connHelper.FilterString(loginDetails.UserId); sql += ",@refId = " + _connHelper.FilterString(""); @@ -213,7 +254,6 @@ namespace CustomerOnlineV2.Repository.Repository.TransactionRepository { _response.ResponseCode = ResponseHelper.EXCEPTION; _response.ResponseMessage = "Exception occured: " + ex.Message; - _logger.LogError("TRANSACTIONREPOSITORY | GETTRANSACTIONDETAILS | EXCEPTION | " + JsonConvert.SerializeObject(_response)); } return await Task.FromResult(_response); diff --git a/CustomerOnlineV2/CustomerOnlineV2/Controllers/CustomerController.cs b/CustomerOnlineV2/CustomerOnlineV2/Controllers/CustomerController.cs index 1d0d03b..98e4ef8 100644 --- a/CustomerOnlineV2/CustomerOnlineV2/Controllers/CustomerController.cs +++ b/CustomerOnlineV2/CustomerOnlineV2/Controllers/CustomerController.cs @@ -2,7 +2,7 @@ using CustomerOnlineV2.Authorization; using CustomerOnlineV2.Business.Business.RegisterBusiness; using CustomerOnlineV2.Common.Models; -using CustomerOnlineV2.Common.Models.HomeModel; +using CustomerOnlineV2.Common.Helper; using CustomerOnlineV2.Common.Models.ReceiverModel; using CustomerOnlineV2.Common.Models.RegisterModel; using CustomerOnlineV2.Common.Models.TransactionModel; @@ -10,7 +10,7 @@ using Microsoft.AspNetCore.Mvc; using Newtonsoft.Json; using Serilog.Context; using CustomerOnlineV2.Common.Helper; - +using CustomerOnlineV2.Common.Models.HomeModel; namespace CustomerOnlineV2.Controllers { @@ -79,7 +79,17 @@ namespace CustomerOnlineV2.Controllers { return View(); } - + public IActionResult CustomerProfile() + { + return View(); + } + [HttpGet] + [Route("Customer/GetCustomerDetail")] + public async Task GetCustomerDetail() + { + var loginDetails = HttpContext.GetLoginDetails(); + return await _registerBusiness.GetTranCustomerById(loginDetails); + } [Authorization("Notifications")] public IActionResult Notifications() { diff --git a/CustomerOnlineV2/CustomerOnlineV2/Controllers/CustomerDocumentController.cs b/CustomerOnlineV2/CustomerOnlineV2/Controllers/CustomerDocumentController.cs new file mode 100644 index 0000000..559498a --- /dev/null +++ b/CustomerOnlineV2/CustomerOnlineV2/Controllers/CustomerDocumentController.cs @@ -0,0 +1,149 @@ +using CustomerOnlineV2.Common.Models.DocumentModel; +using Microsoft.AspNetCore.Mvc; +using CustomerOnlineV2.Common.Helper; +using HttpPostAttribute = Microsoft.AspNetCore.Mvc.HttpPostAttribute; +using CustomerOnlineV2.Business.Business.DocumentBusiness; +using Microsoft.AspNetCore.Hosting; +using System.Reflection; +using CustomerOnlineV2.Authorization; + +namespace CustomerOnlineV2.Controllers +{ + public class CustomerDocumentController : Controller + { + private readonly IDocumentBusiness _business; + + public CustomerDocumentController(IDocumentBusiness business) + { + _business = business; + } + + public IActionResult CustomerDocument() + { + return View(); + } + + [HttpPost] + [Authorization("AddDocment")] + public async Task AddDocment(CustomerDocumentModel doc, string id, string user) + { + var loginDetails = HttpContext.GetLoginDetails(); + //ReceiverInformationModel _response = new ReceiverInformationModel(); + var Document = await _business.Document(doc, loginDetails.UserId, loginDetails.UserName); + + + //if (ModelState.IsValid) + //{ + // string folder = null; + // if (doc.File != null) + // { + // if (doc.File.Length > 0) + // { + // Guid guid1 = Guid.NewGuid(); + // folder = "/attachement/docs/" + guid1 + doc.File.FileName; + // string uploadFolder = Path.Combine(webHostEnvironment.WebRootPath, "attachement/docs"); + // string uniqueFileName = guid1 + doc.File.FileName; + + // string filePath = Path.Combine(uploadFolder, uniqueFileName); + + // using (var stream = new FileStream(filePath, FileMode.Create)) + // { + // await doc.FormFile.CopyToAsync(stream); + // } + // } + // } + //} + return Document; + } + + //[HttpPost] + //[ValidateAntiForgeryToken] + //public async Task AddDocment(CustomerDocumentModel doc) + //{ + // if (doc.File != null) + // { + // //upload files to wwwroot + // var fileName = Path.GetFileName(doc.File.FileName); + // var filePath = Path.Combine(_business.WebRootPath, "images", fileName); + + // using (var fileSteam = new FileStream(filePath, FileMode.Create)) + // { + // await doc.File.CopyToAsync(fileSteam); + // } + + // } + + // return View(); + //} + + + + + + + //public void ProcessRequest(HttpContext context) + //{ + // context.Response.ContentType = "text/plain"; + + // string dirFullPath = HttpContext.Current.Server.MapPath("~/MediaUploader/"); + // string[] files; + // int numFiles; + // files = System.IO.Directory.GetFiles(dirFullPath); + // numFiles = files.Length; + // numFiles = numFiles + 1; + + // string str_image = ""; + + // foreach (string s in context.Request.Files) + // { + // HttpPostedFile file = context.Request.Files[s]; + // string fileName = file.FileName; + // string fileExtension = file.ContentType; + + // if (!string.IsNullOrEmpty(fileName)) + // { + // fileExtension = Path.GetExtension(fileName); + // str_image = "MyPHOTO_" + numFiles.ToString() + fileExtension; + // string pathToSave = HttpContext.Current.Server.MapPath("~/MediaUploader/") + str_image; + // System.Drawing.Bitmap bmpPostedImage = new System.Drawing.Bitmap(file.InputStream); + + // //ResizeMyImage method call + // System.Drawing.Image objImage = ResizeMyImage(bmpPostedImage, 200); + // objImage.Save(pathToSave, System.Drawing.Imaging.ImageFormat.Jpeg); + // } + // } + // context.Response.Write(str_image); + //} + + + //public async Task Upload(CustomerDocumentModel model) + //{ + + + // var loginDetails = HttpContext.GetLoginDetails(); + // //ReceiverInformationModel _response = new ReceiverInformationModel(); + // var receiver1 = await _receiverBusiness.Receivers(receiver, loginDetails.UserId, loginDetails.UserName); + // return receiver1; + + // //////ar result = dbresult.Extra.Split('|'); + // //var customerId = result[0]; + // //var membershipId = result[1]; + // //var registerDate = result[2]; + + // //var loginDetails = HttpContext.GetLoginDetails(); + // //if (model.File != null && model.File.Length > 0) + // //{ + + // // var fileName = model.File.FileName; + // // var documentType = model.File.ContentType; + + // // ///var + // // _repository.ExecuteStoredProcedure(fileName); + + // // return Json(new { success = true, message = "File uploaded and processed successfully." }); + // //} + + // //return Json(new { success = false, message = "File upload failed." }); + //} + } +} diff --git a/CustomerOnlineV2/CustomerOnlineV2/Views/Customer/CustomerProfile.cshtml b/CustomerOnlineV2/CustomerOnlineV2/Views/Customer/CustomerProfile.cshtml new file mode 100644 index 0000000..5a7a5ea --- /dev/null +++ b/CustomerOnlineV2/CustomerOnlineV2/Views/Customer/CustomerProfile.cshtml @@ -0,0 +1,434 @@ +@model CustomerOnlineV2.Common.Models.RegisterModel.OnlineCustomerRegisterModel +@using CustomerOnlineV2.Common.Helper +@{ + Layout = "_Layout2"; +} + +@{ + var userInfo = Context.GetLoginDetails(); + + var fullName = userInfo.FullName; + var username = userInfo.UserName; + var firstName = fullName.Split(' ')[0]; + var mobileNumber = userInfo.MobileNumber; + var email = userInfo.Email; + var userId = userInfo.UserId; + + var errorMessage = Context.Request.Cookies["ErrorMessage"]; + var errorCode = Context.Request.Cookies["ErrorCode"]; + + CustomerOnlineV2.Helper.HelperClass.RemoveCookies("ErrorMessage", Context); + CustomerOnlineV2.Helper.HelperClass.RemoveCookies("ErrorCode", Context); +} +@{ + //var customerInfo = Context.GetCustomerDetails(); + { + + } +} + + +
+
+
+ + + + +
+ +
+

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

+
+
+

Name:

+

+
+
+ +

+
+ +
+ +

+ +

+
+
+ +

+ +

+
+
+ +

+ English (United kingdom) +

+
+
+ +

+ Active +

+
+
+ + + + +
+

+ Personal Address + @* + Edit + *@ + + Edit + +

+
+
+

ZipCode:

+

+ +
+
+

City:

+

+
+
+

Address1:

+

+ +

+
+
+

Address2:

+

+ +

+
+
+ + + +
+

+ Account Setting + + Edit + +

+
+
+

Nationality:

+

+
+
+

Id Type:

+

+
+
+

Id Number:

+

+
+
+

IdIssue Country :

+

+
+
+

Id Issue Date:

+

+
+
+

Id Expiry Date:

+

+
+
+ + + + +
+ +
+
+
+ + +@section Scripts { + +} \ No newline at end of file diff --git a/CustomerOnlineV2/CustomerOnlineV2/Views/Customer/CustomerRegistration.cshtml b/CustomerOnlineV2/CustomerOnlineV2/Views/Customer/CustomerRegistration.cshtml index f8fef41..8cff548 100644 --- a/CustomerOnlineV2/CustomerOnlineV2/Views/Customer/CustomerRegistration.cshtml +++ b/CustomerOnlineV2/CustomerOnlineV2/Views/Customer/CustomerRegistration.cshtml @@ -88,7 +88,7 @@
-
Login Details
+
Your Details
@@ -98,7 +98,7 @@
- +
@@ -108,9 +108,9 @@ - @* - + + @* *@
@@ -119,26 +119,17 @@
- + - @* - - *@ + @* + + *@
- - - -
-
-
-
-
Personal Information
-
@@ -163,55 +154,17 @@
- @*
-
-
- - - -
-
-
*@
- @* select class="form-select form-control" asp-for="Country" asp-items="@CustomerOnlineV2.Helper.HelperClass.GetDropdownData("allCountrylist", true)" class="form-select" required onkeydown="PaymentMethodChangeEvent"> *@ +
-
-
-
- - -
-
-
-
-
-
- - -
-
-
@@ -225,108 +178,16 @@
-
-
-
- - -
-
-
-
-
-
-
- - -
- - - -
-
-
-
-
-
-
- - -
- @* - - *@ -
-
-
-
-
-
-
- - -
- @* - - *@ -
-
-
-
-
-
-
-
-
-
-
Contact Details
-
-
-
-
- - -
-
-
- @*
-
-
- - -
-
-
-
-
-
- - -
-
-
*@
@@ -392,73 +253,12 @@
-
-
-
- - -
-
-
-
-
-
-
-
-
-
-
Other Details
-
-
-
-
- - -
-
-
-
-
-
- - -
-
-
-
-
-
- - -
-
-
+ + +
@@ -491,8 +291,8 @@
- - + +
@@ -516,7 +316,7 @@
- + @@ -546,30 +346,10 @@ + } \ No newline at end of file diff --git a/CustomerOnlineV2/CustomerOnlineV2/Views/Shared/_Layout.cshtml b/CustomerOnlineV2/CustomerOnlineV2/Views/Shared/_Layout.cshtml index b82c56a..519b716 100644 --- a/CustomerOnlineV2/CustomerOnlineV2/Views/Shared/_Layout.cshtml +++ b/CustomerOnlineV2/CustomerOnlineV2/Views/Shared/_Layout.cshtml @@ -160,7 +160,7 @@

diff --git a/CustomerOnlineV2/CustomerOnlineV2/Views/Transaction/Payment.cshtml b/CustomerOnlineV2/CustomerOnlineV2/Views/Transaction/Payment.cshtml index 1b11b99..9780048 100644 --- a/CustomerOnlineV2/CustomerOnlineV2/Views/Transaction/Payment.cshtml +++ b/CustomerOnlineV2/CustomerOnlineV2/Views/Transaction/Payment.cshtml @@ -70,7 +70,8 @@ - + + @Html.AntiForgeryToken() diff --git a/CustomerOnlineV2/CustomerOnlineV2/Views/Transaction/Success.cshtml b/CustomerOnlineV2/CustomerOnlineV2/Views/Transaction/Success.cshtml index 2b3908e..e9434b7 100644 --- a/CustomerOnlineV2/CustomerOnlineV2/Views/Transaction/Success.cshtml +++ b/CustomerOnlineV2/CustomerOnlineV2/Views/Transaction/Success.cshtml @@ -14,15 +14,73 @@
-
-
-

-

Success!

-

Transactions Complete

+
+
+ +

Your Transaction is succesfully created! Print

+ + @*

Transactions Complete

*@ +
+
+

Thank you @Model.SenderName for sending transaction with us.

+

Your Transaction ID is @Model.TransactionId (This is not a Reference No)

+

Your transaction to @Model.PCountry for @CustomerOnlineV2.Common.Helper.Utilities.ShowDecimal(Model.TransferAmount) @Model.CollectCurrency is in progress. You will receive an email regarding the transfer update shortly.

+

Please log-in your personal online banking and transfer funds directly to our accounts

+ @*

You've Succesfully sent @CustomerOnlineV2.Common.Helper.Utilities.ShowDecimal(Model.CollectAmount) @Model.CollectCurrency to @Model.ReceiverName, See transaction details under Transactions Details

*@ + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ Bank Name:   + CLEAR BANK +
+
+ Account Name:   + IME LONDON +
+
+ Sort Code:   + 04-6-93 +
+
+ Account Number:   + 00000151 +
+
+ Total To Pay:   + @CustomerOnlineV2.Common.Helper.Utilities.ShowDecimal(Model.CollectAmount) @Model.CollectCurrency +
+
+ Reference:   + @Model.SenderName +
+
-

You've Succesfully sent @CustomerOnlineV2.Common.Helper.Utilities.ShowDecimal(Model.CollectAmount) @Model.CollectCurrency to @Model.ReceiverName, See transaction details under Transactions Details

- Print +
diff --git a/CustomerOnlineV2/CustomerOnlineV2/Views/Transaction/TranPaySuccess.cshtml b/CustomerOnlineV2/CustomerOnlineV2/Views/Transaction/TranPaySuccess.cshtml index 3ed94e6..8087451 100644 --- a/CustomerOnlineV2/CustomerOnlineV2/Views/Transaction/TranPaySuccess.cshtml +++ b/CustomerOnlineV2/CustomerOnlineV2/Views/Transaction/TranPaySuccess.cshtml @@ -39,18 +39,11 @@

Success!

Transaction Payment Complete

-

Error Code: @ViewBag.errorCode

-

Order Reference: @ViewBag.orderReference

-

Payment Type Description: @ViewBag.paymentTypeDescription

-

Request Reference: @ViewBag.requestReference

-

Response Site Security: @ViewBag.responseSiteSecurity

-

Settle Status: @ViewBag.settleStatus

-

Site Reference: @ViewBag.siteReference

-

Transaction Reference: @ViewBag.transactionReference

+
-@*

You've Succesfully sent @CustomerOnlineV2.Common.Helper.Utilities.ShowDecimal(Model.CollectAmount) @Model.CollectCurrency to @Model.ReceiverName, See transaction details under Transactions Details

- *@
+ < class="text-3 mb-4">You've Succesfully sent @CustomerOnlineV2.Common.Helper.Utilities.ShowDecimal(Model.CollectAmount) @Model.CollectCurrency to @Model.ReceiverName, See transaction details under Transactions Details

+
diff --git a/CustomerOnlineV2/CustomerOnlineV2/wwwroot/images/loading.gif b/CustomerOnlineV2/CustomerOnlineV2/wwwroot/images/loading.gif new file mode 100644 index 0000000..32ac2b4 Binary files /dev/null and b/CustomerOnlineV2/CustomerOnlineV2/wwwroot/images/loading.gif differ