diff --git a/adm/shop_admin/deliverycodeform.php b/adm/shop_admin/deliverycodeform.php index 5d837c1cf..95b450df1 100644 --- a/adm/shop_admin/deliverycodeform.php +++ b/adm/shop_admin/deliverycodeform.php @@ -61,6 +61,14 @@ include_once (G5_ADMIN_PATH.'/admin.head.php'); + + + + + > + + + 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..b82c541b8 100644 --- a/adm/shop_admin/deliverycodelist.php +++ b/adm/shop_admin/deliverycodelist.php @@ -34,6 +34,7 @@ $result = sql_query($sql); ID 배송회사명 고객센터 + 기본 배송지 순서 관리 @@ -44,6 +45,7 @@ $result = sql_query($sql); + 사이트 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 = '전체목록">배송일시 배송업체 ">운송장번호 + 완료상태 @@ -188,6 +189,7 @@ $listall = '전체목록]" value=""> + 전체목록 - " required class="frm_input frm_sit_title required" size="30"> + " required class="frm_input required" size="30"> - " class="frm_input frm_sit_title" size="30"> + " class="frm_input" size="30"> diff --git a/css/admin.css b/css/admin.css index d06d8fad8..9cd4709b3 100644 --- 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} /* ########## 쇼핑몰 사용시 적용 ########## */