diff --git a/adm/shop_admin/orderdeliveryexcel.php b/adm/shop_admin/orderdeliveryexcel.php index 052580edc..704caf529 100644 --- a/adm/shop_admin/orderdeliveryexcel.php +++ b/adm/shop_admin/orderdeliveryexcel.php @@ -45,7 +45,7 @@ for($i=1; $row=sql_fetch_array($result); $i++) { $worksheet->write($i, 4, $row['od_b_name']); $worksheet->write($i, 5, $row['od_b_tel']); $worksheet->write($i, 6, $row['od_b_hp']); - $worksheet->write($i, 7, print_address($row['od_b_addr1'], $row['od_b_addr2'])); + $worksheet->write($i, 7, print_address($row['od_b_addr1'], $row['od_b_addr2'], $row['od_b_addr3'])); $worksheet->write($i, 8, $row['od_delivery_company']); $worksheet->write($i, 9, $row['od_invoice']); } diff --git a/adm/shop_admin/orderform.php b/adm/shop_admin/orderform.php index 7379cfa2b..185aabc69 100644 --- a/adm/shop_admin/orderform.php +++ b/adm/shop_admin/orderform.php @@ -63,6 +63,19 @@ $sql = " select it_id, group by it_id order by ct_id "; $result = sql_query($sql); + +// 주소 참고항목 필드추가 +if(!isset($od['od_addr3'])) { + sql_query(" ALTER TABLE `{$g5['g5_shop_order_table']}` + ADD `od_addr3` varchar(255) NOT NULL DEFAULT '' AFTER `od_addr2`, + ADD `od_b_addr3` varchar(255) NOT NULL DEFAULT '' AFTER `od_b_addr2` ", true); +} + +// 배송목록에 참고항목 필드추가 +if(!sql_query(" select ad_addr3 from {$g5['g5_shop_order_address_table']} limit 1", false)) { + sql_query(" ALTER TABLE `{$g5['g5_shop_order_address_table']}` + ADD `ad_addr3` varchar(255) NOT NULL DEFAULT '' AFTER `ad_addr2` ", true); +} ?>
@@ -737,11 +750,12 @@ $result = sql_query($sql); 주소 검색
- - -
- - + + + + + +
지번주소 : @@ -790,11 +804,12 @@ $result = sql_query($sql); 주소 검색
- - -
- - + + + + + +
지번주소 : diff --git a/adm/shop_admin/orderformupdate.php b/adm/shop_admin/orderformupdate.php index 76254ec86..fc425c3c1 100644 --- a/adm/shop_admin/orderformupdate.php +++ b/adm/shop_admin/orderformupdate.php @@ -3,9 +3,6 @@ $sub_menu = '400400'; include_once('./_common.php'); if($_POST['mod_type'] == 'info') { - $od_addr2 = get_address2($od_addr2, $od_addr3); - $od_b_addr2 = get_address2($od_b_addr2, $od_b_addr3); - $sql = " update {$g5['g5_shop_order_table']} set od_name = '$od_name', od_tel = '$od_tel', @@ -14,6 +11,7 @@ if($_POST['mod_type'] == 'info') { od_zip2 = '$od_zip2', od_addr1 = '$od_addr1', od_addr2 = '$od_addr2', + od_addr3 = '$od_addr3', od_addr_jibeon = '$od_addr_jibeon', od_email = '$od_email', od_b_name = '$od_b_name', @@ -23,6 +21,7 @@ if($_POST['mod_type'] == 'info') { od_b_zip2 = '$od_b_zip2', od_b_addr1 = '$od_b_addr1', od_b_addr2 = '$od_b_addr2', + od_b_addr3 = '$od_b_addr3', od_b_addr_jibeon = '$od_b_addr_jibeon' "; if ($default['de_hope_date_use']) $sql .= " , od_hope_date = '$od_hope_date' "; diff --git a/adm/shop_admin/orderprintresult.php b/adm/shop_admin/orderprintresult.php index 0238a40cb..3c3cfb450 100644 --- a/adm/shop_admin/orderprintresult.php +++ b/adm/shop_admin/orderprintresult.php @@ -39,7 +39,7 @@ if ($csv == 'csv') $to_date = date_conv($to_date); - $sql = " SELECT od_b_zip1, od_b_zip2, od_b_addr1, od_b_addr2, od_b_name, od_b_tel, od_b_hp, b.it_name, ct_qty, b.it_id, a.od_id, od_memo, od_invoice, b.ct_option, b.ct_send_cost + $sql = " SELECT od_b_zip1, od_b_zip2, od_b_addr1, od_b_addr2, od_b_addr3, od_b_name, od_b_tel, od_b_hp, b.it_name, ct_qty, b.it_id, a.od_id, od_memo, od_invoice, b.ct_option, b.ct_send_cost FROM {$g5['g5_shop_order_table']} a, {$g5['g5_shop_cart_table']} b where a.od_id = b.od_id "; if ($case == 1) // 출력기간 @@ -69,7 +69,7 @@ if ($csv == 'csv') $ct_send_cost = iconv_euckr($row['ct_send_cost'] ? '착불' : '선불'); echo '"'.$row['od_b_zip1'].'-'.$row['od_b_zip2'].'"'.','; - echo '"'.print_address($row['od_b_addr1'], $row['od_b_addr2']).'"'.','; + echo '"'.print_address($row['od_b_addr1'], $row['od_b_addr2'], $row['od_b_addr3']).'"'.','; echo '"'.$row['od_b_name'].'"'.','; //echo '"'.multibyte_digit((string)$row[od_b_tel]).'"'.','; //echo '"'.multibyte_digit((string)$row[od_b_hp]).'"'.','; @@ -98,7 +98,7 @@ if ($csv == 'xls') $fr_date = date_conv($fr_date); $to_date = date_conv($to_date); - $sql = " SELECT od_b_zip1, od_b_zip2, od_b_addr1, od_b_addr2, od_b_name, od_b_tel, od_b_hp, b.it_name, ct_qty, b.it_id, a.od_id, od_memo, od_invoice, b.ct_option, b.ct_send_cost + $sql = " SELECT od_b_zip1, od_b_zip2, od_b_addr1, od_b_addr2, od_b_addr3, od_b_name, od_b_tel, od_b_hp, b.it_name, ct_qty, b.it_id, a.od_id, od_memo, od_invoice, b.ct_option, b.ct_send_cost FROM {$g5['g5_shop_order_table']} a, {$g5['g5_shop_cart_table']} b where a.od_id = b.od_id "; if ($case == 1) // 출력기간 @@ -138,7 +138,7 @@ if ($csv == 'xls') $row = array_map('iconv_euckr', $row); $worksheet->write($i, 0, $row['od_b_zip1'].'-'.$row['od_b_zip2']); - $worksheet->write($i, 1, print_address($row['od_b_addr1'], $row['od_b_addr2'])); + $worksheet->write($i, 1, print_address($row['od_b_addr1'], $row['od_b_addr2'], $row['od_b_addr3'])); $worksheet->write($i, 2, $row['od_b_name']); $worksheet->write($i, 3, $row['od_b_tel']); $worksheet->write($i, 4, $row['od_b_hp']); @@ -218,8 +218,8 @@ if (mysql_num_rows($result) == 0) $row1 = sql_fetch($sql1); // 1.03.02 - $row1['od_addr'] = '('.$row1['od_zip1'].'-'.$row1['od_zip2'].') '.print_address($row1['od_addr1'], $row1['od_addr2']); - $row1['od_b_addr'] = '('.$row1['od_b_zip1'].'-'.$row1['od_b_zip2'].') '.print_address($row1['od_b_addr1'], $row1['od_b_addr2']); + $row1['od_addr'] = '('.$row1['od_zip1'].'-'.$row1['od_zip2'].') '.print_address($row1['od_addr1'], $row1['od_addr2'], $row['od_addr3']); + $row1['od_b_addr'] = '('.$row1['od_b_zip1'].'-'.$row1['od_b_zip2'].') '.print_address($row1['od_b_addr1'], $row1['od_b_addr2'], $row['od_b_addr3']); $row1['od_addr'] = ($row1['od_addr']) ? $row1['od_addr'] : '입력안함'; $row1['od_tel'] = ($row1['od_tel']) ? $row1['od_tel'] : '입력안함'; diff --git a/install/gnuboard5shop.sql b/install/gnuboard5shop.sql index cd3431be6..55f8f4516 100644 --- a/install/gnuboard5shop.sql +++ b/install/gnuboard5shop.sql @@ -612,6 +612,7 @@ CREATE TABLE IF NOT EXISTS `g5_shop_order` ( `od_zip2` char(3) NOT NULL DEFAULT '', `od_addr1` varchar(100) NOT NULL DEFAULT '', `od_addr2` varchar(100) NOT NULL DEFAULT '', + `od_addr3` varchar(255) NOT NULL DEFAULT '', `od_addr_jibeon` varchar(255) NOT NULL DEFAULT '', `od_deposit_name` varchar(20) NOT NULL DEFAULT '', `od_b_name` varchar(20) NOT NULL DEFAULT '', @@ -621,6 +622,7 @@ CREATE TABLE IF NOT EXISTS `g5_shop_order` ( `od_b_zip2` char(3) NOT NULL DEFAULT '', `od_b_addr1` varchar(100) NOT NULL DEFAULT '', `od_b_addr2` varchar(100) NOT NULL DEFAULT '', + `od_b_addr3` varchar(255) NOT NULL DEFAULT '', `od_b_addr_jibeon` varchar(255) NOT NULL DEFAULT '', `od_memo` text NOT NULL, `od_cart_count` int(11) NOT NULL DEFAULT '0', @@ -682,6 +684,7 @@ CREATE TABLE IF NOT EXISTS `g5_shop_order_address` ( `ad_zip2` char(3) NOT NULL DEFAULT '', `ad_addr1` varchar(255) NOT NULL DEFAULT '', `ad_addr2` varchar(255) NOT NULL DEFAULT '', + `ad_addr3` varchar(255) NOT NULL DEFAULT '', `ad_jibeon` varchar(255) NOT NULL DEFAULT '', PRIMARY KEY (`ad_id`), KEY `mb_id` (`mb_id`) diff --git a/mobile/shop/mypage.php b/mobile/shop/mypage.php index 27aee43cc..4eed150e1 100644 --- a/mobile/shop/mypage.php +++ b/mobile/shop/mypage.php @@ -41,7 +41,7 @@ for($k=0; $cp=sql_fetch_array($res); $k++) {
회원가입일시
주소
-
+
diff --git a/mobile/shop/orderaddress.php b/mobile/shop/orderaddress.php index 0df050627..a0c20cf1a 100644 --- a/mobile/shop/orderaddress.php +++ b/mobile/shop/orderaddress.php @@ -16,7 +16,7 @@ $order_action_url = G5_HTTPS_SHOP_URL.'/orderaddressupdate.php';
  • @@ -31,7 +31,7 @@ $order_action_url = G5_HTTPS_SHOP_URL.'/orderaddressupdate.php'; >
    -
    +
    /
    @@ -61,17 +61,18 @@ $(function() { var addr = $(this).siblings("input").val().split(String.fromCharCode(30)); var f = window.opener.forderform; - f.od_b_name.value = addr[0]; - f.od_b_tel.value = addr[1]; - f.od_b_hp.value = addr[2]; - f.od_b_zip1.value = addr[3]; - f.od_b_zip2.value = addr[4]; - f.od_b_addr1.value = addr[5]; - f.od_b_addr2.value = addr[6]; - f.od_b_addr_jibeon.value = addr[7]; - f.ad_subject.value = addr[8]; + f.od_b_name.value = addr[0]; + f.od_b_tel.value = addr[1]; + f.od_b_hp.value = addr[2]; + f.od_b_zip1.value = addr[3]; + f.od_b_zip2.value = addr[4]; + f.od_b_addr1.value = addr[5]; + f.od_b_addr2.value = addr[6]; + f.od_b_addr3.value = addr[7]; + f.od_b_addr_jibeon.value = addr[8]; + f.ad_subject.value = addr[9]; - window.opener.document.getElementById("od_b_addr_jibeon").innerText = "지번주소 : "+addr[7]; + window.opener.document.getElementById("od_b_addr_jibeon").innerText = "지번주소 : "+addr[8]; var zip1 = addr[3].replace(/[^0-9]/g, ""); var zip2 = addr[4].replace(/[^0-9]/g, ""); diff --git a/mobile/shop/orderform.php b/mobile/shop/orderform.php index 8012181e2..4b0defa9a 100644 --- a/mobile/shop/orderform.php +++ b/mobile/shop/orderform.php @@ -375,12 +375,12 @@ ob_end_clean(); 주소 검색
    - + - - + + @@ -435,7 +435,7 @@ ob_end_clean(); and ad_default = '1' "; $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_jibeon'].$sep.$row['ad_subject']; + $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_addr3'].$sep.$row['ad_jibeon'].$sep.$row['ad_subject']; $addr_list .= '
    '.PHP_EOL; $addr_list .= ''.PHP_EOL; } @@ -449,7 +449,7 @@ ob_end_clean(); 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_jibeon'].$sep.$row['ad_subject']; + $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_addr3'].$sep.$row['ad_jibeon'].$sep.$row['ad_subject']; $val2 = ''; $addr_list .= '
    '.PHP_EOL.$val2.PHP_EOL; } @@ -504,12 +504,12 @@ ob_end_clean(); 주소 검색
    - + - - + + @@ -1069,7 +1069,7 @@ $(function() { gumae2baesong(false); } else { if(addr[0] == "new") { - for(i=0; i<9; i++) { + for(i=0; i<10; i++) { addr[i] = ""; } } @@ -1082,10 +1082,11 @@ $(function() { f.od_b_zip2.value = addr[4]; f.od_b_addr1.value = addr[5]; f.od_b_addr2.value = addr[6]; - f.od_b_addr_jibeon.value = addr[7]; - f.ad_subject.value = addr[8]; + f.od_b_addr3.value = addr[7]; + f.od_b_addr_jibeon.value = addr[8]; + f.ad_subject.value = addr[9]; - document.getElementById("od_b_addr_jibeon").innerText = "지번주소 : "+addr[7]; + document.getElementById("od_b_addr_jibeon").innerText = "지번주소 : "+addr[8]; var zip1 = addr[3].replace(/[^0-9]/g, ""); var zip2 = addr[4].replace(/[^0-9]/g, ""); @@ -1507,7 +1508,6 @@ function gumae2baesong(checked) { f.od_b_addr2.value = f.od_addr2.value; f.od_b_addr3.value = f.od_addr3.value; f.od_b_addr_jibeon.value = f.od_addr_jibeon.value; - document.getElementById("od_b_addr3").innerText = document.getElementById("od_addr3").innerText; document.getElementById("od_b_addr_jibeon").innerText = document.getElementById("od_addr_jibeon").innerText; calculate_sendcost(String(f.od_b_zip1.value) + String(f.od_b_zip2.value)); @@ -1521,7 +1521,6 @@ function gumae2baesong(checked) { f.od_b_addr2.value = ""; f.od_b_addr3.value = ""; f.od_b_addr_jibeon.value = ""; - document.getElementById("od_b_addr3").innerText = ""; document.getElementById("od_b_addr_jibeon").innerText = ""; } } diff --git a/mobile/shop/orderformupdate.php b/mobile/shop/orderformupdate.php index ae1c6f559..73e162241 100644 --- a/mobile/shop/orderformupdate.php +++ b/mobile/shop/orderformupdate.php @@ -378,9 +378,6 @@ if($default['de_tax_flag_use']) { $od_free_mny = (int)$_POST['comm_free_mny']; } -$od_addr2 = get_address2($od_addr2, $od_addr3); -$od_b_addr2 = get_address2($od_b_addr2, $od_b_addr3); - // 주문서에 입력 $sql = " insert {$g5['g5_shop_order_table']} set od_id = '$od_id', @@ -394,6 +391,7 @@ $sql = " insert {$g5['g5_shop_order_table']} od_zip2 = '$od_zip2', od_addr1 = '$od_addr1', od_addr2 = '$od_addr2', + od_addr3 = '$od_addr3', od_addr_jibeon = '$od_addr_jibeon', od_b_name = '$od_b_name', od_b_tel = '$od_b_tel', @@ -402,6 +400,7 @@ $sql = " insert {$g5['g5_shop_order_table']} od_b_zip2 = '$od_b_zip2', od_b_addr1 = '$od_b_addr1', od_b_addr2 = '$od_b_addr2', + od_b_addr3 = '$od_b_addr3', od_b_addr_jibeon = '$od_b_addr_jibeon', od_deposit_name = '$od_deposit_name', od_memo = '$od_memo', @@ -602,7 +601,8 @@ if($is_member) { and ad_zip1 = '$od_b_zip1' and ad_zip2 = '$od_b_zip2' and ad_addr1 = '$od_b_addr1' - and ad_addr2 = '$od_b_addr2' "; + and ad_addr2 = '$od_b_addr2' + and ad_addr3 = '$od_b_addr3' "; $row = sql_fetch($sql); // 기본배송지 체크 @@ -631,6 +631,7 @@ if($is_member) { ad_zip2 = '$od_b_zip2', ad_addr1 = '$od_b_addr1', ad_addr2 = '$od_b_addr2', + ad_addr3 = '$od_b_addr3', ad_jibeon = '$od_b_addr_jibeon' "; } diff --git a/mobile/shop/orderinquiryview.php b/mobile/shop/orderinquiryview.php index 22bc1a674..b7977dccb 100644 --- a/mobile/shop/orderinquiryview.php +++ b/mobile/shop/orderinquiryview.php @@ -380,7 +380,7 @@ include_once(G5_MSHOP_PATH.'/_head.php'); 주 소 - + E-mail @@ -416,7 +416,7 @@ include_once(G5_MSHOP_PATH.'/_head.php'); 주 소 - + 주소 - + @@ -181,7 +181,7 @@ $ft_a_st = 'display:block;padding:30px 0;background:#484848;color:#fff;text-alig 주소 - + 전하실 말씀 diff --git a/shop/mail/orderupdate2.mail.php b/shop/mail/orderupdate2.mail.php index 987b7df57..d246c5f40 100644 --- a/shop/mail/orderupdate2.mail.php +++ b/shop/mail/orderupdate2.mail.php @@ -148,7 +148,7 @@ $ft_a_st = 'display:block;padding:30px 0;background:#484848;color:#fff;text-alig 주소 - + @@ -181,7 +181,7 @@ $ft_a_st = 'display:block;padding:30px 0;background:#484848;color:#fff;text-alig 주소 - + 전하실 말씀 diff --git a/shop/mail/orderupdate3.mail.php b/shop/mail/orderupdate3.mail.php index 18bd905ea..54855458b 100644 --- a/shop/mail/orderupdate3.mail.php +++ b/shop/mail/orderupdate3.mail.php @@ -71,7 +71,7 @@ $ft_a_st = 'display:block;padding:30px 0;background:#484848;color:#fff;text-alig 주소 - + @@ -105,7 +105,7 @@ $ft_a_st = 'display:block;padding:30px 0;background:#484848;color:#fff;text-alig 주소 - + 전하실 말씀 diff --git a/shop/mypage.php b/shop/mypage.php index 556568188..482231632 100644 --- a/shop/mypage.php +++ b/shop/mypage.php @@ -57,7 +57,7 @@ for($k=0; $cp=sql_fetch_array($res); $k++) {
    회원가입일시
    주소
    -
    +
    diff --git a/shop/orderaddress.php b/shop/orderaddress.php index 10d5af272..1cb7a354e 100644 --- a/shop/orderaddress.php +++ b/shop/orderaddress.php @@ -67,7 +67,7 @@ $order_action_url = G5_HTTPS_SHOP_URL.'/orderaddressupdate.php'; @@ -79,7 +79,7 @@ $order_action_url = G5_HTTPS_SHOP_URL.'/orderaddressupdate.php'; >
    - + @@ -115,10 +115,11 @@ $(function() { f.od_b_zip2.value = addr[4]; f.od_b_addr1.value = addr[5]; f.od_b_addr2.value = addr[6]; - f.od_b_addr_jibeon.value = addr[7]; - f.ad_subject.value = addr[8]; + f.od_b_addr3.value = addr[7]; + f.od_b_addr_jibeon.value = addr[8]; + f.ad_subject.value = addr[9]; - window.opener.document.getElementById("od_b_addr_jibeon").innerText = "지번주소 : "+addr[7]; + window.opener.document.getElementById("od_b_addr_jibeon").innerText = "지번주소 : "+addr[8]; var zip1 = addr[3].replace(/[^0-9]/g, ""); var zip2 = addr[4].replace(/[^0-9]/g, ""); diff --git a/shop/orderform.php b/shop/orderform.php index 51de837a0..8fb3040b4 100644 --- a/shop/orderform.php +++ b/shop/orderform.php @@ -654,12 +654,12 @@ function get_intall_file() 주소 검색
    - - - - - - + + + + + + @@ -716,7 +716,7 @@ function get_intall_file() and ad_default = '1' "; $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_jibeon'].$sep.$row['ad_subject']; + $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_addr3'].$sep.$row['ad_jibeon'].$sep.$row['ad_subject']; $addr_list .= ''.PHP_EOL; $addr_list .= ''.PHP_EOL; } @@ -730,7 +730,7 @@ function get_intall_file() 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_jibeon'].$sep.$row['ad_subject']; + $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_addr3'].$sep.$row['ad_jibeon'].$sep.$row['ad_subject']; $val2 = ''; $addr_list .= ' '.PHP_EOL.$val2.PHP_EOL; } @@ -783,12 +783,12 @@ function get_intall_file() 주소 검색
    - - - - - - + + + + + + @@ -1325,7 +1325,7 @@ $(function() { gumae2baesong(false); } else { if(addr[0] == "new") { - for(i=0; i<9; i++) { + for(i=0; i<10; i++) { addr[i] = ""; } } @@ -1338,10 +1338,11 @@ $(function() { f.od_b_zip2.value = addr[4]; f.od_b_addr1.value = addr[5]; f.od_b_addr2.value = addr[6]; - f.od_b_addr_jibeon.value = addr[7]; - f.ad_subject.value = addr[8]; + f.od_b_addr3.value = addr[7]; + f.od_b_addr_jibeon.value = addr[8]; + f.ad_subject.value = addr[9]; - document.getElementById("od_b_addr_jibeon").innerText = "지번주소 : "+addr[7]; + document.getElementById("od_b_addr_jibeon").innerText = "지번주소 : "+addr[8]; var zip1 = addr[3].replace(/[^0-9]/g, ""); var zip2 = addr[4].replace(/[^0-9]/g, ""); @@ -1733,7 +1734,6 @@ function gumae2baesong(checked) { f.od_b_addr2.value = f.od_addr2.value; f.od_b_addr3.value = f.od_addr3.value; f.od_b_addr_jibeon.value = f.od_addr_jibeon.value; - document.getElementById("od_b_addr3").innerText = document.getElementById("od_addr3").innerText; document.getElementById("od_b_addr_jibeon").innerText = document.getElementById("od_addr_jibeon").innerText; calculate_sendcost(String(f.od_b_zip1.value) + String(f.od_b_zip2.value)); @@ -1747,7 +1747,6 @@ function gumae2baesong(checked) { f.od_b_addr2.value = ""; f.od_b_addr3.value = ""; f.od_b_addr_jibeon.value = ""; - document.getElementById("od_b_addr3").innerText = ""; document.getElementById("od_b_addr_jibeon").innerText = ""; } } diff --git a/shop/orderformupdate.php b/shop/orderformupdate.php index 2bf1c4444..87684ee94 100644 --- a/shop/orderformupdate.php +++ b/shop/orderformupdate.php @@ -373,9 +373,6 @@ if($default['de_tax_flag_use']) { $od_free_mny = (int)$_POST['comm_free_mny']; } -$od_addr2 = get_address2($od_addr2, $od_addr3); -$od_b_addr2 = get_address2($od_b_addr2, $od_b_addr3); - // 주문서에 입력 $sql = " insert {$g5['g5_shop_order_table']} set od_id = '$od_id', @@ -389,6 +386,7 @@ $sql = " insert {$g5['g5_shop_order_table']} od_zip2 = '$od_zip2', od_addr1 = '$od_addr1', od_addr2 = '$od_addr2', + od_addr3 = '$od_addr3', od_addr_jibeon = '$od_addr_jibeon', od_b_name = '$od_b_name', od_b_tel = '$od_b_tel', @@ -397,6 +395,7 @@ $sql = " insert {$g5['g5_shop_order_table']} od_b_zip2 = '$od_b_zip2', od_b_addr1 = '$od_b_addr1', od_b_addr2 = '$od_b_addr2', + od_b_addr3 = '$od_b_addr3', od_b_addr_jibeon = '$od_b_addr_jibeon', od_deposit_name = '$od_deposit_name', od_memo = '$od_memo', @@ -597,7 +596,8 @@ if($is_member) { and ad_zip1 = '$od_b_zip1' and ad_zip2 = '$od_b_zip2' and ad_addr1 = '$od_b_addr1' - and ad_addr2 = '$od_b_addr2' "; + and ad_addr2 = '$od_b_addr2' + and ad_addr3 = '$od_b_addr3' "; $row = sql_fetch($sql); // 기본배송지 체크 @@ -626,6 +626,7 @@ if($is_member) { ad_zip2 = '$od_b_zip2', ad_addr1 = '$od_b_addr1', ad_addr2 = '$od_b_addr2', + ad_addr3 = '$od_b_addr3', ad_jibeon = '$od_b_addr_jibeon' "; } diff --git a/shop/orderinquiryview.php b/shop/orderinquiryview.php index 616dc9167..3b2ae068e 100644 --- a/shop/orderinquiryview.php +++ b/shop/orderinquiryview.php @@ -402,7 +402,7 @@ if(openwin != null) { 주 소 - + E-mail @@ -437,7 +437,7 @@ if(openwin != null) { 주 소 - +