TPS
/
exchange
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'dev'

This commit is contained in:
saparatayev 2022-05-10 14:07:35 +05:00
parent b22366c523 a1faa4b947
commit 7ead459de4
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/Http/Controllers/Api/ExportController.php
View File

@ -13,6 +13,7 @@ class ExportController extends ApiBaseController
public function index(Request $request)
{
$validator = Validator::make($request->all(), array_merge([
'per_page' => 'numeric|gt:0',
'page' => 'numeric|gt:0',
'group' => 'required|exists:groups,id',
'category' => 'exists:categories,id',
@ -34,7 +35,7 @@ class ExportController extends ApiBaseController
->when(request('type'), fn ($q) => $q->where('type', request('type')));
return response()->json([
'exports' => ExportResource::collection($exports->simplePaginate(5)),
'exports' => ExportResource::collection($exports->simplePaginate(request('per_page') ?? 7)),
], 200);
}
}

3
app/Http/Controllers/Api/ImportController.php
View File

@ -13,6 +13,7 @@ class ImportController extends ApiBaseController
public function index(Request $request)
{
$validator = Validator::make($request->all(), array_merge([
'per_page' => 'numeric|gt:0',
'page' => 'numeric|gt:0',
'group' => 'required|exists:groups,id'
], $this->localeValidationRule()));
@ -31,7 +32,7 @@ class ImportController extends ApiBaseController
// ->when(request('registered_at'), fn ($q) => $q->whereDate('registered_at', request('registered_at')));
return response()->json([
'imports' => ImportResource::collection($imports->simplePaginate(5)),
'imports' => ImportResource::collection($imports->simplePaginate(request('per_page') ?? 7)),
], 200);
}
}