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 
Conflicts:
	shop/search.php
This commit is contained in:
gnuboard
2013-11-08 18:08:24 +09:00
parent 02fc807576 f13964c6ec
commit 9ea339a648
27 changed files with 187 additions and 371 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
adm/admin.menu400.shop_1of2.php
View File

@ -17,7 +17,6 @@ $menu['menu400'] = array (
array('400500', '상품옵션재고관리', G5_ADMIN_URL.'/shop_admin/optionstocklist.php', 'scf_item_option'),
array('400650', '쿠폰관리', G5_ADMIN_URL.'/shop_admin/couponlist.php', 'scf_coupon'),
array('400500', '배송일괄처리', G5_ADMIN_URL.'/shop_admin/deliverylist.php', 'scf_deli', 1),
//array('400740', '배송업체관리', G5_ADMIN_URL.'/shop_admin/deliverycodelist.php', 'scf_deli_co', 1),
array('400750', '추가배송비관리', G5_ADMIN_URL.'/shop_admin/sendcostlist.php', 'scf_sendcost', 1)
);
?>

18
adm/shop_admin/categorylist.php
View File

@ -184,22 +184,12 @@ $listall = '<a href="'.$_SERVER['PHP_SELF'].'" class="ov_listall">전체목록</
<label for="ca_use<?php echo $i; ?>">판매</label>
</td>
<td class="td_confirm">
<input type="checkbox" name="ca_hp_cert_use[<?php echo $i; ?>]" value="1" id="ca_hp_cert_use_yes<?php echo $i; ?>" <?php if($row['ca_hp_cert_use']) echo 'checked="checked"'; ?>>
<label for="ca_hp_cert_use_yes<?php echo $i; ?>">사용</label>
<!-- <input type="radio" name="ca_hp_cert_use[<?php echo $i; ?>]" value="1" id="ca_hp_cert_use_yes<?php echo $i; ?>" <?php if($row['ca_hp_cert_use']) echo 'checked="checked"'; ?>>
<label for="ca_hp_cert_use_yes<?php echo $i; ?>">사용함</label>
<input type="radio" name="ca_hp_cert_use[<?php echo $i; ?>]" value="0" id="ca_hp_cert_use_no<?php echo $i; ?>" <?php if(!$row['ca_hp_cert_use']) echo 'checked="checked"'; ?>>
<label for="ca_hp_cert_use_no<?php echo $i; ?>">사용안함</label> -->
<input type="checkbox" name="ca_cert_use[<?php echo $i; ?>]" value="1" id="ca_cert_use_yes<?php echo $i; ?>" <?php if($row['ca_cert_use']) echo 'checked="checked"'; ?>>
<label for="ca_cert_use_yes<?php echo $i; ?>">사용</label>
</td>
<td class="td_confirm">
<input type="checkbox" name="ca_adult_cert_use[<?php echo $i; ?>]" value="1" id="ca_adult_cert_use_yes<?php echo $i; ?>" <?php if($row['ca_adult_cert_use']) echo 'checked="checked"'; ?>>
<label for="ca_adult_cert_use_yes<?php echo $i; ?>">사용</label>
<!-- <input type="radio" name="ca_adult_cert_use[<?php echo $i; ?>]" value="1" id="ca_adult_cert_use_yes<?php echo $i; ?>" <?php if($row['ca_adult_cert_use']) echo 'checked="checked"'; ?>>
<label for="ca_adult_cert_use_yes<?php echo $i; ?>">사용함</label>
<input type="radio" name="ca_adult_cert_use[<?php echo $i; ?>]" value="0" id="ca_adult_cert_use_no<?php echo $i; ?>" <?php if(!$row['ca_adult_cert_use']) echo 'checked="checked"'; ?>>
<label for="ca_adult_cert_use_no<?php echo $i; ?>">사용안함</label> -->
<input type="checkbox" name="ca_adult_use[<?php echo $i; ?>]" value="1" id="ca_adult_use_yes<?php echo $i; ?>" <?php if($row['ca_adult_use']) echo 'checked="checked"'; ?>>
<label for="ca_adult_use_yes<?php echo $i; ?>">사용</label>
</td>
<td class="td_imgline">
<label for="ca_imgline_num<?php echo $i; ?>" class="sound_only">이미지 줄 수</label>

