From 6bb7c4928d80898884ef82bbee28ede45095704f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=9D=B4=EB=8C=80=ED=99=98?= Date: Tue, 19 May 2026 11:16:34 +0900 Subject: [PATCH] =?UTF-8?q?=EC=A3=BC=EB=AC=B8=20>=20=EC=A3=BC=EB=AC=B8=20?= =?UTF-8?q?=EA=B4=80=EB=A6=AC=20>=20=EC=A0=84=EC=B2=B4=EC=A3=BC=EB=AC=B8?= =?UTF-8?q?=EC=A1=B0=ED=9A=8C,=20=EC=A3=BC=EB=AC=B8=20=EC=83=81=EC=84=B8?= =?UTF-8?q?=20-=20=EB=84=A4=EC=9D=B4=EB=B2=84=ED=8E=98=EC=9D=B4=20?= =?UTF-8?q?=EC=A3=BC=EB=AC=B8=20=EC=A0=9C=EC=96=B4=20=EC=A0=9C=ED=95=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit 6858b24344ee84741554ebc7034c0833d855f796) --- .../mngr/ordr/ordrmngr/AllOrdrListInqireR.jsp | 30 ++++++++++++---- .../mngr/ordr/ordrmngr/OrdrDtlInqireR.jsp | 35 +++++++++++++++++++ 2 files changed, 58 insertions(+), 7 deletions(-) diff --git a/src/main/webapp/WEB-INF/views/mngr/ordr/ordrmngr/AllOrdrListInqireR.jsp b/src/main/webapp/WEB-INF/views/mngr/ordr/ordrmngr/AllOrdrListInqireR.jsp index f8b1d59c..a714c3c7 100644 --- a/src/main/webapp/WEB-INF/views/mngr/ordr/ordrmngr/AllOrdrListInqireR.jsp +++ b/src/main/webapp/WEB-INF/views/mngr/ordr/ordrmngr/AllOrdrListInqireR.jsp @@ -391,6 +391,7 @@ $(document).on('click', '[id*="ordrSttus"]', function() { const tr = ($(this).attr('class').split(' ')[0]).replace('btn-', ''); const rowCheckboxs = $('.' + tr).closest('#orderList').find('.' + tr + ' input[name="ordrInnb"]:checked'); + const smrtShopngOrdrnbs = rowCheckboxs.closest('td').find('input[name="smrtShopngOrdrnb"]'); if (rowCheckboxs.length === 0) { alert('선택값이 없습니다.'); @@ -404,6 +405,20 @@ return $(this).closest('tr').find('input[name="subsvcAt"]').val() === 'Y'; }); + // 네이버페이 주문 제어 제한 + let hasSmrt = false; + $(smrtShopngOrdrnbs).each(function() { + if($(this).val() != 'undefined' && $.trim($(this).val()) != '') { + hasSmrt = true; + return; + } + }); + + if ('35' != chgOrdrSttusCd && hasSmrt) { + alert('네이버페이 주문건은 처리할 수 없습니다.'); + return false; + } + let msg = ''; if (chgOrdrSttusCd === '35' && hasSubsvc) { @@ -775,12 +790,12 @@ header += ' '; if ('15' === data.ordrSttusCd) { - header += ' '; - header += ' '; + header += ' '; + header += ' '; } if ('25' === data.ordrSttusCd) { - header += ' '; + header += ' '; /* header += ' '; */ } @@ -819,7 +834,7 @@ if ('25' == data.ordrSttusCd) { header += ' '; } @@ -870,6 +885,7 @@ } tr += '">'; tr += ' '; + tr += ' '; tr += '