diff --git a/adm/admin.menu400.shop_1of2.php b/adm/admin.menu400.shop_1of2.php
index 45e185720..08239cf7f 100644
--- a/adm/admin.menu400.shop_1of2.php
+++ b/adm/admin.menu400.shop_1of2.php
@@ -17,7 +17,7 @@ $menu['menu400'] = array (
     array('400500', '상품옵션재고관리', G5_ADMIN_URL.'/shop_admin/optionstocklist.php', 'scf_item_option'),
     array('400650', '쿠폰관리', G5_ADMIN_URL.'/shop_admin/couponlist.php', 'scf_coupon'),
     array('400500', '배송일괄처리', G5_ADMIN_URL.'/shop_admin/deliverylist.php', 'scf_deli', 1),
-    array('400740', '배송업체관리', G5_ADMIN_URL.'/shop_admin/deliverycodelist.php', 'scf_deli_co', 1),
+    //array('400740', '배송업체관리', G5_ADMIN_URL.'/shop_admin/deliverycodelist.php', 'scf_deli_co', 1),
     array('400750', '추가배송비관리', G5_ADMIN_URL.'/shop_admin/sendcostlist.php', 'scf_sendcost', 1)
 );
 ?>
\ No newline at end of file
diff --git a/adm/shop_admin/configform.php b/adm/shop_admin/configform.php
index 745182bf2..d2b6f16f6 100644
--- a/adm/shop_admin/configform.php
+++ b/adm/shop_admin/configform.php
@@ -647,6 +647,24 @@ $pg_anchor = '<ul class="anchor">
             <col>
         </colgroup>
         <tbody>
+        <tr>
+            <th scope="row"><label for="de_delivery_company">배송업체</label></th>
+            <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";
+                    }
+                    ?>
+                </select>
+            </td>
+        </tr>
         <tr>
             <th scope="row"><label for="de_send_cost_case">배송비유형</label></th>
             <td>
diff --git a/adm/shop_admin/configformupdate.php b/adm/shop_admin/configformupdate.php
index b7de75fc7..c844aa86c 100644
--- a/adm/shop_admin/configformupdate.php
+++ b/adm/shop_admin/configformupdate.php
@@ -102,6 +102,7 @@ $sql = " update {$g5['g5_shop_default_table']}
                 de_settle_max_point         = '$de_settle_max_point',
                 de_settle_point_unit        = '$de_settle_point_unit',
                 de_level_sell               = '$de_level_sell',
+                de_delivery_company         = '$de_delivery_company',
                 de_send_cost_case           = '$de_send_cost_case',
                 de_send_cost_limit          = '$de_send_cost_limit',
                 de_send_cost_list           = '$de_send_cost_list',
diff --git a/adm/shop_admin/deliverylist.php b/adm/shop_admin/deliverylist.php
index 9d168b3ab..44924c601 100644
--- a/adm/shop_admin/deliverylist.php
+++ b/adm/shop_admin/deliverylist.php
@@ -194,7 +194,7 @@ $listall = '<a href="'.$_SERVER['PHP_SELF'].'" class="ov_listall">전체목록</
     <?php
     }
     if ($i == 0)
-        echo '<tr><td colspan="10" class="empty_table">자료가 한건도 없습니다.</td></tr>';
+        echo '<tr><td colspan="11" class="empty_table">자료가 한건도 없습니다.</td></tr>';
     ?>
     </table>
 </div>
diff --git a/adm/shop_admin/orderlist.php b/adm/shop_admin/orderlist.php
index 48bbf6d00..868b5f0f0 100644
--- a/adm/shop_admin/orderlist.php
+++ b/adm/shop_admin/orderlist.php
@@ -205,25 +205,31 @@ $listall = '<a href="'.$_SERVER['PHP_SELF'].'" class="ov_listall">전체목록</
     <caption>주문 내역 목록</caption>
     <thead>
     <tr>
-        <th scope="col" rowspan="2">
+        <th scope="col" rowspan="3">
             <label for="chkall" class="sound_only">주문 전체</label>
             <input type="checkbox" name="chkall" value="1" id="chkall" onclick="check_all(this.form)">
         </th>
         <th scope="col" id="th_odrnum"><a href="<?php echo title_sort("od_id", 1)."&amp;$qstr1"; ?>">주문번호</a></th>
         <th scope="col" id="th_odrer"><a href="<?php echo title_sort("od_name")."&amp;$qstr1"; ?>">주문자</a></th>
