solve conflict
This commit is contained in:
@@ -108,18 +108,15 @@ class CorporateBenefitController extends Controller
|
||||
{
|
||||
|
||||
$corporateBenefit = CorporateBenefit::findOrFail($id);
|
||||
|
||||
$request->validate([
|
||||
'code' => [
|
||||
'budget' => [
|
||||
'required',
|
||||
Rule::unique('corporate_plans')->where('corporate_id', $corporate_id)->ignore($corporateBenefit->id)
|
||||
],
|
||||
'name' => 'required'
|
||||
]);
|
||||
|
||||
$corporateBenefit->fill([
|
||||
'code' => $request->code,
|
||||
'name' => $request->name,
|
||||
'active' => $request->active,
|
||||
'budget' => $request->budget,
|
||||
])->save();
|
||||
|
||||
return $corporateBenefit;
|
||||
|
||||
@@ -381,13 +381,15 @@ class CorporateController extends Controller
|
||||
public function activation(Request $request, $corporate_id)
|
||||
{
|
||||
$request->validate([
|
||||
'active' => 'required'
|
||||
'active' => 'required',
|
||||
'reason' => 'required'
|
||||
]);
|
||||
|
||||
// abort(404);
|
||||
|
||||
$corporate = Corporate::findOrFail($corporate_id);
|
||||
$corporate->active = $request->active == '1';
|
||||
$corporate->reason = $request->reason;
|
||||
|
||||
if ($corporate->save()) {
|
||||
return response()->json([
|
||||
|
||||
@@ -6,6 +6,7 @@ use App\Exceptions\ImportRowException;
|
||||
use App\Helpers\Helper;
|
||||
use App\Models\CorporateFormularium;
|
||||
use App\Models\Formularium;
|
||||
use App\Models\FormulariumTemplate;
|
||||
use App\Services\ImportService;
|
||||
use Illuminate\Contracts\Support\Renderable;
|
||||
use Illuminate\Http\Request;
|
||||
@@ -52,9 +53,16 @@ class CorporateFormulariumController extends Controller
|
||||
* Show the form for creating a new resource.
|
||||
* @return Renderable
|
||||
*/
|
||||
public function create()
|
||||
public function create(Request $request, $corporate_id)
|
||||
{
|
||||
return view('internal::create');
|
||||
$data = CorporateFormularium::where('corporate_id', $corporate_id)->pluck('formularium_template_id')->toArray(); // agar tidak dobel
|
||||
$formularium_template = FormulariumTemplate::whereNotIn('id', $data)->get();
|
||||
$respone = [
|
||||
"status" => 200,
|
||||
"message" => 'data berhasil diambil',
|
||||
"data" => $formularium_template
|
||||
];
|
||||
return $respone;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -62,9 +70,36 @@ class CorporateFormulariumController extends Controller
|
||||
* @param Request $request
|
||||
* @return Renderable
|
||||
*/
|
||||
public function store(Request $request)
|
||||
public function store(Request $request, $corporate_id)
|
||||
{
|
||||
//
|
||||
$request->validate([
|
||||
'id' => 'required'
|
||||
]);
|
||||
|
||||
$checkFormularium = FormulariumTemplate::find($request->id);
|
||||
if (!$checkFormularium){
|
||||
$respone = [
|
||||
"status" => 404,
|
||||
"message" => "data master formularium tidak ditemukan",
|
||||
"data" => []
|
||||
];
|
||||
return $respone;
|
||||
}
|
||||
$newCorporateFormularium = CorporateFormularium::create([
|
||||
'corporate_id' => $corporate_id,
|
||||
'formularium_template_id' => $request->id,
|
||||
'active' => 1
|
||||
]);
|
||||
|
||||
if ($newCorporateFormularium){
|
||||
$respone = [
|
||||
"status" => 200,
|
||||
"message" => "data berhasil disimpan"
|
||||
];
|
||||
return $respone;
|
||||
}
|
||||
|
||||
return $newCorporatePlan;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -72,9 +107,15 @@ class CorporateFormulariumController extends Controller
|
||||
* @param int $id
|
||||
* @return Renderable
|
||||
*/
|
||||
public function show($id)
|
||||
public function show(Request $request, $corporate_id, $id)
|
||||
{
|
||||
return view('internal::show');
|
||||
$data = Formularium::where('formularium_template_id', $id)->get();
|
||||
$respone = [
|
||||
"status" => 200,
|
||||
"message" => 'data berhasil diambil',
|
||||
"data" => $data
|
||||
];
|
||||
return $respone;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -82,9 +123,16 @@ class CorporateFormulariumController extends Controller
|
||||
* @param int $id
|
||||
* @return Renderable
|
||||
*/
|
||||
public function edit($id)
|
||||
public function edit(Request $request, $corporate_id)
|
||||
{
|
||||
return view('internal::edit');
|
||||
$data = CorporateFormularium::where('corporate_id', $corporate_id)->pluck('formularium_template_id')->toArray(); // agar tidak dobel
|
||||
$formularium_template = FormulariumTemplate::whereNotIn('id', $data)->get();
|
||||
$respone = [
|
||||
"status" => 200,
|
||||
"message" => 'data berhasil diambil',
|
||||
"data" => $formularium_template
|
||||
];
|
||||
return $respone;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -139,6 +187,22 @@ class CorporateFormulariumController extends Controller
|
||||
}
|
||||
}
|
||||
|
||||
public function active(Request $request, $corporate_id, $id)
|
||||
{
|
||||
$corporateFormularium = CorporateFormularium::find($id);
|
||||
$corporateFormularium->fill([
|
||||
'active' => $request->active,
|
||||
])->save();
|
||||
|
||||
$respone = [
|
||||
"status" => 200,
|
||||
"message" => 'data berhasil diedit',
|
||||
"data" => $corporateFormularium
|
||||
];
|
||||
|
||||
return $respone;
|
||||
}
|
||||
|
||||
public function import(Request $request, $id)
|
||||
{
|
||||
$request->validate([
|
||||
|
||||
@@ -69,13 +69,14 @@ class CorporateMemberController extends Controller
|
||||
public function activation(Request $request, $member_id)
|
||||
{
|
||||
$request->validate([
|
||||
'active' => 'required'
|
||||
'active' => 'required',
|
||||
'reason' => 'required',
|
||||
]);
|
||||
|
||||
// abort(404);
|
||||
|
||||
$member = Member::findOrFail($member_id);
|
||||
$member->active = $request->active == '1';
|
||||
$member->active = $request->active;
|
||||
$member->reason = $request->reason;
|
||||
|
||||
if ($member->save()) {
|
||||
|
||||
@@ -34,7 +34,7 @@ class CorporatePlanController extends Controller
|
||||
// abort(404);
|
||||
|
||||
$plan = CorporatePlan::findOrFail($plan_id);
|
||||
$plan->active = $request->active == '1';
|
||||
$plan->active = $request->active == 1 ? 0 : 1;
|
||||
$plan->reason = $request->reason;
|
||||
|
||||
if ($plan->save()) {
|
||||
@@ -110,21 +110,21 @@ class CorporatePlanController extends Controller
|
||||
public function update(Request $request, $corporate_id, $id)
|
||||
{
|
||||
$corporatePlan = CorporatePlan::findOrFail($id);
|
||||
|
||||
$request->validate([
|
||||
'code' => [
|
||||
'required',
|
||||
Rule::unique('corporate_plans')->where('corporate_id', $corporate_id)->ignore($corporatePlan->id)
|
||||
// Rule::unique('corporate_plans')->where('corporate_id', $corporate_id)->ignore($corporatePlan->id)
|
||||
],
|
||||
'name' => 'required'
|
||||
]);
|
||||
|
||||
$corporatePlan->fill([
|
||||
'code' => $request->code,
|
||||
'name' => $request->name,
|
||||
'active' => $request->active,
|
||||
'description' => $request->description
|
||||
'corporate_plan_id' => $request->plan,
|
||||
'service_code' => $request->service,
|
||||
'type' => $request->type,
|
||||
'limit_rules' => $request->limit
|
||||
])->save();
|
||||
|
||||
|
||||
return $corporatePlan;
|
||||
}
|
||||
|
||||
|
||||
@@ -144,7 +144,7 @@ class CorporateServiceController extends Controller
|
||||
// ->with('configs', 'service')
|
||||
->first();
|
||||
$corporateService->fill([
|
||||
'status' => $request->status == 'active' ? 'active' : 'inactive',
|
||||
'status' => $request->status == 'active' ? 'inactive' : 'active',
|
||||
'reason' => $request->reason
|
||||
]);
|
||||
$corporateService->save();
|
||||
|
||||
153
Modules/Internal/Http/Controllers/Api/HospitalController.php
Normal file
153
Modules/Internal/Http/Controllers/Api/HospitalController.php
Normal file
@@ -0,0 +1,153 @@
|
||||
<?php
|
||||
|
||||
namespace Modules\Internal\Http\Controllers\Api;
|
||||
|
||||
use App\Models\CorporateHospital;
|
||||
use Illuminate\Contracts\Support\Renderable;
|
||||
use Illuminate\Http\Request;
|
||||
use Illuminate\Routing\Controller;
|
||||
use Illuminate\Validation\Rule;
|
||||
use Illuminate\Support\Facades\DB;
|
||||
|
||||
class HospitalController extends Controller
|
||||
{
|
||||
/**
|
||||
* Display a listing of the resource.
|
||||
* @return Renderable
|
||||
*/
|
||||
public function index(Request $request, $corporate_id)
|
||||
{
|
||||
$datas = CorporateHospital::query()
|
||||
->filter($request->all())
|
||||
->where('corporate_id', $corporate_id)
|
||||
->orderBy('id', 'DESC')
|
||||
->paginate(0)
|
||||
->appends($request->all());
|
||||
|
||||
return $datas;
|
||||
}
|
||||
|
||||
public function activation(Request $request, $hospital_id)
|
||||
{
|
||||
$request->validate([
|
||||
'active' => 'required',
|
||||
'reason' => 'required',
|
||||
]);
|
||||
|
||||
// abort(404);
|
||||
|
||||
$hostpital = CorporateHospital::findOrFail($hospital_id);
|
||||
$hostpital->active = $request->active;
|
||||
$hostpital->reason = $request->reason;
|
||||
|
||||
if ($hostpital->save()) {
|
||||
return response()->json([
|
||||
'hostpital' => $hostpital,
|
||||
'message' => 'Status Updated Successfully'
|
||||
]);
|
||||
}
|
||||
}
|
||||
|
||||
public function dataHospital(Request $request, $corporate_id)
|
||||
{
|
||||
$data = DB::table('organizations')
|
||||
->where('type', 'hospital')
|
||||
->where('status', 'active')
|
||||
->orderBy('id', 'desc')
|
||||
->get();
|
||||
return $data;
|
||||
}
|
||||
|
||||
/**
|
||||
* Show the form for creating a new resource.
|
||||
* @return Renderable
|
||||
*/
|
||||
public function create()
|
||||
{
|
||||
return view('internal::create');
|
||||
}
|
||||
|
||||
/**
|
||||
* Store a newly created resource in storage.
|
||||
* @param Request $request
|
||||
* @return Renderable
|
||||
*/
|
||||
public function store(Request $request, $corporate_id)
|
||||
{
|
||||
$request->validate([
|
||||
'corporate_id' => 'required',
|
||||
'code' => 'required',
|
||||
'name' => 'required',
|
||||
'organization_id' => 'required',
|
||||
]);
|
||||
|
||||
$newCorporateHospital = CorporateHospital::create([
|
||||
'corporate_id' => $corporate_id,
|
||||
'code' => $request->code,
|
||||
'name' => $request->name,
|
||||
'organization_id' => $request->organization_id,
|
||||
'description' => $request->description ? $request->description : null,
|
||||
]);
|
||||
|
||||
return $newCorporateHospital;
|
||||
}
|
||||
|
||||
/**
|
||||
* Show the specified resource.
|
||||
* @param int $id
|
||||
* @return Renderable
|
||||
*/
|
||||
public function show($id)
|
||||
{
|
||||
return view('internal::show');
|
||||
}
|
||||
|
||||
/**
|
||||
* Show the form for editing the specified resource.
|
||||
* @param int $id
|
||||
* @return Renderable
|
||||
*/
|
||||
public function edit($corporate_id, $id)
|
||||
{
|
||||
$corporatePlan = CorporateDivision::findOrFail($id);
|
||||
|
||||
return $corporatePlan;
|
||||
}
|
||||
|
||||
/**
|
||||
* Update the specified resource in storage.
|
||||
* @param Request $request
|
||||
* @param int $id
|
||||
* @return Renderable
|
||||
*/
|
||||
public function update(Request $request, $corporate_id, $id)
|
||||
{
|
||||
$corporatePlan = CorporateHospital::findOrFail($id);
|
||||
$request->validate([
|
||||
'corporate_id' => 'required',
|
||||
'code' => 'required',
|
||||
'name' => 'required',
|
||||
'organization_id' => 'required',
|
||||
]);
|
||||
|
||||
$corporatePlan->fill([
|
||||
'corporate_id' => $corporate_id,
|
||||
'code' => $request->code,
|
||||
'name' => $request->name,
|
||||
'organization_id' => $request->organization_id,
|
||||
'description' => $request->description ? $request->description : null,
|
||||
])->save();
|
||||
|
||||
return $corporatePlan;
|
||||
}
|
||||
|
||||
/**
|
||||
* Remove the specified resource from storage.
|
||||
* @param int $id
|
||||
* @return Renderable
|
||||
*/
|
||||
public function destroy($id)
|
||||
{
|
||||
//
|
||||
}
|
||||
}
|
||||
86
Modules/Internal/Http/Controllers/Api/ServiceController.php
Normal file
86
Modules/Internal/Http/Controllers/Api/ServiceController.php
Normal file
@@ -0,0 +1,86 @@
|
||||
<?php
|
||||
|
||||
namespace Modules\Internal\Http\Controllers\Api;
|
||||
|
||||
use App\Models\Service;
|
||||
use Illuminate\Contracts\Support\Renderable;
|
||||
use Illuminate\Http\Request;
|
||||
use Illuminate\Routing\Controller;
|
||||
|
||||
class ServiceController extends Controller
|
||||
{
|
||||
/**
|
||||
* Display a listing of the resource.
|
||||
* @return Renderable
|
||||
*/
|
||||
public function index(Request $request)
|
||||
{
|
||||
$service = Service::orderBy('name', 'ASC')->get();
|
||||
|
||||
if (empty($service)) {
|
||||
return response(['message' => 'Tidak ada data'], 404);
|
||||
} else {
|
||||
return response(['message' => 'Data ditemukan', "status" => 200, 'data' => $service]);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Show the form for creating a new resource.
|
||||
* @return Renderable
|
||||
*/
|
||||
public function create()
|
||||
{
|
||||
return view('internal::create');
|
||||
}
|
||||
|
||||
/**
|
||||
* Store a newly created resource in storage.
|
||||
* @param Request $request
|
||||
* @return Renderable
|
||||
*/
|
||||
public function store(Request $request)
|
||||
{
|
||||
//
|
||||
}
|
||||
|
||||
/**
|
||||
* Show the specified resource.
|
||||
* @param int $id
|
||||
* @return Renderable
|
||||
*/
|
||||
public function show($id)
|
||||
{
|
||||
return view('internal::show');
|
||||
}
|
||||
|
||||
/**
|
||||
* Show the form for editing the specified resource.
|
||||
* @param int $id
|
||||
* @return Renderable
|
||||
*/
|
||||
public function edit($id)
|
||||
{
|
||||
return view('internal::edit');
|
||||
}
|
||||
|
||||
/**
|
||||
* Update the specified resource in storage.
|
||||
* @param Request $request
|
||||
* @param int $id
|
||||
* @return Renderable
|
||||
*/
|
||||
public function update(Request $request, $id)
|
||||
{
|
||||
//
|
||||
}
|
||||
|
||||
/**
|
||||
* Remove the specified resource from storage.
|
||||
* @param int $id
|
||||
* @return Renderable
|
||||
*/
|
||||
public function destroy($id)
|
||||
{
|
||||
//
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user