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-02-09 14:49:57 +07:00
parent 0b4f5fd478 5d3a41c81b
commit f8f9356d4d
11 changed files with 560 additions and 434 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Modules/Internal/Http/Controllers/Api/DailyMonitoringController.php
View File

@@ -312,13 +312,14 @@ class DailyMonitoringController extends Controller
$name = 'labresult-' . uniqid();
$extension= $file->getClientOriginalExtension();
$fileName = $name . '.' . $extension;
$orignalName = $file->getClientOriginalName();
$path = $file->storeAs($this->path_for_store, $fileName);
File::create([
'fileable_type' => 'App\Models\LaboratoriumResult',
'fileable_id' => $db_response->id,
'type' => 'confirmation-medical-letter',
'name' => $name,
'original_name' => $fileName,
'original_name' => $orignalName,
'extension' => $extension,
'path' => $path,
]);
@@ -330,13 +331,14 @@ class DailyMonitoringController extends Controller
$name = 'labresult-' . uniqid();
$extension= $file->getClientOriginalExtension();
$fileName = $name . '.' . $extension;
$orignalName = $file->getClientOriginalName();
$path = $file->storeAs($this->path_for_store, $fileName);
File::create([
'fileable_type' => 'App\Models\LaboratoriumResult',
'fileable_id' => $db_response->id,
'type' => 'medical-action-letter',
'name' => $name,
'original_name' => $fileName,
'original_name' => $orignalName,
'extension' => $extension,
'path' => $path,
]);
@@ -348,6 +350,7 @@ class DailyMonitoringController extends Controller
foreach ($request->result as $file) {
$name = 'labresult-' . uniqid();
$extension= $file->getClientOriginalExtension();
$orignalName = $file->getClientOriginalName();
$fileName = $name . '.' . $extension;
$path = $file->storeAs($this->path_for_store, $fileName);
File::create([
@@ -355,7 +358,7 @@ class DailyMonitoringController extends Controller
'fileable_id' => $db_response->id,
'type' => 'laboratorium-result',
'name' => $name,
'original_name' => $fileName,
'original_name' => $orignalName,
'extension' => $extension,
'path' => $path,
]);

109
Modules/Internal/Http/Controllers/Api/RequestLogController.php
View File

@@ -106,64 +106,67 @@ class RequestLogController extends Controller
]);
if ($request->member_id){
$code = $this->getNextCode($request);
$member = Member::find($request->member_id);
try {
$code = !empty($this->getNextCode($request)) ? $this->getNextCode($request) : null;
$member = Member::find($request->member_id);
$memberValid = false;
if ($member){
if (($member->members_effective_date <= date('Y-m-d')) &&
($member->members_expire_date >= date('Y-m-d')) &&
($member->active == 1) &&
($member->suspended == 'N')
){
DB::beginTransaction();
try {
$newRequestLog = AppRequestLogService::storeRequestLog(
row: [],
code: $code,
member: $member,
paymentType: 'cashless',
serviceCode: $request->service_code,
submissionDate: $request->submission_date,
// status: 'approved',
status: 'requested', // di nonaktifkan dulu auto approved
organization_id: $request->organization_id,
source: $request->source
);
$memberValid = false;
if ($member){
if (($member->members_effective_date <= date('Y-m-d')) &&
($member->members_expire_date >= date('Y-m-d')) &&
($member->active == 1) &&
($member->suspended == 'N')
){
DB::beginTransaction();
try {
$newRequestLog = AppRequestLogService::storeRequestLog(
row: [],
code: $code,
member: $member,
paymentType: 'cashless',
serviceCode: $request->service_code,
submissionDate: $request->submission_date,
// status: 'approved',
status: 'requested', // di nonaktifkan dulu auto approved
organization_id: $request->organization_id,
source: $request->source
);
DB::commit();
DB::commit();
}
catch (\Throwable $th) {
DB::rollBack();
return Helper::responseJson(status: 'failed', statusCode: 500, message: $th->getMessage());
}
} else {
DB::beginTransaction();
try {
$newRequestLog = AppRequestLogService::storeRequestLog(
row: [],
code: $code,
member: $member,
paymentType: 'cashless',
serviceCode: $request->service_code,
submissionDate: $request->submission_date,
status: 'requested',
organization_id: $request->organization_id,
source: $request->source
);
DB::commit();
}
catch (\Throwable $th) {
DB::rollBack();
return Helper::responseJson(status: 'failed', statusCode: 500, message: $th->getMessage());
}
// return Helper::responseJson(status: 'failed', statusCode: 500, message: 'Member Not Valid');
}
catch (\Throwable $th) {
DB::rollBack();
return Helper::responseJson(status: 'failed', statusCode: 500, message: $th->getMessage());
}
} else {
DB::beginTransaction();
try {
$newRequestLog = AppRequestLogService::storeRequestLog(
row: [],
code: $code,
member: $member,
paymentType: 'cashless',
serviceCode: $request->service_code,
submissionDate: $request->submission_date,
status: 'requested',
organization_id: $request->organization_id,
source: $request->source
);
DB::commit();
}
catch (\Throwable $th) {
DB::rollBack();
return Helper::responseJson(status: 'failed', statusCode: 500, message: $th->getMessage());
}
// return Helper::responseJson(status: 'failed', statusCode: 500, message: 'Member Not Valid');
}
} catch (\Throwable $th) {
return Helper::responseJson(status: 'failed', statusCode: 500, message: $th->getMessage());
}
}
return Helper::responseJson(status: 'success', statusCode: 200, message: 'Request LOG berhasil ajukan!', data: $request->toArray());