work on maintaining new logic for payment mode in exrate logic, add receipt page.

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

@@ -8,5 +8,6 @@ namespace CustomerOnlineV2.Business.Business.TransactionBusiness
         Task<ExrateResponse> DoCalculation(SendTransactionModel calcRequest, LoginResponse loginDetails);
         Task<SendMoneyResponse> SendMoney(SendTransactionModel sendMoneyRequest, LoginResponse loginDetails);
         Task<SendMoneySuccessModel> GetTransactionDetails(string id, LoginResponse loginDetails);
+        Task<TransactionDetailModel> GetReceiptData(string id, LoginResponse loginDetails);
     }
 }

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

@@ -36,6 +36,7 @@ namespace CustomerOnlineV2.Business.Business.TransactionBusiness
 
                 _response = await _tpApi.GetExRate(_request);
                 _response.ProcessId = calcRequest.ProcessId;
+                _response.tpExRate = _partnerDetails.TpExRate;
             }
             return _response;
         }
@@ -60,6 +61,11 @@ namespace CustomerOnlineV2.Business.Business.TransactionBusiness
             return await _transactionRepo.GetTransactionDetails(id, loginDetails);
         }
 
+        public async Task<TransactionDetailModel> GetReceiptData(string id, LoginResponse loginDetails)
+        {
+            return await _transactionRepo.GetReceiptData(id, loginDetails);
+        }
+
         private SendMoneyRequestModel GenerateSendMoneyParams(SendTransactionModel sendMoneyRequest, LoginResponse loginDetails)
         {
             return new SendMoneyRequestModel
@@ -86,12 +92,12 @@ namespace CustomerOnlineV2.Business.Business.TransactionBusiness
                 ServiceCharge = sendMoneyRequest.ServiceCharge,
                 ExRate = sendMoneyRequest.ExRate,
                 CalBy = sendMoneyRequest.CalcBy,
-                TpExRate = sendMoneyRequest.ExRate,
                 TpPCurr = sendMoneyRequest.PayoutCurrency,
                 PayOutPartnerId = sendMoneyRequest.PayoutPartner,
                 ForexSessionId = sendMoneyRequest.ForexSessionId,
                 PaymentType = "wallet",
-                SchemeId = "",
+                //SchemeId = sendMoneyRequest.SchemeId,
+                //TpExRate = sendMoneyRequest.TpExRate,
                 ProcessId = sendMoneyRequest.ProcessId,
                 UserName = loginDetails.UserName
             };
@@ -123,7 +129,9 @@ namespace CustomerOnlineV2.Business.Business.TransactionBusiness
                 ProcessFor = Utilities.ReadFromAppSettings("OnlineAgent:ProcessFor"),
                 ProcessId = calcRequest.ProcessId,
                 UserName = loginDetails.UserName,
-                SessionId = calcRequest.ProcessId
+                SessionId = calcRequest.ProcessId,
+                SchemeId = calcRequest.SchemeId,
+                TpExRate = partnerDetails.TpExRate
             };
         }
 
@@ -178,10 +186,10 @@ namespace CustomerOnlineV2.Business.Business.TransactionBusiness
 
                 _logger.LogError("TRANSACTIONBUSINESS | SENDMONEY.VALIDATEEXRATEREQUEST | REQUEST | " + JsonConvert.SerializeObject(_response));
             }
-            else if (string.IsNullOrEmpty(sendMoneyRequest.CollMode))
+            else if (string.IsNullOrEmpty(sendMoneyRequest.SchemeId))
             {
                 _response.ResponseCode = ResponseHelper.FAILED;
-                _response.ResponseMessage = "Param CollMode can not be emoty!";
+                _response.ResponseMessage = "Param SchemeId can not be emoty!";
 
                 _logger.LogError("TRANSACTIONBUSINESS | SENDMONEY.VALIDATEEXRATEREQUEST | REQUEST | " + JsonConvert.SerializeObject(_response));
             }
