From 1ba2e3d20e7869ae082b0df498fee8661ce59f74 Mon Sep 17 00:00:00 2001
From: chicpro <chicpro@gmail.com>
Date: Tue, 19 Aug 2014 13:22:16 +0900
Subject: [PATCH] =?UTF-8?q?=EC=A3=BC=EC=86=8C=EC=9E=85=EB=A0=A5=EA=B4=80?=
 =?UTF-8?q?=EB=A0=A8=20=EC=9E=90=EB=B0=94=EC=8A=A4=ED=81=AC=EB=A6=BD?=
 =?UTF-8?q?=ED=8A=B8=20=EC=BD=94=EB=93=9C=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/orderform.php | 17 +++++------------
 mobile/shop/orderaddress.php |  6 ------
 mobile/shop/orderform.php    | 27 +++++----------------------
 shop/orderaddress.php        |  6 ------
 shop/orderform.php           | 33 ++++++++-------------------------
 5 files changed, 18 insertions(+), 71 deletions(-)

diff --git a/adm/shop_admin/orderform.php b/adm/shop_admin/orderform.php
index 541701b06..5d6061bd5 100644
--- a/adm/shop_admin/orderform.php
+++ b/adm/shop_admin/orderform.php
@@ -97,9 +97,6 @@ if($od['od_pg'] == 'lg') {
         echo '<script language="JavaScript" src="http://pgweb.uplus.co.kr/WEB_SERVER/js/receipt_link.js"></script>'.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"' : '';
 ?>
 
 <section id="anc_sodr_list">
@@ -833,11 +830,9 @@ $juso_b_addr_view = $od['od_b_addr_jibeon'] == 'N' ? 'style="display:none"' : ''
                         <label for="od_addr1">기본주소</label><br>
                         <input type="text" name="od_addr2" value="<?php echo $od['od_addr2']; ?>" id="od_addr2" class="frm_input" size="35">
                         <label for="od_addr2">상세주소</label>
-                        <span <?php echo $juso_addr_view; ?>>
-                            <br>
-                            <input type="text" name="od_addr3" value="<?php echo $od['od_addr3']; ?>" id="od_addr3" class="frm_input" size="35">
-                            <label for="od_addr3">참고항목</label>
-                        </span>
+                        <br>
+                        <input type="text" name="od_addr3" value="<?php echo $od['od_addr3']; ?>" id="od_addr3" class="frm_input" size="35">
+                        <label for="od_addr3">참고항목</label>
                         <input type="hidden" name="od_addr_jibeon" value="<?php echo $od['od_addr_jibeon']; ?>"><br>
                 </tr>
                 <tr>
@@ -889,10 +884,8 @@ $juso_b_addr_view = $od['od_b_addr_jibeon'] == 'N' ? 'style="display:none"' : ''
                         <label for="od_b_addr1">기본주소</label>
                         <input type="text" name="od_b_addr2" value="<?php echo $od['od_b_addr2']; ?>" id="od_b_addr2" class="frm_input" size="35">
                         <label for="od_b_addr2">상세주소</label>
-                        <span <?php echo $juso_b_addr_view; ?>>
-                            <input type="text" name="od_b_addr3" value="<?php echo $od['od_b_addr3']; ?>" id="od_b_addr3" class="frm_input" size="35">
-                            <label for="od_b_addr3">참고항목</label>
-                        </span>
+                        <input type="text" name="od_b_addr3" value="<?php echo $od['od_b_addr3']; ?>" id="od_b_addr3" class="frm_input" size="35">
+                        <label for="od_b_addr3">참고항목</label>
                         <input type="hidden" name="od_b_addr_jibeon" value="<?php echo $od['od_b_addr_jibeon']; ?>"><br>
                     </td>
                 </tr>
diff --git a/mobile/shop/orderaddress.php b/mobile/shop/orderaddress.php
index c0ccb12c7..c6f2cc1f2 100644
--- a/mobile/shop/orderaddress.php
+++ b/mobile/shop/orderaddress.php
@@ -73,12 +73,6 @@ $(function() {
         f.od_b_addr_jibeon.value = addr[8];
         f.ad_subject.value       = addr[9];
 
-        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 ae6beefc9..b8ed1210b 100644
--- a/mobile/shop/orderform.php
+++ b/mobile/shop/orderform.php
@@ -308,7 +308,6 @@ require_once(G5_MSHOP_PATH.'/'.$default['de_pg_service'].'/orderform.1.php');
                 <td><input type="text" name="od_hp" value="<?php echo $member['mb_hp']; ?>" id="od_hp" class="frm_input" maxlength="20"></td>
             </tr>
             <?php $zip_href = G5_BBS_URL.'/zip.php?frm_name=forderform&amp;frm_zip1=od_zip1&amp;frm_zip2=od_zip2&amp;frm_addr1=od_addr1&amp;frm_addr2=od_addr2&amp;frm_addr3=od_addr3&amp;frm_jibeon=od_addr_jibeon';
-            $juso_addr3_view = $member['mb_addr_jibeon'] == 'N' ? 'style="display:none"' : '';
             ?>
             <tr>
                 <th scope="row">주소</th>
@@ -323,11 +322,9 @@ require_once(G5_MSHOP_PATH.'/'.$default['de_pg_service'].'/orderform.1.php');
                     <input type="text" name="od_addr1" value="<?php echo $member['mb_addr1'] ?>" id="od_addr1" required class="frm_input frm_address required">
                     <label for="od_addr2" class="sound_only">상세주소</label>
                     <input type="text" name="od_addr2" value="<?php echo $member['mb_addr2'] ?>" id="od_addr2" class="frm_input frm_address">
-                    <span <?php echo $juso_addr3_view; ?>>
-                        <label for="od_addr3" class="sound_only">참고항목</label>
-                        <input type="text" name="od_addr3" value="<?php echo $member['mb_addr3'] ?>" id="od_addr3" class="frm_input frm_address">
-                        <input type="hidden" name="od_addr_jibeon" value="<?php echo $member['mb_addr_jibeon']; ?>"><br>
-                    </span>
+                    <label for="od_addr3" class="sound_only">참고항목</label>
+                    <input type="text" name="od_addr3" value="<?php echo $member['mb_addr3'] ?>" id="od_addr3" class="frm_input frm_address" readonly="readonly">
+                    <input type="hidden" name="od_addr_jibeon" value="<?php echo $member['mb_addr_jibeon']; ?>"><br>
                 </td>
             </tr>
             <tr>
@@ -453,10 +450,8 @@ require_once(G5_MSHOP_PATH.'/'.$default['de_pg_service'].'/orderform.1.php');
                     <input type="text" name="od_b_addr1" id="od_b_addr1" required class="frm_input frm_address required">
                     <label for="od_b_addr2" class="sound_only">상세주소</label>
                     <input type="text" name="od_b_addr2" id="od_b_addr2" class="frm_input frm_address">
-                    <span>
-                        <label for="od_b_addr3" class="sound_only">참고항목</label>
-                        <input type="text" name="od_b_addr3" id="od_b_addr3" class="frm_input frm_address">
-                    </span>
+                    <label for="od_b_addr3" class="sound_only">참고항목</label>
+                    <input type="text" name="od_b_addr3" id="od_b_addr3" class="frm_input frm_address" readonly="readonly">
                     <input type="hidden" name="od_b_addr_jibeon" value="">
                 </td>
             </tr>
@@ -961,12 +956,6 @@ $(function() {
             f.od_b_addr_jibeon.value = addr[8];
             f.ad_subject.value       = addr[9];
 
-            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, "");
 
@@ -1414,11 +1403,6 @@ function gumae2baesong(checked) {
         f.od_b_addr3.value = f.od_addr3.value;
         f.od_b_addr_jibeon.value = f.od_addr_jibeon.value;
 
-        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 = "";
@@ -1430,7 +1414,6 @@ function gumae2baesong(checked) {
         f.od_b_addr2.value = "";
         f.od_b_addr3.value = "";
         f.od_b_addr_jibeon.value = "";
-        f.od_b_addr3.parentNode.style.display="";
     }
 }
 
diff --git a/shop/orderaddress.php b/shop/orderaddress.php
index 0ec5b78f4..469c9e8ba 100644
--- a/shop/orderaddress.php
+++ b/shop/orderaddress.php
@@ -126,12 +126,6 @@ $(function() {
         f.od_b_addr_jibeon.value = addr[8];
         f.ad_subject.value       = addr[9];
 
-        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 60032de86..8ac5910d4 100644
--- a/shop/orderform.php
+++ b/shop/orderform.php
@@ -325,8 +325,7 @@ require_once('./'.$default['de_pg_service'].'/orderform.1.php');
                 <th scope="row"><label for="od_hp">핸드폰</label></th>
                 <td><input type="text" name="od_hp" value="<?php echo $member['mb_hp']; ?>" id="od_hp" class="frm_input" maxlength="20"></td>
             </tr>
-            <?php $zip_href = G5_BBS_URL.'/zip.php?frm_name=forderform&amp;frm_zip1=od_zip1&amp;frm_zip2=od_zip2&amp;frm_addr1=od_addr1&amp;frm_addr2=od_addr2&amp;frm_addr3=od_addr3&amp;frm_jibeon=od_addr_jibeon'; 
-            $juso_addr3_view = $member['mb_addr_jibeon'] == 'N' ? 'style="display:none"' : '';
+            <?php $zip_href = G5_BBS_URL.'/zip.php?frm_name=forderform&amp;frm_zip1=od_zip1&amp;frm_zip2=od_zip2&amp;frm_addr1=od_addr1&amp;frm_addr2=od_addr2&amp;frm_addr3=od_addr3&amp;frm_jibeon=od_addr_jibeon';
             ?>
             <tr>
                 <th scope="row">주소</th>
@@ -341,12 +340,10 @@ require_once('./'.$default['de_pg_service'].'/orderform.1.php');
                     <label for="od_addr1">기본주소<strong class="sound_only"> 필수</strong></label><br>
                     <input type="text" name="od_addr2" value="<?php echo $member['mb_addr2'] ?>" id="od_addr2" class="frm_input frm_address" size="60">
                     <label for="od_addr2">상세주소</label>
-                    <span <?php echo $juso_addr3_view; ?>>
-                        <br>
-                        <input type="text" name="od_addr3" value="<?php echo $member['mb_addr3'] ?>" id="od_addr3" class="frm_input frm_address" size="60">
-                        <label for="od_addr3">참고항목</label><br>
-                        <input type="hidden" name="od_addr_jibeon" value="<?php echo $member['mb_addr_jibeon']; ?>">
-                    </span>
+                    <br>
+                    <input type="text" name="od_addr3" value="<?php echo $member['mb_addr3'] ?>" id="od_addr3" class="frm_input frm_address" size="60" readonly="readonly">
+                    <label for="od_addr3">참고항목</label><br>
+                    <input type="hidden" name="od_addr_jibeon" value="<?php echo $member['mb_addr_jibeon']; ?>">
                 </td>
             </tr>
             <tr>
@@ -472,11 +469,9 @@ require_once('./'.$default['de_pg_service'].'/orderform.1.php');
                     <label for="od_b_addr1">기본주소<strong class="sound_only"> 필수</strong></label><br>
                     <input type="text" name="od_b_addr2" id="od_b_addr2" class="frm_input frm_address" size="60">
                     <label for="od_b_addr2">상세주소</label>
-                    <span>
-                        <br>
-                        <input type="text" name="od_b_addr3" id="od_b_addr3" readonly="readonly" class="frm_input frm_address" size="60">
-                        <label for="od_b_addr3">참고항목</label><br>
-                    </span>
+                    <br>
+                    <input type="text" name="od_b_addr3" id="od_b_addr3" readonly="readonly" class="frm_input frm_address" size="60">
+                    <label for="od_b_addr3">참고항목</label><br>
                     <input type="hidden" name="od_b_addr_jibeon" value="">
                 </td>
             </tr>
@@ -977,12 +972,6 @@ $(function() {
             f.od_b_addr_jibeon.value = addr[8];
             f.ad_subject.value       = addr[9];
 
-            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, "");
 
@@ -1423,11 +1412,6 @@ function gumae2baesong(checked) {
         f.od_b_addr3.value = f.od_addr3.value;
         f.od_b_addr_jibeon.value = f.od_addr_jibeon.value;
 
-        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 = "";
@@ -1439,7 +1423,6 @@ function gumae2baesong(checked) {
         f.od_b_addr2.value = "";
         f.od_b_addr3.value = "";
         f.od_b_addr_jibeon.value = "";
-        f.od_b_addr3.parentNode.style.display="";
     }
 }