From 58a28e45e7422f2c75359b6cc5408247db305311 Mon Sep 17 00:00:00 2001
From: chicpro <chicpro@sir.co.kr>
Date: Tue, 12 Jul 2016 10:10:18 +0900
Subject: [PATCH] =?UTF-8?q?=EB=B0=B0=EC=86=A1=EC=A7=80=EC=84=A0=ED=83=9D?=
 =?UTF-8?q?=20=EB=95=8C=20=EC=B6=94=EA=B0=80=EB=B0=B0=EC=86=A1=EB=B9=84?=
 =?UTF-8?q?=EA=B4=80=EB=A0=A8=20=EC=8A=A4=ED=81=AC=EB=A6=BD=ED=8A=B8=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mobile/shop/orderform.sub.php | 50 +++++++++++++----------------------
 shop/orderform.sub.php        | 50 +++++++++++++----------------------
 2 files changed, 36 insertions(+), 64 deletions(-)

diff --git a/mobile/shop/orderform.sub.php b/mobile/shop/orderform.sub.php
index 0b69de0f7..5d82ee162 100644
--- a/mobile/shop/orderform.sub.php
+++ b/mobile/shop/orderform.sub.php
@@ -693,10 +693,11 @@ if($is_kakaopay_use) {
 </div>
 
 <script>
+var zipcode = "";
+
 $(function() {
     var $cp_btn_el;
     var $cp_row_el;
-    var zipcode = "";
 
     $(".cp_btn").click(function() {
         $cp_btn_el = $(this);
@@ -944,10 +945,7 @@ $(function() {
         var addr = $(this).val().split(String.fromCharCode(30));
 
         if (addr[0] == "same") {
-            if($(this).is(":checked"))
-                gumae2baesong(true);
-            else
-                gumae2baesong(false);
+            gumae2baesong();
         } else {
             if(addr[0] == "new") {
                 for(i=0; i<10; i++) {
@@ -969,13 +967,10 @@ $(function() {
             var zip1 = addr[3].replace(/[^0-9]/g, "");
             var zip2 = addr[4].replace(/[^0-9]/g, "");
 
-            if(zip1 != "" && zip2 != "") {
-                var code = String(zip1) + String(zip2);
+            var code = String(zip1) + String(zip2);
 
-                if(zipcode != code) {
-                    zipcode = code;
-                    calculate_sendcost(code);
-                }
+            if(zipcode != code) {
+                calculate_sendcost(code);
             }
         }
     });
@@ -1092,6 +1087,8 @@ function calculate_sendcost(code)
             $("input[name=od_send_cost2]").val(data);
             $("#od_send_cost2").text(number_format(String(data)));
 
+            zipcode = code;
+
             calculate_order_price();
         }
     );
@@ -1479,30 +1476,19 @@ function payment_check(f)
 }
 
 // 구매자 정보와 동일합니다.
-function gumae2baesong(checked) {
+function gumae2baesong() {
     var f = document.forderform;
 
-    if(checked == true) {
-        f.od_b_name.value = f.od_name.value;
-        f.od_b_tel.value  = f.od_tel.value;
-        f.od_b_hp.value   = f.od_hp.value;
-        f.od_b_zip.value  = f.od_zip.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;
+    f.od_b_name.value = f.od_name.value;
+    f.od_b_tel.value  = f.od_tel.value;
+    f.od_b_hp.value   = f.od_hp.value;
+    f.od_b_zip.value  = f.od_zip.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;
 
-        calculate_sendcost(String(f.od_b_zip.value));
-    } else {
-        f.od_b_name.value = "";
-        f.od_b_tel.value  = "";
-        f.od_b_hp.value   = "";
-        f.od_b_zip.value = "";
-        f.od_b_addr1.value = "";
-        f.od_b_addr2.value = "";
-        f.od_b_addr3.value = "";
-        f.od_b_addr_jibeon.value = "";
-    }
+    calculate_sendcost(String(f.od_b_zip.value));
 }
 
 <?php if ($default['de_hope_date_use']) { ?>
diff --git a/shop/orderform.sub.php b/shop/orderform.sub.php
index d4bde5724..ab7a99375 100644
--- a/shop/orderform.sub.php
+++ b/shop/orderform.sub.php
@@ -687,10 +687,11 @@ if($is_kakaopay_use) {
 </div>
 
 <script>
+var zipcode = "";
+
 $(function() {
     var $cp_btn_el;
     var $cp_row_el;
-    var zipcode = "";
 
     $(".cp_btn").click(function() {
         $cp_btn_el = $(this);
@@ -934,10 +935,7 @@ $(function() {
         var addr = $(this).val().split(String.fromCharCode(30));
 
         if (addr[0] == "same") {
-            if($(this).is(":checked"))
-                gumae2baesong(true);
-            else
-                gumae2baesong(false);
+            gumae2baesong();
         } else {
             if(addr[0] == "new") {
                 for(i=0; i<10; i++) {
@@ -959,13 +957,10 @@ $(function() {
             var zip1 = addr[3].replace(/[^0-9]/g, "");
             var zip2 = addr[4].replace(/[^0-9]/g, "");
 
-            if(zip1 != "" && zip2 != "") {
-                var code = String(zip1) + String(zip2);
+            var code = String(zip1) + String(zip2);
 
-                if(zipcode != code) {
-                    zipcode = code;
-                    calculate_sendcost(code);
-                }
+            if(zipcode != code) {
+                calculate_sendcost(code);
             }
         }
     });
@@ -1082,6 +1077,8 @@ function calculate_sendcost(code)
             $("input[name=od_send_cost2]").val(data);
             $("#od_send_cost2").text(number_format(String(data)));
 
+            zipcode = code;
+
             calculate_order_price();
         }
     );
@@ -1483,30 +1480,19 @@ function forderform_check(f)
 }
 
 // 구매자 정보와 동일합니다.
-function gumae2baesong(checked) {
+function gumae2baesong() {
     var f = document.forderform;
 
-    if(checked == true) {
-        f.od_b_name.value = f.od_name.value;
-        f.od_b_tel.value  = f.od_tel.value;
-        f.od_b_hp.value   = f.od_hp.value;
-        f.od_b_zip.value  = f.od_zip.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;
+    f.od_b_name.value = f.od_name.value;
+    f.od_b_tel.value  = f.od_tel.value;
+    f.od_b_hp.value   = f.od_hp.value;
+    f.od_b_zip.value  = f.od_zip.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;
 
-        calculate_sendcost(String(f.od_b_zip.value));
-    } else {
-        f.od_b_name.value = "";
-        f.od_b_tel.value  = "";
-        f.od_b_hp.value   = "";
-        f.od_b_zip.value  = "";
-        f.od_b_addr1.value = "";
-        f.od_b_addr2.value = "";
-        f.od_b_addr3.value = "";
-        f.od_b_addr_jibeon.value = "";
-    }
+    calculate_sendcost(String(f.od_b_zip.value));
 }
 
 <?php if ($default['de_hope_date_use']) { ?>