Merge branch '8.0'

* 8.0:
  Bump v8.6.1 🚀
  Fix CS.
  Fix with closue value implementation. Use filteredQuery as callback parameter. Fix #1752

CHANGELOG.md

@@ -8,6 +8,12 @@
 
 ### [Unreleased]
 
+### [v8.6.1] - 2018-06-03
+
+- Fix/Enhance with closure value implementation. [#1758]
+- Use filteredQuery as callback parameter.
+- Fix [#1752]
+
 ### [v8.6.0] - 2018-05-18
 
 - Add support for manual setting of filtered count [#1743], credits to [@forgottencreature]
@@ -208,7 +214,8 @@ return (new CollectionDataTable(User::all())->toJson();
 - Fix orderColumn api where related tables are not joined.
 - Fix nested with relation search and sort function.
 
-[Unreleased]: https://github.com/yajra/laravel-datatables/compare/v8.6.0...8.0
+[Unreleased]: https://github.com/yajra/laravel-datatables/compare/v8.6.1...8.0
+[v8.6.1]: https://github.com/yajra/laravel-datatables/compare/v8.6.0...v8.6.1
 [v8.6.0]: https://github.com/yajra/laravel-datatables/compare/v8.5.2...v8.6.0
 [v8.5.2]: https://github.com/yajra/laravel-datatables/compare/v8.5.1...v8.5.2
 [v8.5.1]: https://github.com/yajra/laravel-datatables/compare/v8.5.0...v8.5.1
@@ -274,6 +281,7 @@ return (new CollectionDataTable(User::all())->toJson();
 [#1737]: https://github.com/yajra/laravel-datatables/pull/1737
 [#1741]: https://github.com/yajra/laravel-datatables/pull/1741
 [#1743]: https://github.com/yajra/laravel-datatables/pull/1743
+[#1758]: https://github.com/yajra/laravel-datatables/pull/1758
 
 [#1626]: https://github.com/yajra/laravel-datatables/issues/1626
 [#1617]: https://github.com/yajra/laravel-datatables/issues/1617
@@ -290,6 +298,7 @@ return (new CollectionDataTable(User::all())->toJson();
 [#1471]: https://github.com/yajra/laravel-datatables/issues/1471
 [#1739]: https://github.com/yajra/laravel-datatables/issues/1739
 [#1516]: https://github.com/yajra/laravel-datatables/issues/1516
+[#1752]: https://github.com/yajra/laravel-datatables/issues/1752
 
 [laravel-datatables-fractal]: https://github.com/yajra/laravel-datatables-fractal
 

src/DataTableAbstract.php

@@ -340,7 +340,7 @@ public function with($key, $value = '')
         if (is_array($key)) {
             $this->appends = $key;
         } elseif (is_callable($value)) {
-            $this->appends[$key] = value($value);
+            $this->appends[$key] = $value;
         } else {
             $this->appends[$key] = value($value);
         }
@@ -683,12 +683,12 @@ protected function processResults($results, $object = false)
      */
     protected function render(array $data)
     {
-        $output = array_merge([
+        $output = $this->attachAppends([
             'draw'            => (int) $this->request->input('draw'),
             'recordsTotal'    => $this->totalRecords,
             'recordsFiltered' => $this->filteredRecords,
             'data'            => $data,
-        ], $this->appends);
+        ]);
 
         if ($this->config->isDebugging()) {
             $output = $this->showDebugger($output);
@@ -702,6 +702,17 @@ protected function render(array $data)
         );
     }
 
+    /**
+     * Attach custom with meta on response.
+     *
+     * @param array $data
+     * @return array
+     */
+    protected function attachAppends(array $data)
+    {
+        return array_merge($data, $this->appends);
+    }
+
     /**
      * Append debug parameters on output.
      *

src/QueryDataTable.php

@@ -669,4 +669,24 @@ protected function showDebugger(array $output)
 
         return $output;
     }
+
+    /**
+     * Attach custom with meta on response.
+     *
+     * @param array $data
+     * @return array
+     */
+    protected function attachAppends(array $data)
+    {
+        $appends = [];
+        foreach ($this->appends as $key => $value) {
+            if (is_callable($value)) {
+                $appends[$key] = value($value($this->getFilteredQuery()));
+            } else {
+                $appends[$key] = $value;
+            }
+        }
+
+        return array_merge($data, $appends);
+    }
 }