| 확인일시 |
- |
+ |
| 입금액 |
- |
+ |
| 입금자명 |
diff --git a/shop/mail/orderupdate1.mail.php b/shop/mail/orderupdate1.mail.php
index 23690fd7c..91a8ae03a 100644
--- a/shop/mail/orderupdate1.mail.php
+++ b/shop/mail/orderupdate1.mail.php
@@ -90,17 +90,17 @@ $ft_a_st = 'display:block;padding:30px 0;background:#484848;color:#fff;text-alig
- 0) { ?>
+ 0 && $od_settle_case == '신용카드') { ?>
| 신용카드 입금액 |
- |
+ |
- 0) { ?>
+ 0 && $od_settle_case == '계좌이체') { ?>
| 입금액 |
- |
+ |
| 계좌번호 |
@@ -112,7 +112,7 @@ $ft_a_st = 'display:block;padding:30px 0;background:#484848;color:#fff;text-alig
-
+
| 결제정보가 없습니다. |
diff --git a/shop/mail/orderupdate2.mail.php b/shop/mail/orderupdate2.mail.php
index ac2fd4a75..0e997f1fb 100644
--- a/shop/mail/orderupdate2.mail.php
+++ b/shop/mail/orderupdate2.mail.php
@@ -90,17 +90,17 @@ $ft_a_st = 'display:block;padding:30px 0;background:#484848;color:#fff;text-alig
- 0) { ?>
+ 0 && $od_settle_case == '신용카드') { ?>
| 신용카드 입금액 |
- |
+ |
- 0) { ?>
+ 0 && $od_settle_case == '계좌이체') { ?>
| 입금액 |
- |
+ |
| 계좌번호 |
@@ -112,7 +112,7 @@ $ft_a_st = 'display:block;padding:30px 0;background:#484848;color:#fff;text-alig
-
+
| 결제정보가 없습니다. |
diff --git a/shop/orderformupdate.php b/shop/orderformupdate.php
index 57c397316..603ceac49 100644
--- a/shop/orderformupdate.php
+++ b/shop/orderformupdate.php
@@ -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',
diff --git a/shop/orderinquirycancel.php b/shop/orderinquirycancel.php
index 95738244c..ae2017881 100644
--- a/shop/orderinquirycancel.php
+++ b/shop/orderinquirycancel.php
@@ -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&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&uq_id=$uq_id");
diff --git a/shop/orderinquiryview.php b/shop/orderinquiryview.php
index 880b15603..6e4091eaa 100644
--- a/shop/orderinquiryview.php
+++ b/shop/orderinquiryview.php
@@ -175,9 +175,7 @@ if(openwin != null) {
결제/배송 정보
| 입금액 |
- |
+ |
| 입금확인일시 |
- |
+ |
@@ -560,7 +558,7 @@ if(openwin != null) {
0 && $od['od_receipt_bank'] == 0) {
+ if ($od['od_temp_amount'] > 0 && $od['od_receipt_amount'] == 0) {
?>
diff --git a/shop/settle_kcp_common.php b/shop/settle_kcp_common.php
index 2f028a5c4..3ad926370 100644
--- a/shop/settle_kcp_common.php
+++ b/shop/settle_kcp_common.php
@@ -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);
diff --git a/shop/taxsave_kcp.php b/shop/taxsave_kcp.php
index e26e310a4..435f12047 100644
--- a/shop/taxsave_kcp.php
+++ b/shop/taxsave_kcp.php
@@ -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);