From aa2294b672b089fc429c1eb4d03a06d932f3679c Mon Sep 17 00:00:00 2001
From: chicpro <chicpro@gmail.com>
Date: Tue, 22 Oct 2013 17:09:47 +0900
Subject: [PATCH] =?UTF-8?q?kcp=20=EC=82=AC=EC=9D=B4=ED=8A=B8=20=ED=82=A4?=
 =?UTF-8?q?=EC=82=AC=EC=9A=A9=20=EA=B4=80=EB=A0=A8=20=EC=BD=94=EB=93=9C=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

---
 shop/kcp/pp_ax_hub.php        |  2 +-
 shop/kcp/pp_ax_hub_cancel.php |  2 +-
 shop/kcp/pp_cli_hub.php       | 14 --------------
 shop/settle_kcp.inc.php       |  1 +
 4 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/shop/kcp/pp_ax_hub.php b/shop/kcp/pp_ax_hub.php
index f50ebfb31..25d5e5029 100644
--- a/shop/kcp/pp_ax_hub.php
+++ b/shop/kcp/pp_ax_hub.php
@@ -220,7 +220,7 @@ else if ($req_tx = "mod_escrow")
 /* = -------------------------------------------------------------------------- = */
 if ( $tran_cd != "" )
 {
-    $c_PayPlus->mf_do_tx( $trace_no, $g_conf_home_dir, $g_conf_site_cd, "", $tran_cd, "",
+    $c_PayPlus->mf_do_tx( $trace_no, $g_conf_home_dir, $g_conf_site_cd, $g_conf_site_key, $tran_cd, "",
                           $g_conf_gw_url, $g_conf_gw_port, "payplus_cli_slib", $ordr_idxx,
                           $cust_ip, "3" , 0, 0, $g_conf_key_dir, $g_conf_log_dir); // 응답 전문 처리
 
diff --git a/shop/kcp/pp_ax_hub_cancel.php b/shop/kcp/pp_ax_hub_cancel.php
index 340b9ccfb..8b1cc52e4 100644
--- a/shop/kcp/pp_ax_hub_cancel.php
+++ b/shop/kcp/pp_ax_hub_cancel.php
@@ -67,7 +67,7 @@ if ( $req_tx == "pay" )
             $c_PayPlus->mf_set_modx_data( "mod_desc", $cancel_msg );  // 변경 사유
 
             $c_PayPlus->mf_do_tx( $tno,  $g_conf_home_dir, $g_conf_site_cd,
-                                  "",  $tran_cd,    "",
+                                  $g_conf_site_key,  $tran_cd,    "",
                                   $g_conf_gw_url,  $g_conf_gw_port,  "payplus_cli_slib",
                                   $ordr_idxx, $cust_ip, "3" ,
                                   0, 0, $g_conf_key_dir, $g_conf_log_dir);
diff --git a/shop/kcp/pp_cli_hub.php b/shop/kcp/pp_cli_hub.php
index de2c6aeac..d2e8c89ee 100644
--- a/shop/kcp/pp_cli_hub.php
+++ b/shop/kcp/pp_cli_hub.php
@@ -2,20 +2,6 @@
 include './_common.php';
 include G5_LIB_PATH.'/etc.lib.php';
 
-// 현금영수증 필드생성
-$sql = " ALTER TABLE `{$g5['g5_shop_order_table']}` ADD `od_cash_no` VARCHAR( 255 ) NOT NULL ,
-                                            ADD `od_cash_receipt_no` VARCHAR( 255 ) NOT NULL ,
-                                            ADD `od_cash_app_time` VARCHAR( 255 ) NOT NULL ,
-                                            ADD `od_cash_reg_stat` VARCHAR( 255 ) NOT NULL ,
-                                            ADD `od_cash_reg_desc` VARCHAR( 255 ) NOT NULL ,
-                                            ADD `od_cash_tr_code` VARCHAR( 255 ) NOT NULL ,
-                                            ADD `od_cash_id_info` VARCHAR( 255 ) NOT NULL ";
-sql_query($sql, false);
-
-// 현금영수증 사용, 미사용 구분
-$sql = " ALTER TABLE `{$g5['g5_shop_order_table']}` ADD `od_cash` TINYINT NOT NULL ";
-sql_query($sql, false);
-
 $sql = " select count(*) as cnt from {$g5['g5_shop_order_table']} where od_id = '{$_POST['ordr_idxx']}' and od_cash = 1 ";
 $row = sql_fetch($sql);
 if ($row['cnt']) {
diff --git a/shop/settle_kcp.inc.php b/shop/settle_kcp.inc.php
index 65106c822..733fa63bf 100644
--- a/shop/settle_kcp.inc.php
+++ b/shop/settle_kcp.inc.php
@@ -21,6 +21,7 @@ else {
     $default['de_kcp_mid'] = "SR".$default['de_kcp_mid'];
 }
 
+$g_conf_site_key = $default['de_kcp_site_key'];
 
 $g_conf_js_url = "https://pay.kcp.co.kr/plugin/payplus{$test}_un.js";