-Logs ready

Alexey Boroda
1 parent 6649cf43
Showing 5 changed files with 134 additions and 51 deletions Show diff stats
models/Order.php
views/order/_log_item.php
views/order/index.php
views/order/log.php
views/order/view.php
@@ -129,24 +129,72 @@
             return $result;
         }
  
+        /**
+         * @param string $attr
+         * @param array  $values
+         *
+         * @return array
+         * Return array in form ['old'=>'old value ...', 'new' => 'new value ...']
+         */
         public function getLogAttributes(string $attr, array $values)
         {
-            $labels = Label::find()->with('lang')->indexBy('id')->all();
             if ($attr == 'deadline') {
                 return [
-                    'old' => empty($values['old']) ? '' : date('d.m.Y', $values['old']),
-                    'new' => empty($values['new']) ? '' : date('d.m.Y', $values['new']),
+                    'old' => empty($values[ 'old' ]) ? '' : date('d.m.Y', $values[ 'old' ]),
+                    'new' => empty($values[ 'new' ]) ? '' : date('d.m.Y', $values[ 'new' ]),
+                ];
+            } elseif ($attr == 'reason') {
+                return [
+                    'old' => empty($values[ 'old' ]) ? '' : self::REASONS[ $values[ 'old' ] ],
+                    'new' => empty($values[ 'new' ]) ? '' : self::REASONS[ $values[ 'new' ] ],
+                ];
+            } elseif ($attr == 'label') {
+                $labels = Label::find()
+                               ->with('lang')
+                               ->indexBy('id')
+                               ->all();
+                return [
+                    'old' => empty($values[ 'old' ]) ? '' : $labels[ $values[ 'old' ] ]->lang->title,
+                    'new' => empty($values[ 'new' ]) ? '' : $labels[ $values[ 'new' ] ]->lang->title,
                 ];
-            } elseif ($attr = 'reason') {
+            } elseif ($attr == 'delivery') {
+                $deliveries = Delivery::find()
+                                      ->with('lang')
+                                      ->indexBy('id')
+                                      ->all();
                 return [
-                    'old' => empty($values['old']) ? '' : self::REASONS[$values['old']],
-                    'new' => empty($values['new']) ? '' : self::REASONS[$values['new']],
+                    'old' => empty($values[ 'old' ]) ? '' : $deliveries[ $values[ 'old' ] ]->lang->title,
+                    'new' => empty($values[ 'new' ]) ? '' : $deliveries[ $values[ 'new' ] ]->lang->title,
                 ];
-            } elseif ($attr = 'label') {
+            } elseif ($attr == 'manager_id') {
+                $users = User::find()
+                             ->indexBy('id')
+                             ->all();
                 return [
-                    'old' => empty($values['old']) ? '' : $labels[$values['old']]->lang->title,
-                    'new' => empty($values['new']) ? '' : $labels[$values['new']]->lang->title,
+                    'old' => empty($values[ 'old' ]) ? '' : $users[ $values[ 'old' ] ]->username,
+                    'new' => empty($values[ 'new' ]) ? '' : $users[ $values[ 'new' ] ]->username,
                 ];
+            } elseif ($attr == 'payment') {
+                $payment = OrderPayment::find()
+                                       ->with('lang')
+                                       ->indexBy('id')
+                                       ->all();
+                return [
+                    'old' => empty($values[ 'old' ]) ? '' : $payment[ $values[ 'old' ] ]->lang->title,
+                    'new' => empty($values[ 'new' ]) ? '' : $payment[ $values[ 'new' ] ]->lang->title,
+                ];
+            } elseif ($attr == 'shipping_by') {
+                return [
+                    'old' => empty($values[ 'old' ]) ? '' : self::SHIPPING_BY[ $values[ 'old' ] ][ 'label' ],
+                    'new' => empty($values[ 'new' ]) ? '' : self::SHIPPING_BY[ $values[ 'new' ] ][ 'label' ],
+                ];
+            } elseif ($attr == 'pay') {
+                return [
+                    'old' => ($values[ 'old' ] == true) ? 'Оплачен' : 'Не оплачен',
+                    'new' => ($values[ 'new' ] == true) ? 'Оплачен' : 'Не оплачен',
+                ];
+            } else {
+                return $values;
             }
         }
  
