From bdfcf9e65fecf8e236d6274877e11d95c4d6c0bb Mon Sep 17 00:00:00 2001
From: chicpro <chicpro@gmail.com>
Date: Thu, 9 May 2013 20:16:30 +0900
Subject: [PATCH 1/3] =?UTF-8?q?=EC=8A=A4=EB=A7=88=ED=8A=B8=ED=8F=B0=20?=
 =?UTF-8?q?=EA=B2=B0=EC=A0=9C=20=EB=AA=A8=EB=93=88=20=EC=97=B0=EB=8F=99=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

---
 mobile/shop/kcp/order_approval.php | 2 +-
 mobile/shop/orderform.php          | 2 +-
 mobile/shop/settle_kcp.inc.php     | 3 +++
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/mobile/shop/kcp/order_approval.php b/mobile/shop/kcp/order_approval.php
index 98ddded54..86e4d59b0 100644
--- a/mobile/shop/kcp/order_approval.php
+++ b/mobile/shop/kcp/order_approval.php
@@ -1,7 +1,7 @@
 <?php
     include_once('./_common.php');
 
-    include G4_MSHOP_PATH.'/kcp/settle_kcp.inc.php';
+    include G4_MSHOP_PATH.'/settle_kcp.inc.php';
     require G4_MSHOP_PATH.'/kcp/KCPComLibrary.php';              // library [수정불가]
 
 ?>
diff --git a/mobile/shop/orderform.php b/mobile/shop/orderform.php
index fc9ccc747..6417d2cf9 100644
--- a/mobile/shop/orderform.php
+++ b/mobile/shop/orderform.php
@@ -89,7 +89,7 @@ $tablet_size = "1.0"; // 화면 사이즈 조정 - 기기화면에 맞게 수정
     <input type="hidden" name="param_opt_3"	 value="<?=$param_opt_3?>"/>
     <!-- 기타 파라메터 추가 부분 - End - -->
     <!-- 화면 크기조정 부분 - Start - -->
-    <input type="text" name="tablet_size"	 value="<?=$tablet_size?>"/>
+    <input type="hidden" name="tablet_size"	 value="<?=$tablet_size?>"/>
     <!-- 화면 크기조정 부분 - End - -->
     <!--
         사용 카드 설정
diff --git a/mobile/shop/settle_kcp.inc.php b/mobile/shop/settle_kcp.inc.php
index 7fcf57927..fceacd3d4 100644
--- a/mobile/shop/settle_kcp.inc.php
+++ b/mobile/shop/settle_kcp.inc.php
@@ -26,4 +26,7 @@ else {
     $g_wsdl = "real_KCPPaymentService.wsdl";
     $g_conf_gw_url = "paygw.kcp.co.kr";
 }
+
+$g_conf_site_cd = $default['de_kcp_mid'];
+$g_conf_site_key = $default['de_kcp_site_key'];
 ?>

From 90f1beec844f6f8714f63c92dd56d822abcb7b72 Mon Sep 17 00:00:00 2001
From: chicpro <chicpro@gmail.com>
Date: Thu, 9 May 2013 20:35:52 +0900
Subject: [PATCH 2/3] =?UTF-8?q?=EB=AA=A8=EB=B0=94=EC=9D=BC=20=EC=87=BC?=
 =?UTF-8?q?=ED=95=91=EB=AA=B0=20=EC=A3=BC=EB=AC=B8=20=EB=A9=94=EC=9D=BC=20?=
 =?UTF-8?q?=EA=B2=BD=EB=A1=9C=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mobile/shop/orderformupdate.php | 4 ++--
 shop/ordermail2.inc.php         | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/mobile/shop/orderformupdate.php b/mobile/shop/orderformupdate.php
index e03214235..47974f7a7 100644
--- a/mobile/shop/orderformupdate.php
+++ b/mobile/shop/orderformupdate.php
@@ -296,8 +296,8 @@ include_once(G4_MSHOP_PATH.'/kcp/pp_ax_hub_result.php');
 $od_memo = nl2br(htmlspecialchars2(stripslashes($od_memo))) . "&nbsp;";
 
 
-include_once(G4_MSHOP_PATH.'/ordermail1.inc.php');
-include_once(G4_MSHOP_PATH.'/ordermail2.inc.php');
+include_once(G4_SHOP_PATH.'/ordermail1.inc.php');
+include_once(G4_SHOP_PATH.'/ordermail2.inc.php');
 
 // SMS BEGIN --------------------------------------------------------
 // 주문고객과 쇼핑몰관리자에게 SMS 전송
diff --git a/shop/ordermail2.inc.php b/shop/ordermail2.inc.php
index 4bd87d388..e8ce63458 100644
--- a/shop/ordermail2.inc.php
+++ b/shop/ordermail2.inc.php
@@ -10,7 +10,7 @@ $admin = get_admin('super');
 //------------------------------------------------------------------------------
 $subject = $config['cf_title'].' - 주문 알림 메일 ('.$od_name.')';
 ob_start();
-include './mail/orderupdate1.mail.php';
+include G4_SHOP_PATH.'/mail/orderupdate1.mail.php';
 $content = ob_get_contents();
 ob_end_clean();
 
@@ -22,7 +22,7 @@ mailer($od_name, $od_email, $admin['mb_email'], $subject, $content, 1);
 //------------------------------------------------------------------------------
 $subject = $config['cf_title'].' - 주문 내역 안내 메일';
 ob_start();
-include './mail/orderupdate2.mail.php';
+include G4_SHOP_PATH.'/mail/orderupdate2.mail.php';
 $content = ob_get_contents();
 ob_end_clean();
 
@@ -61,7 +61,7 @@ for ($i=0; $row=sql_fetch_array($result); $i++)
 
     $subject = $config['cf_title'].' - 주문 알림 메일 (주문자 '.$od_name.'님)';
     ob_start();
-    include "./mail/orderupdate3.mail.php";
+    include G4_SHOP_PATH.'/mail/orderupdate3.mail.php';
     $content = ob_get_contents();
     ob_end_clean();
 

From c54fbc53680220e8d2dff526935518c336a1ab15 Mon Sep 17 00:00:00 2001
From: chicpro <chicpro@gmail.com>
Date: Thu, 9 May 2013 20:42:20 +0900
Subject: [PATCH 3/3] =?UTF-8?q?=EB=AA=A8=EB=B0=94=EC=9D=BC=20=EC=87=BC?=
 =?UTF-8?q?=ED=95=91=EB=AA=B0=20=EC=B6=94=EC=B2=9C=20=EB=A9=94=EC=9D=BC=20?=
 =?UTF-8?q?=EA=B2=BD=EB=A1=9C=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 shop/itemrecommendmail.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shop/itemrecommendmail.php b/shop/itemrecommendmail.php
index a091d49df..244f6c345 100644
--- a/shop/itemrecommendmail.php
+++ b/shop/itemrecommendmail.php
@@ -43,7 +43,7 @@ $it_name = $it['it_name'];
 $it_mimg = $it['it_id']."_m";
 
 ob_start();
-include "./mail/itemrecommend.mail.php";
+include G4_SHOP_PATH.'/mail/itemrecommend.mail.php';
 $content = ob_get_contents();
 ob_end_clean();