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-08-01 11:42:45 +09:00
parent 1227bd0bfb 53d357d98e
commit c2f02c5355
10 changed files with 70 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
adm/point_list.php
View File

@ -179,7 +179,7 @@ function point_clear()
<td class="td_time"><?php echo $row['po_datetime'] ?></td>
<td class="td_date<?php echo $expr; ?>">
<?php if ($row['po_expired'] == 1) { ?>
만료<?php echo date('ymd', strtotime($row['po_expire_date'])); ?>
만료<?php echo substr(str_replace('-', '', $row['po_expire_date']), 2); ?>
<?php } else echo $row['po_expire_date'] == '9999-12-31' ? '&nbsp;' : $row['po_expire_date']; ?>
</td>
<td class="td_num td_pt"><?php echo number_format($row['po_mb_point']) ?></td>

14
adm/shop_admin/orderform.php
View File

@ -474,6 +474,20 @@ $pg_anchor .='<li><a href="#anc_sodr_chk">결제상세정보 확인</a></li>
<td><?php echo display_price($od['od_cancel_card']); ?></td>
</tr>
<?php } ?>
<?php if($od['od_tax_flag']) { ?>
<tr>
<th scope="row">과세공급가액</th>
<td><?php echo display_price($od['od_tax_mny']); ?></td>
</tr>
<tr>
<th scope="row">과세부가세액</th>
<td><?php echo display_price($od['od_vat_mny']); ?></td>
</tr>
<tr>
<th scope="row">비과세공급가액</th>
<td><?php echo display_price($od['od_free_mny']); ?></td>
</tr>
<?php } ?>
<tr>
<th scope="row">포인트</th>
<td><?php echo display_point($od['od_receipt_point']); ?></td>

14
bbs/point.php
View File

@ -31,6 +31,7 @@ $from_record = ($page - 1) * $rows; // 시작 열을 구함
<tr>
<th scope="col">일시</th>
<th scope="col">내용</th>
<th scope="col">만료일</th>
<th scope="col">지급포인트</th>
<th scope="col">사용포인트</th>
</tr>
@ -55,10 +56,19 @@ $from_record = ($page - 1) * $rows; // 시작 열을 구함
}
$po_content = $row['po_content'];
$expr = '';
if($row['po_expired'] == 1)
$expr = ' txt_expired';
?>
<tr>
<td class="td_datetime"><?php echo $row['po_datetime']; ?></td>
<td><?php echo $po_content; ?></td>
<td class="td_date<?php echo $expr; ?>">
<?php if ($row['po_expired'] == 1) { ?>
만료<?php echo substr(str_replace('-', '', $row['po_expire_date']), 2); ?>
<?php } else echo $row['po_expire_date'] == '9999-12-31' ? '&nbsp;' : $row['po_expire_date']; ?>
</td>
<td class="td_bignum"><?php echo $point1; ?></td>
<td class="td_bignum"><?php echo $point2; ?></td>
</tr>
@ -76,12 +86,12 @@ $from_record = ($page - 1) * $rows; // 시작 열을 구함
</tbody>
<tfoot>
<tr>
<th scope="row" colspan="2">소계</th>
<th scope="row" colspan="3">소계</th>
<td><?php echo $sum_point1; ?></td>
<td><?php echo $sum_point2; ?></td>
</tr>
<tr>
<th scope="row" colspan="2">보유포인트</th>
<th scope="row" colspan="3">보유포인트</th>
<td colspan="2"><?php echo number_format($member['mb_point']); ?></td>
</tr>
</tfoot>

3
css/default.css
View File

