From a4a5a0915d8c14e16bb2ce348fc3e7ebfd5a39dc Mon Sep 17 00:00:00 2001 From: chicpro Date: Mon, 23 Dec 2013 11:39:33 +0900 Subject: [PATCH] =?UTF-8?q?=EB=B0=B0=EC=86=A1=EC=A3=BC=EC=86=8C=EB=A1=9D?= =?UTF-8?q?=EC=97=90=20=EC=A7=80=EB=B2=88=EC=A3=BC=EC=86=8C=20=ED=95=84?= =?UTF-8?q?=EB=93=9C=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- install/gnuboard5shop.sql | 1 + mobile/shop/orderaddress.php | 7 +++-- mobile/shop/orderform.php | 45 ++++++++++++++++++------------- mobile/shop/orderformupdate.php | 3 ++- shop/orderaddress.php | 21 ++++++++------- shop/orderform.php | 47 +++++++++++++++++++-------------- shop/orderformupdate.php | 3 ++- 7 files changed, 75 insertions(+), 52 deletions(-) diff --git a/install/gnuboard5shop.sql b/install/gnuboard5shop.sql index a035e8672..c919f822e 100644 --- a/install/gnuboard5shop.sql +++ b/install/gnuboard5shop.sql @@ -681,6 +681,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_jibeon` varchar(255) NOT NULL DEFAULT '', PRIMARY KEY (`ad_id`), KEY `mb_id` (`mb_id`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; diff --git a/mobile/shop/orderaddress.php b/mobile/shop/orderaddress.php index 66a4dda18..0df050627 100644 --- a/mobile/shop/orderaddress.php +++ b/mobile/shop/orderaddress.php @@ -16,7 +16,7 @@ $order_action_url = G5_HTTPS_SHOP_URL.'/orderaddressupdate.php';
  • @@ -68,7 +68,10 @@ $(function() { f.od_b_zip2.value = addr[4]; f.od_b_addr1.value = addr[5]; f.od_b_addr2.value = addr[6]; - f.ad_subject.value = addr[7]; + f.od_b_addr_jibeon.value = addr[7]; + f.ad_subject.value = addr[8]; + + window.opener.document.getElementById("od_b_addr_jibeon").innerText = "지번주소 : "+addr[7]; 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 ada2d0800..dba19df38 100644 --- a/mobile/shop/orderform.php +++ b/mobile/shop/orderform.php @@ -376,8 +376,8 @@ ob_end_clean(); - - + + @@ -430,7 +430,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_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_jibeon'].$sep.$row['ad_subject']; $addr_list .= '
    '.PHP_EOL; $addr_list .= ''.PHP_EOL; } @@ -444,7 +444,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_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_jibeon'].$sep.$row['ad_subject']; $val2 = ''; $addr_list .= '
    '.PHP_EOL.$val2.PHP_EOL; } @@ -1068,14 +1068,17 @@ $(function() { } var f = document.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.ad_subject.value = addr[7]; + 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]; + + document.getElementById("od_b_addr_jibeon").innerText = "지번주소 : "+addr[7]; var zip1 = addr[3].replace(/[^0-9]/g, ""); var zip2 = addr[4].replace(/[^0-9]/g, ""); @@ -1495,16 +1498,20 @@ function gumae2baesong(checked) { 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; + f.od_b_addr_jibeon.value = f.od_addr_jibeon.value; + 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)); } 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 = ''; + 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 = ""; + f.od_b_addr_jibeon.value = ""; + document.getElementById("od_b_addr_jibeon").innerText = ""; } } diff --git a/mobile/shop/orderformupdate.php b/mobile/shop/orderformupdate.php index 71a4ae22f..4eb74490e 100644 --- a/mobile/shop/orderformupdate.php +++ b/mobile/shop/orderformupdate.php @@ -627,7 +627,8 @@ if($is_member) { ad_zip1 = '$od_b_zip1', ad_zip2 = '$od_b_zip2', ad_addr1 = '$od_b_addr1', - ad_addr2 = '$od_b_addr2' "; + ad_addr2 = '$od_b_addr2', + ad_jibeon = '$od_b_addr_jibeon' "; } sql_query($sql); diff --git a/shop/orderaddress.php b/shop/orderaddress.php index 0ac21172e..10d5af272 100644 --- a/shop/orderaddress.php +++ b/shop/orderaddress.php @@ -67,7 +67,7 @@ $order_action_url = G5_HTTPS_SHOP_URL.'/orderaddressupdate.php'; @@ -108,14 +108,17 @@ $(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.ad_subject.value = addr[7]; + 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]; + + window.opener.document.getElementById("od_b_addr_jibeon").innerText = "지번주소 : "+addr[7]; 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 c414842dd..a942017d9 100644 --- a/shop/orderform.php +++ b/shop/orderform.php @@ -658,8 +658,8 @@ function get_intall_file() - - + + @@ -714,7 +714,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_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_jibeon'].$sep.$row['ad_subject']; $addr_list .= ''.PHP_EOL; $addr_list .= ''.PHP_EOL; } @@ -728,7 +728,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_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_jibeon'].$sep.$row['ad_subject']; $val2 = ''; $addr_list .= ' '.PHP_EOL.$val2.PHP_EOL; } @@ -1321,20 +1321,23 @@ $(function() { gumae2baesong(false); } else { if(addr[0] == "new") { - for(i=0; i<8; i++) { + for(i=0; i<9; i++) { addr[i] = ""; } } var f = document.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.ad_subject.value = addr[7]; + 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]; + + document.getElementById("od_b_addr_jibeon").innerText = "지번주소 : "+addr[7]; var zip1 = addr[3].replace(/[^0-9]/g, ""); var zip2 = addr[4].replace(/[^0-9]/g, ""); @@ -1724,16 +1727,20 @@ function gumae2baesong(checked) { 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; + f.od_b_addr_jibeon.value = f.od_addr_jibeon.value; + 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)); } 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 = ''; + 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 = ""; + f.od_b_addr_jibeon.value = ""; + document.getElementById("od_b_addr_jibeon").innerText = ""; } } diff --git a/shop/orderformupdate.php b/shop/orderformupdate.php index f78629fc4..6b6dcd580 100644 --- a/shop/orderformupdate.php +++ b/shop/orderformupdate.php @@ -622,7 +622,8 @@ if($is_member) { ad_zip1 = '$od_b_zip1', ad_zip2 = '$od_b_zip2', ad_addr1 = '$od_b_addr1', - ad_addr2 = '$od_b_addr2' "; + ad_addr2 = '$od_b_addr2', + ad_jibeon = '$od_b_addr_jibeon' "; } sql_query($sql);