firstgarden/firstgarden-web-gnu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Activity

merge 충돌 처리

Browse Source
This commit is contained in:
whitedot
2013-10-11 17:58:58 +09:00
parent cc336f02fc 7cc386d7a8
commit bbd5174c6f
81 changed files with 787 additions and 2982 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
adm/board_form.php
View File

@ -61,7 +61,7 @@ if (!isset($board['bo_use_sns'])) {
}
}
$sql = " SHOW COLUMNS FROM `{$g5['board_table']}` WHERE field = 'bo_use_cert' ";
$sql = " SHOW COLUMNS FROM `{$g5['board_table']}` LIKE 'bo_use_cert' ";
$row = sql_fetch($sql);
if(strpos($row['Type'], 'hp-') === false) {
sql_query(" ALTER TABLE `{$g5['board_table']}` CHANGE `bo_use_cert` `bo_use_cert` ENUM('','cert','adult','hp-cert','hp-adult') NOT NULL DEFAULT '' ", false);
@ -535,7 +535,7 @@ $pg_anchor = '<ul class="anchor">
<input type="checkbox" name="bo_use_signature" value="1" id="bo_use_signature" <?php echo $board['bo_use_signature']?'checked':''; ?>>
사용
</td>
<td class="td_grpset">
<td class="group_setting">
<input type="checkbox" name="chk_grp_use_signature" value="1" id="chk_grp_use_signature">
<label for="chk_grp_use_signature">그룹적용</label>
<input type="checkbox" name="chk_all_use_signature" value="1" id="chk_all_use_signature">
@ -548,7 +548,7 @@ $pg_anchor = '<ul class="anchor">
<input type="checkbox" name="bo_use_ip_view" value="1" id="bo_use_ip_view" <?php echo $board['bo_use_ip_view']?'checked':''; ?>>
사용
</td>
<td class="td_grpset">
<td class="group_setting">
<input type="checkbox" name="chk_grp_use_ip_view" value="1" id="chk_grp_use_ip_view">
<label for="chk_grp_use_ip_view">그룹적용</label>
<input type="checkbox" name="chk_all_use_ip_view" value="1" id="chk_all_use_ip_view">
@ -562,7 +562,7 @@ $pg_anchor = '<ul class="anchor">
<input type="checkbox" name="bo_use_list_content" value="1" id="bo_use_list_content" <?php echo $board['bo_use_list_content']?'checked':''; ?>>
사용 (사용시 속도가 느려질 수 있습니다.)
</td>
<td class="td_grpset">
<td class="group_setting">
<input type="checkbox" name="chk_grp_use_list_content" value="1" id="chk_grp_use_list_content">
<label for="chk_grp_use_list_content">그룹적용</label>
<input type="checkbox" name="chk_all_use_list_content" value="1" id="chk_all_use_list_content">
@ -576,7 +576,7 @@ $pg_anchor = '<ul class="anchor">
<input type="checkbox" name="bo_use_list_file" value="1" id="bo_use_list_file" <?php echo $board['bo_use_list_file']?'checked':''; ?>>
사용 (사용시 속도가 느려질 수 있습니다.)
</td>
<td class="td_grpset">
<td class="group_setting">
<input type="checkbox" name="chk_grp_use_list_file" value="1" id="chk_grp_use_list_file">
<label for="chk_grp_use_list_file">그룹적용</label>
<input type="checkbox" name="chk_all_use_list_file" value="1" id="chk_all_use_list_file">
@ -589,7 +589,7 @@ $pg_anchor = '<ul class="anchor">
<input type="checkbox" name="bo_use_list_view" value="1" id="bo_use_list_view" <?php echo $board['bo_use_list_view']?'checked':''; ?>>
사용
</td>
<td class="td_grpset">
<td class="group_setting">
<input type="checkbox" name="chk_grp_use_list_view" value="1" id="chk_grp_use_list_view">
<label for="chk_grp_use_list_view">그룹적용</label>
<input type="checkbox" name="chk_all_use_list_view" value="1" id="chk_all_use_list_view">
@ -602,7 +602,7 @@ $pg_anchor = '<ul class="anchor">
<input type="checkbox" name="bo_use_email" value="1" id="bo_use_email" <?php echo $board['bo_use_email']?'checked':''; ?>>
사용
</td>
<td class="td_grpset">
<td class="group_setting">
<input type="checkbox" name="chk_grp_use_email" value="1" id="chk_grp_use_email">
<label for="chk_grp_use_email">그룹적용</label>
<input type="checkbox" name="chk_all_use_email" value="1" id="chk_all_use_email">
@ -625,7 +625,7 @@ $pg_anchor = '<ul class="anchor">
?>
</select>
</td>
<td class="td_grpset">
<td class="group_setting">
<input type="checkbox" name="chk_grp_use_cert" value="1" id="chk_grp_use_cert">
<label for="chk_grp_use_cert">그룹적용</label>
<input type="checkbox" name="chk_all_use_cert" value="1" id="chk_all_use_cert">
@ -638,7 +638,7 @@ $pg_anchor = '<ul class="anchor">
<?php echo help('게시물 한건당 업로드 할 수 있는 파일의 최대 개수 (0 은 파일첨부 사용하지 않음)') ?>
<input type="text" name="bo_upload_count" value="<?php echo $board['bo_upload_count'] ?>" id="bo_upload_count" required class="required numeric frm_input" size="4">
</td>
<td class="td_grpset">
<td class="group_setting">
<input type="checkbox" name="chk_grp_upload_count" value="1" id="chk_grp_upload_count">
<label for="chk_grp_upload_count">그룹적용</label>
<input type="checkbox" name="chk_all_upload_count" value="1" id="chk_all_upload_count">
@ -657,7 +657,7 @@ $pg_anchor = '<ul class="anchor">
<?php echo help('최대 '.ini_get("upload_max_filesize").' 이하 업로드 가능, 1 MB = 1,048,576 bytes') ?>
업로드 파일 한개당 <input type="text" name="bo_upload_size" value="<?php echo $board['bo_upload_size'] ?>" id="bo_upload_size" required class="required numeric frm_input" size="10"> bytes 이하
</td>
<td class="td_grpset">
<td class="group_setting">
<input type="checkbox" name="chk_grp_upload_size" value="1" id="chk_grp_upload_size">
<label for="chk_grp_upload_size">그룹적용</label>
<input type="checkbox" name="chk_all_upload_size" value="1" id="chk_all_upload_size">
@ -669,7 +669,7 @@ $pg_anchor = '<ul class="anchor">
<td>
<input type="checkbox" name="bo_use_file_content" value="1" id="bo_use_file_content" <?php echo $board['bo_use_file_content']?'checked':''; ?>>사용
</td>
<td class="td_grpset">
<td class="group_setting">
<input type="checkbox" name="chk_grp_use_file_content" value="1" id="chk_grp_use_file_content">
<label for="chk_grp_use_file_content">그룹적용</label>
<input type="checkbox" name="chk_all_use_file_content" value="1" id="chk_all_use_file_content">
@ -679,10 +679,10 @@ $pg_anchor = '<ul class="anchor">
<tr>
<th scope="row"><label for="bo_write_min">최소 글수 제한</label></th>
<td>
<?php echo help('글 입력시 최소 글자수를 설정. 0을 입력하면 검사하지 않음') ?>
<?php echo help('글 입력시 최소 글자수를 설정. 0을 입력하거나 최고관리자, DHTML 에디터 사용시에는 검사하지 않음') ?>
<input type="text" name="bo_write_min" value="<?php echo $board['bo_write_min'] ?>" id="bo_write_min" class="numeric frm_input" size="4">
</td>
<td class="td_grpset">
<td class="group_setting">
<input type="checkbox" name="chk_grp_write_min" value="1" id="chk_grp_write_min">
<label for="chk_grp_write_min">그룹적용</label>
<input type="checkbox" name="chk_all_write_min" value="1" id="chk_all_write_min">
@ -692,10 +692,10 @@ $pg_anchor = '<ul class="anchor">
<tr>
<th scope="row"><label for="bo_write_max">최대 글수 제한</label></th>
<td>
<?php echo help('글 입력시 최대 글자수를 설정. 0을 입력하면 검사하지 않음') ?>
<?php echo help('글 입력시 최대 글자수를 설정. 0을 입력하거나 최고관리자, DHTML 에디터 사용시에는 검사하지 않음') ?>
<input type="text" name="bo_write_max" value="<?php echo $board['bo_write_max'] ?>" id="bo_write_max" class="numeric frm_input" size="4">
</td>
<td class="td_grpset">
<td class="group_setting">
<input type="checkbox" name="chk_grp_write_max" value="1" id="chk_grp_write_max">
<label for="chk_grp_write_max">그룹적용</label>
<input type="checkbox" name="chk_all_write_max" value="1" id="chk_all_write_max">
@ -708,7 +708,7 @@ $pg_anchor = '<ul class="anchor">
<?php echo help('댓글 입력시 최소 글자수, 최대 글자수를 설정. 0을 입력하면 검사하지 않음') ?>
<input type="text" name="bo_comment_min" value="<?php echo $board['bo_comment_min'] ?>" id="bo_comment_min" class="numeric frm_input" size="4">
</td>
<td class="td_grpset">
<td class="group_setting">
<input type="checkbox" name="chk_grp_comment_min" value="1" id="chk_grp_comment_min">
<label for="chk_grp_comment_min">그룹적용</label>
<input type="checkbox" name="chk_all_comment_min" value="1" id="chk_all_comment_min">
@ -721,7 +721,7 @@ $pg_anchor = '<ul class="anchor">
<?php echo help('댓글 입력시 최소 글자수, 최대 글자수를 설정. 0을 입력하면 검사하지 않음') ?>
<input type="text" name="bo_comment_max" value="<?php echo $board['bo_comment_max'] ?>" id="bo_comment_max" class="numeric frm_input" size="4">
</td>
<td class="td_grpset">
<td class="group_setting">
<input type="checkbox" name="chk_grp_comment_max" value="1" id="chk_grp_comment_max">
<label for="chk_grp_comment_max">그룹적용</label>
<input type="checkbox" name="chk_all_comment_max" value="1" id="chk_all_comment_max">
@ -735,7 +735,7 @@ $pg_anchor = '<ul class="anchor">
<input type="checkbox" name="bo_use_sns" value="1" id="bo_use_sns" <?php echo $board['bo_use_sns']?'checked':''; ?>>
사용
</td>
<td class="td_grpset">
<td class="group_setting">
<input type="checkbox" name="chk_grp_use_sns" value="1" id="chk_grp_use_sns">
<label for="chk_grp_use_sns">그룹적용</label>
<input type="checkbox" name="chk_all_use_sns" value="1" id="chk_all_use_sns">
@ -748,7 +748,7 @@ $pg_anchor = '<ul class="anchor">
<input type="checkbox" name="bo_use_search" value="1" id="bo_use_search" <?php echo $board['bo_use_search']?'checked':''; ?>>
사용
</td>
<td class="td_grpset">
<td class="group_setting">
<input type="checkbox" name="chk_grp_use_search" value="1" id="chk_grp_use_search">
<label for="chk_grp_use_search">그룹적용</label>
<input type="checkbox" name="chk_all_use_search" value="1" id="chk_all_use_search">
@ -762,7 +762,7 @@ $pg_anchor = '<ul class="anchor">
<input type="checkbox" name="bo_show_menu" value="1" id="bo_show_menu" <?php echo $board['bo_show_menu']?'checked':''; ?>>
사용
</td>
<td class="td_grpset">
<td class="group_setting">
<input type="checkbox" name="chk_grp_show_menu" value="1" id="chk_grp_show_menu">
<label for="chk_grp_show_menu">그룹적용</label>
<input type="checkbox" name="chk_all_show_menu" value="1" id="chk_all_show_menu">
@ -775,7 +775,7 @@ $pg_anchor = '<ul class="anchor">
<?php echo help('숫자가 낮은 게시판 부터 메뉴나 검색시 우선 출력합니다.') ?>
<input type="text" name="bo_order" value="<?php echo $board['bo_order'] ?>" id="bo_order" class="frm_input" size="4">
</td>
<td class="td_grpset">
<td class="group_setting">
<input type="checkbox" name="chk_grp_order" value="1" id="chk_grp_order">
<label for="chk_grp_order">그룹적용</label>
<input type="checkbox" name="chk_all_order" value="1" id="chk_all_order">

28
adm/shop_admin/categoryform.php
View File

@ -82,7 +82,8 @@ include_once (G5_ADMIN_PATH.'/admin.head.php');
$pg_anchor ='<ul class="anchor">
<li><a href="#anc_scatefrm_basic">필수입력</a></li>
<li><a href="#anc_scatefrm_optional">선택입력</a></li>';
<li><a href="#anc_scatefrm_optional">선택입력</a></li>
<li><a href="#anc_scatefrm_extra">여분필드</a></li>';
if ($w == 'u') $pg_anchor .= '<li><a href="#frm_etc">기타설정</a></li>';
$pg_anchor .= '</ul>';
?>
@ -309,6 +310,31 @@ $pg_anchor .= '</ul>';
</div>
</section>
<section id="anc_scatefrm_extra" class="cbox">
<h2>여분필드 설정</h2>
<?php echo $pg_anchor ?>
<table class="frm_tbl">
<colgroup>
<col class="grid_3">
<col>
</colgroup>
<tbody>
<?php for ($i=1; $i<=10; $i++) { ?>
<tr>
<th scope="row">여분필드<?php echo $i ?></th>
<td>
<label for="ca_<?php echo $i ?>_subj">여분필드 <?php echo $i ?> 제목</label>
<input type="text" name="ca_<?php echo $i ?>_subj" id="ca_<?php echo $i ?>_subj" value="<?php echo get_text($ca['ca_'.$i.'_subj']) ?>" class="frm_input">
<label for="ca_<?php echo $i ?>">여분필드 <?php echo $i ?> 값</label>
<input type="text" name="ca_<?php echo $i ?>" value="<?php echo get_text($ca['ca_'.$i]) ?>" id="ca_<?php echo $i ?>" class="frm_input">
</td>
</tr>
<?php } ?>
</tbody>
</table>
</section>
<?php if ($w == "u") { ?>
<section id="frm_etc">
<h2 class="h2_frm">기타설정</h2>

22
adm/shop_admin/categoryformupdate.php
View File

@ -61,7 +61,27 @@ $sql_common = " ca_skin = '$ca_skin',
ca_include_tail = '$ca_include_tail',
ca_mb_id = '$ca_mb_id',
ca_cert_use = '$ca_cert_use',
ca_adult_use = '$ca_adult_use' ";
ca_adult_use = '$ca_adult_use',
ca_1_subj = '$ca_1_subj',
ca_2_subj = '$ca_2_subj',
ca_3_subj = '$ca_3_subj',
ca_4_subj = '$ca_4_subj',
ca_5_subj = '$ca_5_subj',
ca_6_subj = '$ca_6_subj',
ca_7_subj = '$ca_7_subj',
ca_8_subj = '$ca_8_subj',
ca_9_subj = '$ca_9_subj',
ca_10_subj = '$ca_10_subj',
ca_1 = '$ca_1',
ca_2 = '$ca_2',
ca_3 = '$ca_3',
ca_4 = '$ca_4',
ca_5 = '$ca_5',
ca_6 = '$ca_6',
ca_7 = '$ca_7',
ca_8 = '$ca_8',
ca_9 = '$ca_9',
ca_10 = '$ca_10' ";
if ($w == "")

11
adm/shop_admin/configform.php
View File

@ -468,11 +468,11 @@ $pg_anchor = '<ul class="anchor">
<tr>
<th scope="row"><label for="de_vbank_use">가상계좌 결제사용</label></th>
<td>
<?php echo help("주문자가 현금거래를 원할 경우, 해당 거래건에 대해 주문자에게 고유로 발행되는 일회용 계좌번호입니다.", 50); ?>
<select name="de_vbank_use" id="de_vbank_use">
<option value="0" <?php echo get_selected($default['de_vbank_use'], 0); ?>>사용안함</option>
<option value="1" <?php echo get_selected($default['de_vbank_use'], 1); ?>>사용</option>
</select>
<?php echo help("주문자가 현금거래를 원할 경우, 해당 거래건에 대해 주문자에게 고유로 발행되는 일회용 계좌번호입니다.", 50); ?>
<select name="de_vbank_use" id="de_vbank_use">
<option value="0" <?php echo get_selected($default['de_vbank_use'], 0); ?>>사용안함</option>
<option value="1" <?php echo get_selected($default['de_vbank_use'], 1); ?>>사용</option>
</select>
</td>
</tr>
<tr>
@ -558,7 +558,6 @@ $pg_anchor = '<ul class="anchor">
<th scope="row"><label for="de_kcp_mid">KCP SITE CODE</label></th>
<td>
<?php echo help("KCP 에서 받은 SR 로 시작하는 영대문자, 숫자 혼용 총 5자리 SITE CODE 를 입력하세요.\n만약, 사이트코드가 SR로 시작하지 않는다면 KCP에 사이트코드 변경 요청을 하십시오. 예) SRZ89"); ?>
<input type="hidden" name="de_card_pg" value="kcp">
<span class="sitecode">SR</span> <input type="text" name="de_kcp_mid" value="<?php echo $default['de_kcp_mid']; ?>" id="de_kcp_mid" class="frm_input" size="2" maxlength="3" style="font:bold 15px Verdana;"> 영대문자, 숫자 혼용 3자리
</td>
</tr>

1
adm/shop_admin/configformupdate.php
View File

@ -98,7 +98,6 @@ $sql = " update {$g5['g5_shop_default_table']}
de_card_test = '$de_card_test',
de_card_use = '$de_card_use',
de_card_point = '$de_card_point',
de_card_pg = '$de_card_pg',
de_settle_min_point = '$de_settle_min_point',
de_settle_max_point = '$de_settle_max_point',
de_settle_point_unit = '$de_settle_point_unit',

41
adm/shop_admin/deliverylist.php
View File

@ -27,14 +27,15 @@ if ($search != "") {
}
}
$sql_search .= " $where od_status = '배송' ";
if ($sel_ca_id != "") {
$sql_search .= " $where ca_id like '$sel_ca_id%' ";
}
if ($sel_field == "") $sel_field = "od_id";
$sql_common = " from {$g5['g5_shop_order_table']}
$sql_search ";
$sql_common = " from {$g5['g5_shop_order_table']} $sql_search ";
// 테이블의 전체 레코드수만 얻음
if ($chk_misu) {
@ -104,7 +105,7 @@ $listall = '<a href="'.$_SERVER['PHP_SELF'].'" class="ov_listall">전체목록</
</ul>
</div>
<form name="fdeliverylistupate" method="post" action="./deliverylistupdate.php" autocomplete="off">
<form name="fdeliverylist" method="post" onsubmit="return fdeliverylist_submit(this);" autocomplete="off">
<input type="hidden" name="sel_ca_id" value="<?php echo $sel_ca_id; ?>">
<input type="hidden" name="sel_field" value="<?php echo $sel_field; ?>">
<input type="hidden" name="search" value="<?php echo $search; ?>">
@ -117,6 +118,10 @@ $listall = '<a href="'.$_SERVER['PHP_SELF'].'" class="ov_listall">전체목록</
<caption><?php echo $g5['title']; ?> 목록</caption>
<thead>
<tr>
<th scope="col">
<label for="chkall" class="sound_only">주문 전체</label>
<input type="checkbox" name="chkall" value="1" id="chkall" onclick="check_all(this.form)">
</th>
<th scope="col"><a href="<?php echo title_sort("od_id",1) . "&amp;$qstr1"; ?>">주문번호</a></th>
<th scope="col"><a href="<?php echo title_sort("od_name") . "&amp;$qstr1"; ?>">주문자</a></th>
<th scope="col"><a href="<?php echo title_sort("od_cart_price",1) . "&amp;$qstr1"; ?>">주문액</a></th>
@ -130,8 +135,7 @@ $listall = '<a href="'.$_SERVER['PHP_SELF'].'" class="ov_listall">전체목록</
</thead>
<tbody>
<?php
$sql = " select *
$sql_common ";
$sql = " select * $sql_common ";
if ($chk_misu)
$sql .= " where od_misu <= 0 ";
$sql .= " order by $sort1 $sort2
@ -155,8 +159,13 @@ $listall = '<a href="'.$_SERVER['PHP_SELF'].'" class="ov_listall">전체목록</
$tr_bg = $i%2 ? 'class="tr_bg1"' : 'class="tr_bg0"';
?>
<tr<?php echo ' '.$tr_bg; ?>>
<td class="td_odrnum3">
<input type="hidden" name="od_id[<?php echo $i; ?>]" value="<?php echo $row['od_id']; ?>">
<td>
<input type="hidden" name="od_id[<?php echo $i ?>]" value="<?php echo $row['od_id'] ?>" id="od_id_<?php echo $i ?>">
<label for="chk_<?php echo $i; ?>" class="sound_only">주문번호 <?php echo $row['od_id']; ?></label>
<input type="checkbox" name="chk[]" value="<?php echo $i ?>" id="chk_<?php echo $i ?>">
</td>
<td>
<!-- <input type="hidden" name="od_id[<?php echo $i; ?>]" value="<?php echo $row['od_id']; ?>"> -->
<input type="hidden" name="od_tno[<?php echo $i; ?>]" value="<?php echo $row['od_tno']; ?>">
<input type="hidden" name="od_escrow[<?php echo $i; ?>]" value="<?php echo $row['od_escrow']; ?>">
<a href="./orderform.php?od_id=<?php echo $row['od_id']; ?>"><?php echo $row['od_id']; ?></a>
@ -183,7 +192,7 @@ $listall = '<a href="'.$_SERVER['PHP_SELF'].'" class="ov_listall">전체목록</
<?php
}
if ($i == 0)
echo '<tr><td colspan="20" class="empty_table">자료가 한건도 없습니다.</td></tr>';
echo '<tr><td colspan="10" class="empty_table">자료가 한건도 없습니다.</td></tr>';
?>
</table>
</div>
@ -198,13 +207,27 @@ $listall = '<a href="'.$_SERVER['PHP_SELF'].'" class="ov_listall">전체목록</
</div>
<div class="btn_confirm01 btn_confirm">
<input type="submit" value="일괄수정" class="btn_submit" accesskey="s">
<input type="submit" value="선택수정" class="btn_submit" onclick="document.pressed=this.value">
</div>
</form>
<?php echo get_paging(G5_IS_MOBILE ? $config['cf_mobile_pages'] : $config['cf_write_pages'], $page, $total_page, "{$_SERVER['PHP_SELF']}?$qstr&amp;page="); ?>
<script>
function fdeliverylist_submit(f)
{
if (!is_checked("chk[]")) {
alert(document.pressed+" 하실 항목을 하나 이상 선택하세요.");
return false;
}
f.action = "./deliverylistupdate.php";
return true;
}
</script>
<?php
include_once (G5_ADMIN_PATH.'/admin.tail.php');
?>

18
adm/shop_admin/index.php
View File

@ -8,6 +8,7 @@ $g5['title'] = ' 쇼핑몰관리';
include_once (G5_ADMIN_PATH.'/admin.head.php');
$pg_anchor = '<ul class="anchor">
<li><a href="#anc_sidx_ord">주문현황</a></li>
<li><a href="#anc_sidx_rdy">입금완료미배송내역</a></li>
<li><a href="#anc_sidx_wait">미입금주문내역</a></li>
<li><a href="#anc_sidx_ps">사용후기</a></li>
@ -15,6 +16,23 @@ $pg_anchor = '<ul class="anchor">
</ul>';
?>
<section id="anc_sidx_ord">
<h2>주문현황</h2>
<?php echo $pg_anchor; ?>
<?php
$sql = " select count(*) as cnt from {$g5['g5_shop_order_table']} where od_status = '주문' ";
$row = sql_fetch($sql);
echo "주문 : ".$row['cnt'];
?>
<?php
$sql = " select count(*) as cnt from {$g5['g5_shop_order_table']} where od_status = '입금' ";
$row = sql_fetch($sql);
echo "입금 : ".$row['cnt'];
?>
</section>
<section id="anc_sidx_rdy">
<h2>입금완료 미배송내역</h2>
<?php echo $pg_anchor; ?>

51
adm/shop_admin/itemform.php
View File

@ -105,6 +105,7 @@ $pg_anchor ='<ul class="anchor">
<li><a href="#anc_sitfrm_relation">관련상품</a></li>
<li><a href="#anc_sitfrm_event">관련이벤트</a></li>
<li><a href="#anc_sitfrm_optional">상세설명설정</a></li>
<li><a href="#anc_sitfrm_extra">여분필드</a></li>
</ul>
';
?>
@ -1379,20 +1380,52 @@ $(function(){
<label for="chk_all_it_mobile_tail_html">전체적용</label>
</td>
</tr>
<?php if ($w == "u") { ?>
<tr>
<th scope="row">입력일시</th>
<td colspan="2">
<?php echo help("상품을 처음 입력(등록)한 시간입니다."); ?>
<?php echo $it['it_time']; ?>
</td>
</tr>
<?php } ?>
</tbody>
</table>
</div>
</section>
<section id="anc_sitfrm_extra" class="cbox">
<h2>여분필드 설정</h2>
<?php echo $pg_anchor ?>
<table class="frm_tbl">
<colgroup>
<col class="grid_3">
<col class="grid_12">
<col class="grid_3">
</colgroup>
<tbody>
<?php for ($i=1; $i<=10; $i++) { ?>
<tr>
<th scope="row">여분필드<?php echo $i ?></th>
<td>
<label for="it_<?php echo $i ?>_subj">여분필드 <?php echo $i ?> 제목</label>
<input type="text" name="it_<?php echo $i ?>_subj" id="it_<?php echo $i ?>_subj" value="<?php echo get_text($it['it_'.$i.'_subj']) ?>" class="frm_input">
<label for="it_<?php echo $i ?>">여분필드 <?php echo $i ?> 값</label>
<input type="text" name="it_<?php echo $i ?>" value="<?php echo get_text($it['it_'.$i]) ?>" id="it_<?php echo $i ?>" class="frm_input">
</td>
<td class="group_setting">
<input type="checkbox" name="chk_grp_<?php echo $i ?>" value="1" id="chk_grp_<?php echo $i ?>">
<label for="chk_grp_<?php echo $i ?>">그룹적용</label>
<input type="checkbox" name="chk_all_<?php echo $i ?>" value="1" id="chk_all_<?php echo $i ?>">
<label for="chk_all_<?php echo $i ?>">전체적용</label>
</td>
</tr>
<?php } ?>
<?php if ($w == "u") { ?>
<tr>
<th scope="row">입력일시</th>
<td colspan="2">
<?php echo help("상품을 처음 입력(등록)한 시간입니다."); ?>
<?php echo $it['it_time']; ?>
</td>
</tr>
<?php } ?>
</tbody>
</table>
</section>
<div class="btn_confirm01 btn_confirm">
<input type="submit" value="확인" class="btn_submit" accesskey="s">
<a href="./itemlist.php?<?php echo $qstr; ?>">목록</a>

42
adm/shop_admin/itemformupdate.php
View File

@ -310,7 +310,27 @@ $sql_common = " ca_id = '$ca_id',
it_img7 = '$it_img7',
it_img8 = '$it_img8',
it_img9 = '$it_img9',
it_img10 = '$it_img10'
it_img10 = '$it_img10',
it_1_subj = '$it_1_subj',
it_2_subj = '$it_2_subj',
it_3_subj = '$it_3_subj',
it_4_subj = '$it_4_subj',
it_5_subj = '$it_5_subj',
it_6_subj = '$it_6_subj',
it_7_subj = '$it_7_subj',
it_8_subj = '$it_8_subj',
it_9_subj = '$it_9_subj',
it_10_subj = '$it_10_subj',
it_1 = '$it_1',
it_2 = '$it_2',
it_3 = '$it_3',
it_4 = '$it_4',
it_5 = '$it_5',
it_6 = '$it_6',
it_7 = '$it_7',
it_8 = '$it_8',
it_9 = '$it_9',
it_10 = '$it_10'
";
if ($w == "")
@ -445,6 +465,16 @@ if(is_checked('chk_ca_it_head_html')) $ca_fields .= " , it_head_html =
if(is_checked('chk_ca_it_tail_html')) $ca_fields .= " , it_tail_html = '$it_tail_html' ";
if(is_checked('chk_ca_it_mobile_head_html')) $ca_fields .= " , it_mobile_head_html = '$it_mobile_head_html' ";
if(is_checked('chk_ca_it_mobile_tail_html')) $ca_fields .= " , it_mobile_tail_html = '$it_mobile_tail_html' ";
if(is_checked('chk_grp_1')) $ca_fields .= " , it_1_subj = '$it_1_subj', it_1 = '$it_1' ";
if(is_checked('chk_grp_2')) $ca_fields .= " , it_2_subj = '$it_2_subj', it_2 = '$it_2' ";
if(is_checked('chk_grp_3')) $ca_fields .= " , it_3_subj = '$it_3_subj', it_3 = '$it_3' ";
if(is_checked('chk_grp_4')) $ca_fields .= " , it_4_subj = '$it_4_subj', it_4 = '$it_4' ";
if(is_checked('chk_grp_5')) $ca_fields .= " , it_5_subj = '$it_5_subj', it_5 = '$it_5' ";
if(is_checked('chk_grp_6')) $ca_fields .= " , it_6_subj = '$it_6_subj', it_6 = '$it_6' ";
if(is_checked('chk_grp_7')) $ca_fields .= " , it_7_subj = '$it_7_subj', it_7 = '$it_7' ";
if(is_checked('chk_grp_8')) $ca_fields .= " , it_8_subj = '$it_8_subj', it_8 = '$it_8' ";
if(is_checked('chk_grp_9')) $ca_fields .= " , it_9_subj = '$it_9_subj', it_9 = '$it_9' ";
if(is_checked('chk_grp_10')) $ca_fields .= " , it_10_subj = '$it_10_subj', it_10 = '$it_10' ";
if($ca_fields) {
sql_query(" update {$g5['g5_shop_item_table']} set it_name = it_name {$ca_fields} where ca_id = '$ca_id' ");
@ -479,6 +509,16 @@ if(is_checked('chk_all_it_head_html')) $all_fields .= " , it_head_html
if(is_checked('chk_all_it_tail_html')) $all_fields .= " , it_tail_html = '$it_tail_html' ";
if(is_checked('chk_all_it_mobile_head_html')) $all_fields .= " , it_mobile_head_html = '$it_mobile_head_html' ";
if(is_checked('chk_all_it_mobile_tail_html')) $all_fields .= " , it_mobile_tail_html = '$it_mobile_tail_html' ";
if(is_checked('chk_all_1')) $all_fields .= " , it_1_subj = '$it_1_subj', it_1 = '$it_1' ";
if(is_checked('chk_all_2')) $all_fields .= " , it_2_subj = '$it_2_subj', it_2 = '$it_2' ";
if(is_checked('chk_all_3')) $all_fields .= " , it_3_subj = '$it_3_subj', it_3 = '$it_3' ";
if(is_checked('chk_all_4')) $all_fields .= " , it_4_subj = '$it_4_subj', it_4 = '$it_4' ";
if(is_checked('chk_all_5')) $all_fields .= " , it_5_subj = '$it_5_subj', it_5 = '$it_5' ";
if(is_checked('chk_all_6')) $all_fields .= " , it_6_subj = '$it_6_subj', it_6 = '$it_6' ";
if(is_checked('chk_all_7')) $all_fields .= " , it_7_subj = '$it_7_subj', it_7 = '$it_7' ";
if(is_checked('chk_all_8')) $all_fields .= " , it_8_subj = '$it_8_subj', it_8 = '$it_8' ";
if(is_checked('chk_all_9')) $all_fields .= " , it_9_subj = '$it_9_subj', it_9 = '$it_9' ";
if(is_checked('chk_all_10')) $all_fields .= " , it_10_subj = '$it_10_subj', it_10 = '$it_10' ";
if($all_fields) {
sql_query(" update {$g5['g5_shop_item_table']} set it_name = it_name {$all_fields} ");

15
adm/shop_admin/orderform.php
View File

@ -76,11 +76,12 @@ if ($od['mb_id'] == "") {
$qstr = "sort1=$sort1&amp;sort2=$sort2&amp;sel_field=$sel_field&amp;search=$search&amp;page=$page";
// PG사를 KCP 사용하면서 테스트 상점아이디라면
$pg_url = 'http://admin8.kcp.co.kr';
if ($default['de_card_test']) {
// 로그인 아이디 / 비번
// 일반 : test1234 / test12345
// 에스크로 : escrow / escrow913
$g5['g5_shop_cardpg']['kcp'] = "http://testadmin8.kcp.co.kr";
$pg_url = 'http://testadmin8.kcp.co.kr';
}
// 상품목록
@ -414,6 +415,7 @@ $pg_anchor = '<ul class="anchor">
<?php
$sql = " select dl_company, dl_url, dl_tel from {$g5['g5_shop_delivery_table']} where dl_id = '{$od['dl_id']}' ";
$dl = sql_fetch($sql);
if ($od['od_settle_case'] == '계좌이체' || $od['od_settle_case'] == '가상계좌') {
?>
<tr>
<th scope="row">배송회사</th>
@ -525,13 +527,8 @@ $pg_anchor = '<ul class="anchor">
<tr>
<th scope="row"><label for="od_receipt_price"><?php echo $od['od_settle_case']; ?> 입금액</label></th>
<td>
<input type="text" name="od_receipt_price" value="<?php echo $od['od_receipt_price']; ?>" id="od_receipt_price" class="frm_input" size="10"> 원
<?php
if ($od['od_settle_case'] == '계좌이체' || $od['od_settle_case'] == '가상계좌') {
$pg_url = $g5['g5_shop_cardpg'][$default['de_card_pg']];
?>
<input type="text" name="od_receipt_price" value="<?php echo $od['od_receipt_price']; ?>" id="od_receipt_price" class="frm_input"> 원
<a href="<?php echo $pg_url; ?>" target="_blank">결제대행사</a>
<?php } ?>
</td>
</tr>
<tr>
@ -564,7 +561,6 @@ $pg_anchor = '<ul class="anchor">
<th scope="row"><label for="od_receipt_price"><?php echo $od['od_settle_case']; ?> 결제액</label></th>
<td>
<input type="text" name="od_receipt_price" value="<?php echo $od['od_receipt_price']; ?>" id="od_receipt_price" class="frm_input"> 원
<?php $pg_url = $g5['g5_shop_cardpg'][$default['de_card_pg']];?>
<a href="<?php echo $pg_url; ?>" target="_blank">결제대행사</a>
</td>
</tr>
@ -583,8 +579,7 @@ $pg_anchor = '<ul class="anchor">
<th scope="row" class="sodr_sppay"><label for="od_receipt_price">신용카드 결제액</label></th>
<td>
<input type="text" name="od_receipt_price" value="<?php echo $od['od_receipt_price']; ?>" id="od_receipt_price" class="frm_input" size="10"> 원
<?php $card_url = $g5['g5_shop_cardpg'][$default['de_card_pg']]; ?>
<a href="<?php echo $card_url; ?>" target="_blank">결제대행사</a>
<a href="<?php echo $pg_url; ?>" target="_blank">결제대행사</a>
</td>
</tr>
<tr>

7
adm/shop_admin/orderlist.php
View File

@ -327,14 +327,13 @@ $listall = '<a href="'.$_SERVER['PHP_SELF'].'" class="ov_listall">전체목록</
<option value="">선택하세요</option>
<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>
</form>
<div class="local_desc01 local_desc">
<p>
&lt;무통장&gt;인 경우에만 &lt;주문&gt;에서 &lt;입금&gt;으로 변경됩니다. 가상계좌는 입금시 자동으로 &lt;입금&gt;처리됩니다.<br>
@ -342,6 +341,8 @@ $listall = '<a href="'.$_SERVER['PHP_SELF'].'" class="ov_listall">전체목록</
</p>
</div>
</form>
<?php echo get_paging(G5_IS_MOBILE ? $config['cf_mobile_pages'] : $config['cf_write_pages'], $page, $total_page, "{$_SERVER['PHP_SELF']}?$qstr&amp;page="); ?>
<script>
@ -400,6 +401,8 @@ function forderlist_submit(f)
}
}
f.action = "./orderlistupdate.php";
return true;
}
</script>

198
adm/shop_admin/orderlistupdate.php
View File

@ -2,35 +2,169 @@
$sub_menu = '400400';
include_once('./_common.php');
// 주문상태변경 처리
function change_order_status($od_status1, $od_status2, $od)
// 상품옵션별재고 또는 상품재고에 더하기
function add_io_stock($it_id, $ct_qty, $io_id="", $io_type="")
{
global $g5;
// 원래 주문상태와 바뀔 주문상태가 같다면 처리하지 않음
if ($od_status1 == $od_status2) return '';
$od_id = $od['od_id'];
if ($od_status1 == '주문') {
if ($od_status2 == '입금') {
if ($od['od_settle_case'] != '무통장') return '';
$sql = " update {$g5['g5_shop_order_table']}
set od_status = '입금',
od_receipt_price = od_misu,
od_misu = 0
where od_id = '$od_id' ";
sql_query($sql, true);
/*
$sql = " update {$g5['g5_shop_cart_table']} set ct_status = '결제완료' where od_id = '$od_id' and ct_status not in ('취소', '반품', '품절') ";
sql_query($sql);
*/
}
if($io_id) {
$sql = " update {$g5['g5_shop_item_option_table']}
set io_stock_qty = io_stock_qty + '{$ct_qty}'
where it_id = '{$it_id}'
and io_id = '{$io_id}'
and io_type = '{$io_type}' ";
} else {
$sql = " update {$g5['g5_shop_item_table']}
set it_stock_qty = it_stock_qty + '{$ct_qty}'
where it_id = '{$it_id}' ";
}
return sql_query($sql);
}
print_r2($_POST);
// 상품옵션별재고 또는 상품재고에서 빼기
function subtract_io_stock($it_id, $ct_qty, $io_id="", $io_type="")
{
global $g5;
if($io_id) {
$sql = " update {$g5['g5_shop_item_option_table']}
set io_stock_qty = io_stock_qty - '{$ct_qty}'
where it_id = '{$it_id}'
and io_id = '{$io_id}'
and io_type = '{$io_type}' ";
} else {
$sql = " update {$g5['g5_shop_item_table']}
set it_stock_qty = it_stock_qty - '{$ct_qty}'
where it_id = '{$it_id}' ";
}
return sql_query($sql);
}
// 주문과 장바구니의 상태를 변경한다.
function change_status($od_id, $current_status, $change_status)
{
global $g5;
$sql = " update {$g5['g5_shop_order_table']} set od_status = '{$change_status}' where od_id = '{$od_id}' and od_status = '{$current_status}' ";
sql_query($sql, true);
$sql = " update {$g5['g5_shop_cart_table']} set ct_status = '{$change_status}' where od_id = '{$od_id}' and ct_status = '{$current_status}' ";
sql_query($sql, true);
}
//print_r2($_POST);
// 주문상태변경 처리
function change_order_status($current_staus, $change_status, $od)
{
global $g5;
// 현재 주문상태와 바뀔 주문상태가 같다면 처리하지 않음
if ($current_staus == $change_status) return;
$od = sql_fetch(" select od_settle_case from {$g5['g5_shop_order_table']} where od_id = '$od_id' ");
if (!$od) return;
switch ($current_staus)
{
case '주문' :
if ($change_status != '입금') return;
if ($od['od_settle_case'] != '무통장') return;
$sql = " update {$g5['g5_shop_order_table']}
set od_receipt_price = od_misu,
od_misu = 0,
od_receipt_time = '".G5_TIME_YMDHIS."'
where od_id = '$od_id' and od_status = '주문' ";
sql_query($sql, true);
change_status($od_id, '주문', '입금');
break;
case '입금' :
if ($change_status != '준비') return;
change_status($od_id, '입금', '준비');
break;
case '준비' :
if ($change_status != '배송') return;
change_status($od_id, '준비', '배송');
$sql = " select * from {$g5['g5_shop_cart_table']} where od_id = '$od_id' ";
$result = sql_query($sql);
for ($i=0; $row=sql_fetch_array($result); $i++) {
// 재고를 이미 사용했다면 (재고에서 이미 뺐다면)
$stock_use = $row['ct_stock_use'];
if ($row['ct_stock_use'])
{
if ($ct_status == '주문' || $ct_status == '취소' || $ct_status == '반품' || $ct_status == '품절')
{
$stock_use = 0;
// 재고에 다시 더한다.
add_io_stock($row['it_id'], $row['ct_qty'], $row['io_id'], $row['io_type']);
}
}
else
{
// 재고 오류로 인한 수정
if ($ct_status == '배송' || $ct_status == '완료')
{
$stock_use = 1;
// 재고에서 뺀다.
subtract_io_stock($row['it_id'], $row['ct_qty'], $row['io_id'], $row['io_type']);
}
}
$point_use = $row['ct_point_use'];
// 회원이면서 포인트가 0보다 크면
// 이미 포인트를 부여했다면 뺀다.
if ($od['mb_id'] && $row['ct_point'] && $row['ct_point_use'])
{
$point_use = 0;
delete_point($od['mb_id'], "@delivery", $od['mb_id'], "$od_id,{$row['ct_id']}");
}
$sql = " update {$g5['g5_shop_cart_table']}
set ct_point_use = '$point_use',
ct_stock_use = '$stock_use',
ct_status = '$ct_status',
ct_history = CONCAT(ct_history,'$ct_history')
where od_id = '{$row['od_id']}' ";
sql_query($sql);
}
break;
case '배송' :
if ($change_status != '완료') return;
}
// 주문정보
$info = get_order_info($od_id);
if(!$info) continue;
$sql = " update {$g5['g5_shop_order_table']}
set od_misu = '{$info['od_misu']}',
od_tax_mny = '{$info['od_tax_mny']}',
od_vat_mny = '{$info['od_vat_mny']}',
od_free_mny = '{$info['od_free_mny']}',
od_send_cost = '{$info['od_send_cost']}'
where od_id = '$od_id' ";
sql_query($sql, true);
}
for ($i=0; $i<count($_POST['chk']); $i++)
{
@ -38,10 +172,22 @@ for ($i=0; $i<count($_POST['chk']); $i++)
$k = $_POST['chk'][$i];
$od_id = $_POST['od_id'][$k];
$od = sql_fetch(" select * from {$g5['g5_shop_order_table']} where od_id = '$od_id' ");
change_order_status($od['od_status'], $_POST['od_status'], $od);
change_order_status($od['od_status'], $_POST['od_status'], $od_id);
echo $od_id . "<br>";
}
$qstr = "sort1=$sort1&amp;sort2=$sort2&amp;sel_field=$sel_field&amp;search=$search";
$qstr .= "&amp;od_status=$od_status";
$qstr .= "&amp;od_settle_case=$od_settle_case";
$qstr .= "&amp;od_misu=$od_misu";
$qstr .= "&amp;od_cancel_price=$od_cancel_price";
$qstr .= "&amp;od_receipt_price=$od_receipt_price";
$qstr .= "&amp;od_receipt_point=$od_receipt_point";
$qstr .= "&amp;od_receipt_coupon=$od_receipt_coupon";
//$qstr .= "&amp;page=$page";
goto_url("./orderlist.php?$qstr");
?>

16
adm/shop_admin/personalpayform.php
View File

@ -96,8 +96,20 @@ $pg_anchor = '<ul class="anchor">
</div>
</section>
<section id="anc_spp_pay">
<h2 class="h2_frm">결제 정보</h2>
<div class="btn_confirm">
<input type="submit" value="확인" class="btn_submit" accesskey="s">
<?php if($popup == 'yes') { ?>
<button type="button" onclick="self.close();">닫기</button>
<?php } else { ?>
<a href="./personalpaylist.php?<?php echo $qstr; ?>">목록</a>
<?php } ?>
<?php if($w == 'u') { ?>
<a href="./personalpayformupdate.php?w=d&amp;pp_id=<?php echo $pp['pp_id']; ?>" onclick="return del_confirm();">삭제</a>
<?php } ?>
</div>
<section id="anc_spp_pay" class="cbox">
<h2>결제 정보</h2>
<?php echo $pg_anchor; ?>
<div class="local_desc02 local_desc">
<p>결제 관련 정보입니다.</p>