@@ -2,10 +2,9 @@ |
||
| 2 | 2 | |
| 3 | 3 | namespace app\modules\seo\models; |
| 4 | 4 | |
| 5 | +use Yii; |
|
| 5 | 6 | use app\backend\BackendModule; |
| 6 | -use app\backend\components\BackendController; |
|
| 7 | 7 | use devgroup\TagDependencyHelper\ActiveRecordHelper; |
| 8 | -use Yii; |
|
| 9 | 8 | use yii\data\ActiveDataProvider; |
| 10 | 9 | use yii\db\ActiveRecord; |
| 11 | 10 | |
@@ -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 |
@@ -1,6 +1,7 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | 2 | namespace app\modules\shop\components\yml; |
| 3 | 3 | |
| 4 | +use Yii; |
|
| 4 | 5 | use app\models\ObjectStaticValues; |
| 5 | 6 | use app\models\Property; |
| 6 | 7 | use app\models\PropertyStaticValues; |
@@ -9,10 +10,9 @@ discard block |
||
| 9 | 10 | use app\modules\shop\models\Category; |
| 10 | 11 | use app\modules\shop\models\Currency; |
| 11 | 12 | use app\modules\shop\models\Product; |
| 13 | +use app\modules\shop\models\Yml as YmlModel; |
|
| 12 | 14 | use devgroup\TagDependencyHelper\ActiveRecordHelper; |
| 13 | -use Yii; |
|
| 14 | 15 | use yii\base\Component; |
| 15 | -use app\modules\shop\models\Yml as YmlModel; |
|
| 16 | 16 | use yii\caching\TagDependency; |
| 17 | 17 | use yii\db\Query; |
| 18 | 18 | use yii\helpers\Json; |
@@ -2,28 +2,28 @@ |
||
| 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\actions\BatchEditPriceAction; |
|
| 16 | +use app\modules\shop\models\Category; |
|
| 17 | +use app\properties\HasProperties; |
|
| 16 | 18 | use devgroup\JsTreeWidget\AdjacencyFullTreeDataAction; |
| 17 | 19 | use devgroup\JsTreeWidget\TreeNodeMoveAction; |
| 18 | 20 | use devgroup\JsTreeWidget\TreeNodesReorderAction; |
| 19 | -use Yii; |
|
| 20 | 21 | use yii\db\Query; |
| 21 | 22 | use yii\filters\AccessControl; |
| 22 | 23 | use yii\helpers\Json; |
| 23 | 24 | use yii\helpers\Url; |
| 24 | 25 | use yii\web\NotFoundHttpException; |
| 25 | 26 | use yii\web\ServerErrorHttpException; |
| 26 | -use app\modules\shop\actions\BatchEditPriceAction; |
|
| 27 | 27 | |
| 28 | 28 | class BackendCategoryController extends BackendController |
| 29 | 29 | { |
@@ -2,26 +2,29 @@ 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\actions\BatchEditPriceAction; |
|
| 23 | +use app\modules\shop\models\Category; |
|
| 24 | +use app\modules\shop\models\Currency; |
|
| 25 | +use app\modules\shop\models\Product; |
|
| 26 | +use app\properties\HasProperties; |
|
| 23 | 27 | use devgroup\JsTreeWidget\AdjacencyFullTreeDataAction; |
| 24 | -use Yii; |
|
| 25 | 28 | use yii\data\ActiveDataProvider; |
| 26 | 29 | use yii\db\Query; |
| 27 | 30 | use yii\filters\AccessControl; |
@@ -30,9 +33,6 @@ discard block |
||
| 30 | 33 | use yii\helpers\Url; |
| 31 | 34 | use yii\web\NotFoundHttpException; |
| 32 | 35 | use yii\web\ServerErrorHttpException; |
| 33 | -use app\backend\actions\MassPublishAction; |
|
| 34 | -use app\backend\actions\CategoryMovementsAction; |
|
| 35 | -use app\modules\shop\actions\BatchEditPriceAction; |
|
| 36 | 36 | |
| 37 | 37 | class BackendProductController extends BackendController |
| 38 | 38 | { |
@@ -2,11 +2,11 @@ |
||
| 2 | 2 | namespace app\modules\shop\actions; |
| 3 | 3 | |
| 4 | 4 | use Yii; |
| 5 | -use yii\base\Action; |
|
| 6 | -use yii\web\Response; |
|
| 7 | -use yii\web\NotFoundHttpException; |
|
| 8 | 5 | use app\modules\shop\models\Category; |
| 9 | 6 | use app\modules\shop\models\Product; |
| 7 | +use yii\base\Action; |
|
| 8 | +use yii\web\NotFoundHttpException; |
|
| 9 | +use yii\web\Response; |
|
| 10 | 10 | |
| 11 | 11 | class BatchEditPriceAction extends Action |
| 12 | 12 | { |
@@ -2,31 +2,31 @@ |
||
| 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; |
|
| 13 | +use app\modules\shop\ShopModule; |
|
| 12 | 14 | use app\modules\shop\data\FilterPagination; |
| 13 | 15 | use app\modules\shop\traits\HasAddonTrait; |
| 14 | -use app\modules\shop\ShopModule; |
|
| 15 | 16 | use app\properties\HasProperties; |
| 16 | 17 | use app\properties\PropertiesHelper; |
| 17 | 18 | use app\traits\GetImages; |
| 18 | 19 | use devgroup\TagDependencyHelper\ActiveRecordHelper; |
| 19 | -use Yii; |
|
| 20 | 20 | use yii\base\Exception; |
| 21 | 21 | use yii\behaviors\TimestampBehavior; |
| 22 | 22 | use yii\caching\TagDependency; |
| 23 | 23 | use yii\data\ActiveDataProvider; |
| 24 | +use yii\data\Pagination; |
|
| 24 | 25 | use yii\db\ActiveQuery; |
| 25 | 26 | use yii\db\ActiveRecord; |
| 26 | 27 | use yii\db\Expression; |
| 27 | 28 | use yii\db\Query; |
| 28 | 29 | use yii\helpers\ArrayHelper; |
| 29 | -use yii\data\Pagination; |
|
| 30 | 30 | use yii\web\ServerErrorHttpException; |
| 31 | 31 | |
| 32 | 32 | /** |
@@ -344,7 +344,7 @@ discard block |
||
| 344 | 344 | } |
| 345 | 345 | |
| 346 | 346 | /** |
| 347 | - * @return Category|null |
|
| 347 | + * @return ActiveQuery |
|
| 348 | 348 | */ |
| 349 | 349 | public function getCategory() |
| 350 | 350 | { |
@@ -1115,7 +1115,7 @@ discard block |
||
| 1115 | 1115 | } |
| 1116 | 1116 | |
| 1117 | 1117 | /** |
| 1118 | - * @param int|Category|null $category |
|
| 1118 | + * @param integer $category |
|
| 1119 | 1119 | * @param bool $asMainCategory |
| 1120 | 1120 | * @return bool |
| 1121 | 1121 | * @throws \yii\db\Exception |
@@ -2,13 +2,13 @@ |
||
| 2 | 2 | |
| 3 | 3 | namespace app\modules\shop\controllers; |
| 4 | 4 | |
| 5 | -use yii\web\Controller; |
|
| 6 | 5 | use Yii; |
| 7 | -use yii\web\Response; |
|
| 8 | 6 | use app\modules\shop\models\Wishlist; |
| 9 | -use yii\web\NotFoundHttpException; |
|
| 10 | -use yii\web\BadRequestHttpException; |
|
| 11 | 7 | use app\modules\shop\models\WishlistProduct; |
| 8 | +use yii\web\BadRequestHttpException; |
|
| 9 | +use yii\web\Controller; |
|
| 10 | +use yii\web\NotFoundHttpException; |
|
| 11 | +use yii\web\Response; |
|
| 12 | 12 | |
| 13 | 13 | class WishlistController extends Controller |
| 14 | 14 | { |
@@ -2,11 +2,11 @@ |
||
| 2 | 2 | |
| 3 | 3 | namespace app\modules\shop\models; |
| 4 | 4 | |
| 5 | -use yii\db\ActiveRecord; |
|
| 6 | 5 | use Yii; |
| 7 | -use app\modules\user\models\User; |
|
| 8 | -use app\modules\shop\models\WishlistProduct; |
|
| 9 | 6 | use app\modules\shop\models\Currency; |
| 7 | +use app\modules\shop\models\WishlistProduct; |
|
| 8 | +use app\modules\user\models\User; |
|
| 9 | +use yii\db\ActiveRecord; |
|
| 10 | 10 | |
| 11 | 11 | /** |
| 12 | 12 | * This is the model class for table "{{%wishlist}}". |
@@ -73,7 +73,7 @@ discard block |
||
| 73 | 73 | } |
| 74 | 74 | |
| 75 | 75 | /** |
| 76 | - * @return User|null |
|
| 76 | + * @return \yii\db\ActiveQuery |
|
| 77 | 77 | */ |
| 78 | 78 | public function getUser() |
| 79 | 79 | { |
@@ -81,7 +81,7 @@ discard block |
||
| 81 | 81 | } |
| 82 | 82 | |
| 83 | 83 | /** |
| 84 | - * @return WishlistProduct[]|null |
|
| 84 | + * @return \yii\db\ActiveQuery |
|
| 85 | 85 | */ |
| 86 | 86 | public function getItems() |
| 87 | 87 | { |
@@ -91,7 +91,7 @@ discard block |
||
| 91 | 91 | /** |
| 92 | 92 | * @param $user_id |
| 93 | 93 | * @param array $wishlist_ids |
| 94 | - * @return array |
|
| 94 | + * @return \yii\db\BaseActiveRecord[] |
|
| 95 | 95 | */ |
| 96 | 96 | public static function getWishlist($user_id, $wishlist_ids) |
| 97 | 97 | { |
@@ -210,7 +210,7 @@ discard block |
||
| 210 | 210 | } |
| 211 | 211 | |
| 212 | 212 | /** |
| 213 | - * @param $itemId |
|
| 213 | + * @param integer $itemId |
|
| 214 | 214 | * @return bool |
| 215 | 215 | */ |
| 216 | 216 | public function removeItem($itemId) |