From 64bbdc7e3f2bce27ffe21d44a89d4fe3d6aa5a2c Mon Sep 17 00:00:00 2001 From: chicpro Date: Thu, 31 Jan 2013 11:36:13 +0900 Subject: [PATCH 1/9] =?UTF-8?q?get=5Fit=5Fimage=20=ED=95=A8=EC=88=98=20?= =?UTF-8?q?=EC=88=98=EC=A0=95=EC=97=90=20=EB=94=B0=EB=A5=B8=20=EC=BD=94?= =?UTF-8?q?=EB=93=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adm/shop_admin/itemlist.php | 12 +--------- adm/shop_admin/orderlist2.php | 16 +++++++------ adm/shop_admin/orderstatuslist.php | 30 +++++++++--------------- lib/shop.lib.php | 37 +++++++++++++++++++++--------- shop/boxtodayview.inc.php | 2 +- shop/item.php | 6 ++--- shop/largeimage.php | 7 ++++-- shop/list.skin.10.php | 12 +--------- shop/maintype10.inc.php | 12 +--------- 9 files changed, 58 insertions(+), 76 deletions(-) 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 " $row[it_id] - ".get_it_image($row['it_id'], $filename, 50, 50)." + ".get_it_image($row['it_id'], 50, 50)." $tmp_ca_list
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 @@ "; $list = $i%2; + echo " @@ -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++) 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 @@ - + - + diff --git a/lib/shop.lib.php b/lib/shop.lib.php index 2493d66d3..852f84b89 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 = ""; + + if ($id) { $str = "$str"; } 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("/\".cut_str($it_name,10,"")."\";\n"; diff --git a/shop/item.php b/shop/item.php index 41baf541a..14d99f8a6 100644 --- a/shop/item.php +++ b/shop/item.php @@ -188,7 +188,7 @@ else
$row[od_id] - +
".get_it_image("{$row2[it_id]}_s", 50, 50)."".get_it_image($row2[it_id], 50, 50)." $it_name
$row[od_id] ".cut_str($row[od_name],10,"")." $row[mb_id]".get_it_image("{$row[it_id]}_s", 50, 50)."".get_it_image($row['it_id'], 50, 50)." $it_name".number_format($row[ct_amount])." ".number_format($row[it_amount] + $row[ct_amount])."  $row[ct_qty] ".number_format($row[ct_sub_amount])."  ".number_format($row[ct_sub_point])." 
+
-
@@ -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 "  "; + echo ""; + echo " "; } } ?> 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'); "; + echo " "; + } } ?>   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 "\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 "
- + "; 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 = ""; - - // 리스트 썸네일 이미지 - $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; - } - } ?>
".get_it_image($row['it_id'], $filename, $img_width , $img_height, $row['it_id'])."
".get_it_image($row['it_id'], $img_width , $img_height, $row['it_id'])."
".it_name_icon($row)."
- + From a292d1ec825d6781c5fc4b8ba3236e4c45e50842 Mon Sep 17 00:00:00 2001 From: chicpro Date: Thu, 31 Jan 2013 11:39:48 +0900 Subject: [PATCH 2/9] =?UTF-8?q?=ED=85=8C=EC=8A=A4=ED=8A=B8=EB=A5=BC=20?= =?UTF-8?q?=EC=9C=84=ED=95=B4=20=EC=B6=94=EA=B0=80=ED=96=88=EB=8D=98=20?= =?UTF-8?q?=EC=BD=94=EB=93=9C=20=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- shop/settle_kcp.inc.php | 5 ----- shop/settle_kcp_common.php | 36 ++++++++++++++++++------------------ 2 files changed, 18 insertions(+), 23 deletions(-) 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 = */ From 5d61c3396bef2676755cb3eae1a2714ca3b22b37 Mon Sep 17 00:00:00 2001 From: chicpro Date: Thu, 31 Jan 2013 12:10:16 +0900 Subject: [PATCH 3/9] =?UTF-8?q?=ED=8E=98=EC=9D=B4=EC=A7=80=20=EC=A0=91?= =?UTF-8?q?=EC=86=8D=20=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adm/shop_admin/deliverylist.php | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) 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 " - - + + @@ -162,17 +162,17 @@ for ($i=0; $row=mysql_fetch_array($result); $i++) - + - - - + + + "; From bbfe77635e1911156be5ba134d80ea934fb69f2b Mon Sep 17 00:00:00 2001 From: chicpro Date: Thu, 31 Jan 2013 12:12:04 +0900 Subject: [PATCH 4/9] =?UTF-8?q?=EC=83=81=ED=92=88=EC=9D=B4=EB=AF=B8?= =?UTF-8?q?=EC=A7=80=20=EC=8D=B8=EB=84=A4=EC=9D=BC=20=EC=BD=94=EB=93=9C=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adm/shop_admin/orderform.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/adm/shop_admin/orderform.php b/adm/shop_admin/orderform.php index 558f8b86e..faec15c70 100644 --- a/adm/shop_admin/orderform.php +++ b/adm/shop_admin/orderform.php @@ -1,6 +1,7 @@ Date: Thu, 31 Jan 2013 13:30:25 +0900 Subject: [PATCH 5/9] =?UTF-8?q?=EC=83=81=ED=92=88=EC=9D=B4=EB=AF=B8?= =?UTF-8?q?=EC=A7=80=20=EC=8D=B8=EB=84=A4=EC=9D=BC=20=EC=83=9D=EC=84=B1=20?= =?UTF-8?q?=EC=BD=94=EB=93=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- shop/cartsub.inc.php | 27 ++++----------------------- 1 file changed, 4 insertions(+), 23 deletions(-) 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 @@ "; $a2 = ""; - $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 . '
'; From 3a8f164ba9a6d771664e6978ee3b874a9a936b67 Mon Sep 17 00:00:00 2001 From: chicpro Date: Thu, 31 Jan 2013 14:12:55 +0900 Subject: [PATCH 6/9] =?UTF-8?q?chr()=20=ED=95=A8=EC=88=98=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- js/common.js | 6 ++++++ 1 file changed, 6 insertions(+) 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"); } From 50bcabee55c98ae9ae3d4d4eb9e10cf3d10133d5 Mon Sep 17 00:00:00 2001 From: chicpro Date: Thu, 31 Jan 2013 14:13:18 +0900 Subject: [PATCH 7/9] =?UTF-8?q?jquery=20=EC=8A=A4=ED=81=AC=EB=A6=BD?= =?UTF-8?q?=ED=8A=B8=20=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adm/shop_admin/itemform.php | 24 +++++++++--------- adm/shop_admin/iteminfo.php | 6 ++--- adm/shop_admin/optiondata.php | 42 +++++++++++++++---------------- adm/shop_admin/optionform.php | 34 ++++++++++++------------- adm/shop_admin/orderform.php | 4 +-- adm/shop_admin/supplementdata.php | 42 +++++++++++++++---------------- adm/shop_admin/supplementform.php | 4 +-- 7 files changed, 78 insertions(+), 78 deletions(-) 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; $(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=&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=&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 "\n"; echo "\n"; echo " @@ -771,7 +771,7 @@ if ($od['od_receipt_point'] > 0) 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) { ?>
$row[od_id] $row[od_name]".display_amount($row[receiptamount])."  ".display_amount($row[misu])."  $hope_date - $row[it_hit]
$el_title"; - echo ""; - echo ""; + echo ""; + echo ""; if ($el_example != "") { echo "

