diff --git a/models/Order.php b/models/Order.php
index 04d207d..a69a7a4 100755
--- a/models/Order.php
+++ b/models/Order.php
@@ -221,7 +221,7 @@
                 ],
                 [
                     [
-                        'deadline',
+                        'deadTime',
                         'name',
                         'numbercard',
                         'declaration',
@@ -252,44 +252,62 @@
             parent::afterSave($insert, $changedAttributes);
         }
         
+        public function getDeadTime()
+        {
+            if (empty($this->deadline)) {
+                return null;
+            } else {
+                return date('d.m.Y', $this->deadline);
+            }
+        }
+        
+        public function setDeadTime($value)
+        {
+            if (empty($value)) {
+                $this->deadline = null;
+            } else {
+                $this->deadline = strtotime($value);
+            }
+        }
+        
         /**
          * @inheritdoc
          */
-        public function afterFind()
-        {
-            parent::afterFind();
-            $this->deadline = !empty($this->deadline) ? date('d.m.Y', $this->deadline) : '';
-            
-        }
+//        public function afterFind()
+//        {
+//            parent::afterFind();
+//            $this->deadline = !empty($this->deadline) ? date('d.m.Y', $this->deadline) : '';
+//
+//        }
         
         /**
          * @inheritdoc
          */
-        public function beforeSave($insert)
-        {
-            if (parent::beforeSave($insert)) {
-                
-                $this->convertDate();
-                return true;
-            }
-            return false;
-            
-        }
+//        public function beforeSave($insert)
+//        {
+//            if (parent::beforeSave($insert)) {
+//
+//                $this->convertDate();
+//                return true;
+//            }
+//            return false;
+//
+//        }
         
         /**
          * Convert some date
          */
-        protected function convertDate()
-        {
-            if (!empty($this->deadline)) {
-                $date = new \DateTime();
-                $date->setTimestamp(strtotime($this->deadline));
-                $date->format("d.m.Y");
-                $this->deadline = $date->getTimestamp();
-                
-            }
-            
-        }
+//        protected function convertDate()
+//        {
+//            if (!empty($this->deadline)) {
+//                $date = new \DateTime();
+//                $date->setTimestamp(strtotime($this->deadline));
+//                $date->format("d.m.Y");
+//                $this->deadline = $date->getTimestamp();
+//
+//            }
+//
+//        }
         
         /**
          * @inheritdoc
diff --git a/views/order/_form.php b/views/order/_form.php
index 7799c47..9dcab60 100755
--- a/views/order/_form.php
+++ b/views/order/_form.php
@@ -173,15 +173,12 @@ JS;
           <div class="col-sm-6">
               
               <?php
-                  $model->deadline = date('d.m.Y', (int) $model->deadline);
-                  echo $form->field($model, 'deadline')
+//                  $model->deadline = date('d.m.Y', (int) $model->deadline);
+                  echo $form->field($model, 'deadTime')
                        ->widget(
                            DatePicker::className(),
                            [
-                               'disabled' => !$permissions->checkAttr('deadline'),
-                               'pluginOptions' => [
-                                 'format' => 'dd.mm.yyyy',
-                               ],
+//                               'disabled' => !$permissions->checkAttr('deadline'),
                            ]
                        ) ?>
               
--
libgit2 0.21.4