From 3ac2ab8798341a20dc1515ecd8e9349789123f8f Mon Sep 17 00:00:00 2001
From: chicpro <chicpro@gmail.com>
Date: Thu, 24 Oct 2013 11:15:08 +0900
Subject: [PATCH] =?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);
 ?>
 
 <form name="forderpartcancel" method="post" action="./orderpartcancelupdate.php" onsubmit="return form_check(this);">
@@ -35,12 +43,12 @@ include_once(G5_PATH.'/head.sub.php');
         </colgroup>
         <tbody>
         <tr>
-            <th scope="row">과세 입금금액</th>
-            <td><?php echo display_price($od['od_tax_mny'] + $od['od_vat_mny']); ?></td>
+            <th scope="row">과세 취소가능 금액</th>
+            <td><?php echo display_price($sum['tax_mny']); ?></td>
         </tr>
         <tr>
-            <th scope="row">비과세 입금금액</th>
-            <td><?php echo display_price($od['od_free_mny']); ?></td>
+            <th scope="row">비과세 취소가능 금액</th>
+            <td><?php echo display_price($sum['free_mny']); ?></td>
         </tr>
         <tr>
             <th scope="row"><label for="mod_tax_mny">과세 취소금액</label></th>
@@ -68,8 +76,8 @@ include_once(G5_PATH.'/head.sub.php');
 <script>
 function form_check(f)
 {
-    var max_tax_mny = parseInt(<?php echo ($od['od_tax_mny'] + $od['od_vat_mny']); ?>);
-    var max_free_mny = parseInt(<?php echo $od['od_free_mny']; ?>);
+    var max_tax_mny = parseInt(<?php echo $sum['tax_mny']; ?>);
+    var max_free_mny = parseInt(<?php echo $sum['free_mny']; ?>);
     var tax_mny = parseInt(f.mod_tax_mny.value.replace("/[^0-9]/g", ""));
     var free_mny = parseInt(f.mod_free_mny.value.replace("/[^0-9]/g", ""));
 
diff --git a/adm/shop_admin/orderpartcancelupdate.php b/adm/shop_admin/orderpartcancelupdate.php
index e99b25d15..0b27f127c 100644
--- a/adm/shop_admin/orderpartcancelupdate.php
+++ b/adm/shop_admin/orderpartcancelupdate.php
@@ -24,11 +24,19 @@ if($od['od_settle_case'] == '계좌이체' && substr($od['od_receipt_time'], 0,
     alert_close('실시간 계좌이체건의 부분취소 요청은 결제일 익일에 가능합니다.');
 
 // 금액비교
-if($tax_mny && $tax_mny > ($od['od_tax_mny'] + $od['od_vat_mny']))
-    alert('과세 취소금액을 '.number_format(($od['od_tax_mny'] + $od['od_vat_mny'])).'원 이하로 입력해 주십시오.');
+// 과세, 비과세 취소가능 금액계산
+$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);
 
-if($free_mny && $free_mny > $od['od_free_mny'])
-    alert('비과세 취소금액을 '.number_format($od['od_free_mny']).'원 이하로 입력해 주십시오.');
+if($tax_mny && $tax_mny > $sum['tax_mny'])
+    alert('과세 취소금액을 '.number_format($sum['tax_mny']).'원 이하로 입력해 주십시오.');
+
+if($free_mny && $free_mny > $sum['free_mny'])
+    alert('비과세 취소금액을 '.number_format($sum['free_mny']).'원 이하로 입력해 주십시오.');
 
 // 취소사유의 한글깨짐 방지처리
 $def_locale = setlocale(LC_CTYPE, 0);
@@ -160,52 +168,24 @@ if ( $req_tx == "mod" )
         $mod_mny = $c_PayPlus->mf_get_res_data( "panc_mod_mny" ); // 취소요청된 금액
         $rem_mny = $c_PayPlus->mf_get_res_data( "panc_rem_mny" ); // 취소요청후 잔액
 
-        // 주문 합계
-        $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['od_id']}'
-                      and ct_status IN ( '주문', '준비', '배송', '완료' ) ";
-        $sum = sql_fetch($sql);
-
-        $tax_mny = $sum['tax_mny'];
-        $free_mny = $sum['free_mny'];
-
-        // 과세, 비과세
-        if($od['od_tax_flag']) {
-            $tot_tax_mny = ( $tax_mny + $od['od_send_cost'] + $od['od_send_cost2'] )
-                           - ( $od['od_coupon'] + $od['od_send_coupon'] + $od['od_receipt_point'] );
-            if($tot_tax_mny < 0) {
-                $tot_tax_mny = 0;
-                $free_mny += $tot_tax_mny;
-            }
-        } else {
-            $tot_tax_mny = ( $tax_mny + $free_mny + $od['od_send_cost'] + $od['od_send_cost2'] )
-                           - ( $od['od_coupon'] + $od['od_send_coupon'] + $od['od_receipt_point'] );
-            $free_mny = 0;
-        }
-
-        $od_tax_mny = round($tot_tax_mny / 1.1);
-        $od_vat_mny = $tot_tax_mny - $od_tax_mny;
-        $od_free_mny = $free_mny;
-
-        // 미수
-        $od_misu = ( $od['od_cart_price'] + $od['od_send_cost'] + $od['od_send_cost2'] )
-                   - ( $od['od_cart_coupon'] + $od['od_coupon'] + $od['od_send_coupon'] )
-                   - ( $od['od_receipt_price'] + $od['od_receipt_point'] - $mod_mny );
-
-        $shop_memo = '\\n'.$od['od_settle_case'].' 부분취소(금액: '.number_format($mod_mny).'원) - '.G5_TIME_YMDHIS;
-
+        // 환불금액기록
         $sql = " update {$g5['g5_shop_order_table']}
                     set od_refund_price = od_refund_price + '$mod_mny',
-                        od_misu = '$od_misu',
-                        od_tax_mny = '$od_tax_mny',
-                        od_vat_mny = '$od_vat_mny',
-                        od_free_mny = '$od_free_mny',
-                        od_shop_memo = concat(od_shop_memo, \"$shop_memo\")
+                        od_shop_memo = concat(od_shop_memo, \"$mod_memo\")
                     where od_id = '{$od['od_id']}'
                       and od_tno = '$tno' ";
         sql_query($sql);
+
+        // 미수금 등의 정보 업데이트
+        $info = get_order_info($od_id);
+
+        $sql = " update {$g5['g5_shop_order_table']}
+                    set od_misu     = '{$info['od_misu']}',
+                        od_tax_mny  = '{$info['od_tax_mny']}',
+                        od_vat_mny  = '{$info['od_vat_mny']}',
+                        od_free_mny = '{$info['od_free_mny']}'
+                    where od_id = '$od_id' ";
+        sql_query($sql);
     } // End of [res_cd = "0000"]
 
 /* = -------------------------------------------------------------------------- = */