From 4479323b25d7f8a5071477db9a9b1b36b01d9382 Mon Sep 17 00:00:00 2001 From: KWON Date: Fri, 26 Dec 2025 12:46:44 +0900 Subject: [PATCH] =?UTF-8?q?=EC=A3=BC=EB=AC=B8=20=EB=82=B4=EC=97=AD=20?= =?UTF-8?q?=ED=99=95=EC=9D=B8=20=EB=B6=80=EB=B6=84=20=EC=B6=9C=EB=A0=A5?= =?UTF-8?q?=EB=90=98=EB=8F=84=EB=A1=9D=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adm/fg_admin/orderlist_ticket.php | 61 ++++-- adm/fg_admin/orderlist_ticket_ex.php | 232 +++++++---------------- extend/firstgarden.php | 7 +- theme/rb.basic/shop/orderinquiry.sub.php | 18 +- 4 files changed, 138 insertions(+), 180 deletions(-) diff --git a/adm/fg_admin/orderlist_ticket.php b/adm/fg_admin/orderlist_ticket.php index ac416503c..726d05efd 100644 --- a/adm/fg_admin/orderlist_ticket.php +++ b/adm/fg_admin/orderlist_ticket.php @@ -106,26 +106,55 @@ if(!sql_query(" SELECT mb_id FROM {$g5['g5_shop_order_delete_table']} LIMIT 1 ", ?> -
- - - - - +
+ + + + + + - - + + - - - - + + + + + +
+
+ + + + +
+
+
- 주문일 - 상품명 - 옵션 - 주문자 - 주문자전화 - 단가
(옵션가) - 주문수량 - 합계 - - 사용처리 - 상세 + 주문일 + 주문자 + 주문자전화 + 상품명 + 옵션 + 단가 + 주문수량 + 총금액 '; - - // 간편결제 - if($row['od_settle_case'] == '간편결제') { - switch($row['od_pg']) { - case 'lg': - $s_receipt_way = 'PAYNOW'; - break; - case 'inicis': - $s_receipt_way = 'KPAY'; - break; - case 'kcp': - $s_receipt_way = 'PAYCO'; - break; - default: - $s_receipt_way = $row['od_settle_case']; - break; - } - } + $tot_ct_qty = 0; + $tot_orderprice = 0; + $prev_od_id = ''; + $bg_class = 'bg0'; + + for ($i=0; $row=sql_fetch_array($result); $i++) { + // 같은 주문번호 중 첫 번째 행만 출력 + if ($row['od_id'] != $prev_od_id) { + $order_date = substr($row['od_receipt_time'], 0, 10); + $order_name = get_text($row['od_name']); + $order_tel = add_hyphen(get_text($row['od_hp'])); + // 주문번호가 바뀔 때마다 배경색 토글 + $bg_class = ($bg_class === 'bg0') ? 'bg1' : 'bg0'; + } else { + $order_date = ''; + $order_name = ''; + $order_tel = ''; } - else - { - $s_receipt_way = '결제수단없음'; - $s_br = '
'; - } - - if ($row['od_receipt_point'] > 0) - $s_receipt_way .= $s_br."포인트"; - - $mb_nick = get_sideview($row['mb_id'], get_text($row['od_name']), $row['od_email'], ''); - - $od_cnt = 0; - if ($row['mb_id']) - { - $sql2 = " select count(*) as cnt from {$g5['g5_shop_order_table']} where mb_id = '{$row['mb_id']}' "; - $row2 = sql_fetch($sql2); - $od_cnt = $row2['cnt']; - } - - // 주문 번호에 device 표시 - $od_mobile = ''; - if($row['od_mobile']) - $od_mobile = '(M)'; - - // 주문번호에 - 추가 - switch(strlen($row['od_id'])) { - case 16: - $disp_od_id = substr($row['od_id'],0,8).'-'.substr($row['od_id'],8); - break; - default: - $disp_od_id = substr($row['od_id'],0,6).'-'.substr($row['od_id'],6); - break; - } - - // 주문 번호에 에스크로 표시 - $od_paytype = ''; - if($row['od_test']) - $od_paytype .= '테스트'; - - if($default['de_escrow_use'] && $row['od_escrow']) - $od_paytype .= '에스크로'; - - $uid = md5($row['od_id'].$row['od_time'].$row['od_ip']); - - $invoice_time = is_null_time($row['od_invoice_time']) ? G5_TIME_YMDHIS : $row['od_invoice_time']; - $delivery_company = $row['od_delivery_company'] ? $row['od_delivery_company'] : $default['de_delivery_company']; - - $bg = 'bg'.($i%2); - $td_color = 0; - if($row['od_cancel_price'] > 0) { - $bg .= 'cancel'; - $td_color = 1; - } - + + $it_name = $row['it_name']; + $io_id = isset($row['io_id']) ? $row['io_id'] : ''; + $unit_price = $row['io_price'] ? ($row['ct_price'] + $row['io_price']) : $row['ct_price']; + $qty = $row['ct_qty']; + $total_price = $unit_price * $qty; + + $tot_ct_qty += $qty; + $tot_orderprice += $total_price; + $prev_od_id = $row['od_id']; ?> - - - - - - - - - - - - - - - - - - - - - 당일주문'; - // 상태가 '입금' 이 아니면서 유효기간이 지났거나 주문 상태가 취소인 경우 - } else if ($row['od_status'] != '입금' || $row['it_1'] < date("ymd") && !isset($row['it_1']) || $row['od_status'] == '취소') { - echo "사용불가
("; - if( $row['od_status'] == '취소' ) echo "취소)"; // 취소라면 - else echo "유효일자:".$row['it_1'].")"; // 유효일자가 지났다면 - } else { // 위 조건에 해당하지 않으면 사용처리 버튼 출력 - ?> - 사용 - - - - 보기 - + + + + + + + + + 자료가 없습니다.'; + echo '자료가 없습니다.'; ?> - - 합 계 - 건 - - - + + 합 계 + + diff --git a/extend/firstgarden.php b/extend/firstgarden.php index 89fcebc93..2bc3504ba 100644 --- a/extend/firstgarden.php +++ b/extend/firstgarden.php @@ -42,6 +42,11 @@ if(! function_exists('add_admin_menu_update') ) { add_replace('admin_menu', 'add_admin_menu_update', 1, 1); function add_admin_menu_update($menu) { $menu['menu998'] = array(); + + array_push($menu['menu400'], + array('400411', '매표소주문확인', G5_ADMIN_URL.'/fg_admin/orderlist_ticket.php', 'firstgarden') + ); + array_push($menu['menu998'], array('998000', '퍼스트가든', G5_ADMIN_URL . '/fg_admin/orderlist_ticket.php', 'firstgarden'), //array('998010', '베이커리 재고관리', G5_ADMIN_URL . '/fg_admin/bakery/bakery_stock_adm.php', 'firstgarden'), @@ -53,7 +58,7 @@ if(! function_exists('add_admin_menu_update') ) { array('998411', '매표소주문확인', G5_ADMIN_URL.'/fg_admin/orderlist_ticket.php', 'firstgarden'), //array('998421', '혜윰주문확인', G5_ADMIN_URL.'/fg_admin/orderlist_hy.php', 'firstgarden'), //array('998431', 'B2B주문확인', G5_ADMIN_URL.'/fg_admin/orderlist_b2b.php', 'firstgarden'), - array('998412', '관리자주문확인', G5_ADMIN_URL . '/fg_admin/orderlist_admin.php', 'firstgarden'), + //array('998412', '관리자주문확인', G5_ADMIN_URL . '/fg_admin/orderlist_admin.php', 'firstgarden'), array('998413', '관리자월정산용', G5_ADMIN_URL . '/fg_admin/orderlist_admin_sum.php', 'firstgarden'), ); return $menu; diff --git a/theme/rb.basic/shop/orderinquiry.sub.php b/theme/rb.basic/shop/orderinquiry.sub.php index 3b550022f..a812947fc 100644 --- a/theme/rb.basic/shop/orderinquiry.sub.php +++ b/theme/rb.basic/shop/orderinquiry.sub.php @@ -1,12 +1,27 @@ 총 건 +
+
주문번호 주문일시상품명 상품수 주문금액