diff --git a/extend/shop.extend2.php b/extend/shop.extend2.php index e3a7e5f65..6ed24f7db 100644 --- a/extend/shop.extend2.php +++ b/extend/shop.extend2.php @@ -2,6 +2,8 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가 if (!defined('G4_USE_SHOP') || !G4_USE_SHOP) return; + +/* // uniqid 테이블이 없을 경우 생성 if(!sql_query(" select uq_id from {$g4['uniqid_table']} limit 1 ", false)) { sql_query(" CREATE TABLE IF NOT EXISTS `{$g4['uniqid_table']}` ( @@ -355,4 +357,5 @@ if(!$result) { ADD `od_tno` VARCHAR(255) NOT NULL DEFAULT '' AFTER `od_settle_case`, ADD `od_escrow` TINYINT(4) NOT NULL DEFAULT '0' AFTER `od_tno` ", true); } +*/ ?> \ No newline at end of file diff --git a/install/install_db.php b/install/install_db.php index 840050a97..4791a1807 100644 --- a/install/install_db.php +++ b/install/install_db.php @@ -485,7 +485,7 @@ if($shop_install) { fwrite($f, "\$g4['shop_faq_master_table'] = SHOP_TABLE_PREFIX.'faq_master'; // 자주하시는 질문 마스터 테이블\n"); fwrite($f, "\$g4['shop_item_table'] = SHOP_TABLE_PREFIX.'item'; // 상품 테이블\n"); fwrite($f, "\$g4['shop_item_option_table'] = SHOP_TABLE_PREFIX.'item_option'; // 상품옵션 테이블\n"); - fwrite($f, "\$g4['shop_item_us_table'] = SHOP_TABLE_PREFIX.'item_use'; // 상품 사용후기 테이블\n"); + fwrite($f, "\$g4['shop_item_use_table'] = SHOP_TABLE_PREFIX.'item_use'; // 상품 사용후기 테이블\n"); fwrite($f, "\$g4['shop_item_qa_table'] = SHOP_TABLE_PREFIX.'item_qa'; // 상품 질문답변 테이블\n"); fwrite($f, "\$g4['shop_item_relation_table'] = SHOP_TABLE_PREFIX.'item_relation'; // 관련 상품 테이블\n"); fwrite($f, "\$g4['shop_new_win_table'] = SHOP_TABLE_PREFIX.'new_win'; // 새창 테이블\n"); diff --git a/lib/shop.lib.php b/lib/shop.lib.php index 6db357cb0..8645314b7 100644 --- a/lib/shop.lib.php +++ b/lib/shop.lib.php @@ -63,8 +63,7 @@ function get_it_image($it_id, $width, $height=0, $anchor=false, $img_id='') if(!$it_id || !$width) return ''; - $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['shop_item_table']} where it_id = '$it_id' "; + $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['shop_item_table']} where it_id = '$it_id' "; $row = sql_fetch($sql); if(!$row['it_id']) diff --git a/shop/boxbanner.inc.php b/shop/boxbanner.inc.php index 5ffee30c6..05bf797ec 100644 --- a/shop/boxbanner.inc.php +++ b/shop/boxbanner.inc.php @@ -1,9 +1,6 @@ diff --git a/shop/boxcart.inc.php b/shop/boxcart.inc.php index 99247d6d2..45f4d7fc7 100644 --- a/shop/boxcart.inc.php +++ b/shop/boxcart.inc.php @@ -5,10 +5,7 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가 " class="gnb_1da">'.stripslashes($it['it_head_html']).''; // 이전 상품보기 -$sql = " select it_id, it_name from {$g4['shop_item_table']} - where it_id > '$it_id' - and SUBSTRING(ca_id,1,4) = '".substr($it['ca_id'],0,4)."' - and it_use = '1' - order by it_id asc - limit 1 "; +$sql = " select it_id, it_name from {$g4['shop_item_table']} where it_id > '$it_id' and SUBSTRING(ca_id,1,4) = '".substr($it['ca_id'],0,4)."' and it_use = '1' order by it_id asc limit 1 "; $row = sql_fetch($sql); if ($row['it_id']) { $prev_title = '이전상품 '.$row['it_name'].''; @@ -127,12 +114,7 @@ if ($row['it_id']) { } // 다음 상품보기 -$sql = " select it_id, it_name from {$g4['shop_item_table']} - where it_id < '$it_id' - and SUBSTRING(ca_id,1,4) = '".substr($it['ca_id'],0,4)."' - and it_use = '1' - order by it_id desc - limit 1 "; +$sql = " select it_id, it_name from {$g4['shop_item_table']} where it_id < '$it_id' and SUBSTRING(ca_id,1,4) = '".substr($it['ca_id'],0,4)."' and it_use = '1' order by it_id desc limit 1 "; $row = sql_fetch($sql); if ($row['it_id']) { $next_title = '다음 상품 '.$row['it_name'].''; @@ -155,10 +137,7 @@ $row = sql_fetch($sql); $item_qa_count = $row['cnt']; // 관련상품의 갯수를 얻음 -$sql = " select count(*) as cnt - from {$g4['shop_item_relation_table']} a - left join {$g4['shop_item_table']} b on (a.it_id2=b.it_id and b.it_use='1') - where a.it_id = '{$it['it_id']}' "; +$sql = " select count(*) as cnt from {$g4['shop_item_relation_table']} a left join {$g4['shop_item_table']} b on (a.it_id2=b.it_id and b.it_use='1') where a.it_id = '{$it['it_id']}' "; $row = sql_fetch($sql); $item_relation_count = $row['cnt']; ?> @@ -631,11 +610,7 @@ else $img_width = 230; $img_height = 230; - $sql = " select b.* - from {$g4['shop_item_relation_table']} a - left join {$g4['shop_item_table']} b on (a.it_id2=b.it_id) - where a.it_id = '{$it['it_id']}' - and b.it_use='1' "; + $sql = " select b.* from {$g4['shop_item_relation_table']} a left join {$g4['shop_item_table']} b on (a.it_id2=b.it_id) where a.it_id = '{$it['it_id']}' and b.it_use='1' "; $result = sql_query($sql); $num = @mysql_num_rows($result); if ($num) diff --git a/shop/itemqa.php b/shop/itemqa.php index 71bc57670..cc48326b9 100644 --- a/shop/itemqa.php +++ b/shop/itemqa.php @@ -2,7 +2,7 @@ include_once('./_common.php'); include_once(G4_LIB_PATH.'/thumbnail.lib.php'); -$it_id = $_REQUEST['it_id']; +//$it_id = $_REQUEST['it_id']; $itemqa_list = "./itemqalist.php"; $itemqa_form = "./itemqaform.php?it_id=".$it_id; diff --git a/shop/itemuse.php b/shop/itemuse.php index 92836dbe1..d72e2e9c8 100644 --- a/shop/itemuse.php +++ b/shop/itemuse.php @@ -2,7 +2,7 @@ include_once('./_common.php'); include_once(G4_LIB_PATH.'/thumbnail.lib.php'); -$it_id = $_REQUEST['it_id']; +//$it_id = $_REQUEST['it_id']; $itemuse_list = "./itemuselist.php"; $itemuse_form = "./itemuseform.php?it_id=".$it_id; diff --git a/shop/listcategory.inc.php b/shop/listcategory.inc.php index 990f59d5e..1d9fff092 100644 --- a/shop/listcategory.inc.php +++ b/shop/listcategory.inc.php @@ -6,11 +6,7 @@ $ca_id_len = strlen($ca_id); $len2 = $ca_id_len + 2; $len4 = $ca_id_len + 4; -$sql = " select ca_id, ca_name from {$g4['shop_category_table']} - where ca_id like '$ca_id%' - and length(ca_id) = $len2 - and ca_use = '1' - order by ca_id "; +$sql = " select ca_id, ca_name from {$g4['shop_category_table']} where ca_id like '$ca_id%' and length(ca_id) = $len2 and ca_use = '1' order by ca_id "; $result = sql_query($sql); while ($row=sql_fetch_array($result)) { diff --git a/shop/listcategory2.inc.php b/shop/listcategory2.inc.php index 46937e398..69009c8aa 100644 --- a/shop/listcategory2.inc.php +++ b/shop/listcategory2.inc.php @@ -16,17 +16,11 @@ if (!$exists) { $len4 = $tmp_ca_id_len + 4; // 차차기 분류의 건수를 얻음 - $sql = " select count(*) as cnt from {$g4['shop_category_table']} - where ca_id like '$tmp_ca_id%' - and ca_use = '1' - and length(ca_id) = $len4 "; + $sql = " select count(*) as cnt from {$g4['shop_category_table']} where ca_id like '$tmp_ca_id%' and ca_use = '1' and length(ca_id) = $len4 "; $row = sql_fetch($sql); $cnt = $row['cnt']; - $sql = " select ca_id, ca_name from {$g4['shop_category_table']} - where ca_id like '$tmp_ca_id%' - and ca_use = '1' - and length(ca_id) = $len2 order by ca_id "; + $sql = " select ca_id, ca_name from {$g4['shop_category_table']} where ca_id like '$tmp_ca_id%' and ca_use = '1' and length(ca_id) = $len2 order by ca_id "; $result = sql_query($sql); while ($row=sql_fetch_array($result)) { $sct_ct_here = ''; @@ -36,10 +30,7 @@ if (!$exists) { $str .= '
  • '; if ($cnt) { $str .= ''.$row['ca_name'].''; - $sql2 = " select ca_id, ca_name from {$g4['shop_category_table']} - where ca_id like '{$row['ca_id']}%' - and ca_use = '1' - and length(ca_id) = $len4 order by ca_id "; + $sql2 = " select ca_id, ca_name from {$g4['shop_category_table']} where ca_id like '{$row['ca_id']}%' and ca_use = '1' and length(ca_id) = $len4 order by ca_id "; $result2 = sql_query($sql2); $k=0; while ($row2=sql_fetch_array($result2)) { diff --git a/shop/listcategory3.inc.php b/shop/listcategory3.inc.php index 66ac2c89c..e7418567a 100644 --- a/shop/listcategory3.inc.php +++ b/shop/listcategory3.inc.php @@ -4,11 +4,7 @@ $exists = false; $depth2_ca_id = substr($ca_id, 0, 2); -$sql = " select ca_id, ca_name from {$g4['shop_category_table']} - where ca_id like '${depth2_ca_id}%' - and length(ca_id) = 4 - and ca_use = '1' - order by ca_id "; +$sql = " select ca_id, ca_name from {$g4['shop_category_table']} where ca_id like '${depth2_ca_id}%' and length(ca_id) = 4 and ca_use = '1' order by ca_id "; $result = sql_query($sql); while ($row=sql_fetch_array($result)) { if (preg_match("/^{$row['ca_id']}/", $ca_id)) diff --git a/shop/orderform.php b/shop/orderform.php index 77ab70312..6ec809b10 100644 --- a/shop/orderform.php +++ b/shop/orderform.php @@ -106,7 +106,7 @@ function init_pay_button() * setTimeout 에 2번째 변수 0은 딜레이 시간 0은 딜래이 없음을 의미 * - 김민수 - 20101018 - */ -setTimeout("init_pay_button();",300); +setTimeout("init_pay_button();",500);
    diff --git a/shop/orderinquiryview.php b/shop/orderinquiryview.php index 9fa841472..aa87eb92c 100644 --- a/shop/orderinquiryview.php +++ b/shop/orderinquiryview.php @@ -197,9 +197,34 @@ if(openwin != null) { $wanbul = display_price($receipt_amount); } - // 120615 : 취소된 값을 두번 빼주는 결과가 되어 코드 수정 (군포돼지님) - //$misu_amount = $tot_amount - $tot_cancel_amount - $receipt_amount - $od[od_dc_amount]; $misu_amount = $tot_amount - $receipt_amount - $od['od_dc_amount']; + + // 결제정보처리 + if($od['od_receipt_amount'] > 0) + $od_receipt_amount = display_price($od['od_receipt_amount']); + else + $od_receipt_amount = '아직 입금되지 않았거나 입금정보를 입력하지 못하였습니다.'; + + $app_no_subj = ''; + $disp_bank = true; + $disp_receipt = false; + if($od['od_settle_case'] == '신용카드') { + $sql = " select * from {$g4['shop_card_history_table']} where od_id = '{$od['od_id']}' "; + $cd = sql_fetch($sql); + + $app_no_subj = '승인번호'; + $app_no = $cd['cd_app_no']; + $disp_bank = false; + $disp_receipt = true; + } else if($od['od_settle_case'] == '휴대폰') { + $app_no_subj = '휴대폰번호'; + $app_no = $od['od_bank_account']; + $disp_bank = false; + $disp_receipt = true; + } else if($od['od_settle_case'] == '가상계좌' || $od['od_settle_case'] == '계좌이체') { + $app_no_subj = 'KCP 거래번호'; + $app_no = $od['od_tno']; + } ?>
    @@ -219,122 +244,75 @@ if(openwin != null) {
    • - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - '; ?> - - - - - - - - - - + + + 0) + { + ?> - + - + - - + + - - - - - - + - - - + + - + + + + + 0) @@ -369,15 +347,14 @@ if(openwin != null) { } // 현금영수증 발급을 사용하는 경우에만 - if ($default['de_taxsave_use']) { + if ($default['de_taxsave_use'] && $default['de_card_pg'] == 'kcp') { // 미수금이 없고 현금일 경우에만 현금영수증을 발급 할 수 있습니다. if ($misu_amount == 0 && $od['od_receipt_amount'] && ($od['od_settle_case'] == '무통장' || $od['od_settle_case'] == '계좌이체' || $od['od_settle_case'] == '가상계좌')) { - if ($default['de_card_pg'] == 'kcp') { ?>
    주문일시
    결제방식신용카드 결제
    결제금액
    승인일시
    승인번호
    영수증영수증 출력
    결제방식휴대폰 결제
    결제금액
    승인일시
    휴대폰번호
    영수증영수증 출력
    영수증영수증 출력
    결제방식
    입금액결제금액
    입금확인일시결제일시
    입금액아직 입금되지 않았거나 입금정보를 입력하지 못하였습니다.
    계좌번호
    입금자명
    KCP 거래번호입금계좌
    영수증 + + 영수증 출력 + + 영수증 출력 + + +
    현금영수증 - @@ -392,7 +369,6 @@ if(openwin != null) {