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:
SIR
2014-11-05 15:26:49 +09:00
parent 9d97c920e6 5e558626da
commit 9b8d672d9f
26 changed files with 359 additions and 340 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
adm/admin.head.php
View File

@ -95,7 +95,7 @@ function imageview(id, w, h)
continue;
}
$current_class = "";
if (isset($sub_menu) && (substr($sub_menu, 0, 2) == substr($menu['menu'.$key][0][0], 0, 2)))
if (isset($sub_menu) && (substr($sub_menu, 0, 3) == substr($menu['menu'.$key][0][0], 0, 3)))
$current_class = " gnb_1dli_air";
$gnb_str .= '<li class="gnb_1dli'.$current_class.'">'.PHP_EOL;
$gnb_str .= $href1 . $menu['menu'.$key][0][1] . $href2;

2
adm/popular_list.php
View File

@ -57,7 +57,7 @@ $sql = " select *
limit {$from_record}, {$rows} ";
$result = sql_query($sql);
$listall = '<a href="'.$_SERVER['PHP_SELF'].'" class="local_ov01 local_ov">전체목록</a>';
$listall = '<a href="'.$_SERVER['PHP_SELF'].'" class="ov_listall">전체목록</a>';
$g5['title'] = '인기검색어관리';
include_once('./admin.head.php');

3
adm/shop_admin/itemform.php
View File

@ -48,6 +48,9 @@ else if ($w == "u")
$sql = " select * from {$g5['g5_shop_item_table']} where it_id = '$it_id' ";
$it = sql_fetch($sql);
if(!$it)
alert('상품정보가 존재하지 않습니다.');
if (!$ca_id)
$ca_id = $it['ca_id'];

2
adm/shop_admin/itemqaform.php
View File

@ -12,7 +12,7 @@ $sql = " select *
$iq = sql_fetch($sql);
if (!$iq['iq_id']) alert('등록된 자료가 없습니다.');
$name = get_sideview($is['mb_id'], get_text($iq['iq_name']), $is['mb_email'], $is['mb_homepage']);
$name = get_sideview($iq['mb_id'], get_text($iq['iq_name']), $iq['mb_email'], $iq['mb_homepage']);
$g5['title'] = '상품문의';
include_once (G5_ADMIN_PATH.'/admin.head.php');

8
adm/shop_admin/orderdeliveryexcel.php
View File

@ -40,11 +40,11 @@ for($i=1; $row=sql_fetch_array($result); $i++) {
$worksheet->write($i, 0, ' '.$row['od_id']);
$worksheet->write($i, 1, $row['od_name']);
$worksheet->write($i, 2, $row['od_tel']);
$worksheet->write($i, 3, $row['od_hp']);
$worksheet->write($i, 2, ' '.$row['od_tel']);
$worksheet->write($i, 3, ' '.$row['od_hp']);
$worksheet->write($i, 4, $row['od_b_name']);
$worksheet->write($i, 5, $row['od_b_tel']);
$worksheet->write($i, 6, $row['od_b_hp']);
$worksheet->write($i, 5, ' '.$row['od_b_tel']);
$worksheet->write($i, 6, ' '.$row['od_b_hp']);
$worksheet->write($i, 7, print_address($row['od_b_addr1'], $row['od_b_addr2'], $row['od_b_addr3'], $row['od_b_addr_jibeon']));
$worksheet->write($i, 8, $row['od_delivery_company']);
$worksheet->write($i, 9, $row['od_invoice']);

10
adm/shop_admin/orderform.php
View File

@ -10,16 +10,6 @@ auth_check($auth[$sub_menu], "w");
$g5['title'] = "주문 내역 수정";
include_once(G5_ADMIN_PATH.'/admin.head.php');
//------------------------------------------------------------------------------
// 설정 시간이 지난 주문서 없는 장바구니 자료 삭제
//------------------------------------------------------------------------------
$keep_term = $default['de_cart_keep_term'];
if (!$keep_term) $keep_term = 15; // 기본값 15일
$beforetime = date('Y-m-d', ( G5_SERVER_TIME - (86400 * $keep_term) ) );
$sql = " delete from {$g5['g5_shop_cart_table']} where ct_status = '쇼핑' and substring(ct_time, 1, 10) < '$beforetime' ";
sql_query($sql);
//------------------------------------------------------------------------------
// 완료된 주문에 포인트를 적립한다.
save_order_point("완료");

7
adm/shop_admin/orderlistdelete.php
View File

@ -13,11 +13,18 @@ for ($i=0; $i<count($_POST['chk']); $i++)
$od = sql_fetch(" select * from {$g5['g5_shop_order_table']} where od_id = '$od_id' ");
if (!$od) continue;
// 주문상태가 주문이 아니면 건너뜀
if($od['od_status'] != '주문') continue;
$data = serialize($od);
$sql = " insert {$g5['g5_shop_order_delete_table']} set de_key = '$od_id', de_data = '".addslashes($data)."', mb_id = '{$member['mb_id']}', de_ip = '{$_SERVER['REMOTE_ADDR']}', de_datetime = '".G5_TIME_YMDHIS."' ";
sql_query($sql, true);
// cart 테이블의 상품 상태를 삭제로 변경
$sql = " update {$g5['g5_shop_cart_table']} set ct_status = '삭제' where od_id = '$od_id' and ct_status = '주문' ";
sql_query($sql);
$sql = " delete from {$g5['g5_shop_order_table']} where od_id = '$od_id' ";
sql_query($sql);
}

4
adm/shop_admin/orderprintresult.php
View File

@ -212,8 +212,8 @@ if ($csv == 'xls')
$worksheet->write($i, 0, $row['od_b_zip1'].'-'.$row['od_b_zip2']);
$worksheet->write($i, 1, print_address($row['od_b_addr1'], $row['od_b_addr2'], $row['od_b_addr3'], $row['od_b_addr_jibeon']));
$worksheet->write($i, 2, $row['od_b_name']);
$worksheet->write($i, 3, $row['od_b_tel']);
$worksheet->write($i, 4, $row['od_b_hp']);
$worksheet->write($i, 3, ' '.$row['od_b_tel']);
$worksheet->write($i, 4, ' '.$row['od_b_hp']);
$worksheet->write($i, 5, $row['it_name']);
$worksheet->write($i, 6, $row['ct_qty']);
$worksheet->write($i, 7, $row['ct_option']);

2
adm/sms_admin/sms_write_send.php
View File

@ -181,7 +181,7 @@ if ($result)
$hs_memo = "인증 받지 못하였습니다. 계정을 다시 확인해 주세요.";
break;
default: // "미 확인 오류"
$hs_memo = "알 수 없는 오류로 전송이 실패하었습니다.";
$hs_memo = "알 수 없는 오류로 전송이 실패하였습니다.";
break;
}
$wr_failure++;