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-13 18:02:01 +09:00
parent 21da1ac432
commit 55153185c2
21 changed files with 175 additions and 217 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
mobile/shop/orderformupdate.php
View File

@ -307,22 +307,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_MSHOP_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);
@ -333,7 +333,7 @@ else if ($od_settle_case == "가상계좌")
{
include G4_MSHOP_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;
@ -349,13 +349,13 @@ else if ($od_settle_case == "휴대폰")
{
include G4_MSHOP_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;
}
@ -363,13 +363,13 @@ else if ($od_settle_case == "신용카드")
{
include G4_MSHOP_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;
@ -426,18 +426,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',

14
mobile/shop/orderinquiryview.php
View File

@ -162,9 +162,7 @@ include_once(G4_MSHOP_PATH.'/_head.php');
<div id="sod_fin_view">
<h2>결제/배송 정보</h2>
<?php
$receipt_amount = $od['od_receipt_bank']
+ $od['od_receipt_card']
+ $od['od_receipt_hp']
$receipt_amount = $od['od_receipt_amount']
+ $od['od_receipt_point']
- $od['od_cancel_card']
- $od['od_refund_amount'];
@ -274,16 +272,16 @@ include_once(G4_MSHOP_PATH.'/_head.php');
<td><?php echo $od['od_settle_case']; ?></td>
</tr>
<?php
if ($od['od_receipt_bank'])
if ($od['od_receipt_amount'])
{
?>
<tr>
<th scope="row">입금액</th>
<td><?php echo display_price($od['od_receipt_bank']); ?></td>
<td><?php echo display_price($od['od_receipt_amount']); ?></td>
</tr>
<tr>
<td scope="row">입금확인일시</th>
<td><?php echo $od['od_bank_time']; ?></td>
<td><?php echo $od['od_receipt_time']; ?></td>
</tr>
<?php
}
@ -354,7 +352,7 @@ include_once(G4_MSHOP_PATH.'/_head.php');
// 현금영수증 발급을 사용하는 경우에만
if ($default['de_taxsave_use']) {
// 미수금이 없고 현금일 경우에만 현금영수증을 발급 할 수 있습니다.
if ($misu_amount == 0 && $od['od_receipt_bank']) {
if ($misu_amount == 0 && $od['od_receipt_bank'] && ($od['od_settle_case'] == '무통장' || $od['od_settle_case'] == '계좌이체' || $od['od_settle_case'] == '가상계좌')) {
if ($default['de_card_pg'] == 'kcp') {
?>
<tr>
@ -547,7 +545,7 @@ include_once(G4_MSHOP_PATH.'/_head.php');
<?php
// 취소한 내역이 없다면
if ($tot_cancel_amount == 0) {
if ($od['od_temp_bank'] > 0 && $od['od_receipt_bank'] == 0) {
if ($od['od_temp_amount'] > 0 && $od['od_receipt_amount'] == 0) {
?>
<button type="button" onclick="document.getElementById('sod_fin_cancelfrm').style.display='block';">주문 취소하기</button>