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

order 테이블에 주문금액 등 기록되도록 수정

Browse Source
This commit is contained in:
chicpro
2013-09-10 15:55:58 +09:00
parent 3d4ccc4505
commit b5313b7bde
21 changed files with 385 additions and 631 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
mobile/shop/orderform.php
View File

@ -1367,7 +1367,10 @@ function payment_check(f)
{
var temp_point = 0;
var max_point = 0;
var tot_sell_amount = parseInt($("input[name=od_amount]").val());
var od_amount = parseInt(f.od_amount.value);
var send_cost = parseInt(f.od_send_cost.value);
var send_cost2 = parseInt(f.od_send_cost2.value);
var send_coupon = parseInt(f.od_send_coupon.value);
if (typeof(f.max_temp_point) != "undefined")
var max_point = parseInt(f.max_temp_point.value);
@ -1384,7 +1387,7 @@ function payment_check(f)
return false;
}
if (temp_point > tot_sell_amount) {
if (temp_point > od_amount) {
alert("상품 주문금액(배송비 제외) 보다 많이 포인트결제할 수 없습니다.");
f.od_temp_point.select();
return false;
@ -1410,6 +1413,8 @@ function payment_check(f)
}
}
var tot_amount = od_amount + send_cost + send_cost2 - send_coupon - temp_point;
if (document.getElementById("od_settle_iche")) {
if (document.getElementById("od_settle_iche").checked) {
if (tot_amount - temp_point < 150) {

27
mobile/shop/orderformupdate.php
View File

@ -3,13 +3,9 @@ include_once('./_common.php');
if(get_magic_quotes_gpc())
{
//$_GET = array_map("stripslashes", $_GET);
//$_POST = array_map("stripslashes", $_POST);
$_GET = array_add_callback("stripslashes", $_GET);
$_POST = array_add_callback("stripslashes", $_POST);
}
//$_GET = array_map("mysql_real_escape_string", $_GET);
//$_POST = array_map("mysql_real_escape_string", $_POST);
$_GET = array_add_callback("mysql_real_escape_string", $_GET);
$_POST = array_add_callback("mysql_real_escape_string", $_POST);
@ -301,16 +297,14 @@ $i_amount = $i_amount + $i_send_cost + $i_send_cost2 - $i_temp_point - $i_send_c
if ($od_settle_case == "무통장")
{
$od_temp_amount = $i_amount;
$od_receipt_point = $i_temp_point;
$od_receipt_amount = 0;
$od_status = G4_OD_STATUS_ORDER;
}
else if ($od_settle_case == "계좌이체")
{
include G4_MSHOP_PATH.'/kcp/pp_ax_hub.php';
$od_temp_amount = $i_amount;
$od_tno = $tno;
$od_receipt_amount = $amount;
$od_receipt_point = $i_temp_point;
@ -320,14 +314,13 @@ else if ($od_settle_case == "계좌이체")
$bank_name = iconv("cp949", "utf8", $bank_name);
$od_bank_account = $bank_name;
$pg_amount = $amount;
$od_status = G4_OD_STATUS_SETTLE;
}
else if ($od_settle_case == "가상계좌")
{
include G4_MSHOP_PATH.'/kcp/pp_ax_hub.php';
$od_temp_amount = $i_amount;
$od_receipt_point = $i_temp_point;
$od_tno = $tno;
$od_receipt_amount = 0;
$bankname = iconv("cp949", "utf8", $bankname);
@ -335,26 +328,24 @@ else if ($od_settle_case == "가상계좌")
$od_bank_account = $bankname.' '.$account.' '.$depositor;
$od_deposit_name = $od_name;
$pg_amount = $amount;
$od_status = G4_OD_STATUS_ORDER;
}
else if ($od_settle_case == "휴대폰")
{
include G4_MSHOP_PATH.'/kcp/pp_ax_hub.php';
$od_temp_amount = $i_amount;
$od_tno = $tno;
$od_receipt_amount = $amount;
$od_receipt_point = $i_temp_point;
$od_receipt_time = preg_replace("/([0-9]{4})([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})/", "\\1-\\2-\\3 \\4:\\5:\\6", $app_time);
$od_bank_account = $commid.' '.$mobile_no;
$pg_amount = $amount;
$od_status = G4_OD_STATUS_SETTLE;
}
else if ($od_settle_case == "신용카드")
{
include G4_MSHOP_PATH.'/kcp/pp_ax_hub.php';
$od_temp_amount = $i_amount;
$od_tno = $tno;
$od_app_no = $app_no;
$od_receipt_amount = $amount;
@ -363,6 +354,7 @@ else if ($od_settle_case == "신용카드")
$card_name = iconv("cp949", "utf8", $card_name);
$od_bank_account = $card_name;
$pg_amount = $amount;
$od_status = G4_OD_STATUS_SETTLE;
}
else
{
@ -392,8 +384,8 @@ if($escw_yn == 'Y')
$od_escrow = 1;
// 복합과세 금액
$od_tax_mny = round($od_temp_amount / 1.1);
$od_vat_mny = $od_temp_amount - $od_tax_mny;
$od_tax_mny = round($i_amount / 1.1);
$od_vat_mny = $i_amount - $od_tax_mny;
$od_free_mny = 0;
if($default['de_tax_flag_use']) {
$od_tax_mny = (int)$_POST['comm_tax_mny'];
@ -423,11 +415,13 @@ $sql = " insert {$g4['shop_order_table']}
od_b_addr2 = '$od_b_addr2',
od_deposit_name = '$od_deposit_name',
od_memo = '$od_memo',
od_cart_count = '$tot_ct_count',
od_cart_amount = '$tot_ct_amount',
od_cart_coupon = '$tot_it_cp_amount',
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_receipt_amount = '$od_receipt_amount',
od_receipt_point = '$od_receipt_point',
od_bank_account = '$od_bank_account',
@ -439,6 +433,7 @@ $sql = " insert {$g4['shop_order_table']}
od_tax_mny = '$od_tax_mny',
od_vat_mny = '$od_vat_mny',
od_free_mny = '$od_free_mny',
od_status = '$od_status',
od_shop_memo = '',
od_hope_date = '$od_hope_date',
od_time = '".G4_TIME_YMDHIS."',

57
mobile/shop/orderinquiryview.php
View File

@ -123,13 +123,7 @@ include_once(G4_MSHOP_PATH.'/_head.php');
<td class="td_smallmng"><?php echo $opt['ct_status']; ?></td>
</tr>
<?php
if ($opt['ct_status'] == '취소' || $opt['ct_status'] == '반품' || $opt['ct_status'] == '품절') {
$tot_cancel_amount += $sell_amount;
}
else {
$tot_point += $point;
$tot_sell_amount += $sell_amount;
}
$tot_point += $point;
// 전체 상품의 상태가 주문인지 비교할 때 사용
$od_count1++;
@ -143,12 +137,7 @@ include_once(G4_MSHOP_PATH.'/_head.php');
</table>
</li>
<?php
$tot_cp_amount += $row['cp_amount'];
}
$send_cost = $od['od_send_cost'];
$send_cost2 = $od['od_send_cost2'];
$send_coupon = $od['od_send_coupon'];
?>
</ul>
@ -284,37 +273,36 @@ include_once(G4_MSHOP_PATH.'/_head.php');
<?php
// 총계 = 주문상품금액합계 + 배송비 - 상품할인 - 결제할인 - 배송비할인
$od_coupon = $od['od_coupon'];
$tot_amount = $tot_sell_amount + $send_cost + $send_cost2 - $tot_cp_amount - $od_coupon - $send_coupon;
$tot_amount = $od['od_cart_amount'] + $od['od_send_cost'] + $od['od_send_cost2'] - $od['od_cart_coupon'] - $od['od_coupon'] - $od['od_send_coupon'];
?>
<dl id="sod_bsk_tot">
<dt class="sod_bsk_dvr">주문총액</dt>
<dd class="sod_bsk_dvr"><strong><?php echo number_format($tot_sell_amount); ?> 원</strong></dd>
<dd class="sod_bsk_dvr"><strong><?php echo number_format($od['od_cart_amount']); ?> 원</strong></dd>
<?php if($tot_cp_amount > 0) { ?>
<?php if($od['od_cart_coupon'] > 0) { ?>
<dt class="sod_bsk_dvr">상품할인</dt>
<dd class="sod_bsk_dvr"><strong><?php echo number_format($tot_cp_amount); ?> 원</strong></dd>
<dd class="sod_bsk_dvr"><strong><?php echo number_format($od['od_cart_coupon']); ?> 원</strong></dd>
<?php } ?>
<?php if($od_coupon > 0) { ?>
<?php if($od['od_coupon'] > 0) { ?>
<dt class="sod_bsk_dvr">결제할인</dt>
<dd class="sod_bsk_dvr"><strong><?php echo number_format($od_coupon); ?> 원</strong></dd>
<dd class="sod_bsk_dvr"><strong><?php echo number_format($od['od_coupon']); ?> 원</strong></dd>
<?php } ?>
<?php if ($send_cost > 0) { ?>
<?php if ($od['od_send_cost'] > 0) { ?>
<dt class="sod_bsk_dvr">배송비</dt>
<dd class="sod_bsk_dvr"><strong><?php echo number_format($send_cost); ?> 원</strong></dd>
<dd class="sod_bsk_dvr"><strong><?php echo number_format($od['od_send_cost']); ?> 원</strong></dd>
<?php } ?>
<?php if($send_coupon > 0) { ?>
<?php if($od['od_send_coupon'] > 0) { ?>
<dt class="sod_bsk_dvr">배송비할인</dt>
<dd class="sod_bsk_dvr"><strong><?php echo number_format($send_coupon); ?> 원</strong></dd>
<dd class="sod_bsk_dvr"><strong><?php echo number_format($od['od_send_coupon']); ?> 원</strong></dd>
<?php } ?>
<?php if ($send_cost2 > 0) { ?>
<?php if ($od['od_send_cost2'] > 0) { ?>
<dt class="sod_bsk_dvr">추가배송비</dt>
<dd class="sod_bsk_dvr"><strong><?php echo number_format($send_cost2); ?> 원</strong></dd>
<dd class="sod_bsk_dvr"><strong><?php echo number_format($od['od_send_cost2']); ?> 원</strong></dd>
<?php } ?>
<dt class="sod_bsk_cnt">총계</dt>
@ -331,8 +319,7 @@ include_once(G4_MSHOP_PATH.'/_head.php');
<?php
$receipt_amount = $od['od_receipt_amount']
+ $od['od_receipt_point']
- $od['od_cancel_card']
- $od['od_refund_amount'];
- $od['od_cancel_amount'];
$misu = true;
@ -474,22 +461,12 @@ include_once(G4_MSHOP_PATH.'/_head.php');
<?php
}
if ($od['od_cancel_card'] > 0)
if ($od['od_cancel_amount'] > 0)
{
?>
<tr>
<th scope="row">승인취소 금액</th>
<td><?php echo display_price($od['od_cancel_card']); ?></td>
</tr>
<?php
}
if ($od['od_refund_amount'] > 0)
{
?>
<tr>
<th scope="row">환불 금액</th>
<td><?php echo display_price($od['od_refund_amount']); ?></td>
<th scope="row">취소/환불 금액</th>
<td><?php echo display_price($od['od_cancel_amount']); ?></td>
</tr>
<?php
}