From f72791a315d803e4a629734ac863911b1d52ab32 Mon Sep 17 00:00:00 2001
From: chicpro <chicpro@gmail.com>
Date: Wed, 19 Jun 2013 15:20:31 +0900
Subject: [PATCH] =?UTF-8?q?pg=20=EA=B2=B0=EC=A0=9C=20tno=20=EC=A0=80?=
 =?UTF-8?q?=EC=9E=A5=20=ED=95=84=EB=93=9C=EB=AA=85=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 adm/shop_admin/orderform.php     |  4 ++--
 extend/shop.extend2.php          |  9 +++++++++
 install/shop.sql                 |  5 ++---
 mobile/shop/orderformupdate.php  | 15 ++++++++++-----
 mobile/shop/orderinquiryview.php | 12 ++++++------
 shop/orderformupdate.php         | 15 ++++++++++-----
 shop/orderinquiryview.php        | 12 ++++++------
 shop/settle_kcp_common.php       |  2 +-
 8 files changed, 46 insertions(+), 28 deletions(-)

diff --git a/adm/shop_admin/orderform.php b/adm/shop_admin/orderform.php
index 620449e04..a80202449 100644
--- a/adm/shop_admin/orderform.php
+++ b/adm/shop_admin/orderform.php
@@ -346,7 +346,7 @@ $pg_anchor = '<ul class="anchor">
         <?php if ($od['od_settle_case'] == '휴대폰') { ?>
         <tr>
             <th scope="row">휴대폰번호</th>
-            <td><?php echo $od['od_escrow2']; ?></td>
+            <td><?php echo $od['od_bank_account']; ?></td>
             </tr>
         <tr>
             <th scope="row"><?php echo $od['od_settle_case']; ?> 결제액</th>
@@ -534,7 +534,7 @@ $pg_anchor = '<ul class="anchor">
         <?php if ($od['od_settle_case'] == '휴대폰') { ?>
         <tr>
             <th scope="row">휴대폰번호</th>
-            <td><?php echo $od['od_escrow2']; ?></td>
+            <td><?php echo $od['od_bank_account']; ?></td>
         </tr>
         <tr>
             <th scope="row"><label for="od_receipt_amount"><?php echo $od['od_settle_case']; ?> 결제액</label></th>
diff --git a/extend/shop.extend2.php b/extend/shop.extend2.php
index de4e1e6b1..e3a7e5f65 100644
--- a/extend/shop.extend2.php
+++ b/extend/shop.extend2.php
@@ -346,4 +346,13 @@ if(!$result) {
     sql_query(" ALTER TABLE `{$g4['shop_item_table']}`
                     ADD `it_notax` TINYINT(4) NOT NULL DEFAULT '0' AFTER `it_point_type` ", false);
 }
+
+// 에스크로필드 추가
+$sql = " select od_tno from {$g4['shop_order_table']} limit 1 ";
+$result = sql_query($sql, false);
+if(!$result) {
+    sql_query(" ALTER TABLE `{$g4['shop_order_table']}`
+                    ADD `od_tno` VARCHAR(255) NOT NULL DEFAULT '' AFTER `od_settle_case`,
+                    ADD `od_escrow` TINYINT(4) NOT NULL DEFAULT '0' AFTER `od_tno` ", true);
+}
 ?>
\ No newline at end of file
diff --git a/install/shop.sql b/install/shop.sql
index 16d238713..0dec38623 100644
--- a/install/shop.sql
+++ b/install/shop.sql
@@ -614,9 +614,8 @@ CREATE TABLE IF NOT EXISTS `shop_order` (
   `od_invoice_time` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
   `od_hope_date` date NOT NULL DEFAULT '0000-00-00',  
   `od_settle_case` varchar(255) NOT NULL DEFAULT '',
-  `od_escrow1` varchar(255) NOT NULL DEFAULT '',
-  `od_escrow2` varchar(255) NOT NULL DEFAULT '',
-  `od_escrow3` varchar(255) NOT NULL DEFAULT '',
+  `od_tno` varchar(255) NOT NULL DEFAULT '',
+  `od_escrow` tinyint(4) NOT NULL DEFAULT '0',
   `od_cash_no` varchar(255) NOT NULL,
   `od_cash_receipt_no` varchar(255) NOT NULL,
   `od_cash_app_time` varchar(255) NOT NULL,
diff --git a/mobile/shop/orderformupdate.php b/mobile/shop/orderformupdate.php
index bb2a76352..b652f4e0e 100644
--- a/mobile/shop/orderformupdate.php
+++ b/mobile/shop/orderformupdate.php
@@ -337,7 +337,7 @@ else if ($od_settle_case == "계좌이체")
     $od_temp_amount     = $i_amount;
     $od_temp_point      = $i_temp_point;
 
-    $od_escrow1         = $tno;
+    $od_tno             = $tno;
     $od_receipt_amount  = $amount;
     $od_receipt_point   = $i_temp_point;
     $od_receipt_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);
@@ -355,7 +355,7 @@ else if ($od_settle_case == "가상계좌")
     $od_temp_point      = $i_temp_point;
     $od_receipt_point   = 0;
 
-    $od_escrow1         = $tno;
+    $od_tno             = $tno;
     $od_receipt_amount  = 0;
     $bankname           = iconv("cp949", "utf8", $bankname);
     $depositor          = iconv("cp949", "utf8", $depositor);
@@ -370,7 +370,7 @@ else if ($od_settle_case == "휴대폰")
     $od_temp_amount     = $i_amount;
     $od_temp_point      = $i_temp_point;
 
-    $od_escrow1         = $tno;
+    $od_tno             = $tno;
     $od_receipt_amount  = $amount;
     $od_receipt_point   = $i_temp_point;
     $od_receipt_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);
@@ -384,7 +384,7 @@ else if ($od_settle_case == "신용카드")
     $od_temp_amount     = $i_amount;
     $od_temp_point      = $i_temp_point;
 
-    $od_escrow1         = $tno;
+    $od_tno             = $tno;
     $od_receipt_amount  = $amount;
     $od_receipt_point   = $i_temp_point;
     $od_receipt_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);
@@ -418,6 +418,10 @@ $od_id = get_session('ss_order_uniqid');
 // 주문상품의 uq_id 변경을 위한 uq_id를 얻는다.
 $uq_id = get_uniqid();
 
+$od_escrow = 0;
+if($escw_yn == 'Y')
+    $od_escrow = 1;
+
 // 주문서에 입력
 $sql = " insert {$g4['shop_order_table']}
             set od_id             = '$od_id',
@@ -451,7 +455,8 @@ $sql = " insert {$g4['shop_order_table']}
                 od_receipt_point  = '$od_receipt_point',
                 od_bank_account   = '$od_bank_account',
                 od_receipt_time   = '$od_receipt_time',
-                od_escrow1        = '$od_escrow1',
+                od_tno            = '$od_tno',
+                od_escrow         = '$od_escrow',
                 od_shop_memo      = '',
                 od_hope_date      = '$od_hope_date',
                 od_time           = '".G4_TIME_YMDHIS."',
diff --git a/mobile/shop/orderinquiryview.php b/mobile/shop/orderinquiryview.php
index 47429fe1f..5ce1f1d0b 100644
--- a/mobile/shop/orderinquiryview.php
+++ b/mobile/shop/orderinquiryview.php
@@ -233,7 +233,7 @@ include_once(G4_MSHOP_PATH.'/_head.php');
             </tr>
             <tr>
                 <th scope="row">영수증</th>
-                <td><a href="javascript:;" onclick="window.open('http://admin.kcp.co.kr/Modules/Sale/Card/ADSA_CARD_BILL_Receipt.jsp?c_trade_no=<?php echo $od['od_escrow1']; ?>', 'winreceipt', 'width=620,height=670')">영수증 출력</a></td>
+                <td><a href="javascript:;" onclick="window.open('http://admin.kcp.co.kr/Modules/Sale/Card/ADSA_CARD_BILL_Receipt.jsp?c_trade_no=<?php echo $od['od_tno']; ?>', 'winreceipt', 'width=620,height=670')">영수증 출력</a></td>
             </tr>
 
             <?php
@@ -261,10 +261,10 @@ include_once(G4_MSHOP_PATH.'/_head.php');
                 <th scope="row">휴대폰번호</th>
                 <td><?php echo $cd['cd_opt02']; ?></td>
             </tr>
-            <?php //echo '<tr><th scope="row">영수증</th><td><a href="javascript:;" onclick="window.open(\'http://admin.kcp.co.kr/Modules/Sale/Card/ADSA_CARD_BILL_Receipt.jsp?c_trade_no='.$od[od_escrow1].'\', \'winreceipt\', \'width=620,height=670\')">영수증 출력</a></td></tr>'; ?>
+            <?php //echo '<tr><th scope="row">영수증</th><td><a href="javascript:;" onclick="window.open(\'http://admin.kcp.co.kr/Modules/Sale/Card/ADSA_CARD_BILL_Receipt.jsp?c_trade_no='.$od[od_tno].'\', \'winreceipt\', \'width=620,height=670\')">영수증 출력</a></td></tr>'; ?>
             <tr>
                 <th scope="row">영수증</th>
-                <td><a href="javascript:;" onclick="window.open('https://admin.kcp.co.kr/Modules/Bill/ADSA_MCASH_N_Receipt.jsp?a_trade_no=<?php echo $od['od_escrow1']; ?>', 'winreceipt', 'width=500,height=690')">영수증 출력</a></td>
+                <td><a href="javascript:;" onclick="window.open('https://admin.kcp.co.kr/Modules/Bill/ADSA_MCASH_N_Receipt.jsp?a_trade_no=<?php echo $od['od_tno']; ?>', 'winreceipt', 'width=500,height=690')">영수증 출력</a></td>
             </tr>
 
             <?php
@@ -314,11 +314,11 @@ include_once(G4_MSHOP_PATH.'/_head.php');
                 <td><?php echo $od['od_deposit_name']; ?></td>
             </tr>
                 <?php
-                if ($od['od_escrow1']) {
+                if ($od['od_tno']) {
                 ?>
             <tr>
                 <th scope="row">KCP 거래번호</th>
-                <td><?php echo $od['od_escrow1']; ?></td>
+                <td><?php echo $od['od_tno']; ?></td>
             </tr>
                 <?
                 }
@@ -584,7 +584,7 @@ include_once(G4_MSHOP_PATH.'/_head.php');
     <legend>모의입금처리</legend>
     <p>관리자가 가상계좌 테스트를 한 경우에만 보입니다.</p>
     <form method="post" action="http://devadmin.kcp.co.kr/Modules/Noti/TEST_Vcnt_Noti_Proc.jsp" target="_blank">
-    <input type="text" name="e_trade_no" value="<?php echo $od['od_escrow1']; ?>" size="80"><br />
+    <input type="text" name="e_trade_no" value="<?php echo $od['od_tno']; ?>" size="80"><br />
     <input type="text" name="deposit_no" value="<?php echo $deposit_no; ?>" size="80"><br />
     <input type="text" name="req_name" value="<?php echo $od['od_name']; ?>" size="80"><br />
     <input type="text" name="noti_url" value="<?php echo G4_SHOP_URL; ?>/settle_kcp_common.php" size="80"><br /><br />
diff --git a/shop/orderformupdate.php b/shop/orderformupdate.php
index b774c9957..44356973f 100644
--- a/shop/orderformupdate.php
+++ b/shop/orderformupdate.php
@@ -331,7 +331,7 @@ else if ($od_settle_case == "계좌이체")
     $od_temp_amount     = $i_amount;
     $od_temp_point      = $i_temp_point;
 
-    $od_escrow1         = $tno;
+    $od_tno             = $tno;
     $od_receipt_amount  = $amount;
     $od_receipt_point   = $i_temp_point;
     $od_receipt_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);
@@ -349,7 +349,7 @@ else if ($od_settle_case == "가상계좌")
     $od_temp_point      = $i_temp_point;
     $od_receipt_point   = 0;
 
-    $od_escrow1         = $tno;
+    $od_tno             = $tno;
     $od_receipt_amount  = 0;
     $bankname           = iconv("cp949", "utf8", $bankname);
     $depositor          = iconv("cp949", "utf8", $depositor);
@@ -364,7 +364,7 @@ else if ($od_settle_case == "휴대폰")
     $od_temp_amount     = $i_amount;
     $od_temp_point      = $i_temp_point;
 
-    $od_escrow1         = $tno;
+    $od_tno             = $tno;
     $od_receipt_amount  = $amount;
     $od_receipt_point   = $i_temp_point;
     $od_receipt_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);
@@ -378,7 +378,7 @@ else if ($od_settle_case == "신용카드")
     $od_temp_amount     = $i_amount;
     $od_temp_point      = $i_temp_point;
 
-    $od_escrow1         = $tno;
+    $od_tno             = $tno;
     $od_receipt_amount  = $amount;
     $od_receipt_point   = $i_temp_point;
     $od_receipt_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);
