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-08-09 16:28:35 +09:00
parent 5ff1899796 26350ad0b1
commit 8ec4779661
8 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
adm/shop_admin/item_copy.php → adm/shop_admin/itemcopy.php
View File

@ -22,7 +22,7 @@ include_once(G4_PATH.'/head.sub.php');
</table>
<div class="btn_confirm">
<input type="button" value="복사하기" class="btn_submit" onclick="_copy('item_copy_update.php?it_id=<?php echo $it_id; ?>&amp;ca_id=<?php echo $ca_id; ?>');">
<input type="button" value="복사하기" class="btn_submit" onclick="_copy('itemcopyupdate.php?it_id=<?php echo $it_id; ?>&amp;ca_id=<?php echo $ca_id; ?>');">
<button type="button" onclick="self.close();">창닫기</button>
</div>

0
adm/shop_admin/item_copy_update.php → adm/shop_admin/itemcopyupdate.php
View File

7
adm/shop_admin/itemform.php
View File

@ -212,6 +212,13 @@ $pg_anchor ='<ul class="anchor">
<input type="text" name="it_name" value="<?php echo get_text(cut_str($it['it_name'], 250, "")); ?>" id="it_name" required class="frm_input required" size="95">
</td>
</tr>
<tr>
<th scope="row"><label for="it_mobile_name">모바일 상품명</label></th>
<td colspan="2">
<?php echo help("모바일에서 보여지는 상품명이 다른 경우에 입력합니다. 입력이 없으면 기본 상품명이 출력됩니다."); ?>
<input type="text" name="it_mobile_name" value="<?php echo get_text(cut_str($it['it_mobile_name'], 250, "")); ?>" id="it_mobile_name" required class="frm_input">
</td>
</tr>
<tr>
<th scope="row"><label for="it_gallery">전시용 상품</label></th>
<td>

1
adm/shop_admin/itemformupdate.php
View File

@ -260,6 +260,7 @@ $sql_common = " ca_id = '$ca_id',
ca_id2 = '$ca_id2',
ca_id3 = '$ca_id3',
it_name = '$it_name',
it_mobile_name = '$it_mobile_name',
it_gallery = '$it_gallery',
it_maker = '$it_maker',
it_origin = '$it_origin',

7
adm/shop_admin/itemlist.php
View File

@ -199,7 +199,8 @@ if ($sfl || $stx) // 검색렬일 때만 처음 버튼을 보여줌
<?php echo conv_selected_option($ca_list, $row['ca_id']); ?>
</select>
<?php echo $tmp_ca_list; ?><br>
<input type="text" name="it_name[<?php echo $i; ?>]" value="<?php echo htmlspecialchars2(cut_str($row['it_name'],250, "")); ?>" required class="frm_input frm_sit_title required" size="30">
<input type="text" name="it_name[<?php echo $i; ?>]" value="<?php echo htmlspecialchars2(cut_str($row['it_name'],250, "")); ?>" required class="frm_input frm_sit_title required" size="30"><br>
<input type="text" name="it_mobile_name[<?php echo $i; ?>]" value="<?php echo htmlspecialchars2(cut_str($row['it_mobile_name'],250, "")); ?>" class="frm_input frm_sit_title" size="30">
</td>
<td headers="sit_amt"><input type="text" name="it_price[<?php echo $i; ?>]" value="<?php echo $row['it_price']; ?>" class="frm_input sit_amt" size="7"></td>
<td headers="sit_camt"><input type="text" name="it_cust_price[<?php echo $i; ?>]" value="<?php echo $row['it_cust_price']; ?>" class="frm_input sit_camt" size="7"></td>
@ -208,7 +209,7 @@ if ($sfl || $stx) // 검색렬일 때만 처음 버튼을 보여줌
<td rowspan="2"><?php echo $row['it_hit']; ?></td>
<td rowspan="2" class="td_mng">
<a href="<?php echo $href; ?>"><span class="sound_only"><?php echo htmlspecialchars2(cut_str($row['it_name'],250, "")); ?> </span>보기</a>
<a href="./item_copy.php?it_id=<?php echo $row['it_id']; ?>&amp;ca_id=<?php echo $row['ca_id']; ?>" class="item_copy" target="_blank"><span class="sound_only"><?php echo htmlspecialchars2(cut_str($row['it_name'],250, "")); ?> </span>복사</a>
<a href="./itemcopy.php?it_id=<?php echo $row['it_id']; ?>&amp;ca_id=<?php echo $row['ca_id']; ?>" class="itemcopy" target="_blank"><span class="sound_only"><?php echo htmlspecialchars2(cut_str($row['it_name'],250, "")); ?> </span>복사</a>
<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; ?>"><span class="sound_only"><?php echo htmlspecialchars2(cut_str($row['it_name'],250, "")); ?> </span>수정</a>
<!-- <a href="./itemformupdate.php?w=d&amp;it_id=<?php echo $row['it_id']; ?>&amp;ca_id=<?php echo $row['ca_id']; ?>&amp;<?php echo $qstr; ?>" onclick="return delete_confirm();"><span class="sound_only"><?php echo htmlspecialchars2(cut_str($row['it_name'],250, "")); ?> </span>삭제</a> -->
</td>
@ -258,7 +259,7 @@ function fitemlist_submit(f)
}
$(function() {
$(".item_copy").click(function() {
$(".itemcopy").click(function() {
var href = $(this).attr("href");
window.open(href, "copywin", "left=100, top=100, width=300, height=200, scrollbars=0");
return false;

1
adm/shop_admin/itemlistupdate.php
View File

@ -20,6 +20,7 @@ if ($_POST['act_button'] == "선택수정") {
$sql = "update {$g4['shop_item_table']}
set ca_id = '{$_POST['ca_id'][$k]}',
it_name = '{$_POST['it_name'][$k]}',
it_mobile_name = '{$_POST['it_mobile_name'][$k]}',
it_cust_price = '{$_POST['it_cust_price'][$k]}',
it_price = '{$_POST['it_price'][$k]}',
it_point = '{$_POST['it_point'][$k]}',

1
install/shop.sql
View File

@ -398,6 +398,7 @@ CREATE TABLE IF NOT EXISTS `shop_item` (
`ca_id2` varchar(255) NOT NULL DEFAULT '',
`ca_id3` varchar(255) NOT NULL DEFAULT '',
`it_name` varchar(255) NOT NULL DEFAULT '',
`it_mobile_name` varchar(255) NOT NULL DEFAULT '',
`it_gallery` tinyint(4) NOT NULL DEFAULT '0',
`it_maker` varchar(255) NOT NULL DEFAULT '',
`it_origin` varchar(255) NOT NULL DEFAULT '',

6
mobile/skin/shop/basic/main.10.skin.php
View File

@ -38,7 +38,11 @@ for ($i=1; $row=sql_fetch_array($result); $i++) {
}
if ($this->view_it_name) {
echo "<b>".stripslashes($row['it_name'])."</b>\n";
$it_name = $row['it_name'];
if ($this->is_mobile && $row['it_mobile_name']) {
$it_name = $row['it_mobile_name'];
}
echo "<b>".stripslashes($it_name)."</b>\n";
}
if ($this->view_it_cust_price) {