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

Merge branch 'master' of github.com:gnuboard/yc4s

Browse Source
This commit is contained in:
gnuboard
2013-06-14 09:25:08 +09:00
parent 2bec7ffeea c02409fdd2
commit a455e4881c
24 changed files with 586 additions and 495 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
shop/mail/ordermail.mail.php
View File

@ -58,11 +58,11 @@ $ft_a_st = 'display:block;padding:30px 0;background:#484848;color:#fff;text-alig
<tbody>
<tr>
<th scope="row" style="<?php echo $th_st; ?>">승인일시</th>
<td style="<?php echo $td_st; ?>"><?php echo $card_list['od_card_time']; ?></td>
<td style="<?php echo $td_st; ?>"><?php echo $card_list['od_receipt_time']; ?></td>
</tr>
<tr>
<th scope="row" style="<?php echo $th_st; ?>">승인금액</th>
<td style="<?php echo $td_st; ?>"><?php echo $card_list['od_receipt_card']; ?></td>
<td style="<?php echo $td_st; ?>"><?php echo $card_list['od_receipt_amount']; ?></td>
</tr>
</tbody>
</table>
@ -79,11 +79,11 @@ $ft_a_st = 'display:block;padding:30px 0;background:#484848;color:#fff;text-alig
<tbody>
<tr>
<th scope="row" style="<?php echo $th_st; ?>">확인일시</th>
<td style="<?php echo $td_st; ?>"><?php echo $bank_list['od_bank_time']; ?></td>
<td style="<?php echo $td_st; ?>"><?php echo $bank_list['od_receipt_time']; ?></td>
</tr>
<tr>
<th scope="row" style="<?php echo $th_st; ?>">입금액</th>
<td style="<?php echo $td_st; ?>"><?php echo $bank_list['od_receipt_bank']; ?></td>
<td style="<?php echo $td_st; ?>"><?php echo $bank_list['od_receipt_amount']; ?></td>
</tr>
<tr>
<th scope="row" style="<?php echo $th_st; ?>">입금자명</th>

10
shop/mail/orderupdate1.mail.php
View File

