@@ -34,7 +34,7 @@ |
||
34 | 34 | } |
35 | 35 | |
36 | 36 | /** |
37 | - * @return mixed |
|
37 | + * @return \app\modules\shop\models\Addon |
|
38 | 38 | */ |
39 | 39 | public function getModel() |
40 | 40 | { |
@@ -41,7 +41,7 @@ discard block |
||
41 | 41 | } |
42 | 42 | |
43 | 43 | /** |
44 | - * @return mixed |
|
44 | + * @return string |
|
45 | 45 | */ |
46 | 46 | public function getValue() |
47 | 47 | { |
@@ -49,7 +49,7 @@ discard block |
||
49 | 49 | } |
50 | 50 | |
51 | 51 | /** |
52 | - * @param mixed $value |
|
52 | + * @param OfferTag[] $value |
|
53 | 53 | * @return $this |
54 | 54 | */ |
55 | 55 | public function setValue($value) |
@@ -9,9 +9,9 @@ |
||
9 | 9 | use app\modules\shop\models\Category; |
10 | 10 | use app\modules\shop\models\Currency; |
11 | 11 | use app\modules\shop\models\Product; |
12 | +use app\modules\shop\models\Yml as YmlModel; |
|
12 | 13 | use devgroup\TagDependencyHelper\ActiveRecordHelper; |
13 | 14 | use yii\base\Component; |
14 | -use app\modules\shop\models\Yml as YmlModel; |
|
15 | 15 | use yii\caching\TagDependency; |
16 | 16 | use yii\db\Query; |
17 | 17 | use yii\helpers\Json; |
@@ -2,26 +2,26 @@ |
||
2 | 2 | |
3 | 3 | namespace app\modules\shop\controllers; |
4 | 4 | |
5 | +use Yii; |
|
5 | 6 | use app\backend\actions\PropertyHandler; |
7 | +use app\backend\actions\UpdateEditable; |
|
6 | 8 | use app\backend\components\BackendController; |
7 | 9 | 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 | 10 | use app\models\Object; |
12 | 11 | use app\models\ObjectPropertyGroup; |
13 | -use app\modules\shop\models\Currency; |
|
14 | -use app\modules\shop\models\Product; |
|
15 | 12 | use app\models\Property; |
16 | 13 | use app\models\PropertyStaticValues; |
17 | 14 | use app\models\ViewObject; |
18 | -use app\properties\HasProperties; |
|
15 | +use app\modules\image\models\Image; |
|
19 | 16 | use app\modules\image\widgets\RemoveAction; |
20 | 17 | use app\modules\image\widgets\SaveInfoAction; |
21 | 18 | use app\modules\image\widgets\UploadAction; |
22 | -use app\backend\actions\UpdateEditable; |
|
19 | +use app\modules\image\widgets\views\AddImageAction; |
|
20 | +use app\modules\shop\models\Category; |
|
21 | +use app\modules\shop\models\Currency; |
|
22 | +use app\modules\shop\models\Product; |
|
23 | +use app\properties\HasProperties; |
|
23 | 24 | use devgroup\JsTreeWidget\AdjacencyFullTreeDataAction; |
24 | -use Yii; |
|
25 | 25 | use yii\data\ActiveDataProvider; |
26 | 26 | use yii\db\Query; |
27 | 27 | use yii\filters\AccessControl; |
@@ -1,16 +1,18 @@ discard block |
||
1 | 1 | <?php |
2 | 2 | namespace app\modules\shop\controllers; |
3 | 3 | |
4 | +use Yii; |
|
4 | 5 | use app\modules\core\behaviors\DisableRobotIndexBehavior; |
5 | 6 | use app\modules\core\helpers\EventTriggeringHelper; |
6 | 7 | use app\modules\core\models\Events; |
8 | +use app\modules\shop\ShopModule; |
|
7 | 9 | use app\modules\shop\events\CartActionEvent; |
8 | -use app\modules\shop\handlers\CartHandler; |
|
9 | -use app\modules\shop\helpers\PriceHelper; |
|
10 | 10 | use app\modules\shop\events\OrderStageEvent; |
11 | 11 | use app\modules\shop\events\OrderStageLeafEvent; |
12 | +use app\modules\shop\handlers\CartHandler; |
|
13 | +use app\modules\shop\helpers\CurrencyHelper; |
|
14 | +use app\modules\shop\helpers\PriceHelper; |
|
12 | 15 | use app\modules\shop\models\Addon; |
13 | -use app\modules\shop\models\Currency; |
|
14 | 16 | use app\modules\shop\models\Order; |
15 | 17 | use app\modules\shop\models\OrderCode; |
16 | 18 | use app\modules\shop\models\OrderItem; |
@@ -18,17 +20,12 @@ discard block |
||
18 | 20 | use app\modules\shop\models\OrderStageLeaf; |
19 | 21 | use app\modules\shop\models\Product; |
20 | 22 | use app\modules\shop\models\SpecialPriceList; |
21 | -use app\modules\shop\models\UserPreferences; |
|
22 | -use app\modules\shop\ShopModule; |
|
23 | 23 | use yii\base\Event; |
24 | 24 | use yii\helpers\Url; |
25 | -use Yii; |
|
26 | -use yii\helpers\ArrayHelper; |
|
27 | 25 | use yii\web\BadRequestHttpException; |
28 | 26 | use yii\web\Controller; |
29 | 27 | use yii\web\NotFoundHttpException; |
30 | 28 | use yii\web\Response; |
31 | -use app\modules\shop\helpers\CurrencyHelper; |
|
32 | 29 | |
33 | 30 | /** |
34 | 31 | * Class CartController |
@@ -46,7 +46,6 @@ discard block |
||
46 | 46 | |
47 | 47 | /** |
48 | 48 | * @param string $code |
49 | - * @param bool|true $useMainCurrency |
|
50 | 49 | * @return Currency |
51 | 50 | */ |
52 | 51 | static public function findCurrencyByIso($code) |
@@ -57,10 +56,10 @@ discard block |
||
57 | 56 | } |
58 | 57 | |
59 | 58 | /** |
60 | - * @param float|int $input |
|
59 | + * @param integer $input |
|
61 | 60 | * @param Currency $from |
62 | 61 | * @param Currency $to |
63 | - * @return float|int |
|
62 | + * @return string |
|
64 | 63 | */ |
65 | 64 | static public function convertCurrencies($input = 0, Currency $from, Currency $to) |
66 | 65 | { |
@@ -84,7 +83,7 @@ discard block |
||
84 | 83 | } |
85 | 84 | |
86 | 85 | /** |
87 | - * @param float|int $input |
|
86 | + * @param integer $input |
|
88 | 87 | * @param Currency $from |
89 | 88 | * @return float|int |
90 | 89 | */ |
@@ -94,7 +93,7 @@ discard block |
||
94 | 93 | } |
95 | 94 | |
96 | 95 | /** |
97 | - * @param float|int $input |
|
96 | + * @param integer $input |
|
98 | 97 | * @param Currency $from |
99 | 98 | * @return float|int |
100 | 99 | */ |
@@ -104,7 +103,7 @@ discard block |
||
104 | 103 | } |
105 | 104 | |
106 | 105 | /** |
107 | - * @param float|int $input |
|
106 | + * @param integer $input |
|
108 | 107 | * @param Currency $to |
109 | 108 | * @return float|int |
110 | 109 | */ |
@@ -2,8 +2,8 @@ |
||
2 | 2 | |
3 | 3 | namespace app\modules\shop\models; |
4 | 4 | |
5 | -use app\traits\SortModels; |
|
6 | 5 | use Yii; |
6 | +use app\traits\SortModels; |
|
7 | 7 | use yii\data\ActiveDataProvider; |
8 | 8 | |
9 | 9 | /** |
@@ -2,12 +2,12 @@ |
||
2 | 2 | |
3 | 3 | namespace app\widgets\navigation\models; |
4 | 4 | |
5 | +use Yii; |
|
5 | 6 | use app\backgroundtasks\traits\SearchModelTrait; |
6 | 7 | use app\behaviors\Tree; |
7 | 8 | use app\properties\HasProperties; |
8 | 9 | use app\traits\FindById; |
9 | 10 | use app\traits\GetImages; |
10 | -use Yii; |
|
11 | 11 | use yii\data\ActiveDataProvider; |
12 | 12 | |
13 | 13 | /** |
@@ -4,9 +4,8 @@ |
||
4 | 4 | |
5 | 5 | use Ivory\HttpAdapter\HttpAdapterInterface; |
6 | 6 | use Yii; |
7 | -use yii\helpers\ArrayHelper; |
|
8 | -use yii\helpers\Json; |
|
9 | 7 | use yii\data\ActiveDataProvider; |
8 | +use yii\helpers\Json; |
|
10 | 9 | |
11 | 10 | /** |
12 | 11 | * Model for storing name and params of Currency Rate Providers |