From c4efbb150727902400aa5a1d19629c2fe5fc07a6 Mon Sep 17 00:00:00 2001 From: "vincent@cubedesigners.com" Date: Mon, 29 Feb 2016 12:19:49 +0000 Subject: [PATCH] #wesco : xls parse adjusments @1 --- inc/ws/DAO/class.ws.dao.book.php | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) 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"); } -- 2.39.5