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-12-02 14:53:55 +09:00
parent 51b18867e4 f490760ab0
commit 4c14444ff1
10 changed files with 140 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
adm/shop_admin/itemform.php
View File

@ -195,7 +195,7 @@ $pg_anchor ='<ul class="anchor">
<span class="frm_ca_id"><?php echo $it['it_id']; ?></span>
<a href="<?php echo G5_SHOP_URL; ?>/item.php?it_id=<?php echo $it_id; ?>" class="btn_frmline">상품확인</a>
<a href="<?php echo G5_ADMIN_URL; ?>/shop_admin/itemuselist.php?sfl=a.it_id&amp;stx=<?php echo $it_id; ?>" class="btn_frmline">사용후기</a>
<a href="<?php echo G5_ADMIN_URL; ?>/shop_admin/itemqalist.php?sel_field=a.it_id&amp;search=<?php echo $it_id; ?>" class="btn_frmline">상품문의</a>
<a href="<?php echo G5_ADMIN_URL; ?>/shop_admin/itemqalist.php?sfl=a.it_id&amp;stx=<?php echo $it_id; ?>" class="btn_frmline">상품문의</a>
<?php } ?>
</td>
</tr>

2
adm/shop_admin/itemqaform.php
View File

@ -59,7 +59,7 @@ $qstr = 'page='.$page.'&amp;sort1='.$sort1.'&amp;sort2='.$sort2;
<?php if($iq['iq_hp']) { ?>
<tr>
<th scope="row">휴대폰</th>
<td><?php echo get_text($iq['iq_hp']); ?></td>
<td><?php echo hyphen_hp_number($iq['iq_hp']); ?></td>
</tr>
<?php } ?>
<tr>

2
adm/shop_admin/itemqalist.php
View File

@ -133,7 +133,7 @@ $listall = '<a href="'.$_SERVER['PHP_SELF'].'" class="ov_listall">전체목록</
<input type="checkbox" name="chk[]" value="<?php echo $i ?>" id="chk_<?php echo $i; ?>">
<input type="hidden" name="iq_id[<?php echo $i; ?>]" value="<?php echo $row['iq_id']; ?>">
</td>
<td><a href="<?php echo $href; ?>"><?php echo get_it_image($row['it_id'], 50, 50); ?><?php echo cut_str($row['it_name'],30); ?></a></td>
<td><a href="<?php echo $href; ?>"><?php echo get_it_image($row['it_id'], 50, 50); ?> <?php echo cut_str($row['it_name'],30); ?></a></td>
<td>
<a href="#" class="qa_href" onclick="return false;" target="<?php echo $i; ?>"><?php echo $row['iq_subject']; ?></a>
<div id="qa_div<?php echo $i; ?>" class="qa_div" style="display:none;">

48
adm/shop_admin/itemsellrank.php
View File

