From 09c59581da5cafa9ae285cd3fc2573c9eb698fef Mon Sep 17 00:00:00 2001
From: bMancone <brice.mancone@prestashop.com>
Date: Wed, 28 Dec 2011 14:16:43 +0000
Subject: [PATCH] // Updated CSV Import

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11843 b9a71923-0436-4b27-9f14-aed3839534dd
---
 admin-dev/themes/template/import/form.tpl   |  2 +-
 controllers/admin/AdminImportController.php | 16 ++++++++++++----
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/admin-dev/themes/template/import/form.tpl b/admin-dev/themes/template/import/form.tpl
index 5ea56e4bd..bc23d94c5 100644
--- a/admin-dev/themes/template/import/form.tpl
+++ b/admin-dev/themes/template/import/form.tpl
@@ -82,7 +82,7 @@
  * Upload fancybox 
  *}
 <div style="display: none">
-	<div id="upload_file_import" style="background-color: #EBEDF4; border: 1px solid #CCCED7">
+	<div id="upload_file_import" style="padding-left: 10px; background-color: #EBEDF4; border: 1px solid #CCCED7">
 		<div class="clear">&nbsp;</div>
 		<form action="{$current}&token={$token}" method="POST" enctype="multipart/form-data">	
 			<label class="clear" style="width:160px; text-align: left;">{l s='Select your CSV file:'} </label>	
diff --git a/controllers/admin/AdminImportController.php b/controllers/admin/AdminImportController.php
index 0250d5ea2..bad6d69ee 100644
--- a/controllers/admin/AdminImportController.php
+++ b/controllers/admin/AdminImportController.php
@@ -84,7 +84,7 @@ class AdminImportControllerCore extends AdminController
 			$this->l('Addresses'),
 			$this->l('Manufacturers'),
 			$this->l('Suppliers'),
-			$this->l('Supply Orders'),
+			$this->l('SupplyOrders'),
 		));
 
 		switch ((int)Tools::getValue('entity'))
@@ -340,7 +340,7 @@ class AdminImportControllerCore extends AdminController
 				);
 			break;
 			// @since 1.5.0
-			case $this->entities[$this->l('Supply Orders')]:
+			case $this->entities[$this->l('SupplyOrders')]:
 				// required fields
 				$this->required_fields = array(
 					'id_supplier',
@@ -1677,8 +1677,15 @@ class AdminImportControllerCore extends AdminController
 	 */
 	public function supplyOrdersImport()
 	{
+		$this->receiveTab();
 		$handle = $this->openCsvFile();
-		//@TODO
+		self::setLocale();
+
+		for ($current_line = 0; $line = fgetcsv($handle, MAX_LINE_SIZE, Tools::getValue('separator')); $current_line++)
+		{
+			//@TODO
+		}
+
 		$this->closeCsvFile($handle);
 	}
 
@@ -1867,8 +1874,9 @@ class AdminImportControllerCore extends AdminController
 				case $this->entities[$this->l('Suppliers')]:
 					$this->supplierImport();
 				break;
-				case $this->entities[$this->l('Supply Orders')]:
+				case $this->entities[$this->l('SupplyOrders')]:
 					$this->supplyOrdersImport();
+				break;
 				default:
 					$this->_errors[] = $this->l('no entity selected');
 			}