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-11-22 15:44:26 +09:00
parent b3292e57d2 5db2bef37c
commit de520319d3
20 changed files with 140 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
shop/itemqaform.php
View File

@ -42,6 +42,16 @@ if ($w == "u")
include_once(G5_PATH.'/head.sub.php');
$is_dhtml_editor = false;
// 모바일에서는 DHTML 에디터 사용불가
if ($config['cf_editor'] && !G5_IS_MOBILE) {
$is_dhtml_editor = true;
}
$editor_html = editor_html('iq_question', $qa['iq_question'], $is_dhtml_editor);
$editor_js = '';
$editor_js .= get_editor_js('iq_question', $is_dhtml_editor);
$editor_js .= chk_editor_js('iq_question', $is_dhtml_editor);
$itemqaform_skin = G5_SHOP_SKIN_PATH.'/itemqaform.skin.php';
if(!file_exists($itemqaform_skin)) {

5
shop/itemqaformupdate.php
View File

@ -19,7 +19,10 @@ if ($w == "" || $w == "u") {
if (!$iq_question) alert("질문을 입력하여 주십시오.");
}
$url = "./item.php?it_id=$it_id&_=".get_token()."#sit_qa";
if($is_mobile_shop)
$url = './iteminfo.php?it_id='.$it_id.'&info=qa';
else
$url = "./item.php?it_id=$it_id&_=".get_token()."#sit_qa";
if ($w == "")
{

12
shop/itemuseform.php
View File

@ -20,7 +20,7 @@ $is_id = escape_trim($_REQUEST['is_id']);
check_itemuse_write();
if ($w == "") {
$is_score = 10;
$is_score = 5;
} else if ($w == "u") {
$use = sql_fetch(" select * from {$g5['g5_shop_item_use_table']} where is_id = '$is_id' ");
if (!$use) {
@ -37,6 +37,16 @@ if ($w == "") {
include_once(G5_PATH.'/head.sub.php');
$is_dhtml_editor = false;
// 모바일에서는 DHTML 에디터 사용불가
if ($config['cf_editor'] && !G5_IS_MOBILE) {
$is_dhtml_editor = true;
}
$editor_html = editor_html('is_content', $use['is_content'], $is_dhtml_editor);
$editor_js = '';
$editor_js .= get_editor_js('is_content', $is_dhtml_editor);
$editor_js .= chk_editor_js('is_content', $is_dhtml_editor);
$itemuseform_skin = G5_SHOP_SKIN_PATH.'/itemuseform.skin.php';
if(!file_exists($itemuseform_skin)) {

5
shop/itemuseformupdate.php
View File

@ -23,7 +23,10 @@ if ($w == "" || $w == "u") {
if (!$is_content) alert("내용을 입력하여 주십시오.");
}
$url = "./item.php?it_id=$it_id&_=".get_token()."#sit_use";
if($is_mobile_shop)
$url = './iteminfo.php?it_id='.$it_id.'&info=use';
else
$url = "./item.php?it_id=$it_id&_=".get_token()."#sit_use";
if ($w == "")
{

18
shop/personalpayformupdate.php
View File

@ -133,6 +133,24 @@ if($pp_receipt_price > 0 && $pp['pp_id'] && $pp['od_id']) {
die("<p>$sql<p>" . mysql_errno() . " : " . mysql_error() . "<p>error file : {$_SERVER['PHP_SELF']}");
}
// 미수금 정보 업데이트
$info = get_order_info($pp['od_id']);
$sql = " update {$g5['g5_shop_order_table']}
set od_misu = '{$info['od_misu']}' ";
if($info['od_misu'] == 0)
$sql .= " , od_status = '입금' ";
$sql .= " where od_id = '{$pp['od_id']}' ";
sql_query($sql, FALSE);
// 장바구니 상태변경
if($info['od_misu'] == 0) {
$sql = " update {$g5['g5_shop_cart_table']}
set ct_status = '입금'
where od_id = '{$pp['od_id']}' ";
sql_query($sql, FALSE);
}
}
// 개인결제번호제거