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

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