ExcelToJson.php

[Pman.Core] / ExcelToJson.php

diff --git a/ExcelToJson.php b/ExcelToJson.php
index 2bbe5a6..03b29c6 100644 (file)
--- a/ExcelToJson.php
+++ b/ExcelToJson.php
@@ -58,7 +58,7 @@ class Pman_Core_ExcelToJson extends Pman_Roo
             }
             
             if(!$header){
-               $rows[strtoupper($n[0])] = $n[1];
+               $ret[preg_replace('/\s\:/', '', $n[0])] = $n[1];
                continue;
             }
             
@@ -84,7 +84,7 @@ class Pman_Core_ExcelToJson extends Pman_Roo
             foreach($cols as $i=>$k) {
                 $row[$k] = $n[$i];
             }
-            $rows['TRANSFER ITEMS'][] = $row;
+            $rows[] = $row;
             
         }
         
@@ -94,7 +94,7 @@ class Pman_Core_ExcelToJson extends Pman_Roo
         
         fclose($fh);
         
-        foreach ($rows['TRANSFER ITEMS'] as $r){
+        foreach ($rows as $r){
             $itemsite = DB_DataObject::factory('itemsite');
             $itemsite->autoJoin();
             $itemsite->whereAdd("join_itemsite_item_id_item_id.item_number = '{$itemsite->escape($r['ITEM CODE'])}'");
@@ -102,9 +102,13 @@ class Pman_Core_ExcelToJson extends Pman_Roo
                 $this->jerr("error occur on getting item with reference " . $r['ITEM CODE']);
             }
             
-            $itemsite->invhist_transfer_item_qty = $r['QUANTITY'];
-            
-            $ret[] = $itemsite->toArray();
+            $ret['data'][] = array(
+                'itemsite_item_id' => $itemsite->itemsite_item_id,
+                'itemsite_id' => $itemsite->pid(),
+                'itemsite_item_id_item_number' => $r['ITEM CODE'],
+                'itemsite_item_id_item_descrip1' => $r['DESCRIPTION'],
+                'itemsite_qty' => $r['QUANTITY']
+            );
         }
        
         $this->jok($ret);