From 7526dc0656f32e7bed38808b3f234663547343a4 Mon Sep 17 00:00:00 2001
From: chicpro <chicpro@gmail.com>
Date: Wed, 4 Dec 2013 10:04:26 +0900
Subject: [PATCH] =?UTF-8?q?=EB=B0=B0=EC=86=A1=EC=95=88=EB=82=B4=20?=
 =?UTF-8?q?=EB=A9=94=EC=9D=BC=EC=97=90=20=EB=B0=B0=EC=86=A1=EC=A1=B0?=
 =?UTF-8?q?=ED=9A=8C=20=EB=A7=81=ED=81=AC=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 adm/shop_admin/ordermail.inc.php | 1 +
 shop/mail/ordermail.mail.php     | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/adm/shop_admin/ordermail.inc.php b/adm/shop_admin/ordermail.inc.php
index 357ebce0c..e631fd865 100644
--- a/adm/shop_admin/ordermail.inc.php
+++ b/adm/shop_admin/ordermail.inc.php
@@ -75,6 +75,7 @@ if ($od_send_mail)
         $delivery_list['dl_company']      = $od['od_delivery_company'];
         $delivery_list['od_invoice']      = $od['od_invoice'];
         $delivery_list['od_invoice_time'] = $od['od_invoice_time'];
+        $delivery_list['dl_inquiry']      = get_delivery_inquiry($od['od_delivery_company'], $od['od_invoice'], 'dvr_link');
 
         $is_delivery = true;
     }
diff --git a/shop/mail/ordermail.mail.php b/shop/mail/ordermail.mail.php
index e3917653f..49aa51a03 100644
--- a/shop/mail/ordermail.mail.php
+++ b/shop/mail/ordermail.mail.php
@@ -123,7 +123,7 @@ $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 $delivery_list['dl_company']; ?></td>
+            <td style="<?php echo $td_st; ?>"><?php echo $delivery_list['dl_company']; ?> <?php echo $delivery_list['dl_inquiry']; ?></td>
         </tr>
         <tr>
             <th scope="row" style="<?php echo $th_st; ?>">운송장번호</th>