@@ -2,14 +2,14 @@ |
||
2 | 2 | |
3 | 3 | namespace app\modules\shop\controllers; |
4 | 4 | |
5 | +use Yii; |
|
5 | 6 | use app\backend\components\BackendController; |
6 | 7 | use app\components\SearchModel; |
7 | 8 | use app\modules\shop\models\ShippingOption; |
8 | -use Yii; |
|
9 | 9 | use yii\filters\AccessControl; |
10 | 10 | use yii\filters\VerbFilter; |
11 | -use yii\web\NotFoundHttpException; |
|
12 | 11 | use yii\helpers\Url; |
12 | +use yii\web\NotFoundHttpException; |
|
13 | 13 | |
14 | 14 | /** |
15 | 15 | * ShippingOptionController implements the CRUD actions for ShippingOption model. |
@@ -277,7 +277,7 @@ |
||
277 | 277 | * Deletes an existing User model. |
278 | 278 | * If deletion is successful, the browser will be redirected to the 'index' page. |
279 | 279 | * @param integer $id |
280 | - * @return mixed |
|
280 | + * @return \yii\web\Response |
|
281 | 281 | */ |
282 | 282 | public function actionDelete($id) |
283 | 283 | { |
@@ -2,24 +2,24 @@ |
||
2 | 2 | |
3 | 3 | namespace app\modules\shop\controllers; |
4 | 4 | |
5 | +use Yii; |
|
6 | +use app\backend\actions\DeleteOne; |
|
7 | +use app\backend\actions\MultipleDelete; |
|
8 | +use app\backend\actions\UpdateEditable; |
|
5 | 9 | use app\backend\components\BackendController; |
6 | 10 | use app\components\SearchModel; |
11 | +use app\modules\shop\models\Warehouse; |
|
7 | 12 | use app\modules\shop\models\WarehouseEmail; |
8 | 13 | use app\modules\shop\models\WarehouseOpeninghours; |
9 | 14 | use app\modules\shop\models\WarehousePhone; |
10 | -use devgroup\TagDependencyHelper\ActiveRecordHelper; |
|
11 | -use app\backend\actions\DeleteOne; |
|
12 | -use app\backend\actions\MultipleDelete; |
|
13 | -use app\backend\actions\UpdateEditable; |
|
14 | -use app\modules\shop\models\Warehouse; |
|
15 | 15 | use app\modules\shop\models\WarehouseProduct; |
16 | -use yii\helpers\Url; |
|
17 | -use Yii; |
|
16 | +use devgroup\TagDependencyHelper\ActiveRecordHelper; |
|
17 | +use yii\caching\TagDependency; |
|
18 | 18 | use yii\data\ActiveDataProvider; |
19 | 19 | use yii\filters\AccessControl; |
20 | +use yii\helpers\Url; |
|
20 | 21 | use yii\web\HttpException; |
21 | 22 | use yii\web\NotFoundHttpException; |
22 | -use yii\caching\TagDependency; |
|
23 | 23 | |
24 | 24 | class BackendWarehouseController extends BackendController |
25 | 25 | { |
@@ -91,7 +91,7 @@ |
||
91 | 91 | } |
92 | 92 | |
93 | 93 | /** |
94 | - * @return Response |
|
94 | + * @return integer |
|
95 | 95 | * @throws HttpException |
96 | 96 | */ |
97 | 97 | public function actionSavePropertyUnit() |
@@ -2,14 +2,14 @@ |
||
2 | 2 | |
3 | 3 | namespace app\modules\shop\controllers; |
4 | 4 | |
5 | +use Yii; |
|
5 | 6 | use app\backend\components\BackendController; |
7 | +use app\backgroundtasks\helpers\BackgroundTasks; |
|
6 | 8 | use app\components\Helper; |
9 | +use app\models\Property; |
|
7 | 10 | use app\modules\shop\models\Yml; |
8 | -use app\backgroundtasks\helpers\BackgroundTasks; |
|
9 | -use Yii; |
|
10 | 11 | use yii\filters\AccessControl; |
11 | 12 | use yii\helpers\Json; |
12 | -use app\models\Property; |
|
13 | 13 | use yii\web\HttpException; |
14 | 14 | use yii\web\Response; |
15 | 15 |
@@ -2,12 +2,14 @@ discard block |
||
2 | 2 | |
3 | 3 | namespace app\modules\shop\controllers; |
4 | 4 | |
5 | +use Yii; |
|
5 | 6 | use app\modules\core\behaviors\DisableRobotIndexBehavior; |
6 | 7 | use app\modules\core\helpers\EventTriggeringHelper; |
7 | 8 | use app\modules\core\models\Events; |
8 | -use app\modules\shop\helpers\PriceHelper; |
|
9 | +use app\modules\shop\ShopModule; |
|
9 | 10 | use app\modules\shop\events\OrderStageEvent; |
10 | 11 | use app\modules\shop\events\OrderStageLeafEvent; |
12 | +use app\modules\shop\helpers\PriceHelper; |
|
11 | 13 | use app\modules\shop\models\Currency; |
12 | 14 | use app\modules\shop\models\Order; |
13 | 15 | use app\modules\shop\models\OrderCode; |
@@ -16,10 +18,8 @@ discard block |
||
16 | 18 | use app\modules\shop\models\OrderStageLeaf; |
17 | 19 | use app\modules\shop\models\Product; |
18 | 20 | use app\modules\shop\models\SpecialPriceList; |
19 | -use app\modules\shop\ShopModule; |
|
20 | -use yii\helpers\Url; |
|
21 | -use Yii; |
|
22 | 21 | use yii\helpers\ArrayHelper; |
22 | +use yii\helpers\Url; |
|
23 | 23 | use yii\web\BadRequestHttpException; |
24 | 24 | use yii\web\Controller; |
25 | 25 | use yii\web\NotFoundHttpException; |
@@ -74,7 +74,7 @@ |
||
74 | 74 | * Get OrderItem. |
75 | 75 | * @param int $id |
76 | 76 | * @param bool $checkOrderAttachment |
77 | - * @return OrderItem |
|
77 | + * @return null|Order |
|
78 | 78 | * @throws NotFoundHttpException |
79 | 79 | */ |
80 | 80 | protected function loadOrderItem($id, $checkOrderAttachment = true) |
@@ -2,21 +2,21 @@ |
||
2 | 2 | |
3 | 3 | namespace app\modules\shop\controllers; |
4 | 4 | |
5 | +use Yii; |
|
5 | 6 | use app\components\Controller; |
6 | 7 | use app\extensions\DefaultTheme\components\BaseWidget; |
7 | 8 | use app\extensions\DefaultTheme\models\ThemeActiveWidgets; |
8 | 9 | use app\extensions\DefaultTheme\models\ThemeWidgets; |
9 | 10 | use app\extensions\DefaultTheme\widgets\FilterSets\Widget; |
11 | +use app\models\Object; |
|
10 | 12 | use app\models\PropertyStaticValues; |
13 | +use app\models\Search; |
|
11 | 14 | use app\modules\core\helpers\EventTriggeringHelper; |
12 | 15 | use app\modules\shop\events\ProductPageShowed; |
13 | 16 | use app\modules\shop\models\Category; |
14 | -use app\models\Object; |
|
15 | 17 | use app\modules\shop\models\Product; |
16 | -use app\models\Search; |
|
17 | 18 | use app\traits\DynamicContentTrait; |
18 | 19 | use devgroup\TagDependencyHelper\ActiveRecordHelper; |
19 | -use Yii; |
|
20 | 20 | use yii\caching\TagDependency; |
21 | 21 | use yii\data\Pagination; |
22 | 22 | use yii\helpers\ArrayHelper; |
@@ -9,7 +9,6 @@ |
||
9 | 9 | use app\modules\shop\models\DeliveryInformation; |
10 | 10 | use app\modules\shop\models\Order; |
11 | 11 | use app\modules\shop\models\OrderDeliveryInformation; |
12 | -use app\modules\shop\models\OrderStageLeaf; |
|
13 | 12 | use app\modules\shop\models\OrderTransaction; |
14 | 13 | use app\modules\shop\models\PaymentType; |
15 | 14 | use app\properties\HasProperties; |
@@ -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 |
@@ -2,28 +2,28 @@ |
||
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; |
11 | +use app\modules\data\components\ImportableInterface; |
|
12 | +use app\modules\image\models\Image; |
|
12 | 13 | use app\modules\shop\ShopModule; |
13 | 14 | use app\properties\HasProperties; |
14 | 15 | use app\traits\GetImages; |
15 | 16 | use devgroup\TagDependencyHelper\ActiveRecordHelper; |
16 | -use Yii; |
|
17 | 17 | use yii\base\Exception; |
18 | 18 | use yii\behaviors\TimestampBehavior; |
19 | 19 | use yii\caching\TagDependency; |
20 | 20 | use yii\data\ActiveDataProvider; |
21 | +use yii\data\Pagination; |
|
21 | 22 | use yii\db\ActiveQuery; |
22 | 23 | use yii\db\ActiveRecord; |
23 | 24 | use yii\db\Expression; |
24 | 25 | use yii\db\Query; |
25 | 26 | use yii\helpers\ArrayHelper; |
26 | -use yii\data\Pagination; |
|
27 | 27 | |
28 | 28 | /** |
29 | 29 | * This is the model class for table "product". |
@@ -240,7 +240,7 @@ discard block |
||
240 | 240 | /** |
241 | 241 | * Returns model instance by ID using per-request Identity Map and cache |
242 | 242 | * @param $id |
243 | - * @param int $is_active Return only active |
|
243 | + * @param int $isActive Return only active |
|
244 | 244 | * @return Product |
245 | 245 | */ |
246 | 246 | public static function findById($id, $isActive = 1) |
@@ -327,7 +327,7 @@ discard block |
||
327 | 327 | } |
328 | 328 | |
329 | 329 | /** |
330 | - * @return Category|null |
|
330 | + * @return ActiveQuery |
|
331 | 331 | */ |
332 | 332 | public function getCategory() |
333 | 333 | { |
@@ -1074,7 +1074,7 @@ discard block |
||
1074 | 1074 | } |
1075 | 1075 | |
1076 | 1076 | /** |
1077 | - * @param int|Category|null $category |
|
1077 | + * @param integer $category |
|
1078 | 1078 | * @param bool $asMainCategory |
1079 | 1079 | * @return bool |
1080 | 1080 | * @throws \yii\db\Exception |
@@ -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 | { |