From 6700dc83ec90ceff3f2e030404e9c92e15a558ed Mon Sep 17 00:00:00 2001 From: whitedot Date: Tue, 11 Jun 2013 11:42:58 +0900 Subject: [PATCH 01/20] =?UTF-8?q?=EA=B4=80=EB=A6=AC=EC=9E=90:=20=EB=AA=A9?= =?UTF-8?q?=EB=A1=9D=20=EC=A4=91=20=EA=B4=80=EB=A6=AC=20=EB=B6=80=EB=B6=84?= =?UTF-8?q?=20=EB=B2=84=ED=8A=BC+=ED=8C=9D=EC=97=85=EB=A0=88=EC=9D=B4?= =?UTF-8?q?=EC=96=B4=EB=A1=9C=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adm/board_list.php | 14 +++++++++++--- adm/boardgroup_list.php | 11 +++++++++-- adm/member_list.php | 16 ++++++++++++---- adm/poll_list.php | 11 +++++++++-- css/admin.css | 11 ++++++++++- css/default.css | 9 +++++++++ js/common.js | 34 ++++++++++++++++++++++++++++++++-- 7 files changed, 92 insertions(+), 14 deletions(-) diff --git a/adm/board_list.php b/adm/board_list.php index f63296f83..a8f821efc 100644 --- a/adm/board_list.php +++ b/adm/board_list.php @@ -115,8 +115,8 @@ $colspan = 15; 수정'; - $one_copy = '복사'; + $one_update = '
  • 수정
    • '; + $one_copy = '
  • 복사
    • '; ?> @@ -156,7 +156,15 @@ $colspan = 15; - + +
    + + +
    + 수정'; + $s_upd = '
  • 수정
    • '; ?> @@ -160,7 +160,14 @@ $colspan = 8; - + +
    + + +
    + 수정'; - //$s_del = '삭제'; + $s_mod = '
  • 수정
    • '; + //$s_del = '
  • 삭제
    • '; } - $s_grp = '그룹'; + $s_grp = '
  • 그룹
    • '; $leave_date = $row['mb_leave_date'] ? $row['mb_leave_date'] : date('Ymd', G4_SERVER_TIME); $intercept_date = $row['mb_intercept_date'] ? $row['mb_intercept_date'] : date('Ymd', G4_SERVER_TIME); @@ -199,7 +199,15 @@ $colspan = 15; -
    + +
    + + +
    + >
    diff --git a/adm/poll_list.php b/adm/poll_list.php index b198bd513..fad175aba 100644 --- a/adm/poll_list.php +++ b/adm/poll_list.php @@ -103,7 +103,7 @@ $colspan = 6; $row2 = sql_fetch($sql2); $po_etc = ($row['po_etc']) ? "사용" : "미사용"; - $s_mod = '수정'; + $s_mod = '
  • 수정
    • '; //$s_del = '삭제'; ?> @@ -116,7 +116,14 @@ $colspan = 6; - + +
    + + +
    + Date: Tue, 11 Jun 2013 11:46:21 +0900 Subject: [PATCH 02/20] =?UTF-8?q?=EA=B4=80=EB=A6=AC=EC=9E=90:=20qnb=20?= =?UTF-8?q?=EC=9E=90=EA=B0=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- css/admin.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/css/admin.css b/css/admin.css index 237dcaaae..1084e5656 100644 --- a/css/admin.css +++ b/css/admin.css @@ -73,7 +73,7 @@ h2 {font-size:1.2em} #qnb {float:right;margin:0;padding:0;list-style:none} #qnb li {margin-bottom:20px} -#qnb a {display:block;width:40px;font-size:0.9em;letter-spacing:-0.1em;text-align:center} +#qnb a {display:block;width:40px;font-size:0.9em;text-align:center;letter-spacing:-0.1em} #qnb a:focus, #qnb a:hover, #qnb a:active {text-decoration:none} #qnb img {margin-bottom:5px} From 9b99c8e7374032089f89c8e069b0701833981dc0 Mon Sep 17 00:00:00 2001 From: whitedot Date: Tue, 11 Jun 2013 11:46:41 +0900 Subject: [PATCH 03/20] =?UTF-8?q?=EA=B4=80=EB=A6=AC=EC=9E=90:=20qnb=20?= =?UTF-8?q?=EC=9E=90=EA=B0=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- css/admin.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/css/admin.css b/css/admin.css index 4f479b5f4..ac802d6eb 100644 --- a/css/admin.css +++ b/css/admin.css @@ -76,7 +76,7 @@ h2 {font-size:1.2em} #qnb {float:right;margin:0;padding:0;list-style:none} #qnb li {margin-bottom:20px} -#qnb a {display:block;width:40px;font-size:0.9em;text-align:center} +#qnb a {display:block;width:40px;font-size:0.9em;text-align:center;letter-spacing:-0.1em} #qnb a:focus, #qnb a:hover, #qnb a:active {text-decoration:none} #qnb img {margin-bottom:5px} From a22c520ba72ca1110eb409d58798130e7ba8eb56 Mon Sep 17 00:00:00 2001 From: chicpro Date: Tue, 11 Jun 2013 11:48:10 +0900 Subject: [PATCH 04/20] =?UTF-8?q?#209=20=EA=B2=B0=EC=A0=9C=ED=95=A0?= =?UTF-8?q?=EC=9D=B8=20=EC=BF=A0=ED=8F=B0=20=EC=8A=A4=ED=81=AC=EB=A6=BD?= =?UTF-8?q?=ED=8A=B8=EC=97=90=EC=84=9C=20sendcost=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mobile/shop/orderform.php | 1 - shop/orderform.php | 1 - 2 files changed, 2 deletions(-) diff --git a/mobile/shop/orderform.php b/mobile/shop/orderform.php index d9695da91..2ba6e7def 100644 --- a/mobile/shop/orderform.php +++ b/mobile/shop/orderform.php @@ -780,7 +780,6 @@ $(function() { $("#od_coupon_frm").remove(); var $this = $(this); var amount = parseInt($("input[name=org_od_amount]").val()); - var send_cost = parseInt($("input[name=org_send_cost]").val()); $.post( "./ordercoupon.php", { amount: amount }, diff --git a/shop/orderform.php b/shop/orderform.php index 2163f6507..b036c67f4 100644 --- a/shop/orderform.php +++ b/shop/orderform.php @@ -988,7 +988,6 @@ $(function() { $("#od_coupon_frm").remove(); var $this = $(this); var amount = parseInt($("input[name=org_od_amount]").val()); - var send_cost = parseInt($("input[name=org_send_cost]").val()); $.post( "./ordercoupon.php", { amount: amount }, From e04fafdad9c4ab9dbd352a195a63f7151d0f2071 Mon Sep 17 00:00:00 2001 From: whitedot Date: Tue, 11 Jun 2013 13:53:48 +0900 Subject: [PATCH 05/20] =?UTF-8?q?=EC=87=BC=ED=95=91=EB=AA=B0=EA=B4=80?= =?UTF-8?q?=EB=A6=AC=EC=9E=90:=20#219=20=EC=95=84=EC=9D=B4=EC=BD=98=20?= =?UTF-8?q?=EB=B3=80=EA=B2=BD=20=EC=9A=94=EC=B2=AD=20=EC=B2=98=EB=A6=AC=20?= =?UTF-8?q?=EC=99=84=EB=A3=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adm/shop_admin/bannerlist.php | 11 +++-- adm/shop_admin/categorylist.php | 20 ++++++--- adm/shop_admin/contentlist.php | 13 ++++-- adm/shop_admin/couponlist.php | 9 ++++- adm/shop_admin/deliverycodelist.php | 13 ++++-- adm/shop_admin/faqlist.php | 23 ++++++----- adm/shop_admin/faqmasterlist.php | 19 +++++---- adm/shop_admin/itemlist.php | 15 ++++--- adm/shop_admin/itempslist.php | 11 +++-- adm/shop_admin/itemqalist.php | 11 +++-- adm/shop_admin/itemstocklist.php | 9 ++++- adm/shop_admin/itemtypelist.php | 49 ++++++++++++---------- adm/shop_admin/newwinlist.php | 35 +++++++++------- adm/shop_admin/optionstocklist.php | 9 ++++- adm/shop_admin/orderlist.php | 63 ++++++++++++++++------------- 15 files changed, 198 insertions(+), 112 deletions(-) diff --git a/adm/shop_admin/bannerlist.php b/adm/shop_admin/bannerlist.php index 474b11b53..4d2e0ea62 100644 --- a/adm/shop_admin/bannerlist.php +++ b/adm/shop_admin/bannerlist.php @@ -81,9 +81,14 @@ $from_record = ($page - 1) * $rows; // 시작 열을 구함 - - 배너수정 - 배너삭제 + +
    + + +
    diff --git a/adm/shop_admin/categorylist.php b/adm/shop_admin/categorylist.php index 3df814e25..7b7ca8501 100644 --- a/adm/shop_admin/categorylist.php +++ b/adm/shop_admin/categorylist.php @@ -129,13 +129,13 @@ if ($sfl || $stx) // 검색렬일 때만 처음 버튼을 보여줌 $s_level = ''; $s_level_input_size = 40 - $level *5; // 하위 분류일 수록 입력칸 넓이 작아짐 - 지운아빠 2013-04-02 - if ($level+2 < 6) $s_add = ''.($level+2).'단 추가'; // 분류는 5단계까지만 가능 + if ($level+2 < 6) $s_add = '
  • '.($level+2).'단 추가
    • '; // 분류는 5단계까지만 가능 else $s_add = ''; - $s_upd = ''.get_text($row['ca_name']).' 수정'; - $s_vie = ''.get_text($row['ca_name']).' 이동'; + $s_upd = '
  • '.get_text($row['ca_name']).' 수정
    • '; + $s_vie = '
  • '.get_text($row['ca_name']).' 이동
    • '; if ($is_admin == 'super') - $s_del = ''.get_text($row['ca_name']).' 삭제'; + $s_del = '
  • '.get_text($row['ca_name']).' 삭제
    • '; // 해당 분류에 속한 상품의 갯수 $sql1 = " select COUNT(*) as cnt from {$g4['shop_item_table']} @@ -162,7 +162,17 @@ if ($sfl || $stx) // 검색렬일 때만 처음 버튼을 보여줌 > - + +
    + +
      + + + + +
    +
    + 자료가 한 건도 없습니다.\n"; diff --git a/adm/shop_admin/contentlist.php b/adm/shop_admin/contentlist.php index f86ba1721..de11c2c15 100644 --- a/adm/shop_admin/contentlist.php +++ b/adm/shop_admin/contentlist.php @@ -45,10 +45,15 @@ $result = sql_query($sql); - - <?php echo htmlspecialchars2($row['co_subject']); ?> 보기 - <?php echo htmlspecialchars2($row['co_subject']); ?> 수정 - <?php echo htmlspecialchars2($row['co_subject']); ?> 삭제 + +
    + + +
    ~ - <?php echo $row['cp_id']; ?> 수정 + +
    + + +
    + - - <?php echo stripslashes($row['dl_company']); ?> 홈페이지 - <?php echo stripslashes($row['dl_company']); ?> 수정 - <?php echo stripslashes($row['dl_company']); ?> 삭제 + +
    + + +
    - - - - - - <?php echo stripslashes($row['fa_subject']); ?> 수정 - <?php echo stripslashes($row['fa_subject']); ?> 삭제 - - + + + + + +
    + + +
    + +
  • FAQ는 무제한으로 등록할 수 있습니다
  • FAQ추가를 눌러 FAQ Master를 생성합니다. (하나의 FAQ 타이틀 생성 : 자주하시는 질문, 이용안내..등 )
    • -
  • 생성한 FAQ Master 의 상세보기를 눌러 세부 내용을 관리할 수 있습니다.
    • +
  • 생성한 FAQ Master 의 제목을 눌러 세부 내용을 관리할 수 있습니다.
    • @@ -47,7 +47,6 @@ $result = sql_query($sql); ID 제목 FAQ수 - 상세보기 관리 @@ -59,13 +58,17 @@ $result = sql_query($sql); ?> - + - 상세보기 - - <?php echo stripslashes($row['fm_subject']); ?> 보기 - <?php echo stripslashes($row['fm_subject']); ?> 수정 - <?php echo stripslashes($row['fm_subject']); ?> 삭제 + +
    + + +
    value="1"> - - <?php echo htmlspecialchars2(cut_str($row['it_name'],250, 보기"> - <?php echo htmlspecialchars2(cut_str($row['it_name'],250, 복사"> - <?php echo htmlspecialchars2(cut_str($row['it_name'],250, 수정"> - + +
    + + +
    diff --git a/adm/shop_admin/itempslist.php b/adm/shop_admin/itempslist.php index 062ba8adf..21677dadb 100644 --- a/adm/shop_admin/itempslist.php +++ b/adm/shop_admin/itempslist.php @@ -134,9 +134,14 @@ if ($sfl || $stx) // 검색렬일 때만 처음 버튼을 보여줌 - - <?php echo $row['is_subject']; ?> 수정 - <?php echo $row['is_subject']; ?> 삭제 + +
    + + +
    diff --git a/adm/shop_admin/itemqalist.php b/adm/shop_admin/itemqalist.php index fe8cb965e..865595a36 100644 --- a/adm/shop_admin/itemqalist.php +++ b/adm/shop_admin/itemqalist.php @@ -129,9 +129,14 @@ if ($sfl || $stx) // 검색 결과일 때만 처음 버튼을 보여줌 - - <?php echo $row['iq_subject']; ?> 수정 - <?php echo $row['iq_subject']; ?> 삭제 + +
    + + +
    > - 수정 + +
    + + +
    + - - - - - - - - > - > - > - > - > - <?php echo cut_str(stripslashes($row['it_name']), 60, 수정"> - - + + + + + + + > + > + > + > + > + +
    + + +
    + + + 자료가 없습니다.'; - ?> + if (!$i) + echo '자료가 없습니다.'; + ?> diff --git a/adm/shop_admin/newwinlist.php b/adm/shop_admin/newwinlist.php index fc8e480ed..dcd9ec7c4 100644 --- a/adm/shop_admin/newwinlist.php +++ b/adm/shop_admin/newwinlist.php @@ -41,21 +41,26 @@ $result = sql_query($sql); - - - - - - 시간 - px - px - px - px - - <?php echo $row['nw_subject']; ?> 수정 - <?php echo $row['nw_subject']; ?> 삭제 - - + + + + + + 시간 + px + px + px + px + +
    + + +
    + + > - 수정 + +
    + + +
    + - - - - -
    - 주문일시 -     - - - -
    - - - - - 건
    누적 건 - - - - - - - - - <?php echo $lines[$i]['od_id']; ?> 수정 - <?php echo $lines[$i]['od_id']; ?> 삭제 - - + ?> + + + + +
    + 주문일시 +     + + + +
    + + + + + 건
    누적 건 + + + + + + + + +
    + + +
    + + Date: Tue, 11 Jun 2013 13:55:38 +0900 Subject: [PATCH 06/20] =?UTF-8?q?=EB=B0=B0=EC=86=A1=EB=B9=84=20=EC=BF=A0?= =?UTF-8?q?=ED=8F=B0=20=EA=B8=88=EC=95=A1=20=EA=B3=84=EC=82=B0=20=EC=98=A4?= =?UTF-8?q?=EB=A5=98=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mobile/shop/orderformupdate.php | 2 +- shop/orderformupdate.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mobile/shop/orderformupdate.php b/mobile/shop/orderformupdate.php index e8050dabc..34b98de7b 100644 --- a/mobile/shop/orderformupdate.php +++ b/mobile/shop/orderformupdate.php @@ -206,7 +206,7 @@ if($is_member && $send_cost > 0) { $dc = 0; if($cp['cp_id'] && ($cp['cp_minimum'] <= $tot_od_amount)) { if($cp['cp_type']) { - $dc = floor(($tot_od_amount * ($cp['cp_amount'] / 100)) / $cp['cp_trunc']) * $cp['cp_trunc']; + $dc = floor(($send_cost * ($cp['cp_amount'] / 100)) / $cp['cp_trunc']) * $cp['cp_trunc']; } else { $dc = $cp['cp_amount']; } diff --git a/shop/orderformupdate.php b/shop/orderformupdate.php index ab900a55f..a920ef833 100644 --- a/shop/orderformupdate.php +++ b/shop/orderformupdate.php @@ -200,7 +200,7 @@ if($is_member && $send_cost > 0) { $dc = 0; if($cp['cp_id'] && ($cp['cp_minimum'] <= $tot_od_amount)) { if($cp['cp_type']) { - $dc = floor(($tot_od_amount * ($cp['cp_amount'] / 100)) / $cp['cp_trunc']) * $cp['cp_trunc']; + $dc = floor(($send_cost * ($cp['cp_amount'] / 100)) / $cp['cp_trunc']) * $cp['cp_trunc']; } else { $dc = $cp['cp_amount']; } From 5b2aa2fe5356f71bdadbeed6d70c77e2d0744be7 Mon Sep 17 00:00:00 2001 From: whitedot Date: Tue, 11 Jun 2013 13:57:46 +0900 Subject: [PATCH 07/20] =?UTF-8?q?=EC=87=BC=ED=95=91=EB=AA=B0=EA=B4=80?= =?UTF-8?q?=EB=A6=AC=EC=9E=90:=20#216=20=EB=A9=94=EB=89=B4=20=EA=B5=AC?= =?UTF-8?q?=EB=B6=84=20=EC=84=B8=EB=B6=84=ED=99=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adm/admin.menu400.shop_1of2.php | 10 ++-------- adm/admin.menu500.shop_2of2.php | 6 ++++++ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/adm/admin.menu400.shop_1of2.php b/adm/admin.menu400.shop_1of2.php index f7f51a296..e0bc6e24c 100644 --- a/adm/admin.menu400.shop_1of2.php +++ b/adm/admin.menu400.shop_1of2.php @@ -15,14 +15,8 @@ $menu['menu400'] = array ( array('400610', '상품유형관리', G4_ADMIN_URL.'/shop_admin/itemtypelist.php', 'scf_item_type'), array('400500', '상품옵션재고관리', G4_ADMIN_URL.'/shop_admin/optionstocklist.php', 'scf_item_option'), array('400490', '마일리지관리', G4_ADMIN_URL.'/shop_admin/mileagelist.php', 'scf_mileage'), - array('400500', '배송일괄처리', G4_ADMIN_URL.'/shop_admin/deliverylist.php', 'scf_deli', 1), - array('400740', '배송업체관리', G4_ADMIN_URL.'/shop_admin/deliverycodelist.php', 'scf_deli_co', 1), - array('400630', '이벤트관리', G4_ADMIN_URL.'/shop_admin/itemevent.php', 'scf_event'), - array('400640', '이벤트일괄처리', G4_ADMIN_URL.'/shop_admin/itemeventlist.php', 'scf_event_mng'), array('400650', '쿠폰관리', G4_ADMIN_URL.'/shop_admin/couponlist.php', 'scf_coupon'), - array('400700', '내용관리', G4_ADMIN_URL.'/shop_admin/contentlist.php', 'scf_contents', 1), - array('400710', 'FAQ관리', G4_ADMIN_URL.'/shop_admin/faqmasterlist.php', 'scf_faq', 1), - array('400730', '배너관리', G4_ADMIN_URL.'/shop_admin/bannerlist.php', 'scf_banner', 1), - array('400720', '팝업레이어관리', G4_ADMIN_URL.'/shop_admin/newwinlist.php', 'scf_poplayer', 1) + array('400500', '배송일괄처리', G4_ADMIN_URL.'/shop_admin/deliverylist.php', 'scf_deli', 1), + array('400740', '배송업체관리', G4_ADMIN_URL.'/shop_admin/deliverycodelist.php', 'scf_deli_co', 1) ); ?> \ No newline at end of file diff --git a/adm/admin.menu500.shop_2of2.php b/adm/admin.menu500.shop_2of2.php index ea761e56d..815b527b6 100644 --- a/adm/admin.menu500.shop_2of2.php +++ b/adm/admin.menu500.shop_2of2.php @@ -7,6 +7,12 @@ $menu['menu500'] = array ( array('500100', '상품판매순위', G4_ADMIN_URL.'/shop_admin/itemsellrank.php', 'sst_rank'), array('500120', '주문내역출력', G4_ADMIN_URL.'/shop_admin/orderprint.php', 'sst_print_order', 1), array('500130', '전자결제내역', G4_ADMIN_URL.'/shop_admin/ordercardhistory.php', 'sst_pg', 1), + array('400630', '이벤트관리', G4_ADMIN_URL.'/shop_admin/itemevent.php', 'scf_event'), + array('400640', '이벤트일괄처리', G4_ADMIN_URL.'/shop_admin/itemeventlist.php', 'scf_event_mng'), + array('400700', '내용관리', G4_ADMIN_URL.'/shop_admin/contentlist.php', 'scf_contents', 1), + array('400710', 'FAQ관리', G4_ADMIN_URL.'/shop_admin/faqmasterlist.php', 'scf_faq', 1), + array('400730', '배너관리', G4_ADMIN_URL.'/shop_admin/bannerlist.php', 'scf_banner', 1), + array('400720', '팝업레이어관리', G4_ADMIN_URL.'/shop_admin/newwinlist.php', 'scf_poplayer', 1), array('500140', '보관함현황', G4_ADMIN_URL.'/shop_admin/wishlist.php', 'sst_wish'), array('500200', 'SMS 문자전송', G4_ADMIN_URL.'/shop_admin/smssend.php', 'sst_sms'), array('500210', '가격비교사이트', G4_ADMIN_URL.'/shop_admin/price.php', 'sst_compare', 1) From 567b5a7ed211ae5aaa3ba0126799e5d270dc1170 Mon Sep 17 00:00:00 2001 From: whitedot Date: Tue, 11 Jun 2013 13:58:17 +0900 Subject: [PATCH 08/20] =?UTF-8?q?=EC=87=BC=ED=95=91=EB=AA=B0=EA=B4=80?= =?UTF-8?q?=EB=A6=AC=EC=9E=90:=20#219=20=EC=95=84=EC=9D=B4=EC=BD=98=20?= =?UTF-8?q?=EB=B3=80=EA=B2=BD=20=EC=9A=94=EC=B2=AD=20=EC=B2=98=EB=A6=AC=20?= =?UTF-8?q?=EC=99=84=EB=A3=8C2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adm/shop_admin/optionstocklist.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adm/shop_admin/optionstocklist.php b/adm/shop_admin/optionstocklist.php index 7a5307533..06e76de06 100644 --- a/adm/shop_admin/optionstocklist.php +++ b/adm/shop_admin/optionstocklist.php @@ -198,7 +198,7 @@ if ($search) // 검색 결과일 때만 처음 버튼을 보여줌
    From 77f4d077f744986a4df8a9c53bf79dd6a0bc024a Mon Sep 17 00:00:00 2001 From: chicpro Date: Tue, 11 Jun 2013 14:00:46 +0900 Subject: [PATCH 09/20] =?UTF-8?q?#221=20=EC=95=84=EC=9D=B4=EB=94=94=20?= =?UTF-8?q?=ED=81=B4=EB=A6=AD=EC=8B=9C=20=EC=BF=BC=EB=A6=AC=20=EC=98=A4?= =?UTF-8?q?=EB=A5=98=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adm/shop_admin/orderlist.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/adm/shop_admin/orderlist.php b/adm/shop_admin/orderlist.php index b72336491..0da2e4da1 100644 --- a/adm/shop_admin/orderlist.php +++ b/adm/shop_admin/orderlist.php @@ -13,6 +13,9 @@ if ($search != "") { if ($sel_field != "") { + if($sel_field == 'mb_id') + $sel_field = 'a.'.$sel_field; + $sql_search .= " $where $sel_field like '%$search%' "; $where = " and "; } From 59a6ed76a59ad717a47d69c343c84dbeb262fc9f Mon Sep 17 00:00:00 2001 From: whitedot Date: Tue, 11 Jun 2013 15:25:43 +0900 Subject: [PATCH 10/20] =?UTF-8?q?M=EC=87=BC=ED=95=91=EB=AA=B0:=20#222=20?= =?UTF-8?q?=EC=9E=A5=EB=B0=94=EA=B5=AC=EB=8B=88=20=EC=84=A0=ED=83=9D?= =?UTF-8?q?=EC=98=B5=EC=85=98=20=EC=8A=A4=ED=81=AC=EB=A1=A4=EB=B0=94=20?= =?UTF-8?q?=EC=95=88=EB=93=9C=EB=A1=9C=EC=9D=B4=EB=93=9C=20=EC=B2=98?= =?UTF-8?q?=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- css/mobile_shop.css | 1 + js/modernizr.custom.70111.js | 4 ++++ mobile/shop/shop.head.php | 3 +++ 3 files changed, 8 insertions(+) create mode 100644 js/modernizr.custom.70111.js diff --git a/css/mobile_shop.css b/css/mobile_shop.css index 51a28c88c..e98c6a75a 100644 --- a/css/mobile_shop.css +++ b/css/mobile_shop.css @@ -311,6 +311,7 @@ a.sanchor_on {background:#626870;color:#fff !important;text-decoration:none} #sod_bsk_list {position:relative} #sod_bsk_list #mod_option_frm {z-index:10000;position:absolute;top:0;left:0;padding:20px;width:320px;height:auto !important;height:480px;max-height:480px;border:1px solid #000;background:#f5f6fa;overflow-y:scroll} +html.no-overflowscrolling #mod_option_frm {height:auto;max-height:10000px !important} #sod_bsk_dvr {padding:0.3em 0 1em;border-bottom:1px solid #e9e9e9} #sod_bsk_cnt {margin:0 0 1em;padding:1em 0;border-bottom:1px solid #e9e9e9;background:#f5f6fa} diff --git a/js/modernizr.custom.70111.js b/js/modernizr.custom.70111.js new file mode 100644 index 000000000..1a81489fb --- /dev/null +++ b/js/modernizr.custom.70111.js @@ -0,0 +1,4 @@ +/* Modernizr 2.6.2 (Custom Build) | MIT & BSD + * Build: http://modernizr.com/download/#-cssclasses-testallprops-css_overflow_scrolling + */ +;window.Modernizr=function(a,b,c){function x(a){j.cssText=a}function y(a,b){return x(prefixes.join(a+";")+(b||""))}function z(a,b){return typeof a===b}function A(a,b){return!!~(""+a).indexOf(b)}function B(a,b){for(var d in a){var e=a[d];if(!A(e,"-")&&j[e]!==c)return b=="pfx"?e:!0}return!1}function C(a,b,d){for(var e in a){var f=b[a[e]];if(f!==c)return d===!1?a[e]:z(f,"function")?f.bind(d||b):f}return!1}function D(a,b,c){var d=a.charAt(0).toUpperCase()+a.slice(1),e=(a+" "+n.join(d+" ")+d).split(" ");return z(b,"string")||z(b,"undefined")?B(e,b):(e=(a+" "+o.join(d+" ")+d).split(" "),C(e,b,c))}var d="2.6.2",e={},f=!0,g=b.documentElement,h="modernizr",i=b.createElement(h),j=i.style,k,l={}.toString,m="Webkit Moz O ms",n=m.split(" "),o=m.toLowerCase().split(" "),p={},q={},r={},s=[],t=s.slice,u,v={}.hasOwnProperty,w;!z(v,"undefined")&&!z(v.call,"undefined")?w=function(a,b){return v.call(a,b)}:w=function(a,b){return b in a&&z(a.constructor.prototype[b],"undefined")},Function.prototype.bind||(Function.prototype.bind=function(b){var c=this;if(typeof c!="function")throw new TypeError;var d=t.call(arguments,1),e=function(){if(this instanceof e){var a=function(){};a.prototype=c.prototype;var f=new a,g=c.apply(f,d.concat(t.call(arguments)));return Object(g)===g?g:f}return c.apply(b,d.concat(t.call(arguments)))};return e});for(var E in p)w(p,E)&&(u=E.toLowerCase(),e[u]=p[E](),s.push((e[u]?"":"no-")+u));return e.addTest=function(a,b){if(typeof a=="object")for(var d in a)w(a,d)&&e.addTest(d,a[d]);else{a=a.toLowerCase();if(e[a]!==c)return e;b=typeof b=="function"?b():b,typeof f!="undefined"&&f&&(g.className+=" "+(b?"":"no-")+a),e[a]=b}return e},x(""),i=k=null,e._version=d,e._domPrefixes=o,e._cssomPrefixes=n,e.testProp=function(a){return B([a])},e.testAllProps=D,g.className=g.className.replace(/(^|\s)no-js(\s|$)/,"$1$2")+(f?" js "+s.join(" "):""),e}(this,this.document),Modernizr.addTest("overflowscrolling",function(){return Modernizr.testAllProps("overflowScrolling")}); \ No newline at end of file diff --git a/mobile/shop/shop.head.php b/mobile/shop/shop.head.php index b15ee0e68..843b00594 100644 --- a/mobile/shop/shop.head.php +++ b/mobile/shop/shop.head.php @@ -7,6 +7,9 @@ include_once(G4_LIB_PATH.'/connect.lib.php'); include_once(G4_LIB_PATH.'/popular.lib.php'); ?> + + +