latest

CustomerOnlineV2/CustomerOnlineV2.Business/Business/RegisterBusiness/RegisterBusiness.cs

@@ -75,7 +75,7 @@ namespace CustomerOnlineV2.Business.Business.RegisterBusiness
             catch (Exception ex)
             {
                 _logger.LogError("Something Went Wrong, Please Try Again!!", ex);
-                model1.SetResponse("1", "Error occurred while calling RequestOTP.");
+                model1.SetResponse("1", "Error occurred while calling AddCustomers.");
                 return model1;
             }
         }

CustomerOnlineV2/CustomerOnlineV2.Repository/Repository/HomeRepository/HomeRepository.cs

@@ -86,7 +86,7 @@ namespace CustomerOnlineV2.Repository.Repository.HomeRepository
                     _response.ResponseCode = ResponseHelper.SUCCESS;
                     _response.ResponseMessage = "No Transaction History Found!";
 
-                    _logger.LogError("HOMEREPOSITORY | GETCUSTOMERTRANSACTIONLIST | DB RESPONSE | " + JsonConvert.SerializeObject(_response));
+                    _logger.LogInformation("HOMEREPOSITORY | GETCUSTOMERTRANSACTIONLIST | DB RESPONSE | " + JsonConvert.SerializeObject(_response));
                 }
                 else
                 {

CustomerOnlineV2/CustomerOnlineV2.Repository/Repository/ReceiverRepository/ReceiverRepository.cs

@@ -105,7 +105,7 @@ namespace CustomerOnlineV2.Repository.Repository.ReceiverRepository
                 model.ResponseCode = ResponseHelper.EXCEPTION;
                 model.ResponseMessage = "Exception occured: " + ex.Message;
 
-                //_logger.LogError("RECEIVERREPOSITORY | GETRECEIVEDRDETAILS | EXCEPTION | " + JsonConvert.SerializeObject(_response));
+                _logger.LogError("RECEIVERREPOSITORY | GetReceiverDetails | EXCEPTION | " + ex.ToString());
             }
          
             return await Task.FromResult(model);

CustomerOnlineV2/CustomerOnlineV2.Repository/Repository/RegisterRepository/RegisterRepository.cs

@@ -281,7 +281,7 @@ namespace CustomerOnlineV2.Repository.Repository.RegisterRepository
                 model.ResponseCode = ResponseHelper.EXCEPTION;
                 model.ResponseMessage = "Exception occured: " + ex.Message;
 
-                //_logger.LogError("RECEIVERREPOSITORY | GETRECEIVEDRDETAILS | EXCEPTION | " + JsonConvert.SerializeObject(_response));
+                _logger.LogError("REGISTER_REPOSITORY | UpdateCustomers1 | EXCEPTION | ", ex.ToString());
             }
 
             return await Task.FromResult(model);
@@ -330,7 +330,7 @@ namespace CustomerOnlineV2.Repository.Repository.RegisterRepository
                 model.ResponseCode = ResponseHelper.EXCEPTION;
                 model.ResponseMessage = "Exception occured: " + ex.Message;
 
-
+                _logger.LogError("REGISTER_REPOSITORY | UpdateDocument1 | EXCEPTION | ", ex.ToString());
             }
 
             return await Task.FromResult(model);

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

@@ -86,7 +86,7 @@ namespace CustomerOnlineV2.Repository.Repository.TransactionRepository
                     _response.ResponseCode = ResponseHelper.FAILED;
                     _response.ResponseMessage = "DB Null Error!";
 
