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:
kagla
2014-01-16 14:11:10 +09:00
parent a0f6616f0d d5514bdcc7
commit f7175b4cc0
23 changed files with 138 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
adm/shop_admin/configform.php
View File

@ -727,7 +727,7 @@ if(!isset($default['de_root_index_use'])) {
<?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("^list.[0-9]+\.skin\.php", G5_SHOP_SKIN_PATH, $default['de_rel_list_skin']); ?>
<?php echo get_list_skin_options("^relation.[0-9]+\.skin\.php", G5_SHOP_SKIN_PATH, $default['de_rel_list_skin']); ?>
</select>
<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">

1
adm/shop_admin/itemeventlist.php
View File

@ -201,7 +201,6 @@ function fitemeventlistupdatecheck(f)
if (!f.ev_id.value)
{
alert('이벤트를 선택하세요');
document.flist.ev_id.focus();
return false;
}

5
adm/shop_admin/orderform.php
View File

@ -505,11 +505,6 @@ if(!sql_query(" select ad_addr3 from {$g5['g5_shop_order_address_table']} limit
<tbody>
<?php if ($od['od_settle_case'] == '무통장' || $od['od_settle_case'] == '가상계좌' || $od['od_settle_case'] == '계좌이체') { ########## 시작?>
<?php
// 주문서
$sql = " select * from {$g5['g5_shop_order_table']} where od_id = '$od_id' ";
$result = sql_query($sql);
$od = sql_fetch_array($result);
if ($od['od_settle_case'] == '무통장')
{
// 은행계좌를 배열로 만든후