firstgarden/firstgarden-web-gnu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Activity

Merge branch 'master' of github.com:gnuboard/yc4s

Browse Source
This commit is contained in:
whitedot
2013-06-24 16:52:35 +09:00
parent dba5a15ddb f87d020d68
commit bc03b3cc16
14 changed files with 104 additions and 181 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
extend/shop.extend2.php
View File

@ -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);
}
*/
?>

2
install/install_db.php
View File

@ -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");

3
lib/shop.lib.php
View File

@ -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'])

5
shop/boxbanner.inc.php
View File

@ -1,9 +1,6 @@
<?php
// 배너 출력
$sql = " select * from {$g4['shop_banner_table']}
where '".G4_TIME_YMDHIS."' between bn_begin_time and bn_end_time
and bn_position = '$position'
order by bn_order, bn_id desc ";
$sql = " select * from {$g4['shop_banner_table']} where '".G4_TIME_YMDHIS."' between bn_begin_time and bn_end_time and bn_position = '$position' order by bn_order, bn_id desc ";
$result = sql_query($sql);
?>

5
shop/boxcart.inc.php
View File

@ -5,10 +5,7 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
<table cellpadding=0 cellspacing=0 bgcolor=#FFFFFF>
<tr><td><a href='<?php echo G4_SHOP_URL; ?>/cart.php'><img src='<?php echo G4_SHOP_URL; ?>/img/bar_cart.gif' border=0></a></td></tr>
<?php
$hsql = " select a.it_id, a.it_name, a.ct_qty from {$g4['shop_cart_table']} a, {$g4['shop_item_table']} b
where a.uq_id = '".get_session('ss_uq_id')."'
and a.it_id = b.it_id
order by a.ct_id ";
$hsql = " select a.it_id, a.it_name, a.ct_qty from {$g4['shop_cart_table']} a, {$g4['shop_item_table']} b where a.uq_id = '".get_session('ss_uq_id')."' and a.it_id = b.it_id order by a.ct_id ";
$hresult = sql_query($hsql);
for ($i=0; $row=sql_fetch_array($hresult); $i++)
{

11
shop/boxcategory.inc.php
View File

@ -7,10 +7,7 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
<ul id="gnb_1dul">
<?php
// 1단계 분류 판매 가능한 것만
$hsql = " select ca_id, ca_name from {$g4['shop_category_table']}
where length(ca_id) = '2'
and ca_use = '1'
order by ca_id ";
$hsql = " select ca_id, ca_name from {$g4['shop_category_table']} where length(ca_id) = '2' and ca_use = '1' order by ca_id ";
$hresult = sql_query($hsql);
$gnb_zindex = 999; // gnb_1dli z-index 값 설정용
$count = count($hresult);
@ -22,11 +19,7 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
<a href="<?php echo G4_SHOP_URL.'/list.php?ca_id='.$row['ca_id']; ?>" class="gnb_1da"><?php echo $row['ca_name']; ?></a>
<?php
// 2단계 분류 판매 가능한 것만
$sql2 = " select ca_id, ca_name from {$g4['shop_category_table']}
where LENGTH(ca_id) = '4'
and SUBSTRING(ca_id,1,2) = '{$row['ca_id']}'
and ca_use = '1'
order by ca_id ";
$sql2 = " select ca_id, ca_name from {$g4['shop_category_table']} where LENGTH(ca_id) = '4' and SUBSTRING(ca_id,1,2) = '{$row['ca_id']}' and ca_use = '1' order by ca_id ";
$result2 = sql_query($sql2);
for ($j=0; $row2=sql_fetch_array($result2); $j++)
{

37
shop/item.php
View File

@ -17,13 +17,7 @@ $norobot_key = substr($token, 0, $rand);
set_session('ss_norobot_key', $norobot_key);
// 분류사용, 상품사용하는 상품의 정보를 얻음
$sql = " select a.*,
b.ca_name,
b.ca_use
from {$g4['shop_item_table']} a,
{$g4['shop_category_table']} b
where a.it_id = '$it_id'
and a.ca_id = b.ca_id ";
$sql = " select a.*, b.ca_name, b.ca_use from {$g4['shop_item_table']} a, {$g4['shop_category_table']} b where a.it_id = '$it_id' and a.ca_id = b.ca_id ";
$it = sql_fetch($sql);
if (!$it['it_id'])
alert('자료가 없습니다.');
@ -33,9 +27,7 @@ if (!($it['ca_use'] && $it['it_use'])) {
}
// 분류 테이블에서 분류 상단, 하단 코드를 얻음
$sql = " select ca_include_head, ca_include_tail, ca_hp_cert_use, ca_adult_cert_use
from {$g4['shop_category_table']}
where ca_id = '{$it['ca_id']}' ";
$sql = " select ca_include_head, ca_include_tail, ca_hp_cert_use, ca_adult_cert_use from {$g4['shop_category_table']} where ca_id = '{$it['ca_id']}' ";
$ca = sql_fetch($sql);
if(!$is_admin) {
@ -109,12 +101,7 @@ if (file_exists($himg))
echo '<div id="sit_hhtml">'.stripslashes($it['it_head_html']).'</div>';
// 이전 상품보기
$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 = '이전상품<span class="sound_only"> '.$row['it_name'].'</span>';
@ -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 = '다음 상품<span class="sound_only"> '.$row['it_name'].'</span>';
@ -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)

2
shop/itemqa.php
View File

@ -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;

2
shop/itemuse.php
View File

@ -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;

6
shop/listcategory.inc.php
View File

@ -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)) {

15
shop/listcategory2.inc.php
View File

@ -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 .= '<li>';
if ($cnt) {
$str .= '<a href="./list.php?ca_id='.$row['ca_id'].'" class="sct_ct_parent '.$sct_ct_here.'">'.$row['ca_name'].'</a>';
$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)) {

6
shop/listcategory3.inc.php
View File

@ -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))

