Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix timezone issue segment rebuild #8652

Closed
wants to merge 12 commits into from
Closed

Fix timezone issue segment rebuild #8652

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
358fe92
Fix relative date segment filter (like -3 days/+3 days)
kuzmany Oct 30, 2019
cf02490
Fix DateTimeHelper local timezone
kuzmany Oct 30, 2019
64b324e
Revert some DateRelativeInterval logic
kuzmany Oct 30, 2019
52d982e
Minor CS
kuzmany Oct 30, 2019
494a6ed
Coding style fixes.
mohit-rocks Apr 7, 2020
c285362
Added validation to ensure that date timezone is not empty or null.
mohit-rocks Sep 25, 2020
0d85258
Fix DateTimeHelper local timezone
kuzmany Oct 30, 2019
2206dc0
Revert some DateRelativeInterval logic
kuzmany Oct 30, 2019
b2f05a8
Minor CS
kuzmany Oct 30, 2019
ce299e4
Update code snippet and remove class variable in favour of local vari…
mohit-rocks Sep 27, 2020
6bb7ff4
Resolve conflicts manually and remove the unnecesary code.
mohit-rocks Oct 19, 2020
c52064b
Merge branch '3.3' into fix-timezone-issue-segment-rebuild
npracht Mar 5, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions app/bundles/CoreBundle/Helper/DateTimeHelper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,8 @@ public function __construct($string = '', $fromFormat = 'Y-m-d H:i:s', $timezone
*/
public function setDateTime($datetime = '', $fromFormat = 'Y-m-d H:i:s', $timezone = 'local')
{
$localTimezone = date_default_timezone_get();
$localTimezone = ArrayHelper::getValue('default_timezone', (new ParamsLoaderHelper())->getParameters(), date_default_timezone_get());

if ('local' == $timezone) {
$timezone = $localTimezone;
} elseif (empty($timezone)) {
Expand All @@ -71,9 +72,8 @@ public function setDateTime($datetime = '', $fromFormat = 'Y-m-d H:i:s', $timezo

$this->format = (empty($fromFormat)) ? 'Y-m-d H:i:s' : $fromFormat;
$this->timezone = $timezone;

$this->utc = new \DateTimeZone('UTC');
$this->local = new \DateTimeZone($localTimezone);
$this->utc = new \DateTimeZone('UTC');
$this->local = new \DateTimeZone($localTimezone);

if ($datetime instanceof \DateTimeInterface) {
$this->datetime = $datetime;
Expand Down
6 changes: 6 additions & 0 deletions app/bundles/LeadBundle/Segment/Decorator/Date/Other/DateRelativeInterval.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,12 @@ public function getParameterValue(ContactSegmentFilterCrate $contactSegmentFilte

$operator = $this->getOperator($contactSegmentFilterCrate);
$format = 'Y-m-d';

// set now datetime for relative dates like -8 hours, -24 minutes with gt/lt types of operator
if ($contactSegmentFilterCrate->hasTimeParts() && in_array($contactSegmentFilterCrate->getOperator(), ['!gt', 'gt', 'gte', '!lt', 'lt', 'lte'])) {
$format = 'Y-m-d H:i:s';
}

if ('like' === $operator || 'notLike' === $operator) {
$format .= '%';
}
Expand Down
8 changes: 7 additions & 1 deletion app/bundles/LeadBundle/Segment/Decorator/Date/TimezoneResolver.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,13 @@ public function getDefaultDate($hasTimePart)
*/
$timezone = $hasTimePart ? 'UTC' : $this->coreParametersHelper->get('default_timezone', 'UTC');

$date = new \DateTime('midnight today', new \DateTimeZone($timezone));
$time = 'midnight today';

if ($hasTimePart) {
$time = 'now';
}

$date = new \DateTime($time, new \DateTimeZone($timezone));

return new DateTimeHelper($date, null, $timezone);
}
Expand Down