TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix bugs and add import count handle

Browse Source 
modifié:         core/lib/Thelia/Controller/Admin/ImportController.php
	modifié:         core/lib/Thelia/Core/FileFormat/Formatting/Formatter/CSVFormatter.php
	modifié:         core/lib/Thelia/ImportExport/Import/ImportHandler.php
	modifié:         core/lib/Thelia/ImportExport/Import/Type/ProductStockImport.php
	modifié:         core/lib/Thelia/Tests/FileFormat/Formatting/Formatter/CSVFormatterTest.php
This commit is contained in:
Benjamin Perche
2014-07-21 11:47:47 +02:00
parent 4e29830bde
commit 79a8390817
5 changed files with 32 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
core/lib/Thelia/Core/FileFormat/Formatting/Formatter/CSVFormatter.php
View File

@@ -12,10 +12,8 @@
namespace Thelia\Core\FileFormat\Formatting\Formatter;
use Thelia\Core\FileFormat\Formatting\AbstractFormatter;
use Thelia\Core\FileFormat\Formatting\Exception\BadFormattedStringException;
use Thelia\Core\FileFormat\Formatting\FormatterData;
use Thelia\Core\FileFormat\FormatType;
use Thelia\Core\Translation\Translator;
/**
* Class CSVFormatter
@@ -25,7 +23,7 @@ use Thelia\Core\Translation\Translator;
class CSVFormatter extends AbstractFormatter
{
public $delimiter = ";";
public $lineReturn = "\r\n";
public $lineReturn = "\n";
public $stringDelimiter = "\"";
/**
@@ -126,6 +124,7 @@ class CSVFormatter extends AbstractFormatter
if (count($raw) > 0) {
$keys = explode($this->delimiter, array_shift($raw));
$keysLength = count($keys);
foreach ($keys as &$key) {
$key = trim($key, $this->stringDelimiter);
@@ -137,18 +136,19 @@ class CSVFormatter extends AbstractFormatter
$newRow = [];
$row = explode($this->delimiter, $row);
for ($i = 0; $i < $columns; ++$i) {
$value = trim($row[$i], $this->stringDelimiter);
if (count($row) >= $keysLength) {
for ($i = 0; $i < $columns; ++$i) {
$value = trim($row[$i], $this->stringDelimiter);
if (false !== $unserialized = @unserialize($row[$i])) {
$value = $unserialized;
if (false !== $unserialized = @unserialize($row[$i])) {
$value = $unserialized;
}
$newRow[$keys[$i]] = $value;
}
$newRow[$keys[$i]] = $value;
$decoded[] = $newRow;
}
$decoded[] = $newRow;
}
}