Merge pull request #127 from underdpt/fix_export_data_on_buildexcelfile

yajra · web-flow · commit 184855df4747 · 2021-04-03T10:53:25.000+08:00
Use same export data if export handler extends DataTablesExportHandler
diff --git a/src/Services/DataTable.php b/src/Services/DataTable.php
@@ -433,7 +433,7 @@ protected function buildExcelFile()
             return $this->buildFastExcelFile();
         }
 
-        if ($this->exportClass != DataTablesExportHandler::class) {
+        if (! is_subclass_of($this->exportClass, DataTablesExportHandler::class)) {
             $collection = $this->getAjaxResponseData();
 
             return new $this->exportClass($this->convertToLazyCollection($collection));

Original file line number	Diff line number	Diff line change
`@@ -433,7 +433,7 @@ protected function buildExcelFile()`
`433`	`433`	`return $this->buildFastExcelFile();`
`434`	`434`	`}`
`435`	`435`
`436`		`- if ($this->exportClass != DataTablesExportHandler::class) {`
	`436`	`+ if (! is_subclass_of($this->exportClass, DataTablesExportHandler::class)) {`
`437`	`437`	`$collection = $this->getAjaxResponseData();`
`438`	`438`
`439`	`439`	`return new $this->exportClass($this->convertToLazyCollection($collection));`