diff --git a/adm/shop_admin/itemstocklist.php b/adm/shop_admin/itemstocklist.php
index 50cf6e0b8..e7bfd29bf 100644
--- a/adm/shop_admin/itemstocklist.php
+++ b/adm/shop_admin/itemstocklist.php
@@ -48,6 +48,130 @@ $qstr1 = "sel_ca_id=$sel_ca_id&sel_field=$sel_field&search=$search";
$qstr = "$qstr1&sort1=$sort1&sort2=$sort2&page=$page";
?>
+
+
+
+
+
+
+ 상품재고관리
+
+ *상품의 재고와 판매를 일괄 처리합니다.
+ *가재고는 창고재고 -주문대기 수량입니다.
+ *재고수정의 수량은 창고재고를 수정하는것입니다.
+
+
+ =get_paging($config['cf_write_pages'], $page, $total_page, "{$_SERVER['PHP_SELF']}?$qstr&page=");?>
+
+
+
include_once (G4_ADMIN_PATH.'/admin.tail.php');
diff --git a/adm/shop_admin/ordercardhistory.php b/adm/shop_admin/ordercardhistory.php
index 4b2c15e56..2e3bd80f8 100644
--- a/adm/shop_admin/ordercardhistory.php
+++ b/adm/shop_admin/ordercardhistory.php
@@ -49,76 +49,75 @@ $qstr1 = "sel_ca_id=$sel_ca_id&sel_field=$sel_field&search=$search";
$qstr = "$qstr1&sort1=$sort1&sort2=$sort2&page=$page";
?>
-
-* 신용카드, 실시간 계좌이체로 승인한 내역이며, 주문번호를 클릭하시면 주문상세 페이지로 이동합니다.
-
include_once (G4_ADMIN_PATH.'/admin.tail.php');
diff --git a/adm/shop_admin/orderlist.php b/adm/shop_admin/orderlist.php
index 6c54779da..f0535c017 100644
--- a/adm/shop_admin/orderlist.php
+++ b/adm/shop_admin/orderlist.php
@@ -109,7 +109,7 @@ if ($search) // 검색렬일 때만 처음 버튼을 보여줌
-
+
diff --git a/adm/shop_admin/orderstatuslist.php b/adm/shop_admin/orderstatuslist.php
index c9103fb31..53d71c293 100644
--- a/adm/shop_admin/orderstatuslist.php
+++ b/adm/shop_admin/orderstatuslist.php
@@ -4,17 +4,18 @@ include_once('./_common.php');
auth_check($auth[$sub_menu], "r");
-$g4['title'] = '주문개별관리';
+$g4['title'] = '주문개별내역';
+if ($sel_field == 'ct_status') $g4['title'] .= ' ('.$search.')';
include_once (G4_ADMIN_PATH.'/admin.head.php');
$where = " where ";
$sql_search = "";
if ($search != "") {
if ($sel_field == "c.ca_id") {
- $sql_search .= " $where $sel_field like '$search%' ";
+ $sql_search .= " $where $sel_field like '$search%' ";
$where = " and ";
} else if ($sel_field != "") {
- $sql_search .= " $where $sel_field like '%$search%' ";
+ $sql_search .= " $where $sel_field like '%$search%' ";
$where = " and ";
}
@@ -27,9 +28,9 @@ if ($sort1 == "") $sort1 = "od_id";
if ($sort2 == "") $sort2 = "desc";
$sql_common = " from {$g4['shop_order_table']} a
- left join {$g4['shop_cart_table']} b on (a.uq_id = b.uq_id)
- left join {$g4['shop_item_table']} c on (b.it_id = c.it_id)
- $sql_search ";
+ left join {$g4['shop_cart_table']} b on (a.uq_id = b.uq_id)
+ left join {$g4['shop_item_table']} c on (b.it_id = c.it_id)
+ $sql_search ";
// 테이블의 전체 레코드수만 얻음
$sql = " select count(*) as cnt " . $sql_common;
@@ -82,144 +83,126 @@ for ($i=0; $row=sql_fetch_array($result); $i++)
$tot_sub_point += $row['ct_sub_point'];
}
-$qstr1 = "sel_ca_id=$sel_ca_id&sel_field=$sel_field&search=$search&save_search=$search";
-$qstr = "$qstr1&sort1=$sort1&sort2=$sort2&page=$page";
+$qstr1 = "sel_ca_id=$sel_ca_id&sel_field=$sel_field&search=$search&save_search=$search";
+$qstr = "$qstr1&sort1=$sort1&sort2=$sort2&page=$page";
+
+$listall = '';
+if ($search) // 검색렬일 때만 처음 버튼을 보여줌
+ $listall = '전체목록';
?>
-
+
+ =$g4['title']?> 목록
+
+
+
+ ">주문번호 주문일시 |
+ ">주문자 입금자 |
+ ">회원ID |
+ 이미지 |
+ ">상품명 |
+ ">판매가 |
+ ">수량 |
+ ">소계 |
+ ">포인트 |
+ ">상태 |
+ 수정 |
+
+
+
+
+ | 합 계
+ | =number_format($tot_amount)?> |
+ =number_format($tot_qty)?> |
+ =number_format($tot_sub_amount)?> |
+ =number_format($tot_sub_point)?> |
+ |
+
+
+
+
+ for ($i=0; $i
-var f = document.frmorderlist;
-f.sel_field.value = ' echo $sel_field ?>';
-
+ $od_deposit_name = "";
+ if ($lines[$i]['od_deposit_name'] != "")
+ $od_deposit_name = "title='입금자 : }'";
+
+ $href = "$_SERVER[PHP_SELF]?sort1=$sort1&sort2=$sort2&sel_field=c.it_id&search=$lines[$i][it_id]";
+ $it_name = "".cut_str($lines[$i]['it_name'],35)."
";
+ $it_name .= print_item_options($lines[$i]['it_id'], $lines[$i]['it_opt1'], $lines[$i]['it_opt2'], $lines[$i]['it_opt3'], $lines[$i]['it_opt4'], $lines[$i]['it_opt5'], $lines[$i]['it_opt6']);
+
+ $s_mod = icon("수정", "");
+ ?>
+
+
+
+ =$lines[$i]['od_id']?>
+ =$lines[$i]['od_time']?>
+
+ |
+
+
+ 주문자 =cut_str($lines[$i]['od_name'],10,"")?>
+ if ($lines[$i]['od_deposit_name'] != "") echo ' 입금자 '.$lines[$i]['od_deposit_name']?>
+
+ |
+ =$lines[$i]['mb_id']?> |
+ =get_it_image($lines[$i]['it_id'].'_s', 50, 50)?> |
+ =$it_name?> |
+ =number_format($lines[$i]['ct_amount'])?> |
+ =$lines[$i]['ct_qty']?> |
+ =number_format($lines[$i]['ct_sub_amount'])?> |
+ =number_format($lines[$i]['ct_sub_point'])?> |
+ =$lines[$i]['ct_status']?> |
+ 수정 |
+
+
+ }
+
+ if ($i == 0) echo '| 자료가 한건도 없습니다. |
';
+ ?>
+
+
+
+
+
+=get_paging($config['cf_write_pages'], $page, $total_page, "{$_SERVER['PHP_SELF']}?$qstr&page=");?>
include_once (G4_ADMIN_PATH.'/admin.tail.php');
diff --git a/css/admin.css b/css/admin.css
index 1b0321cb5..b1e560b6a 100644
--- a/css/admin.css
+++ b/css/admin.css
@@ -322,6 +322,9 @@ td {padding:8px 5px 6px;border-top:1px solid #e9e9e9;border-bottom:1px solid #e9
.td_sodr_sum {color:#1275d3}
.td_sodr_nonpay {color:#ff6600}
+/* 주문내역 */
+#sodr_status {text-align:center}
+
/* 분류관리 목록 */
.cate_list_lbl {display:inline-block;padding-left:15px;background:url('../adm/shop_admin/img/icon_reply.gif') 0 2px no-repeat}
diff --git a/lib/shop.lib.php b/lib/shop.lib.php
index e2f615397..7e2286eff 100644
--- a/lib/shop.lib.php
+++ b/lib/shop.lib.php
@@ -49,7 +49,7 @@ function get_it_image($img, $width=0, $height=0, $id="")
{
$str = get_image($img, $width, $height);
if ($id) {
- $str = "$str";
+ $str = ''.$str.'';
}
return $str;
}