Merge remote-tracking branch 'origin/master'

Administrator
2 parents dc6b03e4 52c27888
Showing 2 changed files with 13 additions and 12 deletions Show diff stats
controllers/OrderController.php
views/order/index.php
@@ -149,10 +149,10 @@
  
         public function actionAdd()
         {
-            if (!empty( \Yii::$app->request->post() )) {
+            if (!empty(\Yii::$app->request->post())) {
                 $id = \Yii::$app->request->post('OrderProduct')[ 'id' ];
                 $order_id = \Yii::$app->request->post('OrderProduct')[ 'order_id' ];
-                if (!empty( \Yii::$app->request->post('OrderProduct')[ 'count' ] )) {
+                if (!empty(\Yii::$app->request->post('OrderProduct')[ 'count' ])) {
                     $count = \Yii::$app->request->post('OrderProduct')[ 'count' ];
                 } else {
                     $count = 1;
@@ -172,7 +172,7 @@
                                      )
                                      ->one();
  
-                if (!empty( $model )) {
+                if (!empty($model)) {
                     $model->count += $count;
                 } else {
                     $model = new OrderProduct();
@@ -217,7 +217,7 @@
                 if ($orderProduct->load($post)) {
                     $orderProduct->save();
                     $output = '';
-                    if (isset( $posted[ 'count' ] )) {
+                    if (isset($posted[ 'count' ])) {
                         $output = Yii::$app->formatter->asDecimal($orderProduct->count, 0);
                     }
                     $out = Json::encode(
@@ -269,7 +269,7 @@
         public function actionPrint()
         {
             $orderId = Yii::$app->request->get("order_id");
-            if (!empty( $orderId )) {
+            if (!empty($orderId)) {
                 $order = $this->findModel($orderId);
                 return $this->renderPartial(
                     '@frontend/views/cabinet/order_print',
@@ -301,7 +301,7 @@
                 if ($orderProduct->load($post)) {
                     $orderProduct->save();
                     $output = '';
-                    if (isset( $posted[ 'count' ] )) {
+                    if (isset($posted[ 'count' ])) {
                         $output = Yii::$app->formatter->asDecimal($orderProduct->count, 0);
                     }
                     $out = Json::encode(
@@ -331,10 +331,11 @@
                 [
                     'query' => $model->getProducts()
                                      ->joinWith('productVariant.product.brand'),
+                    'sort'  => [ 'defaultOrder' => [ 'id' => SORT_ASC ] ],
                 ]
             );
  
-            if (empty( $model->manager_id )) {
+            if (empty($model->manager_id)) {
                 $model->manager_id = \Yii::$app->user->id;
             }
  
@@ -358,7 +359,7 @@
             }
         }
  
-        public function actionFindProduct($q = null, $id = null)
+        public function actionFindProduct($q = NULL, $id = NULL)
         {
             \Yii::$app->response->format = \yii\web\Response::FORMAT_JSON;
             $out = [
@@ -414,7 +415,7 @@
  
         protected function findModel($id)
         {
-            if (( $model = Order::findOne($id) ) !== null) {
+            if (( $model = Order::findOne($id) ) !== NULL) {
                 return $model;
             } else {
                 throw new NotFoundHttpException('The requested page does not exist.');
@@ -440,7 +441,7 @@
  
         public function actionBlockOrder()
         {
-            if (!empty( \Yii::$app->request->post() )) {
+            if (!empty(\Yii::$app->request->post())) {
                 \Yii::$app->response->format = Response::FORMAT_JSON;
  
                 $model = $this->findModel(\Yii::$app->request->post('id'));
@@ -457,7 +458,7 @@
                 if ($model->save()) {
                     return [
                         'time' => $date,
-                        'user' => !empty( $user ) ? $user->username : '',
+                        'user' => !empty($user) ? $user->username : '',
                     ];
                 } else {
                     return [
@@ -206,7 +206,7 @@ JS;
                     ],
                     [
                         'attribute' => 'created_at',
-                        'format'    => 'date',
+                        'format' => ['date', 'php:d/m/Y G:i'],
                         'filter'    => $searchForm->field($searchModel, 'date_range')
                                                   ->widget(
                                                       DateRangePicker::className(),