From 745802eaead35d1bf1ffcc268401583a3f0fdbb9 Mon Sep 17 00:00:00 2001 From: whitedot Date: Thu, 24 Oct 2013 10:43:28 +0900 Subject: [PATCH 1/4] =?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 2/4] =?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 3/4] =?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 4/4] =?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');