diff --git a/CustomerOnlineV2/CustomerOnlineV2.Business/Business/TransactionBusiness/TransactionBusiness.cs b/CustomerOnlineV2/CustomerOnlineV2.Business/Business/TransactionBusiness/TransactionBusiness.cs index 33999a2..b95c534 100644 --- a/CustomerOnlineV2/CustomerOnlineV2.Business/Business/TransactionBusiness/TransactionBusiness.cs +++ b/CustomerOnlineV2/CustomerOnlineV2.Business/Business/TransactionBusiness/TransactionBusiness.cs @@ -67,6 +67,7 @@ namespace CustomerOnlineV2.Business.Business.TransactionBusiness return await _transactionRepo.GetReceiptData(id, loginDetails); } + public async Task SaveTranData(TrustPaymentRequest tranData, LoginResponse loginDetails) { return await _transactionRepo.SaveTranData(tranData, loginDetails); @@ -88,8 +89,8 @@ namespace CustomerOnlineV2.Business.Business.TransactionBusiness CDDI = new CDDIModel { PurposeOfRemittance = sendMoneyRequest.PurposeOfRemit, - - SourceOfFund = sendMoneyRequest.SourceOfFund, + + SourceOfFund = sendMoneyRequest.SourceOfFund, }, SCountryId = Utilities.ReadFromAppSettings("OnlineAgent:SendingCountry"), PCountryId = sendMoneyRequest.ReceivingCountry, @@ -109,7 +110,7 @@ namespace CustomerOnlineV2.Business.Business.TransactionBusiness SchemeId = sendMoneyRequest.SchemeId, TpExRate = sendMoneyRequest.TpExRate, ProcessId = sendMoneyRequest.ProcessId, - UserName = loginDetails.UserName, + UserName = loginDetails.UserName, ProviderId = "online", DiscountedFee = sendMoneyRequest.DiscountFee, }; @@ -161,15 +162,15 @@ namespace CustomerOnlineV2.Business.Business.TransactionBusiness _logger.LogError("TRANSACTIONBUSINESS | SENDMONEY.VALIDATEEXRATEREQUEST | REQUEST | " + JsonConvert.SerializeObject(_response)); } - else if (sendMoneyRequest.CalcBy != "c") + else if (sendMoneyRequest.CalcBy != "c" || (sendMoneyRequest.CalcBy != "p")) { - if (sendMoneyRequest.CalcBy != "p") - { + + _response.ResponseCode = ResponseHelper.FAILED; _response.ResponseMessage = "Param calcBy have invalid value!"; _logger.LogError("TRANSACTIONBUSINESS | SENDMONEY.VALIDATEEXRATEREQUEST | REQUEST | " + JsonConvert.SerializeObject(_response)); - } + } else if (string.IsNullOrEmpty(sendMoneyRequest.ReceivingCountry)) { @@ -272,15 +273,14 @@ namespace CustomerOnlineV2.Business.Business.TransactionBusiness _logger.LogError("TRANSACTIONBUSINESS | DOCALCULATION.VALIDATEEXRATEREQUEST | REQUEST | " + JsonConvert.SerializeObject(_response)); } - else if (calcRequest.CalcBy != "c") + else if (calcRequest.CalcBy != "c" || calcRequest.CalcBy != "p") { - if (calcRequest.CalcBy != "p") - { - _response.ResponseCode = ResponseHelper.FAILED; - _response.ResponseMessage = "Param calcBy have invalid value!"; - _logger.LogError("TRANSACTIONBUSINESS | DOCALCULATION.VALIDATEEXRATEREQUEST | REQUEST | " + JsonConvert.SerializeObject(_response)); - } + _response.ResponseCode = ResponseHelper.FAILED; + _response.ResponseMessage = "Param calcBy have invalid value!"; + + _logger.LogError("TRANSACTIONBUSINESS | DOCALCULATION.VALIDATEEXRATEREQUEST | REQUEST | " + JsonConvert.SerializeObject(_response)); + } else if (string.IsNullOrEmpty(calcRequest.ReceivingCountry)) { @@ -343,10 +343,8 @@ namespace CustomerOnlineV2.Business.Business.TransactionBusiness { return await _transactionRepo.GetTranData(loginDetails); } - - public async Task GetTransactionReportList(LoginResponse loginDetails , CustomerTransaction model) + public async Task GetTransactionReportList(LoginResponse loginDetails, CustomerTransaction model) { - return await _transactionRepo.GetTransactionReportList(loginDetails, model); } public async Task GetRewardPoints(LoginResponse loginDetails) diff --git a/CustomerOnlineV2/CustomerOnlineV2.Repository/Repository/ReceiverRepository/ReceiverRepository.cs b/CustomerOnlineV2/CustomerOnlineV2.Repository/Repository/ReceiverRepository/ReceiverRepository.cs index 95de11f..eb608f1 100644 --- a/CustomerOnlineV2/CustomerOnlineV2.Repository/Repository/ReceiverRepository/ReceiverRepository.cs +++ b/CustomerOnlineV2/CustomerOnlineV2.Repository/Repository/ReceiverRepository/ReceiverRepository.cs @@ -166,7 +166,7 @@ namespace CustomerOnlineV2.Repository.Repository.ReceiverRepository try { var sql = "EXEC PROC_DYNAMIC_TABLE"; - sql += " @Flag = " + _connHelper.FilterString("edit-customer"); + sql += " @Flag = " + _connHelper.FilterString("editReceiver-detail"); sql += ",@id = " + _connHelper.FilterString(id); _logger.LogDebug("RECEIVERREPOSITORY | EDITRECEIVER | SQL | " + sql); var dt = _connHelper.ExecuteDataTable(sql); @@ -198,8 +198,8 @@ namespace CustomerOnlineV2.Repository.Repository.ReceiverRepository Email = Convert.ToString(item["email"]), idType = Convert.ToString(item["idType"]), idNumber = Convert.ToString(item["idNumber"]), - bankName = Convert.ToString(item["bankName"]), - bankLocation = Convert.ToString(item["bank"]), + bankName = Convert.ToString(item["bank"]), + bankLocation = Convert.ToString(item["branch"]), receiverAccountNumber = Convert.ToString(item["accountNum"]), paymentMode = Convert.ToString(item["paymentMode"]), }); diff --git a/CustomerOnlineV2/CustomerOnlineV2/Views/Customer/CustomerProfile.cshtml b/CustomerOnlineV2/CustomerOnlineV2/Views/Customer/CustomerProfile.cshtml index e526f51..3b85005 100644 --- a/CustomerOnlineV2/CustomerOnlineV2/Views/Customer/CustomerProfile.cshtml +++ b/CustomerOnlineV2/CustomerOnlineV2/Views/Customer/CustomerProfile.cshtml @@ -226,7 +226,7 @@

