From 55153185c2a8878d766355166c0fafb2be48259d Mon Sep 17 00:00:00 2001
From: chicpro <chicpro@gmail.com>
Date: Thu, 13 Jun 2013 18:02:01 +0900
Subject: [PATCH] =?UTF-8?q?#212=20=EA=B2=B0=EC=A0=9C=ED=95=84=EB=93=9C=20?=
 =?UTF-8?q?=EA=B0=84=EC=86=8C=ED=99=94=20=EC=9E=91=EC=97=85=20=EC=A4=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 adm/shop_admin/orderform.php          | 60 +++++++++++++--------------
 adm/shop_admin/orderlist.php          | 22 +---------
 adm/shop_admin/orderlist2.php         | 22 +---------
 adm/shop_admin/orderreceiptupdate.php | 44 +++++++-------------
 adm/shop_admin/sale1date.php          | 18 ++++----
 adm/shop_admin/sale1month.php         | 18 ++++----
 adm/shop_admin/sale1today.php         | 24 +++++++----
 adm/shop_admin/sale1year.php          | 18 ++++----
 extend/shop.extend.php                |  4 +-
 extend/shop.extend2.php               | 10 +++++
 install/shop.sql                      | 12 ++----
 mobile/shop/orderformupdate.php       | 36 +++++++---------
 mobile/shop/orderinquiryview.php      | 14 +++----
 shop/mail/ordermail.mail.php          |  8 ++--
 shop/mail/orderupdate1.mail.php       | 10 ++---
 shop/mail/orderupdate2.mail.php       | 10 ++---
 shop/orderformupdate.php              | 36 +++++++---------
 shop/orderinquirycancel.php           |  6 ++-
 shop/orderinquiryview.php             | 14 +++----
 shop/settle_kcp_common.php            |  4 +-
 shop/taxsave_kcp.php                  |  2 +-
 21 files changed, 175 insertions(+), 217 deletions(-)

diff --git a/adm/shop_admin/orderform.php b/adm/shop_admin/orderform.php
index 09b134c5a..a47e0cb45 100644
--- a/adm/shop_admin/orderform.php
+++ b/adm/shop_admin/orderform.php
@@ -244,8 +244,8 @@ $pg_anchor = '<ul class="anchor">
     // 주문금액 = 상품구입금액 + 배송비
     $amount['정상'] = $t_ct_amount['정상'] + $od['od_send_cost'];
 
-    // 입금액 = 무통장(가상계좌, 계좌이체 포함) + 신용카드 + 휴대폰 + 포인트
-    $amount['입금'] = $od['od_receipt_bank'] + $od['od_receipt_card'] + $od['od_receipt_hp'] + $od['od_receipt_point'];
+    // 입금액 = 결제금액 + 포인트
+    $amount['입금'] = $od['od_receipt_amount'] + $od['od_receipt_point'];
 
     // 쿠폰금액
     $amount['쿠폰'] = $t_cp_amount + $od['od_coupon'];
@@ -325,7 +325,7 @@ $pg_anchor = '<ul class="anchor">
         <?php } ?>
         <tr>
             <th scope="row"><?php echo $od['od_settle_case']; ?> 입금액</th>
-            <td><?php echo display_price($od['od_receipt_bank']); ?></td>
+            <td><?php echo display_price($od['od_receipt_amount']); ?></td>
         </tr>
         <tr>
             <th scope="row">입금자</th>
@@ -334,8 +334,8 @@ $pg_anchor = '<ul class="anchor">
         <tr>
             <th scope="row">입금확인일시</th>
             <td>
