From 8dd78d5b8ee8f273f6606972febd270cf82e5da0 Mon Sep 17 00:00:00 2001
From: chicpro <chicpro@gmail.com>
Date: Thu, 27 Jun 2013 17:10:50 +0900
Subject: [PATCH 1/3] =?UTF-8?q?=EB=8F=99=EC=9D=BCID=EB=A1=9C=EC=9D=B8?=
 =?UTF-8?q?=ED=95=9C=20=EA=B2=B0=EC=A0=9C=EB=AA=A8=EB=93=88=20=EC=84=A4?=
 =?UTF-8?q?=EC=B9=98=EC=95=88=EB=82=B4=20=EB=A9=94=EC=84=B8=EC=A7=80=20?=
 =?UTF-8?q?=EA=B3=84=EC=86=8D=20=EC=B6=9C=EB=A0=A5=EB=90=98=EB=8A=94=20?=
 =?UTF-8?q?=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 shop/orderform.php | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/shop/orderform.php b/shop/orderform.php
index 0f99e7900..04dfd73f9 100644
--- a/shop/orderform.php
+++ b/shop/orderform.php
@@ -140,10 +140,12 @@ function init_pay_button()
     */
     // 체크 방법이 변경
     if( GetPluginObject() == null ){
+        document.getElementById("display_setup_message_top").style.display = "block" ;
         document.getElementById("display_setup_message").style.display = "block" ;
         document.getElementById("display_pay_button").style.display = "none" ;
     }
     else{
+        document.getElementById("display_setup_message_top").style.display = "none" ;
         document.getElementById("display_setup_message").style.display = "none" ;
         document.getElementById("display_pay_button").style.display = "block" ;
     }
@@ -158,7 +160,7 @@ function get_intall_file()
 </script>
 
     <!-- Payplus Plug-in 설치 안내 -->
-    <p id="display_setup_message" style="display:block">
+    <p id="display_setup_message_top" style="display:block">
         <strong>결제안내</strong>
         <span class="red">결제를 하시려면 상단의 노란색 표시줄을 클릭</span>하시거나, <a href="https://pay.kcp.co.kr/plugin_new/file/KCPPluginSetup.exe" onclick="return get_intall_file();"><span class="bold">[수동설치]</span></a>를 눌러 Payplus Plug-in을 설치하시기 바랍니다.<br>
         [수동설치]를 눌러 설치하신 경우 <span class="red bold">새로고침(F5)키</span>를 눌러 진행하시기 바랍니다.
@@ -945,7 +947,6 @@ function get_intall_file()
         ?>
     </section>
 
-<<<<<<< HEAD
     <!-- Payplus Plug-in 설치 안내 -->
     <p id="display_setup_message" style="display:block">
         <span class="red">결제를 계속 하시려면 상단의 노란색 표시줄을 클릭</span>하시거나 <a href="https://pay.kcp.co.kr/plugin_new/file/KCPPluginSetup.exe" onclick="return get_intall_file();"><b><u>[수동설치]</u></b></a>를 눌러 다운로드 된 Payplus Plug-in을 설치하시기 바랍니다.<br>
@@ -953,9 +954,6 @@ function get_intall_file()
         새로고침(F5) 한후에도 계속 설치파일이 다운로드 되거나 결제가 되지 않으면 브라우저를 새로 열어서 주문해 주시기 바랍니다.<br>
         브라우저가 익스플로러가 아닌 경우 Payplus Plug-in 설치에 문제가 있을수 있음을 알려 드립니다.
     </p>
-
-=======
->>>>>>> 225fa4a75dd51016367658455d6c416890c90b64
     <div id="display_pay_button" class="btn_confirm" style="display:none">
         <input type="submit" value="주문하기" class="btn_submit">
         <a href="javascript:history.go(-1);" class="btn01">취소</a>

From b4446c3f5b5403c2eae318fd4b6b90ec13dcb803 Mon Sep 17 00:00:00 2001
From: chicpro <chicpro@gmail.com>
Date: Thu, 27 Jun 2013 18:35:26 +0900
Subject: [PATCH 2/3] =?UTF-8?q?=EA=B2=B0=EC=A0=9C=20=EB=AA=A8=EB=93=88=20?=
 =?UTF-8?q?=EC=B2=B4=ED=81=AC=20=EC=8A=A4=ED=81=AC=EB=A6=BD=ED=8A=B8=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/orderform.php | 22 ++++++----------------
 1 file changed, 6 insertions(+), 16 deletions(-)