- Account Setting + ID Information Edit @@ -538,7 +538,7 @@ }); function getData() { - debugger + $.ajax({ //var id; type: 'GET', diff --git a/CustomerOnlineV2/CustomerOnlineV2/Views/CustomerDocument/CustomerDocument.cshtml b/CustomerOnlineV2/CustomerOnlineV2/Views/CustomerDocument/CustomerDocument.cshtml index c39c2b7..c5850b9 100644 --- a/CustomerOnlineV2/CustomerOnlineV2/Views/CustomerDocument/CustomerDocument.cshtml +++ b/CustomerOnlineV2/CustomerOnlineV2/Views/CustomerDocument/CustomerDocument.cshtml @@ -251,7 +251,7 @@ function FileUpload() { - ; + DisableDocumentButton(); @@ -320,7 +320,7 @@ } function EnableDocumentButton() { - ; + $('.ButtonTExt').show(); $('#btnUpload').css('cursor', 'pointer'); $('.loadingSend').hide(); diff --git a/CustomerOnlineV2/CustomerOnlineV2/Views/Home/Index.cshtml b/CustomerOnlineV2/CustomerOnlineV2/Views/Home/Index.cshtml index 712a209..fc5c064 100644 --- a/CustomerOnlineV2/CustomerOnlineV2/Views/Home/Index.cshtml +++ b/CustomerOnlineV2/CustomerOnlineV2/Views/Home/Index.cshtml @@ -98,14 +98,14 @@ =============================== -->
-
S.N
-
Date
-
Payment Mode
-
Receiver Name
-
Reference Number
-
Status
-
Send Amount
-
Recieve Amount
+
S.N
+
Date
+
Payment Mode
+
Receiver Name
+
Reference Number
+
Status
+
Send Amount
+
Recieve Amount
@@ -212,12 +212,12 @@ =============================== -->
-
S.N
-
Name
-
Send Transaction
-
Country
-
Transaction Type
-
Actions
+
S.N
+
Name
+
Send Transaction
+
Country
+
Transaction Type
+
Actions
@@ -440,25 +440,25 @@ row += `
`; row += '
'; - row += `
${i + 1}
`; + row += `
${i + 1}
`; row += `
${d['transactionDay']}${d['transactionMonth']}
`; - row += `
${d['pBankName']}${d['paymentMethod']}
`; - row += `
${d['receiverName']}
`; - row += `
${d['controlNo']}
`; + row += `
${d['pBankName']}${d['paymentMethod']}
`; + row += `
${d['receiverName']}
`; + row += `
${d['controlNo']}
`; if (d['status'].toLowerCase() == 'paid') { - row += `
Paid
`; + row += `
Paid
`; } else if (d['status'].toLowerCase() == 'cancel') { - row += `
Cancel
`; + row += `
Cancel
`; } else if (d['status'].toLowerCase() == 'processing') { - row += `
PROCESSING
`; + row += `
PROCESSING
`; } else - row += `
${d['status']}
`; + row += `
${d['status']}
`; row += `
${d['cAmt']}(${d['collCurr']})
`; // row += `
-${d['amount']}(${d['pCurrency']})
`; //row += `
${d['amount']}(${d['pCurrency']})
`; - row += `
${d['amount']}(${d['pCurrency']})
`; + row += `
${d['amount']}(${d['pCurrency']})
`; row += '
'; row += '
'; row += '

'; diff --git a/CustomerOnlineV2/CustomerOnlineV2/Views/ReceiverInformation/Receiver.cshtml b/CustomerOnlineV2/CustomerOnlineV2/Views/ReceiverInformation/Receiver.cshtml index 10c977a..7287332 100644 --- a/CustomerOnlineV2/CustomerOnlineV2/Views/ReceiverInformation/Receiver.cshtml +++ b/CustomerOnlineV2/CustomerOnlineV2/Views/ReceiverInformation/Receiver.cshtml @@ -17,306 +17,234 @@ - + -
-
-
- -
-
-

Enter Receiver's Details

+
+
+
+ +
+
+

Enter Receiver's Details

-
-
-
-
-
-
-
- - +
+ +
+
+
+
+
+ + +
-
-
-
+
+
-
-
+
+
+
-
-
-
- - +
+
+ + +
-
-
-
+
+
+
-
-
-
+
+
- + +
-
- + -
+
-
-
+
+
- + +
-
-
-
+
+
- + +
-
-
-
- - +
+
+ + +
-
-
-
- - +
+
+ + +
-
- @*
+ @*
- - + +
-
*@ -
+
*@ +
-
+
- - -
-
- - - @* *@ -
-
-
-
- - +
+
+ + @* + @* + + + *@ + + @* *@ + +
-
+
+
+ + +
-
-
- +
+ + +
+
+ +
+
-
+
-
- - @*
+ @*
- - + +
-
-
+
+
- - + +
-
*@ -
- -
-
-
-
Bank Details
+
*@
-
- +
-
diff --git a/CustomerOnlineV2/CustomerOnlineV2/Views/ReceiverInformation/ViewReceiverList.cshtml b/CustomerOnlineV2/CustomerOnlineV2/Views/ReceiverInformation/ViewReceiverList.cshtml index e1a595c..c2e6764 100644 --- a/CustomerOnlineV2/CustomerOnlineV2/Views/ReceiverInformation/ViewReceiverList.cshtml +++ b/CustomerOnlineV2/CustomerOnlineV2/Views/ReceiverInformation/ViewReceiverList.cshtml @@ -45,11 +45,11 @@ =============================== -->
-
S.N
-
Name
-
Re-Send
-
Country
-
Transaction Type
+
S.N
+
Name
+
Re-Send
+
Country
+
Transaction Type
diff --git a/CustomerOnlineV2/CustomerOnlineV2/Views/Transaction/SendMoney.cshtml b/CustomerOnlineV2/CustomerOnlineV2/Views/Transaction/SendMoney.cshtml index 54c6533..778b4fd 100644 --- a/CustomerOnlineV2/CustomerOnlineV2/Views/Transaction/SendMoney.cshtml +++ b/CustomerOnlineV2/CustomerOnlineV2/Views/Transaction/SendMoney.cshtml @@ -182,14 +182,14 @@ 0.00 - + Payout Amount : 0.00   - +
@@ -215,24 +215,29 @@ @section Scripts{