From cc04f5876c3a5aa18e3b2daccae98dc5486f536d Mon Sep 17 00:00:00 2001
From: Alex <kennen.md@gmail.com>
Date: Fri, 14 Apr 2017 12:52:50 +0300
Subject: [PATCH] -Testing deadline and view fix

---
 views/order/view.php | 44 ++++++++++++++++++++++----------------------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/views/order/view.php b/views/order/view.php
index de8f3a1..8eafd1d 100755
--- a/views/order/view.php
+++ b/views/order/view.php
@@ -64,17 +64,17 @@
     } else {
         $payment = $model->orderPayment->lang->title;
     }
-
-  $js = <<< JS
+    
+    $js = <<< JS
   $('[data-toggle="popover"]').popover();
 JS;
-  $this->registerJs($js, View::POS_READY);
+    $this->registerJs($js, View::POS_READY);
 
 ?>
 <div class="order-view">
-
+  
   <h1><?= Html::encode($this->title) ?></h1>
-
+  
   <p>
       <?= Html::a(
           'Обновить',
@@ -94,7 +94,7 @@ JS;
           [ 'class' => 'btn bg-orange' ]
       ) ?>
   </p>
-
+  
   <div class="box box-default">
     <div class="box-header with-border">
       <h3 class="box-title">Данные заказа</h3>
@@ -108,7 +108,7 @@ JS;
                 'model'      => $model,
                 'attributes' => [
                     'id',
-                    'deadline',
+                    'deadline:date',
                     'pay',
                     [
                         'label' => 'Причина',
@@ -144,8 +144,8 @@ JS;
         ) ?>
     </div><!-- /.box-body -->
   </div><!-- /.box -->
-
-
+  
+  
   <div class="box box-default">
     <div class="box-header with-border">
       <h3 class="box-title">Товары</h3>
@@ -166,12 +166,12 @@ JS;
                         [
                             'attribute' => 'product_name',
                             'content'   => function (OrderProduct $model) {
-                                if (!empty( $model->product_name )) {
-            
-                                    if (empty( $model->productVariant )) {
+                                if (!empty($model->product_name)) {
+                                    
+                                    if (empty($model->productVariant)) {
                                         return '';
                                     }
-            
+                                    
                                     return Html::a(
                                         StringHelper::truncate($model->product_name, 10, '...'),
                                         '#',
@@ -201,11 +201,11 @@ JS;
                             'attribute' => 'productVariant.lang.title',
                             'label'     => \Yii::t('app', 'Цвет'),
                             'content'   => function (OrderProduct $model) {
-        
-                                if (empty( $model->productVariant )) {
+                                
+                                if (empty($model->productVariant)) {
                                     return '';
                                 }
-        
+                                
                                 if (preg_match('@.*\.(png|jpg|gif)@i', $model->productVariant->lang->title)) {
                                     return '';
                                 } else {
@@ -225,11 +225,11 @@ JS;
                         'return',
                         [
                             'content' => function (OrderProduct $model) {
-        
-                                if (empty( $model->productVariant )) {
+                                
+                                if (empty($model->productVariant)) {
                                     return '<i class="glyphicon glyphicon-remove"></i>';
                                 }
-        
+                                
                                 $content = '<table class="table"><tbody><tr><th>Склад</th><th>кол.</th></tr>';
                                 foreach ($model->productVariant->variantStocks as $stock) {
                                     $content .= '<tr><td>' . $stock->stock->title . '</td><td>' . $stock->quantity . '</td></tr>';
@@ -253,7 +253,7 @@ JS;
         ?>
     </div><!-- /.box-body -->
   </div><!-- /.box -->
-
+  
   <div class="box box-default">
     <div class="box-header with-border">
       <h3 class="box-title">История</h3>
@@ -284,8 +284,8 @@ JS;
                 ]
             );
         ?>
-
-
+    
+    
     </div><!-- /.box-body -->
   </div><!-- /.box -->
 
--
libgit2 0.21.4