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

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

Browse Source 
Conflicts:
	extend/shop.extend2.php
	shop/search.php
This commit is contained in:
gnuboard
2013-11-08 16:15:02 +09:00
parent a6e42c52c2 23fe590917
commit 1dcd9d375d
14 changed files with 186 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
adm/shop_admin/categorylist.php
View File

@ -178,7 +178,7 @@ $listall = '<a href="'.$_SERVER['PHP_SELF'].'" class="ov_listall">전체목록</
<?php echo $s_del; ?>
</td>
</tr>
<tr<?php echo ' '.$tr_bg; ?>>
<tr class="<?php echo $tr_bg; ?>">
<td class="td_possible">
<input type="checkbox" name="ca_use[<?php echo $i; ?>]" value="1" id="ca_use<?php echo $i; ?>" <?php echo ($row['ca_use'] ? "checked" : ""); ?>>
<label for="ca_use<?php echo $i; ?>">판매</label>

10
adm/shop_admin/configform.php
View File

@ -859,6 +859,16 @@ $pg_anchor = '<ul class="anchor">
<?php } ?>
</td>
</tr>
<tr>
<th scope="row"><label for="de_item_use_write">사용후기 작성</label></th>
<td>
<?php echo help("주문상태에 따른 사용후기 작성여부를 설정합니다.", 50); ?>
<select name="de_item_use_write" id="de_item_use_write">
<option value="0" <?php echo get_selected($default['de_item_use_write'], 0); ?>>주문상태와 무관하게 작성가능</option>
<option value="1" <?php echo get_selected($default['de_item_use_write'], 1); ?>>주문상태가 완료인 경우에만 작성가능</option>
</select>
</td>
</tr>
<tr>
<th scope="row"><label for="de_item_use_use">사용후기</label></th>
<td>

1
adm/shop_admin/configformupdate.php
View File

@ -139,6 +139,7 @@ $sql = " update {$g5['g5_shop_default_table']}
de_sms_use5 = '$de_sms_use5',
de_sms_hp = '$de_sms_hp',
de_item_use_use = '$de_item_use_use',
de_item_use_write = '$de_item_use_write',
de_code_dup_use = '$de_code_dup_use',
de_cart_keep_term = '$de_cart_keep_term',
de_guest_cart_use = '$de_guest_cart_use',

2
css/admin.css
View File

