diff --git a/CustomerOnlineV2/.vs/CustomerOnlineV2/DesignTimeBuild/.dtbcache.v2 b/CustomerOnlineV2/.vs/CustomerOnlineV2/DesignTimeBuild/.dtbcache.v2 index fc0190c..aaa3c13 100644 Binary files a/CustomerOnlineV2/.vs/CustomerOnlineV2/DesignTimeBuild/.dtbcache.v2 and b/CustomerOnlineV2/.vs/CustomerOnlineV2/DesignTimeBuild/.dtbcache.v2 differ diff --git a/CustomerOnlineV2/.vs/CustomerOnlineV2/v17/.futdcache.v2 b/CustomerOnlineV2/.vs/CustomerOnlineV2/v17/.futdcache.v2 index 00644bd..314d4bb 100644 Binary files a/CustomerOnlineV2/.vs/CustomerOnlineV2/v17/.futdcache.v2 and b/CustomerOnlineV2/.vs/CustomerOnlineV2/v17/.futdcache.v2 differ diff --git a/CustomerOnlineV2/.vs/CustomerOnlineV2/v17/.suo b/CustomerOnlineV2/.vs/CustomerOnlineV2/v17/.suo index 6950a04..84118a0 100644 Binary files a/CustomerOnlineV2/.vs/CustomerOnlineV2/v17/.suo and b/CustomerOnlineV2/.vs/CustomerOnlineV2/v17/.suo differ diff --git a/CustomerOnlineV2/.vs/ProjectEvaluation/customeronlinev2.metadata.v7.bin b/CustomerOnlineV2/.vs/ProjectEvaluation/customeronlinev2.metadata.v7.bin index 027828e..0e0acd1 100644 Binary files a/CustomerOnlineV2/.vs/ProjectEvaluation/customeronlinev2.metadata.v7.bin and b/CustomerOnlineV2/.vs/ProjectEvaluation/customeronlinev2.metadata.v7.bin differ diff --git a/CustomerOnlineV2/.vs/ProjectEvaluation/customeronlinev2.projects.v7.bin b/CustomerOnlineV2/.vs/ProjectEvaluation/customeronlinev2.projects.v7.bin index a59d49b..a6bb6a9 100644 Binary files a/CustomerOnlineV2/.vs/ProjectEvaluation/customeronlinev2.projects.v7.bin and b/CustomerOnlineV2/.vs/ProjectEvaluation/customeronlinev2.projects.v7.bin differ diff --git a/CustomerOnlineV2/CustomerOnlineV2.Business/Business/TransactionBusiness/TransactionBusiness.cs b/CustomerOnlineV2/CustomerOnlineV2.Business/Business/TransactionBusiness/TransactionBusiness.cs index 4b6936e..4fab265 100644 --- a/CustomerOnlineV2/CustomerOnlineV2.Business/Business/TransactionBusiness/TransactionBusiness.cs +++ b/CustomerOnlineV2/CustomerOnlineV2.Business/Business/TransactionBusiness/TransactionBusiness.cs @@ -32,23 +32,47 @@ namespace CustomerOnlineV2.Business.Business.TransactionBusiness if (_response.ResponseCode == ResponseHelper.SUCCESS) { - ExratePayoutDetailsModel _partnerDetails = await _transactionRepo.GetPayoutDetails(calcRequest, loginDetails); - - ExrateCalculateRequestModel _request = GenerateExrateParams(calcRequest, loginDetails, _partnerDetails); - - _response = await _tpApi.GetExRate(_request); - _response.ProcessId = calcRequest.ProcessId; - _response.tpExRate = _partnerDetails.TpExRate; - //if (decimal.TryParse(_response.collAmt, out decimal collAmtDecimal)) - //{ - // decimal roundedCollAmt = Math.Round(collAmtDecimal, 2); - // _response.collAmt = roundedCollAmt.ToString(); - //} - - _response.collAmt = Utilities.ShowDecimal2(_response.collAmt); - _response.sAmt = Utilities.ShowDecimal2(_response.sAmt); - _response.pAmt = Utilities.ShowDecimal2(_response.pAmt); - _response.discountedFee = Utilities.ShowDecimal2(_response.discountedFee); + try + { + + ExratePayoutDetailsModel _partnerDetails = await _transactionRepo.GetPayoutDetails(calcRequest, loginDetails); + + ExrateCalculateRequestModel _request = GenerateExrateParams(calcRequest, loginDetails, _partnerDetails); + + _response = await _tpApi.GetExRate(_request); + _response.ProcessId = calcRequest.ProcessId; + _response.tpExRate = _partnerDetails.TpExRate; + //_response.collAmt = String.Format("{0:0.00}", _response.collAmt); + + //_response.collAmt = Math.Round(_response.collAmt.ToString, 2); + + if (_response.ResponseCode == 0) + { + _response.collAmt = Utilities.ShowDecimal2(_response.collAmt); + _response.sAmt = Utilities.ShowDecimal2(_response.sAmt); + _response.pAmt = Utilities.ShowDecimal2(_response.pAmt); + _response.discountedFee = Utilities.ShowDecimal2(_response.discountedFee); + } + else + { + + _response.ResponseCode = 1; + return _response; + } + + } + catch (Exception ex) + { + _logger.LogError("An error occurred while processing the calculation: " + ex.Message); + _response.ResponseCode = ResponseHelper.FAILED; + + + } + } + else + { + _logger.LogError("Exrate request validation failed. Response Message: " + _response.ResponseMessage); + // Set appropriate error message in _response.ErrorMessage if needed } return _response; } @@ -369,7 +393,7 @@ namespace CustomerOnlineV2.Business.Business.TransactionBusiness } public async Task GetReceiverListDetail(LoginResponse loginDetails, string receiverId) { - return await _transactionRepo.GetReceiverListDetail(loginDetails , receiverId); + return await _transactionRepo.GetReceiverListDetail(loginDetails, receiverId); } public async Task GetReceiverListDDL(CommonDropDownModel model, LoginResponse loginDetails) { diff --git a/CustomerOnlineV2/CustomerOnlineV2.Repository/obj/Debug/net7.0/CustomerOnlineV2.Repository.AssemblyInfo.cs b/CustomerOnlineV2/CustomerOnlineV2.Repository/obj/Debug/net7.0/CustomerOnlineV2.Repository.AssemblyInfo.cs index a1411b6..5afc689 100644 --- a/CustomerOnlineV2/CustomerOnlineV2.Repository/obj/Debug/net7.0/CustomerOnlineV2.Repository.AssemblyInfo.cs +++ b/CustomerOnlineV2/CustomerOnlineV2.Repository/obj/Debug/net7.0/CustomerOnlineV2.Repository.AssemblyInfo.cs @@ -14,7 +14,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("CustomerOnlineV2.Repository")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+090cfe6703c0ca517d42bdf66dcc1dbfa2da71ae")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+da59614c8dcd4211399e6b7143e9c35484c9c1f9")] [assembly: System.Reflection.AssemblyProductAttribute("CustomerOnlineV2.Repository")] [assembly: System.Reflection.AssemblyTitleAttribute("CustomerOnlineV2.Repository")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/CustomerOnlineV2/CustomerOnlineV2.Repository/obj/Debug/net7.0/CustomerOnlineV2.Repository.AssemblyInfoInputs.cache b/CustomerOnlineV2/CustomerOnlineV2.Repository/obj/Debug/net7.0/CustomerOnlineV2.Repository.AssemblyInfoInputs.cache index b3723bb..b1d0760 100644 --- a/CustomerOnlineV2/CustomerOnlineV2.Repository/obj/Debug/net7.0/CustomerOnlineV2.Repository.AssemblyInfoInputs.cache +++ b/CustomerOnlineV2/CustomerOnlineV2.Repository/obj/Debug/net7.0/CustomerOnlineV2.Repository.AssemblyInfoInputs.cache @@ -1 +1 @@ -d13626d4699146bd67cec8996b3a77993818f22d7b8395eb3b0f07c8f6361d9c +de90961b506189c31e9bf31bb226e840138b29228ab8f387df081d62ca0ffdb6 diff --git a/CustomerOnlineV2/CustomerOnlineV2.Repository/obj/Debug/net7.0/CustomerOnlineV2.Repository.csproj.AssemblyReference.cache b/CustomerOnlineV2/CustomerOnlineV2.Repository/obj/Debug/net7.0/CustomerOnlineV2.Repository.csproj.AssemblyReference.cache index 3cddef9..8809e6a 100644 Binary files a/CustomerOnlineV2/CustomerOnlineV2.Repository/obj/Debug/net7.0/CustomerOnlineV2.Repository.csproj.AssemblyReference.cache and b/CustomerOnlineV2/CustomerOnlineV2.Repository/obj/Debug/net7.0/CustomerOnlineV2.Repository.csproj.AssemblyReference.cache differ diff --git a/CustomerOnlineV2/CustomerOnlineV2/Properties/PublishProfiles/FolderProfile.pubxml.user b/CustomerOnlineV2/CustomerOnlineV2/Properties/PublishProfiles/FolderProfile.pubxml.user index 53c4ef1..d3c0176 100644 --- a/CustomerOnlineV2/CustomerOnlineV2/Properties/PublishProfiles/FolderProfile.pubxml.user +++ b/CustomerOnlineV2/CustomerOnlineV2/Properties/PublishProfiles/FolderProfile.pubxml.user @@ -5,7 +5,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121. <_PublishTargetUrl>D:\Publish\Imelondon\New folder - True|2024-02-14T17:30:55.5373878Z;True|2024-02-07T02:01:12.0346310+05:45;True|2024-02-07T01:51:08.9857661+05:45;True|2024-01-31T14:53:26.7904025+05:45;True|2024-01-31T14:32:11.2632740+05:45;True|2024-01-25T22:32:43.7997432+05:45;True|2024-01-08T01:48:51.6977336+05:45;True|2024-01-04T16:57:00.8366880+05:45;True|2024-01-04T16:39:14.5116891+05:45;True|2023-12-29T16:17:33.3592875+05:45;True|2023-12-28T15:22:54.5509910+05:45;True|2023-12-27T21:20:24.7590400+05:45;True|2023-12-20T21:29:37.0436015+05:45;True|2023-12-08T13:46:34.5508826+05:45;True|2023-12-08T13:22:59.7907396+05:45;True|2023-12-08T13:16:18.2446566+05:45;True|2023-12-08T01:36:46.4929190+05:45;True|2023-12-01T14:29:54.6987204+05:45;True|2023-12-01T13:48:23.4841029+05:45;True|2023-12-01T00:12:04.2288558+05:45;True|2023-11-30T23:51:56.2008888+05:45;True|2023-11-30T23:49:36.9385794+05:45;True|2023-11-30T23:46:46.8847879+05:45;True|2023-11-30T23:46:03.6979693+05:45;True|2023-11-30T23:44:27.3157126+05:45;True|2023-11-30T23:33:55.0600332+05:45;False|2023-11-30T23:32:36.1977723+05:45;True|2023-11-30T23:26:29.2113993+05:45;True|2023-11-30T23:04:07.5067771+05:45;True|2023-11-29T01:51:42.3247259+05:45;True|2023-11-28T23:34:50.6877537+05:45;True|2023-11-28T23:31:23.9257392+05:45;True|2023-11-28T17:22:07.3908940+05:45;True|2023-11-28T16:44:59.6364591+05:45;True|2023-11-28T16:39:13.8831139+05:45;True|2023-11-28T16:35:01.7962202+05:45;True|2023-11-28T15:54:09.3703564+05:45;True|2023-11-28T13:17:36.9582579+05:45;True|2023-11-28T11:06:56.1393117+05:45;True|2023-11-27T21:26:39.4737693+05:45;True|2023-11-27T20:27:44.8267131+05:45;True|2023-11-27T15:15:02.7845576+05:45;True|2023-11-27T15:14:24.7414474+05:45;True|2023-11-27T15:12:20.8631275+05:45;True|2023-11-27T14:53:12.8806451+05:45;True|2023-11-27T14:44:42.3370519+05:45;True|2023-11-27T14:03:02.0808830+05:45;True|2023-11-26T22:29:14.7842119+05:45;True|2023-11-26T22:26:41.5591080+05:45;True|2023-11-26T22:24:00.1770904+05:45;True|2023-11-26T22:20:37.2082479+05:45;True|2023-11-26T12:54:30.6489713+05:45;True|2023-11-25T09:37:52.6378019+05:45;True|2023-11-24T23:46:21.5762377+05:45;True|2023-11-24T23:40:44.7042923+05:45;True|2023-11-24T22:26:01.6024702+05:45;True|2023-11-24T22:11:31.5563357+05:45;True|2023-11-23T20:11:39.9968178+05:45;True|2023-11-23T19:11:12.3226825+05:45;True|2023-11-23T14:34:53.3821861+05:45;True|2023-11-22T21:49:39.4855996+05:45;True|2023-11-22T00:55:02.7339322+05:45;True|2023-11-22T00:35:33.7932258+05:45;True|2023-11-22T00:06:39.0977881+05:45;True|2023-11-21T16:56:40.9165139+05:45;True|2023-11-21T16:55:43.5238508+05:45;True|2023-11-21T13:06:42.6334262+05:45;True|2023-11-21T13:05:56.8163644+05:45;True|2023-11-21T01:30:01.6294845+05:45;True|2023-11-21T01:25:46.8788948+05:45;True|2023-11-21T01:18:10.9400288+05:45;True|2023-11-20T17:46:52.6414077+05:45;False|2023-11-20T17:46:20.7035330+05:45;True|2023-11-20T16:17:17.6490092+05:45;True|2023-11-19T23:00:54.1411776+05:45;True|2023-11-19T15:41:16.8030592+05:45;True|2023-11-19T15:27:21.5495440+05:45;True|2023-11-19T12:52:51.4532176+05:45;True|2023-11-17T19:30:12.1934196+05:45;True|2023-11-16T23:07:05.3180955+05:45;True|2023-11-16T23:02:00.4838743+05:45;True|2023-11-16T22:59:08.9347336+05:45;True|2023-11-16T22:55:10.4213631+05:45;True|2023-11-16T22:43:21.8981804+05:45;True|2023-11-14T17:28:08.3885160+05:45;True|2023-11-14T17:22:29.1626336+05:45;True|2023-11-14T17:04:07.2972823+05:45;True|2023-11-11T20:35:29.2080326+05:45;True|2023-11-11T20:32:15.2845349+05:45;True|2023-11-10T16:47:06.4019617+05:45;False|2023-11-10T13:51:28.3018175+05:45;True|2023-11-10T02:19:03.5340681+05:45;True|2023-11-10T01:20:14.2700570+05:45;True|2023-11-09T21:01:27.9875543+05:45;True|2023-11-09T20:59:19.5230056+05:45;True|2023-11-09T18:16:23.7470131+05:45;False|2023-11-09T18:16:03.5500533+05:45;True|2023-11-09T18:09:25.9299204+05:45;True|2023-11-09T15:14:04.7264848+05:45;True|2023-11-09T15:11:19.0085135+05:45; + True|2024-03-04T19:06:49.5592103Z;True|2024-03-05T00:40:28.0051674+05:45;True|2024-03-04T23:20:14.6940454+05:45;True|2024-03-01T15:34:58.2803092+05:45;True|2024-03-01T14:56:51.2802749+05:45;True|2024-02-27T20:29:06.0622612+05:45;True|2024-02-14T23:15:55.5373878+05:45;True|2024-02-07T02:01:12.0346310+05:45;True|2024-02-07T01:51:08.9857661+05:45;True|2024-01-31T14:53:26.7904025+05:45;True|2024-01-31T14:32:11.2632740+05:45;True|2024-01-25T22:32:43.7997432+05:45;True|2024-01-08T01:48:51.6977336+05:45;True|2024-01-04T16:57:00.8366880+05:45;True|2024-01-04T16:39:14.5116891+05:45;True|2023-12-29T16:17:33.3592875+05:45;True|2023-12-28T15:22:54.5509910+05:45;True|2023-12-27T21:20:24.7590400+05:45;True|2023-12-20T21:29:37.0436015+05:45;True|2023-12-08T13:46:34.5508826+05:45;True|2023-12-08T13:22:59.7907396+05:45;True|2023-12-08T13:16:18.2446566+05:45;True|2023-12-08T01:36:46.4929190+05:45;True|2023-12-01T14:29:54.6987204+05:45;True|2023-12-01T13:48:23.4841029+05:45;True|2023-12-01T00:12:04.2288558+05:45;True|2023-11-30T23:51:56.2008888+05:45;True|2023-11-30T23:49:36.9385794+05:45;True|2023-11-30T23:46:46.8847879+05:45;True|2023-11-30T23:46:03.6979693+05:45;True|2023-11-30T23:44:27.3157126+05:45;True|2023-11-30T23:33:55.0600332+05:45;False|2023-11-30T23:32:36.1977723+05:45;True|2023-11-30T23:26:29.2113993+05:45;True|2023-11-30T23:04:07.5067771+05:45;True|2023-11-29T01:51:42.3247259+05:45;True|2023-11-28T23:34:50.6877537+05:45;True|2023-11-28T23:31:23.9257392+05:45;True|2023-11-28T17:22:07.3908940+05:45;True|2023-11-28T16:44:59.6364591+05:45;True|2023-11-28T16:39:13.8831139+05:45;True|2023-11-28T16:35:01.7962202+05:45;True|2023-11-28T15:54:09.3703564+05:45;True|2023-11-28T13:17:36.9582579+05:45;True|2023-11-28T11:06:56.1393117+05:45;True|2023-11-27T21:26:39.4737693+05:45;True|2023-11-27T20:27:44.8267131+05:45;True|2023-11-27T15:15:02.7845576+05:45;True|2023-11-27T15:14:24.7414474+05:45;True|2023-11-27T15:12:20.8631275+05:45;True|2023-11-27T14:53:12.8806451+05:45;True|2023-11-27T14:44:42.3370519+05:45;True|2023-11-27T14:03:02.0808830+05:45;True|2023-11-26T22:29:14.7842119+05:45;True|2023-11-26T22:26:41.5591080+05:45;True|2023-11-26T22:24:00.1770904+05:45;True|2023-11-26T22:20:37.2082479+05:45;True|2023-11-26T12:54:30.6489713+05:45;True|2023-11-25T09:37:52.6378019+05:45;True|2023-11-24T23:46:21.5762377+05:45;True|2023-11-24T23:40:44.7042923+05:45;True|2023-11-24T22:26:01.6024702+05:45;True|2023-11-24T22:11:31.5563357+05:45;True|2023-11-23T20:11:39.9968178+05:45;True|2023-11-23T19:11:12.3226825+05:45;True|2023-11-23T14:34:53.3821861+05:45;True|2023-11-22T21:49:39.4855996+05:45;True|2023-11-22T00:55:02.7339322+05:45;True|2023-11-22T00:35:33.7932258+05:45;True|2023-11-22T00:06:39.0977881+05:45;True|2023-11-21T16:56:40.9165139+05:45;True|2023-11-21T16:55:43.5238508+05:45;True|2023-11-21T13:06:42.6334262+05:45;True|2023-11-21T13:05:56.8163644+05:45;True|2023-11-21T01:30:01.6294845+05:45;True|2023-11-21T01:25:46.8788948+05:45;True|2023-11-21T01:18:10.9400288+05:45;True|2023-11-20T17:46:52.6414077+05:45;False|2023-11-20T17:46:20.7035330+05:45;True|2023-11-20T16:17:17.6490092+05:45;True|2023-11-19T23:00:54.1411776+05:45;True|2023-11-19T15:41:16.8030592+05:45;True|2023-11-19T15:27:21.5495440+05:45;True|2023-11-19T12:52:51.4532176+05:45;True|2023-11-17T19:30:12.1934196+05:45;True|2023-11-16T23:07:05.3180955+05:45;True|2023-11-16T23:02:00.4838743+05:45;True|2023-11-16T22:59:08.9347336+05:45;True|2023-11-16T22:55:10.4213631+05:45;True|2023-11-16T22:43:21.8981804+05:45;True|2023-11-14T17:28:08.3885160+05:45;True|2023-11-14T17:22:29.1626336+05:45;True|2023-11-14T17:04:07.2972823+05:45;True|2023-11-11T20:35:29.2080326+05:45;True|2023-11-11T20:32:15.2845349+05:45;True|2023-11-10T16:47:06.4019617+05:45;False|2023-11-10T13:51:28.3018175+05:45;True|2023-11-10T02:19:03.5340681+05:45;True|2023-11-10T01:20:14.2700570+05:45;True|2023-11-09T21:01:27.9875543+05:45; \ No newline at end of file diff --git a/CustomerOnlineV2/CustomerOnlineV2/Views/Transaction/SendMoney.cshtml b/CustomerOnlineV2/CustomerOnlineV2/Views/Transaction/SendMoney.cshtml index b9f59ec..0ee8b6a 100644 --- a/CustomerOnlineV2/CustomerOnlineV2/Views/Transaction/SendMoney.cshtml +++ b/CustomerOnlineV2/CustomerOnlineV2/Views/Transaction/SendMoney.cshtml @@ -10,7 +10,6 @@ color: green !important; } -
@@ -62,7 +61,6 @@
-
@@ -123,15 +121,16 @@
-
-
-
- - -
+
+
+
+ +
+
+
@@ -152,6 +151,7 @@
+
@@ -206,13 +206,14 @@ 0.00 - + Payout Amount : 0.00   +

@@ -273,8 +274,10 @@ +
+
@@ -296,51 +299,48 @@ @section Scripts{ } \ No newline at end of file diff --git a/CustomerOnlineV2/CustomerOnlineV2/appsettings.json b/CustomerOnlineV2/CustomerOnlineV2/appsettings.json index 4afe9c7..a2ed281 100644 --- a/CustomerOnlineV2/CustomerOnlineV2/appsettings.json +++ b/CustomerOnlineV2/CustomerOnlineV2/appsettings.json @@ -12,7 +12,7 @@ { "Name": "MSSqlServer", "Args": { - "connectionString": "Server=77.68.90.58,1433;database=LogDb;uid=dev;password=P@ssw0rd;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False", + "connectionString": "Server=77.68.15.91\\MSSQLSERVER01,1434;database=LogDb;uid=sa;password=DbAmin123;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False", "sinkOptionsSection": { "tableName": "TBL_CUSTOMER_ONLINE_LOG", "autoCreateSqlTable": true @@ -50,7 +50,7 @@ ] }, "ConnectionStrings": { - "ApplicationDb": "Server=VM97E9E72\\MSSQLSERVER01;database=FastMoneyPro_Remit;uid=sa;password=DbAmin123;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False" + "ApplicationDb": "Server=77.68.15.91\\MSSQLSERVER01,1434;database=FastMoneyPro_remit;uid=sa;password=DbAmin123;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False" }, "JWT": { "ValidAudience": "@Ud!3nCH#3p0!Nc1",