fix null case for datetime

Author: Avikarsha Saha

EventListener/TokenSubscriber.php

@@ -549,11 +549,13 @@ protected function matchFilterForLeadInCustomObject(array $filter, array $lead):
                             break;
                         case 'datetime':
                         case 'time':
-                            $leadValCount   = substr_count($leadVal, ':');
-                            $filterValCount = substr_count($filterVal, ':');
+                            if (!is_null($leadVal) && !is_null($filterVal)) {
+                                $leadValCount   = substr_count($leadVal, ':');
+                                $filterValCount = substr_count($filterVal, ':');
 
-                            if (2 === $leadValCount && 1 === $filterValCount) {
-                                $filterVal .= ':00';
+                                if (2 === $leadValCount && 1 === $filterValCount) {
+                                    $filterVal .= ':00';
+                                }
                             }
                             break;
                         case 'tags':

Tests/Functional/Token/EmailWithCustomObjectDynamicContentFunctionalTest.php

@@ -99,6 +99,12 @@ public function testDynamicContentEmail(): void
     {
         foreach ([
              [
+                 '[email protected]',
+                 $this->buildDynamicContentArray([
+                     ['nexon-datetime', null, '!empty', 'datetime']
+                 ]),
+                 'Custom Object Dynamic Content',
+             ], [
                  '[email protected]',
                  $this->buildDynamicContentArray([
                      ['nexon-text', 'Tata', '='],
@@ -187,7 +193,7 @@ private function buildDynamicContentArray(array $inputs): array
                                 'glue'     => 'and',
                                 'field'    => 'cmf_'.$this->customFieldValues[$input[0]]->getCustomField()->getId(),
                                 'object'   => 'custom_object',
-                                'type'     => 'text',
+                                'type'     => $input[3] ?? 'text',
                                 'filter'   => $input[1],
                                 'display'  => $this->customObject->getName().':'.$this->customFieldValues[$input[0]]->getCustomField()->getLabel(),
                                 'operator' => $input[2],