fix datatable using token api and paginate when searching, fix skrd_amount column to decimal 20
This commit is contained in:
@@ -8,6 +8,7 @@ use App\Http\Resources\GlobalSettingResource;
|
||||
use App\Models\GlobalSetting;
|
||||
use App\Traits\GlobalApiResponse;
|
||||
use Exception;
|
||||
use Illuminate\Http\Request;
|
||||
|
||||
class GlobalSettingsController extends Controller
|
||||
{
|
||||
@@ -15,9 +16,13 @@ class GlobalSettingsController extends Controller
|
||||
/**
|
||||
* Display a listing of the resource.
|
||||
*/
|
||||
public function index()
|
||||
public function index(Request $request)
|
||||
{
|
||||
$query = GlobalSetting::query()->orderBy('id','desc');
|
||||
if($request->has('search') && !empty($request->get("search"))){
|
||||
$query->where('key', 'LIKE', '%'.$request->get('search').'%');
|
||||
}
|
||||
|
||||
return GlobalSettingResource::collection($query->paginate());
|
||||
}
|
||||
|
||||
|
||||
@@ -20,7 +20,7 @@ class ImportDatasourceController extends Controller
|
||||
$search = $request->get("search");
|
||||
$query->where('status', 'like', "%".$search."%");
|
||||
}
|
||||
return ImportDatasourceResource::collection($query->paginate(10));
|
||||
return ImportDatasourceResource::collection($query->paginate());
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -12,9 +12,12 @@ class RequestAssignmentController extends Controller
|
||||
/**
|
||||
* Display a listing of the resource.
|
||||
*/
|
||||
public function index()
|
||||
public function index(Request $request)
|
||||
{
|
||||
$query = PbgTask::query();
|
||||
if($request->has('search') && !empty($request->get("search"))){
|
||||
$query->where('name', 'LIKE', '%'.$request->get('search').'%');
|
||||
}
|
||||
return RequestAssignmentResouce::collection($query->paginate());
|
||||
}
|
||||
|
||||
|
||||
@@ -4,12 +4,15 @@ namespace App\Http\Controllers\Api;
|
||||
|
||||
use App\Http\Controllers\Controller;
|
||||
use App\Http\Requests\Auth\LoginRequest;
|
||||
use App\Http\Resources\UserResource;
|
||||
use App\Models\User;
|
||||
use App\Traits\GlobalApiResponse;
|
||||
use Illuminate\Support\Facades\Hash;
|
||||
use Illuminate\Http\Request;
|
||||
|
||||
class UsersController extends Controller
|
||||
{
|
||||
use GlobalApiResponse;
|
||||
public function login(LoginRequest $request){
|
||||
$user = User::where('email', $request->email)->first();
|
||||
|
||||
@@ -21,7 +24,15 @@ class UsersController extends Controller
|
||||
|
||||
return response(['user' => $user, 'token' => $token], 200);
|
||||
}
|
||||
public function index(){
|
||||
return response()->json(User::all());
|
||||
public function index(Request $request){
|
||||
$query = User::query();
|
||||
if($request->has('search') && !empty($request->get("search"))){
|
||||
$query->where('name', 'LIKE', '%'.$request->get('search').'%');
|
||||
}
|
||||
return UserResource::collection($query->paginate());
|
||||
}
|
||||
public function logout(Request $request){
|
||||
$request->user()->tokens()->delete();
|
||||
return response()->json(['message' => 'logged out successfully']);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user