From 43b41354e6b38ee8feee319e99b7f01a7e32f4d1 Mon Sep 17 00:00:00 2001 From: chicpro Date: Fri, 13 Jun 2014 16:35:39 +0900 Subject: [PATCH] =?UTF-8?q?lg=20=EB=B6=80=EB=B6=84=EC=B7=A8=EC=86=8C=20?= =?UTF-8?q?=EA=B8=B0=EB=8A=A5=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adm/shop_admin/orderform.php | 2 +- adm/shop_admin/orderpartcancel.php | 32 +++-- adm/shop_admin/orderpartcancelupdate.php | 154 ++--------------------- shop/kcp/orderpartcancel.inc.php | 141 +++++++++++++++++++++ shop/lg/orderform.2.php | 2 +- shop/lg/orderpartcancel.inc.php | 99 +++++++++++++++ 6 files changed, 265 insertions(+), 165 deletions(-) create mode 100644 shop/kcp/orderpartcancel.inc.php create mode 100644 shop/lg/orderpartcancel.inc.php diff --git a/adm/shop_admin/orderform.php b/adm/shop_admin/orderform.php index 8ff35e862..4bdacfca4 100644 --- a/adm/shop_admin/orderform.php +++ b/adm/shop_admin/orderform.php @@ -721,7 +721,7 @@ if($od['od_pg'] == 'lg') { 0) { ?> 개인결제추가 - 0 && ($od['od_settle_case'] == '신용카드' || $od['od_settle_case'] == '계좌이체'))) { ?> + 0 && ($od['od_settle_case'] == '신용카드' || $od['od_settle_case'] == '계좌이체')) { ?> 부분취소 목록 diff --git a/adm/shop_admin/orderpartcancel.php b/adm/shop_admin/orderpartcancel.php index 2d05a24df..1db4bdffe 100644 --- a/adm/shop_admin/orderpartcancel.php +++ b/adm/shop_admin/orderpartcancel.php @@ -19,13 +19,8 @@ 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); +// 취소가능금액 +$od_misu = abs($od['od_misu']); ?>
@@ -43,12 +38,9 @@ $sum = sql_fetch($sql); - 과세 취소가능 금액 - + 취소가능 금액 + - - 비과세 취소가능 금액 - @@ -76,8 +68,7 @@ $sum = sql_fetch($sql);