Commit @8ee188612d1191987acc54433c2f0f12a2c01fb0

itn 2023-08-14

간편결제 관련 문구 수정

@8ee188612d1191987acc54433c2f0f12a2c01fb0

0019970

8ee1886

src/main/webapp/WEB-INF/jsp/web/pay/PayListAllAjax.jsp

--- src/main/webapp/WEB-INF/jsp/web/pay/PayListAllAjax.jsp

+++ src/main/webapp/WEB-INF/jsp/web/pay/PayListAllAjax.jsp


 								</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>

 							</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>

Add a comment

Open 0
Closed 0

List

...	...	@@ -499,7 +499,7 @@
499	499	</c:choose> --%>
500	500	</td>
501	501	<td>
502		- <c:out value="${result.payMethodTxt}"/>
	502	+ <c:out value="${result.payMethodTxt}"/><c:if test="${result.payMethod == 'SPAY'}">(<c:out value="${result.cardName}"/>)</c:if>
503	503	<c:if test="${result.pgCode == 'VBANK'}">
504	504	(<c:out value="${result.vbankNum}"/>)
505	505	</c:if>
...	...	@@ -517,58 +517,65 @@
517	517	</td>
518	518	--%>
519	519	<td>
520		- <c:if test="${result.pgStatus eq '1'}">
521		- <!-- 발행전 -->
522		- <c:if test="${result.confirmYn eq null \|\| result.confirmYn eq ''}">
523		- <c:if test="${result.payMethod eq 'BANK' or result.payMethod eq 'VBANK'}">
524		- <c:if test="${result.btnChk eq 'Y'}">
525		- <button type="button" class="btnType btnType20" data-tooltip="cashReceipt_popup02" onclick="javascript:taxValue('${result.moid}');">세금계산서</button>
526		- <button type="button" class="btnType btnType20" data-tooltip="cashReceipt_popup01" onclick="javascript:cashValue('${result.moid}');">현금영수증</button>
	520	+ <c:choose>
	521	+ <c:when test="${result.payMethod == 'SPAY'}">
	522	+ 간편결제(증빙서류 발급불가)
	523	+ </c:when>
	524	+ <c:otherwise>
	525	+ <c:if test="${result.pgStatus eq '1'}">
	526	+ <!-- 발행전 -->
	527	+ <c:if test="${result.confirmYn eq null \|\| result.confirmYn eq ''}">
	528	+ <c:if test="${result.payMethod eq 'BANK' or result.payMethod eq 'VBANK'}">
	529	+ <c:if test="${result.btnChk eq 'Y'}">
	530	+ <button type="button" class="btnType btnType20" data-tooltip="cashReceipt_popup02" onclick="javascript:taxValue('${result.moid}');">세금계산서</button>
	531	+ <button type="button" class="btnType btnType20" data-tooltip="cashReceipt_popup01" onclick="javascript:cashValue('${result.moid}');">현금영수증</button>
	532	+ </c:if>
	533	+ <%--<c:if test="${result.rcptType ne '0'}"> --%>
	534	+ <button type="button" class="btnType btnType20" onclick="fnSimpRecip('<c:out value="${result.tid}"/>','<c:out value="${result.moid}"/>'); return false;">간이영수증</button>
	535	+ <%--</c:if> --%>
	536	+ </c:if>
	537	+
	538	+ <!-- 휴대폰결제 -->
	539	+ <c:if test="${result.payMethod eq 'CELLPHONE'}">
	540	+ <!-- 22.12.09 휴대폰결제는 현금영수증 제외 -->
	541	+ <%-- <button type="button" class="btnType btnType20" data-tooltip="cashReceipt_popup01" onclick="javascript:cashValue('${result.moid}');">현금영수증</button> --%>
	542	+ <button type="button" class="btnType btnType20" onclick="fnSimpRecip('<c:out value="${result.tid}"/>','<c:out value="${result.moid}"/>'); return false;">간이영수증</button>
	543	+ </c:if>
	544	+
