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:
chicpro
2013-09-12 15:59:28 +09:00
parent 597261ed26 1aa5c7c097
commit c64c724099
14 changed files with 124 additions and 376 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
adm/shop_admin/itemexcelupdate.php
View File

@ -73,7 +73,7 @@ if($_FILES['excelfile']['tmp_name']) {
$comma = '';
$sql = " INSERT INTO {$g4['shop_item_table']}
( it_id, ca_id, ca_id2, ca_id3, it_name, it_gallery, 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_explan_html, 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 )
( 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_explan_html, 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++) {
@ -84,7 +84,6 @@ if($_FILES['excelfile']['tmp_name']) {
$ca_id2 = addslashes($data->sheets[0]['cells'][$i][3]);
$ca_id3 = addslashes($data->sheets[0]['cells'][$i][4]);
$it_name = addslashes($data->sheets[0]['cells'][$i][5]);
$it_gallery = addslashes($data->sheets[0]['cells'][$i][6]);
$it_maker = addslashes($data->sheets[0]['cells'][$i][7]);
$it_origin = addslashes($data->sheets[0]['cells'][$i][8]);
$it_brand = addslashes($data->sheets[0]['cells'][$i][9]);
@ -141,7 +140,7 @@ if($_FILES['excelfile']['tmp_name']) {
continue;
}
$sql .= $comma." ( '$it_id', '$ca_id', '$ca_id2', '$ca_id3', '$it_name', '$it_gallery', '$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', '".G4_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' ) ";
$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', '".G4_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 = ' , ';
$succ_count++;

13
adm/shop_admin/itemform.php
View File

@ -219,19 +219,6 @@ $pg_anchor ='<ul class="anchor">
<input type="text" name="it_mobile_name" value="<?php echo get_text(cut_str($it['it_mobile_name'], 250, "")); ?>" id="it_mobile_name" class="frm_input">
</td>
</tr>
<tr>
<th scope="row"><label for="it_gallery">전시용 상품</label></th>
<td>
<?php echo help("이 항목을 체크하면 상품을 전시만 하고, 판매하지 않습니다."); ?>
<input type="checkbox" name="it_gallery" value="1" id="it_gallery" <?php echo ($it['it_gallery'] ? "checked" : ""); ?>>
</td>
<td class="group_setting">
<input type="checkbox" name="chk_ca_it_gallery" value="1" id="chk_ca_it_gallery">
<label for="chk_ca_it_gallery">분류적용</label>
<input type="checkbox" name="chk_all_it_gallery" value="1" id="chk_all_it_gallery">
<label for="chk_all_it_gallery">전체적용</label>
</td>
</tr>
<tr>
<th scope="row"><label for="it_order">출력순서</label></th>
<td>

5
adm/shop_admin/itemformupdate.php
View File

@ -261,7 +261,6 @@ $sql_common = " ca_id = '$ca_id',
ca_id3 = '$ca_id3',
it_name = '$it_name',
it_mobile_name = '$it_mobile_name',
it_gallery = '$it_gallery',
it_maker = '$it_maker',
it_origin = '$it_origin',
it_brand = '$it_brand',
@ -421,7 +420,6 @@ if($supply_count) {
// 동일 분류내 상품 동일 옵션 적용
$ca_fields = '';
if(is_checked('chk_ca_it_gallery')) $ca_fields .= " , it_gallery = '$it_gallery' ";
if(is_checked('chk_ca_it_order')) $ca_fields .= " , it_order = '$it_order' ";
if(is_checked('chk_ca_it_type')) $ca_fields .= " , it_type1 = '$it_type1', it_type2 = '$it_type2', it_type3 = '$it_type3', it_type4 = '$it_type4', it_type5 = '$it_type5' ";
if(is_checked('chk_ca_it_maker')) $ca_fields .= " , it_maker = '$it_maker' ";
@ -439,7 +437,6 @@ if(is_checked('chk_ca_it_point')) $ca_fields .= " , it_point = '$i
if(is_checked('chk_ca_it_point_type')) $ca_fields .= " , it_point_type = '$it_point_type' ";
if(is_checked('chk_ca_it_stock_qty')) $ca_fields .= " , it_stock_qty = '$it_stock_qty' ";
if(is_checked('chk_ca_it_sendcost')) $ca_fields .= " , it_sc_type = '$it_sc_type', it_sc_method = '$it_sc_method', it_sc_price = '$it_sc_price', it_sc_minimum = '$it_sc_minimum', it_sc_qty = '$it_sc_qty' ";
if(is_checked('chk_ca_it_gallery')) $ca_fields .= " , it_gallery = '$it_gallery' ";
if(is_checked('chk_ca_it_head_html')) $ca_fields .= " , it_head_html = '$it_head_html' ";
if(is_checked('chk_ca_it_tail_html')) $ca_fields .= " , it_tail_html = '$it_tail_html' ";
if(is_checked('chk_ca_it_mobile_head_html')) $ca_fields .= " , it_mobile_head_html = '$it_mobile_head_html' ";
@ -455,7 +452,6 @@ if($ca_fields) {
// 모든 상품 동일 옵션 적용
$all_fields = '';
if(is_checked('chk_all_it_gallery')) $all_fields .= " , it_gallery = '$it_gallery' ";
if(is_checked('chk_all_it_order')) $all_fields .= " , it_order = '$it_order' ";
if(is_checked('chk_all_it_type')) $all_fields .= " , it_type1 = '$it_type1', it_type2 = '$it_type2', it_type3 = '$it_type3', it_type4 = '$it_type4', it_type5 = '$it_type5' ";
if(is_checked('chk_all_it_maker')) $all_fields .= " , it_maker = '$it_maker' ";
@ -473,7 +469,6 @@ if(is_checked('chk_all_it_point')) $all_fields .= " , it_point = '
if(is_checked('chk_all_it_point_type')) $all_fields .= " , it_point_type = '$it_point_type' ";
if(is_checked('chk_all_it_stock_qty')) $all_fields .= " , it_stock_qty = '$it_stock_qty' ";
if(is_checked('chk_all_it_sendcost')) $all_fields .= " , it_sc_type = '$it_sc_type', it_sc_method = '$it_sc_method', it_sc_price = '$it_sc_price', it_sc_minimum = '$it_sc_minimum', it_sc_qty = '$it_sc_qty' ";
if(is_checked('chk_all_it_gallery')) $all_fields .= " , it_gallery = '$it_gallery' ";
if(is_checked('chk_all_it_head_html')) $all_fields .= " , it_head_html = '$it_head_html' ";
if(is_checked('chk_all_it_tail_html')) $all_fields .= " , it_tail_html = '$it_tail_html' ";
if(is_checked('chk_all_it_mobile_head_html')) $all_fields .= " , it_mobile_head_html = '$it_mobile_head_html' ";

2
adm/shop_admin/itemlist.php
View File

@ -180,8 +180,6 @@ if ($sfl || $stx) // 검색렬일 때만 처음 버튼을 보여줌
for ($i=0; $row=mysql_fetch_array($result); $i++)
{
$href = G4_SHOP_URL.'/item.php?it_id='.$row['it_id'];
$gallery = $row['it_gallery'] ? 'Y' : '';
?>
<tr>
<td rowspan="2">