preprod fixes

CustomerOnlineV2/CustomerOnlineV2.Business/Business/TransactionBusiness/ITransactionBusiness.cs

@@ -17,5 +17,6 @@ namespace CustomerOnlineV2.Business.Business.TransactionBusiness
         Task<CustomerTransactionList> GetTranData(LoginResponse loginDetails);
         Task<CustomerTransactionList> GetTransactionReportList(LoginResponse loginDetails, CustomerTransaction model);
         Task<CustomerNotificationModel> GetRewardPoints(LoginResponse loginDetails);
+        Task<SendMoneySuccessModel> UpdateTranDataFailed(TrustPaymentRequest request, LoginResponse loginDetails);
     }
 }

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<SendMoneySuccessModel> UpdateTranDataFailed(TrustPaymentRequest request, LoginResponse loginDetails)
+        {
+            return await _transactionRepo.UpdateTranDataFailed(request, loginDetails);
+        }
     }
 }

CustomerOnlineV2/CustomerOnlineV2.Common/Helper/ApplicationConfig.cs

@@ -73,5 +73,10 @@ namespace CustomerOnlineV2.Common.Helper
         {
             return ReadWebConfig("mobileJsonRxUrl");
         }
+
+        public static string GetMerchantEmail()
+        {
+            return ReadWebConfig("merchantemail");
+        }
     }
 }

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

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;
 

CustomerOnlineV2/CustomerOnlineV2.Repository/Repository/TransactionRepository/ITransactionRepository.cs

@@ -14,5 +14,6 @@ namespace CustomerOnlineV2.Repository.Repository.TransactionRepository
 	    Task<CustomerTransactionList> GetTranData(LoginResponse loginDetails);
         Task<CustomerTransactionList> GetTransactionReportList(LoginResponse loginDetails, CustomerTransaction model);
         Task<CustomerNotificationModel> GetRewardPoints(LoginResponse loginDetails);
+        Task<SendMoneySuccessModel> UpdateTranDataFailed(TrustPaymentRequest request, LoginResponse loginDetails);
     }
 }

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<SendMoneySuccessModel> 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<CustomerTransaction> obj = new List<CustomerTransaction>();
-                        foreach (DataRow item in dt.Rows)
+                    List<CustomerTransaction> obj = new List<CustomerTransaction>();
+                    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);
         }
+
+       
     }
 }
 

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]

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<IActionResult> 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")]

CustomerOnlineV2/CustomerOnlineV2/Properties/PublishProfiles/FolderProfile.pubxml.user

@@ -5,7 +5,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
 <Project>
   <PropertyGroup>
     <_PublishTargetUrl>D:\Publish\Imelondon\New folder</_PublishTargetUrl>
-    <History>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;</History>
+    <History>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;</History>
     <LastFailureDetails />
   </PropertyGroup>
 </Project>

CustomerOnlineV2/CustomerOnlineV2/Views/Account/Index.cshtml

@@ -9,7 +9,7 @@
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <base href="~/" />
-    <link href="@Url.Content("~/Content/styles.css")" rel="stylesheet" type="text/css" />
+    <link href="@Url.Content("~/css/styles.css")" rel="stylesheet" type="text/css" />
     <link href="~/vendor/bootstrap/css/bootstrap.min.css" rel="stylesheet" />
     <link href="~/vendor/font-awesome/css/all.min.css" rel="stylesheet" />
     <link href="~/vendor/bootstrap-select/css/bootstrap-select.min.css" rel="stylesheet" />

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

CustomerOnlineV2/CustomerOnlineV2/Views/Customer/Refer.cshtml

@@ -1,8 +1,11 @@
 @using CustomerOnlineV2.Common.Helper
+@model string
 @{
     Layout = "_Layout2";
 }
-
+@{
+    var text = Model;
+}
 <!DOCTYPE html>
 <html lang="en">
 <head>
@@ -175,6 +178,10 @@
                                                 </div>
                                                 <br />
                                                 <h5 style="text-align:left;"><a href="/Home"><button class="btn-primary"><i class="fa fa-home" style="color:white"></i> Home</button></a></h5>
+                                               @if(text.Equals("Y"))
+                                                {
+                                                    <h5 style="text-align:left;"><a href="/Home"><button class="btn-primary"><i class="fa fa-home" style="color:white"></i>SKIP</button></a></h5>
+                                                }
                                             </div>
                                             <div class="col-md-4" id="referImg">
                                                 <img src="~/images/reefer-and-earn.png" alt="Image Description" class="img-fluid" />

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

CustomerOnlineV2/CustomerOnlineV2/Views/Transaction/Payment.cshtml

@@ -72,7 +72,14 @@
         <input asp-for="sitesecurity" name="sitesecurity" type="hidden" />
         <input asp-for="token" name="sitetoken" type="hidden" />
         <input type="hidden" name="stextraurlredirectfields" value="sitetoken">
-        <input asp-for="merchantemail" name="merchantemail" value="shakun@japanremit.com" type="hidden" />
+        <input asp-for="merchantemail" name="merchantemail"  type="hidden" />
+
+
+        <!--Sends email confirmation to the customer, following successful transaction:-->
+        <input type="hidden" name="ruleidentifier" value="STR-2" />
+
+        <!--Sends email confirmation to the customer, following declined transaction:-->
+        <input type="hidden" name="ruleidentifier" value="STR-3" />
         @Html.AntiForgeryToken()
         <input type="submit" id="btn_submit"  style="display:none;" />
     </form>

