@@ -2,15 +2,14 @@ |
||
2 | 2 | |
3 | 3 | namespace app\modules\page\controllers; |
4 | 4 | |
5 | +use Yii; |
|
5 | 6 | use app\components\Controller; |
7 | +use app\models\Search; |
|
6 | 8 | use app\modules\core\helpers\ContentBlockHelper; |
7 | 9 | use app\modules\core\models\ContentBlock; |
8 | 10 | use app\modules\page\models\Page; |
9 | -use app\models\Search; |
|
10 | -use app\modules\seo\behaviors\MetaBehavior; |
|
11 | 11 | use app\traits\LoadModel; |
12 | 12 | use devgroup\TagDependencyHelper\ActiveRecordHelper; |
13 | -use Yii; |
|
14 | 13 | use yii\caching\TagDependency; |
15 | 14 | use yii\data\Pagination; |
16 | 15 | use yii\db\ActiveQuery; |
@@ -3,17 +3,17 @@ |
||
3 | 3 | namespace app\backend\actions; |
4 | 4 | |
5 | 5 | |
6 | +use Yii; |
|
7 | +use app\backend\widgets\CategoryMovementsButtons; |
|
6 | 8 | use app\models\Object; |
7 | 9 | use app\modules\shop\models\Category; |
8 | 10 | use app\modules\shop\models\Product; |
9 | 11 | use devgroup\TagDependencyHelper\ActiveRecordHelper; |
10 | 12 | use yii\base\Action; |
11 | -use Yii; |
|
12 | 13 | use yii\caching\TagDependency; |
13 | 14 | use yii\db\Query; |
14 | 15 | use yii\web\NotFoundHttpException; |
15 | 16 | use yii\web\ServerErrorHttpException; |
16 | -use app\backend\widgets\CategoryMovementsButtons; |
|
17 | 17 | |
18 | 18 | class CategoryMovementsAction extends Action |
19 | 19 | { |
@@ -3,12 +3,12 @@ |
||
3 | 3 | namespace app\backend\widgets; |
4 | 4 | |
5 | 5 | |
6 | -use yii\base\Widget; |
|
7 | 6 | use Yii; |
8 | -use yii\helpers\Html; |
|
9 | -use yii\base\InvalidParamException; |
|
10 | 7 | use app\modules\shop\models\Category; |
11 | 8 | use kartik\icons\Icon; |
9 | +use yii\base\InvalidParamException; |
|
10 | +use yii\base\Widget; |
|
11 | +use yii\helpers\Html; |
|
12 | 12 | |
13 | 13 | class CategoryMovementsButtons extends Widget |
14 | 14 | { |
@@ -2,26 +2,28 @@ discard block |
||
2 | 2 | |
3 | 3 | namespace app\modules\shop\controllers; |
4 | 4 | |
5 | +use Yii; |
|
6 | +use app\backend\actions\CategoryMovementsAction; |
|
7 | +use app\backend\actions\MassPublishAction; |
|
5 | 8 | use app\backend\actions\PropertyHandler; |
9 | +use app\backend\actions\UpdateEditable; |
|
6 | 10 | use app\backend\components\BackendController; |
7 | 11 | use app\backend\events\BackendEntityEditEvent; |
8 | -use app\modules\image\widgets\views\AddImageAction; |
|
9 | -use app\modules\shop\models\Category; |
|
10 | -use app\modules\image\models\Image; |
|
11 | 12 | use app\models\Object; |
12 | 13 | use app\models\ObjectPropertyGroup; |
13 | -use app\modules\shop\models\Currency; |
|
14 | -use app\modules\shop\models\Product; |
|
15 | 14 | use app\models\Property; |
16 | 15 | use app\models\PropertyStaticValues; |
17 | 16 | use app\models\ViewObject; |
18 | -use app\properties\HasProperties; |
|
17 | +use app\modules\image\models\Image; |
|
19 | 18 | use app\modules\image\widgets\RemoveAction; |
20 | 19 | use app\modules\image\widgets\SaveInfoAction; |
21 | 20 | use app\modules\image\widgets\UploadAction; |
22 | -use app\backend\actions\UpdateEditable; |
|
21 | +use app\modules\image\widgets\views\AddImageAction; |
|
22 | +use app\modules\shop\models\Category; |
|
23 | +use app\modules\shop\models\Currency; |
|
24 | +use app\modules\shop\models\Product; |
|
25 | +use app\properties\HasProperties; |
|
23 | 26 | use devgroup\JsTreeWidget\AdjacencyFullTreeDataAction; |
24 | -use Yii; |
|
25 | 27 | use yii\data\ActiveDataProvider; |
26 | 28 | use yii\db\Query; |
27 | 29 | use yii\filters\AccessControl; |
@@ -30,8 +32,6 @@ discard block |
||
30 | 32 | use yii\helpers\Url; |
31 | 33 | use yii\web\NotFoundHttpException; |
32 | 34 | use yii\web\ServerErrorHttpException; |
33 | -use app\backend\actions\MassPublishAction; |
|
34 | -use app\backend\actions\CategoryMovementsAction; |
|
35 | 35 | |
36 | 36 | class BackendProductController extends BackendController |
37 | 37 | { |
@@ -2,8 +2,8 @@ |
||
2 | 2 | |
3 | 3 | namespace app\traits; |
4 | 4 | |
5 | -use devgroup\TagDependencyHelper\ActiveRecordHelper; |
|
6 | 5 | use Yii; |
6 | +use devgroup\TagDependencyHelper\ActiveRecordHelper; |
|
7 | 7 | use yii\caching\TagDependency; |
8 | 8 | use yii\db\ActiveRecord; |
9 | 9 | use yii\web\NotFoundHttpException; |
@@ -4,10 +4,9 @@ |
||
4 | 4 | namespace app\modules\image\actions; |
5 | 5 | |
6 | 6 | |
7 | +use Yii; |
|
7 | 8 | use app\modules\image\models\Image; |
8 | - |
|
9 | 9 | use creocoder\flysystem\Filesystem; |
10 | -use Yii; |
|
11 | 10 | use yii\base\Action; |
12 | 11 | use yii\base\Exception; |
13 | 12 | use yii\web\NotAcceptableHttpException; |
@@ -92,7 +92,7 @@ discard block |
||
92 | 92 | * @param Order $order |
93 | 93 | * @param SpecialPriceList $specialPrice |
94 | 94 | * @param $price |
95 | - * @return float |
|
95 | + * @return integer |
|
96 | 96 | */ |
97 | 97 | static public function getDiscountPriceOrder( |
98 | 98 | Order $order, |
@@ -121,7 +121,7 @@ discard block |
||
121 | 121 | * @param Order $order |
122 | 122 | * @param SpecialPriceList $specialPrice |
123 | 123 | * @param $price |
124 | - * @return float |
|
124 | + * @return integer |
|
125 | 125 | */ |
126 | 126 | static public function getDeliveryPriceOrder( |
127 | 127 | Order $order, |
@@ -143,7 +143,7 @@ discard block |
||
143 | 143 | } |
144 | 144 | |
145 | 145 | /** |
146 | - * @param array $types |
|
146 | + * @param string[] $types |
|
147 | 147 | * @return array |
148 | 148 | */ |
149 | 149 | static protected function getDiscountsByAppliance($types = []) |
@@ -3,13 +3,11 @@ |
||
3 | 3 | |
4 | 4 | use app\modules\shop\events\OrderCalculateEvent; |
5 | 5 | use app\modules\shop\models\AbstractDiscountType; |
6 | -use app\modules\shop\models\Currency; |
|
7 | 6 | use app\modules\shop\models\Discount; |
8 | 7 | use app\modules\shop\models\Order; |
9 | 8 | use app\modules\shop\models\Product; |
10 | 9 | use app\modules\shop\models\SpecialPriceList; |
11 | 10 | use app\modules\shop\models\SpecialPriceObject; |
12 | -use Yii; |
|
13 | 11 | |
14 | 12 | class PriceHandlers |
15 | 13 | { |
@@ -2,14 +2,13 @@ |
||
2 | 2 | |
3 | 3 | namespace app\modules\shop\models; |
4 | 4 | |
5 | +use Yii; |
|
5 | 6 | use app\modules\shop\models\CurrencyRateProvider; |
6 | -use app\modules\shop\components\SpecialPriceProductInterface; |
|
7 | 7 | use devgroup\TagDependencyHelper\ActiveRecordHelper; |
8 | -use Yii; |
|
9 | 8 | use yii\base\InvalidConfigException; |
10 | 9 | use yii\caching\TagDependency; |
11 | -use yii\helpers\ArrayHelper; |
|
12 | 10 | use yii\data\ActiveDataProvider; |
11 | +use yii\helpers\ArrayHelper; |
|
13 | 12 | |
14 | 13 | /** |
15 | 14 | * This is the model class Multi-currency |
@@ -2,12 +2,12 @@ |
||
2 | 2 | |
3 | 3 | namespace app\backend\widgets; |
4 | 4 | |
5 | -use app\models\Object; |
|
6 | -use app\modules\review\models\Review; |
|
7 | 5 | use Yii; |
8 | -use yii\base\Widget; |
|
9 | 6 | use app; |
7 | +use app\models\Object; |
|
8 | +use app\modules\review\models\Review; |
|
10 | 9 | use kartik\icons\Icon; |
10 | +use yii\base\Widget; |
|
11 | 11 | use yii\helpers\Json; |
12 | 12 | |
13 | 13 | class FloatingPanel extends Widget |