Improve date fields auto-detection.

Author: yajra

src/Exports/DataTableQueuedExport.php

@@ -2,6 +2,7 @@
 
 namespace Yajra\DataTables\Exports;
 
+use Carbon\Carbon;
 use Illuminate\Support\Collection;
 use Maatwebsite\Excel\Concerns\Exportable;
 use Maatwebsite\Excel\Concerns\FromQuery;
@@ -49,6 +50,14 @@ public function map($row): array
                     return Date::dateTimeToExcel($row[$property]);
                 }
 
+                if ($this->wantsDateFormat($column)) {
+                    $this->dates[] = $index;
+
+                    $dateValue = $row[$property];
+
+                    return $dateValue ? Date::dateTimeToExcel(Carbon::parse($dateValue)) : '';
+                }
+
                 return $row[$property];
             })
             ->toArray();
@@ -65,8 +74,8 @@ public function columnFormats(): array
 
         $this->columns
             ->each(function (Column $column, $index) use (&$formats) {
-                if (in_array($index, $this->dates)) {
-                    return $formats[$this->num2alpha($index - 1)] = NumberFormat::FORMAT_DATE_YYYYMMDD;
+                if (in_array($index, $this->dates) || $this->wantsDateFormat($column)) {
+                    return $formats[$this->num2alpha($index - 1)] = $column['exportFormat'] ?? NumberFormat::FORMAT_DATE_YYYYMMDD;
                 }
 
                 if (isset($column['exportFormat'])) {
@@ -86,4 +95,17 @@ protected function num2alpha($n)
 
         return $r;
     }
+
+    /**
+     * @param  \Yajra\DataTables\Html\Column  $column
+     * @return bool
+     */
+    protected function wantsDateFormat(Column $column): bool
+    {
+        if (!isset($column['exportFormat'])) {
+            return false;
+        }
+
+        return in_array($column['exportFormat'], config('datatables-export.date_formats', []));
+    }
 }

src/config/datatables-export.php

@@ -1,3 +1,34 @@
 <?php
 
-return [];
+use PhpOffice\PhpSpreadsheet\Style\NumberFormat;
+
+return [
+
+    /**
+     * List of valid date formats to be used for auto-detection.
+     */
+    'date_formats' => [
+        'mm/dd/yyyy',
+        NumberFormat::FORMAT_DATE_DATETIME,
+        NumberFormat::FORMAT_DATE_YYYYMMDD,
+        NumberFormat::FORMAT_DATE_XLSX22,
+        NumberFormat::FORMAT_DATE_DDMMYYYY,
+        NumberFormat::FORMAT_DATE_DMMINUS,
+        NumberFormat::FORMAT_DATE_DMYMINUS,
+        NumberFormat::FORMAT_DATE_DMYSLASH,
+        NumberFormat::FORMAT_DATE_MYMINUS,
+        NumberFormat::FORMAT_DATE_TIME1,
+        NumberFormat::FORMAT_DATE_TIME2,
+        NumberFormat::FORMAT_DATE_TIME3,
+        NumberFormat::FORMAT_DATE_TIME4,
+        NumberFormat::FORMAT_DATE_TIME5,
+        NumberFormat::FORMAT_DATE_TIME6,
+        NumberFormat::FORMAT_DATE_TIME7,
+        NumberFormat::FORMAT_DATE_XLSX14,
+        NumberFormat::FORMAT_DATE_XLSX15,
+        NumberFormat::FORMAT_DATE_XLSX16,
+        NumberFormat::FORMAT_DATE_XLSX17,
+        NumberFormat::FORMAT_DATE_YYYYMMDD2,
+        NumberFormat::FORMAT_DATE_YYYYMMDDSLASH,
+    ]
+];