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:
whitedot
2014-02-07 14:28:00 +09:00
parent 76254e5b1b d4f0c9b274
commit 8d47f1334c
17 changed files with 80 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
adm/shop_admin/itemform.php
View File

@ -582,7 +582,7 @@ $(function(){
<th scope="row">상품선택옵션</th>
<td colspan="2">
<div class="sit_option tbl_frm01">
<?php echo help('옵션항목은 콤마(,) 로 구분하여 여러개를 입력할 수 있습니다. 예시) 라지,미디움,스몰'); ?>
<?php echo help('옵션항목은 콤마(,) 로 구분하여 여러개를 입력할 수 있습니다. 예시) 라지,미디움,스몰<br><strong>옵션명과 옵션항목에 따옴표(\', ")는 입력할 수 없습니다.</strong>'); ?>
<table>
<caption>상품선택옵션 입력</caption>
<colgroup>
@ -740,7 +740,7 @@ $(function(){
<th scope="row">상품추가옵션</th>
<td colspan="2">
<div id="sit_supply_frm" class="sit_option tbl_frm01">
<?php echo help('옵션항목은 콤마(,) 로 구분하여 여러개를 입력할 수 있습니다. 예시) 라지,미디움,스몰'); ?>
<?php echo help('옵션항목은 콤마(,) 로 구분하여 여러개를 입력할 수 있습니다. 예시) 라지,미디움,스몰<br><strong>옵션명과 옵션항목에 따옴표(\', ")는 입력할 수 없습니다.</strong>'); ?>
<table>
<caption>상품추가옵션 입력</caption>
<colgroup>
@ -1013,6 +1013,13 @@ $(function(){
$(function() {
<?php
switch($it['it_sc_type']) {
case 1:
echo '$("#sc_con_method").hide();'.PHP_EOL;
echo '$("#sc_con_basic").hide();'.PHP_EOL;
echo '$("#sc_con_minimum").hide();'.PHP_EOL;
echo '$("#sc_con_qty").hide();'.PHP_EOL;
echo '$("#sc_grp").attr("rowspan","1");'.PHP_EOL;
break;
case 2:
echo '$("#sc_con_method").show();'.PHP_EOL;
echo '$("#sc_con_basic").show();'.PHP_EOL;
@ -1035,11 +1042,11 @@ $(function(){
echo '$("#sc_grp").attr("rowspan","4");'.PHP_EOL;
break;
default:
echo '$("#sc_con_method").hide();'.PHP_EOL;
echo '$("#sc_con_method").show();'.PHP_EOL;
echo '$("#sc_con_basic").hide();'.PHP_EOL;
echo '$("#sc_con_minimum").hide();'.PHP_EOL;
echo '$("#sc_con_qty").hide();'.PHP_EOL;
echo '$("#sc_grp").attr("rowspan","1");'.PHP_EOL;
echo '$("#sc_grp").attr("rowspan","2");'.PHP_EOL;
break;
}
?>
@ -1047,6 +1054,13 @@ $(function(){
var type = $(this).val();
switch(type) {
case "1":
$("#sc_con_method").hide();
$("#sc_con_basic").hide();
$("#sc_con_minimum").hide();
$("#sc_con_qty").hide();
$("#sc_grp").attr("rowspan","1");
break;
case "2":
$("#sc_con_method").show();
$("#sc_con_basic").show();
@ -1069,11 +1083,11 @@ $(function(){
$("#sc_grp").attr("rowspan","4");
break;
default:
$("#sc_con_method").hide();
$("#sc_con_method").show();
$("#sc_con_basic").hide();
$("#sc_con_minimum").hide();
$("#sc_con_qty").hide();
$("#sc_grp").attr("rowspan","1");
$("#sc_grp").attr("rowspan","2");
break;
}
});

12
adm/shop_admin/itemoption.php
View File

@ -14,13 +14,13 @@ if($it['it_id']) {
if(mysql_num_rows($result))
$po_run = true;
} else if(!empty($_POST)) {
$opt1_subject = trim($_POST['opt1_subject']);
$opt2_subject = trim($_POST['opt2_subject']);
$opt3_subject = trim($_POST['opt3_subject']);
$opt1_subject = preg_replace('/[\'\"]/', '', trim(stripslashes($_POST['opt1_subject'])));
$opt2_subject = preg_replace('/[\'\"]/', '', trim(stripslashes($_POST['opt2_subject'])));
$opt3_subject = preg_replace('/[\'\"]/', '', trim(stripslashes($_POST['opt3_subject'])));
$opt1_val = trim($_POST['opt1']);
$opt2_val = trim($_POST['opt2']);
$opt3_val = trim($_POST['opt3']);
$opt1_val = preg_replace('/[\'\"]/', '', trim(stripslashes($_POST['opt1'])));
$opt2_val = preg_replace('/[\'\"]/', '', trim(stripslashes($_POST['opt2'])));
$opt3_val = preg_replace('/[\'\"]/', '', trim(stripslashes($_POST['opt3'])));
if(!$opt1_subject || !$opt1_val) {
echo '옵션1과 옵션1 항목을 입력해 주십시오.';

6
adm/shop_admin/itemsupply.php
View File

@ -84,12 +84,12 @@ if($ps_run) {
} // for
} else {
for($i=0; $i<$subject_count; $i++) {
$spl_subject = trim($_POST['subject'][$i]);
$spl_val = explode(',', trim($_POST['supply'][$i]));
$spl_subject = preg_replace('/[\'\"]/', '', trim(stripslashes($_POST['subject'][$i])));
$spl_val = explode(',', preg_replace('/[\'\"]/', '', trim(stripslashes($_POST['supply'][$i]))));
$spl_count = count($spl_val);
for($j=0; $j<$spl_count; $j++) {
$spl = trim($spl_val[$j]);
$spl = strip_tags(trim($spl_val[$j]));
if($spl_subject && $spl) {
$spl_id = $spl_subject.chr(30).$spl;
$spl_price = 0;