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

2013-10-24 08:59:21 +09:00
parent 7380e1d40b aa4356867f
commit eca181a191
13 changed files with 103 additions and 35 deletions
--- a/adm/shop_admin/orderlist.php
+++ b/adm/shop_admin/orderlist.php
@ -198,7 +198,8 @@ $listall = '<a href="'.$_SERVER['PHP_SELF'].'" class="ov_listall">전체목록</
 </div>
 </form>

-<form name="forderlist" id="forderlist" action="./orderlistupdate.php" onsubmit="return forderlist_submit(this);" method="post">
+<form name="forderlist" id="forderlist" action="./orderlistupdate.php" onsubmit="return forderlist_submit(this);" method="post" autocomplete="off">
+<input type="hidden" name="search_od_status" value="<?php echo $od_status; ?>">

 <div class="tbl_head02 tbl_wrap">
    <table id="sodr_list">
@ -334,9 +335,6 @@ $listall = '<a href="'.$_SERVER['PHP_SELF'].'" class="ov_listall">전체목록</
            <?php echo $s_receipt_way; ?>
        </td>
        <td headers="th_delino">
-            <!-- 값이 바뀌었는지 비교하기 위하여 저장 -->
-            <input type="hidden" name="save_dl_id[<?php echo $i; ?>]" value="<?php echo $row['dl_id']; ?>">
-            <input type="hidden" name="save_od_invoice[<?php echo $i; ?>]" value="<?php echo $row['od_invoice']; ?>">
            <?php if ($od_status == '준비') { ?>
                <input type="text" name="od_invoice[<?php echo $i; ?>]" value="<?php echo $row['od_invoice']; ?>" class="frm_input" size="12">
            <?php } else if ($od_status == '배송' || $od_status ==  '완료') { ?>
@ -399,17 +397,8 @@ $listall = '<a href="'.$_SERVER['PHP_SELF'].'" class="ov_listall">전체목록</

 <div class="local_cmd01 local_cmd">
 <?php if (($od_status == '' || $od_status == '완료') == false) { // 검색된 주문상태가 '전체', '완료' 가 아니라면 ?>
-    <label for="od_status" class="cmd_tit">주문상태 변경</label>
-    <!-- <select name="od_status" id="od_status">
-        <option value="">선택하세요</option>
-        <option value="주문">주문</option>
-        <option value="입금">입금</option>
-        <option value="준비">준비</option>
-        <option value="배송">배송</option>
-        <option value="완료">완료</option>
-    </select> -->
-
-    <?php 
+    <label class="cmd_tit">주문상태 변경</label>
+    <?php
    $change_status = "";
    if ($od_status == '주문') $change_status = "입금";
    if ($od_status == '입금') $change_status = "준비";
@ -417,8 +406,9 @@ $listall = '<a href="'.$_SERVER['PHP_SELF'].'" class="ov_listall">전체목록</
    if ($od_status == '배송') $change_status = "완료";
    ?>
    <?php if ($change_status) { ?>
-        <label><input type="checkbox" name="od_status" value="<?php echo $change_status; ?>"> <?php echo $change_status; ?></label>
+        <label><input type="checkbox" name="od_status" value="<?php echo $change_status; ?>"> '<?php echo $od_status ?>'상태에서 '<strong><?php echo $change_status ?></strong>'상태로 변경</label>
        <input type="submit" value="선택수정" class="btn_submit" onclick="document.pressed=this.value">
+        <?php if ($od_status == '주문') { ?><input type="submit" value="선택삭제" class="btn_submit" onclick="document.pressed=this.value"><?php } ?>
    <?php } ?>
 <?php } ?>
 </div>
@ -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[]");
--- a/adm/shop_admin/orderlistdelete.php
+++ b/adm/shop_admin/orderlistdelete.php
@ -0,0 +1,35 @@
+<?php
+$sub_menu = '400400';
+include_once('./_common.php');
+
+//print_r2($_POST); exit;
+
+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' ");
+    if (!$od) continue;
+
+    $data = serialize($od);
+
+    $sql = " insert {$g5['g5_shop_order_delete_table']} set de_key = '$od_id', de_data = '$data', mb_id = '{$member['mb_id']}', de_ip = '{$_SERVER['REMOTE_ADDR']}', de_datetime = '".G5_TIME_YMDHIS."' ";
+    sql_query($sql, true);
+
+    $sql = " delete from {$g5['g5_shop_order_table']} where od_id = '$od_id' ";
+    sql_query($sql);
+}
+
+$qstr  = "sort1=$sort1&amp;sort2=$sort2&amp;sel_field=$sel_field&amp;search=$search";
+$qstr .= "&amp;od_status=$search_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";
+
+goto_url("./orderlist.php?$qstr");
+?>
--- a/adm/shop_admin/orderlistupdate.php
+++ b/adm/shop_admin/orderlistupdate.php
@ -156,7 +156,6 @@ for ($i=0; $i<count($_POST['chk']); $i++)
                $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);
