Merge pull request #2191 from department-of-veterans-affairs/fix/LEAF…

…-4030/email-template-multi-select-option LEAF-4030: Multi Select Options on Email Templates not formatted correctly
department-of-veterans-affairs · Oct 31, 2023 · 42987fe · 42987fe
2 parents bc13f66 + f44f905
commit 42987fe
Showing 1 changed file with 16 additions and 2 deletions.
diff --git a/LEAF_Request_Portal/sources/FormWorkflow.php b/LEAF_Request_Portal/sources/FormWorkflow.php
@@ -1508,9 +1508,13 @@ private function getFields(): array
                     }
                     break;
                 case (str_starts_with($format, "checkboxes") != false):
+                    if(!empty($data) && is_array(unserialize($data))){
+                        $data = $this->buildCheckboxes(unserialize($data));
+                    }
+                    break;
                 case (str_starts_with($format, "multiselect") != false):
-                    if ($this->isJsonString($data) && is_array(json_decode($data))) {
-                        $data = $this->buildMultiselect(json_decode($data));
+                    if(!empty($data) && is_array(unserialize($data))){
+                        $data = $this->buildMultiselect(unserialize($data));
                     }
                     break;
                 case (str_starts_with($format, "radio") != false):
@@ -1577,6 +1581,16 @@ private function buildGrid(array $data): string
     }
 
     private function buildMultiselect(array $data): string
+    {
+        // filter out non-selected selections
+        $data = array_filter($data, function($x) { return $x !== "no"; });
+        // comma separate to be readable in email
+        $formattedData = "- " . implode("\r\n- ", $data);
+
+        return $formattedData;
+    }
+
+    private function buildCheckboxes(array $data): string
     {
         // filter out non-selected selections
         $data = array_filter($data, function($x) { return $x !== "no"; });