Merge pull request #76 from yajra/enhance-export-print-columns

Allow customization of export and print columns.

Author: yajra

src/Services/DataTable.php

@@ -3,6 +3,7 @@
 namespace Yajra\DataTables\Services;
 
 use Illuminate\Http\JsonResponse;
+use Yajra\DataTables\Html\Column;
 use Illuminate\Support\Collection;
 use Yajra\DataTables\Contracts\DataTableScope;
 use Yajra\DataTables\Contracts\DataTableButtons;
@@ -238,7 +239,7 @@ protected function getDataForPrint()
      */
     protected function printColumns()
     {
-        return is_array($this->printColumns) ? $this->printColumns : $this->getPrintColumnsFromBuilder();
+        return is_array($this->printColumns) ? $this->toColumnsCollection($this->printColumns) : $this->getPrintColumnsFromBuilder();
     }
 
     /**
@@ -300,12 +301,10 @@ public function builder()
      */
     protected function mapResponseToColumns($columns, $type)
     {
-        return array_map(function ($row) use ($columns, $type) {
-            if ($columns) {
-                return (new DataArrayTransformer())->transform($row, $columns, $type);
-            }
+        $transformer = new DataArrayTransformer;
 
-            return $row;
+        return array_map(function ($row) use ($columns, $type, $transformer) {
+            return $transformer->transform($row, $columns, $type);
         }, $this->getAjaxResponseData());
     }
 
@@ -452,7 +451,31 @@ protected function getDataForExport()
      */
     private function exportColumns()
     {
-        return is_array($this->exportColumns) ? $this->exportColumns : $this->getExportColumnsFromBuilder();
+        return is_array($this->exportColumns) ? $this->toColumnsCollection($this->exportColumns) : $this->getExportColumnsFromBuilder();
+    }
+
+    /**
+     * Convert array to collection of Column class.
+     *
+     * @param array $columns
+     * @return Collection
+     */
+    private function toColumnsCollection(array $columns)
+    {
+        $collection = collect();
+        foreach ($columns as $column) {
+            if (isset($column['data'])) {
+                $column['title'] = $column['title'] ?? $column['data'];
+                $collection->push(new Column($column));
+            } else {
+                $data          = [];
+                $data['data']  = $column;
+                $data['title'] = $column;
+                $collection->push(new Column($data));
+            }
+        }
+
+        return $collection;
     }
 
     /**
@@ -583,8 +606,7 @@ protected function hasScopes(array $scopes, $validateAll = false)
             return in_array(get_class($scope), $scopes);
         });
 
-        return $validateAll ? count($filteredScopes) === count($scopes) :
-            ! empty($filteredScopes);
+        return $validateAll ? count($filteredScopes) === count($scopes) : ! empty($filteredScopes);
     }
 
     /**