diff --git a/adm/shop_admin/orderlist.php b/adm/shop_admin/orderlist.php
index c9db01d60..bb9911341 100644
--- a/adm/shop_admin/orderlist.php
+++ b/adm/shop_admin/orderlist.php
@@ -336,7 +336,7 @@ $listall = '전체목록
-
+
@@ -345,7 +345,7 @@ $listall = '전체목록
|
-
+
@@ -358,7 +358,7 @@ $listall = '전체목록
|
-
+
@@ -397,7 +397,7 @@ $listall = '전체목록
-
+ 주문상태 변경
전체목록
if ($od_status == '배송') $change_status = "완료";
?>
-
+
-
+ 주문상태에서만 삭제가 가능합니다.
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);
?>
|