fix trust payment id nt saving

CustomerOnlineV2/CustomerOnlineV2.Api/API/TPApi/TPApiService.cs

@@ -110,6 +110,7 @@ namespace CustomerOnlineV2.Api.API.TPApi
                             _response.TransactionId = _responseTP.Id;
                             _response.Extra2 = _responseTP.Extra2;
                             _response.Extra3 = _responseTP.Extra3;
+                            _response.Extra4 = _responseTP.Extra4;
                         }
                     }
                     else
@@ -176,54 +177,54 @@ namespace CustomerOnlineV2.Api.API.TPApi
         }
 
 
-        public async Task<CommonResponse> SendNotification(SendNotificationRequest request, NOTIFICATION_TYPE nOTIFICATION_TYPE = NOTIFICATION_TYPE.PUSH_NOTIFICATION)
-        {
-            CommonResponse jsonResponse = new CommonResponse();
-            using (HttpClient client = new HttpClient())
-            {
+        //public async Task<CommonResponse> SendNotification(SendNotificationRequest request, NOTIFICATION_TYPE nOTIFICATION_TYPE = NOTIFICATION_TYPE.PUSH_NOTIFICATION)
+        //{
+        //    CommonResponse jsonResponse = new CommonResponse();
+        //    using (HttpClient client = new HttpClient())
+        //    {
                 
                 
-                var obj = JsonConvert.SerializeObject(request);
-                var jbdContent = new StringContent(obj.ToString(), Encoding.UTF8, "application/json");
-                try
-                {
-                    string URL = $"{tp_base_url}NotificationAPI";
-
-                    HttpResponseMessage resp = client.PostAsync(URL, jbdContent).Result;
-                    string resultData = resp.Content.ReadAsStringAsync().Result;
-                    if (resp.IsSuccessStatusCode)
-                    {
-                        jsonResponse = JsonConvert.DeserializeObject<CommonResponse>(resultData);
-                        var a = (jsonResponse.Data != null ? JsonConvert.DeserializeObject<CommonResponse>(jsonResponse.Data.ToString()) : null);
-                        jsonResponse.Data = a;
-
-                        return jsonResponse;
-                    }
-                    else
-                    {
-                        var errorJson = JsonConvert.DeserializeObject<CommonResponse.ErrorJosn>(resultData);
-                        var jsonResponseData = JsonConvert.DeserializeObject<CommonResponse>(errorJson.Message);
+        //        var obj = JsonConvert.SerializeObject(request);
+        //        var jbdContent = new StringContent(obj.ToString(), Encoding.UTF8, "application/json");
+        //        try
+        //        {
+        //            string URL = $"{tp_base_url}NotificationAPI";
+
+        //            HttpResponseMessage resp = client.PostAsync(URL, jbdContent).Result;
+        //            string resultData = resp.Content.ReadAsStringAsync().Result;
+        //            if (resp.IsSuccessStatusCode)
+        //            {
+        //                jsonResponse = JsonConvert.DeserializeObject<CommonResponse>(resultData);
+        //                var a = (jsonResponse.Data != null ? JsonConvert.DeserializeObject<CommonResponse>(jsonResponse.Data.ToString()) : null);
+        //                jsonResponse.Data = a;
+
+        //                return jsonResponse;
+        //            }
+        //            else
+        //            {
+        //                var errorJson = JsonConvert.DeserializeObject<CommonResponse.ErrorJosn>(resultData);
+        //                var jsonResponseData = JsonConvert.DeserializeObject<CommonResponse>(errorJson.Message);
                   
-                        jsonResponse.Id = jsonResponseData.Id;
-                        jsonResponse.ResponseCode = jsonResponseData.ResponseCode;
-                        jsonResponse.Msg = jsonResponseData.Msg;                   
-                        jsonResponse.Extra = jsonResponseData.Extra;
-                        jsonResponse.Extra1 = jsonResponseData.Extra1;
-                        return jsonResponse;
-                    }
-                }
-                catch (Exception ex)
-                {
-                    return new CommonResponse()
-                    {
-                        ResponseCode = 1,
-                        Msg = (ex.InnerException == null ? ex.Message : ex.InnerException.Message)
-                    };
-                }
-            }
+        //                jsonResponse.Id = jsonResponseData.Id;
+        //                jsonResponse.ResponseCode = jsonResponseData.ResponseCode;
+        //                jsonResponse.Msg = jsonResponseData.Msg;                   
+        //                jsonResponse.Extra = jsonResponseData.Extra;
+        //                jsonResponse.Extra1 = jsonResponseData.Extra1;
+        //                return jsonResponse;
+        //            }
+        //        }
+        //        catch (Exception ex)
+        //        {
+        //            return new CommonResponse()
+        //            {
+        //                ResponseCode = 1,
+        //                Msg = (ex.InnerException == null ? ex.Message : ex.InnerException.Message)
+        //            };
+        //        }
+        //    }
 
            
-        }
+        //}
 
 
     }