-                    _logger.LogError("TRANSACTIONREPOSITORY | GETTRANSACTIONDETAILS | DB RESPONSE | " + JsonConvert.SerializeObject(_response));
+                    _logger.LogInformation("TRANSACTIONREPOSITORY | GETTRANSACTIONDETAILS | DB RESPONSE | " + JsonConvert.SerializeObject(_response));
                 }
                 else
                 {
@@ -337,10 +337,10 @@ namespace CustomerOnlineV2.Repository.Repository.TransactionRepository
 
                 if (dt == null || dt.Rows.Count <= 0)
                 {
-                    _response.ResponseCode = ResponseHelper.FAILED;
-                    _response.ResponseMessage = "DB Null Error!";
+                    _response.ResponseCode = ResponseHelper.NORECORD;
+                    _response.ResponseMessage = "NORECORD";
+
 
-                    _logger.LogError("TRANSACTIONREPOSITORY | GETTRANSACTIONDETAILS | DB RESPONSE | " + JsonConvert.SerializeObject(_response));
                 }
                 else
                 {
@@ -392,7 +392,7 @@ namespace CustomerOnlineV2.Repository.Repository.TransactionRepository
             {
                 _response.ResponseCode = ResponseHelper.EXCEPTION;
                 _response.ResponseMessage = "Exception occured: " + ex.Message;
-                _logger.LogError("TRANSACTIONREPOSITORY | GETTRANSACTIONDETAILS | EXCEPTION | " + JsonConvert.SerializeObject(_response));
+                _logger.LogError("TRANSACTIONREPOSITORY | UpdateTranDataFailed | EXCEPTION | " + JsonConvert.SerializeObject(_response));
             }
             return await Task.FromResult(_response);
         }

CustomerOnlineV2/CustomerOnlineV2/Controllers/AccountController.cs

@@ -193,7 +193,7 @@ namespace CustomerOnlineV2.Controllers
         {
             var logindetails = HttpContext.GetLoginDetails();
             model.IpAddress = Utilities.GetIpAddressv2(HttpContext);
-            using (LogContext.PushProperty("DebugId", logindetails.UserName))
+            using (LogContext.PushProperty("DebugId", model.Username))
             {
                 _logger.LogDebug("ACCOUNTCONTROLLER | RESETPASSWORD | REQUEST | " + JsonConvert.SerializeObject(model));
                 if (string.IsNullOrEmpty(model.Username))
@@ -228,7 +228,7 @@ namespace CustomerOnlineV2.Controllers
                 {
                     ViewBag.ResponseCode = "1";
                     ViewBag.ResponseMessage = response.ResponseMessage;
-                    _logger.LogError("ACCOUNTCONTROLLER | LOGIN | ERROR OCCURED | " + JsonConvert.SerializeObject(response));
+                    _logger.LogError("ACCOUNTCONTROLLER | RESETPASSWORD | ERROR OCCURED | " + JsonConvert.SerializeObject(model));
                     return View();
                 }
             }

CustomerOnlineV2/CustomerOnlineV2/Controllers/CustomerController.cs

@@ -1,18 +1,13 @@
 using CustomerOnlineV2.Api.API.TPApi;
 using CustomerOnlineV2.Authorization;
 using CustomerOnlineV2.Business.Business.RegisterBusiness;
-using CustomerOnlineV2.Common.Models;
 using CustomerOnlineV2.Common.Helper;
-using CustomerOnlineV2.Common.Models.ReceiverModel;
+using CustomerOnlineV2.Common.Models;
+using CustomerOnlineV2.Common.Models.HomeModel;
 using CustomerOnlineV2.Common.Models.RegisterModel;
-using CustomerOnlineV2.Common.Models.TransactionModel;
 using Microsoft.AspNetCore.Mvc;
 using Newtonsoft.Json;
-using CustomerOnlineV2.Common.Helper;
-using CustomerOnlineV2.Common.Models.HomeModel;
-using CustomerOnlineV2.Common.Models.ReceiverModel;
-using CustomerOnlineV2.Common.Models.AccountModel;
-using System.Drawing;
+using Serilog.Context;
 
 namespace CustomerOnlineV2.Controllers
 {
@@ -21,46 +16,43 @@ namespace CustomerOnlineV2.Controllers
         private readonly IRegisterBusiness _registerBusiness;
         private readonly ILogger<CustomerController> _logger;
         private readonly ITPApiService _tpApiService;
-      
-        public CustomerController(ILogger<CustomerController> logger, ITPApiService tpApiService , IRegisterBusiness registerBusiness)
+
+        public CustomerController(ILogger<CustomerController> logger, ITPApiService tpApiService, IRegisterBusiness registerBusiness)
         {
             _logger = logger;
             _tpApiService = tpApiService;
             _registerBusiness = registerBusiness;
         }
 
-        //[BindProperty]
-        //public OnlineCustomerRegisterModel Input { get; set; }
         ///[Authorization("Customer")]
         public IActionResult CustomerRegistration()
         {
             return View();
         }
 
-
         [HttpPost]
         //[Authorization("AddCustomer")]
         [ValidateAntiForgeryToken]
         public async Task<JsonRxResponse> AddCustomer(OnlineCustomerRegisterModel register)
         {
+            using (LogContext.PushProperty("DebugId", register.email))
+            {
+                _logger.LogInformation($"AddCustomer |  REQUEST | {JsonConvert.SerializeObject(register)}");
+            }
 
+            DateTime dateTime;
+            if (DateTime.TryParseExact(register.dob, "dd/MM/yyyy", System.Globalization.CultureInfo.InvariantCulture, System.Globalization.DateTimeStyles.None, out dateTime))
+            {
+                register.dob = dateTime.ToString("yyyy-MM-dd");
+            }
 
-        //    AddressListResponse _response = new AddressListResponse();
-        //    addressRequest.IpAddress = Utilities.GetIpAddressv2(HttpContext);
-        //    addressRequest.ProcessId = Convert.ToString(Guid.NewGuid());
-        //    using (LogContext.PushProperty("DebugId", addressRequest.ProcessId))
-        //    {
-        //        _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;
 
-        //    }
-        //    return _response;
         }
 
-
         [HttpPost]
         public async Task<JsonResult> GetAddressByPostCode([FromBody] string postalCode)
         {
@@ -82,40 +74,18 @@ namespace CustomerOnlineV2.Controllers
 
             return Json(jsonResponse);
         }
+
+
+
         public async Task<IActionResult> Success()
         {
+
             return View();
         }
+
         [Authorization("CustomerProfile")]
-        public async Task  <IActionResult> CustomerProfile(CustomerList customer)
-        {
-            //var staticDataResponse = _registerBusiness.GetTranCustomerById(customer);
-
-            //var viewModel = new CustomerList
-            //{
-            //    Email = na,
-            //    otp = "",
-            //};
-            //if (staticDataResponse.ErrorCode == "0" && staticDataResponse.Extra3.Equals("100"))
-            //{
-            //    ViewBag.ResponseCode = "0";
-            //    ViewBag.ResponseMessage = "OTP has been sent.";
-            //    return View(viewModel);
-            //}
-            //else
-            //{
-            //    if (staticDataResponse.Extra3.Equals("103"))
-            //    {
-            //        ViewBag.ResponseCode = "103";
-            //        ViewBag.ResponseMessage = "OTP already has been sent.";
-            //        return View(viewModel);
-            //    }
-            //    ViewBag.ResponseCode = staticDataResponse.ErrorCode;
-            //    ViewBag.ResponseMessage = staticDataResponse.Msg;
-            //    _logger.LogError("ACCOUNTCONTROLLER | REQUESTOTP | ERROR OCCURED | " + JsonConvert.SerializeObject(staticDataResponse));
-            //    return View(viewModel);
-            //}
-        
+        public async Task<IActionResult> CustomerProfile(CustomerList customer)
+        {
             return View();
         }
         [HttpGet]
@@ -125,11 +95,11 @@ namespace CustomerOnlineV2.Controllers
             var loginDetails = HttpContext.GetLoginDetails();
             return await _registerBusiness.GetTranCustomerById(loginDetails);
         }
-		
-		 [Authorization("Notifications")]
+
+
+        [Authorization("Notifications")]
         public IActionResult Notifications()
         {
-
             return View();
         }
 
@@ -156,36 +126,52 @@ namespace CustomerOnlineV2.Controllers
             var loginDetails = HttpContext.GetLoginDetails();
             return await _registerBusiness.EditCustomerAddressById(loginDetails);
         }
-
         [HttpPost]
         [Authorization("UpdateCustomer")]
 
         public async Task<CustomerListModel> UpdateCustomer(CustomerListModel customer, string id)
         {
             var loginDetails = HttpContext.GetLoginDetails();
+
+            using (LogContext.PushProperty("DebugId", loginDetails.UserName))
+            {
+                _logger.LogInformation($"UpdateCustomer |  REQUEST | {JsonConvert.SerializeObject(customer)}");
+            }
+
+
             //ReceiverInformationModel _response = new ReceiverInformationModel();
             var customer1 = await _registerBusiness.UpdateCustomers(customer, loginDetails.UserId);
             return customer1;
         }
-		[Authorization("Refer")]
+
+        [Authorization("Refer")]
+
         [Route("Customer/Refer/{id}")]
         public IActionResult Refer(string id)
         {
-            return View(model:id);
+            return View(model: id);
         }
+
         [HttpGet]
         [Route("GetRewardDetails")]
         public async Task<CustomerNotificationModel> GetRewardDetails()
         {
             var loginDetails = HttpContext.GetLoginDetails();
-            //ReceiverInformationModel _response = new ReceiverInformationModel();
+
             return await _registerBusiness.GetRewardPoints(loginDetails);
         }
+
         [HttpPost]
         [Authorization("UpdateDocument")]
         public async Task<CustomerListModel> UpdateDocument(CustomerListModel customer, string id)
         {
             var loginDetails = HttpContext.GetLoginDetails();
+
+            using (LogContext.PushProperty("DebugId", loginDetails.UserName))
+            {
+                _logger.LogInformation($"UpdateDocument |  REQUEST | {JsonConvert.SerializeObject(customer)}");
+            }
+            //ReceiverInformationModel _response = new ReceiverInformationModel();
             var customer1 = await _registerBusiness.UpdateDocuments(customer, loginDetails.UserId);
             return customer1;
         }
@@ -196,31 +182,14 @@ namespace CustomerOnlineV2.Controllers
             var loginDetails = HttpContext.GetLoginDetails();
             return await _registerBusiness.GetRewardAmount(loginDetails);
         }
+
+
         [HttpGet]
         [Route("ValidateReferralCode/{referralCode}")]
         public async Task<CommonResponse> ValidateReferralCode(string referralCode)
-        
-        
         {
-            //var loginDetails = HttpContext.GetLoginDetails();
-            //ReceiverInformationModel _response = new ReceiverInformationModel();
+
             return await _registerBusiness.ValidateReferralCode(referralCode);
         }
-        //[HttpPost]
-        ////[ApplicationLevelAuthentication]
-        //[Route("mobile/validateReferralCode")]
-        //public IHttpActionResult ValidateReferralCode(validateReferralCodeRequest request)
-        //{
-        //    LogicalThreadContext.Properties[LoggerProperty.CREATEDBY] = request.referralCode;
-        //    LogicalThreadContext.Properties[LoggerProperty.METHODNAME] = "ValidateReferralCode";
-        //    LogicalThreadContext.Properties[LoggerProperty.IPADDRESS] = Request.GetClientIpAddress();
-        //    Log.Debug("ValidateReferralCode | REQUEST : " + JsonConvert.SerializeObject(request));
-        //    if (ModelState.IsValid)
-        //    {
-        //        var response = _requestServices.ValidateReferralCode(request.referralCode);
-        //        return Ok(response);
-        //    }
-        //    return ModelValidationError(ModelState);
-        //}
     }
 }

