diff --git a/app/mobile/controller/InvRequisitionController.php b/app/mobile/controller/InvRequisitionController.php index 3a59c75..d2351b6 100644 --- a/app/mobile/controller/InvRequisitionController.php +++ b/app/mobile/controller/InvRequisitionController.php @@ -86,10 +86,17 @@ class InvRequisitionController extends BaseController */ protected function indexFormat($data, $uid) { - if (isset($data['created_at'])) + if(isset($data['id']) && is_object($data)){ + $data = $data->toArray(); + } + 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'])) + } + 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(); foreach ($data['item'] as $key => $item){