CustomerOnlineV2/CustomerOnlineV2.Common/Models/CommonResponse.cs

@@ -11,6 +11,8 @@
         public string Extra2 { get; set; }
 
         public string? Extra3 { get; set; }
+
+     
         public object Data { get; set; }
 
         public string Msg { get; set; }

CustomerOnlineV2/CustomerOnlineV2.Common/Models/TPResponse.cs

@@ -9,5 +9,7 @@
         public string? Extra { get; set; }
         public string? Extra2 { get; set; }
         public string? Extra3 { get; set; }
+              
+       public string? Extra4 { get; set; }
     }
 }

CustomerOnlineV2/CustomerOnlineV2.Common/Models/TransactionModel/ExrateResponse.cs

@@ -196,6 +196,8 @@ namespace CustomerOnlineV2.Common.Models.TransactionModel
         public string? ControlNo { get; set; }
         public string? Extra2 { get; set; }
         public string? Extra3 { get; set; }
+        public string? Extra4 { get; set; }
+
     }
 
     public class SendMoneySuccessModel : CommonResponse

CustomerOnlineV2/CustomerOnlineV2.Common/Models/TransactionModel/TrustPaymentRequest.cs

@@ -52,5 +52,9 @@ namespace CustomerOnlineV2.Common.Models.TransactionModel
         public string? title { get; set; }
 
         public string? token { get; set; }
+
+         public string? refId { get; set; }
+        public string? type { get; set; }
+
     }
 }

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

@@ -225,13 +225,13 @@ namespace CustomerOnlineV2.Repository.Repository.TransactionRepository
             try
             {
                 var sql = "EXEC proc_trust_payment";
-                sql += " @Flag = " + _connHelper.FilterString("u-details");
+                sql += " @Flag = " + _connHelper.FilterString(tranData.type);
                 sql += ",@type = " + _connHelper.FilterString("data");
                 sql += ",@User = " + _connHelper.FilterString(loginDetails.UserName);
                 sql += ",@transactionreference = " + _connHelper.FilterString(tranData.transactionreference);
                 sql += ",@sitereference = " + _connHelper.FilterString(tranData.sitereference);
+                sql += ",@refId = " + _connHelper.FilterString(tranData.refId);
                 sql += ",@errorcode = " + _connHelper.FilterString(tranData.errorcode);
-
                 sql += ",@orderreference = " + _connHelper.FilterString(tranData.orderreference);
                 sql += ",@settlestatus = " + _connHelper.FilterString(tranData.settlestatus);
                 sql += ",@paymenttypedescription = " + _connHelper.FilterString(tranData.paymenttypedescription);
@@ -303,21 +303,34 @@ namespace CustomerOnlineV2.Repository.Repository.TransactionRepository
 
         public async Task<SendMoneySuccessModel> UpdateTranDataFailed(TrustPaymentRequest request, LoginResponse loginDetails)
         {
+            string sql = "";
             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);
+                if(request.type== "u-details-fail")
+                {
+                    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);
+
+                }
+                else
+                {
+                    sql = "EXEC proc_trust_payment";
+                    sql += " @Flag = " + _connHelper.FilterString("u-details-expire");                
+                    sql += ",@User = " + _connHelper.FilterString(loginDetails.UserName);
+                    sql += ",@tranid = " + _connHelper.FilterString(request.tranId);
+                    sql += ",@refId = " + _connHelper.FilterString(request.refId);                
+                }
 
                 var dt = _connHelper.ExecuteDataTable(sql);
 

CustomerOnlineV2/CustomerOnlineV2/Controllers/AccountController.cs

