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:
gnuboard
2013-11-06 18:28:25 +09:00
parent 0aef005641 669492d7ae
commit ff520bb6df
12 changed files with 164 additions and 204 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
shop/mail/ordermail.mail.php
View File

@ -123,7 +123,7 @@ $ft_a_st = 'display:block;padding:30px 0;background:#484848;color:#fff;text-alig
<tbody>
<tr>
<th scope="row" style="<?php echo $th_st; ?>">배송회사</th>
<td style="<?php echo $td_st; ?>"><a href="<?php echo $delivery_list['dl_url']; ?>" target="_blank" style="text-decoration:none"><?php echo $delivery_list['dl_company']; ?></a></td>
<td style="<?php echo $td_st; ?>"><?php echo $delivery_list['dl_company']; ?></td>
</tr>
<tr>
<th scope="row" style="<?php echo $th_st; ?>">운송장번호</th>
@ -133,10 +133,6 @@ $ft_a_st = 'display:block;padding:30px 0;background:#484848;color:#fff;text-alig
<th scope="row" style="<?php echo $th_st; ?>">배송일시</th>
<td style="<?php echo $td_st; ?>"><?php echo $delivery_list['od_invoice_time']; ?></td>
</tr>
<tr>
<th scope="row" style="<?php echo $th_st; ?>">대표전화</th>
<td style="<?php echo $td_st; ?>"><?php echo $delivery_list['dl_tel']; ?></td>
</tr>
</tbody>
</table>
<?php } ?>

6
shop/orderformupdate.php
View File

@ -270,6 +270,10 @@ if ($od_settle_case == "무통장")
$od_receipt_point = $i_temp_point;
$od_receipt_price = 0;
$od_misu = $i_price - $od_receipt_price;
if($od_misu == 0) {
$od_status = '입금';
$od_receipt_time = G5_TIME_YMDHIS;
}
}
else if ($od_settle_case == "계좌이체")
{
@ -537,7 +541,7 @@ if($config['cf_sms_use'] && ($default['de_sms_use2'] || $default['de_sms_use3'])
include_once(G5_LIB_PATH.'/icode.sms.lib.php');
$SMS = new SMS; // SMS 연결
$SMS->SMS_con($config'cf_icode_server_ip'], $config['cf_icode_id'], $config['cf_icode_pw'], $config['cf_icode_server_port']);
$SMS->SMS_con($config['cf_icode_server_ip'], $config['cf_icode_id'], $config['cf_icode_pw'], $config['cf_icode_server_port']);
$sms_count = 0;
for($s=0; $s<count($sms_contents); $s++) {

24
shop/orderinquiryview.php
View File

@ -460,19 +460,12 @@ if(openwin != null) {
</colgroup>
<tbody>
<?php
// 배송회사 정보
$dl = sql_fetch(" select * from {$g5['g5_shop_delivery_table']} where dl_id = '{$od['dl_id']}' ");
if ($od['od_invoice'] || !$od['misu'])
if ($od['od_invoice'] && $od['od_delivery_company'])
{
if (is_array($dl))
{
// get 으로 날리는 경우 운송장번호를 넘김
if (strpos($dl['dl_url'], "=")) $invoice = $od['od_invoice'];
?>
<tr>
<th scope="row">배송회사</th>
<td><?php echo $dl['dl_company']; ?> [<a href="<?php echo $dl['dl_url'].$invoice; ?>" target="_blank">배송조회하기</a>]</td>
<td><?php echo $od['od_delivery_company']; ?></td>
</tr>
<tr>
<th scope="row">운송장번호</th>
@ -482,20 +475,15 @@ if(openwin != null) {
<th scope="row">배송일시</th>
<td><?php echo $od['od_invoice_time']; ?></td>
</tr>
<tr>
<th>고객센터 전화</th>
<td><?php echo $dl['dl_tel']; ?></td>
</tr>
<?php
}
else
{
}
else
{
?>
<tr>
<td class="empty_table">아직 배송하지 않았거나 배송정보를 입력하지 못하였습니다.</td>
</tr>
<?php
}
}
?>
</tbody>
@ -555,7 +543,7 @@ if(openwin != null) {
<?php } ?>
</section>
<?php if ($od['od_settle_case'] == '가상계좌' && $default['de_card_test'] && $is_admin) {
<?php if ($od['od_settle_case'] == '가상계좌' && $od['od_misu'] > 0 && $default['de_card_test'] && $is_admin) {
preg_match("/\s{1}([^\s]+)\s?/", $od['od_bank_account'], $matchs);
$deposit_no = trim($matchs[1]);
?>