@ -452,7 +452,7 @@ td.td_grpset {width:160px;border-left:1px solid #e9ecee;text-align:center}
#orderitemlist .itemlist {position:absolute;top:0;left:0}
#orderitemlist {position:relative}
#orderitemlist .itemlist {z-index:2;position:absolute;top:0;left:-302px;width:958px;border:1px solid #a2a5a9;background:#f2f5f9}
#orderitemlist .itemlist {z-index:2;position:absolute;top:0;left:-41px;width:958px;border:1px solid #a2a5a9;background:#f2f5f9}
#orderitemlist td {background:#fff}
#orderitemlist #orderitemlist_close {padding:0 20px 10px;text-align:right}

4
css/mobile_shop.css
View File

@ -36,8 +36,8 @@ a:hover, a:focus, a:active {color:#000;text-decoration:underline}
#hd_sch .pop_close {position:absolute;bottom:5px;right:5px;border:0;background:transparent}
#hd_mb {margin:10px 10px 0;text-align:center}
#hd_mb li {display:inline-block;margin:0 0 0 10px}
#hd_mb a {display:block;text-decoration:none;letter-spacing:-0.1em}
#hd_mb li {display:inline-block;margin:0 0 5px 10px}
#hd_mb a {display:block;padding:5px;text-decoration:none;letter-spacing:-0.1em}
/* 중간 레이아웃 */
#container {padding:10px}

19
extend/shop.extend2.php
View File

@ -655,6 +655,7 @@ if(!sql_query(" select it_explan2 from {$g5['g5_shop_item_table']} limit 1 ", fa
ADD `it_explan2` MEDIUMTEXT NOT NULL AFTER `it_explan` ", true);
}
<<<<<<< HEAD
// 관련상품 출력과 상품검색을 위한 설정 필드 추가
if(!sql_query(" select de_rel_list_use from {$g5['g5_shop_default_table']} limit 1 ", false)) {
@ -667,5 +668,23 @@ if(!sql_query(" select de_rel_list_use from {$g5['g5_shop_default_table']} limit
ADD `de_search_img_width` INT NOT NULL AFTER `de_search_list_row`,
ADD `de_search_img_height` INT NOT NULL AFTER `de_search_img_width`
", true);
=======
// de_rel_list_use 추가
if(!sql_query(" select de_rel_list_use from {$g5['g5_shop_default_table']} ", false)) {
sql_query(" ALTER TABLE `{$g5['g5_shop_default_table']}`
ADD `de_rel_list_use` tinyint(4) NOT NULL DEFAULT '0' AFTER `de_mobile_type5_img_height`,
ADD `de_rel_list_skin` varchar(255) NOT NULL DEFAULT '' AFTER `de_rel_list_use`,
ADD `de_search_list_skin` varchar(255) NOT NULL DEFAULT '' AFTER `de_rel_img_height`,
ADD `de_search_list_mod` int(11) NOT NULL DEFAULT '0' AFTER `de_search_list_skin`,
ADD `de_search_list_row` int(11) NOT NULL DEFAULT '0' AFTER `de_search_list_mod`,
ADD `de_search_img_width` int(11) NOT NULL DEFAULT '0' AFTER `de_search_list_row`,
ADD `de_search_img_height` int(11) NOT NULL DEFAULT '0' AFTER `de_search_img_width` ", true);
}
// 사용후기 쓰기 설정 추가
if(!sql_query(" select de_item_use_write from {$g5['g5_shop_default_table']} ", false)) {
sql_query(" ALTER TABLE `{$g5['g5_shop_default_table']}`
ADD `de_item_use_write` tinyint(4) NOT NULL DEFAULT '0' AFTER `de_item_use_use` ", true);
>>>>>>> 23fe590917161cae409fb47b3b92131921dd5c97
}
?>

8
install/gnuboard5shop.sql
View File

@ -250,9 +250,16 @@ CREATE TABLE IF NOT EXISTS `g5_shop_default` (
`de_mobile_type5_list_mod` int(11) NOT NULL DEFAULT '0',
`de_mobile_type5_img_width` int(11) NOT NULL DEFAULT '0',
`de_mobile_type5_img_height` int(11) NOT NULL DEFAULT '0',
`de_rel_list_use` tinyint(4) NOT NULL DEFAULT '0',
`de_rel_list_skin` varchar(255) NOT NULL DEFAULT '0',
`de_rel_list_mod` int(11) NOT NULL DEFAULT '0',
`de_rel_img_width` int(11) NOT NULL DEFAULT '0',
`de_rel_img_height` int(11) NOT NULL DEFAULT '0',
`de_search_list_skin` varchar(255) NOT NULL DEFAULT '0',
`de_search_list_mod` int(11) NOT NULL DEFAULT '0',
`de_search_list_row` int(11) NOT NULL DEFAULT '0',
`de_search_img_width` int(11) NOT NULL DEFAULT '0',
`de_search_img_height` int(11) NOT NULL DEFAULT '0',
`de_bank_use` int(11) NOT NULL DEFAULT '0',
`de_bank_account` text NOT NULL,
`de_card_test` int(11) NOT NULL DEFAULT '0',
@ -291,6 +298,7 @@ CREATE TABLE IF NOT EXISTS `g5_shop_default` (
`de_kcp_mid` varchar(255) NOT NULL DEFAULT '',
`de_iche_use` tinyint(4) NOT NULL DEFAULT '0',
`de_item_use_use` tinyint(4) NOT NULL DEFAULT '0',
`de_item_use_write` tinyint(4) NOT NULL DEFAULT '0',
`de_code_dup_use` tinyint(4) NOT NULL DEFAULT '0',
`de_cart_keep_term` int(11) NOT NULL DEFAULT '0',
`de_guest_cart_use` tinyint(4) NOT NULL DEFAULT '0',

24
lib/shop.lib.php
View File

@ -1771,6 +1771,30 @@ function is_used_coupon($mb_id, $cp_id)
return $used;
}
// 상품후기 작성가능한지 체크
function check_itemuse_write($close=true)
{
global $g5, $default, $is_admin;
if(!$is_admin && $default['de_item_use_write'])
{
$sql = " select count(*) as cnt
from {$g5['g5_shop_cart_table']}
where it_id = '$it_id'
and mb_id = '{$member['mb_id']}'
and ct_status = '완료' ";
$row = sql_fetch($sql);
if($row['cnt'] == 0)
{
if($close)
alert_close('사용후기는 주문하신 상품의 상태가 완료인 경우에만 작성하실 수 있습니다.');
else
alert('사용후기는 주문하신 상품의 상태가 완료인 경우에만 작성하실 수 있습니다.');
}
}
}
//------------------------------------------------------------------------------
// 주문포인트를 적립한다.

3
mobile/shop/itemuseform.php
View File

@ -10,6 +10,9 @@ $w = escape_trim($_REQUEST['w']);
$it_id = escape_trim($_REQUEST['it_id']);
$is_id = escape_trim($_REQUEST['is_id']);
// 사용후기 작성 설정에 따른 체크
check_itemuse_write();
if ($w == "") {
$is_score = 10;
} else if ($w == "u") {

57
mobile/shop/orderinquiryview.php
View File

@ -29,17 +29,7 @@ include_once(G5_MSHOP_PATH.'/_head.php');
<section id="sod_fin_list">
<h2>주문하신 상품</h2>
<span class="sound_only">상품 상태 설명</span>
<dl id="sod_fin_legend">
<dt>주문</dt>
<dd>주문이 접수되었습니다.</dd>
<dt>준비</dt>
<dd>상품 준비 중입니다.</dd>
<dt>배송</dt>
<dd>상품 배송 중입니다.</dd>
<dt>완료</dt>
<dd>상품 배송이 완료되었습니다.</dd>
</dl>
<?php
$st_count1 = $st_count2 = 0;
$custom_cancel = false;
@ -124,6 +114,26 @@ include_once(G5_MSHOP_PATH.'/_head.php');
?>
</ul>
<div>
<span class="sound_only">상품 상태 설명</span>
<button type="button" id="sod_sts_explan_open">상태설명보기</button>
<div id="sod_sts_explan">
<dl id="sod_fin_legend">
<dt>주문</dt>
<dd>주문이 접수되었습니다.</dd>
<dt>입금</dt>
<dd>입금(결제)이 완료 되었습니다.</dd>
<dt>준비</dt>
<dd>상품 준비 중입니다.</dd>
<dt>배송</dt>
<dd>상품 배송 중입니다.</dd>
<dt>완료</dt>
<dd>상품 배송이 완료 되었습니다.</dd>
</dl>
<button type="button" id="sod_sts_explan_close">상태설명닫기</button>
</div>
</div>
<?php
// 총계 = 주문상품금액합계 + 배송비 - 상품할인 - 결제할인 - 배송비할인
$tot_price = $od['od_cart_price'] + $od['od_send_cost'] + $od['od_send_cost2'] - $od['od_cart_coupon'] - $od['od_coupon'] - $od['od_send_coupon'];
@ -552,6 +562,31 @@ include_once(G5_MSHOP_PATH.'/_head.php');
</div>
<script>
$(function() {
$("#sod_sts_explan_open").on("click", function() {
var $explan = $("#sod_sts_explan");
if($explan.is(":animated"))
return false;
if($explan.is(":visible")) {
$explan.slideUp(200);
$("#sod_sts_explan_open").text("상태설명보기");
} else {
$explan.slideDown(200);
$("#sod_sts_explan_open").text("상태설명닫기");
}
});
$("#sod_sts_explan_close").on("click", function() {
var $explan = $("#sod_sts_explan");
if($explan.is(":animated"))
return false;
$explan.slideUp(200);
$("#sod_sts_explan_open").text("상태설명보기");
});
});
function fcancel_check(f)
{
if(!confirm("주문을 정말 취소하시겠습니까?"))

3
shop/itemuseform.php
View File

@ -16,6 +16,9 @@ $w = escape_trim($_REQUEST['w']);
$it_id = escape_trim($_REQUEST['it_id']);
$is_id = escape_trim($_REQUEST['is_id']);
// 사용후기 작성 설정에 따른 체크
check_itemuse_write();
if ($w == "") {
$is_score = 10;
} else if ($w == "u") {

3
shop/itemuseformupdate.php
View File

@ -5,6 +5,9 @@ if (!$is_member) {
alert_close("사용후기는 회원만 작성이 가능합니다.");
}
// 사용후기 작성 설정에 따른 체크
check_itemuse_write();
$is_subject = trim($_REQUEST['is_subject']);
$is_content = trim($_REQUEST['is_content']);

59
shop/orderinquiryview.php
View File

@ -42,19 +42,7 @@ if(openwin != null) {
<section id="sod_fin_list">
<h2>주문하신 상품</h2>
<span class="sound_only">상품 상태 설명</span>
<dl id="sod_fin_legend">
<dt>주문</dt>
<dd>주문이 접수되었습니다.</dd>
<dt>입금</dt>
<dd>입금(결제)이 완료 되었습니다.</dd>
<dt>준비</dt>
<dd>상품 준비 중입니다.</dd>
<dt>배송</dt>
<dd>상품 배송 중입니다.</dd>
<dt>완료</dt>
<dd>상품 배송이 완료 되었습니다.</dd>
</dl>
<?php
$st_count1 = $st_count2 = 0;
$custom_cancel = false;
@ -139,6 +127,26 @@ if(openwin != null) {
?>
</ul>
<div>
<span class="sound_only">상품 상태 설명</span>
<button type="button" id="sod_sts_explan_open">상태설명보기</button>
<div id="sod_sts_explan">
<dl id="sod_fin_legend">
<dt>주문</dt>
<dd>주문이 접수되었습니다.</dd>
<dt>입금</dt>
<dd>입금(결제)이 완료 되었습니다.</dd>
<dt>준비</dt>
<dd>상품 준비 중입니다.</dd>
<dt>배송</dt>
<dd>상품 배송 중입니다.</dd>
<dt>완료</dt>
<dd>상품 배송이 완료 되었습니다.</dd>
</dl>
<button type="button" id="sod_sts_explan_close">상태설명닫기</button>
</div>
</div>
<?php
// 총계 = 주문상품금액합계 + 배송비 - 상품할인 - 결제할인 - 배송비할인
$tot_price = $od['od_cart_price'] + $od['od_send_cost'] + $od['od_send_cost2'] - $od['od_cart_coupon'] - $od['od_coupon'] - $od['od_send_coupon'];
@ -564,6 +572,31 @@ if(openwin != null) {
<!-- } 주문상세내역 끝 -->
<script>
$(function() {
$("#sod_sts_explan_open").on("click", function() {
var $explan = $("#sod_sts_explan");
if($explan.is(":animated"))
return false;
if($explan.is(":visible")) {
$explan.slideUp(200);
$("#sod_sts_explan_open").text("상태설명보기");
} else {
$explan.slideDown(200);
$("#sod_sts_explan_open").text("상태설명닫기");
}
});
$("#sod_sts_explan_close").on("click", function() {
var $explan = $("#sod_sts_explan");
if($explan.is(":animated"))
return false;
$explan.slideUp(200);
$("#sod_sts_explan_open").text("상태설명보기");
});
});
function fcancel_check(f)
{
if(!confirm("주문을 정말 취소하시겠습니까?"))

32
shop/search.php
View File

@ -72,28 +72,34 @@ $row = sql_fetch($sql);
$total_count = $row['cnt'];
?>
<form name="frmdetailsearch" onsubmit="return detail_search_submit(this);">
상세검색 :
<input type="checkbox" name="qname" <?php echo isset($qname)?'checked="checked"':'';?>> 상품명
<input type="checkbox" name="qexplan" <?php echo isset($qexplan)?'checked="checked"':'';?>> 상품설명
<input type="checkbox" name="qid" <?php echo isset($qid)?'checked="checked"':'';?>> 상품코드<br>
상품가격 :
<input type="text" name="qfrom" value="<?php echo $qfrom; ?>" size="10">원 부터
<input type="text" name="qto" value="<?php echo $qto; ?>" size="10">원 까지<br>
검색어 : <input type="text" name="q" value="<?php echo $q; ?>" size="40" maxlength="30">
<input type="submit" value="검색">
<p>상세검색을 선택하지 않거나, 상품가격을 입력하지 않으면 전체에서 검색합니다.</p>
</form>
<!-- 검색결과 시작 { -->
<div id="ssch">
<<<<<<< HEAD
<!-- <div id="ssch_ov">검색어 <strong><?php echo ($q ? stripslashes(get_text($q)) : '없음'); ?></strong> | 검색 결과 <strong><?php echo $total_count; ?></strong>건</div> -->
<a href="#">판매량 많은순</a>
<a href="#">선호도 높은순</a>
<a href="#">사용후기 많은순</a>
<a href="#">최근 등록순</a>
검색 결과 <strong><?php echo $total_count; ?></strong>건
=======
<div id="ssch_frm">
<form name="frmdetailsearch" onsubmit="return detail_search_submit(this);">
상세검색 :
<input type="checkbox" name="qname" <?php echo isset($qname)?'checked="checked"':'';?>> 상품명
<input type="checkbox" name="qexplan" <?php echo isset($qexplan)?'checked="checked"':'';?>> 상품설명
<input type="checkbox" name="qid" <?php echo isset($qid)?'checked="checked"':'';?>> 상품코드<br>
상품가격 :
<input type="text" name="qfrom" value="<?php echo $qfrom; ?>" size="10">원 부터
<input type="text" name="qto" value="<?php echo $qto; ?>" size="10">원 까지<br>
검색어 : <input type="text" name="q" value="<?php echo $q; ?>" size="40" maxlength="30">
<input type="submit" value="검색">
<p>상세검색을 선택하지 않거나, 상품가격을 입력하지 않으면 전체에서 검색합니다.</p>
</form>
</div>
<div id="ssch_ov">검색어 <strong><?php echo ($q ? stripslashes(get_text($q)) : '없음'); ?></strong> | 검색 결과 <strong><?php echo $total_count; ?></strong>건</div>
>>>>>>> 23fe590917161cae409fb47b3b92131921dd5c97
<div>
<?php