@@ -165,6 +165,31 @@ namespace CustomerOnlineV2.Controllers
             return View();
         }
 
+        private static bool ConvertToGlobalFormat(string param)
+        {
+            try
+            {
+                if (string.IsNullOrEmpty(param))
+                {
+                    return true;
+                }
+
+                DateTime dt;
+                string[] formats = { "yyyy-MM-dd", "yyyy/MM/dd", "MM/dd/yyyy", "MM-dd-yyyy", "dd/MM/yyyy" };
+                if (DateTime.TryParseExact(param, formats, System.Globalization.CultureInfo.InvariantCulture, System.Globalization.DateTimeStyles.None, out dt))
+                {
+                    return true;
+                }
+                else
+                {
+                    return false;
+                }
+            }
+            catch (Exception ex)
+            {
+                return false;
+            }
+        }
         [HttpPost]
         [ValidateAntiForgeryToken]
         public async Task<IActionResult> ResetPassword(PasswordResetModel model)
@@ -180,6 +205,23 @@ namespace CustomerOnlineV2.Controllers
                     RedirectToAction("Index", "Account");
                 }
 
+
+                if (!ConvertToGlobalFormat(model.Dob))
+                {
+                    ViewBag.ResponseCode = "1";
+                    ViewBag.ResponseMessage = "Invalid Dob Format";
+                  
+                    return View();
+                }
+
+
+                DateTime dateTime;
+                if (DateTime.TryParseExact(model.Dob, "dd/MM/yyyy", System.Globalization.CultureInfo.InvariantCulture, System.Globalization.DateTimeStyles.None, out dateTime))
+                {
+                    model.Dob = dateTime.ToString("yyyy-MM-dd");
+                }
+
+
                 var response = await _accountBusiness.PasswordReset(model, logindetails);
                 Log.Debug("Change password response: " + JsonConvert.SerializeObject(response));
                 if (response.ResponseCode == ResponseHelper.SUCCESS)

CustomerOnlineV2/CustomerOnlineV2/Controllers/CustomerController.cs

@@ -52,6 +52,7 @@ namespace CustomerOnlineV2.Controllers
             //        _logger.LogInformation($"GETADDRESSLIST | ADDRESSLIST | REQUEST | {JsonConvert.SerializeObject(addressRequest)}");
 
             register.fullName = Helper.HelperClass.GetFullName(register.firstName, register.middleName, register.lastName1);
+            register.country = "233"; /*UK*/
             var register1 = await _registerBusiness.AddCustomers(register);
             return register1;
 

CustomerOnlineV2/CustomerOnlineV2/Controllers/TransactionController.cs

@@ -1,15 +1,17 @@
-using CustomerOnlineV2.Business.Business.TransactionBusiness;
-using CustomerOnlineV2.Common.Models.TransactionModel;
+using CustomerOnlineV2.Authorization;
+using CustomerOnlineV2.Business.Business;
+using CustomerOnlineV2.Business.Business.TransactionBusiness;
 using CustomerOnlineV2.Common.Helper;
+using CustomerOnlineV2.Common.Models.HomeModel;
+using CustomerOnlineV2.Common.Models.Notification;
+using CustomerOnlineV2.Common.Models.TransactionModel;
 using Microsoft.AspNetCore.Mvc;
 using Newtonsoft.Json;
 using Serilog.Context;
-using CustomerOnlineV2.Authorization;
-using System.Text;
+using System.Reflection;
 using System.Security.Cryptography;