@@ -412,6 +412,10 @@ $od_id = get_session('ss_order_uniqid');
 // 주문상품의 uq_id 변경을 위한 uq_id를 얻는다.
 $uq_id = get_uniqid();
 
+$od_escrow = 0;
+if($escw_yn == 'Y')
+    $od_escrow = 1;
+
 // 주문서에 입력
 $sql = " insert {$g4['shop_order_table']}
             set od_id             = '$od_id',
@@ -445,7 +449,8 @@ $sql = " insert {$g4['shop_order_table']}
                 od_receipt_point  = '$od_receipt_point',
                 od_bank_account   = '$od_bank_account',
                 od_receipt_time   = '$od_receipt_time',
-                od_escrow1        = '$od_escrow1',
+                od_tno            = '$od_tno',
+                od_escrow         = '$od_escrow',
                 od_shop_memo      = '',
                 od_hope_date      = '$od_hope_date',
                 od_time           = '".G4_TIME_YMDHIS."',
diff --git a/shop/orderinquiryview.php b/shop/orderinquiryview.php
index 6d20f607d..9fa841472 100644
--- a/shop/orderinquiryview.php
+++ b/shop/orderinquiryview.php
@@ -246,7 +246,7 @@ if(openwin != null) {
             </tr>
             <tr>
                 <th scope="row">영수증</th>
-                <td><a href="javascript:;" onclick="window.open('http://admin.kcp.co.kr/Modules/Sale/Card/ADSA_CARD_BILL_Receipt.jsp?c_trade_no=<?php echo $od['od_escrow1']; ?>', 'winreceipt', 'width=620,height=800')">영수증 출력</a></td>
+                <td><a href="javascript:;" onclick="window.open('http://admin.kcp.co.kr/Modules/Sale/Card/ADSA_CARD_BILL_Receipt.jsp?c_trade_no=<?php echo $od['od_tno']; ?>', 'winreceipt', 'width=620,height=800')">영수증 출력</a></td>
             </tr>
 
             <?php
@@ -274,10 +274,10 @@ if(openwin != null) {
                 <th scope="row">휴대폰번호</th>
                 <td><?php echo $cd['cd_opt02']; ?></td>
             </tr>
-            <?php //echo '<tr><th scope="row">영수증</th><td><a href="javascript:;" onclick="window.open(\'http://admin.kcp.co.kr/Modules/Sale/Card/ADSA_CARD_BILL_Receipt.jsp?c_trade_no='.$od[od_escrow1].'\', \'winreceipt\', \'width=620,height=670\')">영수증 출력</a></td></tr>'; ?>
+            <?php //echo '<tr><th scope="row">영수증</th><td><a href="javascript:;" onclick="window.open(\'http://admin.kcp.co.kr/Modules/Sale/Card/ADSA_CARD_BILL_Receipt.jsp?c_trade_no='.$od[tno].'\', \'winreceipt\', \'width=620,height=670\')">영수증 출력</a></td></tr>'; ?>
             <tr>
                 <th scope="row">영수증</th>
-                <td><a href="javascript:;" onclick="window.open('https://admin.kcp.co.kr/Modules/Bill/ADSA_MCASH_N_Receipt.jsp?a_trade_no=<?php echo $od['od_escrow1']; ?>', 'winreceipt', 'width=500,height=690')">영수증 출력</a></td>
+                <td><a href="javascript:;" onclick="window.open('https://admin.kcp.co.kr/Modules/Bill/ADSA_MCASH_N_Receipt.jsp?a_trade_no=<?php echo $od['od_tno']; ?>', 'winreceipt', 'width=500,height=690')">영수증 출력</a></td>
             </tr>
 
             <?php
@@ -327,11 +327,11 @@ if(openwin != null) {
                 <td><?php echo $od['od_deposit_name']; ?></td>
             </tr>
                 <?php
-                if ($od['od_escrow1']) {
+                if ($od['od_tno']) {
                 ?>
             <tr>
                 <th scope="row">KCP 거래번호</th>
-                <td><?php echo $od['od_escrow1']; ?></td>
+                <td><?php echo $od['od_tno']; ?></td>
             </tr>
                 <?
                 }
@@ -597,7 +597,7 @@ if(openwin != null) {
     <legend>모의입금처리</legend>
     <p>관리자가 가상계좌 테스트를 한 경우에만 보입니다.</p>
     <form method="post" action="http://devadmin.kcp.co.kr/Modules/Noti/TEST_Vcnt_Noti_Proc.jsp" target="_blank">
-    <input type="text" name="e_trade_no" value="<?php echo $od['od_escrow1']; ?>" size="80"><br />
+    <input type="text" name="e_trade_no" value="<?php echo $od['od_tno']; ?>" size="80"><br />
     <input type="text" name="deposit_no" value="<?php echo $deposit_no; ?>" size="80"><br />
     <input type="text" name="req_name" value="<?php echo $od['od_name']; ?>" size="80"><br />
     <input type="text" name="noti_url" value="<?php echo G4_SHOP_URL; ?>/settle_kcp_common.php" size="80"><br /><br />
diff --git a/shop/settle_kcp_common.php b/shop/settle_kcp_common.php
index 3ad926370..4eb4c0dde 100644
--- a/shop/settle_kcp_common.php
+++ b/shop/settle_kcp_common.php
@@ -146,7 +146,7 @@ if(!$default['de_card_test']) {
                     set od_receipt_amount = '$ipgm_mnyx',
                         od_receipt_time = '$tx_tm'
                   where od_id = '$order_no'
-                    and od_escrow1 = '$tno' ";
+                    and od_tno = '$tno' ";
         sql_query($sql, FALSE);
     }