From: vincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Mon, 29 Feb 2016 12:19:49 +0000 (+0000)
Subject: #wesco : xls parse adjusments
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=c4efbb150727902400aa5a1d19629c2fe5fc07a6;p=cubeextranet.git

#wesco : xls parse adjusments
@1
---

diff --git a/inc/ws/DAO/class.ws.dao.book.php b/inc/ws/DAO/class.ws.dao.book.php
index 9d9b74a5f..475714e3f 100644
--- a/inc/ws/DAO/class.ws.dao.book.php
+++ b/inc/ws/DAO/class.ws.dao.book.php
@@ -1385,12 +1385,18 @@ class wsDAOBook extends commonDAO {
 						$i++;
 					}
 				} elseif ($ext == 'xlsx') {
-					include_once ROOT.'/inc/ZendFramework/PHPExcel/PHPExcel.php';
+					include_once ROOT . '/inc/ZendFramework/PHPExcel/PHPExcel.php';
 					$objReader = PHPExcel_IOFactory::createReader('Excel2007');
 					$objPHPExcel = $objReader->load($referencesFile);
 
+
 					foreach ($objPHPExcel->getWorksheetIterator() as $worksheet) {
-						$worksheets[$worksheet->getTitle()] = $worksheet->toArray();
+						$title = $worksheet->getTitle();
+						if (strlen($title) == 2 && cubeCountry::getCountry($title)) {
+							$title = cubeCountry::getCountry($title);
+						}
+
+						$worksheets[$title] = $worksheet->toArray(null, true, true);
 					}
 					$flex->addVariable('basketReferences', $worksheets, false, true, "OrderedObject");
 				}