-using CustomerOnlineV2.Common.Models.HomeModel;
-using CustomerOnlineV2.Common.Models.AccountModel;
-
+using System.Text;
+using Notify = CustomerOnlineV2.Common.Models.Notification;
 namespace CustomerOnlineV2.Controllers
 {
     public class TransactionController : Controller
@@ -28,7 +30,7 @@ namespace CustomerOnlineV2.Controllers
         [Authorization("DoCalculation")]
         public async Task<ExrateResponse> DoCalculation(SendTransactionModel calcModel)
         {
-            ExrateResponse _response = new ExrateResponse(); 
+            ExrateResponse _response = new ExrateResponse();
             var loginDetails = HttpContext.GetLoginDetails();
 
             calcModel.ProcessId = Convert.ToString(Guid.NewGuid());
@@ -73,9 +75,37 @@ namespace CustomerOnlineV2.Controllers
             var loginDetails = HttpContext.GetLoginDetails();
             using (LogContext.PushProperty("DebugId", id))
             {
-                _logger.LogInformation($"TRANSACTIONSERVICE | GETTRANSACTIONDETAILS | REQUEST | {id}");
+                _logger.LogInformation($"TRANSACTIONSERVICE | Success | REQUEST | {id}");
                 _response = await _transactionBusiness.GetTransactionDetails(id, loginDetails);
-                _logger.LogInformation($"TRANSACTIONSERVICE | GETTRANSACTIONDETAILS | RESPONSE | {JsonConvert.SerializeObject(_response)}");
+
+                List<Mapping> bodyMappings = new List<Notify.Mapping>();
+
+                bodyMappings.Add(new Notify.Mapping() { SValue = "CustomerName", SText = _response.SenderName });
+                bodyMappings.Add(new Notify.Mapping() { SValue = "CollectAmt", SText = Utilities.ShowDecimal(_response.CollectAmount) });
+
+                SendNotificationRequest request = new SendNotificationRequest()
+                {
+                    IsBulkNotification = false,
+                    UserName = loginDetails.Email,
+                    ProviderId = "BankTransferTxnPendingStatus",
+                    NotificationTypeId = NOTIFICATION_TYPE.EMAIL.ToString(),
+                    Template = Common.Models.Notification.NotifyTemplate.BANK_TRANSFER_TXN_PENDING,
+                    Recipients = new List<RecipientViewModel>()
+                            {
+                                new RecipientViewModel()
+                                    {
+                                            NotificationContent =  new NotificationDTO() {
+                                                Body = JsonConvert.SerializeObject(bodyMappings),
+                                                //Title will be set by mapping json
+                                            },
+                                             Address= loginDetails.Email
+                                }
+                            }
+                };
+                var model = NotifierV2.SendNotification(request, NOTIFICATION_TYPE.EMAIL);
+                _logger.LogInformation($"TRANSACTIONSERVICE | BankTransferTxnPendingStatus | RESPONSE | {JsonConvert.SerializeObject(model)}");
+
+
             }
             return View(_response);
         }
@@ -109,19 +139,25 @@ namespace CustomerOnlineV2.Controllers
 
         [Authorization("Payment")]
         //[ValidateAntiForgeryToken]
-        public async Task<IActionResult> Payment([FromQuery] string id)
+        public async Task<IActionResult> Payment([FromQuery] string id, [FromQuery] string refid)
         {
             TransactionDetailModel _tranresponse = new TransactionDetailModel();
-            TrustPaymentRequest _request = new TrustPaymentRequest();
+            TrustPaymentRequest _request = new TrustPaymentRequest() { refId = refid, type= "u-details" };
             var loginDetails = HttpContext.GetLoginDetails();
 
-         
+
 
             using (LogContext.PushProperty("DebugId", id))
             {
                 _logger.LogInformation($"Payment | REQUEST | {id}");
+
+          
+
                 _tranresponse = await _transactionBusiness.GetReceiptData(id, loginDetails);
 
+                _request.orderreference = _tranresponse.ControlNo;
+                var _response = await _transactionBusiness.UpdateTranData(_request, loginDetails);
+
                 _request.tranId = id;
                 _request.sitereference = Utilities.ReadFromAppSettings("TrustPay:siteReference");
                 _request.stprofile = "default";
@@ -136,20 +172,20 @@ namespace CustomerOnlineV2.Controllers
                 _request.billingtelephone = _tranresponse.Mobile;
                 _request.billingcountryiso2a = "GB";
 
-                _request.customerpremise = _tranresponse.City;             
+                _request.customerpremise = _tranresponse.City;
                 _request.customerstreet = _tranresponse.Address;
                 _request.customerpostcode = _tranresponse.Zipcode;
                 _request.customertown = _tranresponse.City;
                 //_request.customertelephone = _tranresponse.Mobile;
                 _request.customercountryiso2a = "GB";
-                _request.billingemail= _request.customeremail= loginDetails.Email;
+                _request.billingemail = _request.customeremail = loginDetails.Email;
 
                 _request.successfulurlredirect = $"{Request.Scheme}://{Request.Host}/Transaction/TranPaySuccess";
                 _request.declinedurlredirect = $"{Request.Scheme}://{Request.Host}/Transaction/TranDecline";
-                _request.sitesecuritytimestamp=DateTime.UtcNow.ToString("yyyy-MM-dd HH:mm:ss");
+                _request.sitesecuritytimestamp = DateTime.UtcNow.ToString("yyyy-MM-dd HH:mm:ss");
 
                 _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();
@@ -168,9 +204,10 @@ namespace CustomerOnlineV2.Controllers
                 _request.sitesecurity = $"h{builder.ToString()}";
                 //TempData["TrustPaymentRequest"] = _request;
 
-                _logger.LogInformation($"Payment | RESPONSE | {JsonConvert.SerializeObject(_request)}");
+                _request.type = "u-details-expire";
+                _logger.LogInformation($"Payment | REQUEST | {JsonConvert.SerializeObject(_request)}");
 
-                var _response = await _transactionBusiness.SaveTranData(_request, loginDetails);
+                 await _transactionBusiness.UpdateTranDataFailed(_request, loginDetails);
             }
             return View(_request);
         }
@@ -187,17 +224,22 @@ namespace CustomerOnlineV2.Controllers
             //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()
+                transactionreference = transactionReference.ToString(),
+                 type= "details-ControlNo"
             };
