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
2013-11-08 10:50:01 +09:00
parent b5d34a263f eb494a31b8
commit 49c58e06b1
11 changed files with 58 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
adm/shop_admin/configform.php
View File

@ -228,10 +228,10 @@ $pg_anchor = '<ul class="anchor">
<select name="de_type1_list_skin" id="de_type1_list_skin">
<?php echo get_list_skin_options("^main.[0-9]+\.skin\.php", G5_SHOP_SKIN_PATH, $default['de_type1_list_skin']); ?>
</select>
<label for="de_type1_list_row">출력할 줄 수</label>
<input type="text" name="de_type1_list_row" value="<?php echo $default['de_type1_list_row']; ?>" id="de_type1_list_row" class="frm_input" size="3">
<label for="de_type1_list_mod">1줄당 이미지 수</label>
<input type="text" name="de_type1_list_mod" value="<?php echo $default['de_type1_list_mod']; ?>" id="de_type1_list_mod" class="frm_input" size="3">
<label for="de_type1_list_row">출력할 줄 수</label>
<input type="text" name="de_type1_list_row" value="<?php echo $default['de_type1_list_row']; ?>" id="de_type1_list_row" class="frm_input" size="3">
<label for="de_type1_img_width">이미지 폭</label>
<input type="text" name="de_type1_img_width" value="<?php echo $default['de_type1_img_width']; ?>" id="de_type1_img_width" class="frm_input" size="3">
<label for="de_type1_img_height">이미지 높이</label>
@ -247,10 +247,10 @@ $pg_anchor = '<ul class="anchor">
<select name="de_type2_list_skin" id="de_type2_list_skin">
<?php echo get_list_skin_options("^main.[0-9]+\.skin\.php", G5_SHOP_SKIN_PATH, $default['de_type2_list_skin']); ?>
</select>
<label for="de_type2_list_row">출력할 줄 수</label>
<input type="text" name="de_type2_list_row" value="<?php echo $default['de_type2_list_row']; ?>" id="de_type2_list_row" class="frm_input" size="3">
<label for="de_type2_list_mod">1줄당 이미지 수</label>
<input type="text" name="de_type2_list_mod" value="<?php echo $default['de_type2_list_mod']; ?>" id="de_type2_list_mod" class="frm_input" size="3">
<label for="de_type2_list_row">출력할 줄 수</label>
<input type="text" name="de_type2_list_row" value="<?php echo $default['de_type2_list_row']; ?>" id="de_type2_list_row" class="frm_input" size="3">
<label for="de_type2_img_width">이미지 폭</label>
<input type="text" name="de_type2_img_width" value="<?php echo $default['de_type2_img_width']; ?>" id="de_type2_img_width" class="frm_input" size="3">
<label for="de_type2_img_height">이미지 높이</label>
@ -266,10 +266,10 @@ $pg_anchor = '<ul class="anchor">
<select name="de_type3_list_skin" id="de_type3_list_skin">
<?php echo get_list_skin_options("^main.[0-9]+\.skin\.php", G5_SHOP_SKIN_PATH, $default['de_type3_list_skin']); ?>
</select>
<label for="de_type3_list_row">출력할 줄 수</label>
<input type="text" name="de_type3_list_row" value="<?php echo $default['de_type3_list_row']; ?>" id="de_type3_list_row" class="frm_input" size="3">
<label for="de_type3_list_mod">1줄당 이미지 수</label>
<input type="text" name="de_type3_list_mod" value="<?php echo $default['de_type3_list_mod']; ?>" id="de_type3_list_mod" class="frm_input" size="3">
<label for="de_type3_list_row">출력할 줄 수</label>
<input type="text" name="de_type3_list_row" value="<?php echo $default['de_type3_list_row']; ?>" id="de_type3_list_row" class="frm_input" size="3">
<label for="de_type3_img_width">이미지 폭</label>
<input type="text" name="de_type3_img_width" value="<?php echo $default['de_type3_img_width']; ?>" id="de_type3_img_width" class="frm_input" size="3">
<label for="de_type3_img_height">이미지 높이</label>
@ -285,10 +285,10 @@ $pg_anchor = '<ul class="anchor">
<select name="de_type4_list_skin" id="de_type4_list_skin">
<?php echo get_list_skin_options("^main.[0-9]+\.skin\.php", G5_SHOP_SKIN_PATH, $default['de_type4_list_skin']); ?>
</select>
<label for="de_type4_list_row">출력할 줄 수</label>
<input type="text" name="de_type4_list_row" value="<?php echo $default['de_type4_list_row']; ?>" id="de_type4_list_row" class="frm_input" size="3">
<label for="de_type4_list_mod">1줄당 이미지 수</label>
<input type="text" name="de_type4_list_mod" value="<?php echo $default['de_type4_list_mod']; ?>" id="de_type4_list_mod" class="frm_input" size="3">
<label for="de_type4_list_row">출력할 줄 수</label>
<input type="text" name="de_type4_list_row" value="<?php echo $default['de_type4_list_row']; ?>" id="de_type4_list_row" class="frm_input" size="3">
<label for="de_type4_img_width">이미지 폭</label>
<input type="text" name="de_type4_img_width" value="<?php echo $default['de_type4_img_width']; ?>" id="de_type4_img_width" class="frm_input" size="3">
<label for="de_type4_img_height">이미지 높이</label>
@ -304,10 +304,10 @@ $pg_anchor = '<ul class="anchor">
<select name="de_type5_list_skin" id="de_type5_list_skin">
<?php echo get_list_skin_options("^main.[0-9]+\.skin\.php", G5_SHOP_SKIN_PATH, $default['de_type5_list_skin']); ?>
</select>
<label for="de_type5_list_row">출력할 줄 수</label>
<input type="text" name="de_type5_list_row" value="<?php echo $default['de_type5_list_row']; ?>" id="de_type5_list_row" class="frm_input" size="3">
<label for="de_type5_list_mod">1줄당 이미지 수</label>
<input type="text" name="de_type5_list_mod" value="<?php echo $default['de_type5_list_mod']; ?>" id="de_type5_list_mod" class="frm_input" size="3">
<label for="de_type5_list_row">출력할 줄 수</label>
<input type="text" name="de_type5_list_row" value="<?php echo $default['de_type5_list_row']; ?>" id="de_type5_list_row" class="frm_input" size="3">
<label for="de_type5_img_width">이미지 폭</label>
<input type="text" name="de_type5_img_width" value="<?php echo $default['de_type5_img_width']; ?>" id="de_type5_img_width" class="frm_input" size="3">
<label for="de_type5_img_height">이미지 높이</label>
@ -733,13 +733,36 @@ $pg_anchor = '<ul class="anchor">
<tr>
<th scope="row">관련상품출력</th>
<td>
<?php echo help(G5_SHOP_DIR.'/item.php 에서 스킨설정에서 설정된 스킨의 list.10.skin.php 를 include 하여 출력합니다.'); ?>
<?php echo help("관련상품의 경우 등록된 상품은 모두 출력하므로 '출력할 줄 수'는 설정하지 않습니다. 이미지높이를 0으로 설정하면 상품이미지를 이미지폭에 비례하여 생성합니다."); ?>
<label for="de_rel_list_skin">스킨</label>
<select name="de_rel_list_skin" id="de_rel_list_skin">
<?php echo get_list_skin_options("^main.[0-9]+\.skin\.php", G5_SHOP_SKIN_PATH, $default['de_rel_list_skin']); ?>
</select>
<label for="de_rel_list_mod">1줄당 이미지 수</label>
<input type="text" name="de_rel_list_mod" value="<?php echo $default['de_rel_list_mod']; ?>" id="de_rel_list_mod" class="frm_input" size="3">
<label for="de_rel_img_width">이미지폭</label>
<input type="text" name="de_rel_img_width" value="<?php echo $default['de_rel_img_width']; ?>" id="de_rel_img_width" class="frm_input" size="3">
<label for="de_rel_img_height">이미지높이</label>
<input type="text" name="de_rel_img_height" value="<?php echo $default['de_rel_img_height']; ?>" id="de_rel_img_height" class="frm_input" size="3">
<label for="de_rel_list_use">출력</label>
<input type="checkbox" name="de_rel_list_use" value="1" id="de_rel_list_use" <?php echo $default['de_rel_list_use']?"checked":""; ?>>
</td>
</tr>
<tr>
<th scope="row">검색상품출력</th>
<td>
<label for="de_search_list_skin">스킨</label>
<select name="de_search_list_skin" id="de_search_list_skin">
<?php echo get_list_skin_options("^main.[0-9]+\.skin\.php", G5_SHOP_SKIN_PATH, $default['de_search_list_skin']); ?>
</select>
<label for="de_search_list_mod">1줄당 이미지 수</label>
<input type="text" name="de_search_list_mod" value="<?php echo $default['de_search_list_mod']; ?>" id="de_search_list_mod" class="frm_input" size="3">
<label for="de_search_list_row">출력할 줄 수</label>
<input type="text" name="de_search_list_row" value="<?php echo $default['de_search_list_row']; ?>" id="de_search_list_row" class="frm_input" size="3">
<label for="de_search_img_width">이미지폭</label>
<input type="text" name="de_search_img_width" value="<?php echo $default['de_search_img_width']; ?>" id="de_search_img_width" class="frm_input" size="3">
<label for="de_search_img_height">이미지높이</label>
<input type="text" name="de_search_img_height" value="<?php echo $default['de_search_img_height']; ?>" id="de_search_img_height" class="frm_input" size="3">
</td>
</tr>
<tr>

