From 9c7a388fcde4609fedf2aa45dfc56c5fa04a0247 Mon Sep 17 00:00:00 2001 From: whitedot Date: Mon, 17 Jun 2013 14:10:02 +0900 Subject: [PATCH 01/14] =?UTF-8?q?=EC=82=AC=EC=9A=A9=EC=9E=90:=20=EB=B2=84?= =?UTF-8?q?=ED=8A=BC=20=EA=B8=B0=EB=B3=B8=EC=83=89=EC=83=81=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- css/default.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/css/default.css b/css/default.css index 2421b9edf..f3f452f13 100644 --- a/css/default.css +++ b/css/default.css @@ -125,7 +125,7 @@ a:active {color:#000;text-decoration:underline} /* 버튼 */ .btn01 {display:inline-block;padding:0 10px;height:23px;border:1px solid #ccc;background:#fafafa;color:#000 !important;text-decoration:none !important;line-height:2.15em;vertical-align:middle} .btn01:focus, .btn01:hover {text-decoration:none !important} -.btn02 {display:inline-block;padding:0 10px;height:23px;border:1px solid #333;background:#333;color:#fff !important;text-decoration:none !important;line-height:2.15em;vertical-align:middle} +.btn02 {display:inline-block;padding:0 10px;height:23px;border:1px solid #00a2ff;background:#00a8ff;color:#fff !important;text-decoration:none !important;line-height:2.15em;vertical-align:middle} .btn02:focus, .btn02:hover {text-decoration:none !important} .btn_confirm {text-align:center} /* 서식단계 진행 */ .btn_submit {padding:0 10px;height:24px;border:0;background:#333;color:#fff;letter-spacing:-0.1em;vertical-align:top;cursor:pointer} From 8bbd1250df103124fc74f9261c392b029e9d9fc2 Mon Sep 17 00:00:00 2001 From: whitedot Date: Mon, 17 Jun 2013 14:12:16 +0900 Subject: [PATCH 02/14] =?UTF-8?q?=EC=82=AC=EC=9A=A9=EC=9E=90:=20=EB=B2=84?= =?UTF-8?q?=ED=8A=BC=20=EA=B8=B0=EB=B3=B8=EC=83=89=EC=83=81=20=EC=9E=AC?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- css/default.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/css/default.css b/css/default.css index f3f452f13..f2d14339c 100644 --- a/css/default.css +++ b/css/default.css @@ -144,7 +144,7 @@ button.btn_frmline {font-size:1em} /* 게시판용 버튼 */ .btn_b01 {display:inline-block;padding:0 10px;height:23px;border:1px solid #d9ded9;background:#f5f6fa;color:#000 !important;text-decoration:none !important;line-height:2.15em;vertical-align:middle} .btn_b01:focus, .btn_b01:hover {text-decoration:none !important} -.btn_b02 {display:inline-block;padding:0 10px;height:23px;border:1px solid #eee;background:#333;color:#fff !important;text-decoration:none !important;line-height:2.15em;vertical-align:middle} +.btn_b02 {display:inline-block;padding:0 10px;height:23px;border:1px solid #007eff;background:#008aff;color:#fff !important;text-decoration:none !important;line-height:2.15em;vertical-align:middle} .btn_b02:focus, .btn_b02:hover {text-decoration:none !important} .btn_admin {display:inline-block;padding:0 10px;height:23px;border:1px solid #e8180c;background:#e8180c;color:#fff !important;text-decoration:none !important;line-height:2.15em;vertical-align:middle} /* 관리자 전용 버튼 */ .btn_admin:focus, .btn_admin:hover {text-decoration:none !important} From 32dc378de1af5f849628be2423ad56f71cd8c823 Mon Sep 17 00:00:00 2001 From: whitedot Date: Mon, 17 Jun 2013 14:15:52 +0900 Subject: [PATCH 03/14] =?UTF-8?q?=EC=82=AC=EC=9A=A9=EC=9E=90:=20=EB=B2=84?= =?UTF-8?q?=ED=8A=BC=20=EA=B8=B0=EB=B3=B8=EC=83=89=EC=83=81=20=EC=88=98?= =?UTF-8?q?=EC=A0=95=20=EC=B7=A8=EC=86=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- css/default.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/css/default.css b/css/default.css index f2d14339c..9d94cc2a1 100644 --- a/css/default.css +++ b/css/default.css @@ -125,7 +125,7 @@ a:active {color:#000;text-decoration:underline} /* 버튼 */ .btn01 {display:inline-block;padding:0 10px;height:23px;border:1px solid #ccc;background:#fafafa;color:#000 !important;text-decoration:none !important;line-height:2.15em;vertical-align:middle} .btn01:focus, .btn01:hover {text-decoration:none !important} -.btn02 {display:inline-block;padding:0 10px;height:23px;border:1px solid #00a2ff;background:#00a8ff;color:#fff !important;text-decoration:none !important;line-height:2.15em;vertical-align:middle} +.btn02 {display:inline-block;padding:0 10px;height:23px;border:1px solid #000;background:#333;color:#fff !important;text-decoration:none !important;line-height:2.15em;vertical-align:middle} .btn02:focus, .btn02:hover {text-decoration:none !important} .btn_confirm {text-align:center} /* 서식단계 진행 */ .btn_submit {padding:0 10px;height:24px;border:0;background:#333;color:#fff;letter-spacing:-0.1em;vertical-align:top;cursor:pointer} @@ -144,7 +144,7 @@ button.btn_frmline {font-size:1em} /* 게시판용 버튼 */ .btn_b01 {display:inline-block;padding:0 10px;height:23px;border:1px solid #d9ded9;background:#f5f6fa;color:#000 !important;text-decoration:none !important;line-height:2.15em;vertical-align:middle} .btn_b01:focus, .btn_b01:hover {text-decoration:none !important} -.btn_b02 {display:inline-block;padding:0 10px;height:23px;border:1px solid #007eff;background:#008aff;color:#fff !important;text-decoration:none !important;line-height:2.15em;vertical-align:middle} +.btn_b02 {display:inline-block;padding:0 10px;height:23px;border:1px solid #000;background:#333;color:#fff !important;text-decoration:none !important;line-height:2.15em;vertical-align:middle} .btn_b02:focus, .btn_b02:hover {text-decoration:none !important} .btn_admin {display:inline-block;padding:0 10px;height:23px;border:1px solid #e8180c;background:#e8180c;color:#fff !important;text-decoration:none !important;line-height:2.15em;vertical-align:middle} /* 관리자 전용 버튼 */ .btn_admin:focus, .btn_admin:hover {text-decoration:none !important} From 04ec45c0c56d3d4ebba7a4f0c9a6efce26a08a8d Mon Sep 17 00:00:00 2001 From: chicpro Date: Mon, 17 Jun 2013 15:50:06 +0900 Subject: [PATCH 04/14] =?UTF-8?q?#211=20=EC=A3=BC=EB=AC=B8=EC=8B=9C=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80=EB=B0=B0=EC=86=A1=EB=B9=84=20=EC=B2=98?= =?UTF-8?q?=EB=A6=AC=20=EC=BD=94=EB=93=9C=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/configformupdate.php | 2 +- adm/shop_admin/index.php | 2 +- adm/shop_admin/orderform.php | 10 +++- adm/shop_admin/orderreceiptupdate.php | 2 + extend/shop.extend.php | 4 +- extend/shop.extend2.php | 10 +++- install/install_db.php | 2 +- install/shop.sql | 3 +- mobile/shop/orderform.php | 67 ++++++++++++++++++++++++--- mobile/shop/orderformupdate.php | 19 ++++++-- mobile/shop/orderinquiryview.php | 8 +++- shop/mail/orderupdate1.mail.php | 7 +++ shop/mail/orderupdate2.mail.php | 7 +++ shop/orderform.php | 67 ++++++++++++++++++++++++--- shop/orderformupdate.php | 19 ++++++-- shop/orderinquiryview.php | 8 +++- shop/ordermail1.inc.php | 4 ++ shop/ordersendcost.php | 19 ++++++++ 18 files changed, 231 insertions(+), 29 deletions(-) create mode 100644 shop/ordersendcost.php diff --git a/adm/shop_admin/configformupdate.php b/adm/shop_admin/configformupdate.php index ba9084755..0d1db2a2a 100644 --- a/adm/shop_admin/configformupdate.php +++ b/adm/shop_admin/configformupdate.php @@ -133,7 +133,7 @@ $sql = " update {$g4['shop_default_table']} de_sms_use4 = '$de_sms_use4', de_sms_use5 = '$de_sms_use5', de_sms_hp = '$de_sms_hp', - de_item_use_use = '$de_item_use_use', + de_item_use_use = '$de_item_use_use', de_code_dup_use = '$de_code_dup_use', de_cart_keep_term = '$de_cart_keep_term', de_guest_cart_use = '$de_guest_cart_use', diff --git a/adm/shop_admin/index.php b/adm/shop_admin/index.php index 3f68c43e9..a049d8ab4 100644 --- a/adm/shop_admin/index.php +++ b/adm/shop_admin/index.php @@ -134,7 +134,7 @@ $pg_anchor = '
    자료가 없습니다.'; + if ($i == 0) echo '자료가 없습니다.'; ?> diff --git a/adm/shop_admin/orderform.php b/adm/shop_admin/orderform.php index d581c6dd9..620449e04 100644 --- a/adm/shop_admin/orderform.php +++ b/adm/shop_admin/orderform.php @@ -243,8 +243,8 @@ $pg_anchor = '
      원 + + + + 원 + + \ No newline at end of file diff --git a/install/install_db.php b/install/install_db.php index bc916b05c..0dac5dacc 100644 --- a/install/install_db.php +++ b/install/install_db.php @@ -284,7 +284,7 @@ if($shop_install) { de_simg_height = '$simg_height', de_mimg_width = '$mimg_width', de_mimg_height = '$mimg_height', - de_item_ps_use = '1', + de_item_use_use = '1', de_level_sell = '1', de_code_dup_use = '1', de_sms_cont1 = '{이름}님의 회원가입을 축하드립니다.\nID:{회원아이디}\n{회사명}', diff --git a/install/shop.sql b/install/shop.sql index 8bb824f28..7ed5c3ca5 100644 --- a/install/shop.sql +++ b/install/shop.sql @@ -280,7 +280,7 @@ CREATE TABLE IF NOT EXISTS `shop_default` ( `de_sms_hp` varchar(255) NOT NULL DEFAULT '', `de_kcp_mid` varchar(255) NOT NULL DEFAULT '', `de_iche_use` tinyint(4) NOT NULL DEFAULT '0', - `de_item_ps_use` tinyint(4) NOT NULL DEFAULT '0', + `de_item_use_use` tinyint(4) NOT NULL DEFAULT '0', `de_code_dup_use` tinyint(4) NOT NULL DEFAULT '0', `de_cart_keep_term` int(11) NOT NULL DEFAULT '0', `de_guest_cart_use` tinyint(4) NOT NULL DEFAULT '0', @@ -598,6 +598,7 @@ CREATE TABLE IF NOT EXISTS `shop_order` ( `od_memo` text NOT NULL, `od_send_cost` int(11) NOT NULL DEFAULT '0', `od_send_coupon` int(11) NOT NULL DEFAULT '0', + `od_send_cost2` int(11) NOT NULL DEFAULT '0', `od_temp_amount` int(11) NOT NULL DEFAULT '0', `od_temp_point` int(11) NOT NULL DEFAULT '0', `od_receipt_amount` int(11) NOT NULL DEFAULT '0', diff --git a/mobile/shop/orderform.php b/mobile/shop/orderform.php index b9c6001c2..9e06583df 100644 --- a/mobile/shop/orderform.php +++ b/mobile/shop/orderform.php @@ -294,6 +294,8 @@ ob_end_clean(); + + @@ -478,6 +480,10 @@ ob_end_clean(); 총 주문금액 원 + + + 추가배송비 + 0원 (지역에 따라 추가되는 도선료 등의 배송비입니다.) @@ -701,6 +707,7 @@ ob_end_clean(); $(function() { var $cp_btn_el; var $cp_row_el; + var zipcode = ""; $(".it_coupon_btn").click(function() { $cp_btn_el = $(this); @@ -802,6 +809,7 @@ $(function() { var subj = $el.find("input[name='o_cp_subj[]']").val(); var od_amount = parseInt($("input[name=org_od_amount]").val()); var send_cost = $("input[name=org_send_cost]").val(); + var item_coupon = parseInt($("input[name=item_coupon]").val()); if(parseInt(amount) == 0) { if(!confirm(subj+"쿠폰의 할인 금액은 "+amount+"원입니다.\n쿠폰을 적용하시겠습니까?")) { @@ -811,8 +819,10 @@ $(function() { $("input[name=od_send_cost]").val(send_cost); $("input[name=sc_cp_id]").val(""); + $("#sc_coupon_btn").text("쿠폰적용"); + $("#sc_coupon_cancel").remove(); - $("input[name=od_amount]").val(od_amount - amount); + $("input[name=od_amount]").val(od_amount - item_coupon - amount); $("input[name=od_cp_id]").val(cp_id); calculate_order_amount(); $("#od_coupon_frm").remove(); @@ -828,11 +838,16 @@ $(function() { $("#od_coupon_cancel").live("click", function() { var org_amount = $("input[name=org_od_amount]").val(); - $("input[name=od_amount]").val(org_amount); + var item_coupon = parseInt($("input[name=item_coupon]").val()); + $("input[name=od_amount]").val(org_amount - item_coupon); + $("input[name=od_send_cost]").val($("input[name=org_send_cost]").val()); + $("input[name=sc_cp_id]").val(""); calculate_order_amount(); $("#od_coupon_frm").remove(); $("#od_coupon_btn").text("쿠폰적용").focus(); $(this).remove(); + $("#sc_coupon_btn").text("쿠폰적용"); + $("#sc_coupon_cancel").remove(); }); $("#sc_coupon_btn").click(function() { @@ -885,6 +900,21 @@ $(function() { $(this).remove(); }); + $("#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 == "") + return false; + + var code = String(zip1) + String(zip2); + + if(zipcode == code) + return false; + + zipcode = code; + calculate_sendcost(code); + }); + $("#od_settle_bank").bind("click", function() { $("[name=od_deposit_name]").val( $("[name=od_b_name]").val() ); $("#settle_bank").show(); @@ -931,14 +961,22 @@ function calculate_total_amount() $("#ct_tot_amount").text(number_format(String(tot_sell_amount))+" 원"); $("input[name=good_mny]").val(tot_sell_amount); - $("input[name=od_amount]").val(sell_amount); - $("input[name=org_od_amount]").val(sell_amount); + $("input[name=od_amount]").val(sell_amount - tot_cp_amount); $("input[name=od_send_cost]").val(send_cost); - 0) { ?> + $("input[name=item_coupon]").val(tot_cp_amount); + 0) { ?> $("input[name=od_cp_id]").val(""); + if($("#od_coupon_cancel").size()) { + $("#od_coupon_btn").text("쿠폰적용"); + $("#od_coupon_cancel").remove(); + } 0) { ?> $("input[name=sc_cp_id]").val(""); + if($("#sc_coupon_cancel").size()) { + $("#sc_coupon_btn").text("쿠폰적용"); + $("#sc_coupon_cancel").remove(); + } $("input[name=od_temp_point]").val(0); 0 && $is_member) { ?> @@ -951,7 +989,8 @@ function calculate_order_amount() { var sell_amount = parseInt($("input[name=od_amount]").val()); var send_cost = parseInt($("input[name=od_send_cost]").val()); - var tot_amount = sell_amount + send_cost; + var send_cost2 = parseInt($("input[name=od_send_cost2]").val()); + var tot_amount = sell_amount + send_cost + send_cost2; $("form[name=sm_form] input[name=good_mny]").val(tot_amount); $("#od_tot_amount").text(number_format(String(tot_amount))); @@ -982,6 +1021,20 @@ function calculate_temp_point() $("input[name=max_temp_point]").val(temp_point); } +function calculate_sendcost(code) +{ + $.post( + "./ordersendcost.php", + { zipcode: code }, + function(data) { + $("input[name=od_send_cost2]").val(data); + $("#od_send_cost2").text(number_format(String(data))); + + calculate_order_amount(); + } + ); +} + /* 결제방법에 따른 처리 후 결제등록요청 실행 */ function kcp_approval() { @@ -1255,6 +1308,8 @@ function gumae2baesong(f) f.od_b_zip2.value = f.od_zip2.value; f.od_b_addr1.value = f.od_addr1.value; 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/mobile/shop/orderformupdate.php b/mobile/shop/orderformupdate.php index cc95183a2..62a32e795 100644 --- a/mobile/shop/orderformupdate.php +++ b/mobile/shop/orderformupdate.php @@ -64,6 +64,7 @@ if ($error != "") $i_amount = (int)$_POST['od_amount']; $i_send_cost = (int)$_POST['od_send_cost']; +$i_send_cost2 = (int)$_POST['od_send_cost2']; $i_temp_point = (int)$_POST['od_temp_point']; @@ -251,6 +252,17 @@ if ((int)($send_cost - $tot_sc_cp_amount) !== $i_send_cost) { die("Error.."); } +// 추가배송비가 상이함 +$zipcode = $od_b_zip1 . $od_b_zip2; +$sql = " select sc_id, sc_amount from {$g4['shop_sendcost_table']} where sc_zip1 <= '$zipcode' and sc_zip2 >= '$zipcode' "; +$tmp = sql_fetch($sql); +if(!$tmp['sc_id']) + $send_cost2 = 0; +else + $send_cost2 = (int)$tmp['sc_amount']; +if($send_cost2 !== $i_send_cost2) + die("Error..."); + // 결제포인트가 상이함 $tot_amount = $tot_sell_amount + $send_cost; // 회원이면서 포인트사용이면 @@ -271,7 +283,7 @@ if($default['de_mileage_use']) { } if (($i_temp_point > (int)$temp_point || $i_temp_point < 0)) - die("Error..."); + die("Error...."); if ($od_temp_point) { @@ -294,7 +306,7 @@ if($default['de_mileage_use']) { } if (($i_temp_point > (int)$temp_point || $i_temp_point < 0) && $config['cf_use_point']) - die("Error..."); + die("Error...."); if ($od_temp_point) { @@ -303,7 +315,7 @@ if($default['de_mileage_use']) { } } -$i_amount = $i_amount + $i_send_cost - $i_temp_point; +$i_amount = $i_amount + $i_send_cost + $i_send_cost2 - $i_temp_point; if ($od_settle_case == "무통장") { @@ -425,6 +437,7 @@ $sql = " insert {$g4['shop_order_table']} od_memo = '$od_memo', od_send_cost = '$od_send_cost', od_send_coupon = '$tot_sc_cp_amount', + od_send_cost2 = '$od_send_cost2', od_coupon = '$tot_od_cp_amount', od_temp_amount = '$od_temp_amount', od_temp_point = '$od_temp_point', diff --git a/mobile/shop/orderinquiryview.php b/mobile/shop/orderinquiryview.php index 4d7f1a90c..47429fe1f 100644 --- a/mobile/shop/orderinquiryview.php +++ b/mobile/shop/orderinquiryview.php @@ -116,6 +116,7 @@ include_once(G4_MSHOP_PATH.'/_head.php'); } $send_cost = $od['od_send_cost']; + $send_cost2 = $od['od_send_cost2']; $send_coupon = $od['od_send_coupon']; $org_send_cost = $send_cost + $send_coupon; ?> @@ -124,7 +125,7 @@ include_once(G4_MSHOP_PATH.'/_head.php');
      @@ -151,6 +152,11 @@ include_once(G4_MSHOP_PATH.'/_head.php');
      원
      + 0) { ?> +
      추가배송비
      +
      원
      + +
      총계
      원
      diff --git a/shop/mail/orderupdate1.mail.php b/shop/mail/orderupdate1.mail.php index 91a8ae03a..761e3e649 100644 --- a/shop/mail/orderupdate1.mail.php +++ b/shop/mail/orderupdate1.mail.php @@ -65,6 +65,13 @@ $ft_a_st = 'display:block;padding:30px 0;background:#484848;color:#fff;text-alig + 0) { // 추가배송비가 있다면 ?> + + 추가배송비 + + + + 주문합계 diff --git a/shop/mail/orderupdate2.mail.php b/shop/mail/orderupdate2.mail.php index 0e997f1fb..97a9aa912 100644 --- a/shop/mail/orderupdate2.mail.php +++ b/shop/mail/orderupdate2.mail.php @@ -65,6 +65,13 @@ $ft_a_st = 'display:block;padding:30px 0;background:#484848;color:#fff;text-alig + 0) { // 추가배송비가 있다면 ?> + + 추가배송비 + + + + 주문합계 diff --git a/shop/orderform.php b/shop/orderform.php index a2b0c20d5..a60e0af83 100644 --- a/shop/orderform.php +++ b/shop/orderform.php @@ -299,6 +299,8 @@ setTimeout("init_pay_button();",300); + + 총 주문금액 원 + + 추가배송비 + 0원 (지역에 따라 추가되는 도선료 등의 배송비입니다.) + @@ -905,6 +911,7 @@ setTimeout("init_pay_button();",300); $(function() { var $cp_btn_el; var $cp_row_el; + var zipcode = ""; $(".it_coupon_btn").click(function() { $cp_btn_el = $(this); @@ -1006,6 +1013,7 @@ $(function() { var subj = $el.find("input[name='o_cp_subj[]']").val(); var od_amount = parseInt($("input[name=org_od_amount]").val()); var send_cost = $("input[name=org_send_cost]").val(); + var item_coupon = parseInt($("input[name=item_coupon]").val()); if(parseInt(amount) == 0) { if(!confirm(subj+"쿠폰의 할인 금액은 "+amount+"원입니다.\n쿠폰을 적용하시겠습니까?")) { @@ -1015,8 +1023,10 @@ $(function() { $("input[name=od_send_cost]").val(send_cost); $("input[name=sc_cp_id]").val(""); + $("#sc_coupon_btn").text("쿠폰적용"); + $("#sc_coupon_cancel").remove(); - $("input[name=od_amount]").val(od_amount - amount); + $("input[name=od_amount]").val(od_amount - item_coupon - amount); $("input[name=od_cp_id]").val(cp_id); calculate_order_amount(); $("#od_coupon_frm").remove(); @@ -1032,11 +1042,16 @@ $(function() { $("#od_coupon_cancel").live("click", function() { var org_amount = $("input[name=org_od_amount]").val(); - $("input[name=od_amount]").val(org_amount); + var item_coupon = parseInt($("input[name=item_coupon]").val()); + $("input[name=od_amount]").val(org_amount - item_coupon); + $("input[name=od_send_cost]").val($("input[name=org_send_cost]").val()); + $("input[name=sc_cp_id]").val(""); calculate_order_amount(); $("#od_coupon_frm").remove(); $("#od_coupon_btn").text("쿠폰적용").focus(); $(this).remove(); + $("#sc_coupon_btn").text("쿠폰적용"); + $("#sc_coupon_cancel").remove(); }); $("#sc_coupon_btn").click(function() { @@ -1089,6 +1104,21 @@ $(function() { $(this).remove(); }); + $("#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 == "") + return false; + + var code = String(zip1) + String(zip2); + + if(zipcode == code) + return false; + + zipcode = code; + calculate_sendcost(code); + }); + $("#od_settle_bank").bind("click", function() { $("[name=od_deposit_name]").val( $("[name=od_b_name]").val() ); $("#settle_bank").show(); @@ -1131,14 +1161,22 @@ function calculate_total_amount() $("#ct_tot_amount").text(number_format(String(tot_sell_amount))+" 원"); $("input[name=good_mny]").val(tot_sell_amount); - $("input[name=od_amount]").val(sell_amount); - $("input[name=org_od_amount]").val(sell_amount); + $("input[name=od_amount]").val(sell_amount - tot_cp_amount); $("input[name=od_send_cost]").val(send_cost); - 0) { ?> + $("input[name=item_coupon]").val(tot_cp_amount); + 0) { ?> $("input[name=od_cp_id]").val(""); + if($("#od_coupon_cancel").size()) { + $("#od_coupon_btn").text("쿠폰적용"); + $("#od_coupon_cancel").remove(); + } 0) { ?> $("input[name=sc_cp_id]").val(""); + if($("#sc_coupon_cancel").size()) { + $("#sc_coupon_btn").text("쿠폰적용"); + $("#sc_coupon_cancel").remove(); + } $("input[name=od_temp_point]").val(0); 0 && $is_member) { ?> @@ -1151,7 +1189,8 @@ function calculate_order_amount() { var sell_amount = parseInt($("input[name=od_amount]").val()); var send_cost = parseInt($("input[name=od_send_cost]").val()); - var tot_amount = sell_amount + send_cost; + var send_cost2 = parseInt($("input[name=od_send_cost2]").val()); + var tot_amount = sell_amount + send_cost + send_cost2; $("input[name=good_mny]").val(tot_amount); $("#od_tot_amount").text(number_format(String(tot_amount))); @@ -1182,6 +1221,20 @@ function calculate_temp_point() $("input[name=max_temp_point]").val(temp_point); } +function calculate_sendcost(code) +{ + $.post( + "./ordersendcost.php", + { zipcode: code }, + function(data) { + $("input[name=od_send_cost2]").val(data); + $("#od_send_cost2").text(number_format(String(data))); + + calculate_order_amount(); + } + ); +} + function forderform_check(f) { errmsg = ""; @@ -1394,6 +1447,8 @@ function gumae2baesong(f) f.od_b_zip2.value = f.od_zip2.value; f.od_b_addr1.value = f.od_addr1.value; 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 603ceac49..178e3d99b 100644 --- a/shop/orderformupdate.php +++ b/shop/orderformupdate.php @@ -58,6 +58,7 @@ if ($error != "") $i_amount = (int)$_POST['od_amount']; $i_send_cost = (int)$_POST['od_send_cost']; +$i_send_cost2 = (int)$_POST['od_send_cost2']; $i_temp_point = (int)$_POST['od_temp_point']; @@ -245,6 +246,17 @@ if ((int)($send_cost - $tot_sc_cp_amount) !== $i_send_cost) { die("Error.."); } +// 추가배송비가 상이함 +$zipcode = $od_b_zip1 . $od_b_zip2; +$sql = " select sc_id, sc_amount from {$g4['shop_sendcost_table']} where sc_zip1 <= '$zipcode' and sc_zip2 >= '$zipcode' "; +$tmp = sql_fetch($sql); +if(!$tmp['sc_id']) + $send_cost2 = 0; +else + $send_cost2 = (int)$tmp['sc_amount']; +if($send_cost2 !== $i_send_cost2) + die("Error..."); + // 결제포인트가 상이함 $tot_amount = $tot_od_amount + ($send_cost - $tot_sc_cp_amount); // 회원이면서 포인트사용이면 @@ -265,7 +277,7 @@ if($default['de_mileage_use']) { } if (($i_temp_point > (int)$temp_point || $i_temp_point < 0)) - die("Error..."); + die("Error...."); if ($od_temp_point) { @@ -288,7 +300,7 @@ if($default['de_mileage_use']) { } if (($i_temp_point > (int)$temp_point || $i_temp_point < 0) && $config['cf_use_point']) - die("Error..."); + die("Error...."); if ($od_temp_point) { @@ -297,7 +309,7 @@ if($default['de_mileage_use']) { } } -$i_amount = $i_amount + $i_send_cost - $i_temp_point; +$i_amount = $i_amount + $i_send_cost + $i_send_cost2 - $i_temp_point; if ($od_settle_case == "무통장") { @@ -419,6 +431,7 @@ $sql = " insert {$g4['shop_order_table']} od_memo = '$od_memo', od_send_cost = '$od_send_cost', od_send_coupon = '$tot_sc_cp_amount', + od_send_cost2 = '$od_send_cost2', od_coupon = '$tot_od_cp_amount', od_temp_amount = '$od_temp_amount', od_temp_point = '$od_temp_point', diff --git a/shop/orderinquiryview.php b/shop/orderinquiryview.php index 6e4091eaa..6d20f607d 100644 --- a/shop/orderinquiryview.php +++ b/shop/orderinquiryview.php @@ -128,6 +128,7 @@ if(openwin != null) { } $send_cost = $od['od_send_cost']; + $send_cost2 = $od['od_send_cost2']; $send_coupon = $od['od_send_coupon']; $org_send_cost = $send_cost + $send_coupon; ?> @@ -136,7 +137,7 @@ if(openwin != null) {
      @@ -163,6 +164,11 @@ if(openwin != null) {
      원
      + 0) { ?> +
      추가배송비
      +
      원
      + +
      총계
      원
      diff --git a/shop/ordermail1.inc.php b/shop/ordermail1.inc.php index 25af49c12..4569fca08 100644 --- a/shop/ordermail1.inc.php +++ b/shop/ordermail1.inc.php @@ -71,4 +71,8 @@ for ($i=0; $row=sql_fetch_array($result); $i++) // 배송비가 있다면 총계에 더한다 if ($od_send_cost) $ttotal_amount += $od_send_cost; + +// 추가배송비가 있다면 총계에 더한다 +if ($od_send_cost2) + $ttotal_amount += $od_send_cost2; ?> \ No newline at end of file diff --git a/shop/ordersendcost.php b/shop/ordersendcost.php new file mode 100644 index 000000000..6c2505954 --- /dev/null +++ b/shop/ordersendcost.php @@ -0,0 +1,19 @@ += $code "; +$row = sql_fetch($sql); + +if(!$row['sc_id']) + die('0'); + +die($row['sc_amount']); +?> \ No newline at end of file From 5b37e4d5c4e04be6fb35d41972d473d0e7eb93ed Mon Sep 17 00:00:00 2001 From: whitedot Date: Mon, 17 Jun 2013 16:30:10 +0900 Subject: [PATCH 05/14] =?UTF-8?q?=EA=B4=80=EB=A6=AC=EC=9E=90:=20=EA=B2=8C?= =?UTF-8?q?=EC=8B=9C=ED=8C=90=EA=B7=B8=EB=A3=B9=20=EC=9E=85=EB=A0=A5/?= =?UTF-8?q?=EC=88=98=EC=A0=95=20=EC=8A=A4=ED=83=80=EC=9D=BC=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adm/boardgroup_form.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/adm/boardgroup_form.php b/adm/boardgroup_form.php index a31dacb9c..d8dc747ad 100644 --- a/adm/boardgroup_form.php +++ b/adm/boardgroup_form.php @@ -58,7 +58,7 @@ include_once('./admin.head.php'); if ($w=='') echo '영문자, 숫자, _ 만 가능 (공백없이)'; else - echo '게시판그룹 바로가기'; + echo '게시판그룹 바로가기'; ?> @@ -68,7 +68,7 @@ include_once('./admin.head.php'); 게시판생성'; + echo '게시판생성'; ?> From bf6e4454c779f3cd0433f2ce89ea3373000c520f Mon Sep 17 00:00:00 2001 From: whitedot Date: Mon, 17 Jun 2013 16:43:30 +0900 Subject: [PATCH 06/14] =?UTF-8?q?=EA=B3=B5=ED=86=B5:=20gnb=20=ED=82=A4?= =?UTF-8?q?=EB=B3=B4=EB=93=9C=20=EC=9A=B4=EC=9A=A9=20=EA=B4=80=EB=A0=A8=20?= =?UTF-8?q?=EC=8A=A4=ED=83=80=EC=9D=BC=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- css/admin.css | 8 ++++---- css/default.css | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/css/admin.css b/css/admin.css index b868e880d..145844801 100644 --- a/css/admin.css +++ b/css/admin.css @@ -41,7 +41,7 @@ h2 {font-size:1.2em} /* gnb js off */ #gnb {z-index:12;background:#383a3f} -#gnb h2 {margin:0;padding:0;width:1px;height:1px;font-size:0;line-height:0;overflow:hidden} +#gnb h2 {margin:0;padding:0;font-size:0;line-height:0;overflow:hidden} #gnb_1dul {margin:0 auto;padding:0;width:1000px;zoom:1} #gnb_1dul:after {display:block;visibility:hidden;clear:both;content:""} .gnb_1dli {z-index:13;clear:both;zoom:1} @@ -59,10 +59,10 @@ h2 {font-size:1.2em} .gnb_js .gnb_1dli a {color:#fff;text-align:center} .gnb_js .gnb_1dli_air a {float:none;background:#f5f6fa;color:#000} .gnb_js .gnb_1dli_on a {float:none;background:#fff;color:#000} -.gnb_js .gnb_2dul {position:absolute;top:35px;width:1px;height:1px;overflow:hidden} +.gnb_js .gnb_2dul {display:none;position:absolute;top:35px} .gnb_js .gnb_2dli a {display:inline-block;float:none !important;padding:0 10px;width:161px;text-align:left} -.gnb_1dli_over .gnb_2dul {left:-1px;width:181px;height:auto;border:1px solid #c3c7c5;border-top:0;background:#fff} -.gnb_1dli_over2 .gnb_2dul {right:-1px;width:181px;height:auto;border:1px solid #c3c7c5;border-top:0;background:#fff} +.gnb_1dli_over .gnb_2dul {display:block;left:-1px;width:181px;border:1px solid #c3c7c5;border-top:0;background:#fff} +.gnb_1dli_over2 .gnb_2dul {display:block;right:-1px;width:181px;border:1px solid #c3c7c5;border-top:0;background:#fff} .gnb_js .gnb_grp_style {background:#f7f7f7 !important} .gnb_js .gnb_grp_div {border-top:1px solid #eee} diff --git a/css/default.css b/css/default.css index 9d94cc2a1..3fd62bd54 100644 --- a/css/default.css +++ b/css/default.css @@ -41,7 +41,7 @@ a:active {color:#000;text-decoration:underline} /* gnb js off */ #gnb {position:relative;margin:-1px 0 0;border-bottom:1px solid #c3c7c5;background:#f0f4f8} -#gnb h2 {position:absolute;margin:0;padding:0;font-size:0;line-height:0;overflow:hidden} +#gnb h2 {position:absolute;font-size:0;line-height:0;overflow:hidden} #gnb_1dul {margin:0 auto;padding:0;width:980px;zoom:1} #gnb_1dul:after {display:block;visibility:hidden;clear:both;content:""} .gnb_1dli {z-index:10;clear:both;zoom:1} @@ -60,10 +60,10 @@ a:active {color:#000;text-decoration:underline} .gnb_js .gnb_1da {text-align:center} .gnb_js .gnb_1dli_air a {float:none;background:#333;color:#fff} .gnb_js .gnb_1dli_on a {float:none;background:#333;color:#fff} -.gnb_js .gnb_2dul {position:absolute;top:35px;width:1px;height:1px;overflow:hidden} +.gnb_js .gnb_2dul {display:none;position:absolute;top:35px} .gnb_js .gnb_2da {display:inline-block;float:none !important;padding:0 10px;width:161px;text-align:left} -.gnb_1dli_over .gnb_2dul {left:0;width:180px;height:auto;background:#fff} -.gnb_1dli_over2 .gnb_2dul {right:0;width:180px;height:auto;background:#fff} +.gnb_1dli_over .gnb_2dul {display:block;left:0;background:#fff} +.gnb_1dli_over2 .gnb_2dul {display:block;right:0;width:180px;background:#fff} .gnb_empty {width:100%;height:35px;text-align:center;line-height:2.95em} From 640ef708247a4be7aa9ee80a0a4f33ccbb9a34a8 Mon Sep 17 00:00:00 2001 From: whitedot Date: Mon, 17 Jun 2013 17:47:31 +0900 Subject: [PATCH 07/14] .gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 33e6af57b..1c8837ef9 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ skin/latest/basic2 rankiss* thumb.lib.php test.php +itzimara* From 69e7afa0b0099f1ab9fe6c9c5e84ee6bbe83bf89 Mon Sep 17 00:00:00 2001 From: chicpro Date: Mon, 17 Jun 2013 17:51:02 +0900 Subject: [PATCH 08/14] =?UTF-8?q?=EC=83=81=ED=92=88=EC=83=81=EC=84=B8?= =?UTF-8?q?=ED=8E=98=EC=9D=B4=EC=A7=80=EC=97=90=EC=84=9C=20ie8=20=EB=A1=9C?= =?UTF-8?q?=EA=B7=B8=EC=9D=B8=EC=8B=9C=20=EC=98=A4=EB=B2=84=ED=94=8C?= =?UTF-8?q?=EB=A1=9C=EC=9A=B0=20=EC=97=90=EB=9F=AC=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- shop/itemuse.php | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/shop/itemuse.php b/shop/itemuse.php index 26d20c098..65408f70f 100644 --- a/shop/itemuse.php +++ b/shop/itemuse.php @@ -7,7 +7,7 @@ $it_id = $_REQUEST['it_id']; $itemuse_form = "./itemuseform.php?it_id=".$it_id; $itemuse_list = "./itemuselist.php"; -include_once(G4_PATH.'/head.sub.php'); +//include_once(G4_PATH.'/head.sub.php'); ?>
      @@ -15,7 +15,7 @@ include_once(G4_PATH.'/head.sub.php'); \ No newline at end of file From 6520da514aa181b265c8bcb9ccc806b6606ec345 Mon Sep 17 00:00:00 2001 From: chicpro Date: Mon, 17 Jun 2013 18:34:10 +0900 Subject: [PATCH 09/14] =?UTF-8?q?=EC=83=81=ED=92=88=EB=AC=B8=EC=9D=98?= =?UTF-8?q?=EB=A5=BC=20ajax=20=EB=B0=A9=EC=8B=9D=EC=9C=BC=EB=A1=9C=20?= =?UTF-8?q?=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/shop.lib.php | 4 +- mobile/shop/itemuse.inc.php | 217 ------------------------------------ mobile/shop/itemuseform.php | 104 +++++++++++++++++ mobile/shop/itemuselist.php | 153 +++++++++++++++++++++++++ mobile/shop/list.php | 2 +- shop/item.php | 13 +-- shop/itemqa.php | 208 ++++++++++++++++++++++++++++++++++ shop/itemqaform.php | 74 ++++++++++++ shop/itemqaformupdate.php | 95 ++++++++++++++++ shop/itemuseform.php | 10 +- shop/itemuselist.php | 6 + 11 files changed, 657 insertions(+), 229 deletions(-) delete mode 100644 mobile/shop/itemuse.inc.php create mode 100644 mobile/shop/itemuseform.php create mode 100644 mobile/shop/itemuselist.php create mode 100644 shop/itemqa.php create mode 100644 shop/itemqaform.php create mode 100644 shop/itemqaformupdate.php diff --git a/lib/shop.lib.php b/lib/shop.lib.php index 18c8211c7..7d0c780fc 100644 --- a/lib/shop.lib.php +++ b/lib/shop.lib.php @@ -884,8 +884,8 @@ function alert_opener($msg='', $url='') if (!$msg) $msg = '올바른 방법으로 이용해 주십시오.'; - echo ""; - echo " \ No newline at end of file diff --git a/mobile/shop/itemuseform.php b/mobile/shop/itemuseform.php new file mode 100644 index 000000000..00927b490 --- /dev/null +++ b/mobile/shop/itemuseform.php @@ -0,0 +1,104 @@ + + + +
      +
      + + + +
      + 사용후기 쓰기 +
        +
      • + + +
        • +
      • + + +
        • +
      • + + > + > + > + > + > +
        • +
      + +
      +
      +
      + + + + \ No newline at end of file diff --git a/mobile/shop/itemuselist.php b/mobile/shop/itemuselist.php new file mode 100644 index 000000000..5baca346a --- /dev/null +++ b/mobile/shop/itemuselist.php @@ -0,0 +1,153 @@ + + +전체보기 + +
      + + + +
      + +
      + + + + '; + ?> +
    • + +
      + + + + +
      + +
      +

      + +
      +
      작성자
      +
      +
      작성일
      +
      +
      평가점수
      +
      별<?php echo $star; ?>개
      +
      + + + +
      +
      + +
      • + 0) echo ''; + if ($i == 0) echo '

      자료가 없습니다.

      '; + ?> + +
      + + + + + + + diff --git a/mobile/shop/list.php b/mobile/shop/list.php index e627dbf60..00f97b6da 100644 --- a/mobile/shop/list.php +++ b/mobile/shop/list.php @@ -106,7 +106,7 @@ $qstr1 .= 'ca_id='.$ca_id; if($skin) $qstr1 .= '&skin='.$skin; $qstr1 .='&ev_id='.$ev_id.'&sort='.$sort.'&sortodr='.$sortodr; -echo get_paging($config['cf_write_pages'], $page, $total_page, $_SERVER['PHP_SELF'].'?'.$qstr1.'&page='); +echo get_paging($config['cf_mobile_pages'], $page, $total_page, $_SERVER['PHP_SELF'].'?'.$qstr1.'&page='); ?> 상품문의 - +
      +
      diff --git a/shop/itemqa.php b/shop/itemqa.php new file mode 100644 index 000000000..079546fd2 --- /dev/null +++ b/shop/itemqa.php @@ -0,0 +1,208 @@ + + +
      +

      등록된 상품문의

      + + "; + //if ($row[iq_answer]) $qa .= ""; + //$qa = "$qa"; + + $iq_stats = ''; + $iq_answer = ''; + $iq_flag = 0; + if ($row['iq_answer']) + { + $iq_answer = conv_content($row['iq_answer'],0); + $iq_stats = '답변완료'; + } else { + $iq_stats = '답변전'; + $iq_answer = '답변이 등록되지 않았습니다.'; + $iq_flag = 1; + } + + if ($i == 0) echo '
        '; + ?> + +
      1. + +
        +
        작성자
        +
        +
        작성일
        +
        +
        상태
        +
        +
        + +
        +

        + 문의내용
        + +

        +

        + 답변
        + +

        + + + + + + + +
        + 수정 + 삭제 +
        + +
        +
        2. + + = 0) echo '
      '; + + if (!$i) echo '

      상품문의가 없습니다.

      '; + ?> +
      + + 1) { + $str .= '처음'.PHP_EOL; + } + + $start_page = ( ( (int)( ($cur_page - 1 ) / $write_pages ) ) * $write_pages ) + 1; + $end_page = $start_page + $write_pages - 1; + + if ($end_page >= $total_page) $end_page = $total_page; + + if ($start_page > 1) $str .= '이전'.PHP_EOL; + + if ($total_page > 1) { + for ($k=$start_page;$k<=$end_page;$k++) { + if ($cur_page != $k) + $str .= ''.$k.'페이지'.PHP_EOL; + else + $str .= '열린'.$k.'페이지'.PHP_EOL; + } + } + + if ($total_page > $end_page) $str .= '다음'.PHP_EOL; + + if ($cur_page < $total_page) { + $str .= '맨끝'.PHP_EOL; + } + + if ($str) + return ""; + else + return ""; +} + +echo itemqa_page($config['cf_write_pages'], $page, $total_page, "./itemqa.php?it_id=$it_id&page=", ""); +?> + + + + \ No newline at end of file diff --git a/shop/itemqaform.php b/shop/itemqaform.php new file mode 100644 index 000000000..4189f6544 --- /dev/null +++ b/shop/itemqaform.php @@ -0,0 +1,74 @@ + +
      +
      + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
      + 패스워드는 최소 3글자 이상 입력하십시오. + +
      자동등록방지
      + +
      + +
      +
      +
      + + + + \ No newline at end of file diff --git a/shop/itemqaformupdate.php b/shop/itemqaformupdate.php new file mode 100644 index 000000000..bdb4ecff3 --- /dev/null +++ b/shop/itemqaformupdate.php @@ -0,0 +1,95 @@ + diff --git a/shop/itemuseform.php b/shop/itemuseform.php index c6fab9cae..3ce57e4fd 100644 --- a/shop/itemuseform.php +++ b/shop/itemuseform.php @@ -1,5 +1,11 @@ ) { alert("내용은 글자 이내에서 작성해 주세요. (한글은 영문 3자)\n\n현재 : "+is_content_editor_data.length+" 글자"); - CKEDITOR.instances.is_content.focus(); + CKEDITOR.instances.is_content.focus(); return false; } diff --git a/shop/itemuselist.php b/shop/itemuselist.php index ff44347ce..8e10a48eb 100644 --- a/shop/itemuselist.php +++ b/shop/itemuselist.php @@ -1,5 +1,11 @@ Date: Mon, 17 Jun 2013 18:39:18 +0900 Subject: [PATCH 10/14] =?UTF-8?q?=EB=AA=A8=EB=B0=94=EC=9D=BC=20=EC=87=BC?= =?UTF-8?q?=ED=95=91=EB=AA=B0=20=EC=83=81=ED=92=88=EB=AC=B8=EC=9D=98=20aja?= =?UTF-8?q?x=EB=A1=9C=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mobile/shop/item.php | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/mobile/shop/item.php b/mobile/shop/item.php index 53722582c..4b7f4e94d 100644 --- a/mobile/shop/item.php +++ b/mobile/shop/item.php @@ -582,10 +582,12 @@ else

      상품문의

      - +
      + From 5db134be659e7ab20dd12c11b1432200368a2427 Mon Sep 17 00:00:00 2001 From: whitedot Date: Mon, 17 Jun 2013 18:43:40 +0900 Subject: [PATCH 11/14] =?UTF-8?q?=EC=87=BC=ED=95=91=EB=AA=B0=EA=B4=80?= =?UTF-8?q?=EB=A6=AC=EC=9E=90:=20#232=20=EC=B6=94=EA=B0=80=EB=B0=B0?= =?UTF-8?q?=EC=86=A1=EB=B9=84=20=EB=A7=88=ED=81=AC=EC=97=85=20=EB=B0=8F=20?= =?UTF-8?q?=EC=8A=A4=ED=83=80=EC=9D=BC=20=EC=99=84=EB=A3=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adm/shop_admin/sendcostlist.php | 10 ++-- adm/shop_admin/sendcostzipcode.php | 73 ++++++++++++++---------------- css/admin.css | 13 +++++- css/default_shop.css | 4 +- 4 files changed, 52 insertions(+), 48 deletions(-) diff --git a/adm/shop_admin/sendcostlist.php b/adm/shop_admin/sendcostlist.php index 08a9c462c..465688453 100644 --- a/adm/shop_admin/sendcostlist.php +++ b/adm/shop_admin/sendcostlist.php @@ -63,8 +63,8 @@ include_once (G4_ADMIN_PATH.'/admin.head.php'); - - + + -
      +

      추가배송비 등록

      @@ -104,14 +104,14 @@ include_once (G4_ADMIN_PATH.'/admin.head.php'); - + - + diff --git a/adm/shop_admin/sendcostzipcode.php b/adm/shop_admin/sendcostzipcode.php index 0f61c69e0..c39b4964d 100644 --- a/adm/shop_admin/sendcostzipcode.php +++ b/adm/shop_admin/sendcostzipcode.php @@ -39,7 +39,7 @@ if($addr) { foreach($list as $value) { $code = substr($value, 0, 7); - $result[] = ''.$value.' '.PHP_EOL; + $result[] = ''.$value.' '.PHP_EOL; } } } @@ -49,46 +49,39 @@ include_once(G4_PATH.'/head.sub.php'); ?> -
      - - - - - - - - - - - - -
      우편번호 찾기
      주소지의 시/군을 입력하세요.
      - - - -
      - +
      +

      - -

      검색결과

      -

        - -
        • - -
      - -

      검색된 결과가 없습니다.

      - + +
      + + +

      주소지의 시/군을 입력하세요.

      + +
      + + + +
      + +
      + + + 검색결과 +
        + +
        • + +
      + +

      검색된 결과가 없습니다.

      + + +
      + 창닫기 +
      - - -
      - - - ----- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
      테마 - - - http://jqueryui.com/themeroller/ 의 Gallery 참고 -
      시간 - 동안 창을 다시 띄우지 않음 -
      시작일시 - - " onclick="if (this.checked == true) this.form.di_begin_time.value=this.form.di_begin_chk.value; else this.form.di_begin_time.value = this.form.di_begin_time.defaultValue;">오늘 - 종료일시 - - " onclick="if (this.checked == true) this.form.di_end_time.value=this.form.di_end_chk.value; else this.form.di_end_time.value = this.form.di_end_time.defaultValue;">오늘+7일 -
      출력 스피드 - - - 예) 1000 -
      창위치 - - -
      왼쪽, 상단을 [100,50] 과 같이 입력하거나, ['right','top'] 과 같이 입력할 수 있습니다.");?> -       		창 드래그 - > 가능 - -
      창크기 폭 - px - - 창크기 높이 - px - -
      modal - > 사용 - - 사이즈 조절 가능 - > 사용 - -
      show - - - - - hide - - - -
      ESC - > 사용 - - zIndex - - -
      창제목
      내용
      - -

      -   - -

      - - - - diff --git a/adm/dialog_form_update.php b/adm/dialog_form_update.php deleted file mode 100644 index a45b13aa6..000000000 --- a/adm/dialog_form_update.php +++ /dev/null @@ -1,61 +0,0 @@ - diff --git a/adm/dialog_list.php b/adm/dialog_list.php deleted file mode 100644 index 896ae1556..000000000 --- a/adm/dialog_list.php +++ /dev/null @@ -1,114 +0,0 @@ - - - - - - - - -
        건수 :  
      - - - ----------- - - - - - - - - - - - - - - - - - - - - - - - - - - "; -} - -if ($i == 0) { - echo "\n"; -} -?> - -
      번호시작일시종료일시modalESC위치HeightWidth제목
      $row[di_id]".substr($row['di_begin_time'],2,14)."".substr($row['di_end_time'],2,14)."$row[di_modal]$row[di_escape]$row[di_position]$row[di_height]$row[di_width]$row[di_subject]$s_mod $s_del $s_vie
      자료가 한건도 없습니다.
      - -

      * 같은 페이지에 다이얼로그 창이 2개 이상 뜨는 경우 나중에 설정한 테마가 적용됩니다.

      - - diff --git a/adm/dialog_view.php b/adm/dialog_view.php deleted file mode 100644 index 1b84ae489..000000000 --- a/adm/dialog_view.php +++ /dev/null @@ -1,16 +0,0 @@ - From 8ba2a84198461168008549042bbfc2d01e738d03 Mon Sep 17 00:00:00 2001 From: chicpro Date: Tue, 18 Jun 2013 10:19:52 +0900 Subject: [PATCH 14/14] =?UTF-8?q?#235=20=EB=B3=B5=ED=95=A9=EA=B3=BC?= =?UTF-8?q?=EC=84=B8=20=EC=84=A4=EC=A0=95=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/configform.php | 7 +++++++ adm/shop_admin/configformupdate.php | 3 ++- adm/shop_admin/itemform.php | 20 ++++++++++++++++++-- adm/shop_admin/itemformupdate.php | 1 + extend/shop.extend2.php | 10 ++++++++++ install/shop.sql | 4 +++- 6 files changed, 41 insertions(+), 4 deletions(-) diff --git a/adm/shop_admin/configform.php b/adm/shop_admin/configform.php index 8ff303a84..10419295f 100644 --- a/adm/shop_admin/configform.php +++ b/adm/shop_admin/configform.php @@ -803,6 +803,13 @@ $pg_anchor = '
        > 사용 + + + + + > 사용 + + 비회원에 대한
        개인정보수집 내용 diff --git a/adm/shop_admin/configformupdate.php b/adm/shop_admin/configformupdate.php index 0d1db2a2a..9a29968a2 100644 --- a/adm/shop_admin/configformupdate.php +++ b/adm/shop_admin/configformupdate.php @@ -149,7 +149,8 @@ $sql = " update {$g4['shop_default_table']} de_taxsave_use = '$de_taxsave_use', de_guest_privacy = '$de_guest_privacy', de_hp_use = '$de_hp_use', - de_escrow_use = '$de_escrow_use' + de_escrow_use = '$de_escrow_use', + de_tax_flag_use = '$de_tax_flag_use' "; sql_query($sql); diff --git a/adm/shop_admin/itemform.php b/adm/shop_admin/itemform.php index 8047a0476..33e9fbfcd 100644 --- a/adm/shop_admin/itemform.php +++ b/adm/shop_admin/itemform.php @@ -286,7 +286,7 @@ $pg_anchor ='
          - + @@ -299,7 +299,7 @@ $pg_anchor ='
            - + @@ -312,6 +312,22 @@ $pg_anchor ='
              + + + + + + + + + + + + + diff --git a/adm/shop_admin/itemformupdate.php b/adm/shop_admin/itemformupdate.php index 102860445..cf145e452 100644 --- a/adm/shop_admin/itemformupdate.php +++ b/adm/shop_admin/itemformupdate.php @@ -283,6 +283,7 @@ $sql_common = " ca_id = '$ca_id', it_price = '$it_price', it_point = '$it_point', it_point_type = '$it_point_type', + it_notax = '$it_notax', it_sell_email = '$it_sell_email', it_use = '$it_use', it_stock_qty = '$it_stock_qty', diff --git a/extend/shop.extend2.php b/extend/shop.extend2.php index 2be1768ec..de4e1e6b1 100644 --- a/extend/shop.extend2.php +++ b/extend/shop.extend2.php @@ -336,4 +336,14 @@ if(!$result) { sql_query(" ALTER TABLE `{$g4['shop_order_table']}` ADD `od_send_cost2` INT(11) NOT NULL DEFAULT '0' AFTER `od_send_coupon` ", false); } + +// 복합과세 필드 추가 +$sql = " select de_tax_flag_use from {$g4['shop_default_table']} "; +$result = sql_query($sql, false); +if(!$result) { + sql_query(" ALTER TABLE `{$g4['shop_default_table']}` + ADD `de_tax_flag_use` TINYINT(4) NOT NULL DEFAULT '0' AFTER `de_escrow_use` ", false); + sql_query(" ALTER TABLE `{$g4['shop_item_table']}` + ADD `it_notax` TINYINT(4) NOT NULL DEFAULT '0' AFTER `it_point_type` ", false); +} ?> \ No newline at end of file diff --git a/install/shop.sql b/install/shop.sql index 7ed5c3ca5..b33e9f091 100644 --- a/install/shop.sql +++ b/install/shop.sql @@ -296,7 +296,8 @@ CREATE TABLE IF NOT EXISTS `shop_default` ( `de_taxsave_use` tinyint(4) NOT NULL, `de_guest_privacy` text NOT NULL, `de_hp_use` tinyint(4) NOT NULL DEFAULT '0', - `de_escrow_use` tinyint(4) NOT NULL DEFAULT '0' + `de_escrow_use` tinyint(4) NOT NULL DEFAULT '0', + `de_tax_flag_use` tinyint(4) NOT NULL DEFAULT '0' ) ENGINE=MyISAM DEFAULT CHARSET=utf8; -- -------------------------------------------------------- @@ -418,6 +419,7 @@ CREATE TABLE IF NOT EXISTS `shop_item` ( `it_price` int(11) NOT NULL DEFAULT '0', `it_point` int(11) NOT NULL DEFAULT '0', `it_point_type` tinyint(4) NOT NULL DEFAULT '0', + `it_notax` tinyint(4) NOT NULL DEFAULT '0', `it_sell_email` varchar(255) NOT NULL DEFAULT '', `it_use` tinyint(4) NOT NULL DEFAULT '0', `it_stock_qty` int(11) NOT NULL DEFAULT '0',