From 3d524321d2ec1efeb4d817093f6ca191ab831bf7 Mon Sep 17 00:00:00 2001
From: chicpro <chicpro@gmail.com>
Date: Tue, 17 Dec 2013 14:23:38 +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=EA=B2=80=EC=83=89=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 adm/shop_admin/orderform.php       | 16 ++++++++++------
 adm/shop_admin/orderformupdate.php |  4 +++-
 extend/shop.extend2.php            |  7 +++++++
 install/gnuboard5shop.sql          |  2 ++
 mobile/shop/orderform.php          | 12 ++++++++----
 mobile/shop/orderformupdate.php    |  2 ++
 shop/orderform.php                 | 12 ++++++++----
 shop/orderformupdate.php           |  2 ++
 8 files changed, 42 insertions(+), 15 deletions(-)

diff --git a/adm/shop_admin/orderform.php b/adm/shop_admin/orderform.php
index 52361b661..cc7557922 100644
--- a/adm/shop_admin/orderform.php
+++ b/adm/shop_admin/orderform.php
@@ -737,13 +737,15 @@ $result = sql_query($sql);
                         <input type="text" name="od_zip2" value="<?php echo $od['od_zip2']; ?>" id="od_zip2" required class="frm_input required" size="4">
                         <span id="od_win_zip" style="display:block"></span>
                         <label for="od_addr1" class="sound_only">주소</label>
-                        <input type="text" name="od_addr1" value="<?php echo $od['od_addr1']; ?>" id="od_addr1" required class="frm_input required" size="30"><br>
+                        <input type="text" name="od_addr1" value="<?php echo $od['od_addr1']; ?>" id="od_addr1" required class="frm_input required" size="50"><br>
                         <label for="od_addr2" class="sound_only">상세주소</label>
-                        <input type="text" name="od_addr2" value="<?php echo $od['od_addr2']; ?>" id="od_addr2" required class="frm_input required" size="30">
+                        <input type="text" name="od_addr2" value="<?php echo $od['od_addr2']; ?>" id="od_addr2" required class="frm_input required" size="50">
+                        <input type="hidden" name="od_addr_jibeon" value="">
+                        <br><span id="od_addr_jibeon">지번주소 : <?php echo $od['od_addr_jibeon']; ?></span>
 
                         <script>
                         // 우편번호 자바스크립트 비활성화 대응을 위한 코드
-                        $('<a href="<?php echo G5_BBS_URL; ?>/zip.php?frm_name=frmorderform2&amp;frm_zip1=od_zip1&amp;frm_zip2=od_zip2&amp;frm_addr1=od_addr1&amp;frm_addr2=od_addr2" id="od_zip_find" class="btn_frmline win_zip_find" target="_blank">우편번호 검색</a><br>').appendTo('#od_win_zip');
+                        $('<a href="<?php echo G5_BBS_URL; ?>/zip.php?frm_name=frmorderform3&amp;frm_zip1=od_zip1&amp;frm_zip2=od_zip2&amp;frm_addr1=od_addr1&amp;frm_addr2=od_addr2&amp;frm_jibeon=od_addr_jibeon" id="od_zip_find" class="btn_frmline win_zip_find" target="_blank">주소 검색</a><br>').appendTo('#od_win_zip');
                         $("#od_win_zip").css("display", "inline");
                         $("#od_zip1, #od_zip2, #od_addr1").attr('readonly', 'readonly');
                         $("#od_zip1, #od_zip2, #od_addr1").addClass('readonly');
@@ -795,13 +797,15 @@ $result = sql_query($sql);
                         <input type="text" name="od_b_zip2" value="<?php echo $od['od_b_zip2']; ?>" id="od_b_zip2" required class="frm_input required" size="4">
                         <span id="od_win_zipb" style="display:block"></span>
                         <label for="od_b_addr1" class="sound_only">주소</label>
-                        <input type="text" name="od_b_addr1" value="<?php echo $od['od_b_addr1']; ?>" id="od_b_addr1" required class="frm_input required" size="30"><br>
+                        <input type="text" name="od_b_addr1" value="<?php echo $od['od_b_addr1']; ?>" id="od_b_addr1" required class="frm_input required" size="50"><br>
                         <label for="od_b_addr2" class="sound_only">상세주소</label>
-                        <input type="text" name="od_b_addr2" value="<?php echo $od['od_b_addr2']; ?>" id="od_b_addr2" required class="frm_input required" size="30">
+                        <input type="text" name="od_b_addr2" value="<?php echo $od['od_b_addr2']; ?>" id="od_b_addr2" required class="frm_input required" size="50">
+                        <input type="hidden" name="od_b_addr_jibeon" value="">
+                        <br><span id="od_b_addr_jibeon">지번주소 : <?php echo $od['od_b_addr_jibeon']; ?></span>
 
                         <script>
                         // 우편번호 자바스크립트 비활성화 대응을 위한 코드