7
adm/shop_admin/configformupdate.php
View File

@ -90,9 +90,16 @@ $sql = " update {$g5['g5_shop_default_table']}
de_mobile_type5_list_mod = '$de_mobile_type5_list_mod',
de_mobile_type5_img_width = '$de_mobile_type5_img_width',
de_mobile_type5_img_height = '$de_mobile_type5_img_height',
de_rel_list_use = '$de_rel_list_use',
de_rel_list_skin = '$de_rel_list_skin',
de_rel_list_mod = '$de_rel_list_mod',
de_rel_img_width = '$de_rel_img_width',
de_rel_img_height = '$de_rel_img_height',
de_search_list_skin = '$de_search_list_skin',
de_search_list_mod = '$de_search_list_mod',
de_search_list_row = '$de_search_list_row',
de_search_img_width = '$de_search_img_width',
de_search_img_height = '$de_search_img_height',
de_bank_use = '$de_bank_use',
de_bank_account = '$de_bank_account',
de_card_test = '$de_card_test',

2
adm/shop_admin/orderform.php
View File

@ -123,7 +123,7 @@ $result = sql_query($sql);
$image = get_it_image($row['it_id'], 50, 50);
// 상품의 옵션정보
$sql = " select ct_id, it_id, ct_price, ct_qty, ct_option, ct_status, cp_price, ct_stock_use, ct_point_use, ct_send_cost, io_type, io_price
$sql = " select ct_id, it_id, ct_price, ct_point, ct_qty, ct_option, ct_status, cp_price, ct_stock_use, ct_point_use, ct_send_cost, io_type, io_price
from {$g5['g5_shop_cart_table']}
where od_id = '{$od['od_id']}'
and it_id = '{$row['it_id']}'

