Merge branch 'master' of github.com:gnuboard/yc5

This commit is contained in:
chicpro
2013-10-17 17:38:35 +09:00
5 changed files with 68 additions and 39 deletions

View File

@ -1056,18 +1056,19 @@ function byte_check(el_cont, el_byte)
<section id="scf_sms_pre">
<h3>사전에 정의된 SMS프리셋</h3>
<dl>
<dt>회원가입시</dt>
<dd>{이름} {회원아이디} {회사명}</dd>
<dt>주문서작성</dt>
<dd>{이름} {보낸분} {받는분} {주문번호} {주문금액} {회사명}</dd>
<dt>입금확인시</dt>
<dd>{이름} {입금액} {주문번호} {회사명}</dd>
<dt>상품배송시</dt>
<dd>{이름} {택배회사} {운송장번호} {주문번호} {회사명}</dd>
</dl>
<p><?php echo help('주의! 80 bytes 까지만 전송됩니다. (영문 한글자 : 1byte , 한글 한글자 : 2bytes , 특수문자의 경우 1 또는 2 bytes 임)'); ?></p>
<div class="local_desc01 local_desc">
<dl>
<dt>회원가입시</dt>
<dd>{이름} {회원아이디} {회사명}</dd>
<dt>주문서작성</dt>
<dd>{이름} {보낸분} {받는분} {주문번호} {주문금액} {회사명}</dd>
<dt>입금확인시</dt>
<dd>{이름} {입금액} {주문번호} {회사명}</dd>
<dt>상품배송시</dt>
<dd>{이름} {택배회사} {운송장번호} {주문번호} {회사명}</dd>
</dl>
<p><?php echo help('주의! 80 bytes 까지만 전송됩니다. (영문 한글자 : 1byte , 한글 한글자 : 2bytes , 특수문자의 경우 1 또는 2 bytes 임)'); ?></p>
</div>
<div id="scf_sms">
<?php

View File

