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

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

Browse Source
This commit is contained in:
whitedot
2014-01-24 10:29:22 +09:00
parent a32f5de14f 084275bbce
commit e2b62a5dd7
34 changed files with 166 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
shop/_head.php
View File

@ -1,4 +1,8 @@
<?php
if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
include_once(G5_SHOP_PATH.'/shop.head.php');
if(G5_IS_MOBILE)
include_once(G5_MSHOP_PATH.'/shop.head.php');
else
include_once(G5_SHOP_PATH.'/shop.head.php');
?>

6
shop/_tail.php
View File

@ -1,4 +1,8 @@
<?php
if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
include_once(G5_SHOP_PATH.'/shop.tail.php');
if(G5_IS_MOBILE)
include_once(G5_MSHOP_PATH.'/shop.tail.php');
else
include_once(G5_SHOP_PATH.'/shop.tail.php');
?>

3
shop/index.php
View File

@ -8,9 +8,6 @@ if (G5_IS_MOBILE) {
define("_INDEX_", TRUE);
include_once(G5_LIB_PATH.'/latest.lib.php');
include_once(G5_LIB_PATH.'/poll.lib.php');
include_once(G5_SHOP_PATH.'/shop.head.php');
?>

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

@ -37,11 +37,11 @@ $ft_a_st = 'display:block;padding:30px 0;background:#484848;color:#fff;text-alig
</tr>
<thead>
<tbody>
<?php for ($i=0; $i<count($cart_list); $i++) { ?>
<?php for ($h=0; $h<count($cart_list); $h++) { ?>
<tr>
<td style="<?php echo $td_st; ?>"><a href="<?php echo G5_SHOP_URL; ?>/item.php?it_id=<?php echo $cart_list[$i]['it_id']; ?>" target="_blank" style="text-decoration:none"><?php echo $cart_list[$i]['it_name']; ?></a></td>
<td style="<?php echo $td_st; ?>;text-align:center"><?php echo $cart_list[$i]['it_opt']; ?></td>
<td style="<?php echo $td_st; ?>;text-align:center"><?php echo $cart_list[$i]['ct_status']; ?></td>
<td style="<?php echo $td_st; ?>"><a href="<?php echo G5_SHOP_URL; ?>/item.php?it_id=<?php echo $cart_list[$h]['it_id']; ?>" target="_blank" style="text-decoration:none"><?php echo $cart_list[$h]['it_name']; ?></a></td>
<td style="<?php echo $td_st; ?>;text-align:center"><?php echo $cart_list[$h]['it_opt']; ?></td>
<td style="<?php echo $td_st; ?>;text-align:center"><?php echo $cart_list[$h]['ct_status']; ?></td>
</tr>
<?php } // end for ?>
</tbody>

8
shop/mail/orderupdate1.mail.php
View File

@ -40,14 +40,14 @@ $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; ?>"><a href="<?php echo G5_SHOP_URL.'/item.php?it_id='.$list[$i]['it_id']; ?>" target="_blank" style="text-decoration:none"><span style="display:inline-block;vertical-align:middle"><?php echo $list[$i]['it_simg']; ?></span> <?php echo $list[$i]['it_name']; ?></a></td>
</tr>
<tr>
<th scope="row" style="<?php echo $th_st; ?>">선택옵션 </th>
<td style="<?php echo $td_st; ?>"><?php echo $list[$i]['it_opt']; ?></td>
</tr>
<tr>
<th scope="row" style="<?php echo $th_st; ?>">판매가격</th>
<td style="<?php echo $td_st; ?>"><?php echo display_price($list[$i]['ct_price']); ?></td>
</tr>
<tr>
<th scope="row" style="<?php echo $th_st; ?>">선택옵션 </th>
<td style="<?php echo $td_st; ?>"><?php echo $list[$i]['it_opt']; ?></td>
</tr>
<tr>
<th scope="row" style="<?php echo $th_st; ?>">소계</th>
<td style="<?php echo $td_st; ?>"><?php echo display_price($list[$i]['stotal_price']); ?></td>

8
shop/mail/orderupdate2.mail.php
View File

@ -40,14 +40,14 @@ $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; ?>"><a href="<?php echo G5_SHOP_URL.'/item.php?it_id='.$list[$i]['it_id']; ?>" target="_blank" style="text-decoration:none"><span style="display:inline-block;vertical-align:middle"><?php echo $list[$i]['it_simg']; ?></span> <?php echo $list[$i]['it_name']; ?></a></td>
</tr>
<tr>
<th scope="row" style="<?php echo $th_st; ?>">선택옵션 </th>
<td style="<?php echo $td_st; ?>"><?php echo $list[$i]['it_opt']; ?></td>
</tr>
<tr>
<th scope="row" style="<?php echo $th_st; ?>">판매가격</th>
<td style="<?php echo $td_st; ?>"><?php echo display_price($list[$i]['ct_price']); ?></td>
</tr>
<tr>
<th scope="row" style="<?php echo $th_st; ?>">선택옵션 </th>
<td style="<?php echo $td_st; ?>"><?php echo $list[$i]['it_opt']; ?></td>
</tr>
<tr>
<th scope="row" style="<?php echo $th_st; ?>">소계</th>
<td style="<?php echo $td_st; ?>"><?php echo display_price($list[$i]['stotal_price']); ?></td>

8
shop/mail/orderupdate3.mail.php
View File

@ -39,14 +39,14 @@ $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; ?>"><a href="<?php echo G5_SHOP_URL.'/item.php?it_id='.$list[$i]['it_id']; ?>" target="_blank" style="text-decoration:none"><span style="display:inline-block;vertical-align:middle"><?php echo $list[$i]['it_simg']; ?></span> <?php echo $list[$i]['it_name']; ?></a></td>
</tr>
<tr>
<th scope="row" style="<?php echo $th_st; ?>">선택옵션 </th>
<td style="<?php echo $td_st; ?>"><?php echo $list[$i]['it_opt']; ?></td>
</tr>
<tr>
<th scope="row" style="<?php echo $th_st; ?>">판매가격</th>
<td style="<?php echo $td_st; ?>"><?php echo display_price($list[$i]['ct_price']); ?></td>
</tr>
<tr>
<th scope="row" style="<?php echo $th_st; ?>">선택옵션 </th>
<td style="<?php echo $td_st; ?>"><?php echo $list[$i]['it_opt']; ?></td>
</tr>
</tbody>
</table>

2
shop/orderform.php
View File

@ -539,6 +539,8 @@ function get_intall_file()
※ 해당 은행을 결제창에서 보이게 합니다.(은행코드는 매뉴얼을 참조) */
?>
<input type="hidden" name="kcp_noint" value="<?php echo ($default['de_card_noint_use'] ? '' : 'N'); ?>">
<?php
if($default['de_tax_flag_use']) {
/* KCP는 과세상품과 비과세상품을 동시에 판매하는 업체들의 결제관리에 대한 편의성을 제공해드리고자,

7
shop/ordermail1.inc.php
View File

@ -36,7 +36,7 @@ for ($i=0; $row=sql_fetch_array($result); $i++)
$sum = sql_fetch($sql);
// 옵션정보
$sql2 = " select ct_option, ct_qty
$sql2 = " select ct_option, ct_qty, io_price
from {$g5['g5_shop_cart_table']}
where it_id = '{$row['it_id']}' and od_id = '$od_id' and ct_select = '1'
order by io_type asc, ct_id asc ";
@ -48,7 +48,10 @@ for ($i=0; $row=sql_fetch_array($result); $i++)
for($k=0; $row2=sql_fetch_array($result2); $k++) {
if($k == 0)
$options .= '<ul'.$options_ul.'>'.PHP_EOL;
$options .= '<li'.$options_li.'>'.$row2['ct_option'].' '.$row2['ct_qty'].'개</li>'.PHP_EOL;
$price_plus = '';
if($row2['io_price'] >= 0)
$price_plus = '+';
$options .= '<li'.$options_li.'>'.$row2['ct_option'].' ('.$price_plus.display_price($row2['io_price']).') '.$row2['ct_qty'].'개</li>'.PHP_EOL;
}
if($k > 0)

7
shop/ordermail2.inc.php
View File

@ -57,7 +57,7 @@ for ($i=0; $row=sql_fetch_array($result); $i++)
$sum = sql_fetch($sql);
// 옵션정보
$sql2 = " select ct_option, ct_qty
$sql2 = " select ct_option, ct_qty, io_price
from {$g5['g5_shop_cart_table']}
where it_id = '{$row['it_id']}' and od_id = '$od_id' and ct_select = '1'
order by io_type asc, ct_id asc ";
@ -69,7 +69,10 @@ for ($i=0; $row=sql_fetch_array($result); $i++)
for($k=0; $row2=sql_fetch_array($result2); $k++) {
if($k == 0)
$options .= '<ul'.$options_ul.'>'.PHP_EOL;
$options .= '<li'.$options_li.'>'.$row2['ct_option'].' '.$row2['ct_qty'].'개</li>'.PHP_EOL;
$price_plus = '';
if($row2['io_price'] >= 0)
$price_plus = '+';
$options .= '<li'.$options_li.'>'.$row2['ct_option'].' ('.$price_plus.display_price($row2['io_price']).') '.$row2['ct_qty'].'개</li>'.PHP_EOL;
}
if($k > 0)

1
shop/shop.head.php
View File

@ -7,6 +7,7 @@ include_once(G5_LIB_PATH.'/poll.lib.php');
include_once(G5_LIB_PATH.'/visit.lib.php');
include_once(G5_LIB_PATH.'/connect.lib.php');
include_once(G5_LIB_PATH.'/popular.lib.php');
include_once(G5_LIB_PATH.'/latest.lib.php');
?>
<!-- 상단 시작 { -->