-                <?php if ($od['od_bank_time'] == 0) { ?>입금 확인일시를 체크해 주세요.
-                <?php } else { ?><?php echo $od['od_bank_time']; ?> (<?php echo get_yoil($od['od_bank_time']); ?>)
+                <?php if ($od['od_receipt_time'] == 0) { ?>입금 확인일시를 체크해 주세요.
+                <?php } else { ?><?php echo $od['od_receipt_time']; ?> (<?php echo get_yoil($od['od_receipt_time']); ?>)
                 <?php } ?>
             </td>
         </tr>
@@ -348,13 +348,13 @@ $pg_anchor = '<ul class="anchor">
             </tr>
         <tr>
             <th scope="row"><?php echo $od['od_settle_case']; ?> 결제액</th>
-            <td><?php echo display_price($od['od_receipt_hp']); ?></td>
+            <td><?php echo display_price($od['od_receipt_amount']); ?></td>
         </tr>
         <tr>
             <th scope="row">결제 확인일시</th>
             <td>
-                <?php if ($od['od_hp_time'] == 0) { ?>결제 확인일시를 체크해 주세요.
-                <?php } else { ?><?php echo $od['od_hp_time']; ?> (<?php echo get_yoil($od['od_hp_time']); ?>)
+                <?php if ($od['od_receipt_time'] == 0) { ?>결제 확인일시를 체크해 주세요.
+                <?php } else { ?><?php echo $od['od_receipt_time']; ?> (<?php echo get_yoil($od['od_receipt_time']); ?>)
                 <?php } ?>
             </td>
         </tr>
@@ -364,16 +364,16 @@ $pg_anchor = '<ul class="anchor">
         <tr>
             <th scope="row" class="sodr_sppay">신용카드 입금액</th>
             <td>
-                <?php if ($od['od_card_time'] == "0000-00-00 00:00:00") {?>0원
-                <?php } else { ?><?php echo display_price($od['od_receipt_card']); ?>
+                <?php if ($od['od_receipt_time'] == "0000-00-00 00:00:00") {?>0원
+                <?php } else { ?><?php echo display_price($od['od_receipt_amount']); ?>
                 <?php } ?>
             </td>
         </tr>
         <tr>
             <th scope="row" class="sodr_sppay">카드 승인일시</th>
             <td>
-                <?php if ($od['od_card_time'] == "0000-00-00 00:00:00") {?>신용카드 결제 일시 정보가 없습니다.
-                <?php } else { ?><?php echo substr($od['od_card_time'], 0, 20); ?>
+                <?php if ($od['od_receipt_time'] == "0000-00-00 00:00:00") {?>신용카드 결제 일시 정보가 없습니다.
+                <?php } else { ?><?php echo substr($od['od_receipt_time'], 0, 20); ?>
                 <?php } ?>
             </td>
         </tr>
@@ -430,12 +430,12 @@ $pg_anchor = '<ul class="anchor">
         </tr>
         <?php
         if ($amount['미수'] == 0) {
-            if ($od['od_receipt_bank']) {
+            if ($od['od_receipt_amount'] && ($od['od_settle_case'] == '무통장' || $od['od_settle_case'] == '가상계좌' || $od['od_settle_case'] == '계좌이체')) {
         ?>
         <tr>
             <th scope="row">현금영수증</th>
             <td>
-            <?php if ($od["od_cash"]) { ?>
+            <?php if ($od['od_cash']) { ?>
                 <a href="javascript:;" onclick="window.open('https://admin.kcp.co.kr/Modules/Service/Cash/Cash_Bill_Common_View.jsp?cash_no=<?php echo $od['od_cash_no']; ?>', 'taxsave_receipt', 'width=360,height=647,scrollbars=0,menus=0');">현금영수증 확인</a>
             <?php } else { ?>
                 <a href="javascript:;" onclick="window.open('<?php echo G4_SHOP_URL; ?>/taxsave_kcp.php?od_id=<?php echo $od_id; ?>&amp;uq_id=<?php echo $od['uq_id']; ?>', 'taxsave', 'width=550,height=400,scrollbars=1,menus=0');">현금영수증 발급</a>
@@ -476,7 +476,7 @@ $pg_anchor = '<ul class="anchor">
                 $str[$i] = str_replace("\r", "", $str[$i]);
                 $bank_account .= '<option value="'.$str[$i].'" '.get_selected($od['od_bank_account'], $str[$i]).'>'.$str[$i].'</option>'.PHP_EOL;
             }
-            $bank_account .= "</select> ";
+            $bank_account .= '</select> ';
         }
         else if ($od['od_settle_case'] == '가상계좌')
             $bank_account = $od['od_bank_account'].'<input type="hidden" name="od_bank_account" value="'.$od['od_bank_account'].'">';
@@ -491,9 +491,9 @@ $pg_anchor = '<ul class="anchor">
         </tr>
         <?php } ?>
         <tr>
-            <th scope="row"><label for="od_receipt_bank"><?php echo $od['od_settle_case']; ?> 입금액</label></th>
+            <th scope="row"><label for="od_receipt_amount"><?php echo $od['od_settle_case']; ?> 입금액</label></th>
             <td>
-                <input type="text" name="od_receipt_bank" value="<?php echo $od['od_receipt_bank']; ?>" id="od_receipt_bank" class="frm_input" size="10"> 원
+                <input type="text" name="od_receipt_amount" value="<?php echo $od['od_receipt_amount']; ?>" id="od_receipt_amount" class="frm_input" size="10"> 원
                 <?php
                 if ($od['od_settle_case'] == '계좌이체' || $od['od_settle_case'] == '가상계좌') {
                     $pg_url = $g4['shop_cardpg'][$default['de_card_pg']];
@@ -514,11 +514,11 @@ $pg_anchor = '<ul class="anchor">
             </td>
         </tr>
         <tr>
-            <th scope="row"><label for="od_bank_time">입금 확인일시</label></th>
+            <th scope="row"><label for="od_receipt_time">입금 확인일시</label></th>
             <td>
                 <label for="od_bank_chk">현재 시간으로 설정</label>
-                <input type="checkbox" name="od_bank_chk" id="od_bank_chk" value="<?php echo date("Y-m-d H:i:s", G4_SERVER_TIME); ?>" onclick="if (this.checked == true) this.form.od_bank_time.value=this.form.od_bank_chk.value; else this.form.od_bank_time.value = this.form.od_bank_time.defaultValue;"><br>
-                <input type="text" name="od_bank_time" value="<?php echo is_null_time($od['od_bank_time']) ? "" : $od['od_bank_time']; ?>" id="od_bank_time" class="frm_input" maxlength="19">
+                <input type="checkbox" name="od_bank_chk" id="od_bank_chk" value="<?php echo date("Y-m-d H:i:s", G4_SERVER_TIME); ?>" onclick="if (this.checked == true) this.form.od_receipt_time.value=this.form.od_bank_chk.value; else this.form.od_receipt_time.value = this.form.od_receipt_time.defaultValue;"><br>
+                <input type="text" name="od_receipt_time" value="<?php echo is_null_time($od['od_receipt_time']) ? "" : $od['od_receipt_time']; ?>" id="od_receipt_time" class="frm_input" maxlength="19">
             </td>
         </tr>
         <?php } ########## 끝 ?>
@@ -529,39 +529,39 @@ $pg_anchor = '<ul class="anchor">
             <td><?php echo $od['od_escrow2']; ?></td>
         </tr>
         <tr>
-            <th scope="row"><label for="od_receipt_hp"><?php echo $od['od_settle_case']; ?> 결제액</label></th>
+            <th scope="row"><label for="od_receipt_amount"><?php echo $od['od_settle_case']; ?> 결제액</label></th>
             <td>
-                <input type="text" name="od_receipt_hp" value="<?php echo $od['od_receipt_hp']; ?>" id="od_receipt_hp" class="frm_input"> 원
+                <input type="text" name="od_receipt_amount" value="<?php echo $od['od_receipt_amount']; ?>" id="od_receipt_amount" class="frm_input"> 원
                 <?php $pg_url = $g4['shop_cardpg'][$default['de_card_pg']];?>
                 <a href="<?php echo $pg_url; ?>" target="_blank">결제대행사</a>
             </td>
         </tr>
         <tr>
-            <th scope="row"><label for="op_hp_time">휴대폰 결제일시</label></th>
+            <th scope="row"><label for="op_receipt_time">휴대폰 결제일시</label></th>
             <td>
                 <label for="od_card_chk">현재 시간으로 설정</label>
                 <!-- name od_card_chk 를 od_hp_chk 로 수정 - 지운아빠 2013-04-16 -->
-                <input type="checkbox" name="od_hp_chk" id="od_hp_chk" value="<?php echo date("Y-m-d H:i:s", G4_SERVER_TIME); ?>" onclick="if (this.checked == true) this.form.od_hp_time.value=this.form.od_card_chk.value; else this.form.od_hp_time.value = this.form.od_hp_time.defaultValue;"><br>
-                <input type="text" name="od_hp_time" value="<?php echo is_null_time($od['od_hp_time']) ? "" : $od['od_hp_time']; ?>" id="op_hp_time" class="frm_input" size="19" maxlength="19">
+                <input type="checkbox" name="od_hp_chk" id="od_hp_chk" value="<?php echo date("Y-m-d H:i:s", G4_SERVER_TIME); ?>" onclick="if (this.checked == true) this.form.od_receipt_time.value=this.form.od_hp_chk.value; else this.form.od_receipt_time.value = this.form.od_receipt_time.defaultValue;"><br>
+                <input type="text" name="od_receipt_time" value="<?php echo is_null_time($od['od_receipt_time']) ? "" : $od['od_receipt_time']; ?>" id="op_receipt_time" class="frm_input" size="19" maxlength="19">
             </td>
         </tr>
         <?php } ?>
 
         <?php if ($od['od_settle_case'] == '신용카드') { ?>
         <tr>
-            <th scope="row" class="sodr_sppay"><label for="od_receipt_card">신용카드 결제액</label></th>
+            <th scope="row" class="sodr_sppay"><label for="od_receipt_amount">신용카드 결제액</label></th>
             <td>
-                <input type="text" name="od_receipt_card" value="<?php echo $od['od_receipt_card']; ?>" id="od_receipt_card" class="frm_input" size="10"> 원
+                <input type="text" name="od_receipt_amount" value="<?php echo $od['od_receipt_amount']; ?>" id="od_receipt_amount" class="frm_input" size="10"> 원
                 <?php $card_url = $g4['shop_cardpg'][$default['de_card_pg']]; ?>
                 <a href="<?php echo $card_url; ?>" target="_blank">결제대행사</a>
             </td>
         </tr>
         <tr>
-            <th scope="row" class="sodr_sppay"><label for="od_card_time">카드 승인일시</label></th>
+            <th scope="row" class="sodr_sppay"><label for="od_receipt_time">카드 승인일시</label></th>
             <td>
                 <label for="od_card_chk">현재 시간으로 설정</label>
-                <input type="checkbox" name="od_card_chk" id="od_card_chk" value="<?php echo date("Y-m-d H:i:s", G4_SERVER_TIME); ?>" onclick="if (this.checked == true) this.form.od_card_time.value=this.form.od_card_chk.value; else this.form.od_card_time.value = this.form.od_card_time.defaultValue;"><br>
-                <input type="text" name="od_card_time" value="<?php echo is_null_time($od['od_card_time']) ? "" : $od['od_card_time']; ?>" id="od_card_time" class="frm_input" size="19" maxlength="19">
+                <input type="checkbox" name="od_card_chk" id="od_card_chk" value="<?php echo date("Y-m-d H:i:s", G4_SERVER_TIME); ?>" onclick="if (this.checked == true) this.form.od_receipt_time.value=this.form.od_card_chk.value; else this.form.od_receipt_time.value = this.form.od_receipt_time.defaultValue;"><br>
+                <input type="text" name="od_receipt_time" value="<?php echo is_null_time($od['od_receipt_time']) ? "" : $od['od_receipt_time']; ?>" id="od_receipt_time" class="frm_input" size="19" maxlength="19">
             </td>
         </tr>
         <tr>
diff --git a/adm/shop_admin/orderlist.php b/adm/shop_admin/orderlist.php
index daedf057c..c19080e7a 100644
--- a/adm/shop_admin/orderlist.php
+++ b/adm/shop_admin/orderlist.php
@@ -185,26 +185,8 @@ if ($search) // 검색렬일 때만 처음 버튼을 보여줌
         }
         else
         {
-            if ($lines[$i]['od_temp_bank'] > 0 || $lines[$i]['od_receipt_bank'] > 0)
-            {
-                //$s_receipt_way = "무통장입금";
-                $s_receipt_way = cut_str($lines[$i]['od_bank_account'],8,"");
-                $s_br = "<br />";
-            }
-
-            if ($lines[$i]['od_temp_card'] > 0 || $lines[$i]['od_receipt_card'] > 0)
-            {
-                // 미수금이 없고 카드결제를 하지 않았다면 카드결제를 선택후 무통장 입금한 경우임
-                if ($lines[$i]['misuamount'] <= 0 && $lines[$i]['od_receipt_card'] == 0)
-                    ; // 화면 출력하지 않음
-                else
-                {
-                    $s_receipt_way .= $s_br."카드";
-                    if ($lines[$i]['od_receipt_card'] == 0)
-                        $s_receipt_way .= "<span><span>(미승인)</span></span>";
-                    $s_br = "<br />";
-                }
-            }
+            $s_receipt_way = '결제수단없음';
+            $s_br = '<br />';
         }
 
         if ($lines[$i]['od_receipt_point'] > 0)
diff --git a/adm/shop_admin/orderlist2.php b/adm/shop_admin/orderlist2.php
index ccbb3f790..feb5ffe41 100644
--- a/adm/shop_admin/orderlist2.php
+++ b/adm/shop_admin/orderlist2.php
@@ -126,26 +126,8 @@ if ($search) // 검색렬일 때만 처음 버튼을 보여줌
             }
             else
             {
-                if ($row['od_temp_bank'] > 0 || $row['od_receipt_bank'] > 0)
-                {
-                    //$s_receipt_way = "무통장입금";
-                    $s_receipt_way = cut_str($row['od_bank_account'],8,"");
-                    $s_br = "+";
-                }
-
-                if ($row['od_temp_card'] > 0 || $row['od_receipt_card'] > 0)
-                {
-                    // 미수금이 없고 카드결제를 하지 않았다면 카드결제를 선택후 무통장 입금한 경우임
-                    if ($row['misuamount'] <= 0 && $row['od_receipt_card'] == 0)
-                        ; // 화면 출력하지 않음
-                    else
-                    {
-                        $s_receipt_way .= $s_br."카드";
-                        if ($row['od_receipt_card'] == 0)
-                            $s_receipt_way .= '<span class="small"><span class="point" style="font-size:8pt;">(미승인)</span></span>';
-                        $s_br = '<br>';
-                    }
-                }
+                $s_receipt_way = '결제수단없음';
+                $s_br = '+';
             }
 
             if ($row['od_receipt_point'] > 0)
diff --git a/adm/shop_admin/orderreceiptupdate.php b/adm/shop_admin/orderreceiptupdate.php
index 0c7f158d6..461b244da 100644
--- a/adm/shop_admin/orderreceiptupdate.php
+++ b/adm/shop_admin/orderreceiptupdate.php
@@ -6,40 +6,24 @@ include_once(G4_LIB_PATH.'/icode.sms.lib.php');
 
 auth_check($auth[$sub_menu], "w");
 
-if ($od_bank_time)
+if ($od_receipt_time)
 {
-    if (check_datetime($od_bank_time) == false)
-        alert('무통장 입금일시 오류입니다.');
-}
-
-if ($od_card_time)
-{
-    if (check_datetime($od_card_time) == false)
-        alert('신용카드 결제일시 오류입니다.');
-}
-
-if ($od_hp_time)
-{
-    if (check_datetime($od_hp_time) == false)
-        alert("휴대폰 결제일시 오류입니다.");
+    if (check_datetime($od_receipt_time) == false)
+        alert('결제일시 오류입니다.');
 }
 
 $sql = " update {$g4['shop_order_table']}
-            set od_deposit_name  = '$od_deposit_name',
-                od_bank_account  = '$od_bank_account',
-                od_bank_time     = '$od_bank_time',
-                od_card_time     = '$od_card_time',
-                od_hp_time       = '$od_hp_time',
-                od_receipt_bank  = '$od_receipt_bank',
-                od_receipt_card  = '$od_receipt_card',
-                od_receipt_hp    = '$od_receipt_hp',
-                od_receipt_point = '$od_receipt_point',
-                od_cancel_card   = '$od_cancel_card',
-                od_dc_amount     = '$od_dc_amount',
-                od_refund_amount = '$od_refund_amount',
-                dl_id            = '$dl_id',
-                od_invoice       = '$od_invoice',
-                od_invoice_time  = '$od_invoice_time' ";
+            set od_deposit_name    = '$od_deposit_name',
+                od_bank_account    = '$od_bank_account',
+                od_receipt_time    = '$od_bank_time',
+                od_receipt_amount  = '$od_receipt_amount',
+                od_receipt_point   = '$od_receipt_point',
+                od_cancel_card     = '$od_cancel_card',
+                od_dc_amount       = '$od_dc_amount',
+                od_refund_amount   = '$od_refund_amount',
+                dl_id              = '$dl_id',
+                od_invoice         = '$od_invoice',
+                od_invoice_time    = '$od_invoice_time' ";
 if (isset($od_send_cost))
     $sql .= " , od_send_cost = '$od_send_cost' ";
 $sql .= " where od_id = '$od_id' ";
diff --git a/adm/shop_admin/sale1date.php b/adm/shop_admin/sale1date.php
index 427f1bbc0..17be754a9 100644
--- a/adm/shop_admin/sale1date.php
+++ b/adm/shop_admin/sale1date.php
@@ -38,11 +38,11 @@ $lines = $lines1 = array();
 $sql = " select uq_id,
             SUBSTRING(od_time,1,10) as od_date,
             od_send_cost,
-            od_receipt_bank,
-            od_receipt_card,
+            od_settle_case,
+            od_receipt_amount,
             od_receipt_point,
             od_dc_amount,
-            (od_receipt_bank + od_receipt_card + od_receipt_point) as receiptamount,
+            (od_receipt_amount + od_receipt_point) as receiptamount,
             (od_refund_amount + od_cancel_card) as receiptcancel
        from {$g4['shop_order_table']}
       where SUBSTRING(od_time,1,10) between '$fr_date' and '$to_date'
@@ -67,8 +67,10 @@ for ($i=0; $row=mysql_fetch_array($result); $i++)
     $tot['orderamount']    += $row1['orderamount'];
     $tot['ordercancel']    += $row1['ordercancel'];
     $tot['dc']             += $row['od_dc_amount'];
-    $tot['receiptbank']    += $row['od_receipt_bank'];
-    $tot['receiptcard']    += $row['od_receipt_card'];
+    if($row['od_settle_case'] == '무통장' || $row['od_settle_case'] == '가상계좌' || $row['od_settle_case'] == '계좌이체')
+        $tot['receiptbank']    += $row['od_receipt_amount'];
+    if($row['od_settle_case'] == '신용카드')
+        $tot['receiptcard']    += $row['od_receipt_amount'];
     $tot['receiptpoint ']  += $row['od_receipt_point'];
     $tot['receiptamount']  += $row['receiptamount'];
     $tot['receiptcancel']  += $row['receiptcancel'];
@@ -127,8 +129,10 @@ for ($i=0; $row=mysql_fetch_array($result); $i++)
         $save['orderamount']   += $lines1[$i]['orderamount'];
         $save['ordercancel']   += $lines1[$i]['ordercancel'];
         $save['dc']            += $lines[$i]['od_dc_amount'];
-        $save['receiptbank']   += $lines[$i]['od_receipt_bank'];
-        $save['receiptcard']   += $lines[$i]['od_receipt_card'];
+        if($lines[$i]['od_settle_case'] == '무통장' || $lines[$i]['od_settle_case'] == '가상계좌' || $lines[$i]['od_settle_case'] == '계좌이체')
+            $save['receiptbank']   += $lines[$i]['od_receipt_amount'];
+        if($lines[$i]['od_settle_case'] == '신용카드')
+            $save['receiptcard']   += $lines[$i]['od_receipt_amount'];
         $save['receiptpoint']  += $lines[$i]['od_receipt_point'];
         $save['receiptcancel'] += $lines[$i]['receiptcancel'];
         $save['misu']          += $misu;
diff --git a/adm/shop_admin/sale1month.php b/adm/shop_admin/sale1month.php
index 4f27d249c..30d14abaf 100644
--- a/adm/shop_admin/sale1month.php
+++ b/adm/shop_admin/sale1month.php
@@ -38,11 +38,11 @@ $lines = $lines1 = array();
 $sql = " select uq_id,
             SUBSTRING(od_time,1,7) as od_date,
             od_send_cost,
-            od_receipt_bank,
-            od_receipt_card,
+            od_settle_case,
+            od_receipt_amount,
             od_receipt_point,
             od_dc_amount,
-            (od_receipt_bank + od_receipt_card + od_receipt_point) as receiptamount,
+            (od_receipt_amount + od_receipt_point) as receiptamount,
             (od_refund_amount + od_cancel_card) as receiptcancel
        from {$g4['shop_order_table']}
       where SUBSTRING(od_time,1,7) between '$fr_month' and '$to_month'
@@ -67,8 +67,10 @@ for ($i=0; $row=mysql_fetch_array($result); $i++)
     $tot['orderamount']   += $row1['orderamount'];
     $tot['ordercancel']   += $row1['ordercancel'];
     $tot['dc']            += $row['od_dc_amount'];
-    $tot['receiptbank']   += $row['od_receipt_bank'];
-    $tot['receiptcard']   += $row['od_receipt_card'];
+    if($row['od_settle_case'] == '무통장' || $row['od_settle_case'] == '가상계좌' || $row['od_settle_case'] == '계좌이체')
+        $tot['receiptbank']   += $row['od_receipt_amount'];
+    if($row['od_settle_case'] == '신용카드')
+        $tot['receiptcard']   += $row['od_receipt_amount'];
     $tot['receiptpoint']  += $row['od_receipt_point'];
     $tot['receiptamount'] += $row['receiptamount'];
     $tot['receiptcancel'] += $row['receiptcancel'];
@@ -127,8 +129,10 @@ for ($i=0; $row=mysql_fetch_array($result); $i++)
         $save['orderamount']   += $lines1[$i]['orderamount'];
         $save['ordercancel']   += $lines1[$i]['ordercancel'];
         $save['dc']            += $lines[$i]['od_dc_amount'];
-        $save['receiptbank']   += $lines[$i]['od_receipt_bank'];
-        $save['receiptcard']   += $lines[$i]['od_receipt_card'];
+        if($lines[$i]['od_settle_case'] == '무통장' || $lines[$i]['od_settle_case'] == '가상계좌' || $lines[$i]['od_settle_case'] == '계좌이체')
+            $save['receiptbank']   += $lines[$i]['od_receipt_amount'];
+        if($lines[$i]['od_settle_case'] == '신용카드')
+            $save['receiptcard']   += $lines[$i]['od_receipt_amount'];
         $save['receiptpoint']  += $lines[$i]['od_receipt_point'];
         $save['receiptcancel'] += $lines[$i]['receiptcancel'];
         $save['misu']          += $misu;
diff --git a/adm/shop_admin/sale1today.php b/adm/shop_admin/sale1today.php
index 6a8dffeda..fa11b1fc6 100644
--- a/adm/shop_admin/sale1today.php
+++ b/adm/shop_admin/sale1today.php
@@ -16,11 +16,11 @@ $sql = " select od_id,
                 od_name,
                 uq_id,
                 od_send_cost,
-                od_receipt_bank,
-                od_receipt_card,
+                od_settle_case,
+                od_receipt_amount,
                 od_receipt_point,
                 od_dc_amount,
-                (od_receipt_bank + od_receipt_card + od_receipt_point) as receiptamount,
+                (od_receipt_amount + od_receipt_point) as receiptamount,
                 (od_refund_amount + od_cancel_card) as receiptcancel
            from {$g4['shop_order_table']}
           where SUBSTRING(od_time,1,10) = '$date'
@@ -44,8 +44,10 @@ for ($i=0; $row=mysql_fetch_array($result); $i++)
     $tot['orderamount']   += $row1['orderamount'];
     $tot['ordercancel']   += $row1['ordercancel'];
     $tot['dc']            += $row['od_dc_amount'];
-    $tot['receipt_bank']  += $row['od_receipt_bank'];
-    $tot['receipt_card']  += $row['od_receipt_card'];
+    if($row['od_settle_case'] == '무통장' || $row['od_settle_case'] == '가상계좌' || $row['od_settle_case'] == '계좌이체')
+        $tot['receipt_bank']  += $row['od_receipt_amount'];
+    if($row['od_settle_case'] == '신용카드')
+        $tot['receipt_card']  += $row['od_receipt_amount'];
     $tot['receipt_point'] += $row['od_receipt_point'];
     $tot['receiptamount'] += $row['receiptamount'];
     $tot['receiptcancel'] += $row['receiptcancel'];
@@ -74,7 +76,7 @@ for ($i=0; $row=mysql_fetch_array($result); $i++)
     <tr>
         <td colspan="2">합 계</td>
         <td><?php echo number_format($tot['orderamount']); ?></td>
-        <td><?php echo number_format($tot['ordercancel']+ $tot['dc']); ?></td>
+        <td><?php echo number_format($tot['ordercancel'] + $tot['dc']); ?></td>
         <td><?php echo number_format($tot['receipt_bank']); ?></td>
         <td><?php echo number_format($tot['receipt_card']); ?></td>
         <td><?php echo number_format($tot['receipt_point']); ?></td>
@@ -95,14 +97,20 @@ for ($i=0; $row=mysql_fetch_array($result); $i++)
 
         $misu = $lines1[$i]['orderamount'] - $lines1[$i]['ordercancel'] - $lines[$i]['od_dc_amount'] - $lines[$i]['receiptamount'] + $lines[$i]['receiptcancel'];
 
+        $receipt_bank = $receipt_card = 0;
+        if($lines[$i]['od_settle_case'] == '무통장' || $lines[$i]['od_settle_case'] == '가상계좌' || $lines[$i]['od_settle_case'] == '계좌이체')
+            $receipt_bank = $lines[$i]['od_receipt_amount'];
+        if($lines[$i]['od_settle_case'] == '신용카드')
+            $receipt_card = $lines[$i]['od_receipt_amount'];
+
     ?>
         <tr>
             <td class="td_odrnum2"><a href="./orderform.php?od_id=<?php echo $lines[$i]['od_id']; ?>"><?php echo $lines[$i]['od_id']; ?></a></td>
             <td class="td_name"><?php echo $href; ?><?php echo $lines[$i]['od_name']; ?></a></td>
             <td class="td_num"><?php echo number_format($lines1[$i]['orderamount']); ?></td>
             <td class="td_num"><?php echo number_format($lines1[$i]['ordercancel'] + $lines[$i]['od_dc_amount']); ?></td>
-            <td class="td_num"><?php echo number_format($lines[$i]['od_receipt_bank']); ?></td>
-            <td class="td_num"><?php echo number_format($lines[$i]['od_receipt_card']); ?></td>
+            <td class="td_num"><?php echo number_format($receipt_bank); ?></td>
+            <td class="td_num"><?php echo number_format($receipt_card); ?></td>
             <td class="td_num"><?php echo number_format($lines[$i]['od_receipt_point']); ?></td>
             <td class="td_num"><?php echo number_format($lines[$i]['receiptcancel']); ?></td>
             <td class="td_num"><?php echo number_format($misu); ?></td>
diff --git a/adm/shop_admin/sale1year.php b/adm/shop_admin/sale1year.php
index e9ee44307..f1889003c 100644
--- a/adm/shop_admin/sale1year.php
+++ b/adm/shop_admin/sale1year.php
@@ -33,11 +33,11 @@ unset($tot);
 $sql = " select uq_id,
                 SUBSTRING(od_time,1,4) as od_date,
                 od_send_cost,
-                od_receipt_bank,
-                od_receipt_card,
+                od_settle_case,
+                od_receipt_amount,
                 od_receipt_point,
                 od_dc_amount,
-                (od_receipt_bank + od_receipt_card + od_receipt_point) as receiptamount,
+                (od_receipt_amount + od_receipt_point) as receiptamount,
                 (od_refund_amount + od_cancel_card) as receiptcancel
            from {$g4['shop_order_table']}
           where SUBSTRING(od_time,1,4) between '$fr_year' and '$to_year'
@@ -62,8 +62,10 @@ for ($i=0; $row=mysql_fetch_array($result); $i++)
     $tot['orderamount']   += $row1['orderamount'];
     $tot['ordercancel']   += $row1['ordercancel'];
     $tot['dc']            += $row['od_dc_amount'];
-    $tot['receiptbank']   += $row['od_receipt_bank'];
-    $tot['receiptcard']   += $row['od_receipt_card'];
+    if($row['od_settle_case'] == '무통장' || $row['od_settle_case'] == '가상계좌' || $row['od_settle_case'] == '계좌이체')
+        $tot['receiptbank']   += $row['od_receipt_amount'];
+    if($row['od_settle_case'] == '신용카드')
+        $tot['receiptcard']   += $row['od_receipt_amount'];
     $tot['receiptpoint']  += $row['od_receipt_point'];
     $tot['receiptamount'] += $row['receiptamount'];
     $tot['receiptcancel'] += $row['receiptcancel'];
@@ -122,8 +124,10 @@ for ($i=0; $row=mysql_fetch_array($result); $i++)
         $save['orderamount']   += $lines1[$i]['orderamount'];
         $save['ordercancel']   += $lines1[$i]['ordercancel'];
         $save['dc']            += $lines[$i]['od_dc_amount'];
-        $save['receiptbank']   += $lines[$i]['od_receipt_bank'];
-        $save['receiptcard']   += $lines[$i]['od_receipt_card'];
+        if($lines[$i]['od_settle_case'] == '무통장' || $lines[$i]['od_settle_case'] == '가상계좌' || $lines[$i]['od_settle_case'] == '계좌이체')
+            $save['receiptbank']   += $lines[$i]['od_receipt_amount'];
+        if($lines[$i]['od_settle_case'] == '신용카드')
+            $save['receiptcard']   += $lines[$i]['od_receipt_amount'];
         $save['receiptpoint']  += $lines[$i]['od_receipt_point'];
         $save['receiptcancel'] += $lines[$i]['receiptcancel'];
         $save['misu']          += $misu;
diff --git a/extend/shop.extend.php b/extend/shop.extend.php
index 39ce974ac..0f0620e39 100644
--- a/extend/shop.extend.php
+++ b/extend/shop.extend.php
@@ -35,13 +35,13 @@ define(_MISU_QUERY_, "
     (SUM(IF(b.io_type = 1, b.io_price * b.ct_qty, (b.ct_price + b.io_price) * b.ct_qty))  + a.od_send_cost) as orderamount, /* 주문합계 */
     (SUM(b.cp_amount) + a.od_coupon) as couponamount, /* 쿠폰합계*/
     (SUM(IF(b.ct_status = '취소' OR b.ct_status = '반품' OR b.ct_status = '품절', (IF(b.io_type = 1, b.io_price * b.ct_qty, (b.ct_price + b.io_price) * b.ct_qty)), 0))) as ordercancel, /* 주문취소 */
-    (a.od_receipt_bank + a.od_receipt_card + a.od_receipt_hp + a.od_receipt_point) as receiptamount, /* 입금합계 */
+    (a.od_receipt_amount + a.od_receipt_point) as receiptamount, /* 입금합계 */
     (a.od_refund_amount + a.od_cancel_card) as receiptcancel, /* 입금취소 */
     (
         (SUM(IF(b.io_type = 1, b.io_price * b.ct_qty, (b.ct_price + b.io_price) * b.ct_qty))  + a.od_send_cost) -
         (SUM(IF(b.ct_status = '취소' OR b.ct_status = '반품' OR b.ct_status = '품절', (IF(b.io_type = 1, b.io_price * b.ct_qty, (b.ct_price + b.io_price) * b.ct_qty)), 0))) -
         a.od_dc_amount -
-        (a.od_receipt_bank + a.od_receipt_card + a.od_receipt_hp + a.od_receipt_point) +
+        (a.od_receipt_amount + a.od_receipt_point) +
         (a.od_refund_amount + a.od_cancel_card) -
         (SUM(b.cp_amount) + a.od_coupon)
     ) as misu /* 미수금 = 주문합계 - 주문취소 - DC - 입금합계 + 입금취소 - 쿠폰합계 */");
diff --git a/extend/shop.extend2.php b/extend/shop.extend2.php
index 609f6a99c..cb3310c15 100644
--- a/extend/shop.extend2.php
+++ b/extend/shop.extend2.php
@@ -302,4 +302,14 @@ if(!$result) {
     sql_query(" ALTER TABLE `{$g4['shop_cart_table']}`
                     ADD `ct_send_cost` TINYINT(11) NOT NULL DEFAULT '0' AFTER `io_price` ", false);
 }
+
+// 결제필드 변경
+$sql = " select od_temp_amount from {$g4['shop_order_table']} limit 1 ";
+$result = sql_query($sql, false);
+if(!$result) {
+    sql_query(" ALTER TABLE `{$g4['shop_order_table']}`
+                    ADD `od_temp_amount` INT(11) NOT NULL DEFAULT '0' AFTER `od_send_coupon`,
+                    ADD `od_receipt_amount` INT(11) NOT NULL DEFAULT '0' AFTER `od_temp_point`,
+                    ADD `od_receipt_time` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00' AFTER `od_bank_account` ", false);
+}
 ?>
\ No newline at end of file
diff --git a/install/shop.sql b/install/shop.sql
index a68bfd2ef..d348aae01 100644
--- a/install/shop.sql
+++ b/install/shop.sql
@@ -598,18 +598,12 @@ CREATE TABLE IF NOT EXISTS `shop_order` (
   `od_memo` text NOT NULL,
   `od_send_cost` int(11) NOT NULL DEFAULT '0',
   `od_send_coupon` int(11) NOT NULL DEFAULT '0',
-  `od_temp_bank` int(11) NOT NULL DEFAULT '0',
-  `od_temp_card` int(11) NOT NULL DEFAULT '0',
-  `od_temp_hp` int(11) NOT NULL,
+  `od_temp_amount` int(11) NOT NULL DEFAULT '0',
   `od_temp_point` int(11) NOT NULL DEFAULT '0',
-  `od_receipt_bank` int(11) NOT NULL DEFAULT '0',
-  `od_receipt_card` int(11) NOT NULL DEFAULT '0',
-  `od_receipt_hp` int(11) NOT NULL,
+  `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 '',
-  `od_bank_time` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
-  `od_card_time` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
-  `od_hp_time` datetime NOT NULL,
+  `od_receipt_time` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
   `od_cancel_card` int(11) NOT NULL DEFAULT '0',
   `od_dc_amount` int(11) NOT NULL DEFAULT '0',
   `od_coupon` int(11) NOT NULL DEFAULT '0',
diff --git a/mobile/shop/orderformupdate.php b/mobile/shop/orderformupdate.php
index 1c7804ad7..cc95183a2 100644
--- a/mobile/shop/orderformupdate.php
+++ b/mobile/shop/orderformupdate.php
@@ -307,22 +307,22 @@ $i_amount = $i_amount + $i_send_cost - $i_temp_point;
 
 if ($od_settle_case == "무통장")
 {
-    $od_temp_bank       = $i_amount;
+    $od_temp_amount     = $i_amount;
     $od_temp_point      = $i_temp_point;
     $od_receipt_point   = $i_temp_point;
-    $od_receipt_bank    = 0;
+    $od_receipt_amount  = 0;
 }
 else if ($od_settle_case == "계좌이체")
 {
     include G4_MSHOP_PATH.'/kcp/pp_ax_hub.php';
 
-    $od_temp_bank       = $i_amount;
+    $od_temp_amount     = $i_amount;
     $od_temp_point      = $i_temp_point;
 
     $od_escrow1         = $tno;
-    $od_receipt_bank    = $amount;
+    $od_receipt_amount  = $amount;
     $od_receipt_point   = $i_temp_point;
-    $od_bank_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_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);
     $od_bank_account    = $od_settle_case;
     $od_deposit_name    = $od_name;
     $bank_name          = iconv("cp949", "utf8", $bank_name);
@@ -333,7 +333,7 @@ else if ($od_settle_case == "가상계좌")
 {
     include G4_MSHOP_PATH.'/kcp/pp_ax_hub.php';
 
-    $od_temp_bank       = $i_amount;
+    $od_temp_amount     = $i_amount;
     $od_temp_point      = $i_temp_point;
     $od_receipt_point   = 0;
 
@@ -349,13 +349,13 @@ else if ($od_settle_case == "휴대폰")
 {
     include G4_MSHOP_PATH.'/kcp/pp_ax_hub.php';
 
-    $od_temp_bank       = $i_amount;
+    $od_temp_amount     = $i_amount;
     $od_temp_point      = $i_temp_point;
 
     $od_escrow1         = $tno;
-    $od_receipt_hp      = $amount;
+    $od_receipt_amount  = $amount;
     $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_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);
     $od_bank_account    = $commid.' '.$mobile_no;
     $pg_amount          = $amount;
 }
@@ -363,13 +363,13 @@ else if ($od_settle_case == "신용카드")
 {
     include G4_MSHOP_PATH.'/kcp/pp_ax_hub.php';
 
-    $od_temp_card       = $i_amount;
+    $od_temp_amount     = $i_amount;
     $od_temp_point      = $i_temp_point;
 
     $od_escrow1         = $tno;
-    $od_receipt_card    = $amount;
+    $od_receipt_amount  = $amount;
     $od_receipt_point   = $i_temp_point;
-    $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_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);
     $card_name          = iconv("cp949", "utf8", $card_name);
     $od_bank_account    = $card_name;
     $pg_amount          = $amount;
@@ -426,18 +426,12 @@ $sql = " insert {$g4['shop_order_table']}
                 od_send_cost      = '$od_send_cost',
                 od_send_coupon    = '$tot_sc_cp_amount',
                 od_coupon         = '$tot_od_cp_amount',
-                od_temp_bank      = '$od_temp_bank',
-                od_temp_card      = '$od_receipt_card',
-                od_temp_hp        = '$od_receipt_hp',
+                od_temp_amount    = '$od_temp_amount',
                 od_temp_point     = '$od_temp_point',
-                od_receipt_bank   = '$od_receipt_bank',
-                od_receipt_card   = '$od_receipt_card',
-                od_receipt_hp     = '$od_receipt_hp',
+                od_receipt_amount = '$od_receipt_amount',
                 od_receipt_point  = '$od_receipt_point',
                 od_bank_account   = '$od_bank_account',
-                od_bank_time      = '$od_bank_time',
-                od_card_time      = '$od_card_time',
-                od_hp_time        = '$od_hp_time',
+                od_receipt_time   = '$od_receipt_time',
                 od_escrow1        = '$od_escrow1',
                 od_shop_memo      = '',
                 od_hope_date      = '$od_hope_date',
diff --git a/mobile/shop/orderinquiryview.php b/mobile/shop/orderinquiryview.php
index 4dcba624e..fa12869ae 100644
--- a/mobile/shop/orderinquiryview.php
+++ b/mobile/shop/orderinquiryview.php
@@ -162,9 +162,7 @@ include_once(G4_MSHOP_PATH.'/_head.php');
     <div id="sod_fin_view">
         <h2>결제/배송 정보</h2>
         <?php
-        $receipt_amount = $od['od_receipt_bank']
-                        + $od['od_receipt_card']
-                        + $od['od_receipt_hp']
+        $receipt_amount = $od['od_receipt_amount']
                         + $od['od_receipt_point']
                         - $od['od_cancel_card']
                         - $od['od_refund_amount'];
@@ -274,16 +272,16 @@ include_once(G4_MSHOP_PATH.'/_head.php');
                 <td><?php echo $od['od_settle_case']; ?></td>
             </tr>
                 <?php
-                if ($od['od_receipt_bank'])
+                if ($od['od_receipt_amount'])
                 {
                 ?>
             <tr>
                 <th scope="row">입금액</th>
-                <td><?php echo display_price($od['od_receipt_bank']); ?></td>
+                <td><?php echo display_price($od['od_receipt_amount']); ?></td>
             </tr>
             <tr>
                 <td scope="row">입금확인일시</th>
-                <td><?php echo $od['od_bank_time']; ?></td>
+                <td><?php echo $od['od_receipt_time']; ?></td>
             </tr>
                 <?php
                 }
@@ -354,7 +352,7 @@ include_once(G4_MSHOP_PATH.'/_head.php');
             // 현금영수증 발급을 사용하는 경우에만
             if ($default['de_taxsave_use']) {
                 // 미수금이 없고 현금일 경우에만 현금영수증을 발급 할 수 있습니다.
-                if ($misu_amount == 0 && $od['od_receipt_bank']) {
+                if ($misu_amount == 0 && $od['od_receipt_bank'] && ($od['od_settle_case'] == '무통장' || $od['od_settle_case'] == '계좌이체' || $od['od_settle_case'] == '가상계좌')) {
                     if ($default['de_card_pg'] == 'kcp') {
             ?>
             <tr>
@@ -547,7 +545,7 @@ include_once(G4_MSHOP_PATH.'/_head.php');
         <?php
         // 취소한 내역이 없다면
         if ($tot_cancel_amount == 0) {
-            if ($od['od_temp_bank'] > 0 && $od['od_receipt_bank'] == 0) {
+            if ($od['od_temp_amount'] > 0 && $od['od_receipt_amount'] == 0) {
         ?>
         <button type="button" onclick="document.getElementById('sod_fin_cancelfrm').style.display='block';">주문 취소하기</button>
 
diff --git a/shop/mail/ordermail.mail.php b/shop/mail/ordermail.mail.php
index 27e2c7e1a..f8dbd53d8 100644
--- a/shop/mail/ordermail.mail.php
+++ b/shop/mail/ordermail.mail.php
@@ -58,11 +58,11 @@ $ft_a_st = 'display:block;padding:30px 0;background:#484848;color:#fff;text-alig
         <tbody>
         <tr>
             <th scope="row" style="<?php echo $th_st; ?>">승인일시</th>
-            <td style="<?php echo $td_st; ?>"><?php echo $card_list['od_card_time']; ?></td>
+            <td style="<?php echo $td_st; ?>"><?php echo $card_list['od_receipt_time']; ?></td>
         </tr>
         <tr>
             <th scope="row" style="<?php echo $th_st; ?>">승인금액</th>
-            <td style="<?php echo $td_st; ?>"><?php echo $card_list['od_receipt_card']; ?></td>
+            <td style="<?php echo $td_st; ?>"><?php echo $card_list['od_receipt_amount']; ?></td>
         </tr>
         </tbody>
         </table>
@@ -79,11 +79,11 @@ $ft_a_st = 'display:block;padding:30px 0;background:#484848;color:#fff;text-alig
         <tbody>
         <tr>
             <th scope="row" style="<?php echo $th_st; ?>">확인일시</th>
-            <td style="<?php echo $td_st; ?>"><?php echo $bank_list['od_bank_time']; ?></td>
+            <td style="<?php echo $td_st; ?>"><?php echo $bank_list['od_receipt_time']; ?></td>
         </tr>
         <tr>
             <th scope="row" style="<?php echo $th_st; ?>">입금액</th>
-            <td style="<?php echo $td_st; ?>"><?php echo $bank_list['od_receipt_bank']; ?></td>
+            <td style="<?php echo $td_st; ?>"><?php echo $bank_list['od_receipt_amount']; ?></td>
         </tr>
         <tr>
             <th scope="row" style="<?php echo $th_st; ?>">입금자명</th>
diff --git a/shop/mail/orderupdate1.mail.php b/shop/mail/orderupdate1.mail.php
index 23690fd7c..91a8ae03a 100644
--- a/shop/mail/orderupdate1.mail.php
+++ b/shop/mail/orderupdate1.mail.php
@@ -90,17 +90,17 @@ $ft_a_st = 'display:block;padding:30px 0;background:#484848;color:#fff;text-alig
         </tr>
         <?php } ?>
 
-        <?php if ($od_receipt_card > 0) { ?>
+        <?php if ($od_receipt_amount > 0 && $od_settle_case == '신용카드') { ?>
         <tr>
             <th scope="row" style="<?php echo $th_st; ?>">신용카드 입금액</th>
-            <td style="<?php echo $td_st; ?>"><?php echo display_price($od_receipt_card); ?><!--  (승인전 금액입니다.) --></td>
+            <td style="<?php echo $td_st; ?>"><?php echo display_price($od_receipt_amount); ?></td>
         </tr>
         <?php } ?>
 
-        <?php if ($od_receipt_bank > 0) { ?>
+        <?php if ($od_receipt_amount > 0 && $od_settle_case == '계좌이체') { ?>
         <tr>
             <th scope="row" style="<?php echo $th_st; ?>"><?php echo $od_settle_case; ?> 입금액</th>
-            <td style="<?php echo $td_st; ?>"><?php echo display_price($od_receipt_bank); ?></td>
+            <td style="<?php echo $td_st; ?>"><?php echo display_price($od_receipt_amount); ?></td>
         </tr>
         <tr>
             <th scope="row" style="<?php echo $th_st; ?>">계좌번호</th>
@@ -112,7 +112,7 @@ $ft_a_st = 'display:block;padding:30px 0;background:#484848;color:#fff;text-alig
         </tr>
         <?php } ?>
 
-        <?php if (!$od_receipt_point && !$od_receipt_card && !$od_receipt_bank) { ?>
+        <?php if (!$od_receipt_point && !$od_receipt_amount) { ?>
         <tr>
             <td colspan="2" style="<?php echo $empty_st; ?>">결제정보가 없습니다.</td>
         </tr>
diff --git a/shop/mail/orderupdate2.mail.php b/shop/mail/orderupdate2.mail.php
index ac2fd4a75..0e997f1fb 100644
--- a/shop/mail/orderupdate2.mail.php
+++ b/shop/mail/orderupdate2.mail.php
@@ -90,17 +90,17 @@ $ft_a_st = 'display:block;padding:30px 0;background:#484848;color:#fff;text-alig
         </tr>
         <?php } ?>
 
-        <?php if ($od_receipt_card > 0) { ?>
+        <?php if ($od_receipt_amount > 0 && $od_settle_case == '신용카드') { ?>
         <tr>
             <th scope="row" style="<?php echo $th_st; ?>">신용카드 입금액</th>
-            <td style="<?php echo $td_st; ?>"><?php echo display_price($od_receipt_card); ?><!--  (승인전 금액입니다.) --></td>
+            <td style="<?php echo $td_st; ?>"><?php echo display_price($od_receipt_amount); ?></td>
         </tr>
         <?php } ?>
 
-        <?php if ($od_receipt_bank > 0) { ?>
+        <?php if ($od_receipt_amount > 0 && $od_settle_case == '계좌이체') { ?>
         <tr>
             <th scope="row" style="<?php echo $th_st; ?>"><?php echo $od_settle_case; ?> 입금액</th>
-            <td style="<?php echo $td_st; ?>"><?php echo display_price($od_receipt_bank); ?></td>
+            <td style="<?php echo $td_st; ?>"><?php echo display_price($od_receipt_amount); ?></td>
         </tr>
         <tr>
             <th scope="row" style="<?php echo $th_st; ?>">계좌번호</th>
@@ -112,7 +112,7 @@ $ft_a_st = 'display:block;padding:30px 0;background:#484848;color:#fff;text-alig
         </tr>
         <?php } ?>
 
-        <?php if (!$od_receipt_point && !$od_receipt_card && !$od_receipt_bank) { ?>
+        <?php if (!$od_receipt_point && !$od_receipt_amount) { ?>
         <tr>
             <td colspan="2" style="<?php echo $empty_st; ?>">결제정보가 없습니다.</td>
         </tr>
diff --git a/shop/orderformupdate.php b/shop/orderformupdate.php
index 57c397316..603ceac49 100644
--- a/shop/orderformupdate.php
+++ b/shop/orderformupdate.php
@@ -301,22 +301,22 @@ $i_amount = $i_amount + $i_send_cost - $i_temp_point;
 
 if ($od_settle_case == "무통장")
 {
-    $od_temp_bank       = $i_amount;
+    $od_temp_amount     = $i_amount;
     $od_temp_point      = $i_temp_point;
     $od_receipt_point   = $i_temp_point;
-    $od_receipt_bank    = 0;
+    $od_receipt_amount  = 0;
 }
 else if ($od_settle_case == "계좌이체")
 {
     include G4_SHOP_PATH.'/kcp/pp_ax_hub.php';
 
-    $od_temp_bank       = $i_amount;
+    $od_temp_amount     = $i_amount;
     $od_temp_point      = $i_temp_point;
 
     $od_escrow1         = $tno;
-    $od_receipt_bank    = $amount;
+    $od_receipt_amount  = $amount;
     $od_receipt_point   = $i_temp_point;
-    $od_bank_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_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);
     $od_bank_account    = $od_settle_case;
     $od_deposit_name    = $od_name;
     $bank_name          = iconv("cp949", "utf8", $bank_name);
@@ -327,7 +327,7 @@ else if ($od_settle_case == "가상계좌")
 {
     include G4_SHOP_PATH.'/kcp/pp_ax_hub.php';
 
-    $od_temp_bank       = $i_amount;
+    $od_temp_amount     = $i_amount;
     $od_temp_point      = $i_temp_point;
     $od_receipt_point   = 0;
 
@@ -343,13 +343,13 @@ else if ($od_settle_case == "휴대폰")
 {
     include G4_SHOP_PATH.'/kcp/pp_ax_hub.php';
 
-    $od_temp_bank       = $i_amount;
+    $od_temp_amount     = $i_amount;
     $od_temp_point      = $i_temp_point;
 
     $od_escrow1         = $tno;
-    $od_receipt_hp      = $amount;
+    $od_receipt_amount  = $amount;
     $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_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);
     $od_bank_account    = $commid.' '.$mobile_no;
     $pg_amount          = $amount;
 }
@@ -357,13 +357,13 @@ else if ($od_settle_case == "신용카드")
 {
     include G4_SHOP_PATH.'/kcp/pp_ax_hub.php';
 
-    $od_temp_card       = $i_amount;
+    $od_temp_amount     = $i_amount;
     $od_temp_point      = $i_temp_point;
 
     $od_escrow1         = $tno;
-    $od_receipt_card    = $amount;
+    $od_receipt_amount  = $amount;
     $od_receipt_point   = $i_temp_point;
-    $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_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);
     $card_name          = iconv("cp949", "utf8", $card_name);
     $od_bank_account    = $card_name;
     $pg_amount          = $amount;
@@ -420,18 +420,12 @@ $sql = " insert {$g4['shop_order_table']}
                 od_send_cost      = '$od_send_cost',
                 od_send_coupon    = '$tot_sc_cp_amount',
                 od_coupon         = '$tot_od_cp_amount',
-                od_temp_bank      = '$od_temp_bank',
-                od_temp_card      = '$od_receipt_card',
-                od_temp_hp        = '$od_receipt_hp',
+                od_temp_amount    = '$od_temp_amount',
                 od_temp_point     = '$od_temp_point',
-                od_receipt_bank   = '$od_receipt_bank',
-                od_receipt_card   = '$od_receipt_card',
-                od_receipt_hp     = '$od_receipt_hp',
+                od_receipt_amount = '$od_receipt_amount',
                 od_receipt_point  = '$od_receipt_point',
                 od_bank_account   = '$od_bank_account',
-                od_bank_time      = '$od_bank_time',
-                od_card_time      = '$od_card_time',
-                od_hp_time        = '$od_hp_time',
+                od_receipt_time   = '$od_receipt_time',
                 od_escrow1        = '$od_escrow1',
                 od_shop_memo      = '',
                 od_hope_date      = '$od_hope_date',
diff --git a/shop/orderinquirycancel.php b/shop/orderinquirycancel.php
index 95738244c..ae2017881 100644
--- a/shop/orderinquirycancel.php
+++ b/shop/orderinquirycancel.php
@@ -15,7 +15,7 @@ if (!$od['od_id']) {
     alert("존재하는 주문이 아닙니다.");
 }
 
-if ($od['od_temp_bank'] > 0 && $od['od_receipt_bank'] == 0) {
+if ($od['od_temp_amount'] > 0 && $od['od_receipt_amount'] == 0) {
     ;
 } else {
     alert("취소할 수 있는 주문이 아닙니다.", G4_SHOP_URL."/orderinquiryview.php?od_id=$od_id&amp;uq_id=$uq_id");
@@ -31,7 +31,9 @@ sql_query(" update {$g4['shop_order_table']} set od_send_cost = '0', od_temp_poi
 
 // 주문취소 회원의 포인트를 되돌려 줌
 if ($od['od_receipt_point'] > 0) {
-    insert_point($member['mb_id'], $od['od_receipt_point'], "주문번호 $od_id 본인 취소");
+    if(!$default['de_mileage_use'])
+        insert_point($member['mb_id'], $od['od_receipt_point'], "주문번호 $od_id 본인 취소");
+    insert_mileage($member['mb_id'], $od['od_receipt_point'], "주문번호 $od_id 본인 취소", $od_id);
 }
 
 goto_url(G4_SHOP_URL."/orderinquiryview.php?od_id=$od_id&amp;uq_id=$uq_id");
diff --git a/shop/orderinquiryview.php b/shop/orderinquiryview.php
index 880b15603..6e4091eaa 100644
--- a/shop/orderinquiryview.php
+++ b/shop/orderinquiryview.php
@@ -175,9 +175,7 @@ if(openwin != null) {
     <div id="sod_fin_view">
         <h2>결제/배송 정보</h2>
         <?php
-        $receipt_amount = $od['od_receipt_bank']
-                        + $od['od_receipt_card']
-                        + $od['od_receipt_hp']
+        $receipt_amount = $od['od_receipt_amount']
                         + $od['od_receipt_point']
                         - $od['od_cancel_card']
                         - $od['od_refund_amount'];
@@ -287,16 +285,16 @@ if(openwin != null) {
                 <td><?php echo $od['od_settle_case']; ?></td>
             </tr>
                 <?php
-                if ($od['od_receipt_bank'])
+                if ($od['od_receipt_amount'])
                 {
                 ?>
             <tr>
                 <th scope="row">입금액</th>
-                <td><?php echo display_price($od['od_receipt_bank']); ?></td>
+                <td><?php echo display_price($od['od_receipt_amount']); ?></td>
             </tr>
             <tr>
                 <th scope="row">입금확인일시</th>
-                <td><?php echo $od['od_bank_time']; ?></td>
+                <td><?php echo $od['od_receipt_time']; ?></td>
             </tr>
                 <?php
                 }
@@ -367,7 +365,7 @@ if(openwin != null) {
             // 현금영수증 발급을 사용하는 경우에만
             if ($default['de_taxsave_use']) {
                 // 미수금이 없고 현금일 경우에만 현금영수증을 발급 할 수 있습니다.
-                if ($misu_amount == 0 && $od['od_receipt_bank']) {
+                if ($misu_amount == 0 && $od['od_receipt_amount'] && ($od['od_settle_case'] == '무통장' || $od['od_settle_case'] == '계좌이체' || $od['od_settle_case'] == '가상계좌')) {
                     if ($default['de_card_pg'] == 'kcp') {
             ?>
             <tr>
@@ -560,7 +558,7 @@ if(openwin != null) {
         <?php
         // 취소한 내역이 없다면
         if ($tot_cancel_amount == 0) {
-            if ($od['od_temp_bank'] > 0 && $od['od_receipt_bank'] == 0) {
+            if ($od['od_temp_amount'] > 0 && $od['od_receipt_amount'] == 0) {
         ?>
         <button type="button" onclick="document.getElementById('sod_fin_cancelfrm').style.display='block';">주문 취소하기</button>
 
diff --git a/shop/settle_kcp_common.php b/shop/settle_kcp_common.php
index 2f028a5c4..3ad926370 100644
--- a/shop/settle_kcp_common.php
+++ b/shop/settle_kcp_common.php
@@ -143,8 +143,8 @@ if(!$default['de_card_test']) {
     {
         // 주문서 UPDATE
         $sql = " update {$g4['shop_order_table']}
-                    set od_receipt_bank = '$ipgm_mnyx',
-                        od_bank_time = '$tx_tm'
+                    set od_receipt_amount = '$ipgm_mnyx',
+                        od_receipt_time = '$tx_tm'
                   where od_id = '$order_no'
                     and od_escrow1 = '$tno' ";
         sql_query($sql, FALSE);
diff --git a/shop/taxsave_kcp.php b/shop/taxsave_kcp.php
index e26e310a4..435f12047 100644
--- a/shop/taxsave_kcp.php
+++ b/shop/taxsave_kcp.php
@@ -14,7 +14,7 @@ $goods_name = $goods['full_name'];
 
 $trad_time = date("YmdHis");
 
-$amt_tot = (int)$od['od_receipt_bank'];
+$amt_tot = (int)$od['od_receipt_amount'];
 $amt_sup = (int)round(($amt_tot * 10) / 11);
 $amt_svc = 0;
 $amt_tax = (int)($amt_tot - $amt_sup);