From 0473e9f081865704b53b99647c9065499cb832e1 Mon Sep 17 00:00:00 2001 From: whitedot Date: Wed, 23 Oct 2013 11:00:08 +0900 Subject: [PATCH 01/14] =?UTF-8?q?=EA=B4=80=EB=A6=AC=EC=9E=90:=20min-width?= =?UTF-8?q?=20=EC=A0=81=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- css/admin.css | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/css/admin.css b/css/admin.css index c4536cb32..183b9e894 100644 --- a/css/admin.css +++ b/css/admin.css @@ -22,12 +22,12 @@ a {color:#000;text-decoration:none} a:focus, a:hover, a:active {text-decoration:underline} /* 헤딩 */ -h1 {margin:0 0 10px;padding:0 20px 10px;border-bottom:1px solid #e9e9e9;color:#333;font-size:1.5em;font-family:dotum;letter-spacing:-0.1em} +h1 {margin:0 0 10px;padding:0 20px 10px;min-width:960px;border-bottom:1px solid #e9e9e9;color:#333;font-size:1.5em;font-family:dotum;letter-spacing:-0.1em} h2 {margin:0 0 10px;padding:0 20px;font-size:1.2em} h2.h2_frm {padding-top:15px} /* 레이아웃 */ -#hd {z-index:10;background:url('../adm/img/hd_bg.jpg') #383b3f repeat-x} +#hd {z-index:10;min-width:1000px;background:url('../adm/img/hd_bg.jpg') #383b3f repeat-x} #hd h1, #hd h2 {position:absolute;border:0;font-size:0;line-height:0;overflow:hidden} #hd_wrap {z-index:11;position:relative;margin:0 auto} #logo {position:relative;height:70px} @@ -45,7 +45,7 @@ h2.h2_frm {padding-top:15px} #tnb span {position:absolute;bottom:10px;left:0;width:100%;text-align:center} /* gnb js off */ -#gnb {z-index:12;background:#383a3f} +#gnb {z-index:12;min-width:999px;background:#383a3f} #gnb h2 {margin:0;padding:0;font-size:0;line-height:0;overflow:hidden} #gnb_1dul {margin:0 auto;padding:0;zoom:1} #gnb_1dul:after {display:block;visibility:hidden;clear:both;content:""} @@ -74,13 +74,13 @@ h2.h2_frm {padding-top:15px} .gnb_js .gnb_grp_style:focus, .gnb_js .gnb_grp_style:hover {background:#484848 !important} .gnb_js .gnb_grp_div {border-top:1px solid #eee} -#lnb {margin:0;padding:15px;border-bottom:1px solid #e9e9e9;list-style:none;zoom:1} +#lnb {margin:0;padding:15px;min-width:970px;border-bottom:1px solid #e9e9e9;list-style:none;zoom:1} #lnb:after {display:block;visibility:hidden;clear:both;content:""} #lnb li {float:left} #lnb a {display:inline-block;margin:0 0 0 10px;padding:0 10px 0 0;border-right:1px solid #ccc;font-size:0.95em;letter-spacing:-0.1em} /* 중간 레이아웃 */ -#wrapper {z-index:5;margin:20px 0;zoom:1} +#wrapper {z-index:5;margin:20px 0;min-width:1000px;zoom:1} #wrapper:after {display:block;visibility:hidden;clear:both;content:""} #container {z-index:4;position:relative} @@ -193,13 +193,13 @@ legend {position:absolute;width:0;height:0;font-size:0;line-height:0;text-indent #sort_mb {width:800px} - #sort_sodr {width:600px} /* 하단 레이아웃 */ -#ft {margin:20px 0;padding:10px 20px;border-top:1px solid #d0d6d8} +#ft {margin:20px 0;padding:10px 20px;min-width:960px;border-top:1px solid #d0d6d8} /* 페이지 내 검색 */ +.local_sch {min-width:960px} .local_sch .btn_submit {padding:3px 5px;border:1px solid #ff3061;color:#fff;font-size:0.95em;vertical-align:middle;cursor:pointer} .local_sch01 {margin:0 0 10px;padding:0 20px 10px;border-bottom:1px solid #e9e9e9} @@ -214,26 +214,30 @@ legend {position:absolute;width:0;height:0;font-size:0;line-height:0;text-indent .local_sch02 button {padding:3px 5px;border:1px solid #ced9de;background:#f6f9fa;font-size:0.95em;cursor:pointer} /* 페이지 내 실행 */ +.local_cmd {min-width:960px} + .local_cmd01 {margin:0 0 10px;padding:0 20px} .local_cmd01 .cmd_tit {font-weight:bold} .local_cmd01 .btn_submit {padding:3px 5px;border:1px solid #ff3061;color:#fff;font-size:0.95em;vertical-align:middle;cursor:pointer} /* 페이지 내 안내문 */ +.local_desc {} .local_desc ol, .local_desc ul {margin:0;padding:0 0 10px 21px} .local_desc li {margin:0 0 5px} -.local_desc01 {margin:0 20px 10px;padding:10px 20px 0;border:1px solid #f2f2f2;background:#f9f9f9} +.local_desc01 {margin:0 20px 10px;padding:10px 20px 0;min-width:920px;border:1px solid #f2f2f2;background:#f9f9f9} .local_desc01 strong {color:#ff3061} .local_desc01 a {text-decoration:underline} -.local_desc02 {margin:0 20px 10px} /* 주로 온라인 서식 관련 안내 내용에 사용 */ +.local_desc02 {margin:0 20px 10px;min-width:960px} /* 주로 온라인 서식 관련 안내 내용에 사용 */ .local_desc02 p {padding:0} /* 페이지 내 카운트 */ +.local_ov {min-width:960px} + .local_ov01 {position:relative;margin:-10px 0 10px;padding:10px 20px;border-bottom:1px solid #e9e9e9;background:#f2f5f9} .local_ov01 .ov_listall {display:inline-block;margin:0 5px 0 0;padding:0 10px 0 0;border-right:1px solid #ccc} - /* 테이블 */ table {clear:both;width:100%;border-collapse:collapse;border-spacing:0} table caption {height:0;font-size:0;line-height:0;overflow:hidden} From aa4356867f126e63bf9ed089a412d49a13da43b7 Mon Sep 17 00:00:00 2001 From: gnuboard Date: Wed, 23 Oct 2013 18:34:45 +0900 Subject: [PATCH 02/14] =?UTF-8?q?=EC=A3=BC=EB=AC=B8=EB=A6=AC=EC=8A=A4?= =?UTF-8?q?=ED=8A=B8=EC=97=90=EC=84=9C=20=EC=83=81=ED=83=9C=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD=EC=A4=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adm/shop_admin/orderlist.php | 20 +++++--------------- adm/shop_admin/orderlistupdate.php | 1 - 2 files changed, 5 insertions(+), 16 deletions(-) diff --git a/adm/shop_admin/orderlist.php b/adm/shop_admin/orderlist.php index 130dd25f5..c9db01d60 100644 --- a/adm/shop_admin/orderlist.php +++ b/adm/shop_admin/orderlist.php @@ -198,7 +198,7 @@ $listall = '전체목록 -
+
@@ -397,17 +397,8 @@ $listall = '전체목록 - - - - 주문상태 변경 + 전체목록 - - + @@ -497,7 +487,7 @@ function forderlist_submit(f) } if (f.od_status.checked == false) { - alert("변경하실 주문상태를 선택하세요."); + alert("주문상태 변경에 체크하세요."); return false; } diff --git a/adm/shop_admin/orderlistupdate.php b/adm/shop_admin/orderlistupdate.php index e7767bbe9..c29e007d1 100644 --- a/adm/shop_admin/orderlistupdate.php +++ b/adm/shop_admin/orderlistupdate.php @@ -156,7 +156,6 @@ for ($i=0; $i Date: Thu, 24 Oct 2013 08:59:04 +0900 Subject: [PATCH 03/14] =?UTF-8?q?=ED=83=AD=20=EB=84=93=EC=9D=B4=EB=A5=BC?= =?UTF-8?q?=20outerWidth=20=EB=A1=9C=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- js/shop.mobile.main.js | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/js/shop.mobile.main.js b/js/shop.mobile.main.js index 36edbe633..50d20cb25 100644 --- a/js/shop.mobile.main.js +++ b/js/shop.mobile.main.js @@ -60,7 +60,7 @@ $tabs.each(function() { $(this) .css("width", $(this).width()) - .data("width", $(this).outerWidth()); + .data("width", $(this).width()); }); $btns.on("click", function() { @@ -87,8 +87,10 @@ $slides.not("."+cfg.active_class).css("left", "-"+width+"px"); + set_tab_width(idx); + if(count == 1) { - tab_width = $tabs.eq(0).data("width"); + tab_width = $tabs.eq(0).outerWidth(); pos_left = parseInt((tabw_width - tab_width) / 2); $tabs.eq(0).css("left", pos_left).addClass(cfg.tab_active); } else if(count == 2) { @@ -102,8 +104,6 @@ $slides.eq((idx - 1)).css("left", "-"+width+"px"); $slides.eq((idx + 1) % count).css("left", width+"px"); } - - set_tab_width(idx); } function swipe_left() @@ -128,14 +128,14 @@ $slides.eq(next).css("left", width+"px"); $tabs.removeClass(cfg.tab_active); + set_tab_width(next); + if(count >= 3) { tab_position(next); } else { $tabs.eq(next).addClass(cfg.tab_active); } - set_tab_width(next); - $slides.eq(idx).clearQueue().animate( { left: "-="+width }, cfg.duration, function() { @@ -178,14 +178,14 @@ $slides.eq(next).css("left", "-"+width+"px"); $tabs.removeClass(cfg.tab_active); + set_tab_width(next); + if(count >= 3) { tab_position(next); } else { $tabs.eq(next).addClass(cfg.tab_active); } - set_tab_width(next); - $slides.eq(idx).clearQueue().animate( { left: "+="+width }, cfg.duration, function() { @@ -220,8 +220,8 @@ var $tab_l = $tabs.eq(idx - 1); var $tab_c = $tabs.eq(idx); var $tab_r = $tabs.eq((idx + 1) % count); - var w_c = $tab_c.data("width"); - var w_r = $tab_r.data("width"); + var w_c = $tab_c.outerWidth(); + var w_r = $tab_r.outerWidth(); var pl = 0; var pc = parseInt((tabw_width - w_c) / 2); From 745802eaead35d1bf1ffcc268401583a3f0fdbb9 Mon Sep 17 00:00:00 2001 From: whitedot Date: Thu, 24 Oct 2013 10:43:28 +0900 Subject: [PATCH 04/14] =?UTF-8?q?=EA=B4=80=EB=A6=AC=EC=9E=90:=20=EC=83=88?= =?UTF-8?q?=EC=B0=BD=20=EC=8A=A4=ED=83=80=EC=9D=BC=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- css/admin.css | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/css/admin.css b/css/admin.css index 183b9e894..4f3dd4c35 100644 --- a/css/admin.css +++ b/css/admin.css @@ -624,9 +624,8 @@ strong.sodr_nonpay {display:block;padding:5px 0;text-align:right} /* 새창 기본 스타일 */ .new_win {} -.new_win h1 {margin-bottom:20px;padding:0 20px;height:60px;border-top:2px solid #484848;border-bottom:1px solid #e9e9e9;background:#fff;font-size:1.2em;line-height:5em} -.new_win h2 {margin:0 auto 10px;width:93%} -.new_win table {margin:0 auto 20px;width:93%;background:#fff} +.new_win h1 {margin-bottom:20px;padding:0 20px;min-width:320px/* 적정값으로 변경하여 사용하세요. */;height:60px;border-top:2px solid #484848;border-bottom:1px solid #e9e9e9;background:#fff;font-size:1.2em;line-height:5em} +.new_win h2 {margin:0 20px 10px} .new_win_ul {margin:-20px 0 20px 0;padding:0 0 0 20px;border-bottom:1px solid #515151;background:#484848;list-style:none;zoom:1} .new_win_ul:after {display:block;visibility:hidden;clear:both;content:""} .new_win_ul li {float:left;margin-left:-1px} @@ -634,7 +633,7 @@ strong.sodr_nonpay {display:block;padding:5px 0;text-align:right} .new_win_ul a {display:block;padding:10px 10px 8px;border-right:1px solid #595959;border-left:1px solid #595959;color:#fff;font-family:dotum;font-weight:bold;text-decoration:none} .new_win_desc {margin:0 auto;width:93%} .new_win .anchor {margin:0 auto 5px;width:93%} -.new_win .tbl_wrap {margin:0;padding:0} +.new_win .tbl_wrap {margin:0 20px;padding:0} /* 자바스크립트 alert 대안 */ #validation_check {margin:100px auto;width:500px} From 204a3fd83c81bd64705ac8711e8a1f34b567bc3b Mon Sep 17 00:00:00 2001 From: whitedot Date: Thu, 24 Oct 2013 10:44:29 +0900 Subject: [PATCH 05/14] =?UTF-8?q?=EA=B4=80=EB=A6=AC=EC=9E=90:=20=EC=83=88?= =?UTF-8?q?=EC=B0=BD=20=EC=8A=A4=ED=83=80=EC=9D=BC=20=EC=88=98=EC=A0=952?= 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 4f3dd4c35..aac68f1db 100644 --- a/css/admin.css +++ b/css/admin.css @@ -633,7 +633,7 @@ strong.sodr_nonpay {display:block;padding:5px 0;text-align:right} .new_win_ul a {display:block;padding:10px 10px 8px;border-right:1px solid #595959;border-left:1px solid #595959;color:#fff;font-family:dotum;font-weight:bold;text-decoration:none} .new_win_desc {margin:0 auto;width:93%} .new_win .anchor {margin:0 auto 5px;width:93%} -.new_win .tbl_wrap {margin:0 20px;padding:0} +.new_win .tbl_wrap {margin:0 20px 20px;padding:0} /* 자바스크립트 alert 대안 */ #validation_check {margin:100px auto;width:500px} From b3cd62334ef9750d9f0e8d9381719dbd312ecae7 Mon Sep 17 00:00:00 2001 From: chicpro Date: Thu, 24 Oct 2013 11:14:43 +0900 Subject: [PATCH 06/14] =?UTF-8?q?=EC=9E=98=EB=AA=BB=EB=90=9C=20=EC=82=AC?= =?UTF-8?q?=EC=9D=B4=ED=8A=B8=ED=82=A4=20=EC=A7=80=EC=A0=95=EC=9C=BC?= =?UTF-8?q?=EB=A1=9C=20=EC=9D=B8=ED=95=9C=EC=98=A4=EB=A5=98=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 --- shop/kcp/pp_ax_hub.php | 1 - 1 file changed, 1 deletion(-) diff --git a/shop/kcp/pp_ax_hub.php b/shop/kcp/pp_ax_hub.php index f12c315c5..83ea20c9f 100644 --- a/shop/kcp/pp_ax_hub.php +++ b/shop/kcp/pp_ax_hub.php @@ -25,7 +25,6 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가 } $g_conf_site_cd = $_POST['site_cd']; - $g_conf_site_key = $default['de_kcp_mid']; if (preg_match("/^T000/", $g_conf_site_cd) || $default['de_card_test']) { $g_conf_gw_url = "testpaygw.kcp.co.kr"; // real url : paygw.kcp.co.kr , test url : testpaygw.kcp.co.kr From 3ac2ab8798341a20dc1515ecd8e9349789123f8f Mon Sep 17 00:00:00 2001 From: chicpro Date: Thu, 24 Oct 2013 11:15:08 +0900 Subject: [PATCH 07/14] =?UTF-8?q?=EA=B4=80=EB=A6=AC=EC=9E=90=20=EB=B6=80?= =?UTF-8?q?=EB=B6=84=EC=B7=A8=EC=86=8C=20=EC=B2=98=EB=A6=AC=20=EC=BD=94?= =?UTF-8?q?=EB=93=9C=20=EA=B0=84=EC=86=8C=ED=99=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adm/shop_admin/orderpartcancel.php | 20 +++++-- adm/shop_admin/orderpartcancelupdate.php | 70 +++++++++--------------- 2 files changed, 39 insertions(+), 51 deletions(-) diff --git a/adm/shop_admin/orderpartcancel.php b/adm/shop_admin/orderpartcancel.php index 81eb25ade..2d05a24df 100644 --- a/adm/shop_admin/orderpartcancel.php +++ b/adm/shop_admin/orderpartcancel.php @@ -18,6 +18,14 @@ if($od['od_receipt_price'] - $od['od_refund_price'] <= 0) $g5['title'] = $od['od_settle_case'].' 부분취소'; include_once(G5_PATH.'/head.sub.php'); + +// 과세, 비과세 취소가능 금액계산 +$sql = " select SUM( IF( ct_notax = 0, ( IF(io_type = 1, (io_price * ct_qty), ( (ct_price + io_price) * ct_qty) ) - cp_price ), 0 ) ) as tax_mny, + SUM( IF( ct_notax = 1, ( IF(io_type = 1, (io_price * ct_qty), ( (ct_price + io_price) * ct_qty) ) - cp_price ), 0 ) ) as free_mny + from {$g5['g5_shop_cart_table']} + where od_id = '$od_id' + and ct_status IN ( '취소', '반품', '품절' ) "; +$sum = sql_fetch($sql); ?> @@ -35,12 +43,12 @@ include_once(G5_PATH.'/head.sub.php'); - 과세 입금금액 - + 과세 취소가능 금액 + - 비과세 입금금액 - + 비과세 취소가능 금액 + @@ -68,8 +76,8 @@ include_once(G5_PATH.'/head.sub.php');