Commit 73028f91fb46547a70a682eec347fcad6bee71ca
1 parent
bfb74e22
big commti
Showing
1 changed file
with
5 additions
and
1 deletions
Show diff stats
common/modules/product/models/Export.php
| ... | ... | @@ -85,7 +85,9 @@ class Export extends Model { |
| 85 | 85 | ]; |
| 86 | 86 | |
| 87 | 87 | $to_write = array_merge ($list, $mods); |
| 88 | - | |
| 88 | + foreach($to_write as &$cell) { | |
| 89 | + $cell = iconv("UTF-8", "WINDOWS-1251", $cell); | |
| 90 | + } | |
| 89 | 91 | |
| 90 | 92 | |
| 91 | 93 | fputcsv($handle, $to_write, ';'); |
| ... | ... | @@ -104,6 +106,7 @@ class Export extends Model { |
| 104 | 106 | $fittersArray = []; |
| 105 | 107 | foreach($filters as $filter){ |
| 106 | 108 | $fittersArray[$filter->taxGroup->alias][] = $filter->name; |
| 109 | + unset($filter); | |
| 107 | 110 | } |
| 108 | 111 | $filterString=[]; |
| 109 | 112 | |
| ... | ... | @@ -112,6 +115,7 @@ class Export extends Model { |
| 112 | 115 | $filterString[] = "[{$filterName}:{$row}]"; |
| 113 | 116 | |
| 114 | 117 | } |
| 118 | + | |
| 115 | 119 | return implode('*',$filterString); |
| 116 | 120 | } |
| 117 | 121 | } |
| 118 | 122 | \ No newline at end of file | ... | ... |