CustomerOnlineV2/CustomerOnlineV2/Controllers/ReceiverInformationController.cs

@@ -3,8 +3,12 @@ using CustomerOnlineV2.Business.Business.ReceiverBusiness;
 using CustomerOnlineV2.Common.Helper;
 using CustomerOnlineV2.Common.Models.HomeModel;
 using CustomerOnlineV2.Common.Models.ReceiverModel;
+using CustomerOnlineV2.Repository.Repository.RegisterRepository;
 using Microsoft.AspNetCore.Mvc;
+using Microsoft.Win32;
+using Newtonsoft.Json;
 using NuGet.Protocol.Plugins;
+using Serilog.Context;
 using Controller = Microsoft.AspNetCore.Mvc.Controller;
 using HttpPostAttribute = Microsoft.AspNetCore.Mvc.HttpPostAttribute;
 
@@ -15,11 +19,11 @@ namespace CustomerOnlineV2.Controllers
 
 
         private readonly IReceiverBusiness _receiverBusiness;
+        private readonly ILogger<ReceiverInformationController> _logger;
 
-
-        public ReceiverInformationController(IReceiverBusiness receiverBusiness)
+        public ReceiverInformationController(ILogger<ReceiverInformationController> logger, IReceiverBusiness receiverBusiness)
         {
-
+            _logger = logger;
             _receiverBusiness = receiverBusiness;
         }
 
