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-09-17 14:10:54 +09:00
parent a15a0320a0 df4254db12
commit 9af550206b
9 changed files with 45 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
css/admin.css
View File

@ -34,7 +34,7 @@ h2 {font-size:1.2em}
#tnb {float:right;margin:0;padding:0;zoom:1}
#tnb:after {display:block;visibility:hidden;clear:both;content:""}
#tnb li {float:left;margin:0 0 0 1px}
#tnb a {display:block;position:relative;padding:0 15px;height:33px;background:#383a3f;color:#e0e0e0;text-decoration:none;line-height:2.8em}
#tnb a {display:inline-block;position:relative;padding:0 15px;height:33px;background:#383a3f;color:#e0e0e0;text-decoration:none;line-height:2.8em}
#tnb a:focus, #tnb a:hover {background:#fff;color:#383a3f}
#tnb span {position:absolute;bottom:10px;left:0;width:100%;text-align:center}

2
install/install_db.php
View File

@ -1,5 +1,5 @@
<?php
set_time_limit(0);
@set_time_limit(0);
$gmnow = gmdate('D, d M Y H:i:s') . ' GMT';
header('Expires: 0'); // rfc2616 - Section 14.21
header('Last-Modified: ' . $gmnow);

9
js/common.js
View File

@ -400,16 +400,11 @@ function font_resize(id, act)
var $elements = $("#"+id+" *").not("select").not("option");
$elements.removeClass("applied");
// container의 기본 line-height 저장
if(!default_line_height_saved) {
$("#"+id+" *").data("lh", $("#"+id+" *").css("line-height"));
default_line_height_saved = true;
}
// 폰트 크기 변경에 따른 line-height 적용
var lh = 1.5;
if(act == "default")
lh = $("#"+id+" *").data("lh");
lh = ""
$("#"+id+" *").css("line-height", lh);
// 엘리먼트의 기본 폰트사이즈 저장

6
js/jquery.menu.js
View File

