From 745f2b4616e22947321e308767867169829a0a33 Mon Sep 17 00:00:00 2001
From: gnuboard <kagla@naver.com>
Date: Fri, 18 Oct 2013 14:39:10 +0900
Subject: [PATCH] =?UTF-8?q?=EA=B8=B0=EB=B3=B8=EB=B0=B0=EC=86=A1=EC=97=85?=
 =?UTF-8?q?=EC=B2=B4=20=ED=95=84=EB=93=9C=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/deliverycodeform.php       | 7 +++++++
 adm/shop_admin/deliverycodeformupdate.php | 8 +++++++-
 adm/shop_admin/deliverycodelist.php       | 3 +++
 adm/shop_admin/deliverylist.php           | 2 ++
 4 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/adm/shop_admin/deliverycodeform.php b/adm/shop_admin/deliverycodeform.php
index 5d837c1cf..f2e29ac6b 100644
--- a/adm/shop_admin/deliverycodeform.php
+++ b/adm/shop_admin/deliverycodeform.php
@@ -61,6 +61,13 @@ include_once (G5_ADMIN_PATH.'/admin.head.php');
             <?php echo order_select("dl_order", $dl['dl_order']); ?>
         </td>
     </tr>
+    <tr>
+        <th scope="row"><label for="dl_default">기본 배송업체</label></th>
+        <td>
+            <?php echo help("기본 배송업체로 선택하면 셀렉트박스에서 이 배송업체가 기본으로 노출됩니다."); ?>
+            <input type="checkbox" name="dl_default" value="1" <?php echo get_checked($dl['dl_default'], '1'); ?>> 기본 배송업체로 선택합니다.
+        </td>
+    </tr>
     </tbody>
     </table>
 </div>
diff --git a/adm/shop_admin/deliverycodeformupdate.php b/adm/shop_admin/deliverycodeformupdate.php
index 94ee5313a..e0f44e3f4 100644
--- a/adm/shop_admin/deliverycodeformupdate.php
+++ b/adm/shop_admin/deliverycodeformupdate.php
@@ -10,10 +10,16 @@ if ($W == 'd')
 else
     auth_check($auth[$sub_menu], "w");
 
+// 기본 배송업체가 선택 되었다면 추가나 수정시 기본 배송업체를 모두 삭제한다.
+if ($dl_default && ($w == "" || $w == "u")) {
+    sql_query(" update {$g5['g5_shop_delivery_table']} set dl_default = 0 ");
+}
+
 $sql_common .= "set dl_company = '$dl_company',
                     dl_url = '$dl_url',
                     dl_tel = '$dl_tel',
-                    dl_order = '$dl_order' ";
+                    dl_order = '$dl_order',
+                    dl_default = '$dl_default' ";
 
 if ($w == "") {
     $sql = " alter table {$g5['g5_shop_delivery_table']} auto_increment=1 ";
diff --git a/adm/shop_admin/deliverycodelist.php b/adm/shop_admin/deliverycodelist.php
index 340e1d7c5..713d27d24 100644
--- a/adm/shop_admin/deliverycodelist.php
+++ b/adm/shop_admin/deliverycodelist.php
@@ -23,6 +23,7 @@ $result = sql_query($sql);
 </div>
 
  <div class="btn_add01 btn_add">
+    ■ 는 기본배송업체 표시입니다.
     <a href="./deliverycodeform.php">배송회사추가</a>
 </div>
 
@@ -34,6 +35,7 @@ $result = sql_query($sql);
         <th scope="col">ID</th>
         <th scope="col">배송회사명</th>
         <th scope="col">고객센터</th>
+        <th scope="col">기본배송지</th>
         <th scope="col">순서</th>
         <th scope="col">관리</th>
     </tr>
@@ -44,6 +46,7 @@ $result = sql_query($sql);
         <td class="td_num"><?php echo $row['dl_id']; ?></td>
         <td><?php echo stripslashes($row['dl_company']); ?></td>
         <td class="td_numbig"><?php echo $row['dl_tel']; ?></td>
+        <td><?php echo ($row['dl_default']?"■":""); ?></td>
         <td class="td_num"><?php echo $row['dl_order']; ?></td>
         <td class="td_mng">
             <a href="<?php echo $row['dl_url']; ?>" target="_blank"><span class="sound_only"><?php echo stripslashes($row['dl_company']); ?> </span>사이트</a>
diff --git a/adm/shop_admin/deliverylist.php b/adm/shop_admin/deliverylist.php
index 2e88a74b3..9d168b3ab 100644
--- a/adm/shop_admin/deliverylist.php
+++ b/adm/shop_admin/deliverylist.php
@@ -131,6 +131,7 @@ $listall = '<a href="'.$_SERVER['PHP_SELF'].'" class="ov_listall">전체목록</
         <th scope="col"><a href="<?php echo title_sort("od_invoice_time") . "&amp;$qstr1"; ?>">배송일시</a></th>
         <th scope="col">배송업체</th>
         <th scope="col"><a href="<?php echo title_sort("od_invoice", 1) . "&amp;$qstr1"; ?>">운송장번호</a></th>
+        <th scope="col">완료상태</th>
     </tr>
     </thead>
     <tbody>
@@ -188,6 +189,7 @@ $listall = '<a href="'.$_SERVER['PHP_SELF'].'" class="ov_listall">전체목록</
             <input type="hidden" name="save_od_invoice[<?php echo $i; ?>]" value="<?php echo $row['od_invoice']; ?>">
             <input type="text" name="od_invoice[<?php echo $i; ?>]" value="<?php echo $row['od_invoice']; ?>" class="frm_input" size="10">
         </td>
+        <td><input type="checkbox" name="od_status" value="1"></td>
     </tr>
     <?php
     }