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-10-14 10:23:51 +09:00
parent 298f01d2a0 5052e4e0f0
commit a1d85c358c
14 changed files with 546 additions and 480 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
adm/shop_admin/coupontarget.php
View File

@ -31,7 +31,7 @@ if($_GET['sch_target'] == 1) {
} else {
$sql_common = " from {$g5['g5_shop_item_table']} ";
$sql_where = " where it_use = '1' ";
if($GET['sch_word'])
if($_GET['sch_word'])
$sql_where .= " and it_name like '%$sch_word%' ";
$sql_select = " select it_id as t_id, it_name as t_name ";
$sql_order = " order by it_name ";

7
adm/shop_admin/orderform.php
View File

@ -176,6 +176,7 @@ $pg_anchor = '<ul class="anchor">
$ct_point['소계'] = $opt['ct_point'] * $opt['ct_qty'];
?>
<tr>
<?php if($k == 0) { ?>
<td rowspan="<?php echo $rowspan; ?>">
<a href="./itemform.php?w=u&amp;it_id=<?php echo $row['it_id']; ?>"><?php echo $image; ?> <?php echo stripslashes($row['it_name']); ?></a>
<?php if($od['od_tax_flag'] && $row['ct_notax']) echo '[비과세상품]'; ?>
@ -184,9 +185,10 @@ $pg_anchor = '<ul class="anchor">
<label for="sit_sel_<?php echo $i; ?>" class="sound_only"><?php echo $row['it_name']; ?> 옵션 전체선택</label>
<input type="checkbox" id="sit_sel_<?php echo $i; ?>" name="it_sel[]">
</td>
<?php } ?>
<td>
<label for="ct_opt_chk_<?php echo $chk_cnt; ?>" class="sound_only"><?php echo $opt['ct_option']; ?></label>
<input type="checkbox" name="ct_chk[<?php echo $chk_cnt; ?>]" id="ct_chk_<?php echo $chk_cnt; ?>" value="<?php echo $chk_cnt; ?>">
<input type="checkbox" name="ct_chk[<?php echo $chk_cnt; ?>]" id="ct_chk_<?php echo $chk_cnt; ?>" value="<?php echo $chk_cnt; ?>" class="sct_sel_<?php echo $i; ?>">
<input type="hidden" name="ct_id[<?php echo $chk_cnt; ?>]" value="<?php echo $opt['ct_id']; ?>">
<?php echo $opt['ct_option']; ?>
</td>
@ -862,7 +864,8 @@ $(function() {
// 상품의 옵션선택
$("input[name='it_sel[]']").click(function() {
var $chk = $(this).closest("li").find("input[name^=ct_chk]");
var cls = $(this).attr("id").replace("sit_", "sct_");
var $chk = $("input[name^=ct_chk]."+cls);
if($(this).is(":checked"))
$chk.attr("checked", true);
else