@ -68,12 +68,6 @@ $(function(){
submenu_hide();
}
});
// 폰트 리사이즈 쿠키있으면 실행
var font_resize_act = get_cookie("ck_font_resize_act");
if(font_resize_act != "") {
font_resize("container", font_resize_act);
}
});
function submenu_hide() {

13
js/jquery.shop.menu.js
View File

@ -65,19 +65,6 @@ $(function(){
submenu_hide();
}
});
// 텍스트 리사이즈 카운트 쿠키있으면 실행
var resize_act;
var text_resize_count = parseInt(get_cookie("ck_font_resize_count"));
if(!isNaN(text_resize_count)) {
if(text_resize_count > 0)
resize_act = "increase";
else if(text_resize_count < 0)
resize_act = "decrease";
if(Math.abs(text_resize_count) > 0)
font_resize2("container", resize_act, Math.abs(text_resize_count));
}
});
function submenu_hide() {

18
mobile/shop/orderinquiryview.php
View File

@ -41,6 +41,9 @@ include_once(G5_MSHOP_PATH.'/_head.php');
<dd>상품 배송이 완료되었습니다.</dd>
</dl>
<?php
$st_count1 = $st_count2 = 0;
$custom_cancel = false;
$sql = " select it_id, it_name, cp_price
from {$g5['g5_shop_cart_table']}
where od_id = '$od_id'
@ -101,6 +104,10 @@ include_once(G5_MSHOP_PATH.'/_head.php');
</tr>
<?php
$tot_point += $point;
$st_count1++;
if($opt['ct_status'] == '주문')
$st_count2++;
}
?>
</tbody>
@ -108,6 +115,10 @@ include_once(G5_MSHOP_PATH.'/_head.php');
</li>
<?php
}
// 주문 상품의 상태가 모두 주문이면 고객 취소 가능
if($st_count1 > 0 && $st_count1 == $st_count2)
$custom_cancel = true;
?>
</ul>
@ -162,8 +173,9 @@ include_once(G5_MSHOP_PATH.'/_head.php');
$cancel_price = $od['od_cancel_price'];
$misu = true;
$misu_price = $tot_price - $receipt_price - $cancel_price;
if ($tot_price - $cancel_price == $receipt_price) {
if ($misu_price == 0 && ($od['od_cart_price'] > $od['od_cancel_price'])) {
$wanbul = " (완불)";
$misu = false; // 미수금 없음
}
@ -172,8 +184,6 @@ include_once(G5_MSHOP_PATH.'/_head.php');
$wanbul = display_price($receipt_price);
}
$misu_price = $tot_price - $receipt_price - $cancel_price;
// 결제정보처리
if($od['od_receipt_price'] > 0)
$od_receipt_price = display_price($od['od_receipt_price']);
@ -497,7 +507,7 @@ include_once(G5_MSHOP_PATH.'/_head.php');
<?php
// 취소한 내역이 없다면
if ($cancel_price == 0) {
if ($od['od_settle_case'] != '가상계좌' || $od['od_receipt_price'] == 0) {
if ($custom_cancel) {
?>
<button type="button" onclick="document.getElementById('sod_fin_cancelfrm').style.display='block';">주문 취소하기</button>

6
shop/orderinquirycancel.php
View File

@ -24,7 +24,7 @@ $ct = sql_fetch($sql);
$uid = md5($od['od_id'].$od['od_time'].$od['od_ip']);
if($od['od_status'] != G5_OD_STATUS_ORDER && $od['od_status'] != G5_OD_STATUS_SETTLE) {
if($od['od_cancel_price'] > 0 || $ct['od_count1'] != $ct['od_count2']) {
alert("취소할 수 있는 주문이 아닙니다.", G5_SHOP_URL."/orderinquiryview.php?od_id=$od_id&amp;uid=$uid");
}
@ -64,7 +64,7 @@ sql_query(" update {$g5['g5_shop_cart_table']} set ct_status = '취소' where od
// 주문 취소
$cancel_memo = addslashes($cancel_memo);
$cancel_price = $od['od_misu'];
$cancel_price = $od['od_cart_price'];
$sql = " update {$g5['g5_shop_order_table']}
set od_send_cost = '0',
@ -77,7 +77,7 @@ $sql = " update {$g5['g5_shop_order_table']}
od_coupon = '0',
od_send_coupon = '0',
od_shop_memo = concat(od_shop_memo,\"\\n주문자 본인 직접 취소 - ".G5_TIME_YMDHIS." (취소이유 : {$cancel_memo})\")
where od_id = '$od_id' "
where od_id = '$od_id' ";
sql_query($sql);
// 주문취소 회원의 포인트를 되돌려 줌

18
shop/orderinquiryview.php
View File

@ -54,6 +54,9 @@ if(openwin != null) {
<dd>상품 배송이 완료되었습니다.</dd>
</dl>
<?php
$st_count1 = $st_count2 = 0;
$custom_cancel = false;
$sql = " select it_id, it_name
from {$g5['g5_shop_cart_table']}
where od_id = '$od_id'
@ -114,6 +117,10 @@ if(openwin != null) {
</tr>
<?php
$tot_point += $point;
$st_count1++;
if($opt['ct_status'] == '주문')
$st_count2++;
}
?>
</tbody>
@ -121,6 +128,10 @@ if(openwin != null) {
</li>
<?php
}
// 주문 상품의 상태가 모두 주문이면 고객 취소 가능
if($st_count1 > 0 && $st_count1 == $st_count2)
$custom_cancel = true;
?>
</ul>
@ -174,8 +185,9 @@ if(openwin != null) {
$cancel_price = $od['od_cancel_price'];
$misu = true;
$misu_price = $tot_price - $receipt_price - $cancel_price;
if ($tot_price - $cancel_price == $receipt_price) {
if ($misu_price == 0 && ($od['od_cart_price'] > $od['od_cancel_price'])) {
$wanbul = " (완불)";
$misu = false; // 미수금 없음
}
@ -184,8 +196,6 @@ if(openwin != null) {
$wanbul = display_price($receipt_price);
}
$misu_price = $tot_price - $receipt_price - $cancel_price;
// 결제정보처리
if($od['od_receipt_price'] > 0)
$od_receipt_price = display_price($od['od_receipt_price']);
@ -508,7 +518,7 @@ if(openwin != null) {
<?php
// 취소한 내역이 없다면
if ($cancel_price == 0) {
if ($od['od_status'] == G5_OD_STATUS_ORDER || $od['od_status'] == G5_OD_STATUS_SETTLE) {
if ($custom_cancel) {
?>
<button type="button" onclick="document.getElementById('sod_fin_cancelfrm').style.display='block';">주문 취소하기</button>

10
tail.php
View File

@ -65,6 +65,16 @@ if ($config['cf_analytics']) {
<!-- } 하단 끝 -->
<script>
$(function() {
// 폰트 리사이즈 쿠키있으면 실행
var font_resize_act = get_cookie("ck_font_resize_act");
if(font_resize_act != "") {
font_resize("container", font_resize_act);
}
});
</script>
<?php
include_once(G5_PATH."/tail.sub.php");
?>