From 016059aa3a234ac7a144b28ff16fa1c455a5dee0 Mon Sep 17 00:00:00 2001
From: chicpro <chicpro@gmail.com>
Date: Fri, 14 Jun 2013 09:52:42 +0900
Subject: [PATCH] =?UTF-8?q?#212=20=EA=B2=B0=EC=A0=9C=EA=B8=88=EC=95=A1=20?=
 =?UTF-8?q?=ED=95=84=EB=93=9C=20=EA=B0=84=EC=86=8C=ED=99=94=20=EC=9E=91?=
 =?UTF-8?q?=EC=97=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 adm/shop_admin/index.php              | 12 +++++-------
 adm/shop_admin/ordermail.inc.php      | 12 ++++++------
 adm/shop_admin/orderreceiptupdate.php |  2 +-
 adm/shop_admin/ordersms.inc.php       |  4 ++--
 mobile/shop/orderinquiryview.php      |  2 +-
 5 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/adm/shop_admin/index.php b/adm/shop_admin/index.php
index f320b3f12..4cb9e4a0e 100644
--- a/adm/shop_admin/index.php
+++ b/adm/shop_admin/index.php
@@ -57,9 +57,8 @@ $pg_anchor = '<ul class="anchor">
         }
         else
         {
-            if ($row['od_receipt_bank'])  $settle_method .= "무통장";
-            if ($row['od_receipt_card'])  $settle_method .= "카드";
-            if ($row['od_receipt_point']) $settle_method .= "포인트";
+            $settle_method .= '미입력';
+            if ($row['od_receipt_point']) $settle_method .= '포인트';
         }
     ?>
     <tr>
@@ -122,9 +121,8 @@ $pg_anchor = '<ul class="anchor">
         }
         else
         {
-            if ($row['od_temp_bank'])   $settle_method  .= "무통장";
-            if ($row['od_temp_card'])   $settle_method .= "카드";
-            if ($row['od_temp_milage']) $settle_method .= "포인트";
+            $settle_method .= '미입력';
+            if ($row['od_temp_point']) $settle_method .= '포인트';
         }
     ?>
     <tr>
@@ -160,7 +158,7 @@ $pg_anchor = '<ul class="anchor">
     </thead>
     <tbody>
     <?php
-    $sql = " select * from {$g4[shop_item_ps_table]}
+    $sql = " select * from {$g4['shop_item_ps_table']}
               where is_confirm = 0
               order by is_id desc
               limit $max_limit ";
diff --git a/adm/shop_admin/ordermail.inc.php b/adm/shop_admin/ordermail.inc.php
index 6a2fd59d0..16f85660e 100644
--- a/adm/shop_admin/ordermail.inc.php
+++ b/adm/shop_admin/ordermail.inc.php
@@ -45,17 +45,17 @@ if ($od_send_mail)
     $is_receipt = false;
 
     // 신용카드 입금
-    if ($od['od_receipt_card'] > 0) {
-        $card_list['od_card_time'] = $od['od_card_time'];
-        $card_list['od_receipt_card'] = display_price($od['od_receipt_card']);
+    if ($od['od_receipt_amount'] > 0 && $od['od_settle_case'] == '신용카드') {
+        $card_list['od_receipt_time'] = $od['od_receipt_time'];
+        $card_list['od_receipt_amount'] = display_price($od['od_receipt_amount']);
 
         $is_receipt = true;
     }
 
     // 무통장 입금
-    if ($od['od_receipt_bank'] > 0) {
-        $bank_list['od_bank_time']    = $od['od_bank_time'];
-        $bank_list['od_receipt_bank'] = display_price($od['od_receipt_bank']);
+    if ($od['od_receipt_amount'] > 0 && $od['od_settle_case'] == '무통장') {
+        $bank_list['od_receipt_time']    = $od['od_receipt_time'];
+        $bank_list['od_receipt_amount'] = display_price($od['od_receipt_amount']);
         $bank_list['od_deposit_name'] = $od['od_deposit_name'];
 
         $is_receipt = true;
diff --git a/adm/shop_admin/orderreceiptupdate.php b/adm/shop_admin/orderreceiptupdate.php
index 461b244da..38484a9ee 100644
--- a/adm/shop_admin/orderreceiptupdate.php
+++ b/adm/shop_admin/orderreceiptupdate.php
@@ -15,7 +15,7 @@ if ($od_receipt_time)
 $sql = " update {$g4['shop_order_table']}
             set od_deposit_name    = '$od_deposit_name',
                 od_bank_account    = '$od_bank_account',
-                od_receipt_time    = '$od_bank_time',
+                od_receipt_time    = '$od_receipt_time',
                 od_receipt_amount  = '$od_receipt_amount',
                 od_receipt_point   = '$od_receipt_point',
                 od_cancel_card     = '$od_cancel_card',
diff --git a/adm/shop_admin/ordersms.inc.php b/adm/shop_admin/ordersms.inc.php
index 9e6144ab3..b4198ddf3 100644
--- a/adm/shop_admin/ordersms.inc.php
+++ b/adm/shop_admin/ordersms.inc.php
@@ -7,11 +7,11 @@ $send_number = preg_replace("/[^0-9]/", "", $default['de_admin_company_tel']); /
 
 if ($od_sms_ipgum_check)
 {
-	if ($od_bank_account && $od_receipt_bank && $od_deposit_name)
+	if ($od_bank_account && $od_receipt_amount && $od_deposit_name)
 	{
 		$sms_contents = $default['de_sms_cont4'];
 		$sms_contents = preg_replace("/{이름}/", $od_name, $sms_contents);
-		$sms_contents = preg_replace("/{입금액}/", number_format($od_receipt_bank), $sms_contents);
+		$sms_contents = preg_replace("/{입금액}/", number_format($od_receipt_amount), $sms_contents);
 		$sms_contents = preg_replace("/{주문번호}/", $od_id, $sms_contents);
 		$sms_contents = preg_replace("/{회사명}/", $default['de_admin_company_name'], $sms_contents);
 
diff --git a/mobile/shop/orderinquiryview.php b/mobile/shop/orderinquiryview.php
index fa12869ae..4d7f1a90c 100644
--- a/mobile/shop/orderinquiryview.php
+++ b/mobile/shop/orderinquiryview.php
@@ -352,7 +352,7 @@ include_once(G4_MSHOP_PATH.'/_head.php');
             // 현금영수증 발급을 사용하는 경우에만
             if ($default['de_taxsave_use']) {
                 // 미수금이 없고 현금일 경우에만 현금영수증을 발급 할 수 있습니다.
-                if ($misu_amount == 0 && $od['od_receipt_bank'] && ($od['od_settle_case'] == '무통장' || $od['od_settle_case'] == '계좌이체' || $od['od_settle_case'] == '가상계좌')) {
+                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>