Merge branch 'feature/Redmine-18711-Receiver_Module_for_Web'

# Conflicts:
#	CustomerOnlineV2/.vs/CustomerOnlineV2/v16/.suo

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

@@ -4,7 +4,6 @@ using CustomerOnlineV2.Common.Models.RegisterModel;
 using Microsoft.Extensions.Logging;
 using Newtonsoft.Json;
 using System.Text;
-using static System.Runtime.InteropServices.JavaScript.JSType;
 
 namespace CustomerOnlineV2.Api.API.TPApi
 {

CustomerOnlineV2/CustomerOnlineV2.Business/Business/AccountBusiness/IAccountBusiness.cs

@@ -7,5 +7,6 @@ namespace CustomerOnlineV2.Business.Business.AccountBusiness
     {
         Task<LoginResponse> Login(LoginModel model);
         Task<CommonResponse> ChangePassword(ForceChangePasswordModel model, LoginResponse logindetails);
+        Task<CommonResponse> PasswordReset(PasswordResetModel model, LoginResponse logindetails);
     }
 }

CustomerOnlineV2/CustomerOnlineV2.Business/Business/ReceiverBusiness/IReceiverBusiness.cs

@@ -9,6 +9,6 @@ namespace CustomerOnlineV2.Business.Business.ReceiverBusiness
 {
     public interface IReceiverBusiness
     {
-        Task<ReceiverInformationModel> Receivers(ReceiverInformationModel calcModel);
+        Task<ReceiverInformationModel> Receivers(ReceiverInformationModel model, string id, string user);
     }
 }

CustomerOnlineV2/CustomerOnlineV2.Business/Business/ReceiverBusiness/ReceiverBusiness.cs

@@ -22,12 +22,12 @@ namespace CustomerOnlineV2.Business.Business.ReceiverBusiness
 
 
 
-        public async Task<ReceiverInformationModel> Receivers(ReceiverInformationModel model)
+        public async Task<ReceiverInformationModel> Receivers(ReceiverInformationModel model , string id, string user)
         {
             
             
 
-            var model1 = await _receiverRepository.GetReceiverDetails(model);
+            var model1 = await _receiverRepository.GetReceiverDetails(model ,  id,  user) ;
             return model1;
         }
 

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

@@ -2,6 +2,11 @@
 using CustomerOnlineV2.Common.Models.RegisterModel;
 using CustomerOnlineV2.Repository.Repository.RegisterRepository;
 using Microsoft.Extensions.Logging;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
 
 namespace CustomerOnlineV2.Business.Business.RegisterBusiness
 {

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

@@ -219,5 +219,13 @@
         public string? TotalToPay { get; set; }
         public string? PaidBy { get; set; }
         public string? PCountry { get; set; }
+        public string? Zipcode { get; set; }
+        public string? Firstname { get; set; }
+
+        public string? Lastname1 { get; set; }
+        public string? Address { get; set; }
+        public string? Mobile { get; set; }
+
+        public string? City { get; set; }
     }
 }

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

@@ -28,7 +28,7 @@ namespace CustomerOnlineV2.Repository.Repository.HomeRepository
                 var sql = "EXEC PROC_DYNAMIC_TABLE";
                 sql += " @Flag = " + _connHelper.FilterString("CustomerReceiver");
                 sql += ",@User = " + _connHelper.FilterString(loginDetails.UserName);
-
+                sql += ",@id = " + _connHelper.FilterString(loginDetails.UserId);
                 _logger.LogDebug("HOMEREPOSITORY | GETCUSTOMERRECEIVERLIST | SQL | " + sql);
                 var dt = _connHelper.ExecuteDataTable(sql);
 
@@ -77,7 +77,7 @@ namespace CustomerOnlineV2.Repository.Repository.HomeRepository
                 var sql = "EXEC PROC_DYNAMIC_TABLE";
                 sql += " @Flag = " + _connHelper.FilterString("CustomerTxn");
                 sql += ",@User = " + _connHelper.FilterString(loginDetails.UserName);
-
+                sql += ",@id = " + _connHelper.FilterString(loginDetails.UserId);
                 _logger.LogDebug("HOMEREPOSITORY | GETCUSTOMERTRANSACTIONLIST | SQL | " + sql);
                 var dt = _connHelper.ExecuteDataTable(sql);
 

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

@@ -12,6 +12,6 @@ namespace CustomerOnlineV2.Repository.Repository.ReceiverRepository
 
     {
         // Task<ReceiverInformationModel> GetReceiverDetails(ReceiverInformationModel model);
-        Task<ReceiverInformationModel> GetReceiverDetails(ReceiverInformationModel model);
+        Task<ReceiverInformationModel> GetReceiverDetails(ReceiverInformationModel model, string id, string user);
     }
 }

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

@@ -15,15 +15,16 @@ namespace CustomerOnlineV2.Repository.Repository.ReceiverRepository
             _connHelper = connHelper;
         }
 
