aljaz/btcpayserver
1
0
Fork 0
mirror of https://github.com/aljazceru/btcpayserver.git synced 2025-12-17 22:14:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixing bug induced with server converting UTC times to server local (#835)

Browse Source
This commit is contained in:
Rockstar Developer
2019-05-15 08:02:39 -05:00
committed by Nicolas Dorier
parent 461462eafc
commit 20fb7fc188
3 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
BTCPayServer/Controllers/AppsController.Crowdfund.cs
View File

@@ -129,10 +129,10 @@ namespace BTCPayServer.Controllers
Title = vm.Title, Title = vm.Title,
Enabled = vm.Enabled, Enabled = vm.Enabled,
EnforceTargetAmount = vm.EnforceTargetAmount, EnforceTargetAmount = vm.EnforceTargetAmount,
StartDate = vm.StartDate, StartDate = vm.StartDate?.ToUniversalTime(),
TargetCurrency = vm.TargetCurrency, TargetCurrency = vm.TargetCurrency,
Description = _htmlSanitizer.Sanitize( vm.Description), Description = _htmlSanitizer.Sanitize( vm.Description),
EndDate = vm.EndDate, EndDate = vm.EndDate?.ToUniversalTime(),
TargetAmount = vm.TargetAmount, TargetAmount = vm.TargetAmount,
CustomCSSLink = vm.CustomCSSLink, CustomCSSLink = vm.CustomCSSLink,
MainImageUrl = vm.MainImageUrl, MainImageUrl = vm.MainImageUrl,

2
BTCPayServer/Controllers/PaymentRequestController.cs
View File

@@ -154,7 +154,7 @@ namespace BTCPayServer.Controllers
blob.Email = viewModel.Email; blob.Email = viewModel.Email;
blob.Description = _htmlSanitizer.Sanitize(viewModel.Description); blob.Description = _htmlSanitizer.Sanitize(viewModel.Description);
blob.Amount = viewModel.Amount; blob.Amount = viewModel.Amount;
blob.ExpiryDate = viewModel.ExpiryDate; blob.ExpiryDate = viewModel.ExpiryDate?.ToUniversalTime();
blob.Currency = viewModel.Currency; blob.Currency = viewModel.Currency;
blob.EmbeddedCSS = viewModel.EmbeddedCSS; blob.EmbeddedCSS = viewModel.EmbeddedCSS;
blob.CustomCSSLink = viewModel.CustomCSSLink; blob.CustomCSSLink = viewModel.CustomCSSLink;

6
BTCPayServer/wwwroot/main/site.js
View File

@@ -30,11 +30,7 @@
maxDate: max, maxDate: max,
defaultDate: defaultDate, defaultDate: defaultDate,
time_24hr: true, time_24hr: true,
defaultHour: 0, defaultHour: 0
parseDate: function (date) {
// check with Kukks if this is still needed with new date format
return moment(date).toDate();
}
}); });
} }
}); });