527	545	</c:if>
528		- <%--<c:if test="${result.rcptType ne '0'}"> --%>
529		- <button type="button" class="btnType btnType20" onclick="fnSimpRecip('<c:out value="${result.tid}"/>','<c:out value="${result.moid}"/>'); return false;">간이영수증</button>
530		- <%--</c:if> --%>
531		- </c:if>
532		-
533		- <!-- 휴대폰결제 -->
534		- <c:if test="${result.payMethod eq 'CELLPHONE'}">
535		- <!-- 22.12.09 휴대폰결제는 현금영수증 제외 -->
536		- <%-- <button type="button" class="btnType btnType20" data-tooltip="cashReceipt_popup01" onclick="javascript:cashValue('${result.moid}');">현금영수증</button> --%>
537		- <button type="button" class="btnType btnType20" onclick="fnSimpRecip('<c:out value="${result.tid}"/>','<c:out value="${result.moid}"/>'); return false;">간이영수증</button>
538		- </c:if>
539		-
540		- </c:if>
541		- <!-- 발행대기 -->
542		- <c:if test="${result.confirmYn eq 'N'}">
543		- <c:if test="${result.rcptType eq '9'}">
544		- <p class="fwRg c_002c9a">세금계산서 발행대기</p>
545		- </c:if>
546		- <c:if test="${result.rcptType eq '1' \|\| result.rcptType eq '2'}">
547		- <p class="fwRg c_002c9a">현금영수증 발행대기</p>
548		- </c:if>
549		- <c:if test="${result.rcptType eq '5'}">
550		- <p class="fwRg c_002c9a">관리자 현금영수증 발행대기</p>
551		- </c:if>
552		- </c:if>
553		- <!-- 발행완료 -->
554		- <c:if test="${result.confirmYn eq 'Y'}">
555		- <c:if test="${result.rcptType eq '9'}">
556		- <p class="fwRg c_002c9a">세금계산서 발행완료</p>
557		- </c:if>
558		- <c:if test="${result.rcptType eq '1' \|\| result.rcptType eq '2'}">
559		- <p class="fwRg c_002c9a">현금영수증 발행완료</p>
560		- </c:if>
561		- <c:if test="${result.rcptType eq '5'}">
562		- <p class="fwRg c_002c9a">관리자 현금영수증 발행완료</p>
563		- </c:if>
564		- </c:if>
565		- <c:if test="${result.rcptType eq '0'}">
566		- <p class="fwRg c_002c9a">간이영수증 발행완료</p>
567		- </c:if>
568		- <c:if test="${result.payMethod == 'CARD'}">
569		- <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>
570		- </c:if>
571		- </c:if>
	546	+ <!-- 발행대기 -->
	547	+ <c:if test="${result.confirmYn eq 'N'}">
	548	+ <c:if test="${result.rcptType eq '9'}">
	549	+ <p class="fwRg c_002c9a">세금계산서 발행대기</p>
	550	+ </c:if>
	551	+ <c:if test="${result.rcptType eq '1' \|\| result.rcptType eq '2'}">
	552	+ <p class="fwRg c_002c9a">현금영수증 발행대기</p>
	553	+ </c:if>
	554	+ <c:if test="${result.rcptType eq '5'}">
	555	+ <p class="fwRg c_002c9a">관리자 현금영수증 발행대기</p>
	556	+ </c:if>
	557	+ </c:if>
	558	+ <!-- 발행완료 -->
	559	+ <c:if test="${result.confirmYn eq 'Y'}">
	560	+ <c:if test="${result.rcptType eq '9'}">
	561	+ <p class="fwRg c_002c9a">세금계산서 발행완료</p>
	562	+ </c:if>
	563	+ <c:if test="${result.rcptType eq '1' \|\| result.rcptType eq '2'}">
	564	+ <p class="fwRg c_002c9a">현금영수증 발행완료</p>
	565	+ </c:if>
	566	+ <c:if test="${result.rcptType eq '5'}">
	567	+ <p class="fwRg c_002c9a">관리자 현금영수증 발행완료</p>
	568	+ </c:if>
	569	+ </c:if>
	570	+ <c:if test="${result.rcptType eq '0'}">
	571	+ <p class="fwRg c_002c9a">간이영수증 발행완료</p>
	572	+ </c:if>
	573	+ <c:if test="${result.payMethod == 'CARD'}">
	574	+ <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>
	575	+ </c:if>
	576	+ </c:if>
	577	+ </c:otherwise>
	578	+ </c:choose>
572	579	</td>
573	580	</tr>
574	581	</c:forEach>

Delete comment