diff --git a/adm/shop_admin/configform.php b/adm/shop_admin/configform.php
index 6f297e020..6e2731322 100644
--- a/adm/shop_admin/configform.php
+++ b/adm/shop_admin/configform.php
@@ -423,7 +423,7 @@ $pg_anchor = '<ul class="anchor">
             <?php echo help("주문시 신용카드 결제를 가능하게 할것인지를 설정합니다.", 50); ?>
             <select id="de_card_use" name="de_card_use">
                 <option value="0" <?php echo get_selected($default['de_card_use'], 0); ?>>사용안함</option>
-                <option value="1" <?php echo get_selected($default['de_card_use'], 1); ?>>사용<option>
+                <option value="1" <?php echo get_selected($default['de_card_use'], 1); ?>>사용</option>
             </select>
         </td>
     </tr>
diff --git a/install/shop.sql b/install/shop.sql
index 0dec38623..b3e49d8d0 100644
--- a/install/shop.sql
+++ b/install/shop.sql
@@ -434,6 +434,8 @@ CREATE TABLE IF NOT EXISTS `shop_item` (
   `it_ip` varchar(25) NOT NULL DEFAULT '',
   `it_order` int(11) NOT NULL DEFAULT '0',
   `it_tel_inq` tinyint(4) NOT NULL DEFAULT '0',
+  `it_info_gubun` varchar(50) NOT NULL DEFAULT '',
+  `it_info_value` text NOT NULL,
   `it_img1` varchar(255) NOT NULL DEFAULT '',
   `it_img2` varchar(255) NOT NULL DEFAULT '',
   `it_img3` varchar(255) NOT NULL DEFAULT '',
@@ -524,7 +526,8 @@ CREATE TABLE IF NOT EXISTS `shop_item_qa` (
 DROP TABLE IF EXISTS `shop_item_relation`;
 CREATE TABLE IF NOT EXISTS `shop_item_relation` (
   `it_id` varchar(20) NOT NULL DEFAULT '',
-  `it_id2` varchar(10) NOT NULL DEFAULT '',
+  `it_id2` varchar(20) NOT NULL DEFAULT '',
+  `ir_no` int(11) NOT NULL DEFAULT '0',
   PRIMARY KEY (`it_id`,`it_id2`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 
diff --git a/mobile/shop/cartsub.inc.php b/mobile/shop/cartsub.inc.php
deleted file mode 100644
index a97a47b0f..000000000
--- a/mobile/shop/cartsub.inc.php
+++ /dev/null
@@ -1,334 +0,0 @@
-<?php
-if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
-
-/*
-    $s_page 는 cart.php 일때 수량의 수정, 물품의 삭제를 위한 변수이다.
-               orderinquiryview.php 일때 배송상태등을 나타내는 변수이다.
-
-    $s_uq_id 는 유일한 키
-*/
-
-if ($s_page == 'cart.php' || $s_page == 'orderinquiryview.php')
-    $colspan = 7;
-else
-    $colspan = 6;
-?>
-
-<script src="<?php echo G4_JS_URL; ?>/shop.js"></script>
-
-<form name="frmcartlist" id="sod_bsk_list" method="post">
-<table class="basic_tbl">
-<thead>
-<tr>
-    <th scope="col">상품이미지</th>
-    <th scope="col">상품명</th>
-    <th scope="col">총수량</th>
-    <th scope="col">판매가</th>
-    <th scope="col">소계</th>
-    <th scope="col">포인트</th>
-<?php
-if ($s_page == 'cart.php') {
-    echo '<th scope="col"><input type="checkbox" name="ct_all" value="1"></th>';
-} else if($s_page == 'orderinquiryview.php') {
-    echo '<th scope="col">상태</th>';
-}
-?>
-</tr>
-</thead>
-<tbody>
-<?php
-$tot_point = 0;
-$tot_sell_amount = 0;
-$tot_cancel_amount = 0;
-
-$goods = $goods_it_id = "";
-$goods_count = -1;
-
-// $s_uq_id 로 현재 장바구니 자료 쿼리
-$sql = " select a.ct_id,
-                a.it_id,
-                a.it_name,
-                a.ct_price,
-                a.ct_point,
-                a.ct_qty,
-                a.ct_status,
-                b.ca_id
-           from {$g4['shop_cart_table']} a left join {$g4['shop_item_table']} b on ( a.it_id = b.it_id )
-          where a.uq_id = '$s_uq_id'
-            and a.ct_num = '0' ";
-if($default['de_cart_keep_term']) {
-    $ctime = date('Y-m-d H:i:s', G4_SERVER_TIME - ($default['de_cart_keep_term'] * 86400));
-    $sql .= " and a.ct_time > '$ctime' ";
-}
-$sql .= " order by a.ct_id ";
-$result = sql_query($sql);
-
-$good_info = '';
-
-for ($i=0; $row=mysql_fetch_array($result); $i++)
-{
-    // 합계금액 계산
-    $sql = " select SUM(IF(io_type = 1, (io_price * ct_qty), ((ct_price + io_price) * ct_qty))) as price,
-                    SUM(ct_point * ct_qty) as point,
-                    SUM(ct_qty) as qty
-                from {$g4['shop_cart_table']}
-                where it_id = '{$row['it_id']}'
-                  and uq_id = '$s_uq_id' ";
-    $sum = sql_fetch($sql);
-
-    if (!$goods)
-    {
-        //$goods = addslashes($row[it_name]);
-        //$goods = get_text($row[it_name]);
-        $goods = preg_replace("/\'|\"|\||\,|\&|\;/", "", $row['it_name']);
-        $goods_it_id = $row['it_id'];
-    }
-    $goods_count++;
-
-    // 에스크로 상품정보
-    if($s_page == 'orderform.php' && $default['de_escrow_use']) {
-        if ($i>0)
-            $good_info .= chr(30);
-        $good_info .= "seq=".($i+1).chr(31);
-        $good_info .= "ordr_numb={$od_id}_".sprintf("%04d", $i).chr(31);
-        $good_info .= "good_name=".addslashes($row['it_name']).chr(31);
-        $good_info .= "good_cntx=".$row['ct_qty'].chr(31);
-        $good_info .= "good_amtx=".$row['ct_price'].chr(31);
-    }
-
-    if ($i==0) { // 계속쇼핑
-        $continue_ca_id = $row['ca_id'];
-    }
-
-    if ($s_page == 'cart.php' || $s_page == 'orderinquiryview.php') { // 링크를 붙이고
-        $a1 = '<a href="./item.php?it_id='.$row[it_id].'"><b>';
-        $a2 = '</b></a>';
-        $image = get_it_image($row['it_id'], 70, 70);
-    } else { // 붙이지 않고
-        $a1 = '<b>';
-        $a2 = '</b>';
-        $image = get_it_image($row['it_id'], 50, 50);
-    }
-
-    $it_name = $a1 . stripslashes($row['it_name']) . $a2;
-    $it_options = print_item_options($row['it_id'], $s_uq_id);
-    if($it_options) {
-        $mod_options = '';
-        if($s_page == 'cart.php')
-            $mod_options = '<div class="sod_option_btn"><button type="button" class="mod_options">선택사항수정</button></div>';
-        $it_name .= '<div class="sod_bsk_itopt">'.$it_options.'</div>';
-    }
-
-    $point       = $sum['point'];
-    $sell_amount = $sum['price'];
-?>
-
-<tr>
-    <td class="sod_bsk_img"><?php echo $image; ?></td>
-    <td>
-        <input type="hidden" name="it_id[<?php echo $i; ?>]"    value="<?php echo $row['it_id']; ?>">
-        <input type="hidden" name="it_name[<?php echo $i; ?>]"  value="<?php echo get_text($row['it_name']); ?>">
-        <?php echo $it_name.$mod_options; ?>
-    </td>
-
-    <td class="td_num"><?php echo number_format($sum['qty']); ?></td>
-    <td class="td_bignum"><?php echo number_format($row['ct_price']); ?></td>
-    <td class="td_bignum"><?php echo number_format($sell_amount); ?></td>
-    <td class="td_num"><?php echo number_format($sum['point']); ?></td>
-
-    <?php
-    if ($s_page == 'cart.php')
-        echo '<td class="td_smallmng"><input type="checkbox" name="ct_chk['.$i.']" value="1"></td>';
-    else if ($s_page == 'orderinquiryview.php')
-        echo '<td class="td_smallmng">'.$row['ct_status'].'</td>';
-    ?>
-</tr>
-
-<?php
-    //$tot_point       += $point;
-    //$tot_sell_amount += $sell_amount;
-
-    if ($row['ct_status'] == '취소' || $row['ct_status'] == '반품' || $row['ct_status'] == '품절') {
-        $tot_cancel_amount += $sell_amount;
-    }
-    else {
-        $tot_point       += $point;
-        $tot_sell_amount += $sell_amount;
-    }
-} // for 끝
-
-if ($i == 0) {
-    echo '<tr><td colspan="'.$colspan.'" class="empty_table">장바구니에 담긴 상품이 없습니다.</td></tr>';
-} else {
-    // 배송비가 넘어왔다면
-    if ($_POST['od_send_cost']) {
-        $send_cost = (int)$_POST['od_send_cost'];
-    } else {
-        // 배송비 계산
-        if ($default['de_send_cost_case'] == '없음')
-            $send_cost = 0;
-        else {
-            // 배송비 상한 : 여러단계의 배송비 적용 가능
-            $send_cost_limit = explode(";", $default['de_send_cost_limit']);
-            $send_cost_list  = explode(";", $default['de_send_cost_list']);
-            $send_cost = 0;
-            for ($k=0; $k<count($send_cost_limit); $k++) {
-                // 총판매금액이 배송비 상한가 보다 작다면
-                if ($tot_sell_amount < $send_cost_limit[$k]) {
-                    $send_cost = $send_cost_list[$k];
-                    break;
-                }
-            }
-        }
-
-        // 이미 주문된 내역을 보여주는것이므로 배송비를 주문서에서 얻는다.
-        $sql = "select od_send_cost from {$g4['shop_order_table']} where od_id = '$od_id' ";
-        $row = sql_fetch($sql);
-        if ($row['od_send_cost'] > 0)
-            $send_cost = $row['od_send_cost'];
-    }
-}
-?>
-</tbody>
-</table>
-
-<?php if ($goods_count) $goods .= ' 외 '.$goods_count.'건'; ?>
-
-<?php
-// 배송비가 0 보다 크다면 (있다면)
-if ($send_cost > 0)
-{
-?>
-
-<div id="sod_bsk_dvr" class="sod_bsk_tot">
-    <span>배송비</span>
-    <strong><?php echo number_format($send_cost); ?> 원</strong>
-</div>
-
-<?php } ?>
-
-<?php
-// 총계 = 주문상품금액합계 + 배송비
-$tot_amount = $tot_sell_amount + $send_cost;
-if ($tot_amount > 0) {
-?>
-
-<div id="sod_bsk_cnt" class="sod_bsk_tot">
-    <span>총계</span>
-    <strong><?php echo number_format($tot_amount); ?> 원 <?php echo number_format($tot_point); ?> 점</strong>
-</div>
-
-<?php } ?>
-
-<?php if ($s_page == 'cart.php') { ?>
-<div id="sod_bsk_act">
-    <?php if ($i == 0) { ?>
-    <a href="<?php echo G4_SHOP_URL; ?>/" class="btn01">쇼핑 계속하기</a>
-    <?php } else { ?>
-    <input type="hidden" name="url" value="<?php echo G4_SHOP_URL; ?>/orderform.php">
-    <input type="hidden" name="act" value="">
-    <input type="hidden" name="records" value="<?php echo $i; ?>">
-    <p>장바구니의 상품을 주문하시려면 <strong>주문하기</strong>를 클릭하세요. <strong>비우기</strong>는 장바구니의 상품을 모두 비웁니다.</p>
-    <a href="<?php echo G4_SHOP_URL; ?>/list.php?ca_id=<?php echo $continue_ca_id; ?>" class="btn01">쇼핑 계속하기</a>
-    <a href="javascript:form_check('buy');" class="btn02">주문하기</a>
-    <a href="javascript:form_check('seldelete');" class="btn01">선택삭제</a>
-    <a href="javascript:form_check('alldelete');" class="btn01">비우기</a>
-    <?php } ?>
-</div>
-<?php } ?>
-
-</form>
-
-<?php
-if ($s_page == 'cart.php') {
-    if ($i != 0) {
-?>
-<script>
-$(function() {
-    var close_btn_idx;
-
-    // 선택사항수정
-    $(".mod_options").click(function() {
-        var it_id = $(this).closest("tr").find("input[name^=it_id]").val();
-        var $this = $(this);
-        close_btn_idx = $(".mod_options").index($(this));
-
-        winMask(); // 모달 윈도우 배경 출력
-
-        $.post(
-            "./cartoption.php",
-            { it_id: it_id },
-            function(data) {
-                $("#mod_option_frm").remove();
-                $this.after("<div id=\"mod_option_frm\"></div>");
-                $("#mod_option_frm").html(data);
-                price_calculate();
-            }
-        );
-    });
-
-    // 모두선택
-    $("input[name=ct_all]").click(function() {
-        if($(this).is(":checked"))
-            $("input[name^=ct_chk]").attr("checked", true);
-        else
-            $("input[name^=ct_chk]").attr("checked", false);
-    });
-
-    // 옵션수정 닫기
-    $("#mod_option_close").live("click", function() {
-        $("#mod_option_frm").remove();
-        $("#win_mask, .window").hide();
-        $(".mod_options").eq(close_btn_idx).focus();
-    });
-    $("#win_mask").click(function () {
-        $("#mod_option_frm").remove();
-        $("#win_mask").hide();
-        $(".mod_options").eq(close_btn_idx).focus();
-    });
-
-});
-
-function form_check(act) {
-    var f = document.frmcartlist;
-    var cnt = f.records.value;
-
-    if (act == "buy")
-    {
-        f.act.value = act;
-
-        <?php
-        if (get_session('ss_mb_id')) // 회원인 경우
-        {
-            echo "f.action = './orderform.php';";
-            echo "f.submit();";
-        }
-        else
-            echo "document.location.href = '".G4_BBS_URL."/login.php?url=".urlencode(G4_SHOP_URL."/orderform.php")."';";
-        ?>
-    }
-    else if (act == "alldelete")
-    {
-        f.act.value = act;
-        f.action = "./cartupdate.php";
-        f.submit();
-    }
-    else if (act == "seldelete")
-    {
-        if($("input[name^=ct_chk]:checked").size() < 1) {
-            alert("삭제하실 상품을 하나이상 선택해 주십시오.");
-            return false;
-        }
-
-        f.act.value = act;
-        f.action = "./cartupdate.php";
-        f.submit();
-    }
-
-    return true;
-}
-</script>
-<?php
-    }
-}
-?>
diff --git a/mobile/shop/shop.tail.php b/mobile/shop/shop.tail.php
index 23e040e08..ae1fb013a 100644
--- a/mobile/shop/shop.tail.php
+++ b/mobile/shop/shop.tail.php
@@ -26,13 +26,6 @@ $admin = get_admin("super");
     <a href="#" id="ft_to_top">상단으로</a>
 </footer>
 
-<?php
-if(!G4_IS_MOBILE) {
-    $querystring = str_replace("&", "&amp;", $_SERVER['QUERY_STRING']);
-?>
-<a href="<?php echo $_SERVER['PHP_SELF'].($_SERVER['QUERY_STRING'] ? '?'.$querystring.'&amp;' : '?').'device=mobile'; ?>" id="device_change">모바일 버전으로 보기</a>
-<?php } ?>
-
 <?php
 $sec = get_microtime() - $begin_time;
 $file = $_SERVER['PHP_SELF'];
diff --git a/shop/cartsub.inc.php b/shop/cartsub.inc.php
deleted file mode 100644
index 3a738160d..000000000
--- a/shop/cartsub.inc.php
+++ /dev/null
@@ -1,440 +0,0 @@
-<?php
-if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
-
-/*
-    $s_page 는 cart.php 일때 수량의 수정, 물품의 삭제를 위한 변수이다.
-               orderinquiryview.php 일때 배송상태등을 나타내는 변수이다.
-
-    $s_uq_id 는 유일한 키
-*/
-
-if ($s_page == 'cart.php' || $s_page == 'orderinquiryview.php' || $s_page == 'orderform.php')
-    $colspan = 7;
-else
-    $colspan = 6;
-?>
-
-<script src="<?php echo G4_JS_URL; ?>/shop.js"></script>
-
-<form name="frmcartlist" id="sod_bsk_list" method="post">
-<table class="basic_tbl">
-<thead>
-<tr>
-    <th scope="col">상품이미지</th>
-    <th scope="col">상품명</th>
-    <th scope="col">총수량</th>
-    <th scope="col">판매가</th>
-    <?php if($s_page =='orderform.php') { ?>
-    <th scope="col">쿠폰</th>
-    <?php } ?>
-    <th scope="col">소계</th>
-    <th scope="col">포인트</th>
-<?php
-if ($s_page == 'cart.php')
-    echo '<th scope="col"><label for="ct_all" class="sound_only">상품 전체</label><input type="checkbox" name="ct_all" value="1" id="ct_all"></th>';
-else if ($s_page == 'orderinquiryview.php')
-    echo '<th scope="col">상태</th>';
-?>
-</tr>
-</thead>
-<tbody>
-<?php
-$tot_point = 0;
-$tot_sell_amount = 0;
-$tot_cancel_amount = 0;
-
-$goods = $goods_it_id = "";
-$goods_count = -1;
-
-// $s_uq_id 로 현재 장바구니 자료 쿼리
-$sql = " select a.ct_id,
-                a.it_id,
-                a.it_name,
-                a.ct_price,
-                a.ct_point,
-                a.ct_qty,
-                a.ct_status,
-                b.ca_id,
-                b.ca_id2,
-                b.ca_id3
-           from {$g4['shop_cart_table']} a left join {$g4['shop_item_table']} b on ( a.it_id = b.it_id )
-          where a.uq_id = '$s_uq_id'
-            and a.ct_num = '0' ";
-if($default['de_cart_keep_term']) {
-    $ctime = date('Y-m-d H:i:s', G4_SERVER_TIME - ($default['de_cart_keep_term'] * 86400));
-    $sql .= " and a.ct_time > '$ctime' ";
-}
-$sql .= " order by a.ct_id ";
-$result = sql_query($sql);
-
-$good_info = '';
-
-for ($i=0; $row=mysql_fetch_array($result); $i++)
-{
-    // 합계금액 계산
-    $sql = " select SUM(IF(io_type = 1, (io_price * ct_qty), ((ct_price + io_price) * ct_qty))) as price,
-                    SUM(ct_point * ct_qty) as point,
-                    SUM(ct_qty) as qty
-                from {$g4['shop_cart_table']}
-                where it_id = '{$row['it_id']}'
-                  and uq_id = '$s_uq_id' ";
-    $sum = sql_fetch($sql);
-
-    if (!$goods)
-    {
-        //$goods = addslashes($row[it_name]);
-        //$goods = get_text($row[it_name]);
-        $goods = preg_replace("/\'|\"|\||\,|\&|\;/", "", $row['it_name']);
-        $goods_it_id = $row['it_id'];
-    }
-    $goods_count++;
-
-    // 에스크로 상품정보
-    if($s_page == 'orderform.php' && $default['de_escrow_use']) {
-        if ($i>0)
-            $good_info .= chr(30);
-        $good_info .= "seq=".($i+1).chr(31);
-        $good_info .= "ordr_numb={$od_id}_".sprintf("%04d", $i).chr(31);
-        $good_info .= "good_name=".addslashes($row['it_name']).chr(31);
-        $good_info .= "good_cntx=".$row['ct_qty'].chr(31);
-        $good_info .= "good_amtx=".$row['ct_price'].chr(31);
-    }
-
-    if ($i==0) { // 계속쇼핑
-        $continue_ca_id = $row['ca_id'];
-    }
-
-    if ($s_page == 'cart.php' || $s_page == 'orderinquiryview.php') { // 링크를 붙이고
-        $a1 = '<a href="./item.php?it_id='.$row['it_id'].'"><b>';
-        $a2 = '</b></a>';
-        $image = get_it_image($row['it_id'], 70, 70);
-    } else { // 붙이지 않고
-        $a1 = '<b>';
-        $a2 = '</b>';
-        $image = get_it_image($row['it_id'], 50, 50);
-    }
-
-    $it_name = $a1 . stripslashes($row['it_name']) . $a2;
-    $it_options = print_item_options($row['it_id'], $s_uq_id);
-    if($it_options) {
-        $mod_options = '';
-        if($s_page == 'cart.php')
-            $mod_options = '<div class="sod_option_btn"><button type="button" class="mod_options">선택사항수정</button></div>';
-        $it_name .= '<div class="sod_bsk_itopt">'.$it_options.'</div>';
-    }
-
-    $point       = $sum['point'];
-    $sell_amount = $sum['price'];
-
-    // 쿠폰
-    if($s_page == 'orderform.php' && $is_member) {
-        $cp_button = '';
-
-        $sql = " select count(*) as cnt
-                    from {$g4['shop_coupon_table']}
-                    where mb_id = '{$member['mb_id']}'
-                      and cp_used = '0'
-                      and cp_start <= '".G4_TIME_YMD."'
-                      and cp_end >= '".G4_TIME_YMD."'
-                      and (
-                            ( cp_method = '0' and cp_target = '{$row['it_id']}' )
-                            OR
-                            ( cp_method = '1' and ( cp_target IN ( '{$row['ca_id']}', '{$row['ca_id2']}', '{$row['ca_id3']}' ) ) )
-                          ) ";
-        $cp = sql_fetch($sql);
-
-        if($cp['cnt'])
-            $cp_button = '<button type="button" class="od_coupon_btn">적용</button>';
-    }
-?>
-
-<tr>
-    <td class="sod_bsk_img"><?php echo $image; ?></td>
-    <td>
-        <input type="hidden" name="it_id[<?php echo $i; ?>]"    value="<?php echo $row['it_id']; ?>">
-        <input type="hidden" name="it_name[<?php echo $i; ?>]"  value="<?php echo get_text($row['it_name']); ?>">
-        <input type="hidden" name="cp_id[<?php echo $i; ?>]" value="">
-        <input type="hidden" name="cp_amount[<?php echo $i; ?>]" value="">
-        <?php echo $it_name.$mod_options; ?>
-    </td>
-    <td class="td_num"><?php echo number_format($sum['qty']); ?></td>
-    <td class="td_bignum"><?php echo number_format($row['ct_price']); ?></td>
-    <?php if($s_page == 'orderform.php') { ?>
-    <td><?php echo $cp_button; ?></td>
-    <?php } ?>
-    <td class="td_bignum"><span id="sell_amount_<?php echo $i; ?>"><?php echo number_format($sell_amount); ?></span></td>
-    <td class="td_bignum"><?php echo number_format($point); ?></td>
-
-    <?php
-    if ($s_page == 'cart.php')
-        echo '<td class="td_chk"><label for="ct_chk_'.$i.'" class="sound_only">상품</label><input type="checkbox" name="ct_chk['.$i.']" value="1" id="ct_chk_'.$i.'"></td>';
-    else if ($s_page == 'orderinquiryview.php')
-        echo '<td class="td_smallmng">'.$row['ct_status'].'</td>';
-    ?>
-</tr>
-
-<?php
-    //$tot_point       += $point;
-    //$tot_sell_amount += $sell_amount;
-
-    if ($row['ct_status'] == '취소' || $row['ct_status'] == '반품' || $row['ct_status'] == '품절') {
-        $tot_cancel_amount += $sell_amount;
-    }
-    else {
-        $tot_point       += $point;
-        $tot_sell_amount += $sell_amount;
-    }
-} // for 끝
-
-if ($i == 0) {
-    echo '<tr><td colspan="'.$colspan.'" class="empty_table">장바구니에 담긴 상품이 없습니다.</td></tr>';
-} else {
-    // 배송비가 넘어왔다면
-    if ($_POST['od_send_cost']) {
-        $send_cost = (int)$_POST['od_send_cost'];
-    } else {
-        // 배송비 계산
-        if ($default['de_send_cost_case'] == '없음')
-            $send_cost = 0;
-        else {
-            // 배송비 상한 : 여러단계의 배송비 적용 가능
-            $send_cost_limit = explode(";", $default['de_send_cost_limit']);
-            $send_cost_list  = explode(";", $default['de_send_cost_list']);
-            $send_cost = 0;
-            for ($k=0; $k<count($send_cost_limit); $k++) {
-                // 총판매금액이 배송비 상한가 보다 작다면
-                if ($tot_sell_amount < $send_cost_limit[$k]) {
-                    $send_cost = $send_cost_list[$k];
-                    break;
-                }
-            }
-        }
-
-        // 이미 주문된 내역을 보여주는것이므로 배송비를 주문서에서 얻는다.
-        $sql = "select od_send_cost from {$g4['shop_order_table']} where od_id = '$od_id' ";
-        $row = sql_fetch($sql);
-        if ($row['od_send_cost'] > 0)
-            $send_cost = $row['od_send_cost'];
-    }
-}
-?>
-</tbody>
-</table>
-
-<?php if ($goods_count) $goods .= ' 외 '.$goods_count.'건'; ?>
-
-<?php
-// 배송비가 0 보다 크다면 (있다면)
-if ($send_cost > 0)
-{
-?>
-
-<div id="sod_bsk_dvr" class="sod_bsk_tot">
-    <span>배송비</span>
-    <strong><?php echo number_format($send_cost); ?> 원</strong>
-</div>
-
-<?php } ?>
-
-<?php
-// 총계 = 주문상품금액합계 + 배송비
-$tot_amount = $tot_sell_amount + $send_cost;
-if ($tot_amount > 0) {
-?>
-
-<div id="sod_bsk_cnt" class="sod_bsk_tot">
-    <span>총계</span>
-    <strong><?php echo number_format($tot_amount); ?> 원 <?php echo number_format($tot_point); ?> 점</strong>
-</div>
-
-<?php } ?>
-
-<?php if ($s_page == 'cart.php') { ?>
-<div id="sod_bsk_act">
-    <?php if ($i == 0) { ?>
-    <a href="<?php echo G4_SHOP_URL; ?>/" class="btn01">쇼핑 계속하기</a>
-    <?php } else { ?>
-    <input type="hidden" name="url" value="./orderform.php">
-    <input type="hidden" name="records" value="<?php echo $i; ?>">
-    <input type="hidden" name="act" value="">
-    <p>장바구니의 상품을 주문하시려면 <strong>주문하기</strong>를 클릭하세요. <strong>비우기</strong>는 장바구니의 상품을 모두 비웁니다.</p>
-    <a href="<?php echo G4_SHOP_URL; ?>/list.php?ca_id=<?php echo $continue_ca_id; ?>" class="btn01">쇼핑 계속하기</a>
-    <a href="javascript:form_check('buy');" class="btn02">주문하기</a>
-    <a href="javascript:form_check('seldelete');" class="btn01">선택삭제</a>
-    <a href="javascript:form_check('alldelete');" class="btn01">비우기</a>
-    <?php } ?>
-</div>
-<?php } ?>
-
-</form>
-
-<?php
-if ($i != 0) {
-    if ($s_page == 'cart.php') {
-?>
-<script>
-$(function() {
-    var close_btn_idx;
-
-    // 선택사항수정
-    $(".mod_options").click(function() {
-        var it_id = $(this).closest("tr").find("input[name^=it_id]").val();
-        var $this = $(this);
-        close_btn_idx = $(".mod_options").index($(this));
-
-        winMask(); // 모달 윈도우 배경 출력
-
-        $.post(
-            "./cartoption.php",
-            { it_id: it_id },
-            function(data) {
-                $("#mod_option_frm").remove();
-                $this.after("<div id=\"mod_option_frm\"></div>");
-                $("#mod_option_frm").html(data);
-                price_calculate();
-            }
-        );
-    });
-
-    // 모두선택
-    $("input[name=ct_all]").click(function() {
-        if($(this).is(":checked"))
-            $("input[name^=ct_chk]").attr("checked", true);
-        else
-            $("input[name^=ct_chk]").attr("checked", false);
-    });
-
-    // 옵션수정 닫기
-    $("#mod_option_close").live("click", function() {
-        $("#mod_option_frm").remove();
-        $("#win_mask, .window").hide();
-        $(".mod_options").eq(close_btn_idx).focus();
-    });
-    $("#win_mask").click(function () {
-        $("#mod_option_frm").remove();
-        $("#win_mask").hide();
-        $(".mod_options").eq(close_btn_idx).focus();
-    });
-
-});
-
-function form_check(act) {
-    var f = document.frmcartlist;
-    var cnt = f.records.value;
-
-    if (act == "buy")
-    {
-        f.act.value = act;
-
-        <?php
-        if (get_session('ss_mb_id')) // 회원인 경우
-        {
-            echo "f.action = './orderform.php';";
-            echo "f.submit();";
-        }
-        else
-            echo "document.location.href = '".G4_BBS_URL."/login.php?url=".urlencode(G4_SHOP_URL."/orderform.php")."';";
-        ?>
-    }
-    else if (act == "alldelete")
-    {
-        f.act.value = act;
-        f.action = "./cartupdate.php";
-        f.submit();
-    }
-    else if (act == "seldelete")
-    {
-        if($("input[name^=ct_chk]:checked").size() < 1) {
-            alert("삭제하실 상품을 하나이상 선택해 주십시오.");
-            return false;
-        }
-
-        f.act.value = act;
-        f.action = "./cartupdate.php";
-        f.submit();
-    }
-
-    return true;
-}
-</script>
-<?php
-    }
-
-    if($s_page == 'orderform.php') {
-?>
-<script>
-$(function() {
-    var item_index;
-
-    $(".od_coupon_btn").click(function() {
-        var $this = $(this);
-        $("#it_coupon_frm").remove();
-        item_index = $(".od_coupon_btn").index($this);
-        var it_id = $("input[name^=it_id]:eq("+item_index+")").val();
-
-        $.post(
-            "./orderitemcoupon.php",
-            { it_id: it_id },
-            function(data) {
-                $this.after(data);
-            }
-        );
-    });
-
-    $(".cp_apply").live("click", function() {
-        var $el = $(this).closest("li");
-        var cp_id = $el.find("input[name='f_cp_id[]']").val();
-        var amount = $el.find("input[name='f_cp_amt[]']").val();
-        var subj = $el.find("input[name='f_cp_subj[]']").val();
-        var sell_amount;
-
-        // 이미 사용한 쿠폰이 있는지
-        var cp_dup = false;
-        var cp_dup_idx;
-        $("input[name^=cp_id]").each(function(index) {
-            var id = $(this).val();
-
-            if(id == cp_id) {
-                cp_dup_idx = index;
-                cp_dup = true;
-
-                return false;
-            }
-        });
-
-        if(cp_dup) {
-            var it_name = $("input[name='it_name["+cp_dup_idx+"]']").val();
-            if(!confirm(subj+ "쿠폰은 "+it_name+"에 사용되었습니다.\n"+it_name+"의 쿠폰을 취소한 후 적용하시겠습니까?")) {
-                return false;
-            } else {
-                var $dup_sell_el = $("#sell_amount_"+cp_dup_idx);
-                var $dup_amount_el = $("input[name='cp_amount["+cp_dup_idx+"]']");
-                sell_amount = parseInt($dup_sell_el.text().replace(/[^0-9]/g, ""));
-                var cp_amount = parseInt($dup_amount_el.val());
-                var org_sell = sell_amount + cp_amount;
-
-                $dup_sell_el.text(number_format(String(org_sell)));
-                $dup_amount_el.val("");
-                $("input[name='cp_id["+cp_dup_idx+"]']").val("");
-            }
-        }
-
-        var $s_el = $("#sell_amount_"+item_index);
-        sell_amount = parseInt($s_el.text().replace(/[^0-9]/g, ""));
-        sell_amount = sell_amount - parseInt(amount);
-        $s_el.text(number_format(String(sell_amount)));
-        $("input[name='cp_id["+item_index+"]']").val(cp_id);
-        $("input[name='cp_amount["+item_index+"]']").val(amount);
-
-        $("#it_coupon_frm").remove();
-    });
-
-    $("#it_coupon_close").live("click", function() {
-        $("#it_coupon_frm").remove();
-    });
-});
-</script>
-<?php
-    }
-}
-?>
diff --git a/shop/cartupdate.php b/shop/cartupdate.php
index 85f1d5297..64b23c894 100644
--- a/shop/cartupdate.php
+++ b/shop/cartupdate.php
@@ -145,10 +145,10 @@ else if ($act == "optionmod") // 장바구니에서 옵션변경
 
     $option_count = count($_POST['io_id']);
 
-    if($option_count) {
-        if($_POST['io_type'][0] != 0)
-            alert('상품의 선택옵션을 선택해 주십시오.');
+    if($_POST['io_type'][0] != 0)
+        alert('상품의 선택옵션을 선택해 주십시오.');
 
+    if($option_count) {
         for($i=0; $i<count($_POST['ct_qty']); $i++) {
             if ($_POST['ct_qty'][$i] < 1)
                 alert('수량은 1 이상 입력해 주십시오.');
@@ -240,6 +240,9 @@ else if ($act == "optionmod") // 장바구니에서 옵션변경
         }
 
         sql_query($sql);
+    } else {
+        // 기존 장바구니 자료 삭제
+        sql_query(" delete from {$g4['shop_cart_table']} where uq_id = '$tmp_uq_id' and it_id = '$it_id' ");
     }
 }
 else // 장바구니에 담기
diff --git a/shop/shop.tail.php b/shop/shop.tail.php
index 82b61e111..b588d84b6 100644
--- a/shop/shop.tail.php
+++ b/shop/shop.tail.php
@@ -35,13 +35,6 @@ $admin = get_admin("super");
     </div>
 </footer>
 
-<?php
-if(!G4_IS_MOBILE) {
-    $querystring = str_replace("&", "&amp;", $_SERVER['QUERY_STRING']);
-?>
-<a href="<?php echo $_SERVER['PHP_SELF'].($_SERVER['QUERY_STRING'] ? '?'.$querystring.'&amp;' : '?').'device=mobile'; ?>" id="device_change">모바일 버전으로 보기</a>
-<?php } ?>
-
 <?php
 $sec = get_microtime() - $begin_time;
 $file = $_SERVER['PHP_SELF'];