diff --git a/adm/shop_admin/orderlist.php b/adm/shop_admin/orderlist.php index 8ed6ac6a8..c9db01d60 100644 --- a/adm/shop_admin/orderlist.php +++ b/adm/shop_admin/orderlist.php @@ -198,7 +198,8 @@ $listall = '전체목록 -
+ +
@@ -334,9 +335,6 @@ $listall = '전체목록
- - - @@ -399,17 +397,8 @@ $listall = '전체목록 - - - - 주문상태 변경 + 전체목록 - + + @@ -488,15 +478,17 @@ function forderlist_submit(f) } */ - if (f.od_status.checked == false) { - alert("변경하실 주문상태를 선택하세요."); + if(document.pressed == "선택삭제") { + if(confirm("선택한 자료를 정말 삭제하시겠습니까?")) { + f.action = "./orderlistdelete.php"; + return true; + } return false; } - if(document.pressed == "선택삭제") { - if(!confirm("선택한 자료를 정말 삭제하시겠습니까?")) { - return false; - } + if (f.od_status.checked == false) { + alert("주문상태 변경에 체크하세요."); + return false; } var chk = document.getElementsByName("chk[]"); diff --git a/adm/shop_admin/orderlistdelete.php b/adm/shop_admin/orderlistdelete.php new file mode 100644 index 000000000..bbddb16f5 --- /dev/null +++ b/adm/shop_admin/orderlistdelete.php @@ -0,0 +1,35 @@ + \ No newline at end of file diff --git a/adm/shop_admin/orderlistupdate.php b/adm/shop_admin/orderlistupdate.php index e7767bbe9..c29e007d1 100644 --- a/adm/shop_admin/orderlistupdate.php +++ b/adm/shop_admin/orderlistupdate.php @@ -156,7 +156,6 @@ for ($i=0; $i diff --git a/install/gnuboard5shop.sql b/install/gnuboard5shop.sql index d0ee22942..bc4105295 100644 --- a/install/gnuboard5shop.sql +++ b/install/gnuboard5shop.sql @@ -702,6 +702,21 @@ CREATE TABLE IF NOT EXISTS `g5_shop_order_address` ( -- -------------------------------------------------------- +-- +-- Table structure for table `g5_shop_order_delete` +-- + +DROP TABLE IF EXISTS `g5_shop_order_delete`; +CREATE TABLE IF NOT EXISTS `g5_shop_order_delete` ( + `de_id` int(11) NOT NULL AUTO_INCREMENT, + `de_key` varchar(255) NOT NULL, + `de_data` longtext NOT NULL, + PRIMARY KEY (`de_id`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8; + +-- -------------------------------------------------------- + + -- -- Table structure for table `g5_shop_personalpay` -- diff --git a/install/install_db.php b/install/install_db.php index f5b82b6eb..389403d3f 100644 --- a/install/install_db.php +++ b/install/install_db.php @@ -491,6 +491,7 @@ if($g5_shop_install) { fwrite($f, "\$g5['g5_shop_new_win_table'] = G5_SHOP_TABLE_PREFIX.'new_win'; // 새창 테이블\n"); fwrite($f, "\$g5['g5_shop_onlinecalc_table'] = G5_SHOP_TABLE_PREFIX.'onlinecalc'; // 온라인견적 테이블\n"); fwrite($f, "\$g5['g5_shop_order_table'] = G5_SHOP_TABLE_PREFIX.'order'; // 주문서 테이블\n"); + fwrite($f, "\$g5['g5_shop_order_delete_table'] = G5_SHOP_TABLE_PREFIX.'order_delete'; // 주문서 삭제 테이블\n"); fwrite($f, "\$g5['g5_shop_wish_table'] = G5_SHOP_TABLE_PREFIX.'wish'; // 보관함(위시리스트) 테이블\n"); fwrite($f, "\$g5['g5_shop_coupon_table'] = G5_SHOP_TABLE_PREFIX.'coupon'; // 쿠폰정보 테이블\n"); fwrite($f, "\$g5['g5_shop_coupon_log_table'] = G5_SHOP_TABLE_PREFIX.'coupon_log'; // 쿠폰사용정보 테이블\n"); diff --git a/mobile/shop/iteminfo.php b/mobile/shop/iteminfo.php index ecd49ed15..2b4402224 100644 --- a/mobile/shop/iteminfo.php +++ b/mobile/shop/iteminfo.php @@ -61,7 +61,7 @@ function pg_anchor($info) {
  • >배송정보
  • >교환정보
  • >관련상품
    • -
    • +