From 0f505298b701bd74fd2e2b33c703ce3b3de60f53 Mon Sep 17 00:00:00 2001
From: chicpro <chicpro@gmail.com>
Date: Thu, 7 Nov 2013 13:13:59 +0900
Subject: [PATCH] =?UTF-8?q?=EC=97=90=EC=8A=A4=ED=81=AC=EB=A1=9C=20?=
 =?UTF-8?q?=EA=B2=B0=EC=A0=9C=EB=A5=BC=20=EC=82=AC=EC=9A=A9=ED=95=A0=20?=
 =?UTF-8?q?=EB=95=8C=EB=A7=8C=20=EC=A3=BC=EB=AC=B8=EB=82=B4=EC=97=AD=20?=
 =?UTF-8?q?=EB=A6=AC=EC=8A=A4=ED=8A=B8=EC=97=90=20=EC=A0=81=EC=9A=A9?=
 =?UTF-8?q?=EB=90=98=EB=8F=84=EB=A1=9D=20=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 | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/adm/shop_admin/orderlist.php b/adm/shop_admin/orderlist.php
index 496835b74..ef87ff8b6 100644
--- a/adm/shop_admin/orderlist.php
+++ b/adm/shop_admin/orderlist.php
@@ -185,8 +185,10 @@ $listall = '<a href="'.$_SERVER['PHP_SELF'].'" class="ov_listall">전체목록</
     <label for="od_misu04">포인트주문</label>
     <input type="checkbox" name="od_coupon" value="Y" id="od_misu05" <?php echo get_checked($od_coupon, 'Y'); ?>>
     <label for="od_misu05">쿠폰</label>
+    <?php if($default['de_escrow_use']) { ?>
     <input type="checkbox" name="od_escrow" value="Y" id="od_misu06" <?php echo get_checked($od_escrow, 'Y'); ?>>
     <label for="od_misu06">에스크로</label>
+    <?php } ?>
 </div>
 
 <div class="sch_last">
@@ -286,7 +288,7 @@ $listall = '<a href="'.$_SERVER['PHP_SELF'].'" class="ov_listall">전체목록</
         $delivery_company = $row['od_delivery_company'] ? $row['od_delivery_company'] : $default['de_delivery_company'];
 
         $tr_bg = 'tr_bg'.($i%2);
-        if($row['od_escrow'])
+        if($default['de_escrow_use'] && $row['od_escrow'])
             $tr_bg .= 'escrow';
     ?>
     <tr class="orderlist<?php echo ' '.$tr_bg; ?>">