projects
/
Pman.Core
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(from parent 1:
f1a4c61
)
ExcelToJson.php
author
Edward
<edward@roojs.com>
Fri, 22 Mar 2013 03:36:37 +0000
(11:36 +0800)
committer
Edward
<edward@roojs.com>
Fri, 22 Mar 2013 03:36:37 +0000
(11:36 +0800)
ExcelToJson.php
patch
|
blob
|
history
diff --git
a/ExcelToJson.php
b/ExcelToJson.php
index
8f84f57
..
27675cf
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)
@@
-114,11
+116,8
@@
class Pman_Core_ExcelToJson extends Pman_Roo
'itemsite_qty' => $r['QUANTITY']
);
}
-
- $this->jok($ret);
-
+ return $ret;
- exit;
}
}