TRU Fixes

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/TPResponse.cs

@@ -9,5 +9,6 @@
         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

@@ -193,6 +193,7 @@ 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,7 @@ 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,10 +303,13 @@ 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";
+                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);
@@ -318,6 +321,15 @@ namespace CustomerOnlineV2.Repository.Repository.TransactionRepository
                 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

@@ -163,6 +163,30 @@ 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)
@@ -177,6 +201,17 @@ namespace CustomerOnlineV2.Controllers
                     _logger.LogError("ACCOUNTCONTROLLER | RESETPASSWORD | INVALID logindetails.UserName");
                     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));

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

@@ -168,7 +168,7 @@ namespace CustomerOnlineV2.Controllers
                 _request.sitesecurity = $"h{builder.ToString()}";
                 //TempData["TrustPaymentRequest"] = _request;
 
-                _logger.LogInformation($"Payment | RESPONSE | {JsonConvert.SerializeObject(_request)}");
+                _logger.LogInformation($"Payment | REQUEST | {JsonConvert.SerializeObject(_request)}");
 
                 var _response = await _transactionBusiness.SaveTranData(_request, loginDetails);
             }
@@ -198,6 +198,10 @@ namespace CustomerOnlineV2.Controllers
             };
 
             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);
         }

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/ReceiverInformation/Receiver.cshtml

@@ -661,7 +661,6 @@
     // });
 
     function editReceiver(editFlag, receiverId) {
-        debugger;
 
         if (editFlag === 'Y') {
             $('#btnUpdateReceiver').show();

CustomerOnlineV2/CustomerOnlineV2/Views/Transaction/SendMoney.cshtml

@@ -601,7 +601,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

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