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

merge 충돌 처리

Browse Source
This commit is contained in:
whitedot
2013-10-11 17:58:58 +09:00
parent cc336f02fc 7cc386d7a8
commit bbd5174c6f
81 changed files with 787 additions and 2982 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
shop/cartupdate.php
View File

@ -143,7 +143,7 @@ else // 장바구니에 담기
and io_id = '$io_id'
and io_type = '$io_type'
and ct_stock_use = 0
and ct_status in ('주문', '준비') ";
and ct_status in ('주문', '입금', '준비') ";
$row = sql_fetch($sql);
$sum_qty = $row['cnt'];

8
shop/event.php
View File

@ -15,6 +15,11 @@ if ($is_admin)
echo '<div class="sev_admin"><a href="'.G5_ADMIN_URL.'/shop_admin/itemeventform.php?w=u&amp;ev_id='.$ev['ev_id'].'" class="btn_admin">이벤트 관리</a></div>';
?>
<script>
var itemlist_ca_id = "<?php echo $ca_id; ?>";
</script>
<script src="<?php echo G5_JS_URL; ?>/shop.list.js"></script>
<!-- 이벤트 시작 { -->
<?php
$himg = G5_DATA_PATH.'/event/'.$ev_id.'_h';
@ -82,9 +87,6 @@ if ($i==0)
?>
<?php
// 상품 보기 타입 변경 처리 스크립트
include G5_SHOP_SKIN_PATH.'/list.sub2.skin.php';
$qstr .= 'skin='.$skin.'&amp;ev_id='.$ev_id.'&amp;sort='.$sort.'&amp;sortodr='.$sortodr;
echo get_paging($config['cf_write_pages'], $page, $total_page, "{$_SERVER['PHP_SELF']}?$qstr&amp;page=");
?>

3
shop/itemqaform.php
View File

@ -12,9 +12,6 @@ if (!$is_member) {
alert_close("상품문의는 회원만 작성 가능합니다.");
}
// 상품문의의 내용에 쓸수 있는 최대 글자수 (한글은 영문3자)
$iq_question_max_length = 10000;
$w = escape_trim($_REQUEST['w']);
$it_id = escape_trim($_REQUEST['it_id']);
$iq_id = escape_trim($_REQUEST['iq_id']);

3
shop/itemuseform.php
View File

@ -12,9 +12,6 @@ if (!$is_member) {
alert_close("사용후기는 회원만 작성 가능합니다.");
}
// 사용후기의 내용에 쓸수 있는 최대 글자수 (한글은 영문3자)
$is_content_max_length = 10000;
$w = escape_trim($_REQUEST['w']);
$it_id = escape_trim($_REQUEST['it_id']);
$is_id = escape_trim($_REQUEST['is_id']);

6
shop/kcp/pp_ax_hub.php
View File

@ -77,6 +77,7 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
$app_time = ""; // 승인시간 (모든 결제 수단 공통)
$amount = ""; // KCP 실제 거래 금액
$total_amount = 0; // 복합결제시 총 거래금액
$coupon_mny = ""; // 쿠폰금액
/* = -------------------------------------------------------------------------- = */
$card_cd = ""; // 신용카드 코드
$card_name = ""; // 신용카드 명
@ -86,9 +87,11 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
$partcanc_yn = ""; // 부분취소 가능유무
$card_bin_type_01 = ""; // 카드구분1
$card_bin_type_01 = ""; // 카드구분2
$card_mny = ""; // 카드결제금액
/* = -------------------------------------------------------------------------- = */
$bank_name = ""; // 은행명
$bank_code = ""; // 은행코드
$bk_mny = ""; // 계좌이체결제금액
/* = -------------------------------------------------------------------------- = */
$bankname = ""; // 입금할 은행명
$depositor = ""; // 입금할 계좌 예금주 성명
@ -258,6 +261,7 @@ if ( $req_tx == "pay" )
$tno = $c_PayPlus->mf_get_res_data( "tno" ); // KCP 거래 고유 번호
$amount = $c_PayPlus->mf_get_res_data( "amount" ); // KCP 실제 거래 금액
$pnt_issue = $c_PayPlus->mf_get_res_data( "pnt_issue" ); // 결제 포인트사 코드
$coupon_mny = $c_PayPlus->mf_get_res_data( "coupon_mny" ); // 쿠폰금액
/* = -------------------------------------------------------------------------- = */
/* = 05-1. 신용카드 승인 결과 처리 = */
@ -273,6 +277,7 @@ if ( $req_tx == "pay" )
$partcanc_yn = $c_PayPlus->mf_get_res_data( "partcanc_yn" ); // 부분취소 가능유무
$card_bin_type_01 = $c_PayPlus->mf_get_res_data( "card_bin_type_01" ); // 카드구분1
$card_bin_type_02 = $c_PayPlus->mf_get_res_data( "card_bin_type_02" ); // 카드구분2
$card_mny = $c_PayPlus->mf_get_res_data( "card_mny" ); // 카드결제금액
/* = -------------------------------------------------------------- = */
/* = 05-1.1. 복합결제(포인트+신용카드) 승인 결과 처리 = */
@ -298,6 +303,7 @@ if ( $req_tx == "pay" )
$app_time = $c_PayPlus->mf_get_res_data( "app_time" ); // 승인 시간
$bank_name = $c_PayPlus->mf_get_res_data( "bank_name" ); // 은행명
$bank_code = $c_PayPlus->mf_get_res_data( "bank_code" ); // 은행코드
$bk_mny = $c_PayPlus->mf_get_res_data( "bk_mny" ); // 계좌이체결제금액
}
/* = -------------------------------------------------------------------------- = */

