Merge branch 'MAUT-11460' into development

Avikarsha Saha · Avikarsha Saha · commit 265af9d6432e · 2024-07-11T13:22:50.000+05:30
diff --git a/EventListener/TokenSubscriber.php b/EventListener/TokenSubscriber.php
@@ -452,7 +452,7 @@ private function getCustomFieldValue(CustomObject $customObject, string $customF
                 if (empty($fieldValue->getValue())) {
                     $fieldValue->setValue($fieldValue->getCustomField()->getDefaultValue());
                 }
-                $fieldValues[] = $fieldValue->getCustomField()->getTypeObject()->valueToString($fieldValue);
+                $fieldValues[] = $fieldValue->getValue();
             } catch (NotFoundException $e) {
                 // Custom field not found.
             }
diff --git a/Tests/Functional/Token/EmailWithCustomObjectDynamicContentFunctionalTest.php b/Tests/Functional/Token/EmailWithCustomObjectDynamicContentFunctionalTest.php
@@ -109,7 +109,7 @@ public function testDynamicContentEmail(): void
                  $this->buildDynamicContentArray([
                      ['nexon-text', 'Tata', '='],
                      ['nexon-datetime', '2024-07-01', 'gte'],
-                     ['nexon-multiselect', '"Option A"', 'in'],
+                     ['nexon-multiselect', 'option_a', 'in'],
                  ]),
                  'Custom Object Dynamic Content',
              ], [

Original file line number	Diff line number	Diff line change
`@@ -452,7 +452,7 @@ 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->getCustomField()->getTypeObject()->valueToString($fieldValue);`
	`455`	`+ $fieldValues[] = $fieldValue->getValue();`
`456`	`456`	`} catch (NotFoundException $e) {`
`457`	`457`	`// Custom field not found.`
`458`	`458`	`}`