diff --git a/BTCPayServer/Controllers/AppsController.Crowdfund.cs b/BTCPayServer/Controllers/AppsController.Crowdfund.cs index 1ee719267..bfa3e5ffc 100644 --- a/BTCPayServer/Controllers/AppsController.Crowdfund.cs +++ b/BTCPayServer/Controllers/AppsController.Crowdfund.cs @@ -129,10 +129,10 @@ namespace BTCPayServer.Controllers Title = vm.Title, Enabled = vm.Enabled, EnforceTargetAmount = vm.EnforceTargetAmount, - StartDate = vm.StartDate, + StartDate = vm.StartDate?.ToUniversalTime(), TargetCurrency = vm.TargetCurrency, Description = _htmlSanitizer.Sanitize( vm.Description), - EndDate = vm.EndDate, + EndDate = vm.EndDate?.ToUniversalTime(), TargetAmount = vm.TargetAmount, CustomCSSLink = vm.CustomCSSLink, MainImageUrl = vm.MainImageUrl, diff --git a/BTCPayServer/Controllers/PaymentRequestController.cs b/BTCPayServer/Controllers/PaymentRequestController.cs index 0b09bddef..2281cb2b3 100644 --- a/BTCPayServer/Controllers/PaymentRequestController.cs +++ b/BTCPayServer/Controllers/PaymentRequestController.cs @@ -154,7 +154,7 @@ namespace BTCPayServer.Controllers blob.Email = viewModel.Email; blob.Description = _htmlSanitizer.Sanitize(viewModel.Description); blob.Amount = viewModel.Amount; - blob.ExpiryDate = viewModel.ExpiryDate; + blob.ExpiryDate = viewModel.ExpiryDate?.ToUniversalTime(); blob.Currency = viewModel.Currency; blob.EmbeddedCSS = viewModel.EmbeddedCSS; blob.CustomCSSLink = viewModel.CustomCSSLink; diff --git a/BTCPayServer/wwwroot/main/site.js b/BTCPayServer/wwwroot/main/site.js index f61c10726..25af2dab6 100644 --- a/BTCPayServer/wwwroot/main/site.js +++ b/BTCPayServer/wwwroot/main/site.js @@ -30,11 +30,7 @@ maxDate: max, defaultDate: defaultDate, time_24hr: true, - defaultHour: 0, - parseDate: function (date) { - // check with Kukks if this is still needed with new date format - return moment(date).toDate(); - } + defaultHour: 0 }); } });