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

주문정보에 복합과세결제 정보 기록하도록 수정

Browse Source
This commit is contained in:
chicpro
2013-07-16 18:02:42 +09:00
parent 6fb5881cae
commit 52c56b7138
8 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
adm/shop_admin/orderform.php
View File

@ -167,7 +167,7 @@ $pg_anchor .='<li><a href="#anc_sodr_chk">결제상세정보 확인</a></li>
<li>
<p>
<a href="./itemform.php?w=u&amp;it_id=<?php echo $row['it_id']; ?>"><?php echo $image; ?> <?php echo stripslashes($row['it_name']); ?></a>
<?php if($default['de_tax_flag_use'] && $row['ct_notax']) echo '[비과세상품]'; ?>
<?php if($od['od_tax_flag'] && $row['ct_notax']) echo '[비과세상품]'; ?>
</p>
<table>

2
adm/shop_admin/orderrequest.inc.php
View File

@ -48,7 +48,7 @@ $result = sql_query($sql);
<tr>
<td>
<a href="./itemform.php?w=u&amp;it_id=<?php echo $row['it_id']; ?>"><?php echo $image; ?> <?php echo stripslashes($row['it_name']); ?></a>
<?php if($default['de_tax_flag_use'] && $row['ct_notax']) echo '[비과세상품]'; ?>
<?php if($od['od_tax_flag'] && $row['ct_notax']) echo '[비과세상품]'; ?>
</td>
<td><?php echo $row['ct_option']; ?></td>
<td><?php echo number_format($price); ?></td>

2
adm/shop_admin/orderrequestform.php
View File

@ -197,7 +197,7 @@ $result = sql_query($sql);
<?php } // 반품요청 끝 ?>
<?php
if($od['od_settle_case'] == '신용카드' || $od['od_settle_case'] == '계좌이체') {
if($default['de_tax_flag_use']) {
if($od['od_tax_flag']) {
?>
<tr>
<td><label for="rq_amount2">과세금액 부분취소</label></td>

4
adm/shop_admin/orderrequestformupdate.php
View File

@ -108,7 +108,7 @@ if(($od['od_settle_case'] == '신용카드' || $od['od_settle_case'] == '계좌
if($od['od_settle_case'] == '계좌이체')
$mod_type = 'STPA';
if($default['de_tax_flag_use']) {
if($od['od_tax_flag']) {
$mod_mny = $tax_mny + $mod_free_mny;
}
@ -126,7 +126,7 @@ if(($od['od_settle_case'] == '신용카드' || $od['od_settle_case'] == '계좌
$c_PayPlus->mf_set_modx_data( "rem_mny" , strval($rem_mny) ); // 취소 가능 잔액
$c_PayPlus->mf_set_modx_data( "mod_mny" , strval($mod_mny) ); // 취소 요청 금액
if($default['de_tax_flag_use'])
if($od['od_tax_flag'])
{
$mod_tax_mny = round((int)$tax_mny / 1.1);
$mod_vat_mny = (int)$tax_mny - $mod_tax_mny;

6
extend/shop.extend2.php
View File

@ -388,4 +388,10 @@ if(!sql_query(" select od_mod_history from {$g4['shop_order_table']} limit 1 ",
sql_query(" ALTER TABLE `{$g4['shop_order_table']}`
ADD `od_mod_history` TEXT NOT NULL AFTER `od_shop_memo` ", true);
}
// 주문정보에 복합결제 필드추가
if(!sql_query(" select od_tax_flag from {$g4['shop_order_table']} limit 1 ", false)) {
sql_query(" ALTER TABLE `{$g4['shop_order_table']}`
ADD `od_tax_flag` TINYINT(4) NOT NULL DEFAULT '0' AFTER `od_escrow` ", true);
}
?>

1
install/shop.sql
View File

@ -621,6 +621,7 @@ CREATE TABLE IF NOT EXISTS `shop_order` (
`od_settle_case` varchar(255) NOT NULL DEFAULT '',
`od_tno` varchar(255) NOT NULL DEFAULT '',
`od_escrow` tinyint(4) NOT NULL DEFAULT '0',
`od_tax_flag` tinyint(4) NOT NULL DEFAULT '0',
`od_cash_no` varchar(255) NOT NULL,
`od_cash_receipt_no` varchar(255) NOT NULL,
`od_cash_app_time` varchar(255) NOT NULL,

1
mobile/shop/orderformupdate.php
View File

@ -457,6 +457,7 @@ $sql = " insert {$g4['shop_order_table']}
od_receipt_time = '$od_receipt_time',
od_tno = '$od_tno',
od_escrow = '$od_escrow',
od_tax_flag = '{$default['de_tax_flag_use']}',
od_shop_memo = '',
od_hope_date = '$od_hope_date',
od_time = '".G4_TIME_YMDHIS."',

1
shop/orderformupdate.php
View File

@ -451,6 +451,7 @@ $sql = " insert {$g4['shop_order_table']}
od_receipt_time = '$od_receipt_time',
od_tno = '$od_tno',
od_escrow = '$od_escrow',
od_tax_flag = '{$default['de_tax_flag_use']}',
od_shop_memo = '',
od_hope_date = '$od_hope_date',
od_time = '".G4_TIME_YMDHIS."',