@ -1,6 +1,7 @@
<?php
$sub_menu = '500100';
include_once('./_common.php');
include_once(G5_PLUGIN_PATH.'/jquery-ui/datepicker.php');
auth_check($auth[$sub_menu], "r");
@ -16,12 +17,13 @@ $sql = " select a.it_id,
b.*,
SUM(IF(ct_status = '쇼핑',ct_qty, 0)) as ct_status_1,
SUM(IF(ct_status = '주문',ct_qty, 0)) as ct_status_2,
SUM(IF(ct_status = '준비',ct_qty, 0)) as ct_status_3,
SUM(IF(ct_status = '배송',ct_qty, 0)) as ct_status_4,
SUM(IF(ct_status = '완료',ct_qty, 0)) as ct_status_5,
SUM(IF(ct_status = '취소',ct_qty, 0)) as ct_status_6,
SUM(IF(ct_status = '반품',ct_qty, 0)) as ct_status_7,
SUM(IF(ct_status = '품절',ct_qty, 0)) as ct_status_8,
SUM(IF(ct_status = '입금',ct_qty, 0)) as ct_status_3,
SUM(IF(ct_status = '준비',ct_qty, 0)) as ct_status_4,
SUM(IF(ct_status = '배송',ct_qty, 0)) as ct_status_5,
SUM(IF(ct_status = '완료',ct_qty, 0)) as ct_status_6,
SUM(IF(ct_status = '취소',ct_qty, 0)) as ct_status_7,
SUM(IF(ct_status = '반품',ct_qty, 0)) as ct_status_8,
SUM(IF(ct_status = '품절',ct_qty, 0)) as ct_status_9,
SUM(ct_qty) as ct_status_sum
from {$g5['g5_shop_cart_table']} a, {$g5['g5_shop_item_table']} b ";
$sql .= " where a.it_id = b.it_id ";
@ -84,9 +86,9 @@ $listall = '<a href="'.$_SERVER['PHP_SELF'].'" class="ov_listall">전체목록</
기간설정
<label for="fr_date" class="sound_only">시작일</label>
<input type="text" name="fr_date" value="<?php echo $fr_date; ?>" class="frm_input" size="8" maxlength="8"> 에서
<input type="text" name="fr_date" value="<?php echo $fr_date; ?>" id="fr_date" required class="required frm_input" size="8" maxlength="8"> 에서
<label for="to_date" class="sound_only">종료일</label>
<input type="text" name="to_date" value="<?php echo $to_date; ?>" class="frm_input" size="8" maxlength="8"> 까지
<input type="text" name="to_date" value="<?php echo $to_date; ?>" id="to_date" required class="required frm_input" size="8" maxlength="8"> 까지
<input type="submit" value="검색" class="btn_submit">
</form>
@ -109,12 +111,13 @@ $listall = '<a href="'.$_SERVER['PHP_SELF'].'" class="ov_listall">전체목록</
<th scope="col">상품평</th>
<th scope="col"><a href="<?php echo title_sort("ct_status_1",1)."&amp;$qstr1"; ?>">쇼핑</a></th>
<th scope="col"><a href="<?php echo title_sort("ct_status_2",1)."&amp;$qstr1"; ?>">주문</a></th>
<th scope="col"><a href="<?php echo title_sort("ct_status_3",1)."&amp;$qstr1"; ?>">준비</a></th>
<th scope="col"><a href="<?php echo title_sort("ct_status_4",1)."&amp;$qstr1"; ?>">배송</a></th>
<th scope="col"><a href="<?php echo title_sort("ct_status_5",1)."&amp;$qstr1"; ?>">완료</a></th>
<th scope="col"><a href="<?php echo title_sort("ct_status_6",1)."&amp;$qstr1"; ?>">취소</a></th>
<th scope="col"><a href="<?php echo title_sort("ct_status_7",1)."&amp;$qstr1"; ?>">반품</a></th>
<th scope="col"><a href="<?php echo title_sort("ct_status_8",1)."&amp;$qstr1"; ?>">품절</a></th>
<th scope="col"><a href="<?php echo title_sort("ct_status_3",1)."&amp;$qstr1"; ?>">입금</a></th>
<th scope="col"><a href="<?php echo title_sort("ct_status_4",1)."&amp;$qstr1"; ?>">준비</a></th>
<th scope="col"><a href="<?php echo title_sort("ct_status_5",1)."&amp;$qstr1"; ?>">배송</a></th>
<th scope="col"><a href="<?php echo title_sort("ct_status_6",1)."&amp;$qstr1"; ?>">완료</a></th>
<th scope="col"><a href="<?php echo title_sort("ct_status_7",1)."&amp;$qstr1"; ?>">취소</a></th>
<th scope="col"><a href="<?php echo title_sort("ct_status_8",1)."&amp;$qstr1"; ?>">반품</a></th>
<th scope="col"><a href="<?php echo title_sort("ct_status_9",1)."&amp;$qstr1"; ?>">품절</a></th>
<th scope="col"><a href="<?php echo title_sort("ct_status_sum",1)."&amp;$qstr1"; ?>">합계</a></th>
</tr>
</thead>
@ -130,7 +133,7 @@ $listall = '<a href="'.$_SERVER['PHP_SELF'].'" class="ov_listall">전체목록</
?>
<tr class="<?php echo $bg; ?>">
<td class="td_num"><?php echo $num; ?></td>
<td><a href="<?php echo $href; ?>"><?php echo get_it_image($row['it_id'], 50, 50); ?><?php echo cut_str($row['it_name'],30); ?></a></td>
<td><a href="<?php echo $href; ?>"><?php echo get_it_image($row['it_id'], 50, 50); ?> <?php echo cut_str($row['it_name'],30); ?></a></td>
<td class="td_num"><?php echo $row['ct_status_1']; ?></td>
<td class="td_num"><?php echo $row['ct_status_2']; ?></td>
<td class="td_num"><?php echo $row['ct_status_3']; ?></td>
@ -139,13 +142,14 @@ $listall = '<a href="'.$_SERVER['PHP_SELF'].'" class="ov_listall">전체목록</
<td class="td_num"><?php echo $row['ct_status_6']; ?></td>
<td class="td_num"><?php echo $row['ct_status_7']; ?></td>
<td class="td_num"><?php echo $row['ct_status_8']; ?></td>
<td class="td_num"><?php echo $row['ct_status_9']; ?></td>
<td class="td_num"><?php echo $row['ct_status_sum']; ?></td>
</tr>
<?php
}
if ($i == 0) {
echo '<tr><td colspan="11" class="empty_table">자료가 없습니다.</td></tr>';
echo '<tr><td colspan="12" class="empty_table">자료가 없습니다.</td></tr>';
}
?>
</tbody>
@ -154,6 +158,18 @@ $listall = '<a href="'.$_SERVER['PHP_SELF'].'" class="ov_listall">전체목록</
<?php echo get_paging(G5_IS_MOBILE ? $config['cf_mobile_pages'] : $config['cf_write_pages'], $page, $total_page, "{$_SERVER['PHP_SELF']}?$qstr1&amp;page="); ?>
<script>
$(function() {
$("#fr_date, #to_date").datepicker({
changeMonth: true,
changeYear: true,
dateFormat: "yymmdd",
showButtonPanel: true,
yearRange: "c-99:c+99",
maxDate: "+0d"
});
});
</script>
<?php
include_once (G5_ADMIN_PATH.'/admin.tail.php');

