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-04-08 16:52:38 +09:00
parent c6b0b3c5d2 a826c41f31
commit bf9228c612
2 changed files with 28 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
shop/kcp/pp_ax_hub_cancel.php
View File

@ -1,6 +1,14 @@
<? <?
if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가 if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
$def_locale = setlocale(LC_CTYPE, 0);
$cancel_msg = iconv("utf-8", "euc-kr", $cancel_msg);
$locale_change = false;
if(preg_match("/utf[\-]?8/i", $def_locale)) {
setlocale(LC_CTYPE, 'ko_KR.euc-kr');
$locale_change = true;
}
/* ============================================================================== */ /* ============================================================================== */
/* = 07. 승인 결과 DB처리 실패시 : 자동취소 = */ /* = 07. 승인 결과 DB처리 실패시 : 자동취소 = */
/* = -------------------------------------------------------------------------- = */ /* = -------------------------------------------------------------------------- = */
@ -70,4 +78,7 @@
} }
} // End of [res_cd = "0000"] } // End of [res_cd = "0000"]
/* ============================================================================== */ /* ============================================================================== */
if($locale_change)
setlocale(LC_CTYPE, $def_locale);
?> ?>

37
shop/orderformupdate.php
View File

@ -107,7 +107,6 @@ if ($od_temp_point)
$i_amount = $i_amount + $i_send_cost - $i_temp_point; $i_amount = $i_amount + $i_send_cost - $i_temp_point;
$same_amount_check = $result_check = false;
if ($od_settle_case == "무통장") if ($od_settle_case == "무통장")
{ {
$od_temp_bank = $i_amount; $od_temp_bank = $i_amount;
@ -130,9 +129,7 @@ else if ($od_settle_case == "계좌이체")
$od_deposit_name = $od_name; $od_deposit_name = $od_name;
$bank_name = iconv("cp949", "utf8", $bank_name); $bank_name = iconv("cp949", "utf8", $bank_name);
$od_bank_account = $bank_name; $od_bank_account = $bank_name;
$same_amount_check = true; $pg_amount = $amount;
$result_check = true;
$pg_receipt_amount = $amount;
} }
else if ($od_settle_case == "가상계좌") else if ($od_settle_case == "가상계좌")
{ {
@ -148,7 +145,7 @@ else if ($od_settle_case == "가상계좌")
$depositor = iconv("cp949", "utf8", $depositor); $depositor = iconv("cp949", "utf8", $depositor);
$od_bank_account = $bankname.' '.$account.' '.$depositor; $od_bank_account = $bankname.' '.$account.' '.$depositor;
$od_deposit_name = $od_name; $od_deposit_name = $od_name;
$result_check = true; $pg_amount = $amount;
} }
else if ($od_settle_case == "휴대폰") else if ($od_settle_case == "휴대폰")
{ {
@ -162,9 +159,7 @@ else if ($od_settle_case == "휴대폰")
$od_receipt_point = $i_temp_point; $od_receipt_point = $i_temp_point;
$od_hp_time = preg_replace("/([0-9]{4})([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})/", "\\1-\\2-\\3 \\4:\\5:\\6", $app_time); $od_hp_time = preg_replace("/([0-9]{4})([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})/", "\\1-\\2-\\3 \\4:\\5:\\6", $app_time);
$od_bank_account = $commid.' '.$mobile_no; $od_bank_account = $commid.' '.$mobile_no;
$same_amount_check = true; $pg_amount = $amount;
$result_check = true;
$pg_receipt_amount = $amount;
} }
else if ($od_settle_case == "신용카드") else if ($od_settle_case == "신용카드")
{ {
@ -179,9 +174,7 @@ else if ($od_settle_case == "신용카드")
$od_card_time = preg_replace("/([0-9]{4})([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})/", "\\1-\\2-\\3 \\4:\\5:\\6", $app_time); $od_card_time = preg_replace("/([0-9]{4})([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})/", "\\1-\\2-\\3 \\4:\\5:\\6", $app_time);
$card_name = iconv("cp949", "utf8", $card_name); $card_name = iconv("cp949", "utf8", $card_name);
$od_bank_account = $card_name; $od_bank_account = $card_name;
$same_amount_check = true; $pg_amount = $amount;
$result_check = true;
$pg_receipt_amount = $amount;
} }
else else
{ {
@ -189,9 +182,9 @@ else
} }
// 주문금액과 결제금액이 일치하는지 체크 // 주문금액과 결제금액이 일치하는지 체크
if($same_amount_check) { if($tno) {
if((int)$i_amount !== (int)$pg_receipt_amount) { if((int)$i_amount !== (int)$pg_amount) {
$cancel_msg = 'Receipt amount error'; $cancel_msg = '결제금액 불일치';
include G4_SHOP_PATH.'/kcp/pp_ax_hub_cancel.php'; // 결제취소처리 include G4_SHOP_PATH.'/kcp/pp_ax_hub_cancel.php'; // 결제취소처리
die("Receipt Amount Error"); die("Receipt Amount Error");
@ -252,9 +245,11 @@ $sql = " insert {$g4['yc4_order_table']}
$result = sql_query($sql, false); $result = sql_query($sql, false);
// 주문정보 입력 오류시 kcp 결제 취소 // 주문정보 입력 오류시 kcp 결제 취소
if($result_check && !$result) { if(!$result) {
$cancel_msg = 'Order update error'; if($tno) {
include G4_SHOP_PATH.'/kcp/pp_ax_hub_cancel.php'; // 결제취소처리 $cancel_msg = '주문정보 입력 오류';
include G4_SHOP_PATH.'/kcp/pp_ax_hub_cancel.php'; // 결제취소처리
}
die("<p>$sql<p>" . mysql_errno() . " : " . mysql_error() . "<p>error file : {$_SERVER['PHP_SELF']}"); die("<p>$sql<p>" . mysql_errno() . " : " . mysql_error() . "<p>error file : {$_SERVER['PHP_SELF']}");
} }
@ -273,9 +268,11 @@ $sql = "update {$g4['yc4_cart_table']}
$result = sql_query($sql, false); $result = sql_query($sql, false);
// 주문정보 입력 오류시 kcp 결제 취소 // 주문정보 입력 오류시 kcp 결제 취소
if($result_check && !$result) { if(!$result) {
$cancel_msg = 'Order status update error'; if($tno) {
include G4_SHOP_PATH.'/kcp/pp_ax_hub_cancel.php'; // 결제취소처리 $cancel_msg = '주문상태 변경 오류';
include G4_SHOP_PATH.'/kcp/pp_ax_hub_cancel.php'; // 결제취소처리
}
echo "<p>$sql<p>" . mysql_errno() . " : " . mysql_error() . "<p>error file : {$_SERVER['PHP_SELF']}"; echo "<p>$sql<p>" . mysql_errno() . " : " . mysql_error() . "<p>error file : {$_SERVER['PHP_SELF']}";