From 452ec1520652117a1ea324c663da0264da5953e7 Mon Sep 17 00:00:00 2001
From: chicpro <chicpro@gmail.com>
Date: Mon, 15 Jul 2013 14:13:32 +0900
Subject: [PATCH] =?UTF-8?q?=EA=B2=B0=EC=A0=9C=EA=B8=88=EC=95=A1=EC=9D=B4?=
 =?UTF-8?q?=20=EC=9E=88=EC=9D=84=20=EB=95=8C=EB=A7=8C=20=EC=A3=BC=EB=AC=B8?=
 =?UTF-8?q?=EC=A0=95=EB=B3=B4=EC=97=90=20=ED=99=98=EB=B6=88=EA=B8=88?=
 =?UTF-8?q?=EC=95=A1=20=EA=B8=B0=EB=A1=9D=ED=95=98=EB=8F=84=EB=A1=9D=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 adm/shop_admin/orderrequestform.php       |  2 +-
 adm/shop_admin/orderrequestformupdate.php | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/adm/shop_admin/orderrequestform.php b/adm/shop_admin/orderrequestform.php
index b8dc0ff22..4064eb344 100644
--- a/adm/shop_admin/orderrequestform.php
+++ b/adm/shop_admin/orderrequestform.php
@@ -109,7 +109,7 @@ $qstr2  = $qstr.'&amp;rq_type='.$rq_type.'&amp;save_stx='.$stx;
         <td>
             <select name="rq_status" id="rq_status">
                 <option value="0"<?php echo get_selected($rq['rq_status'], '0'); ?>>선택</option>
-                <option value="1"<?php echo get_selected($rq['rq_status'], '1'); ?>><?php $type; ?>요청 처리완료</option>
+                <option value="1"<?php echo get_selected($rq['rq_status'], '1'); ?>><?php echo $type; ?>요청 처리완료</option>
                 <option value="99"<?php echo get_selected($rq['rq_status'], '99'); ?>>고객취소</option>
                 <option value="100"<?php echo get_selected($rq['rq_status'], '100'); ?>>처리불가</option>
             </select>
diff --git a/adm/shop_admin/orderrequestformupdate.php b/adm/shop_admin/orderrequestformupdate.php
index dd0a3556e..abda24599 100644
--- a/adm/shop_admin/orderrequestformupdate.php
+++ b/adm/shop_admin/orderrequestformupdate.php
@@ -26,7 +26,7 @@ if($rq['rq_type'] == 0)
 else if($rq['rq_type'] == 2)
     $ct_status = '반품';
 
-if(($rq_status == 1 || $rq_status == 2) && $ct_status != '') {
+if($rq_status == 1 && $ct_status != '') {
     $item = explode(',', $rq['ct_id']);
     for($i=0; $i<count($item); $i++) {
         $sql = " update {$g4['shop_cart_table']}
@@ -37,9 +37,9 @@ if(($rq_status == 1 || $rq_status == 2) && $ct_status != '') {
     }
 }
 
-// 환불금액입력
+// 환불금액입력(입금 금액이 있을 때만)
 $rq_amount1 = preg_replace('/[^0-9]/', '', $rq_amount1);
-if($rq_amount1 > 0) {
+if($od['od_receipt_amount'] > 0 && $rq_amount1 > 0) {
     $sql = " update {$g4['shop_order_table']}
                 set od_refund_amount = '$rq_amount1'
                 where od_id = '{$od['od_id']}' ";
@@ -53,8 +53,8 @@ $sql = " insert into `{$g4['shop_request_table']}`
               ( '{$rq['rq_type']}', '$rq_id', '{$od['od_id']}', '{$rq['ct_id']}', '{$member['mb_id']}', '$rq_content', '$rq_status', '$rq_item', '$dl_company', '$rq_invoice', '$rq_amount1', '$rq_amount2', '$rq_amount3', '$rq_account', '$REMOTE_ADDR', '".G4_TIME_YMDHIS."' ) ";
 sql_query($sql);
 
-// 부분취소처리
-if(($od['od_settle_case'] == '신용카드' || $od['od_settle_case'] == '계좌이체') && ($rq_status == 1 || $rq_status == 2))
+// 부분취소처리(결제금액이 있을 때만)
+if(($od['od_settle_case'] == '신용카드' || $od['od_settle_case'] == '계좌이체') && $rq_status == 1 && $od['od_receipt_amount'] > 0 && $od['od_tno'])
 {
     $rq_amount2 = preg_replace('/[^0-9]/', '', $rq_amount2);
     $rq_amount3 = preg_replace('/[^0-9]/', '', $rq_amount3);