@@ -285,10 +293,10 @@ namespace CustomerOnlineV2.Business.Business.TransactionBusiness
                     _logger.LogError("TRANSACTIONBUSINESS | DOCALCULATION.VALIDATEEXRATEREQUEST | REQUEST | " + JsonConvert.SerializeObject(_response));
                 }
             }
-            else if (string.IsNullOrEmpty(calcRequest.CollMode))
+            else if (string.IsNullOrEmpty(calcRequest.SchemeId))
             {
                 _response.ResponseCode = ResponseHelper.FAILED;
-                _response.ResponseMessage = "Param CollMode can not be emoty!";
+                _response.ResponseMessage = "Param SchemeId can not be emoty!";
 
                 _logger.LogError("TRANSACTIONBUSINESS | DOCALCULATION.VALIDATEEXRATEREQUEST | REQUEST | " + JsonConvert.SerializeObject(_response));
             }

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

@@ -59,6 +59,7 @@
         public string? PayoutCurrency { get; set; }
         public string? ExrateCalcByPartner { get; set; }
         public string? PayoutCountryCode { get; set; }
+        public string? TpExRate { get; set; }
     }
 
     public class CalculateModel
@@ -99,13 +100,14 @@
         public string? ProcessId { get; set; }
         public string? UserName { get; set; }
         public string? SessionId { get; set; }
+        public string? SchemeId { get; set; }
+        public string? TpExRate { get; set; }
     }
 
     public class SendTransactionModel
     {
         public string? ReceivingCountry { get; set; }
         public string? DeliveryMethod { get; set; }
-        public string? CollMode { get; set; }
         public string? CollectAmount { get; set; }
         public string? PayoutAmount { get; set; }
         public string? PromoCode { get; set; }
@@ -122,6 +124,8 @@
         public string? ServiceCharge { get; set; }
         public string? ExRate { get; set; }
         public string? ForexSessionId { get; set; }
+        public string? SchemeId { get; set; }
+        public string? TpExRate { get; set; }
     }
 
     public class SendMoneyRequestModel
@@ -190,4 +194,30 @@
         public string? ReceiverName { get; set; }
         public string? TransactionId { get; set; }
     }
+
+    public class TransactionDetailModel : CommonResponse
+    {
+        public string? ControlNo { get; set; }
+        public string? CreatedDate { get; set; }
+        public string? TransactionId { get; set; }
+        public string? ReceiverName { get; set; }
+        public string? ReceiverAddress { get; set; }
+        public string? DeliveryMethod { get; set; }
+        public string? BankName { get; set; }
+        public string? BankBranch { get; set; }
+        public string? AccountNumber { get; set; }
+        public string? PurposeOfRemit { get; set; }
+        public string? Status { get; set; }
+        public string? PayoutAmount { get; set; }
+        public string? PayoutCurr { get; set; }
+        public string? ExRate { get; set; }
+        public string? PromotionPremiumRate { get; set; }
+        public string? SendAmount { get; set; }
+        public string? CollectionCurrency { get; set; }
+        public string? TransferFee { get; set; }
+        public string? PromotionDiscount { get; set; }
+        public string? TotalToPay { get; set; }
+        public string? PaidBy { get; set; }
+        public string? PCountry { get; set; }
+    }
 }

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

@@ -7,5 +7,6 @@ namespace CustomerOnlineV2.Repository.Repository.TransactionRepository
     {
         Task<ExratePayoutDetailsModel> GetPayoutDetails(SendTransactionModel calcRequest, LoginResponse loginDetails);
         Task<SendMoneySuccessModel> GetTransactionDetails(string id, LoginResponse loginDetails);
+        Task<TransactionDetailModel> GetReceiptData(string id, LoginResponse loginDetails);
     }
 }

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

@@ -28,6 +28,7 @@ namespace CustomerOnlineV2.Repository.Repository.TransactionRepository
                 sql += ",@CountryId = " + _connHelper.FilterString(calcRequest.ReceivingCountry);
                 sql += ",@PaymentMethod = " + _connHelper.FilterString(calcRequest.DeliveryMethod);
                 sql += ",@UserEmail = " + _connHelper.FilterString(loginDetails.UserName);
