Merge pull request #162 from davutkmbr/master

fix: Change for correct $action and $actionMethod

Author: yajra

src/Services/DataTable.php

@@ -208,14 +208,11 @@ public function render(string $view = null, array $data = [], array $mergeData =
 
         /** @var string $action */
         $action = $this->request()->get('action');
+        $actionMethod = $action === 'print' ? 'printPreview' : $action;
 
-        if ($action == 'print') {
-            $action = 'printPreview';
-        }
-
-        if (in_array($action, $this->actions) && method_exists($this, $action)) {
+        if (in_array($action, $this->actions) && method_exists($this, $actionMethod)) {
             /** @var callable $callback */
-            $callback = [$this, $action];
+            $callback = [$this, $actionMethod];
 
             return app()->call($callback);
         }
@@ -230,7 +227,7 @@ public function render(string $view = null, array $data = [], array $mergeData =
      */
     public function request(): Request
     {
-        if (! $this->request) {
+        if (!$this->request) {
             $this->request = app(Request::class);
         }
 
@@ -355,7 +352,7 @@ public function builder(): Builder
             return $this->htmlBuilder = $this->htmlBuilder();
         }
 
-        if (! $this->htmlBuilder) {
+        if (!$this->htmlBuilder) {
             $this->htmlBuilder = app(Builder::class);
         }
 
@@ -462,7 +459,7 @@ public function excel()
     {
         set_time_limit(3600);
 
-        $path = $this->getFilename().'.'.strtolower($this->excelWriter);
+        $path = $this->getFilename() . '.' . strtolower($this->excelWriter);
 
         $excelFile = $this->buildExcelFile();
 
@@ -489,11 +486,11 @@ protected function buildExcelFile()
             return $this->buildFastExcelFile();
         }
 
-        if (! class_exists(ExcelServiceProvider::class)) {
+        if (!class_exists(ExcelServiceProvider::class)) {
             throw new Exception('Please install maatwebsite/excel to be able to use this function.');
         }
 
-        if (! new $this->exportClass instanceof DataTablesExportHandler) {
+        if (!new $this->exportClass instanceof DataTablesExportHandler) {
             $collection = $this->getAjaxResponseData();
 
             return new $this->exportClass($this->convertToLazyCollection($collection));
@@ -534,7 +531,7 @@ public function setFilename(string $filename): static
      */
     protected function filename(): string
     {
-        return class_basename($this).'_'.date('YmdHis');
+        return class_basename($this) . '_' . date('YmdHis');
     }
 
     /**
@@ -594,7 +591,7 @@ private function toColumnsCollection(array $columns): Collection
     public function csv()
     {
         set_time_limit(3600);
-        $path = $this->getFilename().'.'.strtolower($this->csvWriter);
+        $path = $this->getFilename() . '.' . strtolower($this->csvWriter);
 
         $excelFile = $this->buildExcelFile();
 
@@ -626,7 +623,7 @@ public function pdf()
         }
 
         // @phpstan-ignore-next-line
-        return $this->buildExcelFile()->download($this->getFilename().'.pdf', $this->pdfWriter);
+        return $this->buildExcelFile()->download($this->getFilename() . '.pdf', $this->pdfWriter);
     }
 
     /**
@@ -638,7 +635,7 @@ public function pdf()
      */
     public function snappyPdf(): Response
     {
-        if (! class_exists(PdfWrapper::class)) {
+        if (!class_exists(PdfWrapper::class)) {
             throw new Exception('You need to install barryvdh/laravel-snappy to be able to use this feature.');
         }
 
@@ -651,7 +648,7 @@ public function snappyPdf(): Response
 
         $snappy->setOptions($options)->setOrientation($orientation);
 
-        return $snappy->loadHTML($this->printPreview())->download($this->getFilename().'.pdf');
+        return $snappy->loadHTML($this->printPreview())->download($this->getFilename() . '.pdf');
     }
 
     /**
@@ -741,7 +738,7 @@ protected function hasScopes(array $scopes, bool $validateAll = false): bool
             return in_array(get_class($scope), $scopes);
         });
 
-        return $validateAll ? count($filteredScopes) === count($scopes) : ! empty($filteredScopes);
+        return $validateAll ? count($filteredScopes) === count($scopes) : !empty($filteredScopes);
     }
 
     /**