0.9.1

sokolby · May 19, 2017 · e736f91 · e736f91
1 parent ba8ee12
commit e736f91
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 5 deletions.
diff --git a/Module.php b/Module.php
@@ -16,7 +16,7 @@ class Module extends \yii\base\Module
     /**
      * @var string Module version
      */
-    protected $version = "0.9";
+    protected $version = "0.9.1";
 
     /**
      * @var string Alias for module

diff --git a/README.md b/README.md
@@ -3,7 +3,7 @@ Yii 2 Admin
 
 Yii 2 Admin - User authentication module and admin dashboard
 
-## New version released 05/18/2017 v.0.9
+## New version released 05/19/2017 v.0.9.1
 
 Based on https://github.com/amnah/yii2-user
 

diff --git a/models/Points.php b/models/Points.php
@@ -48,6 +48,7 @@ public function rules()
     public function attributeLabels()
     {
         return [
+            'id' => Yii::t('user', 'ID бонусного счёта'),
             'user_id' => Yii::t('user', 'Пользователь'),
             'amount' => Yii::t('user', 'Баланс'),
             'last_update' => Yii::t('user', 'Обновлены'),

diff --git a/models/forms/LoginForm.php b/models/forms/LoginForm.php
@@ -72,7 +72,7 @@ public function validateUser()
             } else {
                 $attribute = $this->module->loginEmail ? "Email" : "Username";
             }
-            $this->addError("email", Yii::t("user", "$attribute not found"));
+            $this->addError("email", Yii::t("user", "$attribute не найден"));
 
             // do we need to check $user->userAuths ???
         }
@@ -150,7 +150,7 @@ public function attributeLabels()
 
         return [
             "email" => Yii::t("user", $attribute),
-            "password" => Yii::t("user", "Password"),
+            "password" => Yii::t("user", "пароль"),
             "rememberMe" => Yii::t("user", "Remember Me"),
         ];
     }

diff --git a/views/receipt/view.php b/views/receipt/view.php
@@ -59,11 +59,27 @@
                 }
             ],
             'date',
-            'img',
             'data',
+            'img',
+            [
+                'attribute' => 'img',
+                'format'=>'raw',
+                'value' => function ($model) {
+                        $out = "";
+                        $imgs = json_decode($model->img);
+                        foreach ($imgs as $img){
+                            $out = "<a href='/user_receipt/".$model->user_id."/".$img."' target='_blank'><img src='/user_receipt/".$model->user_id."/".$img."' width='300'/></a></br>";
+                        }
+                        return $out;
+
+
+                }
+            ],
             'status',
+            'notes',
             'api_sent',
             'api_response',
+            'api_check_response',
         ],
     ]) ?>