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
This commit is contained in:
chicpro
2013-11-21 15:07:21 +09:00
parent 9f9f581f11 ef2a22d946
commit b827fe0890
7 changed files with 23 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
adm/shop_admin/img/escrow_bg.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 120 B

BIN
adm/shop_admin/img/escrow_bg2.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 120 B

2
adm/shop_admin/itemstocklist.php
View File

@ -156,7 +156,7 @@ $listall = '<a href="'.$_SERVER['PHP_SELF'].'" class="ov_listall">전체목록</
?>
<tr class="<?php echo $tr_bg; ?>">
<td class="td_num">
<td class="td_numbig">
<input type="hidden" name="it_id[<?php echo $i; ?>]" value="<?php echo $row['it_id']; ?>">
<?php echo $row['it_id']; ?>
</td>

18
adm/shop_admin/orderlist.php
View File

@ -288,21 +288,27 @@ $listall = '<a href="'.$_SERVER['PHP_SELF'].'" class="ov_listall">전체목록</
$od_cnt = $row2['cnt'];
}
// 주문device
// 주문 번호에 device 표시
$od_mobile = '';
if($row['od_mobile'])
$od_mobile = '(M)';
// 주문 번호에 에스크로 표시
$od_paytype = '';
if($default['de_escrow_use'] && $row['od_escrow'])
$od_paytype = '<span class="list_escrow">에스크로</span>';
$uid = md5($row['od_id'].$row['od_time'].$row['od_ip']);
$invoice_time = is_null_time($row['od_invoice_time']) ? G5_TIME_YMDHIS : $row['od_invoice_time'];
$delivery_company = $row['od_delivery_company'] ? $row['od_delivery_company'] : $default['de_delivery_company'];
$tr_bg = 'tr_bg'.($i%2);
if($default['de_escrow_use'] && $row['od_escrow'])
$tr_bg .= 'escrow';
if($od['od_cancel_price'] > 0)
$td_color = 0;
if($row['od_cancel_price'] > 0) {
$tr_bg .= 'cancel';
$td_color = 1;
}
?>
<tr class="orderlist<?php echo ' '.$tr_bg; ?>">
<td rowspan="3" class="td_chk">
@ -317,13 +323,14 @@ $listall = '<a href="'.$_SERVER['PHP_SELF'].'" class="ov_listall">전체목록</
<td headers="th_ordnum" class="td_odrnum2" rowspan="2" colspan="2">
<a href="<?php echo G5_SHOP_URL; ?>/orderinquiryview.php?od_id=<?php echo $row['od_id']; ?>&amp;uid=<?php echo $uid; ?>" class="orderitem"><?php echo substr($row['od_id'],0,8).'-'.substr($row['od_id'],8); ?></a>
<?php echo $od_mobile; ?>
<?php echo $od_paytype; ?>
</td>
<td headers="th_odrer" class="td_name"><?php echo $mb_nick; ?></td>
<td headers="th_odrertel" class="td_tel"><?php echo $row['od_tel']; ?></td>
<td headers="th_recvr" class="td_name"><a href="<?php echo $_SERVER['PHP_SELF']; ?>?sort1=<?php echo $sort1; ?>&amp;sort2=<?php echo $sort2; ?>&amp;sel_field=od_b_name&amp;search=<?php echo $row['od_b_name']; ?>"><?php echo $row['od_b_name']; ?></a></td>
<td rowspan="3" class="td_numsum"><?php echo number_format($row['od_cart_price'] + $row['od_send_cost'] + $row['od_send_cost2']); ?></td>
<td rowspan="3" class="td_numincome"><?php echo number_format($row['od_receipt_price']); ?></td>
<td rowspan="3" class="td_numcancel"><?php echo number_format($row['od_cancel_price']); ?></td>
<td rowspan="3" class="td_numcancel<?php echo $td_color; ?>"><?php echo number_format($row['od_cancel_price']); ?></td>
<td rowspan="3" class="td_numcoupon"><?php echo number_format($row['couponprice']); ?></td>
<td rowspan="3" class="td_numrdy"><?php echo number_format($row['od_misu']); ?></td>
<td rowspan="3" class="td_mngsmall">
@ -442,7 +449,6 @@ $listall = '<a href="'.$_SERVER['PHP_SELF'].'" class="ov_listall">전체목록</
<div class="local_desc02 local_desc">
<p>
&lt;에스크로&gt;주문의 경우 리스트의 배경색이 다르게 표시됩니다. <img src="<?php echo G5_ADMIN_URL; ?>/shop_admin/img/escrow_bg.png" alt=""> or <img src="<?php echo G5_ADMIN_URL; ?>/shop_admin/img/escrow_bg2.png" alt=""><br>
&lt;무통장&gt;인 경우에만 &lt;주문&gt;에서 &lt;입금&gt;으로 변경됩니다. 가상계좌는 입금시 자동으로 &lt;입금&gt;처리됩니다.<br>
&lt;준비&gt;에서 &lt;배송&gt;으로 변경시 &lt;에스크로배송등록&gt;을 체크하시면 에스크로 주문에 한해 KCP에 배송정보가 자동 등록됩니다.<br>
<strong>주의!</strong> 주문번호를 클릭하여 나오는 주문상세내역의 주소를 외부에서 조회가 가능한곳에 올리지 마십시오.

