From e6c1e6e5c01a681849e6e540506ea7847b96c301 Mon Sep 17 00:00:00 2001
From: chicpro <chicpro@gmail.com>
Date: Mon, 8 Apr 2013 15:18:36 +0900
Subject: [PATCH] =?UTF-8?q?=EC=A3=BC=EB=AC=B8,=20=EA=B2=B0=EC=A0=9C=20?=
 =?UTF-8?q?=EA=B8=88=EC=95=A1=20=EB=B6=88=EC=9D=BC=EC=B9=98=EC=8B=9C=20?=
 =?UTF-8?q?=EC=9E=90=EB=8F=99=EC=B7=A8=EC=86=8C=20=EC=B2=98=EB=A6=AC=20?=
 =?UTF-8?q?=EC=BD=94=EB=93=9C=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 shop/orderformupdate.php | 23 ++++++++---------------
 1 file changed, 8 insertions(+), 15 deletions(-)

diff --git a/shop/orderformupdate.php b/shop/orderformupdate.php
index 90b45f9da..b01d25016 100644
--- a/shop/orderformupdate.php
+++ b/shop/orderformupdate.php
@@ -107,7 +107,6 @@ if ($od_temp_point)
 
 $i_amount = $i_amount + $i_send_cost - $i_temp_point;
 
-$same_amount_check = $result_check = false;
 if ($od_settle_case == "무통장")
 {
     $od_temp_bank       = $i_amount;
@@ -130,9 +129,7 @@ else if ($od_settle_case == "계좌이체")
     $od_deposit_name    = $od_name;
     $bank_name          = iconv("cp949", "utf8", $bank_name);
     $od_bank_account    = $bank_name;
-    $same_amount_check  = true;
-    $result_check       = true;
-    $pg_receipt_amount  = $amount;
+    $pg_amount          = $amount;
 }
 else if ($od_settle_case == "가상계좌")
 {
@@ -148,7 +145,7 @@ else if ($od_settle_case == "가상계좌")
     $depositor          = iconv("cp949", "utf8", $depositor);
     $od_bank_account    = $bankname.' '.$account.' '.$depositor;
     $od_deposit_name    = $od_name;
-    $result_check       = true;
+    $pg_amount          = $amount;
 }
 else if ($od_settle_case == "휴대폰")
 {
@@ -162,9 +159,7 @@ else if ($od_settle_case == "휴대폰")
     $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_bank_account    = $commid.' '.$mobile_no;
-    $same_amount_check  = true;
-    $result_check       = true;
-    $pg_receipt_amount  = $amount;
+    $pg_amount          = $amount;
 }
 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);
     $card_name          = iconv("cp949", "utf8", $card_name);
     $od_bank_account    = $card_name;
-    $same_amount_check  = true;
-    $result_check       = true;
-    $pg_receipt_amount  = $amount;
+    $pg_amount          = $amount;
 }
 else
 {
@@ -189,8 +182,8 @@ else
 }
 
 // 주문금액과 결제금액이 일치하는지 체크
-if($same_amount_check) {
-    if((int)$i_amount !== (int)$pg_receipt_amount) {
+if($tno) {
+    if((int)$i_amount !== (int)$pg_amount) {
         $cancel_msg = 'Receipt amount error';
         include G4_SHOP_PATH.'/kcp/pp_ax_hub_cancel.php'; // 결제취소처리
 
@@ -253,7 +246,7 @@ $result = sql_query($sql, false);
 
 // 주문정보 입력 오류시 kcp 결제 취소
 if(!$result) {
-    if($result_check) {
+    if($tno) {
         $cancel_msg = 'Order update error';
         include G4_SHOP_PATH.'/kcp/pp_ax_hub_cancel.php'; // 결제취소처리
     }
@@ -276,7 +269,7 @@ $result = sql_query($sql, false);
 
 // 주문정보 입력 오류시 kcp 결제 취소
 if(!$result) {
-    if($result_check) {
+    if($tno) {
         $cancel_msg = 'Order status update error';
         include G4_SHOP_PATH.'/kcp/pp_ax_hub_cancel.php'; // 결제취소처리
     }