From 97d2f2bb85b0979e1a8bdf7e8825dac398b90cba Mon Sep 17 00:00:00 2001 From: chicpro Date: Mon, 18 Aug 2014 14:28:05 +0900 Subject: [PATCH] =?UTF-8?q?=EB=8B=A4=EC=9D=8CAPI=20=EB=8F=84=EB=A1=9C?= =?UTF-8?q?=EB=AA=85=20=EC=A3=BC=EC=86=8C=20=EC=A0=81=EC=9A=A9?= 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 | 20 +++++++++----- adm/shop_admin/orderprintresult.php | 12 ++++---- mobile/shop/mypage.php | 2 +- mobile/shop/orderaddress.php | 8 ++++-- mobile/shop/orderform.php | 34 +++++++++++++++-------- mobile/shop/orderformupdate.php | 5 +++- 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/orderaddress.php | 8 ++++-- shop/orderform.php | 40 ++++++++++++++++++--------- shop/orderformupdate.php | 9 ++++-- shop/orderinquiryview.php | 4 +-- 16 files changed, 104 insertions(+), 58 deletions(-) diff --git a/adm/shop_admin/orderdeliveryexcel.php b/adm/shop_admin/orderdeliveryexcel.php index 704caf529..c232aa51a 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'], $row['od_b_addr3'])); + $worksheet->write($i, 7, print_address($row['od_b_addr1'], $row['od_b_addr2'], $row['od_b_addr3'], $row['od_b_addr_jibeon'])); $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 8f1cb7ca9..541701b06 100644 --- a/adm/shop_admin/orderform.php +++ b/adm/shop_admin/orderform.php @@ -97,6 +97,9 @@ if($od['od_pg'] == 'lg') { echo ''.PHP_EOL; } } + +$juso_addr_view = $od['od_addr_jibeon'] == 'N' ? 'style="display:none"' : ''; +$juso_b_addr_view = $od['od_b_addr_jibeon'] == 'N' ? 'style="display:none"' : ''; ?>
@@ -829,11 +832,13 @@ if($od['od_pg'] == 'lg') {
-
- - + + > +
+ + +
- 지번주소 : @@ -884,10 +889,11 @@ if($od['od_pg'] == 'lg') { - - + > + + +
- 지번주소 : diff --git a/adm/shop_admin/orderprintresult.php b/adm/shop_admin/orderprintresult.php index 97f82bc84..0a4f48825 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 a.od_id, 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, b.it_sc_type + $sql = " SELECT a.od_id, od_b_zip1, od_b_zip2, od_b_addr1, od_b_addr2, od_b_addr3, od_b_addr_jibeon, 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, b.it_sc_type FROM {$g5['g5_shop_order_table']} a, {$g5['g5_shop_cart_table']} b where a.od_id = b.od_id "; if ($case == 1) // 출력기간 @@ -105,7 +105,7 @@ if ($csv == 'csv') } echo '"'.$row['od_b_zip1'].'-'.$row['od_b_zip2'].'"'.','; - echo '"'.print_address($row['od_b_addr1'], $row['od_b_addr2'], $row['od_b_addr3']).'"'.','; + echo '"'.print_address($row['od_b_addr1'], $row['od_b_addr2'], $row['od_b_addr3'], $row['od_b_addr_jibeon']).'"'.','; echo '"'.$row['od_b_name'].'"'.','; //echo '"'.multibyte_digit((string)$row[od_b_tel]).'"'.','; //echo '"'.multibyte_digit((string)$row[od_b_hp]).'"'.','; @@ -134,7 +134,7 @@ if ($csv == 'xls') $fr_date = date_conv($fr_date); $to_date = date_conv($to_date); - $sql = " SELECT a.od_id, 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, b.it_sc_type + $sql = " SELECT a.od_id, od_b_zip1, od_b_zip2, od_b_addr1, od_b_addr2, od_b_addr3, od_b_addr_jibeon, 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, b.it_sc_type FROM {$g5['g5_shop_order_table']} a, {$g5['g5_shop_cart_table']} b where a.od_id = b.od_id "; if ($case == 1) // 출력기간 @@ -210,7 +210,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'], $row['od_b_addr3'])); + $worksheet->write($i, 1, print_address($row['od_b_addr1'], $row['od_b_addr2'], $row['od_b_addr3'], $row['od_b_addr_jibeon'])); $worksheet->write($i, 2, $row['od_b_name']); $worksheet->write($i, 3, $row['od_b_tel']); $worksheet->write($i, 4, $row['od_b_hp']); @@ -291,8 +291,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'], $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_zip1'].'-'.$row1['od_zip2'].') '.print_address($row1['od_addr1'], $row1['od_addr2'], $row1['od_addr3'], $row1['od_addr_jibeon']); + $row1['od_b_addr'] = '('.$row1['od_b_zip1'].'-'.$row1['od_b_zip2'].') '.print_address($row1['od_b_addr1'], $row1['od_b_addr2'], $row1['od_b_addr3'], $row1['od_b_addr_jibeon']); $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 4eed150e1..f6a45c96a 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 37de87059..c0ccb12c7 100644 --- a/mobile/shop/orderaddress.php +++ b/mobile/shop/orderaddress.php @@ -32,7 +32,7 @@ $order_action_url = G5_HTTPS_SHOP_URL.'/orderaddressupdate.php'; > -
+
/
@@ -73,7 +73,11 @@ $(function() { f.od_b_addr_jibeon.value = addr[8]; f.ad_subject.value = addr[9]; - window.opener.document.getElementById("od_b_addr_jibeon").innerText = "지번주소 : "+addr[8]; + if(addr[8] == "N"){ //지번이면 + f.od_b_addr3.parentNode.style.display="none"; + } else { //도로명 또는 그외 + f.od_b_addr3.parentNode.style.display=""; + } 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 cc34949ab..ae6beefc9 100644 --- a/mobile/shop/orderform.php +++ b/mobile/shop/orderform.php @@ -307,7 +307,9 @@ require_once(G5_MSHOP_PATH.'/'.$default['de_pg_service'].'/orderform.1.php'); - + 주소 @@ -321,10 +323,11 @@ require_once(G5_MSHOP_PATH.'/'.$default['de_pg_service'].'/orderform.1.php'); - - -
- + > + + +
+ @@ -450,10 +453,11 @@ require_once(G5_MSHOP_PATH.'/'.$default['de_pg_service'].'/orderform.1.php'); - - + + + + - @@ -957,7 +961,11 @@ $(function() { f.od_b_addr_jibeon.value = addr[8]; f.ad_subject.value = addr[9]; - document.getElementById("od_b_addr_jibeon").innerText = "지번주소 : "+addr[8]; + if(addr[8] == "N"){ //지번이면 + f.od_b_addr3.parentNode.style.display="none"; + } else { + f.od_b_addr3.parentNode.style.display=""; + } var zip1 = addr[3].replace(/[^0-9]/g, ""); var zip2 = addr[4].replace(/[^0-9]/g, ""); @@ -1405,8 +1413,12 @@ 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_addr_jibeon").innerText = document.getElementById("od_addr_jibeon").innerText; + if(f.od_addr_jibeon.value == "N"){ //지번이면 + f.od_b_addr3.parentNode.style.display="none"; + } else { + f.od_b_addr3.parentNode.style.display=""; + } calculate_sendcost(String(f.od_b_zip1.value) + String(f.od_b_zip2.value)); } else { f.od_b_name.value = ""; @@ -1418,7 +1430,7 @@ function gumae2baesong(checked) { f.od_b_addr2.value = ""; f.od_b_addr3.value = ""; f.od_b_addr_jibeon.value = ""; - document.getElementById("od_b_addr_jibeon").innerText = ""; + f.od_b_addr3.parentNode.style.display=""; } } diff --git a/mobile/shop/orderformupdate.php b/mobile/shop/orderformupdate.php index 10230584f..ade2cdf51 100644 --- a/mobile/shop/orderformupdate.php +++ b/mobile/shop/orderformupdate.php @@ -225,6 +225,8 @@ if ((int)($send_cost - $tot_sc_cp_price) !== (int)($i_send_cost - $i_send_coupon } // 추가배송비가 상이함 +$od_b_zip1 = preg_replace('/[^0-9]/', '', $od_b_zip1); +$od_b_zip2 = preg_replace('/[^0-9]/', '', $od_b_zip2); $zipcode = $od_b_zip1 . $od_b_zip2; $sql = " select sc_id, sc_price from {$g5['g5_shop_sendcost_table']} where sc_zip1 <= '$zipcode' and sc_zip2 >= '$zipcode' "; $tmp = sql_fetch($sql); @@ -697,7 +699,8 @@ if($is_member) { if($row['ad_id']){ $sql = " update {$g5['g5_shop_order_address_table']} set ad_default = '$ad_default', - ad_subject = '$ad_subject' + ad_subject = '$ad_subject', + ad_jibeon = '$od_b_addr_jibeon' where mb_id = '{$member['mb_id']}' and ad_id = '{$row['ad_id']}' "; } else { diff --git a/mobile/shop/orderinquiryview.php b/mobile/shop/orderinquiryview.php index 8675e8a15..82acdddcf 100644 --- a/mobile/shop/orderinquiryview.php +++ b/mobile/shop/orderinquiryview.php @@ -460,7 +460,7 @@ if($od['od_pg'] == 'lg') { 주 소 - + E-mail @@ -496,7 +496,7 @@ if($od['od_pg'] == 'lg') { 주 소 - + 주소 - + @@ -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 cf9e985c7..e8d3e872a 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 0c12420a5..c50230f8c 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 51d3f625d..24ad33ed9 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 b37617216..0ec5b78f4 100644 --- a/shop/orderaddress.php +++ b/shop/orderaddress.php @@ -86,7 +86,7 @@ $order_action_url = G5_HTTPS_SHOP_URL.'/orderaddressupdate.php';
- + @@ -126,7 +126,11 @@ $(function() { f.od_b_addr_jibeon.value = addr[8]; f.ad_subject.value = addr[9]; - window.opener.document.getElementById("od_b_addr_jibeon").innerText = "지번주소 : "+addr[8]; + if(addr[8] == "N"){ //지번이면 + f.od_b_addr3.parentNode.style.display="none"; + } else { //도로명 또는 그외 + f.od_b_addr3.parentNode.style.display=""; + } 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 a3849f192..60032de86 100644 --- a/shop/orderform.php +++ b/shop/orderform.php @@ -325,7 +325,9 @@ require_once('./'.$default['de_pg_service'].'/orderform.1.php'); - + 주소 @@ -338,11 +340,13 @@ require_once('./'.$default['de_pg_service'].'/orderform.1.php');
-
- -
- - + + > +
+ +
+ + @@ -467,11 +471,13 @@ require_once('./'.$default['de_pg_service'].'/orderform.1.php');
-
- -
+ + +
+ +
+ - @@ -971,7 +977,11 @@ $(function() { f.od_b_addr_jibeon.value = addr[8]; f.ad_subject.value = addr[9]; - document.getElementById("od_b_addr_jibeon").innerText = "지번주소 : "+addr[8]; + if(addr[8] == "N"){ //지번이면 + f.od_b_addr3.parentNode.style.display="none"; + } else { + f.od_b_addr3.parentNode.style.display=""; + } var zip1 = addr[3].replace(/[^0-9]/g, ""); var zip2 = addr[4].replace(/[^0-9]/g, ""); @@ -1412,8 +1422,12 @@ 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_addr_jibeon").innerText = document.getElementById("od_addr_jibeon").innerText; + if(f.od_addr_jibeon.value == "N"){ //지번이면 + f.od_b_addr3.parentNode.style.display="none"; + } else { + f.od_b_addr3.parentNode.style.display=""; + } calculate_sendcost(String(f.od_b_zip1.value) + String(f.od_b_zip2.value)); } else { f.od_b_name.value = ""; @@ -1425,7 +1439,7 @@ function gumae2baesong(checked) { f.od_b_addr2.value = ""; f.od_b_addr3.value = ""; f.od_b_addr_jibeon.value = ""; - document.getElementById("od_b_addr_jibeon").innerText = ""; + f.od_b_addr3.parentNode.style.display=""; } } diff --git a/shop/orderformupdate.php b/shop/orderformupdate.php index 98aa99b70..fe044c8a6 100644 --- a/shop/orderformupdate.php +++ b/shop/orderformupdate.php @@ -219,6 +219,8 @@ if ((int)($send_cost - $tot_sc_cp_price) !== (int)($i_send_cost - $i_send_coupon } // 추가배송비가 상이함 +$od_b_zip1 = preg_replace('/[^0-9]/', '', $od_b_zip1); +$od_b_zip2 = preg_replace('/[^0-9]/', '', $od_b_zip2); $zipcode = $od_b_zip1 . $od_b_zip2; $sql = " select sc_id, sc_price from {$g5['g5_shop_sendcost_table']} where sc_zip1 <= '$zipcode' and sc_zip2 >= '$zipcode' "; $tmp = sql_fetch($sql); @@ -403,8 +405,8 @@ if($default['de_tax_flag_use']) { $od_free_mny = (int)$_POST['comm_free_mny']; } -$od_pg = $default['de_pg_service']; -$od_email = get_email_address($od_email); +$od_pg = $default['de_pg_service']; +$od_email = get_email_address($od_email); // 주문서에 입력 $sql = " insert {$g5['g5_shop_order_table']} @@ -691,7 +693,8 @@ if($is_member) { if($row['ad_id']){ $sql = " update {$g5['g5_shop_order_address_table']} set ad_default = '$ad_default', - ad_subject = '$ad_subject' + ad_subject = '$ad_subject', + ad_jibeon = '$od_b_addr_jibeon' where mb_id = '{$member['mb_id']}' and ad_id = '{$row['ad_id']}' "; } else { diff --git a/shop/orderinquiryview.php b/shop/orderinquiryview.php index e1cd86f33..b90e47d3f 100644 --- a/shop/orderinquiryview.php +++ b/shop/orderinquiryview.php @@ -477,7 +477,7 @@ if($od['od_pg'] == 'lg') { 주 소 - + E-mail @@ -512,7 +512,7 @@ if($od['od_pg'] == 'lg') { 주 소 - +