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-10-23 13:30:33 +09:00
parent 6ed5635e74 2d716eba56
commit 6416b6df6c
6 changed files with 76 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

101
adm/shop_admin/orderlist.php
View File

@ -209,27 +209,33 @@ $listall = '<a href="'.$_SERVER['PHP_SELF'].'" class="ov_listall">전체목록</
<label for="chkall" class="sound_only">주문 전체</label>
<input type="checkbox" name="chkall" value="1" id="chkall" onclick="check_all(this.form)">
</th>
<th scope="col" id="th_odrnum"><a href="<?php echo title_sort("od_id", 1)."&amp;$qstr1"; ?>">주문번호</a></th>
<th scope="col" id="th_odrer"><a href="<?php echo title_sort("od_name")."&amp;$qstr1"; ?>">주문자</a></th>
<th scope="col" colspan="2">주문상태</th>
<th scope="col" rowspan="3">결제수단</th>
<th scope="col" rowspan="3"><a href="<?php echo title_sort("od_cart_price", 1)."&amp;$qstr1"; ?>">주문합계</a></th>
<th scope="col" rowspan="3"><a href="<?php echo title_sort("od_receipt_price")."&amp;$qstr1"; ?>">입금합계</a></th>
<th scope="col" rowspan="3"><a href="<?php echo title_sort("od_cancel_price", 1)."&amp;$qstr1"; ?>">주문취소</a></th>
<!-- <th scope="col" id="th_odrnum"><a href="<?php echo title_sort("od_id", 1)."&amp;$qstr1"; ?>">주문번호</a></th> -->
<th scope="col" id="th_odrnum" rowspan="2" colspan="2"><a href="<?php echo title_sort("od_id", 1)."&amp;$qstr1"; ?>">주문번호</a></th>
<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">입금합계</th>
<th scope="col" rowspan="3">주문취소</th>
<th scope="col" rowspan="3">쿠폰</th>
<th scope="col" rowspan="3"><a href="<?php echo title_sort("od_misu", 1)."&amp;$qstr1"; ?>">미수금</a></th>
<th scope="col" rowspan="3">미수금</th>
<th scope="col" rowspan="3">관리</th>
</tr>
<tr>
<th scope="col" id="th_odrdate">주문일시</th>
<th scope="col" id="th_odrid"><a href="<?php echo title_sort("mb_id")."&amp;$qstr1"; ?>">회원ID</a></th>
<th scope="col"><a href="<?php echo title_sort("od_cart_price", 1)."&amp;$qstr1"; ?>">주문건</a></th>
<th scope="col"><a href="<?php echo title_sort("od_cart_price", 1)."&amp;$qstr1"; ?>">누적건</a></th>
<!-- <th scope="col" id="th_odrdate">주문일시</th> -->
<!-- <th scope="col">결제수단</th> -->
<!-- <th scope="col" id="th_odrid"><a href="<?php echo title_sort("mb_id")."&amp;$qstr1"; ?>">회원ID</a></th> -->
<th scope="col" id="th_odrid">회원ID</th>
<th scope="col" id="th_odrcnt">주문상품수</th>
<th scope="col" id="th_odrall">누적주문수</th>
</tr>
<tr>
<th scope="col">배송일시</th>
<th scope="col">배송회사</th>
<th scope="col" colspan="2">운송장번호</th>
<!-- <th scope="col">배송일시</th> -->
<th scope="col" id="odrstat">주문상태</th>
<th scope="col" id="odrpay">결제수단</th>
<th scope="col" id="delino">운송장번호</th>
<th scope="col" id="delicom">배송회사</th>
<th scope="col" id="delidate">배송일시</th>
</tr>
</thead>
<tbody>
@ -280,19 +286,17 @@ $listall = '<a href="'.$_SERVER['PHP_SELF'].'" class="ov_listall">전체목록</
<label for="chk_<?php echo $i; ?>" class="sound_only">주문번호 <?php echo $row['od_id']; ?></label>
<input type="checkbox" name="chk[]" value="<?php echo $i ?>" id="chk_<?php echo $i ?>">
</td>
<td headers="th_ordnum" class="td_odrnum2">
<!-- <td headers="th_ordnum" class="td_odrnum2">
<?php echo $od_mobile; ?>
<a href="<?php echo G5_SHOP_URL; ?>/orderinquiryview.php?od_id=<?php echo $row['od_id']; ?>&amp;uid=<?php echo $uid; ?>"><?php echo $row['od_id']; ?></a><br>
</td> -->
<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; ?>"><?php echo substr($row['od_id'],0,8).'-'.substr($row['od_id'],8); ?></a>
<?php echo $od_mobile; ?>
</td>
<td headers="th_odrer" class="td_name"><?php echo $mb_nick; ?></td>
<td colspan="2" class="td_odrstatus">
<input type="hidden" name="current_status[<?php echo $i ?>]" value="<?php echo $row['od_status'] ?>">
<?php echo $row['od_status']; ?>
</td>
<td rowspan="3" class="td_payby">
<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_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>
@ -304,24 +308,46 @@ $listall = '<a href="'.$_SERVER['PHP_SELF'].'" class="ov_listall">전체목록</
</td>
</tr>
<tr class="<?php echo $tr_bg; ?>">
<td headers="th_odrdate"><span class="sound_only">주문일시 </span><?php echo $row['od_time']; ?></td>
<td headers="th_odrid" class="td_name"><a href="<?php echo $_SERVER['PHP_SELF']; ?>?sort1=<?php echo $sort1; ?>&amp;sort2=<?php echo $sort2; ?>&amp;sel_field=mb_id&amp;search=<?php echo $row['mb_id']; ?>"><?php echo $row['mb_id']; ?></a></td>
<td class="td_cntsmall"><?php echo $row['od_cart_count']; ?>건</td>
<td class="td_cntsmall"><?php echo $od_cnt; ?>건</td>
<!-- <td headers="th_odrdate"><span class="sound_only">주문일시 </span><?php echo $row['od_time']; ?></td> -->
<!-- <td class="td_payby">
<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_odrid" class="td_name"><a href="<?php echo $_SERVER['PHP_SELF']; ?>?sort1=<?php echo $sort1; ?>&amp;sort2=<?php echo $sort2; ?>&amp;sel_field=mb_id&amp;search=<?php echo $row['mb_id']; ?>"><?php echo $row['mb_id']; ?></a></td> -->
<td headers="th_odrid">
<?php if ($row['mb_id']) { ?>
<a href="<?php echo $_SERVER['PHP_SELF']; ?>?sort1=<?php echo $sort1; ?>&amp;sort2=<?php echo $sort2; ?>&amp;sel_field=mb_id&amp;search=<?php echo $row['mb_id']; ?>"><?php echo $row['mb_id']; ?></a>
<?php } else { ?>
비회원
<?php } ?>
</td>
<td headers="th_odrcnt"><?php echo $row['od_cart_count']; ?>건</td>
<td headers="th_odrall"><?php echo $od_cnt; ?>건</td>
</tr>
<tr class="<?php echo $tr_bg; ?>">
<td>
<td headers="th_odrstat" class="td_odrstatus">
<input type="hidden" name="current_status[<?php echo $i ?>]" value="<?php echo $row['od_status'] ?>">
<?php echo $row['od_status']; ?>
</td>
<td headers="th_odrpay" class="td_payby">
<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">
<!-- 값이 바뀌었는지 비교하기 위하여 저장 -->
<input type="hidden" name="save_dl_id[<?php echo $i; ?>]" value="<?php echo $row['dl_id']; ?>">
<input type="hidden" name="save_od_invoice[<?php echo $i; ?>]" value="<?php echo $row['od_invoice']; ?>">
<?php if ($od_status == '준비') { ?>
<input type="text" name="od_invoice_time[<?php echo $i; ?>]" value="<?php echo $invoice_time; ?>" class="frm_input" size="16" maxlength="19">
<input type="text" name="od_invoice[<?php echo $i; ?>]" value="<?php echo $row['od_invoice']; ?>" class="frm_input" size="12">
<?php } else if ($od_status == '배송' || $od_status == '완료') { ?>
<?php echo $row['od_invoice_time']; ?>
<?php echo $row['od_invoice']; ?>
<?php } else { ?>
-
<?php } ?>
</td>
<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="20">
<input type="text" name="od_delivery_company[<?php echo $i; ?>]" value="<?php echo $delivery_company; ?>" class="frm_input" size="12">
<?php } else if ($od_status == '배송' || $od_status == '완료') { ?>
<?php echo $row['od_delivery_company']; ?>
<?php } else { ?>
@ -332,14 +358,11 @@ $listall = '<a href="'.$_SERVER['PHP_SELF'].'" class="ov_listall">전체목록</
<?php echo conv_selected_option($delivery_options, $row['dl_id']?$row['dl_id']:$delivery_default); ?>
</select> -->
</td>
<td colspan="2" class="list_delino">
<!-- 값이 바뀌었는지 비교하기 위하여 저장 -->
<input type="hidden" name="save_dl_id[<?php echo $i; ?>]" value="<?php echo $row['dl_id']; ?>">
<input type="hidden" name="save_od_invoice[<?php echo $i; ?>]" value="<?php echo $row['od_invoice']; ?>">
<td headers="th_delidate">
<?php if ($od_status == '준비') { ?>
<input type="text" name="od_invoice[<?php echo $i; ?>]" value="<?php echo $row['od_invoice']; ?>" class="frm_input" size="10">
<input type="text" name="od_invoice_time[<?php echo $i; ?>]" value="<?php echo $invoice_time; ?>" class="frm_input" size="12" maxlength="19">
<?php } else if ($od_status == '배송' || $od_status == '완료') { ?>
<?php echo $row['od_invoice']; ?>
<?php echo substr($row['od_invoice_time'],2,14); ?>
<?php } else { ?>
-
<?php } ?>

4
css/admin.css
View File

@ -429,9 +429,7 @@ td.td_grpset {width:160px;border-left:1px solid #e9ecee;text-align:center}
.scf_sms_cnt {display:block}
/* 주문내역 */
#sodr_list .td_odrnum2 {text-align:left}
#sodr_list .td_odrnum2 a {text-decoration:underline}
#sodr_list .list_delino {text-align:center}
#sodr_list td {text-align:center !important}
/* 주문내역 수정 */
.sodr_nonpay {color:#ff6600}

6
css/mobile_shop.css
View File

@ -190,7 +190,9 @@ a.sanchor_on {background:#626870;color:#fff !important;text-decoration:none}
/* 상품 상세보기 - 다른 상품 보기 */
#sit_siblings {margin:0 0 10px;padding:10px 10px 20px;border-bottom:1px solid #e9e9e9;text-align:center}
#sit_siblings h2 {position:absolute;font-size:0;line-height:0;content:""}
#sit_siblings h2 {position:absolute;font-size:0;text-indent:-9999em;line-height:0;overflow:hidden}
#sit_siblings a {display:inline-block;margin:0 10px}
#sit_siblings a span {position:absolute;font-size:0;text-indent:-9999em;line-height:0;overflow:hidden}
/* 상품 상세보기 하단 버튼 */
#sit_more {padding:0 0 0 1px}
@ -201,7 +203,7 @@ a.sanchor_on {background:#626870;color:#fff !important;text-decoration:none}
/* 상품 상세보기 - 상품정보 */
#sit_inf {margin:0 0 1em;padding:1em 1em 2em;border-bottom:1px solid #e9e9e9}
#sit_inf h2 {margin:0 0 1em}
#sit_inf h3 {position:absolute;font-size:0;line-height:0;content:""}
#sit_inf h3 {position:absolute;font-size:0;text-indent:-9999em;line-height:0;overflow:hidden}
#sit_inf_basic {margin:0 0 1em}
#sit_inf_explan {margin:0 0 1em}

2
js/jquery.fancyalert.js
View File

@ -14,7 +14,7 @@ function fancyalert(msg)
box += "<div id=\"fancyalert_inner\"><span>"+msg;
box += "<br>";
box += "<button type=\"button\" id=\"fancyalert_close\">확인</button>";
box += "</span></div>";
box += "</span></div><div id=\"fancyalert_bg\"></div>";
box += "</div>";
$("body").append(box);

4
mobile/shop/item.php
View File

@ -79,7 +79,7 @@ $sql = " select it_id, it_name from {$g5['g5_shop_item_table']}
limit 1 ";
$row = sql_fetch($sql);
if ($row['it_id']) {
$prev_title = '이전상품보기 '.$row['it_name'];
$prev_title = '이전상품 <span>'.$row['it_name'].'</span>';
$prev_href = '<a href="'.G5_SHOP_URL.'/item.php?it_id='.$row['it_id'].'">';
$prev_href2 = '</a>';
} else {
@ -97,7 +97,7 @@ $sql = " select it_id, it_name from {$g5['g5_shop_item_table']}
limit 1 ";
$row = sql_fetch($sql);
if ($row['it_id']) {
$next_title = '다음 상품 '.$row['it_name'];
$next_title = '다음 상품 <span>'.$row['it_name'].'</span>';
$next_href = '<a href="'.G5_SHOP_URL.'/item.php?it_id='.$row['it_id'].'">';
$next_href2 = '</a>';
} else {

11
mobile/skin/shop/basic/style.css
View File

@ -79,7 +79,7 @@
/* ##### maint.(nn).skin.php, list.(nn).skin.php 공통 적용 끝 ##### */
/* 상품상세 */
#info_content {width:100%}
#info_content {width:100%;height:100%}
#menu_button {position:fixed;left:0;bottom:0;width:100%;height:40px;text-align:center}
#menu_list {position:fixed;left:0;bottom:0}
.menu_hidden {display:none}
@ -89,7 +89,8 @@
#loading_message img {position:relative;opacity:1.0}
/* 알림 box */
#fancyalert {display:table;z-index:10000;position:absolute;top:0;left:0;background-color:#282828;text-align:center;opacity: 0.8}
#fancyalert_inner {display:table-cell;width:100px;height:100px;vertical-align:middle;opacity:1.0}
#fancyalert_inner span {display:block;margin:0 auto;padding:30px;width:200px;background:#000;color:#f0f1f2}
#fancyalert_inner button {margin:15px 0 0;padding:10px 30px;border:0;background:#282828;color:#fff}
#fancyalert {display:table;z-index:10000;position:absolute;top:0;left:0}
#fancyalert_bg {position:absolute;top:0;left:0;width:100%;height:100%;vertical-align:middle;background:#000;text-align:center;opacity: 0.7}
#fancyalert_inner {display:table-cell;position:relative;z-index:2;vertical-align:middle;text-align:center}
#fancyalert_inner span {display:block;margin:0 auto;padding:30px;width:200px;background:#1f1f1f;color:#f0f1f2}
#fancyalert_inner button {margin:15px 0 0;padding:10px 30px;border:0;background:#000;color:#fff}