-Feed in process

-Orders table hover

-Feed in process
-Orders table hover
Alexey Boroda
1 parent b044365b
Showing 3 changed files with 11 additions and 6 deletions Show diff stats
controllers/OrderController.php
models/Order.php
views/order/index.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(
@@ -126,6 +126,7 @@
                         'manager_id',
                         'edit_time',
                         'edit_id',
+                        'delivery',
                     ],
                     'integer',
                 ],
@@ -181,6 +181,7 @@ JS;
     <?php
         echo GridView::widget(
             [
+                'hover'        => 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) . '<br>' . 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') . '<br>' .
-                                    \Yii::$app->formatter->asDate($model->deadline, 'php:Y г');
+                                return \Yii::$app->formatter->asDate(
+                                        $model->deadline,
+                                        'php:d M'
+                                    ) . '<br>' . \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;
                             }
                         },
                     ],