fix translations and migrations

Author: ZakharovAndrew

migrations/m240111_115911_create_users_table.php

@@ -24,7 +24,7 @@ public function up()
                 'birthday' => $this->dateTime()->defaultValue(null),
                 'status' => $this->integer()->defaultValue(10),
                 'sex' => $this->integer()->defaultValue(0),
-                'created_at' => $this->dateTime()->defaultValue( new \yii\db\Expression('CURRENT_TIMESTAMP') ),
+                'created_at' => $this->timestamp()->defaultValue( new \yii\db\Expression('CURRENT_TIMESTAMP') ),
                 'updated_at' => $this->dateTime()
             ]
         );

migrations/m240111_185911_create_roles_table.php

@@ -16,7 +16,7 @@ public function up()
                 'title' => $this->string(255)->notNull(),
                 'code' => $this->string(255)->notNull(),
                 'description' => $this->text(),
-                'created_at' => $this->dateTime()->defaultValue( new \yii\db\Expression('NOW()') ),
+                'created_at' => $this->timestamp()->defaultValue( new \yii\db\Expression('CURRENT_TIMESTAMP') ),
             ]
         );
 

migrations/m240112_191311_create_user_roles_table.php

@@ -16,7 +16,7 @@ public function up()
                 'user_id' => $this->integer(),
                 'role_id' => $this->integer(),
                 'note' => $this->string(500),
-                'created_at' => $this->dateTime()->defaultValue( new \yii\db\Expression('NOW()') ),
+                'created_at' => $this->timestamp()->defaultValue( new \yii\db\Expression('CURRENT_TIMESTAMP') ),
             ]
         );
 

src/messages/ru/user.php

@@ -30,13 +30,16 @@
     'Role' => 'Роль',
     'Roles' => 'Роли',
     'Create Roles' => 'Создать роль',
+    'Add role' => 'Добавить роль',
+    'Delete role' => 'Удалить роль',
     //users
     'Username' => 'Логин',
     'Users' => 'Пользователи',
     'This email is already taken!' => 'Этот Email уже занят!',
     'Login' => 'Логин',
     'City' => 'Город',
     'Avatar' => 'Аватар',
+    'Deleted' => 'Удален',
     'User' => 'Пользователь',
     'Manager' => 'Менеджер',
     'Senior manager' => 'Старший менеджер',
@@ -51,7 +54,9 @@
     'Female' => 'Женский',
     'You cannot give a user a status higher than or equal to yours!' => 'Нельзя ставить пользователю статус выше или равный вашему!',
     // actions
+    'Create User' => 'Создать пользователя',
     'Save' => 'Сохранить',
+    'Update' => 'Изменить',
 
     //
     'Hello' => 'Здравствуйте',

src/views/user/_form.php

@@ -3,6 +3,7 @@
 use yii\helpers\Html;
 use yii\widgets\ActiveForm;
 use app\models\User;
+use ZakharovAndrew\user\Module;
 
 /** @var yii\web\View $this */
 /** @var app\models\User $model */
@@ -30,7 +31,7 @@
     <?= $form->field($model, 'sex')->dropDownList(User::getSexList()) ?>
 
     <div class="form-group">
-        <?= Html::submitButton('Save', ['class' => 'btn btn-success']) ?>
+        <?= Html::submitButton(Module::t('Save'), ['class' => 'btn btn-success']) ?>
     </div>
 
     <?php ActiveForm::end(); ?>

src/views/user/index.php

@@ -20,7 +20,7 @@
     <h1><?= Html::encode($this->title) ?></h1>
 
     <p>
-        <?= Html::a('Create User', ['create'], ['class' => 'btn btn-success']) ?>
+        <?= Html::a(Module::t('Create User'), ['create'], ['class' => 'btn btn-success']) ?>
     </p>
 
     <?php // echo $this->render('_search', ['model' => $searchModel]); ?>
@@ -33,14 +33,21 @@
 
             'id',
             'username',
-            //'auth_key',
-            //'password',
+
             //'password_reset_token',
-            //'email:email',
             'name',
+            'email:email',
             //'avatar',
             //'city',
             //'birthday',
+            [
+                'attribute' => 'sex',
+                'format' => 'raw',
+                'filter' => User::getSexList(),
+                'value' => function ($model) {
+                    return User::getSexList()[$model->sex] ?? '';
+                }
+            ],
             [
                 'attribute' => 'status',
                 'format' => 'raw',
@@ -58,17 +65,16 @@
                     $roles = UserRoles::getUserRoles($model->id);
 
                     foreach ($roles as $role) {
-                        $result .= $role->title . '<a href="'.Url::toRoute(['/user/user-roles/delete', 'id' => $role->id]).'" title="Delete" aria-label="Delete" >X</a>';
+                        $result .= $role->title . '<a href="'.Url::toRoute(['/user/user-roles/delete', 'id' => $role->id]).'" title="'.Module::t('Delete role').'" aria-label="'.Module::t('Delete role').'" >X</a>';
                     }
 
-                    $result .= '<a href="'.Url::toRoute(['/user/user-roles/create', 'user_id' => $model->id, 'form'=>'_form_good_product']).'" title="Delete" aria-label="Delete" class="btn btn-sm btn-success">+</a>';
+                    $result .= '<a href="'.Url::toRoute(['/user/user-roles/create', 'user_id' => $model->id, 'form'=>'_form_good_product']).'" title="'.Module::t('Add role').'" aria-label="'.Module::t('Add role').'" class="btn btn-sm btn-success">+</a>';
 
                     return $result;
 
                 }
             ],
-            //'sex',
-            //'shop_id',
+            
             //'created_at',
             //'updated_at',
 

src/views/user/update.php

@@ -1,14 +1,14 @@
 <?php
 
 use yii\helpers\Html;
+use ZakharovAndrew\user\Module;
 
 /** @var yii\web\View $this */
 /** @var app\models\User $model */
 
 $this->title = 'Update User: ' . $model->id;
-$this->params['breadcrumbs'][] = ['label' => 'Users', 'url' => ['index']];
-$this->params['breadcrumbs'][] = ['label' => $model->id, 'url' => ['view', 'id' => $model->id]];
-$this->params['breadcrumbs'][] = 'Update';
+$this->params['breadcrumbs'][] = ['label' => Module::t('Users'), 'url' => ['index']];
+$this->params['breadcrumbs'][] = Module::t('Update');
 ?>
 <div class="user-update">