@@ -38,6 +42,10 @@ namespace CustomerOnlineV2.Controllers
         public async Task<ReceiverInformationModel> AddReceiver(ReceiverInformationModel receiver, string id, string user)
         {
             var loginDetails = HttpContext.GetLoginDetails();
+            using (LogContext.PushProperty("DebugId", loginDetails.Email))
+            {
+                _logger.LogInformation($"AddReceiver |  REQUEST | {JsonConvert.SerializeObject(receiver)}");
+            }
             //ReceiverInformationModel _response = new ReceiverInformationModel();
             var receiver1 = await _receiverBusiness.Receivers(receiver, loginDetails.UserId, loginDetails.UserName);
             return receiver1;

CustomerOnlineV2/CustomerOnlineV2/Controllers/TransactionController.cs

@@ -1,17 +1,18 @@
-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.ReceiverModel;
+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 CustomerOnlineV2.Common.Models.RegisterModel;
-using CustomerOnlineV2.Common.Models.ReceiverModel;
-
+using System.Text;
+using Notify = CustomerOnlineV2.Common.Models.Notification;
 namespace CustomerOnlineV2.Controllers
 {
     public class TransactionController : Controller
@@ -30,11 +31,11 @@ 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());
-            using (LogContext.PushProperty("DebugId", calcModel.ProcessId))
+            using (LogContext.PushProperty("DebugId", loginDetails.UserName))
             {
                 _logger.LogInformation($"TRANSACTIONSERVICE | DOCALCULATION | REQUEST | {JsonConvert.SerializeObject(calcModel)}");
                 _response = await _transactionBusiness.DoCalculation(calcModel, loginDetails);
@@ -59,8 +60,9 @@ namespace CustomerOnlineV2.Controllers
             calcModel.IpAddress = Utilities.GetIpAddressv2(HttpContext);
 
             calcModel.ProcessId = Convert.ToString(Guid.NewGuid());
-            using (LogContext.PushProperty("DebugId", calcModel.ProcessId))
+            using (LogContext.PushProperty("DebugId", loginDetails.UserName))
             {
+                LogContext.PushProperty("ProcessId", calcModel.ProcessId);
                 _logger.LogInformation($"TRANSACTIONSERVICE | SENDMONEY | REQUEST | {JsonConvert.SerializeObject(calcModel)}");
                 _response = await _transactionBusiness.SendMoney(calcModel, loginDetails);
                 _logger.LogInformation($"TRANSACTIONSERVICE | SENDMONEY | RESPONSE | {JsonConvert.SerializeObject(_response)}");
@@ -73,11 +75,40 @@ namespace CustomerOnlineV2.Controllers
         {
             SendMoneySuccessModel _response = new SendMoneySuccessModel();
             var loginDetails = HttpContext.GetLoginDetails();
-            using (LogContext.PushProperty("DebugId", id))
+            using (LogContext.PushProperty("DebugId", loginDetails.UserName))
             {
-                _logger.LogInformation($"TRANSACTIONSERVICE | GETTRANSACTIONDETAILS | REQUEST | {id}");
+                LogContext.PushProperty("ProcessId", 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);
         }
@@ -87,7 +118,7 @@ namespace CustomerOnlineV2.Controllers
         {
             TransactionDetailModel _response = new TransactionDetailModel();
             var loginDetails = HttpContext.GetLoginDetails();
-            using (LogContext.PushProperty("DebugId", id))
+            using (LogContext.PushProperty("DebugId", loginDetails.UserName))
             {
                 _logger.LogInformation($"TRANSACTIONSERVICE | GETRECEIPTDATA | REQUEST | {id}");
                 _response = await _transactionBusiness.GetReceiptData(id, loginDetails);
@@ -100,7 +131,7 @@ namespace CustomerOnlineV2.Controllers
         {
             TransactionDetailModel _response = new TransactionDetailModel();
             var loginDetails = HttpContext.GetLoginDetails();
-            using (LogContext.PushProperty("DebugId", id))
+            using (LogContext.PushProperty("DebugId", loginDetails.UserName))
             {
                 _logger.LogInformation($"TRANSACTIONSERVICE | GETRECEIPTDATA | REQUEST | {id}");
                 _response = await _transactionBusiness.GetReceiptData(id, loginDetails);
@@ -111,19 +142,26 @@ 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))
+
+            using (LogContext.PushProperty("DebugId", loginDetails.UserName))
             {
+                LogContext.PushProperty("ProcessId", 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";
@@ -138,20 +176,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.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();
@@ -170,9 +208,10 @@ namespace CustomerOnlineV2.Controllers
                 _request.sitesecurity = $"h{builder.ToString()}";
                 //TempData["TrustPaymentRequest"] = _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);
         }
@@ -189,21 +228,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);
         }
@@ -229,12 +269,17 @@ 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();
+            using (LogContext.PushProperty("DebugId", loginDetails.UserName))
+            {
+                _logger.LogDebug("TranDecline | REQUEST | " + JsonConvert.SerializeObject(_request));
+            }
             var _response = await _transactionBusiness.UpdateTranDataFailed(_request, loginDetails);
-       
+
             _response.transactionreference = transactionReference;
             return View(_response);
         }
@@ -262,7 +307,6 @@ namespace CustomerOnlineV2.Controllers
             var loginDetails = HttpContext.GetLoginDetails();
             return await _transactionBusiness.GetRewardPoints(loginDetails);
         }
-
         [HttpGet]
         public async Task<ReceiverListModel> GetReceiverListDetail(string id)
         {

CustomerOnlineV2/CustomerOnlineV2/Views/Account/ResetPassword.cshtml

@@ -190,7 +190,7 @@
                 dateFormat: "dd/mm/yy",
                 changeMonth: true,
                 changeYear: true,
-                yearRange: "-60:+0",
+                yearRange: "-100:+0",
                 // showOn: "both",
                 // buttonText: '<i class="icon-calendar"></i>',
             });

CustomerOnlineV2/CustomerOnlineV2/Views/Customer/CustomerProfile.cshtml

@@ -450,7 +450,7 @@
                 dateFormat: "dd/mm/yy",
                 changeMonth: true,
                 changeYear: true,
-                yearRange: "-60:+0",
+                yearRange: "-100:+0",
                 // showOn: "both",
                 // buttonText: '<i class="icon-calendar"></i>',
             });
