From b5277acaf2440293b2d7423ced577796ec881d3b Mon Sep 17 00:00:00 2001
From: chicpro <chicpro@gmail.com>
Date: Wed, 6 Nov 2013 17:14:37 +0900
Subject: [PATCH] =?UTF-8?q?=EC=82=AC=EC=9A=A9=EC=9E=90=20=EC=A3=BC?=
 =?UTF-8?q?=EB=AC=B8=EC=83=81=EC=84=B8=20=EB=B3=80=EA=B2=BD=EB=90=9C=20?=
 =?UTF-8?q?=EB=B0=B0=EC=86=A1=EC=A0=95=EB=B3=B4=20=ED=95=84=EB=93=9C=20?=
 =?UTF-8?q?=EC=A0=81=EC=9A=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mobile/shop/orderinquiryview.php | 24 ++++++------------------
 shop/orderinquiryview.php        | 24 ++++++------------------
 2 files changed, 12 insertions(+), 36 deletions(-)

diff --git a/mobile/shop/orderinquiryview.php b/mobile/shop/orderinquiryview.php
index 558b6007a..7754c327f 100644
--- a/mobile/shop/orderinquiryview.php
+++ b/mobile/shop/orderinquiryview.php
@@ -449,19 +449,12 @@ include_once(G5_MSHOP_PATH.'/_head.php');
                 </colgroup>
                 <tbody>
                 <?php
-                // 배송회사 정보
-                $dl = sql_fetch(" select * from {$g5['g5_shop_delivery_table']} where dl_id = '{$od['dl_id']}' ");
-
-                if ($od['od_invoice'] || !$od['misu'])
+                if ($od['od_invoice'] && $od['od_delivery_company'])
                 {
-                    if (is_array($dl))
-                    {
-                        // get 으로 날리는 경우 운송장번호를 넘김
-                        if (strpos($dl['dl_url'], "=")) $invoice = $od['od_invoice'];
                 ?>
                 <tr>
                     <th scope="row">배송회사</th>
-                    <td><?php echo $dl['dl_company']; ?> [<a href="<?php echo $dl['dl_url'].$invoice; ?>" target="_blank">배송조회하기</a>]</td>
+                    <td><?php echo $od['od_delivery_company']; ?></td>
                 </tr>
                 <tr>
                     <th scope="row">운송장번호</th>
@@ -471,20 +464,15 @@ include_once(G5_MSHOP_PATH.'/_head.php');
                     <th scope="row">배송일시</th>
                     <td><?php echo $od['od_invoice_time']; ?></td>
                 </tr>
-                <tr>
-                    <th>고객센터 전화</th>
-                    <td><?php echo $dl['dl_tel']; ?></td>
-                </tr>
                 <?php
-                    }
-                    else
-                    {
+                }
+                else
+                {
                 ?>
                 <tr>
                     <td class="empty_table">아직 배송하지 않았거나 배송정보를 입력하지 못하였습니다.</td>
                 </tr>
                 <?php
-                    }
                 }
                 ?>
                 </tbody>
@@ -544,7 +532,7 @@ include_once(G5_MSHOP_PATH.'/_head.php');
         <?php } ?>
     </section>
 
-    <?php if ($od['od_settle_case'] == '가상계좌' && $default['de_card_test'] && $is_admin) {
+    <?php if ($od['od_settle_case'] == '가상계좌' && $od['od_misu'] > 0 && $default['de_card_test'] && $is_admin) {
     preg_match("/(\s[^\s]+\s)/", $od['od_bank_account'], $matchs);
     $deposit_no = trim($matchs[1]);
     ?>
diff --git a/shop/orderinquiryview.php b/shop/orderinquiryview.php
index b7db3fb99..642cc82ce 100644
--- a/shop/orderinquiryview.php
+++ b/shop/orderinquiryview.php
@@ -460,19 +460,12 @@ if(openwin != null) {
                 </colgroup>
                 <tbody>
                 <?php
-                // 배송회사 정보
-                $dl = sql_fetch(" select * from {$g5['g5_shop_delivery_table']} where dl_id = '{$od['dl_id']}' ");
-
-                if ($od['od_invoice'] || !$od['misu'])
+                if ($od['od_invoice'] && $od['od_delivery_company'])
                 {
-                    if (is_array($dl))
-                    {
-                        // get 으로 날리는 경우 운송장번호를 넘김
-                        if (strpos($dl['dl_url'], "=")) $invoice = $od['od_invoice'];
                 ?>
                 <tr>
                     <th scope="row">배송회사</th>
-                    <td><?php echo $dl['dl_company']; ?> [<a href="<?php echo $dl['dl_url'].$invoice; ?>" target="_blank">배송조회하기</a>]</td>
+                    <td><?php echo $od['od_delivery_company']; ?></td>
                 </tr>
                 <tr>
                     <th scope="row">운송장번호</th>
@@ -482,20 +475,15 @@ if(openwin != null) {
                     <th scope="row">배송일시</th>
                     <td><?php echo $od['od_invoice_time']; ?></td>
                 </tr>
-                <tr>
-                    <th>고객센터 전화</th>
-                    <td><?php echo $dl['dl_tel']; ?></td>
-                </tr>
                 <?php
-                    }
-                    else
-                    {
+                }
+                else
+                {
                 ?>
                 <tr>
                     <td class="empty_table">아직 배송하지 않았거나 배송정보를 입력하지 못하였습니다.</td>
                 </tr>
                 <?php
-                    }
                 }
                 ?>
                 </tbody>
@@ -555,7 +543,7 @@ if(openwin != null) {
         <?php } ?>
     </section>
 
-    <?php if ($od['od_settle_case'] == '가상계좌' && $default['de_card_test'] && $is_admin) {
+    <?php if ($od['od_settle_case'] == '가상계좌' && $od['od_misu'] > 0 && $default['de_card_test'] && $is_admin) {
     preg_match("/\s{1}([^\s]+)\s?/", $od['od_bank_account'], $matchs);
     $deposit_no = trim($matchs[1]);
     ?>