4
css/default.css
View File

@ -43,8 +43,8 @@ a:hover, a:focus, a:active {color:#000;text-decoration:underline}
/* gnb js off */
#gnb {position:relative;margin:-1px 0 0;border-bottom:1px solid #c3c7c5;background:#f0f4f8}
#gnb h2 {position:absolute;font-size:0;line-height:0;overflow:hidden}
#gnb_1dul {margin:0 auto;padding:0;width:980px;zoom:1}
#gnb_1dul:after {display:block;visibility:hidden;clear:both;content:""}
#gnb #gnb_1dul {margin:0 auto !important;padding:0;width:980px;zoom:1}
#gnb #gnb_1dul:after {display:block;visibility:hidden;clear:both;content:""}
.gnb_1dli {z-index:10;clear:both;zoom:1}
.gnb_1dli:after {display:block;visibility:hidden;clear:both;content:""}
.gnb_1da {display:block;float:left;width:80px;height:35px;font-weight:bold;line-height:2.95em;text-decoration:none}

1
mobile/shop/shop.head.php
View File

@ -49,6 +49,7 @@ include_once(G5_LIB_PATH.'/popular.lib.php');
<li><a href="<?php echo G5_SHOP_URL; ?>/mypage.php">마이페이지</a></li>
<li><a href="<?php echo G5_SHOP_URL; ?>/cart.php">장바구니</a></li>
<li><a href="<?php echo G5_SHOP_URL; ?>/personalpay.php">개인결제</a></li>
<li><a href="<?php echo G5_BBS_URL; ?>/qalist.php">1:1문의</a></li>
<li><a href="<?php echo G5_URL; ?>/">커뮤니티</a></li>
</ul>

5
shop/list.php
View File

@ -6,10 +6,7 @@ if (G5_IS_MOBILE) {
return;
}
$sql = " select *
from {$g5['g5_shop_category_table']}
where ca_id = '$ca_id'
and ca_use = '1' ";
$sql = " select * from {$g5['g5_shop_category_table']} where ca_id = '$ca_id' and ca_use = '1' ";
$ca = sql_fetch($sql);
if (!$ca['ca_id'])
alert('등록된 분류가 없습니다.');

12
shop/search.php
View File

@ -93,18 +93,18 @@ $total_count = $row['cnt'];
<div>
<?php
// 리스트 유형별로 출력
$list_file = G5_SHOP_SKIN_PATH.'/'.G5_SHOP_SEARCH_SKIN;
$list_file = G5_SHOP_SKIN_PATH.'/'.$default['de_search_list_skin'];
if (file_exists($list_file)) {
// 총몇개 = 한줄에 몇개 * 몇줄
$items = 4 * 5;
$items = $default['de_search_list_mod'] * $default['de_search_list_row'];
// 페이지가 없으면 첫 페이지 (1 페이지)
if ($page == "") $page = 1;
// 시작 레코드 구함
$from_record = ($page - 1) * $items;
$list = new item_list(G5_SHOP_SEARCH_SKIN, G5_SHOP_SEARCH_MOD, G5_SHOP_SEARCH_ROW, $default['de_simg_width'], $default['de_simg_height']);
$list->set_query(" select * $sql_common $sql_where ");
$list = new item_list($default['de_search_list_skin'], $default['de_search_list_mod'], $default['de_search_list_row'], $default['de_search_img_width'], $default['de_search_img_height']);
$list->set_query(" select * $sql_common $sql_where limit $from_record, $items ");
$list->set_is_page(true);
$list->set_order_by($order_by);
$list->set_from_record($from_record);
@ -119,7 +119,9 @@ $total_count = $row['cnt'];
echo $list->run();
// where 된 전체 상품수
$total_count = $list->total_count;
$sql = " select count(*) as cnt $sql_common $sql_where ";
$row = sql_fetch($sql);
$total_count = $row['cnt'];
// 전체 페이지 계산
$total_page = ceil($total_count / $items);
}

1
shop/shop.head.php
View File

@ -81,6 +81,7 @@ include_once(G5_LIB_PATH.'/popular.lib.php');
<?php } ?>
<li><a href="<?php echo G5_SHOP_URL; ?>/mypage.php">마이페이지</a></li>
<li><a href="<?php echo G5_SHOP_URL; ?>/faq.php">FAQ</a></li>
<li><a href="<?php echo G5_BBS_URL; ?>/qalist.php">1:1문의</a></li>
<li><a href="<?php echo G5_SHOP_URL; ?>/personalpay.php">개인결제</a></li>
<li><a href="<?php echo G5_SHOP_URL; ?>/itemuselist.php">사용후기</a></li>
<li><a href="<?php echo G5_URL; ?>/">커뮤니티</a></li>

