From 73028f91fb46547a70a682eec347fcad6bee71ca Mon Sep 17 00:00:00 2001 From: Vitaliy Date: Fri, 26 Aug 2016 15:35:12 +0300 Subject: [PATCH] big commti --- common/modules/product/models/Export.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/common/modules/product/models/Export.php b/common/modules/product/models/Export.php index 744c9a4..b1ab599 100755 --- a/common/modules/product/models/Export.php +++ b/common/modules/product/models/Export.php @@ -85,7 +85,9 @@ class Export extends Model { ]; $to_write = array_merge ($list, $mods); - + foreach($to_write as &$cell) { + $cell = iconv("UTF-8", "WINDOWS-1251", $cell); + } fputcsv($handle, $to_write, ';'); @@ -104,6 +106,7 @@ class Export extends Model { $fittersArray = []; foreach($filters as $filter){ $fittersArray[$filter->taxGroup->alias][] = $filter->name; + unset($filter); } $filterString=[]; @@ -112,6 +115,7 @@ class Export extends Model { $filterString[] = "[{$filterName}:{$row}]"; } + return implode('*',$filterString); } } \ No newline at end of file -- libgit2 0.21.4