Merge branch 'master' of github.com:gnuboard/yc4s

This commit is contained in:
whitedot
2013-05-09 21:10:40 +09:00
6 changed files with 11 additions and 8 deletions

View File

@ -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 [수정불가]
?>

View File

@ -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 - -->
<!--
사용 카드 설정

View File

@ -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 전송

View File

@ -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'];
?>