Cavemanon/piratepoet
7
Fork 0
Code Pull Requests Actions Releases 16 Activity

Update backend logic to support (not)blank

Browse Source 
MAILPOET-4996
This commit is contained in:
John Oleksowicz
2023-07-18 14:05:10 -05:00
committed by Aschepikov
parent f522c0786c
commit a1b51aecf0
2 changed files with 198 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
mailpoet/lib/Segments/DynamicSegments/Filters/MailPoetCustomFields.php
View File

@ -37,9 +37,8 @@ class MailPoetCustomFields implements Filter {
$subscribersTable,
$subscribersCustomFieldTable,
'subscribers_custom_field',
"$subscribersTable.id = subscribers_custom_field.subscriber_id"
"$subscribersTable.id = subscribers_custom_field.subscriber_id AND subscribers_custom_field.custom_field_id = $customFieldIdParam"
);
$queryBuilder->andWhere("subscribers_custom_field.custom_field_id = $customFieldIdParam");
$queryBuilder->setParameter($customFieldIdParam, $customFieldId);
$valueParam = ':value' . $parameterSuffix;
@ -66,7 +65,13 @@ class MailPoetCustomFields implements Filter {
$value = $filterData->getParam('value');
$operator = $filterData->getParam('operator');
$queryBuilder->setParameter($valueParam, $value);
if ($dateType === 'month') {
if ($operator === 'is_blank') {
$queryBuilder->andWhere('subscribers_custom_field.value IS NULL');
return $queryBuilder;
} elseif ($operator === 'is_not_blank') {
$queryBuilder->andWhere('subscribers_custom_field.value IS NOT NULL');
return $queryBuilder;
} elseif ($dateType === 'month') {
return $this->applyForDateMonth($queryBuilder, $valueParam);
} elseif ($dateType === 'year') {
return $this->applyForDateYear($queryBuilder, $operator, $valueParam);
@ -106,10 +111,15 @@ class MailPoetCustomFields implements Filter {
private function applyForCheckbox(QueryBuilder $queryBuilder, DynamicSegmentFilterEntity $filter): QueryBuilder {
$filterData = $filter->getFilterData();
$value = $filterData->getParam('value');
$operator = $filterData->getParam('operator');
if ($value === '1') {
if ($operator === 'is_blank') {
$queryBuilder->andWhere('subscribers_custom_field.value IS NULL');
} elseif ($operator === 'is_not_blank') {
$queryBuilder->andWhere('subscribers_custom_field.value IS NOT NULL');
} elseif ($value === '1') {
$queryBuilder->andWhere('subscribers_custom_field.value = 1');
} else {
} elseif ($value === '0') {
$queryBuilder->andWhere('subscribers_custom_field.value <> 1');
}
return $queryBuilder;
@ -134,6 +144,10 @@ class MailPoetCustomFields implements Filter {
} elseif ($operator === 'less_than') {
$queryBuilder->andWhere("subscribers_custom_field.value < $valueParam");
$queryBuilder->setParameter($valueParam, $value);
} elseif ($operator === 'is_blank') {
$queryBuilder->andWhere('subscribers_custom_field.value IS NULL');
} elseif ($operator === 'is_not_blank') {
$queryBuilder->andWhere('subscribers_custom_field.value IS NOT NULL');
} else {
$queryBuilder->andWhere("subscribers_custom_field.value LIKE $valueParam");
$queryBuilder->setParameter($valueParam, '%' . Helpers::escapeSearch($value) . '%');