@ -196,6 +196,9 @@ td.empty_table {padding:85px 0;text-align:center}
.td_datetime {width:110px;text-align:center}
.td_mng {width:80px;text-align:center}
.txt_active {color:#5d910b}
.txt_expired {color:#ccc}
/* 새창 기본 스타일 */
.new_win {}
.new_win #new_win_title {margin-bottom:20px;padding:0 20px;height:60px;border-top:3px solid #4e5d60;border-bottom:1px solid #e9e9e9;background:#fff;font-size:1.2em;line-height:5em}

8
extend/shop.extend2.php
View File

@ -400,4 +400,12 @@ if (!sql_query(" select de_mobile_type1_list_mod from {$g4['shop_default_table']
CHANGE `de_mobile_type4_list_row` `de_mobile_type4_list_mod` INT(11) NOT NULL DEFAULT '0',
CHANGE `de_mobile_type5_list_row` `de_mobile_type5_list_mod` INT(11) NOT NULL DEFAULT '0' ", true);
}
// 과세, 비과세 금액 필드 추가
if(!sql_query(" select od_tax_mny from {$g4['shop_order_table']} limit 1 ", false)) {
sql_query(" ALTER TABLE `{$g4['shop_order_table']}`
ADD `od_tax_mny` INT(11) NOT NULL DEFAULT '0' AFTER `od_tax_flag`,
ADD `od_vat_mny` INT(11) NOT NULL DEFAULT '0' AFTER `od_tax_mny`,
ADD `od_free_mny` INT(11) NOT NULL DEFAULT '0' AFTER `od_vat_mny` ", true);
}
?>

3
install/shop.sql
View File

@ -623,6 +623,9 @@ CREATE TABLE IF NOT EXISTS `shop_order` (
`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_tax_mny` int(11) NOT NULL DEFAULT '0',
`od_vat_mny` int(11) NOT NULL DEFAULT '0',
`od_free_mny` int(11) 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,

5
mobile/shop/orderform.php
View File

@ -222,7 +222,7 @@ ob_start();
// 복합과세처리
if($default['de_tax_flag_use']) {
$comm_tax_mny = round(($tot_tax_mny + $send_cost) / 1.1);
$comm_vat_mnt = ($tot_tax_mny + $send_cost) - $comm_tax_mny;
$comm_vat_mny = ($tot_tax_mny + $send_cost) - $comm_tax_mny;
}
?>
</tbody>
@ -1205,8 +1205,7 @@ function kcp_approval()
f.settle_method.value = settle_method;
<?php if($default['de_tax_flag_use']) { ?>
if(settle_method != "무통장")
calculate_tax();
calculate_tax();
<?php } ?>
var new_win = window.open("about:blank", "tar_opener", "scrollbars=yes,resizable=yes");

13
mobile/shop/orderformupdate.php
View File

@ -397,6 +397,16 @@ $od_escrow = 0;
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_free_mny = 0;
if($default['de_tax_flag_use']) {
$od_tax_mny = (int)$_POST['comm_tax_mny'];
$od_vat_mny = (int)$_POST['comm_vat_mny'];
$od_free_mny = (int)$_POST['comm_free_mny'];
}
// 주문서에 입력
$sql = " insert {$g4['shop_order_table']}
set od_id = '$od_id',
@ -433,6 +443,9 @@ $sql = " insert {$g4['shop_order_table']}
od_tno = '$od_tno',
od_escrow = '$od_escrow',
od_tax_flag = '{$default['de_tax_flag_use']}',
od_tax_mny = '$od_tax_mny',
od_vat_mny = '$od_vat_mny',
od_free_mny = '$od_free_mny',
od_shop_memo = '',
od_hope_date = '$od_hope_date',
od_time = '".G4_TIME_YMDHIS."',

3
shop/orderform.php
View File

@ -1483,8 +1483,7 @@ function forderform_check(f)
}
<?php if($default['de_tax_flag_use']) { ?>
if(settle_method != "무통장")
calculate_tax();
calculate_tax();
<?php } ?>
// pay_method 설정

13
shop/orderformupdate.php
View File

@ -391,6 +391,16 @@ $od_escrow = 0;
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_free_mny = 0;
if($default['de_tax_flag_use']) {
$od_tax_mny = (int)$_POST['comm_tax_mny'];
$od_vat_mny = (int)$_POST['comm_vat_mny'];
$od_free_mny = (int)$_POST['comm_free_mny'];
}
// 주문서에 입력
$sql = " insert {$g4['shop_order_table']}
set od_id = '$od_id',
@ -427,6 +437,9 @@ $sql = " insert {$g4['shop_order_table']}
od_tno = '$od_tno',
od_escrow = '$od_escrow',
od_tax_flag = '{$default['de_tax_flag_use']}',
od_tax_mny = '$od_tax_mny',
od_vat_mny = '$od_vat_mny',
od_free_mny = '$od_free_mny',
od_shop_memo = '',
od_hope_date = '$od_hope_date',
od_time = '".G4_TIME_YMDHIS."',