-
             var loginDetails = HttpContext.GetLoginDetails();
+            using (LogContext.PushProperty("DebugId", loginDetails.UserName))
+            {
+                _logger.LogDebug("TranPaySuccess | REQUEST | " + JsonConvert.SerializeObject(_request));
+            }
+
             var _response = await _transactionBusiness.UpdateTranData(_request, loginDetails);
             return View(_response);
         }
@@ -223,7 +265,8 @@ namespace CustomerOnlineV2.Controllers
                 requestreference = requestReference.ToString(),
                 responsesitesecurity = responseSiteSecurity.ToString(),
                 settlestatus = settleStatus.ToString(),
-                transactionreference = transactionReference.ToString()
+                transactionreference = transactionReference.ToString(),
+                type = "u-details-fail"
             };
 
             var loginDetails = HttpContext.GetLoginDetails();

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-28T07:32:36.9582579Z;True|2023-11-28T11:06:56.1393117+05:45;True|2023-11-27T21:26:39.4737693+05:45;True|2023-11-27T20:27:44.8267131+05:45;True|2023-11-27T15:15:02.7845576+05:45;True|2023-11-27T15:14:24.7414474+05:45;True|2023-11-27T15:12:20.8631275+05:45;True|2023-11-27T14:53:12.8806451+05:45;True|2023-11-27T14:44:42.3370519+05:45;True|2023-11-27T14:03:02.0808830+05:45;True|2023-11-26T22:29:14.7842119+05:45;True|2023-11-26T22:26:41.5591080+05:45;True|2023-11-26T22:24:00.1770904+05:45;True|2023-11-26T22:20:37.2082479+05:45;True|2023-11-26T12:54:30.6489713+05:45;True|2023-11-25T09:37:52.6378019+05:45;True|2023-11-24T23:46:21.5762377+05:45;True|2023-11-24T23:40:44.7042923+05:45;True|2023-11-24T22:26:01.6024702+05:45;True|2023-11-24T22:11:31.5563357+05:45;True|2023-11-23T20:11:39.9968178+05:45;True|2023-11-23T19:11:12.3226825+05:45;True|2023-11-23T14:34:53.3821861+05:45;True|2023-11-22T21:49:39.4855996+05:45;True|2023-11-22T00:55:02.7339322+05:45;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;</History>
+    <History>True|2023-11-28T17:49:50.6877537Z;True|2023-11-28T23:31:23.9257392+05:45;True|2023-11-28T17:22:07.3908940+05:45;True|2023-11-28T16:44:59.6364591+05:45;True|2023-11-28T16:39:13.8831139+05:45;True|2023-11-28T16:35:01.7962202+05:45;True|2023-11-28T15:54:09.3703564+05:45;True|2023-11-28T13:17:36.9582579+05:45;True|2023-11-28T11:06:56.1393117+05:45;True|2023-11-27T21:26:39.4737693+05:45;True|2023-11-27T20:27:44.8267131+05:45;True|2023-11-27T15:15:02.7845576+05:45;True|2023-11-27T15:14:24.7414474+05:45;True|2023-11-27T15:12:20.8631275+05:45;True|2023-11-27T14:53:12.8806451+05:45;True|2023-11-27T14:44:42.3370519+05:45;True|2023-11-27T14:03:02.0808830+05:45;True|2023-11-26T22:29:14.7842119+05:45;True|2023-11-26T22:26:41.5591080+05:45;True|2023-11-26T22:24:00.1770904+05:45;True|2023-11-26T22:20:37.2082479+05:45;True|2023-11-26T12:54:30.6489713+05:45;True|2023-11-25T09:37:52.6378019+05:45;True|2023-11-24T23:46:21.5762377+05:45;True|2023-11-24T23:40:44.7042923+05:45;True|2023-11-24T22:26:01.6024702+05:45;True|2023-11-24T22:11:31.5563357+05:45;True|2023-11-23T20:11:39.9968178+05:45;True|2023-11-23T19:11:12.3226825+05:45;True|2023-11-23T14:34:53.3821861+05:45;True|2023-11-22T21:49:39.4855996+05:45;True|2023-11-22T00:55:02.7339322+05:45;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;</History>
     <LastFailureDetails />
   </PropertyGroup>
 </Project>

