diff --git a/css/default_shop.css b/css/default_shop.css index f50f80753..42f91b0a3 100644 --- a/css/default_shop.css +++ b/css/default_shop.css @@ -494,12 +494,16 @@ 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:#f2f5f9} -.sod_bsk_itopt ul {margin:0;padding:0;list-style:none} -.sod_bsk_itopt li {padding:3px;border-bottom:1px solid #e9e9e9} +.sod_img {width:90px;text-align:center} +.sod_opt {margin:5px 0;border:1px solid #e9e9e9;border-bottom:0;background:#f2f5f9} +.sod_opt ul {margin:0;padding:0;list-style:none} +.sod_opt 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} +#sit_opt_added {margin:0;padding:0;border:1px solid #e9e9e9;border-bottom:0;background:#fff;list-style:none} +#sit_opt_added li {padding:10px 20px;border-bottom:1px solid #e9e9e9} +#sit_opt_added li div {margin:5px 0 0;text-align:right} + #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:#f2f5f9;overflow-y:scroll;overflow-x:none} @@ -527,7 +531,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:#f2f5f9;overflow-y:scroll;overflow-x:none} +#sod_list #cp_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} @@ -551,6 +555,9 @@ fieldset .frm_input {padding:2px 2px 3px;border:1px solid #b8c9c2;background:#f7 #sod_frm_escrow {margin:30px 0 0} +/* 배송지 목록 */ +#sod_addr .td_mng button {margin:0;padding:0;border:0;background:transparent} + /* 주문내역 */ #sod_v {} #sod_v .basic_tbl {text-align:center} diff --git a/css/mobile_shop.css b/css/mobile_shop.css index 5ba9c131f..81efe5759 100644 --- a/css/mobile_shop.css +++ b/css/mobile_shop.css @@ -193,10 +193,10 @@ 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:#f2f5f9} -.sod_bsk_itopt ul {margin:0;padding:0;list-style:none} -.sod_bsk_itopt li {margin:0 0 1px;padding:5px} +.sod_img {width:100px;text-align:center} +.sod_opt {border-top:1px dashed #e9e9e9;background:#f2f5f9} +.sod_opt ul {margin:0;padding:0;list-style:none} +.sod_opt li {padding:8px} .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} @@ -236,9 +236,27 @@ html.no-overflowscrolling #mod_option_frm {height:auto;max-height:10000px !impor #sod_frm {} #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:10px;width:278px;height:auto !important;height:480px;max-height:480px;border:1px solid #c9c9c9;background:#f2f5f9;overflow-y:scroll} -html.no-overflowscrolling #it_coupon_frm {height:auto;max-height:10000px !important} /* overflow 미지원 기기 대응 */ +#sod_list {position:relative;margin:0;padding:0;list-style:none} +#sod_list .sod_li {position:relative;padding:5px 0} +#sod_list .sod_li:nth-of-type(1) {border-top:1px solid #e9e9e9} +#sod_list .sod_li:after {display:block;visibility:hidden;clear:both;content:""} +#sod_list .li_name {margin:0 0 15px} +#sod_list .li_name strong {display:inline-block;padding:8px 0 10px;font-size:1.167em} +#sod_list .li_prqty {margin:0 0 5px;padding:0 0 15px;border-bottom:1px solid #e9e9e9} +#sod_list .li_prqty:after {display:block;visibility:hidden;clear:both;content:""} +#sod_list .li_prqty span {font-weight:bold} +#sod_list .li_prqty span span {font-weight:normal} +#sod_list .prqty_price {float:left;padding:0 2% 0 0;width:48%;border-right:1px solid #e9e9e9;text-align:right} +#sod_list .prqty_qty {float:right;width:48%;text-align:left} +#sod_list .li_cp {margin:5px 0 0} +#sod_list .li_cp .cp_btn {display:block;margin:0;padding:10px 0;width:100%;border:0;background:#ff882a;color:#fff;font-weight:bold} +#sod_list .li_total {position:relative} +#sod_list .total_img {position:absolute;top:0;left:0} +#sod_list .total_span {display:block;position:relative;padding:5px 0;text-align:right} +#sod_list .total_span span {position:absolute;top:5px;left:0} +#sod_list .total_price {border-bottom:1px solid #e9e9e9} +#sod_list #cp_frm {z-index:10000;position:absolute;top:0;left:0;padding:10px;width:278px;height:auto !important;height:480px;max-height:480px;border:1px solid #c9c9c9;background:#f2f5f9;overflow-y:scroll} +html.no-overflowscrolling #cp_frm {height:auto;max-height:10000px !important} /* overflow 미지원 기기 대응 */ #sod_frm_deli {position:relative;line-height:2em} #sod_frm_deli #order_address {display:block;padding:5px 0;background:#000;color:#fff;text-align:center} @@ -256,10 +274,13 @@ html.no-overflowscrolling #it_coupon_frm {height:auto;max-height:10000px !import #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:#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} +#sod_frm_paysel {margin:0 0 15px} +#sod_frm_paysel ul {margin:0;padding:0;border:1px solid #e9e9e9;background:#f2f5f9;list-style:none} +#sod_frm_paysel ul:after {display:block;visibility:hidden;clear:both;content:""} +#sod_frm_paysel li {float:left;padding:10px 2%;width:46%} +#sod_frm_paysel #settle_bank {padding:10px;background:#dbdfe2;line-height:2em} +#sod_frm_paysel #settle_bank label {display:inline-block;margin:0 10px 0 0;font-weight:bold} +#sod_frm_paysel #settle_bank .frm_input {background:#fff;text-align:center} #sod_frm_escrow {margin:30px 0 0} diff --git a/mobile/shop/cart.php b/mobile/shop/cart.php index a0d1773ec..11cc2643a 100644 --- a/mobile/shop/cart.php +++ b/mobile/shop/cart.php @@ -75,7 +75,7 @@ include_once(G5_MSHOP_PATH.'/_head.php'); $it_options = print_item_options($row['it_id'], $s_cart_id); if($it_options) { $mod_options = '
'; - $it_name .= '
'.$it_options.'
'; + $it_name .= '
'.$it_options.'
'; } $point = $sum['point']; @@ -83,7 +83,7 @@ include_once(G5_MSHOP_PATH.'/_head.php'); ?> - + diff --git a/mobile/shop/orderform.php b/mobile/shop/orderform.php index 6dbfbac95..305580a6a 100644 --- a/mobile/shop/orderform.php +++ b/mobile/shop/orderform.php @@ -37,22 +37,7 @@ ob_start(); ?>

