diff --git a/shop/orderaddress.php b/shop/orderaddress.php
index 4cbbf02bd..c316f7aa6 100644
--- a/shop/orderaddress.php
+++ b/shop/orderaddress.php
@@ -13,7 +13,10 @@ if($w == 'd') {
 $sql = " select *
             from {$g5['g5_shop_order_address_table']}
             where mb_id = '{$member['mb_id']}'
-            order by ad_default, ad_id desc ";
+            order by
+            ad_default desc,
+            ad_id desc ";
+
 $result = sql_query($sql);
 
 if(!mysql_num_rows($result))
@@ -28,11 +31,12 @@ $g5['title'] = '배송지 목록';
 include_once(G5_PATH.'/head.sub.php');
 
 $order_action_url = G5_HTTPS_SHOP_URL.'/orderaddress_update.php';
+
 ?>
-<form name="forderaddress" method="post" action="<?php echo $order_action_url; ?>" autocomplete="off">
+<form name="forderaddress" method="post" action="<?php echo $order_action_url; ?>" onsubmit="return fitemlist_submit(this);" autocomplete="off">
 <div id="sod_addr_list" class="new_win">
 
-    <h1 id="new_win_title">배송지 목록dd</h1>
+    <h1 id="new_win_title">배송지 목록</h1>
 
     <table class="basic_tbl">
     <thead>
@@ -55,9 +59,12 @@ $order_action_url = G5_HTTPS_SHOP_URL.'/orderaddress_update.php';
         $addr = $row['ad_name'].$sep.$row['ad_tel'].$sep.$row['ad_hp'].$sep.$row['ad_zip1'].$sep.$row['ad_zip2'].$sep.$row['ad_addr1'].$sep.$row['ad_addr2'].$sep.$row['ad_subject'];
     ?>
     <tr>
-        <td class="td_chk"><label for="chk_<?php echo $i;?>" class="sound_only">배송지선택</label><input type="checkbox" name="ad_id" value="<?php echo $i;?>" id="chk_<?php echo $i;?>"></td>
-        <td class="td_name"><input type="text" name="ad_subject" id="ad_subject" class="frm_input" size="10" maxlength="20" value="<?php echo $row['ad_subject']; ?>"></td>
-        <td class="td_basic"><label for="ad_basic<?php echo $i;?>" class="sound_only">기본배송지</label><input type="radio" name="ad_default" value="1" id="ad_basic<?php echo $i;?>"></td>
+        <td class="td_chk"><label for="chk_<?php echo $i;?>" class="sound_only">배송지선택</label>
+            <input type="hidden" name="ad_id[]" value="<?php echo $row['ad_id'];?>">
+            <input type="checkbox" name="chk[]" value="<?php echo $i;?>" id="chk_<?php echo $i;?>">
+        </td>
+        <td class="td_name"><input type="text" name="ad_subject[]" id="ad_subject" class="frm_input" size="10" maxlength="20" value="<?php echo $row['ad_subject']; ?>"></td>
+        <td class="td_default"><label for="ad_default<?php echo $i;?>" class="sound_only">기본배송지</label><input type="radio" name="ad_default" value="<?php echo $row['ad_id'];?>" id="ad_default<?php echo $i;?>" <?php if($row['ad_default']) echo 'checked="checked"';?>></td>
         <td class="td_smallname"><?php echo $row['ad_name']; ?></td>
         <td class="td_bignum"><?php echo $row['ad_tel']; ?><br><?php echo $row['ad_hp']; ?></td>
         <td><?php echo sprintf('%s %s', $row['ad_addr1'], $row['ad_addr2']); ?></td>
@@ -73,12 +80,28 @@ $order_action_url = G5_HTTPS_SHOP_URL.'/orderaddress_update.php';
     </tbody>
     </table>
     <div class="btn_list">
-        <input type="submit" name="act_button" value="선택수정">
+        <input type="submit" name="act_button" value="선택수정" onclick="document.pressed=this.value">
     </div>
 </div>
 </form>
 
 <script>
+function fitemlist_submit(f)
+{
+    if (!is_checked("chk[]")) {
+        alert(document.pressed+" 하실 항목을 하나 이상 선택하세요.");
+        return false;
+    }
+
+    if(document.pressed == "선택삭제") {
+        if(!confirm("선택한 자료를 정말 삭제하시겠습니까?")) {
+            return false;
+        }
+    }
+
+    return true;
+}
+
 $(function() {
     $(".sel_address").on("click", function() {
         var addr = $(this).siblings("input").val().split(String.fromCharCode(30));
@@ -111,6 +134,16 @@ $(function() {
     $(".del_address").on("click", function() {
         return confirm("배송지 목록을 삭제하시겠습니까?");
     });
+
+    // 전체선택 부분
+    $("#chk_all").on("change", function() {
+        if ($(this).attr("checked")){
+            $("input[type='checkbox']:not(checked)").attr("checked", true);
+        }else{
+            $("input[type='checkbox']:checked").attr("checked", false);
+        }
+    });
+
 });
 </script>
 
diff --git a/shop/orderaddress_update.php b/shop/orderaddress_update.php
index fb223e592..337617194 100644
--- a/shop/orderaddress_update.php
+++ b/shop/orderaddress_update.php
@@ -1,66 +1,33 @@
 <?php
 include_once('./_common.php');
 
-if(get_magic_quotes_gpc())
-{
-    $_GET  = array_add_callback("stripslashes", $_GET);
-    $_POST = array_add_callback("stripslashes", $_POST);
+//print_r2($_POST); exit;
+
+if ($is_member && count($_POST['chk'])) {
+
+    // 해당 회원에 대한 기본배송지 클리어
+    if (isset($_POST['ad_default'])) {
+        $sql = " update `{$g5['g5_shop_order_address_table']}` 
+                    set ad_default  = 0
+                  where mb_id       = '{$member['mb_id']}' ";
+        sql_query($sql);
+    }
+
+    for ($i=0; $i<count($_POST['chk']); $i++)
+    {
+        // 실제 번호를 넘김
+        $k = $_POST['chk'][$i];
+
+        $sql = " update `{$g5['g5_shop_order_address_table']}`
+                    set ad_subject  = '{$_POST['ad_subject'][$k]}' ";
+        // 기본배송지로 선택 되었다면
+        if ($_POST['ad_id'][$k] == $_POST['ad_default'])
+            $sql .= " , ad_default  = '1' ";
+        $sql .= " where ad_id       = '{$_POST['ad_id'][$k]}' 
+                    and mb_id       = '{$member['mb_id']}' ";
+        sql_query($sql);
+    }
 }
 
-$_GET  = array_add_callback("mysql_real_escape_string", $_GET);
-$_POST = array_add_callback("mysql_real_escape_string", $_POST);
-
-// orderview 에서 사용하기 위해 session에 넣고
-$uid = md5($od_id.G5_TIME_YMDHIS.$REMOTE_ADDR);
-set_session('ss_orderview_uid', $uid);
-
-// 배송지처리
-if($is_member && $ad_default) {
-
-    $sql = " select ad_id
-                from {$g5['g5_shop_order_address_table']}
-                where mb_id = '{$member['mb_id']}' ";
-    $row = sql_fetch($sql);
-
-    if($ad_default) {
-        $sql = " update {$g5['g5_shop_order_address_table']}
-                    set ad_default = '0'
-                    where mb_id = '{$member['mb_id']}' ";
-        sql_query($sql);
-    }
-
-    if($row['ad_id']) {
-        $sql = " update {$g5['g5_shop_order_address_table']}
-                    set ";
-        if($ad_default)
-            $sql .= " ad_default = '$ad_default' ";
-        if($ad_subject)
-            $sql .= " , ad_subject = '$ad_subject' ";
-        $sql .= " where ad_id = '{$row['ad_id']}'
-                    and mb_id = '{$member['mb_id']}' ";
-        sql_query($sql);
-
-    if(!$ad_default && $add_subject) {
-        $sql = " insert into {$g5['g5_shop_order_address_table']}
-                    set mb_id       = '{$member['mb_id']}',
-                        ad_subject  = '$ad_subject',
-                        ad_default  = '$ad_default',
-                        ad_name     = '$od_b_name',
-                        ad_tel      = '$od_b_tel',
-                        ad_hp       = '$od_b_hp',
-                        ad_zip1     = '$od_b_zip1',
-                        ad_zip2     = '$od_b_zip2',
-                        ad_addr1    = '$od_b_addr1',
-                        ad_addr2    = '$od_b_addr2' ";
-        sql_query($sql);
-    }
-
-    }
-}
-print_r ($row);
-echo $member['mb_id']."멤버아이디<br>";
-echo $ad_default."디폴트값<br>";
-echo $ad_subject. "제목<br>";
-echo $row['ad_id']. "고유 아이디<br>";
-//goto_url(G5_SHOP_URL.'/orderaddress.php?od_id='.$od_id.'&amp;uid='.$uid);
+goto_url(G5_SHOP_URL.'/orderaddress.php?od_id='.$od_id.'&amp;uid='.$uid);
 ?>
\ No newline at end of file
diff --git a/shop/orderformupdate.php b/shop/orderformupdate.php
index c37466060..5038114b5 100644
--- a/shop/orderformupdate.php
+++ b/shop/orderformupdate.php
@@ -576,12 +576,44 @@ if (get_session('ss_direct'))
     set_session('ss_cart_direct', '');
 
 // 배송지처리
-if($is_member && ($add_address || $ad_default)) {
+if($is_member) {
     $ad_zip1 = $od_b_zip1;
     $ad_zip2 = $od_b_zip2;
     $ad_addr1 = $od_b_addr1;
     $ad_addr2 = $od_b_addr2;
 
+    $sql = " select count(*) as count from {$g5['g5_shop_order_address_table']}
+                where mb_id = '{$member['mb_id']}'
+                and ad_subject = '{$_POST['od_b_subject']}'
+                and ad_name = '{$_POST['od_b_name']}'
+                and ad_tel = '{$_POST['od_b_tel']}'
+                and ad_hp = '{$_POST['od_b_hp']}'
+                and ad_zip1 = '{$_POST['od_b_zip1']}'
+                and ad_zip2 = '{$_POST['od_b_zip2']}'
+                and ad_addr1 = '{$_POST['od_b_addr1']}'
+                and ad_addr2 = '{$_POST['od_b_addr2']}' ";
+
+    $row = sql_fetch($sql);
+
+    if(!$row['count']){
+        $sql = " insert into {$g5['g5_shop_order_address_table']}
+                    set mb_id       = '{$member['mb_id']}',
+                        ad_subject  = '$ad_subject',
+                        ad_default  = '$ad_default',
+                        ad_name     = '$od_b_name',
+                        ad_tel      = '$od_b_tel',
+                        ad_hp       = '$od_b_hp',
+                        ad_zip1     = '$od_b_zip1',
+                        ad_zip2     = '$od_b_zip2',
+                        ad_addr1    = '$od_b_addr1',
+                        ad_addr2    = '$od_b_addr2' ";
+        sql_query($sql);
+        echo "됏다";
+    }
+
+
+//print_r ($row);
+
     $sql = " select ad_id
                 from {$g5['g5_shop_order_address_table']}
                 where mb_id = '{$member['mb_id']}'