-        <th scope="col" rowspan="2">주문상태</th>
-        <th scope="col" rowspan="2">결제수단</th>
-        <th scope="col" rowspan="2"><a href="<?php echo title_sort("od_cart_price", 1)."&amp;$qstr1"; ?>">주문합계</a></th>
-        <th scope="col" rowspan="2"><a href="<?php echo title_sort("od_receipt_price")."&amp;$qstr1"; ?>">입금합계</a></th>
-        <th scope="col" rowspan="2"><a href="<?php echo title_sort("od_cancel_price", 1)."&amp;$qstr1"; ?>">주문취소</a></th>
-        <th scope="col" rowspan="2">쿠폰</th>
-        <th scope="col" rowspan="2"><a href="<?php echo title_sort("od_misu", 1)."&amp;$qstr1"; ?>">미수금</a></th>
-        <th scope="col" rowspan="2"><a href="<?php echo title_sort("od_cart_price", 1)."&amp;$qstr1"; ?>">건수</a><br>(누적)</th>
-        <th scope="col" rowspan="2">관리</th>
+        <th scope="col" colspan="2">주문상태</th>
+        <th scope="col" rowspan="3">결제수단</th>
+        <th scope="col" rowspan="3"><a href="<?php echo title_sort("od_cart_price", 1)."&amp;$qstr1"; ?>">주문합계</a></th>
+        <th scope="col" rowspan="3"><a href="<?php echo title_sort("od_receipt_price")."&amp;$qstr1"; ?>">입금합계</a></th>
+        <th scope="col" rowspan="3"><a href="<?php echo title_sort("od_cancel_price", 1)."&amp;$qstr1"; ?>">주문취소</a></th>
+        <th scope="col" rowspan="3">쿠폰</th>
+        <th scope="col" rowspan="3"><a href="<?php echo title_sort("od_misu", 1)."&amp;$qstr1"; ?>">미수금</a></th>
+        <th scope="col" rowspan="3">관리</th>
     </tr>
     <tr>
         <th scope="col" id="th_odrdate">주문일시</th>
         <th scope="col" id="th_odrid"><a href="<?php echo title_sort("mb_id")."&amp;$qstr1"; ?>">회원ID</a></th>
+        <th scope="col"><a href="<?php echo title_sort("od_cart_price", 1)."&amp;$qstr1"; ?>">주문건</a></th>
+        <th scope="col"><a href="<?php echo title_sort("od_cart_price", 1)."&amp;$qstr1"; ?>">누적건</a></th>
+    </tr>
+    <tr>
+        <th scope="col">배송일시</th>
+        <th scope="col">배송회사</th>
+        <th scope="col" colspan="2">운송장번호</th>
     </tr>
     </thead>
     <tbody>
@@ -263,10 +269,13 @@ $listall = '<a href="'.$_SERVER['PHP_SELF'].'" class="ov_listall">전체목록</
 
         $uid = md5($row['od_id'].$row['od_time'].$row['od_ip']);
 
+        $invoice_time = is_null_time($row['od_invoice_time']) ? G5_TIME_YMDHIS : $row['od_invoice_time'];
+        $delivery_company = $row['od_delivery_company'] ? $row['od_delivery_company'] : $default['de_delivery_company'];
+
         $tr_bg = $i%2 ? 'tr_bg1' : 'tr_bg0';
     ?>
     <tr class="orderlist<?php echo ' '.$tr_bg; ?>">
-        <td rowspan="2" class="td_chk">
+        <td rowspan="3" class="td_chk">
             <input type="hidden" name="od_id[<?php echo $i ?>]" value="<?php echo $row['od_id'] ?>" id="od_id_<?php echo $i ?>">
             <label for="chk_<?php echo $i; ?>" class="sound_only">주문번호 <?php echo $row['od_id']; ?></label>
             <input type="checkbox" name="chk[]" value="<?php echo $i ?>" id="chk_<?php echo $i ?>">
@@ -276,21 +285,20 @@ $listall = '<a href="'.$_SERVER['PHP_SELF'].'" class="ov_listall">전체목록</
             <a href="<?php echo G5_SHOP_URL; ?>/orderinquiryview.php?od_id=<?php echo $row['od_id']; ?>&amp;uid=<?php echo $uid; ?>"><?php echo $row['od_id']; ?></a><br>
         </td>
         <td headers="th_odrer" class="td_name"><?php echo $mb_nick; ?></td>
