firstgarden/firstgarden-web-gnu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Activity

Merge branch 'master' into orderlist

Browse Source 
Conflicts:
	adm/shop_admin/orderlist.php
This commit is contained in:
gnuboard
2013-10-24 18:07:43 +09:00
parent d04a2caa76 995d2a41b8
commit 56d0a873d4
14 changed files with 223 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files

75
adm/shop_admin/orderform.php
View File

@ -218,14 +218,16 @@ $pg_anchor = '<ul class="anchor">
</div>
<div class="btn_list02 btn_list">
<strong>주문상태 변경</strong>
<input type="hidden" name="chk_cnt" value="<?php echo $chk_cnt; ?>">
<input type="submit" name="act_button" value="주문" onclick="document.pressed=this.value">
<input type="submit" name="act_button" value="상품준비중" onclick="document.pressed=this.value">
<input type="submit" name="act_button" value="배송중" onclick="document.pressed=this.value">
<input type="submit" name="act_button" value="상품" onclick="document.pressed=this.value">
<input type="submit" name="act_button" value="배송" onclick="document.pressed=this.value">
<input type="submit" name="act_button" value="완료" onclick="document.pressed=this.value">
<input type="submit" name="act_button" value="취소" onclick="document.pressed=this.value">
<input type="submit" name="act_button" value="반품" onclick="document.pressed=this.value">
<input type="submit" name="act_button" value="품절" onclick="document.pressed=this.value">
<p>취소,반품,품절 상태는 장바구니 상품의 상태만 변경이 되며 주문서의 상태는 변경되지 않습니다.</p>
</div>
</form>
@ -247,19 +249,19 @@ $pg_anchor = '<ul class="anchor">
<?php
// 주문금액 = 상품구입금액 + 배송비 + 추가배송비
$amount['주문'] = $od['od_cart_price'] + $od['od_send_cost'] + $od['od_send_cost2'];
$amount['order'] = $od['od_cart_price'] + $od['od_send_cost'] + $od['od_send_cost2'];
// 입금액 = 결제금액 + 포인트
$amount['입금'] = $od['od_receipt_price'] + $od['od_receipt_point'];
$amount['receipt'] = $od['od_receipt_price'] + $od['od_receipt_point'];
// 쿠폰금액
$amount['쿠폰'] = $od['od_cart_coupon'] + $od['od_coupon'] + $od['od_send_coupon'];
$amount['coupon'] = $od['od_cart_coupon'] + $od['od_coupon'] + $od['od_send_coupon'];
// 취소금액
$amount['취소'] = $od['od_cancel_price'];
$amount['cancel'] = $od['od_cancel_price'];
// 미수금 = 주문금액 - 취소금액 - 입금금액 - 쿠폰금액
//$amount['미수'] = $amount['주문'] - $amount['입금'] - $amount['쿠폰'];
//$amount['미수'] = $amount['order'] - $amount['receipt'] - $amount['coupon'];
// 결제방법
$s_receipt_way = $od['od_settle_case'];
@ -289,12 +291,12 @@ $pg_anchor = '<ul class="anchor">
<tr>
<td><?php echo $od['od_id']; ?></td>
<td class="td_paybybig"><?php echo $s_receipt_way; ?></td>
<td class="td_numbig td_numsum"><?php echo display_price($amount['주문']); ?></td>
<td class="td_numbig td_numsum"><?php echo display_price($amount['order']); ?></td>
<td class="td_numbig"><?php echo display_price($od['od_send_cost'] + $od['od_send_cost2']); ?></td>
<td class="td_numbig"><?php echo display_point($od['od_receipt_point']); ?></td>
<td class="td_numbig td_numincome"><?php echo number_format($amount['입금']); ?>원</td>
<td class="td_numbig td_numcoupon"><?php echo display_price($amount['쿠폰']); ?></td>
<td class="td_numbig td_numcancel"><?php echo number_format($amount['취소']); ?>원</td>
<td class="td_numbig td_numincome"><?php echo number_format($amount['receipt']); ?>원</td>
<td class="td_numbig td_numcoupon"><?php echo display_price($amount['coupon']); ?></td>
<td class="td_numbig td_numcancel"><?php echo number_format($amount['cancel']); ?>원</td>
</tr>
</tbody>
</table>
@ -414,32 +416,19 @@ $pg_anchor = '<ul class="anchor">
<th scope="row">결제취소/환불액</th>
<td><?php echo display_price($od['od_refund_price']); ?></td>
</tr>
<?php
$sql = " select dl_company, dl_url, dl_tel from {$g5['g5_shop_delivery_table']} where dl_id = '{$od['dl_id']}' ";
$dl = sql_fetch($sql);
?>
<tr>
<th scope="row">배송회사</th>
<td>
<?php
if ($od['dl_id'] > 0) {
// get 으로 날리는 경우 운송장번호를 넘김
if (strpos($dl['dl_url'], "=")) $invoice = $od['od_invoice'];
?>
<a href="<?php echo $dl['dl_url']; ?><?php echo $invoice; ?>" target="_blank"><?php echo $dl['dl_company']; ?></a> (고객센터 <?php echo $dl['dl_tel']; ?>)
<?php } else { ?>배송회사를 선택해 주세요.
<?php } ?>
</td>
</tr>
<?php if ($od['od_invoice']) { ?>
<tr>
<th scope="row">운송장번호</th>
<td><?php echo $od['od_invoice']; ?></td>
</tr>
<tr>
<th scope="row">배송회사</th>
<td><?php echo $od['od_delivery_company']; ?></td>
</tr>
<?php } ?>
<tr>
<th scope="row">배송일시</th>
<td><?php echo is_null_time($od['od_invoice_time']) ? $od['od_invoice_time'] : ''; ?></td>
<td><?php echo is_null_time($od['od_invoice_time']) ? "" : $od['od_invoice_time']; ?></td>
</tr>
<tr>
<th scope="row"><label for="od_send_cost">배송비</label></th>
@ -536,8 +525,8 @@ $pg_anchor = '<ul class="anchor">
<th scope="row"><label for="od_deposit_name">입금자명</label></th>
<td>
<?php if ($default['de_sms_use3']) { ?>
<label for="od_sms_ipgum_check">SMS 문자전송</label>
<input type="checkbox" name="od_sms_ipgum_check" id="od_sms_ipgum_check">
<label for="od_sms_ipgum_check">SMS 입금 문자전송</label>
<br>
<?php } ?>
<input type="text" name="od_deposit_name" value="<?php echo $od['od_deposit_name']; ?>" id="od_deposit_name" class="frm_input">
@ -603,35 +592,23 @@ $pg_anchor = '<ul class="anchor">
<input type="text" name="od_refund_price" value="<?php echo $od['od_refund_price']; ?>" class="frm_input" size="10"> 원
</td>
</tr>
<tr>
<th scope="row"><label for="dl_id">배송회사</label></th>
<td>
<select name="dl_id" id="dl_id">
<option value="">배송시 선택하세요.</option>
<?php
$sql = "select * from {$g5['g5_shop_delivery_table']} order by dl_order desc, dl_id desc ";
$result = sql_query($sql);
for ($i=0; $row=sql_fetch_array($result); $i++) {
?>
<option value="<?php echo $row['dl_id']; ?>" <?php echo get_selected($od['dl_id'], $row['dl_id']); ?>><?php echo $row['dl_company']; ?></option>
<?php
}
mysql_free_result($result);
?>
</select>
</td>
</tr>
<tr>
<th scope="row"><label for="od_invoice">운송장번호</label></th>
<td>
<?php if ($default['de_sms_use4']) { ?>
<label for="od_sms_baesong_check">SMS 문자전송</label>
<input type="checkbox" name="od_sms_baesong_check" id="od_sms_baesong_check">
<label for="od_sms_baesong_check">SMS 배송 문자전송</label>
<br>
<?php } ?>
<input type="text" name="od_invoice" value="<?php echo $od['od_invoice']; ?>" id="od_invoice" class="frm_input">
</td>
</tr>
<tr>
<th scope="row"><label for="od_delivery_company">배송회사</label></th>
<td>
<input type="text" name="od_delivery_company" value="<?php echo $od['od_delivery_company']; ?>" id="od_delivery_company" class="frm_input">
</td>
</tr>
<tr>
<th scope="row"><label for="od_invoice_time">배송일시</label></th>
<td>

