From 73b4b2d834cf1e5fdd8c8c87f223e2986f3d741a Mon Sep 17 00:00:00 2001 From: nemoluv Date: Tue, 24 Sep 2013 10:01:39 +0900 Subject: [PATCH 01/35] =?UTF-8?q?#301=20=EC=9E=91=EC=97=85=EC=A4=91=20?= =?UTF-8?q?=EB=B8=8C=EB=9E=9C=EC=B9=98=20=EC=9D=B4=EB=8F=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- shop/orderform.php | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/shop/orderform.php b/shop/orderform.php index 1707db5e7..ed842e945 100644 --- a/shop/orderform.php +++ b/shop/orderform.php @@ -704,7 +704,15 @@ function get_intall_file() - + + + '.PHP_EOL.' + '; + } + ?> + Date: Tue, 24 Sep 2013 18:08:22 +0900 Subject: [PATCH 02/35] =?UTF-8?q?#301=20=EC=9E=91=EC=97=85=EC=A4=91=20?= =?UTF-8?q?=EB=B8=8C=EB=9E=9C=EC=B9=98=20=EC=9D=B4=EB=8F=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- shop/orderaddress.php | 11 +++++- shop/orderform.php | 78 +++++++++++++++++++------------------------ 2 files changed, 44 insertions(+), 45 deletions(-) diff --git a/shop/orderaddress.php b/shop/orderaddress.php index 293bddf84..52dc93559 100644 --- a/shop/orderaddress.php +++ b/shop/orderaddress.php @@ -35,7 +35,11 @@ include_once(G5_PATH.'/head.sub.php'); + + @@ -49,7 +53,9 @@ include_once(G5_PATH.'/head.sub.php'); $addr = $row['ad_name'].$sep.$row['ad_tel'].$sep.$row['ad_hp'].$sep.$row['ad_zip1'].$sep.$row['ad_zip2'].$sep.$row['ad_addr1'].$sep.$row['ad_addr2'].$sep.$row['ad_subject']; ?> - + + + @@ -64,6 +70,9 @@ include_once(G5_PATH.'/head.sub.php'); ?>
+ + 배송지명기본
배송지		 이름 전화번호 주소
+
+ +
diff --git a/shop/orderaddress_update.php b/shop/orderaddress_update.php index fb223e592..337617194 100644 --- a/shop/orderaddress_update.php +++ b/shop/orderaddress_update.php @@ -1,66 +1,33 @@ "; -echo $ad_default."디폴트값
"; -echo $ad_subject. "제목
"; -echo $row['ad_id']. "고유 아이디
"; -//goto_url(G5_SHOP_URL.'/orderaddress.php?od_id='.$od_id.'&uid='.$uid); +goto_url(G5_SHOP_URL.'/orderaddress.php?od_id='.$od_id.'&uid='.$uid); ?> \ No newline at end of file diff --git a/shop/orderformupdate.php b/shop/orderformupdate.php index c37466060..5038114b5 100644 --- a/shop/orderformupdate.php +++ b/shop/orderformupdate.php @@ -576,12 +576,44 @@ if (get_session('ss_direct')) set_session('ss_cart_direct', ''); // 배송지처리 -if($is_member && ($add_address || $ad_default)) { +if($is_member) { $ad_zip1 = $od_b_zip1; $ad_zip2 = $od_b_zip2; $ad_addr1 = $od_b_addr1; $ad_addr2 = $od_b_addr2; + $sql = " select count(*) as count from {$g5['g5_shop_order_address_table']} + where mb_id = '{$member['mb_id']}' + and ad_subject = '{$_POST['od_b_subject']}' + and ad_name = '{$_POST['od_b_name']}' + and ad_tel = '{$_POST['od_b_tel']}' + and ad_hp = '{$_POST['od_b_hp']}' + and ad_zip1 = '{$_POST['od_b_zip1']}' + and ad_zip2 = '{$_POST['od_b_zip2']}' + and ad_addr1 = '{$_POST['od_b_addr1']}' + and ad_addr2 = '{$_POST['od_b_addr2']}' "; + + $row = sql_fetch($sql); + + if(!$row['count']){ + $sql = " insert into {$g5['g5_shop_order_address_table']} + set mb_id = '{$member['mb_id']}', + ad_subject = '$ad_subject', + ad_default = '$ad_default', + ad_name = '$od_b_name', + ad_tel = '$od_b_tel', + ad_hp = '$od_b_hp', + ad_zip1 = '$od_b_zip1', + ad_zip2 = '$od_b_zip2', + ad_addr1 = '$od_b_addr1', + ad_addr2 = '$od_b_addr2' "; + sql_query($sql); + echo "됏다"; + } + + +//print_r ($row); + $sql = " select ad_id from {$g5['g5_shop_order_address_table']} where mb_id = '{$member['mb_id']}' From 5c369ee04c9e47156c9e61b3c61a10a115dc4145 Mon Sep 17 00:00:00 2001 From: nemoluv Date: Mon, 30 Sep 2013 09:57:17 +0900 Subject: [PATCH 06/35] =?UTF-8?q?#301=20=EC=A3=BC=EB=AC=B8=20=ED=8F=BC,=20?= =?UTF-8?q?=EB=B0=B0=EC=86=A1=EC=A7=80=EA=B4=80=EB=A6=AC=20=EB=B6=80?= =?UTF-8?q?=EB=B6=84=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- css/default_shop.css | 5 +++ shop/orderaddress.php | 50 +++++++++++++---------- shop/orderaddress_update.php | 33 ---------------- shop/orderaddressupdate.php | 47 ++++++++++++++++++++++ shop/orderform.php | 2 +- shop/orderformupdate.php | 77 +++++++++--------------------------- 6 files changed, 102 insertions(+), 112 deletions(-) delete mode 100644 shop/orderaddress_update.php create mode 100644 shop/orderaddressupdate.php diff --git a/css/default_shop.css b/css/default_shop.css index a4a8822f8..68a0255b5 100644 --- a/css/default_shop.css +++ b/css/default_shop.css @@ -239,6 +239,10 @@ button.btn_frmline2 {font-size:1em;cursor:pointer} .btn_admin {display:inline-block;padding:0 10px;height:23px;border:1px solid #e8180c !important;background:#e8180c !important;color:#fff !important;text-decoration:none !important;line-height:2.15em;vertical-align:middle} /* 관리자 전용 버튼 */ .btn_admin:focus, .btn_admin:hover {text-decoration:none !important} +/* 선택수정 버튼 */ +.btn_list {margin:0 auto;width:93%} +.btn_list input, .btn_list button {background: none repeat scroll 0 0 #617D46;border: 0 none;color: #FFFFFF;height: 28px;line-height: 2.2em;padding: 0 15px;vertical-align: middle} + /* 기본테이블 */ .basic_tbl {margin-bottom:10px;width:100%;border-collapse:collapse;border-spacing:0} .basic_tbl caption {margin:0;padding:0;font-size:0;line-height:0;overflow:hidden} @@ -307,6 +311,7 @@ td.empty_table {padding:85px 0;text-align:center} .td_datetime {width:110px;text-align:center} .td_smallmng {width:50px;text-align:center} .td_mng {width:80px;text-align:center} +.td_default {width:60px;text-align:center} /* 새창 기본 스타일 */ .new_win {} diff --git a/shop/orderaddress.php b/shop/orderaddress.php index c316f7aa6..04f0edec9 100644 --- a/shop/orderaddress.php +++ b/shop/orderaddress.php @@ -10,15 +10,30 @@ if($w == 'd') { goto_url($_SERVER['PHP_SELF']); } +$sql_common = " from {$g5['g5_shop_order_address_table']} "; + +$sql = " select count(ad_id) as cnt " . $sql_common; +$row = sql_fetch($sql); +$total_count = $row['cnt']; + +$rows = $config['cf_page_rows']; +$total_page = ceil($total_count / $rows); // 전체 페이지 계산 +if ($page == "") { $page = 1; } // 페이지가 없으면 첫 페이지 (1 페이지) +$from_record = ($page - 1) * $rows; // 시작 열을 구함 + $sql = " select * from {$g5['g5_shop_order_address_table']} where mb_id = '{$member['mb_id']}' order by ad_default desc, - ad_id desc "; + ad_id desc + limit $from_record, $rows"; $result = sql_query($sql); +//$qstr = $qstr.'&sca='.$sca.'&page='.$page; +$qstr = $qstr.'&sca='.$sca.'&page='.$page.'&save_stx='.$stx; + if(!mysql_num_rows($result)) alert_close('배송지 목록 자료가 없습니다.'); @@ -33,7 +48,9 @@ include_once(G5_PATH.'/head.sub.php'); $order_action_url = G5_HTTPS_SHOP_URL.'/orderaddress_update.php'; ?> -
+ + +