4
adm/shop_admin/categorylistupdate.php
View File

@ -21,12 +21,12 @@ for ($i=0; $i<count($_POST['ca_id']); $i++)
ca_mb_id = '{$_POST['ca_mb_id'][$i]}',
ca_img_width = '{$_POST['ca_img_width'][$i]}',
ca_list_mod = '{$_POST['ca_list_mod'][$i]}',
ca_hp_cert_use = '{$_POST['ca_hp_cert_use'][$i]}',
ca_cert_use = '{$_POST['ca_cert_use'][$i]}',
ca_use = '{$_POST['ca_use'][$i]}',
ca_skin = '{$_POST['ca_skin'][$i]}',
ca_img_height = '{$_POST['ca_img_height'][$i]}',
ca_list_row = '{$_POST['ca_list_row'][$i]}',
ca_adult_cert_use = '{$_POST['ca_adult_cert_use'][$i]}',
ca_adult_use = '{$_POST['ca_adult_use'][$i]}',
ca_stock_qty = '{$_POST['ca_stock_qty'][$i]}'
where ca_id = '{$_POST['ca_id'][$i]}' ";
sql_query($sql);

85
adm/shop_admin/deliverycodeform.php
View File

@ -1,85 +0,0 @@
<?php
$sub_menu = '400740';
include_once('./_common.php');
auth_check($auth[$sub_menu], "w");
$html_title = '배송업체';
$g5['title'] = $html_title;
if ($w == "u") {
$html_title .= ' 수정';
$readonly = ' readonly';
$sql = " select * from {$g5['g5_shop_delivery_table']} where dl_id = '$dl_id' ";
$dl = sql_fetch($sql);
if (!$dl['dl_id']) alert('등록된 자료가 없습니다.');
}
else
{
$html_title .= ' 입력';
$dl['dl_url'] = "http://";
}
include_once (G5_ADMIN_PATH.'/admin.head.php');
?>
<form name="fdeliverycodeform" action="./deliverycodeformupdate.php" method="post">
<input type="hidden" name="w" value="<?php echo $w; ?>">
<input type="hidden" name="dl_id" value="<?php echo $dl_id; ?>">
<div class="tbl_frm01 tbl_wrap">
<table>
<caption><?php echo $g5['title']; ?></caption>
<colgroup>
<col class="grid_4">
<col>
</colgroup>
<tbody>
<tr>
<th scope="row"><label for="dl_company">배송업체명</label></th>
<td>
<input type="text" name="dl_company" value="<?php echo stripslashes($dl['dl_company']); ?>" id="dl_company" required class="frm_input">
</td>
</tr>
<tr>
<th scope="row"><label for="dl_url">화물추적 URL</label></th>
<td>
<input type="text" class="frm_input" name="dl_url" value="<?php echo stripslashes($dl['dl_url']); ?>" id="dl_url" size="100">
</td>
</tr>
<tr>
<th scope="row"><label for="dl_tel">고객센터 전화</label></th>
<td>
<input type="text" class="frm_input" name="dl_tel" value="<?php echo stripslashes($dl['dl_tel']); ?>" id="dl_tel">
</td>
</tr>
<tr>
<th scope="row"><label for="dl_order">출력 순서</label></th>
<td>
<?php echo help("셀렉트박스에서 출력할 때 순서를 정합니다.\n\n숫자가 작을수록 상단에 출력합니다."); ?>
<?php echo order_select("dl_order", $dl['dl_order']); ?>
</td>
</tr>
<tr>
<th scope="row"><label for="dl_default">기본 배송업체</label></th>
<td>
<?php echo help("기본 배송업체로 선택하면 셀렉트박스에서 이 배송업체가 기본으로 노출됩니다."); ?>
<input type="checkbox" name="dl_default" value="1" id="dl_default" <?php echo get_checked($dl['dl_default'], '1'); ?>>
<label for="dl_default">기본 배송업체로 선택합니다.</label>
</td>
</tr>
</tbody>
</table>
</div>
<div class="btn_confirm01 btn_confirm">
<input type="submit" value="확인" class="btn_submit" accesskey="s">
<a href="./deliverycodelist.php">목록</a>
</div>
</form>
<?php
include_once (G5_ADMIN_PATH.'/admin.tail.php');
?>

