@@ -1094,7 +1094,7 @@ |
||
| 1094 | 1094 | } |
| 1095 | 1095 | |
| 1096 | 1096 | /** |
| 1097 | - * @param int|Category|null $category |
|
| 1097 | + * @param integer $category |
|
| 1098 | 1098 | * @param bool $asMainCategory |
| 1099 | 1099 | * @return bool |
| 1100 | 1100 | * @throws \yii\db\Exception |
@@ -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; |
@@ -61,7 +61,7 @@ |
||
| 61 | 61 | |
| 62 | 62 | /** |
| 63 | 63 | * Set the algorithm of calculation |
| 64 | - * @return float function(float, float) |
|
| 64 | + * @return \Closure function(float, float) |
|
| 65 | 65 | */ |
| 66 | 66 | protected function getCalculator() { |
| 67 | 67 | $kind = Yii::$app->request->post('kind'); |
@@ -2,11 +2,10 @@ |
||
| 2 | 2 | namespace app\modules\shop\actions; |
| 3 | 3 | |
| 4 | 4 | use Yii; |
| 5 | -use yii\base\Action; |
|
| 6 | -use yii\web\Response; |
|
| 7 | 5 | use app\modules\shop\models\Category; |
| 8 | -use app\modules\shop\models\Currency; |
|
| 9 | 6 | use app\modules\shop\models\Product; |
| 7 | +use yii\base\Action; |
|
| 8 | +use yii\web\Response; |
|
| 10 | 9 | |
| 11 | 10 | class PacketPriceEditAction extends Action |
| 12 | 11 | { |
@@ -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\PacketPriceEditAction; |
|
| 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\PacketPriceEditAction; |
|
| 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\PacketPriceEditAction; |
|
| 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\PacketPriceEditAction; |
|
| 36 | 36 | |
| 37 | 37 | class BackendProductController extends BackendController |
| 38 | 38 | { |
@@ -2,12 +2,12 @@ |
||
| 2 | 2 | namespace app\modules\shop\widgets; |
| 3 | 3 | |
| 4 | 4 | use Yii; |
| 5 | +use app\modules\shop\assets\PacketPriceEditAsset; |
|
| 6 | +use app\modules\shop\models\Currency; |
|
| 7 | +use kartik\icons\Icon; |
|
| 5 | 8 | use yii\base\Widget; |
| 6 | 9 | use yii\helpers\Html; |
| 7 | 10 | use yii\helpers\Url; |
| 8 | -use kartik\icons\Icon; |
|
| 9 | -use app\modules\shop\assets\PacketPriceEditAsset; |
|
| 10 | -use app\modules\shop\models\Currency; |
|
| 11 | 11 | |
| 12 | 12 | /** |
| 13 | 13 | * Packet edit the prices |