@@ -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; |
@@ -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; |
@@ -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. |
@@ -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 | |
@@ -3,8 +3,6 @@ |
||
| 3 | 3 | namespace app\modules\shop\controllers; |
| 4 | 4 | |
| 5 | 5 | use app\modules\core\behaviors\DisableRobotIndexBehavior; |
| 6 | -use app\modules\shop\models\Contragent; |
|
| 7 | -use app\modules\shop\models\Customer; |
|
| 8 | 6 | use app\modules\shop\models\Order; |
| 9 | 7 | use yii\filters\AccessControl; |
| 10 | 8 | use yii\helpers\Url; |
@@ -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; |
@@ -239,7 +239,7 @@ discard block |
||
| 239 | 239 | /** |
| 240 | 240 | * Returns model using indentity map and cache |
| 241 | 241 | * @param int $id |
| 242 | - * @param int|null $isActive |
|
| 242 | + * @param integer $isActive |
|
| 243 | 243 | * @return Category|null |
| 244 | 244 | */ |
| 245 | 245 | public static function findById($id, $isActive = 1) |
@@ -275,6 +275,7 @@ discard block |
||
| 275 | 275 | /** |
| 276 | 276 | * Finds category by slug inside category_group_id |
| 277 | 277 | * Uses cache and identity_map |
| 278 | + * @param integer $category_group_id |
|
| 278 | 279 | */ |
| 279 | 280 | public static function findBySlug($slug, $category_group_id, $parent_id = 0) |
| 280 | 281 | { |
@@ -328,6 +329,7 @@ discard block |
||
| 328 | 329 | /** |
| 329 | 330 | * Ищет по name в рамках category_group_id |
| 330 | 331 | * Заносит в identity_map |
| 332 | + * @param integer $category_group_id |
|
| 331 | 333 | */ |
| 332 | 334 | public static function findByName($name, $category_group_id, $parent_id = 0) |
| 333 | 335 | { |
@@ -415,6 +417,7 @@ discard block |
||
| 415 | 417 | /** |
| 416 | 418 | * Ищет root для группы категорий |
| 417 | 419 | * Использует identity_map |
| 420 | + * @param integer $id |
|
| 418 | 421 | * @return Category|null |
| 419 | 422 | */ |
| 420 | 423 | public static function findRootForCategoryGroup($id = null) |
@@ -477,7 +480,7 @@ discard block |
||
| 477 | 480 | |
| 478 | 481 | /** |
| 479 | 482 | * @param int $parentId |
| 480 | - * @param int|null $isActive |
|
| 483 | + * @param integer $isActive |
|
| 481 | 484 | * @return Category[]|array |
| 482 | 485 | */ |
| 483 | 486 | public static function getByParentId($parentId = null, $isActive = 1) |
@@ -2,11 +2,10 @@ |
||
| 2 | 2 | |
| 3 | 3 | namespace app\models; |
| 4 | 4 | |
| 5 | +use Yii; |
|
| 5 | 6 | use app\properties\AbstractModel; |
| 6 | 7 | use app\properties\HasProperties; |
| 7 | -use Yii; |
|
| 8 | 8 | use yii\data\ActiveDataProvider; |
| 9 | -use yii\helpers\ArrayHelper; |
|
| 10 | 9 | |
| 11 | 10 | /** |
| 12 | 11 | * This is the model class for table "submission". |