tbfajri/aso
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

add switch corporate & fix table & fix policy

Browse Source
This commit is contained in:
Muhammad Fajar
2022-12-08 08:51:25 +07:00
parent df34c3919d
commit 0c9362334c
17 changed files with 227 additions and 174 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Modules/Client/Http/Controllers/Api/CorporateController.php → Modules/Client/Http/Controllers/Api/CorporateManageController.php
View File

@@ -7,7 +7,7 @@ use Illuminate\Http\Request;
use Illuminate\Routing\Controller;
use Illuminate\Support\Facades\Auth;
class CorporateController extends Controller
class CorporateManageController extends Controller
{
/**
* Display a listing of the resource.
@@ -18,8 +18,6 @@ class CorporateController extends Controller
$userLogin = Auth::user();
$corporate = $userLogin->managedCorporates()->select(['corporates.id', 'corporates.name'])->get();
// corporate policy, all member list, notification
return response()->json($corporate);
}

4
Modules/Client/Http/Controllers/Api/DashboardController.php → Modules/Client/Http/Controllers/Api/CorporatePolicyController.php
View File

@@ -8,7 +8,7 @@ use Illuminate\Routing\Controller;
use Illuminate\Support\Facades\Auth;
use Modules\Client\Transformers\DashboardResources;
class DashboardController extends Controller
class CorporatePolicyController extends Controller
{
/**
* Display a listing of the resource.
@@ -20,7 +20,7 @@ class DashboardController extends Controller
$currentCorporate = $user->managedCorporates()
->with(['currentPolicy', 'employees'])
->find($corporate_id);
$data = DashboardResources::make($currentCorporate);
return response()->json($data);

12
Modules/Client/Http/Controllers/Api/DivisionController.php
View File

@@ -15,17 +15,13 @@ class DivisionController extends Controller
* Display a listing of the resource.
* @return Renderable
*/
public function index(Request $request)
public function index(Request $request, $corporate_id)
{
$user = Auth::user();
$corporate = $user->managedCorporates()->where('active', 1)->first();
$benefits = CorporateDivision::query()
->where('corporate_id', $corporate->id)
$division = CorporateDivision::query()
->where('corporate_id', $corporate_id)
->get(['id', 'name']);
return $benefits;
return response()->json($division);
}
/**

35
Modules/Client/Http/Controllers/Api/MemberController.php
View File

@@ -7,6 +7,7 @@ use App\Models\Member;
use Illuminate\Contracts\Support\Renderable;
use Illuminate\Http\Request;
use Illuminate\Routing\Controller;
use Modules\Client\Transformers\MemberResources;
class MemberController extends Controller
{
@@ -14,29 +15,25 @@ class MemberController extends Controller
* Display a listing of the resource.
* @return Renderable
*/
public function index(Request $request)
public function index(Request $request, $corporate_id)
{
$user = auth()->user();
$corporate = $user->managedCorporates()->first();
// $plans =
$limit = $request->has('per_page') ? $request->per_page : 10;
$members = Member::query()
->whereHas('employeds', function($corporateEmployee) use ($corporate) {
$corporateEmployee->where('corporate_id', $corporate->id);
});
if ($request->has('search')) {
$members
->where('member_id', 'like', "%" . $request->search . "%")
->orWhere('payor_id', 'like', "%" . $request->search . "%")
->orWhere('name', 'like', "%" . $request->search . "%");
}
->whereHas('employeds', function ($corporateEmployee) use ($corporate_id) {
$corporateEmployee->where('corporate_id', $corporate_id);
})->when($request->input('division'), function ($division, $division_id) {
$division->whereHas('division', function ($corporateEmployee) use ($division_id) {
$corporateEmployee->where('division_id', $division_id);
});
})->when($request->input('search'), function ($query, $search) {
$query->where('member_id', 'like', "%" . $search . "%")
->orWhere('name', 'like', "%" . $search . "%");
})->when($request->has('orderBy'), function ($query) use ($request) {
$query->orderBy($request->orderBy, $request->order);
})->paginate($limit);
$members = $members->paginate();
return response()->json([
'members' => Helper::paginateResources($members)
]);
return response()->json(Helper::paginateResources(MemberResources::collection($members)));
}
/**