Merge branch 'staging' of https://dev.sismedika.online/febio/aso into staging
This commit is contained in:
@@ -147,18 +147,18 @@ class RequestLogController extends Controller
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
return ApiResponse::apiResponse('requestLogControllerInstance1', $data, trans('Message.server_error'), 500);
|
return ApiResponse::apiResponse('Server Error', $data, trans('Message.server_error'), 500);
|
||||||
}
|
}
|
||||||
} catch (\Exception $e) {
|
} catch (\Exception $e) {
|
||||||
// Tangani kesalahan di sini
|
// Tangani kesalahan di sini
|
||||||
return ApiResponse::apiResponse('requestLogControllerInstance2', $data, $e->getMessage(), 500);
|
return ApiResponse::apiResponse('Server Error', $data, $e->getMessage(), 500);
|
||||||
}
|
}
|
||||||
} catch (\Exception $e) {
|
} catch (\Exception $e) {
|
||||||
// Rollback transaksi jika terjadi kesalahan
|
// Rollback transaksi jika terjadi kesalahan
|
||||||
DB::rollBack();
|
DB::rollBack();
|
||||||
|
|
||||||
// Handle error, bisa di-log atau dikembalikan sebagai response
|
// Handle error, bisa di-log atau dikembalikan sebagai response
|
||||||
return ApiResponse::apiResponse('requestLogControllerInstance3', $data, $e->getMessage(), 500);
|
return ApiResponse::apiResponse('Server Error', $data, $e->getMessage(), 500);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -106,64 +106,67 @@ class RequestLogController extends Controller
|
|||||||
]);
|
]);
|
||||||
|
|
||||||
if ($request->member_id){
|
if ($request->member_id){
|
||||||
$code = !empty($this->getNextCode($request)) ? $this->getNextCode($request) : '0000';
|
try {
|
||||||
$member = Member::find($request->member_id);
|
$code = !empty($this->getNextCode($request)) ? $this->getNextCode($request) : null;
|
||||||
|
$member = Member::find($request->member_id);
|
||||||
|
|
||||||
$memberValid = false;
|
$memberValid = false;
|
||||||
if ($member){
|
if ($member){
|
||||||
if (($member->members_effective_date <= date('Y-m-d')) &&
|
if (($member->members_effective_date <= date('Y-m-d')) &&
|
||||||
($member->members_expire_date >= date('Y-m-d')) &&
|
($member->members_expire_date >= date('Y-m-d')) &&
|
||||||
($member->active == 1) &&
|
($member->active == 1) &&
|
||||||
($member->suspended == 'N')
|
($member->suspended == 'N')
|
||||||
){
|
){
|
||||||
DB::beginTransaction();
|
DB::beginTransaction();
|
||||||
try {
|
try {
|
||||||
$newRequestLog = AppRequestLogService::storeRequestLog(
|
$newRequestLog = AppRequestLogService::storeRequestLog(
|
||||||
row: [],
|
row: [],
|
||||||
code: $code,
|
code: $code,
|
||||||
member: $member,
|
member: $member,
|
||||||
paymentType: 'cashless',
|
paymentType: 'cashless',
|
||||||
serviceCode: $request->service_code,
|
serviceCode: $request->service_code,
|
||||||
submissionDate: $request->submission_date,
|
submissionDate: $request->submission_date,
|
||||||
// status: 'approved',
|
// status: 'approved',
|
||||||
status: 'requested', // di nonaktifkan dulu auto approved
|
status: 'requested', // di nonaktifkan dulu auto approved
|
||||||
organization_id: $request->organization_id,
|
organization_id: $request->organization_id,
|
||||||
source: $request->source
|
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());
|
return Helper::responseJson(status: 'success', statusCode: 200, message: 'Request LOG berhasil ajukan!', data: $request->toArray());
|
||||||
|
|||||||
Reference in New Issue
Block a user