diff --git a/adm/shop_admin/orderform.php b/adm/shop_admin/orderform.php
index c4aa8a32e..7bf93f2b9 100644
--- a/adm/shop_admin/orderform.php
+++ b/adm/shop_admin/orderform.php
@@ -167,7 +167,7 @@ $pg_anchor .='
결제상세정보 확인
-
+
diff --git a/adm/shop_admin/orderrequest.inc.php b/adm/shop_admin/orderrequest.inc.php
index 7c22b3fbc..13289792b 100644
--- a/adm/shop_admin/orderrequest.inc.php
+++ b/adm/shop_admin/orderrequest.inc.php
@@ -48,7 +48,7 @@ $result = sql_query($sql);
|
-
+
|
|
|
diff --git a/adm/shop_admin/orderrequestform.php b/adm/shop_admin/orderrequestform.php
index 19bd8bc65..8a400d944 100644
--- a/adm/shop_admin/orderrequestform.php
+++ b/adm/shop_admin/orderrequestform.php
@@ -197,7 +197,7 @@ $result = sql_query($sql);
|
diff --git a/adm/shop_admin/orderrequestformupdate.php b/adm/shop_admin/orderrequestformupdate.php
index cb4f3f7f4..0539987cd 100644
--- a/adm/shop_admin/orderrequestformupdate.php
+++ b/adm/shop_admin/orderrequestformupdate.php
@@ -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;
diff --git a/extend/shop.extend2.php b/extend/shop.extend2.php
index 10cb083a1..617b87565 100644
--- a/extend/shop.extend2.php
+++ b/extend/shop.extend2.php
@@ -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);
+}
?>
\ No newline at end of file
diff --git a/install/shop.sql b/install/shop.sql
index 9f6f68560..3e8f787ea 100644
--- a/install/shop.sql
+++ b/install/shop.sql
@@ -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,
diff --git a/mobile/shop/orderformupdate.php b/mobile/shop/orderformupdate.php
index 82c05b821..699861047 100644
--- a/mobile/shop/orderformupdate.php
+++ b/mobile/shop/orderformupdate.php
@@ -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."',
diff --git a/shop/orderformupdate.php b/shop/orderformupdate.php
index 9423b3c38..1da3e7682 100644
--- a/shop/orderformupdate.php
+++ b/shop/orderformupdate.php
@@ -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."',