--- a/css/admin.css
+++ b/css/admin.css
@ -353,7 +353,7 @@ td.td_grpset {width:160px;border-left:1px solid #e9ecee;text-align:center}
 .td_mng .mng_del, .td_mngsmall .mng_del {}
 .td_num {width:60px;text-align:center}
 .td_numbig {width:100px;text-align:center}
-.td_numcancel {color:#999;text-align:center;text-decoration:line-through}
+.td_numcancel {color:#999;text-align:center;}
 .td_numcoupon {color:#86b325;text-align:center}
 .td_numincome {color:#357dbb;text-align:center}
 .td_numsmall {width:30px;text-align:center}
--- a/extend/shop.extend2.php
+++ b/extend/shop.extend2.php
@ -627,4 +627,14 @@ if(!sql_query(" select od_delivery_company from {$g5['g5_shop_order_table']} lim
    sql_query(" ALTER TABLE `{$g5['g5_shop_order_table']}`
                    CHANGE `dl_id` `od_delivery_company` varchar(255) NOT NULL DEFAULT '' ", true);
 }
+
+// 주문서 삭제 테이블추가
+if(!sql_query(" DESCRIBE `{$g5['g5_shop_order_delete_table']}` ", false)) {
+    sql_query(" CREATE TABLE IF NOT EXISTS `{$g5['g5_shop_order_delete_table']}` (
+                  `de_id` int(11) NOT NULL AUTO_INCREMENT,
+                  `de_key` varchar(255) NOT NULL,
+                  `de_data` longtext NOT NULL,
+                  PRIMARY KEY (`de_id`)
+                )", true);
+}
 ?>
--- 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`
 --
--- 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");
--- a/mobile/shop/iteminfo.php
+++ b/mobile/shop/iteminfo.php
@ -61,7 +61,7 @@ function pg_anchor($info) {
        <?php if ($default['de_baesong_content']) { ?><li><a href="<?php echo $href; ?>&amp;info=dvr" <?php if ($info == 'dvr') echo 'class="sanchor_on"'; ?>>배송정보</a></li><?php } ?>
        <?php if ($default['de_change_content']) { ?><li><a href="<?php echo $href; ?>&amp;info=ex" <?php if ($info == 'ex') echo 'class="sanchor_on"'; ?>>교환정보</a></li><?php } ?>
        <li><a href="<?php echo $href; ?>&amp;info=rel" <?php if ($info == 'rel') echo 'class="sanchor_on"'; ?>>관련상품 <span class="item_relation_count"><?php echo $item_relation_count; ?></span></a></li>
-        <li><button type="button" id="iteminfo_close" onclick="self.close();">닫기</button></li>
+        <li><button type="button" id="iteminfo_close" onclick="self.close();">창닫기</button></li>
    </ul>
 <?php
 }
@ -95,7 +95,7 @@ switch($info) {
 </div>

 <div id="menu_button" class="menu_hidden">
-    <button type="button">메뉴열기</button>
+    <button type="button"><b>1</b>메뉴열기</button>
 </div>
 <div id="menu_list">
    <?php echo pg_anchor($info); ?>
@ -128,7 +128,7 @@ $(function() {
        $("#menu_list").animate(
            { bottom: ani_direction }, duration,
            function() {
-                $this.toggleClass("menu_opened").text(button_text);
+                $this.toggleClass("menu_opened").html("<span></span>"+button_text);
            }
        );
    });
@ -153,7 +153,7 @@ function content_scroll()
    $("#menu_button")
        .css("bottom", 0)
        .removeClass("menu_hidden")
-        .children().removeClass("menu_opened").text("메뉴열기");
+        .children().removeClass("menu_opened").html("<span></span>메뉴열기");

    $("#menu_list")
        .css("bottom", "-"+mlh+"px")
--- a/mobile/skin/shop/basic/img/arr_down01.gif
+++ b/mobile/skin/shop/basic/img/arr_down01.gif
--- a/mobile/skin/shop/basic/img/arr_up01.gif
+++ b/mobile/skin/shop/basic/img/arr_up01.gif
--- a/mobile/skin/shop/basic/style.css
+++ b/mobile/skin/shop/basic/style.css
@ -81,7 +81,22 @@
 /* 상품상세 */
 #info_content {width:100%;height:100%}
 #menu_button {position:fixed;left:0;bottom:0;width:100%;height:40px;text-align:center}
-#menu_list {position:fixed;left:0;bottom:0}
+#menu_button button {position:relative;margin:0;padding:0;width:20%;height:40px;border:0;background:transparent}
+#menu_button button span {display:inline-block;position:absolute;top:0;left:0;width:100%;height:100%;background:url('img/arr_up01.gif') #000 center 15px no-repeat}
+#menu_button button.menu_opened {background:#ff3061;color:#fff}
+#menu_button button.menu_opened span {background:url('img/arr_down01.gif') #000 center 15px no-repeat}
+
+#menu_list {position:fixed;left:0;bottom:0;width:100%;border-top:1px solid #000;background:#f0f1f2}
+#menu_list ul {margin:0;padding:0;border:0}
+#menu_list li {margin:0;padding:0;width:19%}
+#menu_list li:nth-of-type(1) {width:15%}
+#menu_list li:nth-of-type(4), #menu_list li:nth-of-type(5) {width:14%}
+#menu_list a {display:block;padding:15px 0;border:0;border-right:1px solid #e9e9e9;font-size:0.95em;text-align:center;letter-spacing:-0.1em}
+#menu_list a:focus, #menu_list a:hover {background:#f0f1f2;color:#000}
+#menu_list li:nth-of-type(6) a {border:0}
+#menu_list li:nth-last-of-type(1) {width:100%}
+#menu_list button {margin:0;padding:15px 0;width:100%;border:0;border-top:1px solid #e9e9e9;background:#fff;color:#000}
+
 .menu_hidden {display:none}

 /* 로딩안내 레이어 */
--- a/shop/kcp/pp_ax_hub.php
+++ b/shop/kcp/pp_ax_hub.php
@ -24,7 +24,8 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
        $g_conf_log_dir   = G5_SHOP_PATH.'/kcp/log';
    }

-    $g_conf_site_cd = $_POST['site_cd'];
+    $g_conf_site_cd  = $_POST['site_cd'];
+    $g_conf_site_key = $default['de_kcp_mid'];

    if (preg_match("/^T000/", $g_conf_site_cd) || $default['de_card_test']) {
        $g_conf_gw_url  = "testpaygw.kcp.co.kr";                    // real url : paygw.kcp.co.kr , test url : testpaygw.kcp.co.kr
--- a/shop/orderformupdate.php
+++ b/shop/orderformupdate.php
@ -281,7 +281,7 @@ else if ($od_settle_case == "계좌이체")
    $od_receipt_time    = preg_replace("/([0-9]{4})([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})/", "\\1-\\2-\\3 \\4:\\5:\\6", $app_time);
    $od_bank_account    = $od_settle_case;
    $od_deposit_name    = $od_name;
-    $bank_name          = iconv("cp949", "utf8", $bank_name);
+    $bank_name          = iconv("cp949", "utf-8", $bank_name);
    $od_bank_account    = $bank_name;
    $pg_price           = $amount;
    $od_misu            = $i_price - $od_receipt_price;
@ -294,9 +294,9 @@ else if ($od_settle_case == "가상계좌")
    $od_receipt_point   = $i_temp_point;
    $od_tno             = $tno;
    $od_receipt_price   = 0;
-    $bankname           = iconv("cp949", "utf8", $bankname);
-    $depositor          = iconv("cp949", "utf8", $depositor);
-    $od_bank_account    = $bankname.' '.$account.' '.$depositor;
+    $bankname           = iconv("cp949", "utf-8", $bankname);
+    $depositor          = iconv("cp949", "utf-8", $depositor);
+    $od_bank_account    = $bankname.' '.$account;
    $od_deposit_name    = $depositor;
    $pg_price           = $amount;
    $od_misu            = $i_price - $od_receipt_price;
@ -324,7 +324,7 @@ else if ($od_settle_case == "신용카드")
    $od_receipt_price   = $amount;
    $od_receipt_point   = $i_temp_point;
    $od_receipt_time    = preg_replace("/([0-9]{4})([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})/", "\\1-\\2-\\3 \\4:\\5:\\6", $app_time);
-    $card_name          = iconv("cp949", "utf8", $card_name);
+    $card_name          = iconv("cp949", "utf-8", $card_name);
    $od_bank_account    = $card_name;
    $pg_price           = $amount;
    $od_misu            = $i_price - $od_receipt_price;