diff --git a/app/admin/controller/InvRequisitionController.php b/app/admin/controller/InvRequisitionController.php index bd31235..68b39f7 100644 --- a/app/admin/controller/InvRequisitionController.php +++ b/app/admin/controller/InvRequisitionController.php @@ -86,7 +86,9 @@ class InvRequisitionController extends BaseController protected function showFormat($data) { if (isset($data['id'])){ - $data['approve'] = InvRequisitionApprove::where('requisition_id', $data['id'])->get()->toArray(); + $data['approve'] = InvRequisitionApprove::where('requisition_id', $data['id'])->orderBy('id')->get()->toArray(); + + $approve_id = 0; foreach ($data['approve'] as $key => $value) { if (isset($value['created_at'])){ $value['created_at'] = is_int($value['created_at'])?$value['created_at']:strtotime($value['created_at']); @@ -94,10 +96,10 @@ class InvRequisitionController extends BaseController } if (isset($value['updated_at'])){ $value['updated_at'] = is_int($value['updated_at'])?$value['updated_at']:strtotime($value['updated_at']); - $data['approve'][$key] = date('Y-m-d H:i:s', $value['updated_at']); + $data['approve'][$key]['updated_at'] = date('Y-m-d H:i:s', $value['updated_at']); } + $approve_id = $value['id']; } - $approve_id = !empty($data['approve'])?array_pop($data['approve'])['id']:null; $data['approve_id'] = $approve_id; } if (isset($data['created_at']))