diff --git a/CustomerOnlineV2/.vs/CustomerOnlineV2/DesignTimeBuild/.dtbcache.v2 b/CustomerOnlineV2/.vs/CustomerOnlineV2/DesignTimeBuild/.dtbcache.v2 index ba426f6..4177dc9 100644 Binary files a/CustomerOnlineV2/.vs/CustomerOnlineV2/DesignTimeBuild/.dtbcache.v2 and b/CustomerOnlineV2/.vs/CustomerOnlineV2/DesignTimeBuild/.dtbcache.v2 differ diff --git a/CustomerOnlineV2/.vs/CustomerOnlineV2/v17/.futdcache.v2 b/CustomerOnlineV2/.vs/CustomerOnlineV2/v17/.futdcache.v2 index ba2c393..7310b29 100644 Binary files a/CustomerOnlineV2/.vs/CustomerOnlineV2/v17/.futdcache.v2 and b/CustomerOnlineV2/.vs/CustomerOnlineV2/v17/.futdcache.v2 differ diff --git a/CustomerOnlineV2/.vs/CustomerOnlineV2/v17/.suo b/CustomerOnlineV2/.vs/CustomerOnlineV2/v17/.suo index ed52c77..54d18e3 100644 Binary files a/CustomerOnlineV2/.vs/CustomerOnlineV2/v17/.suo and b/CustomerOnlineV2/.vs/CustomerOnlineV2/v17/.suo differ diff --git a/CustomerOnlineV2/.vs/ProjectEvaluation/customeronlinev2.metadata.v7.bin b/CustomerOnlineV2/.vs/ProjectEvaluation/customeronlinev2.metadata.v7.bin index 57afeb4..605c9bd 100644 Binary files a/CustomerOnlineV2/.vs/ProjectEvaluation/customeronlinev2.metadata.v7.bin and b/CustomerOnlineV2/.vs/ProjectEvaluation/customeronlinev2.metadata.v7.bin differ diff --git a/CustomerOnlineV2/.vs/ProjectEvaluation/customeronlinev2.projects.v7.bin b/CustomerOnlineV2/.vs/ProjectEvaluation/customeronlinev2.projects.v7.bin index 0ea1036..69805c3 100644 Binary files a/CustomerOnlineV2/.vs/ProjectEvaluation/customeronlinev2.projects.v7.bin and b/CustomerOnlineV2/.vs/ProjectEvaluation/customeronlinev2.projects.v7.bin differ diff --git a/CustomerOnlineV2/CustomerOnlineV2.Business/Business/TransactionBusiness/ITransactionBusiness.cs b/CustomerOnlineV2/CustomerOnlineV2.Business/Business/TransactionBusiness/ITransactionBusiness.cs index 127b19a..40b172f 100644 --- a/CustomerOnlineV2/CustomerOnlineV2.Business/Business/TransactionBusiness/ITransactionBusiness.cs +++ b/CustomerOnlineV2/CustomerOnlineV2.Business/Business/TransactionBusiness/ITransactionBusiness.cs @@ -17,5 +17,6 @@ namespace CustomerOnlineV2.Business.Business.TransactionBusiness Task GetTranData(LoginResponse loginDetails); Task GetTransactionReportList(LoginResponse loginDetails, CustomerTransaction model); Task GetRewardPoints(LoginResponse loginDetails); + Task UpdateTranDataFailed(TrustPaymentRequest request, LoginResponse loginDetails); } } diff --git a/CustomerOnlineV2/CustomerOnlineV2.Business/Business/TransactionBusiness/TransactionBusiness.cs b/CustomerOnlineV2/CustomerOnlineV2.Business/Business/TransactionBusiness/TransactionBusiness.cs index af68e92..9e9a535 100644 --- a/CustomerOnlineV2/CustomerOnlineV2.Business/Business/TransactionBusiness/TransactionBusiness.cs +++ b/CustomerOnlineV2/CustomerOnlineV2.Business/Business/TransactionBusiness/TransactionBusiness.cs @@ -351,5 +351,9 @@ namespace CustomerOnlineV2.Business.Business.TransactionBusiness { return (CustomerNotificationModel)await _transactionRepo.GetRewardPoints(loginDetails); } + public async Task UpdateTranDataFailed(TrustPaymentRequest request, LoginResponse loginDetails) + { + return await _transactionRepo.UpdateTranDataFailed(request, loginDetails); + } } } diff --git a/CustomerOnlineV2/CustomerOnlineV2.Common/Helper/ApplicationConfig.cs b/CustomerOnlineV2/CustomerOnlineV2.Common/Helper/ApplicationConfig.cs index 0b45d17..6ae169e 100644 --- a/CustomerOnlineV2/CustomerOnlineV2.Common/Helper/ApplicationConfig.cs +++ b/CustomerOnlineV2/CustomerOnlineV2.Common/Helper/ApplicationConfig.cs @@ -73,5 +73,10 @@ namespace CustomerOnlineV2.Common.Helper { return ReadWebConfig("mobileJsonRxUrl"); } + + public static string GetMerchantEmail() + { + return ReadWebConfig("merchantemail"); + } } } diff --git a/CustomerOnlineV2/CustomerOnlineV2.Common/Models/TransactionModel/ExrateResponse.cs b/CustomerOnlineV2/CustomerOnlineV2.Common/Models/TransactionModel/ExrateResponse.cs index e688a5e..43bf687 100644 --- a/CustomerOnlineV2/CustomerOnlineV2.Common/Models/TransactionModel/ExrateResponse.cs +++ b/CustomerOnlineV2/CustomerOnlineV2.Common/Models/TransactionModel/ExrateResponse.cs @@ -240,6 +240,7 @@ namespace CustomerOnlineV2.Common.Models.TransactionModel public string? RecFirstName { get; set; } public string? RecMiddleName { get; set; } public string? RecLastName { get; set; } + public string? transactionreference { get; set; } } public class TransactionDetailModel : CommonResponse diff --git a/CustomerOnlineV2/CustomerOnlineV2.Repository/Repository/DocumentRepository/DocumentRepository.cs b/CustomerOnlineV2/CustomerOnlineV2.Repository/Repository/DocumentRepository/DocumentRepository.cs index c8c77e2..25edc90 100644 --- a/CustomerOnlineV2/CustomerOnlineV2.Repository/Repository/DocumentRepository/DocumentRepository.cs +++ b/CustomerOnlineV2/CustomerOnlineV2.Repository/Repository/DocumentRepository/DocumentRepository.cs @@ -148,14 +148,12 @@ namespace CustomerOnlineV2.Repository.Repository.DocumentRepository { doc.ResponseCode = ResponseHelper.FAILED; doc.ResponseMessage = "DB Null Error!"; - - } else { doc.ResponseCode = ResponseHelper.SUCCESS; doc.ResponseMessage = ResponseMessageHelper.SUCCESS; - doc.Extra = dt.Rows[0]["Extra"].ToString(); + //doc.Extra = dt.Rows[0]["Extra"].ToString(); // doc.Extra1 = ApplicationConfig.GetMobileApiUrl(); doc.Extra2 = url; diff --git a/CustomerOnlineV2/CustomerOnlineV2.Repository/Repository/TransactionRepository/ITransactionRepository.cs b/CustomerOnlineV2/CustomerOnlineV2.Repository/Repository/TransactionRepository/ITransactionRepository.cs index 311ea4c..0d851a4 100644 --- a/CustomerOnlineV2/CustomerOnlineV2.Repository/Repository/TransactionRepository/ITransactionRepository.cs +++ b/CustomerOnlineV2/CustomerOnlineV2.Repository/Repository/TransactionRepository/ITransactionRepository.cs @@ -14,5 +14,6 @@ namespace CustomerOnlineV2.Repository.Repository.TransactionRepository Task GetTranData(LoginResponse loginDetails); Task GetTransactionReportList(LoginResponse loginDetails, CustomerTransaction model); Task GetRewardPoints(LoginResponse loginDetails); + Task UpdateTranDataFailed(TrustPaymentRequest request, LoginResponse loginDetails); } } diff --git a/CustomerOnlineV2/CustomerOnlineV2.Repository/Repository/TransactionRepository/TransactionRepository.cs b/CustomerOnlineV2/CustomerOnlineV2.Repository/Repository/TransactionRepository/TransactionRepository.cs index 5e723c5..7e9057c 100644 --- a/CustomerOnlineV2/CustomerOnlineV2.Repository/Repository/TransactionRepository/TransactionRepository.cs +++ b/CustomerOnlineV2/CustomerOnlineV2.Repository/Repository/TransactionRepository/TransactionRepository.cs @@ -291,6 +291,51 @@ namespace CustomerOnlineV2.Repository.Repository.TransactionRepository } + } + catch (Exception ex) + { + _response.ResponseCode = ResponseHelper.EXCEPTION; + _response.ResponseMessage = "Exception occured: " + ex.Message; + _logger.LogError("TRANSACTIONREPOSITORY | GETTRANSACTIONDETAILS | EXCEPTION | " + JsonConvert.SerializeObject(_response)); + } + return await Task.FromResult(_response); + } + + public async Task UpdateTranDataFailed(TrustPaymentRequest request, LoginResponse loginDetails) + { + SendMoneySuccessModel _response = new SendMoneySuccessModel(); + try + { + var sql = "EXEC proc_trust_payment"; + sql += " @Flag = " + _connHelper.FilterString("u-details-fail"); + sql += ",@type = " + _connHelper.FilterString("data"); + sql += ",@User = " + _connHelper.FilterString(loginDetails.UserName); + sql += ",@transactionreference = " + _connHelper.FilterString(request.transactionreference); + sql += ",@sitereference = " + _connHelper.FilterString(request.sitereference); + sql += ",@errorcode = " + _connHelper.FilterString(request.errorcode); + + sql += ",@orderreference = " + _connHelper.FilterString(request.orderreference); + sql += ",@settlestatus = " + _connHelper.FilterString(request.settlestatus); + sql += ",@paymenttypedescription = " + _connHelper.FilterString(request.paymenttypedescription); + sql += ",@responsesitesecurity = " + _connHelper.FilterString(request.responsesitesecurity); + + var dt = _connHelper.ExecuteDataTable(sql); + + if (dt == null || dt.Rows.Count <= 0) + { + _response.ResponseCode = ResponseHelper.FAILED; + _response.ResponseMessage = "DB Null Error!"; + + _logger.LogError("TRANSACTIONREPOSITORY | GETTRANSACTIONDETAILS | DB RESPONSE | " + JsonConvert.SerializeObject(_response)); + } + else + { + _response.ResponseCode = ResponseHelper.SUCCESS; + _response.ResponseMessage = ResponseMessageHelper.SUCCESS; + + } + + } catch (Exception ex) { @@ -374,34 +419,33 @@ namespace CustomerOnlineV2.Repository.Repository.TransactionRepository else { var dt = ds.Tables[1]; - if (dt.Rows.Count > 0) { - _response.ResponseCode = Convert.ToInt16(dt.Rows[0]["errorCode"]); - //_response.ResponseMessage = Convert.ToString(dt.Rows[0]["msg"]); + _response.ResponseCode = Convert.ToInt16(dt.Rows[0]["errorCode"]); + //_response.ResponseMessage = Convert.ToString(dt.Rows[0]["msg"]); - List obj = new List(); - foreach (DataRow item in dt.Rows) + List obj = new List(); + foreach (DataRow item in dt.Rows) + { + obj.Add(new CustomerTransaction { - obj.Add(new CustomerTransaction - { - Id = Convert.ToString(item["userId"]), - //User = Convert.ToString(item["userId"]), - TranId = Convert.ToString(item["tranId"]), - ControlNo = Convert.ToString(item["controlNo"]), - CollAmt = Utilities.ShowDecimal(Convert.ToString(item["TranAmount"])), - PayoutAmt = Utilities.ShowDecimal(Convert.ToString(item["payoutAmt"])), - PCurr = Convert.ToString(item["pCurr"]), - CollCurr = Convert.ToString(item["collCurr"]), - PayStatus = Convert.ToString(item["payStatus"]), - PayoutMode = Convert.ToString(item["payoutMode"]), - SendDate = Convert.ToString(item["sendDate"]), - PaidDate = Convert.ToString(item["paidDate"]), - DisplayActions = item["DisplayActions"].ToString() - }); - } - - _response.CustomerTransaction = obj; + Id = Convert.ToString(item["userId"]), + //User = Convert.ToString(item["userId"]), + TranId = Convert.ToString(item["tranId"]), + ControlNo = Convert.ToString(item["controlNo"]), + CollAmt = Utilities.ShowDecimal(Convert.ToString(item["TranAmount"])), + PayoutAmt = Utilities.ShowDecimal(Convert.ToString(item["payoutAmt"])), + PCurr = Convert.ToString(item["pCurr"]), + CollCurr = Convert.ToString(item["collCurr"]), + PayStatus = Convert.ToString(item["payStatus"]), + PayoutMode = Convert.ToString(item["payoutMode"]), + SendDate = Convert.ToString(item["sendDate"]), + PaidDate = Convert.ToString(item["paidDate"]), + DisplayActions = item["DisplayActions"].ToString() + }); + } + + _response.CustomerTransaction = obj; } else { @@ -480,6 +524,8 @@ namespace CustomerOnlineV2.Repository.Repository.TransactionRepository } return await Task.FromResult(_response); } + + } } diff --git a/CustomerOnlineV2/CustomerOnlineV2.Repository/obj/Debug/net7.0/CustomerOnlineV2.Repository.csproj.AssemblyReference.cache b/CustomerOnlineV2/CustomerOnlineV2.Repository/obj/Debug/net7.0/CustomerOnlineV2.Repository.csproj.AssemblyReference.cache index 0fa1b60..0d4070b 100644 Binary files a/CustomerOnlineV2/CustomerOnlineV2.Repository/obj/Debug/net7.0/CustomerOnlineV2.Repository.csproj.AssemblyReference.cache and b/CustomerOnlineV2/CustomerOnlineV2.Repository/obj/Debug/net7.0/CustomerOnlineV2.Repository.csproj.AssemblyReference.cache differ diff --git a/CustomerOnlineV2/CustomerOnlineV2/Controllers/CustomerController.cs b/CustomerOnlineV2/CustomerOnlineV2/Controllers/CustomerController.cs index 2e8245c..897b9e8 100644 --- a/CustomerOnlineV2/CustomerOnlineV2/Controllers/CustomerController.cs +++ b/CustomerOnlineV2/CustomerOnlineV2/Controllers/CustomerController.cs @@ -144,9 +144,11 @@ namespace CustomerOnlineV2.Controllers } [Authorization("Refer")] - public IActionResult Refer() + + [Route("Customer/Refer/{id}")] + public IActionResult Refer(string id) { - return View(); + return View(model:id); } [HttpGet] diff --git a/CustomerOnlineV2/CustomerOnlineV2/Controllers/TransactionController.cs b/CustomerOnlineV2/CustomerOnlineV2/Controllers/TransactionController.cs index 675fde4..f3e6534 100644 --- a/CustomerOnlineV2/CustomerOnlineV2/Controllers/TransactionController.cs +++ b/CustomerOnlineV2/CustomerOnlineV2/Controllers/TransactionController.cs @@ -123,7 +123,7 @@ namespace CustomerOnlineV2.Controllers _tranresponse = await _transactionBusiness.GetReceiptData(id, loginDetails); _request.tranId = id; - _request.sitereference = "test_subhidauk71992"; + _request.sitereference = Utilities.ReadFromAppSettings("TrustPay:siteReference"); _request.stprofile = "default"; _request.currencyiso3a = "GBP"; _request.orderreference = _tranresponse.ControlNo; @@ -145,10 +145,12 @@ namespace CustomerOnlineV2.Controllers _request.billingemail= _request.customeremail= loginDetails.Email; _request.successfulurlredirect = $"{Request.Scheme}://{Request.Host}/Transaction/TranPaySuccess"; - _request.declinedurlredirect = $"{Request.Scheme}://{Request.Host}/Transaction//TranDecline"; + _request.declinedurlredirect = $"{Request.Scheme}://{Request.Host}/Transaction/TranDecline"; _request.sitesecuritytimestamp=DateTime.UtcNow.ToString("yyyy-MM-dd HH:mm:ss"); - var hash = $"GBP{_request.mainamount}test_subhidauk71992{_request.sitesecuritytimestamp}BEe6nRraqNeUgkpI"; + _request.merchantemail = Utilities.ReadFromAppSettings("TrustPay:merchantemail"); + + var hash = $"GBP{_request.mainamount}{Utilities.ReadFromAppSettings("TrustPay:siteReference")}{_request.sitesecuritytimestamp}{Utilities.ReadFromAppSettings("TrustPay:SitePassword")}"; StringBuilder builder = new StringBuilder(); using (SHA256 sha256Hash = SHA256.Create()) @@ -202,7 +204,33 @@ namespace CustomerOnlineV2.Controllers public async Task TranDecline() { - return View(); + + var errorCode = Request.Query["errorcode"]; + var orderReference = Request.Query["orderreference"]; + var paymentTypeDescription = Request.Query["paymenttypedescription"]; + var requestReference = Request.Query["requestreference"]; + var responseSiteSecurity = Request.Query["responsesitesecurity"]; + var settleStatus = Request.Query["settlestatus"]; + var siteReference = Request.Query["sitereference"]; + var transactionReference = Request.Query["transactionreference"]; + //var _requestFromTempData = TempData["TrustPaymentRequest"] as TrustPaymentRequest; + var _request = new TrustPaymentRequest + { + + errorcode = errorCode.ToString(), + orderreference = orderReference.ToString(), + paymenttypedescription = paymentTypeDescription.ToString(), + requestreference = requestReference.ToString(), + responsesitesecurity = responseSiteSecurity.ToString(), + settlestatus = settleStatus.ToString(), + transactionreference = transactionReference.ToString() + }; + + var loginDetails = HttpContext.GetLoginDetails(); + var _response = await _transactionBusiness.UpdateTranDataFailed(_request, loginDetails); + + _response.transactionreference = transactionReference; + return View(_response); } [Authorization("ViewAllTxn")] diff --git a/CustomerOnlineV2/CustomerOnlineV2/Properties/PublishProfiles/FolderProfile.pubxml.user b/CustomerOnlineV2/CustomerOnlineV2/Properties/PublishProfiles/FolderProfile.pubxml.user index 9ddc03c..732eaa8 100644 --- a/CustomerOnlineV2/CustomerOnlineV2/Properties/PublishProfiles/FolderProfile.pubxml.user +++ b/CustomerOnlineV2/CustomerOnlineV2/Properties/PublishProfiles/FolderProfile.pubxml.user @@ -5,7 +5,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121. <_PublishTargetUrl>D:\Publish\Imelondon\New folder - True|2023-11-20T10:32:17.6490092Z;True|2023-11-19T23:00:54.1411776+05:45;True|2023-11-19T15:41:16.8030592+05:45;True|2023-11-19T15:27:21.5495440+05:45;True|2023-11-19T12:52:51.4532176+05:45;True|2023-11-17T19:30:12.1934196+05:45;True|2023-11-16T23:07:05.3180955+05:45;True|2023-11-16T23:02:00.4838743+05:45;True|2023-11-16T22:59:08.9347336+05:45;True|2023-11-16T22:55:10.4213631+05:45;True|2023-11-16T22:43:21.8981804+05:45;True|2023-11-14T17:28:08.3885160+05:45;True|2023-11-14T17:22:29.1626336+05:45;True|2023-11-14T17:04:07.2972823+05:45;True|2023-11-11T20:35:29.2080326+05:45;True|2023-11-11T20:32:15.2845349+05:45;True|2023-11-10T16:47:06.4019617+05:45;False|2023-11-10T13:51:28.3018175+05:45;True|2023-11-10T02:19:03.5340681+05:45;True|2023-11-10T01:20:14.2700570+05:45;True|2023-11-09T21:01:27.9875543+05:45;True|2023-11-09T20:59:19.5230056+05:45;True|2023-11-09T18:16:23.7470131+05:45;False|2023-11-09T18:16:03.5500533+05:45;True|2023-11-09T18:09:25.9299204+05:45;True|2023-11-09T15:14:04.7264848+05:45;True|2023-11-09T15:11:19.0085135+05:45;True|2023-11-09T15:07:24.6950375+05:45;True|2023-11-09T00:57:27.0432228+05:45;True|2023-11-09T00:52:22.0688681+05:45;True|2023-11-08T23:45:10.1218798+05:45;True|2023-11-08T23:42:07.1091081+05:45;True|2023-11-08T23:36:21.1551855+05:45;True|2023-11-08T23:32:16.8459083+05:45;True|2023-11-08T23:29:21.9724548+05:45;True|2023-11-08T23:14:15.4606206+05:45;True|2023-11-08T20:17:27.8481449+05:45;True|2023-11-08T19:52:59.1891066+05:45;True|2023-11-08T16:44:42.6170002+05:45;True|2023-11-08T16:33:32.3937081+05:45;True|2023-11-08T16:18:57.4262589+05:45;True|2023-11-08T00:01:31.4692446+05:45;True|2023-11-06T17:55:12.6620312+05:45;True|2023-11-05T15:21:57.3331893+05:45;True|2023-11-05T15:07:58.3259353+05:45;True|2023-11-02T23:11:02.5272439+05:45;True|2023-11-02T22:58:36.7647241+05:45;True|2023-11-02T22:08:03.5661910+05:45;True|2023-11-02T22:07:08.2086903+05:45;True|2023-11-02T21:18:27.6856975+05:45;True|2023-11-02T10:37:27.5223056+05:45;True|2023-11-01T23:22:42.2298533+05:45;True|2023-10-30T17:55:11.9721362+05:45;True|2023-10-29T17:09:11.8995164+05:45;True|2023-10-29T16:20:20.1678046+05:45;True|2023-10-29T16:13:08.8199881+05:45;True|2023-10-18T20:42:40.0300271+05:45;True|2023-10-18T20:27:39.6534102+05:45;True|2023-10-18T19:56:06.2850218+05:45;True|2023-10-16T20:47:51.3919651+05:45;True|2023-10-13T20:01:32.8414911+05:45;True|2023-10-13T13:07:03.4626761+05:45;True|2023-10-13T11:29:46.2911220+05:45;True|2023-10-12T23:04:08.5198980+05:45;True|2023-10-12T22:39:00.3925922+05:45;True|2023-10-12T22:26:31.2038205+05:45;True|2023-10-12T22:13:31.7059757+05:45;True|2023-10-11T13:56:00.4592945+05:45;True|2023-10-09T19:35:04.4206191+05:45;True|2023-10-09T16:17:33.9136320+05:45;True|2023-10-06T20:43:34.9359549+05:45;True|2023-10-06T20:19:27.9864655+05:45;True|2023-10-06T19:51:50.5688105+05:45;False|2023-10-06T19:42:18.7902186+05:45;True|2023-10-06T16:58:15.1830803+05:45;True|2023-10-06T14:47:33.8539675+05:45;True|2023-10-06T14:41:23.0085056+05:45;True|2023-10-06T14:35:32.2357167+05:45;False|2023-10-06T14:34:38.0047989+05:45;True|2023-10-06T13:57:57.2620024+05:45;False|2023-10-06T13:56:52.3772036+05:45;True|2023-10-04T16:01:22.5357585+05:45;True|2023-10-02T20:44:19.7679042+05:45;True|2023-10-02T15:48:27.7095019+05:45;True|2023-10-02T14:28:56.8941557+05:45;True|2023-10-02T10:20:00.9610803+05:45;False|2023-10-02T10:19:08.8983048+05:45;True|2023-10-01T10:57:18.5031552+05:45;True|2023-10-01T10:49:45.6697395+05:45;True|2023-10-01T10:30:36.9697630+05:45;False|2023-10-01T10:29:54.7925519+05:45;False|2023-10-01T10:28:54.2561950+05:45;False|2023-10-01T10:28:43.4908474+05:45;True|2023-10-01T08:51:13.4409742+05:45; + True|2023-11-21T19:10:02.7339322Z;True|2023-11-22T00:35:33.7932258+05:45;True|2023-11-22T00:06:39.0977881+05:45;True|2023-11-21T16:56:40.9165139+05:45;True|2023-11-21T16:55:43.5238508+05:45;True|2023-11-21T13:06:42.6334262+05:45;True|2023-11-21T13:05:56.8163644+05:45;True|2023-11-21T01:30:01.6294845+05:45;True|2023-11-21T01:25:46.8788948+05:45;True|2023-11-21T01:18:10.9400288+05:45;True|2023-11-20T17:46:52.6414077+05:45;False|2023-11-20T17:46:20.7035330+05:45;True|2023-11-20T16:17:17.6490092+05:45;True|2023-11-19T23:00:54.1411776+05:45;True|2023-11-19T15:41:16.8030592+05:45;True|2023-11-19T15:27:21.5495440+05:45;True|2023-11-19T12:52:51.4532176+05:45;True|2023-11-17T19:30:12.1934196+05:45;True|2023-11-16T23:07:05.3180955+05:45;True|2023-11-16T23:02:00.4838743+05:45;True|2023-11-16T22:59:08.9347336+05:45;True|2023-11-16T22:55:10.4213631+05:45;True|2023-11-16T22:43:21.8981804+05:45;True|2023-11-14T17:28:08.3885160+05:45;True|2023-11-14T17:22:29.1626336+05:45;True|2023-11-14T17:04:07.2972823+05:45;True|2023-11-11T20:35:29.2080326+05:45;True|2023-11-11T20:32:15.2845349+05:45;True|2023-11-10T16:47:06.4019617+05:45;False|2023-11-10T13:51:28.3018175+05:45;True|2023-11-10T02:19:03.5340681+05:45;True|2023-11-10T01:20:14.2700570+05:45;True|2023-11-09T21:01:27.9875543+05:45;True|2023-11-09T20:59:19.5230056+05:45;True|2023-11-09T18:16:23.7470131+05:45;False|2023-11-09T18:16:03.5500533+05:45;True|2023-11-09T18:09:25.9299204+05:45;True|2023-11-09T15:14:04.7264848+05:45;True|2023-11-09T15:11:19.0085135+05:45;True|2023-11-09T15:07:24.6950375+05:45;True|2023-11-09T00:57:27.0432228+05:45;True|2023-11-09T00:52:22.0688681+05:45;True|2023-11-08T23:45:10.1218798+05:45;True|2023-11-08T23:42:07.1091081+05:45;True|2023-11-08T23:36:21.1551855+05:45;True|2023-11-08T23:32:16.8459083+05:45;True|2023-11-08T23:29:21.9724548+05:45;True|2023-11-08T23:14:15.4606206+05:45;True|2023-11-08T20:17:27.8481449+05:45;True|2023-11-08T19:52:59.1891066+05:45;True|2023-11-08T16:44:42.6170002+05:45;True|2023-11-08T16:33:32.3937081+05:45;True|2023-11-08T16:18:57.4262589+05:45;True|2023-11-08T00:01:31.4692446+05:45;True|2023-11-06T17:55:12.6620312+05:45;True|2023-11-05T15:21:57.3331893+05:45;True|2023-11-05T15:07:58.3259353+05:45;True|2023-11-02T23:11:02.5272439+05:45;True|2023-11-02T22:58:36.7647241+05:45;True|2023-11-02T22:08:03.5661910+05:45;True|2023-11-02T22:07:08.2086903+05:45;True|2023-11-02T21:18:27.6856975+05:45;True|2023-11-02T10:37:27.5223056+05:45;True|2023-11-01T23:22:42.2298533+05:45;True|2023-10-30T17:55:11.9721362+05:45;True|2023-10-29T17:09:11.8995164+05:45;True|2023-10-29T16:20:20.1678046+05:45;True|2023-10-29T16:13:08.8199881+05:45;True|2023-10-18T20:42:40.0300271+05:45;True|2023-10-18T20:27:39.6534102+05:45;True|2023-10-18T19:56:06.2850218+05:45;True|2023-10-16T20:47:51.3919651+05:45;True|2023-10-13T20:01:32.8414911+05:45;True|2023-10-13T13:07:03.4626761+05:45;True|2023-10-13T11:29:46.2911220+05:45;True|2023-10-12T23:04:08.5198980+05:45;True|2023-10-12T22:39:00.3925922+05:45;True|2023-10-12T22:26:31.2038205+05:45;True|2023-10-12T22:13:31.7059757+05:45;True|2023-10-11T13:56:00.4592945+05:45;True|2023-10-09T19:35:04.4206191+05:45;True|2023-10-09T16:17:33.9136320+05:45;True|2023-10-06T20:43:34.9359549+05:45;True|2023-10-06T20:19:27.9864655+05:45;True|2023-10-06T19:51:50.5688105+05:45;False|2023-10-06T19:42:18.7902186+05:45;True|2023-10-06T16:58:15.1830803+05:45;True|2023-10-06T14:47:33.8539675+05:45;True|2023-10-06T14:41:23.0085056+05:45;True|2023-10-06T14:35:32.2357167+05:45;False|2023-10-06T14:34:38.0047989+05:45;True|2023-10-06T13:57:57.2620024+05:45;False|2023-10-06T13:56:52.3772036+05:45;True|2023-10-04T16:01:22.5357585+05:45;True|2023-10-02T20:44:19.7679042+05:45;True|2023-10-02T15:48:27.7095019+05:45;True|2023-10-02T14:28:56.8941557+05:45;True|2023-10-02T10:20:00.9610803+05:45;False|2023-10-02T10:19:08.8983048+05:45;True|2023-10-01T10:57:18.5031552+05:45; \ No newline at end of file diff --git a/CustomerOnlineV2/CustomerOnlineV2/Views/Account/Index.cshtml b/CustomerOnlineV2/CustomerOnlineV2/Views/Account/Index.cshtml index 8f5dda7..b85eda2 100644 --- a/CustomerOnlineV2/CustomerOnlineV2/Views/Account/Index.cshtml +++ b/CustomerOnlineV2/CustomerOnlineV2/Views/Account/Index.cshtml @@ -9,7 +9,7 @@ - + diff --git a/CustomerOnlineV2/CustomerOnlineV2/Views/Customer/CustomerProfile.cshtml b/CustomerOnlineV2/CustomerOnlineV2/Views/Customer/CustomerProfile.cshtml index 19d1070..e6b3d64 100644 --- a/CustomerOnlineV2/CustomerOnlineV2/Views/Customer/CustomerProfile.cshtml +++ b/CustomerOnlineV2/CustomerOnlineV2/Views/Customer/CustomerProfile.cshtml @@ -526,7 +526,6 @@ url: '/Customer/GetCustomerDetail', success: function (response) { - debugger; var data = response.customerListModel[0]; $('#fullName').text(data.fullName); @@ -551,9 +550,14 @@ $('#addLink1').hide(); $('#add2link').hide(); - $("#primary-IdType").val(data.idTypeValue); + + if (data.idTypeValue != '10997') + $("#IdBackUpload").show(); + else + $("#IdBackUpload").hide(); + //$("#primary-IdType").attr("disabled", true); if (status === 'NOT_COMPLETED') { @@ -616,9 +620,6 @@ }); } function editCustomerAddress() { - debugger; - - $.ajax({ type: 'GET', @@ -629,14 +630,8 @@ var result = data.customerRegisterModel[0]; - - $('#postalCode').val(result.postalCode); - - - - console.log('Received data:', data); }, error: function () { console.error('Error retrieving data.'); @@ -676,10 +671,10 @@ } - + function editCustomerIdInformation() { - debugger; - + + $.ajax({ @@ -697,16 +692,14 @@ $('#nativeCountry option[value="' + result.nativeCountry + '"]').attr('selected', 'selected'); $('#idIssueDate').val(result.idIssueDate); $('#idExpiryDate').val(result.idExpiryDate) - - - console.log('Received data:', data); + }, error: function () { console.error('Error retrieving data.'); } }); - + } function UpdateDocument() { @@ -723,10 +716,6 @@ nativeCountry: $("#nativeCountry").val(), idIssueDate: $("#idIssueDate").val(), idExpiryDate: $("#idExpiryDate").val(), - - - - }, success: function (response) { if (response.responseCode != 0) { @@ -798,15 +787,21 @@ }); $("#btnUpload").on('click', function () { + let idtype = $('#primary-IdType').val(); - FileUpload(idtype, '11394', 'ID_Front', 'IdFrontFileUpload','N'); + FileUpload(idtype, '11394', 'ID_Front', 'IdFrontFileUpload', 'N'); - debugger; - FileUpload(idtype, '11395', 'ID_Back', 'IdBackFileUpload', 'N'); + if ($('#IdBackFileUpload').get(0).files.length != 0) { + FileUpload(idtype, '11395', 'ID_Back', 'IdBackFileUpload', 'N'); + } + + if ($('#IdFrontFileUpload').get(0).files.length != 0) { - clearUploads(); - ShowAlertMessage("0", "Document uploaded successfully.", "CustomerProfile"); + clearUploads(); + ShowAlertMessage("0", "Document uploaded successfully.", "CustomerProfile"); + } + }); @@ -817,8 +812,7 @@ clearUploads(); }); - function clearUploads() - { + function clearUploads() { $('.loadImg').remove(); $('.loadImg1').remove(); $('.loadImg3').remove(); @@ -834,6 +828,7 @@ } function FileUpload(idtype, documentType, desc, id, alert) { + debugger; const formData = new FormData(); let file = $('#' + id).prop("files")[0]; formData.append('MyUploader', file); @@ -862,16 +857,15 @@ return false; } - + if (alert === 'Y') ShowAlertMessage("0", "Document uploaded successfully.", "CustomerProfile"); //window.location.reload(); }, - error: function (data) { - alert("Error occurs"); + alert("Error occured on file upload"); } }); diff --git a/CustomerOnlineV2/CustomerOnlineV2/Views/Customer/Refer.cshtml b/CustomerOnlineV2/CustomerOnlineV2/Views/Customer/Refer.cshtml index 9fb3bea..d20faa3 100644 --- a/CustomerOnlineV2/CustomerOnlineV2/Views/Customer/Refer.cshtml +++ b/CustomerOnlineV2/CustomerOnlineV2/Views/Customer/Refer.cshtml @@ -1,8 +1,11 @@ @using CustomerOnlineV2.Common.Helper +@model string @{ Layout = "_Layout2"; } - +@{ + var text = Model; +} @@ -175,6 +178,10 @@
+ @if(text.Equals("Y")) + { +
+ }
Image Description diff --git a/CustomerOnlineV2/CustomerOnlineV2/Views/ReceiverInformation/Receiver.cshtml b/CustomerOnlineV2/CustomerOnlineV2/Views/ReceiverInformation/Receiver.cshtml index 0d92c43..9c6d830 100644 --- a/CustomerOnlineV2/CustomerOnlineV2/Views/ReceiverInformation/Receiver.cshtml +++ b/CustomerOnlineV2/CustomerOnlineV2/Views/ReceiverInformation/Receiver.cshtml @@ -295,6 +295,7 @@ editReceiver(editFlag, receiverId); $("#RelationshipOther").hide(); + $("#branh").hide(); $("#Relationship").on("change", function () { if ($(this).val() == '11339') @@ -486,7 +487,7 @@ DisableReceiveButton(); - let country = $('#Country option:selected').html(); + let country = $('#Country option:selected').val(); let firstName = $('#firstName').val(); let middleName = $('#middleName').val(); let lastName1 = $('#lastName1').val(); diff --git a/CustomerOnlineV2/CustomerOnlineV2/Views/Transaction/Payment.cshtml b/CustomerOnlineV2/CustomerOnlineV2/Views/Transaction/Payment.cshtml index 9780048..b0d937c 100644 --- a/CustomerOnlineV2/CustomerOnlineV2/Views/Transaction/Payment.cshtml +++ b/CustomerOnlineV2/CustomerOnlineV2/Views/Transaction/Payment.cshtml @@ -72,7 +72,14 @@ - + + + + + + + + @Html.AntiForgeryToken() diff --git a/CustomerOnlineV2/CustomerOnlineV2/Views/Transaction/Receipt.cshtml b/CustomerOnlineV2/CustomerOnlineV2/Views/Transaction/Receipt.cshtml index 30a4997..159069e 100644 --- a/CustomerOnlineV2/CustomerOnlineV2/Views/Transaction/Receipt.cshtml +++ b/CustomerOnlineV2/CustomerOnlineV2/Views/Transaction/Receipt.cshtml @@ -43,7 +43,7 @@ - Receive Amount : + Total Payout Amount : @Utilities.ShowDecimal(Model.PayoutAmount) @Model.PayoutCurr diff --git a/CustomerOnlineV2/CustomerOnlineV2/Views/Transaction/SendMoney.cshtml b/CustomerOnlineV2/CustomerOnlineV2/Views/Transaction/SendMoney.cshtml index 825dee2..688118f 100644 --- a/CustomerOnlineV2/CustomerOnlineV2/Views/Transaction/SendMoney.cshtml +++ b/CustomerOnlineV2/CustomerOnlineV2/Views/Transaction/SendMoney.cshtml @@ -485,7 +485,6 @@ function SendMoney() { - debugger; DisableSendButton(); let receivingCountry = $('#ReceivingCountry').val(); diff --git a/CustomerOnlineV2/CustomerOnlineV2/Views/Transaction/Success.cshtml b/CustomerOnlineV2/CustomerOnlineV2/Views/Transaction/Success.cshtml index b8d5549..e60d0f0 100644 --- a/CustomerOnlineV2/CustomerOnlineV2/Views/Transaction/Success.cshtml +++ b/CustomerOnlineV2/CustomerOnlineV2/Views/Transaction/Success.cshtml @@ -86,8 +86,9 @@ You can keep track of your transfer from Home.

-

-

+ diff --git a/CustomerOnlineV2/CustomerOnlineV2/Views/Transaction/TranDecline.cshtml b/CustomerOnlineV2/CustomerOnlineV2/Views/Transaction/TranDecline.cshtml index a7b87d5..234efe3 100644 --- a/CustomerOnlineV2/CustomerOnlineV2/Views/Transaction/TranDecline.cshtml +++ b/CustomerOnlineV2/CustomerOnlineV2/Views/Transaction/TranDecline.cshtml @@ -1,4 +1,6 @@ -@{ +@* @model CustomerOnlineV2.Common.Models.TransactionModel.SendMoneySuccessModel *@ +@using CustomerOnlineV2.Common.Helper +@{ Layout = null; } @@ -33,12 +35,16 @@
-

-

Success!

-

Transaction Payment failed

+

+

Failed!

+

Transaction Payment failed ! +
+ Transaction Reference:@Model.transactionreference +

+
@*

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/Views/Transaction/TranPaySuccess.cshtml b/CustomerOnlineV2/CustomerOnlineV2/Views/Transaction/TranPaySuccess.cshtml index a5e3aa7..cce011c 100644 --- a/CustomerOnlineV2/CustomerOnlineV2/Views/Transaction/TranPaySuccess.cshtml +++ b/CustomerOnlineV2/CustomerOnlineV2/Views/Transaction/TranPaySuccess.cshtml @@ -54,23 +54,16 @@

-

Success!

-

Transaction Payment Complete

- - + @*

Success!

*@ +

Your payment has been sucessfully received.

- @*

You've Succesfully sent See transaction details under Transactions Details

- *@
- -
- - @@ -225,6 +218,12 @@
@@ -80,9 +73,9 @@
+ - Receive Amount : + Total Payout Amount : @Utilities.ShowDecimal(Model.PayoutAmount) @Model.PayoutCurr
+
@@ -234,6 +233,9 @@
+ + +