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

Fix bugs and add Product prices export

Browse Source 
modifié:         core/lib/Thelia/Config/Resources/export.xml
	modifié:         core/lib/Thelia/Controller/Admin/ImportController.php
	modifié:         core/lib/Thelia/Core/DependencyInjection/Loader/XmlFileLoader.php
	modifié:         core/lib/Thelia/Core/DependencyInjection/Loader/schema/dic/config/thelia-1.0.xsd
	nouveau fichier: core/lib/Thelia/ImportExport/Export/Type/ProductPricesExport.php
	modifié:         core/lib/Thelia/Tests/Controller/ImportControllerTest.php
This commit is contained in:
Benjamin Perche
2014-07-21 14:43:51 +02:00
parent 5e00367757
commit 0e3ae84cb8
6 changed files with 126 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/lib/Thelia/Controller/Admin/ImportController.php
View File

@@ -106,11 +106,14 @@ class ImportController extends BaseAdminController
*/
$archiveBuilder = $archiveBuilder->loadArchive($file->getPathname());
$content = $this->getFileContentInArchive(
$contentAndFormat = $this->getFileContentInArchive(
$archiveBuilder,
$formatterManager,
$tools["types"]
);
$formatter = $contentAndFormat["formatter"];
$content = $contentAndFormat["content"];
} elseif ($formatter !== null) {
/**
* If the file isn't an archive
@@ -195,7 +198,10 @@ class ImportController extends BaseAdminController
);
}
return $content;
return array(
"formatter" => $formatter,
"content" => $content,
);
}
public function retrieveFormatTools(
@@ -302,7 +308,7 @@ class ImportController extends BaseAdminController
}
return $this->getTranslator()->trans(
"Import successfully done, %numb row(s) have been imported",
"Import successfully done, %numb row(s) have been changed",
[
"%numb" => $handler->getImportedRows(),
]