주문하실 상품을 확인하세요.

-
- - - - - - - - - - - - - - - + - - - - - - - - - - +
  • + + + + + + + + +
    +
    + 판매가 + 수량 +
    +
    + + 주문금액 + 적립포인트 +
    + +
    • --> - 이후로 배송 바랍니다. + 이후로 배송 바랍니다. @@ -450,7 +435,7 @@ ob_end_clean(); $row = sql_fetch($sql); if($row['ad_id']) { $val1 = $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']; - $addr_list .= ''.PHP_EOL; + $addr_list .= '
    '.PHP_EOL; $addr_list .= ''.PHP_EOL; } @@ -635,45 +620,46 @@ ob_end_clean(); } if ($default['de_bank_use'] || $default['de_vbank_use'] || $default['de_bank_use'] || $default['de_bank_use'] || $default['de_bank_use']) { - echo '
    '; - echo '결제방법 선택'; + echo '
      '; } // 무통장입금 사용 if ($default['de_bank_use']) { $multi_settle++; - echo ' '.PHP_EOL; + echo '
      • '.PHP_EOL; $checked = ''; } // 가상계좌 사용 if ($default['de_vbank_use']) { $multi_settle++; - echo ' '.PHP_EOL; + echo '
      • '.PHP_EOL; $checked = ''; } // 계좌이체 사용 if ($default['de_iche_use']) { $multi_settle++; - echo ' '.PHP_EOL; + echo '
      • '.PHP_EOL; $checked = ''; } // 휴대폰 사용 if ($default['de_hp_use']) { $multi_settle++; - echo ' '.PHP_EOL; + echo '
      • '.PHP_EOL; $checked = ''; } // 신용카드 사용 if ($default['de_card_use']) { $multi_settle++; - echo ' '.PHP_EOL; + echo '
      • '.PHP_EOL; $checked = ''; } + echo '
    '; + $temp_point = 0; // 회원이면서 포인트사용이면 if ($is_member && $config['cf_use_point']) @@ -726,7 +712,7 @@ ob_end_clean(); } if ($default['de_bank_use'] || $default['de_vbank_use'] || $default['de_bank_use'] || $default['de_bank_use'] || $default['de_bank_use']) { - echo '
    '; + echo ''; } if ($multi_settle == 0) @@ -832,10 +818,10 @@ $(function() { var $cp_row_el; var zipcode = ""; - $(".it_coupon_btn").click(function() { + $(".cp_btn").click(function() { $cp_btn_el = $(this); $cp_row_el = $(this).closest("tr"); - $("#it_coupon_frm").remove(); + $("#cp_frm").remove(); var it_id = $cp_btn_el.closest("tr").find("input[name^=it_id]").val(); $.post( @@ -885,7 +871,7 @@ $(function() { } } - var $s_el = $cp_row_el.find(".ct_sell_price");; + var $s_el = $cp_row_el.find(".total_price");; sell_price = parseInt($cp_row_el.find("input[name^=it_price]").val()); sell_price = sell_price - parseInt(price); if(sell_price < 0) { @@ -897,22 +883,22 @@ $(function() { $cp_row_el.find("input[name^=cp_price]").val(price); calculate_total_price(); - $("#it_coupon_frm").remove(); + $("#cp_frm").remove(); $cp_btn_el.text("변경").focus(); - if(!$cp_row_el.find(".it_coupon_cancel").size()) - $cp_btn_el.after(""); + if(!$cp_row_el.find(".cp_cancel").size()) + $cp_btn_el.after(""); }); - $("#it_coupon_close").live("click", function() { - $("#it_coupon_frm").remove(); + $("#cp_close").live("click", function() { + $("#cp_frm").remove(); $cp_btn_el.focus(); }); - $(".it_coupon_cancel").live("click", function() { + $(".cp_cancel").live("click", function() { coupon_cancel($(this).closest("tr")); calculate_total_price(); - $("#it_coupon_frm").remove(); - $(this).closest("tr").find(".it_coupon_btn").text("적용").focus(); + $("#cp_frm").remove(); + $(this).closest("tr").find(".cp_btn").text("쿠폰적용").focus(); $(this).remove(); }); @@ -1117,7 +1103,7 @@ $(function() { function coupon_cancel($el) { - var $dup_sell_el = $el.find(".ct_sell_price"); + var $dup_sell_el = $el.find(".total_price"); var $dup_price_el = $el.find("input[name^=cp_price]"); var org_sell_price = $el.find("input[name^=it_price]").val(); diff --git a/shop/cart.php b/shop/cart.php index 9f81eda9f..4bc8d7320 100644 --- a/shop/cart.php +++ b/shop/cart.php @@ -94,7 +94,7 @@ include_once('./_head.php'); $it_options = print_item_options($row['it_id'], $s_cart_id); if($it_options) { $mod_options = '
    '; - $it_name .= '
    '.$it_options.'
    '; + $it_name .= '
    '.$it_options.'
    '; } $point = $sum['point']; @@ -102,7 +102,7 @@ include_once('./_head.php'); ?> - + - + - + @@ -1081,10 +1081,10 @@ $(function() { var $cp_row_el; var zipcode = ""; - $(".it_coupon_btn").click(function() { + $(".cp_btn").click(function() { $cp_btn_el = $(this); $cp_row_el = $(this).closest("tr"); - $("#it_coupon_frm").remove(); + $("#cp_frm").remove(); var it_id = $cp_btn_el.closest("tr").find("input[name^=it_id]").val(); $.post( @@ -1134,7 +1134,7 @@ $(function() { } } - var $s_el = $cp_row_el.find(".ct_sell_price");; + var $s_el = $cp_row_el.find(".total_price");; sell_price = parseInt($cp_row_el.find("input[name^=it_price]").val()); sell_price = sell_price - parseInt(price); if(sell_price < 0) { @@ -1146,22 +1146,22 @@ $(function() { $cp_row_el.find("input[name^=cp_price]").val(price); calculate_total_price(); - $("#it_coupon_frm").remove(); + $("#cp_frm").remove(); $cp_btn_el.text("변경").focus(); - if(!$cp_row_el.find(".it_coupon_cancel").size()) - $cp_btn_el.after(""); + if(!$cp_row_el.find(".cp_cancel").size()) + $cp_btn_el.after(""); }); - $("#it_coupon_close").live("click", function() { - $("#it_coupon_frm").remove(); + $("#cp_close").live("click", function() { + $("#cp_frm").remove(); $cp_btn_el.focus(); }); - $(".it_coupon_cancel").live("click", function() { + $(".cp_cancel").live("click", function() { coupon_cancel($(this).closest("tr")); calculate_total_price(); - $("#it_coupon_frm").remove(); - $(this).closest("tr").find(".it_coupon_btn").text("적용").focus(); + $("#cp_frm").remove(); + $(this).closest("tr").find(".cp_btn").text("적용").focus(); $(this).remove(); }); @@ -1362,7 +1362,7 @@ $(function() { function coupon_cancel($el) { - var $dup_sell_el = $el.find(".ct_sell_price"); + var $dup_sell_el = $el.find(".total_price"); var $dup_price_el = $el.find("input[name^=cp_price]"); var org_sell_price = $el.find("input[name^=it_price]").val(); diff --git a/shop/orderitemcoupon.php b/shop/orderitemcoupon.php index 9bc7b4a86..7bf6ab17b 100644 --- a/shop/orderitemcoupon.php +++ b/shop/orderitemcoupon.php @@ -40,7 +40,7 @@ $count = mysql_num_rows($result); ?> -
    +
    0) { ?>
    상품이미지상품명
    총수량판매가쿠폰소계포인트
    - -
    - - - - - - - - - -
    diff --git a/shop/orderaddress.php b/shop/orderaddress.php index 8c4db26b7..58026e917 100644 --- a/shop/orderaddress.php +++ b/shop/orderaddress.php @@ -50,9 +50,6 @@ $order_action_url = G5_HTTPS_SHOP_URL.'/orderaddressupdate.php';

    배송지 목록

    -
    - -
    @@ -87,7 +84,7 @@ $order_action_url = G5_HTTPS_SHOP_URL.'/orderaddressupdate.php'; @@ -98,8 +95,9 @@ $order_action_url = G5_HTTPS_SHOP_URL.'/orderaddressupdate.php';
    - + 삭제
    -
    - +
    + +
    diff --git a/shop/orderform.php b/shop/orderform.php index 1cd221c7b..b1225a84d 100644 --- a/shop/orderform.php +++ b/shop/orderform.php @@ -257,7 +257,7 @@ function get_intall_file() $it_name = '' . stripslashes($row['it_name']) . ''; $it_options = print_item_options($row['it_id'], $s_cart_id); if($it_options) { - $it_name .= '
    '.$it_options.'
    '; + $it_name .= '
    '.$it_options.'
    '; } // 복합과세금액 @@ -298,14 +298,14 @@ function get_intall_file() } if($cp_count) { - $cp_button = ''; + $cp_button = ''; $it_cp_count++; } } ?>
    @@ -320,7 +320,7 @@ function get_intall_file()
    @@ -87,11 +87,11 @@ $count = mysql_num_rows($result); 사용할 수 있는 쿠폰이 없습니다.

    '; + echo '
    사용할 수 있는 쿠폰이 없습니다.
    '; } ?>
    - +
    \ No newline at end of file diff --git a/skin/shop/basic/style.css b/skin/shop/basic/style.css index b1c480cff..2aea1420e 100644 --- a/skin/shop/basic/style.css +++ b/skin/shop/basic/style.css @@ -212,10 +212,6 @@ .td_sit_sel {position:relative} .sit_sel_submit {position:static !important;position:absolute;float:right !important;float:none;top:8px;right:0} -#sit_opt_added {margin:0;padding:0;border:1px solid #e9e9e9;border-bottom:0;background:#fff;list-style:none} -#sit_opt_added li {padding:10px 20px;border-bottom:1px solid #e9e9e9} -#sit_opt_added li div {margin:5px 0 0;text-align:right} - #sit_sel_option h3 {position:absolute;font-size:0;line-height:0;overflow:hidden} #sit_tot_price {margin:20px 0;font-size:1.3em;font-weight:bold}