From 1f02f0e1a2476106d5b3d05ee276ab3f3187dc8f Mon Sep 17 00:00:00 2001
From: Edward <edward@roojs.com>
Date: Fri, 22 Mar 2013 11:36:37 +0800
Subject: [PATCH] ExcelToJson.php

---
 ExcelToJson.php | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/ExcelToJson.php b/ExcelToJson.php
index 8f84f57c..27675cfd 100644
--- 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)
@@ -114,11 +116,8 @@ class Pman_Core_ExcelToJson extends Pman_Roo
                 'itemsite_qty' => $r['QUANTITY']
             );
         }
-       
-        $this->jok($ret);
-        
+        return $ret;
         
-        exit;
     }
     
 }
-- 
2.39.2