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

Merge branch 'master' into orderlist

Browse Source 
Conflicts:
	adm/shop_admin/orderlist.php
This commit is contained in:
gnuboard
2013-10-24 18:07:43 +09:00
parent d04a2caa76 995d2a41b8
commit 56d0a873d4
14 changed files with 223 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
adm/shop_admin/orderlist.php
View File

@ -198,7 +198,7 @@ $listall = '<a href="'.$_SERVER['PHP_SELF'].'" class="ov_listall">전체목록</
</div>
</form>
<form name="forderlist" id="forderlist" action="./orderlistupdate.php" onsubmit="return forderlist_submit(this);" method="post">
<form name="forderlist" id="forderlist" action="./orderlistupdate.php" onsubmit="return forderlist_submit(this);" method="post" autocomplete="off">
<input type="hidden" name="search_od_status" value="<?php echo $od_status; ?>">
<div class="tbl_head02 tbl_wrap">
@ -215,7 +215,7 @@ $listall = '<a href="'.$_SERVER['PHP_SELF'].'" class="ov_listall">전체목록</
<th scope="col" id="th_odrer">주문자</th>
<th scope="col" id="th_odrertel">주문자전화</th>
<th scope="col" id="th_recvr">받는분</th>
<th scope="col" rowspan="3">주문합계</th>
<th scope="col" rowspan="3">주문합계<br>선불배송비포함</th>
<th scope="col" rowspan="3">입금합계</th>
<th scope="col" rowspan="3">주문취소</th>
<th scope="col" rowspan="3">쿠폰</th>
@ -336,7 +336,7 @@ $listall = '<a href="'.$_SERVER['PHP_SELF'].'" class="ov_listall">전체목록</
</td>
<td headers="th_delino">
<?php if ($od_status == '준비') { ?>
<input type="text" name="od_invoice[<?php echo $i; ?>]" value="<?php echo $row['od_invoice']; ?>" class="frm_input" size="12">
<input type="text" name="od_invoice[<?php echo $i; ?>]" value="<?php echo $row['od_invoice']; ?>" class="frm_input" size="10">
<?php } else if ($od_status == '배송' || $od_status == '완료') { ?>
<?php echo $row['od_invoice']; ?>
<?php } else { ?>
@ -345,7 +345,7 @@ $listall = '<a href="'.$_SERVER['PHP_SELF'].'" class="ov_listall">전체목록</
</td>
<td headers="th_delicom">
<?php if ($od_status == '준비') { ?>
<input type="text" name="od_delivery_company[<?php echo $i; ?>]" value="<?php echo $delivery_company; ?>" class="frm_input" size="12">
<input type="text" name="od_delivery_company[<?php echo $i; ?>]" value="<?php echo $delivery_company; ?>" class="frm_input" size="10">
<?php } else if ($od_status == '배송' || $od_status == '완료') { ?>
<?php echo $row['od_delivery_company']; ?>
<?php } else { ?>
@ -358,7 +358,7 @@ $listall = '<a href="'.$_SERVER['PHP_SELF'].'" class="ov_listall">전체목록</
</td>
<td headers="th_delidate">
<?php if ($od_status == '준비') { ?>
<input type="text" name="od_invoice_time[<?php echo $i; ?>]" value="<?php echo $invoice_time; ?>" class="frm_input" size="12" maxlength="19">
<input type="text" name="od_invoice_time[<?php echo $i; ?>]" value="<?php echo $invoice_time; ?>" class="frm_input" size="10" maxlength="19">
<?php } else if ($od_status == '배송' || $od_status == '완료') { ?>
<?php echo substr($row['od_invoice_time'],2,14); ?>
<?php } else { ?>
@ -397,6 +397,7 @@ $listall = '<a href="'.$_SERVER['PHP_SELF'].'" class="ov_listall">전체목록</
<div class="local_cmd01 local_cmd">
<?php if (($od_status == '' || $od_status == '완료') == false) { // 검색된 주문상태가 '전체', '완료' 가 아니라면 ?>
<<<<<<< HEAD
<label for="od_status" class="cmd_tit">주문상태 변경</label>
<select name="od_status" id="od_status">
<option value="">선택하세요</option>
@ -408,6 +409,10 @@ $listall = '<a href="'.$_SERVER['PHP_SELF'].'" class="ov_listall">전체목록</
</select>
<?php /*
=======
<strong>주문상태 변경</strong>
<?php
>>>>>>> master
$change_status = "";
if ($od_status == '주문') $change_status = "입금";
if ($od_status == '입금') $change_status = "준비";
@ -415,12 +420,19 @@ $listall = '<a href="'.$_SERVER['PHP_SELF'].'" class="ov_listall">전체목록</
if ($od_status == '배송') $change_status = "완료";
?>
<?php if ($change_status) { ?>
<<<<<<< HEAD
<label><input type="checkbox" name="od_status" value="<?php echo $change_status; ?>"> <?php echo $od_status .' -> ' . $change_status; ?></label>
<input type="submit" value="선택수정" class="btn_submit" onclick="document.pressed=this.value">
<?php if ($od_status == '주문') { ?><input type="submit" value="선택삭제" class="btn_submit" onclick="document.pressed=this.value"><?php } ?>
<?php } */ ?>
<input type="submit" value="선택수정" class="btn_submit" onclick="document.pressed=this.value">
<?php if ($od_status == '주문') { ?><input type="submit" value="선택삭제" class="btn_submit" onclick="document.pressed=this.value"><?php } ?>
=======
<label><input type="checkbox" name="od_status" value="<?php echo $change_status; ?>"> '<?php echo $od_status ?>'상태에서 '<strong><?php echo $change_status ?></strong>'상태로 변경합니다.</label>
<input type="submit" value="선택수정" class="btn_submit" onclick="document.pressed=this.value">
<?php if ($od_status == '주문') { ?> <span>주문상태에서만 삭제가 가능합니다.</span> <input type="submit" value="선택삭제" class="btn_submit" onclick="document.pressed=this.value"><?php } ?>
<?php } ?>
>>>>>>> master
<?php } ?>
</div>
@ -498,7 +510,7 @@ function forderlist_submit(f)
}
if (f.od_status.checked == false) {
alert("변경하실 주문상태를 선택하세요.");
alert("주문상태 변경에 체크하세요.");
return false;
}