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

This commit is contained in:
Server D3 Linksehat
2025-09-22 16:07:43 +07:00
22 changed files with 1530 additions and 18 deletions

View File

@@ -346,6 +346,11 @@ class RequestLogController extends Controller
$requestLog->approved_at = Carbon::now();
}
if ($request->status_approval){
$requestLog->status_approval = $request->status_approval;
$requestLog->approval_nominal_by = auth()->user()->id;
}
$requestLog->save();
// update nirc member
@@ -1224,6 +1229,34 @@ class RequestLogController extends Controller
]);
}
}
return Helper::responseJson(data: $request->toArray(), message: 'File Success Uploaded');
}
public function approvalFiles(Request $request, $id)
{
Helper::setCustomPHPIniSettings();
$requestLog = RequestLog::findOrFail($id);
$nominal = $request->nominal;
if($nominal){
$requestLog->nominal = $nominal;
$requestLog->save();
}
if ($request->hasFile('approval_files')) {
foreach ($request->approval_files as $file) {
$fileData = File::storeFile('approval', $id, $file);
$requestLog->files()->updateOrCreate([
'type' => 'approval',
'name' => $fileData['name'],
'original_name' => $file->getClientOriginalName(),
'extension' => $file->getClientOriginalExtension(),
'source' => env('FILESYSTEM_DISK'),
'path' => $fileData['path'],
'created_by' => auth()->user()->id,
'updated_by' => auth()->user()->id,
'reason' => $request->reason,
]);
}
}
return Helper::responseJson(data: $request->toArray(), message: 'File Success Uploaded');
}

View File

@@ -323,6 +323,7 @@ Route::prefix('internal')->group(function () {
Route::post('customer-service/request/exportFiledInvoice', [RequestLogController::class, 'exportFiledInvoice']);
Route::get('customer-service/request/data', [RequestLogController::class, 'generateDataRequestLogExcel']);
Route::post('customer-service/request/{id}/add_file', [RequestLogController::class, 'requestFiles']);
Route::post('customer-service/request/{id}/approval_files', [RequestLogController::class, 'approvalFiles']);
Route::post('customer-service/request/{id}/delete_file', [RequestLogController::class, 'deleteFiles']);
Route::post('customer-service/request/final-log', [RequestLogController::class, 'updateFinalLog']);

View File

@@ -31,6 +31,8 @@ class RequestLogResource extends JsonResource
'status' => $this->status ?? 'unknown',
'provider' => $provider ? $provider->name : '-',
'status_final_log' => $this->status_final_log ?? 'unknown',
'nominal' => $this->nominal ?? 'unknown',
'status_approval' => $this->status_approval ?? 'requested',
'service_name' => $this->service ? $this->service->name : '',
'payment_type' => $this->payment_type,
'payment_type_name' => $this->payment_type_name,

View File

@@ -33,7 +33,7 @@ class RequestLogShowResource extends JsonResource
$corporateId = $requestLog['member']['current_plan']['corporate_id'] ?? 0;
$member_id = $requestLog['member_id'];
$planMember = MemberPlan::where('member_id', $member_id)->get('plan_id');
$planId = Plan::whereIn('id', $planMember)->where('service_code', $requestLog['service_code'])->first();
$benefit = CorporateBenefit::with(['benefit', 'plan'])->where('plan_id', $planId->id)->get()->toArray();
$benefitDetailLog = RequestLogBenefit::with('benefit')->where('request_log_id', $requestLog['id'])->get()->toArray();
@@ -174,9 +174,12 @@ class RequestLogShowResource extends JsonResource
'keterangan' => $requestLog['keterangan'],
'hak_kamar_pasien' => $requestLog['hak_kamar_pasien'],
'penempatan_kamar' => $requestLog['penempatan_kamar'],
'nominal' => $requestLog['nominal'],
'status_approval' => $requestLog['status_approval'],
'catatan' => $requestLog['catatan'],
'reason' => $requestLog['reason'],
'diagnosis' => $icd,
'url_approval' => env('LMS_WEB_URL') . '/custormer-service/final-log/detail/'.$requestLog['id'] . '/' . auth()->user()->id,
'is_reversal' => $isReversal, // untuk penjagaan, jika true tidak bisa di edit/hapus lagi