firstgarden/firstgarden-web-gnu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Activity

Merge branch 'master' of github.com:gnuboard/yc4s

Browse Source
This commit is contained in:
whitedot
2013-11-26 14:38:58 +09:00
parent 2a8e692ff5 453623d725
commit 3a966503cd
4 changed files with 30 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
.gitignore vendored
View File

@ -2,25 +2,15 @@ dbconfig.php
log log
.htaccess .htaccess
data data
/.htaccess
data/ data/
test test
.htaccess
config.php config.php
data/
test/
sirgle sirgle
sr_*
google*
skin/latest/basic2
rankiss*
thumb.lib.php
test.php test.php
itzimara*
nemoluv*
cheditor*
*.key *.key
g5_tree g5_tree
*.sh *.sh
kcho07_rss/ cheditor5/
mobile/skin/board/bach72_mobile/
skin/board
lessc.inc.php
lessc.php

31
adm/shop_admin/itemexcelupdate.php
View File

@ -70,13 +70,6 @@ if($_FILES['excelfile']['tmp_name']) {
$total_count = 0; $total_count = 0;
$fail_count = 0; $fail_count = 0;
$succ_count = 0; $succ_count = 0;
$comma = '';
/*
$sql = " INSERT INTO {$g5['g5_shop_item_table']}
( it_id, ca_id, ca_id2, ca_id3, it_name, it_maker, it_origin, it_brand, it_model, it_type1, it_type2, it_type3, it_type4, it_type5, it_basic, it_explan, it_mobile_explan, it_cust_price, it_price, it_point, it_sell_email, it_use, it_stock_qty, it_time, it_ip, it_order, it_tel_inq, it_img1, it_img2, it_img3, it_img4, it_img5, it_img6, it_img7, it_img8, it_img9, it_img10 )
VALUES ";
*/
for ($i = 3; $i <= $data->sheets[0]['numRows']; $i++) { for ($i = 3; $i <= $data->sheets[0]['numRows']; $i++) {
$total_count++; $total_count++;
@ -88,6 +81,7 @@ if($_FILES['excelfile']['tmp_name']) {
$ca_id2 = addslashes($data->sheets[0]['cells'][$i][$j++]); $ca_id2 = addslashes($data->sheets[0]['cells'][$i][$j++]);
$ca_id3 = addslashes($data->sheets[0]['cells'][$i][$j++]); $ca_id3 = addslashes($data->sheets[0]['cells'][$i][$j++]);
$it_name = addslashes($data->sheets[0]['cells'][$i][$j++]); $it_name = addslashes($data->sheets[0]['cells'][$i][$j++]);
$it_mobile_name = addslashes($data->sheets[0]['cells'][$i][$j++]);
$it_maker = addslashes($data->sheets[0]['cells'][$i][$j++]); $it_maker = addslashes($data->sheets[0]['cells'][$i][$j++]);
$it_origin = addslashes($data->sheets[0]['cells'][$i][$j++]); $it_origin = addslashes($data->sheets[0]['cells'][$i][$j++]);
$it_brand = addslashes($data->sheets[0]['cells'][$i][$j++]); $it_brand = addslashes($data->sheets[0]['cells'][$i][$j++]);
@ -104,9 +98,14 @@ if($_FILES['excelfile']['tmp_name']) {
$it_price = addslashes(only_number($data->sheets[0]['cells'][$i][$j++])); $it_price = addslashes(only_number($data->sheets[0]['cells'][$i][$j++]));
$it_tel_inq = addslashes($data->sheets[0]['cells'][$i][$j++]); $it_tel_inq = addslashes($data->sheets[0]['cells'][$i][$j++]);
$it_point = addslashes(only_number($data->sheets[0]['cells'][$i][$j++])); $it_point = addslashes(only_number($data->sheets[0]['cells'][$i][$j++]));
$it_point_type = addslashes(only_number($data->sheets[0]['cells'][$i][$j++]));
$it_sell_email = addslashes($data->sheets[0]['cells'][$i][$j++]); $it_sell_email = addslashes($data->sheets[0]['cells'][$i][$j++]);
$it_use = addslashes($data->sheets[0]['cells'][$i][$j++]); $it_use = addslashes($data->sheets[0]['cells'][$i][$j++]);
$it_stock_qty = addslashes(only_number($data->sheets[0]['cells'][$i][$j++])); $it_stock_qty = addslashes(only_number($data->sheets[0]['cells'][$i][$j++]));
$it_noti_qty = addslashes(only_number($data->sheets[0]['cells'][$i][$j++]));
$it_buy_min_qty = addslashes(only_number($data->sheets[0]['cells'][$i][$j++]));
$it_buy_max_qty = addslashes(only_number($data->sheets[0]['cells'][$i][$j++]));
$it_notax = addslashes(only_number($data->sheets[0]['cells'][$i][$j++]));
$it_order = addslashes(only_number($data->sheets[0]['cells'][$i][$j++])); $it_order = addslashes(only_number($data->sheets[0]['cells'][$i][$j++]));
$it_img1 = addslashes($data->sheets[0]['cells'][$i][$j++]); $it_img1 = addslashes($data->sheets[0]['cells'][$i][$j++]);
$it_img2 = addslashes($data->sheets[0]['cells'][$i][$j++]); $it_img2 = addslashes($data->sheets[0]['cells'][$i][$j++]);
@ -144,18 +143,13 @@ if($_FILES['excelfile']['tmp_name']) {
continue; continue;
} }
/*
$sql .= $comma." ( '$it_id', '$ca_id', '$ca_id2', '$ca_id3', '$it_name', '$it_maker', '$it_origin', '$it_brand', '$it_model', '$it_type1', '$it_type2', '$it_type3', '$it_type4', '$it_type5', '$it_basic', '$it_explan', '$it_mobile_explan', '1', '$it_cust_price', '$it_price', '$it_point', '$it_sell_email', '$it_use', '$it_stock_qty', '".G5_TIME_YMDHIS."', '".$_SERVER['REMOTE_ADDR']."', '$it_order', '$it_tel_inq', '$it_img1', '$it_img2', '$it_img3', '$it_img4', '$it_img5', '$it_img6', '$it_img7', '$it_img8', '$it_img9', '$it_img10' ) ";
$comma = ' , ';
*/
$sql = " INSERT INTO {$g5['g5_shop_item_table']} $sql = " INSERT INTO {$g5['g5_shop_item_table']}
SET it_id = '$it_id', SET it_id = '$it_id',
ca_id = '$ca_id', ca_id = '$ca_id',
ca_id2 = '$ca_id2', ca_id2 = '$ca_id2',
ca_id3 = '$ca_id3', ca_id3 = '$ca_id3',
it_name = '$it_name', it_name = '$it_name',
it_mobile_name = '$it_mobile_name',
it_maker = '$it_maker', it_maker = '$it_maker',
it_origin = '$it_origin', it_origin = '$it_origin',
it_brand = '$it_brand', it_brand = '$it_brand',
@ -171,6 +165,12 @@ if($_FILES['excelfile']['tmp_name']) {
it_cust_price = '$it_cust_price', it_cust_price = '$it_cust_price',
it_price = '$it_price', it_price = '$it_price',
it_point = '$it_point', it_point = '$it_point',
it_point_type = '$it_point_type',
it_stock_qty = '$it_stock_qty',
it_noti_qty = '$it_noti_qty',
it_buy_min_qty = '$it_buy_min_qty',
it_buy_max_qty = '$it_buy_max_qty',
it_notax = '$it_notax',
it_use = '$it_use', it_use = '$it_use',
it_time = '".G5_TIME_YMDHIS."', it_time = '".G5_TIME_YMDHIS."',
it_ip = '{$_SERVER['REMOTE_ADDR']}', it_ip = '{$_SERVER['REMOTE_ADDR']}',
@ -190,11 +190,6 @@ if($_FILES['excelfile']['tmp_name']) {
$succ_count++; $succ_count++;
} }
/*
if($succ_count > 0)
sql_query($sql);
*/
} }
$g5['title'] = '상품 엑셀일괄등록 결과'; $g5['title'] = '상품 엑셀일괄등록 결과';

13
css/admin.css
View File

@ -49,25 +49,24 @@ h3 {margin:0 20px}
/* gnb js off */ /* gnb js off */
#gnb {z-index:12;min-width:999px;background:#383a3f} #gnb {z-index:12;min-width:999px;background:#383a3f}
#gnb h2 {margin:0;padding:0;font-size:0;line-height:0;overflow:hidden} #gnb h2 {margin:0;padding:0;font-size:0;line-height:0;overflow:hidden}
#gnb_1dul {margin:0 auto;padding:0;zoom:1} #gnb_1dul {margin:0 20px;padding:0;zoom:1}
#gnb_1dul:after {display:block;visibility:hidden;clear:both;content:""} #gnb_1dul:after {display:block;visibility:hidden;clear:both;content:""}
.gnb_1dli {z-index:13;clear:both;zoom:1} .gnb_1dli {z-index:13;clear:both;zoom:1}
.gnb_1dli:after {display:block;visibility:hidden;clear:both;content:""} .gnb_1dli:after {display:block;visibility:hidden;clear:both;content:""}
.gnb_1dli a {display:block;float:left;padding:10px 0;width:110px;color:#e0e0e0;font-weight:bold;text-decoration:none} .gnb_1dli a {display:block;float:left;width:110px;height:34px;color:#fff;font-weight:bold;text-decoration:none;line-height:2.8em}
.gnb_1dli a:focus, .gnb_1dli a:hover {text-decoration:none} .gnb_1dli a:focus, .gnb_1dli a:hover {text-decoration:none}
.gnb_2dul {float:left;width:auto} .gnb_2dul {float:left;width:auto}
.gnb_2dli {float:left} .gnb_2dli {float:left}
.gnb_2dli a {color:#e0e0e0;font-weight:normal} .gnb_2dli a {color:#e0e0e0;font-weight:normal}
/* gnb js on */ /* gnb js on */
.gnb_js {padding-left:1px} .gnb_js {}
.gnb_js #gnb_1dul {margin:0 20px;zoom:1} .gnb_js #gnb_1dul {zoom:1}
.gnb_js #gnb_1dul:after {display:block;visibility:hidden;clear:both;content:""}
.gnb_js .gnb_1dli {clear:none;position:relative;float:left;margin:0 0 0 -1px;border:1px solid #333;border-top:0;border-bottom:0} .gnb_js .gnb_1dli {clear:none;position:relative;float:left;margin:0 0 0 -1px;border:1px solid #333;border-top:0;border-bottom:0}
.gnb_js .gnb_1dli a {color:#fff;text-align:center} .gnb_js .gnb_1dli a {text-align:center}
.gnb_js .gnb_1dli_air a {float:none;background:#fff;color:#000} .gnb_js .gnb_1dli_air a {float:none;background:#fff;color:#000}
.gnb_js .gnb_1dli_on a {float:none;background:#282828;color:#fff} .gnb_js .gnb_1dli_on a {float:none;background:#282828;color:#fff}
.gnb_js .gnb_2dul {display:none;position:absolute;top:34px;width:181px;border:1px solid #999;border-top:0;background:#fff} .gnb_js .gnb_2dul {display:none;position:absolute;top:34px;width:181px;border:1px solid #999;border-top:0;background:#fff}
.gnb_js .gnb_2dli a {display:inline-block;float:none;padding:8px 10px;width:161px;background:#fff;color:#000;text-align:left} .gnb_js .gnb_2dli a {display:inline-block;float:none;padding:8px 10px;width:161px;height:auto;background:#fff;color:#000;text-align:left;line-height:1em}
.gnb_js .gnb_2dli a:focus, .gnb_js .gnb_2dli a:hover {background:#484848;color:#fff} .gnb_js .gnb_2dli a:focus, .gnb_js .gnb_2dli a:hover {background:#484848;color:#fff}
.gnb_1dli_over .gnb_2dul {display:block;left:-1px} .gnb_1dli_over .gnb_2dul {display:block;left:-1px}
.gnb_1dli_over2 .gnb_2dul {display:block;right:-1px} .gnb_1dli_over2 .gnb_2dul {display:block;right:-1px}

BIN
lib/Excel/itemexcel.xls
View File

Binary file not shown.