-                        $('<a href="<?php echo G5_BBS_URL; ?>/zip.php?frm_name=frmorderform2&amp;frm_zip1=od_b_zip1&amp;frm_zip2=od_b_zip2&amp;frm_addr1=od_b_addr1&amp;frm_addr2=od_b_addr2" id="od_zip_findb" class="btn_frmline win_zip_find" target="_blank">우편번호 검색</a><br>').appendTo('#od_win_zipb');
+                        $('<a href="<?php echo G5_BBS_URL; ?>/zip.php?frm_name=frmorderform3&amp;frm_zip1=od_b_zip1&amp;frm_zip2=od_b_zip2&amp;frm_addr1=od_b_addr1&amp;frm_addr2=od_b_addr2&amp;frm_jibeon=od_b_addr_jibeon" id="od_zip_findb" class="btn_frmline win_zip_find" target="_blank">주소 검색</a><br>').appendTo('#od_win_zipb');
                         $("#od_win_zipb").css("display", "inline");
                         $("#od_b_zip1, #od_b_zip2, #od_b_addr1").attr('readonly', 'readonly');
                         $("#od_b_zip1, #od_b_zip2, #od_b_addr1").addClass('readonly');
diff --git a/adm/shop_admin/orderformupdate.php b/adm/shop_admin/orderformupdate.php
index e7d8e1b91..34a988944 100644
--- a/adm/shop_admin/orderformupdate.php
+++ b/adm/shop_admin/orderformupdate.php
@@ -11,6 +11,7 @@ if($_POST['mod_type'] == 'info') {
                     od_zip2 = '$od_zip2',
                     od_addr1 = '$od_addr1',
                     od_addr2 = '$od_addr2',
+                    od_addr_jibeon = '$od_addr_jibeon',
                     od_email = '$od_email',
                     od_b_name = '$od_b_name',
                     od_b_tel = '$od_b_tel',
@@ -18,7 +19,8 @@ if($_POST['mod_type'] == 'info') {
                     od_b_zip1 = '$od_b_zip1',
                     od_b_zip2 = '$od_b_zip2',
                     od_b_addr1 = '$od_b_addr1',
-                    od_b_addr2 = '$od_b_addr2' ";
+                    od_b_addr2 = '$od_b_addr2',
+                    od_b_addr_jibeon = '$od_b_addr_jibeon' ";
     if ($default['de_hope_date_use'])
         $sql .= " , od_hope_date = '$od_hope_date' ";
 } else {
diff --git a/extend/shop.extend2.php b/extend/shop.extend2.php
index 1c5f2d6a4..3c99d664c 100644
--- a/extend/shop.extend2.php
+++ b/extend/shop.extend2.php
@@ -743,4 +743,11 @@ if(!sql_query(" select nw_device from {$g5['g5_shop_new_win_table']} limit 1 ",
     sql_query(" ALTER TABLE `{$g5['g5_shop_new_win_table']}`
                     ADD `nw_device` varchar(10) NOT NULL DEFAULT 'both' AFTER `nw_id` ", true);
 }
+
+// 주문정보 지번주소 필드 추가
+if(!sql_query(" select od_addr_jibeon from {$g5['g5_shop_order_table']} limit 1 ", false)) {
+    sql_query(" ALTER TABLE `{$g5['g5_shop_order_table']}`
+                    ADD `od_addr_jibeon` varchar(255) NOT NULL DEFAULT '' AFTER `od_addr2`,
+                    ADD `od_b_addr_jibeon` varchar(255) NOT NULL DEFAULT '' AFTER `od_b_addr2` ", true);
+}
 ?>
diff --git a/install/gnuboard5shop.sql b/install/gnuboard5shop.sql
index 514761384..a035e8672 100644
--- a/install/gnuboard5shop.sql
+++ b/install/gnuboard5shop.sql
@@ -611,6 +611,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_addr_jibeon` varchar(255) NOT NULL DEFAULT '',
   `od_deposit_name` varchar(20) NOT NULL DEFAULT '',
   `od_b_name` varchar(20) NOT NULL DEFAULT '',
   `od_b_tel` varchar(20) NOT NULL DEFAULT '',
@@ -619,6 +620,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_addr_jibeon` varchar(255) NOT NULL DEFAULT '',
   `od_memo` text NOT NULL,
   `od_cart_count` int(11) NOT NULL DEFAULT '0',
   `od_cart_price` int(11) NOT NULL DEFAULT '0',
diff --git a/mobile/shop/orderform.php b/mobile/shop/orderform.php
index cf5b5bafd..7ae455059 100644
--- a/mobile/shop/orderform.php
+++ b/mobile/shop/orderform.php
@@ -362,7 +362,7 @@ ob_end_clean();
                 <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'; ?>
+            <?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_jibeon=od_addr_jibeon'; ?>
             <tr>
                 <th scope="row">주소</th>
                 <td>
@@ -376,9 +376,11 @@ ob_end_clean();
                     <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">상세주소<strong class="sound_only"> 필수</strong></label>
                     <input type="text" name="od_addr2" value="<?php echo $member['mb_addr2'] ?>" id="od_addr2" required class="frm_input frm_address required">
+                    <input type="hidden" name="od_addr_jibeon" value="">
+                    <br><span id="od_addr_jibeon"></span>
                     <script>
                     // 우편번호 자바스크립트 비활성화 대응을 위한 코드
-                    $('<a href="<?php echo $zip_href; ?>" class="btn_frmline win_zip_find" target="_blank">우편번호 검색</a><br>').appendTo('#od_win_zip');
+                    $('<a href="<?php echo $zip_href; ?>" class="btn_frmline win_zip_find" target="_blank">주소 검색</a><br>').appendTo('#od_win_zip');
                     $("#od_win_zip").css("display", "inline");
                     $("#od_zip1, #od_zip2, #od_addr1").attr('readonly', 'readonly');
                     </script>
@@ -493,7 +495,7 @@ ob_end_clean();
                 <th scope="row"><label for="od_b_hp">핸드폰</label></th>
                 <td><input type="text" name="od_b_hp" id="od_b_hp" class="frm_input" maxlength="20"></td>
             </tr>
-            <?php $zip_href = G5_BBS_URL.'/zip.php?frm_name=forderform&amp;frm_zip1=od_b_zip1&amp;frm_zip2=od_b_zip2&amp;frm_addr1=od_b_addr1&amp;frm_addr2=od_b_addr2'; ?>
+            <?php $zip_href = G5_BBS_URL.'/zip.php?frm_name=forderform&amp;frm_zip1=od_b_zip1&amp;frm_zip2=od_b_zip2&amp;frm_addr1=od_b_addr1&amp;frm_addr2=od_b_addr2&amp;frm_jibeon=od_b_addr_jibeon'; ?>
             <tr>
                 <th scope="row">주소</th>
                 <td id="sod_frm_addr">
@@ -507,9 +509,11 @@ ob_end_clean();
                     <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">상세주소<strong class="sound_only"> 필수</strong></label>
                     <input type="text" name="od_b_addr2" id="od_b_addr2" required class="frm_input frm_address required">
+                    <input type="hidden" name="od_b_addr_jibeon" value="">
+                    <br><span id="od_b_addr_jibeon"></span>
                     <script>
                     // 우편번호 자바스크립트 비활성화 대응을 위한 코드
-                    $('<a href="<?php echo $zip_href; ?>" class="btn_frmline win_zip_find" target="_blank">우편번호 검색</a>').appendTo('#od_winb_zip');
+                    $('<a href="<?php echo $zip_href; ?>" class="btn_frmline win_zip_find" target="_blank">주소 검색</a>').appendTo('#od_winb_zip');
                     $("#od_winb_zip").css("display", "inline");
                     $("#od_b_zip1, #od_b_zip2, #od_b_addr1").attr('readonly', 'readonly');
                     </script>
diff --git a/mobile/shop/orderformupdate.php b/mobile/shop/orderformupdate.php
index 7f266f014..71a4ae22f 100644
--- a/mobile/shop/orderformupdate.php
+++ b/mobile/shop/orderformupdate.php
@@ -391,6 +391,7 @@ $sql = " insert {$g5['g5_shop_order_table']}
                 od_zip2           = '$od_zip2',
                 od_addr1          = '$od_addr1',
                 od_addr2          = '$od_addr2',
+                od_addr_jibeon    = '$od_addr_jibeon',
                 od_b_name         = '$od_b_name',
                 od_b_tel          = '$od_b_tel',
                 od_b_hp           = '$od_b_hp',
@@ -398,6 +399,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_addr_jibeon  = '$od_b_addr_jibeon',
                 od_deposit_name   = '$od_deposit_name',
                 od_memo           = '$od_memo',
                 od_cart_count     = '$cart_count',
diff --git a/shop/orderform.php b/shop/orderform.php
index 3f62de8e6..6d3ecc0f4 100644
--- a/shop/orderform.php
+++ b/shop/orderform.php
@@ -644,7 +644,7 @@ function get_intall_file()
                 <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'; ?>
+            <?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_jibeon=od_addr_jibeon'; ?>
             <tr>
                 <th scope="row">주소</th>
                 <td>
@@ -658,9 +658,11 @@ function get_intall_file()
                     <input type="text" name="od_addr1" value="<?php echo $member['mb_addr1'] ?>" id="od_addr1" required class="frm_input frm_address required" size="50">
                     <label for="od_addr2" class="sound_only">상세주소<strong class="sound_only"> 필수</strong></label>
                     <input type="text" name="od_addr2" value="<?php echo $member['mb_addr2'] ?>" id="od_addr2" required class="frm_input frm_address required" size="50">
+                    <input type="hidden" name="od_addr_jibeon" value="">
+                    <br><span id="od_addr_jibeon"></span>
                     <script>
                     // 우편번호 자바스크립트 비활성화 대응을 위한 코드
-                    $('<a href="<?php echo $zip_href; ?>" class="btn_frmline win_zip_find" target="_blank">우편번호 검색</a><br>').appendTo('#od_win_zip');
+                    $('<a href="<?php echo $zip_href; ?>" class="btn_frmline win_zip_find" target="_blank">주소 검색</a><br>').appendTo('#od_win_zip');
                     $("#od_win_zip").css("display", "inline");
                     $("#od_zip1, #od_zip2, #od_addr1").attr('readonly', 'readonly');
                     </script>
@@ -775,7 +777,7 @@ function get_intall_file()
                 <th scope="row"><label for="od_b_hp">핸드폰</label></th>
                 <td><input type="text" name="od_b_hp" id="od_b_hp" class="frm_input" maxlength="20"></td>
             </tr>
-            <?php $zip_href = G5_BBS_URL.'/zip.php?frm_name=forderform&amp;frm_zip1=od_b_zip1&amp;frm_zip2=od_b_zip2&amp;frm_addr1=od_b_addr1&amp;frm_addr2=od_b_addr2'; ?>
+            <?php $zip_href = G5_BBS_URL.'/zip.php?frm_name=forderform&amp;frm_zip1=od_b_zip1&amp;frm_zip2=od_b_zip2&amp;frm_addr1=od_b_addr1&amp;frm_addr2=od_b_addr2&amp;frm_jibeon=od_b_addr_jibeon'; ?>
             <tr>
                 <th scope="row">주소</th>
                 <td id="sod_frm_addr">
@@ -789,9 +791,11 @@ function get_intall_file()
                     <input type="text" name="od_b_addr1" id="od_b_addr1" required class="frm_input frm_address required" size="50">
                     <label for="od_b_addr2" class="sound_only">상세주소<strong class="sound_only"> 필수</strong></label>
                     <input type="text" name="od_b_addr2" id="od_b_addr2" required class="frm_input frm_address required" size="50">
+                    <input type="hidden" name="od_b_addr_jibeon" value="">
+                    <br><span id="od_b_addr_jibeon"></span>
                     <script>
                     // 우편번호 자바스크립트 비활성화 대응을 위한 코드
-                    $('<a href="<?php echo $zip_href; ?>" class="btn_frmline win_zip_find" target="_blank">우편번호 검색</a><br>').appendTo('#od_winb_zip');
+                    $('<a href="<?php echo $zip_href; ?>" class="btn_frmline win_zip_find" target="_blank">주소 검색</a><br>').appendTo('#od_winb_zip');
                     $("#od_winb_zip").css("display", "inline");
                     $("#od_b_zip1, #od_b_zip2, #od_b_addr1").attr('readonly', 'readonly');
                     </script>
diff --git a/shop/orderformupdate.php b/shop/orderformupdate.php
index 66f8bc002..f78629fc4 100644
--- a/shop/orderformupdate.php
+++ b/shop/orderformupdate.php
@@ -386,6 +386,7 @@ $sql = " insert {$g5['g5_shop_order_table']}
                 od_zip2           = '$od_zip2',
                 od_addr1          = '$od_addr1',
                 od_addr2          = '$od_addr2',
+                od_addr_jibeon    = '$od_addr_jibeon',
                 od_b_name         = '$od_b_name',
                 od_b_tel          = '$od_b_tel',
                 od_b_hp           = '$od_b_hp',
@@ -393,6 +394,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_addr_jibeon  = '$od_b_addr_jibeon',
                 od_deposit_name   = '$od_deposit_name',
                 od_memo           = '$od_memo',
                 od_cart_count     = '$cart_count',