-        <td rowspan="2" class="td_odrstatus">
+        <td colspan="2" class="td_odrstatus">
             <input type="hidden" name="current_status[<?php echo $i ?>]" value="<?php echo $row['od_status'] ?>">
             <?php echo $row['od_status']; ?>
         </td>
-        <td rowspan="2" class="td_payby">
+        <td rowspan="3" class="td_payby">
             <input type="hidden" name="current_settle_case[<?php echo $i ?>]" value="<?php echo $row['od_settle_case'] ?>">
             <?php echo $s_receipt_way; ?>
         </td>
-        <td rowspan="2" class="td_numsum"><?php echo number_format($row['od_cart_price'] + $row['od_send_cost'] + $row['od_send_cost2']); ?></td>
-        <td rowspan="2" class="td_numincome"><?php echo number_format($row['od_receipt_price']); ?></td>
-        <td rowspan="2" class="td_numcancel"><?php echo number_format($row['od_cancel_price']); ?></td>
-        <td rowspan="2" class="td_numcoupon"><?php echo number_format($row['couponprice']); ?></td>
-        <td rowspan="2" class="td_numrdy"><?php echo number_format($row['od_misu']); ?></td>
-        <td rowspan="2" class="td_cntsmall"><?php echo $row['od_cart_count']; ?>건<?php if($od_cnt) { ?><br>(<?php echo $od_cnt; ?>건)<?php } ?></td>
-        <td rowspan="2" class="td_mngsmall">
+        <td rowspan="3" class="td_numsum"><?php echo number_format($row['od_cart_price'] + $row['od_send_cost'] + $row['od_send_cost2']); ?></td>
+        <td rowspan="3" class="td_numincome"><?php echo number_format($row['od_receipt_price']); ?></td>
+        <td rowspan="3" class="td_numcancel"><?php echo number_format($row['od_cancel_price']); ?></td>
+        <td rowspan="3" class="td_numcoupon"><?php echo number_format($row['couponprice']); ?></td>
+        <td rowspan="3" class="td_numrdy"><?php echo number_format($row['od_misu']); ?></td>
+        <td rowspan="3" class="td_mngsmall">
             <a href="./orderform.php?od_id=<?php echo $row['od_id']; ?>&amp;<?php echo $qstr; ?>" class="mng_mod"><span class="sound_only"><?php echo $row['od_id']; ?> </span>수정</a>
             <a href="./orderdelete.php?od_id=<?php echo $row['od_id']; ?>&amp;mb_id=<?php echo $row['mb_id']; ?>&amp;<?php echo $qstr; ?>" onclick="return delete_confirm();" class="mng_del"><span class="sound_only"><?php echo $row['od_id']; ?> </span>삭제</a>
         </td>
@@ -298,6 +306,44 @@ $listall = '<a href="'.$_SERVER['PHP_SELF'].'" class="ov_listall">전체목록</
     <tr class="<?php echo $tr_bg; ?>">
         <td headers="th_odrdate"><span class="sound_only">주문일시 </span><?php echo $row['od_time']; ?></td>
         <td headers="th_odrid" class="td_name"><a href="<?php echo $_SERVER['PHP_SELF']; ?>?sort1=<?php echo $sort1; ?>&amp;sort2=<?php echo $sort2; ?>&amp;sel_field=mb_id&amp;search=<?php echo $row['mb_id']; ?>"><?php echo $row['mb_id']; ?></a></td>
