From 2ffac4aea8b7184943e85774c0ebf2a1e0cf169c Mon Sep 17 00:00:00 2001
From: chicpro <chicpro@gmail.com>
Date: Fri, 12 Apr 2013 16:53:54 +0900
Subject: [PATCH] =?UTF-8?q?#66=20=EC=97=90=20=EB=94=B0=EB=A5=B8=20print=5F?=
 =?UTF-8?q?delivery=5Fcompany=20=ED=95=A8=EC=88=98=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/deliverylist.php | 15 +--------------
 lib/shop.lib.php                | 22 ++++++++++++++++++++++
 2 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/adm/shop_admin/deliverylist.php b/adm/shop_admin/deliverylist.php
index c5c517688..daf5c68a2 100644
--- a/adm/shop_admin/deliverylist.php
+++ b/adm/shop_admin/deliverylist.php
@@ -9,15 +9,6 @@ include_once (G4_ADMIN_PATH.'/admin.head.php');
 
 //sql_query(" update $g4[shop_cart_table] set ct_status = '완료' where ct_status = '배송' ");
 
-// 배송회사리스트 ---------------------------------------------
-$delivery_options = "";
-$sql = " select * from {$g4['shop_delivery_table']} order by dl_order ";
-$result = sql_query($sql);
-for($i=0; $row=sql_fetch_array($result); $i++) {
-    $delivery_options .= '<option value="'.$row['dl_id'].'">'.$row['dl_company'].'</option>';
-}
-// 배송회사리스트 end ---------------------------------------------
-
 $where = " where ";
 $sql_search = "";
 if ($search != "") {
@@ -164,11 +155,7 @@ if ($search) // 검색렬일 때만 처음 버튼을 보여줌
         <td><?=$hope_date?></td>
         <td><input type="text" name="od_invoice_time[<?=$i?>]" value="<?=$invoice_time?>" class="frm_input" size="20" maxlength="19"></td>
         <td>
-            <label for="dl_id_<?=$i?>">배송업체</label>
-            <select name="dl_id[<?=$i?>]" id="dl_id_<?=$i?>">
-                <option value="">선택하세요</option>
-                <?=$delivery_options?>
-            </select>
+            <?=print_delivery_company($i, $row['dl_id'])?>
         </td>
         <td>
             <!-- 값이 바뀌었는지 비교하기 위하여 저장 -->
diff --git a/lib/shop.lib.php b/lib/shop.lib.php
index 7e2286eff..68c437280 100644
--- a/lib/shop.lib.php
+++ b/lib/shop.lib.php
@@ -621,6 +621,28 @@ function alert_opener($msg='', $url='')
     exit;
 }
 
+// 배송회사를 select 로 출력
+function print_delivery_company($no, $val)
+{
+    global $g4;
+
+    $delivery_options = '';
+    $sql = " select * from {$g4['shop_delivery_table']} order by dl_order ";
+    $result = sql_query($sql);
+    for($i=0; $row=sql_fetch_array($result); $i++) {
+        $selected = get_selected($row['dl_id'], $val);
+        $delivery_options .= '<option value="'.$row['dl_id'].'"'.$selected.'>'.$row['dl_company'].'</option>'.PHP_EOL;
+    }
+
+    $str = '<label for="dl_id_'.$no.'">배송업체</label>'.PHP_EOL;
+    $str .= '<select name="dl_id['.$no.']" id="dl_id_'.$no.'">'.PHP_EOL;
+    $str .= '<option value="">선택하세요</option>'.PHP_EOL;
+    $str .= $delivery_options;
+    $str .= '</select>';
+
+    return $str;
+}
+
 // 주문서 번호를 얻는다.
 function get_new_od_id()
 {