-        public async Task<ReceiverInformationModel> GetReceiverDetails(ReceiverInformationModel model)
+        public async Task<ReceiverInformationModel> GetReceiverDetails(ReceiverInformationModel model, string id , string user )
         {
             //ReceiverInformationModel _response = new ReceiverInformationModel();
             try
             {
                 var sql = "EXEC proc_online_receiverSetup";
-                sql += " @flag = " + _connHelper.FilterString("i-new-register");
+                sql += " @flag = " + _connHelper.FilterString("i");
                 
                 //sql += ", @user						        = " + _connHelper.FilterString(model.ReceiverId.());
+                sql += ",@user	= " + _connHelper.FilterString(user);
                 sql += ",@country =" + _connHelper.FilterString(model.Country);
                 //sql += ",@nativeCountry =" + _connHelper.FilterString(model.NativeCountry);
                 sql += ",@receiverType =" + _connHelper.FilterString(model.receiverType);
@@ -48,11 +49,12 @@ namespace CustomerOnlineV2.Repository.Repository.ReceiverRepository
                 sql += ",@receiverAccountNo =" + _connHelper.FilterString(model.receiverAccountNumber);
                 sql += ",@remarks =" + _connHelper.FilterString(model.Remarks);
                 //sql += ",@receiverId =" + _connHelper.FilterString(model.ReceiverId);
-                sql += ",@customerId =" + _connHelper.FilterString(model.CustomerId);
+                sql += ",@customerId =" + _connHelper.FilterString(id);
              
                 sql += ",@membershipId =" + _connHelper.FilterString(model.MembershipId);
                 //sql += ",@otherRelationDesc =" + _connHelper.FilterString(model.OtherRelationDescription);
                 sql += ",@zipCode =" + _connHelper.FilterString(model.zipCode);
+                sql += ",@CreatedFrom =" + _connHelper.FilterString("O");
                 //sql += ",@loginBranchId=" + _connHelper.FilterString(model.ag.ToString());
                 //sql += ",@PurposeOfRemitanceOther=" + _connHelper.FilterString(model.PurposeOfRemitanceOther);
                // sql += ",@RelationshipOther=" + _connHelper.FilterString(model.RelationshipOther);

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

@@ -151,7 +151,12 @@ namespace CustomerOnlineV2.Repository.Repository.TransactionRepository
                     _response.PromotionDiscount = Convert.ToString(dt.Rows[0]["PromotionDiscount"]);
                     _response.TotalToPay = Convert.ToString(dt.Rows[0]["camt"]);
                     _response.PaidBy = Convert.ToString(dt.Rows[0]["collMode"]);
-                    _response.PCountry = Convert.ToString(dt.Rows[0]["pCountry"]);
+                    _response.Zipcode = Convert.ToString(dt.Rows[0]["zipcode"]);
+                    _response.Firstname = Convert.ToString(dt.Rows[0]["firstname"]);
+                    _response.Lastname1 = Convert.ToString(dt.Rows[0]["lastname1"]);
+                    _response.Address = Convert.ToString(dt.Rows[0]["address"]);
+                    _response.City = Convert.ToString(dt.Rows[0]["city"]);
+                    _response.Mobile = Convert.ToString(dt.Rows[0]["mobile"]);
                 }
             }
             catch (Exception ex)

CustomerOnlineV2/CustomerOnlineV2/Controllers/CustomerController.cs

@@ -3,8 +3,10 @@ using CustomerOnlineV2.Authorization;
 using CustomerOnlineV2.Business.Business.RegisterBusiness;
 using CustomerOnlineV2.Common.Models.ReceiverModel;
 using CustomerOnlineV2.Common.Models.RegisterModel;
+using CustomerOnlineV2.Common.Models.TransactionModel;
 using Microsoft.AspNetCore.Mvc;
 using Newtonsoft.Json;
+using Serilog.Context;
 
 namespace CustomerOnlineV2.Controllers
 {
@@ -40,7 +42,7 @@ namespace CustomerOnlineV2.Controllers
 
 
         [HttpPost]
-        public JsonResult GetAddressByPostCode(string postalCode)
+        public async Task<JsonResult> GetAddressByPostCode([FromBody] string postalCode)
         {
             var postCode = postalCode.ToUpper();
             string ProcessId = Guid.NewGuid().ToString().Replace("-", "") + ":" + postCode;
@@ -55,10 +57,14 @@ namespace CustomerOnlineV2.Controllers
                 TownName = postCode,
             };
 
-            var response = _tpApiService.GetAddressList(requestObj);
+            var response = await _tpApiService.GetAddressList(requestObj);
             string jsonResponse = JsonConvert.SerializeObject(response);
 
             return Json(jsonResponse);
         }
+        public async Task<IActionResult> Success()
+        {
+            return View();
+        }
     }
 }

