From eef7b5267a2563305bda8d796eb84b4d0a375681 Mon Sep 17 00:00:00 2001
From: itn <itn@LAPTOP-ONDDS4DD>
Date: Thu, 29 Jun 2023 16:28:22 +0900
Subject: [PATCH] =?UTF-8?q?=EC=9A=94=EA=B8=88=EA=B2=B0=EC=A0=9C=EB=82=B4?=
 =?UTF-8?q?=EC=97=AD=20=EA=B0=84=ED=8E=B8=EA=B2=B0=EC=A0=9C=20=EA=B8=B0?=
 =?UTF-8?q?=EB=8A=A5=20=EC=B6=94=EA=B0=80=ED=9B=84=20=EC=A3=BC=EC=84=9D?=
 =?UTF-8?q?=EC=B2=98=EB=A6=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/itn/let/mjo/pay/web/MjonPayController.java | 7 +++++++
 src/main/webapp/WEB-INF/jsp/web/pay/PayList.jsp          | 2 +-
 src/main/webapp/WEB-INF/jsp/web/pay/PayListAllAjax.jsp   | 2 +-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/main/java/itn/let/mjo/pay/web/MjonPayController.java b/src/main/java/itn/let/mjo/pay/web/MjonPayController.java
index fe7bc442..ecb5205b 100644
--- a/src/main/java/itn/let/mjo/pay/web/MjonPayController.java
+++ b/src/main/java/itn/let/mjo/pay/web/MjonPayController.java
@@ -1841,6 +1841,7 @@ public class MjonPayController {
     			"/web/member/pay/PayListCardAjax.do",
     			"/web/member/pay/PayListVBankAjax.do",
     			"/web/member/pay/PayListBankAjax.do",
+    			"/web/member/pay/PayListSPayAjax.do",
     			"/web/member/pay/PayListOfflineAjax.do",
     			"/web/member/pay/PayListRefundAjax.do"
     			})
@@ -1894,6 +1895,7 @@ public class MjonPayController {
     			|| pattern.equals("/web/member/pay/PayListCardAjax.do")
     			|| pattern.equals("/web/member/pay/PayListVBankAjax.do")
     			|| pattern.equals("/web/member/pay/PayListBankAjax.do")
+    			|| pattern.equals("/web/member/pay/PayListSPayAjax.do")
     			|| pattern.equals("/web/member/pay/PayListOfflineAjax.do")
     			|| pattern.equals("/web/member/pay/PayListRefundAjax.do")
     		) { //전체 , 모바일, 신용카드
@@ -2024,6 +2026,11 @@ public class MjonPayController {
     			mjonPayVO.setPayMethod("BANK");
     			mjonPayVO.setPageType("bank");
     		}    		
+    		if(pattern.equals("/web/member/pay/PayListSPayAjax.do")) { //즉시이체
+    			mjonPayVO.setSearchCondition2("SPAY");
+    			mjonPayVO.setPayMethod("SPAY");
+    			mjonPayVO.setPageType("SPAY");
+    		}    		    		
     		if(pattern.equals("/web/member/pay/PayListOfflineAjax.do")) { //무통장
     			mjonPayVO.setSearchCondition2("OFFLINE");
     			mjonPayVO.setPayMethod("OFFLINE");
diff --git a/src/main/webapp/WEB-INF/jsp/web/pay/PayList.jsp b/src/main/webapp/WEB-INF/jsp/web/pay/PayList.jsp
index fe6b3f1a..0ad55334 100644
--- a/src/main/webapp/WEB-INF/jsp/web/pay/PayList.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/pay/PayList.jsp
@@ -186,9 +186,9 @@ function fnShowRefundPrintPopup(){
 				<!-- tab button -->
 				<ul class="tabType1">
 					<li class="tab active"><button type="button" onclick="TabType5(this,'1');listLoad('/web/member/pay/PayListAllAjax.do'); return false;" >전체</button></li>
+					<!-- <li class="tab"><button type="button" onclick="TabType5(this,'2');listLoad('/web/member/pay/PayListSPayAjax.do'); return false;">간편결제 결제내역</button></li>-->
 					<li class="tab"><button type="button" onclick="TabType5(this,'2');listLoad('/web/member/pay/PayListVBankAjax.do'); return false;">전용계좌 결제내역</button></li>
 					<li class="tab"><button type="button" onclick="TabType5(this,'3');listLoad('/web/member/pay/PayListCardAjax.do'); return false;">신용카드 결제내역</button></li>
-					<!-- <li class="tab"><button type="button" onclick="TabType5(this,'4');listLoad('/web/member/pay/PayListOfflineAjax.do'); return false;">무통장입금</button></li> -->
 					<li class="tab"><button type="button" onclick="TabType5(this,'4');listLoad('/web/member/pay/PayListMobileAjax.do'); return false;">휴대폰  결제내역</button></li>
 					<li class="tab"><button type="button" onclick="TabType5(this,'5');listLoad('/web/member/pay/PayListBankAjax.do'); return false;">즉시이체 결제내역</button></li>					
 					<li class="tab"><button type="button" onclick="TabType5(this,'6');listLoad('/web/member/pay/PayListPointAjax.do'); return false;">포인트 교환내역</button></li>					
diff --git a/src/main/webapp/WEB-INF/jsp/web/pay/PayListAllAjax.jsp b/src/main/webapp/WEB-INF/jsp/web/pay/PayListAllAjax.jsp
index 16ab51d7..da109637 100644
--- a/src/main/webapp/WEB-INF/jsp/web/pay/PayListAllAjax.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/pay/PayListAllAjax.jsp
@@ -514,7 +514,7 @@ $(document).on("click", "#chkAll", function(e) {
 									<c:if test="${result.rcptType eq '0'}">
 										<p class="fwRg c_002c9a">간이영수증 발행완료</p>
 									</c:if>
-									<c:if test="${result.payMethod == 'CARD'}">
+									<c:if test="${result.payMethod == 'CARD' || result.payMethod == 'SPAY'}">
 										<button type="button" class="btnType btnType20" onclick="fnPrintReceipt('<c:out value="${result.tid}"/>', '<c:out value="${result.pgCode}"/>', '<c:out value="${result.svcId}"/>', '<c:out value="${result.mrctTrdNo}"/>', '<c:out value="${result.trdNo}"/>', '<c:out value="${result.regDate}"/>'); return false;">카드전표</button>
 									</c:if>
 								</c:if>