Merge branch 'yajra:master' into master

Author: throwExceptions

CHANGELOG.md

@@ -2,6 +2,11 @@
 
 ## UNRELEASED
 
+## v0.6.0 - 10-13-2021
+
+- Use box/spout instead of Laravel Excel. #13
+- Add support for number format and text with leading zeroes.
+
 ## v0.5.2 - 10-13-2021
 
 - Fix export when used with Eloquent Builder. #12

README.md

@@ -6,13 +6,14 @@
 [![Total Downloads](https://img.shields.io/packagist/dt/yajra/laravel-datatables-export.svg)](https://packagist.org/packages/yajra/laravel-datatables-export)
 [![License](https://img.shields.io/github/license/mashape/apistatus.svg)](https://packagist.org/packages/yajra/laravel-datatables-export)
 
-This package is a plugin of [Laravel DataTables](https://github.com/yajra/laravel-datatables) for handling server-side exporting using Queue, Laravel Excel and Livewire.
+This package is a plugin of [Laravel DataTables](https://github.com/yajra/laravel-datatables) for handling server-side exporting using Queue, Spout and Livewire.
 
 ## Requirements
 
 - [PHP >=7.4](http://php.net/)
 - [Laravel 8.x](https://github.com/laravel/framework)
 - [Laravel Livewire](https://laravel-livewire.com/)
+- [Spout](https://github.com/box/spout)
 - [Laravel DataTables 9.x](https://github.com/yajra/laravel-datatables)
 - [jQuery DataTables v1.10.x](http://datatables.net/)
 
@@ -96,6 +97,16 @@ Column::make('mobile')->exportFormat('00000000000'),
 
 The format above will treat mobile numbers as text with leading zeroes.
 
+## Numeric Fields Formatting
+
+The package will auto-detect numeric fields and can be used with custom formats.
+
+```phpt
+Column::make('total')->exportFormat('0.00'),
+Column::make('count')->exportFormat('#,##0'),
+Column::make('average')->exportFormat('#,##0.00),
+```
+
 ## Date Fields Formatting
 
 The package will auto-detect date fields when used with a valid format or is a DateTime instance.

composer.json

@@ -20,7 +20,8 @@
     "php": ">=7.4|8.*",
     "yajra/laravel-datatables-buttons": "4.*",
     "yajra/laravel-datatables-html": "^4.40",
-    "livewire/livewire": "2.*"
+    "livewire/livewire": "2.*",
+    "box/spout": "^3.3"
   },
   "require-dev": {
     "phpunit/phpunit": "^9.5.9"

src/Exports/DataTableQueuedExport.php

@@ -2,6 +2,10 @@
 
 namespace Yajra\DataTables\Jobs;
 
+use Box\Spout\Common\Type;
+use Box\Spout\Writer\Common\Creator\Style\StyleBuilder;
+use Box\Spout\Writer\Common\Creator\WriterEntityFactory;
+use Carbon\Carbon;
 use Illuminate\Bus\Batchable;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldBeUnique;
@@ -11,7 +15,8 @@
 use Illuminate\Queue\SerializesModels;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Str;
-use Yajra\DataTables\Exports\DataTableQueuedExport;
+use PhpOffice\PhpSpreadsheet\Shared\Date;
+use Yajra\DataTables\Html\Column;
 use Yajra\DataTables\Services\DataTable;
 
 class DataTableExportJob implements ShouldQueue, ShouldBeUnique
@@ -63,12 +68,67 @@ public function handle()
         $dataTable = app()->call([$oTable, 'dataTable'], compact('query'));
         $dataTable->skipPaging();
 
-        $type = Str::startsWith(request('exportType'), 'csv') ? '.csv' : '.xlsx';
-        $path = 'exports/'.$this->batchId.$type;
+        $type = Str::startsWith(request('exportType'), Type::CSV) ? Type::CSV : Type::XLSX;
+        $writer = WriterEntityFactory::createWriter($type);
+        $writer->openToFile(storage_path('app/exports/' . $this->batchId . '.' . $type));
 
-        (new DataTableQueuedExport(
-            $dataTable->getFilteredQuery(),
-            $oTable->html()->getColumns()->filter->exportable
-        ))->store($path);
+        $columns = $oTable->html()->getColumns()->filter->exportable;
+        $writer->addRow(WriterEntityFactory::createRowFromArray($columns->pluck('title')->toArray()));
+
+        foreach ($dataTable->getFilteredQuery()->cursor() as $row) {
+            $cells = collect();
+            $columns->map(function (Column $column, $index) use ($row, $cells) {
+                $property = $column['data'];
+                $value = $row->{$property} ?? '';
+
+                if ($value instanceof \DateTime || $this->wantsDateFormat($column)) {
+                    $date = $value ? Date::dateTimeToExcel(Carbon::parse($value)) : '';
+                    $defaultDateFormat = config('datatables-export.default_date_format', 'yyyy-mm-dd');
+                    $format = $column['exportFormat'] ?? $defaultDateFormat;
+
+                    $cells->push(
+                        WriterEntityFactory::createCell($date, (new StyleBuilder)->setFormat($format)->build())
+                    );
+                } else {
+                    $format = $column['exportFormat']
+                        ? (new StyleBuilder)->setFormat($column['exportFormat'])->build()
+                        : null;
+
+                    $value = $this->isNumeric($value) ? (float) $value : $value;
+
+                    $cells->push(WriterEntityFactory::createCell($value, $format));
+                }
+            });
+
+            $writer->addRow(WriterEntityFactory::createRow($cells->toArray()));
+        }
+        $writer->close();
+    }
+
+    /**
+     * @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', []));
+    }
+
+    /**
+     * @param  mixed  $value
+     * @return bool
+     */
+    protected function isNumeric($value): bool
+    {
+        // Skip numeric style if value has leading zeroes.
+        if (Str::startsWith($value, '0')) {
+            return false;
+        }
+
+        return is_numeric($value);
     }
 }

src/Jobs/DataTableExportJob.php

@@ -4,6 +4,11 @@
 
 return [
 
+    /**
+     * Default export format for date.
+     */
+    'default_date_format' => 'yyyy-mm-dd',
+
     /**
      * List of valid date formats to be used for auto-detection.
      */