@@ -1,9 +1,6 @@ |
||
1 | 1 | <?php |
2 | 2 | |
3 | 3 | use app\backend\components\ActionColumn; |
4 | -use kartik\dynagrid\DynaGrid; |
|
5 | -use kartik\helpers\Html; |
|
6 | -use kartik\icons\Icon; |
|
7 | 4 | |
8 | 5 | /** |
9 | 6 | * @var $this yii\web\View |
@@ -2,19 +2,18 @@ |
||
2 | 2 | |
3 | 3 | namespace app\modules\shop\backend; |
4 | 4 | |
5 | +use Yii; |
|
5 | 6 | use app\backend\components\BackendController; |
6 | -use app\modules\shop\models\Category; |
|
7 | 7 | use app\models\Object; |
8 | -use app\modules\shop\models\Product; |
|
9 | 8 | use app\models\Property; |
10 | 9 | use app\models\PropertyGroup; |
11 | 10 | use app\models\PropertyStaticValues; |
11 | +use app\modules\shop\models\Category; |
|
12 | 12 | use app\modules\shop\models\FilterSets; |
13 | +use app\modules\shop\models\Product; |
|
14 | +use devgroup\JsTreeWidget\AdjacencyFullTreeDataAction; |
|
13 | 15 | use devgroup\TagDependencyHelper\ActiveRecordHelper; |
14 | -use Yii; |
|
15 | -use yii\debug\components\search\Filter; |
|
16 | 16 | use yii\filters\AccessControl; |
17 | -use devgroup\JsTreeWidget\AdjacencyFullTreeDataAction; |
|
18 | 17 | use yii\web\BadRequestHttpException; |
19 | 18 | use yii\web\NotFoundHttpException; |
20 | 19 | use yii\web\Response; |
@@ -193,6 +193,9 @@ |
||
193 | 193 | return $result; |
194 | 194 | } |
195 | 195 | |
196 | + /** |
|
197 | + * @param string $className |
|
198 | + */ |
|
196 | 199 | private function invalidateTags($className, $ids) |
197 | 200 | { |
198 | 201 | $tags = [ |
@@ -44,6 +44,10 @@ |
||
44 | 44 | return $default; |
45 | 45 | } |
46 | 46 | |
47 | + /** |
|
48 | + * @param Yml $yml |
|
49 | + * @param string $name |
|
50 | + */ |
|
47 | 51 | private function wrapByYmlParam($yml, $name, $model, $tpl) |
48 | 52 | { |
49 | 53 | $result = $this->getByYmlParam($yml, $name, $model); |
@@ -2,18 +2,18 @@ |
||
2 | 2 | |
3 | 3 | namespace app\modules\shop\commands; |
4 | 4 | |
5 | -use app\modules\shop\models\Yml; |
|
5 | +use Yii; |
|
6 | +use app\models\ObjectStaticValues; |
|
7 | +use app\models\Property; |
|
8 | +use app\models\PropertyStaticValues; |
|
6 | 9 | use app\modules\shop\models\Category; |
7 | 10 | use app\modules\shop\models\Product; |
8 | -use yii\helpers\Url; |
|
9 | -use Yii; |
|
11 | +use app\modules\shop\models\Yml; |
|
10 | 12 | use devgroup\TagDependencyHelper\ActiveRecordHelper; |
11 | 13 | use yii\caching\TagDependency; |
12 | 14 | use yii\db\Query; |
13 | 15 | use yii\helpers\Json; |
14 | -use app\models\ObjectStaticValues; |
|
15 | -use app\models\Property; |
|
16 | -use app\models\PropertyStaticValues; |
|
16 | +use yii\helpers\Url; |
|
17 | 17 | |
18 | 18 | class YmlController extends \yii\console\Controller |
19 | 19 | { |
@@ -2,21 +2,21 @@ |
||
2 | 2 | |
3 | 3 | namespace app\modules\shop\controllers; |
4 | 4 | |
5 | +use Yii; |
|
5 | 6 | use app\backend\actions\PropertyHandler; |
6 | 7 | use app\backend\components\BackendController; |
7 | 8 | use app\backend\events\BackendEntityEditEvent; |
8 | -use app\modules\image\widgets\views\AddImageAction; |
|
9 | -use app\modules\shop\models\Category; |
|
10 | 9 | use app\models\Object; |
11 | 10 | use app\models\ViewObject; |
12 | -use app\properties\HasProperties; |
|
13 | 11 | use app\modules\image\widgets\RemoveAction; |
14 | 12 | use app\modules\image\widgets\SaveInfoAction; |
15 | 13 | use app\modules\image\widgets\UploadAction; |
14 | +use app\modules\image\widgets\views\AddImageAction; |
|
15 | +use app\modules\shop\models\Category; |
|
16 | +use app\properties\HasProperties; |
|
16 | 17 | use devgroup\JsTreeWidget\AdjacencyFullTreeDataAction; |
17 | 18 | use devgroup\JsTreeWidget\TreeNodeMoveAction; |
18 | 19 | use devgroup\JsTreeWidget\TreeNodesReorderAction; |
19 | -use Yii; |
|
20 | 20 | use yii\db\Query; |
21 | 21 | use yii\filters\AccessControl; |
22 | 22 | use yii\helpers\Json; |
@@ -2,13 +2,13 @@ |
||
2 | 2 | |
3 | 3 | namespace app\modules\shop\controllers; |
4 | 4 | |
5 | -use app\backend\components\BackendController; |
|
6 | 5 | use Yii; |
7 | -use app\modules\shop\models\CategoryGroup; |
|
6 | +use app\backend\components\BackendController; |
|
8 | 7 | use app\components\SearchModel; |
8 | +use app\modules\shop\models\CategoryGroup; |
|
9 | 9 | use yii\filters\AccessControl; |
10 | -use yii\web\NotFoundHttpException; |
|
11 | 10 | use yii\helpers\Url; |
11 | +use yii\web\NotFoundHttpException; |
|
12 | 12 | |
13 | 13 | /** |
14 | 14 | * CategoryGroupController implements the CRUD actions for CategoryGroup 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 | { |
@@ -3,12 +3,12 @@ |
||
3 | 3 | namespace app\modules\shop\controllers; |
4 | 4 | |
5 | 5 | |
6 | +use Yii; |
|
7 | +use app\backend\components\BackendController; |
|
6 | 8 | use app\modules\shop\models\AbstractDiscountType; |
7 | 9 | use app\modules\shop\models\Discount; |
8 | 10 | use app\modules\shop\models\DiscountType; |
9 | 11 | use yii\filters\AccessControl; |
10 | -use app\backend\components\BackendController; |
|
11 | -use Yii; |
|
12 | 12 | use yii\helpers\Url; |
13 | 13 | use yii\web\NotFoundHttpException; |
14 | 14 |
@@ -2,12 +2,14 @@ discard block |
||
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\backend\models\Notification; |
7 | 8 | use app\backend\models\OrderChat; |
8 | 9 | use app\components\Helper; |
9 | 10 | use app\components\SearchModel; |
10 | 11 | use app\modules\core\helpers\EventSubscribingHelper; |
12 | +use app\modules\shop\ShopModule; |
|
11 | 13 | use app\modules\shop\events\OrderCalculateEvent; |
12 | 14 | use app\modules\shop\helpers\PriceHelper; |
13 | 15 | use app\modules\shop\models\Contragent; |
@@ -22,14 +24,11 @@ discard block |
||
22 | 24 | use app\modules\shop\models\Product; |
23 | 25 | use app\modules\shop\models\ShippingOption; |
24 | 26 | use app\modules\shop\models\SpecialPriceList; |
25 | -use app\modules\shop\ShopModule; |
|
26 | 27 | use app\modules\user\models\User; |
27 | 28 | use app\properties\HasProperties; |
28 | 29 | use kartik\helpers\Html; |
29 | -use Yii; |
|
30 | 30 | use yii\caching\TagDependency; |
31 | 31 | use yii\data\ArrayDataProvider; |
32 | -use yii\db\Query; |
|
33 | 32 | use yii\filters\AccessControl; |
34 | 33 | use yii\helpers\ArrayHelper; |
35 | 34 | use yii\helpers\Url; |
@@ -2,10 +2,10 @@ |
||
2 | 2 | |
3 | 3 | namespace app\modules\shop\controllers; |
4 | 4 | |
5 | -use app\components\SearchModel; |
|
5 | +use Yii; |
|
6 | 6 | use app\backend\components\BackendController; |
7 | +use app\components\SearchModel; |
|
7 | 8 | use app\modules\shop\models\PaymentType; |
8 | -use Yii; |
|
9 | 9 | use yii\filters\AccessControl; |
10 | 10 | use yii\filters\VerbFilter; |
11 | 11 | use yii\web\NotFoundHttpException; |
@@ -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,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\models\Object; |
7 | 8 | use app\models\PrefilteredPages; |
8 | -use app\modules\shop\models\Product; |
|
9 | 9 | use app\models\Property; |
10 | 10 | use app\models\PropertyGroup; |
11 | 11 | use app\models\PropertyStaticValues; |
12 | -use Yii; |
|
12 | +use app\modules\shop\models\Product; |
|
13 | 13 | use yii\db\Query; |
14 | 14 | use yii\filters\AccessControl; |
15 | 15 | use yii\helpers\Url; |