@@ -459,7 +459,7 @@
                 dateFormat: "dd/mm/yy",
                 changeMonth: true,
                 changeYear: true,
-                yearRange: "-0:+60",
+                yearRange: "-0:+100",
                 // showOn: "both",
                 // buttonText: '<i class="icon-calendar"></i>',
             });

CustomerOnlineV2/CustomerOnlineV2/Views/Customer/CustomerRegistration.cshtml

@@ -416,7 +416,7 @@
                 dateFormat: "dd/mm/yy",
                 changeMonth: true,
                 changeYear: true,
-                yearRange: "-60:+0",
+                yearRange: "-100:+0",
                 // showOn: "both",
                 // buttonText: '<i class="icon-calendar"></i>',
             });

CustomerOnlineV2/CustomerOnlineV2/Views/Customer/Refer.cshtml

@@ -168,7 +168,7 @@
                                                 <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>
+                                                    <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> *@

CustomerOnlineV2/CustomerOnlineV2/Views/Transaction/Payment.cshtml

@@ -58,8 +58,8 @@
         <input asp-for="customertown" name="customertown" type="hidden" />
         <input asp-for="billingcountryiso2a" name="billingcountryiso2a" type="hidden" />
         <input asp-for="customercountryiso2a" name="customercountryiso2a" type="hidden" />
-        <input asp-for="billingtelephone" name="billingtelephone" type="hidden" value="7984713677" />
-        <input asp-for="customertelephone" name="customertelephone" type="hidden" value="7984713677" />
+        <input asp-for="billingtelephone" name="billingtelephone" type="hidden" value="" />
+        <input asp-for="customertelephone" name="customertelephone" type="hidden" value="" />
       
         <input asp-for="billingemail" name="billingemail" type="hidden" />
         <input asp-for="customeremail" name="customeremail" type="hidden" />

CustomerOnlineV2/CustomerOnlineV2/Views/Transaction/SendMoney.cshtml

@@ -3,10 +3,6 @@
 @{
     Layout = "_Layout2";
 }
-@* @{
-    var receiverId = ViewBag.ReceiverId as string;
-    //var editFlag = ViewBag.EditFlag as string;
-} *@
 <style>
     .reward-text {
         font-size: 16px;
@@ -259,7 +255,7 @@
                                         </td>
                                     </tr>
                                     <tr class="account-number">
-                                        <td> Account Number :</td>
+                                        <td> Account No :</td>
                                         <td>
                                             <strong><span id="acountNumber"></span></strong>
                                         </td>