ExcelToJson.php

[Pman.Core] / ExcelToJson.php

diff --git a/ExcelToJson.php b/ExcelToJson.php
index 8f84f57..ffda332 100644 (file)
--- a/ExcelToJson.php
+++ b/ExcelToJson.php
@@ -30,7 +30,9 @@ class Pman_Core_ExcelToJson extends Pman_Roo
         require_once 'File/Convert.php';
         $fc = new File_Convert($img->getStoreName(), $img->mimetype );
         $csv = $fc->convert('text/csv');
-        $this->importCsv($csv);
+        $data = $this->importCsv($csv);
+        $this->jdata($data);
+        
     }
     
     function importCsv($csv)
@@ -50,6 +52,9 @@ class Pman_Core_ExcelToJson extends Pman_Roo
         
         while(false !== ($n = fgetcsv($fh,10000, ',', '"'))) {
             if(!array_filter($n)){
+                if ($header) {
+                    continue;
+                }
                 $header = true;
                 continue;
             }
@@ -79,46 +84,8 @@ class Pman_Core_ExcelToJson extends Pman_Roo
             $rows[] = $row;
             
         }
-        
-        
-        
         fclose($fh);
         
-        $lc = DB_DataObject::factory('location');
-        if(!$lc->get('location_name', $ret['From'])){
-            $this->jerr('error occur on getting location with reference ' . $ret['From']);
-        }
-        $ret['invhist_transfer_from'] = $lc->pid();
-        $ret['invhist_transfer_from_location_name'] = $lc->location_name;
-        
-        $lt = DB_DataObject::factory('location');
-        if(!$lt->get('location_name', $ret['To'])){
-            $this->jerr('error occur on getting location with reference ' . $ret['From']);
-        }
-        $ret['invhist_transfer_to'] = $lt->pid();
-        $ret['invhist_transfer_to_location_name'] = $lt->location_name;
-        
-        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'])}'");
-            if(!$itemsite->find(true)){
-                $this->jerr("error occur on getting item with reference " . $r['ITEM CODE']);
-            }
-            
-            $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);
-        
-        
-        exit;
+        return array('ret' => $ret, 'rows' => $rows);;
     }
-    
-}
+}
\ No newline at end of file