Commit fe48c7301f19c6ac89b23befe28f8d925780cef2
1 parent
1b898c16
20.07.16
Showing
2 changed files
with
2 additions
and
3 deletions
Show diff stats
common/modules/product/models/Export.php
@@ -31,7 +31,7 @@ class Export extends Model { | @@ -31,7 +31,7 @@ class Export extends Model { | ||
31 | }*/ | 31 | }*/ |
32 | $mods = []; | 32 | $mods = []; |
33 | 33 | ||
34 | - //$filterString = $this->convertFilterToString($product->getFilters()); | 34 | + $filterString = $this->convertFilterToString($product->getFilters()); |
35 | 35 | ||
36 | foreach ($product->variantsWithFilters as $variant) | 36 | foreach ($product->variantsWithFilters as $variant) |
37 | { | 37 | { |
@@ -70,7 +70,7 @@ class Export extends Model { | @@ -70,7 +70,7 @@ class Export extends Model { | ||
70 | $product->name, | 70 | $product->name, |
71 | '', | 71 | '', |
72 | ((! empty($product->description)) ? $product->description : ''), | 72 | ((! empty($product->description)) ? $product->description : ''), |
73 | - '',//$filterString, | 73 | + $filterString, |
74 | (!empty($product->variant)) ? $product->variant->price_old : '', | 74 | (!empty($product->variant)) ? $product->variant->price_old : '', |
75 | (!empty($product->variant)) ? $product->variant->price : '', | 75 | (!empty($product->variant)) ? $product->variant->price : '', |
76 | intval($product->akciya), | 76 | intval($product->akciya), |
common/modules/product/models/Import.php
@@ -457,7 +457,6 @@ class Import extends Model { | @@ -457,7 +457,6 @@ class Import extends Model { | ||
457 | 457 | ||
458 | 458 | ||
459 | if (isset($options) && !empty($options)) { | 459 | if (isset($options) && !empty($options)) { |
460 | - print_r($options); | ||
461 | $_product->options = $options; | 460 | $_product->options = $options; |
462 | } | 461 | } |
463 | 462 |