Merge branch 'master' of gitlab.artweb.com.ua:root/test_1

Mihail
2 parents 59eedf0c 313fb9a2
Showing 2 changed files with 3 additions and 2 deletions Show diff stats
backend/views/accounts/_form.php
common/models/Accounts.php
@@ -36,7 +36,7 @@ use yii\helpers\ArrayHelper;
  
         <?= $form->field($model, 'comment')->textarea(['rows' => 6]) ?>
  
-        <?= $form->field($model, 'dt')->textInput(['maxlength' => true]) ?>
+        <?= $form->field($model, 'dt')->textInput(['maxlength' => true,'value'=>date('Y.m.d')]) ?>
  
         <?= $form->field($model, 'is_active')->checkbox()  ?>
  
@@ -75,7 +75,7 @@ class Accounts extends \yii\db\ActiveRecord
     {
         return [
             [['if_manager', 'margin_id', 'country', 'city', 'rating',  'is_active', 'is_firm', 'office_id', 'is_scribe', 'set_manager_id', 'car', 'mod', 'deliveries', 'scode'], 'integer'],
-            [['company','email', 'pass', 'name','surname', 'phones', 'comment', 'dt', 'set_manager_id'], 'required'],
+            [['email', 'pass', 'name','surname', 'phones',], 'required'],
             [['comment'], 'string'],
             [['balance'], 'number'],
             [['email', 'name','surname', 'firm_site'], 'string', 'max' => 150],
@@ -88,6 +88,7 @@ class Accounts extends \yii\db\ActiveRecord
             [['email'], 'email'],
             ['re_pass', 'compare', 'compareAttribute' => 'pass'],
             ['verifyCode', 'captcha'],
+            ['dt', 'date', 'format' => 'Y.m.d']
         ];
     }