From 8ee188612d1191987acc54433c2f0f12a2c01fb0 Mon Sep 17 00:00:00 2001
From: itn <itn@LAPTOP-ONDDS4DD>
Date: Mon, 14 Aug 2023 14:40:30 +0900
Subject: [PATCH] =?UTF-8?q?=EA=B0=84=ED=8E=B8=EA=B2=B0=EC=A0=9C=20?=
 =?UTF-8?q?=EA=B4=80=EB=A0=A8=20=EB=AC=B8=EA=B5=AC=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../WEB-INF/jsp/web/pay/PayListAllAjax.jsp    | 111 ++++++++++--------
 1 file changed, 59 insertions(+), 52 deletions(-)

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 aec92b1f..dccd1643 100644
--- a/src/main/webapp/WEB-INF/jsp/web/pay/PayListAllAjax.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/pay/PayListAllAjax.jsp
@@ -499,7 +499,7 @@ function getMberGrdChk() {
 								</c:choose> --%>
 							</td>
 							<td>
-								<c:out value="${result.payMethodTxt}"/>
+								<c:out value="${result.payMethodTxt}"/><c:if test="${result.payMethod == 'SPAY'}">(<c:out value="${result.cardName}"/>)</c:if>								
 								<c:if test="${result.pgCode == 'VBANK'}">
 									(<c:out value="${result.vbankNum}"/>)
 								</c:if>
@@ -517,58 +517,65 @@ function getMberGrdChk() {
 							</td>
 							 --%>
 							<td>
-								<c:if test="${result.pgStatus eq '1'}">
-									<!-- 발행전 -->
-									<c:if test="${result.confirmYn eq null || result.confirmYn eq ''}">
-										<c:if test="${result.payMethod eq 'BANK' or result.payMethod eq 'VBANK'}">
-											<c:if test="${result.btnChk eq 'Y'}">
-												<button type="button" class="btnType btnType20" data-tooltip="cashReceipt_popup02" onclick="javascript:taxValue('${result.moid}');">세금계산서</button>
-												<button type="button" class="btnType btnType20" data-tooltip="cashReceipt_popup01" onclick="javascript:cashValue('${result.moid}');">현금영수증</button>
+								<c:choose>
+									<c:when test="${result.payMethod == 'SPAY'}">
+										간편결제(증빙서류 발급불가)
+									</c:when>
+									<c:otherwise>
+										<c:if test="${result.pgStatus eq '1'}">
+											<!-- 발행전 -->
+											<c:if test="${result.confirmYn eq null || result.confirmYn eq ''}">
+												<c:if test="${result.payMethod eq 'BANK' or result.payMethod eq 'VBANK'}">
+													<c:if test="${result.btnChk eq 'Y'}">
+														<button type="button" class="btnType btnType20" data-tooltip="cashReceipt_popup02" onclick="javascript:taxValue('${result.moid}');">세금계산서</button>
+														<button type="button" class="btnType btnType20" data-tooltip="cashReceipt_popup01" onclick="javascript:cashValue('${result.moid}');">현금영수증</button>
+													</c:if>
+													<%--<c:if test="${result.rcptType ne '0'}"> --%>
+														<button type="button" class="btnType btnType20" onclick="fnSimpRecip('<c:out value="${result.tid}"/>','<c:out value="${result.moid}"/>'); return false;">간이영수증</button>
+													<%--</c:if> --%>
+												</c:if>
+												
+												<!-- 휴대폰결제 -->
+												<c:if test="${result.payMethod eq 'CELLPHONE'}">
+													<!-- 22.12.09 휴대폰결제는 현금영수증 제외 -->
+													<%-- <button type="button" class="btnType btnType20" data-tooltip="cashReceipt_popup01" onclick="javascript:cashValue('${result.moid}');">현금영수증</button> --%>
+													<button type="button" class="btnType btnType20" onclick="fnSimpRecip('<c:out value="${result.tid}"/>','<c:out value="${result.moid}"/>'); return false;">간이영수증</button>
+												</c:if>
+												
 											</c:if>
-											<%--<c:if test="${result.rcptType ne '0'}"> --%>
-												<button type="button" class="btnType btnType20" onclick="fnSimpRecip('<c:out value="${result.tid}"/>','<c:out value="${result.moid}"/>'); return false;">간이영수증</button>
-											<%--</c:if> --%>
-										</c:if>
-										
-										<!-- 휴대폰결제 -->
-										<c:if test="${result.payMethod eq 'CELLPHONE'}">
-											<!-- 22.12.09 휴대폰결제는 현금영수증 제외 -->
-											<%-- <button type="button" class="btnType btnType20" data-tooltip="cashReceipt_popup01" onclick="javascript:cashValue('${result.moid}');">현금영수증</button> --%>
-											<button type="button" class="btnType btnType20" onclick="fnSimpRecip('<c:out value="${result.tid}"/>','<c:out value="${result.moid}"/>'); return false;">간이영수증</button>
-										</c:if>
-										
-									</c:if>
-									<!-- 발행대기 -->
-									<c:if test="${result.confirmYn eq 'N'}">
-										<c:if test="${result.rcptType eq '9'}">
-											<p class="fwRg c_002c9a">세금계산서 발행대기</p>
-										</c:if>
-										<c:if test="${result.rcptType eq '1' || result.rcptType eq '2'}">
-											<p class="fwRg c_002c9a">현금영수증 발행대기</p>
-										</c:if>
-										<c:if test="${result.rcptType eq '5'}">
-											<p class="fwRg c_002c9a">관리자 현금영수증 발행대기</p>
-										</c:if>
-									</c:if>
-									<!-- 발행완료 -->
-									<c:if test="${result.confirmYn eq 'Y'}">
-										<c:if test="${result.rcptType eq '9'}">
-											<p class="fwRg c_002c9a">세금계산서 발행완료</p>
-										</c:if>
-										<c:if test="${result.rcptType eq '1' || result.rcptType eq '2'}">
-											<p class="fwRg c_002c9a">현금영수증 발행완료</p>
-										</c:if>
-										<c:if test="${result.rcptType eq '5'}">
-											<p class="fwRg c_002c9a">관리자 현금영수증 발행완료</p>
-										</c:if>
-									</c:if>
-									<c:if test="${result.rcptType eq '0'}">
-										<p class="fwRg c_002c9a">간이영수증 발행완료</p>
-									</c:if>
-									<c:if test="${result.payMethod == 'CARD'}">
-										<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>
+											<!-- 발행대기 -->
+											<c:if test="${result.confirmYn eq 'N'}">
+												<c:if test="${result.rcptType eq '9'}">
+													<p class="fwRg c_002c9a">세금계산서 발행대기</p>
+												</c:if>
+												<c:if test="${result.rcptType eq '1' || result.rcptType eq '2'}">
+													<p class="fwRg c_002c9a">현금영수증 발행대기</p>
+												</c:if>
+												<c:if test="${result.rcptType eq '5'}">
+													<p class="fwRg c_002c9a">관리자 현금영수증 발행대기</p>
+												</c:if>
+											</c:if>
+											<!-- 발행완료 -->
+											<c:if test="${result.confirmYn eq 'Y'}">
+												<c:if test="${result.rcptType eq '9'}">
+													<p class="fwRg c_002c9a">세금계산서 발행완료</p>
+												</c:if>
+												<c:if test="${result.rcptType eq '1' || result.rcptType eq '2'}">
+													<p class="fwRg c_002c9a">현금영수증 발행완료</p>
+												</c:if>
+												<c:if test="${result.rcptType eq '5'}">
+													<p class="fwRg c_002c9a">관리자 현금영수증 발행완료</p>
+												</c:if>
+											</c:if>
+											<c:if test="${result.rcptType eq '0'}">
+												<p class="fwRg c_002c9a">간이영수증 발행완료</p>
+											</c:if>
+											<c:if test="${result.payMethod == 'CARD'}">
+												<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>										
+									</c:otherwise>
+								</c:choose>							
 							</td>
 						</tr>
 						</c:forEach>