diff --git a/application/admin/controller/orders/Dispatch2.php b/application/admin/controller/orders/Dispatch2.php index 236c03e..62e7f48 100644 --- a/application/admin/controller/orders/Dispatch2.php +++ b/application/admin/controller/orders/Dispatch2.php @@ -76,13 +76,12 @@ class Dispatch2 extends Backend ->paginate($limit); foreach ($list as &$row) { - $row->btn_edit = (in_array($row->status, $this->model->btnActiveStatusList('btn_edit'))) ? true : false; - $row->btn_cancel = (in_array($row->status, $this->model->btnActiveStatusList('btn_cancel'))) ? true : false; - $row->btn_abnormal = (in_array($row->status, $this->model->btnActiveStatusList('btn_abnormal'))) ? true : false; - $row->btn_finished = (in_array($row->status, $this->model->btnActiveStatusList('btn_finished'))) ? true : false; - $row->is_disabled = (in_array($row->status, $this->model->btnActiveStatusList('disabled_status'))) ? true : false; - - $row->btn_record = (in_array($row->status, $this->model->btnActiveStatusList('btn_record'))) ? true : false; + $row->btn_edit = in_array($row->status, $this->model->btnActiveStatusList('btn_edit')); + $row->btn_cancel = in_array($row->status, $this->model->btnActiveStatusList('btn_cancel')); + $row->btn_abnormal = in_array($row->status, $this->model->btnActiveStatusList('btn_abnormal')); + $row->btn_finished = in_array($row->status, $this->model->btnActiveStatusList('btn_finished')); + $row->is_disabled = in_array($row->status, $this->model->btnActiveStatusList('disabled_status')); + $row->btn_record = in_array($row->status, $this->model->btnActiveStatusList('btn_record')); // $row->btn_income = (in_array($row->status, $this->model->btnActiveStatusList('btn_income')) && in_array($row->order->status, $orderModel->incomeBtnStatus())) ? true : false; } $result = array("total" => $list->total(), "rows" => $list->items());