+        <td class="td_cntsmall"><?php echo $row['od_cart_count']; ?>건</td>
+        <td class="td_cntsmall"><?php echo $od_cnt; ?>건</td>
+    </tr>
+    <tr class="<?php echo $tr_bg; ?>">
+        <td>
+            <?php if ($od_status == '준비') { ?>
+                <input type="text" name="od_invoice_time[<?php echo $i; ?>]" value="<?php echo $invoice_time; ?>" class="frm_input" size="16" maxlength="19">
+            <?php } else if ($od_status == '배송' || $od_status ==  '완료') { ?>
+                <?php echo $row['od_invoice_time']; ?>
+            <?php } else { ?>
+                -
+            <?php } ?>
+        </td>
+        <td>
+            <?php if ($od_status == '준비') { ?>
+                <input type="text" name="od_delivery_company[<?php echo $i; ?>]" value="<?php echo $delivery_company; ?>" class="frm_input" size="20">
+            <?php } else if ($od_status == '배송' || $od_status ==  '완료') { ?>
+                <?php echo $row['od_delivery_company']; ?>
+            <?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 colspan="2">
+            <!-- 값이 바뀌었는지 비교하기 위하여 저장 -->
+            <input type="hidden" name="save_dl_id[<?php echo $i; ?>]" value="<?php echo $row['dl_id']; ?>">
+            <input type="hidden" name="save_od_invoice[<?php echo $i; ?>]" value="<?php echo $row['od_invoice']; ?>">
+            <?php if ($od_status == '준비') { ?>
+                <input type="text" name="od_invoice[<?php echo $i; ?>]" value="<?php echo $row['od_invoice']; ?>" class="frm_input" size="10">
+            <?php } else if ($od_status == '배송' || $od_status ==  '완료') { ?>
+                <?php echo $row['od_invoice']; ?>
+            <?php } else { ?>
+                -
+            <?php } ?>
+        </td>
     </tr>
     <?php
         $tot_itemcount     += $row['od_cart_count'];
@@ -309,18 +355,19 @@ $listall = '<a href="'.$_SERVER['PHP_SELF'].'" class="ov_listall">전체목록</
     }
     mysql_free_result($result);
     if ($i == 0)
-        echo '<tr><td colspan="10" class="empty_table">자료가 없습니다.</td></tr>';
+        echo '<tr><td colspan="12" class="empty_table">자료가 없습니다.</td></tr>';
     ?>
     </tbody>
     <tfoot>
     <tr class="orderlist">
-        <th scope="row" colspan="5">합 계</th>
+        <th scope="row" colspan="3">&nbsp;</th>
+        <td><?php echo (int)$tot_itemcount; ?>건</td>
+        <th scope="row" colspan="2">합 계</th>
         <td><?php echo number_format($tot_orderprice); ?></td>
         <td><?php echo number_format($tot_receiptprice); ?></td>
         <td><?php echo number_format($tot_ordercancel); ?></td>
         <td><?php echo number_format($tot_couponprice); ?></td>
         <td><?php echo number_format($tot_misu); ?></td>
-        <td><?php echo (int)$tot_itemcount; ?>건</td>
         <td></td>
     </tr>
     </tfoot>
@@ -328,22 +375,36 @@ $listall = '<a href="'.$_SERVER['PHP_SELF'].'" class="ov_listall">전체목록</
 </div>
 
 <div class="local_cmd01 local_cmd">
+<?php if (($od_status == '' || $od_status == '완료') == false) { // 검색된 주문상태가 '전체', '완료' 가 아니라면 ?>
     <label for="od_status" class="cmd_tit">주문상태 변경</label>
-    <select name="od_status" id="od_status">
+    <!-- <select name="od_status" id="od_status">
         <option value="">선택하세요</option>
         <option value="주문">주문</option>
         <option value="입금">입금</option>
         <option value="준비">준비</option>
         <option value="배송">배송</option>
-        <!-- <option value="완료">완료</option> -->
-    </select>
-    <input type="submit" value="선택수정" class="btn_submit" onclick="document.pressed=this.value">
+        <option value="완료">완료</option>
+    </select> -->
+
+    <?php 
+    $change_status = "";
+    if ($od_status == '주문') $change_status = "입금";
+    if ($od_status == '입금') $change_status = "준비";
+    if ($od_status == '준비') $change_status = "배송";
+    if ($od_status == '배송') $change_status = "완료";
+    ?>
+    <?php if ($change_status) { ?>
+        <label><input type="checkbox" name="od_status" value="<?php echo $change_status; ?>"> <?php echo $change_status; ?></label>
+        <input type="submit" value="선택수정" class="btn_submit" onclick="document.pressed=this.value">
+    <?php } ?>
+<?php } ?>
 </div>
 
 <div class="local_desc01 local_desc">
 <p>
     &lt;무통장&gt;인 경우에만 &lt;주문&gt;에서 &lt;입금&gt;으로 변경됩니다. 가상계좌는 입금시 자동으로 &lt;입금&gt;처리됩니다.<br>
     &lt;준비&gt;에서 &lt;배송&gt;으로 변경된 주문은 배송관리에서 배송정보 입력과 &lt;완료&gt;처리를 해주시기 바랍니다.<br>
