merge 충돌 처리

This commit is contained in:
whitedot
2013-06-13 11:31:56 +09:00
parent c0d2b4ca7d
commit 80c20cc73f
36 changed files with 399 additions and 398 deletions

View File

@ -46,7 +46,7 @@ include_once(G4_MSHOP_PATH.'/_head.php');
$sql .= " order by a.ct_id ";
$result = sql_query($sql);
$good_info = '';
$it_send_cost = 0;
for ($i=0; $row=mysql_fetch_array($result); $i++)
{
@ -74,6 +74,11 @@ include_once(G4_MSHOP_PATH.'/_head.php');
$it_name .= '<div class="sod_bsk_itopt">'.$it_options.'</div>';
}
// 개별배송비 계산
if($default['de_send_cost_case'] == '개별') {
$it_send_cost += get_item_sendcost($row['it_id'], $sum['price'], $sum['qty']);
}
$point = $sum['point'];
$sell_amount = $sum['price'];
?>
@ -104,18 +109,20 @@ include_once(G4_MSHOP_PATH.'/_head.php');
// 배송비 계산
if ($default['de_send_cost_case'] == '없음')
$send_cost = 0;
else {
else if($default['de_send_cost_case'] == '상한') {
// 배송비 상한 : 여러단계의 배송비 적용 가능
$send_cost_limit = explode(";", $default['de_send_cost_limit']);
$send_cost_list = explode(";", $default['de_send_cost_list']);
$send_cost = 0;
for ($k=0; $k<count($send_cost_limit); $k++) {
// 총판매금액이 배송비 상한가 보다 작다면
if ($tot_sell_amount < $send_cost_limit[$k]) {
$send_cost = $send_cost_list[$k];
if ($tot_sell_amount < preg_replace('/[^0-9]/', '', $send_cost_limit[$k])) {
$send_cost = preg_replace('/[^0-9]/', '', $send_cost_list[$k]);
break;
}
}
} else {
$send_cost = $it_send_cost;
}
}
?>

View File

@ -108,7 +108,7 @@
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<meta http-equiv="Cache-Control" content="No-Cache">
<meta http-equiv="Pragma" content="No-Cache">
<meta name="viewport" content="width=device-width; user-scalable=<?=$tablet_size?>; initial-scale=<?=$tablet_size?>; maximum-scale=<?=$tablet_size?>; minimum-scale=<?=$tablet_size?>">
<meta name="viewport" content="width=device-width; user-scalable=<?php echo $tablet_size; ?>; initial-scale=<?php echo $tablet_size; ?>; maximum-scale=<?php echo $tablet_size; ?>; minimum-scale=<?php echo $tablet_size; ?>">
<style type="text/css">
.LINE { background-color:#afc3ff }
@ -174,29 +174,29 @@
{
var of = window.opener.document.forderform;
of.req_tx.value = "<?=$req_tx?>";
of.res_cd.value = "<?=$res_cd?>";
of.tran_cd.value = "<?=$tran_cd?>";
of.ordr_idxx.value = "<?=$ordr_idxx?>";
of.good_mny.value = "<?=$good_mny?>";
of.good_name.value = "<?=$good_name?>";
of.buyr_name.value = "<?=$buyr_name?>";
of.buyr_tel1.value = "<?=$buyr_tel1?>";
of.buyr_tel2.value = "<?=$buyr_tel2?>";
of.buyr_mail.value = "<?=$buyr_mail?>";
of.enc_info.value = "<?=$enc_info?>";
of.enc_data.value = "<?=$enc_data?>";
of.use_pay_method.value = "<?=$use_pay_method?>";
of.rcvr_name.value = "<?=$rcvr_name?>";
of.rcvr_tel1.value = "<?=$rcvr_tel1?>";
of.rcvr_tel2.value = "<?=$rcvr_tel2?>";
of.rcvr_mail.value = "<?=$rcvr_mail?>";
of.rcvr_zipx.value = "<?=$rcvr_zipx?>";
of.rcvr_add1.value = "<?=$rcvr_add1?>";
of.rcvr_add2.value = "<?=$rcvr_add2?>";
of.param_opt_1.value = "<?=$param_opt_1?>";
of.param_opt_2.value = "<?=$param_opt_2?>";
of.param_opt_3.value = "<?=$param_opt_3?>";
of.req_tx.value = "<?php echo $req_tx; ?>";
of.res_cd.value = "<?php echo $res_cd; ?>";
of.tran_cd.value = "<?php echo $tran_cd; ?>";
of.ordr_idxx.value = "<?php echo $ordr_idxx; ?>";
of.good_mny.value = "<?php echo $good_mny; ?>";
of.good_name.value = "<?php echo $good_name; ?>";
of.buyr_name.value = "<?php echo $buyr_name; ?>";
of.buyr_tel1.value = "<?php echo $buyr_tel1; ?>";
of.buyr_tel2.value = "<?php echo $buyr_tel2; ?>";
of.buyr_mail.value = "<?php echo $buyr_mail; ?>";
of.enc_info.value = "<?php echo $enc_info; ?>";
of.enc_data.value = "<?php echo $enc_data; ?>";
of.use_pay_method.value = "<?php echo $use_pay_method; ?>";
of.rcvr_name.value = "<?php echo $rcvr_name; ?>";
of.rcvr_tel1.value = "<?php echo $rcvr_tel1; ?>";
of.rcvr_tel2.value = "<?php echo $rcvr_tel2; ?>";
of.rcvr_mail.value = "<?php echo $rcvr_mail; ?>";
of.rcvr_zipx.value = "<?php echo $rcvr_zipx; ?>";
of.rcvr_add1.value = "<?php echo $rcvr_add1; ?>";
of.rcvr_add2.value = "<?php echo $rcvr_add2; ?>";
of.param_opt_1.value = "<?php echo $param_opt_1; ?>";
of.param_opt_2.value = "<?php echo $param_opt_2; ?>";
of.param_opt_3.value = "<?php echo $param_opt_3; ?>";
var od = window.opener.document;
od.getElementById("show_req_btn").style.display = "none";
@ -217,70 +217,70 @@
<form name="sm_form" method="POST" accept-charset="euc-kr">
<input type="hidden" name='good_name' value='<?=$good_name?>'>
<input type="hidden" name='good_mny' value='<?=$good_mny?>' >
<input type="hidden" name='buyr_name' value="<?=$buyr_name?>">
<input type="hidden" name='buyr_tel1' value='<?=$buyr_tel1?>'>
<input type="hidden" name='buyr_tel2' value='<?=$buyr_tel2?>'>
<input type="hidden" name='buyr_mail' value='<?=$buyr_mail?>'>
<input type="hidden" name='ipgm_date' value='<?=$ipgm_date?>'>
<input type="hidden" name="good_name" value="<?php echo $good_name; ?>">
<input type="hidden" name="good_mny" value="<?php ehco $good_mny; ?>" >
<input type="hidden" name='buyr_name' value="<?php echo $buyr_name; ?>">
<input type="hidden" name="buyr_tel1" value="<?php echo $buyr_tel1; ?>">
<input type="hidden" name="buyr_tel2" value="<?php echo $buyr_tel2; ?>">
<input type="hidden" name="buyr_mail" value="<?php echo $buyr_mail; ?>">
<input type="hidden" name="ipgm_date" value="<?php echo $ipgm_date; ?>">
<!-- 필수 사항 -->
<!-- 요청 구분 -->
<input type='hidden' name='req_tx' value='pay'>
<input type="hidden" name="req_tx" value="pay">
<!-- 사이트 코드 -->
<input type="hidden" name='site_cd' value="<?=$g_conf_site_cd?>">
<input type="hidden" name="site_cd" value="<?php echo $g_conf_site_cd; ?>">
<!-- 사이트 키 -->
<input type='hidden' name='site_key' value='<?=$g_conf_site_key?>'>
<input type="hidden" name="site_key" value="<?php echo $g_conf_site_key; ?>">
<!-- 사이트 이름 -->
<input type="hidden" name='shop_name' value="<?=$g_conf_site_name?>">
<input type="hidden" name="shop_name" value="<?php echo $g_conf_site_name; ?>">
<!-- 결제수단-->
<input type="hidden" name='pay_method' value="<?=$pay_method?>">
<input type="hidden" name="pay_method" value="<?php echo $pay_method; ?>">
<!-- 주문번호 -->
<input type="hidden" name='ordr_idxx' value="<?=$ordr_idxx?>">
<input type="hidden" name="ordr_idxx" value="<?php echo $ordr_idxx; ?>">
<!-- 최대 할부개월수 -->
<input type="hidden" name='quotaopt' value="12">
<input type="hidden" name="quotaopt" value="12">
<!-- 통화 코드 -->
<input type="hidden" name='currency' value="410">
<input type="hidden" name="currency" value="410">
<!-- 결제등록 키 -->
<input type="hidden" name='approval_key' id="approval">
<input type="hidden" name="approval_key" id="approval">
<!-- 리턴 URL (kcp와 통신후 결제를 요청할 수 있는 암호화 데이터를 전송 받을 가맹점의 주문페이지 URL) -->
<!-- 반드시 가맹점 주문페이지의 URL을 입력 해주시기 바랍니다. -->
<input type="hidden" name='Ret_URL' value="<?php echo G4_MSHOP_URL; ?>/kcp/order_approval_form.php">
<input type="hidden" name="Ret_URL" value="<?php echo G4_MSHOP_URL; ?>/kcp/order_approval_form.php">
<!-- 인증시 필요한 파라미터(변경불가)-->
<input type='hidden' name='ActionResult' value='<?=$ActionResult?>'>
<input type="hidden" name="ActionResult" value="<?php echo $ActionResult; ?>">
<!-- 에스크로 사용유무 에스크로 사용 업체(가상계좌만 해당)는 Y로 세팅 해주시기 바랍니다.-->
<input type="hidden" name='escw_used' value='Y'>
<input type="hidden" name="escw_used" value="Y">
<!-- 에스크로 결제처리모드 -->
<input type="hidden" name='pay_mod' value='<?php echo ($default['de_escrow_use']?"O":"N"); ?>'>
<input type="hidden" name="pay_mod" value="<?php echo ($default["de_escrow_use"]?"O":"N"); ?>">
<!-- 수취인이름 -->
<input type='hidden' name='rcvr_name' value='<?=$rcvr_name?>'>
<input type="hidden" name="rcvr_name" value="<?php echo $rcvr_name; ?>">
<!-- 수취인 연락처 -->
<input type='hidden' name='rcvr_tel1' value='<?=$rcvr_tel1?>'>
<input type="hidden" name="rcvr_tel1" value="<?php echo $rcvr_tel1; ?>">
<!-- 수취인 휴대폰 번호 -->
<input type='hidden' name='rcvr_tel2' value='<?=$rcvr_tel2?>'>
<input type="hidden" name="rcvr_tel2" value="<?php echo $rcvr_tel2; ?>">
<!-- 수취인 E-MAIL -->
<input type='hidden' name='rcvr_add1' value='<?=$rcvr_add1?>'>
<input type="hidden" name="rcvr_add1" value="<?php echo $rcvr_add1; ?>">
<!-- 수취인 우편번호 -->
<input type='hidden' name='rcvr_add2' value='<?=$rcvr_add2?>'>
<input type="hidden" name="rcvr_add2" value="<?php echo $rcvr_add2; ?>">
<!-- 수취인 주소 -->
<input type='hidden' name='rcvr_mail' value='<?=$rcvr_mail?>'>
<input type="hidden" name="rcvr_mail" value="<?php echo $rcvr_mail; ?>">
<!-- 수취인 상세 주소 -->
<input type='hidden' name='rcvr_zipx' value='<?=$rcvr_zipx?>'>
<input type="hidden" name="rcvr_zipx" value="<?php echo $rcvr_zipx; ?>">
<!-- 장바구니 상품 개수 -->
<input type='hidden' name='bask_cntx' value="<?=$bask_cntx?>">
<input type="hidden" name="bask_cntx" value="<?php echo $bask_cntx; ?>">
<!-- 장바구니 정보(상단 스크립트 참조) -->
<input type='hidden' name='good_info' value="<?=$good_info?>">
<input type="hidden" name="good_info" value="<?php echo $good_info; ?>">
<!-- 배송소요기간 -->
<input type="hidden" name='deli_term' value='03'>
<input type="hidden" name="deli_term" value="03">
<!-- 기타 파라메터 추가 부분 - Start - -->
<input type="hidden" name='param_opt_1' value="<?=$param_opt_1?>"/>
<input type="hidden" name='param_opt_2' value="<?=$param_opt_2?>"/>
<input type="hidden" name='param_opt_3' value="<?=$param_opt_3?>"/>
<input type="hidden" name="param_opt_1" value="<?php echo $param_opt_1; ?>"/>
<input type="hidden" name="param_opt_2" value="<?php echo $param_opt_2; ?>"/>
<input type="hidden" name="param_opt_3" value="<?php echo $param_opt_3; ?>"/>
<!-- 기타 파라메터 추가 부분 - End - -->
<!-- 화면 크기조정 부분 - Start - -->
<input type="hidden" name='tablet_size' value="<?=$tablet_size?>"/>
<input type="hidden" name="tablet_size" value="<?php echo $tablet_size; ?>"/>
<!-- 화면 크기조정 부분 - End - -->
<!--
사용 카드 설정
@ -299,10 +299,10 @@
<input type="hidden" name="kcp_noint_quota" value="CCBC-02:03:06,CCKM-03:06,CCSS-03:06:09"/> */
-->
<input type="hidden" name="res_cd" value="<?=$res_cd?>"> <!-- 결과 코드 -->
<input type="hidden" name="tran_cd" value="<?=$tran_cd?>"> <!-- 트랜잭션 코드 -->
<input type="hidden" name="enc_info" value="<?=$enc_info?>"> <!-- 암호화 정보 -->
<input type="hidden" name="enc_data" value="<?=$enc_data?>"> <!-- 암호화 데이터 -->
<input type="hidden" name="res_cd" value="<?php echo $res_cd; ?>"> <!-- 결과 코드 -->
<input type="hidden" name="tran_cd" value="<?php echo $tran_cd; ?>"> <!-- 트랜잭션 코드 -->
<input type="hidden" name="enc_info" value="<?php echo $enc_info; ?>"> <!-- 암호화 정보 -->
<input type="hidden" name="enc_data" value="<?php echo $enc_data; ?>"> <!-- 암호화 데이터 -->
</form>
</div>

View File

@ -40,7 +40,7 @@ if ($is_admin)
<div id="sct">
<?
<?php
$nav_ca_id = $ca_id;
include G4_MSHOP_PATH.'/navigation1.inc.php';

View File

@ -30,6 +30,6 @@ else
?>
<div id="sct_location">
<a href='<?=$g4[path]?>/' class="sct_bg">Home</a>
<?=$str?>
<a href='<?php echo G4_SHOP_URL; ?>/' class="sct_bg">Home</a>
<?php echo $str; ?>
</div>

View File

@ -195,31 +195,35 @@ ob_start();
<?php if ($goods_count) $goods .= ' 외 '.$goods_count.'건'; ?>
<?php
// 배송비가 0 보다 크다면 (있다면)
if ($send_cost > 0)
{
?>
<div id="sod_bsk_sell" class="sod_bsk_tot">
<span>주문</span>
<strong><?php echo number_format($tot_sell_amount); ?> 원</strong>
</div>
<div id="sod_bsk_coupon" class="sod_bsk_tot">
<span>쿠폰</span>
<strong id="ct_tot_coupon">0 원</strong>
</div>
<div id="sod_bsk_dvr" class="sod_bsk_tot">
<span>배송비</span>
<strong><?php echo number_format($send_cost); ?> 원</strong>
</div>
<?php } ?>
<?php
// 총계 = 주문상품금액합계 + 배송비
$tot_amount = $tot_sell_amount + $send_cost;
if ($tot_amount > 0) {
?>
<div id="sod_bsk_cnt" class="sod_bsk_tot">
<span>총계</span>
<strong><span id="ct_tot_amount"><?php echo number_format($tot_amount); ?></span> 원 <?php echo number_format($tot_point); ?> 점</strong>
<strong id="ct_tot_amount"><?php echo number_format($tot_amount); ?></strong>
</div>
<?php } ?>
<div id="sod_bsk_point" class="sod_bsk_tot">
<span><?php echo $default['de_mileage_use'] ? '마일리지' : '포인트'; ?></span>
<strong><?php echo number_format($tot_point); ?> 점</strong>
</div>
<?php
$content = ob_get_contents();
ob_end_clean();
@ -262,12 +266,12 @@ ob_end_clean();
<!-- 배송소요기간 -->
<input type="hidden" name="deli_term" value="03">
<!-- 기타 파라메터 추가 부분 - Start - -->
<input type="hidden" name="param_opt_1" value="<?=$param_opt_1?>"/>
<input type="hidden" name="param_opt_2" value="<?=$param_opt_2?>"/>
<input type="hidden" name="param_opt_3" value="<?=$param_opt_3?>"/>
<input type="hidden" name="param_opt_1" value="<?php echo $param_opt_1; ?>"/>
<input type="hidden" name="param_opt_2" value="<?php echo $param_opt_2; ?>"/>
<input type="hidden" name="param_opt_3" value="<?php echo $param_opt_3; ?>"/>
<!-- 기타 파라메터 추가 부분 - End - -->
<!-- 화면 크기조정 부분 - Start - -->
<input type="hidden" name="tablet_size" value="<?=$tablet_size?>"/>
<input type="hidden" name="tablet_size" value="<?php echo $tablet_size; ?>"/>
<!-- 화면 크기조정 부분 - End - -->
<!--
사용 카드 설정
@ -710,7 +714,7 @@ $(function() {
$.post(
"./orderitemcoupon.php",
{ it_id: it_id, sw_direct: "<?php echo $sw_direct; ?>" },
{ it_id: it_id, sw_direct: "<?php echo $sw_direct; ?>" },
function(data) {
$cp_btn_el.after(data);
}
@ -718,7 +722,7 @@ $(function() {
});
$(".cp_apply").live("click", function() {
var $el = $(this).closest("li");
var $el = $(this).closest("tr");
var cp_id = $el.find("input[name='f_cp_id[]']").val();
var amount = $el.find("input[name='f_cp_amt[]']").val();
var subj = $el.find("input[name='f_cp_subj[]']").val();
@ -764,7 +768,9 @@ $(function() {
calculate_total_amount();
$("#it_coupon_frm").remove();
$cp_btn_el.focus();
$cp_btn_el.text("변경").focus();
if(!$cp_row_el.find(".it_coupon_cancel").size())
$cp_btn_el.after("<button type=\"button\" class=\"it_coupon_cancel btn_frmline\">취소</button>");
});
$("#it_coupon_close").live("click", function() {
@ -772,11 +778,12 @@ $(function() {
$cp_btn_el.focus();
});
$("#it_coupon_cancel").live("click", function() {
coupon_cancel($cp_row_el);
$(".it_coupon_cancel").live("click", function() {
coupon_cancel($(this).closest("tr"));
calculate_total_amount();
$("#it_coupon_frm").remove();
$cp_btn_el.focus();
$(this).closest("tr").find(".it_coupon_btn").text("적용").focus();
$(this).remove();
});
$("#od_coupon_btn").click(function() {
@ -793,7 +800,7 @@ $(function() {
});
$(".od_cp_apply").live("click", function() {
var $el = $(this).closest("li");
var $el = $(this).closest("tr");
var cp_id = $el.find("input[name='o_cp_id[]']").val();
var amount = parseInt($el.find("input[name='o_cp_amt[]']").val());
var subj = $el.find("input[name='o_cp_subj[]']").val();
@ -813,7 +820,9 @@ $(function() {
$("input[name=od_cp_id]").val(cp_id);
calculate_order_amount();
$("#od_coupon_frm").remove();
$("#od_coupon_btn").focus();
$("#od_coupon_btn").text("쿠폰변경").focus();
if(!$("#od_coupon_cancel").size())
$("#od_coupon_btn").after("<button type=\"button\" id=\"od_coupon_cancel\" class=\"btn_frmline\">쿠폰취소</button>");
});
$("#od_coupon_close").live("click", function() {
@ -826,7 +835,8 @@ $(function() {
$("input[name=od_amount]").val(org_amount);
calculate_order_amount();
$("#od_coupon_frm").remove();
$("#od_coupon_btn").focus();
$("#od_coupon_btn").text("쿠폰적용").focus();
$(this).remove();
});
$("#sc_coupon_btn").click(function() {
@ -844,7 +854,7 @@ $(function() {
});
$(".sc_cp_apply").live("click", function() {
var $el = $(this).closest("li");
var $el = $(this).closest("tr");
var cp_id = $el.find("input[name='s_cp_id[]']").val();
var amount = parseInt($el.find("input[name='s_cp_amt[]']").val());
var subj = $el.find("input[name='s_cp_subj[]']").val();
@ -860,7 +870,9 @@ $(function() {
$("input[name=sc_cp_id]").val(cp_id);
calculate_order_amount();
$("#sc_coupon_frm").remove();
$("#sc_coupon_btn").focus();
$("#sc_coupon_btn").text("쿠폰변경").focus();
if(!$("#sc_coupon_cancel").size())
$("#sc_coupon_btn").after("<button type=\"button\" id=\"sc_coupon_cancel\" class=\"btn_frmline\">쿠폰취소</button>");
});
$("#sc_coupon_close").live("click", function() {
@ -873,7 +885,8 @@ $(function() {
$("input[name=od_send_cost]").val(send_cost);
calculate_order_amount();
$("#sc_coupon_frm").remove();
$("#sc_coupon_btn").focus();
$("#sc_coupon_btn").text("쿠폰적용").focus();
$(this).remove();
});
$("#od_settle_bank").bind("click", function() {
@ -905,20 +918,23 @@ function calculate_total_amount()
{
var $it_amt = $("input[name^=it_amount]");
var $cp_amt = $("input[name^=cp_amount]");
var tot_sell_amount = sell_amount = 0;
var tot_sell_amount = sell_amount = tot_cp_amount = 0;
var it_amount, cp_amount;
var send_cost = parseInt($("input[name=org_send_cost]").val());
$it_amt.each(function(index) {
it_amount = parseInt($(this).val());
cp_amount = parseInt($cp_amt.eq(index).val());
sell_amount += (it_amount - cp_amount);
sell_amount += it_amount;
tot_cp_amount += cp_amount;
});
tot_sell_amount = sell_amount + send_cost;
tot_sell_amount = sell_amount - tot_cp_amount + send_cost;
$("#ct_tot_amount").text(number_format(String(tot_sell_amount)));
$("form[name=sm_form] input[name=good_mny]").val(tot_sell_amount);
$("#ct_tot_coupon").text(number_format(String(tot_cp_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_send_cost]").val(send_cost);

View File

@ -49,7 +49,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
</p>
<div id="guest_privacy">
<?=$default[de_guest_privacy]?>
<?php echo $default['de_guest_privacy']; ?>
</div>
<label for="agree">개인정보수집에 대한 내용을 읽었으며 이에 동의합니다.</label>
@ -69,10 +69,8 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
}
}
//f.url.value = "<?=$g4[shop_path]?>/orderform.php";
//f.action = "<?=$g4[shop_path]?>/orderform.php";
f.url.value = "<?=$url?>";
f.action = "<?=$url?>";
f.url.value = "<?php echo $url; ?>";
f.action = "<?php echo $url; ?>";
f.submit();
}
</script>
@ -83,7 +81,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
<fieldset id="mb_login_od">
<legend>비회원 주문조회</legend>
<form name="forderinquiry" method="post" action="<?=urldecode($url)?>" autocomplete="off">
<form name="forderinquiry" method="post" action="<?php echo urldecode($url); ?>" autocomplete="off">
<label for="od_id" class="od_id sound_only">주문번호<strong class="sound_only"> 필수</strong></label>
<input type="text" name="od_id" value="<? echo $od_id ?>" id="od_id" placeholder="주문번호" required class="frm_input required" size="20">