diff --git a/adm/admin.menu400.shop_1of2.php b/adm/admin.menu400.shop_1of2.php index 08239cf7f..098d45c20 100644 --- a/adm/admin.menu400.shop_1of2.php +++ b/adm/admin.menu400.shop_1of2.php @@ -17,7 +17,6 @@ $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('400750', '추가배송비관리', G5_ADMIN_URL.'/shop_admin/sendcostlist.php', 'scf_sendcost', 1) ); ?> \ No newline at end of file diff --git a/adm/shop_admin/categorylist.php b/adm/shop_admin/categorylist.php index 5e286781c..d4c8d891c 100644 --- a/adm/shop_admin/categorylist.php +++ b/adm/shop_admin/categorylist.php @@ -184,22 +184,12 @@ $listall = '전체목록">판매 - > - - - + > + - > - - - + > + diff --git a/adm/shop_admin/categorylistupdate.php b/adm/shop_admin/categorylistupdate.php index 00278f96b..e2f9f0c68 100644 --- a/adm/shop_admin/categorylistupdate.php +++ b/adm/shop_admin/categorylistupdate.php @@ -21,12 +21,12 @@ for ($i=0; $i - -
- - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- -
- -
- -
- - -
- - > - -
-
- -
- - 목록 -
- -
- - diff --git a/adm/shop_admin/deliverycodeformupdate.php b/adm/shop_admin/deliverycodeformupdate.php deleted file mode 100644 index e0f44e3f4..000000000 --- a/adm/shop_admin/deliverycodeformupdate.php +++ /dev/null @@ -1,46 +0,0 @@ - diff --git a/adm/shop_admin/deliverycodelist.php b/adm/shop_admin/deliverycodelist.php deleted file mode 100644 index b82c541b8..000000000 --- a/adm/shop_admin/deliverycodelist.php +++ /dev/null @@ -1,67 +0,0 @@ - - -
- 개 업체 등록됨 -
- -
- 배송회사추가 -
- -
- - - - - - - - - - - - - - - - - - - - - - - '; - ?> - -
목록
ID배송회사명고객센터기본 배송지순서관리
- 사이트 - 수정 - 삭제 -
자료가 없습니다.
-
- - diff --git a/adm/shop_admin/img/escrow_bg.png b/adm/shop_admin/img/escrow_bg.png new file mode 100644 index 000000000..1941edfd8 Binary files /dev/null and b/adm/shop_admin/img/escrow_bg.png differ diff --git a/adm/shop_admin/img/escrow_bg2.png b/adm/shop_admin/img/escrow_bg2.png new file mode 100644 index 000000000..b06a50a11 Binary files /dev/null and b/adm/shop_admin/img/escrow_bg2.png differ diff --git a/adm/shop_admin/img/qnb_sit.jpg b/adm/shop_admin/img/qnb_sit.jpg deleted file mode 100644 index ede80d2bb..000000000 Binary files a/adm/shop_admin/img/qnb_sit.jpg and /dev/null differ diff --git a/adm/shop_admin/img/qnb_sodr.jpg b/adm/shop_admin/img/qnb_sodr.jpg deleted file mode 100644 index a6155e8f0..000000000 Binary files a/adm/shop_admin/img/qnb_sodr.jpg and /dev/null differ diff --git a/adm/shop_admin/img/qnb_sps.jpg b/adm/shop_admin/img/qnb_sps.jpg deleted file mode 100644 index 42926895a..000000000 Binary files a/adm/shop_admin/img/qnb_sps.jpg and /dev/null differ diff --git a/adm/shop_admin/img/qnb_sqna.jpg b/adm/shop_admin/img/qnb_sqna.jpg deleted file mode 100644 index f38f6fbbe..000000000 Binary files a/adm/shop_admin/img/qnb_sqna.jpg and /dev/null differ diff --git a/adm/shop_admin/img/tnb_shome.jpg b/adm/shop_admin/img/tnb_shome.jpg deleted file mode 100644 index ea8db8bbc..000000000 Binary files a/adm/shop_admin/img/tnb_shome.jpg and /dev/null differ diff --git a/adm/shop_admin/img/tnb_shome_cf.jpg b/adm/shop_admin/img/tnb_shome_cf.jpg deleted file mode 100644 index 5f6af01c4..000000000 Binary files a/adm/shop_admin/img/tnb_shome_cf.jpg and /dev/null differ diff --git a/adm/shop_admin/orderlist.php b/adm/shop_admin/orderlist.php index b989ecedd..b39314c4a 100644 --- a/adm/shop_admin/orderlist.php +++ b/adm/shop_admin/orderlist.php @@ -360,10 +360,6 @@ $listall = '전체목록 - - @@ -430,9 +426,9 @@ $listall = '전체목록 -
+

