Merge remote-tracking branch 'origin/master'

Administrator
2 parents d6957eed 8d70cfe3
Showing 2 changed files with 53 additions and 44 deletions Show diff stats
views/order/_form.php
views/order/index.php
@@ -142,7 +142,12 @@ JS;
 ?>
-<?php $form = ActiveForm::begin([ 'id' => 'main-form' ]); ?>
+<?php $form = ActiveForm::begin(
+    [
+        'id'      => 'main-form',
+//        'options' => [ 'class' => 'form-inline' ],
+    ]
+); ?>
 <div class="container">
   <div class="form-group">
     <br>
@@ -379,27 +384,7 @@ JS;
                       [
                           'class' => SerialColumn::className(),
                       ],
-                      [
-                          'attribute' => 'sku',
-                          'content'   => function($model) {
-                              return Html::a(
-                                  $model->sku,
-                                  '#',
-                                  [
-                                      'onclick'        => 'event.preventDefault();',
-                                      'data-toggle'    => 'popover',
-                                      'data-placement' => 'right',
-                                      'data-html'      => 'true',
-                                      'data-content'   => Html::img(
-                                          $model->productVariant->imageUrl,
-                                          [
-                                              'class' => 'img-rounded',
-                                          ]
-                                      ),
-                                  ]
-                              );
-                          },
-                      ],
+                      'sku',
                       [
                           'attribute' => 'product_name',
                           'content'   => function($model) {
@@ -408,9 +393,16 @@ JS;
                                       StringHelper::truncate($model->product_name, 10, '...'),
                                       '#',
                                       [
-                                          'data-toggle' => 'tooltip',
-                                          'title'       => $model->product_name,
-                                          'onclick'     => 'event.preventDefault();',
+                                          'onclick'        => 'event.preventDefault();',
+                                          'data-toggle'    => 'popover',
+                                          'data-placement' => 'right',
+                                          'data-html'      => 'true',
+                                          'data-content'   => Html::img(
+                                              $model->productVariant->imageUrl,
+                                              [
+                                                  'class' => 'img-rounded',
+                                              ]
+                                          ) . Html::tag('p', $model->product_name),
                                       ]
                                   );
                               } else {
@@ -420,7 +412,7 @@ JS;
                       ],
                       [
                           'attribute' => 'productVariant.product.brand.lang.title',
-                          'label' => 'Брэнд',
+                          'label'     => 'Брэнд',
                       ],
                       [
                           'attribute' => 'productVariant.lang.title',
@@ -434,8 +426,8 @@ JS;
                           },
                       ],
                       [
-                        'attribute' => 'productVariant.size',
-                        'label' => 'Размер',
+                          'attribute' => 'productVariant.size',
+                          'label'     => 'Размер',
                       ],
                       'price',
                       [
@@ -633,7 +625,8 @@ JS;
                                               ),
                                           ],
                                       ]
-                                  )->label('Артикул');
+                                  )
+                                  ->label('Артикул');
         ?>
     </div>
@@ -52,19 +52,30 @@ JS;
-    <?php echo Html::submitButton(
-        \Yii::t('app', 'Искать'),
-        [
-            'class' => 'btn btn-primary',
-        ]
-    ) ?>
+   
-<?php echo Html::button(\Yii::t('app', 'Скрыть/Показать'), [
-  'data-toggle' => 'collapse',
-  'data-target' => '#search-fields',
-  'class' => 'btn btn-default'
-])?>
-<div class="row collapse in" id="search-fields">
+<?php
+//    echo Html::button(\Yii::t('app', 'Скрыть/Показать'), [
+//  'data-toggle' => 'collapse',
+//  'data-target' => '#search-fields',
+//  'class' => 'btn btn-default'
+//]);
+//?>
+<div class="box box-primary">
+  <div class="box-header with-border">
+<!--    <h3 class="box-title"></h3>-->
+      <?php echo Html::submitButton(
+          \Yii::t('app', 'Искать'),
+          [
+              'class' => 'btn btn-primary',
+          ]
+      ) ?>
+    <div class="box-tools pull-right">
+      <button class="btn btn-box-tool" data-widget="collapse"><i class="fa fa-minus"></i></button>
+    </div>
+  </div>
+  
+<div class="row box-body" id="search-fields">
   <div class="col-md-4">
       <?php
           echo $searchForm->field($searchModel, 'label')
@@ -181,6 +192,8 @@ JS;
   </div>
 </div>
+</div>
+  
 <p>
     <?php
         echo GridView::widget(
@@ -203,9 +216,9 @@ JS;
                         'content'   => function($model) {
                             $manager = $model->manager;
                             if (empty($manager)) {
-                                return $model->id;
+                                return Html::a($model->id, ['update', 'id' => $model->id], ['target' => '_blank', 'data-pjax' => '0']);
                             } else {
-                                return $model->id . '<br>' . $manager->username;
+                                return Html::a($model->id, ['update', 'id' => $model->id], ['target' => '_blank', 'data-pjax' => '0']) . '<br>' . $manager->username;
                             }
                         },
                     ],
@@ -340,7 +353,10 @@ JS;
                                 return Html::a(
                                     Html::tag('span', '', [ 'class' => 'glyphicon glyphicon-pencil' ]),
                                     $url,
-                                    [ 'target' => '_blank' ]
+                                    [
+                                      'target' => '_blank',
+                                      'data-pjax' => '0',
+                                    ]
                                 );
                             },
                         ],