Merge branch '7.x' into fix-small-typo

Author: matbcvo

app/bundles/LeadBundle/Entity/LeadFieldRepository.php

@@ -373,6 +373,30 @@ public function compareValue($lead, $field, $value, $operatorExpr, ?string $fiel
         }
     }
 
+    /**
+     * Compare a form result value with empty value for defined lead.
+     */
+    public function compareEmptyDateValue(int $lead, string $field, string $operatorExpr): bool
+    {
+        $q        = $this->_em->getConnection()->createQueryBuilder();
+        $property = $this->getPropertyByField($field, $q);
+        $q->select('l.id')
+            ->from(MAUTIC_TABLE_PREFIX.'leads', 'l')
+            ->where(
+                $q->expr()->and(
+                    $q->expr()->eq('l.id', ':lead'),
+                    ('empty' === $operatorExpr) ?
+                        $q->expr()->isNull($property)
+                        :
+                        $q->expr()->isNotNull($property)
+                )
+            )
+            ->setParameter('lead', $lead, \PDO::PARAM_INT);
+        $result = $q->executeQuery()->fetchAssociative();
+
+        return !empty($result['id']);
+    }
+
     /**
      * Compare a form result value with defined date value for defined lead.
      *

app/bundles/LeadBundle/EventListener/CampaignSubscriber.php

@@ -526,17 +526,32 @@ public function onCampaignTriggerCondition(CampaignExecutionEvent $event)
             } else {
                 $operators = OperatorOptions::getFilterExpressionFunctions();
                 $field     = $event->getConfig()['field'];
-                $value     = $event->getConfig()['value'];
+                $value     = $event->getConfig()['value'] ?? '';
+                $operator  = $event->getConfig()['operator'];
                 $fields    = $this->getFields($lead);
 
-                $fieldValue = isset($fields[$field]) ? CustomFieldHelper::fieldValueTransfomer($fields[$field], $value) : $value;
-                $result     = $this->leadFieldModel->getRepository()->compareValue(
-                    $lead->getId(),
-                    $field,
-                    $fieldValue,
-                    $operators[$event->getConfig()['operator']]['expr'],
-                    $fields[$field]['type'] ?? null
-                );
+                $fieldType  = '';
+                $fieldValue = $value;
+                if (isset($fields[$field])) {
+                    $fieldValue = CustomFieldHelper::fieldValueTransfomer($fields[$field], $value);
+                    $fieldType  = $fields[$field]['type'];
+                }
+
+                // Preventing date/datetime fields to fail on empty/notEmpty
+                if (in_array($fieldType, ['date', 'datetime']) && in_array($operator, ['empty', '!empty'])) {
+                    $result     = $this->leadFieldModel->getRepository()->compareEmptyDateValue(
+                        $lead->getId(),
+                        $field,
+                        $operators[$operator]['expr']
+                    );
+                } else {
+                    $result     = $this->leadFieldModel->getRepository()->compareValue(
+                        $lead->getId(),
+                        $field,
+                        $fieldValue,
+                        $operators[$operator]['expr']
+                    );
+                }
             }
         } elseif ($event->checkContext('lead.dnc')) {
             $channels  = $event->getConfig()['channels'];