+                sql += ",@SchemeId = " + _connHelper.FilterString(calcRequest.SchemeId);
 
                 _logger.LogDebug("TRANSACTIONREPOSITORY | GETPAYOUTDETAILS | SQL | " + sql);
                 var dt = _connHelper.ExecuteDataTable(sql);
@@ -49,6 +50,7 @@ namespace CustomerOnlineV2.Repository.Repository.TransactionRepository
                     _response.PayoutCurrency = Convert.ToString(dt.Rows[0]["PayoutCurrency"]);
                     _response.PayoutPartner = Convert.ToString(dt.Rows[0]["AgentId"]);
                     _response.ExrateCalcByPartner = Convert.ToString(dt.Rows[0]["exRateCalByPartner"]);
+                    _response.TpExRate = Convert.ToString(dt.Rows[0]["tpExRate"]);
                 }
             }
             catch (Exception ex)
@@ -102,5 +104,64 @@ namespace CustomerOnlineV2.Repository.Repository.TransactionRepository
             }
             return await Task.FromResult(_response);
         }
+
+        public async Task<TransactionDetailModel> GetReceiptData(string id, LoginResponse loginDetails)
+        {
+            TransactionDetailModel _response = new TransactionDetailModel();
+            try
+            {
+                var sql = "EXEC PROC_DYNAMIC_TABLE";
+                sql += " @Flag = " + _connHelper.FilterString("Txn-Detail");
+                sql += ",@UserEmail = " + _connHelper.FilterString(loginDetails.UserName);
+                sql += ",@id = " + _connHelper.FilterString(id);
+
+                _logger.LogDebug("TRANSACTIONREPOSITORY | GETRECEIPTDATA | SQL | " + sql);
+                var dt = _connHelper.ExecuteDataTable(sql);
+
+                if (dt == null || dt.Rows.Count <= 0)
+                {
+                    _response.ResponseCode = ResponseHelper.FAILED;
+                    _response.ResponseMessage = "DB Null Error!";
+
+                    _logger.LogError("TRANSACTIONREPOSITORY | GETRECEIPTDATA | DB RESPONSE | " + JsonConvert.SerializeObject(_response));
+                }
+                else
+                {
+                    _response.ResponseCode = ResponseHelper.SUCCESS;
+                    _response.ResponseMessage = ResponseMessageHelper.SUCCESS;
+
+                    _response.ControlNo = Convert.ToString(dt.Rows[0]["ControlNo"]);
+                    _response.CreatedDate = Convert.ToString(dt.Rows[0]["createdDate"]);
+                    _response.TransactionId = Convert.ToString(dt.Rows[0]["id"]);
+                    _response.ReceiverName = Convert.ToString(dt.Rows[0]["receivername"]);
+                    _response.ReceiverAddress = Convert.ToString(dt.Rows[0]["address"]);
+                    _response.DeliveryMethod = Convert.ToString(dt.Rows[0]["paymentMethod"]);
+                    _response.BankName = Convert.ToString(dt.Rows[0]["pbankname"]);
+                    _response.BankBranch = Convert.ToString(dt.Rows[0]["pbankBranchName"]);
+                    _response.AccountNumber = Convert.ToString(dt.Rows[0]["accountNo"]);
+                    _response.PurposeOfRemit = Convert.ToString(dt.Rows[0]["purposeofremit"]);
+                    _response.Status = Convert.ToString(dt.Rows[0]["status"]);
+                    _response.PayoutAmount = Convert.ToString(dt.Rows[0]["pamt"]);
+                    _response.PayoutCurr = Convert.ToString(dt.Rows[0]["payoutCurr"]);
+                    _response.ExRate = Convert.ToString(dt.Rows[0]["customerRate"]);
+                    _response.PromotionPremiumRate = Convert.ToString(dt.Rows[0]["PromotionPremiumRate"]);
+                    _response.SendAmount = Convert.ToString(dt.Rows[0]["tamt"]);
+                    _response.CollectionCurrency = Convert.ToString(dt.Rows[0]["collCurr"]);
+                    _response.TransferFee = Convert.ToString(dt.Rows[0]["servicecharge"]);
+                    _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"]);
+                }
+            }
+            catch (Exception ex)
+            {
+                _response.ResponseCode = ResponseHelper.EXCEPTION;
+                _response.ResponseMessage = "Exception occured: " + ex.Message;
+
+                _logger.LogError("TRANSACTIONREPOSITORY | GETRECEIPTDATA | EXCEPTION | " + JsonConvert.SerializeObject(_response));
+            }
+            return await Task.FromResult(_response);
+        }
     }
 }

