From 084275bbce25f7f604cbf8983eb69b743ecc7520 Mon Sep 17 00:00:00 2001
From: chicpro <chicpro@gmail.com>
Date: Thu, 23 Jan 2014 22:47:47 +0900
Subject: [PATCH] =?UTF-8?q?=EC=A3=BC=EB=AC=B8=EB=82=B4=EC=97=AD=20?=
 =?UTF-8?q?=EB=B0=B0=EC=86=A1=EC=97=85=EC=B2=B4=20=EC=84=A0=ED=83=9D?=
 =?UTF-8?q?=EB=B6=80=EB=B6=84=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/configform.php    | 11 +----------
 adm/shop_admin/orderlist.php     |  9 +++++++--
 adm/shop_admin/ordermail.inc.php | 12 ++++++------
 lib/shop.lib.php                 | 16 ++++++++++++++++
 shop/mail/ordermail.mail.php     |  8 ++++----
 5 files changed, 34 insertions(+), 22 deletions(-)

diff --git a/adm/shop_admin/configform.php b/adm/shop_admin/configform.php
index 737d2e762..106b78094 100644
--- a/adm/shop_admin/configform.php
+++ b/adm/shop_admin/configform.php
@@ -653,16 +653,7 @@ if(!isset($default['de_shop_layout_use'])) {
             <td>
                 <?php echo help("이용 중이거나 이용하실 배송업체를 선택하세요.", 50); ?>
                 <select name="de_delivery_company" id="de_delivery_company">
-                    <option value="">없음</option>
-                    <option value="자체배송" <?php echo get_selected($default['de_delivery_company'], "자체배송"); ?>>자체배송</option>
-                    <?php
-                    $dlcomp = explode(")", str_replace("(", "", G5_DELIVERY_COMPANY));
-                    for ($i=0; $i<count($dlcomp); $i++) {
-                        if (trim($dlcomp[$i])=="") continue;
-                        list($value, $url, $tel) = explode("^", $dlcomp[$i]);
-                        echo "<option value=\"$value\" ".get_selected($default['de_delivery_company'], $value).">$value</option>\n";
-                    }
-                    ?>
+                    <?php echo get_delivery_company($default['de_delivery_company']); ?>
                 </select>
             </td>
         </tr>
diff --git a/adm/shop_admin/orderlist.php b/adm/shop_admin/orderlist.php
index a2edc1b7a..9878a9ec0 100644
--- a/adm/shop_admin/orderlist.php
+++ b/adm/shop_admin/orderlist.php
@@ -384,9 +384,14 @@ if(!sql_query(" select mb_id from {$g5['g5_shop_order_delete_table']} limit 1 ",
         </td>
         <td headers="th_delicom">
             <?php if ($od_status == '준비') { ?>
-                <input type="text" name="od_delivery_company[<?php echo $i; ?>]" value="<?php echo $delivery_company; ?>" class="frm_input" size="10">
+                <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 $row['od_delivery_company']; ?>
+                <?php echo $delivery_company; ?>
             <?php } else { ?>
                 -
             <?php } ?>
diff --git a/adm/shop_admin/ordermail.inc.php b/adm/shop_admin/ordermail.inc.php
index e631fd865..2dad63e5c 100644
--- a/adm/shop_admin/ordermail.inc.php
+++ b/adm/shop_admin/ordermail.inc.php
@@ -22,10 +22,10 @@ if ($od_send_mail)
               where od_id = '{$od['od_id']}'
               order by ct_id ";
     $result = sql_query($sql);
-    for ($i=0; $ct=mysql_fetch_array($result); $i++) {
-        $cart_list[$i]['it_id']   = $ct['it_id'];
-        $cart_list[$i]['it_name'] = $ct['it_name'];
-        $cart_list[$i]['it_opt']  = $ct['ct_option'];
+    for ($j=0; $ct=mysql_fetch_array($result); $j++) {
+        $cart_list[$j]['it_id']   = $ct['it_id'];
+        $cart_list[$j]['it_name'] = $ct['it_name'];
+        $cart_list[$j]['it_opt']  = $ct['ct_option'];
 
         $ct_status = $ct['ct_status'];
         if ($ct_status == "준비") {
@@ -34,8 +34,8 @@ if ($od_send_mail)
             $ct_status = "배송중";
         }
 
-        $cart_list[$i]['ct_status'] = $ct_status;
-        $cart_list[$i]['ct_qty']    = $ct['ct_qty'];
+        $cart_list[$j]['ct_status'] = $ct_status;
+        $cart_list[$j]['ct_qty']    = $ct['ct_qty'];
     }
 
 
diff --git a/lib/shop.lib.php b/lib/shop.lib.php
index efccb1f68..187f743f9 100644
--- a/lib/shop.lib.php
+++ b/lib/shop.lib.php
@@ -2068,6 +2068,22 @@ function save_order_point($ct_status="완료")
 }
 
 
+// 배송업체 리스트 얻기
+function get_delivery_company($company)
+{
+    $option = '<option value="">없음</option>'.PHP_EOL;
+    $option .= '<option value="자체배송" '.get_selected($company, '자체배송').'>자체배송</option>'.PHP_EOL;
+
+    $dlcomp = explode(")", str_replace("(", "", G5_DELIVERY_COMPANY));
+    for ($i=0; $i<count($dlcomp); $i++) {
+        if (trim($dlcomp[$i])=="") continue;
+        list($value, $url, $tel) = explode("^", $dlcomp[$i]);
+        $option .= '<option value="'.$value.'" '.get_selected($company, $value).'>'.$value.'</option>'.PHP_EOL;
+    }
+
+    return $option;
+}
+
 //==============================================================================
 // 쇼핑몰 라이브러리 모음 끝
 //==============================================================================
diff --git a/shop/mail/ordermail.mail.php b/shop/mail/ordermail.mail.php
index 142cd0e46..4781e9306 100644
--- a/shop/mail/ordermail.mail.php
+++ b/shop/mail/ordermail.mail.php
@@ -37,11 +37,11 @@ $ft_a_st = 'display:block;padding:30px 0;background:#484848;color:#fff;text-alig
         </tr>
         <thead>
         <tbody>
-        <?php for ($i=0; $i<count($cart_list); $i++) { ?>
+        <?php for ($h=0; $h<count($cart_list); $h++) { ?>
         <tr>
-            <td style="<?php echo $td_st; ?>"><a href="<?php echo G5_SHOP_URL; ?>/item.php?it_id=<?php echo $cart_list[$i]['it_id']; ?>" target="_blank" style="text-decoration:none"><?php echo $cart_list[$i]['it_name']; ?></a></td>
-            <td style="<?php echo $td_st; ?>;text-align:center"><?php echo $cart_list[$i]['it_opt']; ?></td>
-            <td style="<?php echo $td_st; ?>;text-align:center"><?php echo $cart_list[$i]['ct_status']; ?></td>
+            <td style="<?php echo $td_st; ?>"><a href="<?php echo G5_SHOP_URL; ?>/item.php?it_id=<?php echo $cart_list[$h]['it_id']; ?>" target="_blank" style="text-decoration:none"><?php echo $cart_list[$h]['it_name']; ?></a></td>
+            <td style="<?php echo $td_st; ?>;text-align:center"><?php echo $cart_list[$h]['it_opt']; ?></td>
+            <td style="<?php echo $td_st; ?>;text-align:center"><?php echo $cart_list[$h]['ct_status']; ?></td>
         </tr>
         <?php } // end for ?>
         </tbody>