From bb4d345add7afb6435bb689725ce9431b8c7be86 Mon Sep 17 00:00:00 2001
From: thisgun <thisgun@naver.com>
Date: Fri, 12 Jun 2026 08:23:51 +0000
Subject: [PATCH] =?UTF-8?q?=EB=82=98=EC=9D=B4=EC=8A=A4=ED=8E=98=EC=9D=B4?=
 =?UTF-8?q?=20=EB=B6=80=EB=B6=84=EC=B7=A8=EC=86=8C=20=EC=B2=98=EB=A6=AC=20?=
 =?UTF-8?q?=EB=B3=B4=EA=B0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit ef0da4a903983f46934d5c14ac10adb93a673398)
---
 adm/shop_admin/orderform.php             | 2 +-
 adm/shop_admin/orderpartcancel.php       | 8 ++++----
 adm/shop_admin/orderpartcancelupdate.php | 4 +++-
 shop/nicepay/cancel_process.php          | 5 ++++-
 4 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/adm/shop_admin/orderform.php b/adm/shop_admin/orderform.php
index bcaeeec9a..c122c6ed4 100644
--- a/adm/shop_admin/orderform.php
+++ b/adm/shop_admin/orderform.php
@@ -1035,7 +1035,7 @@ if ($is_nicepay_vbank_pg_cancel) {
         <?php if($od['od_status'] == '주문' && $od['od_misu'] > 0) { ?>
         <a href="./personalpayform.php?popup=yes&amp;od_id=<?php echo $od_id; ?>" id="personalpay_add" class="btn btn_02">개인결제추가</a>
         <?php } ?>
-        <?php if($od['od_misu'] < 0 && ($od['od_receipt_price'] - $od['od_refund_price']) > 0 && ($od['od_settle_case'] == '신용카드' || $od['od_settle_case'] == '계좌이체' || $od['od_settle_case'] == 'KAKAOPAY')) { ?>
+        <?php if($od['od_misu'] < 0 && ($od['od_receipt_price'] - $od['od_refund_price']) > 0 && ($od['od_settle_case'] == '신용카드' || $od['od_settle_case'] == '계좌이체' || $od['od_settle_case'] == 'KAKAOPAY' || ($od['od_pg'] == 'nicepay' && $od['od_settle_case'] == '간편결제'))) { ?>
         <a href="./orderpartcancel.php?od_id=<?php echo $od_id; ?>" id="orderpartcancel" class="btn btn_02"><?php echo $od['od_settle_case']; ?> 부분취소</a>
         <?php } ?>
         <a href="./orderlist.php?<?php echo $qstr; ?>" class="btn btn_02">목록</a>
diff --git a/adm/shop_admin/orderpartcancel.php b/adm/shop_admin/orderpartcancel.php
index 0b22d74ae..35f2636a9 100644
--- a/adm/shop_admin/orderpartcancel.php
+++ b/adm/shop_admin/orderpartcancel.php
@@ -78,10 +78,10 @@ var g5_admin_csrf_token_key = "<?php echo (function_exists('admin_csrf_token_key
 function form_check(f)
 {
     var max_mny = parseInt(<?php echo $od_misu; ?>);
-    var tax_mny = parseInt(f.mod_tax_mny.value.replace("/[^0-9]/g", ""));
+    var tax_mny = parseInt(f.mod_tax_mny.value.replace(/[^0-9]/g, ""), 10) || 0;
     var free_mny = 0;
-    if(typeof f.mod_free_mny.value != "undefined")
-        free_mny = parseInt(f.mod_free_mny.value.replace("/[^0-9]/g", ""));
+    if(typeof f.mod_free_mny != "undefined")
+        free_mny = parseInt(f.mod_free_mny.value.replace(/[^0-9]/g, ""), 10) || 0;
 
     if(!tax_mny && !free_mny) {
         alert("과세 취소금액 또는 비과세 취소금액을 입력해 주십시오.");
@@ -108,4 +108,4 @@ function form_check(f)
 </script>
 
 <?php
-include_once(G5_PATH.'/tail.sub.php');
\ No newline at end of file
+include_once(G5_PATH.'/tail.sub.php');
diff --git a/adm/shop_admin/orderpartcancelupdate.php b/adm/shop_admin/orderpartcancelupdate.php
index e0ff51fac..a8c443eb7 100644
--- a/adm/shop_admin/orderpartcancelupdate.php
+++ b/adm/shop_admin/orderpartcancelupdate.php
@@ -6,6 +6,8 @@ auth_check_menu($auth, $sub_menu, "w");
 
 check_admin_token();
 
+$od_id = isset($_POST['od_id']) ? safe_replace_regex($_POST['od_id'], 'od_id') : '';
+$mod_memo = isset($_POST['mod_memo']) ? trim(clean_xss_tags($_POST['mod_memo'], 1, 1)) : '';
 $tax_mny = isset($_POST['mod_tax_mny']) ? preg_replace('/[^0-9]/', '', $_POST['mod_tax_mny']) : 0;
 $free_mny = isset($_POST['mod_free_mny']) ? preg_replace('/[^0-9]/', '', $_POST['mod_free_mny']) : 0;
 
@@ -50,4 +52,4 @@ self.close();
 </script>
 
 <?php
-include_once(G5_PATH.'/tail.sub.php');
\ No newline at end of file
+include_once(G5_PATH.'/tail.sub.php');
diff --git a/shop/nicepay/cancel_process.php b/shop/nicepay/cancel_process.php
index 519e8ccd7..8e35c8606 100644
--- a/shop/nicepay/cancel_process.php
+++ b/shop/nicepay/cancel_process.php
@@ -51,7 +51,10 @@ try{
 	* <Cancel Request>
 	****************************************************************************************
 	*/
-	$response = nicepay_reqPost($data, "https://webapi.nicepay.co.kr/webapi/cancel_process.jsp"); //Cancel API call
+	$cancelUrl = (isset($od['od_settle_case']) && $od['od_settle_case'] === '가상계좌')
+		? "https://webapi.nicepay.co.kr/webapi/cancel_process.jsp"
+		: "https://pg-api.nicepay.co.kr/webapi/cancel_process.jsp";
+	$response = nicepay_reqPost($data, $cancelUrl); //Cancel API call
 
 	$result = json_decode($response, true);