46
adm/shop_admin/deliverycodeformupdate.php
View File

@ -1,46 +0,0 @@
<?php
$sub_menu = '400740';
include_once('./_common.php');
if ($w == "u" || $w == "d")
check_demo();
if ($W == 'd')
auth_check($auth[$sub_menu], "d");
else
auth_check($auth[$sub_menu], "w");
// 기본 배송업체가 선택 되었다면 추가나 수정시 기본 배송업체를 모두 삭제한다.
if ($dl_default && ($w == "" || $w == "u")) {
sql_query(" update {$g5['g5_shop_delivery_table']} set dl_default = 0 ");
}
$sql_common .= "set dl_company = '$dl_company',
dl_url = '$dl_url',
dl_tel = '$dl_tel',
dl_order = '$dl_order',
dl_default = '$dl_default' ";
if ($w == "") {
$sql = " alter table {$g5['g5_shop_delivery_table']} auto_increment=1 ";
sql_query($sql);
$sql = " insert {$g5['g5_shop_delivery_table']} $sql_common ";
sql_query($sql);
$dl_id = mysql_insert_id();
} else if ($w == "u") {
$sql = " update {$g5['g5_shop_delivery_table']} $sql_common where dl_id = '$dl_id' ";
sql_query($sql);
} else if ($w == "d") {
// Master 삭제
$sql = " delete from {$g5['g5_shop_delivery_table']} where dl_id = '$dl_id' ";
sql_query($sql);
}
if ($w == 'd') {
goto_url("./deliverycodelist.php");
} else {
goto_url("./deliverycodeform.php?w=u&amp;dl_id=$dl_id");
}
?>

67
adm/shop_admin/deliverycodelist.php
View File

@ -1,67 +0,0 @@
<?php
$sub_menu = '400740';
include_once('./_common.php');
auth_check($auth[$sub_menu], "r");
$g5['title'] = '배송업체관리';
include_once (G5_ADMIN_PATH.'/admin.head.php');
$sql_common = " from {$g5['g5_shop_delivery_table']} ";
// 테이블의 전체 레코드수만 얻음
$sql = " select count(*) as cnt " . $sql_common;
$row = sql_fetch($sql);
$total_count = $row['cnt'];
$sql = "select * $sql_common order by dl_order , dl_id desc ";
$result = sql_query($sql);
?>
<div class="local_ov01 local_ov">
<?php echo $total_count; ?>개 업체 등록됨
</div>
<div class="btn_add01 btn_add">
<a href="./deliverycodeform.php">배송회사추가</a>
</div>
<div class="tbl_head01 tbl_wrap">
<table>
<caption><?php echo $g5['title']; ?> 목록</caption>
<thead>
<tr>
<th scope="col">ID</th>
<th scope="col">배송회사명</th>
<th scope="col">고객센터</th>
<th scope="col">기본<span class="sound_only"> 배송지</span></th>
<th scope="col">순서</th>
<th scope="col">관리</th>
</tr>
</thead>
<tbody>
<?php for ($i=0; $row=mysql_fetch_array($result); $i++) { ?>
<tr>
<td class="td_num"><?php echo $row['dl_id']; ?></td>
<td><?php echo stripslashes($row['dl_company']); ?></td>
<td class="td_numbig"><?php echo $row['dl_tel']; ?></td>
<td class="td_mngsmall"><?php echo ($row['dl_default']?"예":""); ?></td>
<td class="td_num"><?php echo $row['dl_order']; ?></td>
<td class="td_mng">
<a href="<?php echo $row['dl_url']; ?>" target="_blank"><span class="sound_only"><?php echo stripslashes($row['dl_company']); ?> </span>사이트</a>
<a href="./deliverycodeform.php?w=u&amp;dl_id=<?php echo $row['dl_id']; ?>"><span class="sound_only"><?php echo stripslashes($row['dl_company']); ?> </span>수정</a>
<a href="./deliverycodeformupdate.php?w=d&amp;dl_id=<?php echo $row['dl_id']; ?>" onclick="return delete_confirm();"><span class="sound_only"><?php echo stripslashes($row['dl_company']); ?> </span>삭제</a>
</td>
</tr>
<?php
}
if ($i == 0)
echo '<tr><td colspan="5" class="empty_table">자료가 없습니다.</td></tr>';
?>
</tbody>
</table>
</div>
<?php
include_once (G5_ADMIN_PATH.'/admin.tail.php');
?>

