diff --git a/adm/point_list.php b/adm/point_list.php
index b5fa1ec3d..cf6663f46 100644
--- a/adm/point_list.php
+++ b/adm/point_list.php
@@ -179,7 +179,7 @@ function point_clear()
|
- 만료
+ 만료
|
|
diff --git a/adm/shop_admin/orderform.php b/adm/shop_admin/orderform.php
index 2132bcebe..3e12eeba9 100644
--- a/adm/shop_admin/orderform.php
+++ b/adm/shop_admin/orderform.php
@@ -474,6 +474,20 @@ $pg_anchor .='결제상세정보 확인
|
+
+
+ | 과세공급가액 |
+ |
+
+
+ | 과세부가세액 |
+ |
+
+
+ | 비과세공급가액 |
+ |
+
+
| 포인트 |
|
diff --git a/bbs/point.php b/bbs/point.php
index ebfdc9c56..dc7907f4f 100644
--- a/bbs/point.php
+++ b/bbs/point.php
@@ -31,6 +31,7 @@ $from_record = ($page - 1) * $rows; // 시작 열을 구함
| 일시 |
내용 |
+ 만료일 |
지급포인트 |
사용포인트 |
@@ -55,10 +56,19 @@ $from_record = ($page - 1) * $rows; // 시작 열을 구함
}
$po_content = $row['po_content'];
+
+ $expr = '';
+ if($row['po_expired'] == 1)
+ $expr = ' txt_expired';
?>
|
|
+
+
+ 만료
+
+ |
|
|
@@ -76,12 +86,12 @@ $from_record = ($page - 1) * $rows; // 시작 열을 구함
- | 소계 |
+ 소계 |
|
|
- | 보유포인트 |
+ 보유포인트 |
|
diff --git a/css/default.css b/css/default.css
index ddba6d729..16d8d82cd 100644
--- a/css/default.css
+++ b/css/default.css
@@ -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}
diff --git a/extend/shop.extend2.php b/extend/shop.extend2.php
index 57aaa0e65..fdc1f5fe2 100644
--- a/extend/shop.extend2.php
+++ b/extend/shop.extend2.php
@@ -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);
+}
?>
\ No newline at end of file
diff --git a/install/shop.sql b/install/shop.sql
index ad9a397de..7d21a7af6 100644
--- a/install/shop.sql
+++ b/install/shop.sql
@@ -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,
diff --git a/mobile/shop/orderform.php b/mobile/shop/orderform.php
index 697a9fa21..975a5af4f 100644
--- a/mobile/shop/orderform.php
+++ b/mobile/shop/orderform.php
@@ -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;
}
?>
@@ -1205,8 +1205,7 @@ function kcp_approval()
f.settle_method.value = settle_method;
- if(settle_method != "무통장")
- calculate_tax();
+ calculate_tax();
var new_win = window.open("about:blank", "tar_opener", "scrollbars=yes,resizable=yes");
diff --git a/mobile/shop/orderformupdate.php b/mobile/shop/orderformupdate.php
index 946db9fd5..2d1164fa2 100644
--- a/mobile/shop/orderformupdate.php
+++ b/mobile/shop/orderformupdate.php
@@ -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."',
diff --git a/shop/orderform.php b/shop/orderform.php
index b94738e18..fa3507cc6 100644
--- a/shop/orderform.php
+++ b/shop/orderform.php
@@ -1483,8 +1483,7 @@ function forderform_check(f)
}
- if(settle_method != "무통장")
- calculate_tax();
+ calculate_tax();
// pay_method 설정
diff --git a/shop/orderformupdate.php b/shop/orderformupdate.php
index 130eb8a6f..1bf61f68c 100644
--- a/shop/orderformupdate.php
+++ b/shop/orderformupdate.php
@@ -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."',