From fc775578421a871d188a5654aa9b72bf2d3c8d20 Mon Sep 17 00:00:00 2001 From: chicpro Date: Tue, 17 Sep 2013 10:11:22 +0900 Subject: [PATCH 1/7] =?UTF-8?q?=EA=B3=A0=EA=B0=9D=EC=B7=A8=EC=86=8C=20?= =?UTF-8?q?=EC=B2=98=EB=A6=AC=20=EC=BD=94=EB=93=9C=20=EC=98=A4=EB=A5=98=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- shop/orderinquirycancel.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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); // 주문취소 회원의 포인트를 되돌려 줌 From c5ac4cbd854b85a2f4271979945e329147be558c Mon Sep 17 00:00:00 2001 From: chicpro Date: Tue, 17 Sep 2013 10:11:50 +0900 Subject: [PATCH 2/7] =?UTF-8?q?=EA=B3=A0=EA=B0=9D=EC=B7=A8=EC=86=8C=20?= =?UTF-8?q?=EC=9A=94=EC=B2=AD=20=EA=B0=80=EB=8A=A5=20=EC=83=81=ED=83=9C=20?= =?UTF-8?q?=EC=B2=B4=ED=81=AC=20=EC=BD=94=EB=93=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mobile/shop/orderinquiryview.php | 18 ++++++++++++++---- shop/orderinquiryview.php | 18 ++++++++++++++---- 2 files changed, 28 insertions(+), 8 deletions(-) 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/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) { From 210c8d89c6f8f297c77f8b76207219b8579261cf Mon Sep 17 00:00:00 2001 From: chicpro Date: Tue, 17 Sep 2013 11:34:14 +0900 Subject: [PATCH 3/7] =?UTF-8?q?set=5Ftime=5Flimit=20=EA=B2=BD=EA=B3=A0=20?= =?UTF-8?q?=EC=B6=9C=EB=A0=A5=EB=90=98=EC=A7=80=20=EC=95=8A=EB=8F=84?= =?UTF-8?q?=EB=A1=9D=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- install/install_db.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/install_db.php b/install/install_db.php index ce48c598f..f355f91fd 100644 --- a/install/install_db.php +++ b/install/install_db.php @@ -1,5 +1,5 @@ Date: Tue, 17 Sep 2013 12:52:55 +0900 Subject: [PATCH 4/7] =?UTF-8?q?=ED=8F=B0=ED=8A=B8=20=EC=82=AC=EC=9D=B4?= =?UTF-8?q?=EC=A6=88=20=EB=B3=80=EA=B2=BD=20=ED=9B=84=20=EA=B8=B0=EB=B3=B8?= =?UTF-8?q?=ED=81=AC=EA=B8=B0=20=EC=84=A4=EC=A0=95=20=EC=8B=9C=20line-heig?= =?UTF-8?q?ht=20=EC=84=A4=EC=A0=95=20=EB=AC=B8=EC=A0=9C=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- js/common.js | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/js/common.js b/js/common.js index 8922f3e2e..fc4e51f24 100644 --- a/js/common.js +++ b/js/common.js @@ -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); // 엘리먼트의 기본 폰트사이즈 저장 From e9a0e77b9029d16e2f5e4b6a90dfc64bf134e636 Mon Sep 17 00:00:00 2001 From: whitedot Date: Tue, 17 Sep 2013 13:03:41 +0900 Subject: [PATCH 5/7] =?UTF-8?q?=EA=B4=80=EB=A6=AC=EC=9E=90:=20tnb=20ie6=20?= =?UTF-8?q?=EA=B9=A8=EC=A7=80=EB=8A=94=20=EB=AC=B8=EC=A0=9C=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- css/admin.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/css/admin.css b/css/admin.css index 04c025be3..ef83f39b4 100644 --- a/css/admin.css +++ b/css/admin.css @@ -33,7 +33,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} From b4de497107256e994715b0c154c35a741ebd05d0 Mon Sep 17 00:00:00 2001 From: chicpro Date: Tue, 17 Sep 2013 13:44:24 +0900 Subject: [PATCH 6/7] =?UTF-8?q?=ED=8F=B0=ED=8A=B8=20=EB=A6=AC=EC=82=AC?= =?UTF-8?q?=EC=9D=B4=EC=A6=88=20=ED=95=A8=EC=88=98=20=EC=8B=A4=ED=96=89=20?= =?UTF-8?q?=EC=BD=94=EB=93=9C=EB=A5=BC=20tail.php=20=ED=8C=8C=EC=9D=BC?= =?UTF-8?q?=EB=A1=9C=20=EC=9D=B4=EB=8F=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- js/jquery.menu.js | 6 ------ tail.php | 10 ++++++++++ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/js/jquery.menu.js b/js/jquery.menu.js index a84e0997f..01871f471 100644 --- a/js/jquery.menu.js +++ b/js/jquery.menu.js @@ -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() { 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 From 0ae6047b52bde79418869fc713fa6973818d1f33 Mon Sep 17 00:00:00 2001 From: chicpro Date: Tue, 17 Sep 2013 14:00:38 +0900 Subject: [PATCH 7/7] =?UTF-8?q?=ED=8F=B0=ED=8A=B8=20=EB=A6=AC=EC=82=AC?= =?UTF-8?q?=EC=9D=B4=EC=A6=88=20=EC=8B=A4=ED=96=89=20=EC=BD=94=EB=93=9C=20?= =?UTF-8?q?=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- js/jquery.shop.menu.js | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/js/jquery.shop.menu.js b/js/jquery.shop.menu.js index 5d1236593..9a08b03a0 100644 --- a/js/jquery.shop.menu.js +++ b/js/jquery.shop.menu.js @@ -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() {