@@ -1,16 +1,16 @@ |
||
1 | 1 | <?php |
2 | 2 | |
3 | +use app\backend\components\ActiveForm; |
|
4 | +use app\backend\components\Helper; |
|
3 | 5 | use app\backend\widgets\BackendWidget; |
6 | +use app\backend\widgets\GridView; |
|
7 | +use app\modules\shop\ShopModule; |
|
4 | 8 | use app\modules\shop\controllers\BackendProductController; |
5 | 9 | use app\modules\shop\models\Product; |
6 | -use app\backend\widgets\GridView; |
|
7 | 10 | use kartik\helpers\Html; |
8 | 11 | use kartik\icons\Icon; |
9 | -use app\backend\components\ActiveForm; |
|
10 | 12 | use kartik\widgets\DateTimePicker; |
11 | 13 | use yii\data\ActiveDataProvider; |
12 | -use app\backend\components\Helper; |
|
13 | -use app\modules\shop\ShopModule; |
|
14 | 14 | use yii\helpers\Url; |
15 | 15 | |
16 | 16 | /** |
@@ -5,9 +5,9 @@ |
||
5 | 5 | * @var \yii\data\ActiveDataProvider $dataProvider |
6 | 6 | */ |
7 | 7 | |
8 | +use kartik\icons\Icon; |
|
8 | 9 | use yii\helpers\Html; |
9 | - use yii\helpers\Url; |
|
10 | - use kartik\icons\Icon; |
|
10 | +use yii\helpers\Url; |
|
11 | 11 | |
12 | 12 | $this->title = Yii::t('app', 'Order stages'); |
13 | 13 | $this->params['breadcrumbs'] = [ |
@@ -2,8 +2,8 @@ |
||
2 | 2 | |
3 | 3 | namespace app\modules\shop\widgets; |
4 | 4 | |
5 | -use yii\helpers\ArrayHelper; |
|
6 | 5 | use Yii; |
6 | +use yii\helpers\ArrayHelper; |
|
7 | 7 | |
8 | 8 | /** |
9 | 9 | * @property \app\models\Property $property |
@@ -2,8 +2,8 @@ |
||
2 | 2 | |
3 | 3 | namespace app\modules\user\actions; |
4 | 4 | |
5 | -use app; |
|
6 | 5 | use Yii; |
6 | +use app; |
|
7 | 7 | |
8 | 8 | /** |
9 | 9 | * AuthAction extends base yii2 auth action adding error view |
@@ -2,17 +2,16 @@ |
||
2 | 2 | |
3 | 3 | namespace app\modules\user\controllers; |
4 | 4 | |
5 | +use Yii; |
|
5 | 6 | use app\backend\components\BackendController; |
6 | 7 | use app\components\SearchModel; |
7 | 8 | use app\modules\user\models\User; |
8 | -use Yii; |
|
9 | 9 | use yii\filters\AccessControl; |
10 | 10 | use yii\filters\VerbFilter; |
11 | 11 | use yii\helpers\ArrayHelper; |
12 | 12 | use yii\helpers\Json; |
13 | -use yii\rbac\Item; |
|
14 | 13 | use yii\helpers\Url; |
15 | - |
|
14 | +use yii\rbac\Item; |
|
16 | 15 | use yii\web\NotFoundHttpException; |
17 | 16 | |
18 | 17 | /** |
@@ -156,7 +156,7 @@ |
||
156 | 156 | * Deletes an existing User model. |
157 | 157 | * If deletion is successful, the browser will be redirected to the 'index' page. |
158 | 158 | * @param integer $id |
159 | - * @return mixed |
|
159 | + * @return \yii\web\Response |
|
160 | 160 | */ |
161 | 161 | public function actionDelete($id) |
162 | 162 | { |
@@ -2,7 +2,10 @@ discard block |
||
2 | 2 | |
3 | 3 | namespace app\modules\user\controllers; |
4 | 4 | |
5 | +use Yii; |
|
5 | 6 | use app; |
7 | +use app\components\AuthClientHelper; |
|
8 | +use app\modules\seo\behaviors\MetaBehavior; |
|
6 | 9 | use app\modules\user\actions\AuthAction; |
7 | 10 | use app\modules\user\models\LoginForm; |
8 | 11 | use app\modules\user\models\PasswordResetRequestForm; |
@@ -10,8 +13,6 @@ discard block |
||
10 | 13 | use app\modules\user\models\ResetPasswordForm; |
11 | 14 | use app\modules\user\models\User; |
12 | 15 | use app\modules\user\models\UserService; |
13 | -use app\modules\seo\behaviors\MetaBehavior; |
|
14 | -use Yii; |
|
15 | 16 | use yii\base\ErrorException; |
16 | 17 | use yii\base\InvalidParamException; |
17 | 18 | use yii\caching\TagDependency; |
@@ -21,7 +22,6 @@ discard block |
||
21 | 22 | use yii\web\Controller; |
22 | 23 | use yii\web\NotFoundHttpException; |
23 | 24 | use yii\web\Response; |
24 | -use app\components\AuthClientHelper; |
|
25 | 25 | |
26 | 26 | /** |
27 | 27 | * Base DotPlant2 controller for handling user's login/signup/logout and etc. functions |
@@ -2,13 +2,10 @@ |
||
2 | 2 | |
3 | 3 | namespace app\modules\user\models; |
4 | 4 | |
5 | -use app\modules\shop\models\Customer; |
|
6 | -use app\properties\HasProperties; |
|
5 | +use Yii; |
|
7 | 6 | use app\models\PropertyGroup; |
8 | -use app\models\ObjectPropertyGroup; |
|
9 | - |
|
7 | +use app\properties\HasProperties; |
|
10 | 8 | use devgroup\TagDependencyHelper\ActiveRecordHelper; |
11 | -use Yii; |
|
12 | 9 | use yii\base\NotSupportedException; |
13 | 10 | use yii\behaviors\TimestampBehavior; |
14 | 11 | use yii\caching\TagDependency; |
@@ -128,7 +128,7 @@ discard block |
||
128 | 128 | } |
129 | 129 | |
130 | 130 | /** |
131 | - * @return array List of all possible statuses for User instance |
|
131 | + * @return string[] List of all possible statuses for User instance |
|
132 | 132 | */ |
133 | 133 | public static function getStatuses() |
134 | 134 | { |
@@ -251,7 +251,7 @@ discard block |
||
251 | 251 | } |
252 | 252 | |
253 | 253 | /** |
254 | - * @return int|string current user ID |
|
254 | + * @return integer current user ID |
|
255 | 255 | */ |
256 | 256 | public function getId() |
257 | 257 | { |
@@ -385,7 +385,7 @@ discard block |
||
385 | 385 | } |
386 | 386 | |
387 | 387 | /** |
388 | - * @return mixed|string Display name for the user visual identification |
|
388 | + * @return string Display name for the user visual identification |
|
389 | 389 | */ |
390 | 390 | public function getDisplayName() |
391 | 391 | { |
@@ -44,11 +44,11 @@ |
||
44 | 44 | } |
45 | 45 | |
46 | 46 | /** |
47 | - * @param $property |
|
47 | + * @param \app\models\Property $property |
|
48 | 48 | * @param $model |
49 | 49 | * @param $values |
50 | 50 | * @param $form |
51 | - * @param $renderType |
|
51 | + * @param string $renderType |
|
52 | 52 | * @return string |
53 | 53 | */ |
54 | 54 | public function render($property, $model, $values, $form, $renderType) |
@@ -11,8 +11,6 @@ |
||
11 | 11 | * @var $this \app\properties\handlers\Handler |
12 | 12 | * @var $values array |
13 | 13 | */ |
14 | -use vova07\imperavi\Widget as ImperaviWidget; |
|
15 | -use yii\helpers\Url; |
|
16 | 14 | |
17 | 15 | ?> |
18 | 16 | <?=$form->field($model, $property_key.'[0]')->widget( |