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

Merge branch 'master' of github.com:gnuboard/yc5

Browse Source
This commit is contained in:
SIR
2014-09-29 13:17:37 +09:00
parent 4818f23a0b a74369e796
commit 33fbd3bebc
13 changed files with 85 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
adm/shop_admin/configformupdate.php
View File

@ -21,6 +21,12 @@ if ($_FILES['mobile_logo_img2']['name']) upload_file($_FILES['mobile_logo_img2']
$de_kcp_mid = substr($_POST['de_kcp_mid'],0,3);
// kcp 전자결제를 사용할 때 site key 입력체크
if($de_pg_service == 'kcp' && ($de_iche_use || $de_vbank_use || $de_hp_use || $de_card_use)) {
if(trim($de_kcp_site_key) == '')
alert('KCP SITE KEY를 입력해 주십시오.');
}
//
// 영카트 default
//

4
adm/shop_admin/orderform.php
View File

@ -531,8 +531,7 @@ add_javascript(G5_POSTCODE_JS, 0); //다음 주소 js
</td>
</tr>
<?php
if ($default['de_taxsave_use'] && $amount['미수'] == 0) {
if ($od['od_receipt_price'] && ($od['od_settle_case'] == '무통장' || $od['od_settle_case'] == '가상계좌' || $od['od_settle_case'] == '계좌이체')) {
if ($od['od_misu'] == 0 && $od['od_receipt_price'] && ($od['od_settle_case'] == '무통장' || $od['od_settle_case'] == '가상계좌' || $od['od_settle_case'] == '계좌이체')) {
?>
<tr>
<th scope="row">현금영수증</th>
@ -568,7 +567,6 @@ add_javascript(G5_POSTCODE_JS, 0); //다음 주소 js
</td>
</tr>
<?php
}
}
?>
</tbody>

22
adm/shop_admin/personalpayform.php
View File

@ -174,20 +174,19 @@ if(!sql_query(" select pp_cash from {$g5['g5_shop_personalpay_table']} limit 1 "
</td>
</tr>
<?php
if ($default['de_taxsave_use']) {
$is_cash_receipt = true;
$is_cash_receipt = true;
// 주문내역이 있으면 현금영수증 발급하지 않음
if($pp['od_id']) {
$sql = " select count(od_id) as cnt from {$g5['g5_shop_order_table']} where od_id = '{$pp['od_id']}' ";
$row = sql_fetch($sql);
// 주문내역이 있으면 현금영수증 발급하지 않음
if($pp['od_id']) {
$sql = " select count(od_id) as cnt from {$g5['g5_shop_order_table']} where od_id = '{$pp['od_id']}' ";
$row = sql_fetch($sql);
if($row['cnt'] > 0)
$is_cash_receipt = false;
}
if($row['cnt'] > 0)
$is_cash_receipt = false;
}
if ($is_cash_receipt && ($pp['pp_price'] - $pp['pp_receipt_price']) == 0) {
if ($pp['pp_receipt_price'] && ($pp['pp_settle_case'] == '무통장' || $pp['pp_settle_case'] == '가상계좌' || $pp['pp_settle_case'] == '계좌이체')) {
if ($is_cash_receipt && ($pp['pp_price'] - $pp['pp_receipt_price']) == 0) {
if ($pp['pp_receipt_price'] && ($pp['pp_settle_case'] == '무통장' || $pp['pp_settle_case'] == '가상계좌' || $pp['pp_settle_case'] == '계좌이체')) {
?>
<tr>
<th scope="row">현금영수증</th>
@ -223,7 +222,6 @@ if(!sql_query(" select pp_cash from {$g5['g5_shop_personalpay_table']} limit 1 "
</td>
</tr>
<?php
}
}
}
?>