From 2d913ccb2339ec5f1175dfde9a45e0900d53ef9a Mon Sep 17 00:00:00 2001
From: Alex <kennen.md@gmail.com>
Date: Fri, 3 Feb 2017 13:46:19 +0200
Subject: [PATCH] -Product log fixes

---
 components/OrderProductLogger.php |  2 +-
 views/order/_log_product_item.php | 38 +++++++++-----------------------------
 2 files changed, 10 insertions(+), 30 deletions(-)

diff --git a/components/OrderProductLogger.php b/components/OrderProductLogger.php
index e839ac6..cab92d5 100644
--- a/components/OrderProductLogger.php
+++ b/components/OrderProductLogger.php
@@ -43,7 +43,7 @@
                 $log->order_id = $params['order_id'];
                 $log->data = Json::encode($data);
                 
-                if (\Yii::$app->user instanceof User) {
+                if (\Yii::$app->user->identity instanceof User) {
                     $log->user_id = (integer) \Yii::$app->user->identity->id;
                 } else {
                     $log->user_id = NULL;
diff --git a/views/order/_log_product_item.php b/views/order/_log_product_item.php
index 5dd8e7e..d3b880e 100644
--- a/views/order/_log_product_item.php
+++ b/views/order/_log_product_item.php
@@ -12,17 +12,11 @@
     use yii\helpers\Url;
 
 ?>
-<div class="box box-success">
+<div class="box box-success collapsed-box">
   <div class="box-header with-border">
-    <h3 class="box-title">История товара <a href="<?= Url::to(
-            [
-                '/ecommerce/variant/view',
-                'product_id' => $model->productVariant->product->id,
-                'id'         => $model->productVariant->id,
-            ]
-        ) ?>" target="_blank" class="text-green"><?php echo $model->sku; ?></a></h3>
+    <h3 class="box-title">История товара <span class="text-green"><?php echo $model->sku; ?></span></h3>
     <div class="box-tools pull-right">
-      <button type="button" class="btn btn-box-tool" data-widget="collapse"><i class="fa fa-minus"></i>
+      <button type="button" class="btn btn-box-tool" data-widget="collapse"><i class="fa fa-plus"></i>
       </button>
     </div>
   </div>
@@ -37,7 +31,8 @@
                 echo Html::img(
                     $model->productVariant->imageUrl,
                     [
-                        'class' => 'img-thumbnail',
+                        'class' => 'img-thumbnail img-center',
+                        'width' => '50%',
                     ]
                 );
             }
@@ -56,33 +51,18 @@
       </div>
       <div class="box-footer no-padding">
         <ul class="nav nav-stacked">
-          <li><a target="_blank" href="<?= Url::to(
-                  [
-                      '/ecommerce/manage/view',
-                      'id' => $model->productVariant->product->id,
-                  ]
-              ) ?>">Название: <span class="text-orange pull-right"><?php echo StringHelper::truncate(
+          <li><a href="#" class="no-click">Название: <span class="text-orange pull-right"><?php echo StringHelper::truncate(
                           $model->productVariant->product->lang->title,
                           35,
                           '...'
                       ); ?></span></a></li>
-          <li><a target="_blank" href="<?= Url::to(
-                  [
-                      '/ecommerce/category/view',
-                      'id' => $model->productVariant->category->id,
-                  ]
-              ) ?>">Категория:
+          <li><a href="#" class="no-click">Категория:
               <span class="pull-right text-orange"><?php echo $model->productVariant->category->lang->title; ?></span></a>
           </li>
-          <li><a target="_blank" href="<?= Url::to(
-                  [
-                      '/ecommerce/brand/view',
-                      'id' => $model->productVariant->product->brand->id,
-                  ]
-              ) ?>">Брэнд:
+          <li><a href="#" class="no-click">Брэнд:
               <span class="pull-right text-orange"><?php echo $model->productVariant->product->brand->lang->title; ?></span></a>
           </li>
-          <li><a target="_blank" href="#">Метки:
+          <li><a href="#" class="no-click">Метки:
                   <?php
                       if ($model->productVariant->product->is_discount) {
                           echo Html::tag(
--
libgit2 0.21.4