Merge pull request #2198 from VikassWebkul214254/email-and-contact-columns-of-exported-file

issue #2172 fixed

Author: VikassWebkul214254

packages/Webkul/DataGrid/src/Exports/DataGridExport.php

@@ -37,13 +37,37 @@ public function headings(): array
     }
 
     /**
-     * Mapping.
+     * Map each row for export.
      */
     public function map(mixed $record): array
     {
         return collect($this->datagrid->getColumns())
             ->filter(fn ($column) => $column->getExportable())
-            ->map(fn ($column) => $record->{$column->getIndex()})
+            ->map(function ($column) use ($record) {
+                $index = $column->getIndex();
+                $value = $record->{$index};
+
+                if (in_array($index, ['emails', 'contact_numbers']) && is_string($value)) {
+                    return $this->extractValuesFromJson($value);
+                }
+
+                return $value;
+            })
             ->toArray();
     }
+
+    /**
+     * Extract 'value' fields from a JSON string.
+     */
+    protected function extractValuesFromJson(string $json): string
+    {
+        $decoded = json_decode($json, true);
+
+        if (json_last_error() === JSON_ERROR_NONE
+            && is_array($decoded)) {
+            return collect($decoded)->pluck('value')->implode(', ');
+        }
+
+        return $json;
+    }
 }