Merge branch 'MAUt-11460' into beta

Avikarsha Saha · Avikarsha Saha · commit 0165326f1013 · 2024-07-11T20:03:56.000+05:30
diff --git a/EventListener/TokenSubscriber.php b/EventListener/TokenSubscriber.php
@@ -452,7 +452,12 @@ private function getCustomFieldValue(CustomObject $customObject, string $customF
                 if (empty($fieldValue->getValue())) {
                     $fieldValue->setValue($fieldValue->getCustomField()->getDefaultValue());
                 }
-                $fieldValues[] = $fieldValue->getValue();
+
+                if (in_array($fieldValue->getCustomField()->getType(), ['multiselect', 'select'])) {
+                    $fieldValues[] = $fieldValue->getValue();
+                } else {
+                    $fieldValues[] = $fieldValue->getCustomField()->getTypeObject()->valueToString($fieldValue);
+                }
             } catch (NotFoundException $e) {
                 // Custom field not found.
             }
@@ -528,6 +533,7 @@ protected function matchFilterForLeadInCustomObject(array $filter, array $lead):
             }
 
             $leadValues   = $lead[$data['field']];
+            $leadValues   = 'custom_object' === $data['object'] ? $leadValues : [$leadValues];
             $filterVal    = $data['filter'];
             $subgroup     = null;
 
diff --git a/Tests/Functional/Token/EmailWithCustomObjectDynamicContentFunctionalTest.php b/Tests/Functional/Token/EmailWithCustomObjectDynamicContentFunctionalTest.php
@@ -188,17 +188,29 @@ private function buildDynamicContentArray(array $inputs): array
                 'filters'   => [
                     [
                         'content' => 'Custom Object Dynamic Content',
-                        'filters' => array_map(function ($input) {
-                            return [
-                                'glue'     => 'and',
-                                'field'    => 'cmf_'.$this->customFieldValues[$input[0]]->getCustomField()->getId(),
-                                'object'   => 'custom_object',
-                                'type'     => $input[3] ?? 'text',
-                                'filter'   => $input[1],
-                                'display'  => $this->customObject->getName().':'.$this->customFieldValues[$input[0]]->getCustomField()->getLabel(),
-                                'operator' => $input[2],
-                            ];
-                        }, $inputs),
+                        'filters' => array_merge(
+                            array_map(function ($input) {
+                                return [
+                                        'glue'     => 'and',
+                                        'field'    => 'cmf_'.$this->customFieldValues[$input[0]]->getCustomField()->getId(),
+                                        'object'   => 'custom_object',
+                                        'type'     => $input[3] ?? 'text',
+                                        'filter'   => $input[1],
+                                        'display'  => $this->customObject->getName().':'.$this->customFieldValues[$input[0]]->getCustomField()->getLabel(),
+                                        'operator' => $input[2],
+                                    ];
+                            }, $inputs),
+                            [
+                                [
+                                    'glue'     => 'and',
+                                    'field'    => 'email',
+                                    'object'   => 'lead',
+                                    'type'     => 'email',
+                                    'filter'   => null,
+                                    'operator' => '!empty',
+                                ],
+                            ]
+                        ),
                     ],
                 ],
             ],

Original file line number	Diff line number	Diff line change
`@@ -452,7 +452,12 @@ private function getCustomFieldValue(CustomObject $customObject, string $customF`
`452`	`452`	`if (empty($fieldValue->getValue())) {`
`453`	`453`	`$fieldValue->setValue($fieldValue->getCustomField()->getDefaultValue());`
`454`	`454`	`}`
`455`		`- $fieldValues[] = $fieldValue->getValue();`
	`455`	`+`
	`456`	`+ if (in_array($fieldValue->getCustomField()->getType(), ['multiselect', 'select'])) {`
	`457`	`+ $fieldValues[] = $fieldValue->getValue();`
	`458`	`+ } else {`
	`459`	`+ $fieldValues[] = $fieldValue->getCustomField()->getTypeObject()->valueToString($fieldValue);`
	`460`	`+ }`
`456`	`461`	`} catch (NotFoundException $e) {`
`457`	`462`	`// Custom field not found.`
`458`	`463`	`}`
`@@ -528,6 +533,7 @@ protected function matchFilterForLeadInCustomObject(array $filter, array $lead):`
`528`	`533`	`}`
`529`	`534`
`530`	`535`	`$leadValues = $lead[$data['field']];`
	`536`	`+ $leadValues = 'custom_object' === $data['object'] ? $leadValues : [$leadValues];`
`531`	`537`	`$filterVal = $data['filter'];`
`532`	`538`	`$subgroup = null;`
`533`	`539`