CustomerOnlineV2/CustomerOnlineV2/Views/Transaction/Receipt.cshtml

@@ -43,7 +43,7 @@
                         <tr>
                             <td style="font-size:18px;">
                                 <strong>
-                                    Receive Amount :
+                                    Total Payout Amount :
                                 </strong>
                                <span>@Utilities.ShowDecimal(Model.PayoutAmount) @Model.PayoutCurr</span>
                             </td>

CustomerOnlineV2/CustomerOnlineV2/Views/Transaction/SendMoney.cshtml

@@ -485,7 +485,6 @@
 
         function SendMoney() {
 
-            debugger;
             DisableSendButton();
             
             let receivingCountry = $('#ReceivingCountry').val();

CustomerOnlineV2/CustomerOnlineV2/Views/Transaction/Success.cshtml

@@ -86,8 +86,9 @@
                                     You can keep track of your transfer from Home.
                                 </p>
                             </div>
-                            <h3 style="text-align:right">  <a href="/Transaction/SendMoney"><button class="btn-primary" ><i class="fa fa-save" style="color:white"> Send Again</i></button></a></h3>
-                            <h3 style="text-align:right"><a href="/Home"><button class="btn-primary"><i class="fa fa-home" style="color:white"></i> Home</button></a></h3>
+                            <div>
+                                <h4 style="text-align:right">  <a href="/Transaction/SendMoney"><button class="btn-primary"><i class="fa fa-save" style="color:white"> Send Again</i></button></a></h4>
+                                <h5 style="text-align:right;"><a href="/customer/Refer"><button class="btn-primary"><i class="fa fa-home" style="color:white"></i> Home</button></a></h5>
                            
                         </div>
                     </div>

CustomerOnlineV2/CustomerOnlineV2/Views/Transaction/TranDecline.cshtml

@@ -1,4 +1,6 @@
-@{
+@* @model CustomerOnlineV2.Common.Models.TransactionModel.SendMoneySuccessModel *@
+@using CustomerOnlineV2.Common.Helper
+@{
     Layout = null;
 }
 <!DOCTYPE html>
@@ -33,12 +35,16 @@
                     <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-fail text-20 lh-1"><i class="fas fa-check-circle"></i></p>
-                                <p class="text-fail text-8 fw-500 lh-1">Success!</p>
-                                <p class="lead"> Transaction Payment failed</p>
+                                <p class="text-fail text-20 lh-1"><i class="fas fa-info-circle"></i></p>
+                                <p class="text-fail text-8 fw-500 lh-1">Failed!</p>
+                                <p class="lead"> Transaction Payment failed !
+                                    <br />
+                                    <strong>Transaction Reference:</strong><span >@Model.transactionreference</span>
+                                </p>
+
                             </div>
                             @*   <p class="text-3 mb-4">You've Succesfully sent <span class="text-4 fw-500">@CustomerOnlineV2.Common.Helper.Utilities.ShowDecimal(Model.CollectAmount) @Model.CollectCurrency</span> to <span class="fw-500">@Model.ReceiverName</span>, 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>
+                            <div class="d-grid" style="text-align:center"><a href="/Home/Index"><button class="btn btn-primary">Dashboard Page</button></a></div>
 
                         </div>
                     </div>

CustomerOnlineV2/CustomerOnlineV2/Views/Transaction/TranPaySuccess.cshtml

@@ -54,23 +54,16 @@
 
                             <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>
-
-
+                                @*  <p class="text-success text-8 fw-500 lh-1">Success!</p> *@
+                                <p class="lead">Your payment has been sucessfully received.</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 justify-content-center"><a href="/Home/Index"><button class="btn btn-primary"><i class="fa fa-home" style="color:white"></i>Home</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>
@@ -80,9 +73,9 @@
                                     </td>
                                 </tr>
                                 <tr>
-                                    <td style="font-size:18px;">
+                                    <td>
                                         <strong>
-                                        Receive Amount :
+                                            Total Payout Amount :
                                         </strong>
                                         <span>@Utilities.ShowDecimal(Model.PayoutAmount) @Model.PayoutCurr</span>
                                     </td>
@@ -225,6 +218,12 @@
                                     </tr>
 
                                 </table>
+                                <div style="text-align:center;">
+                                <a href="/customer/Refer/Y">
+                                    <button type="button"  class="btn btn-success btn-lg btn-block">
+                                        SKIP <span class="glyphicon glyphicon-chevron-right"></span>
+                                    </button>
+                                </a>
                             </div>
                         </div>
                     </div>
@@ -234,6 +233,9 @@
         </div>
 
     </div>
+
+    </div>
+
 </div>
 </html>
 <script>

CustomerOnlineV2/CustomerOnlineV2/appsettings.json

@@ -64,8 +64,13 @@
         "SendingCountry": "223",
         "ProcessFor": "send"
     },
+    "TrustPay": {
+        "merchantemail": "kewal@imelondon.co.uk",
+        "siteReference": "test_subhidauk71992",
+        "SitePassword": "BEe6nRraqNeUgkpI"
+    },
     "AllowedHosts": "*",
-    "SessionTimeOutInMinutes": "10",
+    "SessionTimeOutInMinutes": "10",    
     "EncryptDecryptKey": "mH9Mjsi3VBOvk40YsCd1S8rm2vYFV7P6",
     "docUploadPath": "D:\\",
     "profilePicUploadURL": "D:\\CustomerDocument\\App\\MobileApi\\Images\\Profile\\",