diff --git a/css/admin.css b/css/admin.css index d510252a0..3458acc46 100644 --- a/css/admin.css +++ b/css/admin.css @@ -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} diff --git a/install/install_db.php b/install/install_db.php index 7360385aa..f6999cc06 100644 --- a/install/install_db.php +++ b/install/install_db.php @@ -1,5 +1,5 @@ 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() { diff --git a/mobile/shop/orderinquiryview.php b/mobile/shop/orderinquiryview.php index eaa014839..1d85a3a3e 100644 --- a/mobile/shop/orderinquiryview.php +++ b/mobile/shop/orderinquiryview.php @@ -41,6 +41,9 @@ include_once(G5_MSHOP_PATH.'/_head.php');
상품 배송이 완료되었습니다.
@@ -108,6 +115,10 @@ include_once(G5_MSHOP_PATH.'/_head.php'); 0 && $st_count1 == $st_count2) + $custom_cancel = true; ?> @@ -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'); diff --git a/shop/orderinquirycancel.php b/shop/orderinquirycancel.php index efd1a2fd0..c3f802c0e 100644 --- a/shop/orderinquirycancel.php +++ b/shop/orderinquirycancel.php @@ -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&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); // 주문취소 회원의 포인트를 되돌려 줌 diff --git a/shop/orderinquiryview.php b/shop/orderinquiryview.php index 2c3f0b353..bf3d1ce11 100644 --- a/shop/orderinquiryview.php +++ b/shop/orderinquiryview.php @@ -54,6 +54,9 @@ if(openwin != null) {
상품 배송이 완료되었습니다.
@@ -121,6 +128,10 @@ if(openwin != null) { 0 && $st_count1 == $st_count2) + $custom_cancel = true; ?> @@ -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) { diff --git a/tail.php b/tail.php index 93046060f..a5139b2c8 100644 --- a/tail.php +++ b/tail.php @@ -65,6 +65,16 @@ if ($config['cf_analytics']) { + + \ No newline at end of file