CustomerOnlineV2/CustomerOnlineV2/Controllers/TransactionController.cs

@@ -69,9 +69,23 @@ namespace CustomerOnlineV2.Controllers
             var loginDetails = HttpContext.GetLoginDetails();
             using (LogContext.PushProperty("DebugId", id))
             {
-                _logger.LogInformation($"TRANSACTIONSERVICE | SUCCESS | REQUEST | {id}");
+                _logger.LogInformation($"TRANSACTIONSERVICE | GETTRANSACTIONDETAILS | REQUEST | {id}");
                 _response = await _transactionBusiness.GetTransactionDetails(id, loginDetails);
-                _logger.LogInformation($"TRANSACTIONSERVICE | SUCCESS | RESPONSE | {JsonConvert.SerializeObject(_response)}");
+                _logger.LogInformation($"TRANSACTIONSERVICE | GETTRANSACTIONDETAILS | RESPONSE | {JsonConvert.SerializeObject(_response)}");
+            }
+            return View(_response);
+        }
+
+        [Authorization("SendMoney")]
+        public async Task<IActionResult> Receipt([FromQuery] string id)
+        {
+            TransactionDetailModel _response = new TransactionDetailModel();
+            var loginDetails = HttpContext.GetLoginDetails();
+            using (LogContext.PushProperty("DebugId", id))
+            {
+                _logger.LogInformation($"TRANSACTIONSERVICE | GETRECEIPTDATA | REQUEST | {id}");
+                _response = await _transactionBusiness.GetReceiptData(id, loginDetails);
+                _logger.LogInformation($"TRANSACTIONSERVICE | GETRECEIPTDATA | RESPONSE | {JsonConvert.SerializeObject(_response)}");
             }
             return View(_response);
         }

CustomerOnlineV2/CustomerOnlineV2/Views/Transaction/Receipt.cshtml