CustomerOnlineV2/CustomerOnlineV2/Views/Customer/CustomerProfile.cshtml

@@ -59,11 +59,16 @@
                     <p class="text-3 fw-500 mb-2">Hello, <strong> @firstName </strong></p>
                     <p class="text-3 fw-500 mb-2">User Id <strong> :<span> @membershipId</span> </strong></p>
 
+                    <div class="row">
                     <p class="mb-2">
-                        <a href="#" class="text-5 text-light" data-bs-toggle="tooltip" title="Edit Profile">
+                            <a href="/Customer/CustomerProfile" class="text-3 text-link btn-outline" data-bs-toggle="tooltip" title="Edit Profile">
                             <i class="fas fa-edit"></i>
                         </a>
+                            @* <div class="">
+                               <a href="/Customer/CustomerProfile" class="px-1 text-3">Edit Profile</a>
+                            </div> *@
                     </p>
+                    </div>
                 </div>
                 <!-- Profile Details End -->
                 <!-- Need Help?  -->

CustomerOnlineV2/CustomerOnlineV2/Views/Customer/CustomerRegistration.cshtml

@@ -619,7 +619,7 @@
             let idType = $('#idType').val();
             let idNumber = $('#idNumber').val();
             let dob = $('#dob').val();
-            let nativeCountry = $('#nativeCountry').val();
+            let nativeCountry = $('#country').val();
             let gender = $('#gender').val();
             let mobile = $('#mobile').val();
             let telNo = $('#telNo').val();

CustomerOnlineV2/CustomerOnlineV2/Views/Customer/Notifications.cshtml

@@ -54,10 +54,10 @@
                             <div class="transaction-item px-4 py-2" data-bs-toggle="modal" data-bs-target="#transaction-detail">
                                 <div class="row align-items-center flex-row">
                                     @* <div class="col-1 col-sm-1"><span class="d-block text-1" id="sn">${sn}</span></div> *@
-                                    <div class="col-3 col-sm-2"><span class="d-block text-1" id="iconHtml">${iconHtml}</span></div>
-                                    <div class="col-3 col-sm-4"><span class="d-block text-1" id="title">${d.title}</span></div>
-                                    <div class="col-3 col-sm-4"><span class="d-block text-1" id="body">${d.body}</span></div>
-                                    <div class="col-2 col-sm-2"><span class="d-block text-1" id="date">${d.date}</span></div>
+                                    <div class="col-3 col-sm-2"><span class="d-block text-1" id="iconHtml"></span></div>
+                                    <div class="col-3 col-sm-4"><span class="d-block text-1" id="title"></span></div>
+                                    <div class="col-3 col-sm-4"><span class="d-block text-1" id="body"></span></div>
+                                    <div class="col-2 col-sm-2"><span class="d-block text-1" id="date"></span></div>
                                 </div>
                             </div>
 

CustomerOnlineV2/CustomerOnlineV2/Views/Customer/Refer.cshtml

@@ -6,12 +6,14 @@
 @{
     var text = Model;
 }