@ -90,17 +90,17 @@ $ft_a_st = 'display:block;padding:30px 0;background:#484848;color:#fff;text-alig
</tr>
<?php } ?>
<?php if ($od_receipt_card > 0) { ?>
<?php if ($od_receipt_amount > 0 && $od_settle_case == '신용카드') { ?>
<tr>
<th scope="row" style="<?php echo $th_st; ?>">신용카드 입금액</th>
<td style="<?php echo $td_st; ?>"><?php echo display_price($od_receipt_card); ?><!-- (승인전 금액입니다.) --></td>
<td style="<?php echo $td_st; ?>"><?php echo display_price($od_receipt_amount); ?></td>
</tr>
<?php } ?>
<?php if ($od_receipt_bank > 0) { ?>
<?php if ($od_receipt_amount > 0 && $od_settle_case == '계좌이체') { ?>
<tr>
<th scope="row" style="<?php echo $th_st; ?>"><?php echo $od_settle_case; ?> 입금액</th>
<td style="<?php echo $td_st; ?>"><?php echo display_price($od_receipt_bank); ?></td>
<td style="<?php echo $td_st; ?>"><?php echo display_price($od_receipt_amount); ?></td>
</tr>
<tr>
<th scope="row" style="<?php echo $th_st; ?>">계좌번호</th>
@ -112,7 +112,7 @@ $ft_a_st = 'display:block;padding:30px 0;background:#484848;color:#fff;text-alig
</tr>
<?php } ?>
<?php if (!$od_receipt_point && !$od_receipt_card && !$od_receipt_bank) { ?>
<?php if (!$od_receipt_point && !$od_receipt_amount) { ?>
<tr>
<td colspan="2" style="<?php echo $empty_st; ?>">결제정보가 없습니다.</td>
</tr>

10
shop/mail/orderupdate2.mail.php
View File

@ -90,17 +90,17 @@ $ft_a_st = 'display:block;padding:30px 0;background:#484848;color:#fff;text-alig
</tr>
<?php } ?>
<?php if ($od_receipt_card > 0) { ?>
<?php if ($od_receipt_amount > 0 && $od_settle_case == '신용카드') { ?>
<tr>
<th scope="row" style="<?php echo $th_st; ?>">신용카드 입금액</th>
<td style="<?php echo $td_st; ?>"><?php echo display_price($od_receipt_card); ?><!-- (승인전 금액입니다.) --></td>
<td style="<?php echo $td_st; ?>"><?php echo display_price($od_receipt_amount); ?></td>
</tr>
<?php } ?>
<?php if ($od_receipt_bank > 0) { ?>
<?php if ($od_receipt_amount > 0 && $od_settle_case == '계좌이체') { ?>
<tr>
<th scope="row" style="<?php echo $th_st; ?>"><?php echo $od_settle_case; ?> 입금액</th>
<td style="<?php echo $td_st; ?>"><?php echo display_price($od_receipt_bank); ?></td>
<td style="<?php echo $td_st; ?>"><?php echo display_price($od_receipt_amount); ?></td>
</tr>
<tr>
<th scope="row" style="<?php echo $th_st; ?>">계좌번호</th>
@ -112,7 +112,7 @@ $ft_a_st = 'display:block;padding:30px 0;background:#484848;color:#fff;text-alig
</tr>
<?php } ?>
<?php if (!$od_receipt_point && !$od_receipt_card && !$od_receipt_bank) { ?>
<?php if (!$od_receipt_point && !$od_receipt_amount) { ?>
<tr>
<td colspan="2" style="<?php echo $empty_st; ?>">결제정보가 없습니다.</td>
</tr>

36
shop/orderformupdate.php
View File

@ -301,22 +301,22 @@ $i_amount = $i_amount + $i_send_cost - $i_temp_point;
if ($od_settle_case == "무통장")
{
$od_temp_bank = $i_amount;
$od_temp_amount = $i_amount;
$od_temp_point = $i_temp_point;
$od_receipt_point = $i_temp_point;
$od_receipt_bank = 0;
$od_receipt_amount = 0;
}
else if ($od_settle_case == "계좌이체")
{
include G4_SHOP_PATH.'/kcp/pp_ax_hub.php';
$od_temp_bank = $i_amount;
$od_temp_amount = $i_amount;
$od_temp_point = $i_temp_point;
$od_escrow1 = $tno;
$od_receipt_bank = $amount;
$od_receipt_amount = $amount;
$od_receipt_point = $i_temp_point;
$od_bank_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_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 = $od_settle_case;
$od_deposit_name = $od_name;
$bank_name = iconv("cp949", "utf8", $bank_name);
@ -327,7 +327,7 @@ else if ($od_settle_case == "가상계좌")
{
include G4_SHOP_PATH.'/kcp/pp_ax_hub.php';
$od_temp_bank = $i_amount;
$od_temp_amount = $i_amount;
$od_temp_point = $i_temp_point;
$od_receipt_point = 0;
@ -343,13 +343,13 @@ else if ($od_settle_case == "휴대폰")
{
include G4_SHOP_PATH.'/kcp/pp_ax_hub.php';
$od_temp_bank = $i_amount;
$od_temp_amount = $i_amount;
$od_temp_point = $i_temp_point;
$od_escrow1 = $tno;
$od_receipt_hp = $amount;
$od_receipt_amount = $amount;
$od_receipt_point = $i_temp_point;
$od_hp_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_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;
}
@ -357,13 +357,13 @@ else if ($od_settle_case == "신용카드")
{
include G4_SHOP_PATH.'/kcp/pp_ax_hub.php';
$od_temp_card = $i_amount;
$od_temp_amount = $i_amount;
$od_temp_point = $i_temp_point;
$od_escrow1 = $tno;
$od_receipt_card = $amount;
$od_receipt_amount = $amount;
$od_receipt_point = $i_temp_point;
$od_card_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_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);
$card_name = iconv("cp949", "utf8", $card_name);
$od_bank_account = $card_name;
$pg_amount = $amount;
@ -420,18 +420,12 @@ $sql = " insert {$g4['shop_order_table']}
od_send_cost = '$od_send_cost',
od_send_coupon = '$tot_sc_cp_amount',
od_coupon = '$tot_od_cp_amount',
od_temp_bank = '$od_temp_bank',
od_temp_card = '$od_receipt_card',
od_temp_hp = '$od_receipt_hp',
od_temp_amount = '$od_temp_amount',
od_temp_point = '$od_temp_point',
od_receipt_bank = '$od_receipt_bank',
od_receipt_card = '$od_receipt_card',
od_receipt_hp = '$od_receipt_hp',
od_receipt_amount = '$od_receipt_amount',
od_receipt_point = '$od_receipt_point',
od_bank_account = '$od_bank_account',
od_bank_time = '$od_bank_time',
od_card_time = '$od_card_time',
od_hp_time = '$od_hp_time',
od_receipt_time = '$od_receipt_time',
od_escrow1 = '$od_escrow1',
od_shop_memo = '',
od_hope_date = '$od_hope_date',

6
shop/orderinquirycancel.php
View File

@ -15,7 +15,7 @@ if (!$od['od_id']) {
alert("존재하는 주문이 아닙니다.");
}
if ($od['od_temp_bank'] > 0 && $od['od_receipt_bank'] == 0) {
if ($od['od_temp_amount'] > 0 && $od['od_receipt_amount'] == 0) {
;
} else {
alert("취소할 수 있는 주문이 아닙니다.", G4_SHOP_URL."/orderinquiryview.php?od_id=$od_id&amp;uq_id=$uq_id");
@ -31,7 +31,9 @@ sql_query(" update {$g4['shop_order_table']} set od_send_cost = '0', od_temp_poi
// 주문취소 회원의 포인트를 되돌려 줌
if ($od['od_receipt_point'] > 0) {
insert_point($member['mb_id'], $od['od_receipt_point'], "주문번호 $od_id 본인 취소");
if(!$default['de_mileage_use'])
insert_point($member['mb_id'], $od['od_receipt_point'], "주문번호 $od_id 본인 취소");
insert_mileage($member['mb_id'], $od['od_receipt_point'], "주문번호 $od_id 본인 취소", $od_id);
}
goto_url(G4_SHOP_URL."/orderinquiryview.php?od_id=$od_id&amp;uq_id=$uq_id");

14
shop/orderinquiryview.php
View File

@ -175,9 +175,7 @@ if(openwin != null) {
<div id="sod_fin_view">
<h2>결제/배송 정보</h2>
<?php
$receipt_amount = $od['od_receipt_bank']
+ $od['od_receipt_card']
+ $od['od_receipt_hp']
$receipt_amount = $od['od_receipt_amount']
+ $od['od_receipt_point']
- $od['od_cancel_card']
- $od['od_refund_amount'];
@ -287,16 +285,16 @@ if(openwin != null) {
<td><?php echo $od['od_settle_case']; ?></td>
</tr>
<?php
if ($od['od_receipt_bank'])
if ($od['od_receipt_amount'])
{
?>
<tr>
<th scope="row">입금액</th>
<td><?php echo display_price($od['od_receipt_bank']); ?></td>
<td><?php echo display_price($od['od_receipt_amount']); ?></td>
</tr>
<tr>
<th scope="row">입금확인일시</th>
<td><?php echo $od['od_bank_time']; ?></td>
<td><?php echo $od['od_receipt_time']; ?></td>
</tr>
<?php
}
@ -367,7 +365,7 @@ if(openwin != null) {
// 현금영수증 발급을 사용하는 경우에만
if ($default['de_taxsave_use']) {
// 미수금이 없고 현금일 경우에만 현금영수증을 발급 할 수 있습니다.
if ($misu_amount == 0 && $od['od_receipt_bank']) {
if ($misu_amount == 0 && $od['od_receipt_amount'] && ($od['od_settle_case'] == '무통장' || $od['od_settle_case'] == '계좌이체' || $od['od_settle_case'] == '가상계좌')) {
if ($default['de_card_pg'] == 'kcp') {
?>
<tr>
@ -560,7 +558,7 @@ if(openwin != null) {
<?php
// 취소한 내역이 없다면
if ($tot_cancel_amount == 0) {
if ($od['od_temp_bank'] > 0 && $od['od_receipt_bank'] == 0) {
if ($od['od_temp_amount'] > 0 && $od['od_receipt_amount'] == 0) {
?>
<button type="button" onclick="document.getElementById('sod_fin_cancelfrm').style.display='block';">주문 취소하기</button>

4
shop/settle_kcp_common.php
View File

@ -143,8 +143,8 @@ if(!$default['de_card_test']) {
{
// 주문서 UPDATE
$sql = " update {$g4['shop_order_table']}
set od_receipt_bank = '$ipgm_mnyx',
od_bank_time = '$tx_tm'
set od_receipt_amount = '$ipgm_mnyx',
od_receipt_time = '$tx_tm'
where od_id = '$order_no'
and od_escrow1 = '$tno' ";
sql_query($sql, FALSE);

2
shop/taxsave_kcp.php
View File

@ -14,7 +14,7 @@ $goods_name = $goods['full_name'];
$trad_time = date("YmdHis");
$amt_tot = (int)$od['od_receipt_bank'];
$amt_tot = (int)$od['od_receipt_amount'];
$amt_sup = (int)round(($amt_tot * 10) / 11);
$amt_svc = 0;
$amt_tax = (int)($amt_tot - $amt_sup);