- <에스크로>주문의 경우 리스트의 배경색이 다르게 표시됩니다.
+ <에스크로>주문의 경우 리스트의 배경색이 다르게 표시됩니다. or
<무통장>인 경우에만 <주문>에서 <입금>으로 변경됩니다. 가상계좌는 입금시 자동으로 <입금>처리됩니다.
<준비>에서 <배송>으로 변경시 <에스크로배송등록>을 체크하시면 에스크로 주문에 한해 KCP에 배송정보가 자동 등록됩니다.
주의! 주문번호를 클릭하여 나오는 주문상세내역의 주소를 외부에서 조회가 가능한곳에 올리지 마십시오. diff --git a/adm/shop_admin/ordersms.inc.php b/adm/shop_admin/ordersms.inc.php index be2ca432c..eb4168a73 100644 --- a/adm/shop_admin/ordersms.inc.php +++ b/adm/shop_admin/ordersms.inc.php @@ -25,13 +25,11 @@ if ($config['cf_sms_use']) { if ($od_sms_baesong_check) { - if ($dl_id && $od_invoice) + if ($od_delivery_company && $od_invoice) { $sms_contents = $default['de_sms_cont5']; $sms_contents = preg_replace("/{이름}/", $od_name, $sms_contents); - $sql = " select dl_company from {$g5['g5_shop_delivery_table']} where dl_id = '$dl_id' "; - $row = sql_fetch($sql); - $sms_contents = preg_replace("/{택배회사}/", $row['dl_company'], $sms_contents); + $sms_contents = preg_replace("/{택배회사}/", $od_delivery_company, $sms_contents); $sms_contents = preg_replace("/{운송장번호}/", $od_invoice, $sms_contents); $sms_contents = preg_replace("/{주문번호}/", $od_id, $sms_contents); $sms_contents = preg_replace("/{회사명}/", $default['de_admin_company_name'], $sms_contents); diff --git a/css/default.css b/css/default.css index b2aabf730..0db058f46 100644 --- a/css/default.css +++ b/css/default.css @@ -12,6 +12,7 @@ article, aside, details, figcaption, figure, footer, header, hgroup, menu, nav, legend {position:absolute;font-size:0;line-height:0;text-indent:-9999em;overflow:hidden} label, input, select, img {vertical-align:middle} input, button {margin:0;padding:0;font-family:dotum;font-size:1em} +button {cursor:pointer} textarea, select {font-family:dotum;font-size:1em} p {margin:0;padding:10px 0;line-height:1.7em;word-break:break-all} diff --git a/css/default_shop.css b/css/default_shop.css index 4cc58778b..5903d5e67 100644 --- a/css/default_shop.css +++ b/css/default_shop.css @@ -37,7 +37,7 @@ a:hover, a:focus, a:active {color:#000;text-decoration:underline} /* ckeditor 단축키 */ .cke_sc {margin:0 0 5px;text-align:right} .btn_cke_sc{display:inline-block;padding:0 10px;height:23px;border:1px solid #ccc !important;background:#fafafa !important;color:#000 !important;text-decoration:none !important;line-height:1.9em;vertical-align:middle} -.cke_sc_def {margin:0 0 5px;padding:10px;border:1px solid #ccc;background:#f5f6fa;text-align:center} +.cke_sc_def {margin:0 0 5px;padding:10px;border:1px solid #ccc;background:#f2f5f9;text-align:center} .cke_sc_def dl {margin:0 0 5px;text-align:left;zoom:1} .cke_sc_def dl:after {display:block;visibility:hidden;clear:both;content:""} .cke_sc_def dt, .cke_sc_def dd {float:left;margin:0;padding:5px 0;border-bottom:1px solid #e9e9e9} @@ -54,7 +54,7 @@ a:hover, a:focus, a:active {color:#000;text-decoration:underline} .hd_pops_footer {position:absolute;bottom:0;left:0;padding:10px 0;width:100%;background:#000;color:#fff;text-align:right} .hd_pops_footer button {margin-right:5px;padding:5px 10px;border:0;background:#393939;color:#fff} -#hd_nb {border-bottom:1px solid #e9e9e9;background:#f5f6fa;zoom:1} +#hd_nb {border-bottom:1px solid #e9e9e9;background:#f2f5f9;zoom:1} #hd_nb:after {display:block;visibility:hidden;clear:both;content:""} #hd_nb h2 {position:absolute;font-size:0;line-height:0;overflow:hidden} #hd_nb ul {margin:0 auto;width:110px} @@ -65,23 +65,22 @@ a:hover, a:focus, a:active {color:#000;text-decoration:underline} #hd_aside {border-top:1px solid #e9e9e9;border-bottom:1px solid #e9e9e9} #hd_aside h2 {position:absolute;font-size:0;line-height:0;overflow:hidden} -#hd_aside div {position:relative;margin:0 auto;width:998px;border-right:1px solid #e9e9e9;border-left:1px solid #e9e9e9;background:#f5f6fa;zoom:1} +#hd_aside div {position:relative;margin:0 auto;width:998px;border-right:1px solid #e9e9e9;border-left:1px solid #e9e9e9;background:#f2f5f9;zoom:1} #hd_aside div:after {display:block;visibility:hidden;clear:both;content:""} #sch_all {float:left;background:#fff} #sch_all h3 {position:absolute;font-size:0;line-height:0;overflow:hidden} -#sch_all span {display:inline-block;position:relative;padding:0 10px;height:38px;border-right:1px solid #e9e9e9;vertical-align:middle;line-height:3em} +#sch_all span {display:inline-block;position:relative;padding:0 10px;height:30px;border-right:1px solid #e9e9e9;vertical-align:middle;line-height:2.4em} #sch_all select {position:static !important;position:relative;margin:0 !important;margin:7px 0 0} -#sch_all_str {width:110px;height:36px;border:0;line-height:2.8em} -#sch_all_submit {padding:0 10px;height:38px;border:0;background:#626870;color:#fff} +#sch_all_str {width:110px;height:28px;border:0;line-height:2.8em} +#sch_all_submit {padding:0 10px;height:30px;border:0;background:#626870;color:#fff;cursor:pointer} #hd_aside_mb {float:right;background:#fff;zoom:1} #hd_aside_mb:after {display:block;visibility:hidden;clear:both;content:""} #hd_aside_mb h3 {position:absolute;font-size:0;line-height:0;overflow:hidden} #hd_aside_mb li {float:left;border-left:1px solid #e9e9e9} -#hd_aside_mb a {display:inline-block;padding:0 15px;height:38px;font-weight:bold;text-decoration:none;line-height:3.4em !important;line-height:3em} -#hd_aside_mb a:focus, -#hd_aside_mb a:hover {background:#626870;color:#fff} +#hd_aside_mb a {display:inline-block;padding:0 10px;height:30px;text-decoration:none;line-height:2.7em} +#hd_aside_mb a:focus, #hd_aside_mb a:hover {background:#626870;color:#fff} /* 중간 레이아웃 */ #wrapper {z-index:5;margin:30px auto;width:1000px;zoom:1} @@ -91,7 +90,7 @@ a:hover, a:focus, a:active {color:#000;text-decoration:underline} /* 오늘 본 상품 */ #stv {z-index:1001;float:right;position:relative;width:88px} #stv_list {position:fixed !important;position:absolute;width:88px;border:1px solid #e9e9e9;background:#fff} -#stv_list h2 {padding:10px 0 8px;background:#f5f6fa;text-align:center;letter-spacing:-0.1em} +#stv_list h2 {padding:10px 0 8px;background:#f2f5f9;text-align:center;letter-spacing:-0.1em} #stv_pg {display:block;margin:5px 0 0} #stv_list p {padding:20px 0;text-align:center} #stv_btn {text-align:center;zoom:1} @@ -101,7 +100,7 @@ a:hover, a:focus, a:active {color:#000;text-decoration:underline} .stv_item {display:none;text-align:center} .stv_item img {margin:5px 0} -#stv_nb {margin:0;padding:0;border-top:1px solid #e9e9e9;background:#f5f6fa;list-style:none} +#stv_nb {margin:0;padding:0;border-top:1px solid #e9e9e9;background:#f2f5f9;list-style:none} #stv_nb li {text-align:center} #stv_nb a {display:block} @@ -109,7 +108,7 @@ a:hover, a:focus, a:active {color:#000;text-decoration:underline} #aside {float:left;margin:0 10px 0 0;width:150px} /* aside:gnb */ -#gnb {margin:0 0 5px;padding:0 0 10px;border:1px solid #d5d5d5;background:#f5f6fa} +#gnb {margin:0 0 5px;padding:0 0 10px;border:1px solid #d5d5d5;background:#f2f5f9} #gnb h2 {position:absolute;font-size:0;line-height:0;overflow:hidden} .gnb_1dul {margin:0;border:0;background:#fff;list-style:none} .gnb_1dli {position:relative;background:url('../shop/img/gnb_bg.gif') top right repeat-x} @@ -120,7 +119,7 @@ a:hover, a:focus, a:active {color:#000;text-decoration:underline} .gnb_1dli_over .gnb_2dul, .gnb_1dli_over2 .gnb_2dul {display:block;top:0;left:127px;width:130px;background:#fff} .gnb_2da {display:none} .gnb_1dli_over .gnb_2da {display:block;padding:0 10px;height:33px;border-bottom:1px solid #e9e9e9;line-height:2.9em !important;line-height:2.6em} -.gnb_2da:focus, .gnb_2da:hover {background:#f5f6fa;text-decoration:none} +.gnb_2da:focus, .gnb_2da:hover {background:#f2f5f9;text-decoration:none} /* aside:이벤트 링크 */ #sev {margin:0 0 5px;padding:0 0 10px;border:1px solid #ecc9d6;background:#fff8fb} @@ -133,7 +132,7 @@ a:hover, a:focus, a:active {color:#000;text-decoration:underline} #sev_empty {padding:15px 0;text-align:center} /* aside:커뮤니티 링크 */ -#scomm {margin:0 0 5px;padding:0 0 10px;border:1px solid #d5d5d5;background:#f5f6fa} +#scomm {margin:0 0 5px;padding:0 0 10px;border:1px solid #d5d5d5;background:#f2f5f9} #scomm h2 {position:absolute;font-size:0;line-height:0;overflow:hidden} #scomm ul {margin:0;padding:0;border:0;background:#fff;list-style:none} #scomm a {display:block;padding:7px 10px 6px;border-bottom:1px solid #f4f4f4;text-decoration:none} @@ -147,7 +146,7 @@ a:hover, a:focus, a:active {color:#000;text-decoration:underline} #sbn_aside li {margin:0 0 1px} /* aside:장바구니 */ -#sbsk {margin:0 0 5px;padding:0 0 10px;border:1px solid #d5d5d5;background:#f5f6fa} +#sbsk {margin:0 0 5px;padding:0 0 10px;border:1px solid #d5d5d5;background:#f2f5f9} #sbsk h2 {position:absolute;font-size:0;line-height:0;overflow:hidden} #sbsk ul {margin:0;padding:0;border:0;background:#fff;list-style:none} #sbsk a {display:block;padding:7px 10px 6px;border-bottom:1px solid #f4f4f4;text-decoration:none} @@ -155,7 +154,7 @@ a:hover, a:focus, a:active {color:#000;text-decoration:underline} #sbsk_empty {padding:15px 0;text-align:center} /* aside:위시리스트 */ -#swish {margin:0 0 5px;padding:0 0 10px;border:1px solid #d5d5d5;background:#f5f6fa} +#swish {margin:0 0 5px;padding:0 0 10px;border:1px solid #d5d5d5;background:#f2f5f9} #swish h2 {position:absolute;font-size:0;line-height:0;overflow:hidden} #swish ul {margin:0;padding:0;border:0;background:#fff;list-style:none} #swish a {display:block;padding:7px 10px 6px;border-bottom:1px solid #f4f4f4;text-decoration:none} @@ -205,7 +204,7 @@ a:hover, a:focus, a:active {color:#000;text-decoration:underline} .sanchor {margin:0 0 10px;padding:0;zoom:1} .sanchor:after {display:block;visibility:hidden;clear:both;content:""} .sanchor li {float:left;margin-left:-1px;list-style:none} -.sanchor a {display:inline-block;border:1px solid #e9e9e9;background:#f5f6fa;padding:0 7px;height:30px;text-decoration:none;line-height:2.6em} +.sanchor a {display:inline-block;border:1px solid #e9e9e9;background:#f2f5f9;padding:0 7px;height:30px;text-decoration:none;line-height:2.6em} .sanchor a:focus, .sanchor a:hover {background:#626870;color:#fff;text-decoration:none} .sanchor a.sanchor_on {background:#626870;color:#fff !important;text-decoration:none} @@ -226,7 +225,7 @@ fieldset .btn_submit {height:22px;font-size:1em} button.btn_cancel {display:inline-block;padding:0 10px;height:22px;border:1px solid #ccc;background:#fafafa;line-height:1.9em} .btn_cancel:focus, .btn_cancel:hover {text-decoration:none !important} .btn_frmline {display:inline-block;padding:0 7px 0 5px;height:22px;border:0;background:#333;color:#fff !important;letter-spacing:-0.1em;text-decoration:none;vertical-align:middle;line-height:2em} /* 우편번호검색버튼 등 */ -.btn_frmline2 {display:inline-block;padding:0 7px 0 5px;height:20px;border:1px solid #e9e9e9;background:#f5f6fa;color:#ff3061 !important;letter-spacing:-0.1em;text-decoration:none;vertical-align:middle;line-height:1.7em} +.btn_frmline2 {display:inline-block;padding:0 7px 0 5px;height:20px;border:1px solid #e9e9e9;background:#f2f5f9;color:#ff3061 !important;letter-spacing:-0.1em;text-decoration:none;vertical-align:middle;line-height:1.7em} button.btn_frmline {font-size:1em;cursor:pointer} button.btn_frmline2 {font-size:1em;cursor:pointer} .btn_win {clear:both;margin-bottom:20px;text-align:center} /* 새창용 */ @@ -357,7 +356,7 @@ fieldset .frm_input {padding:2px 2px 3px;border:1px solid #b8c9c2;background:#f7 .sct_admin {margin:0 0 10px;text-align:right} /* 상품 목록 현재 위치 */ -#sct_location {margin:0 0 10px;border:1px solid #e9e9e9;background:#f5f6fa;letter-spacing:-4px} +#sct_location {margin:0 0 10px;border:1px solid #e9e9e9;background:#f2f5f9;letter-spacing:-4px} #sct_location a {display:inline-block;padding:10px 10px 8px;text-decoration:none;letter-spacing:0 !important} .sct_here {font-weight:bold} .sct_bg {padding-right:15px !important;background:url('../shop/img/sct_bg_toright.gif') right 11px no-repeat} @@ -405,7 +404,7 @@ fieldset .frm_input {padding:2px 2px 3px;border:1px solid #b8c9c2;background:#f7 .sit_empty {padding:20px 0;text-align:center} /* 상품 상세보기 - 개요 */ -#sit_ov_wrap {margin:0 0 20px;border-bottom:1px solid #e9e9e9;background:#f5f6fa;zoom:1} +#sit_ov_wrap {margin:0 0 20px;border-bottom:1px solid #e9e9e9;background:#f2f5f9;zoom:1} #sit_ov_wrap:after {display:block;visibility:hidden;clear:both;content:""} /* 상품 상세보기 - 이미지 미리보기 */ @@ -486,8 +485,8 @@ fieldset .frm_input {padding:2px 2px 3px;border:1px solid #b8c9c2;background:#f7 #sit_inf_explan img {max-width:100%;height:auto} #sit_inf_open {width:100%;border:0;border-collapse:collapse} -#sit_inf_open th {padding:7px 10px;border:1px solid #fff;background:#f5f6fa;vertical-align:top;text-align:left} -#sit_inf_open td {padding:7px 10px;border:1px solid #fff;background:#f5f6fa;vertical-align:top} +#sit_inf_open th {padding:7px 10px;border:1px solid #fff;background:#f2f5f9;vertical-align:top;text-align:left} +#sit_inf_open td {padding:7px 10px;border:1px solid #fff;background:#f2f5f9;vertical-align:top} /* 상품 상세보기 - 사용후기 */ #sit_use {margin:0 0 10px;padding:10px 10px 20px;border-bottom:1px solid #e9e9e9} @@ -495,7 +494,7 @@ fieldset .frm_input {padding:2px 2px 3px;border:1px solid #b8c9c2;background:#f7 #sit_use h3 {margin:0 0 10px} #sit_use_ol {margin:0 0 5px;padding:0;border-top:1px solid #e9e9e9;list-style:none} -.sit_use_li {position:relative;padding:0 0 10px;border-bottom:1px solid #e9e9e9;background:#f5f6fa} +.sit_use_li {position:relative;padding:0 0 10px;border-bottom:1px solid #e9e9e9;background:#f2f5f9} .sit_use_li_title {display:block;margin:0;padding:10px;width:100%;border:0;background:transparent;text-align:left;cursor:pointer} .sit_use_dl {margin:0;padding:0 10px;zoom:1} @@ -523,7 +522,7 @@ fieldset .frm_input {padding:2px 2px 3px;border:1px solid #b8c9c2;background:#f7 #sit_qa h3 {margin:0 0 10px} #sit_qa_ol {margin:0 0 5px;padding:0;border-top:1px solid #e9e9e9;list-style:none} -.sit_qa_li {position:relative;padding:0 0 10px;border-bottom:1px solid #e9e9e9;background:#f5f6fa} +.sit_qa_li {position:relative;padding:0 0 10px;border-bottom:1px solid #e9e9e9;background:#f2f5f9} .sit_qa_li_title {display:block;margin:0;padding:10px;width:100%;border:0;background:transparent;text-align:left;cursor:pointer} .sit_qa_dl {margin:0;padding:0 10px;zoom:1} @@ -573,7 +572,7 @@ fieldset .frm_input {padding:2px 2px 3px;border:1px solid #b8c9c2;background:#f7 #sps li:after {display:block;visibility:hidden;clear:both;content:""} .sps_img {float:left;margin:0 10px 0 0;width:80px} -.sps_img span {position:absolute;font-size:0;line-height:0} +.sps_img span {position:absolute;font-size:0;line-height:0;overflow:hidden} #sps dl {margin:5px 0 10px;zoom:1} #sps dl:after {display:block;visibility:hidden;clear:both;content:""} @@ -622,7 +621,7 @@ fieldset .frm_input {padding:2px 2px 3px;border:1px solid #b8c9c2;background:#f7 #smb_my_act:after {display:block;visibility:hidden;clear:both;content:""} #smb_my_act ul {float:right;margin:0;padding:0;list-style:none} #smb_my_act li {float:left;margin:0 0 0 4px} -#smb_my_ov dl {margin:0;border:1px solid #e9e9e9;background:#f5f6fa;zoom:1} +#smb_my_ov dl {margin:0;border:1px solid #e9e9e9;background:#f2f5f9;zoom:1} #smb_my_ov dl:after {display:block;visibility:hidden;clear:both;content:''} #smb_my_ov dt {float:left;padding:7px 10px;width:100px;border-bottom:1px solid #e9e9e9;font-weight:bold} #smb_my_ov dd {float:left;margin:0;padding:7px 10px;width:220px;border-bottom:1px solid #e9e9e9} @@ -641,15 +640,15 @@ fieldset .frm_input {padding:2px 2px 3px;border:1px solid #b8c9c2;background:#f7 /* 장바구니 */ #sod_bsk {} .sod_bsk_img {width:90px;text-align:center} -.sod_bsk_itopt {margin:5px 0;border:1px solid #e9e9e9;border-bottom:0;background:#f5f6fa} +.sod_bsk_itopt {margin:5px 0;border:1px solid #e9e9e9;border-bottom:0;background:#f2f5f9} .sod_bsk_itopt ul {margin:0;padding:0;list-style:none} .sod_bsk_itopt li {padding:3px;border-bottom:1px solid #e9e9e9} .sod_option_btn .mod_options {margin:0;padding:3px 0;width:100%;border:0;background:#333;color:#fff;cursor:pointer} #sod_bsk_list {position:relative} -#sod_bsk_list #mod_option_frm {z-index:10000;position:absolute;top:0;left:99px;padding:20px;width:500px;height:auto !important;height:500px;max-height:500px;border:1px solid #000;background:#f5f6fa;overflow-y:scroll;overflow-x:none} +#sod_bsk_list #mod_option_frm {z-index:10000;position:absolute;top:0;left:99px;padding:20px;width:500px;height:auto !important;height:500px;max-height:500px;border:1px solid #000;background:#f2f5f9;overflow-y:scroll;overflow-x:none} -#sod_bsk_tot {margin:0;padding:10px;border:1px solid #e9e9e9;background:#f5f6fa;zoom:1} +#sod_bsk_tot {margin:0;padding:10px;border:1px solid #e9e9e9;background:#f2f5f9;zoom:1} #sod_bsk_tot:after {display:block;visibility:hidden;clear:both;content:""} #sod_bsk_tot dt, #sod_bsk_tot dd {float:left;padding:12px 0;border-bottom:1px solid #e9e9e9} #sod_bsk_tot dt {padding-left:2%;width:48%;font-weight:bold} @@ -673,7 +672,7 @@ fieldset .frm_input {padding:2px 2px 3px;border:1px solid #b8c9c2;background:#f7 #display_setup_message strong {display:block;margin:0 0 10px} #sod_list {position:relative} -#sod_list #it_coupon_frm {z-index:10000;position:absolute;top:0;left:99px;padding:20px;width:500px;height:auto !important;height:500px;max-height:500px;border:1px solid #000;background:#f5f6fa;overflow-y:scroll;overflow-x:none} +#sod_list #it_coupon_frm {z-index:10000;position:absolute;top:0;left:99px;padding:20px;width:500px;height:auto !important;height:500px;max-height:500px;border:1px solid #000;background:#f2f5f9;overflow-y:scroll;overflow-x:none} #sod_frm_orderer {margin:20px 0 40px} @@ -689,9 +688,9 @@ fieldset .frm_input {padding:2px 2px 3px;border:1px solid #b8c9c2;background:#f7 #sod_frm_pay .basic_tbl th {width:auto !important;font-weight:bold;text-align:center !important} #sod_frm_pay .basic_tbl td {padding:8px 5px 6px !important;border-top:1px solid #e9e9e9 !important;border-bottom:1px solid #e9e9e9 !important;line-height:1.5em !important;word-break:break-all !important} -#sod_frm_pay #sc_coupon_frm, #sod_frm_pay #od_coupon_frm {z-index:10000;position:absolute;top:0;left:99px;padding:20px;width:500px;height:auto !important;height:500px;max-height:500px;border:1px solid #000;background:#f5f6fa;overflow-y:scroll} +#sod_frm_pay #sc_coupon_frm, #sod_frm_pay #od_coupon_frm {z-index:10000;position:absolute;top:0;left:99px;padding:20px;width:500px;height:auto !important;height:500px;max-height:500px;border:1px solid #000;background:#f2f5f9;overflow-y:scroll} -#sod_frm_paysel {margin:0 0 20px;padding:10px;border:1px solid #e9e9e9;background:#f5f6fa;text-align:center} +#sod_frm_paysel {margin:0 0 20px;padding:10px;border:1px solid #e9e9e9;background:#f2f5f9;text-align:center} #sod_frm_paysel legend {position:absolute;font-size:0;line-height:0;overflow:hidden} #settle_bank {margin:10px 0 0} @@ -703,7 +702,11 @@ fieldset .frm_input {padding:2px 2px 3px;border:1px solid #b8c9c2;background:#f7 /* 주문상세내역 */ #sod_fin {} -#sod_fin_legend {padding:7px 5px 0;border:1px solid #e9e9e9;zoom:1} + +#sod_sts_wrap {margin:0 0 10px;text-align:right} +#sod_sts_explan {display:none} + +#sod_fin_legend {padding:7px 5px 0;border:1px solid #e9e9e9;text-align:left;zoom:1} #sod_fin_legend:after {display:block;visibility:hidden;clear:both;content:''} #sod_fin_legend dt {clear:both;float:left;margin:0 0 5px;width:50px;font-weight:bold} #sod_fin_legend dd {float:left;margin:0} @@ -719,7 +722,7 @@ fieldset .frm_input {padding:2px 2px 3px;border:1px solid #b8c9c2;background:#f7 #sod_ul p a {font-weight:bold;text-decoration:none} #request_form {position:relative} -#request_form div {display:none;z-index:10000;position:absolute;top:23px;left:0;padding:20px 0;width:520px;border:1px solid #000;background:#f5f6fa;text-align:center} +#request_form div {display:none;z-index:10000;position:absolute;top:23px;left:0;padding:20px 0;width:520px;border:1px solid #000;background:#f2f5f9;text-align:center} #request_form .frm_input {width:300px;background:#fff !important} #request_form .btn_frmline, #request_form .btn_cancel {vertical-align:middle !important} #request_form .btn_frmline {padding:0 10px;line-height:1.6em} @@ -728,7 +731,7 @@ fieldset .frm_input {padding:2px 2px 3px;border:1px solid #b8c9c2;background:#f7 #sod_req_btn button {background:#626870} #sod_req_log {margin:0 0 20px} -#sod_req_log ul {margin:0;padding:0;border-top:1px solid #e9e9e9;background:#f5f6fa;list-style:none} +#sod_req_log ul {margin:0;padding:0;border-top:1px solid #e9e9e9;background:#f2f5f9;list-style:none} #sod_req_log li {padding:10px 10px 20px;border:1px solid #e9e9e9;border-top:0} #sod_req_log h3 {margin:20px 0 10px} .sod_req_log_view table {margin:0} @@ -743,7 +746,7 @@ fieldset .frm_input {padding:2px 2px 3px;border:1px solid #b8c9c2;background:#f7 #sod_fin_view {border:1px solid #e9e9e9} #sod_fin_view h2 {position:absolute;font-size:0;line-height:0;overflow:hidden} #sod_fin_view h3 {margin:0 0 10px} -#sod_fin_view .basic_tbl th {padding:0 10px;border-top:1px solid #eee;border-bottom:1px solid #eee;background:#f5f6fa;text-align:left} +#sod_fin_view .basic_tbl th {padding:0 10px;border-top:1px solid #eee;border-bottom:1px solid #eee;background:#f2f5f9;text-align:left} #sod_fin_pay {padding:10px;border-bottom:1px solid #e9e9e9} @@ -771,7 +774,7 @@ fieldset .frm_input {padding:2px 2px 3px;border:1px solid #b8c9c2;background:#f7 #scash {} #scash section {padding:10px 0} #scash h2 {margin:0 0 10px;text-align:center} -#scash .basic_tbl th {padding:0 10px;border-top:1px solid #eee;border-bottom:1px solid #eee;background:#f5f6fa;text-align:left} +#scash .basic_tbl th {padding:0 10px;border-top:1px solid #eee;border-bottom:1px solid #eee;background:#f2f5f9;text-align:left} #scash_apply {padding:10px 0 20px;text-align:center} #scash_apply button {padding:10px;border:0;background:#565e60;color:#fff} #scash_copy {text-align:center} @@ -799,26 +802,29 @@ fieldset .frm_input {padding:2px 2px 3px;border:1px solid #b8c9c2;background:#f7 .sfaq_admin {text-align:right} #sfaq_wrap ol {margin:0;padding:0;list-style:none} #sfaq_list {margin:0 0 10px;border:1px solid #ccc} -#sfaq_list li {border-bottom:1px solid #fff;background:#f5f6fa} +#sfaq_list li {border-bottom:1px solid #fff;background:#f2f5f9} #sfaq_list a {display:block;padding:10px;font-weight:bold;text-decoration:none} #sfaq_list a:focus, #sfaq_list a:hover {background:#626870;color:#fff} #sfaq_con {border:1px solid #e9e9e9;border-top:0} #sfaq_con li {padding:0 0 10px} -#sfaq_con h3 {padding:10px;background:#f5f6fa;border-top:1px solid #e9e9e9} +#sfaq_con h3 {padding:10px;background:#f2f5f9;border-top:1px solid #e9e9e9} #sfaq_con p {padding:10px} .sfaq_tolist {padding:0 10px;text-align:right} .sfaq_img {text-align:center} /* 상품검색 */ -#ssch_ov {margin:0 0 10px;padding:15px 0;border:1px solid #e9e9e9;background:#f5f6fa;text-align:center} -#ssch caption {padding:0 0 5px;font-size:1em;font-weight:bold;text-align:left;line-height:1.5em} -.ssch_it_img {width:100px;text-align:center} -.ssch_it_img img {width:100px;height:100px} -#ssch .ssch_num {width:150px;text-align:right} - -#ssch .sit_icon {display:inline-block;margin:0 0 0 5px} -#ssch .sit_icon img {margin:0 1px 0 0} +#ssch_frm {padding:20px;border:1px solid #e9e9e9;background:#f2f5f9;zoom:1} +#ssch_frm:after {display:block;visibility:hidden;clear:both;content:""} +#ssch_frm div {margin:0 0 5px} +#ssch_frm strong {display:inline-block;width:100px} +#ssch_frm .frm_input {background:#fff} +#ssch_frm .btn_submit {height:21px} +#ssch_frm p {margin:10px 0 0;border-top:1px solid #e9e9e9} +#ssch_frm #ssch_sort {float:left;margin:0;padding:0;list-style:none;zoom:1} +#ssch_frm #ssch_sort:after {display:block;visibility:hidden;clear:both;content:""} +#ssch_frm #ssch_sort li {float:left;margin:0 1px 0 0} +#ssch_frm #ssch_ov {float:right} /* 쇼핑몰 이벤트 */ #sev {} diff --git a/css/mobile_shop.css b/css/mobile_shop.css index f09fcb0bd..cf97f9f65 100644 --- a/css/mobile_shop.css +++ b/css/mobile_shop.css @@ -30,7 +30,7 @@ a:hover, a:focus, a:active {color:#000;text-decoration:underline} #hd_sch_open {position:absolute;top:10px;right:10px;padding:0 10px;height:2.6em;border:0;background:#333;color:#fff;font-size:1em;letter-spacing:-0.1em;vertical-align:top;-webkit-appearance:none} -#hd_sch {display:none;z-index:10;position:absolute;top:0;left:0;padding:22px 0;width:100%;background:#f5f6fa;text-align:center} +#hd_sch {display:none;z-index:10;position:absolute;top:0;left:0;padding:22px 0;width:100%;background:#f2f5f9;text-align:center} #hd_sch h2 {margin:0 0 10px} #hd_sch .frm_input {height:2.5em;border-color:#999;background:#fff;line-height:2.5em} #hd_sch .pop_close {position:absolute;bottom:5px;right:5px;border:0;background:transparent} @@ -73,7 +73,7 @@ a.sanchor_on {background:#626870;color:#fff !important;text-decoration:none} .sct_admin {margin:0 0 10px;text-align:right} /* 상품 목록 현재 위치 */ -#sct_location {border:1px solid #e9e9e9;background:#f5f6fa;letter-spacing:-4px} +#sct_location {border:1px solid #e9e9e9;background:#f2f5f9;letter-spacing:-4px} #sct_location a {display:inline-block;padding:5px 10px;text-decoration:none;letter-spacing:0 !important} .sct_here {font-weight:bold} .sct_bg {padding-right:13px !important;background:url('../shop/img/sct_bg_toright.gif') right 8px no-repeat} @@ -126,7 +126,7 @@ a.sanchor_on {background:#626870;color:#fff !important;text-decoration:none} #sit_pvi_prev {position:absolute;top:0;left:0} #sit_pvi_next {position:absolute;top:0;right:0} -.sit_pvi_btn {display:none;z-index:10;width:2em;height:280px;border:0;background:#f5f6fa} +.sit_pvi_btn {display:none;z-index:10;width:2em;height:280px;border:0;background:#f2f5f9} #sit_pvi_slide {position:relative;margin:0 auto;padding:0;list-style:none;width:280px;height:280px;overflow-x:hidden} #sit_pvi_slide li {display:none;position:absolute;left:0;top:0} @@ -142,7 +142,7 @@ a.sanchor_on {background:#626870;color:#fff !important;text-decoration:none} #sit_pvi_nw li img {width:60px;height:60px} /* 상품 상세보기 - 간략정보 및 구매기능 */ -#sit_ov {position:relative;padding:50px 13px 13px;height:auto !important;height:355px;min-height:355px;background:#f5f6fa} +#sit_ov {position:relative;padding:50px 13px 13px;height:auto !important;height:355px;min-height:355px;background:#f2f5f9} #sit_ov h2 {position:absolute;font-size:0;text-indent:-9999em;line-height:0;overflow:hidden} #sit_ov h3 {margin:0 0 10px} @@ -207,8 +207,8 @@ a.sanchor_on {background:#626870;color:#fff !important;text-decoration:none} #sit_inf_explan img {max-width:100%;height:auto} #sit_inf_open {width:100%;border:0;border-collapse:collapse} -#sit_inf_open th {padding:0.5px 10px;border:1px solid #fff;background:#f5f6fa;text-align:left} -#sit_inf_open td {padding:0.5px 10px;border:1px solid #fff;background:#f5f6fa} +#sit_inf_open th {padding:0.5px 10px;border:1px solid #fff;background:#f2f5f9;text-align:left} +#sit_inf_open td {padding:0.5px 10px;border:1px solid #fff;background:#f2f5f9} /* 상품 상세보기 - 사용후기 */ #sit_use {margin:0 0 10px;padding:10px 10px 20px;border-bottom:1px solid #e9e9e9} @@ -216,7 +216,7 @@ a.sanchor_on {background:#626870;color:#fff !important;text-decoration:none} #sit_use h3 {margin:0 0 10px} #sit_use_ol {margin:0 0 5px;padding:0;border-top:1px solid #e9e9e9;list-style:none} -.sit_use_li {position:relative;padding:0 0 10px;border-bottom:1px solid #e9e9e9;background:#f5f6fa} +.sit_use_li {position:relative;padding:0 0 10px;border-bottom:1px solid #e9e9e9;background:#f2f5f9} .sit_use_li_title {display:block;margin:0;padding:10px;width:100%;border:0;background:transparent;text-align:left} .sit_use_dl {margin:0;padding:0 10px;zoom:1} @@ -237,7 +237,7 @@ a.sanchor_on {background:#626870;color:#fff !important;text-decoration:none} #sit_qa h3 {margin:0 0 10px} #sit_qa_ol {margin:0 0 5px;padding:0;border-top:1px solid #e9e9e9;list-style:none} -.sit_qa_li {position:relative;padding:0 0 10px;border-bottom:1px solid #e9e9e9;background:#f5f6fa} +.sit_qa_li {position:relative;padding:0 0 10px;border-bottom:1px solid #e9e9e9;background:#f2f5f9} .sit_qa_li_title {display:block;margin:0;padding:10px;width:100%;border:0;background:transparent;text-align:left} .sit_qa_dl {margin:0;padding:0 10px;zoom:1} @@ -274,24 +274,24 @@ a.sanchor_on {background:#626870;color:#fff !important;text-decoration:none} /* 사용후기 모음 */ #sps_sch {margin:0 0 10px} -#sps_sch a {display:inline-block;padding:0 8px;height:1.8em;background:#333;color:#fff;text-decoration:none;vertical-align:middle;line-height:1.8em} -#sps_sch .btn_submit {height:1.8em;vertical-align:middle;line-height:1.8em} +#sps_sch a {display:inline-block;padding:0 8px;height:23px;background:#333;color:#fff;text-decoration:none;vertical-align:middle;line-height:23px} +#sps_sch .btn_submit {height:23px;vertical-align:middle} #sps {zoom:1} #sps ol {margin:0;padding:0;border-top:1px solid #e9e9e9;list-style:none} -#sps li {position:relative;padding:10px;border-bottom:1px solid #e9e9e9} +#sps li {position:relative;padding:10px 0;border-bottom:1px solid #e9e9e9} #sps li:after {display:block;visibility:hidden;clear:both;content:""} -.sps_img {float:left;width:15%} -.sps_img span {position:absolute;font-size:0;line-height:0} +.sps_img {float:left;width:25%} +.sps_img span {position:absolute;font-size:0;line-height:0;overflow:hidden} #sps dl {margin:5px 0 10px;zoom:1} #sps dl:after {display:block;visibility:hidden;clear:both;content:""} -#sps dt {float:left} -#sps dd {float:left;margin:0 15px 0 5px} +#sps dt {float:left;margin:0 0 5px} +#sps dd {float:left;margin:0 15px 5px 5px} #sps dd img {position:relative;top:-2px} -.sps_section {float:right;width:80%} +.sps_section {float:right;width:75%} .sps_section p {padding:0;width:100%;height:1.8em;overflow:hidden} .sps_con_full {padding:0;height:auto !important} .sps_con_btn {margin:5px 0 0;text-align:right} @@ -299,24 +299,24 @@ a.sanchor_on {background:#626870;color:#fff !important;text-decoration:none} /* 상품문의 모음 */ #sqa_sch {margin:0 0 10px} -#sqa_sch a {display:inline-block;padding:0 8px;height:1.8em;background:#333;color:#fff;text-decoration:none;vertical-align:middle;line-height:1.8em} -#sqa_sch .btn_submit {height:1.8em;vertical-align:middle;line-height:1.8em} +#sqa_sch a {display:inline-block;padding:0 8px;height:2em;background:#333;color:#fff;text-decoration:none;vertical-align:middle;line-height:1.9em} +#sqa_sch .btn_submit {height:2em;vertical-align:middle} #sqa {zoom:1} #sqa ol {margin:0;padding:0;border-top:1px solid #e9e9e9;list-style:none} -#sqa li {position:relative;padding:10px;border-bottom:1px solid #e9e9e9} +#sqa li {position:relative;padding:10px 0;border-bottom:1px solid #e9e9e9} #sqa li:after {display:block;visibility:hidden;clear:both;content:""} -.sqa_img {float:left;width:15%} +.sqa_img {float:left;width:25%} .sqa_img span {position:absolute;font-size:0;line-height:0} #sqa dl {margin:5px 0 10px;zoom:1} #sqa dl:after {display:block;visibility:hidden;clear:both;content:""} -#sqa dt {float:left} -#sqa dd {float:left;margin:0 15px 0 5px} +#sqa dt {float:left;margin:0 0 5px} +#sqa dd {float:left;margin:0 15px 5px 5px} #sqa dd img {position:relative;top:-2px} -.sqa_section {float:right;width:80%} +.sqa_section {float:right;width:75%} .sqa_section .sqa_con {padding:10px;background:#f2f5f9;line-height:1.7em} .sqa_section p {padding:0;width:100%;height:1.8em;overflow:hidden} .sqa_con_full {padding:0;height:auto !important} @@ -328,7 +328,7 @@ a.sanchor_on {background:#626870;color:#fff !important;text-decoration:none} #smb_my_ov {margin:0 0 20px} #smb_my_ov h2 {position:absolute;font-size:0;text-indent:-9999em;line-height:0;overflow:hidden} -#smb_my_ov dl {margin:0;border-top:1px solid #e9e9e9;background:#f5f6fa;zoom:1} +#smb_my_ov dl {margin:0;border-top:1px solid #e9e9e9;background:#f2f5f9;zoom:1} #smb_my_ov dl:after {display:block;visibility:hidden;clear:both;content:''} #smb_my_ov dt {float:left;padding:10px;width:30%;border-bottom:1px solid #e9e9e9;font-weight:bold} #smb_my_ov dd {margin:0;padding:10px 0;border-bottom:1px solid #e9e9e9} @@ -344,16 +344,16 @@ a.sanchor_on {background:#626870;color:#fff !important;text-decoration:none} /* 장바구니 */ #sod_bsk {} .sod_bsk_img {width:100px;text-align:center} -.sod_bsk_itopt {margin:5px 0;border-top:1px dashed #e9e9e9;background:#f5f6fa} +.sod_bsk_itopt {margin:5px 0;border-top:1px dashed #e9e9e9;background:#f2f5f9} .sod_bsk_itopt ul {margin:0;padding:0;list-style:none} .sod_bsk_itopt li {margin:0 0 1px;padding:5px} .sod_option_btn .mod_options {margin:0 0 10px;padding:5px 0;width:100%;border:0;background:#333;color:#fff} #sod_bsk_list {position:relative} -#sod_bsk_list #mod_option_frm {z-index:10000;position:absolute;top:0;left:0;padding:20px;width:320px;height:auto !important;height:480px;max-height:480px;border:1px solid #000;background:#f5f6fa;overflow-y:scroll} +#sod_bsk_list #mod_option_frm {z-index:10000;position:absolute;top:0;left:0;padding:20px;width:320px;height:auto !important;height:480px;max-height:480px;border:1px solid #000;background:#f2f5f9;overflow-y:scroll} html.no-overflowscrolling #mod_option_frm {height:auto;max-height:10000px !important} /* overflow 미지원 기기 대응 */ -#sod_bsk_tot {margin:0;padding:10px;border:1px solid #e9e9e9;background:#f5f6fa;zoom:1} +#sod_bsk_tot {margin:0;padding:10px;border:1px solid #e9e9e9;background:#f2f5f9;zoom:1} #sod_bsk_tot:after {display:block;visibility:hidden;clear:both;content:""} #sod_bsk_tot dt, #sod_bsk_tot dd {float:left;padding:10px 0;border-bottom:1px solid #e9e9e9} #sod_bsk_tot dt {padding-left:2%;width:48%;font-weight:bold} @@ -375,7 +375,7 @@ html.no-overflowscrolling #mod_option_frm {height:auto;max-height:10000px !impor #sod_frm h2 {margin:0 0 10px} #sod_list {position:relative} -#sod_list #it_coupon_frm {z-index:10000;position:absolute;top:0;left:0;padding:20px;width:320px;height:auto !important;height:480px;max-height:480px;border:1px solid #000;background:#f5f6fa;overflow-y:scroll} +#sod_list #it_coupon_frm {z-index:10000;position:absolute;top:0;left:0;padding:20px;width:320px;height:auto !important;height:480px;max-height:480px;border:1px solid #000;background:#f2f5f9;overflow-y:scroll} html.no-overflowscrolling #it_coupon_frm {height:auto;max-height:10000px !important} /* overflow 미지원 기기 대응 */ #sod_frm_orderer {margin:15px 0 30px} @@ -388,10 +388,10 @@ html.no-overflowscrolling #it_coupon_frm {height:auto;max-height:10000px !import #sod_frm_pay .tbl_head01 caption {font-size:0;line-height:0;overflow:hidden} #sod_frm_pay .tbl_head01 th {width:auto !important;font-weight:bold;text-align:center !important} #sod_frm_pay .tbl_head01 td {border-top:1px solid #e9e9e9 !important;border-bottom:1px solid #e9e9e9 !important;line-height:1.5em !important;word-break:break-all !important} -#sod_frm_pay #sc_coupon_frm, #sod_frm_pay #od_coupon_frm {z-index:10000;position:absolute;top:0;left:0;padding:20px;width:320px;height:auto !important;height:480px;max-height:480px;border:1px solid #000;background:#f5f6fa;overflow-y:scroll} +#sod_frm_pay #sc_coupon_frm, #sod_frm_pay #od_coupon_frm {z-index:10000;position:absolute;top:0;left:0;padding:20px;width:320px;height:auto !important;height:480px;max-height:480px;border:1px solid #000;background:#f2f5f9;overflow-y:scroll} html.no-overflowscrolling #sc_coupon_frm, html.no-overflowscrolling #od_coupon_frm {height:auto;max-height:10000px !important} /* overflow 미지원 기기 대응 */ -#sod_frm_paysel {margin:0 0 15px;padding:10px;border:1px solid #e9e9e9;background:#f5f6fa;text-align:center} +#sod_frm_paysel {margin:0 0 15px;padding:10px;border:1px solid #e9e9e9;background:#f2f5f9;text-align:center} #sod_frm_paysel legend {position:absolute;font-size:0;text-indent:-9999em;line-height:0;overflow:hidden} #sod_frm_paysel .frm_input {background:#fff} #sod_frm_paysel div {margin:5px 0 0} @@ -407,7 +407,11 @@ html.no-overflowscrolling #sc_coupon_frm, html.no-overflowscrolling #od_coupon_f /* 주문상세내역 */ #sod_fin {} -#sod_fin_legend {margin:10px;padding:5px 5px 0;border:1px solid #e9e9e9;zoom:1} + +#sod_sts_wrap {margin:0 0 10px;text-align:right} +#sod_sts_explan {display:none} + +#sod_fin_legend {margin:10px;padding:5px 5px 0;border:1px solid #e9e9e9;text-align:left;zoom:1} #sod_fin_legend:after {display:block;visibility:hidden;clear:both;content:''} #sod_fin_legend dt {clear:both;float:left;margin:0 0 5px;width:50px;font-weight:bold} #sod_fin_legend dd {float:left;margin:0} @@ -423,7 +427,7 @@ html.no-overflowscrolling #sc_coupon_frm, html.no-overflowscrolling #od_coupon_f #sod_ul p a {font-weight:bold;text-decoration:none} #request_form {position:relative} -#request_form div {display:none;z-index:10000;position:absolute;top:31px;left:0;padding:10px 0;width:290px;border:1px solid #000;background:#f5f6fa;text-align:center} +#request_form div {display:none;z-index:10000;position:absolute;top:31px;left:0;padding:10px 0;width:290px;border:1px solid #000;background:#f2f5f9;text-align:center} #request_form label {letter-spacing:-0.1em} #request_form .frm_input {width:170px;background:#fff !important} #request_form .btn_frmline, #request_form .btn_cancel {margin:5px 0 0;padding:0 5px;height:1.9em;vertical-align:middle !important;line-height:1.9em} @@ -432,7 +436,7 @@ html.no-overflowscrolling #sc_coupon_frm, html.no-overflowscrolling #od_coupon_f #sod_req_btn button {background:#626870} #sod_req_log {margin:0 0 20px} -#sod_req_log ul {margin:0;padding:0;border-top:1px solid #e9e9e9;background:#f5f6fa;list-style:none} +#sod_req_log ul {margin:0;padding:0;border-top:1px solid #e9e9e9;background:#f2f5f9;list-style:none} #sod_req_log li {padding:10px 10px 20px;border:1px solid #e9e9e9;border-top:0} #sod_req_log h3 {margin:20px 0 10px} .sod_req_log_view table {margin:0} @@ -446,7 +450,7 @@ html.no-overflowscrolling #sc_coupon_frm, html.no-overflowscrolling #od_coupon_f #sod_fin_view {border:1px solid #e9e9e9} #sod_fin_view h2 {position:absolute;font-size:0;text-indent:-9999em;line-height:0;overflow:hidden} #sod_fin_view h3 {margin:0 0 10px} -#sod_fin_view .tbl_head01 th {padding:0 10px;border-top:1px solid #eee;border-bottom:1px solid #eee;background:#f5f6fa;text-align:left} +#sod_fin_view .tbl_head01 th {padding:0 10px;border-top:1px solid #eee;border-bottom:1px solid #eee;background:#f2f5f9;text-align:left} #sod_fin_pay {padding:10px;border-bottom:1px solid #e9e9e9} @@ -474,14 +478,14 @@ html.no-overflowscrolling #sc_coupon_frm, html.no-overflowscrolling #od_coupon_f #scash {} #scash section {padding:10px 0} #scash h2 {margin:0 0 10px;text-align:center} -#scash .tbl_head01 th {padding:0 10px;border-top:1px solid #eee;border-bottom:1px solid #eee;background:#f5f6fa;text-align:left} +#scash .tbl_head01 th {padding:0 10px;border-top:1px solid #eee;border-bottom:1px solid #eee;background:#f2f5f9;text-align:left} #scash_apply {padding:10px 0 15px;text-align:center} #scash_apply button {padding:10px;border:0;background:#565e60;color:#fff} #scash_copy {text-align:center} /* 상품검색 */ #ssch{margin:0 0 20px} -#ssch_ov {padding:15px 0;border-top:1px solid #e9e9e9;border-bottom:1px solid #e9e9e9;background:#f5f6fa;text-align:center} +#ssch_ov {padding:15px 0;border-top:1px solid #e9e9e9;border-bottom:1px solid #e9e9e9;background:#f2f5f9;text-align:center} .ssch_ul {margin:0;padding:0;list-style:none} .ssch_ul li {padding:10px;min-height:100px;border-bottom:1px solid #e9e9e9} .ssch_ul .sit_icon {display:inline-block} @@ -491,7 +495,7 @@ html.no-overflowscrolling #sc_coupon_frm, html.no-overflowscrolling #od_coupon_f /* 쇼핑몰 이벤트 */ #sev {margin:0;padding:0;min-height:150px;list-style:none} #sev li {position:relative;margin:-1px 0 0;border-bottom:1px solid #e9e9e9} -#sev a {display:block;padding:10px;border:1px solid #e9e9e9;border-bottom:0;background:#f5f6fa} +#sev a {display:block;padding:10px;border:1px solid #e9e9e9;border-bottom:0;background:#f2f5f9} .sev_admin {text-align:right} /* 화면낭독기 사용자용 */ @@ -515,7 +519,7 @@ html.no-overflowscrolling #sc_coupon_frm, html.no-overflowscrolling #od_coupon_f /* ckeditor 단축키 */ .cke_sc {margin:0 0 5px;text-align:right} .btn_cke_sc{display:inline-block;padding:0 10px;height:23px;border:1px solid #ccc !important;background:#fafafa !important;color:#000 !important;text-decoration:none !important;line-height:1.9em;vertical-align:middle} -.cke_sc_def {margin:0 0 5px;padding:10px;border:1px solid #ccc;background:#f5f6fa;text-align:center} +.cke_sc_def {margin:0 0 5px;padding:10px;border:1px solid #ccc;background:#f2f5f9;text-align:center} .cke_sc_def dl {margin:0 0 5px;text-align:left;zoom:1} .cke_sc_def dl:after {display:block;visibility:hidden;clear:both;content:""} .cke_sc_def dt, .cke_sc_def dd {float:left;margin:0;padding:5px 0;border-bottom:1px solid #e9e9e9} diff --git a/extend/shop.extend2.php b/extend/shop.extend2.php index d8b5093e2..65a2e466f 100644 --- a/extend/shop.extend2.php +++ b/extend/shop.extend2.php @@ -672,4 +672,17 @@ if(!sql_query(" select de_item_use_write from {$g5['g5_shop_default_table']} ", sql_query(" ALTER TABLE `{$g5['g5_shop_default_table']}` ADD `de_item_use_write` tinyint(4) NOT NULL DEFAULT '0' AFTER `de_item_use_use` ", true); } + +// 현금영수증 필드 정리 +if(!sql_query(" select od_cash_info from {$g5['g5_shop_order_table']} limit 1", false)) { + sql_query(" ALTER TABLE `{$g5['g5_shop_order_table']}` + MODIFY `od_cash` tinyint(4) NOT NULL DEFAULT '0' AFTER `od_free_mny`, + ADD `od_cash_info` text NOT NULL AFTER `od_cash_no`, + DROP `od_cash_receipt_no`, + DROP `od_cash_app_time`, + DROP `od_cash_reg_stat`, + DROP `od_cash_reg_desc`, + DROP `od_cash_tr_code`, + DROP `od_cash_id_info` ", true); +} ?> diff --git a/install/gnuboard5shop.sql b/install/gnuboard5shop.sql index 6c600f253..4b4867ff2 100644 --- a/install/gnuboard5shop.sql +++ b/install/gnuboard5shop.sql @@ -314,22 +314,6 @@ CREATE TABLE IF NOT EXISTS `g5_shop_default` ( -- -------------------------------------------------------- --- --- Table structure for table `g5_shop_delivery` --- - -DROP TABLE IF EXISTS `g5_shop_delivery`; -CREATE TABLE IF NOT EXISTS `g5_shop_delivery` ( - `dl_id` int(11) NOT NULL AUTO_INCREMENT, - `dl_company` varchar(255) NOT NULL DEFAULT '', - `dl_url` varchar(255) NOT NULL DEFAULT '', - `dl_tel` varchar(255) NOT NULL DEFAULT '', - `dl_order` int(11) NOT NULL DEFAULT '0', - PRIMARY KEY (`dl_id`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8; - --- -------------------------------------------------------- - -- -- Table structure for table `g5_shop_event` -- @@ -618,8 +602,7 @@ CREATE TABLE IF NOT EXISTS `g5_shop_onlinecalc` ( DROP TABLE IF EXISTS `g5_shop_order`; CREATE TABLE IF NOT EXISTS `g5_shop_order` ( `od_id` bigint(20) unsigned NOT NULL, - `mb_id` varchar(255) NOT NULL DEFAULT '', - `od_pwd` varchar(255) NOT NULL DEFAULT '', + `mb_id` varchar(255) NOT NULL DEFAULT '', `od_name` varchar(20) NOT NULL DEFAULT '', `od_email` varchar(100) NOT NULL DEFAULT '', `od_tel` varchar(20) NOT NULL DEFAULT '', @@ -641,8 +624,8 @@ CREATE TABLE IF NOT EXISTS `g5_shop_order` ( `od_cart_price` int(11) NOT NULL DEFAULT '0', `od_cart_coupon` int(11) NOT NULL DEFAULT '0', `od_send_cost` int(11) NOT NULL DEFAULT '0', - `od_send_coupon` int(11) NOT NULL DEFAULT '0', `od_send_cost2` int(11) NOT NULL DEFAULT '0', + `od_send_coupon` int(11) NOT NULL DEFAULT '0', `od_receipt_price` int(11) NOT NULL DEFAULT '0', `od_cancel_price` int(11) NOT NULL DEFAULT '0', `od_receipt_point` int(11) NOT NULL DEFAULT '0', @@ -653,12 +636,10 @@ CREATE TABLE IF NOT EXISTS `g5_shop_order` ( `od_misu` int(11) NOT NULL DEFAULT '0', `od_shop_memo` text NOT NULL, `od_mod_history` text NOT NULL, - `od_status` varchar(255) NOT NULL DEFAULT '', - `dl_id` int(11) NOT NULL DEFAULT '0', - `od_invoice` varchar(255) NOT NULL DEFAULT '', - `od_invoice_time` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', + `od_status` varchar(255) NOT NULL DEFAULT '', `od_hope_date` date NOT NULL DEFAULT '0000-00-00', `od_settle_case` varchar(255) NOT NULL DEFAULT '', + `od_mobile` tinyint(4) NOT NULL DEFAULT '0', `od_tno` varchar(255) NOT NULL DEFAULT '', `od_app_no` varchar(20) NOT NULL DEFAULT '', `od_escrow` tinyint(4) NOT NULL DEFAULT '0', @@ -666,16 +647,14 @@ CREATE TABLE IF NOT EXISTS `g5_shop_order` ( `od_tax_mny` int(11) NOT NULL DEFAULT '0', `od_vat_mny` int(11) NOT NULL DEFAULT '0', `od_free_mny` int(11) NOT NULL DEFAULT '0', - `od_cash_no` varchar(255) NOT NULL, - `od_cash_receipt_no` varchar(255) NOT NULL, - `od_cash_app_time` varchar(255) NOT NULL, - `od_cash_reg_stat` varchar(255) NOT NULL, - `od_cash_reg_desc` varchar(255) NOT NULL, - `od_cash_tr_code` varchar(255) NOT NULL, - `od_cash_id_info` varchar(255) NOT NULL, + `od_delivery_company` varchar(255) NOT NULL DEFAULT '0', + `od_invoice` varchar(255) NOT NULL DEFAULT '', + `od_invoice_time` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', `od_cash` tinyint(4) NOT NULL, - `od_time` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', - `od_mobile` tinyint(4) NOT NULL DEFAULT '0', + `od_cash_no` varchar(255) NOT NULL, + `od_cash_info` text NOT NULL, + `od_time` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', + `od_pwd` varchar(255) NOT NULL DEFAULT '', `od_ip` varchar(25) NOT NULL DEFAULT '', PRIMARY KEY (`od_id`), KEY `index2` (`mb_id`) diff --git a/install/install_db.php b/install/install_db.php index 87df85cc0..ba34ba5a5 100644 --- a/install/install_db.php +++ b/install/install_db.php @@ -484,7 +484,6 @@ if($g5_shop_install) { fwrite($f, "\$g5['g5_shop_cart_table'] = G5_SHOP_TABLE_PREFIX.'cart'; // 장바구니 테이블\n"); fwrite($f, "\$g5['g5_shop_category_table'] = G5_SHOP_TABLE_PREFIX.'category'; // 상품분류 테이블\n"); fwrite($f, "\$g5['g5_shop_content_table'] = G5_SHOP_TABLE_PREFIX.'content'; // 내용(컨텐츠)정보 테이블\n"); - fwrite($f, "\$g5['g5_shop_delivery_table'] = G5_SHOP_TABLE_PREFIX.'delivery'; // 배송정보 테이블\n"); fwrite($f, "\$g5['g5_shop_event_table'] = G5_SHOP_TABLE_PREFIX.'event'; // 이벤트 테이블\n"); fwrite($f, "\$g5['g5_shop_event_item_table'] = G5_SHOP_TABLE_PREFIX.'event_item'; // 상품, 이벤트 연결 테이블\n"); fwrite($f, "\$g5['g5_shop_faq_table'] = G5_SHOP_TABLE_PREFIX.'faq'; // 자주하시는 질문 테이블\n"); diff --git a/mobile/shop/orderinquiryview.php b/mobile/shop/orderinquiryview.php index babd8f6e1..9222a361d 100644 --- a/mobile/shop/orderinquiryview.php +++ b/mobile/shop/orderinquiryview.php @@ -114,9 +114,9 @@ include_once(G5_MSHOP_PATH.'/_head.php'); ?> -

+
상품 상태 설명 - +
주문
@@ -130,7 +130,7 @@ include_once(G5_MSHOP_PATH.'/_head.php');
완료
상품 배송이 완료 되었습니다.
- +
diff --git a/mobile/skin/shop/basic/itemuselist.skin.php b/mobile/skin/shop/basic/itemuselist.skin.php index c5f521e62..d88f85c2e 100644 --- a/mobile/skin/shop/basic/itemuselist.skin.php +++ b/mobile/skin/shop/basic/itemuselist.skin.php @@ -19,9 +19,8 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가 - - +
diff --git a/shop/kcp/pp_cli_hub.php b/shop/kcp/pp_cli_hub.php index d2e8c89ee..6dd7f6b5d 100644 --- a/shop/kcp/pp_cli_hub.php +++ b/shop/kcp/pp_cli_hub.php @@ -30,6 +30,7 @@ if ($row['cnt']) { if ($default['de_card_test']) { $default['de_kcp_mid'] = 'T0000'; + $default['de_kcp_site_key'] = '3grptw1.zW0GSo4PQdaGvsF__'; } if ($default['de_kcp_mid'] == 'T0000') { @@ -52,6 +53,7 @@ if ($row['cnt']) { $g_conf_user_type = "PGNW"; // 변경 불가 //$g_conf_site_id = $default[de_kcp_mid]; // 리얼 반영시 KCP에 발급된 site_cd 사용 ex) T0000 $g_conf_site_id = strlen($default['de_kcp_mid']) == 3 ? "SR".$default['de_kcp_mid'] : $default['de_kcp_mid']; // 리얼 반영시 KCP에 발급된 site_cd 사용 ex) T0000 + $g_conf_site_key = $default['de_kcp_site_key']; /* ============================================================================== */ /* ============================================================================== */ @@ -187,7 +189,7 @@ if ($row['cnt']) { if ( strlen($tx_cd) > 0 ) { $c_PayPlus->mf_do_tx( "", $g_conf_home_dir, $g_conf_site_id, - "", $tx_cd, "", + $g_conf_site_key, $tx_cd, "", $g_conf_pa_url, $g_conf_pa_port, "payplus_cli_slib", $ordr_idxx, $cust_ip, $g_conf_log_level, "", $g_conf_tx_mode ); @@ -227,15 +229,20 @@ if ($row['cnt']) { /* = -------------------------------------------------------------------------- = */ $bSucc = ""; // DB 작업 실패일 경우 "false" 로 세팅 + // 결과값 serialize + $cash = array(); + $cash['receipt_no'] = $receipt_no; + $cash['app_time'] = $app_time; + $cash['reg_stat'] = $reg_stat; + $cash['reg_desc'] = iconv("cp949", "utf-8", $reg_desc); + $cash['tr_code'] = $tr_code; + $cash['id_info'] = $id_info; + $cash_info = serialize($cash); + $sql = " update {$g5['g5_shop_order_table']} - set od_cash_no = '$cash_no', - od_cash_receipt_no = '$receipt_no', - od_cash_app_time = '$app_time', - od_cash_reg_stat = '$reg_stat', - od_cash_reg_desc = '".iconv("cp949", "utf-8", $reg_desc)."', - od_cash_tr_code = '$tr_code', - od_cash_id_info = '$id_info', - od_cash = '1' + set od_cash = '1' + od_cash_no = '$cash_no', + od_cash_info = '$cash_info' where od_id = '$ordr_idxx' "; $result = sql_query($sql); if (!$result) $bSucc = "false"; @@ -255,7 +262,7 @@ if ($row['cnt']) { $c_PayPlus->mf_set_modx_data( "trad_time", $trad_time ); $c_PayPlus->mf_do_tx( "", $g_conf_home_dir, $g_conf_site_id, - "", $tx_cd, "", + $g_conf_site_key, $tx_cd, "", $g_conf_pa_url, $g_conf_pa_port, "payplus_cli_slib", $ordr_idxx, $cust_ip, $g_conf_log_level, "", $g_conf_tx_mode ); diff --git a/shop/orderinquiryview.php b/shop/orderinquiryview.php index 4178d8609..a95c0349b 100644 --- a/shop/orderinquiryview.php +++ b/shop/orderinquiryview.php @@ -127,9 +127,9 @@ if(openwin != null) { ?> -
+
상품 상태 설명 - +
주문
@@ -143,7 +143,7 @@ if(openwin != null) {
완료
상품 배송이 완료 되었습니다.
- +
diff --git a/shop/search.php b/shop/search.php index 498298c6a..462726cc3 100644 --- a/shop/search.php +++ b/shop/search.php @@ -74,28 +74,51 @@ $total_count = $row['cnt']; +>>>>>>> f13964c6ecb1d12f0b922f1ef98f6813242c39ca