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

This commit is contained in:
chicpro
2013-11-07 10:13:15 +09:00
4 changed files with 13 additions and 9 deletions

View File

@ -192,13 +192,13 @@ $listall = '<a href="'.$_SERVER['PHP_SELF'].'" class="ov_listall">전체목록</
<!-- <a href="./itemformupdate.php?w=d&amp;it_id=<?php echo $row['it_id']; ?>&amp;ca_id=<?php echo $row['ca_id']; ?>&amp;<?php echo $qstr; ?>" onclick="return delete_confirm();"><span class="sound_only"><?php echo htmlspecialchars2(cut_str($row['it_name'],250, "")); ?> </span>삭제</a> -->
</td>
</tr>
<tr>
<tr<?php echo ' '.$tr_bg; ?>>
<td rowspan="2" class="td_img"><a href="<?php echo $href; ?>"><?php echo get_it_image($row['it_id'], 50, 50); ?></a></td>
<td headers="" class="td_input"><input type="text" name="it_name[<?php echo $i; ?>]" value="<?php echo htmlspecialchars2(cut_str($row['it_name'],250, "")); ?>" required class="frm_input required" size="30"></td>
<td headers="th_amt" class="td_numbig td_input"><input type="text" name="it_price[<?php echo $i; ?>]" value="<?php echo $row['it_price']; ?>" class="frm_input sit_amt" size="7"></td>
<td headers="th_camt" class="td_numbig td_input"><input type="text" name="it_cust_price[<?php echo $i; ?>]" value="<?php echo $row['it_cust_price']; ?>" class="frm_input sit_camt" size="7"></td>
</tr>
<tr>
<tr<?php echo ' '.$tr_bg; ?>>
<td headers="" class="td_input"><input type="text" name="it_mobile_name[<?php echo $i; ?>]" value="<?php echo htmlspecialchars2(cut_str($row['it_mobile_name'],250, "")); ?>" class="frm_input" size="30"></td>
<td headers="th_pt" class="td_numbig td_input"><input type="text" name="it_point[<?php echo $i; ?>]" value="<?php echo $row['it_point']; ?>" class="frm_input sit_pt" size="7"></td>
<td headers="th_qty" class="td_numbig td_input"><input type="text" name="it_stock_qty[<?php echo $i; ?>]" value="<?php echo $row['it_stock_qty']; ?>" class="frm_input sit_qty" size="7"></td>

View File

@ -163,7 +163,7 @@ $result = sql_query($sql);
<label for="ct_qty_<?php echo $chk_cnt; ?>" class="sound_only"><?php echo $opt['ct_option']; ?> 수량</label>
<input type="text" name="ct_qty[<?php echo $chk_cnt; ?>]" id="ct_qty_<?php echo $chk_cnt; ?>" value="<?php echo $opt['ct_qty']; ?>" required class="frm_input required" size="5">
</td>
<td class="td_numsmall"><?php echo number_format($opt_price); ?></td>
<td class="td_num"><?php echo number_format($opt_price); ?></td>
<td class="td_num"><?php echo number_format($ct_price['stotal']); ?></td>
<td class="td_num"><?php echo number_format($opt['cp_price']); ?></td>
<td class="td_num"><?php echo number_format($ct_point['stotal']); ?></td>
@ -196,6 +196,9 @@ $result = sql_query($sql);
<input type="submit" name="ct_status" value="반품" onclick="document.pressed=this.value">
<input type="submit" name="ct_status" value="품절" onclick="document.pressed=this.value">
</p>
</div>
<div class="local_desc01 local_desc">
<p>주문, 입금, 준비, 배송, 완료는 장바구니와 주문서 상태를 모두 변경하지만, 취소, 반품, 품절은 장바구니의 상태만 변경하며, 주문서 상태는 변경하지 않습니다.</p>
<p>개별적인(이곳에서의) 상태 변경은 모든 작업을 수동으로 처리합니다. 예를 들어 주문에서 입금으로 상태 변경시 입금액(결제금액)을 포함한 모든 정보는 수동 입력으로 처리하셔야 합니다.</p>
</div>
@ -298,7 +301,7 @@ $result = sql_query($sql);
<table>
<caption>결제상세정보</caption>
<colgroup>
<col class="grid_4">
<col class="grid_3">
<col>
</colgroup>
<tbody>
@ -480,7 +483,7 @@ $result = sql_query($sql);
<table>
<caption>결제상세정보 수정</caption>
<colgroup>
<col class="grid_4">
<col class="grid_3">
<col>
</colgroup>
<tbody>

View File

@ -342,7 +342,7 @@ $listall = '<a href="'.$_SERVER['PHP_SELF'].'" class="ov_listall">전체목록</
<input type="hidden" name="current_settle_case[<?php echo $i ?>]" value="<?php echo $row['od_settle_case'] ?>">
<?php echo $s_receipt_way; ?>
</td>
<td headers="th_delino">
<td headers="th_delino" class="td_delino">
<?php if ($od_status == '준비') { ?>
<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 == '완료') { ?>

View File

@ -120,12 +120,12 @@ h3 {margin:0 20px}
/* 공통박스 */
.compare_wrap {margin:0 20px 10px;zoom:1}
.compare_wrap:after {display:block;visibility:hidden;clear:both;content:""}
.compare_wrap section {margin:10px 0;padding-top:10px}
.compare_wrap section {margin:10px 0;padding:2%;background:#f2f5f9}
.compare_wrap h3 {margin:10px 0 20px;text-align:center}
.compare_wrap .tbl_frm {margin:0}
.compare_wrap .btn_confirm {padding:10px 0 0}
.compare_left {float:left;width:49%}
.compare_right {float:right;width:49%}
.compare_left {float:left;width:45%}
.compare_right {float:right;width:45%}
/* 버튼 */
.btn_confirm {margin:0 20px 10px}
@ -345,6 +345,7 @@ table .tr_bg1 td {border-color:#e4f1c6}
.td_date {width:70px;text-align:center}
.td_datetime {width:130px;text-align:center}
.td_delicom {width:100px}
.td_delino {width:130px}
.td_etc {width:80px;text-align:center}
.td_extra label {display:inline-block;width:100px}
.td_extra input {margin-right:5px;width:130px}