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:
chicpro
2013-05-29 10:14:47 +09:00
parent e0bb9069bd 155e51e4b5
commit cde7b14bdb
5 changed files with 18 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
adm/shop_admin/itemsellrank.php
View File

@ -105,6 +105,7 @@ if ($fr_date || $to_date) // 검색렬일 때만 처음 버튼을 보여줌
<div id="btn_add">
<a href="./itemlist.php" class="btn_add_optional">상품등록</a>
<a href="./itemstocklist.php" class="btn_add_optional">상품재고관리</a>
<a href="./optionstocklist.php" class="btn_add_optional">상품옵션재고관리</a>
</div>
<table>

2
adm/shop_admin/itemstocklist.php
View File

@ -161,7 +161,7 @@ if ($search) // 검색 결과일 때만 처음 버튼을 보여줌
<td class="td_num"><input type="text" name="it_stock_qty[<?php echo $i; ?>]" value="<?php echo $row['it_stock_qty']; ?>" class="frm_input" size="10" autocomplete="off"></td>
<td class="td_chk"><input type="checkbox" name="it_use[<?php echo $i; ?>]" value="1" <?php echo ($row['it_use'] ? "checked" : ""); ?>></td>
<td class="td_smallmng"><a href="./itemform.php?w=u&amp;it_id=<?php echo $row['it_id']; ?>&amp;ca_id=<?php echo $row['ca_id']; ?>&amp;<?php echo $qstr; ?>">수정</a></td>
</tr><tr>
</tr>
<?php
}
if (!$i)

16
adm/shop_admin/optionstocklist.php
View File

@ -149,7 +149,7 @@ if ($search) // 검색 결과일 때만 처음 버튼을 보여줌
$temporary_qty = $row['io_stock_qty'] - $wait_qty;
$option = '';
$nbsp = '';
$option_br = '';
if($row['io_type']) {
$opt = explode(chr(30), $row['io_id']);
if($opt[0] && $opt[1])
@ -159,8 +159,8 @@ if ($search) // 검색 결과일 때만 처음 버튼을 보여줌
$opt = explode(chr(30), $row['io_id']);
for($k=0; $k<count($subj); $k++) {
if($subj[$k] && $opt[$k]) {
$option .= $nbsp.$subj[$k].' : '.$opt[$k];
$nbsp = '&nbsp;';
$option .= $option_br.$subj[$k].' : '.$opt[$k];
$option_br = '<br>';
}
}
}
@ -171,21 +171,21 @@ if ($search) // 검색 결과일 때만 처음 버튼을 보여줌
?>
<tr>
<td class="td_bignum">
<td>
<input type="hidden" name="it_id[<?php echo $i; ?>]" value="<?php echo $row['it_id']; ?>">
<input type="hidden" name="io_id[<?php echo $i; ?>]" value="<?php echo $row['io_id']; ?>">
<input type="hidden" name="io_type[<?php echo $i; ?>]" value="<?php echo $row['io_type']; ?>">
<a href="<?php echo $href; ?>"><?php echo get_it_image($row['it_id'], 50, 50); ?><?php echo cut_str(stripslashes($row['it_name']), 60, "&#133"); ?></a>
</td>
<td><?php echo $option; ?></td>
<td><?php echo $type; ?></td>
<td class="grid_3"><?php echo $option; ?></td>
<td class="td_mng"><?php echo $type; ?></td>
<td class="td_num"><?php echo number_format($row['io_stock_qty']); ?></td>
<td class="td_num"><?php echo number_format($wait_qty); ?></td>
<td class="td_num"><?php echo number_format($temporary_qty); ?></td>
<td class="td_num"><input type="text" name="io_stock_qty[<?php echo $i; ?>]" value="<?php echo $row['io_stock_qty']; ?>" class="frm_input" size="10" autocomplete="off"></td>
<td class="td_num"><input type="text" name="io_stock_qty[<?php echo $i; ?>]" value="<?php echo $row['io_stock_qty']; ?>" class="frm_input" size="8" autocomplete="off"></td>
<td class="td_chk"><input type="checkbox" name="io_use[<?php echo $i; ?>]" value="1" <?php echo ($row['io_use'] ? "checked" : ""); ?>></td>
<td class="td_smallmng"><a href="./itemform.php?w=u&amp;it_id=<?php echo $row['it_id']; ?>&amp;ca_id=<?php echo $row['ca_id']; ?>&amp;<?php echo $qstr; ?>">수정</a></td>
</tr><tr>
</tr>
<?php
}
if (!$i)

6
shop/ordermail1.inc.php
View File

@ -40,10 +40,12 @@ for ($i=0; $row=sql_fetch_array($result); $i++)
$result2 = sql_query($sql2);
$options = '';
$options_ul = ' style="margin:0;padding:0"'; // ul style
$options_li = ' style="padding:5px 0;list-style:none"'; // li style
for($k=0; $row2=sql_fetch_array($result2); $k++) {
if($k == 0)
$options .= '<ul>'.PHP_EOL;
$options .= '<li>'.$row2['ct_option'].' '.$row2['ct_qty'].'개</li>'.PHP_EOL;
$options .= '<ul'.$options_ul.'>'.PHP_EOL;
$options .= '<li'.$options_li.'>'.$row2['ct_option'].' '.$row2['ct_qty'].'개</li>'.PHP_EOL;
}
if($k > 0)

6
shop/ordermail2.inc.php
View File

@ -54,10 +54,12 @@ for ($i=0; $row=sql_fetch_array($result); $i++)
$result2 = sql_query($sql2);
$options = '';
$options_ul = ' style="margin:0;padding:0"'; // ul style
$options_li = ' style="padding:5px 0;list-style:none"'; // li style
for($k=0; $row2=sql_fetch_array($result2); $k++) {
if($k == 0)
$options .= '<ul>'.PHP_EOL;
$options .= '<li>'.$row2['ct_option'].' '.$row2['ct_qty'].'개</li>'.PHP_EOL;
$options .= '<ul'.$options_ul.'>'.PHP_EOL;
$options .= '<li'.$options_li.'>'.$row2['ct_option'].' '.$row2['ct_qty'].'개</li>'.PHP_EOL;
}
if($k > 0)