+
 <!DOCTYPE html>
 <html lang="en">
 <head>
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <style>
+    <link href="~/css/refer.css" rel="stylesheet" />
+   @*  <style>
         .custom-tab {
             background-color: #262262 !important;
             color: white !important;
@@ -119,7 +121,7 @@
             cursor: pointer;
         }
     </style>
-
+ *@
     <script src="~/vendor/jquery/jquery.min.js"></script>
 
 </head>
@@ -161,15 +163,16 @@
                                             <div class="col-md-6">
                                                 <br />
                                                 <div class="mb-4">
-                                                    <h2 class="referral-code-header">Available Reward Amount: <span id="showRewardPoints" style="color:green;"></span></h2>
+                                                    <h5 class="referral-code-header">Available Reward Amount: <span id="showRewardPoints" style="color:green;"></span></h5>
                                                 </div>
-                                                <h2 class="referral-code-header">Refer Now</h2>
-                                                <p class="text-black fs-5">Receive a FREE £5.00 bonus credit as Reward Amount</p>
-                                                <p>You and your friend will each be given £5.00 in bonus credit. Get £1.00 after they successfully register, and £4.00 after their first transaction.</p>
+                                                <h4 class="referral-code-header">Refer Now</h4>
+                                                <p>Receive a FREE £5.00 bonus credit as Reward Amount</p>
+                                                <p style="width:80%">You and your friend will each be given £5.00 in bonus credit.
+                                                    <br>Get £1.00 after they successfully register, and 4$ after their first transaction.</p>
                                                 <p>There may be minimum send requirements.</p>
                                                 <p><a href="https://imelondon.co.uk/RewardPoint_Declaration.html" target="_blank">Terms &amp; Conditions</a></p>
                                                @*  <p class="text-black fs-5">Refer IME Londong to your friends &amp; get many more exciting deals <br> plus discount on your every transfer.</p> *@
-                                                <h2 class="referral-code-header">Your Referral Code:</h2>
+                                                <h5 class="referral-code-header">Your Referral Code:</h5>
                                                 <div class="referral-code-container">
                                                     <input type="text" id="referralCode" class="referral-code" value="@User.FindFirst("MembershipId").Value" readonly>
                                                     <span class="copy-icon" id="copyReferralCode" onclick="copyReferralCode()">
@@ -177,13 +180,15 @@
                                                     </span>
                                                 </div>
                                                 <br />
+
                                                 <h5 style="text-align:left; display: inline-block;">
                                                     <a href="/Home"><button class="btn-primary"><i class="fa fa-home" style="color:white"></i> Home</button></a> 
                                                 </h5>
