Andrew Wallo 4 months ago
parent
commit
eaa599e1d0
1 changed files with 2 additions and 2 deletions
  1. 2
    2
      app/Providers/MacroServiceProvider.php

+ 2
- 2
app/Providers/MacroServiceProvider.php View File

355
                     return null;
355
                     return null;
356
                 }
356
                 }
357
 
357
 
358
-                $timezone ??= $column->getTimezone() ?? CompanySettingsService::getDefaultTimezone();
358
+                $timezone ??= CompanySettingsService::getDefaultTimezone();
359
 
359
 
360
                 // Use shiftTimezone to shift UTC calendar date to the specified timezone
360
                 // Use shiftTimezone to shift UTC calendar date to the specified timezone
361
                 // Using setTimezone would convert which is wrong for calendar dates
361
                 // Using setTimezone would convert which is wrong for calendar dates
386
                     return null;
386
                     return null;
387
                 }
387
                 }
388
 
388
 
389
-                $timezone ??= $entry->getTimezone() ?? CompanySettingsService::getDefaultTimezone();
389
+                $timezone ??= CompanySettingsService::getDefaultTimezone();
390
 
390
 
391
                 // Use shiftTimezone to shift UTC calendar date to the specified timezone
391
                 // Use shiftTimezone to shift UTC calendar date to the specified timezone
392
                 // Using setTimezone would convert which is wrong for calendar dates
392
                 // Using setTimezone would convert which is wrong for calendar dates

Loading…
Cancel
Save