2
shop/orderform.php
View File

@ -106,7 +106,7 @@ function init_pay_button()
* setTimeout 에 2번째 변수 0은 딜레이 시간 0은 딜래이 없음을 의미
* - 김민수 - 20101018 -
*/
setTimeout("init_pay_button();",300);
setTimeout("init_pay_button();",500);
</script>
<form name="forderform" method="post" action="<?php echo $order_action_url; ?>" onsubmit="return forderform_check(this);" autocomplete="off">

186
shop/orderinquiryview.php
View File

@ -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'];
}
?>
<section id="sod_fin_pay">
@ -219,122 +244,75 @@ if(openwin != null) {
<th scope="row">주문일시</th>
<td><?php echo $od['od_time']; ?></td>
</tr>
<?php
if ($od['od_settle_case'] == '신용카드')
{
$sql = " select * from {$g4['shop_card_history_table']} where od_id = '{$od['od_id']}' order by cd_id desc ";
$result = sql_query($sql);
$cd = mysql_fetch_array($result);
?>
<tr>
<th scope="row">결제방식</th>
<td>신용카드 결제</td>
</tr>
<tr>
<th scope="row">결제금액</th>
<td><?php echo display_price($cd['cd_amount']); ?></td>
</tr>
<tr>
<th scope="row">승인일시</th>
<td><?php echo $cd['cd_trade_ymd'].' '.$cd['cd_trade_hms']; ?></td>
</tr>
<tr>
<th scope="row">승인번호</th>
<td><?php echo $cd['cd_app_no']; ?></td>
</tr>
<tr>
<th scope="row">영수증</th>
<td><a href="javascript:;" onclick="window.open('http://admin.kcp.co.kr/Modules/Sale/Card/ADSA_CARD_BILL_Receipt.jsp?c_trade_no=<?php echo $od['od_tno']; ?>', 'winreceipt', 'width=620,height=800')">영수증 출력</a></td>
</tr>
<?php
}
else if ($od['od_settle_case'] == '휴대폰')
{
$sql = " select * from {$g4['shop_card_history_table']} where od_id = '{$od['od_id']}' order by cd_id desc ";
$result = sql_query($sql);
$cd = mysql_fetch_array($result);
?>
<tr>
<th scope="row">결제방식</th>
<td>휴대폰 결제</td>
</tr>
<tr>
<th scope="row">결제금액</th>
<td><?php echo display_price($cd['cd_amount']); ?></td>
</tr>
<tr>
<th scope="row">승인일시</th>
<td><?php echo $cd['cd_trade_ymd'].' '.$cd['cd_trade_hms']; ?></td>
</tr>
<tr>
<th scope="row">휴대폰번호</th>
<td><?php echo $cd['cd_opt02']; ?></td>
</tr>
<?php //echo '<tr><th scope="row">영수증</th><td><a href="javascript:;" onclick="window.open(\'http://admin.kcp.co.kr/Modules/Sale/Card/ADSA_CARD_BILL_Receipt.jsp?c_trade_no='.$od[tno].'\', \'winreceipt\', \'width=620,height=670\')">영수증 출력</a></td></tr>'; ?>
<tr>
<th scope="row">영수증</th>
<td><a href="javascript:;" onclick="window.open('https://admin.kcp.co.kr/Modules/Bill/ADSA_MCASH_N_Receipt.jsp?a_trade_no=<?php echo $od['od_tno']; ?>', 'winreceipt', 'width=500,height=690')">영수증 출력</a></td>
</tr>
<?php
}
else
{
?>
<tr>
<th scope="row">결제방식</th>
<td><?php echo $od['od_settle_case']; ?></td>
</tr>
<?php
if ($od['od_receipt_amount'])
{
?>
<tr>
<th scope="row">입금액</th>
<td><?php echo display_price($od['od_receipt_amount']); ?></td>
<th scope="row">결제금액</th>
<td><?php echo $od_receipt_amount; ?></td>
</tr>
<?php
if($od['od_receipt_amount'] > 0)
{
?>
<tr>
<th scope="row">입금확인일시</th>
<th scope="row">결제일시</th>
<td><?php echo $od['od_receipt_time']; ?></td>
</tr>
<?php
}
else
{
?>
<?php
}
// 승인번호, 휴대폰번호, KCP 거래번호
if($app_no_subj)
{
?>
<tr>
<th scope="row">입금액</th>
<td>아직 입금되지 않았거나 입금정보를 입력하지 못하였습니다.</td>
<th scope="row"><?php echo $app_no_subj; ?></th>
<td><?php echo $app_no; ?></td>
</tr>
<?php
}
if ($od['od_settle_case'] != '계좌이체') {
?>
<tr>
<th scope="row">계좌번호</th>
<td><?php echo $od['od_bank_account']; ?></td>
</tr>
<?php
}
?>
<?php
}
// 계좌정보
if($disp_bank)
{
?>
<tr>
<th scope="row">입금자명</th>
<td><?php echo $od['od_deposit_name']; ?></td>
</tr>
<?php
if ($od['od_tno']) {
?>
<tr>
<th scope="row">KCP 거래번호</th>
<td><?php echo $od['od_tno']; ?></td>
<th scope="row">입금계좌</th>
<td><?php echo $od['od_bank_account']; ?></td>
</tr>
<?
}
<?php
}
if($disp_receipt) {
?>
<tr>
<th scope="row">영수증</th>
<td>
<?php
if($od['od_settle_case'] == '휴대폰')
{
?>
<a href="javascript:;" onclick="window.open('https://admin.kcp.co.kr/Modules/Bill/ADSA_MCASH_N_Receipt.jsp?a_trade_no=<?php echo $od['od_tno']; ?>', 'winreceipt', 'width=500,height=690')">영수증 출력</a>
<?php
}
if($od['od_settle_case'] == '신용카드')
{
?>
<a href="javascript:;" onclick="window.open('http://admin.kcp.co.kr/Modules/Sale/Card/ADSA_CARD_BILL_Receipt.jsp?c_trade_no=<?php echo $od['od_tno']; ?>', 'winreceipt', 'width=620,height=800')">영수증 출력</a>
<?php
}
?>
<td>
</td>
</tr>
<?php
}
if ($od['od_receipt_point'] > 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') {
?>
<tr>
<th scope="row">현금영수증</th>
<td>
<?
<?php
if ($od['od_cash'])
{
?>
@ -392,7 +369,6 @@ if(openwin != null) {
</td>
</tr>
<?php
}
}
}
?>