13
adm/shop_admin/orderprint.php
View File

@ -1,6 +1,7 @@
<?php
$sub_menu = '500120';
include_once('./_common.php');
include_once(G5_PLUGIN_PATH.'/jquery-ui/datepicker.php');
auth_check($auth[$sub_menu], "r");
@ -32,10 +33,10 @@ include_once (G5_ADMIN_PATH.'/admin.head.php');
<option value="">전체</option>
</select>
<label for="fr_date" class="sound_only">기간 시작일</label>
<input type="text" name="fr_date" value="<?php echo date("Ymd"); ?>" id="fr_date" class="frm_input" size="10" maxlength="8">
<input type="text" name="fr_date" value="<?php echo date("Ymd"); ?>" id="fr_date" required class="required frm_input" size="10" maxlength="8">
~
<label for="to_date" class="sound_only">기간 종료일</label>
<input type="text" name="to_date" value="<?php echo date("Ymd"); ?>" id="to_date" class="frm_input" size="10" maxlength="8">
<input type="text" name="to_date" value="<?php echo date("Ymd"); ?>" id="to_date" required class="required frm_input" size="10" maxlength="8">
<input type="submit" value="출력 (새창)" class="btn_submit">
</form>
@ -64,10 +65,10 @@ include_once (G5_ADMIN_PATH.'/admin.head.php');
<option value="">전체</option>
</select>
<label for="fr_od_id" class="sound_only">주문번호 구간 시작</label>
<input type="text" name="fr_od_id" id="fr_od_id" class="frm_input" size="10" maxlength="20">
<input type="text" name="fr_od_id" id="fr_od_id" required class="required frm_input" size="10" maxlength="20">
~
<label for="fr_od_id" class="sound_only">주문번호 구간 종료</label>
<input type="text" name="to_od_id" id="to_od_id" class="frm_input" size="10" maxlength="20">
<input type="text" name="to_od_id" id="to_od_id" required class="required frm_input" size="10" maxlength="20">
<input type="submit" value="출력 (새창)" class="btn_submit">
</form>
@ -84,6 +85,10 @@ include_once (G5_ADMIN_PATH.'/admin.head.php');
</div>
<script>
$(function(){
$("#fr_date, #to_date").datepicker({ changeMonth: true, changeYear: true, dateFormat: "yymmdd", showButtonPanel: true, yearRange: "c-99:c+99", maxDate: "+0d" });
});
function forderprintcheck(f)
{
if (f.csv[0].checked || f.csv[1].checked)

28
adm/shop_admin/sale1.php
View File

@ -1,6 +1,7 @@
<?php
$sub_menu = '500110';
include_once('./_common.php');
include_once(G5_PLUGIN_PATH.'/jquery-ui/datepicker.php');
auth_check($auth[$sub_menu], "r");
@ -13,7 +14,7 @@ include_once (G5_ADMIN_PATH.'/admin.head.php');
<div>
<form name="frm_sale_today" action="./sale1today.php" method="get">
<strong>일일 매출</strong>
<input type="text" name="date" value="<?php echo date("Ymd", G5_SERVER_TIME); ?>" id="date" class="frm_input" size="8" maxlength="8">
<input type="text" name="date" value="<?php echo date("Ymd", G5_SERVER_TIME); ?>" id="date" required class="required frm_input" size="8" maxlength="8">
<label for="date">일 하루</label>
<input type="submit" value="확인" class="btn_submit">
</form>
@ -22,9 +23,9 @@ include_once (G5_ADMIN_PATH.'/admin.head.php');
<div>
<form name="frm_sale_date" action="./sale1date.php" method="get">
<strong>일간 매출</strong>
<input type="text" name="fr_date" value="<?php echo date("Ym01", G5_SERVER_TIME); ?>" id="fr_date" class="frm_input" size="8" maxlength="8">
<input type="text" name="fr_date" value="<?php echo date("Ym01", G5_SERVER_TIME); ?>" id="fr_date" required class="required frm_input" size="8" maxlength="8">
<label for="fr_date">일 ~</label>
<input type="text" name="to_date" value="<?php echo date("Ymd", G5_SERVER_TIME); ?>" id="to_date" class="frm_input" size="8" maxlength="8">
<input type="text" name="to_date" value="<?php echo date("Ymd", G5_SERVER_TIME); ?>" id="to_date" required class="required frm_input" size="8" maxlength="8">
<label for="to_date">일</label>
<input type="submit" value="확인" class="btn_submit">
</form>
@ -33,9 +34,9 @@ include_once (G5_ADMIN_PATH.'/admin.head.php');
<div>
<form name="frm_sale_month" action="./sale1month.php" method="get">
<strong>월간 매출</strong>
<input type="text" name="fr_month" value="<?php echo date("Y01", G5_SERVER_TIME); ?>" id="fr_month" class="frm_input" size="6" maxlength="6">
<input type="text" name="fr_month" value="<?php echo date("Y01", G5_SERVER_TIME); ?>" id="fr_month" required class="required frm_input" size="6" maxlength="6">
<label for="fr_month">월 ~</label>
<input type="text" name="to_month" value="<?php echo date("Ym", G5_SERVER_TIME); ?>" id="to_month" class="frm_input" size="6" maxlength="6">
<input type="text" name="to_month" value="<?php echo date("Ym", G5_SERVER_TIME); ?>" id="to_month" required class="required frm_input" size="6" maxlength="6">
<label for="to_month">월</label>
<input type="submit" value="확인" class="btn_submit">
</form>
@ -44,9 +45,9 @@ include_once (G5_ADMIN_PATH.'/admin.head.php');
<div class="sch_last">
<form name="frm_sale_year" action="./sale1year.php" method="get">
<strong>연간 매출</strong>
<input type="text" name="fr_year" value="<?php echo date("Y", G5_SERVER_TIME)-1; ?>" id="fr_year" class="frm_input" size="4" maxlength="4">
<input type="text" name="fr_year" value="<?php echo date("Y", G5_SERVER_TIME)-1; ?>" id="fr_year" required class="required frm_input" size="4" maxlength="4">
<label for="fr_year">년 ~</label>
<input type="text" name="to_year" value="<?php echo date("Y", G5_SERVER_TIME); ?>" id="to_year" class="frm_input" size="4" maxlength="4">
<input type="text" name="to_year" value="<?php echo date("Y", G5_SERVER_TIME); ?>" id="to_year" required class="required frm_input" size="4" maxlength="4">
<label for="to_year">년</label>
<input type="submit" value="확인" class="btn_submit">
</form>
@ -54,6 +55,19 @@ include_once (G5_ADMIN_PATH.'/admin.head.php');
</div>
<script>
$(function() {
$("#date, #fr_date, #to_date").datepicker({
changeMonth: true,
changeYear: true,
dateFormat: "yymmdd",
showButtonPanel: true,
yearRange: "c-99:c+99",
maxDate: "+0d"
});
});
</script>
<?php
include_once (G5_ADMIN_PATH.'/admin.tail.php');
?>

20
adm/shop_admin/wishlist.php
View File

@ -1,6 +1,7 @@
<?php
$sub_menu = '500140';
include_once('./_common.php');
include_once(G5_PLUGIN_PATH.'/jquery-ui/datepicker.php');
auth_check($auth[$sub_menu], "r");
@ -75,10 +76,10 @@ $listall = '<a href="'.$_SERVER['PHP_SELF'].'" class="ov_listall">전체목록</
</select>
<label for="fr_date" class="sound_only">시작일</label>
<input type="text" name="fr_date" value="<?php echo $fr_date; ?>" id="fr_date" class="frm_input" size="8" maxlength="8">
<input type="text" name="fr_date" value="<?php echo $fr_date; ?>" id="fr_date" required class="required frm_input" size="8" maxlength="8">
~
<label for="to_date" class="sound_only">종료일</label>
<input type="text" name="to_date" value="<?php echo $to_date; ?>" id="to_date" class="frm_input" size="8" maxlength="8">
<input type="text" name="to_date" value="<?php echo $to_date; ?>" id="to_date" required class="required frm_input" size="8" maxlength="8">
<input type="submit" value="검색" class="btn_submit">
</form>
@ -108,7 +109,7 @@ $listall = '<a href="'.$_SERVER['PHP_SELF'].'" class="ov_listall">전체목록</
<tr class="<?php echo $bg; ?>">
<td class="td_num"><?php echo $num; ?></td>
<td>
<a href="<?php echo $href; ?>"><?php echo get_it_image($row['it_id'], 50, 50); ?><?php echo cut_str($row['it_name'],30); ?></a>
<a href="<?php echo $href; ?>"><?php echo get_it_image($row['it_id'], 50, 50); ?> <?php echo cut_str($row['it_name'],30); ?></a>
</td>
<td class="td_num"><?php echo $row['it_id_cnt']; ?></td>
</tr>
@ -129,6 +130,19 @@ $listall = '<a href="'.$_SERVER['PHP_SELF'].'" class="ov_listall">전체목록</
<p>고객님들이 보관함에 가장 많이 넣은 순으로 순위를 출력합니다.</p>
</div>
<script>
$(function() {
$("#fr_date, #to_date").datepicker({
changeMonth: true,
changeYear: true,
dateFormat: "yymmdd",
showButtonPanel: true,
yearRange: "c-99:c+99",
maxDate: "+0d"
});
});
</script>
<?php
include_once (G5_ADMIN_PATH.'/admin.tail.php');
?>

2
css/default.css
View File

@ -140,7 +140,7 @@ a.btn02:focus, .btn02:hover {text-decoration:none}
.btn_confirm {text-align:center} /* 서식단계 진행 */
input.btn_submit {padding:0 10px;height:24px;border:0;background:#333;color:#fff;letter-spacing:-0.1em;vertical-align:middle;cursor:pointer}
input.btn_submit {padding:0 10px;height:24px;border:0;background:#ff3061;color:#fff;letter-spacing:-0.1em;vertical-align:middle;cursor:pointer}
button.btn_submit {height:22px}
fieldset .btn_submit {height:22px}

2
css/mobile.css
View File

@ -110,7 +110,7 @@ a.btn02:focus, .btn02:hover {text-decoration:none}
.btn_confirm {text-align:center} /* 서식단계 진행 */
input.btn_submit {padding:0 10px;height:2.6em;border:0;background:#333;color:#fff;letter-spacing:-0.1em;vertical-align:top;-webkit-appearance:none}
input.btn_submit {padding:0 10px;height:2.6em;border:0;background:#ff3061;color:#fff;letter-spacing:-0.1em;vertical-align:top;-webkit-appearance:none}
button.btn_submit {height:1.9em}
fieldset .btn_submit {height:1.9em}

57
lib/thumbnail.lib.php
View File

@ -103,11 +103,36 @@ function get_view_thumbnail($contents, $thumb_width=0)
$srcfile = G5_PATH.$data_path;
if(is_file($srcfile)) {
// 썸네일 높이
$size = @getimagesize($srcfile);
if(empty($size))
continue;
// jpg 이면 exif 체크
if($size[2] == 2) {
$degree = 0;
$exif = @exif_read_data($srcfile);
if(!empty($exif['Orientation'])) {
switch($exif['Orientation']) {
case 8:
$degree = 90;
break;
case 3:
$degree = 180;
break;
case 6:
$degree = -90;
break;
}
// 세로사진의 경우 가로, 세로 값 바꿈
if($degree == 90 || $degree == -90) {
$tmp = $size;
$size[0] = $tmp[1];
$size[1] = $tmp[0];
}
}
}
// 원본 width가 thumb_width보다 작다면
if($size[0] <= $thumb_width)
continue;
@ -118,6 +143,7 @@ function get_view_thumbnail($contents, $thumb_width=0)
$is_animated = is_animated_gif($srcfile);
}
// 썸네일 높이
$thumb_height = round(($thumb_width * $size[1]) / $size[0]);
$filename = basename($srcfile);
$filepath = dirname($srcfile);
@ -186,10 +212,39 @@ function thumbnail($filename, $source_path, $target_path, $thumb_width, $thumb_h
// 원본파일의 GD 이미지 생성
$src = null;
$degree = 0;
if ($size[2] == 1) {
$src = imagecreatefromgif($source_file);
} else if ($size[2] == 2) {
$src = imagecreatefromjpeg($source_file);
// exif 정보를 기준으로 회전각도 구함
$exif = @exif_read_data($source_file);
if(!empty($exif['Orientation'])) {
switch($exif['Orientation']) {
case 8:
$degree = 90;
break;
case 3:
$degree = 180;
break;
case 6:
$degree = -90;
break;
}
// 회전각도 있으면 이미지 회전
if($degree) {
$src = imagerotate($src, $degree, 0);
// 세로사진의 경우 가로, 세로 값 바꿈
if($degree == 90 || $degree == -90) {
$tmp = $size;
$size[0] = $tmp[1];
$size[1] = $tmp[0];
}
}
}
} else if ($size[2] == 3) {
$src = imagecreatefrompng($source_file);
} else {