@@ -0,0 +1,183 @@
+@model CustomerOnlineV2.Common.Models.TransactionModel.TransactionDetailModel
+@using CustomerOnlineV2.Common.Helper
+
+@{
+    Layout = "_Layout2";
+}
+
+<div class="container">
+    <div class="row">
+        <!-- Middle Panel  -->
+        <div class="col-lg-12">
+            <div class="mb-4">
+                <h3 class="fw-400">Transaction Details</h3>
+                <p>Refer us to your friends and become one of IME London Remit's Preferred Clients!</p>
+            </div>
+            <div class="card">
+                <div class="card-body p-4">
+                    <div class="row mb-4">
+                        <div class="col-md-12">
+                            <div class="row">
+                                <div class="col-md-6">
+                                    <table>
+                                        <tr>
+                                            <td>
+                                                <strong>Creation Date:</strong>
+                                                <span id="MainContent_lblTxnDate">@Model.CreatedDate</span>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                <strong>Transaction ID:</strong>
+                                                <span id="MainContent_lblTxnID">@Model.TransactionId</span>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>
+                                                <strong>Control Number:</strong>
+                                                <span id="MainContent_lblTxnID">@Model.ControlNo</span>
+                                            </td>
+                                        </tr>
+                                    </table>
+                                </div>
+                                <div class="col-md-6">
+                                    <div class="text-end">
+                                        <a href="" target="_blank" class="btn btn-sm btn-secondary"><i class="fa fa-print me-2"></i>Print</a>
+                                    </div>
+                                    <div class="form-group text-center">
+                                        <h3>
+                                            Status:
+                                            <span id="MainContent_lblStatusDetail">@Model.Status</span>
+                                        </h3>
+                                    </div>
+                                </div>
+                            </div>
+                            <hr class="mx-n4 mb-4">
+                        </div>
+                        <div class="col-md-6 border-end">
+                            <div class="form-group">
+                                <h3>Your Receiver Information</h3>
+                                <table>
+                                    <tr>
+                                        <td>
+                                            <b>Full Name</b><br>
+                                            <span id="MainContent_lblBenficiaryName">@Model.ReceiverName</span>
+                                            <br>
+                                        </td>
+                                    </tr>
+                                    <tr>
+                                        <td>
+                                            <b>Address</b><br>
+                                            <span id="MainContent_lblReceiverAddress">@Model.ReceiverAddress</span>
+                                        </td>
+                                    </tr>
+                                </table>
+                            </div>
+                            <div class="form-group">
+                                <hr>
+                                <h3>Receiving Details</h3>
+                                <table>
+                                    <tr>
+                                        <td>
+                                            <b>Delivery Method</b><br>
+                                            <span id="MainContent_lblDeliverMethod">@Model.DeliveryMethod</span>
+                                            <br>
+                                            <br>
+                                        </td>
+                                    </tr>
+
+                                    <tr id="MainContent_rowBankTransfer">
+                                        <td>
+                                            <b>Bank Details</b><br>
+                                            Bank Name:<span id="MainContent_lblReceiverBank">@Model.BankName</span>
+                                            <br>
+                                            Bank Branch:<span id="MainContent_lblReceiverBankBranch">@Model.BankBranch</span>
+                                            <br>
+                                            Bank Account No:<span id="MainContent_lblReceiverBankAcc">@Model.AccountNumber</span>
+                                        </td>
+                                    </tr>
+                                </table>
+                            </div>
+                            <div class="form-group">
+                                <table>
+                                    <tr>
+                                        <td>
+                                            <b>Purpose of Remittance:</b>
+                                        </td>
+                                        <td>
+                                            &nbsp;
+                                            <span id="MainContent_lblPurpose">@Model.PurposeOfRemit</span>
+                                        </td>
+                                    </tr>
+
+                                </table>
+                            </div>
+                        </div>
+                        <div class="col-md-6">
+                            <div class="px-4">
+                                <h3>Your Payment Details</h3>
+                                <span class="me-2">
+                                    <strong class="me-2">To: </strong>
+                                    <i class=" currency-flag currency-flag-npr me-1"></i>
+                                </span>
+                                <span>@Model.PCountry</span>
+                                <table class="table">
+                                    <tr>
+                                        <td>Delivery Amount :</td>
+                                        <td>
+                                            <strong><span>@Utilities.ShowDecimal(Model.PayoutAmount) @Model.PayoutCurr</span></strong>
+                                        </td>
+                                    </tr>
+                                    <tr>
+                                        <td>Exchange Rate :</td>
+                                        <td>
+                                            <strong><span>@Model.ExRate</span></strong>
+                                        </td>
+                                    </tr>
+                                    <tr>
+                                        <td>
+                                            <i>Promotion Premium Rate* :</i>
+                                        </td>
+                                        <td>
+                                            <strong><span>@Model.PromotionPremiumRate</span></strong>
+                                        </td>
+                                    </tr>
+                                    <tr>
+                                        <td>Send Amount :</td>
+                                        <td>
+                                            <strong><span>@Utilities.ShowDecimal(Model.SendAmount) @Model.CollectionCurrency</span></strong>
+                                        </td>
+                                    </tr>
+                                    <tr>
+                                        <td>Transfer Fee :</td>
+                                        <td>
+                                            <strong><span>@Utilities.ShowDecimal(Model.TransferFee) @Model.CollectionCurrency</span></strong>
+                                        </td>
+                                    </tr>
+                                    <tr>
+                                        <td>Promotion Discount* :</td>
+                                        <td>
+                                            <strong><span>@Model.PromotionDiscount</span></strong>
+                                        </td>
+                                    </tr>
+                                    <tr>
+                                        <td>Total to Pay :</td>
+                                        <td>
+                                            <strong><span>@Utilities.ShowDecimal(Model.TotalToPay) @Model.CollectionCurrency</span></strong>
+                                        </td>
+                                    </tr>
+                                    <tr>
+                                        <td>Paid by :</td>
+                                        <td>
+                                            <strong><span>@Model.PaidBy</span></strong>
+                                        </td>
+                                    </tr>
+                                </table>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>

