diff --git a/adm/shop_admin/orderlist.php b/adm/shop_admin/orderlist.php
index 649f6be41..449e3fbd5 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,14 @@ $total_page = ceil($total_count / $rows); // 전체 페이지 계산
if ($page == "") { $page = 1; } // 페이지가 없으면 첫 페이지 (1 페이지)
$from_record = ($page - 1) * $rows; // 시작 열을 구함
+<<<<<<< HEAD
$sql = " select *
$sql_common
order by $sort1 $sort2
limit $from_record, $rows ";
+=======
+$sql = " select *, "._MISU_QUERY_." $sql_common order by $sort1 $sort2 limit $from_record, $rows ";
+>>>>>>> itemskin
$result = sql_query($sql, false);
$qstr1 = "sel_field=$sel_field&search=$search&save_search=$search";
@@ -106,6 +136,12 @@ if ($search) // 검색렬일 때만 처음 버튼을 보여줌
">미수금 순 정렬
+ 주문상태 :
+
+
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 @@
-
-
-
+// 상품 선택옵션 갯수
+$sql = " select count(*) as cnt from {$g4['shop_item_option_table']} where it_id = '{$it['it_id']}' and io_type = '0' and io_use = '1' ";
+$row = sql_fetch($sql);
+$opt_count = $row['cnt'];
-
-
+// 상품 추가옵션 갯수
+$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'];
-
+
+
-
-
-
-
-
-
- 상품 정보
-
-
- 상품 기본설명
-
-
-
-
-
-
- 상품 상세설명
-
-
-
-
-
-
- 상품 정보 고시
-
-
-
-
-
-
-
-
- $val) {
- $ii_title = $info_array[$key][0];
- $ii_value = $val;
- ?>
-
- |
- |
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 관련상품
-
-
-
- set_query($sql);
- echo $list->run();
- ?>
-
-
-
-
-
-
-
+
+
+
diff --git a/shop/itemqa.php b/shop/itemqa.php
index d1d6b75db..4844ccac1 100644
--- a/shop/itemqa.php
+++ b/shop/itemqa.php
@@ -8,8 +8,6 @@ if (G4_IS_MOBILE) {
include_once(G4_LIB_PATH.'/thumbnail.lib.php');
-//$it_id = $_REQUEST['it_id'];
-
$itemqa_list = "./itemqalist.php";
$itemqa_form = "./itemqaform.php?it_id=".$it_id;
$itemqa_formupdate = "./itemqaformupdate.php?it_id=".$it_id;
@@ -162,7 +160,7 @@ echo itemqa_page($config['cf_write_pages'], $page, $total_page, "./itemqa.php?it
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 이 분류에 등록된 다른 상품이 없습니다.';
+ }
+ ?>
+
+
+
+
+
+
+
+
+
+
+
diff --git a/skin/shop/basic/item.info.skin.php b/skin/shop/basic/item.info.skin.php
new file mode 100644
index 000000000..a331be5b2
--- /dev/null
+++ b/skin/shop/basic/item.info.skin.php
@@ -0,0 +1,135 @@
+
+
+
+
+
+
+ 상품 정보
+
+
+ 상품 기본설명
+
+
+
+
+
+
+ 상품 상세설명
+
+
+
+
+
+
+ 상품 정보 고시
+
+
+
+
+
+
+
+
+ $val) {
+ $ii_title = $info_array[$key][0];
+ $ii_value = $val;
+ ?>
+
+ |
+ |
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 관련상품
+
+
+
+ set_query($sql);
+ echo $list->run();
+ ?>
+
+
+
diff --git a/skin/shop/basic/list.10.skin.php b/skin/shop/basic/list.10.skin.php
index 2efe590f0..e2e2b6ccd 100644
--- a/skin/shop/basic/list.10.skin.php
+++ b/skin/shop/basic/list.10.skin.php
@@ -1,5 +1,5 @@
diff --git a/skin/shop/basic/list.20.skin.php b/skin/shop/basic/list.20.skin.php
index 1665df845..1014e2fed 100644
--- a/skin/shop/basic/list.20.skin.php
+++ b/skin/shop/basic/list.20.skin.php
@@ -1,5 +1,5 @@
diff --git a/skin/shop/basic/list.30.skin.php b/skin/shop/basic/list.30.skin.php
index 56a200364..1c3e4159e 100644
--- a/skin/shop/basic/list.30.skin.php
+++ b/skin/shop/basic/list.30.skin.php
@@ -1,5 +1,5 @@
diff --git a/skin/shop/basic/list.40.skin.php b/skin/shop/basic/list.40.skin.php
index 58e2e0a69..dcf4845ed 100644
--- a/skin/shop/basic/list.40.skin.php
+++ b/skin/shop/basic/list.40.skin.php
@@ -1,5 +1,5 @@
diff --git a/skin/shop/basic/main.10.skin.php b/skin/shop/basic/main.10.skin.php
index bd9833e80..42e92d6d6 100644
--- a/skin/shop/basic/main.10.skin.php
+++ b/skin/shop/basic/main.10.skin.php
@@ -1,5 +1,5 @@
diff --git a/skin/shop/basic/main.20.skin.php b/skin/shop/basic/main.20.skin.php
index ecbdfcd7f..d3a3b8ad7 100644
--- a/skin/shop/basic/main.20.skin.php
+++ b/skin/shop/basic/main.20.skin.php
@@ -1,5 +1,5 @@