diff --git a/mobile/shop/orderform.php b/mobile/shop/orderform.php index f4c1fda73..bcafd97e9 100644 --- a/mobile/shop/orderform.php +++ b/mobile/shop/orderform.php @@ -458,7 +458,7 @@ ob_end_clean(); where mb_id = '{$member['mb_id']}' and ad_default = '0' order by ad_id desc - limit 2 "; + limit 1 "; $result = sql_query($sql); for($i=0; $row=sql_fetch_array($result); $i++) { $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']; @@ -468,14 +468,21 @@ ob_end_clean(); $addr_list .= ''.PHP_EOL; $addr_list .= ''.PHP_EOL; + + $addr_list .='배송지목록'; + } else { + // 주문자와 동일 + $addr_list .= ''.PHP_EOL; + $addr_list .= ''.PHP_EOL; + } ?> 배송지선택 - 배송지목록 + @@ -1068,7 +1075,10 @@ $(function() { var addr = $(this).val().split(String.fromCharCode(30)); if (addr[0] == "same") { - gumae2baesong(); + if($(this).is(":checked")) + gumae2baesong(true); + else + gumae2baesong(false); } else { if(addr[0] == "new") { for(i=0; i<8; i++) { @@ -1488,19 +1498,28 @@ function payment_check(f) } // 구매자 정보와 동일합니다. -function gumae2baesong() -{ +function gumae2baesong(checked) { var f = document.forderform; - f.od_b_name.value = f.od_name.value; - f.od_b_tel.value = f.od_tel.value; - f.od_b_hp.value = f.od_hp.value; - f.od_b_zip1.value = f.od_zip1.value; - f.od_b_zip2.value = f.od_zip2.value; - f.od_b_addr1.value = f.od_addr1.value; - f.od_b_addr2.value = f.od_addr2.value; + if(checked == true) { + f.od_b_name.value = f.od_name.value; + f.od_b_tel.value = f.od_tel.value; + f.od_b_hp.value = f.od_hp.value; + f.od_b_zip1.value = f.od_zip1.value; + f.od_b_zip2.value = f.od_zip2.value; + f.od_b_addr1.value = f.od_addr1.value; + f.od_b_addr2.value = f.od_addr2.value; - calculate_sendcost(String(f.od_b_zip1.value) + String(f.od_b_zip2.value)); + calculate_sendcost(String(f.od_b_zip1.value) + String(f.od_b_zip2.value)); + } else { + f.od_b_name.value = ''; + f.od_b_tel.value = ''; + f.od_b_hp.value = ''; + f.od_b_zip1.value = ''; + f.od_b_zip2.value = ''; + f.od_b_addr1.value = ''; + f.od_b_addr2.value = ''; + } } diff --git a/shop/orderform.php b/shop/orderform.php index 3f0074189..1cd221c7b 100644 --- a/shop/orderform.php +++ b/shop/orderform.php @@ -729,7 +729,7 @@ function get_intall_file() where mb_id = '{$member['mb_id']}' and ad_default = '0' order by ad_id desc - limit 2 "; + limit 1 "; $result = sql_query($sql); for($i=0; $row=sql_fetch_array($result); $i++) { $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']; @@ -739,14 +739,21 @@ function get_intall_file() $addr_list .= ''.PHP_EOL; $addr_list .= ''.PHP_EOL; + + $addr_list .='배송지목록'; + } else { + // 주문자와 동일 + $addr_list .= ''.PHP_EOL; + $addr_list .= ''.PHP_EOL; + } ?> 배송지선택 - 배송지목록 + @@ -755,9 +762,7 @@ function get_intall_file() - + @@ -1312,7 +1317,10 @@ $(function() { var addr = $(this).val().split(String.fromCharCode(30)); if (addr[0] == "same") { - gumae2baesong(); + if($(this).is(":checked")) + gumae2baesong(true); + else + gumae2baesong(false); } else { if(addr[0] == "new") { for(i=0; i<8; i++) { @@ -1707,20 +1715,29 @@ function forderform_check(f) } // 구매자 정보와 동일합니다. -function gumae2baesong() { +function gumae2baesong(checked) { var f = document.forderform; - f.od_b_name.value = f.od_name.value; - f.od_b_tel.value = f.od_tel.value; - f.od_b_hp.value = f.od_hp.value; - f.od_b_zip1.value = f.od_zip1.value; - f.od_b_zip2.value = f.od_zip2.value; - f.od_b_addr1.value = f.od_addr1.value; - f.od_b_addr2.value = f.od_addr2.value; + if(checked == true) { + f.od_b_name.value = f.od_name.value; + f.od_b_tel.value = f.od_tel.value; + f.od_b_hp.value = f.od_hp.value; + f.od_b_zip1.value = f.od_zip1.value; + f.od_b_zip2.value = f.od_zip2.value; + f.od_b_addr1.value = f.od_addr1.value; + f.od_b_addr2.value = f.od_addr2.value; - calculate_sendcost(String(f.od_b_zip1.value) + String(f.od_b_zip2.value)); + calculate_sendcost(String(f.od_b_zip1.value) + String(f.od_b_zip2.value)); + } else { + f.od_b_name.value = ''; + f.od_b_tel.value = ''; + f.od_b_hp.value = ''; + f.od_b_zip1.value = ''; + f.od_b_zip2.value = ''; + f.od_b_addr1.value = ''; + f.od_b_addr2.value = ''; + } } -// 구매자 정보와 동일 함수 끝 $(function(){