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

17
adm/shop_admin/orderform.php
View File

@ -644,6 +644,12 @@ $result = sql_query($sql);
<div class="btn_confirm01 btn_confirm">
<input type="submit" value="결제/배송내역 수정" class="btn_submit">
<?php if($od['od_misu'] > 0) { ?>
<a href="./personalpayform.php?popup=yes&amp;od_id=<?php echo $od_id; ?>" id="personalpay_add">개인결제추가</a>
<?php } ?>
<?php if($od['od_misu'] < 0 && ($od['od_receipt_price'] - $od['od_refund_price']) > 0 && ($od['od_settle_case'] == '신용카드' || $od['od_settle_case'] == '계좌이체')) { ?>
<a href="./orderpartcancel.php?od_id=<?php echo $od_id; ?>" id="orderpartcancel"><?php echo $od['od_settle_case']; ?> 부분취소</a>
<?php } ?>
<a href="./orderlist.php?<?php echo $qstr; ?>">목록</a>
</div>
</form>
@ -828,15 +834,6 @@ $result = sql_query($sql);
</form>
</section>
<div class="btn_list03 btn_list">
<?php if($od['od_misu'] > 0) { ?>
<a href="./personalpayform.php?popup=yes&amp;od_id=<?php echo $od_id; ?>" id="personalpay_add">개인결제추가</a>
<?php } ?>
<?php if($od['od_misu'] < 0 && ($od['od_receipt_price'] - $od['od_refund_price']) > 0 && $od['od_settle_case'] == '신용카드' || $od['od_settle_case'] == '계좌이체') { ?>
<a href="./orderpartcancel.php?od_id=<?php echo $od_id; ?>" id="orderpartcancel"><?php echo $od['od_settle_case']; ?> 부분취소</a>
<?php } ?>
</div>
<script>
$(function() {
// 전체 옵션선택
@ -863,7 +860,7 @@ $(function() {
// 개인결제추가
$("#personalpay_add").on("click", function() {
var href = this.href;
window.open(href, "personalpaywin", "left=100, top=100, width=700, height=650, scrollbars=yes");
window.open(href, "personalpaywin", "left=100, top=100, width=700, height=560, scrollbars=yes");
return false;
});

7
adm/shop_admin/personalpayform.php
View File

@ -57,12 +57,15 @@ $pg_anchor = '<ul class="anchor">
<input type="hidden" name="stx" value="<?php echo $stx; ?>">
<input type="hidden" name="page" value="<?php echo $page; ?>">
<input type="hidden" name="popup" value="<?php echo $popup; ?>">
<?php if($popup == 'yes') { ?>
<input type="hidden" name="pp_use" value="1">
<?php } ?>
<?php echo $wrp_tag_st; ?>
<section id="anc_spp_info">
<h2 class="h2_frm">주문 정보</h2>
<?php echo $pg_anchor; ?>
<?php if($popup != 'yes') echo $pg_anchor; ?>
<div class="local_desc02 local_desc">
<p>주문 관련 기본 정보입니다.</p>
</div>
@ -108,6 +111,7 @@ $pg_anchor = '<ul class="anchor">
<?php } ?>
</div>
<?php if($popup != 'yes') { ?>
<section id="anc_spp_pay" class="cbox">
<h2>결제 정보</h2>
<?php echo $pg_anchor; ?>
@ -179,6 +183,7 @@ $pg_anchor = '<ul class="anchor">
<a href="./personalpayformupdate.php?w=d&amp;pp_id=<?php echo $pp['pp_id']; ?>" onclick="return del_confirm();">삭제</a>
<?php } ?>
</div>
<?php } ?>
<?php echo $wrp_tag_end; ?>
</form>

3
install/gnuboard5.sql
View File

@ -327,6 +327,7 @@ CREATE TABLE IF NOT EXISTS `g5_config` (
-- Table structure for table `g5_cert_history`
--
DROP TABLE IF EXISTS `g5_cert_history`;
CREATE TABLE IF NOT EXISTS `g5_cert_history` (
`cr_id` int(11) NOT NULL auto_increment,
`mb_id` varchar(20) NOT NULL DEFAULT '',
@ -707,6 +708,7 @@ CREATE TABLE IF NOT EXISTS `g5_autosave` (
-- Table structure for table `g5_qa_config`
--
DROP TABLE IF EXISTS `g5_qa_config`;
CREATE TABLE IF NOT EXISTS `g5_qa_config` (
`qa_title` varchar(255) NOT NULL DEFAULT'',
`qa_category` varchar(255) NOT NULL DEFAULT'',
@ -745,6 +747,7 @@ CREATE TABLE IF NOT EXISTS `g5_qa_config` (
-- Table structure for table `g5_qa_content`
--
DROP TABLE IF EXISTS `g5_qa_content`;
CREATE TABLE IF NOT EXISTS `g5_qa_content` (
`qa_id` int(11) NOT NULL AUTO_INCREMENT,
`qa_num` int(11) NOT NULL DEFAULT '0',

2
install/gnuboard5shop.sql
View File

@ -162,6 +162,7 @@ CREATE TABLE IF NOT EXISTS `g5_shop_coupon` (
-- Table structure for table `g5_shop_coupon_log`
--
DROP TABLE IF EXISTS `g5_shop_coupon_log`;
CREATE TABLE IF NOT EXISTS `g5_shop_coupon_log` (
`cl_id` int(11) NOT NULL AUTO_INCREMENT,
`cp_id` varchar(255) NOT NULL DEFAULT '',
@ -663,6 +664,7 @@ CREATE TABLE IF NOT EXISTS `g5_shop_order` (
-- Table structure for table `g5_shop_order_address`
--
DROP TABLE IF EXISTS `g5_shop_order_address`;
CREATE TABLE IF NOT EXISTS `g5_shop_order_address` (
`ad_id` int(11) NOT NULL AUTO_INCREMENT,
`mb_id` varchar(255) NOT NULL DEFAULT '',

10
mobile/shop/itemqaform.php
View File

@ -36,6 +36,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_MSHOP_SKIN_PATH.'/itemqaform.skin.php';
if(!file_exists($itemqaform_skin)) {

12
mobile/shop/itemuseform.php
View File

@ -14,7 +14,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) {
@ -31,6 +31,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_MSHOP_SKIN_PATH.'/itemuseform.skin.php';
if(!file_exists($itemuseform_skin)) {

6
mobile/shop/kcp/order_approval_form.php
View File

@ -202,12 +202,6 @@
of.param_opt_2.value = "<?php echo $param_opt_2; ?>";
of.param_opt_3.value = "<?php echo $param_opt_3; ?>";
var od = window.opener.document;
od.getElementById("display_pay_button").style.display = "none";
//od.getElementById("show_req_btn").style.display = "none";
//od.getElementById("show_progress").style.display = "block";
//od.getElementById("show_pay_btn").style.display = "inline";
//alert("주문하기를 클릭하셔야 주문이 완료됩니다.");
window.opener.forderform_check();
window.close();

7
mobile/shop/kcp/personalpay_approval_form.php
View File

@ -202,13 +202,6 @@
of.param_opt_2.value = "<?php echo $param_opt_2; ?>";
of.param_opt_3.value = "<?php echo $param_opt_3; ?>";
var od = window.opener.document;
od.getElementById("display_pay_button").style.display = "none";
//od.getElementById("show_req_btn").style.display = "none";
//od.getElementById("show_progress").style.display = "block";
//od.getElementById("show_pay_btn").style.display = "inline";
//alert("주문하기를 클릭하셔야 주문이 완료됩니다.");
window.opener.fpersonalpayform_check();
window.close();
} else {

11
mobile/shop/orderform.php
View File

@ -764,13 +764,13 @@ ob_end_clean();
<input type="hidden" name="comm_free_mny" value="<?php echo $comm_free_mny; ?>"> <!-- 비과세 금액 -->
<?php } ?>
<p id="show_progress" style="display:none;">반드시 주문하기 버튼을 클릭 하셔야만 결제가 진행됩니다.</p>
<div id="display_pay_button" class="btn_confirm">
<span id="show_req_btn"><input type="button" name="submitChecked" onClick="kcp_approval();" value="결제등록요청"class="btn_submit"></span>
<span id="show_pay_btn" style="display:none;"><input type="button" onClick="forderform_check();" value="주문하기" class="btn_submit"></span>
<a href="javascript:history.go(-1);" class="btn_cancel">취소</a>
</div>
<p id="show_progress" style="display:none;">주문완료 중입니다. 잠시만 기다려 주십시오.</p>
</form>
<?php if ($default['de_escrow_use']) { ?>
@ -1325,7 +1325,12 @@ function forderform_check()
return false;
}
f.submit();
document.getElementById("display_pay_button").style.display = "none";
document.getElementById("show_progress").style.display = "block";
setTimeout(function() {
f.submit();
}, 300);
}
// 주문폼 필드체크

11
mobile/shop/personalpayform.php
View File

@ -210,13 +210,13 @@ if($default['de_escrow_use']) {
<input type="hidden" name="param_opt_2" value="">
<input type="hidden" name="param_opt_3" value="">
<p id="show_progress" style="display:none;">반드시 결제하기 버튼을 클릭 하셔야만 결제가 진행됩니다.</p>
<div id="display_pay_button" class="btn_confirm">
<span id="show_req_btn"><input type="button" name="submitChecked" onClick="kcp_approval();" value="결제등록요청"class="btn_submit"></span>
<span id="show_pay_btn" style="display:none;"><input type="button" onClick="fpersonalpayform_check();" value="결제하기" class="btn_submit"></span>
<a href="javascript:history.go(-1);" class="btn_cancel">취소</a>
</div>
<p id="show_progress" style="display:none;">결제진행 중입니다. 잠시만 기다려 주십시오.</p>
</form>
<?php if ($default['de_escrow_use']) { ?>
@ -318,7 +318,12 @@ function fpersonalpayform_check()
return false;
}
f.submit();
document.getElementById("display_pay_button").style.display = "none";
document.getElementById("show_progress").style.display = "block";
setTimeout(function() {
f.submit();
}, 300);
}
// 결제폼 필드체크

18
mobile/shop/personalpayformupdate.php
View File

@ -141,6 +141,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);
}
}
// 개인결제번호제거

7
mobile/skin/shop/basic/itemqaform.skin.php
View File

@ -12,6 +12,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
<input type="hidden" name="w" value="<?php echo $w; ?>">
<input type="hidden" name="it_id" value="<?php echo $it_id; ?>">
<input type="hidden" name="iq_id" value="<?php echo $iq_id; ?>">
<input type="hidden" name="is_mobile_shop" value="1">
<div class="tbl_frm01 tbl_wrap">
<table>
@ -41,7 +42,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
</tr>
<tr>
<th scope="row"><label for="iq_question">질문</label></th>
<td><?php echo editor_html('iq_question', $qa['iq_question']); ?></td>
<td><?php echo $editor_html; ?></td>
</tr>
</tbody>
</table>
@ -57,9 +58,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
<script type="text/javascript">
function fitemqa_submit(f)
{
<?php echo get_editor_js('iq_question'); ?>
<?php echo chk_editor_js('iq_question'); ?>
<?php echo $editor_js; ?>
return true;
}

17
mobile/skin/shop/basic/itemuseform.skin.php
View File

@ -12,6 +12,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
<input type="hidden" name="w" value="<?php echo $w; ?>">
<input type="hidden" name="it_id" value="<?php echo $it_id; ?>">
<input type="hidden" name="is_id" value="<?php echo $is_id; ?>">
<input type="hidden" name="is_mobile_shop" value="1">
<div class="tbl_frm01 tbl_wrap">
<table>
@ -26,34 +27,34 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
</tr>
<tr>
<th scope="row"><label for="" style="width:200px;">내용</label></th>
<td><?php echo editor_html('is_content', $use['is_content']); ?></td>
<td><?php echo $editor_html; ?></td>
</tr>
<tr>
<th scope="row">평가</th>
<td>
<ul id="sit_use_write_star">
<li>
<input type="radio" name="is_score" value="10" id="is_score10" <?php echo ($is_score==10)?'checked="checked"':''; ?>>
<input type="radio" name="is_score" value="5" id="is_score10" <?php echo ($is_score==5)?'checked="checked"':''; ?>>
<label for="is_score10">매우만족</label>
<img src="<?php echo G5_SHOP_URL; ?>/img/s_star5.png">
</li>
<li>
<input type="radio" name="is_score" value="8" id="is_score8" <?php echo ($is_score==8)?'checked="checked"':''; ?>>
<input type="radio" name="is_score" value="4" id="is_score8" <?php echo ($is_score==4)?'checked="checked"':''; ?>>
<label for="is_score8">만족</label>
<img src="<?php echo G5_SHOP_URL; ?>/img/s_star4.png">
</li>
<li>
<input type="radio" name="is_score" value="6" id="is_score6" <?php echo ($is_score==6)?'checked="checked"':''; ?>>
<input type="radio" name="is_score" value="3" id="is_score6" <?php echo ($is_score==3)?'checked="checked"':''; ?>>
<label for="is_score6">보통</label>
<img src="<?php echo G5_SHOP_URL; ?>/img/s_star3.png">
</li>
<li>
<input type="radio" name="is_score" value="4" id="is_score4" <?php echo ($is_score==4)?'checked="checked"':''; ?>>
<input type="radio" name="is_score" value="2" id="is_score4" <?php echo ($is_score==2)?'checked="checked"':''; ?>>
<label for="is_score4">불만</label>
<img src="<?php echo G5_SHOP_URL; ?>/img/s_star2.png">
</li>
<li>
<input type="radio" name="is_score" value="2" id="is_score2" <?php echo ($is_score==2)?'checked="checked"':''; ?>>
<input type="radio" name="is_score" value="1" id="is_score2" <?php echo ($is_score==1)?'checked="checked"':''; ?>>
<label for="is_score2">매우불만</label>
<img src="<?php echo G5_SHOP_URL; ?>/img/s_star1.png">
</li>
@ -75,9 +76,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
<script type="text/javascript">
function fitemuse_submit(f)
{
<?php echo get_editor_js('is_content'); ?>
<?php echo chk_editor_js('is_content'); ?>
<?php echo $editor_js; ?>
return true;
}

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);
}
}
// 개인결제번호제거

6
skin/shop/basic/itemqaform.skin.php
View File

@ -41,7 +41,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
</tr>
<tr>
<th scope="row"><label for="iq_question">질문</label></th>
<td><?php echo editor_html('iq_question', get_text($qa['iq_question'])); ?></td>
<td><?php echo $editor_html; ?></td>
</tr>
</tbody>
</table>
@ -57,9 +57,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
<script type="text/javascript">
function fitemqa_submit(f)
{
<?php echo get_editor_js('iq_question'); ?>
<?php echo chk_editor_js('iq_question'); ?>
<?php echo $editor_js; ?>
return true;
}

16
skin/shop/basic/itemuseform.skin.php
View File

@ -26,34 +26,34 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
</tr>
<tr>
<th scope="row"><label for="" style="width:200px;">내용</label></th>
<td><?php echo editor_html('is_content', get_text($use['is_content'])); ?></td>
<td><?php echo $editor_html; ?></td>
</tr>
<tr>
<th scope="row">평점</th>
<td>
<ul id="sit_use_write_star">
<li>
<input type="radio" name="is_score" value="5" id="is_score5" <?php echo ($is_score==10)?'checked="checked"':''; ?>>
<input type="radio" name="is_score" value="5" id="is_score5" <?php echo ($is_score==5)?'checked="checked"':''; ?>>
<label for="is_score5">매우만족</label>
<img src="<?php echo G5_URL; ?>/shop/img/s_star5.png">
</li>
<li>
<input type="radio" name="is_score" value="4" id="is_score4" <?php echo ($is_score==8)?'checked="checked"':''; ?>>
<input type="radio" name="is_score" value="4" id="is_score4" <?php echo ($is_score==4)?'checked="checked"':''; ?>>
<label for="is_score4">만족</label>
<img src="<?php echo G5_URL; ?>/shop/img/s_star4.png">
</li>
<li>
<input type="radio" name="is_score" value="3" id="is_score3" <?php echo ($is_score==6)?'checked="checked"':''; ?>>
<input type="radio" name="is_score" value="3" id="is_score3" <?php echo ($is_score==3)?'checked="checked"':''; ?>>
<label for="is_score3">보통</label>
<img src="<?php echo G5_URL; ?>/shop/img/s_star3.png">
</li>
<li>
<input type="radio" name="is_score" value="2" id="is_score2" <?php echo ($is_score==4)?'checked="checked"':''; ?>>
<input type="radio" name="is_score" value="2" id="is_score2" <?php echo ($is_score==2)?'checked="checked"':''; ?>>
<label for="is_score2">불만</label>
<img src="<?php echo G5_URL; ?>/shop/img/s_star2.png">
</li>
<li>
<input type="radio" name="is_score" value="1" id="is_score1" <?php echo ($is_score==2)?'checked="checked"':''; ?>>
<input type="radio" name="is_score" value="1" id="is_score1" <?php echo ($is_score==1)?'checked="checked"':''; ?>>
<label for="is_score1">매우불만</label>
<img src="<?php echo G5_URL; ?>/shop/img/s_star1.png">
</li>
@ -75,9 +75,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
<script type="text/javascript">
function fitemuse_submit(f)
{
<?php echo get_editor_js('is_content'); ?>
<?php echo chk_editor_js('is_content'); ?>
<?php echo $editor_js; ?>
return true;
}