2
skin/shop/basic/item.form.skin.php
View File

@ -248,6 +248,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
<?php } // 전화문의가 아닐 경우 끝 ?>
<?php if ($it['it_use'] && !$it['it_tel_inq']) { ?>
<!-- 선택된 옵션 시작 { -->
<section id="sit_sel_option">
<h3>선택된 옵션</h3>
@ -284,7 +285,6 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
<!-- 총 구매액 -->
<div id="sit_tot_price"></div>
<?php if ($it['it_use']) { ?>
<ul id="sit_ov_btn">
<?php if (!$it['it_tel_inq']) { ?>
<li><input type="submit" onclick="document.pressed=this.value;" value="바로구매" id="sit_btn_buy"></li>

5
skin/shop/basic/item.info.skin.php
View File

@ -97,6 +97,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
<!-- } 교환/반품 끝 -->
<?php } ?>
<?php if ($default['de_rel_list_use']) { ?>
<!-- 관련상품 시작 { -->
<section id="sit_rel">
<h2>관련상품</h2>
@ -105,14 +106,14 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
<div class="sct_wrap">
<?php
$sql = " select b.* from {$g5['g5_shop_item_relation_table']} a left join {$g5['g5_shop_item_table']} b on (a.it_id2=b.it_id) where a.it_id = '{$it['it_id']}' and b.it_use='1' ";
$list = new item_list("relation.skin.php", $default['de_rel_list_mod'], 1, $default['de_rel_img_width'], $default['de_rel_img_height']);
$list = new item_list($default['de_rel_list_skin'], $default['de_rel_list_mod'], 0, $default['de_rel_img_width'], $default['de_rel_img_height']);
$list->set_query($sql);
echo $list->run();
?>
</div>
</section>
<!-- } 관련상품 끝 -->
<?php } ?>
<script>
$(window).on("load", function() {

75
skin/shop/basic/relation.skin.php
View File

@ -1,75 +0,0 @@
<?php
if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
?>
<link rel="stylesheet" href="<?php echo G5_SHOP_SKIN_URL; ?>/style.css">
<!-- 상품진열 10 시작 { -->
<?php
for ($i=1; $row=sql_fetch_array($result); $i++) {
if ($this->list_mod >= 2) { // 1줄 이미지 : 2개 이상
if ($i%$this->list_mod == 0) $sct_last = ' sct_last'; // 줄 마지막
else if ($i%$this->list_mod == 1) $sct_last = ' sct_clear'; // 줄 첫번째
else $sct_last = '';
} else { // 1줄 이미지 : 1개
$sct_last = ' sct_clear';
}
if ($i == 1) {
if ($this->css) {
echo "<ul class=\"{$this->css}\">\n";
} else {
echo "<ul class=\"sct sct_10\">\n";
}
}
echo "<li class=\"sct_li{$sct_last}\" style=\"width:{$this->img_width}px\">\n";
if ($this->href) {
echo "<a href=\"{$this->href}{$row['it_id']}\" class=\"sct_a\">\n";
}
if ($this->view_it_img) {
echo "<span class=\"sct_img\">".get_it_image($row['it_id'], $this->img_width, $this->img_height)."</span>\n";
}
if ($this->view_it_id) {
echo "<b>".stripslashes($row['it_id'])."</b>\n";
}
if ($this->view_it_name) {
echo "<b>".stripslashes($row['it_name'])."</b>\n";
}
if ($this->view_it_cust_price) {
echo "<span class=\"sct_cost\">".display_price($row['it_cust_price'])."</span>\n";
}
if ($this->view_it_price) {
echo "<span class=\"sct_cost\">".display_price(get_price($row), $row['it_tel_inq'])."</span>\n";
}
if ($this->view_it_icon) {
echo "<span class=\"sct_icon\">".item_icon($row)."</span>\n";
}
if ($this->href) {
echo "</a>\n";
}
if ($this->view_sns) {
echo "<div class=\"sct_sns\">";
echo get_sns_share_link('facebook', $sns_url, $sns_title, G5_SHOP_URL.'/img/sns_fb.png');
echo get_sns_share_link('twitter', $sns_url, $sns_title, G5_SHOP_URL.'/img/sns_twt.png');
echo get_sns_share_link('googleplus', $sns_url, $sns_title, G5_SHOP_URL.'/img/sns_goo.png');
echo "</div>\n";
}
echo "</li>\n";
}
if ($i > 1) echo "</ul>\n";
if($i == 1) echo "<p class=\"sct_noitem\">등록된 상품이 없습니다.</p>\n";
?>
<!-- } 상품진열 10 끝 -->