diff --git a/adm/shop_admin/itemexcelupdate.php b/adm/shop_admin/itemexcelupdate.php
index bfe22ede5..21e511d55 100644
--- a/adm/shop_admin/itemexcelupdate.php
+++ b/adm/shop_admin/itemexcelupdate.php
@@ -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++;
diff --git a/adm/shop_admin/itemform.php b/adm/shop_admin/itemform.php
index 641f6f875..6b222b32e 100644
--- a/adm/shop_admin/itemform.php
+++ b/adm/shop_admin/itemform.php
@@ -219,19 +219,6 @@ $pg_anchor ='
" id="it_mobile_name" class="frm_input">
-
- |
-
-
- >
- |
-
-
-
-
-
- |
-
|
diff --git a/adm/shop_admin/itemformupdate.php b/adm/shop_admin/itemformupdate.php
index 97039ca26..3be24aed9 100644
--- a/adm/shop_admin/itemformupdate.php
+++ b/adm/shop_admin/itemformupdate.php
@@ -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' ";
diff --git a/adm/shop_admin/itemlist.php b/adm/shop_admin/itemlist.php
index 72f576dc7..4449ad321 100644
--- a/adm/shop_admin/itemlist.php
+++ b/adm/shop_admin/itemlist.php
@@ -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' : '';
?>
|
diff --git a/install/shop.sql b/install/shop.sql
index ca66ab144..071192010 100644
--- a/install/shop.sql
+++ b/install/shop.sql
@@ -387,7 +387,6 @@ CREATE TABLE IF NOT EXISTS `shop_item` (
`ca_id3` varchar(255) NOT NULL DEFAULT '',
`it_name` varchar(255) NOT NULL DEFAULT '',
`it_mobile_name` varchar(255) NOT NULL DEFAULT '',
- `it_gallery` tinyint(4) NOT NULL DEFAULT '0',
`it_maker` varchar(255) NOT NULL DEFAULT '',
`it_origin` varchar(255) NOT NULL DEFAULT '',
`it_brand` varchar(255) NOT NULL DEFAULT '',
diff --git a/lib/shop.lib.php b/lib/shop.lib.php
index 501bea297..571672749 100644
--- a/lib/shop.lib.php
+++ b/lib/shop.lib.php
@@ -1324,7 +1324,7 @@ function relation_item($it_id, $width, $height, $rows=3)
if(!$it_id)
return $str;
- $sql = " select b.it_id, b.it_name, b.it_price, b.it_tel_inq, b.it_gallery from {$g4['shop_item_relation_table']} a left join {$g4['shop_item_table']} b on ( a.it_id2 = b.it_id ) where a.it_id = '$it_id' order by ir_no asc limit 0, $rows ";
+ $sql = " select b.it_id, b.it_name, b.it_price, b.it_tel_inq from {$g4['shop_item_relation_table']} a left join {$g4['shop_item_table']} b on ( a.it_id2 = b.it_id ) where a.it_id = '$it_id' order by ir_no asc limit 0, $rows ";
$result = sql_query($sql);
for($i=0; $row=sql_fetch_array($result); $i++) {
@@ -1334,12 +1334,9 @@ function relation_item($it_id, $width, $height, $rows=3)
}
$it_name = get_text($row['it_name']); // 상품명
- $it_price = ''; // 상품가격
- if(!$row['it_gallery']) {
- $it_price = get_price($row);
- if(!$row['it_tel_inq'])
- $it_price = display_price($it_price);
- }
+ $it_price = get_price($row); // 상품가격
+ if(!$row['it_tel_inq'])
+ $it_price = display_price($it_price);
$img = get_it_image($row['it_id'], $width, $height);
@@ -1355,30 +1352,6 @@ function relation_item($it_id, $width, $height, $rows=3)
// 상품이미지에 유형 아이콘 출력
function item_icon($it)
{
- /*
- $icon = '';
-
- if($it['it_gallery']) // sold out
- $icon .= ' ';
-
- if($it['it_type1'])
- $icon .= ' ';
-
- if($it['it_type2'])
- $icon .= ' ';
-
- if($it['it_type3'])
- $icon .= ' ';
-
- if($it['it_type4'])
- $icon .= ' ';
-
- if($it['it_type5'])
- $icon .= ' ';
-
- return $icon;
- */
-
$icon = '';
// 품절
$stock = get_it_stock_qty($it['it_id']);
diff --git a/mobile/shop/item.php b/mobile/shop/item.php
index 622a2f36e..4b3529c42 100644
--- a/mobile/shop/item.php
+++ b/mobile/shop/item.php
@@ -288,7 +288,6 @@ else
|
-
@@ -426,17 +425,14 @@ else
-
-