From 982ff1d8c0257bc64c5aa84c040a7116123e949f Mon Sep 17 00:00:00 2001
From: chicpro <chicpro@gmail.com>
Date: Mon, 25 Aug 2014 13:46:32 +0900
Subject: [PATCH] =?UTF-8?q?=EB=B0=B0=EC=86=A1=EC=A0=95=EB=B3=B4=20?=
 =?UTF-8?q?=ED=91=9C=EC=8B=9C=EA=B4=80=EB=A0=A8=20=EC=BD=94=EB=93=9C=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 adm/shop_admin/orderlist.php | 27 +++++++++------------------
 1 file changed, 9 insertions(+), 18 deletions(-)

diff --git a/adm/shop_admin/orderlist.php b/adm/shop_admin/orderlist.php
index a6a61d554..0fafc4d95 100644
--- a/adm/shop_admin/orderlist.php
+++ b/adm/shop_admin/orderlist.php
@@ -386,34 +386,25 @@ if(!sql_query(" select mb_id from {$g5['g5_shop_order_delete_table']} limit 1 ",
         <td headers="th_delino" class="td_delino">
             <?php if ($od_status == '준비') { ?>
                 <input type="text" name="od_invoice[<?php echo $i; ?>]" value="<?php echo $row['od_invoice']; ?>" class="frm_input" size="10">
-            <?php } else if ($od_status == '배송' || $od_status ==  '완료') { ?>
-                <?php echo $row['od_invoice']; ?>
-            <?php } else { ?>
-                -
-            <?php } ?>
+            <?php } else {
+                echo ($row['od_invoice'] ? $row['od_invoice'] : '-');
+            } ?>
         </td>
         <td headers="th_delicom">
             <?php if ($od_status == '준비') { ?>
                 <select name="od_delivery_company[<?php echo $i; ?>]">
                     <?php echo get_delivery_company($delivery_company); ?>
                 </select>
-                <?php
-                /*<input type="text" name="od_delivery_company[<?php echo $i; ?>]" value="<?php echo $delivery_company; ?>" class="frm_input" size="10"> */
-                ?>
-            <?php } else if ($od_status == '배송' || $od_status ==  '완료') { ?>
-                <?php echo $delivery_company; ?>
-            <?php } else { ?>
-                -
-            <?php } ?>
+            <?php } else {
+                echo ($row['od_delivery_company'] ? $row['od_delivery_company'] : '-');
+            } ?>
         </td>
         <td headers="th_delidate">
             <?php if ($od_status == '준비') { ?>
                 <input type="text" name="od_invoice_time[<?php echo $i; ?>]" value="<?php echo $invoice_time; ?>" class="frm_input" size="10" maxlength="19">
-            <?php } else if ($od_status == '배송' || $od_status ==  '완료') { ?>
-                <?php echo substr($row['od_invoice_time'],2,14); ?>
-            <?php } else { ?>
-                -
-            <?php } ?>
+            <?php } else {
+                echo (is_null_time($row['od_invoice_time']) ? '-' : substr($row['od_invoice_time'],2,14));
+            } ?>
         </td>
     </tr>
     <?php