CustomerOnlineV2/CustomerOnlineV2/Controllers/ReceiverInformationController.cs

@@ -1,5 +1,6 @@
 using CustomerOnlineV2.Authorization;
 using CustomerOnlineV2.Business.Business.ReceiverBusiness;
+using CustomerOnlineV2.Common.Helper;
 using CustomerOnlineV2.Common.Models.ReceiverModel;
 using Microsoft.AspNetCore.Mvc;
 using Controller = Microsoft.AspNetCore.Mvc.Controller;
@@ -29,10 +30,11 @@ namespace CustomerOnlineV2.Controllers
 
         [HttpPost]
         [Authorization("AddReceiver")]
-        public async Task<ReceiverInformationModel> AddReceiver(ReceiverInformationModel receiver)
+        public async Task<ReceiverInformationModel> AddReceiver(ReceiverInformationModel receiver , string id, string user)
         {
+            var loginDetails = HttpContext.GetLoginDetails();
             //ReceiverInformationModel _response = new ReceiverInformationModel();
-           var receiver1 = await _receiverBusiness.Receivers(receiver);
+            var receiver1 = await _receiverBusiness.Receivers(receiver, loginDetails.UserId, loginDetails.UserName);
             return receiver1;
         }
 

CustomerOnlineV2/CustomerOnlineV2/Controllers/TransactionController.cs

@@ -89,5 +89,29 @@ namespace CustomerOnlineV2.Controllers
             }
             return View(_response);
         }
+        public async Task<IActionResult> Payment([FromQuery] string id)
+        {
+            TransactionDetailModel _tranresponse = new TransactionDetailModel();
+            TrustPaymentRequest _request = new TrustPaymentRequest();
+            var loginDetails = HttpContext.GetLoginDetails();
+            using (LogContext.PushProperty("DebugId", id))
+            {
+                _logger.LogInformation($"Payment | REQUEST | {id}");
+                _tranresponse = await _transactionBusiness.GetReceiptData(id, loginDetails);
+                _request.sitereference = "test_subhidauk71992";
+                _request.stprofile = "default";
+                _request.currencyiso3a = "GBP";
+                _request.orderreference = Guid.NewGuid().ToString(); 
+                _request.mainamount = _tranresponse.TotalToPay;
+                _request.billingfirstname = _tranresponse.Firstname;
+                _request.billinglastname = _tranresponse.Lastname1;
+                _request.billingstreet = _tranresponse.Address;
+                _request.billingpostcode = _tranresponse.Zipcode;
+                _request.billingtown = _tranresponse.City;
+                _request.billingcountryiso2a = "GB";
+                _request.customerpremise = _tranresponse.City;             
+                _request.customerstreet = _tranresponse.Address;
+                _request.customerpostcode = _tranresponse.Zipcode;
+                _request.customertown = _tranresponse.City;
     }
 }

CustomerOnlineV2/CustomerOnlineV2/Program.cs

@@ -38,7 +38,7 @@ builder.Services.AddAuthentication(CookieAuthenticationDefaults.AuthenticationSc
 
 builder.Services.AddAntiforgery(options => options.HeaderName = "RequestVerificationToken");
 builder.Services.AddControllers();
-builder.Services.AddControllersWithViews();
+builder.Services.AddControllersWithViews().AddRazorRuntimeCompilation();
 builder.Services.AddRazorPages();
 builder.Services.AddScoped<IConnectionHelper, ConnectionHelper>();
 builder.Services.AddScoped<IAccountBusiness, AccountBusiness>();

CustomerOnlineV2/CustomerOnlineV2/Views/Home/Index.cshtml

@@ -282,7 +282,7 @@
                     row += '<div class="px-4 py-3">';
                     row += '<div class="row align-items-center flex-row">';
                     row += '<div class="col-1 col-sm-4"><span class="d-block text-1">' + d['name'] + '</span> <span class="text-muted">' + d['mobile'] + '</span></div>';
-                    row += '<div class="col-2 col-sm-2"><span class="d-block text-1"><a href="send-money.html?receiverid=123123123">Send Transaction</a></span></div>';
+                    row += '<div class="col-2 col-sm-2"><span class="d-block text-1"><a href="/Transaction/SendMoney">Send Transaction</a></span></div>';
                     row += '<div class="col-3 col-sm-3 d-none d-sm-block text-center text-1">' + d['country'] + '</div>';
                     row += '<div class="col-4 col-sm-3 text-end text-1"> <span class="text-nowrap">' + d['transactionType'] + '</span></div>';
                     row += '</div>';

CustomerOnlineV2/CustomerOnlineV2/Views/ReceiverInformation/Receiver.cshtml

@@ -416,7 +416,8 @@
 
                         $('#Country').focus();
                         $('#message').text('Data successfully submitted');
-                       // window.location.replace("/ReceiverInformation/Success?id=" + response.ReceiverId);
+
+                        window.location.replace("/home");
                     },