From c120d092c71b478c79b8681b2d60de0f1ea34a3a Mon Sep 17 00:00:00 2001
From: chicpro <chicpro@gmail.com>
Date: Fri, 5 Jul 2013 17:59:51 +0900
Subject: [PATCH] =?UTF-8?q?#250=20=EC=B7=A8=EC=86=8C=EA=B0=80=EB=8A=A5=20?=
 =?UTF-8?q?=EA=B8=88=EC=95=A1=EC=9D=84=20=EC=B4=9D=EC=95=A1=EC=9C=BC?=
 =?UTF-8?q?=EB=A1=9C=EB=A7=8C=20=ED=91=9C=EC=8B=9C=ED=95=98=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

---
 adm/shop_admin/partcancel.php | 42 ++---------------------------------
 1 file changed, 2 insertions(+), 40 deletions(-)

diff --git a/adm/shop_admin/partcancel.php b/adm/shop_admin/partcancel.php
index 7ec058001..3ccd89bb5 100644
--- a/adm/shop_admin/partcancel.php
+++ b/adm/shop_admin/partcancel.php
@@ -26,40 +26,6 @@ if($od['od_settle_case'] == '계좌이체')
     $mod_type = 'STPA';
 
 $available_cancel = $od['od_receipt_amount'] - $od['od_cancel_card'];
-
-// 복합과세 사용시 각각 취소가능 금액
-if($default['de_tax_flag_use']) {
-    $sql = " select ct_price, io_price, io_type, ct_qty, ct_notax, cp_amount
-                from {$g4['shop_cart_table']}
-                where uq_id = '{$od['uq_id']}'
-                  and ct_status IN ( '주문', '준비', '배송', '완료' ) ";
-    $result = sql_query($sql);
-
-    $tot_tax_mny = 0;
-    $tot_free_mny = 0;
-
-    for($i=0; $row=sql_fetch_array($result); $i++) {
-        if($row['ct_notax']) {
-            if($row['io_type']) {
-                $tot_free += ($row['io_priece'] * $row['ct_qty']);
-            } else {
-                $tot_free += (($row['ct_price'] + $row['io_price']) * $row['ct_qty']);
-            }
-
-            $tot_free -= $row['cp_amount'];
-        } else {
-            if($row['io_type']) {
-                $tot_tax += ($row['io_priece'] * $row['ct_qty']);
-            } else {
-                $tot_tax += (($row['ct_price'] + $row['io_price']) * $row['ct_qty']);
-            }
-
-            $tot_tax -= $row['cp_amount'];
-        }
-    }
-
-    //$tot_tax -= ($od['od_send_cost'] + $od['od_send_cost2'] - $od['od_coupon'] - $od['od_send_coupon'] - $od['od_receipt_point']);
-}
 ?>
 
 <div>
@@ -72,11 +38,10 @@ if($default['de_tax_flag_use']) {
     <p>
         <?php echo $g4['title']; ?>
     </p>
-    <?php if($default['de_tax_flag_use']) { ?>
     <p>
-        과세 취소가능금액 : <?php echo number_format($tot_tax); ?> 원<br>
-        비과세 취소가능금액 : <?php echo number_format($tot_free); ?> 원
+        취소가능금액 : <?php echo number_format($available_cancel); ?> 원
     </p>
+    <?php if($default['de_tax_flag_use']) { ?>
     <p>
         <label for="tax_mny">과세 취소요청금액</label>
         <input type="text" name="tax_mny" id="tax_mny" size="20"> 원
@@ -86,9 +51,6 @@ if($default['de_tax_flag_use']) {
         <input type="text" name="mod_free_mny" id="mod_free_mny" size="20"> 원
     </p>
     <?php } else { ?>
-    <p>
-        취소가능금액 : <?php echo number_format($available_cancel); ?> 원
-    </p>
     <p>
         <label for="mod_mny">취소요청금액</label>
         <input type="text" name="mod_mny" id="mod_mny" size="20" required class="required"> 원