Use new toJson() method.

yajra · yajra · commit 8fe1ece96a73 · 2017-09-07T17:20:08.000+08:00
diff --git a/add-column.md b/add-column.md
@@ -13,7 +13,7 @@ Route::get('user-data', function() {
 
 	return DataTables::eloquent($model)
 				->addColumn('intro', 'Hi {{$name}}!')
-				->make(true);
+				->toJson();
 });
 ```
 
@@ -30,7 +30,7 @@ Route::get('user-data', function() {
 				->addColumn('intro', function(User $user) {
 					return 'Hi ' . $user->name . '!';
 				})
-				->make(true);
+				->toJson();
 });
 ```
 
@@ -47,7 +47,7 @@ Route::get('user-data', function() {
 
 	return DataTables::eloquent($model)
 				->addColumn('intro', 'users.datatables.intro')
-				->make(true);
+				->toJson();
 });
 ```
 
@@ -69,6 +69,6 @@ Route::get('user-data', function() {
 
 	return DataTables::eloquent($model)
 				->addColumn('intro', 'Hi {{$name}}!', 2)
-				->make(true);
+				->toJson();
 });
 ```
diff --git a/blacklist.md b/blacklist.md
@@ -10,6 +10,6 @@ Route::get('user-data', function() {
 
 	return DataTables::eloquent($model)
 				->blacklist(['password', 'name'])
-				->make(true);
+				->toJson();
 });
 ```
diff --git a/buttons-extended.md b/buttons-extended.md
@@ -8,15 +8,15 @@ We can now extend and reuse our DataTable class inside our controller by using `
 ## Upgrading from v1.0 to v1.1
 - Upgrade to `laravel-datatables-buttons:^1.1`
 - Rename `ajax()` method to `dataTable()`
-- Remove `->make(true)` from the method chain.
+- Remove `->toJson()` from the method chain.
 
 ```php
     public function ajax()
     {
         return $this->datatables
             ->eloquent($this->query())
             ->addColumn('action', 'path.to.action.view')
-            ->make(true)
+            ->toJson()
     }
 ```
 
diff --git a/edit-column.md b/edit-column.md
@@ -13,7 +13,7 @@ Route::get('user-data', function() {
 
 	return DataTables::eloquent($model)
 				->editColumn('name', 'Hi {{$name}}!')
-				->make(true);
+				->toJson();
 });
 ```
 
@@ -30,7 +30,7 @@ Route::get('user-data', function() {
 				->editColumn('name', function(User $user) {
 					return 'Hi ' . $user->name . '!';
 				})
-				->make(true);
+				->toJson();
 });
 ```
 
@@ -47,7 +47,7 @@ Route::get('user-data', function() {
 
 	return DataTables::eloquent($model)
 				->editColumn('name', 'users.datatables.into')
-				->make(true);
+				->toJson();
 });
 ```
 
diff --git a/engine-collection.md b/engine-collection.md
@@ -16,7 +16,7 @@ Route::get('user-data', function() {
 		['id' => 3, 'name' => 'James'],
 	]);
 
-	return DataTables::of($collection)->make(true);
+	return DataTables::of($collection)->toJson();
 });
 ```
 
@@ -33,7 +33,7 @@ Route::get('user-data', function() {
 		['id' => 3, 'name' => 'James'],
 	]);
 
-	return DataTables::queryBuilder($collection)->make(true);
+	return DataTables::queryBuilder($collection)->toJson();
 });
 ```
 
@@ -50,7 +50,7 @@ Route::get('user-data', function(DataTables $datatables) {
 		['id' => 3, 'name' => 'James'],
 	]);
 
-	return $datatables->queryBuilder($collection)->make(true);
+	return $datatables->queryBuilder($collection)->toJson();
 });
 ```
 <a name="ioc"></a>
@@ -65,6 +65,6 @@ Route::get('user-data', function() {
 		['id' => 3, 'name' => 'James'],
 	]);
 
-	return app('datatables')->queryBuilder($collection)->make(true);
+	return app('datatables')->queryBuilder($collection)->toJson();
 });
 ```
diff --git a/engine-eloquent.md b/engine-eloquent.md
@@ -12,7 +12,7 @@ use DataTables;
 Route::get('user-data', function() {
 	$model = App\User::query();
 
-	return DataTables::of($model)->make(true);
+	return DataTables::of($model)->toJson();
 });
 ```
 
@@ -25,7 +25,7 @@ use DataTables;
 Route::get('user-data', function() {
 	$model = App\User::query();
 
-	return DataTables::eloquent($model)->make(true);
+	return DataTables::eloquent($model)->toJson();
 });
 ```
 
@@ -38,7 +38,7 @@ use Yajra\DataTables\DataTables;
 Route::get('user-data', function(DataTables $datatables) {
 	$model = App\User::query();
 
-	return $datatables->eloquent($model)->make(true);
+	return $datatables->eloquent($model)->toJson();
 });
 ```
 <a name="ioc"></a>
