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

Merge remote-tracking branch 'origin/staging' into origin/production

Browse Source
This commit is contained in:
Linksehat Staging Server
2024-03-05 13:14:56 +07:00
parent 2c9977c860 09c976ce3b
commit c1b1270972
19 changed files with 812 additions and 179 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Modules/Internal/Http/Controllers/Api/ClaimRequestController.php
View File

@@ -231,13 +231,13 @@ class ClaimRequestController extends Controller
{
$claimRequest = ClaimRequest::findOrFail($id);
$claimRequest->load([
'histories' => function ($history) {
$history->latest();
'requestLog',
'requestLog.organization',
'requestLog.member',
'member.currentPlan' => function($memberPlan) {
$memberPlan->join('claim_requests', 'claim_requests.service_code', '=', 'plans.service_code');
},
'files',
'member',
'claim',
'organization',
'requestLog.files',
]);
return Helper::responseJson(data: ClaimRequestShowResource::make($claimRequest));

10
Modules/Internal/Http/Controllers/Api/RequestLogBenefitController.php
View File

@@ -74,6 +74,7 @@ class RequestLogBenefitController extends Controller
'excess_paid' => $value['excess_paid'],
'keterangan' => $value['keterangan'],
'created_by' => auth()->user()->id,
'reason' => $value['reason'] ? $value['reason'] : null ,
];
// Insert Data
@@ -121,6 +122,7 @@ class RequestLogBenefitController extends Controller
$requestLogBenefit->keterangan = $request->keterangan;
$requestLogBenefit->updated_by = auth()->user()->id;
$requestLogBenefit->updated_at = Carbon::now();
$requestLogBenefit->reason = $request->reason;
$requestLogBenefit->save();
@@ -136,10 +138,14 @@ class RequestLogBenefitController extends Controller
* @param int $id
* @return Renderable
*/
public function destroy($id)
public function destroy(Request $request, $id)
{
$requestLogBenefit = RequestLogBenefit::findOrFail($id);
$requestLogBenefit->delete();
$requestLogBenefit->reason = 'Reason Delete ' .$request->reason;
$requestLogBenefit->deleted_at = Carbon::now();
$requestLogBenefit->deleted_by = auth()->user()->id;
$requestLogBenefit->save();
}
}