24
adm/shop_admin/orderlist.php
View File

@ -198,7 +198,7 @@ $listall = '<a href="'.$_SERVER['PHP_SELF'].'" class="ov_listall">전체목록</
</div>
</form>
<form name="forderlist" id="forderlist" action="./orderlistupdate.php" onsubmit="return forderlist_submit(this);" method="post">
<form name="forderlist" id="forderlist" action="./orderlistupdate.php" onsubmit="return forderlist_submit(this);" method="post" autocomplete="off">
<input type="hidden" name="search_od_status" value="<?php echo $od_status; ?>">
<div class="tbl_head02 tbl_wrap">
@ -215,7 +215,7 @@ $listall = '<a href="'.$_SERVER['PHP_SELF'].'" class="ov_listall">전체목록</
<th scope="col" id="th_odrer">주문자</th>
<th scope="col" id="th_odrertel">주문자전화</th>
<th scope="col" id="th_recvr">받는분</th>
<th scope="col" rowspan="3">주문합계</th>
<th scope="col" rowspan="3">주문합계<br>선불배송비포함</th>
<th scope="col" rowspan="3">입금합계</th>
<th scope="col" rowspan="3">주문취소</th>
<th scope="col" rowspan="3">쿠폰</th>
@ -336,7 +336,7 @@ $listall = '<a href="'.$_SERVER['PHP_SELF'].'" class="ov_listall">전체목록</
</td>
<td headers="th_delino">
<?php if ($od_status == '준비') { ?>
<input type="text" name="od_invoice[<?php echo $i; ?>]" value="<?php echo $row['od_invoice']; ?>" class="frm_input" size="12">
<input type="text" name="od_invoice[<?php echo $i; ?>]" value="<?php echo $row['od_invoice']; ?>" class="frm_input" size="10">
<?php } else if ($od_status == '배송' || $od_status == '완료') { ?>
<?php echo $row['od_invoice']; ?>
<?php } else { ?>
@ -345,7 +345,7 @@ $listall = '<a href="'.$_SERVER['PHP_SELF'].'" class="ov_listall">전체목록</
</td>
<td headers="th_delicom">
<?php if ($od_status == '준비') { ?>
<input type="text" name="od_delivery_company[<?php echo $i; ?>]" value="<?php echo $delivery_company; ?>" class="frm_input" size="12">
<input type="text" name="od_delivery_company[<?php echo $i; ?>]" value="<?php echo $delivery_company; ?>" class="frm_input" size="10">
<?php } else if ($od_status == '배송' || $od_status == '완료') { ?>
<?php echo $row['od_delivery_company']; ?>
<?php } else { ?>
@ -358,7 +358,7 @@ $listall = '<a href="'.$_SERVER['PHP_SELF'].'" class="ov_listall">전체목록</
</td>
<td headers="th_delidate">
<?php if ($od_status == '준비') { ?>
<input type="text" name="od_invoice_time[<?php echo $i; ?>]" value="<?php echo $invoice_time; ?>" class="frm_input" size="12" maxlength="19">
<input type="text" name="od_invoice_time[<?php echo $i; ?>]" value="<?php echo $invoice_time; ?>" class="frm_input" size="10" maxlength="19">
<?php } else if ($od_status == '배송' || $od_status == '완료') { ?>
<?php echo substr($row['od_invoice_time'],2,14); ?>
<?php } else { ?>
@ -397,6 +397,7 @@ $listall = '<a href="'.$_SERVER['PHP_SELF'].'" class="ov_listall">전체목록</
<div class="local_cmd01 local_cmd">
<?php if (($od_status == '' || $od_status == '완료') == false) { // 검색된 주문상태가 '전체', '완료' 가 아니라면 ?>
<<<<<<< HEAD
<label for="od_status" class="cmd_tit">주문상태 변경</label>
<select name="od_status" id="od_status">
<option value="">선택하세요</option>
@ -408,6 +409,10 @@ $listall = '<a href="'.$_SERVER['PHP_SELF'].'" class="ov_listall">전체목록</
</select>
<?php /*
=======
<strong>주문상태 변경</strong>
<?php
>>>>>>> master
$change_status = "";
if ($od_status == '주문') $change_status = "입금";
if ($od_status == '입금') $change_status = "준비";
@ -415,12 +420,19 @@ $listall = '<a href="'.$_SERVER['PHP_SELF'].'" class="ov_listall">전체목록</
if ($od_status == '배송') $change_status = "완료";
?>
<?php if ($change_status) { ?>
<<<<<<< HEAD
<label><input type="checkbox" name="od_status" value="<?php echo $change_status; ?>"> <?php echo $od_status .' -> ' . $change_status; ?></label>
<input type="submit" value="선택수정" class="btn_submit" onclick="document.pressed=this.value">
<?php if ($od_status == '주문') { ?><input type="submit" value="선택삭제" class="btn_submit" onclick="document.pressed=this.value"><?php } ?>
<?php } */ ?>
<input type="submit" value="선택수정" class="btn_submit" onclick="document.pressed=this.value">
<?php if ($od_status == '주문') { ?><input type="submit" value="선택삭제" class="btn_submit" onclick="document.pressed=this.value"><?php } ?>
=======
<label><input type="checkbox" name="od_status" value="<?php echo $change_status; ?>"> '<?php echo $od_status ?>'상태에서 '<strong><?php echo $change_status ?></strong>'상태로 변경합니다.</label>
<input type="submit" value="선택수정" class="btn_submit" onclick="document.pressed=this.value">
<?php if ($od_status == '주문') { ?> <span>주문상태에서만 삭제가 가능합니다.</span> <input type="submit" value="선택삭제" class="btn_submit" onclick="document.pressed=this.value"><?php } ?>
<?php } ?>
>>>>>>> master
<?php } ?>
</div>
@ -498,7 +510,7 @@ function forderlist_submit(f)
}
if (f.od_status.checked == false) {
alert("변경하실 주문상태를 선택하세요.");
alert("주문상태 변경에 체크하세요.");
return false;
}

101
adm/shop_admin/orderlistupdate.php
View File

@ -57,6 +57,78 @@ function change_status($od_id, $current_status, $change_status)
}
// 주문서에 입금시 update
function order_update_receipt($od_id)
{
global $g5;
$sql = " update {$g5['g5_shop_order_table']} set od_receipt_price = od_misu, od_misu = 0, od_receipt_time = '".G5_TIME_YMDHIS."' where od_id = '$od_id' and od_status = '입금' ";
return sql_query($sql);
}
// 주문서에 배송시 update
function order_update_delivery($od_id, $mb_id, $change_status, $delivery)
{
global $g5;
$sql = " update {$g5['g5_shop_order_table']} set od_delivery_company = '{$delivery['delivery_company']}', od_invoice = '{$delivery['invoice']}', od_invoice_time = '{$delivery['invoice_time']}' where od_id = '$od_id' and od_status = '배송' ";
sql_query($sql);
$sql = " select * from {$g5['g5_shop_cart_table']} where od_id = '$od_id' ";
$result = sql_query($sql);
for ($i=0; $row=sql_fetch_array($result); $i++)
{
// 재고를 이미 사용했거나 재고에서 이미 뺐다면
$stock_use = $row['ct_stock_use'];
if ($row['ct_stock_use'])
{
if ($change_status == '주문' ||
$change_status == '취소' ||
$change_status == '반품' ||
$change_status == '품절')
{
// 재고에 다시 더한다.
add_io_stock($row['it_id'], $row['ct_qty'], $row['io_id'], $row['io_type']);
$stock_use = 0;
}
}
else
{
// 재고 오류로 인한 수정
if ($change_status == '배송' ||
$change_status == '완료')
{
// 재고에서 뺀다.
subtract_io_stock($row['it_id'], $row['ct_qty'], $row['io_id'], $row['io_type']);
$stock_use = 1;
}
}
$point_use = $row['ct_point_use'];
// 회원이면서 포인트가 0보다 크거나 이미 포인트를 부여했다면 뺀다.
if ($mb_id && $row['ct_point'] && $row['ct_point_use'])
{
delete_point($mb_id, "@delivery", $mb_id, "$od_id,{$row['ct_id']}");
$point_use = 0;
}
/*
$sql = " update {$g5['g5_shop_cart_table']}
set ct_point_use = '$point_use',
ct_stock_use = '$stock_use',
ct_history = CONCAT(ct_history,'$ct_history')
where od_id = '$od_id' ";
*/
$sql = " update {$g5['g5_shop_cart_table']} set ct_point_use = '$point_use', ct_stock_use = '$stock_use' where od_id = '$od_id' ";
sql_query($sql);
}
}
for ($i=0; $i<count($_POST['chk']); $i++)
{
// 실제 번호를 넘김
@ -76,39 +148,31 @@ for ($i=0; $i<count($_POST['chk']); $i++)
$current_status = $od['od_status'];
$change_status = $_POST['od_status'];
switch ($current_status)
{
case '주문' :
if ($change_status != '입금') continue;
if ($od['od_settle_case'] != '무통장') continue;
change_status($od_id, '주문', '입금');
$sql = " update {$g5['g5_shop_order_table']}
set od_receipt_price = od_misu,
od_misu = 0,
od_receipt_time = '".G5_TIME_YMDHIS."'
where od_id = '$od_id' and od_status = '입금' ";
sql_query($sql, true);
order_update_receipt($od_id);
break;
case '입금' :
if ($change_status != '준비') continue;
change_status($od_id, '입금', '준비');
break;
case '준비' :
if ($change_status != '배송') continue;
change_status($od_id, '준비', '배송');
$delivery['invoice'] = $invoice;
$delivery['invoice_time'] = $invoice_time;
$delivery['delivery_company'] = $delivery_company;
order_update_delivery($od_id, $od['mb_id'], $change_status, $delivery);
/*
$sql = " update {$g5['g5_shop_order_table']}
set od_delivery_company = '$delivery_company',
od_invoice = '$invoice',
@ -156,19 +220,18 @@ for ($i=0; $i<count($_POST['chk']); $i++)
$sql = " update {$g5['g5_shop_cart_table']}
set ct_point_use = '$point_use',
ct_stock_use = '$stock_use',
ct_status = '$ct_status',
ct_history = CONCAT(ct_history,'$ct_history')
where od_id = '{$row['od_id']}' ";
sql_query($sql);
}
*/
break;
case '배송' :
if ($change_status != '완료') continue;
change_status($od_id, '배송', '완료');
break;
} // switch end

20
adm/shop_admin/orderpartcancel.php
View File

@ -18,6 +18,14 @@ if($od['od_receipt_price'] - $od['od_refund_price'] <= 0)
$g5['title'] = $od['od_settle_case'].' 부분취소';
include_once(G5_PATH.'/head.sub.php');
// 과세, 비과세 취소가능 금액계산
$sql = " select SUM( IF( ct_notax = 0, ( IF(io_type = 1, (io_price * ct_qty), ( (ct_price + io_price) * ct_qty) ) - cp_price ), 0 ) ) as tax_mny,
SUM( IF( ct_notax = 1, ( IF(io_type = 1, (io_price * ct_qty), ( (ct_price + io_price) * ct_qty) ) - cp_price ), 0 ) ) as free_mny
from {$g5['g5_shop_cart_table']}
where od_id = '$od_id'
and ct_status IN ( '취소', '반품', '품절' ) ";
$sum = sql_fetch($sql);
?>
<form name="forderpartcancel" method="post" action="./orderpartcancelupdate.php" onsubmit="return form_check(this);">
@ -35,12 +43,12 @@ include_once(G5_PATH.'/head.sub.php');
</colgroup>
<tbody>
<tr>
<th scope="row">과세 입금금액</th>
<td><?php echo display_price($od['od_tax_mny'] + $od['od_vat_mny']); ?></td>
<th scope="row">과세 취소가능 금액</th>
<td><?php echo display_price($sum['tax_mny']); ?></td>
</tr>
<tr>
<th scope="row">비과세 입금금액</th>
<td><?php echo display_price($od['od_free_mny']); ?></td>
<th scope="row">비과세 취소가능 금액</th>
<td><?php echo display_price($sum['free_mny']); ?></td>
</tr>
<tr>
<th scope="row"><label for="mod_tax_mny">과세 취소금액</label></th>
@ -68,8 +76,8 @@ include_once(G5_PATH.'/head.sub.php');
<script>
function form_check(f)
{
var max_tax_mny = parseInt(<?php echo ($od['od_tax_mny'] + $od['od_vat_mny']); ?>);
var max_free_mny = parseInt(<?php echo $od['od_free_mny']; ?>);
var max_tax_mny = parseInt(<?php echo $sum['tax_mny']; ?>);
var max_free_mny = parseInt(<?php echo $sum['free_mny']; ?>);
var tax_mny = parseInt(f.mod_tax_mny.value.replace("/[^0-9]/g", ""));
var free_mny = parseInt(f.mod_free_mny.value.replace("/[^0-9]/g", ""));

70
adm/shop_admin/orderpartcancelupdate.php
View File

@ -24,11 +24,19 @@ if($od['od_settle_case'] == '계좌이체' && substr($od['od_receipt_time'], 0,
alert_close('실시간 계좌이체건의 부분취소 요청은 결제일 익일에 가능합니다.');
// 금액비교
if($tax_mny && $tax_mny > ($od['od_tax_mny'] + $od['od_vat_mny']))
alert('과세 취소금액을 '.number_format(($od['od_tax_mny'] + $od['od_vat_mny'])).'원 이하로 입력해 주십시오.');
// 과세, 비과세 취소가능 금액계산
$sql = " select SUM( IF( ct_notax = 0, ( IF(io_type = 1, (io_price * ct_qty), ( (ct_price + io_price) * ct_qty) ) - cp_price ), 0 ) ) as tax_mny,
SUM( IF( ct_notax = 1, ( IF(io_type = 1, (io_price * ct_qty), ( (ct_price + io_price) * ct_qty) ) - cp_price ), 0 ) ) as free_mny
from {$g5['g5_shop_cart_table']}
where od_id = '$od_id'
and ct_status IN ( '취소', '반품', '품절' ) ";
$sum = sql_fetch($sql);
if($free_mny && $free_mny > $od['od_free_mny'])
alert('비과세 취소금액을 '.number_format($od['od_free_mny']).'원 이하로 입력해 주십시오.');
if($tax_mny && $tax_mny > $sum['tax_mny'])
alert('과세 취소금액을 '.number_format($sum['tax_mny']).'원 이하로 입력해 주십시오.');
if($free_mny && $free_mny > $sum['free_mny'])
alert('비과세 취소금액을 '.number_format($sum['free_mny']).'원 이하로 입력해 주십시오.');
// 취소사유의 한글깨짐 방지처리
$def_locale = setlocale(LC_CTYPE, 0);
@ -160,52 +168,24 @@ if ( $req_tx == "mod" )
$mod_mny = $c_PayPlus->mf_get_res_data( "panc_mod_mny" ); // 취소요청된 금액
$rem_mny = $c_PayPlus->mf_get_res_data( "panc_rem_mny" ); // 취소요청후 잔액
// 주문 합계
$sql = " select SUM( IF( ct_notax = 0, ( IF(io_type = 1, (io_price * ct_qty), ( (ct_price + io_price) * ct_qty) ) - cp_price ), 0 ) ) as tax_mny,
SUM( IF( ct_notax = 1, ( IF(io_type = 1, (io_price * ct_qty), ( (ct_price + io_price) * ct_qty) ) - cp_price ), 0 ) ) as free_mny
from {$g5['g5_shop_cart_table']}
where od_id = '{$od['od_id']}'
and ct_status IN ( '주문', '준비', '배송', '완료' ) ";
$sum = sql_fetch($sql);
$tax_mny = $sum['tax_mny'];
$free_mny = $sum['free_mny'];
// 과세, 비과세
if($od['od_tax_flag']) {
$tot_tax_mny = ( $tax_mny + $od['od_send_cost'] + $od['od_send_cost2'] )
- ( $od['od_coupon'] + $od['od_send_coupon'] + $od['od_receipt_point'] );
if($tot_tax_mny < 0) {
$tot_tax_mny = 0;
$free_mny += $tot_tax_mny;
}
} else {
$tot_tax_mny = ( $tax_mny + $free_mny + $od['od_send_cost'] + $od['od_send_cost2'] )
- ( $od['od_coupon'] + $od['od_send_coupon'] + $od['od_receipt_point'] );
$free_mny = 0;
}
$od_tax_mny = round($tot_tax_mny / 1.1);
$od_vat_mny = $tot_tax_mny - $od_tax_mny;
$od_free_mny = $free_mny;
// 미수
$od_misu = ( $od['od_cart_price'] + $od['od_send_cost'] + $od['od_send_cost2'] )
- ( $od['od_cart_coupon'] + $od['od_coupon'] + $od['od_send_coupon'] )
- ( $od['od_receipt_price'] + $od['od_receipt_point'] - $mod_mny );
$shop_memo = '\\n'.$od['od_settle_case'].' 부분취소(금액: '.number_format($mod_mny).'원) - '.G5_TIME_YMDHIS;
// 환불금액기록
$sql = " update {$g5['g5_shop_order_table']}
set od_refund_price = od_refund_price + '$mod_mny',
od_misu = '$od_misu',
od_tax_mny = '$od_tax_mny',
od_vat_mny = '$od_vat_mny',
od_free_mny = '$od_free_mny',
od_shop_memo = concat(od_shop_memo, \"$shop_memo\")
od_shop_memo = concat(od_shop_memo, \"$mod_memo\")
where od_id = '{$od['od_id']}'
and od_tno = '$tno' ";
sql_query($sql);
// 미수금 등의 정보 업데이트
$info = get_order_info($od_id);
$sql = " update {$g5['g5_shop_order_table']}
set od_misu = '{$info['od_misu']}',
od_tax_mny = '{$info['od_tax_mny']}',
od_vat_mny = '{$info['od_vat_mny']}',
od_free_mny = '{$info['od_free_mny']}'
where od_id = '$od_id' ";
sql_query($sql);
} // End of [res_cd = "0000"]
/* = -------------------------------------------------------------------------- = */

2
adm/shop_admin/orderreceiptupdate.php
View File

@ -26,7 +26,7 @@ $sql = " update {$g5['g5_shop_order_table']}
od_receipt_price = '$od_receipt_price',
od_receipt_point = '$od_receipt_point',
od_refund_price = '$od_refund_price',
dl_id = '$dl_id',
od_deliver_company = '$od_deliver_company',
od_invoice = '$od_invoice',
od_invoice_time = '$od_invoice_time',
od_send_cost = '$od_send_cost',

2
adm/shop_admin/personalpayform.php
View File

@ -96,7 +96,7 @@ $pg_anchor = '<ul class="anchor">
</div>
</section>
<div class="btn_confirm">
<div class="btn_confirm01 btn_confirm">
<input type="submit" value="확인" class="btn_submit" accesskey="s">
<?php if($popup == 'yes') { ?>
<button type="button" onclick="self.close();">닫기</button>

38
css/admin.css
View File

@ -23,13 +23,13 @@ a {color:#000;text-decoration:none}
a:focus, a:hover, a:active {text-decoration:underline}
/* 헤딩 */
h1 {margin:0 0 10px;padding:0 20px 10px;border-bottom:1px solid #e9e9e9;color:#333;font-size:1.5em;font-family:dotum;letter-spacing:-0.1em}
h1 {margin:0 0 10px;padding:0 20px 10px;min-width:960px;border-bottom:1px solid #e9e9e9;color:#333;font-size:1.5em;font-family:dotum;letter-spacing:-0.1em}
h2 {margin:0 0 10px;padding:0 20px;font-size:1.2em}
h2.h2_frm {padding-top:15px}
h3 {margin:0 20px}
/* 레이아웃 */
#hd {z-index:10;background:url('../adm/img/hd_bg.jpg') #383b3f repeat-x}
#hd {z-index:10;min-width:1000px;background:url('../adm/img/hd_bg.jpg') #383b3f repeat-x}
#hd h1, #hd h2 {position:absolute;border:0;font-size:0;line-height:0;overflow:hidden}
#hd_wrap {z-index:11;position:relative;margin:0 auto}
#logo {position:relative;height:70px}
@ -47,7 +47,7 @@ h3 {margin:0 20px}
#tnb span {position:absolute;bottom:10px;left:0;width:100%;text-align:center}
/* gnb js off */
#gnb {z-index:12;background:#383a3f}
#gnb {z-index:12;min-width:999px;background:#383a3f}
#gnb h2 {margin:0;padding:0;font-size:0;line-height:0;overflow:hidden}
#gnb_1dul {margin:0 auto;padding:0;zoom:1}
#gnb_1dul:after {display:block;visibility:hidden;clear:both;content:""}
@ -77,14 +77,14 @@ h3 {margin:0 20px}
.gnb_js .gnb_grp_div {border-top:1px solid #eee}
#lnb {margin:0;padding:15px;border-bottom:1px solid #e9e9e9;list-style:none;zoom:1}
#lnb {margin:0;padding:15px;min-width:970px;border-bottom:1px solid #e9e9e9;list-style:none;zoom:1}
#lnb:after {display:block;visibility:hidden;clear:both;content:""}
#lnb li {float:left}
#lnb a {display:inline-block;margin:0 0 0 10px;padding:0 10px 0 0;border-right:1px solid #ccc;font-size:0.95em;letter-spacing:-0.1em}
/* 중간 레이아웃 */
#wrapper {z-index:5;margin:20px 0;zoom:1}
#wrapper {z-index:5;margin:20px 0;min-width:1000px;zoom:1}
#wrapper:after {display:block;visibility:hidden;clear:both;content:""}
@ -198,12 +198,18 @@ legend {position:absolute;width:0;height:0;font-size:0;line-height:0;text-indent
.anchor a:focus, .anchor a:hover {background:#c8d2d8}
#sort_mb {width:800px}
#sort_sodr {width:600px}
/* 하단 레이아웃 */
#ft {margin:20px 0;padding:10px 20px;border-top:1px solid #d0d6d8}
#ft {margin:20px 0;padding:10px 20px;min-width:960px;border-top:1px solid #d0d6d8}
/* 페이지 내 검색 */
.local_sch .btn_submit {padding:3px 5px;border:1px solid #ff3061;color:#fff;font-size:0.95em;vertical-align:middle}
.local_sch {min-width:960px}
.local_sch .btn_submit {padding:3px 5px;border:1px solid #ff3061;color:#fff;font-size:0.95em;vertical-align:middle;cursor:pointer}
.local_sch01 {margin:0 0 10px;padding:0 20px 10px;border-bottom:1px solid #e9e9e9}
.local_sch01 span {display:block;margin:0 0 5px}
@ -216,22 +222,27 @@ legend {position:absolute;width:0;height:0;font-size:0;line-height:0;text-indent
.local_sch02 button {padding:3px 5px;border:1px solid #ced9de;background:#f6f9fa;font-size:0.95em;cursor:pointer}
/* 페이지 내 실행 */
.local_cmd {min-width:960px}
.local_cmd01 {margin:0 0 10px;padding:0 20px}
.local_cmd01 .cmd_tit {font-weight:bold}
.local_cmd01 .btn_submit {padding:3px 5px;border:1px solid #ff3061;color:#fff;font-size:0.95em;vertical-align:middle}
/* 페이지 내 안내문 */
.local_desc {}
.local_desc ol, .local_desc ul {margin:0;padding:0 0 10px 21px}
.local_desc li {margin:0 0 5px}
.local_desc01 {margin:0 20px 10px;padding:10px 20px 0;border:1px solid #f2f2f2;background:#f9f9f9}
.local_desc01 {margin:0 20px 10px;padding:10px 20px 0;min-width:920px;border:1px solid #f2f2f2;background:#f9f9f9}
.local_desc01 strong {color:#ff3061}
.local_desc01 a {text-decoration:underline}
.local_desc02 {margin:0 20px 10px} /* 주로 온라인 서식 관련 안내 내용에 사용 */
.local_desc02 {margin:0 20px 10px;min-width:960px} /* 주로 온라인 서식 관련 안내 내용에 사용 */
.local_desc02 p {padding:0}
/* 페이지 내 카운트 */
.local_ov {min-width:960px}
.local_ov01 {position:relative;margin:-10px 0 10px;padding:10px 20px;border-bottom:1px solid #e9e9e9;background:#f2f5f9}
.local_ov01 .ov_listall {display:inline-block;margin:0 5px 0 0;padding:0 10px 0 0;border-right:1px solid #ccc}
@ -622,9 +633,8 @@ strong.sodr_nonpay {display:block;padding:5px 0;text-align:right}
/* 새창 기본 스타일 */
.new_win {}
.new_win h1 {margin-bottom:20px;padding:0 20px;height:60px;border-top:2px solid #484848;border-bottom:1px solid #e9e9e9;background:#fff;font-size:1.2em;line-height:5em}
.new_win h2 {margin:0 auto 10px;width:93%}
.new_win table {margin:0 auto 20px;width:93%;background:#fff}
.new_win h1 {margin-bottom:20px;padding:0 20px;min-width:320px/* 적정값으로 변경하여 사용하세요. */;height:60px;border-top:2px solid #484848;border-bottom:1px solid #e9e9e9;background:#fff;font-size:1.2em;line-height:5em}
.new_win h2 {margin:0 20px 10px}
.new_win_ul {margin:-20px 0 20px 0;padding:0 0 0 20px;border-bottom:1px solid #515151;background:#484848;list-style:none;zoom:1}
.new_win_ul:after {display:block;visibility:hidden;clear:both;content:""}
.new_win_ul li {float:left;margin-left:-1px}
@ -632,7 +642,7 @@ strong.sodr_nonpay {display:block;padding:5px 0;text-align:right}
.new_win_ul a {display:block;padding:10px 10px 8px;border-right:1px solid #595959;border-left:1px solid #595959;color:#fff;font-family:dotum;font-weight:bold;text-decoration:none}
.new_win_desc {margin:0 auto;width:93%}
.new_win .anchor {margin:0 auto 5px;width:93%}
.new_win .tbl_wrap {margin:0;padding:0}
.new_win .tbl_wrap {margin:0 20px 20px;padding:0}
/* 자바스크립트 alert 대안 */
#validation_check {margin:100px auto;width:500px}

22
js/shop.mobile.main.js
View File

@ -60,7 +60,7 @@
$tabs.each(function() {
$(this)
.css("width", $(this).width())
.data("width", $(this).outerWidth());
.data("width", $(this).width());
});
$btns.on("click", function() {
@ -87,8 +87,10 @@
$slides.not("."+cfg.active_class).css("left", "-"+width+"px");
set_tab_width(idx);
if(count == 1) {
tab_width = $tabs.eq(0).data("width");
tab_width = $tabs.eq(0).outerWidth();
pos_left = parseInt((tabw_width - tab_width) / 2);
$tabs.eq(0).css("left", pos_left).addClass(cfg.tab_active);
} else if(count == 2) {
@ -102,8 +104,6 @@
$slides.eq((idx - 1)).css("left", "-"+width+"px");
$slides.eq((idx + 1) % count).css("left", width+"px");
}
set_tab_width(idx);
}
function swipe_left()
@ -128,14 +128,14 @@
$slides.eq(next).css("left", width+"px");
$tabs.removeClass(cfg.tab_active);
set_tab_width(next);
if(count >= 3) {
tab_position(next);
} else {
$tabs.eq(next).addClass(cfg.tab_active);
}
set_tab_width(next);
$slides.eq(idx).clearQueue().animate(
{ left: "-="+width }, cfg.duration,
function() {
@ -178,14 +178,14 @@
$slides.eq(next).css("left", "-"+width+"px");
$tabs.removeClass(cfg.tab_active);
set_tab_width(next);
if(count >= 3) {
tab_position(next);
} else {
$tabs.eq(next).addClass(cfg.tab_active);
}
set_tab_width(next);
$slides.eq(idx).clearQueue().animate(
{ left: "+="+width }, cfg.duration,
function() {
@ -220,8 +220,8 @@
var $tab_l = $tabs.eq(idx - 1);
var $tab_c = $tabs.eq(idx);
var $tab_r = $tabs.eq((idx + 1) % count);
var w_c = $tab_c.data("width");
var w_r = $tab_r.data("width");
var w_c = $tab_c.outerWidth();
var w_r = $tab_r.outerWidth();
var pl = 0;
var pc = parseInt((tabw_width - w_c) / 2);
@ -270,7 +270,7 @@
break;
}
},
threshold: 70,
threshold: 100,
excludedElements:"button, input, select, textarea, .noSwipe",
allowPageScroll:"vertical"
});

4
mobile/shop/iteminfo.php
View File

@ -146,9 +146,9 @@ function content_scroll()
if(window.innerHeight - $(window).outerHeight(true) > 0)
sh += (window.innerHeight - $(window).outerHeight(true));
}
var mbh = $("#menu_button").outerHeight(true);
var mbh = $("#menu_button").outerHeight();
var mlh = $("#menu_list").outerHeight(true);
var ch = sh - mbh;
var ch = sh;
$("#menu_button")
.css("bottom", 0)

2
mobile/skin/shop/basic/item.form.skin.php
View File

@ -377,7 +377,7 @@ $(function(){
return false;
},
threshold: 70,
threshold: 100,
excludedElements:"button, input, select, textarea, .noSwipe",
allowPageScroll:"vertical"
};

1
shop/kcp/pp_ax_hub.php
View File

@ -25,7 +25,6 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
}
$g_conf_site_cd = $_POST['site_cd'];
$g_conf_site_key = $default['de_kcp_mid'];
if (preg_match("/^T000/", $g_conf_site_cd) || $default['de_card_test']) {
$g_conf_gw_url = "testpaygw.kcp.co.kr"; // real url : paygw.kcp.co.kr , test url : testpaygw.kcp.co.kr

2
shop/orderinquiryview.php
View File

@ -544,7 +544,7 @@ if(openwin != null) {
</section>
<?php if ($od['od_settle_case'] == '가상계좌' && $default['de_card_test'] && $is_admin) {
preg_match("/(\s[^\s]+\s)/", $od['od_bank_account'], $matchs);
preg_match("/\s{1}([^\s]+)\s?/", $od['od_bank_account'], $matchs);
$deposit_no = trim($matchs[1]);
?>
<fieldset>

19
shop/settle_kcp_common.php
View File

@ -162,7 +162,7 @@ if(!$default['de_card_test']) {
od_status = '입금',
od_shop_memo = concat(od_shop_memo, \"\\n개인결제 ".$row['pp_id']." 로 결제완료 - ".$receipt_time."\")
where od_id = '{$row['od_id']}' ";
sql_query($sql, FALSE);
$result = sql_query($sql, FALSE);
}
} else {
// 주문서 UPDATE
@ -172,10 +172,25 @@ if(!$default['de_card_test']) {
od_status = '입금'
where od_id = '$order_no'
and od_tno = '$tno' ";
sql_query($sql, FALSE);
$result = sql_query($sql, FALSE);
}
}
if($result) {
if($row['od_id'])
$od_id = $row['od_id'];
else
$od_id = $order_no;
// 미수금 정보 업데이트
$info = get_order_info($od_id);
$sql = " update {$g5['g5_shop_order_table']}
set od_misu = '{$info['od_misu']}'
where od_id = '$od_id' ";
sql_query($sql, FALSE);
}
/* = -------------------------------------------------------------------------- = */
/* = 03-2. 가상계좌 환불 통보 데이터 DB 처리 작업 부분 = */
/* = -------------------------------------------------------------------------- = */