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

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

Browse Source
This commit is contained in:
whitedot
2013-10-23 13:05:02 +09:00
parent f3a2170932 0eb2d582b7
commit efff2fa414
3 changed files with 98 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

96
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_odrer">주문자전화</th>
<th scope="col" id="th_odrid">받는분</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">주문상품수</th>
<th scope="col">누적주문수</th>
</tr>
<tr>
<th scope="col">배송일시</th>
<!-- <th scope="col">배송일시</th> -->
<th scope="col">주문상태</th>
<th scope="col">결제수단</th>
<th scope="col">운송장번호</th>
<th scope="col">배송회사</th>
<th scope="col" colspan="2">운송장번호</th>
<th scope="col">배송일시</th>
</tr>
</thead>
<tbody>
@ -280,19 +286,16 @@ $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> -->
<td headers="th_ordnum" class="td_odrnum2" rowspan="2" colspan="2">
<?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 substr($row['od_id'],0,8).'-'.substr($row['od_id'],8); ?></a></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_odrer" class="td_name"><?php echo $row['od_tel']; ?></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=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 +307,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 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" class="td_name">
<?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 class="td_cntsmall"><?php echo $row['od_cart_count']; ?>건</td>
<td class="td_cntsmall"><?php echo $od_cnt; ?>건</td>
</tr>
<tr class="<?php echo $tr_bg; ?>">
<td>
<td 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 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 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']; ?>">
<?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 class="list_delino">
<?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 +357,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 class="list_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">
<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,8 +429,8 @@ 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 .td_odrnum2 {text-align:center}
#sodr_list .td_odrnum2 a {text-decoration:none;}
#sodr_list .list_delino {text-align:center}
/* 주문내역 수정 */

77
js/shop.mobile.main.js
View File

@ -76,33 +76,22 @@
width = $wrap.width();
tabw_width = $tab.width();
tab_width = $tabs.eq(0).width();
height = $slides.eq(idx).height();
$wrap.height(height);
$slides.not("."+cfg.active_class).css("left", "-"+width+"px");
if(count < 3) {
pos_left = 0;
li_left = parseInt((tabw_width - (tab_width * count)) / (count + 1));
$tabs.each(function(index) {
pos_left += (li_left + (tab_width * index));
$(this).css("left", pos_left);
});
$tabs.removeClass(cfg.tab_actie);
if(count == 1) {
tab_width = $tabs.eq(0).outerWidth();
pos_left = parseInt((tabw_width - tab_width) / 2);
$tabs.eq(0).css("left", pos_left).addClass(cfg.tab_active);
} else if(count == 2) {
$tabs.eq(0).css("left", 0).addClass("tab_left");
$tabs.eq(1).css("right", 0);
$tabs.removeClass(cfg.tab_active);
$tabs.eq(idx).addClass(cfg.tab_active);
} else {
li_left = parseInt((tabw_width - (tab_width * 3)) / 2);
pos_left = tab_width + li_left;
pos_right = tabw_width - tab_width;
$tabs.removeClass(cfg.tab_actie+" tab_listed").css("left", "-"+tab_width+"px");
$tabs.eq(idx - 1).addClass("tab_listed").css("left", "0px");
$tabs.eq(idx).addClass(cfg.tab_active+" tab_listed").css("left", pos_left+"px");
$tabs.eq((idx + 1) % count).addClass("tab_listed").css("left", pos_right+"px");
} else if(count >= 3) {
tab_position(idx);
$slides.eq((idx - 1)).css("left", "-"+width+"px");
$slides.eq((idx + 1) % count).css("left", width+"px");
@ -132,13 +121,10 @@
$tabs.removeClass(cfg.tab_active);
if(count >= 3) {
$tabs.removeClass("tab_listed").css("left", "-"+tab_width+"px");
$tabs.eq(next - 1).addClass("tab_listed").css("left", "0px");
$tabs.eq(next).addClass("tab_listed").css("left", pos_left+"px");
$tabs.eq((next + 1) % count).addClass("tab_listed").css("left", pos_right+"px");
tab_position(next);
} else {
$tabs.eq(next).addClass(cfg.tab_active);
}
$tabs.eq(next).addClass(cfg.tab_active);
$slides.eq(idx).clearQueue().animate(
{ left: "-="+width }, cfg.duration,
@ -183,13 +169,10 @@
$tabs.removeClass(cfg.tab_active);
if(count >= 3) {
$tabs.removeClass("tab_listed").css("left", "-"+tab_width+"px");
$tabs.eq(next - 1).addClass("tab_listed").css("left", "0px");
$tabs.eq(next).addClass("tab_listed").css("left", pos_left+"px");
$tabs.eq((next + 1) % count).addClass("tab_listed").css("left", pos_right+"px");
tab_position(next);
} else {
$tabs.eq(next).addClass(cfg.tab_active);
}
$tabs.eq(next).addClass(cfg.tab_active);
$slides.eq(idx).clearQueue().animate(
{ left: "+="+width }, cfg.duration,
@ -209,6 +192,25 @@
$slides.eq(next).addClass(cfg.active_class);
}
function tab_position(idx)
{
$tabs.removeClass(cfg.tab_actie+" tab_listed tab_left").css("left", "-"+tabw_width+"px");
var $tab_l = $tabs.eq(idx - 1);
var $tab_c = $tabs.eq(idx);
var $tab_r = $tabs.eq((idx + 1) % count);
var w_c = $tab_c.outerWidth();
var w_r = $tab_r.outerWidth();
var pl = 0;
var pc = parseInt((tabw_width - w_c) / 2);
var pr = tabw_width - w_r;
$tab_l.addClass("tab_listed tab_left").css("left", pl);
$tab_c.addClass(cfg.tab_active+" tab_listed").css("left", pc);
$tab_r.addClass("tab_listed").css("left", pr);
}
function check_animated()
{
if($slides.filter(":animated").size())
@ -225,14 +227,9 @@
if($el.parent().hasClass(cfg.tab_active))
return;
idx = $slides.index($slides.filter("."+cfg.active_class));
var idx_pos = parseInt($tabs.eq(idx).css("left"));
var btn_pos = parseInt($el.parent().css("left"));
if(idx_pos > btn_pos)
if($el.parent().hasClass("tab_left"))
swipe_right();
else(idx_pos < btn_pos)
else
swipe_left();
}