diff --git a/controllers/OrderController.php b/controllers/OrderController.php index 9f10736..eafd9e5 100755 --- a/controllers/OrderController.php +++ b/controllers/OrderController.php @@ -9,6 +9,7 @@ use Yii; use yii\helpers\ArrayHelper; use yii\helpers\Json; + use yii\helpers\VarDumper; use yii\web\Controller; use yii\filters\VerbFilter; use yii\data\ActiveDataProvider; @@ -343,7 +344,7 @@ $headers = \Yii::$app->response->headers; $headers->set('Access-Control-Allow-Origin', '*'); - + if ($model->load(Yii::$app->request->post()) && $model->save()) { $this->unblockOrder($model->id); return $this->render( diff --git a/models/Order.php b/models/Order.php index 7474e9f..d6c07cf 100755 --- a/models/Order.php +++ b/models/Order.php @@ -126,6 +126,7 @@ 'manager_id', 'edit_time', 'edit_id', + 'delivery', ], 'integer', ], diff --git a/views/order/index.php b/views/order/index.php index 075a337..9294a6d 100755 --- a/views/order/index.php +++ b/views/order/index.php @@ -181,6 +181,7 @@ JS; true, 'dataProvider' => $dataProvider, 'filterModel' => $searchModel, 'rowOptions' => function($model) { @@ -206,7 +207,7 @@ JS; ], [ 'attribute' => 'created_at', - 'content' => function($model) { + 'content' => function($model) { return date('d/m/Y', $model->created_at) . '
' . date('G:i', $model->created_at); }, 'filter' => $searchForm->field($searchModel, 'date_range') @@ -232,8 +233,10 @@ JS; if ($model->deadline == '') { return ''; } else { - return \Yii::$app->formatter->asDate($model->deadline, 'php:d M') . '
' . - \Yii::$app->formatter->asDate($model->deadline, 'php:Y г'); + return \Yii::$app->formatter->asDate( + $model->deadline, + 'php:d M' + ) . '
' . \Yii::$app->formatter->asDate($model->deadline, 'php:Y г'); } }, ], @@ -242,9 +245,9 @@ JS; 'attribute' => 'total', 'content' => function($model) { if (empty($model->total)) { - return ''; + return ''; } else { - return $model->total; + return $model->total; } }, ], -- libgit2 0.21.4