diff --git a/adm/shop_admin/deliverylist.php b/adm/shop_admin/deliverylist.php
index 7f6caaa2c..4b557870e 100644
--- a/adm/shop_admin/deliverylist.php
+++ b/adm/shop_admin/deliverylist.php
@@ -33,13 +33,13 @@ if ($sel_ca_id != "") {
 
 if ($sel_field == "")  $sel_field = "od_id";
 
-$sql_common = " from $g4[yc4_order_table] a
-                left join $g4[yc4_cart_table] b on (a.on_uid="b".on_uid)
+$sql_common = " from $g4[yc4_cart_table] a
+                left join $g4[yc4_order_table] b on ( a.uq_id = b.od_id)
                 $sql_search ";
 
 // 테이블의 전체 레코드수만 얻음
 if ($chk_misu) {
-    $sql  = " select od_id, a.*, "._MISU_QUERY_." $sql_common group by od_id having  misu <= 0 ";
+    $sql  = " select b.od_id, b.*, "._MISU_QUERY_." $sql_common group by b.od_id having  misu <= 0 ";
     $result = sql_query($sql);
     $total_count = mysql_num_rows($result);
 }
@@ -136,10 +136,10 @@ if ($chk_misu)
 $sql .= "  order by $sort1 $sort2/* 김선용 심각한 트래픽으로 미사용, a.od_invoice asc*/
           limit $from_record, $config[cf_page_rows] ";
 $result = sql_query($sql);
-for ($i=0; $row=mysql_fetch_array($result); $i++) 
+for ($i=0; $row=mysql_fetch_array($result); $i++)
 {
     $invoice_time = $g4[time_ymdhis];
-    if (!is_null_time($row[od_invoice_time])) 
+    if (!is_null_time($row[od_invoice_time]))
         $invoice_time = $row[od_invoice_time];
 
     $sql1 = " select * from $g4[member_table] where mb_id = '$row[mb_id]' ";
@@ -153,8 +153,8 @@ for ($i=0; $row=mysql_fetch_array($result); $i++)
 
     $list = $i%2;
     echo "
-    <input type="hidden" name='od_id[$i]' value='$row[od_id]'>
-    <input type="hidden" name='on_uid[$i]' value='$row[on_uid]'>
+    <input type=\"hidden\" name='od_id[$i]' value='$row[od_id]'>
+    <input type=\"hidden\" name='on_uid[$i]' value='$row[on_uid]'>
     <tr class='list$list center ht'>
         <td><a href='./orderform.php?od_id=$row[od_id]'>$row[od_id]</a></td>
         <td>$row[od_name]</td>
@@ -162,17 +162,17 @@ for ($i=0; $row=mysql_fetch_array($result); $i++)
         <td align=right>".display_amount($row[receiptamount])."&nbsp;</td>
         <td align=right>".display_amount($row[misu])."&nbsp;</td>
         <td>$hope_date</td>
-        <td><input type="text" name='od_invoice_time[$i]' class=ed size=20 maxlength=19 value='$invoice_time'></td>
+        <td><input type=\"text\" name='od_invoice_time[$i]' class=ed size=20 maxlength=19 value='$invoice_time'></td>
         <td>
-            <select id="dl_id" name="dl_id"[$i]>
+            <select id=\"dl_id\" name=\"dl_id[$i]\">
             <option value=''>--------
             $delivery_options
             </select>
         </td>
         <!-- 값이 바뀌었는지 비교하기 위하여 저장 -->
-        <input type="hidden" name='save_dl_id[$i]' value='$row[dl_id]'>
-        <input type="hidden" name='save_od_invoice[$i]' value='$row[od_invoice]'>
-        <td><input type="text" name='od_invoice[$i]' class=ed size=10 value='$row[od_invoice]'></td>
+        <input type=\"hidden\" name='save_dl_id[$i]' value='$row[dl_id]'>
+        <input type=\"hidden\" name='save_od_invoice[$i]' value='$row[od_invoice]'>
+        <td><input type=\"text\" name='od_invoice[$i]' class=ed size=10 value='$row[od_invoice]'></td>
         <td>$row[it_hit]</td>
     </tr>";
 
diff --git a/adm/shop_admin/itemform.php b/adm/shop_admin/itemform.php
index b35a702c9..cc10d5c5d 100644
--- a/adm/shop_admin/itemform.php
+++ b/adm/shop_admin/itemform.php
@@ -789,11 +789,11 @@ var f = document.fitemform;
 <?php if($w == 'u') { ?>
 $(document).ready(function() {
     // 선택옵션등록 변경
-    $("input[id="it_option_use" name="it_option_use"]").click(function() {
+    $("input[name=it_option_use]").click(function() {
         var val = $(this).val();
         if(val == "0") {
             if(!confirm("기존의 선택옵션정보가 삭제됩니다. 계속 하시겠습니까?")) {
-                $("input[id="it_option_use" name="it_option_use"]").filter("input[value=1]").attr("checked", true);
+                $("input[name=it_option_use]").filter("input[value=1]").attr("checked", true);
             } else {
                 $("input[name^=it_opt]:text").val('');
             }
@@ -801,11 +801,11 @@ $(document).ready(function() {
     });
 
     // 추가옵션등록 변경
-    $("input[id="it_supplement_use" name="it_supplement_use"]").click(function() {
+    $("input[name=it_supplement_use]").click(function() {
         var val = $(this).val();
         if(val == "0") {
             if(!confirm("기존의 추가옵션정보가 삭제됩니다. 계속 하시겠습니까?")) {
-                $("input[id="it_supplement_use" name="it_supplement_use"]").filter("input[value=1]").attr("checked", true);
+                $("input[name=it_supplement_use]").filter("input[value=1]").attr("checked", true);
             }
         }
     });
@@ -839,28 +839,28 @@ function codedupcheck(id)
 // 선택옵션창
 function optionformwindow()
 {
-    var it_id = $.trim($('input[id="it_id" name="it_id"]').val());
+    var it_id = $.trim($('input[name=it_id]').val());
     if (!it_id) {
         alert('상품코드를 입력하십시오.');
         f.it_id.focus();
         return;
     }
 
-    $('input[id="it_option_use" name="it_option_use"]').filter('input[value=1]').attr('checked', true);
+    $('input[name=it_option_use]').filter('input[value=1]').attr('checked', true);
     window.open("./optionform.php?w=<? echo $w; ?>&it_id="+it_id, "optionform", "width=700, height=700, left=100, top=50, scrollbars=yes");
 }
 
 // 추가옵션창
 function supplementformwindow()
 {
-    var it_id = $.trim($('input[id="it_id" name="it_id"]').val());
+    var it_id = $.trim($('input[name=it_id]').val());
     if (!it_id) {
         alert('상품코드를 입력하십시오.');
         f.it_id.focus();
         return;
     }
 
-    $('input[id="it_supplement_use" name="it_supplement_use"]').filter('input[value=1]').attr('checked', true);
+    $('input[name=it_supplement_use]').filter('input[value=1]').attr('checked', true);
     window.open("./supplementform.php?w=<? echo $w; ?>&it_id="+it_id, "supplementform", "width=700, height=700, left=100, top=50, scrollbars=yes");
 }
 
@@ -880,18 +880,18 @@ function fitemformcheck(f)
     }
 
     // 개별배송비체크
-    var sc_type = $("input[id="it_sc_type" name="it_sc_type"]:checked").val();
-    var sc_basic = $("input[id="it_sc_basic" name="it_sc_basic"]").val();
+    var sc_type = $("input[name=it_sc_type]:checked").val();
+    var sc_basic = $("input[name=it_sc_basic]").val();
     var patt = /[^0-9]/g;
 
     if(sc_type == "1") { // 조건부무료
-        var minimum = $("input[id="it_minimum" name="it_minimum"]").val().replace(patt, "");
+        var minimum = $("input[name=it_minimum]").val().replace(patt, "");
         if(minimum == "") {
             alert("구매금액 합계를 입력해 주세요.");
             return false;
         }
     } else if(sc_type == "3") { // 수량별
-        var count = $("input[id="it_count" name="it_count"]").val().replace(patt, "");
+        var count = $("input[name=it_count]").val().replace(patt, "");
         if(count == "") {
             alert("반복수량을 입력해 주세요.");
             return false;
diff --git a/adm/shop_admin/iteminfo.php b/adm/shop_admin/iteminfo.php
index b448344f3..7d462c8a7 100644
--- a/adm/shop_admin/iteminfo.php
+++ b/adm/shop_admin/iteminfo.php
@@ -64,8 +64,8 @@ if ($article) {
         echo "<tr class='ht'>\n";
         echo "<td style='padding:3px;' valign='top'><b>$el_title</b></td>\n";
         echo "<td style='padding:3px;' valign='top'>";
-        echo "<input type="hidden" name='{$el_name}[]' value='$el_title' />";
-        echo "<input type="text" name='{$el_name}[]' value='$el_value' class='ed' style='width:99%;' required itemname='$el_title' />";
+        echo "<input type=\"hidden\" name='{$el_name}[]' value='$el_title' />";
+        echo "<input type=\"text\" name='{$el_name}[]' value='$el_value' class='ed' style='width:99%;' required itemname='$el_title' />";
         if ($el_example != "") {
             echo "<p style=\"margin:2px 0;padding:0\">$el_example</p>";
         }
@@ -87,7 +87,7 @@ if ($article) {
 <script>
 $(function(){
     $("#null").click(function(){
-        var $f = $("#fiteminfo input[type="text"], #fiteminfo textarea");
+        var $f = $("#fiteminfo input[type=text], #fiteminfo textarea");
         if (this.checked) {
             $.each($f, function(){
                 if ($(this).val() == "") {
diff --git a/adm/shop_admin/itemlist.php b/adm/shop_admin/itemlist.php
index 3f67dd296..f75924ff1 100644
--- a/adm/shop_admin/itemlist.php
+++ b/adm/shop_admin/itemlist.php
@@ -162,21 +162,11 @@ for ($i=0; $row=mysql_fetch_array($result); $i++)
 
     $list = $i%2;
 
-    // 리스트 썸네일 이미지
-    $filepath = G4_DATA_PATH.'/item/'.$row['it_id'];
-    for($k=1; $k<=10; $k++) {
-        $idx = 'it_img'.$k;
-        if(file_exists($filepath.'/'.$row[$idx]) && is_file($filepath.'/'.$row[$idx])) {
-            $filename = $row[$idx];
-            break;
-        }
-    }
-
     echo "
     <input type=\"hidden\" name='it_id[$i]' value='$row[it_id]'>
     <tr class='list$list'>
         <td>$row[it_id]</td>
-        <td style='padding-top:5px; padding-bottom:5px;'><a href='$href'>".get_it_image($row['it_id'], $filename, 50, 50)."</a></td>
+        <td style='padding-top:5px; padding-bottom:5px;'><a href='$href'>".get_it_image($row['it_id'], 50, 50)."</a></td>
         <td align=left>$tmp_ca_list<br><input type=\"text\" name='it_name[$i]' value='".htmlspecialchars2(cut_str($row[it_name],250, ""))."' required size=40 class=ed></td>
         <td colspan=3>
             <table width=210 cellpadding=0 cellspacing=0>
diff --git a/adm/shop_admin/optiondata.php b/adm/shop_admin/optiondata.php
index a8c41ebda..908824c82 100644
--- a/adm/shop_admin/optiondata.php
+++ b/adm/shop_admin/optiondata.php
@@ -36,13 +36,13 @@ if($makemode) {
 ?>
 
 <table width="650" cellpadding="0" cellspacing="0" border="0">
-<input type="hidden" id="it_id" name="it_id" value="<? echo $it_id; ?>" />
-<input type="hidden" id="w" name="w" value="<? echo $w; ?>" />
-<input type="hidden" id="makemode" name="makemode" value="" />
+<input type="hidden" name="it_id" value="<? echo $it_id; ?>" />
+<input type="hidden" name="w" value="<? echo $w; ?>" />
+<input type="hidden" name="makemode" value="" />
 <tr>
     <td colspan="<?php echo ($option_count + 5); ?>" height="50">
-    <b>추가금액</b> <input type="text" id="common_amount" name="common_amount" value="" size="5" />&nbsp;&nbsp;&nbsp;<b>재고수량</b> <input type="text" id="common_qty" name="common_qty" value="" size="5" />&nbsp;&nbsp;&nbsp;<b>통보수량</b> <input type="text" id="common_notice" name="common_notice" value="" size="5" />
-    &nbsp;&nbsp;&nbsp;<b>사용여부</b> <select id="common_use" name="common_use">
+    <b>추가금액</b> <input type="text" name="common_amount" value="" size="5" />&nbsp;&nbsp;&nbsp;<b>재고수량</b> <input type="text" name="common_qty" value="" size="5" />&nbsp;&nbsp;&nbsp;<b>통보수량</b> <input type="text" name="common_notice" value="" size="5" />
+    &nbsp;&nbsp;&nbsp;<b>사용여부</b> <select name="common_use">
         <option value=''>선택</option>
         <option value="1">Y</option>
         <option value="0">N</option>
@@ -50,7 +50,7 @@ if($makemode) {
     </td>
 </tr>
 <tr>
-    <td rowspan="2" width="50"><input type="checkbox" id="all_check" name="all_check" value="1" /></td>
+    <td rowspan="2" width="50"><input type="checkbox" name="all_check" value="1" /></td>
     <th colspan="<?php echo $option_count; ?>" align="center">옵션항목</th>
     <th rowspan="2" width="75">추가금액</th>
     <th rowspan="2" width="75">재고수량</th>
@@ -74,7 +74,7 @@ if($rec_count) {
         $str .= '<tr>';
         $opt_id = $list[$i]['opt_id'];
 
-        $str .= '<td><input type="checkbox" id="list_check[]" name="list_check[]" value="1" /><input type="hidden" id="opt_id[]" name="opt_id[]" value="'. $opt_id . '" /></td>';
+        $str .= '<td><input type="checkbox" name="list_check[]" value="1" /><input type="hidden" name="opt_id[]" value="'. $opt_id . '" /></td>';
 
         if(trim($opt[0])) {
             $str .= '<td class="cell-opt1">' . $opt[0] . '</td>';
@@ -96,10 +96,10 @@ if($rec_count) {
             $opt_use0 = ' selected="selected"';
         }
 
-        $str .= '<td><input type="text" id="opt_amount[]" name="opt_amount[]" value="' . $list[$i]['opt_amount'] . '" size="5" /></td>';
-        $str .= '<td><input type="text" id="opt_qty[]" name="opt_qty[]" value="' . $list[$i]['opt_qty'] . '" size="5" /></td>';
-        $str .= '<td><input type="text" id="opt_notice[]" name="opt_notice[]" value="' . $list[$i]['opt_notice'] . '" size="5" /></td>';
-        $str .= '<td><select id="opt_use[]" name="opt_use[]"><option value="1"'.$opt_use1.'>Y</option><option value="0"'.$opt_use0.'>N</option></select>';
+        $str .= '<td><input type="text" name="opt_amount[]" value="' . $list[$i]['opt_amount'] . '" size="5" /></td>';
+        $str .= '<td><input type="text" name="opt_qty[]" value="' . $list[$i]['opt_qty'] . '" size="5" /></td>';
+        $str .= '<td><input type="text" name="opt_notice[]" value="' . $list[$i]['opt_notice'] . '" size="5" /></td>';
+        $str .= '<td><select name="opt_use[]"><option value="1"'.$opt_use1.'>Y</option><option value="0"'.$opt_use0.'>N</option></select>';
         $str .= '</tr>';
     }
 } else {
@@ -133,12 +133,12 @@ if($rec_count) {
                     $opt_id .= chr(30) . $opt3_item[$k];
                 }
 
-                $str .= '<td><input type="checkbox" id="list_check[]" name="list_check[]" value="1" /><input type="hidden" id="opt_id[]" name="opt_id[]" value="'. $opt_id . '" /></td>';
+                $str .= '<td><input type="checkbox" name="list_check[]" value="1" /><input type="hidden" name="opt_id[]" value="'. $opt_id . '" /></td>';
                 $str .= $str1 . $str2 . $str3;
-                $str .= '<td><input type="text" id="opt_amount[]" name="opt_amount[]" value="0" size="5" /></td>';
-                $str .= '<td><input type="text" id="opt_qty[]" name="opt_qty[]" value="0" size="5" /></td>';
-                $str .= '<td><input type="text" id="opt_notice[]" name="opt_notice[]" value="0" size="5" /></td>';
-                $str .= '<td><select id="opt_use[]" name="opt_use[]"><option value="1">Y</option><optoin value="0">N</option></select>';
+                $str .= '<td><input type="text" name="opt_amount[]" value="0" size="5" /></td>';
+                $str .= '<td><input type="text" name="opt_qty[]" value="0" size="5" /></td>';
+                $str .= '<td><input type="text" name="opt_notice[]" value="0" size="5" /></td>';
+                $str .= '<td><select name="opt_use[]"><option value="1">Y</option><optoin value="0">N</option></select>';
                 $str .= '</tr>';
             }
         }
@@ -158,7 +158,7 @@ echo $str;
 <script>
 $(document).ready(function() {
     // 모두선택
-    $('input[id="all_check" name="all_check"]').click(function() {
+    $('input[name=all_check]').click(function() {
         if($(this).is(':checked')) {
             $('input[name^=list_check]').attr('checked', true);
         } else {
@@ -168,10 +168,10 @@ $(document).ready(function() {
 
     // 일괄수정
     $('button#common_modify').click(function() {
-        var common_amount = $.trim($('input[id="common_amount" name="common_amount"]').val());
-        var common_qty = $.trim($('input[id="common_qty" name="common_qty"]').val());
-        var common_notice = $.trim($('input[id="common_notice" name="common_notice"]').val());
-        var common_use = $('select[id="common_use" name="common_use"]').val();
+        var common_amount = $.trim($('input[name=common_amount]').val());
+        var common_qty = $.trim($('input[name=common_qty]').val());
+        var common_notice = $.trim($('input[name=common_notice]').val());
+        var common_use = $('select[name=common_use]').val();
 
         if(common_amount == '' && common_qty == '' && common_notice == '' && common_use == '') {
             alert('추가금액, 재고수량, 통보수량, 사용여부 중 1개 이상의 값을 입력해 주세요.');
diff --git a/adm/shop_admin/optionform.php b/adm/shop_admin/optionform.php
index 4b6c960b6..72d6c4841 100644
--- a/adm/shop_admin/optionform.php
+++ b/adm/shop_admin/optionform.php
@@ -18,7 +18,7 @@ if ($is_admin != 'super')
 }
 
 $g4['title'] = $html_title;
-include_once ($g4['path'].'/head.sub.php');
+include_once (G4_PATH.'/head.sub.php');
 ?>
 
 <style type="text/css">
@@ -68,12 +68,12 @@ var it_id = '<?php echo $it_id; ?>';
 $(document).ready(function() {
     var $opener = window.opener;
 
-    $('input[id="it_opt1_subject" name="it_opt1_subject"]').val($opener.$('input[id="it_opt1_subject" name="it_opt1_subject"]').val());
-    $('input[id="it_opt2_subject" name="it_opt2_subject"]').val($opener.$('input[id="it_opt2_subject" name="it_opt2_subject"]').val());
-    $('input[id="it_opt3_subject" name="it_opt3_subject"]').val($opener.$('input[id="it_opt3_subject" name="it_opt3_subject"]').val());
-    $('input[id="it_opt1" name="it_opt1"]').val($opener.$('input[id="it_opt1" name="it_opt1"]').val());
-    $('input[id="it_opt2" name="it_opt2"]').val($opener.$('input[id="it_opt2" name="it_opt2"]').val());
-    $('input[id="it_opt3" name="it_opt3"]').val($opener.$('input[id="it_opt3" name="it_opt3"]').val());
+    $('input[name=it_opt1_subject]').val($opener.$('input[name=it_opt1_subject]').val());
+    $('input[name=it_opt2_subject]').val($opener.$('input[name=it_opt2_subject]').val());
+    $('input[name=it_opt3_subject]').val($opener.$('input[name=it_opt3_subject]').val());
+    $('input[name=it_opt1]').val($opener.$('input[name=it_opt1]').val());
+    $('input[name=it_opt2]').val($opener.$('input[name=it_opt2]').val());
+    $('input[name=it_opt3]').val($opener.$('input[name=it_opt3]').val());
 
     optionTableMake('');
 
@@ -181,21 +181,21 @@ $(document).ready(function() {
         }
 
         if(opt1) {
-            opt1_subject = $('input[id="it_opt1_subject" name="it_opt1_subject"]').val();
+            opt1_subject = $('input[name=it_opt1_subject]').val();
         }
         if(opt2) {
-            opt2_subject = $('input[id="it_opt2_subject" name="it_opt2_subject"]').val();
+            opt2_subject = $('input[name=it_opt2_subject]').val();
         }
         if(opt3) {
-            opt3_subject = $('input[id="it_opt3_subject" name="it_opt3_subject"]').val();
+            opt3_subject = $('input[name=it_opt3_subject]').val();
         }
 
-        $opener.$('input[id="it_opt1_subject" name="it_opt1_subject"]').val(opt1_subject);
-        $opener.$('input[id="it_opt2_subject" name="it_opt2_subject"]').val(opt2_subject);
-        $opener.$('input[id="it_opt3_subject" name="it_opt3_subject"]').val(opt3_subject);
-        $opener.$('input[id="it_opt1" name="it_opt1"]').val(opt1);
-        $opener.$('input[id="it_opt2" name="it_opt2"]').val(opt2);
-        $opener.$('input[id="it_opt3" name="it_opt3"]').val(opt3);
+        $opener.$('input[name=it_opt1_subject]').val(opt1_subject);
+        $opener.$('input[name=it_opt2_subject]').val(opt2_subject);
+        $opener.$('input[name=it_opt3_subject]').val(opt3_subject);
+        $opener.$('input[name=it_opt1]').val(opt1);
+        $opener.$('input[name=it_opt2]').val(opt2);
+        $opener.$('input[name=it_opt3]').val(opt3);
 
         return true;
     });
@@ -288,5 +288,5 @@ function optionTableMake(makemode)
 </script>
 
 <?php
-include_once($g4['path'] . '/tail.sub.php');
+include_once(G4_PATH.'/tail.sub.php');
 ?>
\ No newline at end of file
diff --git a/adm/shop_admin/orderform.php b/adm/shop_admin/orderform.php
index 558f8b86e..eba784f21 100644
--- a/adm/shop_admin/orderform.php
+++ b/adm/shop_admin/orderform.php
@@ -1,6 +1,7 @@
 <?
 $sub_menu = "400400";
 include_once("./_common.php");
+include_once(G4_LIB_PATH.'/thumbnail.lib.php');
 
 // 메세지
 $html_title = "주문 내역 수정";
@@ -184,7 +185,7 @@ for ($i=0; $row=sql_fetch_array($result); $i++)
     $t_ct_amount['정상'] += ($row['orderamount'] - $row['ordercancel']);
     $t_ct_amount['취소'] += $row['ordercancel'];
 
-    $image = get_it_image("{$row['it_id']}_s", (int)($default['de_simg_width'] / $image_rate), (int)($default['de_simg_height'] / $image_rate), $row['it_id']);
+    $image = get_it_image($row['it_id'], (int)($default['de_simg_width'] / $image_rate), (int)($default['de_simg_height'] / $image_rate), $row['it_id']);
 
     $list = $i%2;
     echo "
@@ -729,7 +730,7 @@ if ($od['od_receipt_point'] > 0)
             <td>
                 <input type="text" class=ed id="od_zip1" name="od_zip1" size=4 readonly required itemname='우편번호 앞자리' value='<?=$od['od_zip1']?>'> -
                 <input type="text" class=ed id="od_zip2" name="od_zip2" size=4 readonly required itemname='우편번호 뒷자리' value='<?=$od['od_zip2']?>'>
-                &nbsp;<a href="javascript:;" onclick="win_zip('frmorderform2', 'od_zip1', 'od_zip2', 'od_addr1', 'od_addr2');"><img src="<?=$g4['shop_admin_path']?>/img/btn_zip_find.gif" border=0 align=absmiddle></a><br>
+                &nbsp;<a href="<?=G4_BBS_URL?>/zip.php?frm_name=frmorderform2&amp;frm_zip1=od_zip1&amp;frm_zip2=od_zip2&amp;frm_addr1=od_addr1&amp;frm_addr2=od_addr2" class="win_zip_find"><img src="<?=$g4['shop_admin_path']?>/img/btn_zip_find.gif" border=0 align=absmiddle></a><br>
                 <input type="text" class=ed id="od_addr1" name="od_addr1" size=50 readonly required itemname='주소' value='<?=$od['od_addr1']?>'><br>
                 <input type="text" class=ed id="od_addr2" name="od_addr2" size=50 required itemname='상세주소' value='<?=$od['od_addr2']?>'></td>
         </tr>
@@ -770,7 +771,7 @@ if ($od['od_receipt_point'] > 0)
             <td>
                 <input type="text" class=ed id="od_b_zip1" name="od_b_zip1" size=4 readonly required itemname='우편번호 앞자리' value='<?=$od['od_b_zip1']?>'> -
                 <input type="text" class=ed id="od_b_zip2" name="od_b_zip2" size=4 readonly required itemname='우편번호 뒷자리' value='<?=$od['od_b_zip2']?>'>
-                &nbsp;<a href="javascript:;" onclick="win_zip('frmorderform2', 'od_b_zip1', 'od_b_zip2', 'od_b_addr1', 'od_b_addr2');"><img src="<?=$g4[shop_admin_path]?>/img/btn_zip_find.gif" border=0 align=absmiddle></a><br>
+                &nbsp;<a href="<?=G4_BBS_URL?>/zip.php?frm_name=frmorderform2&amp;frm_zip1=od_b_zip1&amp;frm_zip2=od_b_zip2&amp;frm_addr1=od_b_addr1&amp;frm_addr2=od_b_addr2" class="win_zip_find"><img src="<?=$g4[shop_admin_path]?>/img/btn_zip_find.gif" border=0 align=absmiddle></a><br>
                 <input type="text" class=ed id="od_b_addr1" name="od_b_addr1" size=50 readonly required itemname='주소' value='<?=$od['od_b_addr1']?>'><br>
                 <input type="text" class=ed id="od_b_addr2" name="od_b_addr2" size=50 required itemname='상세주소' value='<?=$od['od_b_addr2']?>'></td>
         </tr>
diff --git a/adm/shop_admin/orderlist2.php b/adm/shop_admin/orderlist2.php
index b12227b87..49e10ea08 100644
--- a/adm/shop_admin/orderlist2.php
+++ b/adm/shop_admin/orderlist2.php
@@ -1,6 +1,7 @@
 <?
 $sub_menu = "400420";
 include_once("./_common.php");
+include_once(G4_LIB_PATH.'/thumbnail.lib.php');
 
 auth_check($auth[$sub_menu], "r");
 
@@ -25,8 +26,8 @@ if ($sel_field == "")  $sel_field = "od_id";
 if ($sort1 == "") $sort1 = "od_id";
 if ($sort2 == "") $sort2 = "desc";
 
-$sql_common = " from $g4[yc4_order_table] a
-                left join $g4[yc4_cart_table] b on (a.on_uid="b".on_uid)
+$sql_common = " from $g4[yc4_cart_table] a
+                left join $g4[yc4_order_table] b on ( a.uq_id = b.od_id)
                 $sql_search ";
 
 // 테이블의 전체 레코드수만 얻음
@@ -38,10 +39,10 @@ $total_page  = ceil($total_count / $rows);  // 전체 페이지 계산
 if ($page == "") { $page = 1; } // 페이지가 없으면 첫 페이지 (1 페이지)
 $from_record = ($page - 1) * $rows; // 시작 열을 구함
 
-$sql  = " select a.od_id,
-                 a.*, "._MISU_QUERY_."
+$sql  = " select b.od_id,
+                 b.*, "._MISU_QUERY_."
            $sql_common
-           group by a.od_id
+           group by b.od_id
            order by $sort1 $sort2
            limit $from_record, $rows ";
 $result = sql_query($sql);
@@ -169,6 +170,7 @@ for ($i=0; $row=mysql_fetch_array($result); $i++)
         echo "<tr><td colspan=12 height=1 bgcolor='#CCCCCC'></td></tr>";
 
     $list = $i%2;
+
     echo "
     <tr class='list$list ht'>
         <td align=center title='주문일시 : $row[od_time]'><a href='$g4[shop_path]/orderinquiryview.php?od_id=$row[od_id]&on_uid=$row[on_uid]'>$row[od_id]</a></td>
@@ -197,7 +199,7 @@ for ($i=0; $row=mysql_fetch_array($result); $i++)
     $sql2 = " select c.it_name,
                      b.*
                 from $g4[yc4_order_table] a
-                left join $g4[yc4_cart_table] b on (a.on_uid = b.on_uid)
+                left join $g4[yc4_cart_table] b on (a.od_id = b.uq_id)
                 left join $g4[yc4_item_table] c on (b.it_id = c.it_id)
                where od_id = '$row[od_id]' ";
     $result2 = sql_query($sql2);
@@ -216,7 +218,7 @@ for ($i=0; $row=mysql_fetch_array($result); $i++)
             <td colspan=3>
                 <table width=100% cellpadding=0 cellspacing=0>
                 <tr>
-                	<td style='padding-top:5px; padding-bottom:5px;'><a href='$href'>".get_it_image("{$row2[it_id]}_s", 50, 50)."</a></td>
+                	<td style='padding-top:5px; padding-bottom:5px;'><a href='$href'>".get_it_image($row2[it_id], 50, 50)."</a></td>
                 	<td>$it_name</td>
                 </tr>
                 </table></td>
diff --git a/adm/shop_admin/orderstatuslist.php b/adm/shop_admin/orderstatuslist.php
index 5ef269b61..8a1b15576 100644
--- a/adm/shop_admin/orderstatuslist.php
+++ b/adm/shop_admin/orderstatuslist.php
@@ -1,6 +1,7 @@
 <?
 $sub_menu = "400410";
 include_once("./_common.php");
+include_once(G4_LIB_PATH.'/thumbnail.lib.php');
 
 auth_check($auth[$sub_menu], "r");
 
@@ -26,9 +27,9 @@ if ($sel_field == "")  $sel_field = "od_id";
 if ($sort1 == "") $sort1 = "od_id";
 if ($sort2 == "") $sort2 = "desc";
 
-$sql_common = " from $g4[yc4_order_table] a
-                left join $g4[yc4_cart_table] b on (a.on_uid = b.on_uid)
-                left join $g4[yc4_item_table] c on (b.it_id = c.it_id)
+$sql_common = " from {$g4['yc4_order_table']} a
+                left join {$g4['yc4_cart_table']} b on (a.od_id = b.uq_id)
+                left join {$g4['yc4_item_table']} c on (b.it_id = c.it_id)
                 $sql_search ";
 
 // 테이블의 전체 레코드수만 얻음
@@ -46,26 +47,16 @@ $sql  = " select a.od_id,
                  a.od_name,
                  a.od_deposit_name,
                  a.od_time,
-                 b.it_opt1,
-                 b.it_opt2,
-                 b.it_opt3,
-                 b.it_opt4,
-                 b.it_opt5,
-                 b.it_opt6,
+                 b.ct_option,
                  b.ct_status,
                  b.ct_qty,
+                 b.it_amount,
                  b.ct_amount,
                  b.ct_point,
-                 (b.ct_qty * b.ct_amount) as ct_sub_amount,
+                 (b.ct_qty * (b.ct_amount+b.it_amount)) as ct_sub_amount,
                  (b.ct_qty * b.ct_point)  as ct_sub_point,
                  c.it_id,
-                 c.it_name,
-                 c.it_opt1_subject,
-                 c.it_opt2_subject,
-                 c.it_opt3_subject,
-                 c.it_opt4_subject,
-                 c.it_opt5_subject,
-                 c.it_opt6_subject
+                 c.it_name
            $sql_common
            order by $sort1 $sort2
            limit $from_record, $rows ";
@@ -160,14 +151,15 @@ for ($i=0; $row=sql_fetch_array($result); $i++) {
     $s_mod = icon("수정", "./orderform.php?od_id=$row[od_id]");
 
     $list = $i%2;
+
     echo "
     <tr class='list$list center'>
         <td align=center title='주문일시 : $row[od_time]'><a href='$_SERVER[PHP_SELF]?sort1=$sort1&sort2=$sort2&sel_field=od_id&search=$row[od_id]'>$row[od_id]</a></td>
         <td align=center $od_deposit_name><a href='$_SERVER[PHP_SELF]?sort1=$sort1&sort2=$sort2&sel_field=od_name&search=$row[od_name]'>".cut_str($row[od_name],10,"")."</a></td>
         <td align=center><a href='$_SERVER[PHP_SELF]?sort1=$sort1&sort2=$sort2&sel_field=mb_id&search=$row[mb_id]'>$row[mb_id]</a></td>
-        <td style='padding-top:5px; padding-bottom:5px;'><a href='$href'>".get_it_image("{$row[it_id]}_s", 50, 50)."</a></td>
+        <td style='padding-top:5px; padding-bottom:5px;'><a href='$href'>".get_it_image($row['it_id'], 50, 50)."</a></td>
         <td align=left>$it_name</td>
-        <td align=right>".number_format($row[ct_amount])."&nbsp;</td>
+        <td align=right>".number_format($row[it_amount] + $row[ct_amount])."&nbsp;</td>
         <td align=center>$row[ct_qty]</td>
         <td align=right>".number_format($row[ct_sub_amount])."&nbsp;</td>
         <td align=right>".number_format($row[ct_sub_point])."&nbsp;</td>
diff --git a/adm/shop_admin/supplementdata.php b/adm/shop_admin/supplementdata.php
index 16c0be625..fc2a2827d 100644
--- a/adm/shop_admin/supplementdata.php
+++ b/adm/shop_admin/supplementdata.php
@@ -31,13 +31,13 @@ if(!$makemode) {
 ?>
 
 <table width="650" cellpadding="0" cellspacing="0" border="0">
-<input type="hidden" id="it_id" name="it_id" value="<? echo $it_id; ?>" />
-<input type="hidden" id="w" name="w" value="<? echo $w; ?>" />
-<input type="hidden" id="makemode" name="makemode" value="<? echo $makemode; ?>" />
+<input type="hidden" name="it_id" value="<? echo $it_id; ?>" />
+<input type="hidden" name="w" value="<? echo $w; ?>" />
+<input type="hidden" name="makemode" value="<? echo $makemode; ?>" />
 <tr>
     <td colspan="6" height="50">
-    <b>추가금액</b> <input type="text" id="common_amount" name="common_amount" value="" size="5" />&nbsp;&nbsp;&nbsp;<b>재고수량</b> <input type="text" id="common_qty" name="common_qty" value="" size="5" />&nbsp;&nbsp;&nbsp;<b>통보수량</b> <input type="text" id="common_notice" name="common_notice" value="" size="5" />
-    &nbsp;&nbsp;&nbsp;<b>사용여부</b> <select id="common_use" name="common_use">
+    <b>추가금액</b> <input type="text" name="common_amount" value="" size="5" />&nbsp;&nbsp;&nbsp;<b>재고수량</b> <input type="text" name="common_qty" value="" size="5" />&nbsp;&nbsp;&nbsp;<b>통보수량</b> <input type="text" name="common_notice" value="" size="5" />
+    &nbsp;&nbsp;&nbsp;<b>사용여부</b> <select name="common_use">
         <option value=''>선택</option>
         <option value="1">Y</option>
         <option value="0">N</option>
@@ -45,7 +45,7 @@ if(!$makemode) {
     </td>
 </tr>
 <tr>
-    <td width="50"><input type="checkbox" id="all_check" name="all_check" value="1" /></td>
+    <td width="50"><input type="checkbox" name="all_check" value="1" /></td>
     <th width="150" align="center">추가옵션명</th>
     <th width="150" align="center">추가옵션항목</th>
     <th width="75">추가금액</th>
@@ -61,7 +61,7 @@ if($option_count) {
         $str .= '<tr>';
         $sp_id = $list[$i]['sp_id'];
 
-        $str .= '<td><input type="checkbox" id="list_check[]" name="list_check[]" value="1" /><input type="hidden" id="sp_id[]" name="sp_id[]" value="'. $sp_id . '" /></td>';
+        $str .= '<td><input type="checkbox" name="list_check[]" value="1" /><input type="hidden" name="sp_id[]" value="'. $sp_id . '" /></td>';
 
         if(trim($opt[0]) && trim($opt[1])) {
             $str .= '<td>' . $opt[0] . '</td>';
@@ -76,10 +76,10 @@ if($option_count) {
             $sp_use0 = ' selected="selected"';
         }
 
-        $str .= '<td><input type="text" id="sp_amount[]" name="sp_amount[]" value="' . $list[$i]['sp_amount'] . '" size="5" /></td>';
-        $str .= '<td><input type="text" id="sp_qty[]" name="sp_qty[]" value="' . $list[$i]['sp_qty'] . '" size="5" /></td>';
-        $str .= '<td><input type="text" id="sp_notice[]" name="sp_notice[]" value="' . $list[$i]['sp_notice'] . '" size="5" /></td>';
-        $str .= '<td><select id="sp_use[]" name="sp_use[]"><option value="1"'.$sp_use1.'>Y</option><option value="0"'.$sp_use0.'>N</option></select>';
+        $str .= '<td><input type="text" name="sp_amount[]" value="' . $list[$i]['sp_amount'] . '" size="5" /></td>';
+        $str .= '<td><input type="text" name="sp_qty[]" value="' . $list[$i]['sp_qty'] . '" size="5" /></td>';
+        $str .= '<td><input type="text" name="sp_notice[]" value="' . $list[$i]['sp_notice'] . '" size="5" /></td>';
+        $str .= '<td><select name="sp_use[]"><option value="1"'.$sp_use1.'>Y</option><option value="0"'.$sp_use0.'>N</option></select>';
         $str .= '</tr>';
     }
 } else {
@@ -94,13 +94,13 @@ if($option_count) {
 
         for($k = 0; $k < $sp_opt_count; $k++) {
             $sp_id = $sp_subj . chr(30) . $sp_opt[$k];
-            $str .= '<td><input type="checkbox" id="list_check[]" name="list_check[]" value="1" /><input type="hidden" id="sp_id[]" name="sp_id[]" value="'. $sp_id . '" /></td>';
+            $str .= '<td><input type="checkbox" name="list_check[]" value="1" /><input type="hidden" name="sp_id[]" value="'. $sp_id . '" /></td>';
             $str .= '<td>' . $sp_subj . '</td>';
             $str .= '<td>' . $sp_opt[$k] . '</td>';
-            $str .= '<td><input type="text" id="sp_amount[]" name="sp_amount[]" value="0" size="5" /></td>';
-            $str .= '<td><input type="text" id="sp_qty[]" name="sp_qty[]" value="0" size="5" /></td>';
-            $str .= '<td><input type="text" id="sp_notice[]" name="sp_notice[]" value="0" size="5" /></td>';
-            $str .= '<td><select id="sp_use[]" name="sp_use[]"><option value="1">Y</option><optoin value="0">N</option></select>';
+            $str .= '<td><input type="text" name="sp_amount[]" value="0" size="5" /></td>';
+            $str .= '<td><input type="text" name="sp_qty[]" value="0" size="5" /></td>';
+            $str .= '<td><input type="text" name="sp_notice[]" value="0" size="5" /></td>';
+            $str .= '<td><select name="sp_use[]"><option value="1">Y</option><optoin value="0">N</option></select>';
             $str .= '</tr>';
         }
     }
@@ -119,7 +119,7 @@ echo $str;
 <script>
 $(document).ready(function() {
     // 모두선택
-    $('input[id="all_check" name="all_check"]').click(function() {
+    $('input[name=all_check]').click(function() {
         if($(this).is(':checked')) {
             $('input[name^=list_check]').attr('checked', true);
         } else {
@@ -129,10 +129,10 @@ $(document).ready(function() {
 
     // 일괄수정
     $('button#common_modify').click(function() {
-        var common_amount = $.trim($('input[id="common_amount" name="common_amount"]').val());
-        var common_qty = $.trim($('input[id="common_qty" name="common_qty"]').val());
-        var common_notice = $.trim($('input[id="common_notice" name="common_notice"]').val());
-        var common_use = $('select[id="common_use" name="common_use"]').val();
+        var common_amount = $.trim($('input[name=common_amount]').val());
+        var common_qty = $.trim($('input[name=common_qty]').val());
+        var common_notice = $.trim($('input[name=common_notice]').val());
+        var common_use = $('select[name=common_use]').val();
 
         if(common_amount == '' && common_qty == '' && common_notice == '' && common_use == '') {
             alert('추가금액, 재고수량, 통보수량, 사용여부 중 1개 이상의 값을 입력해 주세요.');
diff --git a/adm/shop_admin/supplementform.php b/adm/shop_admin/supplementform.php
index 8f222428e..a515ee0fb 100644
--- a/adm/shop_admin/supplementform.php
+++ b/adm/shop_admin/supplementform.php
@@ -49,7 +49,7 @@ if($spl_count) {
 }
 
 $g4['title'] = $html_title;
-include_once ($g4['path'].'/head.sub.php');
+include_once (G4_PATH.'/head.sub.php');
 ?>
 
 <style type="text/css">
@@ -212,5 +212,5 @@ function supplementTableMake(makemode)
 </script>
 
 <?php
-include_once($g4['path'] . '/tail.sub.php');
+include_once(G4_PATH.'/tail.sub.php');
 ?>
\ No newline at end of file
diff --git a/js/common.js b/js/common.js
index bdcf69845..bf3ca0000 100644
--- a/js/common.js
+++ b/js/common.js
@@ -432,6 +432,12 @@ function doc_write(cont)
     document.write(cont);
 }
 
+// php chr() 대응
+function chr(code)
+{
+    return String.fromCharCode(code);
+}
+
 var win_password_lost = function(href) {
     window.open(href, "win_password_lost", "left=50, top=50, width=617, height=330, scrollbars=1");
 }
diff --git a/lib/shop.lib.php b/lib/shop.lib.php
index 2493d66d3..c79066e3d 100644
--- a/lib/shop.lib.php
+++ b/lib/shop.lib.php
@@ -143,27 +143,42 @@ function get_image($img, $width=0, $height=0)
 }
 
 // 상품 이미지를 얻는다
-function get_it_image($dir, $img, $width, $height, $it_id="", $class="", $thumbnail=true)
+function get_it_image($it_id, $width, $height, $id="", $thumbnail=true)
 {
+    global $g4;
+
     if($thumbnail && !$width)
         return "";
 
-    $src = G4_DATA_URL.'/item/'.$dir.'/'.$img;
+    $sql = " select it_id, it_img1, it_img2, it_img3, it_img4, it_img5, it_img6, it_img7, it_img8, it_img9, it_img10
+                from {$g4['yc4_item_table']}
+                where it_id = '$it_id' ";
+    $row = sql_fetch($sql);
 
-    if($thumbnail) {
-        $filepath = G4_DATA_PATH.'/item/'.$dir;
+    if(!$row['it_id'])
+        return "";
 
-        if(file_exists($filepath.'/'.$img) && is_file($filepath.'/'.$img)) {
-            $src = G4_DATA_URL.'/item/'.$dir.'/'.it_img_thumb($img, $filepath, $width, $height);
+    $filepath = G4_DATA_PATH.'/item/'.$row['it_id'];
+    $filename = "";
+    for($k=1; $k<=10; $k++) {
+        $idx = 'it_img'.$k;
+        if(file_exists($filepath.'/'.$row[$idx]) && is_file($filepath.'/'.$row[$idx])) {
+            $filename = $row[$idx];
+            break;
         }
     }
 
-    $str = "<img id=\"$img\" src=\"$src\" width=\"$width\" height=\"$height\"";
-    if($class)
-        $str .= " class=\"$class\"";
-    $str .= " />";
+    $src = G4_DATA_URL.'/item/'.$row['it_id'].'/'.$filename;
 
-    if ($it_id) {
+    if($thumbnail) {
+        if(file_exists($filepath.'/'.$filename) && is_file($filepath.'/'.$filename)) {
+            $src = G4_DATA_URL.'/item/'.$row['it_id'].'/'.it_img_thumb($filename, $filepath, $width, $height);
+        }
+    }
+
+    $str = "<img id=\"$img\" src=\"$src\" width=\"$width\" height=\"$height\" />";
+
+    if ($id) {
         $str = "<a href='".G4_SHOP_URL."/item.php?it_id=$it_id'>$str</a>";
     }
 
@@ -610,7 +625,7 @@ function get_supplement_subject($it_id)
     // 추가옵션명
     $subject = array();
     for($i = 0; $row = sql_fetch_array($result); $i++) {
-        $str = explode('|*|', $row['sp_id']);
+        $str = explode(chr(30), $row['sp_id']);
 
         if(!in_array($str[0], $subject)) {
             array_push($subject, $str[0]);
@@ -637,7 +652,7 @@ function get_supplement_option($it_id, $sp_id, $index)
     $str = '<select name="item-supplement-'.$index.'">'."\n";
     $str .= '<option value="">선택</option>'."\n";
     for($i = 0; $row = sql_fetch_array($result); $i++) {
-        $opt = str_replace($sp_id.'|*|', '', $row['sp_id']);
+        $opt = str_replace($sp_id.chr(30), '', $row['sp_id']);
         if($opt) {
             if($row['sp_amount']) {
                 $info = ' (+'.number_format($row['sp_amount']).'원)';
diff --git a/shop/boxtodayview.inc.php b/shop/boxtodayview.inc.php
index 826fe9880..ffc4dfa6c 100644
--- a/shop/boxtodayview.inc.php
+++ b/shop/boxtodayview.inc.php
@@ -66,7 +66,7 @@ for ($i=1; $i<=$tv_idx; $i++)
         if(file_exists($tv_filepath.'/'.$tv_filename) && $tv_filename != "")
             break;
     }
-    $img = get_it_image($tv_it_id, $tv_filename, $tv_div['img_width'], $tv_div['img_height'], $tv_it_id);
+    $img = get_it_image($tv_it_id, $tv_div['img_width'], $tv_div['img_height'], $tv_it_id);
     $img = str_replace("\"", "\\\"", $img);
     $img = preg_replace("/\<a /", "<a title='$it_name' ", $img);
     echo "goods_link[$i] = \"{$img}<br/><span class=small>".cut_str($it_name,10,"")."</span>\";\n";
diff --git a/shop/cartsub.inc.php b/shop/cartsub.inc.php
index d01a2a55e..f9ae7d8e0 100644
--- a/shop/cartsub.inc.php
+++ b/shop/cartsub.inc.php
@@ -1,5 +1,6 @@
 <?
 if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
+include_once(G4_LIB_PATH.'/thumbnail.lib.php');
 
 /*
     $s_page 는 cart.php 일때 수량의 수정, 물품의 삭제를 위한 변수이다.
@@ -88,17 +89,7 @@ $sql = " select a.ct_id,
                 b.it_option_use,
                 b.it_supplement_use,
                 b.it_nocoupon,
-                b.it_notax,
-                b.it_img1,
-                b.it_img2,
-                b.it_img3,
-                b.it_img4,
-                b.it_img5,
-                b.it_img6,
-                b.it_img7,
-                b.it_img8,
-                b.it_img9,
-                b.it_img10
+                b.it_notax
           from {$g4['yc4_cart_table']} as a left join {$g4['yc4_item_table']} as b on ( a.it_id = b.it_id )
             where $sql_where
               and a.ct_parent = '0'
@@ -156,24 +147,14 @@ for ($i=0; $row=mysql_fetch_array($result); $i++)
         $continue_ca_id = $row['ca_id'];
     }
 
-    // 리스트 썸네일 이미지
-    $filepath = G4_DATA_PATH.'/item/'.$row['it_id'];
-    for($k=1; $k<=10; $k++) {
-        $idx = 'it_img'.$k;
-        if(file_exists($filepath.'/'.$row[$idx]) && is_file($filepath.'/'.$row[$idx])) {
-            $filename = $row[$idx];
-            break;
-        }
-    }
-
     if ($s_page == "cart.php" || $s_page == "orderinquiryview.php") { // 링크를 붙이고
         $a1 = "<a href='./item.php?it_id={$row['it_id']}'>";
         $a2 = "</a>";
-        $image = get_it_image($row['it_id'], $filename, 50, 50, $row['it_id']);
+        $image = get_it_image($row['it_id'], 50, 50, $row['it_id']);
     } else { // 붙이지 않고
         $a1 = "";
         $a2 = "";
-        $image = get_it_image($row['it_id'], $filename, 50, 50);
+        $image = get_it_image($row['it_id'], 50, 50);
     }
 
     $it_name = $a1 . stripslashes($row['it_name']) . $a2 . '<br />';
diff --git a/shop/item.php b/shop/item.php
index 41baf541a..73b2339d2 100644
--- a/shop/item.php
+++ b/shop/item.php
@@ -188,7 +188,7 @@ else
         <table cellpadding=0 cellspacing=0>
             <tr><td height=22></td></tr>
             <tr><td colspan=3 align=center>
-                <table cellpadding=1 cellspacing=0 bgcolor=#E4E4E4><tr><td id="middle_image"><?=get_large_image($filename, $it['it_id'], false)?><?=get_it_image($it['it_id'], $filename, $default['de_mimg_width'], $default['de_mimg_height']);?></a></td></tr></table></td></tr>
+                <table cellpadding=1 cellspacing=0 bgcolor=#E4E4E4><tr><td id="middle_image"><?=get_large_image($filename, $it['it_id'], false)?><?=get_it_image($it['it_id'], $default['de_mimg_width'], $default['de_mimg_height']);?></a></td></tr></table></td></tr>
             <tr><td colspan=3 height=10></td></tr>
             <tr>
                 <td colspan=3 align=center>
@@ -200,8 +200,8 @@ else
                     if (file_exists($filepath.'/'.$filename) && $filename != "")
                     {
                         echo get_large_image($filename, $it['it_id'], false);
-                        echo get_it_image($it['it_id'], $filename, 40, 40, "", "item_view_thumbnail");
-                        echo "</a> &nbsp;";
+                        echo "<img id=\"".$filename."\" src=\"".G4_DATA_URL."/item/".$it['it_id']."/".it_img_thumb($filename, $filepath, 40, 40)."\" class=\"item_view_thumbnail\" />";
+                        echo "&nbsp;";
                     }
                 }
                 ?>
@@ -944,7 +944,7 @@ function optionDisplay()
                 optioncontent += "<input type=\"hidden\" name=\"opt_id[]\" value=\""+ opt_id + "\" />";
                 optioncontent += "<input type=\"hidden\" name=\"ct_option[]\" value=\""+ option + "\" />";
                 optioncontent += "<input type=\"hidden\" name=\"ct_amount[]\" value=\"" + data.amount + "\" />";
-                optioncontent += "<span class=\"option-stock>" + data.qty + "</span>";
+                optioncontent += "<span class=\"option-stock\">" + data.qty + "</span>";
                 optioncontent += "<span class=\"selected-option\">" + option + "</span>";
                 optioncontent += "<span class=\"option-price\"> (+" + number_format(String(data.amount)) + "원)</span>";
                 optioncontent += "<span class=\"item-count\"> <input type=\"text\" name=\"ct_qty[]\" value=\"1\" maxlength=\"4\" /></span>";
diff --git a/shop/largeimage.php b/shop/largeimage.php
index 253667d11..fd3e756a3 100644
--- a/shop/largeimage.php
+++ b/shop/largeimage.php
@@ -26,9 +26,12 @@ include_once(G4_PATH.'/head.sub.php');
         <?
         for ($i=1; $i<=10; $i++)
         {
+            $filepath = G4_DATA_PATH.'/item/'.$it_id;
             $filename = $row['it_img'.$i];
-            if (file_exists(G4_DATA_PATH."/item/{$it_id}/{$filename}") && $filename != "")
-                echo get_it_image($it_id, $filename, 50, 50, "", "image_thumbnail")."&nbsp;";
+            if (file_exists($filepath.'/'.$filename) && $filename != "") {
+                echo "<img id=\"".$filename."\" src=\"".G4_DATA_URL."/item/".$it_id."/".it_img_thumb($filename, $filepath, 50, 50)."\" class=\"image_thumbnail\" />";
+                echo "&nbsp;";
+            }
         }
         ?>
         &nbsp;</td>
diff --git a/shop/list.skin.10.php b/shop/list.skin.10.php
index 5b5ca33fc..a6825a733 100644
--- a/shop/list.skin.10.php
+++ b/shop/list.skin.10.php
@@ -14,21 +14,11 @@ for ($i=0; $row=sql_fetch_array($result); $i++)
         echo "<tr>\n";
     }
 
-    // 리스트 썸네일 이미지
-    $filepath = G4_DATA_PATH.'/item/'.$row['it_id'];
-    for($k=1; $k<=10; $k++) {
-        $idx = 'it_img'.$k;
-        if(file_exists($filepath.'/'.$row[$idx]) && is_file($filepath.'/'.$row[$idx])) {
-            $filename = $row[$idx];
-            break;
-        }
-    }
-
     echo "
     <td width='{$td_width}%' align=center valign=top>
         <br>
         <table width=98% cellpadding=2 cellspacing=0>
-        <tr><td align=center>".get_it_image($row['it_id'], $filename, $img_width , $img_height, $row['it_id'])."</td></tr>
+        <tr><td align=center>".get_it_image($row['it_id'], $img_width , $img_height, $row['it_id'])."</td></tr>
         <tr><td align=center>".it_name_icon($row)."</td></tr>";
 
     if ($row[it_cust_amount] && !$row[it_gallery])
diff --git a/shop/maintype10.inc.php b/shop/maintype10.inc.php
index ce92bc797..ef42540a6 100644
--- a/shop/maintype10.inc.php
+++ b/shop/maintype10.inc.php
@@ -11,21 +11,11 @@ for ($i=0; $row=sql_fetch_array($result); $i++) {
     }
 
     $href = "<a href='".G4_SHOP_URL."/item.php?it_id={$row['it_id']}' class=item>";
-
-    // 리스트 썸네일 이미지
-    $filepath = G4_DATA_PATH.'/item/'.$row['it_id'];
-    for($k=1; $k<=10; $k++) {
-        $idx = 'it_img'.$k;
-        if(file_exists($filepath.'/'.$row[$idx]) && is_file($filepath.'/'.$row[$idx])) {
-            $filename = $row[$idx];
-            break;
-        }
-    }
 ?>
     <td width="<?=$td_width?>%" align=center valign=top>
         <table width=98% cellpadding=1 cellspacing=0 border=0>
         <tr><td height=5></td></tr>
-        <tr><td align=center><?=$href?><?=get_it_image($row['it_id'], $filename, $img_width, $img_height)?></a></td></tr>
+        <tr><td align=center><?=$href?><?=get_it_image($row['it_id'], $img_width, $img_height)?></a></td></tr>
         <tr><td align=center><?=$href?><?=stripslashes($row['it_name'])?></a></td></tr>
         <!--시중가격<tr><td align=center><strike><?=display_amount($row[it_cust_amount])?></strike></td></tr>-->
         <tr><td align=center><span class=amount><?=display_amount(get_amount($row), $row['it_tel_inq'])?></span></td></tr>
diff --git a/shop/settle_kcp.inc.php b/shop/settle_kcp.inc.php
index f96e944bb..d6b9d5d80 100644
--- a/shop/settle_kcp.inc.php
+++ b/shop/settle_kcp.inc.php
@@ -3,11 +3,6 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
 
 $test = "";
 
-<<<<<<< HEAD
-$default['de_card_test'] = 1;
-$default['de_escrow_use'] = 1;
-=======
->>>>>>> a811b2f9cff6268823ba4ef76b9e57769cf04bc6
 if ($default['de_card_test']) {
     if ($default['de_escrow_use'] == 1) {
         // 에스크로결제 테스트
diff --git a/shop/settle_kcp_common.php b/shop/settle_kcp_common.php
index e9cabc590..358800857 100644
--- a/shop/settle_kcp_common.php
+++ b/shop/settle_kcp_common.php
@@ -16,25 +16,25 @@ fclose($fp);
        REMOTE ADDRESS 체크를 하여, 아래의 IP 이외의 다른 경로를 통해서 전송된
        데이터에 대해서는 결과처리를 하지 마시기 바랍니다.
 ------------------------------------------------------------------------------*/
-/*
-switch ($_SERVER['REMOTE_ADDR']) {
-    case '203.238.36.58' :
-    case '203.238.36.160' :
-    case '203.238.36.161' :
-    case '203.238.36.173' :
-    case '203.238.36.178' :
-        break;
-    default :
-        $super_admin = get_admin('super');
-        $egpcs_str = "ENV[" . serialize($_ENV) . "] "
-                   . "GET[" . serialize($_GET) . "]"
-                   . "POST[" . serialize($_POST) . "]"
-                   . "COOKIE[" . serialize($_COOKIE) . "]"
-                   . "SESSION[" . serialize($_SESSION) . "]";
-        mailer('경고', 'waring', $super_admin['mb_email'], '올바르지 않은 접속 보고', $_SERVER['PHP_SELF'].' 에 '.$_SERVER['REMOTE_ADDR'].' 이 '.$g4['time_ymdhis'].' 에 접속을 시도하였습니다.'."\n\n" . $egpcs_str, 2);
-        exit;
+if(!$default['de_card_test']) {
+    switch ($_SERVER['REMOTE_ADDR']) {
+        case '203.238.36.58' :
+        case '203.238.36.160' :
+        case '203.238.36.161' :
+        case '203.238.36.173' :
+        case '203.238.36.178' :
+            break;
+        default :
+            $super_admin = get_admin('super');
+            $egpcs_str = "ENV[" . serialize($_ENV) . "] "
+                       . "GET[" . serialize($_GET) . "]"
+                       . "POST[" . serialize($_POST) . "]"
+                       . "COOKIE[" . serialize($_COOKIE) . "]"
+                       . "SESSION[" . serialize($_SESSION) . "]";
+            mailer('경고', 'waring', $super_admin['mb_email'], '올바르지 않은 접속 보고', $_SERVER['PHP_SELF'].' 에 '.$_SERVER['REMOTE_ADDR'].' 이 '.$g4['time_ymdhis'].' 에 접속을 시도하였습니다.'."\n\n" . $egpcs_str, 2);
+            exit;
+    }
 }
-*/
 
     /* ============================================================================== */
     /* =   PAGE : 공통 통보 PAGE                                                    = */