Fix numeric format as text.

Author: jeanne007

src/Jobs/DataTableExportJob.php

@@ -2,10 +2,6 @@
 
 namespace Yajra\DataTables\Jobs;
 
-use OpenSpout\Common\Helper\CellTypeHelper;
-use OpenSpout\Common\Type;
-use OpenSpout\Writer\Common\Creator\Style\StyleBuilder;
-use OpenSpout\Writer\Common\Creator\WriterEntityFactory;
 use Carbon\Carbon;
 use Illuminate\Bus\Batchable;
 use Illuminate\Bus\Queueable;
@@ -16,11 +12,13 @@
 use Illuminate\Queue\SerializesModels;
 use Illuminate\Support\Arr;
 use Illuminate\Support\Facades\Auth;
-use Illuminate\Support\Facades\File;
 use Illuminate\Support\Facades\Storage;
 use Illuminate\Support\Str;
+use OpenSpout\Common\Helper\CellTypeHelper;
+use OpenSpout\Common\Type;
+use OpenSpout\Writer\Common\Creator\Style\StyleBuilder;
+use OpenSpout\Writer\Common\Creator\WriterEntityFactory;
 use PhpOffice\PhpSpreadsheet\Shared\Date;
-use Yajra\DataTables\Exceptions\Exception;
 use Yajra\DataTables\Html\Column;
 use Yajra\DataTables\Services\DataTable;
 
@@ -40,9 +38,9 @@ class DataTableExportJob implements ShouldQueue, ShouldBeUnique
     /**
      * Create a new job instance.
      *
-     * @param  array  $dataTable
-     * @param  array  $request
-     * @param  null  $user
+     * @param array $dataTable
+     * @param array $request
+     * @param null $user
      */
     public function __construct(array $dataTable, array $request, $user = null)
     {
@@ -78,7 +76,7 @@ public function handle()
 
         $type = Str::startsWith(request('exportType'), Type::CSV) ? Type::CSV : Type::XLSX;
         $disk = config('datatables-export.disk', 'local');
-        $filename = $this->batchId.'.'.$type;
+        $filename = $this->batchId . '.' . $type;
 
         $path = Storage::disk($disk)->path($filename);
 
@@ -88,7 +86,7 @@ public function handle()
         $columns = $oTable->html()->getColumns()->filter->exportable;
         $writer->addRow(
             WriterEntityFactory::createRowFromArray(
-                $columns->map(fn ($column) => strip_tags($column['title']))->toArray()
+                $columns->map(fn($column) => strip_tags($column['title']))->toArray()
             )
         );
 
@@ -112,12 +110,16 @@ public function handle()
                     $cells->push(
                         WriterEntityFactory::createCell($date, (new StyleBuilder)->setFormat($format)->build())
                     );
+                } else if ($this->wantsText($column)) {
+                    $cells->push(
+                        WriterEntityFactory::createCell($value, (new StyleBuilder)->setFormat($column['exportFormat'])->build())
+                    );
                 } else {
                     $format = $column['exportFormat']
                         ? (new StyleBuilder)->setFormat($column['exportFormat'])->build()
                         : null;
 
-                    $value = $this->isNumeric($value) ? (float) $value : $value;
+                    $value = $this->isNumeric($value) ? (float)$value : $value;
 
                     $cells->push(WriterEntityFactory::createCell($value, $format));
                 }
@@ -129,7 +131,7 @@ public function handle()
     }
 
     /**
-     * @param  \Yajra\DataTables\Html\Column  $column
+     * @param \Yajra\DataTables\Html\Column $column
      * @return bool
      */
     protected function wantsDateFormat(Column $column): bool
@@ -142,7 +144,7 @@ protected function wantsDateFormat(Column $column): bool
     }
 
     /**
-     * @param  mixed  $value
+     * @param mixed $value
      * @return bool
      */
     protected function isNumeric($value): bool
@@ -154,4 +156,17 @@ protected function isNumeric($value): bool
 
         return is_numeric($value);
     }
+
+    /**
+     * @param \Yajra\DataTables\Html\Column $column
+     * @return bool
+     */
+    protected function wantsText(Column $column): bool
+    {
+        if (! isset($column['exportFormat'])) {
+            return false;
+        }
+
+        return in_array($column['exportFormat'], config('datatables-export.text_formats', []));
+    }
 }

src/config/datatables-export.php

@@ -81,6 +81,15 @@
         NumberFormat::FORMAT_DATE_YYYYMMDDSLASH,
     ],
 
+    /*
+     * List of valid text formats to be used.
+     */
+    'text_formats' => [
+        '@',
+        NumberFormat::FORMAT_GENERAL,
+        NumberFormat::FORMAT_TEXT
+    ],
+
     /*
     |--------------------------------------------------------------------------
     | Purge Options