BIN
adm/shop_admin/img/escrow_bg.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 120 B

BIN
adm/shop_admin/img/escrow_bg2.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 120 B

BIN
adm/shop_admin/img/qnb_sit.jpg
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.3 KiB

BIN
adm/shop_admin/img/qnb_sodr.jpg
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.3 KiB

BIN
adm/shop_admin/img/qnb_sps.jpg
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.2 KiB

BIN
adm/shop_admin/img/qnb_sqna.jpg
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.3 KiB

BIN
adm/shop_admin/img/tnb_shome.jpg
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.9 KiB

BIN
adm/shop_admin/img/tnb_shome_cf.jpg
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.0 KiB

8
adm/shop_admin/orderlist.php
View File

@ -360,10 +360,6 @@ $listall = '<a href="'.$_SERVER['PHP_SELF'].'" class="ov_listall">전체목록</
<?php } else { ?>
-
<?php } ?>
<!-- <label for="dl_id_<?php echo $i; ?>" class="sound_only">배송업체</label>
<select name="dl_id[<?php echo $i; ?>]" id="dl_id_<?php echo $i; ?>">
<?php echo conv_selected_option($delivery_options, $row['dl_id']?$row['dl_id']:$delivery_default); ?>
</select> -->
</td>
<td headers="th_delidate">
<?php if ($od_status == '준비') { ?>
@ -430,9 +426,9 @@ $listall = '<a href="'.$_SERVER['PHP_SELF'].'" class="ov_listall">전체목록</
<?php } ?>
</div>
<div class="local_desc01 local_desc">
<div class="local_desc02 local_desc">
<p>
&lt;에스크로&gt;주문의 경우 리스트의 배경색이 다르게 표시됩니다.<br>
&lt;에스크로&gt;주문의 경우 리스트의 배경색이 다르게 표시됩니다. <img src="<?php echo G5_ADMIN_URL; ?>/shop_admin/img/escrow_bg.png" alt=""> or <img src="<?php echo G5_ADMIN_URL; ?>/shop_admin/img/escrow_bg2.png" alt=""><br>
&lt;무통장&gt;인 경우에만 &lt;주문&gt;에서 &lt;입금&gt;으로 변경됩니다. 가상계좌는 입금시 자동으로 &lt;입금&gt;처리됩니다.<br>
&lt;준비&gt;에서 &lt;배송&gt;으로 변경시 &lt;에스크로배송등록&gt;을 체크하시면 에스크로 주문에 한해 KCP에 배송정보가 자동 등록됩니다.<br>
<strong>주의!</strong> 주문번호를 클릭하여 나오는 주문상세내역의 주소를 외부에서 조회가 가능한곳에 올리지 마십시오.

6
adm/shop_admin/ordersms.inc.php
View File

@ -25,13 +25,11 @@ if ($config['cf_sms_use']) {
if ($od_sms_baesong_check)
{
if ($dl_id && $od_invoice)
if ($od_delivery_company && $od_invoice)
{
$sms_contents = $default['de_sms_cont5'];
$sms_contents = preg_replace("/{이름}/", $od_name, $sms_contents);
$sql = " select dl_company from {$g5['g5_shop_delivery_table']} where dl_id = '$dl_id' ";
$row = sql_fetch($sql);
$sms_contents = preg_replace("/{택배회사}/", $row['dl_company'], $sms_contents);
$sms_contents = preg_replace("/{택배회사}/", $od_delivery_company, $sms_contents);
$sms_contents = preg_replace("/{운송장번호}/", $od_invoice, $sms_contents);
$sms_contents = preg_replace("/{주문번호}/", $od_id, $sms_contents);
$sms_contents = preg_replace("/{회사명}/", $default['de_admin_company_name'], $sms_contents);