diff --git a/app/admin/controller/InvRequisitionController.php b/app/admin/controller/InvRequisitionController.php index c54f81a..70c5096 100644 --- a/app/admin/controller/InvRequisitionController.php +++ b/app/admin/controller/InvRequisitionController.php @@ -79,17 +79,18 @@ class InvRequisitionController extends BaseController */ protected function indexFormat($data, $applicant_id) { -// if (isset($data['id'])){ -// $data['approve'] = InvRequisitionApprove::where('requisition_id', $data['id'])->get(); -// } - if (isset($data['created_at'])){ - $data['created_at'] = is_int($data['created_at'])?$data['created_at']:strtotime($data['created_at']);{ - $data['updated_at'] = is_int($data['updated_at'])?$data['updated_at']:strtotime($data['updated_at']); - $data['created_at'] = date('Y-m-d H:i:s', $data['created_at']); - } + if (isset($data['id'])){ + //$data['approve'] = InvRequisitionApprove::where('requisition_id', $data['id'])->get(); + $data = $data->toArray(); } - if (isset($data['updated_at'])) + if (isset($data['created_at'])){ + $data['created_at'] = is_int($data['created_at'])?$data['created_at']:strtotime($data['created_at']); + $data['created_at'] = date('Y-m-d H:i:s', $data['created_at']); + } + if (isset($data['updated_at'])){ + $data['updated_at'] = is_int($data['updated_at'])?$data['updated_at']:strtotime($data['updated_at']); $data['updated_at'] = date('Y-m-d H:i:s', $data['updated_at']); + } if (isset($data['id'])){ $data['item'] = InvRequisitionItem::where('requisition_id', $data['id'])->get(); }