-                                               @if(text.Equals("Y"))
+                                                @if (text.Equals("Y"))
                                                 {
                                                     <h5 style="text-align:center; display: inline-block;"><a href="/Home"><button class="btn-primary"><i class="fas fa-fast-forward" 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

@@ -663,11 +663,7 @@
                 success: function (data) {
 
                     var result = data.receiverInformationModel[0];
-                    let mobile = result.mobile;
-                    const prefix = '+977';
-                    if (mobile.startsWith(prefix)) {
-                        mobile = mobile.slice(prefix.length);
-                    }
+             
 
 
 
@@ -680,7 +676,8 @@
                     $('#Relationship option[value="' + result.relationship + '"]').attr('selected', 'selected');
                     $('#Address').val(result.address);
                     $('#City').val(result.city);
-                    $('#Mobile').val(mobile);
+                    PopulateCountryFlagForMobileNumber();
+                    $('#Mobile').val(result.mobile);
                     $('#Email').val(result.email);
                     //$('#zipCode').val(result.city);
                     $('#idNumber').val(result.idNumber);

CustomerOnlineV2/CustomerOnlineV2/Views/Transaction/Payment.cshtml

@@ -23,7 +23,7 @@
 
             $(".loader").fadeOut("slow");
 
-              $("[id*='btn_submit']").click();
+             $("[id*='btn_submit']").click();
 
 
 

CustomerOnlineV2/CustomerOnlineV2/Views/Transaction/SendMoney.cshtml

@@ -616,7 +616,7 @@
                         // window.location.replace("/Transaction/Payment?id=" + response.transactionId);
                         var selectedSchemeId = $('#SchemeId').val();
                         if (selectedSchemeId === 'DEBIT_CARD') {
-                            window.location.replace("/Transaction/Payment?id=" + response.transactionId);
+                            window.location.replace("/Transaction/Payment?id=" + response.transactionId + "&refid=" + response.extra4);
                         } else {
                             window.location.replace("/Transaction/Success?id=" + response.transactionId);
                         }

CustomerOnlineV2/CustomerOnlineV2/Views/Transaction/Success.cshtml

@@ -48,7 +48,7 @@
                                      <tr>
                                          <td>
                                             Sort Code: &nbsp;
-                                            <span>04-08-42</span>
+                                            <span>04-06-93</span>
                                             <br>
                                         </td>
                                         
@@ -56,7 +56,7 @@
                                       <tr>
                                          <td>
                                            Account Number: &nbsp;
-                                            <span>00000042</span>
+                                            <span>00000151</span>
                                             <br>
                                         </td>
                                         

CustomerOnlineV2/CustomerOnlineV2/wwwroot/css/refer.css

@@ -0,0 +1,158 @@
+
+
+
+.custom-tab {
+    background-color: #262262 !important;
+    color: white !important;
+    border: 1px solid #262262 !important;
+    transition: background-color 0.3s ease-in-out;
+}
+
+.custom-tab:hover {
+    background-color: white !important;
+    color: black !important;
+}
+#col-md-6 {
+    flex: 0 0 auto !important;
+    width: 100% !important;
+}
+.col-md-3 {
+    flex: 0 0 auto !important;
+    width: 100% !important;
+}
+
+.p {
+    width: 400px;
+}
+.img-fluid {
+    max-width: 368px;
+    height: 214px;
+}
+
+.btn-primary {
+    background-color: #262262 !important;
+    border-color: #262262 !important;
+}
+/*@media screen and (max-width: 600px) {
+    h1, .h1, h2, .h2, h3, .h3, h4, .h4, h5, .h5, h6, .h6 {
+        margin-top: 0;
+        margin-bottom: 0.5rem;
+        font-weight: 200;
+        line-height: 1.2;
+    }
+}*/
+
+    p {
+        line-height: 1.8 !important;
+        font-size: 18px !important;
+    }
+
+    @media screen and (max-width: 600px) {
+        .banner .banner-small {
+            height: 445px !important;
+            border-radius: 8px !important;
+            padding: 50px 20px !important;
+            margin-bottom: 24px !important;
+            position: relative !important;
+        }
+    }
+
+
+    #referImg {
+        text-align: right;
+        width:30%;
+
+    }
+
+    #reward-table {
+        width: 100%;
+        border-collapse: collapse;
+        margin-top: 20px;
+    }
+
+        #reward-table th, #reward-table td {
+            padding: 12px;
+            text-align: left;
+            border: 1px solid #ddd;
+        }
+
+    /*             #reward-table tbody tr:nth-child(even) {
+                background-color: beige;
+            } */
+
+    @media screen and (max-width: 600px) {
+        #reward-table tbody tr:hover {
+            background-color: #f1f1f1;
+        }
+    }
+
+    }
+
+    .banner-small-2 {
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+    }
+
+        .banner-small-2 .img-fluid {
+            margin-left: 20px;
+            padding-right: 100px;
+        }
+
+        .banner-small-2 .text-content {
+            width: 60%;
+        }
+
+    .referral-code-container {
+        position: relative;
+        width: 18%;
+    }
+
+    .referral-code-header {
+        font-size: 1rem;
+    }
+
+    .referral-code {
+        width: 120%;
+        padding-right: 30px;
+        padding-left: 13px;
+        background-color: #f0f8ff;
+        border: 1px solid #a0a0a0;
+        border-radius: 5px;
+    }
+
+        .referral-code:focus {
+            outline: none;
+        }
+
+    .copy-icon {
+        position: absolute;
+        top: -3px;
+        right: -25px;
+        padding: 10px;
+        cursor: pointer;
+    }
+
+@media (min-width: 1025px) and (max-width: 1260px){
+
+ .col-md-6 {
+    width: 65%;
+    height: 140%
+}
+}
+    @media (min-width: 768px) {
+
+        .row mb-4 {
+            width: 65%;
+            height: 3%;
+        }
+    }
+
+    .referral-code-header {
+        width: 500px;
+        height: 20px;
+    }
+
+    .p {
+        width: 65%%;
+    }