From 46b20261ff5f1d88d7db79377faafadeefb0bd87 Mon Sep 17 00:00:00 2001 From: chicpro Date: Fri, 3 Jan 2014 15:54:46 +0900 Subject: [PATCH] =?UTF-8?q?=EB=8F=84=EB=A1=9C=EB=AA=85=20=EC=A3=BC?= =?UTF-8?q?=EC=86=8C=20=ED=91=9C=EA=B8=B0=EB=B2=95=EC=97=90=20=EB=94=B0?= =?UTF-8?q?=EB=A5=B8=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adm/shop_admin/orderdeliveryexcel.php | 2 +- adm/shop_admin/orderform.php | 14 ++++++++------ adm/shop_admin/orderformupdate.php | 3 +++ adm/shop_admin/orderprintresult.php | 10 +++++----- mobile/shop/mypage.php | 2 +- mobile/shop/orderform.php | 22 +++++++++++++++------- mobile/shop/orderformupdate.php | 3 +++ mobile/shop/orderinquiryview.php | 4 ++-- shop/mail/orderupdate1.mail.php | 4 ++-- shop/mail/orderupdate2.mail.php | 4 ++-- shop/mail/orderupdate3.mail.php | 4 ++-- shop/mypage.php | 2 +- shop/orderform.php | 24 ++++++++++++++++-------- shop/orderformupdate.php | 3 +++ shop/orderinquiryview.php | 4 ++-- 15 files changed, 66 insertions(+), 39 deletions(-) diff --git a/adm/shop_admin/orderdeliveryexcel.php b/adm/shop_admin/orderdeliveryexcel.php index a4993ce4f..052580edc 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, $row['od_b_addr1'].' '.$row['od_b_addr2']); + $worksheet->write($i, 7, print_address($row['od_b_addr1'], $row['od_b_addr2'])); $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 c9d7f99d1..7379cfa2b 100644 --- a/adm/shop_admin/orderform.php +++ b/adm/shop_admin/orderform.php @@ -735,12 +735,13 @@ $result = sql_query($sql); - - 주소 검색
+ 주소 검색
-
+ +
- +
지번주소 : @@ -788,11 +789,12 @@ $result = sql_query($sql); - - 주소 검색
+ 주소 검색
-
+ +
- +
지번주소 : diff --git a/adm/shop_admin/orderformupdate.php b/adm/shop_admin/orderformupdate.php index 34a988944..76254ec86 100644 --- a/adm/shop_admin/orderformupdate.php +++ b/adm/shop_admin/orderformupdate.php @@ -3,6 +3,9 @@ $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', diff --git a/adm/shop_admin/orderprintresult.php b/adm/shop_admin/orderprintresult.php index 039867b07..0238a40cb 100644 --- a/adm/shop_admin/orderprintresult.php +++ b/adm/shop_admin/orderprintresult.php @@ -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 '"'.$row['od_b_addr1'].' '.$row['od_b_addr2'].'"'.','; + echo '"'.print_address($row['od_b_addr1'], $row['od_b_addr2']).'"'.','; echo '"'.$row['od_b_name'].'"'.','; //echo '"'.multibyte_digit((string)$row[od_b_tel]).'"'.','; //echo '"'.multibyte_digit((string)$row[od_b_hp]).'"'.','; @@ -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, $row['od_b_addr1'].' '.$row['od_b_addr2']); + $worksheet->write($i, 1, print_address($row['od_b_addr1'], $row['od_b_addr2'])); $worksheet->write($i, 2, $row['od_b_name']); $worksheet->write($i, 3, $row['od_b_tel']); $worksheet->write($i, 4, $row['od_b_hp']); @@ -146,7 +146,7 @@ if ($csv == 'xls') $worksheet->write($i, 6, $row['ct_qty']); $worksheet->write($i, 7, $row['ct_option']); $worksheet->write($i, 8, $ct_send_cost); - $worksheet->write($i, 9, $row['it_id']); + $worksheet->write($i, 9, ' '.$row['it_id']); $worksheet->write($i, 10, ' '.$row['od_id']); $worksheet->write($i, 11, $row['od_invoice']); $worksheet->write($i, 12, $row['od_memo']); @@ -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'].') '.$row1['od_addr1'].' '.$row1['od_addr2']; - $row1['od_b_addr'] = '('.$row1['od_b_zip1'].'-'.$row1['od_b_zip2'].') '.$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']); + $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_addr']) ? $row1['od_addr'] : '입력안함'; $row1['od_tel'] = ($row1['od_tel']) ? $row1['od_tel'] : '입력안함'; diff --git a/mobile/shop/mypage.php b/mobile/shop/mypage.php index 9e43876c0..89aecde4f 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/orderform.php b/mobile/shop/orderform.php index 07409f5c7..8012181e2 100644 --- a/mobile/shop/orderform.php +++ b/mobile/shop/orderform.php @@ -365,7 +365,7 @@ ob_end_clean(); - + 주소 @@ -377,8 +377,10 @@ ob_end_clean(); 주소 검색
- - + + + + @@ -492,7 +494,7 @@ ob_end_clean(); - + 주소 @@ -504,8 +506,10 @@ ob_end_clean(); 주소 검색
- - + + + + @@ -1065,7 +1069,7 @@ $(function() { gumae2baesong(false); } else { if(addr[0] == "new") { - for(i=0; i<8; i++) { + for(i=0; i<9; i++) { addr[i] = ""; } } @@ -1501,7 +1505,9 @@ 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_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)); @@ -1513,7 +1519,9 @@ function gumae2baesong(checked) { f.od_b_zip2.value = ""; f.od_b_addr1.value = ""; 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 4eb74490e..ae1c6f559 100644 --- a/mobile/shop/orderformupdate.php +++ b/mobile/shop/orderformupdate.php @@ -378,6 +378,9 @@ 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', diff --git a/mobile/shop/orderinquiryview.php b/mobile/shop/orderinquiryview.php index a115d9fc9..22bc1a674 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 fa16a34f8..987b7df57 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 1a57321ae..18bd905ea 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 14191f255..556568188 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/orderform.php b/shop/orderform.php index d150c20eb..51de837a0 100644 --- a/shop/orderform.php +++ b/shop/orderform.php @@ -644,7 +644,7 @@ function get_intall_file() - + 주소 @@ -655,9 +655,11 @@ function get_intall_file() 주소 검색
- - - + + + + + @@ -771,7 +773,7 @@ function get_intall_file() - + 주소 @@ -782,9 +784,11 @@ function get_intall_file() 주소 검색
- - - + + + + + @@ -1727,7 +1731,9 @@ 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_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)); @@ -1739,7 +1745,9 @@ function gumae2baesong(checked) { f.od_b_zip2.value = ""; f.od_b_addr1.value = ""; 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 6b6dcd580..2bf1c4444 100644 --- a/shop/orderformupdate.php +++ b/shop/orderformupdate.php @@ -373,6 +373,9 @@ 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', diff --git a/shop/orderinquiryview.php b/shop/orderinquiryview.php index ceb3e6458..616dc9167 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) { 주 소 - +