배송지 목록

@@ -63,7 +80,7 @@ $order_action_url = G5_HTTPS_SHOP_URL.'/orderaddress_update.php'; - + >
@@ -80,28 +97,14 @@ $order_action_url = G5_HTTPS_SHOP_URL.'/orderaddress_update.php';
- +
+ + diff --git a/shop/orderaddress_update.php b/shop/orderaddress_update.php deleted file mode 100644 index 337617194..000000000 --- a/shop/orderaddress_update.php +++ /dev/null @@ -1,33 +0,0 @@ - \ No newline at end of file diff --git a/shop/orderaddressupdate.php b/shop/orderaddressupdate.php new file mode 100644 index 000000000..645fdfdd4 --- /dev/null +++ b/shop/orderaddressupdate.php @@ -0,0 +1,47 @@ + \ No newline at end of file diff --git a/shop/orderform.php b/shop/orderform.php index 23c422a8d..dadc5adf5 100644 --- a/shop/orderform.php +++ b/shop/orderform.php @@ -1299,7 +1299,7 @@ $(function() { // 배송지목록 $("#order_address").on("click", function() { var url = this.href; - window.open(url, "win_address", "left=100,top=100,width=800,height=500,scrollbars=1"); + window.open(url, "win_address", "left=100,top=100,width=800,height=600,scrollbars=1"); return false; }); }); diff --git a/shop/orderformupdate.php b/shop/orderformupdate.php index 5038114b5..a10880ffd 100644 --- a/shop/orderformupdate.php +++ b/shop/orderformupdate.php @@ -577,75 +577,36 @@ if (get_session('ss_direct')) // 배송지처리 if($is_member) { - $ad_zip1 = $od_b_zip1; - $ad_zip2 = $od_b_zip2; - $ad_addr1 = $od_b_addr1; - $ad_addr2 = $od_b_addr2; - - $sql = " select count(*) as count from {$g5['g5_shop_order_address_table']} + $sql = " select * from {$g5['g5_shop_order_address_table']} where mb_id = '{$member['mb_id']}' - and ad_subject = '{$_POST['od_b_subject']}' - and ad_name = '{$_POST['od_b_name']}' - and ad_tel = '{$_POST['od_b_tel']}' - and ad_hp = '{$_POST['od_b_hp']}' - and ad_zip1 = '{$_POST['od_b_zip1']}' - and ad_zip2 = '{$_POST['od_b_zip2']}' - and ad_addr1 = '{$_POST['od_b_addr1']}' - and ad_addr2 = '{$_POST['od_b_addr2']}' "; + and ad_name = '{$_POST['od_b_name']}' + and ad_tel = '{$_POST['od_b_tel']}' + and ad_hp = '{$_POST['od_b_hp']}' + and ad_zip1 = '{$_POST['od_b_zip1']}' + and ad_zip2 = '{$_POST['od_b_zip2']}' + and ad_addr1 = '{$_POST['od_b_addr1']}' + and ad_addr2 = '{$_POST['od_b_addr2']}' "; $row = sql_fetch($sql); - if(!$row['count']){ - $sql = " insert into {$g5['g5_shop_order_address_table']} - set mb_id = '{$member['mb_id']}', - ad_subject = '$ad_subject', - ad_default = '$ad_default', - ad_name = '$od_b_name', - ad_tel = '$od_b_tel', - ad_hp = '$od_b_hp', - ad_zip1 = '$od_b_zip1', - ad_zip2 = '$od_b_zip2', - ad_addr1 = '$od_b_addr1', - ad_addr2 = '$od_b_addr2' "; - sql_query($sql); - echo "됏다"; - } - - -//print_r ($row); - - $sql = " select ad_id - from {$g5['g5_shop_order_address_table']} - where mb_id = '{$member['mb_id']}' - and ad_zip1 = '$ad_zip1' - and ad_zip2 = '$ad_zip2' - and ad_addr1 = '$ad_addr1' - and ad_addr2 = '$ad_addr2' "; - $row = sql_fetch($sql); - + // 기본배송지로 할시 if($ad_default) { $sql = " update {$g5['g5_shop_order_address_table']} set ad_default = '0' where mb_id = '{$member['mb_id']}' "; sql_query($sql); + + if($row['ad_id']){ + $sql = " update {$g5['g5_shop_order_address_table']} + set ad_default = '1' + where mb_id = '{$member['mb_id']}' + and ad_id = '{$row['ad_id']}' "; + sql_query($sql); + } } - if($row['ad_id']) { - $sql = " update {$g5['g5_shop_order_address_table']} - set ad_zip1 = '$ad_zip1', - ad_zip2 = '$ad_zip2', - ad_addr1 = '$ad_addr1', - ad_addr2 = '$ad_addr2' "; - if($ad_default) - $sql .= " , ad_default = '$ad_default' "; - if($ad_subject) - $sql .= " , ad_subject = '$ad_subject' "; - $sql .= " where ad_id = '{$row['ad_id']}' - and mb_id = '{$member['mb_id']}' "; - sql_query($sql); - } - - if(!$row['ad_id'] && $add_address) { + // 카운트 된 값이 없으면 새로 배송지 추가 저장 + if(!$row['ad_id']){ $sql = " insert into {$g5['g5_shop_order_address_table']} set mb_id = '{$member['mb_id']}', ad_subject = '$ad_subject', From 7ea8bfd3c96aeceb173f952d464201a9c14512d5 Mon Sep 17 00:00:00 2001 From: whitedot Date: Mon, 30 Sep 2013 10:11:15 +0900 Subject: [PATCH 07/35] =?UTF-8?q?=EA=B3=B5=ED=86=B5:=20=ED=85=8C=EC=9D=B4?= =?UTF-8?q?=EB=B8=94=20th,=20td=20=ED=8C=A8=EB=94=A9=EA=B0=92=20=EC=A1=B0?= =?UTF-8?q?=EC=A0=95,=20=EC=82=AC=EB=85=B8=EB=9D=BC=EA=B0=80=EB=85=B8?= =?UTF-8?q?=EB=9D=BC=EB=8B=98=20=EA=B1=B4=EC=9D=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- css/admin.css | 4 ++-- css/default.css | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/css/admin.css b/css/admin.css index a237f67bc..eafc746d2 100644 --- a/css/admin.css +++ b/css/admin.css @@ -186,12 +186,12 @@ fieldset button {padding:0 15px;height:23px;border:0;background:#617d46;color:#f /* 테이블 */ table {clear:both;margin-bottom:10px;width:100%;border-collapse:collapse;border-spacing:0} caption {padding:10px 0 15px;font-weight:bold;text-align:left} -thead th {padding:12px 0 8px;border-bottom:1px solid #666;background:#565e60;color:#fff} +thead th {padding:12px 0;border-bottom:1px solid #666;background:#565e60;color:#fff} thead th input {vertical-align:top} /* middle 로 하면 게시판 읽기에서 목록 사용시 체크박스 라인 깨짐 */ thead a {color:#fff} tfoot th {border-top:1px solid #666;border-bottom:1px solid #666;background:#484848;color:#fff} tfoot td {border-color:#666;background:#484848;color:#fff;font-weight:bold;text-align:center} -td {padding:8px 5px 6px;border:1px solid #e9e9e9;line-height:1.5em;word-break:break-all} +td {padding:8px 5px;border:1px solid #e9e9e9;line-height:1.5em;word-break:break-all} .bo_sideview td {padding:6px 4px} /* 사이드뷰 사용하는 테이블 셀 패딩값 */ /* 내용 없는 테이블 */ .empty_table {padding:200px 0;text-align:center} diff --git a/css/default.css b/css/default.css index 2ab28c502..94c6ca2cc 100644 --- a/css/default.css +++ b/css/default.css @@ -158,13 +158,13 @@ button.btn_frmline {font-size:1em} /* 기본테이블 */ .basic_tbl {margin-bottom:10px;width:100%;border-collapse:collapse;border-spacing:0} .basic_tbl caption {padding:0;font-size:0;line-height:0;overflow:hidden} -.basic_tbl thead th {padding:12px 0 8px;background:#565e60;color:#fff} +.basic_tbl thead th {padding:12px 0;background:#565e60;color:#fff} .basic_tbl thead a {color:#fff} .basic_tbl thead th input {vertical-align:top} /* middle 로 하면 게시판 읽기에서 목록 사용시 체크박스 라인 깨짐 */ .basic_tbl tfoot th {border-top:1px solid #666;border-bottom:1px solid #666;background:#484848;color:#fff} .basic_tbl tfoot td {border-color:#666;background:#484848;color:#fff;font-weight:bold;text-align:center} .basic_tbl tbody th {} -.basic_tbl td {padding:8px 5px 6px;border-top:1px solid #e9e9e9;border-bottom:1px solid #e9e9e9;line-height:1.5em;word-break:break-all} +.basic_tbl td {padding:8px 5px;border-top:1px solid #e9e9e9;border-bottom:1px solid #e9e9e9;line-height:1.5em;word-break:break-all} .basic_tbl a {} .bo_sideview td {padding:6px 4px} /* 사이드뷰 사용하는 테이블 셀 패딩값 */ td.empty_table {padding:85px 0;text-align:center} From 446570b3d436960a9871d0bf78fbba6d436ee387 Mon Sep 17 00:00:00 2001 From: chicpro Date: Mon, 30 Sep 2013 12:01:11 +0900 Subject: [PATCH 08/35] =?UTF-8?q?=EC=A3=BC=EB=AC=B8=ED=8F=BC=20=EB=B0=B0?= =?UTF-8?q?=EC=86=A1=EC=A7=80=20=EC=B2=98=EB=A6=AC=20=EC=BD=94=EB=93=9C=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 --- shop/orderaddress.php | 20 +++++++------- shop/orderaddressupdate.php | 53 +++++++++++++++---------------------- shop/orderform.php | 15 ++++++----- shop/orderformupdate.php | 37 ++++++++++++-------------- 4 files changed, 57 insertions(+), 68 deletions(-) diff --git a/shop/orderaddress.php b/shop/orderaddress.php index 04f0edec9..8e984cf6f 100644 --- a/shop/orderaddress.php +++ b/shop/orderaddress.php @@ -26,7 +26,7 @@ $sql = " select * where mb_id = '{$member['mb_id']}' order by ad_default desc, - ad_id desc + ad_id desc limit $from_record, $rows"; $result = sql_query($sql); @@ -45,7 +45,7 @@ if (G5_IS_MOBILE) { $g5['title'] = '배송지 목록'; include_once(G5_PATH.'/head.sub.php'); -$order_action_url = G5_HTTPS_SHOP_URL.'/orderaddress_update.php'; +$order_action_url = G5_HTTPS_SHOP_URL.'/orderaddressupdate.php'; ?>
@@ -77,10 +77,10 @@ $order_action_url = G5_HTTPS_SHOP_URL.'/orderaddress_update.php'; ?> - + - + >
@@ -139,16 +139,16 @@ $(function() { }); // 전체선택 부분 - $("#chk_all").on("change", function() { - if ($(this).attr("checked")){ - $("input[type='checkbox']:not(checked)").attr("checked", true); - }else{ - $("input[type='checkbox']:checked").attr("checked", false); + $("#chk_all").on("click", function() { + if($(this).is(":checked")) { + $("input[name^='chk[']").attr("checked", true); + } else { + $("input[name^='chk[']").attr("checked", false); } }); $("#btn_submit").on("click", function() { - if( $(":checkbox:checked").length==0 ){ + if($("input[name^='chk[']:checked").length==0 ){ alert("수정하실 항목을 하나 이상 선택하세요."); return false; } diff --git a/shop/orderaddressupdate.php b/shop/orderaddressupdate.php index 645fdfdd4..607d22618 100644 --- a/shop/orderaddressupdate.php +++ b/shop/orderaddressupdate.php @@ -1,47 +1,36 @@ \ No newline at end of file diff --git a/shop/orderform.php b/shop/orderform.php index dadc5adf5..180d33ac4 100644 --- a/shop/orderform.php +++ b/shop/orderform.php @@ -293,7 +293,7 @@ function get_intall_file() alert('장바구니가 비어 있습니다.', G5_SHOP_URL.'/cart.php'); } else { // 배송비 계산 - $send_cost = get_sendcost($tot_sell_price, $s_cart_id); + $send_cost = get_sendcost($s_cart_id); } // 복합과세처리 @@ -664,7 +664,7 @@ function get_intall_file() $sep = chr(30); // 주문자와 동일 - $addr_list .= ''.PHP_EOL; + $addr_list .= ''.PHP_EOL; $addr_list .= ''.PHP_EOL; // 기본배송지 @@ -683,6 +683,7 @@ function get_intall_file() $sql = " select * from {$g5['g5_shop_order_address_table']} where mb_id = '{$member['mb_id']}' + and ad_default = '0' order by ad_id desc limit 2 "; $result = sql_query($sql); @@ -1264,8 +1265,10 @@ $(function() { // 배송지선택 $("input[name=ad_sel_addr]").on("click", function() { var addr = $(this).val().split(String.fromCharCode(30)); - if ($(this).attr("id") == "ad_sel_addr_same"); // 이 아이디가 ad_sel_addr_same 일때는 아무런 실행도 하지 않는다. - else{ // 아닐땐 실행 + + if (addr[0] == "same") { + gumae2baesong(); + } else { if(addr[0] == "new") { for(i=0; i<8; i++) { addr[i] = ""; @@ -1659,7 +1662,7 @@ function forderform_check(f) } // 구매자 정보와 동일합니다. -$("#ad_sel_addr_same").on("click", function(){ +function gumae2baesong() { var f = document.forderform; f.od_b_name.value = f.od_name.value; @@ -1671,7 +1674,7 @@ $("#ad_sel_addr_same").on("click", function(){ f.od_b_addr2.value = f.od_addr2.value; calculate_sendcost(String(f.od_b_zip1.value) + String(f.od_b_zip2.value)); -}); +} // 구매자 정보와 동일 함수 끝 diff --git a/shop/orderformupdate.php b/shop/orderformupdate.php index a10880ffd..3f685c6d9 100644 --- a/shop/orderformupdate.php +++ b/shop/orderformupdate.php @@ -579,34 +579,30 @@ if (get_session('ss_direct')) if($is_member) { $sql = " select * from {$g5['g5_shop_order_address_table']} where mb_id = '{$member['mb_id']}' - and ad_name = '{$_POST['od_b_name']}' - and ad_tel = '{$_POST['od_b_tel']}' - and ad_hp = '{$_POST['od_b_hp']}' - and ad_zip1 = '{$_POST['od_b_zip1']}' - and ad_zip2 = '{$_POST['od_b_zip2']}' - and ad_addr1 = '{$_POST['od_b_addr1']}' - and ad_addr2 = '{$_POST['od_b_addr2']}' "; - + and ad_name = '$od_b_name' + and ad_tel = '$od_b_tel' + and ad_hp = '$od_b_hp' + and ad_zip1 = '$od_b_zip1' + and ad_zip2 = '$od_b_zip2' + and ad_addr1 = '$od_b_addr1' + and ad_addr2 = '$od_b_addr2' "; $row = sql_fetch($sql); - // 기본배송지로 할시 + // 기본배송지 체크 if($ad_default) { $sql = " update {$g5['g5_shop_order_address_table']} set ad_default = '0' where mb_id = '{$member['mb_id']}' "; sql_query($sql); - - if($row['ad_id']){ - $sql = " update {$g5['g5_shop_order_address_table']} - set ad_default = '1' - where mb_id = '{$member['mb_id']}' - and ad_id = '{$row['ad_id']}' "; - sql_query($sql); - } } - // 카운트 된 값이 없으면 새로 배송지 추가 저장 - if(!$row['ad_id']){ + if($row['ad_id']){ + $sql = " update {$g5['g5_shop_order_address_table']} + set ad_default = '1', + ad_subject = '$ad_subject' + where mb_id = '{$member['mb_id']}' + and ad_id = '{$row['ad_id']}' "; + } else { $sql = " insert into {$g5['g5_shop_order_address_table']} set mb_id = '{$member['mb_id']}', ad_subject = '$ad_subject', @@ -618,8 +614,9 @@ if($is_member) { ad_zip2 = '$od_b_zip2', ad_addr1 = '$od_b_addr1', ad_addr2 = '$od_b_addr2' "; - sql_query($sql); } + + sql_query($sql); } goto_url(G5_SHOP_URL.'/orderinquiryview.php?od_id='.$od_id.'&uid='.$uid); From f8e1e9eb9c452f044680bed22bf6b2100967257f Mon Sep 17 00:00:00 2001 From: chicpro Date: Mon, 30 Sep 2013 13:28:22 +0900 Subject: [PATCH 09/35] =?UTF-8?q?=EB=AA=A8=EB=B0=94=EC=9D=BC=20=EB=B0=B0?= =?UTF-8?q?=EC=86=A1=EC=A7=80=EB=AA=A9=EB=A1=9D=20=EA=B8=B0=EB=8A=A5=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mobile/shop/orderaddress.php | 46 ++++++++++++++++++++++--- mobile/shop/orderform.php | 60 +++++++++++++++++++++------------ mobile/shop/orderformupdate.php | 46 ++++++++++--------------- shop/orderaddress.php | 5 --- shop/orderform.php | 8 ++--- 5 files changed, 100 insertions(+), 65 deletions(-) diff --git a/mobile/shop/orderaddress.php b/mobile/shop/orderaddress.php index 103b3c1d0..5989d493a 100644 --- a/mobile/shop/orderaddress.php +++ b/mobile/shop/orderaddress.php @@ -3,15 +3,23 @@ include_once('./_common.php'); $g5['title'] = '배송지 목록'; include_once(G5_PATH.'/head.sub.php'); -?> -
-

+$order_action_url = G5_HTTPS_SHOP_URL.'/orderaddressupdate.php'; + +?> + +
+ +

배송지 목록

+ + @@ -25,13 +33,18 @@ include_once(G5_PATH.'/head.sub.php'); $addr = $row['ad_name'].$sep.$row['ad_tel'].$sep.$row['ad_hp'].$sep.$row['ad_zip1'].$sep.$row['ad_zip2'].$sep.$row['ad_addr1'].$sep.$row['ad_addr2'].$sep.$row['ad_subject']; ?> - + + + @@ -40,7 +53,13 @@ include_once(G5_PATH.'/head.sub.php'); ?>
+ + 배송지명기본
배송지		 이름 전화번호 주소
+ + + >
- + 삭제
+
+ +
+ + + diff --git a/mobile/shop/orderform.php b/mobile/shop/orderform.php index 8f83be467..00fe4705d 100644 --- a/mobile/shop/orderform.php +++ b/mobile/shop/orderform.php @@ -431,6 +431,11 @@ ob_end_clean(); // 배송지 이력 $addr_list = ''; $sep = chr(30); + + // 주문자와 동일 + $addr_list .= ''.PHP_EOL; + $addr_list .= ''.PHP_EOL; + // 기본배송지 $sql = " select * from {$g5['g5_shop_order_address_table']} @@ -447,6 +452,7 @@ ob_end_clean(); $sql = " select * from {$g5['g5_shop_order_address_table']} where mb_id = '{$member['mb_id']}' + and ad_default = '0' order by ad_id desc limit 2 "; $result = sql_query($sql); @@ -468,7 +474,11 @@ ob_end_clean(); - + + + + +
- -

배송지 목록

diff --git a/shop/orderform.php b/shop/orderform.php index 180d33ac4..0c5eb7be8 100644 --- a/shop/orderform.php +++ b/shop/orderform.php @@ -664,7 +664,7 @@ function get_intall_file() $sep = chr(30); // 주문자와 동일 - $addr_list .= ''.PHP_EOL; + $addr_list .= ''.PHP_EOL; $addr_list .= ''.PHP_EOL; // 기본배송지 @@ -707,10 +707,8 @@ function get_intall_file() - '.PHP_EOL.' - '; - }?> + + Date: Mon, 30 Sep 2013 13:48:43 +0900 Subject: [PATCH 10/35] =?UTF-8?q?canonical=20=EC=A7=80=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- head.sub.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/head.sub.php b/head.sub.php index 79711eac2..59b191974 100644 --- a/head.sub.php +++ b/head.sub.php @@ -44,6 +44,12 @@ if (G5_IS_MOBILE) { if (defined('G5_IS_ADMIN')) { echo ''.PHP_EOL; } else { + // canonical 지정 + $canonical = ''; + if ($bo_table && $wr_id) $canonical = 'http://'.$_SERVER["HTTP_HOST"].'/bbs/board.php?bo_table='.$bo_table.'&wr_id='.$wr_id; + else $canonical = 'http://'.$_SERVER["HTTP_HOST"].$_SERVER["REQUEST_URI"]; + echo ''; + echo ''.PHP_EOL; } echo ''; From 5a6b84a924389fa5a61065b7989ab6f9421bb780 Mon Sep 17 00:00:00 2001 From: nemoluv Date: Mon, 30 Sep 2013 17:50:00 +0900 Subject: [PATCH 11/35] =?UTF-8?q?#5=20required=20=EC=B2=98=EB=A6=AC=20?= =?UTF-8?q?=EC=95=88=EB=90=9C=20=EB=B6=80=EB=B6=84=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 3 +++ adm/boardgroup_form.php | 2 +- plugin/gcaptcha/gcaptcha.lib.php | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 3e26fb122..4ae7fdff4 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,6 @@ nemoluv* cheditor* *.key *.sh +kcho07_rss/ +mobile/skin/board/bach72_mobile/ +skin/board diff --git a/adm/boardgroup_form.php b/adm/boardgroup_form.php index ce9f57c15..6b03a9467 100644 --- a/adm/boardgroup_form.php +++ b/adm/boardgroup_form.php @@ -53,7 +53,7 @@ include_once('./admin.head.php'); - + '; $html .= '자동등록방지 숫자'; if (!G5_IS_MOBILE) $html .= '숫자를 음성으로 듣기'; - $html .= ''; + $html .= ''; $html .= '

자동등록방지 숫자를 순서대로 입력하세요.

'; $html .= ''; return $html; From 35b34a507c3d12a3a5485008274a99f5c9b4e70f Mon Sep 17 00:00:00 2001 From: nemoluv Date: Mon, 30 Sep 2013 17:50:56 +0900 Subject: [PATCH 12/35] =?UTF-8?q?#303=20label=20=EC=88=9C=EC=84=9C=20?= =?UTF-8?q?=EC=95=9E=20=EB=92=A4=EB=A1=9C=20=EB=B3=80=EA=B2=BD=20=EC=9E=91?= =?UTF-8?q?=EC=97=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adm/shop_admin/configform.php | 8 ++++---- adm/shop_admin/deliverylist.php | 8 ++++---- adm/shop_admin/itemeventform.php | 2 +- adm/shop_admin/newwinform.php | 4 ++-- adm/shop_admin/orderform.php | 16 ++++++++-------- adm/shop_admin/personalpayform.php | 4 ++-- 6 files changed, 21 insertions(+), 21 deletions(-) diff --git a/adm/shop_admin/configform.php b/adm/shop_admin/configform.php index d95eb2da3..2d95ad19f 100644 --- a/adm/shop_admin/configform.php +++ b/adm/shop_admin/configform.php @@ -724,8 +724,8 @@ $pg_anchor = '
    { $size = getimagesize($logo_img); ?> - +