66
shop/orderform.php
View File

@ -30,9 +30,8 @@ $od_id = get_uniqid();
set_session('ss_order_id', $od_id);
$s_cart_id = $tmp_cart_id;
$order_action_url = G5_HTTPS_SHOP_URL.'/orderformupdate.php';
if (file_exists('./settle_'.$default['de_card_pg'].'.inc.php')) {
include './settle_'.$default['de_card_pg'].'.inc.php';
}
require './settle_kcp.inc.php';
?>
<?php
@ -94,18 +93,58 @@ function jsf__pay( form )
}
// Payplus Plug-in 설치 안내
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" ;
document.getElementById("display_setup_message").scrollIntoView();
if (navigator.userAgent.indexOf('MSIE') > 0)
{
try
{
if( document.Payplus.object == 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" ;
document.getElementById("display_setup_message").scrollIntoView();
}
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" ;
}
}
catch (e)
{
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" ;
document.getElementById("display_setup_message").scrollIntoView();
}
}
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" ;
else
{
try
{
if( Payplus == 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" ;
document.getElementById("display_setup_message").scrollIntoView();
}
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" ;
}
}
catch (e)
{
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" ;
document.getElementById("display_setup_message").scrollIntoView();
}
}
}
@ -346,7 +385,6 @@ function get_intall_file()
?>
<input type="hidden" name="req_tx" value="pay">
<input type="hidden" name="site_cd" value="<?php echo $default['de_kcp_mid']; ?>">
<input type="hidden" name="site_key" value="<?php echo $default['de_kcp_site_key']; ?>">
<input type="hidden" name="site_name" value="<?php echo $default['de_admin_company_name']; ?>">
<?php
@ -1019,7 +1057,7 @@ function get_intall_file()
<!-- } 에스크로 안내 끝 -->
<?php } ?>
<!-- <?php if ($default[de_card_use] || $default[de_iche_use]) { echo "결제대행사 : $default[de_card_pg]"; } ?> -->
<!-- <?php if ($default['de_card_use'] || $default['de_iche_use']) { echo "결제대행사 : KCP"; } ?> -->
</div>

5
shop/orderinquirycancel.php
View File

@ -30,9 +30,8 @@ if($od['od_cancel_price'] > 0 || $ct['od_count1'] != $ct['od_count2']) {
// PG 결제 취소
if($od['od_tno']) {
if (file_exists('./settle_'.$default['de_card_pg'].'.inc.php')) {
include './settle_'.$default['de_card_pg'].'.inc.php';
}
require './settle_kcp.inc.php';
$_POST['tno'] = $od['od_tno'];
$_POST['req_tx'] = 'mod';
$_POST['mod_type'] = 'STSC';

2
shop/orderinquiryview.php
View File

@ -333,7 +333,7 @@ if(openwin != null) {
}
// 현금영수증 발급을 사용하는 경우에만
if ($default['de_taxsave_use'] && $default['de_card_pg'] == 'kcp') {
if ($default['de_taxsave_use']) {
// 미수금이 없고 현금일 경우에만 현금영수증을 발급 할 수 있습니다.
if ($misu_price == 0 && $od['od_receipt_price'] && ($od['od_settle_case'] == '무통장' || $od['od_settle_case'] == '계좌이체' || $od['od_settle_case'] == '가상계좌')) {
?>

6
shop/personalpayform.php
View File

@ -19,9 +19,8 @@ $g5['title'] = $pp['pp_name'].'님 개인결제';
include_once('./_head.php');
$action_url = G5_HTTPS_SHOP_URL.'/personalpayformupdate.php';
if (file_exists('./settle_'.$default['de_card_pg'].'.inc.php')) {
include './settle_'.$default['de_card_pg'].'.inc.php';
}
require './settle_kcp.inc.php';
// 개인결제 체크를 위한 hash
$hash_data = md5($pp['pp_id'].$pp['pp_price'].$pp['pp_time']);
@ -130,7 +129,6 @@ function get_intall_file()
?>
<input type="hidden" name="req_tx" value="pay">
<input type="hidden" name="site_cd" value="<?php echo $default['de_kcp_mid']; ?>">
<input type="hidden" name="site_key" value="<?php echo $default['de_kcp_site_key']; ?>">
<input type="hidden" name="site_name" value="<?php echo $default['de_admin_company_name']; ?>">
<?php