후불제 회원 요금결제내역 세금계산서 버튼 처리 추가 - 입금대기 상태의 내역에 대해서 세금계산서 처리 로직 변경
- 입금대기 상태의 내역에 대해서 세금계산서 처리 로직 변경
@f05d6bf8e79ff3c65fdf7ece19d48d1e1fb6198b
--- src/main/resources/egovframework/sqlmap/let/msg/MjonMsgData_SQL_mysql.xml
+++ src/main/resources/egovframework/sqlmap/let/msg/MjonMsgData_SQL_mysql.xml
... | ... | @@ -2130,6 +2130,7 @@ |
| 2130 | 2130 |
, HOTLINE_AGENT_CODE AS hotlineAgentCode |
| 2131 | 2131 |
, BLINE_CODE AS blineCode |
| 2132 | 2132 |
, AT_SMISHING_YN AS atSmishingYn |
| 2133 |
+ , PRE_PAYMENT_YN AS prePaymentYn |
|
| 2133 | 2134 |
FROM LETTNGNRLMBER |
| 2134 | 2135 |
WHERE MBER_ID = #userId# |
| 2135 | 2136 |
|
--- src/main/webapp/WEB-INF/jsp/web/pay/PayListAllAjax.jsp
+++ src/main/webapp/WEB-INF/jsp/web/pay/PayListAllAjax.jsp
... | ... | @@ -153,16 +153,18 @@ |
| 153 | 153 |
var cashRegNo = ""; |
| 154 | 154 |
var frm = document.taxForm; |
| 155 | 155 |
var bizOrRegi = $("input:radio[name=bizOrRegi]:checked").val();
|
| 156 |
+ var taxbillAuto = '${mberManageVO.taxbillAuto}'; //자동발행 여부 체크
|
|
| 156 | 157 |
|
| 157 | 158 |
//담당자명이 없으면 세금계산서 발행등록 메뉴로 보냄 |
| 158 | 159 |
if(taxMngNm == '') {
|
| 159 | 160 |
alert("세금계산서 발행 정보를 입력하는 화면으로 이동합니다.");
|
| 160 |
- |
|
| 161 | 161 |
location.href = "/web/member/pay/BillPub.do"; |
| 162 | 162 |
} |
| 163 | 163 |
|
| 164 | 164 |
//최초 레이어 오픈 시 작동 |
| 165 |
- //if(bizOrRegi === undefined) {
|
|
| 165 |
+ //자동발행 저장하지 않았을 경우만 처리하도록 함 20231228 우영두 수정 |
|
| 166 |
+ //자동발행 저장하였을 경우 자동발행 저장된 기업/개인 라디오버튼이 선택 되도록 함. |
|
| 167 |
+ if(taxbillAuto == 'N') {
|
|
| 166 | 168 |
if(taxBizNo != "") {
|
| 167 | 169 |
bizOrRegi = "biz"; |
| 168 | 170 |
$("input[type=radio][value='biz']").prop("checked",true);
|
... | ... | @@ -170,7 +172,7 @@ |
| 170 | 172 |
bizOrRegi = "regi"; |
| 171 | 173 |
$("input[type=radio][value='regi']").prop("checked",true);
|
| 172 | 174 |
} |
| 173 |
- //} |
|
| 175 |
+ } |
|
| 174 | 176 |
|
| 175 | 177 |
if(bizOrRegi == "biz"){
|
| 176 | 178 |
//사업자번호 공란인 경우 |
... | ... | @@ -205,6 +207,16 @@ |
| 205 | 207 |
frm.rcptType.value = "9"; |
| 206 | 208 |
frm.phone.value = "${mberManageVO.taxMngPhoneNum}";
|
| 207 | 209 |
frm.email.value = "${mberManageVO.taxMngEmail}";
|
| 210 |
+ |
|
| 211 |
+ if(bizOrRegi == "biz") {
|
|
| 212 |
+ $(".biz").show();
|
|
| 213 |
+ $(".regi").hide();
|
|
| 214 |
+ } |
|
| 215 |
+ if(bizOrRegi == "regi") {
|
|
| 216 |
+ $(".biz").hide();
|
|
| 217 |
+ $(".regi").show();
|
|
| 218 |
+ } |
|
| 219 |
+ |
|
| 208 | 220 |
} |
| 209 | 221 |
|
| 210 | 222 |
//현금영수증 value 넣기 |
... | ... | @@ -398,7 +410,7 @@ |
| 398 | 410 |
※ 간편결제 영수증은 결제하신 서비스를 통해 제공됩니다. |
| 399 | 411 |
</c:when> |
| 400 | 412 |
<c:otherwise> |
| 401 |
- ※ 후불제 고객은 사용금액 결제수단은 계좌이체만 가능합니다. <br /> |
|
| 413 |
+ ※ 후불제 고객의 사용금액 결제수단은 계좌이체만 가능합니다. <br /> |
|
| 402 | 414 |
※ 세금계산서 발행 후 매월 15일(공휴일인 경우 다음 영업일) 이전까지 아래 계좌로 입금 부탁드립니다.<br /> |
| 403 | 415 |
<p class="accountinfo"><span>-입금은행:</span>우리은행<span>-입금계좌:</span>1005-904-154328<span>-받는사람:</span>주식회사 아이티앤</p> |
| 404 | 416 |
</c:otherwise> |
... | ... | @@ -567,6 +579,52 @@ |
| 567 | 579 |
</c:if> |
| 568 | 580 |
</c:when> |
| 569 | 581 |
<c:otherwise> |
| 582 |
+ <c:if test="${result.pgStatus eq '0'}">
|
|
| 583 |
+ <!-- 후불제 회원 입금대기 상태인 경우 처리 --> |
|
| 584 |
+ <!-- 발행대기 --> |
|
| 585 |
+ <c:if test="${result.confirmYn eq 'N'}">
|
|
| 586 |
+ <c:if test="${result.rcptType eq '9'}">
|
|
| 587 |
+ <p class="fwRg c_002c9a">세금계산서 발행대기</p> |
|
| 588 |
+ </c:if> |
|
| 589 |
+ <c:if test="${result.rcptType eq '1' || result.rcptType eq '2'}">
|
|
| 590 |
+ <p class="fwRg c_002c9a">현금영수증 발행대기</p> |
|
| 591 |
+ </c:if> |
|
| 592 |
+ <c:if test="${result.rcptType eq '5'}">
|
|
| 593 |
+ <p class="fwRg c_002c9a">관리자 현금영수증 발행대기</p> |
|
| 594 |
+ </c:if> |
|
| 595 |
+ |
|
| 596 |
+ <!-- 의무발생일경우 --> |
|
| 597 |
+ <c:if test="${result.rcptType eq '3'}">
|
|
| 598 |
+ <c:if test="${result.payMethod eq 'BANK' or result.payMethod eq 'VBANK'}">
|
|
| 599 |
+ <c:if test="${result.btnChk eq 'Y'}">
|
|
| 600 |
+ <button type="button" class="btnType btnType20" data-tooltip="cashReceipt_popup02" onclick="javascript:taxValue('${result.moid}');">세금계산서</button>
|
|
| 601 |
+ <button type="button" class="btnType btnType20" data-tooltip="cashReceipt_popup01" onclick="javascript:cashValue('${result.moid}');">현금영수증</button>
|
|
| 602 |
+ </c:if> |
|
| 603 |
+ |
|
| 604 |
+ <%-- <button type="button" class="btnType btnType20" onclick="fnSimpRecip('<c:out value="${result.tid}"/>','<c:out value="${result.moid}"/>'); return false;">간이영수증</button> --%>
|
|
| 605 |
+ </c:if> |
|
| 606 |
+ |
|
| 607 |
+ <!-- 휴대폰결제 --> |
|
| 608 |
+ <c:if test="${result.payMethod eq 'CELLPHONE'}">
|
|
| 609 |
+ <!-- 22.12.09 휴대폰결제는 현금영수증 제외 --> |
|
| 610 |
+ <%-- <button type="button" class="btnType btnType20" onclick="fnSimpRecip('<c:out value="${result.tid}"/>','<c:out value="${result.moid}"/>'); return false;">간이영수증</button> --%>
|
|
| 611 |
+ 휴대폰결제(증빙서류 발급불가) |
|
| 612 |
+ </c:if> |
|
| 613 |
+ </c:if> |
|
| 614 |
+ </c:if> |
|
| 615 |
+ <!-- 발행완료 --> |
|
| 616 |
+ <c:if test="${result.confirmYn eq 'Y'}">
|
|
| 617 |
+ <c:if test="${result.rcptType eq '9'}">
|
|
| 618 |
+ <p class="fwRg c_002c9a">세금계산서 발행완료</p> |
|
| 619 |
+ </c:if> |
|
| 620 |
+ <c:if test="${result.rcptType eq '1' || result.rcptType eq '2'}">
|
|
| 621 |
+ <p class="fwRg c_002c9a">현금영수증 발행완료</p> |
|
| 622 |
+ </c:if> |
|
| 623 |
+ <c:if test="${result.rcptType eq '5'}">
|
|
| 624 |
+ <p class="fwRg c_002c9a">관리자 현금영수증 발행완료</p> |
|
| 625 |
+ </c:if> |
|
| 626 |
+ </c:if> |
|
| 627 |
+ </c:if> |
|
| 570 | 628 |
<c:if test="${result.pgStatus eq '1'}">
|
| 571 | 629 |
<!-- 발행전 --> |
| 572 | 630 |
<c:if test="${result.confirmYn eq null || result.confirmYn eq ''}">
|
... | ... | @@ -825,8 +883,8 @@ |
| 825 | 883 |
<!-- 선거 후보자정보와 업체정보 둘 다 등록되어있는 경우 : radio 선택하여 영역 보여주기 --> |
| 826 | 884 |
<th scope="row">발행대상</th> |
| 827 | 885 |
<td> |
| 828 |
- <input type="radio" name="bizOrRegi" value="biz" id="biz" onchange="fncBizOrRegi(this.value); return false;" checked="checked" /><label for="biz">기업</label> |
|
| 829 |
- <input type="radio" name="bizOrRegi" value="regi" id="regi" onchange="fncBizOrRegi(this.value); return false;" /><label for="regi">개인</label> |
|
| 886 |
+ <input type="radio" name="bizOrRegi" value="biz" id="biz" onchange="fncBizOrRegi(this.value); return false;" <c:if test="${mberManageVO.taxbillAuto eq 'B'}" >checked="checked" </c:if><label for="biz">기업</label>
|
|
| 887 |
+ <input type="radio" name="bizOrRegi" value="regi" id="regi" onchange="fncBizOrRegi(this.value); return false;" <c:if test="${mberManageVO.taxbillAuto eq 'C'}" >checked="checked" </c:if> /><label for="regi">개인</label>
|
|
| 830 | 888 |
</td> |
| 831 | 889 |
</tr> |
| 832 | 890 |
<!-- 업체정보 --> |
--- src/main/webapp/WEB-INF/jsp/web/pay/PayUserSWList.jsp
+++ src/main/webapp/WEB-INF/jsp/web/pay/PayUserSWList.jsp
... | ... | @@ -204,86 +204,146 @@ |
| 204 | 204 |
<button type="button" class="button info" onclick="infoPop('PayUserList');">사용안내</button>
|
| 205 | 205 |
</div> |
| 206 | 206 |
<div class="hisroy_price"> |
| 207 |
- <div class="hisroy_price_in"> |
|
| 208 |
- <p> |
|
| 209 |
- <i></i>충전금액 |
|
| 210 |
- </p> |
|
| 211 |
- |
|
| 212 |
- <div class="clearfix"> |
|
| 213 |
- <p>캐시</p> |
|
| 214 |
- <p> |
|
| 215 |
- <span> |
|
| 216 |
- <c:choose> |
|
| 217 |
- <c:when test="${not empty sumPayMoney}">
|
|
| 218 |
- <fmt:formatNumber value="${sumPayMoney}" pattern="#,###.#"/>
|
|
| 219 |
- </c:when> |
|
| 220 |
- <c:otherwise> |
|
| 221 |
- <fmt:formatNumber value="0" pattern="#,###.#"/> |
|
| 222 |
- </c:otherwise> |
|
| 223 |
- </c:choose> |
|
| 224 |
- </span>원 |
|
| 225 |
- </p> |
|
| 226 |
- </div> |
|
| 227 |
- <div class="clearfix"> |
|
| 228 |
- <p>포인트</p> |
|
| 229 |
- <p> |
|
| 230 |
- <span> |
|
| 231 |
- <c:choose> |
|
| 232 |
- <c:when test="${not empty sumPoint}">
|
|
| 233 |
- <fmt:formatNumber value="${sumPoint}" pattern="#,###.#"/>
|
|
| 234 |
- </c:when> |
|
| 235 |
- <c:otherwise> |
|
| 236 |
- <fmt:formatNumber value="0" pattern="#,###.#"/> |
|
| 237 |
- </c:otherwise> |
|
| 238 |
- </c:choose> |
|
| 239 |
- </span>원 |
|
| 240 |
- </p> |
|
| 241 |
- </div> |
|
| 242 |
- </div> |
|
| 243 |
- <div class="hisroy_price_in"> |
|
| 244 |
- <p> |
|
| 245 |
- <i></i>사용금액 |
|
| 246 |
- </p> |
|
| 247 |
- <c:forEach var="result" items="${usedCashTotList}" varStatus="status">
|
|
| 248 |
- <div class="clearfix"> |
|
| 207 |
+ <c:choose> |
|
| 208 |
+ <c:when test="${mberManageVO.prePaymentYn eq 'Y'}">
|
|
| 209 |
+ <div class="hisroy_price_in"> |
|
| 249 | 210 |
<p> |
| 250 |
- <c:if test="${result.divFlag eq 'CASH' }">
|
|
| 251 |
- 캐시 |
|
| 252 |
- </c:if> |
|
| 253 |
- <c:if test="${result.divFlag eq 'POINT' }">
|
|
| 254 |
- 포인트 |
|
| 255 |
- </c:if> |
|
| 211 |
+ <i></i>충전금액 |
|
| 256 | 212 |
</p> |
| 257 |
- <p> |
|
| 258 |
- <span> |
|
| 259 |
- <fmt:formatNumber value="${result.totalPrice}" pattern="#,###.#"/>
|
|
| 260 |
- </span>원 |
|
| 261 |
- </p> |
|
| 213 |
+ |
|
| 214 |
+ <div class="clearfix"> |
|
| 215 |
+ <p>캐시</p> |
|
| 216 |
+ <p> |
|
| 217 |
+ <span> |
|
| 218 |
+ <c:choose> |
|
| 219 |
+ <c:when test="${not empty sumPayMoney}">
|
|
| 220 |
+ <fmt:formatNumber value="${sumPayMoney}" pattern="#,###.#"/>
|
|
| 221 |
+ </c:when> |
|
| 222 |
+ <c:otherwise> |
|
| 223 |
+ <fmt:formatNumber value="0" pattern="#,###.#"/> |
|
| 224 |
+ </c:otherwise> |
|
| 225 |
+ </c:choose> |
|
| 226 |
+ </span>원 |
|
| 227 |
+ </p> |
|
| 228 |
+ </div> |
|
| 229 |
+ <div class="clearfix"> |
|
| 230 |
+ <p>포인트</p> |
|
| 231 |
+ <p> |
|
| 232 |
+ <span> |
|
| 233 |
+ <c:choose> |
|
| 234 |
+ <c:when test="${not empty sumPoint}">
|
|
| 235 |
+ <fmt:formatNumber value="${sumPoint}" pattern="#,###.#"/>
|
|
| 236 |
+ </c:when> |
|
| 237 |
+ <c:otherwise> |
|
| 238 |
+ <fmt:formatNumber value="0" pattern="#,###.#"/> |
|
| 239 |
+ </c:otherwise> |
|
| 240 |
+ </c:choose> |
|
| 241 |
+ </span>원 |
|
| 242 |
+ </p> |
|
| 243 |
+ </div> |
|
| 262 | 244 |
</div> |
| 263 |
- </c:forEach> |
|
| 264 |
- </div> |
|
| 265 |
- <div class="hisroy_price_in"> |
|
| 266 |
- <p> |
|
| 267 |
- <i></i>잔액 |
|
| 268 |
- </p> |
|
| 269 |
- <div class="clearfix"> |
|
| 270 |
- <p>캐시</p> |
|
| 271 |
- <p> |
|
| 272 |
- <span> |
|
| 273 |
- <fmt:formatNumber value="${mberManageVO.userMoney}" pattern="" />
|
|
| 274 |
- </span>원 |
|
| 275 |
- </p> |
|
| 276 |
- </div> |
|
| 277 |
- <div class="clearfix"> |
|
| 278 |
- <p>포인트</p> |
|
| 279 |
- <p> |
|
| 280 |
- <span> |
|
| 281 |
- <fmt:formatNumber value="${mberManageVO.userPoint}" pattern="" />
|
|
| 282 |
- </span>원 |
|
| 283 |
- </p> |
|
| 284 |
- </div> |
|
| 285 |
- </div> |
|
| 245 |
+ <div class="hisroy_price_in"> |
|
| 246 |
+ <p> |
|
| 247 |
+ <i></i>사용금액 |
|
| 248 |
+ </p> |
|
| 249 |
+ <c:forEach var="result" items="${usedCashTotList}" varStatus="status">
|
|
| 250 |
+ <div class="clearfix"> |
|
| 251 |
+ <p> |
|
| 252 |
+ <c:if test="${result.divFlag eq 'CASH' }">
|
|
| 253 |
+ 캐시 |
|
| 254 |
+ </c:if> |
|
| 255 |
+ <c:if test="${result.divFlag eq 'POINT' }">
|
|
| 256 |
+ 포인트 |
|
| 257 |
+ </c:if> |
|
| 258 |
+ </p> |
|
| 259 |
+ <p> |
|
| 260 |
+ <span> |
|
| 261 |
+ <fmt:formatNumber value="${result.totalPrice}" pattern="#,###.#"/>
|
|
| 262 |
+ </span>원 |
|
| 263 |
+ </p> |
|
| 264 |
+ </div> |
|
| 265 |
+ </c:forEach> |
|
| 266 |
+ </div> |
|
| 267 |
+ <div class="hisroy_price_in"> |
|
| 268 |
+ <p> |
|
| 269 |
+ <i></i>잔액 |
|
| 270 |
+ </p> |
|
| 271 |
+ <div class="clearfix"> |
|
| 272 |
+ <p>캐시</p> |
|
| 273 |
+ <p> |
|
| 274 |
+ <span> |
|
| 275 |
+ <fmt:formatNumber value="${mberManageVO.userMoney}" pattern="" />
|
|
| 276 |
+ </span>원 |
|
| 277 |
+ </p> |
|
| 278 |
+ </div> |
|
| 279 |
+ <div class="clearfix"> |
|
| 280 |
+ <p>포인트</p> |
|
| 281 |
+ <p> |
|
| 282 |
+ <span> |
|
| 283 |
+ <fmt:formatNumber value="${mberManageVO.userPoint}" pattern="" />
|
|
| 284 |
+ </span>원 |
|
| 285 |
+ </p> |
|
| 286 |
+ </div> |
|
| 287 |
+ </div> |
|
| 288 |
+ </c:when> |
|
| 289 |
+ <c:otherwise> |
|
| 290 |
+ <div class="hisroy_defprice_in"> |
|
| 291 |
+ <p><i></i>누적 사용금액</p> |
|
| 292 |
+ <div class="clearfix"> |
|
| 293 |
+ <p>캐시</p> |
|
| 294 |
+ <p><span>120</span>원</p> |
|
| 295 |
+ </div> |
|
| 296 |
+ <div class="clearfix"> |
|
| 297 |
+ <p>포인트</p> |
|
| 298 |
+ <p><span>120</span>원</p> |
|
| 299 |
+ </div> |
|
| 300 |
+ </div> |
|
| 301 |
+ <div class="hisroy_defprice_in"> |
|
| 302 |
+ <p><i></i>누적 납부금액</p> |
|
| 303 |
+ <div class="clearfix"> |
|
| 304 |
+ <p>캐시</p> |
|
| 305 |
+ <p><span>120</span>원</p> |
|
| 306 |
+ </div> |
|
| 307 |
+ <div class="clearfix"> |
|
| 308 |
+ <p>포인트</p> |
|
| 309 |
+ <p><span>120</span>원</p> |
|
| 310 |
+ </div> |
|
| 311 |
+ </div> |
|
| 312 |
+ <div class="hisroy_defprice_in"> |
|
| 313 |
+ <p><i></i>당월 납부 예상금액</p> |
|
| 314 |
+ <div class="clearfix"> |
|
| 315 |
+ <p>캐시</p> |
|
| 316 |
+ <p><span>120</span>원</p> |
|
| 317 |
+ </div> |
|
| 318 |
+ <div class="clearfix"> |
|
| 319 |
+ <p>포인트</p> |
|
| 320 |
+ <p><span>120</span>원</p> |
|
| 321 |
+ </div> |
|
| 322 |
+ </div> |
|
| 323 |
+ <div class="hisroy_defprice_in"> |
|
| 324 |
+ <p><i></i>잔액 (사용가능금액)</p> |
|
| 325 |
+ <div class="clearfix"> |
|
| 326 |
+ <p>캐시</p> |
|
| 327 |
+ <p> |
|
| 328 |
+ <span> |
|
| 329 |
+ <fmt:formatNumber value="${mberManageVO.userMoney}" pattern="" />
|
|
| 330 |
+ </span>원 |
|
| 331 |
+ </p> |
|
| 332 |
+ </div> |
|
| 333 |
+ <div class="clearfix"> |
|
| 334 |
+ <p>포인트</p> |
|
| 335 |
+ <p> |
|
| 336 |
+ <span> |
|
| 337 |
+ <fmt:formatNumber value="${mberManageVO.userPoint}" pattern="" />
|
|
| 338 |
+ </span>원 |
|
| 339 |
+ </p> |
|
| 340 |
+ </div> |
|
| 341 |
+ </div> |
|
| 342 |
+ </c:otherwise> |
|
| 343 |
+ </c:choose> |
|
| 286 | 344 |
</div> |
| 345 |
+ |
|
| 346 |
+ |
|
| 287 | 347 |
<div class="history_details"> |
| 288 | 348 |
<p class="tType1_title"><img src="/publish/images/content/history_details_title.png" alt=""> 발송내역</p> |
| 289 | 349 |
<div class="details_wrap"> |
Add a comment
Delete comment
Once you delete this comment, you won't be able to recover it. Are you sure you want to delete this comment?