13
css/admin.css
View File

@ -256,10 +256,10 @@ tfoot th {}
tfoot td {font-weight:bold;text-align:center}
table .tr_bg0 {background:#fff}
table .tr_bg1 {background:#f0f3f7}
table .tr_bg0escrow {background:#f3f7e7}
table .tr_bg0escrow td {border-color:#e4efbb}
table .tr_bg1escrow {background:#edf1e3}
table .tr_bg1escrow td {border-color:#dce9ad}
table .tr_bg0cancel {background:#fdebf3}
table .tr_bg0cancel td {border-color:#f9d8e6}
table .tr_bg1cancel {background:#fdebf3}
table .tr_bg1cancel td {border-color:#f9d8e6}
.tbl_wrap {margin:0 0 10px;padding:0 20px}
.tbl_wrap td.empty_table {padding:100px 0;text-align:center}
@ -371,7 +371,8 @@ td.td_grpset {width:160px;border-left:1px solid #e9ecee;text-align:center}
.td_mng .mng_del, .td_mngsmall .mng_del {}
.td_num {width:60px;text-align:center}
.td_numbig {width:100px;text-align:center}
.td_numcancel {color:#999;text-align:center;}
.td_numcancel0 {color:#999;text-align:center}
.td_numcancel1 {color:#ff3061;font-weight:bold;text-align:center}
.td_numcoupon {color:#86b325;text-align:center}
.td_numincome {color:#357dbb;text-align:center}
.td_numsmall {width:30px;text-align:center}
@ -470,6 +471,8 @@ td.td_grpset {width:160px;border-left:1px solid #e9ecee;text-align:center}
#orderitemlist td {background:#fff}
#orderitemlist #orderitemlist_close {padding:0 20px 10px;text-align:right}
#sodr_list .list_escrow {display:block;color:#80bc0d;text-align:center}
/* 주문내역 수정 */
.sodr_nonpay {color:#ff6600}
strong.sodr_nonpay {display:block;padding:5px 0;text-align:right}

2
css/default.css
View File

@ -9,7 +9,7 @@ h1, h2, h3, h4, h5, h6 {font-size:1em;font-family:dotum}
article, aside, details, figcaption, figure, footer, header, hgroup, menu, nav, section {display:block}
#hd ul, nav ul, #ft ul {margin:0;padding:0;list-style:none}
legend {position:absolute;font-size:0;line-height:0;text-indent:-9999em;overflow:hidden}
legend {position:absolute;margin:0;padding:0;font-size:0;line-height:0;text-indent:-9999em;overflow:hidden}
label, input, select, img {vertical-align:middle}
input, button {margin:0;padding:0;font-family:dotum;font-size:1em}
button {cursor:pointer}

2
css/default_shop.css
View File

@ -8,7 +8,7 @@ html, h1, h2, h3, h4, h5, h6, form, fieldset, img {margin:0;padding:0;border:0}
h1, h2, h3, h4, h5, h6 {font-size:1em;font-family:dotum}
article, aside, details, figcaption, figure, footer, header, hgroup, menu, nav, section {display:block}
#hd ul, nav ul, #ft ul {margin:0;padding:0;list-style:none}
legend {position:absolute;font-size:0;line-height:0;text-indent:-9999em;overflow:hidden}
legend {position:absolute;margin:0;padding:0;font-size:0;text-indent:-9999em;line-height:0;overflow:hidden}
label, input, select, img {vertical-align:middle}
input, button {margin:0;padding:0;font-family:dotum;font-size:1em}
button {cursor:pointer}