@@ -2,13 +2,12 @@ |
||
2 | 2 | |
3 | 3 | namespace app\modules\shop\models; |
4 | 4 | |
5 | -use app\modules\shop\models\CurrencyRateProvider; |
|
6 | -use app\modules\shop\components\SpecialPriceProductInterface; |
|
7 | 5 | use Yii; |
6 | +use app\modules\shop\models\CurrencyRateProvider; |
|
8 | 7 | use yii\base\InvalidConfigException; |
9 | 8 | use yii\caching\TagDependency; |
10 | -use yii\helpers\ArrayHelper; |
|
11 | 9 | use yii\data\ActiveDataProvider; |
10 | +use yii\helpers\ArrayHelper; |
|
12 | 11 | |
13 | 12 | /** |
14 | 13 | * This is the model class Multi-currency |
@@ -224,7 +224,7 @@ |
||
224 | 224 | } |
225 | 225 | |
226 | 226 | /** |
227 | - * @return PropertyGroup|null |
|
227 | + * @return PropertyGroup |
|
228 | 228 | */ |
229 | 229 | public function getPropertyGroup() |
230 | 230 | { |
@@ -2,12 +2,12 @@ |
||
2 | 2 | |
3 | 3 | namespace app\widgets\navigation\models; |
4 | 4 | |
5 | +use Yii; |
|
5 | 6 | use app\backgroundtasks\traits\SearchModelTrait; |
6 | 7 | use app\behaviors\Tree; |
7 | 8 | use app\properties\HasProperties; |
8 | 9 | use app\traits\FindById; |
9 | 10 | use app\traits\GetImages; |
10 | -use Yii; |
|
11 | 11 | use yii\data\ActiveDataProvider; |
12 | 12 | |
13 | 13 | /** |
@@ -84,7 +84,7 @@ |
||
84 | 84 | |
85 | 85 | /** |
86 | 86 | * @param Contragent $contragent |
87 | - * @return DeliveryInformation|null |
|
87 | + * @return DeliveryInformation |
|
88 | 88 | */ |
89 | 89 | public static function createNewDeliveryInformation(Contragent $contragent, $dummyObject = true) |
90 | 90 | { |
@@ -2,12 +2,12 @@ |
||
2 | 2 | |
3 | 3 | namespace app\widgets\navigation\models; |
4 | 4 | |
5 | +use Yii; |
|
5 | 6 | use app\backgroundtasks\traits\SearchModelTrait; |
6 | 7 | use app\behaviors\Tree; |
7 | 8 | use app\properties\HasProperties; |
8 | 9 | use app\traits\FindById; |
9 | 10 | use app\traits\GetImages; |
10 | -use Yii; |
|
11 | 11 | use yii\data\ActiveDataProvider; |
12 | 12 | |
13 | 13 | /** |
@@ -3,8 +3,8 @@ |
||
3 | 3 | namespace app\modules\shop\models; |
4 | 4 | |
5 | 5 | |
6 | -use app\components\payment\AbstractPayment; |
|
7 | 6 | use Yii; |
7 | +use app\components\payment\AbstractPayment; |
|
8 | 8 | use yii\base\Exception; |
9 | 9 | use yii\base\UnknownClassException; |
10 | 10 | use yii\db\ActiveRecord; |
@@ -237,7 +237,7 @@ discard block |
||
237 | 237 | /** |
238 | 238 | * Returns model instance by ID using per-request Identity Map and cache |
239 | 239 | * @param $id |
240 | - * @param int $is_active Return only active |
|
240 | + * @param int $isActive Return only active |
|
241 | 241 | * @return Product |
242 | 242 | */ |
243 | 243 | public static function findById($id, $isActive = 1) |
@@ -1071,7 +1071,7 @@ discard block |
||
1071 | 1071 | } |
1072 | 1072 | |
1073 | 1073 | /** |
1074 | - * @param int|Category|null $category |
|
1074 | + * @param integer $category |
|
1075 | 1075 | * @param bool $asMainCategory |
1076 | 1076 | * @return bool |
1077 | 1077 | * @throws \yii\db\Exception |
@@ -2,29 +2,29 @@ |
||
2 | 2 | |
3 | 3 | namespace app\modules\shop\models; |
4 | 4 | |
5 | +use Yii; |
|
5 | 6 | use app\behaviors\CleanRelations; |
6 | 7 | use app\behaviors\Tree; |
7 | 8 | use app\components\Helper; |
8 | -use app\modules\image\models\Image; |
|
9 | 9 | use app\models\Object; |
10 | -use app\modules\data\components\ImportableInterface; |
|
11 | 10 | use app\modules\data\components\ExportableInterface; |
12 | -use app\modules\shop\traits\HasAddonTrait; |
|
11 | +use app\modules\data\components\ImportableInterface; |
|
12 | +use app\modules\image\models\Image; |
|
13 | 13 | use app\modules\shop\ShopModule; |
14 | +use app\modules\shop\traits\HasAddonTrait; |
|
14 | 15 | use app\properties\HasProperties; |
15 | 16 | use app\traits\GetImages; |
16 | 17 | use devgroup\TagDependencyHelper\ActiveRecordHelper; |
17 | -use Yii; |
|
18 | 18 | use yii\base\Exception; |
19 | 19 | use yii\behaviors\TimestampBehavior; |
20 | 20 | use yii\caching\TagDependency; |
21 | 21 | use yii\data\ActiveDataProvider; |
22 | +use yii\data\Pagination; |
|
22 | 23 | use yii\db\ActiveQuery; |
23 | 24 | use yii\db\ActiveRecord; |
24 | 25 | use yii\db\Expression; |
25 | 26 | use yii\db\Query; |
26 | 27 | use yii\helpers\ArrayHelper; |
27 | -use yii\data\Pagination; |
|
28 | 28 | |
29 | 29 | /** |
30 | 30 | * This is the model class for table "product". |
@@ -168,7 +168,7 @@ |
||
168 | 168 | } |
169 | 169 | |
170 | 170 | /** |
171 | - * @return array |
|
171 | + * @return string[] |
|
172 | 172 | */ |
173 | 173 | public function getOfferElements() |
174 | 174 | { |
@@ -1,5 +1,4 @@ |
||
1 | 1 | <?php |
2 | -use kartik\select2\Select2; |
|
3 | 2 | |
4 | 3 | /** |
5 | 4 | * @var $this yii\web\View |
@@ -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'] = [ |