From d61957d2deff56f924c240c865c025bcd8352284 Mon Sep 17 00:00:00 2001 From: Kyle Spearrin Date: Wed, 10 Jul 2019 22:16:24 -0400 Subject: [PATCH] tz id for linux vs windows --- src/Billing/Utilities/PayPalIpnClient.cs | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/Billing/Utilities/PayPalIpnClient.cs b/src/Billing/Utilities/PayPalIpnClient.cs index c88978086a..317f3bba8e 100644 --- a/src/Billing/Utilities/PayPalIpnClient.cs +++ b/src/Billing/Utilities/PayPalIpnClient.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.Globalization; using System.Linq; using System.Net.Http; +using System.Runtime.InteropServices; using System.Text; using System.Threading.Tasks; using System.Web; @@ -165,8 +166,10 @@ namespace Bit.Billing.Utilities CultureInfo.InvariantCulture, DateTimeStyles.None, out var paymentDate); if(parsed) { - return TimeZoneInfo.ConvertTimeToUtc(paymentDate, - TimeZoneInfo.FindSystemTimeZoneById("Pacific Standard Time")); + var pacificTime = RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? + TimeZoneInfo.FindSystemTimeZoneById("Pacific Standard Time") : + TimeZoneInfo.FindSystemTimeZoneById("America/Los_Angeles"); + return TimeZoneInfo.ConvertTimeToUtc(paymentDate, pacificTime); } } return default(DateTime);