From b08ad7e33289ac27f8b6454a8fa73a2c424a9e6b Mon Sep 17 00:00:00 2001
From: chicpro <chicpro@gmail.com>
Date: Thu, 29 Aug 2013 16:00:10 +0900
Subject: [PATCH] =?UTF-8?q?od=5Ftemp=5Fpoint=20=ED=95=84=EB=93=9C=20?=
 =?UTF-8?q?=EC=A0=9C=EA=B1=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 adm/shop_admin/index.php        | 2 +-
 install/shop.sql                | 1 -
 mobile/shop/orderformupdate.php | 6 ------
 shop/orderformupdate.php        | 6 ------
 shop/orderinquirycancel.php     | 2 +-
 5 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/adm/shop_admin/index.php b/adm/shop_admin/index.php
index a82d8e7f1..16adebf13 100644
--- a/adm/shop_admin/index.php
+++ b/adm/shop_admin/index.php
@@ -122,7 +122,7 @@ $pg_anchor = '<ul class="anchor">
         else
         {
             $settle_method .= '미입력';
-            if ($row['od_temp_point']) $settle_method .= '포인트';
+            if ($row['od_receipt_point']) $settle_method .= '포인트';
         }
     ?>
     <tr>
diff --git a/install/shop.sql b/install/shop.sql
index b08a8aaeb..2e15429f6 100644
--- a/install/shop.sql
+++ b/install/shop.sql
@@ -601,7 +601,6 @@ CREATE TABLE IF NOT EXISTS `shop_order` (
   `od_send_coupon` int(11) NOT NULL DEFAULT '0',
   `od_send_cost2` int(11) NOT NULL DEFAULT '0',
   `od_temp_amount` int(11) NOT NULL DEFAULT '0',
-  `od_temp_point` int(11) NOT NULL DEFAULT '0',
   `od_receipt_amount` int(11) NOT NULL DEFAULT '0',
   `od_receipt_point` int(11) NOT NULL DEFAULT '0',
   `od_bank_account` varchar(255) NOT NULL DEFAULT '',
diff --git a/mobile/shop/orderformupdate.php b/mobile/shop/orderformupdate.php
index 78be8448c..a412358f7 100644
--- a/mobile/shop/orderformupdate.php
+++ b/mobile/shop/orderformupdate.php
@@ -301,7 +301,6 @@ $i_amount = $i_amount + $i_send_cost + $i_send_cost2 - $i_temp_point - $i_send_c
 if ($od_settle_case == "무통장")
 {
     $od_temp_amount     = $i_amount;
-    $od_temp_point      = $i_temp_point;
     $od_receipt_point   = $i_temp_point;
     $od_receipt_amount  = 0;
 }
@@ -310,7 +309,6 @@ else if ($od_settle_case == "계좌이체")
     include G4_MSHOP_PATH.'/kcp/pp_ax_hub.php';
 
     $od_temp_amount     = $i_amount;
-    $od_temp_point      = $i_temp_point;
 
     $od_tno             = $tno;
     $od_receipt_amount  = $amount;
@@ -327,7 +325,6 @@ else if ($od_settle_case == "가상계좌")
     include G4_MSHOP_PATH.'/kcp/pp_ax_hub.php';
 
     $od_temp_amount     = $i_amount;
-    $od_temp_point      = $i_temp_point;
     $od_receipt_point   = $i_temp_point;
 
     $od_tno             = $tno;
@@ -343,7 +340,6 @@ else if ($od_settle_case == "휴대폰")
     include G4_MSHOP_PATH.'/kcp/pp_ax_hub.php';
 
     $od_temp_amount     = $i_amount;
-    $od_temp_point      = $i_temp_point;
 
     $od_tno             = $tno;
     $od_receipt_amount  = $amount;
@@ -357,7 +353,6 @@ else if ($od_settle_case == "신용카드")
     include G4_MSHOP_PATH.'/kcp/pp_ax_hub.php';
 
     $od_temp_amount     = $i_amount;
-    $od_temp_point      = $i_temp_point;
 
     $od_tno             = $tno;
     $od_receipt_amount  = $amount;
@@ -431,7 +426,6 @@ $sql = " insert {$g4['shop_order_table']}
                 od_send_cost2     = '$od_send_cost2',
                 od_coupon         = '$tot_od_cp_amount',
                 od_temp_amount    = '$od_temp_amount',
-                od_temp_point     = '$od_temp_point',
                 od_receipt_amount = '$od_receipt_amount',
                 od_receipt_point  = '$od_receipt_point',
                 od_bank_account   = '$od_bank_account',
diff --git a/shop/orderformupdate.php b/shop/orderformupdate.php
index 429cc0d0a..4aa93547d 100644
--- a/shop/orderformupdate.php
+++ b/shop/orderformupdate.php
@@ -295,7 +295,6 @@ $i_amount = $i_amount + $i_send_cost + $i_send_cost2 - $i_temp_point - $i_send_c
 if ($od_settle_case == "무통장")
 {
     $od_temp_amount     = $i_amount;
-    $od_temp_point      = $i_temp_point;
     $od_receipt_point   = $i_temp_point;
     $od_receipt_amount  = 0;
 }
@@ -304,7 +303,6 @@ else if ($od_settle_case == "계좌이체")
     include G4_SHOP_PATH.'/kcp/pp_ax_hub.php';
 
     $od_temp_amount     = $i_amount;
-    $od_temp_point      = $i_temp_point;
 
     $od_tno             = $tno;
     $od_receipt_amount  = $amount;
@@ -321,7 +319,6 @@ else if ($od_settle_case == "가상계좌")
     include G4_SHOP_PATH.'/kcp/pp_ax_hub.php';
 
     $od_temp_amount     = $i_amount;
-    $od_temp_point      = $i_temp_point;
     $od_receipt_point   = $i_temp_point;
 
     $od_tno             = $tno;
@@ -337,7 +334,6 @@ else if ($od_settle_case == "휴대폰")
     include G4_SHOP_PATH.'/kcp/pp_ax_hub.php';
 
     $od_temp_amount     = $i_amount;
-    $od_temp_point      = $i_temp_point;
 
     $od_tno             = $tno;
     $od_receipt_amount  = $amount;
@@ -351,7 +347,6 @@ else if ($od_settle_case == "신용카드")
     include G4_SHOP_PATH.'/kcp/pp_ax_hub.php';
 
     $od_temp_amount     = $i_amount;
-    $od_temp_point      = $i_temp_point;
 
     $od_tno             = $tno;
     $od_receipt_amount  = $amount;
@@ -425,7 +420,6 @@ $sql = " insert {$g4['shop_order_table']}
                 od_send_cost2     = '$od_send_cost2',
                 od_coupon         = '$tot_od_cp_amount',
                 od_temp_amount    = '$od_temp_amount',
-                od_temp_point     = '$od_temp_point',
                 od_receipt_amount = '$od_receipt_amount',
                 od_receipt_point  = '$od_receipt_point',
                 od_bank_account   = '$od_bank_account',
diff --git a/shop/orderinquirycancel.php b/shop/orderinquirycancel.php
index 5f2a6e1dc..bee0330fd 100644
--- a/shop/orderinquirycancel.php
+++ b/shop/orderinquirycancel.php
@@ -64,7 +64,7 @@ sql_query(" update {$g4['shop_cart_table']} set ct_status = '취소' where od_id
 
 // 주문 취소
 $cancel_memo = addslashes($cancel_memo);
-sql_query(" update {$g4['shop_order_table']} set od_send_cost = '0', od_send_cost2 = '0', od_temp_point = '0', od_receipt_amount = '0', od_receipt_point = '0', od_shop_memo = concat(od_shop_memo,\"\\n주문자 본인 직접 취소 - ".G4_TIME_YMDHIS." (취소이유 : {$cancel_memo})\") where od_id = '$od_id' ");
+sql_query(" update {$g4['shop_order_table']} set od_send_cost = '0', od_send_cost2 = '0', od_receipt_amount = '0', od_receipt_point = '0', od_shop_memo = concat(od_shop_memo,\"\\n주문자 본인 직접 취소 - ".G4_TIME_YMDHIS." (취소이유 : {$cancel_memo})\") where od_id = '$od_id' ");
 
 // 주문취소 회원의 포인트를 되돌려 줌
 if ($od['od_receipt_point'] > 0)