diff --git a/.gitignore b/.gitignore
index 64293a626..eeac49274 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 data
 dbconfig.php
+log
diff --git a/extend/shop.extend.php b/extend/shop.extend.php
index 73e8b1fcf..e8bce80b2 100644
--- a/extend/shop.extend.php
+++ b/extend/shop.extend.php
@@ -112,6 +112,7 @@ if(!$result) {
     sql_query(" ALTER TABLE `{$g4['yc4_order_table']}` ADD `uq_id` BIGINT(20) unsigned NOT NULL AFTER `od_id` ", false);
     sql_query(" ALTER TABLE `{$g4['yc4_card_history_table']}` ADD `uq_id` BIGINT(20) unsigned NOT NULL AFTER `od_id` ", false);
     sql_query(" ALTER TABLE `{$g4['yc4_order_table']}` MODIFY COLUMN od_id BIGINT(20) unsigned NOT NULL ", false);
+    sql_query(" ALTER TABLE `{$g4['yc4_card_history_table']}` MODIFY COLUMN od_id BIGINT(20) unsigned NOT NULL ", false);
     sql_query(" ALTER TABLE `{$g4['yc4_cart_table']}` ADD INDEX uq_id (uq_id) ", false);
     sql_query(" ALTER TABLE `{$g4['yc4_order_table']}` ADD UNIQUE uq_id (uq_id) ", false);
     sql_query(" ALTER TABLE `{$g4['yc4_order_table']}` DROP INDEX index1", false);
diff --git a/shop/kcp/log/201303/26_pp_cli.log b/shop/kcp/log/201303/26_pp_cli.log
new file mode 100644
index 000000000..1064fc7f8
--- /dev/null
+++ b/shop/kcp/log/201303/26_pp_cli.log
@@ -0,0 +1,25 @@
+0326-110750 -  7296 - T00003QB32AibeOk - MSG : TX_START - site_cd=[T0000]+tx_cd=[00100000]+ordr_idxx=[13032609441253]+log_level=[3]
+0326-110750 -  7296 - T00003QB32AibeOk - MSG : PG_����_����__����
+0326-110750 -  7296 - T00003QB32AibeOk - MSG : PG_����_��û_����_����__����
+0326-110751 -  7296 - T00003QB32AibeOk - MSG : PG_����_����_����_����__����
+0326-110751 -  7296 - T00003QB32AibeOk - MSG : TX_ENDED - res=[res_cd=0000res_msg=����ó��pay_method=PACAorder_no=13032609441253res_en_msg=processing completedcard_cd=CCSScard_name=�Ｚī��acqu_cd=CCSSacqu_name=�Ｚī��card_no=5310708000009287mcht_taxno=1138521083mall_taxno=1138521083ca_order_id=13032609441253tno=20130326962625amount=5000card_mny=5000coupon_mny=0escw_yn=Nvan_cd=VNKCapp_time=20130326110751van_apptime=20130326110751app_no=31756924bizx_numb=24450105quota=00noinf=Npg_txid=0326110751MP01AB7TL1WT0000000050000031756924partcanc_yn=Ycard_bin_type_01=0card_bin_type_02=0join_cd=0000]
+0326-111822 -  7346 - T00003QBHKAibeOk - MSG : TX_START - site_cd=[T0000]+tx_cd=[00100000]+ordr_idxx=[13032609441253]+log_level=[3]
+0326-111822 -  7346 - T00003QBHKAibeOk - MSG : PG_����_����__����
+0326-111822 -  7346 - T00003QBHKAibeOk - MSG : PG_����_��û_����_����__����
+0326-111822 -  7346 - T00003QBHKAibeOk - MSG : PG_����_����_����_����__����
+0326-111822 -  7346 - T00003QBHKAibeOk - MSG : TX_ENDED - res=[res_cd=0000res_msg=����ó��pay_method=PACAorder_no=13032609441253res_en_msg=processing completedcard_cd=CCSScard_name=�Ｚī��acqu_cd=CCSSacqu_name=�Ｚī��card_no=5310708000009287mcht_taxno=1138521083mall_taxno=1138521083ca_order_id=13032609441253tno=20130326962648amount=5000card_mny=5000coupon_mny=0escw_yn=Nvan_cd=VNKCapp_time=20130326111822van_apptime=20130326111822app_no=41661223bizx_numb=24450105quota=00noinf=Npg_txid=0326111822MP01AF7TYLB60000000050000041661223partcanc_yn=Ycard_bin_type_01=0card_bin_type_02=0join_cd=0000]
+0326-113357 -  7394 - T00003QBXBAibeOk - MSG : TX_START - site_cd=[T0000]+tx_cd=[00100000]+ordr_idxx=[13032609441253]+log_level=[3]
+0326-113357 -  7394 - T00003QBXBAibeOk - MSG : PG_����_����__����
+0326-113357 -  7394 - T00003QBXBAibeOk - MSG : PG_����_��û_����_����__����
+0326-113357 -  7394 - T00003QBXBAibeOk - MSG : PG_����_����_����_����__����
+0326-113357 -  7394 - T00003QBXBAibeOk - MSG : TX_ENDED - res=[res_cd=0000res_msg=����ó��pay_method=PACAorder_no=13032609441253res_en_msg=processing completedcard_cd=CCSScard_name=�Ｚī��acqu_cd=CCSSacqu_name=�Ｚī��card_no=5310708000009287mcht_taxno=1138521083mall_taxno=1138521083ca_order_id=13032609441253tno=20130326962663amount=5000card_mny=5000coupon_mny=0escw_yn=Nvan_cd=VNKCapp_time=20130326113357van_apptime=20130326113357app_no=62333915bizx_numb=24450105quota=00noinf=Npg_txid=0326113357MP01AF7UIMMY0000000050000062333915partcanc_yn=Ycard_bin_type_01=0card_bin_type_02=0join_cd=0000]
+0326-115452 -  7493 - T00003QBs6AibeOk - MSG : TX_START - site_cd=[T0000]+tx_cd=[00100000]+ordr_idxx=[13032609441253]+log_level=[3]
+0326-115452 -  7493 - T00003QBs6AibeOk - MSG : PG_����_����__����
+0326-115452 -  7493 - T00003QBs6AibeOk - MSG : PG_����_��û_����_����__����
+0326-115452 -  7493 - T00003QBs6AibeOk - MSG : PG_����_����_����_����__����
+0326-115452 -  7493 - T00003QBs6AibeOk - MSG : TX_ENDED - res=[res_cd=0000res_msg=����ó��pay_method=PACAorder_no=13032609441253res_en_msg=processing completedcard_cd=CCSScard_name=�Ｚī��acqu_cd=CCSSacqu_name=�Ｚī��card_no=5310708000009287mcht_taxno=1138521083mall_taxno=1138521083ca_order_id=13032609441253tno=20130326962692amount=5000card_mny=5000coupon_mny=0escw_yn=Nvan_cd=VNKCapp_time=20130326115453van_apptime=20130326115453app_no=56365335bizx_numb=24450105quota=00noinf=Npg_txid=0326115453MP01AD7V9J8B0000000050000056365335partcanc_yn=Ycard_bin_type_01=0card_bin_type_02=0join_cd=0000]
+0326-134833 -  8007 - T00003QDmNAibeOk - MSG : TX_START - site_cd=[T0000]+tx_cd=[00100000]+ordr_idxx=[13032613480042]+log_level=[3]
+0326-134833 -  8007 - T00003QDmNAibeOk - MSG : PG_����_����__����
+0326-134833 -  8007 - T00003QDmNAibeOk - MSG : PG_����_��û_����_����__����
+0326-134835 -  8007 - T00003QDmNAibeOk - MSG : PG_����_����_����_����__����
+0326-134835 -  8007 - T00003QDmNAibeOk - MSG : TX_ENDED - res=[res_cd=0000res_msg=����ó��pay_method=PAVCorder_no=13032613480042tno=20130326962727van_txid=DP002013032600147047amount=5000escw_yn=Nvan_cd=SCWRbankcode=BK04bankname=��������depositor=KCP �׽�Ʈaccount=T0400000040774app_time=20130326134836van_apptime=20130326134834mall_taxno=1138521083va_date=20130402235959va_name=�ְ�������]
diff --git a/shop/orderform.php b/shop/orderform.php
index 53e494c47..4f32a1f79 100644
--- a/shop/orderform.php
+++ b/shop/orderform.php
@@ -29,10 +29,8 @@ $s_uq_id = $tmp_uq_id;
 include_once('./cartsub.inc.php');
 
 // 새로운 주문번호 생성
-if(!get_session('ss_order_uniqid')) {
-    set_session('ss_order_uniqid', get_uniqid());
-}
-$od_uq_id = get_session('ss_order_uniqid');
+$od_id = get_uniqid();
+set_session('ss_order_uniqid', $od_id);
 
 if (file_exists("./settle_{$default['de_card_pg']}.inc.php")) {
     include "./settle_{$default['de_card_pg']}.inc.php";
@@ -168,7 +166,7 @@ $order_action_url = G4_HTTPS_SHOP_URL.'/orderformupdate.php';
     */
 ?>
     <input type="hidden" name="pay_method"  value="" />
-    <input type="hidden" name="ordr_idxx"   value="<? echo $od_uq_id; ?>" />
+    <input type="hidden" name="ordr_idxx"   value="<? echo $od_id; ?>" />
     <input type="hidden" name="good_name"   value="<? echo $goods; ?>" />
     <input type="hidden" name="good_mny"    value="<? echo $good_mny; ?>" />
     <input type="hidden" name="buyr_name"   value="" />
@@ -619,9 +617,16 @@ $order_action_url = G4_HTTPS_SHOP_URL.'/orderformupdate.php';
 </tr>
 </table>
 
-<p align=center>
-    <input type="image" src="<?=G4_SHOP_URL?>/img/btn_next2.gif" border=0 alt="다음">&nbsp;
+<p align=center id="display_pay_button" style="display:none">
+    <input type="image" src="<?=G4_SHOP_URL?>/img/btn_next2.gif" border=0 alt="결제하기">&nbsp;
     <a href='javascript:history.go(-1);'><img src="<?=G4_SHOP_URL?>/img/btn_back1.gif" alt="뒤로" border=0></a>
+</p>
+<!-- Payplus Plug-in 설치 안내 -->
+<p id="display_setup_message" style="display:none">
+    <span class="red">결제를 계속 하시려면 상단의 노란색 표시줄을 클릭</span>하시거나<br/>
+    <a href="http://pay.kcp.co.kr/plugin/file_vista/PayplusWizard.exe"><span class="bold">[수동설치]</span></a>를 눌러 Payplus Plug-in을 설치하시기 바랍니다.<br/>
+    [수동설치]를 눌러 설치하신 경우 <span class="red bold">새로고침(F5)키</span>를 눌러 진행하시기 바랍니다.
+</p>
 </form>
 
 <!-- <? if ($default[de_card_use] || $default[de_iche_use]) { echo "결제대행사 : $default[de_card_pg]"; } ?> -->
@@ -844,7 +849,15 @@ function forderform_check(f)
     f.rcvr_add1.value = f.od_b_addr1.value;
     f.rcvr_add2.value = f.od_b_addr2.value;
 
-    return true;
+    if(f.pay_method.value != "무통장") {
+        if(jsf__pay( f )) {
+            return true;
+        } else {
+            return false;
+        }
+    } else {
+        return true;
+    }
 }
 
 // 구매자 정보와 동일합니다.
diff --git a/shop/orderformupdate.php b/shop/orderformupdate.php
index 4066de718..a75c9314c 100644
--- a/shop/orderformupdate.php
+++ b/shop/orderformupdate.php
@@ -117,14 +117,15 @@ if ($od_settle_case == "무통장")
 }
 else if ($od_settle_case == "계좌이체")
 {
-    include "./kcp/pp_ax_hub.php";
+    include G4_SHOP_PATH.'/kcp/pp_ax_hub.php';
 
     $od_temp_bank       = $i_amount;
     $od_temp_point      = $i_temp_point;
 
+    $od_escrow1         = $tno;
     $od_receipt_bank    = $amount;
     $od_receipt_point   = $i_temp_point;
-    $od_receipt_time    = preg_replace("/([0-9]{4})([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})/", "\\1-\\2-\\3 \\4:\\5:\\6", $app_time);
+    $od_bank_time       = preg_replace("/([0-9]{4})([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})/", "\\1-\\2-\\3 \\4:\\5:\\6", $app_time);
     $od_bank_account    = $od_settle_case;
     $od_deposit_name    = $od_name;
     $bank_name          = iconv("cp949", "utf8", $bank_name);
@@ -134,12 +135,13 @@ else if ($od_settle_case == "계좌이체")
 }
 else if ($od_settle_case == "가상계좌")
 {
-    include "./kcp/pp_ax_hub.php";
+    include G4_SHOP_PATH.'/kcp/pp_ax_hub.php';
 
     $od_temp_bank       = $i_amount;
     $od_temp_point      = $i_temp_point;
     $od_receipt_point   = 0;
 
+    $od_escrow1         = $tno;
     $od_receipt_amount  = 0;
     $bankname           = iconv("cp949", "utf8", $bankname);
     $depositor          = iconv("cp949", "utf8", $depositor);
@@ -148,28 +150,30 @@ else if ($od_settle_case == "가상계좌")
 }
 else if ($od_settle_case == "휴대폰")
 {
-    include "./kcp/pp_ax_hub.php";
+    include G4_SHOP_PATH.'/kcp/pp_ax_hub.php';
 
     $od_temp_bank       = $i_amount;
     $od_temp_point      = $i_temp_point;
 
+    $od_escrow1         = $tno;
     $od_receipt_hp      = $amount;
     $od_receipt_point   = $i_temp_point;
-    $od_receipt_time    = preg_replace("/([0-9]{4})([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})/", "\\1-\\2-\\3 \\4:\\5:\\6", $app_time);
+    $od_hp_time         = preg_replace("/([0-9]{4})([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})/", "\\1-\\2-\\3 \\4:\\5:\\6", $app_time);
     $od_bank_account    = $commid.' '.$mobile_no;
     $same_amount_check  = true;
     $pg_receipt_amount  = $amount;
 }
 else if ($od_settle_case == "신용카드")
 {
-    include "./kcp/pp_ax_hub.php";
+    include G4_SHOP_PATH.'/kcp/pp_ax_hub.php';
 
     $od_temp_card       = $i_amount;
     $od_temp_point      = $i_temp_point;
 
+    $od_escrow1         = $tno;
     $od_receipt_card    = $amount;
     $od_receipt_point   = $i_temp_point;
-    $od_receipt_time    = preg_replace("/([0-9]{4})([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})/", "\\1-\\2-\\3 \\4:\\5:\\6", $app_time);
+    $od_card_time       = preg_replace("/([0-9]{4})([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})/", "\\1-\\2-\\3 \\4:\\5:\\6", $app_time);
     $card_name          = iconv("cp949", "utf8", $card_name);
     $od_bank_account    = $card_name;
     $same_amount_check  = true;
@@ -183,7 +187,7 @@ else
 // 주문금액과 결제금액이 일치하는지 체크
 if($same_amount_check) {
     if((int)$i_amount !== (int)$pg_receipt_amount) {
-        include "./kcp/pp_ax_hub_cancel.php"; // 결제취소처리
+        include G4_SHOP_PATH.'/kcp/pp_ax_hub_cancel.php'; // 결제취소처리
 
         die("Receipt Amount Error");
     }
@@ -230,6 +234,10 @@ $sql = " insert {$g4['yc4_order_table']}
                 od_receipt_hp     = '$od_receipt_hp',
                 od_receipt_point  = '$od_receipt_point',
                 od_bank_account   = '$od_bank_account',
+                od_bank_time      = '$od_bank_time',
+                od_card_time      = '$od_card_time',
+                od_hp_time        = '$od_hp_time',
+                od_escrow1        = '$od_escrow1',
                 od_shop_memo      = '',
                 od_hope_date      = '$od_hope_date',
                 od_time           = '".G4_TIME_YMDHIS."',
@@ -256,11 +264,14 @@ if ($is_member && $od_receipt_point) {
     insert_point($member['mb_id'], (-1) * $od_receipt_point, "주문번호 $od_id 결제");
 }
 
+// PG 결제내역기록
+include_once(G4_SHOP_PATH.'/kcp/pp_ax_hub_result.php');
+
 $od_memo = nl2br(htmlspecialchars2(stripslashes($od_memo))) . "&nbsp;";
 
 
-include_once('./ordermail1.inc.php');
-include_once('./ordermail2.inc.php');
+include_once(G4_SHOP_PATH.'/ordermail1.inc.php');
+include_once(G4_SHOP_PATH.'/ordermail2.inc.php');
 
 // SMS BEGIN --------------------------------------------------------
 // 쇼핑몰 운영자가 수신자가 됨
@@ -287,14 +298,17 @@ if ($default['de_sms_use2'] && $receive_number)
 // SMS END   --------------------------------------------------------
 
 
-// order_confirm 에서 사용하기 위해 tmp에 넣고
+// orderview 에서 사용하기 위해 tmp에 넣고
 set_session('ss_temp_uq_id', $tmp_uq_id);
 
-// ss_uq_id 기존자료 세션에서 제거
-if (get_session("ss_direct"))
-    set_session("ss_uq_direct", "");
-else
-    set_session("ss_uq_id", "");
+// 주문번호제거
+set_session('ss_order_uniqid', '');
 
-goto_url(G4_SHOP_URL.'./orderinquiryview.php?od_id='.$od_id.'&amp;uq_id='.$tmp_uq_id);
+// ss_uq_id 기존자료 세션에서 제거
+if (get_session('ss_direct'))
+    set_session('ss_uq_direct', '');
+else
+    set_session('ss_uq_id', '');
+
+goto_url(G4_SHOP_URL.'/orderinquiryview.php?od_id='.$od_id.'&amp;uq_id='.$tmp_uq_id);
 ?>
diff --git a/shop/orderinquiryview.php b/shop/orderinquiryview.php
index 301506f6c..0620c3685 100644
--- a/shop/orderinquiryview.php
+++ b/shop/orderinquiryview.php
@@ -6,7 +6,7 @@ $token = md5(uniqid(rand(), true));
 set_session("ss_token", $token);
 
 if (!$is_member) {
-    if (get_session("ss_uq_id_inquiry") != $_GET['uq_id'])
+    if (get_session("ss_temp_uq_id") != $_GET['uq_id'])
         alert("직접 링크로는 주문서 조회가 불가합니다.\\n\\n주문조회 화면을 통하여 조회하시기 바랍니다.");
 }
 
@@ -34,6 +34,13 @@ $s_page = 'orderinquiryview.php';
 include './cartsub.inc.php';
 ?>
 
+<script>
+var openwin = window.open( './kcp/proc_win.html', 'proc_win', '' );
+if(openwin != null) {
+    openwin.close();
+}
+</script>
+
 <br>
 <div align=right><img src='<?=G4_SHOP_URL?>/img/status01.gif' align=absmiddle> : 주문대기, <img src='<?=G4_SHOP_URL?>/img/status02.gif' align=absmiddle> : 상품준비중, <img src='<?=G4_SHOP_URL?>/img/status03.gif' align=absmiddle> : 배송중, <img src='<?=G4_SHOP_URL?>/img/status04.gif' align=absmiddle> : 배송완료</div>
 
@@ -357,6 +364,27 @@ if ($default['de_taxsave_use']) {
 </table>
 <br><br>
 
+<? if ($od['od_settle_case'] == '가상계좌' && $default['de_card_test'] && $is_admin) {
+    preg_match("/(\s[^\s]+\s)/", $od['od_bank_account'], $matchs);
+    $deposit_no = trim($matchs[1]);
+?>
+<center>
+<div style="width:500px">
+<fieldset>
+<legend>모의입금처리</legend>
+<p>관리자가 가상계좌 테스트를 한 경우에만 보입니다.</p>
+<form method="post" action="http://devadmin.kcp.co.kr/Modules/Noti/TEST_Vcnt_Noti_Proc.jsp" target="_blank">
+<input type="text" name="e_trade_no" value="<?=$od['od_escrow1']?>" size="80"><br />
+<input type="text" name="deposit_no" value="<?=$deposit_no?>" size="80"><br />
+<input type="text" name="req_name" value="<?=$od['od_name']?>" size="80"><br />
+<input type="text" name="noti_url" value="<?=G4_SHOP_URL?>/settle_kcp_common.php" size="80"><br /><br />
+<input type="submit" value="입금통보 테스트">
+</form>
+</fieldset>
+</div>
+</center>
+<? } ?>
+
 <?
 include_once('./_tail.php');
 ?>
\ No newline at end of file
diff --git a/shop/settle_kcp_common.php b/shop/settle_kcp_common.php
index d33c9d122..488e2d5be 100644
--- a/shop/settle_kcp_common.php
+++ b/shop/settle_kcp_common.php
@@ -1,7 +1,7 @@
 <?
 include_once('./_common.php');
 include_once(G4_LIB_PATH.'/etc.lib.php');
-include_once(G4_LIB_PATH..'/mailer.lib.php');
+include_once(G4_LIB_PATH.'/mailer.lib.php');
 
 /*------------------------------------------------------------------------------
     ※ KCP 에서 가맹점의 결과처리 페이지로 데이터를 전송할 때에, 아래와 같은
@@ -10,22 +10,24 @@ include_once(G4_LIB_PATH..'/mailer.lib.php');
        REMOTE ADDRESS 체크를 하여, 아래의 IP 이외의 다른 경로를 통해서 전송된
        데이터에 대해서는 결과처리를 하지 마시기 바랍니다.
 ------------------------------------------------------------------------------*/
-switch ($_SERVER['REMOTE_ADDR']) {
-    case '203.238.36.58' :
-    case '203.238.36.160' :
-    case '203.238.36.161' :
-    case '203.238.36.173' :
-    case '203.238.36.178' :
-        break;
-    default :
-        $super_admin = get_admin('super');
-        $egpcs_str = "ENV[" . serialize($_ENV) . "] "
-                   . "GET[" . serialize($_GET) . "]"
-                   . "POST[" . serialize($_POST) . "]"
-                   . "COOKIE[" . serialize($_COOKIE) . "]"
-                   . "SESSION[" . serialize($_SESSION) . "]";
-        mailer('경고', 'waring', $super_admin['mb_email'], '올바르지 않은 접속 보고', "{$_SERVER['PHP_SELF']} 에 {$_SERVER['REMOTE_ADDR']} 이 ".G4_TIME_YMDHIS." 에 접속을 시도하였습니다.\n\n" . $egpcs_str, 2);
-        exit;
+if(!$default['de_card_test']) {
+    switch ($_SERVER['REMOTE_ADDR']) {
+        case '203.238.36.58' :
+        case '203.238.36.160' :
+        case '203.238.36.161' :
+        case '203.238.36.173' :
+        case '203.238.36.178' :
+            break;
+        default :
+            $super_admin = get_admin('super');
+            $egpcs_str = "ENV[" . serialize($_ENV) . "] "
+                       . "GET[" . serialize($_GET) . "]"
+                       . "POST[" . serialize($_POST) . "]"
+                       . "COOKIE[" . serialize($_COOKIE) . "]"
+                       . "SESSION[" . serialize($_SESSION) . "]";
+            mailer('경고', 'waring', $super_admin['mb_email'], '올바르지 않은 접속 보고', "{$_SERVER['PHP_SELF']} 에 {$_SERVER['REMOTE_ADDR']} 이 ".G4_TIME_YMDHIS." 에 접속을 시도하였습니다.\n\n" . $egpcs_str, 2);
+            exit;
+    }
 }
 
     /* ============================================================================== */