firstgarden/firstgarden-web-gnu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Activity

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

Browse Source
This commit is contained in:
whitedot
2013-05-09 21:10:40 +09:00
parent 159251e169 c54fbc5368
commit ecdce3dc00
6 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mobile/shop/kcp/order_approval.php
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 [수정불가]
?>

2
mobile/shop/orderform.php
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 - -->
<!--
사용 카드 설정

4
mobile/shop/orderformupdate.php
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 전송

3
mobile/shop/settle_kcp.inc.php
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'];
?>

2
shop/itemrecommendmail.php
View File

@ -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();

6
shop/ordermail2.inc.php
View File

@ -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();