diff --git a/adm/shop_admin/orderform.php b/adm/shop_admin/orderform.php
index 99aed396b..429e6544f 100644
--- a/adm/shop_admin/orderform.php
+++ b/adm/shop_admin/orderform.php
@@ -817,12 +817,9 @@ add_javascript(G5_POSTCODE_JS, 0); //다음 주소 js
| 주문하시는 분 주소 |
-
-
- -
-
-
-
+
+
+
@@ -872,12 +869,9 @@ add_javascript(G5_POSTCODE_JS, 0); //다음 주소 js
|
| 받으시는 분 주소 |
-
-
- -
-
-
-
+
+
+
diff --git a/adm/shop_admin/orderformupdate.php b/adm/shop_admin/orderformupdate.php
index fc425c3c1..1ff37a11c 100644
--- a/adm/shop_admin/orderformupdate.php
+++ b/adm/shop_admin/orderformupdate.php
@@ -3,6 +3,11 @@ $sub_menu = '400400';
include_once('./_common.php');
if($_POST['mod_type'] == 'info') {
+ $od_zip1 = substr($_POST['od_zip'], 0, 3);
+ $od_zip2 = substr($_POST['od_zip'], 3);
+ $od_b_zip1 = substr($_POST['od_b_zip'], 0, 3);
+ $od_b_zip2 = substr($_POST['od_b_zip'], 3);
+
$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 2120f3bfd..461e9f111 100644
--- a/adm/shop_admin/orderprintresult.php
+++ b/adm/shop_admin/orderprintresult.php
@@ -104,7 +104,7 @@ if ($csv == 'csv')
$ct_send_cost = iconv_euckr($ct_send_cost);
}
- echo '"'.$row['od_b_zip1'].'-'.$row['od_b_zip2'].'"'.',';
+ echo '"'.$row['od_b_zip1'].$row['od_b_zip2'].'"'.',';
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]).'"'.',';
@@ -209,7 +209,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, 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'], $row['od_b_addr_jibeon']));
$worksheet->write($i, 2, $row['od_b_name']);
$worksheet->write($i, 3, ' '.$row['od_b_tel']);
@@ -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'], $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_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/orderform.php b/mobile/shop/orderform.php
index 2f00d6aeb..9bd0c86f4 100644
--- a/mobile/shop/orderform.php
+++ b/mobile/shop/orderform.php
@@ -215,7 +215,7 @@ ob_start();
주문금액
적립포인트
-
+
| 주소 |
-
-
- -
-
-
-
+
+
+
@@ -439,12 +436,9 @@ require_once(G5_MSHOP_PATH.'/'.$default['de_pg_service'].'/orderform.1.php');
|
| 주소 |
-
-
- -
-
-
-
+
+
+
@@ -902,12 +896,11 @@ $(function() {
});
$("#od_b_addr2").focus(function() {
- var zip1 = $("#od_b_zip1").val().replace(/[^0-9]/g, "");
- var zip2 = $("#od_b_zip2").val().replace(/[^0-9]/g, "");
- if(zip1 == "" || zip2 == "")
+ var zip = $("#od_b_zip").val().replace(/[^0-9]/g, "");
+ if(zip == "")
return false;
- var code = String(zip1) + String(zip2);
+ var code = String(zip);
if(zipcode == code)
return false;
@@ -949,8 +942,7 @@ $(function() {
f.od_b_name.value = addr[0];
f.od_b_tel.value = addr[1];
f.od_b_hp.value = addr[2];
- f.od_b_zip1.value = addr[3];
- f.od_b_zip2.value = addr[4];
+ f.od_b_zip.value = addr[3] + addr[4];
f.od_b_addr1.value = addr[5];
f.od_b_addr2.value = addr[6];
f.od_b_addr3.value = addr[7];
@@ -1172,7 +1164,7 @@ function pay_approval()
f.rcvr_tel1.value = pf.od_b_tel.value;
f.rcvr_tel2.value = pf.od_b_hp.value;
f.rcvr_mail.value = pf.od_email.value;
- f.rcvr_zipx.value = pf.od_b_zip1.value + pf.od_b_zip2.value;
+ f.rcvr_zipx.value = pf.od_b_zip.value;
f.rcvr_add1.value = pf.od_b_addr1.value;
f.rcvr_add2.value = pf.od_b_addr2.value;
f.settle_method.value = settle_method;
@@ -1301,8 +1293,7 @@ function orderfield_check(f)
check_field(f.od_tel, "주문하시는 분 전화번호를 입력하십시오.");
check_field(f.od_addr1, "주소검색을 이용하여 주문하시는 분 주소를 입력하십시오.");
//check_field(f.od_addr2, " 주문하시는 분의 상세주소를 입력하십시오.");
- check_field(f.od_zip1, "");
- check_field(f.od_zip2, "");
+ check_field(f.od_zip, "");
clear_field(f.od_email);
if(f.od_email.value=='' || f.od_email.value.search(/(\S+)@(\S+)\.(\S+)/) == -1)
@@ -1319,8 +1310,7 @@ function orderfield_check(f)
check_field(f.od_b_tel, "받으시는 분 전화번호를 입력하십시오.");
check_field(f.od_b_addr1, "주소검색을 이용하여 받으시는 분 주소를 입력하십시오.");
//check_field(f.od_b_addr2, "받으시는 분의 상세주소를 입력하십시오.");
- check_field(f.od_b_zip1, "");
- check_field(f.od_b_zip2, "");
+ check_field(f.od_b_zip, "");
var od_settle_bank = document.getElementById("od_settle_bank");
if (od_settle_bank) {
@@ -1454,20 +1444,18 @@ function gumae2baesong(checked) {
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_zip1.value = f.od_zip1.value;
- f.od_b_zip2.value = f.od_zip2.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_zip1.value) + String(f.od_b_zip2.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_zip1.value = "";
- f.od_b_zip2.value = "";
+ f.od_b_zip.value = "";
f.od_b_addr1.value = "";
f.od_b_addr2.value = "";
f.od_b_addr3.value = "";
diff --git a/mobile/shop/orderformupdate.php b/mobile/shop/orderformupdate.php
index b85e01a98..ddb95c9fc 100644
--- a/mobile/shop/orderformupdate.php
+++ b/mobile/shop/orderformupdate.php
@@ -235,8 +235,9 @@ 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);
+$od_b_zip = preg_replace('/[^0-9]/', '', $od_b_zip);
+$od_b_zip1 = substr($od_b_zip, 0, 3);
+$od_b_zip2 = substr($od_b_zip, 3);
$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);
@@ -443,8 +444,9 @@ $od_email = get_email_address($od_email);
$od_name = clean_xss_tags($od_name);
$od_tel = clean_xss_tags($od_tel);
$od_hp = clean_xss_tags($od_hp);
-$od_zip1 = preg_replace('/[^0-9]/', '', $od_zip1);
-$od_zip2 = preg_replace('/[^0-9]/', '', $od_zip2);
+$od_zip = preg_replace('/[^0-9]/', '', $od_zip);
+$od_zip1 = substr($od_zip, 0, 3);
+$od_zip2 = substr($od_zip, 3);
$od_addr1 = clean_xss_tags($od_addr1);
$od_addr2 = clean_xss_tags($od_addr2);
$od_addr3 = clean_xss_tags($od_addr3);
diff --git a/mobile/shop/orderinquiryview.php b/mobile/shop/orderinquiryview.php
index 1f4ec709d..40d24ebfa 100644
--- a/mobile/shop/orderinquiryview.php
+++ b/mobile/shop/orderinquiryview.php
@@ -467,7 +467,7 @@ if($od['od_pg'] == 'lg') {
|
| 주 소 |
- |
+ |
| E-mail |
@@ -503,7 +503,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 e8d3e872a..15e770bb0 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 c50230f8c..11ba98f95 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/orderform.php b/shop/orderform.php
index 317becbff..6f246a3ef 100644
--- a/shop/orderform.php
+++ b/shop/orderform.php
@@ -333,12 +333,9 @@ require_once('./'.$default['de_pg_service'].'/orderform.1.php');
| 주소 |
-
-
- -
-
-
-
+
+
+
@@ -461,12 +458,9 @@ require_once('./'.$default['de_pg_service'].'/orderform.1.php');
|
| 주소 |
-
-
- -
-
-
-
+
+
+
@@ -925,12 +919,11 @@ $(function() {
});
$("#od_b_addr2").focus(function() {
- var zip1 = $("#od_b_zip1").val().replace(/[^0-9]/g, "");
- var zip2 = $("#od_b_zip2").val().replace(/[^0-9]/g, "");
- if(zip1 == "" || zip2 == "")
+ var zip = $("#od_b_zip").val().replace(/[^0-9]/g, "");
+ if(zip == "")
return false;
- var code = String(zip1) + String(zip2);
+ var code = String(zip);
if(zipcode == code)
return false;
@@ -968,8 +961,7 @@ $(function() {
f.od_b_name.value = addr[0];
f.od_b_tel.value = addr[1];
f.od_b_hp.value = addr[2];
- f.od_b_zip1.value = addr[3];
- f.od_b_zip2.value = addr[4];
+ f.od_b_zip.value = addr[3] + addr[4];
f.od_b_addr1.value = addr[5];
f.od_b_addr2.value = addr[6];
f.od_b_addr3.value = addr[7];
@@ -1172,8 +1164,7 @@ function forderform_check(f)
check_field(f.od_tel, "주문하시는 분 전화번호를 입력하십시오.");
check_field(f.od_addr1, "주소검색을 이용하여 주문하시는 분 주소를 입력하십시오.");
//check_field(f.od_addr2, " 주문하시는 분의 상세주소를 입력하십시오.");
- check_field(f.od_zip1, "");
- check_field(f.od_zip2, "");
+ check_field(f.od_zip, "");
clear_field(f.od_email);
if(f.od_email.value=='' || f.od_email.value.search(/(\S+)@(\S+)\.(\S+)/) == -1)
@@ -1190,8 +1181,7 @@ function forderform_check(f)
check_field(f.od_b_tel, "받으시는 분 전화번호를 입력하십시오.");
check_field(f.od_b_addr1, "주소검색을 이용하여 받으시는 분 주소를 입력하십시오.");
//check_field(f.od_b_addr2, "받으시는 분의 상세주소를 입력하십시오.");
- check_field(f.od_b_zip1, "");
- check_field(f.od_b_zip2, "");
+ check_field(f.od_b_zip, "");
var od_settle_bank = document.getElementById("od_settle_bank");
if (od_settle_bank) {
@@ -1389,7 +1379,7 @@ function forderform_check(f)
f.rcvr_tel1.value = f.od_b_tel.value;
f.rcvr_tel2.value = f.od_b_hp.value;
f.rcvr_mail.value = f.od_email.value;
- f.rcvr_zipx.value = f.od_b_zip1.value + f.od_b_zip2.value;
+ f.rcvr_zipx.value = f.od_b_zip.value;
f.rcvr_add1.value = f.od_b_addr1.value;
f.rcvr_add2.value = f.od_b_addr2.value;
@@ -1411,7 +1401,7 @@ function forderform_check(f)
f.LGD_RECEIVER.value = f.od_b_name.value;
f.LGD_RECEIVERPHONE.value = f.od_b_hp.value;
- f.LGD_ESCROW_ZIPCODE.value = f.od_b_zip1.value + f.od_b_zip2.value;
+ f.LGD_ESCROW_ZIPCODE.value = f.od_b_zip.value;
f.LGD_ESCROW_ADDRESS1.value = f.od_b_addr1.value;
f.LGD_ESCROW_ADDRESS2.value = f.od_b_addr2.value;
f.LGD_ESCROW_BUYERPHONE.value = f.od_hp.value;
@@ -1432,7 +1422,7 @@ function forderform_check(f)
f.buyertel.value = f.od_hp.value ? f.od_hp.value : f.od_tel.value;
f.recvname.value = f.od_b_name.value;
f.recvtel.value = f.od_b_hp.value ? f.od_b_hp.value : f.od_b_tel.value;
- f.recvpostnum.value = f.od_b_zip1.value + f.od_b_zip2.value;
+ f.recvpostnum.value = f.od_b_zip.value;
f.recvaddr.value = f.od_b_addr1.value + " " +f.od_b_addr2.value;
if(f.gopaymethod.value != "무통장") {
@@ -1454,20 +1444,18 @@ function gumae2baesong(checked) {
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_zip1.value = f.od_zip1.value;
- f.od_b_zip2.value = f.od_zip2.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_zip1.value) + String(f.od_b_zip2.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_zip1.value = "";
- f.od_b_zip2.value = "";
+ f.od_b_zip.value = "";
f.od_b_addr1.value = "";
f.od_b_addr2.value = "";
f.od_b_addr3.value = "";
diff --git a/shop/orderformupdate.php b/shop/orderformupdate.php
index 119b3967b..cb1041ac1 100644
--- a/shop/orderformupdate.php
+++ b/shop/orderformupdate.php
@@ -220,9 +220,10 @@ 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;
+$od_b_zip = preg_replace('/[^0-9]/', '', $od_b_zip);
+$od_b_zip1 = substr($od_b_zip, 0, 3);
+$od_b_zip2 = substr($od_b_zip, 3);
+$zipcode = $od_b_zip;
$sql = " select sc_id, sc_price from {$g5['g5_shop_sendcost_table']} where sc_zip1 <= '$zipcode' and sc_zip2 >= '$zipcode' ";
$tmp = sql_fetch($sql);
if(!$tmp['sc_id'])
@@ -428,8 +429,9 @@ $od_email = get_email_address($od_email);
$od_name = clean_xss_tags($od_name);
$od_tel = clean_xss_tags($od_tel);
$od_hp = clean_xss_tags($od_hp);
-$od_zip1 = preg_replace('/[^0-9]/', '', $od_zip1);
-$od_zip2 = preg_replace('/[^0-9]/', '', $od_zip2);
+$od_zip = preg_replace('/[^0-9]/', '', $od_zip);
+$od_zip1 = substr($od_zip, 0, 3);
+$od_zip2 = substr($od_zip, 3);
$od_addr1 = clean_xss_tags($od_addr1);
$od_addr2 = clean_xss_tags($od_addr2);
$od_addr3 = clean_xss_tags($od_addr3);
diff --git a/shop/orderinquiryview.php b/shop/orderinquiryview.php
index 1e47f5e9a..2125dfcdd 100644
--- a/shop/orderinquiryview.php
+++ b/shop/orderinquiryview.php
@@ -484,7 +484,7 @@ if($od['od_pg'] == 'lg') {
|
| 주 소 |
- |
+ |
| E-mail |
@@ -519,7 +519,7 @@ if($od['od_pg'] == 'lg') {
| 주 소 |
- |
+ |