8000 Fix date for dynamic contents by kuzmany · Pull Request #9955 · mautic/mautic · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Fix date for dynamic contents #9955

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

Merged
merged 9 commits into from
Jun 9, 2021
Merged

Fix date for dynamic contents #9955

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
625f8a1
Fix date for dynamic contents
kuzmany May 2, 2021
b59f450
Merge branch 'features' into fix-date-dynamic-content
kuzmany May 2, 2021
3dd9ef8
Merge branch 'features' into fix-date-dynamic-content
npracht May 5, 2021
311940d
Merge remote-tracking branch 'upstream/features' into fix-date-dynami…
kuzmany May 15, 2021
1b165e2
Resolve conflicts in unit tests
kuzmany May 15, 2021
fc5bf47
Merge branch 'features' into fix-date-dynamic-content
RCheesley May 15, 2021
dc516d8
Merge branch 'features' into fix-date-dynamic-content
RCheesley May 15, 2021
7ab95f0
Merge branch 'features' into fix-date-dynamic-content
npracht Jun 9, 2021
7b9f73d
Merge branch 'features' into fix-date-dynamic-content
npracht Jun 9, 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
10 changes: 0 additions & 10 deletions app/bundles/EmailBundle/EventListener/MatchFilterForLeadTrait.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ protected function matchFilterForLead(array $filter, array $lead)
// Lead in generated for preview with faked data
return false;
}

$groups = [];
$groupNum = 0;

Expand Down Expand Up @@ -76,15 +75,6 @@ protected function matchFilterForLead(array $filter, array $lead)
$filterVal = (bool) $filterVal;
}
break;
case 'date':
10204 if (!$leadVal instanceof \DateTime) {
$leadVal = new \DateTime($leadVal);
}

if (!$filterVal instanceof \DateTime) {
$filterVal = new \DateTime($filterVal);
}
break;
case 'datetime':
case 'time':
$leadValCount = substr_count($leadVal, ':');
Expand Down
39 changes: 39 additions & 0 deletions app/bundles/EmailBundle/Tests/EventListener/MatchFilterForLeadTraitTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,45 @@ public function testDWCContactContains(): void

self::assertFalse($this->matchFilterForLeadTrait->match($this->filter, $this->lead));
}

/**
* @dataProvider dateMatchTestProvider
*/
public function testMatchFilterForLeadTraitForDate(?string $value, string $operator, bool $expect)
{
$filters = [
[
'glue' => 'and',
'field' => 'date',
'object' => 'lead',
'type' => 'date',
'filter' => '2021-05-01',
'display' => null,
'operator' => $operator,
],
];

$lead = [
'id' => 1,
'date' => $value,
];

$this->assertEquals($expect, $this->matchFilterForLeadTrait->match($filters, $lead));
}

public function dateMatchTestProvider(): iterable
{
$date = '2021-05-01';

yield [$date, '=', true];
yield [$date, '!=', false];
yield ['2020-02-02', '!=', true];
yield [$date, '!=', false];
yield [null, 'empty', true];
yield [$date, 'empty', false];
yield [$date, '!empty', true];
yield [null, '!empty', false];
}
}

class MatchFilterForLeadTraitTestable
Expand Down
0