From 6e46578f21fda5b4065426d3543591fa66d4b8d7 Mon Sep 17 00:00:00 2001
From: chicpro <chicpro@gmail.com>
Date: Fri, 8 Nov 2013 16:47:47 +0900
Subject: [PATCH] =?UTF-8?q?=EB=B0=B0=EC=86=A1=ED=9A=8C=EC=82=AC=20dl=5Fid?=
 =?UTF-8?q?=20=ED=95=84=EB=93=9C=20=EC=A0=9C=EA=B1=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 adm/shop_admin/orderlist.php    | 4 ----
 adm/shop_admin/ordersms.inc.php | 6 ++----
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/adm/shop_admin/orderlist.php b/adm/shop_admin/orderlist.php
index b989ecedd..b4bcab49d 100644
--- a/adm/shop_admin/orderlist.php
+++ b/adm/shop_admin/orderlist.php
@@ -360,10 +360,6 @@ $listall = '<a href="'.$_SERVER['PHP_SELF'].'" class="ov_listall">전체목록</
             <?php } else { ?>
                 -
             <?php } ?>
-            <!-- <label for="dl_id_<?php echo $i; ?>" class="sound_only">배송업체</label>
-            <select name="dl_id[<?php echo $i; ?>]" id="dl_id_<?php echo $i; ?>">
-                <?php echo conv_selected_option($delivery_options, $row['dl_id']?$row['dl_id']:$delivery_default); ?>
-            </select> -->
         </td>
         <td headers="th_delidate">
             <?php if ($od_status == '준비') { ?>
diff --git a/adm/shop_admin/ordersms.inc.php b/adm/shop_admin/ordersms.inc.php
index be2ca432c..eb4168a73 100644
--- a/adm/shop_admin/ordersms.inc.php
+++ b/adm/shop_admin/ordersms.inc.php
@@ -25,13 +25,11 @@ if ($config['cf_sms_use']) {
 
     if ($od_sms_baesong_check)
     {
-        if ($dl_id && $od_invoice)
+        if ($od_delivery_company && $od_invoice)
         {
             $sms_contents = $default['de_sms_cont5'];
             $sms_contents = preg_replace("/{이름}/", $od_name, $sms_contents);
-            $sql = " select dl_company from {$g5['g5_shop_delivery_table']} where dl_id = '$dl_id' ";
-            $row = sql_fetch($sql);
-            $sms_contents = preg_replace("/{택배회사}/", $row['dl_company'], $sms_contents);
+            $sms_contents = preg_replace("/{택배회사}/", $od_delivery_company, $sms_contents);
             $sms_contents = preg_replace("/{운송장번호}/", $od_invoice, $sms_contents);
             $sms_contents = preg_replace("/{주문번호}/", $od_id, $sms_contents);
             $sms_contents = preg_replace("/{회사명}/", $default['de_admin_company_name'], $sms_contents);