From c380ddf5bafc16493c113ebedf28dbfdecbfcd11 Mon Sep 17 00:00:00 2001 From: whitedot Date: Thu, 12 Sep 2013 14:06:10 +0900 Subject: [PATCH 1/4] =?UTF-8?q?=EC=87=BC=ED=95=91=EB=AA=B0:=20#295=20?= =?UTF-8?q?=EC=83=81=ED=92=88=EC=83=81=EC=84=B8=EB=B3=B4=EA=B8=B0=20?= =?UTF-8?q?=EB=B2=84=ED=8A=BC=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- css/default_shop.css | 2 +- skin/shop/basic/item.form.skin.php | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/css/default_shop.css b/css/default_shop.css index d39f0c6ba..2188b6dd6 100644 --- a/css/default_shop.css +++ b/css/default_shop.css @@ -460,7 +460,7 @@ td.empty_table {padding:85px 0;text-align:center} #sit_ov_btn {margin:0 0 0 34px !important;margin:0 0 0 33px;padding:0;list-style:none;zoom:1} #sit_ov_btn:after {display:block;visibility:hidden;clear:both;content:""} #sit_ov_btn li {float:left;margin:0 0 0 1px} -#sit_ov_btn a {display:inline-block;padding:10px 0 8px;width:80px;font-size:0.95em;text-align:center;text-decoration:none;letter-spacing:-0.1em} +#sit_ov_btn a, #sit_ov_btn input {display:inline-block;padding:10px 0 8px;width:80px;border:0;font-size:0.95em;text-align:center;text-decoration:none;letter-spacing:-0.1em;cursor:pointer} #sit_btn_buy {background:#ff5b89;color:#fff} #sit_btn_cart, #sit_btn_wish {background:#555;color:#fff} #sit_btn_rec {background:#888;color:#fff} diff --git a/skin/shop/basic/item.form.skin.php b/skin/shop/basic/item.form.skin.php index c06adc03a..f8ca238b1 100644 --- a/skin/shop/basic/item.form.skin.php +++ b/skin/shop/basic/item.form.skin.php @@ -254,8 +254,6 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
    • -
  • 바로구매
    • -
  • 장바구니
  • 위시리스트
    • From e7d2d697cf7675083a45e84d6d59a241677190b1 Mon Sep 17 00:00:00 2001 From: gnuboard Date: Thu, 12 Sep 2013 14:16:44 +0900 Subject: [PATCH 2/4] =?UTF-8?q?=EC=82=AC=EC=9A=A9=ED=95=98=EC=A7=80=20?= =?UTF-8?q?=EC=95=8A=EB=8A=94=20=ED=8C=8C=EC=9D=BC=20=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- shop/list.skin.10.php | 50 ---------------------------------------- shop/list.skin.11.php | 50 ---------------------------------------- shop/list.skin.12.php | 50 ---------------------------------------- shop/list.skin.13.php | 53 ------------------------------------------- 4 files changed, 203 deletions(-) delete mode 100644 shop/list.skin.10.php delete mode 100644 shop/list.skin.11.php delete mode 100644 shop/list.skin.12.php delete mode 100644 shop/list.skin.13.php diff --git a/shop/list.skin.10.php b/shop/list.skin.10.php deleted file mode 100644 index 122324238..000000000 --- a/shop/list.skin.10.php +++ /dev/null @@ -1,50 +0,0 @@ - - - -= 2) { // 1줄 이미지 : 2개 이상 - if ($i%$list_mod == 0) $sct_last = 'sct_last'; // 줄 마지막 - else if ($i%$list_mod == 1) $sct_last = 'sct_clear'; // 줄 첫번째 - else $sct_last = ''; - } else { // 1줄 이미지 : 1개 - $sct_last = 'sct_clear'; - } - - $sns_title = get_text($row['it_name']).' | '.get_text($config['cf_title']); - $sns_url = G4_SHOP_URL.'/item.php?it_id='.$row['it_id']; - - if ($i == 1) echo ''; - -if($i == 1) echo '

    등록된 상품이 없습니다.

    '; -?> - \ No newline at end of file diff --git a/shop/list.skin.11.php b/shop/list.skin.11.php deleted file mode 100644 index 5f7fd20ad..000000000 --- a/shop/list.skin.11.php +++ /dev/null @@ -1,50 +0,0 @@ - - - -= 2) { // 1줄 이미지 : 2개 이상 - if ($i%$list_mod == 0) $sct_last = 'sct_last'; // 줄 마지막 - else if ($i%$list_mod == 1) $sct_last = 'sct_clear'; // 줄 첫번째 - else $sct_last = ''; - } else { // 1줄 이미지 : 1개 - $sct_last = 'sct_clear'; - } - - $sns_title = get_text($row['it_name']).' | '.get_text($config['cf_title']); - $sns_url = G4_SHOP_URL.'/item.php?it_id='.$row['it_id']; - - if ($i == 1) echo ''; - -if($i == 1) echo '

    등록된 상품이 없습니다.

    '; -?> - \ No newline at end of file diff --git a/shop/list.skin.12.php b/shop/list.skin.12.php deleted file mode 100644 index ac4fa570e..000000000 --- a/shop/list.skin.12.php +++ /dev/null @@ -1,50 +0,0 @@ - - - -= 2) { // 1줄 이미지 : 2개 이상 - if ($i%$list_mod == 0) $sct_last = 'sct_last'; // 줄 마지막 - else if ($i%$list_mod == 1) $sct_last = 'sct_clear'; // 줄 첫번째 - else $sct_last = ''; - } else { // 1줄 이미지 : 1개 - $sct_last = 'sct_clear'; - } - - $sns_title = get_text($row['it_name']).' | '.get_text($config['cf_title']); - $sns_url = G4_SHOP_URL.'/item.php?it_id='.$row['it_id']; - - if ($i == 1) echo ''; - -if($i == 1) echo '

    등록된 상품이 없습니다.

    '; -?> - \ No newline at end of file diff --git a/shop/list.skin.13.php b/shop/list.skin.13.php deleted file mode 100644 index bb98d6d97..000000000 --- a/shop/list.skin.13.php +++ /dev/null @@ -1,53 +0,0 @@ - - - -= 2) { // 1줄 이미지 : 2개 이상 - if ($i%$list_mod == 0) $sct_last = 'sct_last'; // 줄 마지막 - else if ($i%$list_mod == 1) $sct_last = 'sct_clear'; // 줄 첫번째 - else $sct_last = ''; - } else { // 1줄 이미지 : 1개 - $sct_last = 'sct_clear'; - } - - $sns_title = get_text($row['it_name']).' | '.get_text($config['cf_title']); - $sns_url = G4_SHOP_URL.'/item.php?it_id='.$row['it_id']; - - if ($i == 1) echo ''; - -if($i == 1) echo '

    등록된 상품이 없습니다.

    '; -?> - \ No newline at end of file From 4364f6c924d44cd6af95318350aeb15b3371b24e Mon Sep 17 00:00:00 2001 From: gnuboard Date: Thu, 12 Sep 2013 14:26:23 +0900 Subject: [PATCH 3/4] =?UTF-8?q?it=5Fgallery=20=EC=82=AC=EC=9A=A9=ED=95=98?= =?UTF-8?q?=EB=8A=94=20=EC=BD=94=EB=93=9C=20=EB=AA=A8=EB=91=90=20=EC=82=AD?= =?UTF-8?q?=EC=A0=9C=20#296?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adm/shop_admin/itemexcelupdate.php | 5 ++--- adm/shop_admin/itemform.php | 13 ----------- adm/shop_admin/itemformupdate.php | 5 ----- adm/shop_admin/itemlist.php | 2 -- install/shop.sql | 1 - lib/shop.lib.php | 35 ++++-------------------------- mobile/shop/item.php | 8 ++----- mobile/shop/list.skin.10.php | 6 ++--- skin/shop/basic/item.form.skin.php | 9 +++----- 9 files changed, 14 insertions(+), 70 deletions(-) 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
      - -