@@ -263,13 +311,17 @@
  
         public function afterSave($insert, $changedAttributes)
         {
+//            VarDumper::dump($changedAttributes, 10, true);die();
             $data = [];
             foreach ($changedAttributes as $key => $attribute) {
                 if ($this->oldAttributes[ $key ] != $attribute) {
-                    $data[ $key ] = [
-                        'old' => $attribute,
-                        'new' => $this->oldAttributes[ $key ],
-                    ];
+                    $data[ $key ] = $this->getLogAttributes(
+                        $key,
+                        [
+                            'old' => $attribute,
+                            'new' => $this->oldAttributes[ $key ],
+                        ]
+                    );
                 }
             }
  
@@ -12,18 +12,18 @@
 <!-- timeline item -->
 <li>
   <!-- timeline icon -->
-  <i class="fa fa-tag bg-blue"></i>
+  <i class="fa fa-user bg-orange"></i>
   <div class="timeline-item">
     <span class="time"><i class="fa fa-calendar"></i> <?= Yii::$app->formatter->asDatetime($model->created_at) ?></span>
  
-    <h3 class="timeline-header">Title</h3>
+    <h3 class="timeline-header">Пользователь: <span class="text-orange"><?=$model->user->username?></span></h3>
  
     <div class="timeline-body">
-      <table class="table table-bordered">
+      <table class="table table-bordered table-striped">
         <tr>
           <th>Поле</th>
-          <th>с</th>
-          <th>на</th>
+          <th>Старое значение</th>
+          <th>Новое значение</th>
         </tr>
           <?php
               foreach (Json::decode($model->data) as $key => $item) {
@@ -347,7 +347,7 @@ JS;
                     [
                         'class'    => 'yii\grid\ActionColumn',
                         'template' => \Yii::$app->user->identity->isAdmin(
-                        ) ? '{view} {update} {delete}' : '{view} {update}',
+                        ) ? '{history} {view} {update} {delete}' : '{view} {update}',
                         'buttons'  => [
                             'update' => function($url, $model) {
                                 return Html::a(
@@ -359,6 +359,16 @@ JS;
                                     ]
                                 );
                             },
+                            'history' => function($url, $model) {
+                                return Html::a(
+                                    Html::tag('span', '', [ 'class' => 'glyphicon glyphicon-time' ]),
+                                    ['log', 'id' => $model->id],
+                                    [
+                                        'target' => '_blank',
+                                        'data-pjax' => '0',
+                                    ]
+                                );
+                            },
                         ],
                     ],
                 ],
@@ -9,41 +9,51 @@
      * @var ActiveDataProvider $logData
      * @var Order              $model
      */
-
+    
+    $this->title = 'История заказа #' . $model->id;
+    
+    $this->params[ 'breadcrumbs' ][] = [
+        'url'   => yii\helpers\Url::to([ '/ecommerce/order/index' ]),
+        'label' => \Yii::t('app', 'Заказы'),
+    ];
+    $this->params[ 'breadcrumbs' ][] = [
+        'url'   => yii\helpers\Url::to([ '/ecommerce/order/view', 'id' => $model->id ]),
+        'label' => \Yii::t('app', 'Заказ #') . $model->id,
+    ];
+    $this->params[ 'breadcrumbs' ][] = $this->title;
+    
 ?>
  
 <div class="order-log">
   <div class="box box-default">
     <div class="box-header with-border">
       <h3 class="box-title">История</h3>
-<!--      <div class="box-tools pull-right">-->
-<!--        <button class="btn btn-box-tool" data-widget="collapse"><i class="fa fa-minus"></i></button>-->
-<!--      </div>-->
-    </div><!-- /.box-header -->
-    <div class="box-body">
+      <div class="box-body">
  
+          <?php
+              echo ListView::widget(
+                  [
+                      'dataProvider' => $logData,
+                      'layout'       => '{items}',
+                      'itemView'     => '_log_item',
+                      'itemOptions'  => [
+                          'tag' => false,
+                      ],
+                      'options'      => [
+                          'tag'   => $logData->totalCount == 0 ? 'div' : 'ul',
+                          'class' => $logData->totalCount == 0 ? 'list-view' : 'list-view timeline',
+                      ],
+                      'viewParams'   => [
+                          'order' => $model,
+                      ],
+                      'emptyText' => 'У этого заказа пока нет истории',
+                      'emptyTextOptions' => [
+                        'class' => 'callout callout-info'
+                      ],
+                  ]
+              );
+          ?>
  
-        <?php
-            echo ListView::widget(
-                [
-                    'dataProvider' => $logData,
-                    'layout'       => '{items}',
-                    'itemView'     => '_log_item',
-                    'itemOptions'  => [
-                        'tag' => false,
-                    ],
-                    'options'      => [
-                        'tag'   => 'ul',
-                        'class' => 'list-view timeline',
-                    ],
-                    'viewParams'   => [
-                        'order' => $model,
-                    ],
-                ]
-            );
-        ?>
-
-
-    </div><!-- /.box-body -->
-  </div><!-- /.box -->
-</div>
+      </div><!-- /.box-body -->
+    </div><!-- /.box -->
+  </div>
@@ -36,7 +36,15 @@
           ],
           [ 'class' => 'btn btn-primary' ]
       ) ?>
-
+        
+      <?= Html::a(
+          'История',
+          [
+              'log',
+              'id' => $model->id,
+          ],
+          [ 'class' => 'btn bg-orange' ]
+      ) ?>
   </p>
  
   <div class="box box-default">
@@ -54,7 +62,10 @@
                     'id',
                     'deadline',
                     'pay',
-                    'reason',
+                    [
+                        'label' => 'Причина',
+                        'value' => empty($model->reason) ? '' : Order::REASONS[$model->reason],
+                    ],
                     [
                         'label' => 'Статус',
                         'value' => $model->orderLabel->lang->title,