+    &lt;배송&gt;전에는 기본으로 배송일시가 현재시간으로 채워져 있습니다.<br>
     <strong>주의!</strong> 주문번호를 클릭하여 나오는 주문상세내역의 주소를 외부에서 조회가 가능한곳에 올리지 마십시오.
 </p>
 </div>
@@ -392,6 +453,7 @@ function forderlist_submit(f)
         return false;
     }
 
+    /*
     switch (f.od_status.value) {
         case "" : 
             alert("변경하실 주문상태를 선택하세요.");
@@ -401,6 +463,12 @@ function forderlist_submit(f)
         default :
 
     }
+    */
+
+    if (f.od_status.checked == false) {
+        alert("변경하실 주문상태를 선택하세요.");
+        return false;
+    }
 
     if(document.pressed == "선택삭제") {
         if(!confirm("선택한 자료를 정말 삭제하시겠습니까?")) {
@@ -422,23 +490,46 @@ function forderlist_submit(f)
             {
                 case "입금" : 
                     if (!(current_status == "주문" && current_settle_case == "무통장")) {
-                        alert("주문상태의 '무통장'(결제수단)인 경우에만 입금 처리 가능합니다.");
+                        alert("'주문' 상태의 '무통장'(결제수단)인 경우에만 '입금' 처리 가능합니다.");
                         return false;
                     }
                     break;
 
                 case "준비" : 
                     if (current_status != "입금") {
-                        alert("입금상태의 주문만 '준비'로 변경이 가능합니다.");
+                        alert("'입금' 상태의 주문만 '준비'로 변경이 가능합니다.");
                         return false;
                     }
                     break;
 
                 case "배송" : 
                     if (current_status != "준비") {
-                        alert("준비상태의 주문만 '배송'으로 변경이 가능합니다.");
+                        alert("'준비' 상태의 주문만 '배송'으로 변경이 가능합니다.");
                         return false;
                     }
+
+                    var invoice      = f.elements['od_invoice['+k+']'];
+                    var invoice_time = f.elements['od_invoice_time['+k+']'];
+                    var delivery_company = f.elements['od_delivery_company['+k+']'];
+
+                    if ($.trim(invoice_time.value) == '') {
+                        alert("배송일시를 입력하시기 바랍니다.");
+                        invoice_time.focus();
+                        return false;
+                    }
+
+                    if ($.trim(delivery_company.value) == '') {
+                        alert("배송업체를 입력하시기 바랍니다.");
+                        delivery_company.focus();
+                        return false;
+                    }
+
+                    if ($.trim(invoice.value) == '') {
+                        alert("운송장번호를 입력하시기 바랍니다.");
+                        invoice.focus();
+                        return false;
+                    }
+
                     break;
             }
         }
diff --git a/adm/shop_admin/orderlistupdate.php b/adm/shop_admin/orderlistupdate.php
index f62ce53ba..e7767bbe9 100644
--- a/adm/shop_admin/orderlistupdate.php
+++ b/adm/shop_admin/orderlistupdate.php
@@ -2,6 +2,7 @@
 $sub_menu = '400400';
 include_once('./_common.php');
 
+//print_r2($_POST); exit;
 
 // 상품옵션별재고 또는 상품재고에 더하기
 function add_io_stock($it_id, $ct_qty, $io_id="", $io_type="")
@@ -56,40 +57,47 @@ function change_status($od_id, $current_status, $change_status)
 }
 
 
