From dbf74c9207d5afc0ee50adea2e6ff74fbf19272a Mon Sep 17 00:00:00 2001 From: gnuboard Date: Tue, 10 Sep 2013 17:09:06 +0900 Subject: [PATCH 1/5] =?UTF-8?q?=EC=A3=BC=EB=AC=B8=EA=B4=80=EB=A6=AC=20?= =?UTF-8?q?=EB=AA=A9=EB=A1=9D=20=EC=88=98=EC=A0=95=EC=A4=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adm/shop_admin/orderlist.php | 57 +++++++++++++++++++++++++++--------- 1 file changed, 43 insertions(+), 14 deletions(-) diff --git a/adm/shop_admin/orderlist.php b/adm/shop_admin/orderlist.php index beaf453c2..133d85121 100644 --- a/adm/shop_admin/orderlist.php +++ b/adm/shop_admin/orderlist.php @@ -7,26 +7,52 @@ auth_check($auth[$sub_menu], "r"); $g4['title'] = '주문내역'; include_once (G4_ADMIN_PATH.'/admin.head.php'); -$where = " where "; +$where = array(); + $sql_search = ""; -if ($search != "") -{ - if ($sel_field != "") - { - $sql_search .= " $where $sel_field like '%$search%' "; - $where = " and "; +if ($search != "") { + if ($sel_field != "") { + $where[] = " $sel_field like '%$search%' "; } - if ($save_search != $search) + if ($save_search != $search) { $page = 1; + } +} + +if ($od_status) { + $where[] = " od_status = '$od_status' "; + switch ($od_status) { + case G4_OD_STATUS_ORDER : // 입금확인중 + $sort1 = "od_id"; + $sort2 = "desc"; + break; + case G4_OD_STATUS_SETTLE : // 결제완료 + $sort1 = "od_receipt_time"; + $sort2 = "desc"; + break; + case G4_OD_STATUS_READY : // 배송준비중 + $sort1 = "od_receipt_time"; + $sort2 = "desc"; + break; + case G4_OD_STATUS_DELIVERY : // 배송중 + $sort1 = "od_invoice_time"; + $sort2 = "desc"; + break; + + + } +} + +if ($where) { + $sql_search = ' where '.implode(' and ', $where); } if ($sel_field == "") $sel_field = "od_id"; if ($sort1 == "") $sort1 = "od_id"; if ($sort2 == "") $sort2 = "desc"; -$sql_common = " from {$g4['shop_order_table']} - $sql_search "; +$sql_common = " from {$g4['shop_order_table']} $sql_search "; $sql = " select count(od_id) as cnt " . $sql_common; $row = sql_fetch($sql); @@ -37,10 +63,7 @@ $total_page = ceil($total_count / $rows); // 전체 페이지 계산 if ($page == "") { $page = 1; } // 페이지가 없으면 첫 페이지 (1 페이지) $from_record = ($page - 1) * $rows; // 시작 열을 구함 -$sql = " select *, "._MISU_QUERY_." - $sql_common - order by $sort1 $sort2 - limit $from_record, $rows "; +$sql = " select *, "._MISU_QUERY_." $sql_common order by $sort1 $sort2 limit $from_record, $rows "; $result = sql_query($sql, false); $qstr1 = "sel_field=$sel_field&search=$search&save_search=$search"; @@ -106,6 +129,12 @@ if ($search) // 검색렬일 때만 처음 버튼을 보여줌
  • ">미수금 순 정렬
  • + 주문상태 : + + From 3cf99851eedf33a8dc91bbecff25e1db71b0dad0 Mon Sep 17 00:00:00 2001 From: gnuboard Date: Wed, 11 Sep 2013 09:47:40 +0900 Subject: [PATCH 2/5] =?UTF-8?q?=EC=82=AC=EC=9A=A9=ED=95=98=EC=A7=80=20?= =?UTF-8?q?=EC=95=8A=EB=8A=94=20md5.js=20script=20=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- shop/item.php | 1 - 1 file changed, 1 deletion(-) diff --git a/shop/item.php b/shop/item.php index 70a2d49f7..516726e5b 100644 --- a/shop/item.php +++ b/shop/item.php @@ -149,7 +149,6 @@ function pg_anchor($anc_id) { - Date: Wed, 11 Sep 2013 14:27:56 +0900 Subject: [PATCH 3/5] =?UTF-8?q?=EC=BD=94=EB=93=9C=20=EC=A0=95=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- extend/shop.extend.php | 2 +- shop/itemqa.php | 4 +--- shop/itemqaform.php | 2 +- shop/itemuse.php | 13 +------------ shop/itemuseform.php | 17 +---------------- skin/shop/basic/list.10.skin.php | 2 +- skin/shop/basic/list.20.skin.php | 2 +- skin/shop/basic/list.30.skin.php | 2 +- skin/shop/basic/list.40.skin.php | 2 +- skin/shop/basic/main.10.skin.php | 2 +- skin/shop/basic/main.20.skin.php | 2 +- skin/shop/basic/main.30.skin.php | 2 +- skin/shop/basic/main.40.skin.php | 2 +- skin/shop/basic/main.50.skin.php | 2 +- skin/shop/basic/personalpay.skin.php | 2 +- 15 files changed, 15 insertions(+), 43 deletions(-) diff --git a/extend/shop.extend.php b/extend/shop.extend.php index 1b6ee0e24..bb13f0185 100644 --- a/extend/shop.extend.php +++ b/extend/shop.extend.php @@ -1,5 +1,5 @@ $(function(){ $(".itemqa_form").click(function(){ - window.open(this.href, "itemqa_form", "width=800,height=500,scrollbars=1"); + window.open(this.href, "itemqa_form", "width=800,height=600,scrollbars=1"); return false; }); diff --git a/shop/itemqaform.php b/shop/itemqaform.php index df0f27a92..9b1ec9d19 100644 --- a/shop/itemqaform.php +++ b/shop/itemqaform.php @@ -57,7 +57,7 @@ include_once(G4_PATH.'/head.sub.php'); - +
    diff --git a/shop/itemuse.php b/shop/itemuse.php index ec5e62e87..7dbe2e71a 100644 --- a/shop/itemuse.php +++ b/shop/itemuse.php @@ -8,8 +8,6 @@ if (G4_IS_MOBILE) { include_once(G4_LIB_PATH.'/thumbnail.lib.php'); -//$it_id = $_REQUEST['it_id']; - $itemuse_list = "./itemuselist.php"; $itemuse_form = "./itemuseform.php?it_id=".$it_id; $itemuse_formupdate = "./itemuseformupdate.php?it_id=".$it_id; @@ -20,14 +18,6 @@ $itemuse_formupdate = "./itemuseformupdate.php?it_id=".$it_id;

    등록된 사용후기

    $(function(){ $(".itemuse_form").click(function(){ - window.open(this.href, "itemuse_form", "width=800,height=500,scrollbars=1"); + window.open(this.href, "itemuse_form", "width=800,height=700,scrollbars=1"); return false; }); diff --git a/shop/itemuseform.php b/shop/itemuseform.php index 81e268d2a..1752b0409 100644 --- a/shop/itemuseform.php +++ b/shop/itemuseform.php @@ -59,7 +59,7 @@ include_once(G4_PATH.'/head.sub.php'); - + 평가 @@ -106,21 +106,6 @@ include_once(G4_PATH.'/head.sub.php'); +// 상품 추가옵션 갯수 +$sql = " select count(*) as cnt from {$g4['shop_item_option_table']} where it_id = '{$it['it_id']}' and io_type = '1' and io_use = '1' "; +$row = sql_fetch($sql); +$spl_count = $row['cnt']; + +// 고객선호도 별점수 +$star_score = get_star_image($it['it_id']); + +// 선택 옵션 +$option_1 = get_item_options($it['it_id'], $it['it_option_subject']); + +// 추가 옵션 +$option_2 = get_item_supply($it['it_id'], $it['it_supply_subject']); - + +
    -
    - - - + + + -
    - -
    -
    - - - '; - ?> -
    - 0) { - echo '
      '; - foreach($thumbnails as $val) { - $thumb_count++; - $sit_pvi_last =''; - if ($thumb_count % 5 == 0) $sit_pvi_last = 'class="li_last"'; - echo '
    • '; - echo ''.$val.''; - echo '
    • '; - } - echo '
    '; - } - ?> -
    - - - -
    -

    요약정보 및 구매

    -

    -

    - - 상품 선택옵션 개, 추가옵션 개 -

    - -
    - - 고객선호도 - - - - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - ?> - - - - - - - - - - - - - - -
    제조사
    원산지
    브랜드
    모델
    판매가격전화문의
    시중가격
    판매가격 - 원 - -
    재고수량
    포인트 - 점 -
    - - - -
    - - - -
    -

    선택옵션

    - - - - - - - - -
    -
    - - - - - -
    -

    추가옵션

    - - - - - - - - -
    -
    - - - - - - -
    -

    선택된 옵션

    - -
      -
    • - - - - - - - (+0원) -
      - - - -
      -
    • -
    - - -
    - - - -
    - - - - - - -
    - - - -
    - 이 분류에 등록된 다른 상품이 없습니다.'; - } - ?> -
    - -
    - -
    - - - - -
    -

    상품 정보

    - - -

    상품 기본설명

    - -
    - -
    - - -

    상품 상세설명

    - -
    - -
    - - -

    상품 정보 고시

    - - - - - - - - - $val) { - $ii_title = $info_array[$key][0]; - $ii_value = $val; - ?> - - - - - - -
    - - - -
    - - - -
    -

    사용후기

    - - -
    - -
    - - - -
    -

    상품문의

    - - -
    - -
    - - - - -
    -

    배송정보

    - - - -
    - - - - - - -
    -

    교환/반품

    - - - -
    - - - - -
    -

    관련상품

    - - -
    - set_query($sql); - echo $list->run(); - ?> -
    -
    - - - - - + + +
    diff --git a/skin/shop/basic/item.form.skin.php b/skin/shop/basic/item.form.skin.php new file mode 100644 index 000000000..77cf72958 --- /dev/null +++ b/skin/shop/basic/item.form.skin.php @@ -0,0 +1,459 @@ + + +
    + + + + +
    + +
    +
    + '.$img.''; + } + } + + if($big_img_count == 0) { + echo ''; + } + ?> +
    + 0) { + echo '
      '; + foreach($thumbnails as $val) { + $thumb_count++; + $sit_pvi_last =''; + if ($thumb_count % 5 == 0) $sit_pvi_last = 'class="li_last"'; + echo '
    • '; + echo ''.$val.''; + echo '
    • '; + } + echo '
    '; + } + ?> +
    + + + +
    +

    요약정보 및 구매

    +

    +

    + 상품 선택옵션 개, 추가옵션 개 +

    + +
    + + 고객선호도 + + + + +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */ + ?> + + + + + + + + + + + + + + +
    제조사
    원산지
    브랜드
    모델
    판매가격전화문의
    시중가격
    판매가격 + 원 + +
    재고수량
    포인트 + 점 +
    + + + +
    + + + +
    +

    선택옵션

    + + + + + + + + +
    +
    + + + + + +
    +

    추가옵션

    + + + + + + + + +
    +
    + + + + + + +
    +

    선택된 옵션

    + +
      +
    • + + + + + + + (+0원) +
      + + + +
      +
    • +
    + + +
    + + + +
    + + + + + + +
    + + + +
    + 이 분류에 등록된 다른 상품이 없습니다.'; + } + ?> +
    + +
    + +
    + + + + + + diff --git a/skin/shop/basic/item.info.skin.php b/skin/shop/basic/item.info.skin.php new file mode 100644 index 000000000..3dddd1ff6 --- /dev/null +++ b/skin/shop/basic/item.info.skin.php @@ -0,0 +1,137 @@ + + + + + + + +
    +

    상품 정보

    + + +

    상품 기본설명

    + +
    + +
    + + +

    상품 상세설명

    + +
    + +
    + + +

    상품 정보 고시

    + + + + + + + + + $val) { + $ii_title = $info_array[$key][0]; + $ii_value = $val; + ?> + + + + + + +
    + + + +
    + + + +
    +

    사용후기

    + + +
    + +
    + + + +
    +

    상품문의

    + + +
    + +
    + + + + +
    +

    배송정보

    + + + +
    + + + + + + +
    +

    교환/반품

    + + + +
    + + + + +
    +

    관련상품

    + + +
    + set_query($sql); + echo $list->run(); + ?> +
    +
    + From 9177db0a348a9a676f3efa6167040f55d2f6370d Mon Sep 17 00:00:00 2001 From: gnuboard Date: Thu, 12 Sep 2013 10:42:56 +0900 Subject: [PATCH 5/5] =?UTF-8?q?item.php=20=EB=A5=BC=20=ED=8F=BC=EA=B3=BC?= =?UTF-8?q?=20=EC=84=A4=EB=AA=85=20=EB=91=90=EA=B0=9C=EC=9D=98=20=EC=8A=A4?= =?UTF-8?q?=ED=82=A8=EC=9C=BC=EB=A1=9C=20=EB=82=98=EB=88=84=EA=B3=A0=20?= =?UTF-8?q?=EC=8A=A4=ED=82=A8=EC=97=90=EC=84=9C=20=ED=98=B8=EC=B6=9C?= =?UTF-8?q?=ED=95=98=EB=8A=94=20=ED=95=A8=EC=88=98=EB=93=B1=EC=9D=98=20?= =?UTF-8?q?=EC=BD=94=EB=93=9C=EB=A5=BC=20=EB=B3=80=EC=88=98=EB=A1=9C=20?= =?UTF-8?q?=EC=9D=BC=EB=B6=80=20=EB=8C=80=EC=B2=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- shop/item.php | 8 +++ skin/shop/basic/item.form.skin.php | 82 ++++++++++-------------------- skin/shop/basic/item.info.skin.php | 2 - 3 files changed, 35 insertions(+), 57 deletions(-) diff --git a/shop/item.php b/shop/item.php index 245ecb574..894456c5f 100644 --- a/shop/item.php +++ b/shop/item.php @@ -154,6 +154,14 @@ $option_1 = get_item_options($it['it_id'], $it['it_option_subject']); // 추가 옵션 $option_2 = get_item_supply($it['it_id'], $it['it_supply_subject']); +// 소셜 관련 +$sns_title = get_text($it['it_name']).' | '.get_text($config['cf_title']); +$sns_url = G4_SHOP_URL.'/item.php?it_id='.$it['it_id']; +$sns_share_links .= get_sns_share_link('facebook', $sns_url, $sns_title, G4_SHOP_URL.'/img/sns_fb2.png').' '; +$sns_share_links .= get_sns_share_link('twitter', $sns_url, $sns_title, G4_SHOP_URL.'/img/sns_twt2.png').' '; +$sns_share_links .= get_sns_share_link('googleplus', $sns_url, $sns_title, G4_SHOP_URL.'/img/sns_goo2.png'); + +// 보안서버경로 if (G4_HTTPS_DOMAIN) $action_url = G4_HTTPS_DOMAIN.'/'.G4_SHOP_DIR.'/cartupdate.php'; else diff --git a/skin/shop/basic/item.form.skin.php b/skin/shop/basic/item.form.skin.php index 77cf72958..c06adc03a 100644 --- a/skin/shop/basic/item.form.skin.php +++ b/skin/shop/basic/item.form.skin.php @@ -2,7 +2,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가 ?> -
    + @@ -65,15 +65,9 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가

    - 고객선호도 - - - +
    @@ -119,7 +113,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가 - + @@ -258,6 +252,8 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
      +
    • +
    • 바로구매
    • 장바구니
    • @@ -313,34 +309,11 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가 diff --git a/skin/shop/basic/item.info.skin.php b/skin/shop/basic/item.info.skin.php index 3dddd1ff6..a331be5b2 100644 --- a/skin/shop/basic/item.info.skin.php +++ b/skin/shop/basic/item.info.skin.php @@ -1,8 +1,6 @@ -
    시중가격