@@ -48,6 +48,6 @@ Route::get('user-data', function(DataTables $datatables) {
 Route::get('user-data', function() {
 	$model = App\User::query();
 
-	return app('datatables')->eloquent($model)->make(true);
+	return app('datatables')->eloquent($model)->toJson();
 });
 ```
diff --git a/engine-query.md b/engine-query.md
@@ -13,7 +13,7 @@ use DataTables;
 Route::get('user-data', function() {
 	$query = DB::table('users');
 
-	return DataTables::of($query)->make(true);
+	return DataTables::of($query)->toJson();
 });
 ```
 
@@ -27,7 +27,7 @@ use DataTables;
 Route::get('user-data', function() {
 	$query = DB::table('users');
 
-	return DataTables::queryBuilder($query)->make(true);
+	return DataTables::queryBuilder($query)->toJson();
 });
 ```
 
@@ -41,7 +41,7 @@ use Yajra\DataTables\DataTables;
 Route::get('user-data', function(DataTables $datatables) {
 	$query = DB::table('users');
 
-	return $datatables->queryBuilder($query)->make(true);
+	return $datatables->queryBuilder($query)->toJson();
 });
 ```
 <a name="ioc"></a>
@@ -53,6 +53,6 @@ use DB;
 Route::get('user-data', function() {
 	$query = DB::table('users');
 
-	return app('datatables')->queryBuilder($query)->make(true);
+	return app('datatables')->queryBuilder($query)->toJson();
 });
 ```
diff --git a/filter-column.md b/filter-column.md
@@ -21,6 +21,6 @@ Route::get('user-data', function() {
 					$sql = "CONCAT(users.first_name,'-',users.last_name)  like ?";
 	                $query->whereRaw($sql, ["%{$keyword}%"]);
 	            })
-				->make(true);
+				->toJson();
 });
 ```
diff --git a/html-builder-table.md b/html-builder-table.md
@@ -13,7 +13,7 @@ use Yajra\DataTables\Html\Builder;
 
 Route::get('users', function(Builder $builder) {
 	if (request()->ajax()) {
-        return DataTables::of(User::query())->make(true);
+        return DataTables::of(User::query())->toJson();
     }
 
 	$html = $builder->columns([
diff --git a/html-builder.md b/html-builder.md
@@ -43,7 +43,7 @@ use Yajra\DataTables\Html\Builder;
 
 Route::get('users', function(Builder $builder) {
 	if (request()->ajax()) {
-        return DataTables::of(User::query())->make(true);
+        return DataTables::of(User::query())->toJson();
     }
 
 	$html = $builder->columns([
diff --git a/index-column.md b/index-column.md
@@ -11,7 +11,7 @@ Route::get('user-data', function() {
 
 	return DataTables::eloquent($model)
 				->addIndexColumn()
-				->make(true);
+				->toJson();
 });
 ```
 
diff --git a/manual-order.md b/manual-order.md
@@ -19,6 +19,6 @@ Route::get('user-data', function() {
 		                $query->orderBy('email', 'desc');
 		            }
 		        })
-				->make(true);
+				->toJson();
 });
 ```
diff --git a/manual-search.md b/manual-search.md
@@ -22,7 +22,7 @@ Route::get('user-data', function() {
 		                $query->where('email', 'like', "%{request('email')}%");
 		            }
 		        })
-				->make(true);
+				->toJson();
 });
 ```
 
@@ -47,6 +47,6 @@ Route::get('user-data', function() {
 		                $query->where('email', 'like', "%{request('email')}%");
 		            }
 		        }, true)
-				->make(true);
+				->toJson();
 });
 ```
diff --git a/only-trashed.md b/only-trashed.md
@@ -11,6 +11,6 @@ Route::get('user-data', function() {
 
 	return DataTables::eloquent($model)
 				->onlyTrashed()
-				->make(true);
+				->toJson();
 });
 ```
diff --git a/order-by-nulls-last.md b/order-by-nulls-last.md
@@ -10,7 +10,7 @@ Route::get('user-data', function() {
 
 	return DataTables::eloquent($model)
 			->orderByNullsLast()
-			->make(true);
+			->toJson();
 });
 ```
 
diff --git a/order-column.md b/order-column.md
@@ -14,6 +14,6 @@ Route::get('user-data', function() {
 
 	return DataTables::eloquent($model)
 				->orderColumn('name', '-name $1')
-				->make(true);
+				->toJson();
 });
 ```
diff --git a/order-columns.md b/order-columns.md
@@ -18,6 +18,6 @@ Route::get('user-data', function() {
 
 	return DataTables::eloquent($model)
 				->orderColumns(['name', 'email'], '-:column $1')
-				->make(true);
+				->toJson();
 });
 ```
diff --git a/query-builder.md b/query-builder.md
@@ -11,6 +11,6 @@ Route::get('user-data', function() {
 	$dataTable = DataTables::eloquent($model);
 	$dataTable->where('company_id', 2);
 
-	return $dataTable->make(true);
+	return $dataTable->toJson();
 });
 ```
diff --git a/raw-columns.md b/raw-columns.md
@@ -14,7 +14,7 @@ Route::get('user-data', function() {
 				->addColumn('link', '<a href="#">Html Column</a>')
 				->addColumn('action', 'path.to.view')
 				->rawColumns(['link', 'action'])
-				->make(true);
+				->toJson();
 });
 ```
 
diff --git a/relationships.md b/relationships.md
@@ -17,7 +17,7 @@ Route::get('user-data', function() {
                         return str_limit($post->title, 30, '...');
                     })->implode('<br>');
                 })
-				->make(true);
+				->toJson();
 });
 ```
 
diff --git a/remove-column.md b/remove-column.md
@@ -10,6 +10,6 @@ Route::get('user-data', function() {
 
 	return DataTables::eloquent($model)
 				->removeColumn('password')
-				->make(true);
+				->toJson();
 });
 ```
diff --git a/response-fractal-serializer.md b/response-fractal-serializer.md
@@ -11,6 +11,6 @@ Route::get('user-data', function() {
 	return DataTables::eloquent($model)
 					->setTransformer(new App\Transformers\UserTransformer)
 					->setSerializer(new App\Serializers\CustomSerializer)
-					->make(true);
+					->toJson();
 });
 ```
diff --git a/response-fractal.md b/response-fractal.md
@@ -12,7 +12,7 @@ Route::get('user-data', function() {
 
 	return DataTables::eloquent($model)
 				->setTransformer(new UserTransformer)
-				->make(true);
+				->toJson();
 });
 ```
 
diff --git a/response-object.md b/response-object.md
@@ -10,7 +10,7 @@ Route::get('user-data', function() {
 
 	return DataTables::eloquent($model)
 				->addColumn('intro', 'Hi {{$name}}!')
-				->make(true);
+				->toJson();
 });
 ```
 
diff --git a/response-with.md b/response-with.md
@@ -14,7 +14,7 @@ Route::get('user-data', function() {
 	return DataTables::eloquent($model)
 				->with('posts', 100)
 				->with('comments', 20)
-				->make(true);
+				->toJson();
 });
 ```
 
@@ -32,7 +32,7 @@ Route::get('user-data', function() {
 					'posts' => 100,
 					'comments' => 20,
 				])
-				->make(true);
+				->toJson();
 });
 ```
 
diff --git a/set-total-records.md b/set-total-records.md
@@ -11,6 +11,6 @@ Route::get('user-data', function() {
 
 	return DataTables::eloquent($model)
 				->setTotalRecords(100)
-				->make(true);
+				->toJson();
 });
 ```
diff --git a/skip-paging.md b/skip-paging.md
@@ -11,7 +11,7 @@ Route::get('user-data', function() {
 
 	return DataTables::eloquent($model)
 				->skipPaging()
-				->make(true);
+				->toJson();
 });
 ```
 
diff --git a/smart-search.md b/smart-search.md
@@ -11,6 +11,6 @@ Route::get('user-data', function() {
 
 	return DataTables::eloquent($model)
 					->smart(false)
-					->make(true);
+					->toJson();
 });
 ```
diff --git a/upgrade.md b/upgrade.md
@@ -158,7 +158,7 @@ All columns are now escaped by default to protect us from XSS attack. To allow c
 Datatables::of(User::query())
 	->addColumn('href', '<a href="#">Html Content</a>')
 	->rawColumns(['href'])
-	->make(true);
+	->toJson();
 ```
 
   
diff --git a/whitelist.md b/whitelist.md
diff --git a/with-trashed.md b/with-trashed.md
diff --git a/xss.md b/xss.md

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ use Yajra\DataTables\Html\Builder;`
`13`	`13`
`14`	`14`	`Route::get('users', function(Builder $builder) {`
`15`	`15`	`if (request()->ajax()) {`
`16`		`- return DataTables::of(User::query())->make(true);`
	`16`	`+ return DataTables::of(User::query())->toJson();`
`17`	`17`	`}`
`18`	`18`
`19`	`19`	`$html = $builder->columns([`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ use Yajra\DataTables\Html\Builder;`
`43`	`43`
`44`	`44`	`Route::get('users', function(Builder $builder) {`
`45`	`45`	`if (request()->ajax()) {`
`46`		`- return DataTables::of(User::query())->make(true);`
	`46`	`+ return DataTables::of(User::query())->toJson();`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`$html = $builder->columns([`
Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,6 @@ Route::get('user-data', function() {`
`19`	`19`	`$query->orderBy('email', 'desc');`
`20`	`20`	`}`
`21`	`21`	`})`
`22`		`- ->make(true);`
	`22`	`+ ->toJson();`
`23`	`23`	`});`
`24`	`24`	```