-
-//print_r2($_POST); 
-
-// 주문상태변경 처리
-function change_order_status($current_staus, $change_status, $od) 
+for ($i=0; $i<count($_POST['chk']); $i++)
 {
-    global $g5;
+    // 실제 번호를 넘김
+    $k     = $_POST['chk'][$i];
+    $od_id = $_POST['od_id'][$k];
 
-    // 현재 주문상태와 바뀔 주문상태가 같다면 처리하지 않음
-    if ($current_staus == $change_status) return;
+    $invoice      = $_POST['od_invoice'][$k];
+    $invoice_time = $_POST['od_invoice_time'][$k];
+    $delivery_company = $_POST['od_delivery_company'][$k];
 
-    $od_id = $od['od_id'];
+    $od = sql_fetch(" select * from {$g5['g5_shop_order_table']} where od_id = '$od_id' ");
+    if (!$od) continue;
+    
+    //change_order_status($od['od_status'], $_POST['od_status'], $od);
+    //echo $od_id . "<br>";
 
-    switch ($current_staus) 
+    $current_status = $od['od_status'];
+    $change_status  = $_POST['od_status'];
+
+
+    switch ($current_status) 
     {
         case '주문' :
 
-            if ($change_status != '입금') return;
-            if ($od['od_settle_case'] != '무통장') return;
+            if ($change_status != '입금') continue;
+            if ($od['od_settle_case'] != '무통장') continue;
+
+            change_status($od_id, '주문', '입금');
 
             $sql = " update {$g5['g5_shop_order_table']} 
                         set od_receipt_price = od_misu,
                             od_misu = 0,
                             od_receipt_time = '".G5_TIME_YMDHIS."'
-                      where od_id = '$od_id' and od_status = '주문' ";
+                      where od_id = '$od_id' and od_status = '입금' ";
             sql_query($sql, true);
 
-            change_status($od_id, '주문', '입금');
-
             break;
 
         case '입금' :
 
-            if ($change_status != '준비') return;
+            if ($change_status != '준비') continue;
 
             change_status($od_id, '입금', '준비');
 
@@ -97,15 +105,25 @@ function change_order_status($current_staus, $change_status, $od)
 
         case '준비' :
 
-            if ($change_status != '배송') return;
+            if ($change_status != '배송') continue;
 
             change_status($od_id, '준비', '배송');
 
+            $sql = " update {$g5['g5_shop_order_table']} 
+                        set od_delivery_company = '$delivery_company',
+                            od_invoice      = '$invoice',
+                            od_invoice_time = '$invoice_time'
+                      where od_id = '$od_id' and od_status = '배송' ";
+            sql_query($sql, true);
+
             $sql = " select * from {$g5['g5_shop_cart_table']} where od_id = '$od_id' ";
             $result = sql_query($sql);
-            for ($i=0; $row=sql_fetch_array($result); $i++) {
-                // 재고를 이미 사용했다면 (재고에서 이미 뺐다면)
+
+            for ($i=0; $row=sql_fetch_array($result); $i++) 
+            {
+                // 재고를 이미 사용했거나 재고에서 이미 뺐다면
                 $stock_use = $row['ct_stock_use'];
+            
                 if ($row['ct_stock_use'])
                 {
                     if ($ct_status == '주문' || $ct_status == '취소' || $ct_status == '반품' || $ct_status == '품절')
@@ -127,8 +145,8 @@ function change_order_status($current_staus, $change_status, $od)
                 }
 
                 $point_use = $row['ct_point_use'];
-                // 회원이면서 포인트가 0보다 크면
-                // 이미 포인트를 부여했다면 뺀다.
+                
+                // 회원이면서 포인트가 0보다 크거나 이미 포인트를 부여했다면 뺀다.
                 if ($od['mb_id'] && $row['ct_point'] && $row['ct_point_use'])
                 {
                     $point_use = 0;
@@ -148,8 +166,12 @@ function change_order_status($current_staus, $change_status, $od)
 
         case '배송' :
 
-            if ($change_status != '완료') return;
-    }
+            if ($change_status != '완료') continue;
+
+            change_status($od_id, '배송', '완료');
+
+    } // switch end 
+
 
     // 주문정보
     $info = get_order_info($od_id);
@@ -163,19 +185,7 @@ function change_order_status($current_staus, $change_status, $od)
                     od_send_cost    = '{$info['od_send_cost']}'
                 where od_id = '$od_id' ";
     sql_query($sql, true);
-}
 
-for ($i=0; $i<count($_POST['chk']); $i++)
-{
-    // 실제 번호를 넘김
-    $k     = $_POST['chk'][$i];
-    $od_id = $_POST['od_id'][$k];
-
-    $od = sql_fetch(" select * from {$g5['g5_shop_order_table']} where od_id = '$od_id' ");
-    if (!$od) continue;
-    
-    change_order_status($od['od_status'], $_POST['od_status'], $od);
-    //echo $od_id . "<br>";
 }
 
 $qstr  = "sort1=$sort1&amp;sort2=$sort2&amp;sel_field=$sel_field&amp;search=$search";
diff --git a/extend/shop.extend.php b/extend/shop.extend.php
index 601ff66c8..fe54d0440 100644
--- a/extend/shop.extend.php
+++ b/extend/shop.extend.php
@@ -40,6 +40,25 @@ define('G5_SHOP_SKIN_URL',   G5_URL .'/'.G5_SKIN_DIR.'/shop/'.$default['de_shop_
 define('G5_MSHOP_SKIN_PATH', G5_MOBILE_PATH.'/'.G5_SKIN_DIR.'/shop/'.$default['de_shop_mobile_skin']);
 define('G5_MSHOP_SKIN_URL',  G5_MOBILE_URL .'/'.G5_SKIN_DIR.'/shop/'.$default['de_shop_mobile_skin']);
 
+/*
+배송업체에 데이터를 추가하는 경우 아래 형식으로 추가하세요.
+.'(배송업체명^택배조회URL^연락처)'
+*/
+define('G5_DELIVERY_COMPANY',
+     '(경동택배^http://www.kdexp.com/sub3_shipping.asp?stype=1&p_item=^080-873-2178)'
+    .'(대신택배^http://home.daesinlogistics.co.kr/daesin/jsp/d_freight_chase/d_general_process2.jsp?billno1=^043-222-4582)'
+    .'(동부택배^http://www.dongbups.com/delivery/delivery_search_view.jsp?item_no=^1588-8848)'
+    .'(로젠택배^http://www.ilogen.com/iLOGEN.Web.New/TRACE/TraceNoView.aspx?gubun=slipno&slipno=^1588-9988)'
+    .'(우체국^http://service.epost.go.kr/trace.RetrieveRegiPrclDeliv.postal?sid1=^1588-1300)'
+    .'(이노지스택배^http://www.innogis.co.kr/tracking_view.asp?invoice=^1566-4082)'
+    .'(한진택배^http://www.hanjin.co.kr/Delivery_html/inquiry/result_waybill.jsp?wbl_num=^1588-0011)'
+    .'(현대택배^http://www.hlc.co.kr/personalService/tracking/06/tracking_goods_result.jsp?InvNo=^1588-2121)'
+    .'(CJ대한통운^https://www.doortodoor.co.kr/parcel/doortodoor.do?fsp_action=PARC_ACT_002&fsp_cmd=retrieveInvNoACT&invc_no=^1588-1255)'
+    .'(CVSnet편의점택배^http://was.cvsnet.co.kr/_ver2/board/ctod_status.jsp?invoice_no=^1577-1287)'
+    .'(KG옐로우캡택배^http://www.yellowcap.co.kr/custom/inquiry_result.asp?invoice_no=^1588-0123)'
+    .'(KGB택배^http://www.kgbls.co.kr/sub5/trace.asp?f_slipno=^1577-4577)'
+);
+
 /*
 // 주문상태 상수
 define('G5_OD_STATUS_ORDER'     , '입금확인중');
diff --git a/extend/shop.extend2.php b/extend/shop.extend2.php
index e63d02f43..5ef3b213f 100644
--- a/extend/shop.extend2.php
+++ b/extend/shop.extend2.php
@@ -615,4 +615,16 @@ if(!sql_query(" select ev_mobile_skin from {$g5['g5_shop_event_table']} limit 1
                     ADD `ev_mobile_img_height` int(11) NOT NULL DEFAULT '0' AFTER `ev_mobile_img_width`,
                     ADD `ev_mobile_list_mod` int(11) NOT NULL DEFAULT '0' AFTER `ev_mobile_img_height` ", true);
 }
+
+// 쇼핑몰설정 테이블에 배송업체 필드 추가
+if(!sql_query(" select de_delivery_company from {$g5['g5_shop_default_table']} limit 1 ", false)) {
+    sql_query(" ALTER TABLE `{$g5['g5_shop_default_table']}`
+                    ADD `de_delivery_company` varchar(255) NOT NULL DEFAULT '' AFTER `de_level_sell` ", true);
+}
+
+// 주문서 테이블에 배송업체 필드 추가
+if(!sql_query(" select od_delivery_company from {$g5['g5_shop_order_table']} limit 1 ", false)) {
+    sql_query(" ALTER TABLE `{$g5['g5_shop_order_table']}`
+                    CHANGE `dl_id` `od_delivery_company` varchar(255) NOT NULL DEFAULT '' ", true);
+}
 ?>