Merge branch 'master' of github.com:gnuboard/yc5

2013-10-18 17:34:17 +09:00
parent b3d971538c f074fb3339
commit 54afed7a5d
6 changed files with 25 additions and 7 deletions
--- a/adm/shop_admin/deliverycodeform.php
+++ b/adm/shop_admin/deliverycodeform.php
@ -61,6 +61,14 @@ 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" id="dl_default" <?php echo get_checked($dl['dl_default'], '1'); ?>>
+            <label for="dl_default">기본 배송업체로 선택합니다.</label>
+        </td>
+    </tr>
    </tbody>
    </table>
 </div>
--- 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 ";
--- a/adm/shop_admin/deliverycodelist.php
+++ b/adm/shop_admin/deliverycodelist.php
@ -34,6 +34,7 @@ $result = sql_query($sql);
        <th scope="col">ID</th>
        <th scope="col">배송회사명</th>
        <th scope="col">고객센터</th>
+        <th scope="col">기본<span class="sound_only"> 배송지</span></th>
        <th scope="col">순서</th>
        <th scope="col">관리</th>
    </tr>
@ -44,6 +45,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 class="td_mngsmall"><?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>
--- 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
    }
--- a/adm/shop_admin/itemlist.php
+++ b/adm/shop_admin/itemlist.php
@ -194,12 +194,12 @@ $listall = '<a href="'.$_SERVER['PHP_SELF'].'" class="ov_listall">전체목록</
    </tr>
    <tr>
        <td rowspan="2" class="td_img"><a href="<?php echo $href; ?>"><?php echo get_it_image($row['it_id'], 50, 50); ?></a></td>
-        <td headers="" class="td_input"><input type="text" name="it_name[<?php echo $i; ?>]" value="<?php echo htmlspecialchars2(cut_str($row['it_name'],250, "")); ?>" required class="frm_input frm_sit_title required" size="30"></td>
+        <td headers="" class="td_input"><input type="text" name="it_name[<?php echo $i; ?>]" value="<?php echo htmlspecialchars2(cut_str($row['it_name'],250, "")); ?>" required class="frm_input required" size="30"></td>
        <td headers="th_amt" class="td_numbig td_input"><input type="text" name="it_price[<?php echo $i; ?>]" value="<?php echo $row['it_price']; ?>" class="frm_input sit_amt" size="7"></td>
        <td headers="th_camt" class="td_numbig td_input"><input type="text" name="it_cust_price[<?php echo $i; ?>]" value="<?php echo $row['it_cust_price']; ?>" class="frm_input sit_camt" size="7"></td>
    </tr>
    <tr>
-        <td headers="" class="td_input"><input type="text" name="it_mobile_name[<?php echo $i; ?>]" value="<?php echo htmlspecialchars2(cut_str($row['it_mobile_name'],250, "")); ?>" class="frm_input frm_sit_title" size="30"></td>
+        <td headers="" class="td_input"><input type="text" name="it_mobile_name[<?php echo $i; ?>]" value="<?php echo htmlspecialchars2(cut_str($row['it_mobile_name'],250, "")); ?>" class="frm_input" size="30"></td>
        <td headers="th_pt" class="td_numbig td_input"><input type="text" name="it_point[<?php echo $i; ?>]" value="<?php echo $row['it_point']; ?>" class="frm_input sit_pt" size="7"></td>
        <td headers="th_qty" class="td_numbig td_input"><input type="text" name="it_stock_qty[<?php echo $i; ?>]" value="<?php echo $row['it_stock_qty']; ?>" class="frm_input sit_qty" size="7"></td>
    </tr>
--- a/css/admin.css
+++ b/css/admin.css
@ -140,7 +140,7 @@ h3 {margin:0 20px}
 .btn_confirm02 a {display:inline-block;padding:0 15px;height:30px;background:#617d46;color:#fff;text-decoration:none;line-height:2.5em;vertical-align:middle}
 .btn_confirm02 a:focus {background:#555}

-.btn_submit {background:#ff3061}
+.btn_submit {background:#ff3061;cursor:pointer}
 .btn_confirm .btn_submit {padding:0 15px;border:0;height:30px;color:#fff}
 .btn_cancel {display:inline-block;padding:0 15px;height:30px;border:0;background:#617d46;color:#fff;text-decoration:none;line-height:2.5em;vertical-align:middle}
 .btn_frmline {display:inline-block;padding:0 7px 0 5px;height:21px;border:0;background:#444;color:#fff !important;letter-spacing:-0.1em;text-decoration:none;vertical-align:middle;line-height:2em} /* 우편번호검색버튼 등 */
@ -202,7 +202,7 @@ legend {position:absolute;width:0;height:0;font-size:0;line-height:0;text-indent
 #ft {margin:20px 0;padding:10px 20px;border-top:1px solid #d0d6d8}

 /* 페이지 내 검색 */
-.local_sch .btn_submit {padding:3px 5px;border:1px solid #ff3061;color:#fff;font-size:0.95em;vertical-align:middle;cursor:pointer}
+.local_sch .btn_submit {padding:3px 5px;border:1px solid #ff3061;color:#fff;font-size:0.95em;vertical-align:middle}

 .local_sch01 {margin:0 0 10px;padding:0 20px 10px;border-bottom:1px solid #e9e9e9}
 .local_sch01 span {display:block;margin:0 0 5px}
@ -218,7 +218,7 @@ legend {position:absolute;width:0;height:0;font-size:0;line-height:0;text-indent
 /* 페이지 내 실행 */
 .local_cmd01 {margin:0 0 10px;padding:0 20px}
 .local_cmd01 .cmd_tit {font-weight:bold}
-.local_cmd01 .btn_submit {padding:3px 5px;border:1px solid #ff3061;color:#fff;font-size:0.95em;vertical-align:middle;cursor:pointer}
+.local_cmd01 .btn_submit {padding:3px 5px;border:1px solid #ff3061;color:#fff;font-size:0.95em;vertical-align:middle}

 /* 페이지 내 안내문 */
 .local_desc ol, .local_desc ul {margin:0;padding:0 0 10px 21px}
@ -396,7 +396,7 @@ td.td_grpset {width:160px;border-left:1px solid #e9ecee;text-align:center}
 /* 메일 테스트 */

 #fsendmailtest {margin:50px 0;text-align:center}
-#fsendmailtest .btn_submit {padding:3px 5px;border:1px solid #ff3061;color:#fff;font-size:0.95em;vertical-align:middle;cursor:pointer}
+#fsendmailtest .btn_submit {padding:3px 5px;border:1px solid #ff3061;color:#fff;font-size:0.95em;vertical-align:middle}

 /* ########## 쇼핑몰 사용시 적용 ########## */