@ -27,7 +27,7 @@ if ($search != "") {
}
}
$sql_search .= " $where od_status = '배송' ";
$sql_search .= " $where od_status in ('준비', '배송') ";
if ($sel_ca_id != "") {
$sql_search .= " $where ca_id like '$sel_ca_id%' ";

View File

@ -21,31 +21,31 @@ $pg_anchor = '<ul class="anchor">
<?php echo $pg_anchor; ?>
<div class="local_desc01 local_desc">
<p>
<ul>
<?php
$sql = " select count(*) as cnt from {$g5['g5_shop_order_table']} where od_status = '주문' ";
$row = sql_fetch($sql);
echo "<a href=\"./orderlist.php?od_status=주문\">주문 : ".$row['cnt']."</a>";
echo "<li><a href=\"./orderlist.php?od_status=주문\">주문 : ".$row['cnt']."</a></li>";
?>
<?php
$sql = " select count(*) as cnt from {$g5['g5_shop_order_table']} where od_status = '입금' ";
$row = sql_fetch($sql);
echo "입금 : ".$row['cnt'];
echo "<li><a href=\"./orderlist.php?od_status=입금\">입금 : ".$row['cnt']."</a></li>";
?>
<?php
$sql = " select count(*) as cnt from {$g5['g5_shop_order_table']} where od_status = '준비' ";
$row = sql_fetch($sql);
echo "준비 : ".$row['cnt'];
echo "<li><a href=\"./orderlist.php?od_status=준비\">준비 : ".$row['cnt']."</a></li>";
?>
<?php
$sql = " select count(*) as cnt from {$g5['g5_shop_order_table']} where od_status = '배송' ";
$row = sql_fetch($sql);
echo "배송 : ".$row['cnt'];
echo "<li><a href=\"./orderlist.php?od_status=배송\">배송 : ".$row['cnt']."</a></li>";
?>
</p>
</ul>
</div>
</section>

View File

@ -139,16 +139,18 @@ $listall = '<a href="'.$_SERVER['PHP_SELF'].'" class="ov_listall">전체목록</
<form class="local_sch02 local_sch">
<div>
<strong>주문상태</strong>
<input type="radio" name="od_status" value="" id="od_status01" <?php echo get_checked($od_status, ''); ?>>
<label for="od_status01">전체</label>
<input type="radio" name="od_status" value="주문" id="od_status02" <?php echo get_checked($od_status, '주문'); ?>>
<label for="od_status02">주문</label>
<input type="radio" name="od_status" value="입금" id="od_status03" <?php echo get_checked($od_status, '입금'); ?>>
<label for="od_status03">입금</label>
<input type="radio" name="od_status" value="배송" id="od_status04" <?php echo get_checked($od_status, '배송'); ?>>
<label for="od_status04">배송</label>
<input type="radio" name="od_status" value="완료" id="od_status05" <?php echo get_checked($od_status, '완료'); ?>>
<label for="od_status05">완료</label>
<input type="radio" name="od_status" value="" id="od_status_all" <?php echo get_checked($od_status, ''); ?>>
<label for="od_status_all">전체</label>
<input type="radio" name="od_status" value="주문" id="od_status_odr" <?php echo get_checked($od_status, '주문'); ?>>
<label for="od_status_odr">주문</label>
<input type="radio" name="od_status" value="입금" id="od_status_income" <?php echo get_checked($od_status, '입금'); ?>>
<label for="od_status_income">입금</label>
<input type="radio" name="od_status" value="준비" id="od_status_rdy" <?php echo get_checked($od_status, '준비'); ?>>
<label for="od_status_rdy">준비</label>
<input type="radio" name="od_status" value="배송" id="od_status_dvr" <?php echo get_checked($od_status, '배송'); ?>>
<label for="od_status_dvr">배송</label>
<input type="radio" name="od_status" value="완료" id="od_status_done" <?php echo get_checked($od_status, '완료'); ?>>
<label for="od_status_done">완료</label>
</div>
<div>
@ -333,7 +335,7 @@ $listall = '<a href="'.$_SERVER['PHP_SELF'].'" class="ov_listall">전체목록</
<option value="입금">입금</option>
<option value="준비">준비</option>
<option value="배송">배송</option>
<option value="완료">완료</option>
<!-- <option value="완료">완료</option> -->
</select>
<input type="submit" value="선택수정" class="btn_submit" onclick="document.pressed=this.value">
</div>
@ -341,6 +343,7 @@ $listall = '<a href="'.$_SERVER['PHP_SELF'].'" class="ov_listall">전체목록</
<div class="local_desc01 local_desc">
<p>
&lt;무통장&gt;인 경우에만 &lt;주문&gt;에서 &lt;입금&gt;으로 변경됩니다. 가상계좌는 입금시 자동으로 &lt;입금&gt;처리됩니다.<br>
&lt;준비&gt;에서 &lt;배송&gt;으로 변경된 주문은 배송관리에서 배송정보 입력과 &lt;완료&gt;처리를 해주시기 바랍니다.<br>
<strong>주의!</strong> 주문번호를 클릭하여 나오는 주문상세내역의 주소를 외부에서 조회가 가능한곳에 올리지 마십시오.
</p>
</div>
@ -406,12 +409,37 @@ function forderlist_submit(f)
}
var chk = document.getElementsByName("chk[]");
for (var i=0; i<chk.length; i++) {
if (chk[i].checked) {
for (var i=0; i<chk.length; i++)
{
if (chk[i].checked)
{
var k = chk[i].value;
if (!(f.elements['current_settle_case['+k+']'].value == "무통장" && f.od_status.value == "입금")) {
alert("무통장의 경우에만 입금 처리 가능합니다.");
return false;
var current_settle_case = f.elements['current_settle_case['+k+']'].value;
var current_status = f.elements['current_status['+k+']'].value;
var change_status = f.od_status.value;
switch (change_status)
{
case "입금" :
if (!(current_status == "주문" && current_settle_case == "무통장")) {
alert("주문상태의 '무통장'(결제수단)인 경우에만 입금 처리 가능합니다.");
return false;
}
break;
case "준비" :
if (current_status != "입금") {
alert("입금상태의 주문만 '준비'로 변경이 가능합니다.");
return false;
}
break;
case "배송" :
if (current_status != "준비") {
alert("준비상태의 주문만 '배송'으로 변경이 가능합니다.");
return false;
}
break;
}
}
}

View File

@ -26,6 +26,7 @@ a:focus, a:hover, a:active {text-decoration:underline}
h1 {margin:0 0 10px;padding:0 20px 10px;border-bottom:1px solid #e9e9e9;color:#333;font-size:1.5em;font-family:dotum;letter-spacing:-0.1em}
h2 {margin:0 0 10px;padding:0 20px;font-size:1.2em}
h2.h2_frm {padding-top:15px}
h3 {margin:0 20px}
/* 레이아웃 */
#hd {z-index:10;background:url('../adm/img/hd_bg.jpg') #383b3f repeat-x}
@ -413,13 +414,12 @@ td.td_grpset {width:160px;border-left:1px solid #e9ecee;text-align:center}
.scf_img {display:none}
#scf_sms_pre h3 {padding:10px 0 0}
#scf_sms_pre dl {margin:10px 0 0;zoom:1}
#scf_sms_pre h3 {padding:10px 0}
#scf_sms_pre dl {margin:0 0 10px;zoom:1}
#scf_sms_pre dl:after {display:block;visibility:hidden;clear:both;content:""}
#scf_sms_pre dt {clear:both;float:left;padding:5px 0;width:100px}
#scf_sms_pre dd {padding:5px 0;overflow:hidden}
#scf_sms_pre p {margin:0 0 20px}
#scf_sms {margin:0 0 30px;zoom:1}
#scf_sms {margin:0 20px 30px;padding:20px 0 0;zoom:1}
#scf_sms:after {display:block;visibility:hidden;clear:both;content:""}
.scf_sms_box {float:left;margin:0 8px 0 9px;width:163px;text-align:center}
.scf_sms_box h4 {margin:0 0 5px}