Merge remote-tracking branch 'origin/staging' into origin/production
This commit is contained in:
@@ -27,25 +27,30 @@ class RequestLogController extends Controller
|
||||
'service_code' => $request->service_code,
|
||||
'organization_id' => $request->organization_id,
|
||||
'organization_name' => $request->organization_name,
|
||||
'address_provider' => $request->address_provider
|
||||
'address_provider' => $request->address_provider,
|
||||
'submission_date' => $request->submission_date,
|
||||
];
|
||||
$validator = Validator::make($request->all(), [
|
||||
'member_id' => 'required',
|
||||
'service_code' => 'required'
|
||||
'service_code' => 'required',
|
||||
'submission_date' => 'required'
|
||||
], [
|
||||
'member_id.required' => trans('Validation.required',['attribute' => 'Member ID']),
|
||||
'service_code.required' => trans('Validation.required',['attribute' => 'Service Code']),
|
||||
'submission_date.required' => trans('Validation.required',['attribute' => 'Submission Date']),
|
||||
]);
|
||||
if($request->organization_id)
|
||||
{
|
||||
$validator = Validator::make($request->all(), [
|
||||
'organization_id' => 'required',
|
||||
'member_id' => 'required',
|
||||
'service_code' => 'required'
|
||||
'service_code' => 'required',
|
||||
'submission_date' => 'required'
|
||||
], [
|
||||
'organization_id.required' => trans('Validation.required',['attribute' => 'Provider ID']),
|
||||
'member_id.required' => trans('Validation.required',['attribute' => 'Member ID']),
|
||||
'service_code.required' => trans('Validation.required',['attribute' => 'Service Code']),
|
||||
'submission_date.required' => trans('Validation.required',['attribute' => 'Submission Date']),
|
||||
]);
|
||||
}
|
||||
if ($validator->fails())
|
||||
|
||||
@@ -122,7 +122,7 @@ class RequestLogController extends Controller
|
||||
member: $member,
|
||||
paymentType: 'cashless',
|
||||
serviceCode: $request->service_code,
|
||||
submissionDate: null,
|
||||
submissionDate: $request->submission_date,
|
||||
// status: 'approved',
|
||||
status: 'requested', // di nonaktifkan dulu auto approved
|
||||
organization_id: $request->organization_id,
|
||||
@@ -145,7 +145,7 @@ class RequestLogController extends Controller
|
||||
member: $member,
|
||||
paymentType: 'cashless',
|
||||
serviceCode: $request->service_code,
|
||||
submissionDate: null,
|
||||
submissionDate: $request->submission_date,
|
||||
status: 'requested',
|
||||
organization_id: $request->organization_id,
|
||||
source: $request->source
|
||||
|
||||
Reference in New Issue
Block a user