@@ -291,7 +291,7 @@ |
||
291 | 291 | * @param string $key ContentBlock key |
292 | 292 | * @param array $params . Array of params to be replaced while render |
293 | 293 | * @param yii\base\Model $model . Caller model instance to use in caching |
294 | - * @return mixed |
|
294 | + * @return string |
|
295 | 295 | */ |
296 | 296 | public static function getChunk($key, $params = [], yii\base\Model $model = null) |
297 | 297 | { |
@@ -9,10 +9,10 @@ |
||
9 | 9 | use app\modules\shop\models\Category; |
10 | 10 | use app\modules\shop\models\Product; |
11 | 11 | use devgroup\TagDependencyHelper\ActiveRecordHelper; |
12 | +use yii; |
|
12 | 13 | use yii\caching\TagDependency; |
13 | 14 | use yii\helpers\ArrayHelper; |
14 | 15 | use yii\helpers\Url; |
15 | -use yii; |
|
16 | 16 | |
17 | 17 | /** |
18 | 18 | * Class ContentBlockHelper |
@@ -93,7 +93,7 @@ |
||
93 | 93 | * @param string $key |
94 | 94 | * @param bool $valueOnly |
95 | 95 | * @param mixed $defaultValue |
96 | - * @return ContentBlock|string |
|
96 | + * @return string |
|
97 | 97 | */ |
98 | 98 | public static function getChunk($key, $valueOnly = true, $defaultValue = null) |
99 | 99 | { |
@@ -2,11 +2,10 @@ |
||
2 | 2 | |
3 | 3 | namespace app\modules\core\models; |
4 | 4 | |
5 | +use Yii; |
|
5 | 6 | use app\modules\core\helpers\ContentBlockHelper; |
6 | 7 | use devgroup\TagDependencyHelper\ActiveRecordHelper; |
7 | -use yii\caching\TagDependency; |
|
8 | 8 | use yii\data\ActiveDataProvider; |
9 | -use Yii; |
|
10 | 9 | |
11 | 10 | /** |
12 | 11 | * This is the model class for table "content_block". |
@@ -2,10 +2,9 @@ |
||
2 | 2 | |
3 | 3 | namespace app\modules\core\models; |
4 | 4 | |
5 | -use devgroup\TagDependencyHelper\ActiveRecordHelper; |
|
6 | 5 | use Yii; |
6 | +use devgroup\TagDependencyHelper\ActiveRecordHelper; |
|
7 | 7 | use yii\caching\TagDependency; |
8 | -use yii\helpers\ArrayHelper; |
|
9 | 8 | |
10 | 9 | /** |
11 | 10 | * This is the model class for table "{{%content_decorators}}". |
@@ -2,17 +2,16 @@ |
||
2 | 2 | |
3 | 3 | namespace app\modules\core\models; |
4 | 4 | |
5 | +use Packagist\Api\Result\Package\Version; |
|
6 | +use Yii; |
|
5 | 7 | use app; |
6 | 8 | use app\components\ExtensionModule; |
7 | -use Yii; |
|
8 | 9 | use yii\base\ErrorException; |
9 | 10 | use yii\caching\TagDependency; |
11 | +use yii\data\ActiveDataProvider; |
|
12 | +use yii\db\ActiveQuery; |
|
10 | 13 | use yii\db\ActiveRecord; |
11 | -use yii\db\Query; |
|
12 | 14 | use yii\helpers\ArrayHelper; |
13 | -use yii\db\ActiveQuery; |
|
14 | -use yii\data\ActiveDataProvider; |
|
15 | -use Packagist\Api\Result\Package\Version; |
|
16 | 15 | use yii\helpers\Json; |
17 | 16 | use yii\web\NotFoundHttpException; |
18 | 17 |
@@ -4,11 +4,9 @@ |
||
4 | 4 | |
5 | 5 | use Yii; |
6 | 6 | use yii\caching\TagDependency; |
7 | -use yii\db\ActiveRecord; |
|
8 | -use yii\db\Query; |
|
9 | -use yii\helpers\ArrayHelper; |
|
10 | -use yii\db\ActiveQuery; |
|
11 | 7 | use yii\data\ActiveDataProvider; |
8 | +use yii\db\ActiveQuery; |
|
9 | +use yii\db\ActiveRecord; |
|
12 | 10 | |
13 | 11 | /** |
14 | 12 | * This is the model class for table "{{%extension_types}}". |
@@ -1,8 +1,8 @@ |
||
1 | 1 | <?php |
2 | 2 | |
3 | -use yii\helpers\Json; |
|
4 | 3 | use kartik\dynagrid\DynaGrid; |
5 | 4 | use kartik\icons\Icon; |
5 | +use yii\helpers\Json; |
|
6 | 6 | |
7 | 7 | /** |
8 | 8 | * @var yii\web\View $this |
@@ -12,8 +12,19 @@ |
||
12 | 12 | |
13 | 13 | abstract class AbstractImportCsv extends Import |
14 | 14 | { |
15 | + /** |
|
16 | + * @param resource $handle |
|
17 | + */ |
|
15 | 18 | abstract protected function getCsv($handle); |
19 | + |
|
20 | + /** |
|
21 | + * @param resource $handle |
|
22 | + */ |
|
16 | 23 | abstract protected function putCsv($handle, $fields); |
24 | + |
|
25 | + /** |
|
26 | + * @param resource $handle |
|
27 | + */ |
|
17 | 28 | abstract protected function putHeader($handle, $fields); |
18 | 29 | |
19 | 30 | public function setData() |
@@ -2,12 +2,6 @@ |
||
2 | 2 | |
3 | 3 | namespace app\modules\data\components; |
4 | 4 | |
5 | -use app\models\Property; |
|
6 | -use app\models\Object; |
|
7 | -use app\modules\shop\models\Product; |
|
8 | -use yii\db\Expression; |
|
9 | -use app\models\PropertyStaticValues; |
|
10 | -use app\models\ObjectStaticValues; |
|
11 | 5 | use Yii; |
12 | 6 | |
13 | 7 | abstract class AbstractImportCsv extends Import |
@@ -264,6 +264,9 @@ |
||
264 | 264 | return $result; |
265 | 265 | } |
266 | 266 | |
267 | + /** |
|
268 | + * @param integer $parent |
|
269 | + */ |
|
267 | 270 | public function parseGruppa($parent) |
268 | 271 | { |
269 | 272 | if (null === $this->xml) { |
@@ -3,15 +3,14 @@ |
||
3 | 3 | namespace app\modules\data\components\commerceml; |
4 | 4 | |
5 | 5 | use app\components\Helper; |
6 | -use app\modules\data\models\CommercemlGuid; |
|
7 | -use app\modules\shop\models\Category; |
|
8 | 6 | use app\models\Object; |
9 | 7 | use app\models\ObjectPropertyGroup; |
10 | 8 | use app\models\ObjectStaticValues; |
11 | -use app\modules\shop\models\CategoryGroup; |
|
12 | -use app\modules\shop\models\Product; |
|
13 | 9 | use app\models\Property; |
14 | 10 | use app\models\PropertyStaticValues; |
11 | +use app\modules\data\models\CommercemlGuid; |
|
12 | +use app\modules\shop\models\Category; |
|
13 | +use app\modules\shop\models\Product; |
|
15 | 14 | use app\properties\AbstractPropertyEavModel; |
16 | 15 | |
17 | 16 | class XmlFileReader |
@@ -31,6 +31,10 @@ discard block |
||
31 | 31 | /* |
32 | 32 | * Export method |
33 | 33 | */ |
34 | + |
|
35 | + /** |
|
36 | + * @param string[] $header |
|
37 | + */ |
|
34 | 38 | abstract public function getData($header, $data); |
35 | 39 | /* |
36 | 40 | * Import method |
@@ -133,6 +137,7 @@ discard block |
||
133 | 137 | * @param array $propertiesFields |
134 | 138 | * @param array $row |
135 | 139 | * @param array $titleFields |
140 | + * @param integer $columnsCount |
|
136 | 141 | * @throws \Exception |
137 | 142 | */ |
138 | 143 | protected function save($objectId, $object, $objectFields = [], $properties = [], $propertiesFields = [], $row=[], $titleFields=[], $columnsCount = null) |
@@ -280,7 +285,6 @@ discard block |
||
280 | 285 | } |
281 | 286 | |
282 | 287 | /** |
283 | - * @param array $exportFields |
|
284 | 288 | * @return array |
285 | 289 | */ |
286 | 290 | public function getAllFields($fields = []) |
@@ -2,15 +2,15 @@ |
||
2 | 2 | |
3 | 3 | namespace app\modules\data\components; |
4 | 4 | |
5 | +use Yii; |
|
5 | 6 | use app\models\Object; |
6 | 7 | use app\models\ObjectPropertyGroup; |
7 | 8 | use app\models\ObjectStaticValues; |
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 app\modules\shop\models\Product; |
|
12 | 13 | use devgroup\TagDependencyHelper\ActiveRecordHelper; |
13 | -use Yii; |
|
14 | 14 | use yii\base\Component; |
15 | 15 | use yii\base\InvalidParamException; |
16 | 16 | use yii\db\ActiveQuery; |