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-11-12 14:20:56 +09:00
parent 4ef22669d1 d29e4ccbc2
commit b2c377d85d
89 changed files with 249 additions and 772 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
mobile/shop/cart.php
View File

@ -14,13 +14,15 @@ include_once(G5_MSHOP_PATH.'/_head.php');
<table>
<thead>
<tr>
<th scope="col">상품이미지</th>
<th scope="col">상품명</th>
<th scope="col" rowspan="2">상품이미지</th>
<th scope="col" colspan="4">상품명</th>
<th scope="col" rowspan="2"><input type="checkbox" name="ct_all" value="1" checked="checked"></th>
</tr>
<tr>
<th scope="col">총수량</th>
<th scope="col">판매가</th>
<th scope="col">소계</th>
<th scope="col">포인트</th>
<th scope="col"><input type="checkbox" name="ct_all" value="1" checked="checked"></th>
</tr>
</thead>
<tbody>
@ -41,7 +43,7 @@ include_once(G5_MSHOP_PATH.'/_head.php');
from {$g5['g5_shop_cart_table']} a left join {$g5['g5_shop_item_table']} b on ( a.it_id = b.it_id )
where a.od_id = '$s_cart_id' ";
if($default['de_cart_keep_term']) {
$ctime = date('Y-m-d H:i:s', G5_SERVER_TIME - ($default['de_cart_keep_term'] * 86400));
$ctime = date('Y-m-d H:i:s', G5_SERVER_TIME - (($default['de_cart_keep_term'] - 1) * 86400));
$sql .= " and a.ct_time > '$ctime' ";
}
$sql .= " group by a.it_id ";
@ -72,7 +74,7 @@ include_once(G5_MSHOP_PATH.'/_head.php');
$it_name = $a1 . stripslashes($row['it_name']) . $a2;
$it_options = print_item_options($row['it_id'], $s_cart_id);
if($it_options) {
$mod_options = '<div class="sod_option_btn"><button type="button" class="mod_options">선택사항수정</button></div>';
$mod_options = '<div class="sod_option_btn"><button type="button" id="mod_opt_'.$row['it_id'].'" class="mod_options">선택사항수정</button></div>';
$it_name .= '<div class="sod_bsk_itopt">'.$it_options.'</div>';
}
@ -81,18 +83,22 @@ include_once(G5_MSHOP_PATH.'/_head.php');
?>
<tr>
<td class="sod_bsk_img"><?php echo $image; ?></td>
<td>
<td rowspan="3" class="sod_bsk_img"><?php echo $image; ?></td>
<td colspan="4">
<input type="hidden" name="it_id[<?php echo $i; ?>]" value="<?php echo $row['it_id']; ?>">
<input type="hidden" name="it_name[<?php echo $i; ?>]" value="<?php echo get_text($row['it_name']); ?>">
<?php echo $it_name.$mod_options; ?>
<?php echo $it_name; ?>
</td>
<td rowspan="3" class="td_mngsmall"><input type="checkbox" name="ct_chk[<?php echo $i; ?>]" value="1" checked="checked"></td>
</tr>
<tr>
<td class="td_num"><?php echo number_format($sum['qty']); ?></td>
<td class="td_numbig"><?php echo number_format($row['ct_price']); ?></td>
<td class="td_numbig"><?php echo number_format($sell_price); ?></td>
<td class="td_num"><?php echo number_format($sum['point']); ?></td>
<td class="td_mngsmall"><input type="checkbox" name="ct_chk[<?php echo $i; ?>]" value="1" checked="checked"></td>
</tr>
<tr>
<td colspan="4"><?php echo $mod_options; ?></td>
</tr>
<?php
@ -153,7 +159,7 @@ $(function() {
// 선택사항수정
$(".mod_options").click(function() {
var it_id = $(this).closest("tr").find("input[name^=it_id]").val();
var it_id = $(this).attr("id").replace("mod_opt_", "");
var $this = $(this);
close_btn_idx = $(".mod_options").index($(this));

6
mobile/shop/mypage.php
View File

@ -65,7 +65,7 @@ for($k=0; $cp=sql_fetch_array($res); $k++) {
<tr>
<th scope="col">이미지</th>
<th scope="col">상품명</th>
<th scope="col">보관일시</th>
<th scope="col">보관일</th>
</tr>
</thead>
<tbody>
@ -80,13 +80,13 @@ for($k=0; $cp=sql_fetch_array($res); $k++) {
$result = sql_query($sql);
for ($i=0; $row = sql_fetch_array($result); $i++)
{
$image = get_it_image($row['it_id'], 70, 70, true);
$image = get_it_image($row['it_id'], 50, 50, true);
?>
<tr>
<td class="smb_my_img"><?php echo $image; ?></td>
<td><a href="./item.php?it_id=<?php echo $row['it_id']; ?>"><?php echo stripslashes($row['it_name']); ?></a></td>
<td class="td_datetime"><?php echo $row['wi_time']; ?></td>
<td class="td_datetime"><?php echo substr($row['wi_time'], 2, 8); ?></td>
</tr>
<?php

40
mobile/shop/orderaddress.php
View File

@ -12,19 +12,25 @@ $order_action_url = G5_HTTPS_SHOP_URL.'/orderaddressupdate.php';
<h1 id="new_win_title">배송지 목록</h1>
<div>
<button type="button" onclick="self.close();">닫기</button>
</div>
<div class="tbl_wrap tbl_head01">
<table>
<thead>
<tr>
<th scope="col">
<th scope="col" rowspan="3">
<label for="chk_all" class="sound_only">전체선택</label><input type="checkbox" name="chk_all" id="chk_all">
</th>
<th scope="col">배송지명</th>
<th scope="col">기본<br>배송지</th>
<th scope="col">배송지명</th>
<th scope="col">이름</th>
<th scope="col">전화번호</th>
<th scope="col">주소</th>
<th scope="col">관리</th>
<th scope="col" rowspan="3">관리</th>
</tr>
<tr>
<th scope="col" colspan="3">전화번호</th>
</tr>
<th scope="col" colspan="3">주소</th>
</tr>
</thead>
<tbody>
@ -34,21 +40,31 @@ $order_action_url = G5_HTTPS_SHOP_URL.'/orderaddressupdate.php';
$addr = $row['ad_name'].$sep.$row['ad_tel'].$sep.$row['ad_hp'].$sep.$row['ad_zip1'].$sep.$row['ad_zip2'].$sep.$row['ad_addr1'].$sep.$row['ad_addr2'].$sep.$row['ad_subject'];
?>
<tr>
<td class="td_chk"><label for="chk_<?php echo $i;?>" class="sound_only">배송지선택</label>
<td class="td_chk" rowspan="3">
<label for="chk_<?php echo $i;?>" class="sound_only">배송지선택</label>
<input type="hidden" name="ad_id[<?php echo $i; ?>]" value="<?php echo $row['ad_id'];?>">
<input type="checkbox" name="chk[]" value="<?php echo $i;?>" id="chk_<?php echo $i;?>">
</td>
<td class="td_name"><input type="text" name="ad_subject[<?php echo $i; ?>]" id="ad_subject" class="frm_input" size="10" maxlength="20" value="<?php echo $row['ad_subject']; ?>"></td>
<td class="td_default"><label for="ad_default<?php echo $i;?>" class="sound_only">기본배송지</label><input type="radio" name="ad_default" value="<?php echo $row['ad_id'];?>" id="ad_default<?php echo $i;?>" <?php if($row['ad_default']) echo 'checked="checked"';?>></td>
<td class="td_default">
<label for="ad_default<?php echo $i;?>" class="sound_only">기본배송지</label>
<input type="radio" name="ad_default" value="<?php echo $row['ad_id'];?>" id="ad_default<?php echo $i;?>" <?php if($row['ad_default']) echo 'checked="checked"';?>>
</td>
<td class="td_name">
<input type="text" name="ad_subject[<?php echo $i; ?>]" id="ad_subject" class="frm_input" size="10" maxlength="20" value="<?php echo $row['ad_subject']; ?>">
</td>
<td class="td_namesmall"><?php echo $row['ad_name']; ?></td>
<td class="td_numbig"><?php echo $row['ad_tel']; ?><br><?php echo $row['ad_hp']; ?></td>
<td><?php echo sprintf('%s %s', $row['ad_addr1'], $row['ad_addr2']); ?></td>
<td class="td_mng">
<td rowspan="3" class="td_mng">
<input type="hidden" value="<?php echo $addr; ?>">
<button type="button" class="sel_address btn_frmline">선택</button>
<button type="button" class="sel_address btn_frmline">선택</button><br>
<a href="<?php echo $_SERVER['PHP_SELF']; ?>?w=d&amp;ad_id=<?php echo $row['ad_id']; ?>" class="del_address">삭제</a>
</td>
</tr>
<tr>
<td colspan="3" class="td_numbig"><?php echo $row['ad_tel']; ?> / <?php echo $row['ad_hp']; ?></td>
</tr>
<tr>
<td colspan="3"><?php echo sprintf('%s %s', $row['ad_addr1'], $row['ad_addr2']); ?></td>
</tr>
<?php
}
?>

4
mobile/shop/orderform.php
View File

@ -77,7 +77,7 @@ ob_start();
where a.od_id = '$s_cart_id'
and a.ct_select = '1' ";
if($default['de_cart_keep_term']) {
$ctime = date('Y-m-d H:i:s', G5_SERVER_TIME - ($default['de_cart_keep_term'] * 86400));
$ctime = date('Y-m-d H:i:s', G5_SERVER_TIME - (($default['de_cart_keep_term'] - 1) * 86400));
$sql .= " and a.ct_time > '$ctime' ";
}
$sql .= " group by a.it_id ";
@ -189,7 +189,7 @@ ob_start();
<?php if($default['de_tax_flag_use']) { ?>
<input type="hidden" name="it_notax[<?php echo $i; ?>]" value="<?php echo $row['it_notax']; ?>">
<?php } ?>
<?php echo $it_name.$mod_options; ?>
<?php echo $it_name; ?>
</td>
</tr>
<tr>

59
mobile/shop/orderinquiry.sub.php
View File

@ -12,9 +12,13 @@ if (!defined("_ORDERINQUIRY_")) exit; // 개별 페이지 접근 불가
<tr>
<th scope="col">주문번호</th>
<th scope="col">주문일시</th>
<th scope="col">주문금액</th>
<th scope="col">쿠폰</th>
<th scope="col">입금액</th>
<th rowspan="2" scope="col">입금액</th>
</tr>
<tr>
<th colspan="2" scope="col">주문상품</th>
</tr>
<tr>
<th colspan="3" scope="col">배송정보</th>
</tr>
</thead>
<tbody>
@ -28,18 +32,57 @@ if (!defined("_ORDERINQUIRY_")) exit; // 개별 페이지 접근 불가
$result = sql_query($sql);
for ($i=0; $row=sql_fetch_array($result); $i++)
{
// 주문상품
$sql = " select *, count(ct_id) as cnt
from {$g5['g5_shop_cart_table']}
where od_id = '{$row['od_id']}'
order by ct_id
limit 1 ";
$ct = sql_fetch($sql);
$ct_name = get_text($ct['it_name']).' '.get_text($ct['ct_option']);
if($ct['cnt'] > 1)
$ct_name .= ' 외 '.($ct['cnt'] - 1).'건';
switch($row['od_status']) {
case '입금':
$od_status = '입금완료';
break;
case '준비':
$od_status = '상품준비중';
break;
case '배송':
$od_status = '상품배송';
break;
case '완료':
$od_status = '배송완료';
break;
default:
$od_status = '입금확인중';
break;
}
$od_invoice = '';
if($row['od_delivery_company'] && $row['od_invoice'])
$od_invoice = get_text($row['od_delivery_company']).' '.get_text($row['od_invoice']);
$uid = md5($row['od_id'].$row['od_time'].$row['od_ip']);
?>
<tr>
<td>
<input type="hidden" name="ct_id[<?php echo $i; ?>]" value="<?php echo $row['ct_id']; ?>">
<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>
</td>
<td class="td_datetime"><?php echo substr($row['od_time'],0,16); ?> (<?php echo get_yoil($row['od_time']); ?>)</td>
<td class="td_numbig"><?php echo display_price($row['od_cart_price'] + $row['od_send_cost'] + $row['od_send_cost2']); ?></td>
<td class="td_numbig"><?php echo display_price($row['couponprice']); ?></td>
<td class="td_stat"><?php echo display_price($row['od_receipt_price']); ?></td>
<td><?php echo substr($row['od_time'],2,8); ?></td>
<td rowspan="2"><?php echo display_price($row['od_receipt_price']); ?></td>
</tr>
<tr>
<td colspan="2"><?php echo $ct_name; ?></td>
</tr>
<tr>
<td colspan="3">
<?php echo $od_status; ?>
<?php echo $od_invoice; ?>
</td>
</tr>
<?php

130
mobile/shop/orderinquiryview.php
View File

@ -41,78 +41,74 @@ include_once(G5_MSHOP_PATH.'/_head.php');
order by ct_id ";
$result = sql_query($sql);
?>
<ul id="sod_ul">
<?php
for($i=0; $row=sql_fetch_array($result); $i++) {
$image = get_it_image($row['it_id'], 70, 70);
?>
<li>
<p>
<a href="./item.php?it_id=<?php echo $row['it_id']; ?>"><?php echo $image; ?> <?php echo $row['it_name']; ?></a>
</p>
<table>
<thead>
<tr>
<th scope="col" rowspan="3">상품이미지</th>
<th scope="col" colspan="5">상품명</th>
</tr>
<th scope="col" colspan="5">옵션항목</th>
<tr>
<th scope="col">수량</th>
<th scope="col">판매가</th>
<th scope="col">소계</th>
<th scope="col">포인트</th>
<th scope="col">상태</th>
</tr>
</thead>
<tbody>
<?php
for($i=0; $row=sql_fetch_array($result); $i++) {
$image = get_it_image($row['it_id'], 70, 70);
<div class="tbl_head01 tbl_wrap">
<table>
<thead>
<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>
</tr>
</thead>
<tbody>
<?php
$sql = " select ct_id, it_name, ct_option, ct_qty, ct_price, ct_point, ct_status, io_type, io_price
from {$g5['g5_shop_cart_table']}
where od_id = '$od_id'
and it_id = '{$row['it_id']}'
order by io_type asc, ct_id asc ";
$res = sql_query($sql);
$ct_list = array();
// 옵션항목
$sql = " select ct_id, it_name, ct_option, ct_qty, ct_price, ct_point, ct_status, io_type, io_price
from {$g5['g5_shop_cart_table']}
where od_id = '$od_id'
and it_id = '{$row['it_id']}'
order by io_type asc, ct_id asc ";
$res = sql_query($sql);
$rowspan = mysql_num_rows($res) * 2 + 1;
?>
<tr>
<td rowspan="<?php echo $rowspan; ?>"><a href="./item.php?it_id=<?php echo $row['it_id']; ?>"><?php echo $image; ?></a></td>
<td colspan="5"><a href="./item.php?it_id=<?php echo $row['it_id']; ?>"><?php echo $row['it_name']; ?></a></td>
</tr>
<?php
for($k=0; $opt=sql_fetch_array($res); $k++) {
if($opt['io_type'])
$opt_price = $opt['io_price'];
else
$opt_price = $opt['ct_price'] + $opt['io_price'];
for($k=0; $opt=sql_fetch_array($res); $k++) {
if($opt['io_type'])
$opt_price = $opt['io_price'];
else
$opt_price = $opt['ct_price'] + $opt['io_price'];
$sell_price = $opt_price * $opt['ct_qty'];
$point = $opt['ct_point'] * $opt['ct_qty'];
?>
<tr>
<td colspan="5"><?php echo $opt['ct_option']; ?></td>
</tr>
<tr>
<td class="td_mngsmall"><?php echo number_format($opt['ct_qty']); ?></td>
<td class="td_numbig"><?php echo number_format($opt_price); ?></td>
<td class="td_num"><?php echo number_format($sell_price); ?></td>
<td class="td_num"><?php echo number_format($point); ?></td>
<td class="td_mngsmall"><?php echo $opt['ct_status']; ?></td>
</tr>
<?php
$tot_point += $point;
$sell_price = $opt_price * $opt['ct_qty'];
$point = $opt['ct_point'] * $opt['ct_qty'];
$ct_list[$opt['ct_id']]['name'] = $opt['it_name'];
$ct_list[$opt['ct_id']]['option'] = $opt['ct_option'];
?>
<tr>
<td><?php echo $opt['ct_option']; ?></td>
<td class="td_mngsmall"><?php echo number_format($opt['ct_qty']); ?></td>
<td class="td_numbig"><?php echo number_format($opt_price); ?></td>
<td class="td_num"><?php echo number_format($sell_price); ?></td>
<td class="td_num"><?php echo number_format($point); ?></td>
<td class="td_mngsmall"><?php echo $opt['ct_status']; ?></td>
</tr>
<?php
$tot_point += $point;
$st_count1++;
if($opt['ct_status'] == '주문')
$st_count2++;
}
?>
</tbody>
</table>
</div>
</li>
<?php
$st_count1++;
if($opt['ct_status'] == '주문')
$st_count2++;
}
}
// 주문 상품의 상태가 모두 주문이면 고객 취소 가능
if($st_count1 > 0 && $st_count1 == $st_count2)
$custom_cancel = true;
?>
</ul>
// 주문 상품의 상태가 모두 주문이면 고객 취소 가능
if($st_count1 > 0 && $st_count1 == $st_count2)
$custom_cancel = true;
?>
</tbody>
</table>
<div id="sod_sts_wrap">
<span class="sound_only">상품 상태 설명</span>

4
mobile/shop/wishlist.php
View File

@ -44,7 +44,7 @@ include_once(G5_MSHOP_PATH.'/_head.php');
if ($row['it_tel_inq']) $out_cd = 'tel_inq';
$image = get_it_image($row['it_id'], 70, 70);
$image = get_it_image($row['it_id'], 50, 50);
$it_point = get_item_point($row);
?>
@ -52,7 +52,7 @@ include_once(G5_MSHOP_PATH.'/_head.php');
<td class="sod_ws_img"><?php echo $image; ?></td>
<td>
<a href="<?php echo G5_SHOP_URL; ?>/item.php?it_id=<?php echo $row['it_id']; ?>"><?php echo stripslashes($row['it_name']); ?></a>
<small>보관일시 <?php echo $row['wi_time']; ?></small>
<br><small>보관일 <?php echo substr($row['wi_time'], 2, 8); ?></small>
</td>
<td class="td_chk">
<?php

4
mobile/skin/board/basic/style.css
View File

@ -206,10 +206,8 @@
#bo_v_sns:after {display:block;visibility:hidden;clear:both;content:""}
#bo_v_sns li {float:left;margin:0 5px 0 0}
#bo_v form {padding-top:15px}
/* 게시판 댓글 */
#bo_vc {margin:0 0 5px;padding:15px 15px 5px;border-top:1px solid #cfded8;border-bottom:1px solid #cfded8;background:#f7f7f7}
#bo_vc {margin:0 0 15px;padding:15px 15px 5px;border-top:1px solid #cfded8;border-bottom:1px solid #cfded8;background:#f7f7f7}
#bo_vc h2 {margin-bottom:5px}
#bo_vc article {padding:0 0 5px;border-top:1px dotted #ccc}
#bo_vc header {position:relative;padding:13px 0 5px}

8
mobile/skin/board/basic/view_comment.skin.php
View File

@ -32,7 +32,7 @@ var char_max = parseInt(<?php echo $comment_max ?>); // 최대
<?php } ?>
작성일
<span class="bo_vc_hdinfo"><time datetime="<?php echo date('Y-m-d\TH:i:s+09:00', strtotime($list[$i]['datetime'])) ?>"><?php echo $list[$i]['datetime'] ?></time></span>
<?php
<?php
include(G5_SNS_PATH."/view_comment_list.sns.skin.php");
?>
</header>
@ -116,7 +116,7 @@ var char_max = parseInt(<?php echo $comment_max ?>); // 최대
<td><?php echo $captcha_html; ?></td>
</tr>
<?php } ?>
<?php
<?php
include(G5_SNS_PATH."/view_comment_write.sns.skin.php");
?>
<tr>
@ -141,7 +141,7 @@ var char_max = parseInt(<?php echo $comment_max ?>); // 최대
<script>
var save_before = '';
var save_html = document.getElementById('bo_vc_w').innerHTML;
var save_html;
function good_and_write()
{
@ -262,6 +262,8 @@ var char_max = parseInt(<?php echo $comment_max ?>); // 최대
if (save_before != el_id)
{
save_html = document.getElementById('bo_vc_w').innerHTML;
if (save_before)
{
document.getElementById(save_before).style.display = 'none';

4
mobile/skin/board/gallery/style.css
View File

@ -192,10 +192,8 @@
#bo_v_sns:after {display:block;visibility:hidden;clear:both;content:""}
#bo_v_sns li {float:left;margin:0 5px 0 0}
#bo_v form {padding-top:15px}
/* 게시판 댓글 */
#bo_vc {margin:0 0 5px;padding:15px 15px 5px;border-top:1px solid #cfded8;border-bottom:1px solid #cfded8;background:#f7f7f7}
#bo_vc {margin:0 0 15px;padding:15px 15px 5px;border-top:1px solid #cfded8;border-bottom:1px solid #cfded8;background:#f7f7f7}
#bo_vc h2 {margin-bottom:5px}
#bo_vc article {padding:0 0 5px;border-top:1px dotted #ccc}
#bo_vc header {position:relative;padding:13px 0 5px}

8
mobile/skin/board/gallery/view_comment.skin.php
View File

@ -32,7 +32,7 @@ var char_max = parseInt(<?php echo $comment_max ?>); // 최대
<?php } ?>
작성일
<span class="bo_vc_hdinfo"><time datetime="<?php echo date('Y-m-d\TH:i:s+09:00', strtotime($list[$i]['datetime'])) ?>"><?php echo $list[$i]['datetime'] ?></time></span>
<?php
<?php
include(G5_SNS_PATH."/view_comment_list.sns.skin.php");
?>
</header>
@ -116,7 +116,7 @@ var char_max = parseInt(<?php echo $comment_max ?>); // 최대
<td><?php echo $captcha_html; ?></td>
</tr>
<?php } ?>
<?php
<?php
include(G5_SNS_PATH."/view_comment_write.sns.skin.php");
?>
<tr>
@ -141,7 +141,7 @@ var char_max = parseInt(<?php echo $comment_max ?>); // 최대
<script>
var save_before = '';
var save_html = document.getElementById('bo_vc_w').innerHTML;
var save_html;
function good_and_write()
{
@ -262,6 +262,8 @@ var char_max = parseInt(<?php echo $comment_max ?>); // 최대
if (save_before != el_id)
{
save_html = document.getElementById('bo_vc_w').innerHTML;
if (save_before)
{
document.getElementById(save_before).style.display = 'none';

2
mobile/skin/popular/basic/style.css
View File

@ -6,7 +6,7 @@
#popular div {zoom:1}
#popular div:after {display:block;visibility:hidden;clear:both;content:""}
#popular h2 {float:left;padding:10px;color:#fff}
#popular ul {float:left;list-style:none}
#popular ul {float:left;margin:0 0 0 10px;padding:0;list-style:none}
#popular li {float:left}
#popular a {display:inline-block;padding:10px;color:#fff;text-decoration:none}
#popular a:focus,