From aca4733b12f2407d4b096ba70f5fe0e926a78864 Mon Sep 17 00:00:00 2001 From: thisgun Date: Fri, 20 Jan 2023 11:17:20 +0900 Subject: [PATCH 1/5] =?UTF-8?q?=EC=87=BC=ED=95=91=EB=AA=B0=20=EC=9E=A5?= =?UTF-8?q?=EB=B0=94=EA=B5=AC=EB=8B=88=EC=97=90=EC=84=9C=20=EC=9E=AC?= =?UTF-8?q?=EA=B3=A0=20=EC=9D=B4=EC=83=81=20=EC=A3=BC=EB=AC=B8=ED=95=A0?= =?UTF-8?q?=EC=88=98=20=EC=9E=88=EB=8A=94=20=EC=98=A4=EB=A5=98=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mobile/shop/orderform.sub.php | 9 +++++++++ shop/ajax.orderstock.php | 6 +++--- shop/cartupdate.php | 9 +++++++-- 3 files changed, 19 insertions(+), 5 deletions(-) diff --git a/mobile/shop/orderform.sub.php b/mobile/shop/orderform.sub.php index 71935a5f3..bcb44303d 100644 --- a/mobile/shop/orderform.sub.php +++ b/mobile/shop/orderform.sub.php @@ -1233,6 +1233,7 @@ var temp_point = 0; function pay_approval() { + // 무통장 아닌 가상계좌, 계좌이체, 휴대폰, 신용카드, 기타 등등 을 처리한다. // 재고체크 var stock_msg = order_stock_check(); if(stock_msg != "") { @@ -1435,6 +1436,14 @@ function pay_approval() function forderform_check() { + // 무통장만 여기에처 처리한다. + // 재고체크 + var stock_msg = order_stock_check(); + if(stock_msg != "") { + alert(stock_msg); + return false; + } + var f = document.forderform; // 필드체크 diff --git a/shop/ajax.orderstock.php b/shop/ajax.orderstock.php index ef685eac1..b37fcd867 100644 --- a/shop/ajax.orderstock.php +++ b/shop/ajax.orderstock.php @@ -42,15 +42,15 @@ if (function_exists('before_check_cart_price')) { } // 재고체크 -$sql = " select * +$sql = " select *, sum(ct_qty) as sum_ct_qty from {$g5['g5_shop_cart_table']} where od_id = '$tmp_cart_id' and ct_select = '1' - and ct_status = '쇼핑' "; + and ct_status = '쇼핑' GROUP BY od_id, it_id, it_name, ct_option, io_id, io_type "; $result = sql_query($sql); for($i=0; $row=sql_fetch_array($result); $i++) { - $ct_qty = $row['ct_qty']; + $ct_qty = $row['sum_ct_qty']; // 해당 상품이 품절 또는 판매중지 상태인지 체크합니다. $sql = " select it_soldout, it_use, ca_id, ca_id2, ca_id3 from {$g5['g5_shop_item_table']} where it_id = '".$row['it_id']."' "; diff --git a/shop/cartupdate.php b/shop/cartupdate.php index ad0887b6f..b8ba2848d 100644 --- a/shop/cartupdate.php +++ b/shop/cartupdate.php @@ -58,10 +58,14 @@ if($act == "buy") } // 주문 상품의 재고체크 - $sql = " select ct_qty, it_name, ct_option, io_id, io_type + // 동일 상품 옵션이 레코드에 있는 경우 재고를 제대로 체크하지 못하는 오류가 있음 + // $sql = " select ct_qty, it_name, ct_option, io_id, io_type from {$g5['g5_shop_cart_table']} where od_id = '$tmp_cart_id' and it_id = '$it_id' "; + + $sql = " select sum(ct_qty) as ct_qty, it_name, ct_option, io_id, io_type from {$g5['g5_shop_cart_table']} where od_id = '$tmp_cart_id' - and it_id = '$it_id' "; + and it_id = '$it_id' GROUP BY od_id, it_id, it_name, ct_option, io_id, io_type "; + $result = sql_query($sql); for($k=0; $row=sql_fetch_array($result); $k++) { @@ -73,6 +77,7 @@ if($act == "buy") and ct_stock_use = 0 and ct_status = '쇼핑' and ct_select = '1' "; + $sum = sql_fetch($sql); // $sum['cnt'] 가 null 일때 재고 반영이 제대로 안되는 오류 수정 (그누위즈님,210614) // $sum_qty = $sum['cnt']; From 66039a4b37c1b7f51ac7dd282e96d112bb0db9fd Mon Sep 17 00:00:00 2001 From: thisgun Date: Fri, 20 Jan 2023 11:17:50 +0900 Subject: [PATCH 2/5] =?UTF-8?q?PHP8=20=EB=B2=84=EC=A0=84=EC=97=90=EC=84=9C?= =?UTF-8?q?=20=EA=B2=BD=EA=B3=A0=EB=AC=B8=EC=9D=B4=20=EB=82=98=EC=98=A4?= =?UTF-8?q?=EB=8A=94=20=EC=BD=94=EB=93=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common.php | 1 + 1 file changed, 1 insertion(+) diff --git a/common.php b/common.php index 0d330d5cb..6e7efb984 100644 --- a/common.php +++ b/common.php @@ -502,6 +502,7 @@ if (isset($_REQUEST['url'])) { $urlencode = urlencode($_SERVER['REQUEST_URI']); if (G5_DOMAIN) { $p = @parse_url(G5_DOMAIN); + $p['path'] = isset($p['path']) ? $p['path'] : '/'; $urlencode = G5_DOMAIN.urldecode(preg_replace("/^".urlencode($p['path'])."/", "", $urlencode)); } } From 6fa0f0e704a324153f48e13b27a9639cd1120b33 Mon Sep 17 00:00:00 2001 From: thisgun Date: Wed, 25 Jan 2023 11:06:07 +0900 Subject: [PATCH 3/5] =?UTF-8?q?=EC=A0=95=EB=A0=AC=20=EA=B8=B0=EB=8A=A5?= =?UTF-8?q?=EC=97=90=20=EC=A7=A7=EC=9D=80=20=EC=A3=BC=EC=86=8C=20=EC=A0=81?= =?UTF-8?q?=EC=9A=A9=20=EC=98=A4=EB=A5=98=EB=A5=BC=20=EB=8B=A4=EC=8B=9C=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/common.lib.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/common.lib.php b/lib/common.lib.php index 257515e5a..19c15393b 100644 --- a/lib/common.lib.php +++ b/lib/common.lib.php @@ -865,8 +865,10 @@ function subject_sort_link($col, $query_string='', $flag='asc') $arr_query[] = 'page='.$page; $qstr = implode("&", $arr_query); - $url = G5_HTTP_BBS_URL . "/board.php?{$qstr}"; - return ''; + parse_str(html_entity_decode($qstr), $qstr_array); + $url = short_url_clean(get_params_merge_url($qstr_array)); + + return ''; } From f61d6cc09ad433930894f336150c5311989a64ed Mon Sep 17 00:00:00 2001 From: thisgun Date: Wed, 25 Jan 2023 12:30:13 +0900 Subject: [PATCH 4/5] =?UTF-8?q?SMS=EA=B4=80=EB=A6=AC=20=ED=9C=B4=EB=8C=80?= =?UTF-8?q?=ED=8F=B0=EA=B4=80=EB=A6=AC=20=ED=8E=98=EC=9D=B4=EC=A7=80=20PHP?= =?UTF-8?q?=ED=8A=B9=EC=A0=95=EB=B2=84=EC=A0=84=EC=97=90=EC=84=9C=20?= =?UTF-8?q?=EC=98=A4=EB=A5=98=EB=82=98=EB=8A=94=20=EB=AC=B8=EC=A0=9C=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adm/sms_admin/num_book_write.php | 11 ++++++++++- adm/sms_admin/number_move_update.php | 14 ++++++-------- 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/adm/sms_admin/num_book_write.php b/adm/sms_admin/num_book_write.php index 7890ee90f..327505f6b 100644 --- a/adm/sms_admin/num_book_write.php +++ b/adm/sms_admin/num_book_write.php @@ -33,7 +33,16 @@ if ($w == 'u' && is_numeric($bk_no)) { $g5['title'] .= '수정'; } else { - $write = array('bg_no' => (int) $bg_no); + $write = array( + 'bg_no' => (int) $bg_no, + 'bk_no' => 0, + 'mb_id' => '', + 'bk_name' => '', + 'bk_hp' => '', + 'bk_memo' => '', + 'bk_receipt' => 1, + 'bk_datetime' => '' + ); $g5['title'] .= '추가'; } diff --git a/adm/sms_admin/number_move_update.php b/adm/sms_admin/number_move_update.php index b64a1459e..61bbfb1c8 100644 --- a/adm/sms_admin/number_move_update.php +++ b/adm/sms_admin/number_move_update.php @@ -71,18 +71,16 @@ if( count($save_group) ){ //그룹테이블 업데이트 $msg = '해당 번호를 선택한 그룹으로 '.$act.' 하였습니다.'; $opener_href = './num_book.php?page='.$page; - -echo << -HEREDOC; \ No newline at end of file +돌아가기 + \ No newline at end of file From d28be441088e53f3c38b66ba4327938cee24d0d2 Mon Sep 17 00:00:00 2001 From: thisgun Date: Wed, 25 Jan 2023 16:52:29 +0900 Subject: [PATCH 5/5] =?UTF-8?q?=EB=B2=84=EC=A0=84=205.5.8.2.7=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- version.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.php b/version.php index 650d70433..3a7dceb72 100644 --- a/version.php +++ b/version.php @@ -2,7 +2,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가 define('G5_VERSION', '그누보드5'); -define('G5_GNUBOARD_VER', '5.5.8.2.6'); +define('G5_GNUBOARD_VER', '5.5.8.2.7'); // 그누보드5.4.5.5 버전과 영카트5.4.5.5.1 버전을 합쳐서 그누보드5.4.6 버전에서 시작함 (kagla-210617) // G5_YOUNGCART_VER 이 상수를 사용하는 곳이 있으므로 주석 처리 해제함 // 그누보드5.4.6 이상 버전 부터는 영카트를 그누보드에 포함하여 배포하므로 영카트5의 버전은 의미가 없습니다.