$el_example

"; } @@ -87,7 +87,7 @@ if ($article) { \ No newline at end of file diff --git a/adm/shop_admin/orderform.php b/adm/shop_admin/orderform.php index faec15c70..eba784f21 100644 --- a/adm/shop_admin/orderform.php +++ b/adm/shop_admin/orderform.php @@ -730,7 +730,7 @@ if ($od['od_receipt_point'] > 0) 		'> - '> -  
+  
'>
'>
'> - '> -  
+  
'>
'>
- - - + + + - + @@ -61,7 +61,7 @@ if($option_count) { $str .= ''; $sp_id = $list[$i]['sp_id']; - $str .= ''; + $str .= ''; if(trim($opt[0]) && trim($opt[1])) { $str .= ''; @@ -76,10 +76,10 @@ if($option_count) { $sp_use0 = ' selected="selected"'; } - $str .= ''; - $str .= ''; - $str .= ''; - $str .= ''; + $str .= ''; + $str .= ''; + $str .= ''; } } 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 .= ''; + $str .= ''; $str .= ''; $str .= ''; - $str .= ''; - $str .= ''; - $str .= ''; - $str .= ''; + $str .= ''; + $str .= ''; + $str .= ''; } } @@ -119,7 +119,7 @@ echo $str; \ No newline at end of file From 875b64203d5861d116857e37c1d7b217478072e9 Mon Sep 17 00:00:00 2001 From: chicpro Date: Thu, 31 Jan 2013 14:33:10 +0900 Subject: [PATCH 8/9] =?UTF-8?q?=EC=98=B5=EC=85=98=20=EA=B5=AC=EB=B6=84?= =?UTF-8?q?=EC=9E=90=20=EB=B3=80=EA=B2=BD=EC=95=88=EB=90=9C=20=EB=B6=80?= =?UTF-8?q?=EB=B6=84=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/shop.lib.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/shop.lib.php b/lib/shop.lib.php index 852f84b89..c79066e3d 100644 --- a/lib/shop.lib.php +++ b/lib/shop.lib.php @@ -625,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]); @@ -652,7 +652,7 @@ function get_supplement_option($it_id, $sp_id, $index) $str = '"; optioncontent += ""; optioncontent += ""; - optioncontent += "" + data.qty + ""; + optioncontent += "" + data.qty + ""; optioncontent += "" + option + ""; optioncontent += " (+" + number_format(String(data.amount)) + "원)"; optioncontent += " ";
- 추가금액    재고수량    통보수량 -    사용여부    재고수량    통보수량 +    사용여부
추가옵션명 추가옵션항목 추가금액
' . $opt[0] . ''; + $str .= ''; $str .= '
' . $sp_subj . '' . $sp_opt[$k] . ''; + $str .= ''; $str .= '