CustomerOnlineV2/CustomerOnlineV2/Views/Transaction/SendMoney.cshtml

@@ -43,7 +43,7 @@
                                         <div class="col-md-10">
                                             <div class="mb-3">
                                                 <div class="form-floating">
-                                                    <select asp-for="CollMode" asp-items="@CustomerOnlineV2.Helper.HelperClass.GetDropdownData("howToPay", true)" class="form-select" required></select>
+                                                    <select asp-for="SchemeId" asp-items="@CustomerOnlineV2.Helper.HelperClass.GetDropdownData("howToPay", true)" class="form-select" required></select>
                                                     <label class="form-label">How do you pay us? </label>
                                                 </div>
                                             </div>
@@ -179,6 +179,7 @@
 <input type="hidden" id="hdnTransferAmount" />
 <input type="hidden" id="hdnServiceCharge" />
 <input type="hidden" id="hdnExRate" />
+<input type="hidden" id="hdnTPExRate" />
 <input type="hidden" id="hdnForexSessionId" />
 <input type="hidden" id="hdnProcessId" />
 
@@ -257,13 +258,14 @@
             DisableCalculateButton();
             debugger
             let receivingCountry = $('#ReceivingCountry').val();
-            let collMode = $('#CollMode').val();
             let deliveryMethod = $('#DeliveryMethod').val();
             let collectionAmount = parseFloat($('#CollectAmount').val());
             let payoutAmount = parseFloat($('#PayoutAmount').val());
             let promoCode = $('#PromoCode').val();
             let calcBy = $('#hdnCalcBy').val();
 