diff --git a/shop/orderform.php b/shop/orderform.php
index 04dfd73f9..521a194e4 100644
--- a/shop/orderform.php
+++ b/shop/orderform.php
@@ -46,14 +46,11 @@ if (file_exists('./settle_'.$default['de_card_pg'].'.inc.php')) {
 /* ============================================================================== */
 ?>
 <script>
+//StartSmartUpdate();
+
 function CheckPayplusInstall()
 {
-    if (ChkBrowser())
-    {
-        document.writeln(KCPUX_OBJ); //-- inner 형식 변경
-        //setTimeout("plugin_Set_Time_Out('ie');", 100);
-    }
-    else
+    if(!ChkBrowser())
     {
         var inst = 0;
         for (var i = 0; i < navigator.plugins.length; i++)
@@ -85,22 +82,15 @@ function CheckPayplusInstall()
                 alert("플러그인이 업데이트 되었습니다. 재설치 하시고 진행해 주시기 바랍니다. 재설치 후에는 반드시 브라우저를 재시작 하십시오.");
             }
 
-            document.location.href = GetInstallFile();
+            //document.location.href = GetInstallFile();
+            var down_win = window.open(GetInstallFile(), "_self");
+            down_win.close();
             return false;
         }
-        else
-        {
-            //var plugin_info = "<embed id='plugin' " + "type=" + KCP_GetPluginVersion() + " pluginspage='' width='0' height='0'></embed>";
-            //document.write(plugin_info);
-
-            setTimeout("plugin_Set_Time_Out('mozilra');", 100);
-        }
     }
 
     StartSmartUpdate();
     setTimeout("init_pay_button();",300);
-
-    return true;
 }
 
 /* Payplus Plug-in 실행 */

From 7c3b78792011aaf93dbbe968034d2ca094405b1f Mon Sep 17 00:00:00 2001
From: chicpro <chicpro@gmail.com>
Date: Fri, 28 Jun 2013 08:53:04 +0900
Subject: [PATCH 3/3] =?UTF-8?q?=EA=B2=B0=EC=A0=9C=EB=AA=A8=EB=93=88=20?=
 =?UTF-8?q?=EC=84=A4=EC=B9=98=20=EC=B2=B4=ED=81=AC=20=EC=8A=A4=ED=81=AC?=
 =?UTF-8?q?=EB=A6=BD=ED=8A=B8=20=ED=8E=98=EC=9D=B4=EC=A7=80=20=ED=95=98?=
 =?UTF-8?q?=EB=8B=A8=EC=9C=BC=EB=A1=9C=20=EC=9C=84=EC=B9=98=20=EC=9D=B4?=
 =?UTF-8?q?=EB=8F=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 shop/orderform.php | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/shop/orderform.php b/shop/orderform.php
index 521a194e4..a5c5618a6 100644
--- a/shop/orderform.php
+++ b/shop/orderform.php
@@ -46,8 +46,6 @@ if (file_exists('./settle_'.$default['de_card_pg'].'.inc.php')) {
 /* ============================================================================== */
 ?>
 <script>
-//StartSmartUpdate();
-
 function CheckPayplusInstall()
 {
     if(!ChkBrowser())
@@ -82,9 +80,7 @@ function CheckPayplusInstall()
                 alert("플러그인이 업데이트 되었습니다. 재설치 하시고 진행해 주시기 바랍니다. 재설치 후에는 반드시 브라우저를 재시작 하십시오.");
             }
 
-            //document.location.href = GetInstallFile();
-            var down_win = window.open(GetInstallFile(), "_self");
-            down_win.close();
+            document.location.href = GetInstallFile();
             return false;
         }
     }
@@ -1001,8 +997,6 @@ function get_intall_file()
 </div>
 
 <script>
-CheckPayplusInstall();
-
 $(function() {
     var $cp_btn_el;
     var $cp_row_el;
@@ -1613,4 +1607,8 @@ function gumae2baesong(f)
 
 <?php
 include_once('./_tail.php');
-?>
\ No newline at end of file
+?>
+
+<script>
+CheckPayplusInstall();
+</script>
\ No newline at end of file