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

#212 결제금액 필드 간소화 작업

Browse Source
This commit is contained in:
chicpro
2013-06-14 09:52:42 +09:00
parent c02409fdd2
commit 016059aa3a
5 changed files with 15 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
adm/shop_admin/index.php
View File

@ -57,9 +57,8 @@ $pg_anchor = '<ul class="anchor">
} }
else else
{ {
if ($row['od_receipt_bank']) $settle_method .= "무통장"; $settle_method .= '미입력';
if ($row['od_receipt_card']) $settle_method .= "카드"; if ($row['od_receipt_point']) $settle_method .= '포인트';
if ($row['od_receipt_point']) $settle_method .= "포인트";
} }
?> ?>
<tr> <tr>
@ -122,9 +121,8 @@ $pg_anchor = '<ul class="anchor">
} }
else else
{ {
if ($row['od_temp_bank']) $settle_method .= "무통장"; $settle_method .= '미입력';
if ($row['od_temp_card']) $settle_method .= "카드"; if ($row['od_temp_point']) $settle_method .= '포인트';
if ($row['od_temp_milage']) $settle_method .= "포인트";
} }
?> ?>
<tr> <tr>
@ -160,7 +158,7 @@ $pg_anchor = '<ul class="anchor">
</thead> </thead>
<tbody> <tbody>
<?php <?php
$sql = " select * from {$g4[shop_item_ps_table]} $sql = " select * from {$g4['shop_item_ps_table']}
where is_confirm = 0 where is_confirm = 0
order by is_id desc order by is_id desc
limit $max_limit "; limit $max_limit ";

12
adm/shop_admin/ordermail.inc.php
View File

@ -45,17 +45,17 @@ if ($od_send_mail)
$is_receipt = false; $is_receipt = false;
// 신용카드 입금 // 신용카드 입금
if ($od['od_receipt_card'] > 0) { if ($od['od_receipt_amount'] > 0 && $od['od_settle_case'] == '신용카드') {
$card_list['od_card_time'] = $od['od_card_time']; $card_list['od_receipt_time'] = $od['od_receipt_time'];
$card_list['od_receipt_card'] = display_price($od['od_receipt_card']); $card_list['od_receipt_amount'] = display_price($od['od_receipt_amount']);
$is_receipt = true; $is_receipt = true;
} }
// 무통장 입금 // 무통장 입금
if ($od['od_receipt_bank'] > 0) { if ($od['od_receipt_amount'] > 0 && $od['od_settle_case'] == '무통장') {
$bank_list['od_bank_time'] = $od['od_bank_time']; $bank_list['od_receipt_time'] = $od['od_receipt_time'];
$bank_list['od_receipt_bank'] = display_price($od['od_receipt_bank']); $bank_list['od_receipt_amount'] = display_price($od['od_receipt_amount']);
$bank_list['od_deposit_name'] = $od['od_deposit_name']; $bank_list['od_deposit_name'] = $od['od_deposit_name'];
$is_receipt = true; $is_receipt = true;

2
adm/shop_admin/orderreceiptupdate.php
View File

@ -15,7 +15,7 @@ if ($od_receipt_time)
$sql = " update {$g4['shop_order_table']} $sql = " update {$g4['shop_order_table']}
set od_deposit_name = '$od_deposit_name', set od_deposit_name = '$od_deposit_name',
od_bank_account = '$od_bank_account', od_bank_account = '$od_bank_account',
od_receipt_time = '$od_bank_time', od_receipt_time = '$od_receipt_time',
od_receipt_amount = '$od_receipt_amount', od_receipt_amount = '$od_receipt_amount',
od_receipt_point = '$od_receipt_point', od_receipt_point = '$od_receipt_point',
od_cancel_card = '$od_cancel_card', od_cancel_card = '$od_cancel_card',

4
adm/shop_admin/ordersms.inc.php
View File

@ -7,11 +7,11 @@ $send_number = preg_replace("/[^0-9]/", "", $default['de_admin_company_tel']); /
if ($od_sms_ipgum_check) if ($od_sms_ipgum_check)
{ {
if ($od_bank_account && $od_receipt_bank && $od_deposit_name) if ($od_bank_account && $od_receipt_amount && $od_deposit_name)
{ {
$sms_contents = $default['de_sms_cont4']; $sms_contents = $default['de_sms_cont4'];
$sms_contents = preg_replace("/{이름}/", $od_name, $sms_contents); $sms_contents = preg_replace("/{이름}/", $od_name, $sms_contents);
$sms_contents = preg_replace("/{입금액}/", number_format($od_receipt_bank), $sms_contents); $sms_contents = preg_replace("/{입금액}/", number_format($od_receipt_amount), $sms_contents);
$sms_contents = preg_replace("/{주문번호}/", $od_id, $sms_contents); $sms_contents = preg_replace("/{주문번호}/", $od_id, $sms_contents);
$sms_contents = preg_replace("/{회사명}/", $default['de_admin_company_name'], $sms_contents); $sms_contents = preg_replace("/{회사명}/", $default['de_admin_company_name'], $sms_contents);

2
mobile/shop/orderinquiryview.php
View File

@ -352,7 +352,7 @@ include_once(G4_MSHOP_PATH.'/_head.php');
// 현금영수증 발급을 사용하는 경우에만 // 현금영수증 발급을 사용하는 경우에만
if ($default['de_taxsave_use']) { if ($default['de_taxsave_use']) {
// 미수금이 없고 현금일 경우에만 현금영수증을 발급 할 수 있습니다. // 미수금이 없고 현금일 경우에만 현금영수증을 발급 할 수 있습니다.
if ($misu_amount == 0 && $od['od_receipt_bank'] && ($od['od_settle_case'] == '무통장' || $od['od_settle_case'] == '계좌이체' || $od['od_settle_case'] == '가상계좌')) { if ($misu_amount == 0 && $od['od_receipt_amount'] && ($od['od_settle_case'] == '무통장' || $od['od_settle_case'] == '계좌이체' || $od['od_settle_case'] == '가상계좌')) {
if ($default['de_card_pg'] == 'kcp') { if ($default['de_card_pg'] == 'kcp') {
?> ?>
<tr> <tr>