+            let schemeId = $('#SchemeId').val();
+
             if (calcBy == '') {
                 ShowAlertMessage(1, 'Invalid param calculate by!');
                 EnableCalculateButton();
@@ -302,12 +304,12 @@
 
             let Data = {
                 ReceivingCountry: receivingCountry,
-                CollMode: collMode,
                 DeliveryMethod: deliveryMethod,
                 CollectAmount: collectionAmount,
                 PayoutAmount: payoutAmount,
                 PromoCode: promoCode,
-                CalcBy: calcBy
+                CalcBy: calcBy,
+                SchemeId: schemeId
             };
 
             $.ajax(
@@ -351,6 +353,7 @@
                         $('#hdnExRate').val(response.exRate);
                         $('#hdnForexSessionId').val(response.forexSessionId);
                         $('#hdnProcessId').val(response.processId);
+                        $('#hdnTPExRate').val(response.tpExRate);
                     },
                     error: function () {
                         return null;
@@ -363,7 +366,6 @@
             DisableSendButton();
             debugger
             let receivingCountry = $('#ReceivingCountry').val();
-            let collMode = $('#CollMode').val();
             let deliveryMethod = $('#DeliveryMethod').val();
             let collectionAmount = parseFloat($('#CollectAmount').val());
             let payoutAmount = parseFloat($('#PayoutAmount').val());
@@ -373,6 +375,9 @@
             let purposeOfRemit = $('#PurposeOfRemit').val();
             let termsAndConditions = $('#TermsAndConditions').val();
 
+            let schemeId = $('#SchemeId').val();
+            let tpExRate = $('#hdnTPExRate').val();
+
             let payoutPartner = $('#hdnPayoutPartner').val();
             let payoutCurrency = $('#hdnPayoutCurrency').val();
             let transferAmount = $('#hdnTransferAmount').val();
@@ -419,7 +424,6 @@
 
             let Data = {
                 ReceivingCountry: receivingCountry,
-                CollMode: collMode,
                 DeliveryMethod: deliveryMethod,
                 CollectAmount: collectionAmount,
                 PayoutAmount: payoutAmount,
@@ -434,7 +438,9 @@
                 ServiceCharge: serviceCharge,
                 ExRate: exRate,
                 ForexSessionId: forexSessionId,
-                ProcessId: processId
+                ProcessId: processId,
+                SchemeId: schemeId,
+                TpExRate: tpExRate
             };
 
             $.ajax(

CustomerOnlineV2/CustomerOnlineV2/obj/Debug/net7.0/CustomerOnlineV2.GeneratedMSBuildEditorConfig.editorconfig

@@ -44,6 +44,10 @@ build_metadata.AdditionalFiles.CssScope =
 build_metadata.AdditionalFiles.TargetPath = Vmlld3NcU2hhcmVkXF9WYWxpZGF0aW9uU2NyaXB0c1BhcnRpYWwuY3NodG1s
 build_metadata.AdditionalFiles.CssScope = 
 
+[D:/C\# Projects/UAT/JME_JAPAN/JME_Remit_UAT/Temp/Customer/CustomerPortal/CustomerOnlineV2/CustomerOnlineV2/Views/Transaction/Receipt.cshtml]
+build_metadata.AdditionalFiles.TargetPath = Vmlld3NcVHJhbnNhY3Rpb25cUmVjZWlwdC5jc2h0bWw=
+build_metadata.AdditionalFiles.CssScope = 
+
 [D:/C\# Projects/UAT/JME_JAPAN/JME_Remit_UAT/Temp/Customer/CustomerPortal/CustomerOnlineV2/CustomerOnlineV2/Views/Transaction/SendMoney.cshtml]
 build_metadata.AdditionalFiles.TargetPath = Vmlld3NcVHJhbnNhY3Rpb25cU2VuZE1vbmV5LmNzaHRtbA==
 build_metadata.AdditionalFiles.CssScope = 

DB/PROC_DROPDOWN_LIST.sql

@@ -97,9 +97,11 @@ BEGIN TRY
 	END
 	ELSE IF @Flag = 'howToPay'
 	BEGIN
-		SELECT Id = 'BT', Text = 'Bank Transfer (Best Rate)', errorCode = 0, msg = 'Success' UNION ALL
-		SELECT Id = 'CARD', Text = 'Debit/Credit Card', errorCode = 0, msg = 'Success' UNION ALL
-		SELECT Id = 'ONB', Text = 'Online Banking/Open Banking', errorCode = 0, msg = 'Success'
+		SELECT Id = detailTitle 
+				, Text = CASE detailTitle WHEN 'ONLINE' THEN 'Online Banking(Best Rate)'   WHEN 'DEBIT_CARD' THEN  'DEBIT CARD' ELSE 'E-Banking (Good rate)' END
+		FROM staticDataValue (NOLOCK)
+		WHERE typeId = '8109'
+		AND ISNULL(isactive, 'Y') = 'Y'
 	END
 	ELSE IF @Flag = 'pCountry'
 	BEGIN

DB/PROC_DYNAMIC_TABLE.sql

@@ -13,6 +13,7 @@ ALTER PROC PROC_DYNAMIC_TABLE
 	,@ConfirmPassword VARCHAR(40) = NULL
 	,@ipAddress VARCHAR(20) = NULL
 	,@id BIGINT = NULL
+	,@SchemeId VARCHAR(30) = NULL
 )
 AS;
 SET NOCOUNT ON;
@@ -65,7 +66,12 @@ BEGIN TRY
 	END
 	ELSE IF @Flag = 'PayoutMethod'
 	BEGIN
-		DECLARE @PayoutCurrency VARCHAR(5)
+		DECLARE @PayoutCurrency VARCHAR(5), @tpExRate MONEY
+		
+		SELECT @tpExRate = detailDesc
+		FROM staticDataValue (NOLOCK)
+		WHERE typeId = '8109'
+		AND detailTitle = @SchemeId
 
 		SELECT @PayoutCurrency = CM.currencyCode
 		FROM countryCurrency CC(NOLOCK)
@@ -83,6 +89,7 @@ BEGIN TRY
 				,CM.CountryName
 				,AgentId
 				,PayoutCurrency = @PayoutCurrency
+				,tpExRate = @tpExRate
 			FROM TblPartnerwiseCountry P(NOLOCK)
 			INNER JOIN COUNTRYMASTER CM(NOLOCK) ON CM.COUNTRYID = P.COUNTRYID
 			WHERE P.countryId = @CountryId
@@ -101,6 +108,7 @@ BEGIN TRY
 				,CM.CountryName
 				,AgentId
 				,PayoutCurrency = @PayoutCurrency
+				,tpExRate = @tpExRate
 			FROM TblPartnerwiseCountry P(NOLOCK)
 			INNER JOIN COUNTRYMASTER CM(NOLOCK) ON CM.COUNTRYID = P.COUNTRYID
 			WHERE P.countryId = @CountryId
@@ -144,9 +152,9 @@ BEGIN TRY
 	END
 	ELSE IF @Flag = 'howToPay'
 	BEGIN
-		SELECT Id = 'BT', Text = 'Bank Transfer (Best Rate)', errorCode = 0, msg = 'Success' UNION ALL
-		SELECT Id = 'CARD', Text = 'Debit/Credit Card', errorCode = 0, msg = 'Success' UNION ALL
-		SELECT Id = 'ONB', Text = 'Online Banking/Open Banking', errorCode = 0, msg = 'Success'
+		SELECT Id = 'ONLINE', Text = 'Online Banking(Best Rate)', extra = 0, errorCode = 0, msg = 'Success' UNION ALL
+		SELECT Id = 'EBANKING', Text = 'E-Banking/ (Good rate)', extra = 0, errorCode = 0, msg = 'Success' UNION ALL
+		SELECT Id = 'DEBIT_CARD', Text = 'DEBIT CARD', extra = 0.15, errorCode = 0, msg = 'Success'
 	END
 	ELSE IF @Flag = 'pCountry'
 	BEGIN
@@ -259,9 +267,17 @@ BEGIN TRY
 	END
 	ELSE IF @Flag = 'Txn-Detail'
 	BEGIN
-		SELECT ControlNo = dbo.decryptdb(rt.controlNo), rt.receivername, rt.camt, rt.id
+		SELECT ControlNo = dbo.decryptdb(rt.controlNo), rt.receivername, rt.camt, rt.id, rt.collCurr, tr.address, rt.createdDate, rt.paymentMethod
+					, collMode = rt.depositType, rt.pbankname, rt.pbankBranchName, rt.accountNo, rt.purposeofremit
+					, status = CASE WHEN payStatus = 'Paid' THEN 'Paid' WHEN tranStatus = 'Cancel' OR payStatus = 'Cancel' THEN 'Cancel' ELSE 'Processing' END
+					, rt.pamt, rt.payoutCurr, rt.customerRate
+					, PromotionPremiumRate = 0
+					, rt.tamt, rt.collCurr, rt.servicecharge
+					, PromotionDiscount = 0
+					, rt.camt, rt.pCountry
 		FROM remitTranTemp rt(NOLOCK)
-		WHERE id = @id
+		INNER JOIN tranReceiversTemp tr(NOLOCK) on tr.tranid = rt.id
+		WHERE rt.id = @id
 	END
 END TRY
 BEGIN CATCH