From 6495aa00759600321d1dc3316fe721384c4740b6 Mon Sep 17 00:00:00 2001
From: chicpro <chicpro@sir.co.kr>
Date: Tue, 8 Sep 2015 10:24:00 +0900
Subject: [PATCH] =?UTF-8?q?=EC=9D=B4=EB=8B=88=EC=8B=9C=EC=8A=A4=20kpay=20?=
 =?UTF-8?q?=EA=B2=B0=EC=A0=9C=20=EC=A0=95=EB=B3=B4=EC=B2=98=EB=A6=AC=20?=
 =?UTF-8?q?=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 install/gnuboard5shop.sql            | 1 +
 mobile/shop/inicis/orderform.1.php   | 1 +
 mobile/shop/inicis/pay_return.php    | 3 ++-
 mobile/shop/inicis/settle_common.php | 1 +
 mobile/shop/orderform.php            | 2 +-
 orderupgrade.php                     | 7 +++++++
 shop/kcp/orderform.2.php             | 1 +
 shop/orderform.php                   | 3 +--
 8 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/install/gnuboard5shop.sql b/install/gnuboard5shop.sql
index df5dbc6f1..243e03cbe 100644
--- a/install/gnuboard5shop.sql
+++ b/install/gnuboard5shop.sql
@@ -792,6 +792,7 @@ CREATE TABLE IF NOT EXISTS `g5_shop_inicis_log` (
   `P_TYPE` varchar(255) NOT NULL DEFAULT '',
   `P_OID` varchar(255) NOT NULL DEFAULT '',
   `P_FN_NM` varchar(255) NOT NULL DEFAULT '',
+  `P_AUTH_NO` varchar(255) NOT NULL DEFAULT '',
   `P_AMT` int(11) NOT NULL DEFAULT '0',
   `P_RMESG1` varchar(255) NOT NULL DEFAULT '',
   PRIMARY KEY (`oid`)
diff --git a/mobile/shop/inicis/orderform.1.php b/mobile/shop/inicis/orderform.1.php
index 8573e7300..75da51643 100644
--- a/mobile/shop/inicis/orderform.1.php
+++ b/mobile/shop/inicis/orderform.1.php
@@ -15,6 +15,7 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
 <input type="hidden" name="P_RETURN_URL" value="">
 <input type="hidden" name="P_HPP_METHOD" value="2">
 <input type="hidden" name="P_RESERVED"   value="bank_receipt=N&twotrs_isp=Y&block_isp=Y<?php echo $useescrow; ?>">
+<input type="hidden" name="DEF_RESERVED" value="bank_receipt=N&twotrs_isp=Y&block_isp=Y<?php echo $useescrow; ?>">
 <input type="hidden" name="P_NOTI"       value="<?php echo $od_id; ?>">
 <input type="hidden" name="P_QUOTABASE"  value="01:02:03:04:05:06:07:08:09:10:11:12"> <!-- 할부기간 설정 01은 일시불 -->
 
diff --git a/mobile/shop/inicis/pay_return.php b/mobile/shop/inicis/pay_return.php
index 6ec615650..09f3b7643 100644
--- a/mobile/shop/inicis/pay_return.php
+++ b/mobile/shop/inicis/pay_return.php
@@ -46,7 +46,7 @@ $g5['title'] = 'KG 이니시스 결제';
 $g5['body_script'] = ' onload="setPAYResult();"';
 include_once(G5_PATH.'/head.sub.php');
 
-$exclude = array('res_cd', 'P_HASH', 'P_TYPE', 'P_AUTH_DT', 'P_VACT_BANK');
+$exclude = array('res_cd', 'P_HASH', 'P_TYPE', 'P_AUTH_DT', 'P_VACT_BANK', 'P_AUTH_NO');
 
 echo '<form name="forderform" method="post" action="'.$order_action_url.'" autocomplete="off">'.PHP_EOL;
 
@@ -57,6 +57,7 @@ echo '<input type="hidden" name="P_HASH"      value="'.$hash.'">'.PHP_EOL;
 echo '<input type="hidden" name="P_TYPE"      value="'.$PAY['P_TYPE'].'">'.PHP_EOL;
 echo '<input type="hidden" name="P_AUTH_DT"   value="'.$PAY['P_AUTH_DT'].'">'.PHP_EOL;
 echo '<input type="hidden" name="P_VACT_BANK" value="'.$PAY['P_FN_NM'].'">'.PHP_EOL;
+echo '<input type="hidden" name="P_AUTH_NO"   value="'.$PAY['P_AUTH_NO'].'">'.PHP_EOL;
 
 echo '</form>'.PHP_EOL;
 ?>
diff --git a/mobile/shop/inicis/settle_common.php b/mobile/shop/inicis/settle_common.php
index 4d9ca8b99..6edb7d189 100644
--- a/mobile/shop/inicis/settle_common.php
+++ b/mobile/shop/inicis/settle_common.php
@@ -177,6 +177,7 @@ if($PGIP == "211.219.96.165" || $PGIP == "118.129.210.25")	//PG에서 보냈는
                         P_TYPE    = '$P_TYPE',
                         P_OID     = '$P_OID',
                         P_FN_NM   = '".iconv_utf8($P_FN_NM)."',
+                        P_AUTH_NO = '$P_AUTH_NO',
                         P_AMT     = '$P_AMT',
                         P_RMESG1  = '".iconv_utf8($P_RMESG1)."' ";
         @sql_query($sql);
diff --git a/mobile/shop/orderform.php b/mobile/shop/orderform.php
index f71ffcd8d..4940635ec 100644
--- a/mobile/shop/orderform.php
+++ b/mobile/shop/orderform.php
@@ -1228,7 +1228,7 @@ function pay_approval()
     var ypos = (screen.width - height) / 2;
     var position = "top=" + ypos + ",left=" + xpos;
     var features = position + ", width=320, height=440";
-    var p_reserved = f.P_RESERVED.value;
+    var p_reserved = f.DEF_RESERVED.value;
     f.P_RESERVED.value = p_reserved;
     switch(settle_method) {
         case "계좌이체":
diff --git a/orderupgrade.php b/orderupgrade.php
index 16ba05bec..9dae931a4 100644
--- a/orderupgrade.php
+++ b/orderupgrade.php
@@ -57,6 +57,7 @@ if(!sql_query(" DESCRIBE {$g5['g5_shop_inicis_log_table']} ", false)) {
                   `P_TYPE` varchar(255) NOT NULL DEFAULT '',
                   `P_OID` varchar(255) NOT NULL DEFAULT '',
                   `P_FN_NM` varchar(255) NOT NULL DEFAULT '',
+                  `P_AUTH_NO` varchar(255) NOT NULL DEFAULT '',
                   `P_AMT` int(11) NOT NULL DEFAULT '0',
                   `P_RMESG1` varchar(255) NOT NULL DEFAULT '',
                   PRIMARY KEY (`oid`)
@@ -81,6 +82,12 @@ if(isset($g5['g5_shop_order_data_table']) && !sql_query(" DESCRIBE {$g5['g5_shop
                 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;", true);
 }
 
+// 모바일 이니시스 결제정보 테이블 필드 추가
+if(!sql_query(" select P_AUTH_NO from {$g5['g5_shop_inicis_log_table']} limit 1 ", false)) {
+    sql_query(" ALTER TABLE `{$g5['g5_shop_inicis_log_table']}`
+                    ADD `P_AUTH_NO` varchar(255) NOT NULL DEFAULT '' AFTER `P_FN_NM` ", true);
+}
+
 echo '<p>테이블 업그레이드 완료!</p>';
 
 include_once(G5_PATH.'/tail.sub.php');
diff --git a/shop/kcp/orderform.2.php b/shop/kcp/orderform.2.php
index 46c121255..7d38880cc 100644
--- a/shop/kcp/orderform.2.php
+++ b/shop/kcp/orderform.2.php
@@ -11,6 +11,7 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
     <input type="hidden" name="req_tx"          value="pay">
     <input type="hidden" name="site_cd"         value="<?php echo $default['de_kcp_mid']; ?>">
     <input type="hidden" name="site_name"       value="<?php echo $default['de_admin_company_name']; ?>">
+    <input type="hidden" name="def_site_cd"     value="<?php echo $default['de_kcp_mid']; ?>">
 
 <?php
     /*
diff --git a/shop/orderform.php b/shop/orderform.php
index 9a330b549..33e159240 100644
--- a/shop/orderform.php
+++ b/shop/orderform.php
@@ -1326,8 +1326,7 @@ function forderform_check(f)
 
     // pay_method 설정
     <?php if($default['de_pg_service'] == 'kcp') { ?>
-    var kcp_site_cd = f.site_cd.value;
-    f.site_cd.value = kcp_site_cd;
+    f.site_cd.value = f.def_site_cd.value;
     f.payco_direct.value = "";
     switch(settle_method)
     {