From 9ec80913707b538abee13a4f52e5ac6c8d02a349 Mon Sep 17 00:00:00 2001
From: chicpro <chicpro@gmail.com>
Date: Wed, 2 Jul 2014 16:21:25 +0900
Subject: [PATCH] =?UTF-8?q?kcp=20=EC=B7=A8=EC=86=8C=20=EB=A9=94=EC=84=B8?=
 =?UTF-8?q?=EC=A7=80=20=ED=95=9C=EA=B8=80=EA=B9=A8=EC=A7=90=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 adm/shop_admin/orderlist.php             | 2 +-
 adm/shop_admin/orderpartcancelupdate.php | 1 -
 shop/kcp/orderpartcancel.inc.php         | 4 +++-
 shop/kcp/pp_ax_hub_cancel.php            | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/adm/shop_admin/orderlist.php b/adm/shop_admin/orderlist.php
index c01c3d318..a6a61d554 100644
--- a/adm/shop_admin/orderlist.php
+++ b/adm/shop_admin/orderlist.php
@@ -477,7 +477,7 @@ if(!sql_query(" select mb_id from {$g5['g5_shop_order_delete_table']} limit 1 ",
 <div class="local_desc02 local_desc">
 <p>
     &lt;무통장&gt;인 경우에만 &lt;주문&gt;에서 &lt;입금&gt;으로 변경됩니다. 가상계좌는 입금시 자동으로 &lt;입금&gt;처리됩니다.<br>
-    &lt;준비&gt;에서 &lt;배송&gt;으로 변경시 &lt;에스크로배송등록&gt;을 체크하시면 에스크로 주문에 한해 KCP에 배송정보가 자동 등록됩니다.<br>
+    &lt;준비&gt;에서 &lt;배송&gt;으로 변경시 &lt;에스크로배송등록&gt;을 체크하시면 에스크로 주문에 한해 PG사에 배송정보가 자동 등록됩니다.<br>
     <strong>주의!</strong> 주문번호를 클릭하여 나오는 주문상세내역의 주소를 외부에서 조회가 가능한곳에 올리지 마십시오.
 </p>
 </div>
diff --git a/adm/shop_admin/orderpartcancelupdate.php b/adm/shop_admin/orderpartcancelupdate.php
index 0cbedd403..c0b80689e 100644
--- a/adm/shop_admin/orderpartcancelupdate.php
+++ b/adm/shop_admin/orderpartcancelupdate.php
@@ -1,7 +1,6 @@
 <?php
 $sub_menu = '400400';
 include_once('./_common.php');
-include_once(G5_SHOP_PATH.'/settle_kcp.inc.php');
 
 auth_check($auth[$sub_menu], "w");
 
diff --git a/shop/kcp/orderpartcancel.inc.php b/shop/kcp/orderpartcancel.inc.php
index 727ca8117..11bf31bdc 100644
--- a/shop/kcp/orderpartcancel.inc.php
+++ b/shop/kcp/orderpartcancel.inc.php
@@ -3,6 +3,8 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
 
 if($od['od_pg'] != 'kcp') return;
 
+include_once(G5_SHOP_PATH.'/settle_kcp.inc.php');
+
 // locale ko_KR.euc-kr 로 설정
 setlocale(LC_CTYPE, 'ko_KR.euc-kr');
 
@@ -32,7 +34,7 @@ include G5_SHOP_PATH.'/kcp/pp_cli_hub_lib.php';
 
 $tno            = $od['od_tno'];
 $req_tx         = 'mod';
-$mod_desc       = $mod_memo;
+$mod_desc       = iconv_euckr($mod_memo);
 $cust_ip        = getenv('REMOTE_ADDR');
 $rem_mny        = (int)$od['od_receipt_price'] - (int)$od['od_refund_price'];
 $mod_mny        = (int)$tax_mny;
diff --git a/shop/kcp/pp_ax_hub_cancel.php b/shop/kcp/pp_ax_hub_cancel.php
index ce1eef5aa..f5c14d89c 100644
--- a/shop/kcp/pp_ax_hub_cancel.php
+++ b/shop/kcp/pp_ax_hub_cancel.php
@@ -59,7 +59,7 @@ if ( $req_tx == "pay" )
             $c_PayPlus->mf_set_modx_data( "tno",      $tno                         );  // KCP 원거래 거래번호
             $c_PayPlus->mf_set_modx_data( "mod_type", $bSucc_mod_type              );  // 원거래 변경 요청 종류
             $c_PayPlus->mf_set_modx_data( "mod_ip",   $cust_ip                     );  // 변경 요청자 IP
-            $c_PayPlus->mf_set_modx_data( "mod_desc", $cancel_msg );  // 변경 사유
+            $c_PayPlus->mf_set_modx_data( "mod_desc", iconv_euckr($cancel_msg)     );  // 변경 사유
 
             $c_PayPlus->mf_do_tx( $tno,  $g_conf_home_dir, $g_conf_site_cd,
                                   $g_conf_site_key,  $tran_cd,    "",