Merge branch 'master' of http://dudgusw@vcs.iten.co.kr:9999/hylee/mjon_git
@d1343ccb92dce3290cca767a046258e5f18a7be2
--- src/main/java/itn/let/kakao/user/kakaoAt/web/KakaoAlimTalkTemplateController.java
+++ src/main/java/itn/let/kakao/user/kakaoAt/web/KakaoAlimTalkTemplateController.java
... | ... | @@ -564,6 +564,8 @@ |
| 564 | 564 |
return "redirect:/web/user/login/login.do"; |
| 565 | 565 |
} |
| 566 | 566 |
|
| 567 |
+ model.addAttribute("loginVO", loginVO);
|
|
| 568 |
+ |
|
| 567 | 569 |
// 사용자 아이디를 이용한 발신프로필 조회 |
| 568 | 570 |
kakaoVO.setUserId(userId); |
| 569 | 571 |
List<KakaoVO> selectKakaoProfileList = kakaoApiService.selectKakaoProfileList(kakaoVO); |
... | ... | @@ -750,6 +752,8 @@ |
| 750 | 752 |
LoginVO loginVO = EgovUserDetailsHelper.isAuthenticated()? (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser():null; |
| 751 | 753 |
String userId = loginVO == null ? "" : EgovStringUtil.isNullToString(loginVO.getId()); |
| 752 | 754 |
|
| 755 |
+ model.addAttribute("loginVO", loginVO);
|
|
| 756 |
+ |
|
| 753 | 757 |
if(userId == "") {
|
| 754 | 758 |
model.addAttribute("message", "로그인 후 이용이 가능합니다.");
|
| 755 | 759 |
return "redirect:/web/user/login/login.do"; |
--- src/main/java/itn/let/mjo/msg/service/MjonMsgVO.java
+++ src/main/java/itn/let/mjo/msg/service/MjonMsgVO.java
... | ... | @@ -204,6 +204,7 @@ |
| 204 | 204 |
private int failSendCnt; |
| 205 | 205 |
private double succSendPrice; |
| 206 | 206 |
private double failSendPrice; |
| 207 |
+ private double totSuccSendPrice; |
|
| 207 | 208 |
|
| 208 | 209 |
public String getSearchDelayMsgYn() {
|
| 209 | 210 |
return searchDelayMsgYn; |
... | ... | @@ -499,6 +500,7 @@ |
| 499 | 500 |
private double supplyPrice; // 공급가액 |
| 500 | 501 |
private double vatPrice; // 부가세 |
| 501 | 502 |
private double totalPrice; // 금액 |
| 503 |
+ private String addVatType; // 부가세 포함 여부 |
|
| 502 | 504 |
|
| 503 | 505 |
private String addrGrpId; // 주소록 그룹아이디 |
| 504 | 506 |
private String addrGrpNm; // 주소록 그룹명 |
... | ... | @@ -1298,6 +1300,12 @@ |
| 1298 | 1300 |
public void setTotalPrice(double totalPrice) {
|
| 1299 | 1301 |
this.totalPrice = totalPrice; |
| 1300 | 1302 |
} |
| 1303 |
+ public String getAddVatType() {
|
|
| 1304 |
+ return addVatType; |
|
| 1305 |
+ } |
|
| 1306 |
+ public void setAddVatType(String addVatType) {
|
|
| 1307 |
+ this.addVatType = addVatType; |
|
| 1308 |
+ } |
|
| 1301 | 1309 |
public String getDetailType() {
|
| 1302 | 1310 |
return detailType; |
| 1303 | 1311 |
} |
... | ... | @@ -1624,4 +1632,10 @@ |
| 1624 | 1632 |
public void setFailSendPrice(double failSendPrice) {
|
| 1625 | 1633 |
this.failSendPrice = failSendPrice; |
| 1626 | 1634 |
} |
| 1635 |
+ public double getTotSuccSendPrice() {
|
|
| 1636 |
+ return totSuccSendPrice; |
|
| 1637 |
+ } |
|
| 1638 |
+ public void setTotSuccSendPrice(double totSuccSendPrice) {
|
|
| 1639 |
+ this.totSuccSendPrice = totSuccSendPrice; |
|
| 1640 |
+ } |
|
| 1627 | 1641 |
} |
--- src/main/java/itn/let/mjo/pay/service/MjonPayService.java
+++ src/main/java/itn/let/mjo/pay/service/MjonPayService.java
... | ... | @@ -127,8 +127,16 @@ |
| 127 | 127 |
//총 사용금액 - 카카오 추가 |
| 128 | 128 |
List<MjonPayVO> selectUsedCashWithKakaoTotCnt(MjonPayVO mjonPayVO) throws Exception; |
| 129 | 129 |
|
| 130 |
- |
|
| 131 | 130 |
List<MjonPayVO> selectCashInfoList(String userId) throws Exception; |
| 132 | 131 |
|
| 133 | 132 |
List<MjonPayVO> selectPointInfoList(String userId) throws Exception; |
| 133 |
+ |
|
| 134 |
+ //누적 사용금액 조회 (캐시 테이블에서 현재까지 사용된 금액 합산 - 캐시 테이블에서 "-"로 사용된 금액만 합산) |
|
| 135 |
+ public String selectTotalSumCashForAfterPay(String userId) throws Exception; |
|
| 136 |
+ |
|
| 137 |
+ //누적 사용 포인트 조회 (포인트 테이블에서 현재까지 사용된 포인트 합산 - 회원 포인트 정보 업데이트시 사용되는 쿼리 이용) |
|
| 138 |
+ public String selectTotalSumPointForAfterPay(String userId) throws Exception; |
|
| 139 |
+ |
|
| 140 |
+ //누적 납부금액 조회 (후불회원이 사용금액을 실 납부한 금액 합산 - 미납 금액 제외한 총 합산 금액) |
|
| 141 |
+ public String selectTotSumPaymentAfterPay(String userId) throws Exception; |
|
| 134 | 142 |
} |
--- src/main/java/itn/let/mjo/pay/service/impl/MjonPayDAO.java
+++ src/main/java/itn/let/mjo/pay/service/impl/MjonPayDAO.java
... | ... | @@ -302,4 +302,56 @@ |
| 302 | 302 |
|
| 303 | 303 |
} |
| 304 | 304 |
|
| 305 |
+ //누적 사용금액 조회 (캐시 테이블에서 현재까지 사용된 금액 합산 - 캐시 테이블에서 "-"로 사용된 금액만 합산) |
|
| 306 |
+ public String selectTotalSumCashForAfterPay(String userId) throws Exception{
|
|
| 307 |
+ |
|
| 308 |
+ String result = ""; |
|
| 309 |
+ |
|
| 310 |
+ try {
|
|
| 311 |
+ |
|
| 312 |
+ result = (String) select("mjonPayDAO.selectTotalSumCashForAfterPay", userId);
|
|
| 313 |
+ |
|
| 314 |
+ } catch (Exception e) {
|
|
| 315 |
+ System.out.println("selectTotalSumCashForAfterPay DAO Error!!! " + e);
|
|
| 316 |
+ } |
|
| 317 |
+ |
|
| 318 |
+ return result; |
|
| 319 |
+ |
|
| 320 |
+ } |
|
| 321 |
+ |
|
| 322 |
+ |
|
| 323 |
+ //누적 사용 포인트 조회 (포인트 테이블에서 현재까지 사용된 포인트 합산 - 회원 포인트 정보 업데이트시 사용되는 쿼리 이용) |
|
| 324 |
+ public String selectTotalSumPointForAfterPay(String userId) throws Exception{
|
|
| 325 |
+ |
|
| 326 |
+ String result = ""; |
|
| 327 |
+ |
|
| 328 |
+ try {
|
|
| 329 |
+ |
|
| 330 |
+ result = (String) select("mjonPayDAO.selectTotalSumPointForAfterPay", userId);
|
|
| 331 |
+ |
|
| 332 |
+ } catch (Exception e) {
|
|
| 333 |
+ System.out.println("selectTotalSumPointForAfterPay DAO Error!!! " + e);
|
|
| 334 |
+ } |
|
| 335 |
+ |
|
| 336 |
+ return result; |
|
| 337 |
+ |
|
| 338 |
+ } |
|
| 339 |
+ |
|
| 340 |
+ //누적 납부금액 조회 (후불회원이 사용금액을 실 납부한 금액 합산 - 미납 금액 제외한 총 합산 금액) |
|
| 341 |
+ public String selectTotSumPaymentAfterPay(String userId) throws Exception{
|
|
| 342 |
+ |
|
| 343 |
+ String result = ""; |
|
| 344 |
+ |
|
| 345 |
+ try {
|
|
| 346 |
+ |
|
| 347 |
+ result = (String) select("mjonPayDAO.selectTotSumPaymentAfterPay", userId);
|
|
| 348 |
+ |
|
| 349 |
+ } catch (Exception e) {
|
|
| 350 |
+ System.out.println("selectTotSumPaymentAfterPay DAO Error!!! " + e);
|
|
| 351 |
+ } |
|
| 352 |
+ |
|
| 353 |
+ return result; |
|
| 354 |
+ |
|
| 355 |
+ } |
|
| 356 |
+ |
|
| 305 | 357 |
} |
--- src/main/java/itn/let/mjo/pay/service/impl/MjonPayServiceImpl.java
+++ src/main/java/itn/let/mjo/pay/service/impl/MjonPayServiceImpl.java
... | ... | @@ -2743,6 +2743,59 @@ |
| 2743 | 2743 |
return mjonPayDAO.selectPointInfoList(userId); |
| 2744 | 2744 |
} |
| 2745 | 2745 |
|
| 2746 |
+ //누적 사용금액 조회 (캐시 테이블에서 현재까지 사용된 금액 합산 - 캐시 테이블에서 "-"로 사용된 금액만 합산) |
|
| 2747 |
+ @Override |
|
| 2748 |
+ public String selectTotalSumCashForAfterPay(String userId) throws Exception{
|
|
| 2749 |
+ |
|
| 2750 |
+ String result = ""; |
|
| 2751 |
+ |
|
| 2752 |
+ try {
|
|
| 2753 |
+ |
|
| 2754 |
+ result = mjonPayDAO.selectTotalSumCashForAfterPay(userId); |
|
| 2755 |
+ |
|
| 2756 |
+ } catch (Exception e) {
|
|
| 2757 |
+ System.out.println("selectTotalSumCashForAfterPay Service Imple Error!!! " + e);
|
|
| 2758 |
+ } |
|
| 2759 |
+ |
|
| 2760 |
+ return result; |
|
| 2761 |
+ |
|
| 2762 |
+ } |
|
| 2746 | 2763 |
|
| 2764 |
+ |
|
| 2765 |
+ //누적 사용 포인트 조회 (포인트 테이블에서 현재까지 사용된 포인트 합산 - 회원 포인트 정보 업데이트시 사용되는 쿼리 이용) |
|
| 2766 |
+ @Override |
|
| 2767 |
+ public String selectTotalSumPointForAfterPay(String userId) throws Exception{
|
|
| 2768 |
+ |
|
| 2769 |
+ String result = ""; |
|
| 2770 |
+ |
|
| 2771 |
+ try {
|
|
| 2772 |
+ |
|
| 2773 |
+ result = mjonPayDAO.selectTotalSumPointForAfterPay(userId); |
|
| 2774 |
+ |
|
| 2775 |
+ } catch (Exception e) {
|
|
| 2776 |
+ System.out.println("selectTotalSumPointForAfterPay Service Imple Error!!! " + e);
|
|
| 2777 |
+ } |
|
| 2778 |
+ |
|
| 2779 |
+ return result; |
|
| 2780 |
+ |
|
| 2781 |
+ } |
|
| 2782 |
+ |
|
| 2783 |
+ //누적 납부금액 조회 (후불회원이 사용금액을 실 납부한 금액 합산 - 미납 금액 제외한 총 합산 금액) |
|
| 2784 |
+ @Override |
|
| 2785 |
+ public String selectTotSumPaymentAfterPay(String userId) throws Exception{
|
|
| 2786 |
+ |
|
| 2787 |
+ String result = ""; |
|
| 2788 |
+ |
|
| 2789 |
+ try {
|
|
| 2790 |
+ |
|
| 2791 |
+ result = mjonPayDAO.selectTotSumPaymentAfterPay(userId); |
|
| 2792 |
+ |
|
| 2793 |
+ } catch (Exception e) {
|
|
| 2794 |
+ System.out.println("selectTotSumPaymentAfterPay Service Imple Error!!! " + e);
|
|
| 2795 |
+ } |
|
| 2796 |
+ |
|
| 2797 |
+ return result; |
|
| 2798 |
+ |
|
| 2799 |
+ } |
|
| 2747 | 2800 |
|
| 2748 | 2801 |
} |
--- src/main/java/itn/let/mjo/pay/web/MjonPayController.java
+++ src/main/java/itn/let/mjo/pay/web/MjonPayController.java
... | ... | @@ -1931,6 +1931,13 @@ |
| 1931 | 1931 |
// End |
| 1932 | 1932 |
} |
| 1933 | 1933 |
*/ |
| 1934 |
+ |
|
| 1935 |
+ //후불제 회원 여부 조회 |
|
| 1936 |
+ UserManageVO userManageVO = new UserManageVO(); |
|
| 1937 |
+ userManageVO.setMberId(userId); |
|
| 1938 |
+ userManageVO = userManageService.selectAdminSmsNoticeYn(userManageVO); |
|
| 1939 |
+ |
|
| 1940 |
+ model.addAttribute("prePaymentYn", userManageVO.getPrePaymentYn());
|
|
| 1934 | 1941 |
|
| 1935 | 1942 |
if(pattern.equals("/web/member/pay/PayListAllAjax.do")
|
| 1936 | 1943 |
|| pattern.equals("/web/member/pay/PayListMobileAjax.do")
|
... | ... | @@ -2098,13 +2105,6 @@ |
| 2098 | 2105 |
|
| 2099 | 2106 |
return "/web/pay/PayListAllAjax"; |
| 2100 | 2107 |
} |
| 2101 |
- |
|
| 2102 |
- //후불제 회원 여부 조회 |
|
| 2103 |
- UserManageVO userManageVO = new UserManageVO(); |
|
| 2104 |
- userManageVO.setMberId(userId); |
|
| 2105 |
- userManageVO = userManageService.selectAdminSmsNoticeYn(userManageVO); |
|
| 2106 |
- |
|
| 2107 |
- model.addAttribute("prePaymentYn", userManageVO.getPrePaymentYn());
|
|
| 2108 | 2108 |
|
| 2109 | 2109 |
return "/web/pay/PayList"; |
| 2110 | 2110 |
} |
... | ... | @@ -2624,7 +2624,7 @@ |
| 2624 | 2624 |
model.addAttribute("reservToList", reservToList);
|
| 2625 | 2625 |
} |
| 2626 | 2626 |
|
| 2627 |
- {
|
|
| 2627 |
+ {// 선거 후보자 정보 조회
|
|
| 2628 | 2628 |
MjonCandidateVO mjonCandidateVO = new MjonCandidateVO(); |
| 2629 | 2629 |
if("p".equals(mberManageVO.getDept())) { //개인회원 선거 후보자 정보 불러오기
|
| 2630 | 2630 |
mjonCandidateVO = mjonCandidateService.selectCandidateDataInfo(userId); |
... | ... | @@ -2635,6 +2635,49 @@ |
| 2635 | 2635 |
} |
| 2636 | 2636 |
model.addAttribute("mjonCandidateVO", mjonCandidateVO);
|
| 2637 | 2637 |
} |
| 2638 |
+ |
|
| 2639 |
+ |
|
| 2640 |
+ {
|
|
| 2641 |
+ /** |
|
| 2642 |
+ * 후불제 회원 관련 사용 요금 내역 정보 조회하기 |
|
| 2643 |
+ * 20231228 우영두 추가 |
|
| 2644 |
+ * 누적사용금액, 누적 납부금액, 당월 납부 예상금액 정보 조회 |
|
| 2645 |
+ * |
|
| 2646 |
+ * */ |
|
| 2647 |
+ |
|
| 2648 |
+ //누적 사용금액 조회 (캐시 테이블에서 현재까지 사용된 금액 합산 - 캐시 테이블에서 "-"로 사용된 금액만 합산) |
|
| 2649 |
+ String totSumCashAfterPay = mjonPayService.selectTotalSumCashForAfterPay(userId); |
|
| 2650 |
+ model.addAttribute("totSumCashAfterPay", totSumCashAfterPay);
|
|
| 2651 |
+ |
|
| 2652 |
+ //누적 사용 포인트 조회 (포인트 테이블에서 현재까지 사용된 포인트 합산 - 회원 포인트 정보 업데이트시 사용되는 쿼리 이용) |
|
| 2653 |
+ String totSumPointAfterPay = mjonPayService.selectTotalSumPointForAfterPay(userId); |
|
| 2654 |
+ model.addAttribute("totSumPointAfterPay", totSumPointAfterPay);
|
|
| 2655 |
+ |
|
| 2656 |
+ //누적 납부금액 조회 (후불회원이 사용금액을 실 납부한 금액 합산 - 미납 금액 제외한 총 합산 금액) |
|
| 2657 |
+ String totSumPaymentAfterPay = mjonPayService.selectTotSumPaymentAfterPay(userId); |
|
| 2658 |
+ model.addAttribute("totSumPaymentAfterPay", totSumPaymentAfterPay);
|
|
| 2659 |
+ |
|
| 2660 |
+ //누적 납부 포인트 조회 ( 누적 납부금액 합산에 대한 2% 포인트 정보 계산) |
|
| 2661 |
+ float p_i_re_point = 0; |
|
| 2662 |
+ JoinSettingVO sysJoinSetVO = mjonMsgDataService.selectJoinSettingInfo(); |
|
| 2663 |
+ if (sysJoinSetVO != null) {
|
|
| 2664 |
+ p_i_re_point = sysJoinSetVO.getPointPer(); |
|
| 2665 |
+ } |
|
| 2666 |
+ int paymentPointAfterPay = Math.round((Float.parseFloat(totSumPaymentAfterPay) * p_i_re_point / 100)); |
|
| 2667 |
+ model.addAttribute("sumPaymentPointAfterPay", paymentPointAfterPay);
|
|
| 2668 |
+ |
|
| 2669 |
+ //당월 납부 예상금액 (누적 사용금액 합산 - 누적 납부금액 합산 정보 계산) |
|
| 2670 |
+ |
|
| 2671 |
+ float unPaymentAfterPay = Float.parseFloat(totSumCashAfterPay) - Float.parseFloat(totSumPaymentAfterPay); |
|
| 2672 |
+ model.addAttribute("unPaymentAfterPay", unPaymentAfterPay);
|
|
| 2673 |
+ |
|
| 2674 |
+ //당월 납부 예상 포인트 (당월 납부 예상 금액에 대한 2% 포인트 정보 계산) |
|
| 2675 |
+ int unPaymentPointAfterPay = Math.round((unPaymentAfterPay * p_i_re_point / 100)); |
|
| 2676 |
+ model.addAttribute("unPaymentPointAfterPay", unPaymentPointAfterPay);
|
|
| 2677 |
+ |
|
| 2678 |
+ } |
|
| 2679 |
+ |
|
| 2680 |
+ |
|
| 2638 | 2681 |
return "/web/pay/PayUserSWList"; |
| 2639 | 2682 |
} |
| 2640 | 2683 |
|
... | ... | @@ -2656,31 +2699,43 @@ |
| 2656 | 2699 |
String userId = loginVO == null ? "" : EgovStringUtil.isNullToString(loginVO.getId()); |
| 2657 | 2700 |
mjonMsgVO.setUserId(userId); |
| 2658 | 2701 |
|
| 2659 |
- if(mjonMsgVO.getPageUnit() != 10) {
|
|
| 2660 |
- mjonMsgVO.setPageUnit(mjonMsgVO.getPageUnit()); |
|
| 2661 |
- } |
|
| 2662 |
- |
|
| 2663 |
- /** pageing */ |
|
| 2664 |
- PaginationInfo paginationInfo = new PaginationInfo(); |
|
| 2665 |
- paginationInfo.setCurrentPageNo(mjonMsgVO.getPageIndex()); |
|
| 2666 |
- paginationInfo.setRecordCountPerPage(mjonMsgVO.getPageUnit()); |
|
| 2667 |
- paginationInfo.setPageSize(mjonMsgVO.getPageSize()); |
|
| 2702 |
+ try {
|
|
| 2703 |
+ |
|
| 2704 |
+ if(mjonMsgVO.getPageUnit() != 10) {
|
|
| 2705 |
+ mjonMsgVO.setPageUnit(mjonMsgVO.getPageUnit()); |
|
| 2706 |
+ } |
|
| 2707 |
+ |
|
| 2708 |
+ /** pageing */ |
|
| 2709 |
+ PaginationInfo paginationInfo = new PaginationInfo(); |
|
| 2710 |
+ paginationInfo.setCurrentPageNo(mjonMsgVO.getPageIndex()); |
|
| 2711 |
+ paginationInfo.setRecordCountPerPage(mjonMsgVO.getPageUnit()); |
|
| 2712 |
+ paginationInfo.setPageSize(mjonMsgVO.getPageSize()); |
|
| 2668 | 2713 |
|
| 2669 |
- mjonMsgVO.setFirstIndex(paginationInfo.getFirstRecordIndex()); |
|
| 2670 |
- mjonMsgVO.setLastIndex(paginationInfo.getLastRecordIndex()); |
|
| 2671 |
- mjonMsgVO.setRecordCountPerPage(paginationInfo.getRecordCountPerPage()); |
|
| 2672 |
- |
|
| 2673 |
- if("".equals(mjonMsgVO.getSearchSortCnd())){ //최초조회시 최신것 조회List
|
|
| 2674 |
- mjonMsgVO.setSearchSortCnd("regDate");
|
|
| 2675 |
- mjonMsgVO.setSearchSortOrd("desc");
|
|
| 2714 |
+ mjonMsgVO.setFirstIndex(paginationInfo.getFirstRecordIndex()); |
|
| 2715 |
+ mjonMsgVO.setLastIndex(paginationInfo.getLastRecordIndex()); |
|
| 2716 |
+ mjonMsgVO.setRecordCountPerPage(paginationInfo.getRecordCountPerPage()); |
|
| 2717 |
+ |
|
| 2718 |
+ if("".equals(mjonMsgVO.getSearchSortCnd())){ //최초조회시 최신것 조회List
|
|
| 2719 |
+ mjonMsgVO.setSearchSortCnd("regDate");
|
|
| 2720 |
+ mjonMsgVO.setSearchSortOrd("desc");
|
|
| 2721 |
+ } |
|
| 2722 |
+ |
|
| 2723 |
+ List<MjonMsgVO> payUserSWList = mjonMsgDataService.selectPayUserSWList(mjonMsgVO); |
|
| 2724 |
+ |
|
| 2725 |
+ paginationInfo.setTotalRecordCount(payUserSWList.size()> 0 ? payUserSWList.get(0).getTotCnt() : 0); |
|
| 2726 |
+ model.addAttribute("paginationInfo", paginationInfo);
|
|
| 2727 |
+ model.addAttribute("payUserSWList", payUserSWList);
|
|
| 2728 |
+ |
|
| 2729 |
+ if(payUserSWList.size() > 0) {
|
|
| 2730 |
+ model.addAttribute("totSuccSendPrice", payUserSWList.get(0).getTotSuccSendPrice());
|
|
| 2731 |
+ }else {
|
|
| 2732 |
+ model.addAttribute("totSuccSendPrice", 0);
|
|
| 2733 |
+ } |
|
| 2734 |
+ |
|
| 2735 |
+ } catch (Exception e) {
|
|
| 2736 |
+ System.out.println("PayUserSWListAjax Controller Error!!! " + e);
|
|
| 2676 | 2737 |
} |
| 2677 | 2738 |
|
| 2678 |
- |
|
| 2679 |
- List<MjonMsgVO> payUserSWList = mjonMsgDataService.selectPayUserSWList(mjonMsgVO); |
|
| 2680 |
- |
|
| 2681 |
- paginationInfo.setTotalRecordCount(payUserSWList.size()> 0 ? payUserSWList.get(0).getTotCnt() : 0); |
|
| 2682 |
- model.addAttribute("paginationInfo", paginationInfo);
|
|
| 2683 |
- model.addAttribute("payUserSWList", payUserSWList);
|
|
| 2684 | 2739 |
|
| 2685 | 2740 |
return "/web/pay/PayUserSWListAjax"; |
| 2686 | 2741 |
} |
... | ... | @@ -2947,6 +3002,41 @@ |
| 2947 | 3002 |
wb.dispose(); |
| 2948 | 3003 |
try { wb.close(); } catch(Exception ignore) {}
|
| 2949 | 3004 |
} |
| 3005 |
+ } |
|
| 3006 |
+ |
|
| 3007 |
+ |
|
| 3008 |
+ @RequestMapping(value= {"/web/member/pay/PrintPayUserSWListAjax.do"})
|
|
| 3009 |
+ public String printPayUserSWListAjax( |
|
| 3010 |
+ @ModelAttribute("searchVO") MjonMsgVO mjonMsgVO
|
|
| 3011 |
+ , RedirectAttributes redirectAttributes |
|
| 3012 |
+ , ModelMap model) throws Exception {
|
|
| 3013 |
+ //로그인 권한정보 불러오기 |
|
| 3014 |
+ LoginVO loginVO = EgovUserDetailsHelper.isAuthenticated()? (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser():null; |
|
| 3015 |
+ String userId = loginVO == null ? "" : EgovStringUtil.isNullToString(loginVO.getId()); |
|
| 3016 |
+ String userNm = loginVO == null ? "" : EgovStringUtil.isNullToString(loginVO.getName()); |
|
| 3017 |
+ |
|
| 3018 |
+ mjonMsgVO.setUserId(userId); |
|
| 3019 |
+ model.addAttribute("userNm", userNm);
|
|
| 3020 |
+ |
|
| 3021 |
+ |
|
| 3022 |
+ mjonMsgVO.setFirstIndex(0); |
|
| 3023 |
+ mjonMsgVO.setRecordCountPerPage(10000); |
|
| 3024 |
+ |
|
| 3025 |
+ //결제 리스트 정보 불러오기 |
|
| 3026 |
+ List<MjonMsgVO> payUserList = mjonMsgDataService.selectPayUserSWList(mjonMsgVO); |
|
| 3027 |
+ model.addAttribute("payUserList", payUserList);
|
|
| 3028 |
+ |
|
| 3029 |
+ Calendar cal = Calendar.getInstance(); |
|
| 3030 |
+ |
|
| 3031 |
+ int year = cal.get(Calendar.YEAR); |
|
| 3032 |
+ int month = cal.get(Calendar.MONTH) + 1; |
|
| 3033 |
+ int day = cal.get(Calendar.DAY_OF_MONTH); |
|
| 3034 |
+ |
|
| 3035 |
+ model.addAttribute("year", year);
|
|
| 3036 |
+ model.addAttribute("month", month);
|
|
| 3037 |
+ model.addAttribute("day", day);
|
|
| 3038 |
+ |
|
| 3039 |
+ return "web/pay/PrintPayUserSWListPopUp"; |
|
| 2950 | 3040 |
} |
| 2951 | 3041 |
|
| 2952 | 3042 |
|
... | ... | @@ -3844,9 +3934,11 @@ |
| 3844 | 3934 |
MberManageVO tmpMberManageVO = mjonMsgDataService.selectMberManageInfo(mberId); |
| 3845 | 3935 |
String dept = tmpMberManageVO.getDept(); |
| 3846 | 3936 |
|
| 3847 |
- if(dept.equals("p") && taxCNm != null && taxCNm.length() > 0) {
|
|
| 3937 |
+ //후보자 정보 조회 |
|
| 3938 |
+ MjonCandidateVO mjonCandidateVO = mjonCandidateService.selectCandidateDataInfo(mberId); |
|
| 3939 |
+ |
|
| 3940 |
+ if(mjonCandidateVO != null && dept.equals("p") && taxCNm != null && taxCNm.length() > 0) {
|
|
| 3848 | 3941 |
|
| 3849 |
- MjonCandidateVO mjonCandidateVO = mjonCandidateService.selectCandidateDataInfo(mberId); |
|
| 3850 | 3942 |
String candidateNm = mjonCandidateVO.getCandidateNm(); |
| 3851 | 3943 |
if(candidateNm != null && candidateNm.length() > 0) {
|
| 3852 | 3944 |
|
... | ... | @@ -4730,7 +4822,10 @@ |
| 4730 | 4822 |
if(!"".equals(startDate)) {
|
| 4731 | 4823 |
startDate = startDate.replaceAll("/", "-");
|
| 4732 | 4824 |
}else {
|
| 4733 |
- startDate = transFormat.format(minRegDate); |
|
| 4825 |
+ |
|
| 4826 |
+ if(minRegDate != null) {
|
|
| 4827 |
+ startDate = transFormat.format(minRegDate); |
|
| 4828 |
+ } |
|
| 4734 | 4829 |
} |
| 4735 | 4830 |
model.addAttribute("startDate", startDate);
|
| 4736 | 4831 |
|
... | ... | @@ -4738,7 +4833,9 @@ |
| 4738 | 4833 |
if(!"".equals(endDate)) {
|
| 4739 | 4834 |
endDate = endDate.replaceAll("/", "-");
|
| 4740 | 4835 |
}else {
|
| 4741 |
- endDate = transFormat.format(maxRegDate); |
|
| 4836 |
+ if(maxRegDate != null) {
|
|
| 4837 |
+ endDate = transFormat.format(maxRegDate); |
|
| 4838 |
+ } |
|
| 4742 | 4839 |
} |
| 4743 | 4840 |
model.addAttribute("endDate", endDate);
|
| 4744 | 4841 |
|
... | ... | @@ -4772,6 +4869,12 @@ |
| 4772 | 4869 |
model.addAttribute("mberNm", mberNm);
|
| 4773 | 4870 |
model.addAttribute("managerNm", managerNm);
|
| 4774 | 4871 |
model.addAttribute("moblphonNo", moblphonNo);
|
| 4872 |
+ |
|
| 4873 |
+ //부가세 포함 가격 정보 계산 |
|
| 4874 |
+ double addTax = Math.round(totalSumPrice * 0.1); |
|
| 4875 |
+ |
|
| 4876 |
+ model.addAttribute("addTax", decFormat.format(addTax));
|
|
| 4877 |
+ model.addAttribute("addTaxSumPrice", decFormat.format(addTax+totalSumPrice));
|
|
| 4775 | 4878 |
|
| 4776 | 4879 |
|
| 4777 | 4880 |
return "/web/pay/MsgPrintUsageDetailsPopUp"; |
... | ... | @@ -4966,7 +5069,9 @@ |
| 4966 | 5069 |
if(!"".equals(startDate)) {
|
| 4967 | 5070 |
startDate = startDate.replaceAll("/", "-");
|
| 4968 | 5071 |
}else {
|
| 4969 |
- startDate = transFormat.format(minRegDate); |
|
| 5072 |
+ if(minRegDate != null) {
|
|
| 5073 |
+ startDate = transFormat.format(minRegDate); |
|
| 5074 |
+ } |
|
| 4970 | 5075 |
} |
| 4971 | 5076 |
model.addAttribute("startDate", startDate);
|
| 4972 | 5077 |
|
... | ... | @@ -4974,7 +5079,9 @@ |
| 4974 | 5079 |
if(!"".equals(endDate)) {
|
| 4975 | 5080 |
endDate = endDate.replaceAll("/", "-");
|
| 4976 | 5081 |
}else {
|
| 4977 |
- endDate = transFormat.format(maxRegDate); |
|
| 5082 |
+ if(maxRegDate != null) {
|
|
| 5083 |
+ endDate = transFormat.format(maxRegDate); |
|
| 5084 |
+ } |
|
| 4978 | 5085 |
} |
| 4979 | 5086 |
model.addAttribute("endDate", endDate);
|
| 4980 | 5087 |
|
... | ... | @@ -5010,6 +5117,13 @@ |
| 5010 | 5117 |
model.addAttribute("managerNm", managerNm);
|
| 5011 | 5118 |
model.addAttribute("moblphonNo", moblphonNo);
|
| 5012 | 5119 |
|
| 5120 |
+ |
|
| 5121 |
+ //부가세 포함 가격 정보 계산 |
|
| 5122 |
+ double addTax = Math.round(totalSumPrice * 0.1); |
|
| 5123 |
+ |
|
| 5124 |
+ model.addAttribute("addTax", decFormat.format(addTax));
|
|
| 5125 |
+ model.addAttribute("addTaxSumPrice", decFormat.format(addTax+totalSumPrice));
|
|
| 5126 |
+ |
|
| 5013 | 5127 |
return "/web/pay/MsgPrintStatementPopUp"; |
| 5014 | 5128 |
} |
| 5015 | 5129 |
|
--- src/main/java/itn/let/mjo/test/web/TestController.java
+++ src/main/java/itn/let/mjo/test/web/TestController.java
... | ... | @@ -3,11 +3,8 @@ |
| 3 | 3 |
import java.awt.image.BufferedImage; |
| 4 | 4 |
import java.io.File; |
| 5 | 5 |
import java.io.IOException; |
| 6 |
-import java.io.UnsupportedEncodingException; |
|
| 7 | 6 |
import java.math.BigDecimal; |
| 8 | 7 |
import java.math.RoundingMode; |
| 9 |
-import java.net.URLEncoder; |
|
| 10 |
-import java.nio.charset.StandardCharsets; |
|
| 11 | 8 |
import java.nio.file.Files; |
| 12 | 9 |
import java.nio.file.Path; |
| 13 | 10 |
import java.nio.file.Paths; |
... | ... | @@ -23,7 +20,6 @@ |
| 23 | 20 |
|
| 24 | 21 |
import javax.annotation.Resource; |
| 25 | 22 |
import javax.imageio.ImageIO; |
| 26 |
-import javax.mail.internet.ContentDisposition; |
|
| 27 | 23 |
import javax.servlet.http.HttpServletRequest; |
| 28 | 24 |
import javax.servlet.http.HttpServletResponse; |
| 29 | 25 |
import javax.servlet.http.HttpSession; |
... | ... | @@ -36,7 +32,6 @@ |
| 36 | 32 |
import org.slf4j.LoggerFactory; |
| 37 | 33 |
import org.springframework.beans.factory.annotation.Autowired; |
| 38 | 34 |
import org.springframework.beans.factory.annotation.Value; |
| 39 |
-import org.springframework.core.env.SystemEnvironmentPropertySource; |
|
| 40 | 35 |
import org.springframework.core.io.ByteArrayResource; |
| 41 | 36 |
import org.springframework.core.io.FileSystemResource; |
| 42 | 37 |
import org.springframework.http.HttpEntity; |
... | ... | @@ -223,6 +218,10 @@ |
| 223 | 218 |
/** 등급제 관리 서비스 */ |
| 224 | 219 |
@Resource(name = "mberGrdService") |
| 225 | 220 |
MberGrdService mberGrdService; |
| 221 |
+ |
|
| 222 |
+ /** 후불제 자동 충전 서비스 */ |
|
| 223 |
+ @Resource (name = "userManageService") |
|
| 224 |
+ private EgovUserManageService egovUserManageService; |
|
| 226 | 225 |
|
| 227 | 226 |
private static final Logger logger = LoggerFactory.getLogger(TestController.class); |
| 228 | 227 |
|
... | ... | @@ -3276,4 +3275,20 @@ |
| 3276 | 3275 |
} |
| 3277 | 3276 |
|
| 3278 | 3277 |
|
| 3278 |
+ @RequestMapping(value="/web/mjon/test/insertAfterPayCashChargeSchedulerAjax.do") |
|
| 3279 |
+ public void testAfterPayCashCharge() throws Exception{
|
|
| 3280 |
+ |
|
| 3281 |
+ System.out.println("=================================testAfterPayCashCharge Start==========================================");
|
|
| 3282 |
+ |
|
| 3283 |
+ try {
|
|
| 3284 |
+ |
|
| 3285 |
+ egovUserManageService.updateUserCashByAutoCash(); |
|
| 3286 |
+ |
|
| 3287 |
+ } catch (Exception e) {
|
|
| 3288 |
+ System.out.println("++++++++++++++ testAfterPayCashCharge Error!!! "+e);
|
|
| 3289 |
+ } |
|
| 3290 |
+ |
|
| 3291 |
+ } |
|
| 3292 |
+ |
|
| 3293 |
+ |
|
| 3279 | 3294 |
} |
--- src/main/java/itn/let/uat/uia/web/EgovMypageController.java
+++ src/main/java/itn/let/uat/uia/web/EgovMypageController.java
... | ... | @@ -392,6 +392,48 @@ |
| 392 | 392 |
|
| 393 | 393 |
model.addAttribute("pageTab", "myPageIndex");
|
| 394 | 394 |
model.addAttribute("loginVO", loginVO);
|
| 395 |
+ |
|
| 396 |
+ |
|
| 397 |
+ {
|
|
| 398 |
+ |
|
| 399 |
+ /** |
|
| 400 |
+ * 후불제 회원 관련 사용 요금 내역 정보 조회하기 |
|
| 401 |
+ * 20240102 우영두 추가 |
|
| 402 |
+ * 누적사용금액, 누적 납부금액, 당월 납부 예상금액 정보 조회 |
|
| 403 |
+ * |
|
| 404 |
+ * */ |
|
| 405 |
+ |
|
| 406 |
+ //누적 사용금액 조회 (캐시 테이블에서 현재까지 사용된 금액 합산 - 캐시 테이블에서 "-"로 사용된 금액만 합산) |
|
| 407 |
+ String totSumCashAfterPay = mjonPayService.selectTotalSumCashForAfterPay(userId); |
|
| 408 |
+ model.addAttribute("totSumCashAfterPay", totSumCashAfterPay);
|
|
| 409 |
+ |
|
| 410 |
+ //누적 사용 포인트 조회 (포인트 테이블에서 현재까지 사용된 포인트 합산 - 회원 포인트 정보 업데이트시 사용되는 쿼리 이용) |
|
| 411 |
+ String totSumPointAfterPay = mjonPayService.selectTotalSumPointForAfterPay(userId); |
|
| 412 |
+ model.addAttribute("totSumPointAfterPay", totSumPointAfterPay);
|
|
| 413 |
+ |
|
| 414 |
+ //누적 납부금액 조회 (후불회원이 사용금액을 실 납부한 금액 합산 - 미납 금액 제외한 총 합산 금액) |
|
| 415 |
+ String totSumPaymentAfterPay = mjonPayService.selectTotSumPaymentAfterPay(userId); |
|
| 416 |
+ model.addAttribute("totSumPaymentAfterPay", totSumPaymentAfterPay);
|
|
| 417 |
+ |
|
| 418 |
+ //누적 납부 포인트 조회 ( 누적 납부금액 합산에 대한 2% 포인트 정보 계산) |
|
| 419 |
+ float p_i_re_point = 0; |
|
| 420 |
+ JoinSettingVO sysJoinSetVO = mjonMsgDataService.selectJoinSettingInfo(); |
|
| 421 |
+ if (sysJoinSetVO != null) {
|
|
| 422 |
+ p_i_re_point = sysJoinSetVO.getPointPer(); |
|
| 423 |
+ } |
|
| 424 |
+ int paymentPointAfterPay = Math.round((Float.parseFloat(totSumPaymentAfterPay) * p_i_re_point / 100)); |
|
| 425 |
+ model.addAttribute("sumPaymentPointAfterPay", paymentPointAfterPay);
|
|
| 426 |
+ |
|
| 427 |
+ //당월 납부 예상금액 (누적 사용금액 합산 - 누적 납부금액 합산 정보 계산) |
|
| 428 |
+ float unPaymentAfterPay = Float.parseFloat(totSumCashAfterPay) - Float.parseFloat(totSumPaymentAfterPay); |
|
| 429 |
+ model.addAttribute("unPaymentAfterPay", unPaymentAfterPay);
|
|
| 430 |
+ |
|
| 431 |
+ //당월 납부 예상 포인트 (당월 납부 예상 금액에 대한 2% 포인트 정보 계산) |
|
| 432 |
+ int unPaymentPointAfterPay = Math.round((unPaymentAfterPay * p_i_re_point / 100)); |
|
| 433 |
+ model.addAttribute("unPaymentPointAfterPay", unPaymentPointAfterPay);
|
|
| 434 |
+ |
|
| 435 |
+ } |
|
| 436 |
+ |
|
| 395 | 437 |
return "web/user/mberInfoIndex"; |
| 396 | 438 |
} |
| 397 | 439 |
|
--- src/main/java/itn/let/uss/umt/service/UserManageVO.java
+++ src/main/java/itn/let/uss/umt/service/UserManageVO.java
... | ... | @@ -207,6 +207,7 @@ |
| 207 | 207 |
private String atSmishingYn; // 알림톡 스미싱 의심여부 |
| 208 | 208 |
private String spamYn; |
| 209 | 209 |
private String nextPayMethod; |
| 210 |
+ private float paymentCash; //이전달에 실제 사용한 캐시 정보 |
|
| 210 | 211 |
|
| 211 | 212 |
public String getNextPayMethod() {
|
| 212 | 213 |
return nextPayMethod; |
... | ... | @@ -731,6 +732,12 @@ |
| 731 | 732 |
public void setVipYn(String vipYn) {
|
| 732 | 733 |
this.vipYn = vipYn; |
| 733 | 734 |
} |
| 735 |
+ public float getPaymentCash() {
|
|
| 736 |
+ return paymentCash; |
|
| 737 |
+ } |
|
| 738 |
+ public void setPaymentCash(float paymentCash) {
|
|
| 739 |
+ this.paymentCash = paymentCash; |
|
| 740 |
+ } |
|
| 734 | 741 |
|
| 735 | 742 |
|
| 736 | 743 |
|
--- src/main/java/itn/let/uss/umt/service/impl/EgovUserManageServiceImpl.java
+++ src/main/java/itn/let/uss/umt/service/impl/EgovUserManageServiceImpl.java
... | ... | @@ -698,7 +698,12 @@ |
| 698 | 698 |
public void updateUserCashByAutoCash() throws Exception {
|
| 699 | 699 |
List<UserManageVO> userPrePaymentYnList = userManageDAO.selectUserPrePaymentYnList(new UserManageVO()); |
| 700 | 700 |
for (UserManageVO umVO: userPrePaymentYnList) {
|
| 701 |
- if (umVO.getNowChargeCash() > 0) {
|
|
| 701 |
+ if (umVO.getPaymentCash() > 0) {
|
|
| 702 |
+ |
|
| 703 |
+ //이번달에 입력된 후불 결제요청 데이터가 있는지 확인 - 혹시나 중복 입력을 방지하기 위함 |
|
| 704 |
+ int paymentCnt = userManageDAO.selectUserPrePaymentPGdataCount(umVO.getMberId()); |
|
| 705 |
+ |
|
| 706 |
+ if(paymentCnt > 0) continue; |
|
| 702 | 707 |
|
| 703 | 708 |
//회원 정보 조회 |
| 704 | 709 |
MberManageVO mberManageVO = mberManageDAO.selectMber(umVO.getMberId()); //멤버ID에서 유니크ID로 수정 필요 |
--- src/main/java/itn/let/uss/umt/service/impl/UserManageDAO.java
+++ src/main/java/itn/let/uss/umt/service/impl/UserManageDAO.java
... | ... | @@ -316,4 +316,9 @@ |
| 316 | 316 |
return (List<UserManageVO>) list("userManageDAO.selectUserPrePaymentYnList", userManageVO);
|
| 317 | 317 |
} |
| 318 | 318 |
|
| 319 |
+ // 이번달 입력된 결제요청 정보가 있는지 체크 |
|
| 320 |
+ public int selectUserPrePaymentPGdataCount(String userId) throws Exception{
|
|
| 321 |
+ return (int) select("userManageDAO.selectUserPrePaymentPGdataCount", userId);
|
|
| 322 |
+ } |
|
| 323 |
+ |
|
| 319 | 324 |
}(No newline at end of file) |
--- src/main/java/itn/let/uss/umt/web/EgovUserManageController.java
+++ src/main/java/itn/let/uss/umt/web/EgovUserManageController.java
... | ... | @@ -2714,6 +2714,23 @@ |
| 2714 | 2714 |
msg = "로그인이 필요합니다."; |
| 2715 | 2715 |
} |
| 2716 | 2716 |
else {
|
| 2717 |
+ |
|
| 2718 |
+ MberManageVO mberManageVO = mberManageService.selectMber(userManageVO.getMberId()); |
|
| 2719 |
+ |
|
| 2720 |
+ String taxbillAuto = mberManageVO.getTaxbillAuto(); |
|
| 2721 |
+ |
|
| 2722 |
+ if(taxbillAuto == null || taxbillAuto.equals("N")) {
|
|
| 2723 |
+ |
|
| 2724 |
+ isSuccess = false; |
|
| 2725 |
+ msg = "세금계산서 자동발행의 선택이 안되어 있습니다. 확인 부탁드리겠습니다."; |
|
| 2726 |
+ |
|
| 2727 |
+ modelAndView.addObject("isSuccess", isSuccess);
|
|
| 2728 |
+ modelAndView.addObject("msg", msg);
|
|
| 2729 |
+ |
|
| 2730 |
+ return modelAndView; |
|
| 2731 |
+ |
|
| 2732 |
+ } |
|
| 2733 |
+ |
|
| 2717 | 2734 |
int payCnt = userManageService.selectPayCountByUser(userManageVO); |
| 2718 | 2735 |
if (payCnt > 0) {
|
| 2719 | 2736 |
isSuccess = false; |
--- src/main/java/itn/web/MainController.java
+++ src/main/java/itn/web/MainController.java
... | ... | @@ -1169,6 +1169,31 @@ |
| 1169 | 1169 |
|
| 1170 | 1170 |
model.addAttribute("myBankList", myBankList);
|
| 1171 | 1171 |
|
| 1172 |
+ String prePaymentYn = ""; |
|
| 1173 |
+ if(loginVO != null) {
|
|
| 1174 |
+ |
|
| 1175 |
+ String auth = loginVO.getAuthority(); |
|
| 1176 |
+ |
|
| 1177 |
+ //사용자 권한인 경우만 실행 |
|
| 1178 |
+ if(!auth.equals("ROLE_ADMIN")) {
|
|
| 1179 |
+ |
|
| 1180 |
+ //후불회원 여부 조회 |
|
| 1181 |
+ UserManageVO userManageVO = new UserManageVO(); |
|
| 1182 |
+ |
|
| 1183 |
+ if(!userId.equals("")) {
|
|
| 1184 |
+ userManageVO.setMberId(userId); |
|
| 1185 |
+ userManageVO = userManageService.selectAdminSmsNoticeYn(userManageVO); |
|
| 1186 |
+ } |
|
| 1187 |
+ |
|
| 1188 |
+ if(userManageVO.getPrePaymentYn() != null) {
|
|
| 1189 |
+ prePaymentYn = userManageVO.getPrePaymentYn(); |
|
| 1190 |
+ } |
|
| 1191 |
+ |
|
| 1192 |
+ } |
|
| 1193 |
+ |
|
| 1194 |
+ } |
|
| 1195 |
+ model.addAttribute("prePaymentYn", prePaymentYn);
|
|
| 1196 |
+ |
|
| 1172 | 1197 |
return "web/com/webCommonHeader"; |
| 1173 | 1198 |
} |
| 1174 | 1199 |
|
--- src/main/resources/egovframework/egovProps/globals_dev.properties
+++ src/main/resources/egovframework/egovProps/globals_dev.properties
... | ... | @@ -99,7 +99,7 @@ |
| 99 | 99 |
|
| 100 | 100 |
|
| 101 | 101 |
Globals.fax.xpedite.id=kr/itn0202 |
| 102 |
-Globals.fax.xpedite.pw=easytour7! |
|
| 102 |
+Globals.fax.xpedite.pw=on240101! |
|
| 103 | 103 |
Globals.fax.file.save.path=/usr/local/tomcat/file/sht/fax |
| 104 | 104 |
Globals.fax.file.convert.path=/usr/local/tomcat/file/sht/fax/Convert |
| 105 | 105 |
Globals.fax.file.ori.path=/usr/local/tomcat/file/sht/fax |
--- src/main/resources/egovframework/egovProps/globals_local.properties
+++ src/main/resources/egovframework/egovProps/globals_local.properties
... | ... | @@ -100,7 +100,7 @@ |
| 100 | 100 |
|
| 101 | 101 |
|
| 102 | 102 |
Globals.fax.xpedite.id=kr/itn0202 |
| 103 |
-Globals.fax.xpedite.pw=easytour7! |
|
| 103 |
+Globals.fax.xpedite.pw=on240101! |
|
| 104 | 104 |
Globals.fax.file.save.path=/usr/local/tomcat/file/sht/fax |
| 105 | 105 |
Globals.fax.file.convert.path=/usr/local/tomcat/file/sht/fax/Convert |
| 106 | 106 |
Globals.fax.file.ori.path=/usr/local/tomcat/file/sht/fax |
--- src/main/resources/egovframework/egovProps/globals_prod.properties
+++ src/main/resources/egovframework/egovProps/globals_prod.properties
... | ... | @@ -87,7 +87,7 @@ |
| 87 | 87 |
Globals.mjon.biz.kakao.apiKey=dheBWCONP6J5 |
| 88 | 88 |
|
| 89 | 89 |
Globals.fax.xpedite.id=kr/itn0202 |
| 90 |
-Globals.fax.xpedite.pw=easytour7! |
|
| 90 |
+Globals.fax.xpedite.pw=on240101! |
|
| 91 | 91 |
Globals.fax.file.save.path=/usr/local/tomcat/file/sht/fax |
| 92 | 92 |
Globals.fax.file.convert.path=/usr/local/tomcat/file/sht/fax/Convert |
| 93 | 93 |
Globals.fax.file.ori.path=/usr/local/tomcat/file/sht/fax |
--- 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 |
|
... | ... | @@ -3139,11 +3140,12 @@ |
| 3139 | 3140 |
<select id="mjonMsgDAO.selectPayUserSWList" parameterClass="mjonMsgVO" resultClass="mjonMsgVO"> |
| 3140 | 3141 |
SELECT |
| 3141 | 3142 |
COUNT(pay.totCnt) OVER() AS totCnt |
| 3143 |
+ , SUM(pay.succSendPrice) OVER() AS totSuccSendPrice |
|
| 3142 | 3144 |
, pay.regDate AS regDate |
| 3143 | 3145 |
, pay.sendCount AS sendCount |
| 3144 | 3146 |
, pay.succSendCnt AS succSendCnt |
| 3145 |
- , pay.failSendCnt AS failSendCnt |
|
| 3146 | 3147 |
, pay.succSendPrice AS succSendPrice |
| 3148 |
+ , pay.failSendCnt AS failSendCnt |
|
| 3147 | 3149 |
, pay.failSendPrice AS failSendPrice |
| 3148 | 3150 |
, pay.smsTxt AS smsTxt |
| 3149 | 3151 |
, pay.subject AS subject |
... | ... | @@ -3169,8 +3171,8 @@ |
| 3169 | 3171 |
, M.regDate AS regDate |
| 3170 | 3172 |
, M.sendCount AS sendCount |
| 3171 | 3173 |
, SUM(IF(RESULT = 'W' OR RESULT = 'S', 1, 0 )) AS succSendCnt |
| 3172 |
- , SUM(IF(RESULT = 'F', 1, 0 )) AS failSendCnt |
|
| 3173 | 3174 |
, SUM(IF(RESULT = 'W' OR RESULT = 'S', 1, 0 )) * M.eachPrice AS succSendPrice |
| 3175 |
+ , SUM(IF(RESULT = 'F', 1, 0 )) AS failSendCnt |
|
| 3174 | 3176 |
, SUM(IF(RESULT = 'F', 1, 0 )) * M.eachPrice AS failSendPrice |
| 3175 | 3177 |
, M.smsTxt AS smsTxt |
| 3176 | 3178 |
, M.subject AS subject |
--- src/main/resources/egovframework/sqlmap/let/pay/MjonPay_SQL_mysql.xml
+++ src/main/resources/egovframework/sqlmap/let/pay/MjonPay_SQL_mysql.xml
... | ... | @@ -2188,7 +2188,7 @@ |
| 2188 | 2188 |
<select id="mjonPayDAO.selectCashInfoList" parameterClass="String" resultClass="mjonPayVO"> |
| 2189 | 2189 |
SELECT |
| 2190 | 2190 |
'chargeCash' AS divFlag |
| 2191 |
- ,SUM(CASH) AS cashSum |
|
| 2191 |
+ ,NVL(SUM(CASH),0) AS cashSum |
|
| 2192 | 2192 |
FROM |
| 2193 | 2193 |
MJ_PG |
| 2194 | 2194 |
WHERE 1=1 |
... | ... | @@ -2225,7 +2225,7 @@ |
| 2225 | 2225 |
<![CDATA[ |
| 2226 | 2226 |
SELECT |
| 2227 | 2227 |
'chargePoint' AS divFlag |
| 2228 |
- ,SUM(POINT) AS sumPay |
|
| 2228 |
+ ,NVL(SUM(POINT),0) AS sumPay |
|
| 2229 | 2229 |
FROM |
| 2230 | 2230 |
MJ_POINT |
| 2231 | 2231 |
WHERE 1=1 |
... | ... | @@ -2279,4 +2279,40 @@ |
| 2279 | 2279 |
|
| 2280 | 2280 |
</select> |
| 2281 | 2281 |
|
| 2282 |
+ <select id="mjonPayDAO.selectTotalSumCashForAfterPay" parameterClass="String" resultClass="String"> |
|
| 2283 |
+ |
|
| 2284 |
+ <![CDATA[ |
|
| 2285 |
+ |
|
| 2286 |
+ SELECT NVL(ABS(SUM(CASH)), 0) FROM MJ_CASH |
|
| 2287 |
+ WHERE USER_ID = #userId# |
|
| 2288 |
+ AND DEL_FLAG = 'N' |
|
| 2289 |
+ AND MSG_GROUP_ID IS NOT NULL |
|
| 2290 |
+ |
|
| 2291 |
+ ]]> |
|
| 2292 |
+ </select> |
|
| 2293 |
+ |
|
| 2294 |
+ <select id="mjonPayDAO.selectTotalSumPointForAfterPay" parameterClass="String" resultClass="String"> |
|
| 2295 |
+ |
|
| 2296 |
+ SELECT NVL(B.POINT , 0) AS point |
|
| 2297 |
+ FROM LETTNGNRLMBER A |
|
| 2298 |
+ LEFT JOIN |
|
| 2299 |
+ ( |
|
| 2300 |
+ SELECT SUM(POINT) AS POINT , USER_ID FROM MJ_POINT A |
|
| 2301 |
+ GROUP BY A.USER_ID , A.DEL_FLAG |
|
| 2302 |
+ HAVING USER_ID = #userId# AND A.DEL_FLAG = 'N' |
|
| 2303 |
+ ) B ON A.MBER_ID = B.USER_ID |
|
| 2304 |
+ WHERE A.MBER_ID = #userId# |
|
| 2305 |
+ |
|
| 2306 |
+ </select> |
|
| 2307 |
+ |
|
| 2308 |
+ <select id="mjonPayDAO.selectTotSumPaymentAfterPay" parameterClass="String" resultClass="String"> |
|
| 2309 |
+ |
|
| 2310 |
+ SELECT NVL(SUM(CASH), 0) |
|
| 2311 |
+ FROM MJ_PG |
|
| 2312 |
+ WHERE USER_ID = #userId# |
|
| 2313 |
+ AND PG_STATUS = 1 |
|
| 2314 |
+ AND AFTER_PAY_YN = 'Y' |
|
| 2315 |
+ |
|
| 2316 |
+ </select> |
|
| 2317 |
+ |
|
| 2282 | 2318 |
</sqlMap>(No newline at end of file) |
--- src/main/resources/egovframework/sqlmap/let/uss/umt/EgovUserManage_SQL_Mysql.xml
+++ src/main/resources/egovframework/sqlmap/let/uss/umt/EgovUserManage_SQL_Mysql.xml
... | ... | @@ -1405,6 +1405,29 @@ |
| 1405 | 1405 |
|
| 1406 | 1406 |
<!-- 후불제 회원 목록 --> |
| 1407 | 1407 |
<select id="userManageDAO.selectUserPrePaymentYnList" parameterClass="userVO" resultClass="userVO"> |
| 1408 |
+ |
|
| 1409 |
+ SELECT IFNULL(SUM(MC.CASH * -1), 0) AS paymentCash, |
|
| 1410 |
+ IFNULL(MB.AUTO_CASH - MB.USER_MONEY, 0) AS nowChargeCash, |
|
| 1411 |
+ MC.USER_ID AS mberId, |
|
| 1412 |
+ MB.AUTO_CASH AS autoCash |
|
| 1413 |
+ FROM MJ_CASH MC |
|
| 1414 |
+ INNER JOIN LETTNGNRLMBER MB |
|
| 1415 |
+ ON MC.USER_ID = MB.MBER_ID |
|
| 1416 |
+ AND MB.PRE_PAYMENT_YN = 'N' |
|
| 1417 |
+ AND MB.MBER_STTUS = 'Y' |
|
| 1418 |
+ WHERE YEAR(MC.FRST_REGIST_PNTTM) = YEAR(CURRENT_DATE - INTERVAL 1 MONTH) |
|
| 1419 |
+ AND MONTH(MC.FRST_REGIST_PNTTM) = MONTH(CURRENT_DATE - INTERVAL 1 MONTH) |
|
| 1420 |
+ AND |
|
| 1421 |
+ ( |
|
| 1422 |
+ MC.MSG_GROUP_ID IS NOT NULL OR MEMO = '맞춤문자 신청' |
|
| 1423 |
+ ) |
|
| 1424 |
+ GROUP BY MC.USER_ID |
|
| 1425 |
+ |
|
| 1426 |
+ </select> |
|
| 1427 |
+ |
|
| 1428 |
+ |
|
| 1429 |
+ <!-- 후불제 회원 목록 기존 소스 백업--> |
|
| 1430 |
+ <select id="userManageDAO.selectUserPrePaymentYnList_bak" parameterClass="userVO" resultClass="userVO"> |
|
| 1408 | 1431 |
SELECT |
| 1409 | 1432 |
M.mberId, |
| 1410 | 1433 |
M.autoCash, |
... | ... | @@ -1420,5 +1443,16 @@ |
| 1420 | 1443 |
WHERE PRE_PAYMENT_YN = 'N' AND A.MBER_STTUS = 'Y' |
| 1421 | 1444 |
) M |
| 1422 | 1445 |
</select> |
| 1446 |
+ |
|
| 1447 |
+ |
|
| 1448 |
+ <select id="userManageDAO.selectUserPrePaymentPGdataCount" parameterClass="String" resultClass="Integer"> |
|
| 1449 |
+ |
|
| 1450 |
+ SELECT COUNT(MOID) |
|
| 1451 |
+ FROM MJ_PG |
|
| 1452 |
+ WHERE USER_ID = #userId# |
|
| 1453 |
+ AND YEAR(REG_DATE) = YEAR(CURRENT_DATE) |
|
| 1454 |
+ AND MONTH(REG_DATE) = MONTH(CURRENT_DATE) |
|
| 1455 |
+ |
|
| 1456 |
+ </select> |
|
| 1423 | 1457 |
|
| 1424 | 1458 |
</sqlMap> |
--- src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovGnrlUserSelectUpdt.jsp
+++ src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovGnrlUserSelectUpdt.jsp
... | ... | @@ -1439,6 +1439,23 @@ |
| 1439 | 1439 |
|
| 1440 | 1440 |
//후불제 여부 |
| 1441 | 1441 |
function fnMberPrePaymentYn(prePaymentYn){
|
| 1442 |
+ |
|
| 1443 |
+ var form = document.mberManageVO; |
|
| 1444 |
+ var taxbillAuto = form.taxbillAuto.value; |
|
| 1445 |
+ var sumPayMoney = '${sumPayMoney}';
|
|
| 1446 |
+ |
|
| 1447 |
+ //기존 결재 내역 존재 여부 확인 |
|
| 1448 |
+ if(sumPayMoney > 0){
|
|
| 1449 |
+ alert("회원의 결제내역 정보가 존재합니다. 확인 부탁드리겠습니다.");
|
|
| 1450 |
+ return false; |
|
| 1451 |
+ } |
|
| 1452 |
+ |
|
| 1453 |
+ //세금계산서 자동발행 여부 확인 |
|
| 1454 |
+ if(taxbillAuto == '' || taxbillAuto == 'N'){
|
|
| 1455 |
+ alert("세금계산서 자동발행의 선택이 안되어 있습니다. 확인 부탁드리겠습니다.");
|
|
| 1456 |
+ return false; |
|
| 1457 |
+ } |
|
| 1458 |
+ |
|
| 1442 | 1459 |
if(confirm("후불제로 변경하시겠습니까?\n후불제로 변경하면 선불제로 변경 불가합니다.")){
|
| 1443 | 1460 |
|
| 1444 | 1461 |
$.ajax({
|
... | ... | @@ -2965,6 +2982,7 @@ |
| 2965 | 2982 |
<input type="hidden" name="rsaPasswd" id="rsaPasswd" /> |
| 2966 | 2983 |
<input type="hidden" id="RSAModulus" value="${RSAModulus}"/>
|
| 2967 | 2984 |
<input type="hidden" id="RSAExponent" value="${RSAExponent}"/>
|
| 2985 |
+ <input type="hidden" id="taxbillAuto" name="taxbillAuto" value="<c:out value='${mberManageVO.taxbillAuto}'/>"/>
|
|
| 2968 | 2986 |
|
| 2969 | 2987 |
<div class="area_top"> |
| 2970 | 2988 |
<p><span>·</span> 이용자 정보 조회</p> |
--- src/main/webapp/WEB-INF/jsp/layout/include/defaultResource.jsp
+++ src/main/webapp/WEB-INF/jsp/layout/include/defaultResource.jsp
... | ... | @@ -75,6 +75,8 @@ |
| 75 | 75 |
|
| 76 | 76 |
<!-- Uncaught TypeError: e.widget is not a function로 인해 가장 마지막에 선언_이준호_220510 --> |
| 77 | 77 |
<script type="text/javascript" src="/dist/js/jquery_wrapper.min.js"></script> |
| 78 |
+ <%-- 20240110 matomo 사용 안함으로 인하여 주석처리 함 |
|
| 79 |
+ |
|
| 78 | 80 |
<c:if test="${fn:contains(pageContext.request.requestURL, 'munjaon.co.kr')}">
|
| 79 | 81 |
<!-- Matomo --> |
| 80 | 82 |
<script> |
... | ... | @@ -96,5 +98,5 @@ |
| 96 | 98 |
</script> |
| 97 | 99 |
<noscript><p><img src="https://mtm.munjaon.co.kr:9997/matomo.php?idsite=2&rec=1" style="border:0;" alt="" /></p></noscript> |
| 98 | 100 |
<!-- End Matomo Code --> |
| 99 |
- </c:if> |
|
| 101 |
+ </c:if> --%> |
|
| 100 | 102 |
(No newline at end of file) |
--- src/main/webapp/WEB-INF/jsp/web/com/webCommonHeader.jsp
+++ src/main/webapp/WEB-INF/jsp/web/com/webCommonHeader.jsp
... | ... | @@ -870,7 +870,7 @@ |
| 870 | 870 |
<tr class="moneyBack"> |
| 871 | 871 |
<th>은행명</th> |
| 872 | 872 |
<td> |
| 873 |
- <label for="" class="label">은행명 선택</label> |
|
| 873 |
+ <label for="bankNm" class="label">은행명 선택</label> |
|
| 874 | 874 |
<select id="bankNm" name="bankNm" onclick="pointLimitUnderAction()"> |
| 875 | 875 |
<option value="">은행선택</option> |
| 876 | 876 |
<option value="국민은행">국민은행</option> |
... | ... | @@ -886,21 +886,21 @@ |
| 886 | 886 |
<tr class="moneyBack"> |
| 887 | 887 |
<th>계좌번호</th> |
| 888 | 888 |
<td> |
| 889 |
- <label for="" class="label">계좌번호 입력</label> |
|
| 889 |
+ <label for="accountNum" class="label">계좌번호 입력</label> |
|
| 890 | 890 |
<input type="text" name="accountNum" id="accountNum" placeholder="계좌번호를 입력해주세요" onfocus="this.placeholder=''" onblur="this.placeholder='새 계좌번호를 입력해주세요'"class="inputLight" style="width: 100%;" oninput="this.value = this.value.replace(/[^0-9]/g, '').replace(/(\..*)\./g, '$1');" maxlength="20" onclick="pointLimitUnderAction()"> |
| 891 | 891 |
</td> |
| 892 | 892 |
</tr> |
| 893 | 893 |
<tr class="moneyBack"> |
| 894 | 894 |
<th>예금주</th> |
| 895 | 895 |
<td> |
| 896 |
- <label for="" class="label">예금주 입력</label> |
|
| 896 |
+ <label for="accountNm" class="label">예금주 입력</label> |
|
| 897 | 897 |
<input type="text" name="accountNm" id="accountNm" placeholder="예금주를 입력해주세요" onfocus="this.placeholder=''" onblur="this.placeholder='새 예금주를 입력해주세요'"class="inputLight" style="width: 100%;" maxlength="20" onclick="pointLimitUnderAction()"> |
| 898 | 898 |
</td> |
| 899 | 899 |
</tr> |
| 900 | 900 |
<tr class="moneyBack"> |
| 901 | 901 |
<th>연락처</th> |
| 902 | 902 |
<td> |
| 903 |
- <label for="" class="label">연락처 입력</label> |
|
| 903 |
+ <label for="mbtlNum" class="label">연락처 입력</label> |
|
| 904 | 904 |
<input type="text" name="mbtlNum" id="mbtlNum" placeholder="‘-’없이 전화번호를 입력해주세요" onfocus="this.placeholder=''" onblur="this.placeholder='‘-’없이 전화번호를 입력해주세요'"class="inputLight" style="width: 100%;" oninput="this.value = this.value.replace(/[^0-9]/g, '').replace(/(\..*)\./g, '$1');" maxlength="20" onclick="pointLimitUnderAction()"> |
| 905 | 905 |
</td> |
| 906 | 906 |
</tr> |
... | ... | @@ -915,9 +915,9 @@ |
| 915 | 915 |
<tr> |
| 916 | 916 |
<th>목록 노출</th> |
| 917 | 917 |
<td> |
| 918 |
- <label for="point" class="label">목록 노출여부</label> |
|
| 919 |
- <input type="radio" name="screenYn" value="Y" checked="checked">노출 |
|
| 920 |
- <input type="radio" name="screenYn" value="N">비노출 |
|
| 918 |
+ <label for="screenYnY" class="label">목록 노출여부</label> |
|
| 919 |
+ <input type="radio" id="screenYnY" name="screenYn" value="Y" checked="checked">노출 |
|
| 920 |
+ <input type="radio" id="screenYnN" name="screenYn" value="N">비노출 |
|
| 921 | 921 |
</td> |
| 922 | 922 |
</tr> |
| 923 | 923 |
</tbody> |
... | ... | @@ -1419,8 +1419,8 @@ |
| 1419 | 1419 |
<dt><a href="<c:out value='/web/mjon/msgcampain/selectMsgDataView.do'/>" rel="nosublink">선거문자</a></dt> |
| 1420 | 1420 |
<dd> |
| 1421 | 1421 |
<ul> |
| 1422 |
- <li><a href="<c:out value='/web/mjon/msgcampain/selectMsgDataView.do'/>" rel="nosublink">단문·장문·그림문자</a></li> |
|
| 1423 |
- <li><a href="<c:out value='/web/mjon/msgcampain/excel/selectMsgExcelDataView.do'/>">단체문자</a></li> |
|
| 1422 |
+ <li><a href="<c:out value='/web/mjon/msgcampain/selectMsgDataView.do'/>">단체문자</a></li> |
|
| 1423 |
+ <li><a href="<c:out value='/web/mjon/msgcampain/selectMsgTWDataView.do'/>" rel="nosublink">20건 문자</a></li> |
|
| 1424 | 1424 |
</ul> |
| 1425 | 1425 |
</dd> |
| 1426 | 1426 |
</dl> |
... | ... | @@ -1524,7 +1524,7 @@ |
| 1524 | 1524 |
<li><a href="<c:out value='/web/pay/PayGuide.do'/>" rel="nosublink">요금안내/견적내기</a></li> |
| 1525 | 1525 |
<li><a href="<c:out value='/web/member/pay/PayView.do'/>" rel="nosublink">결제하기</a></li> |
| 1526 | 1526 |
<li><a href="<c:out value='/web/member/pay/PayList.do'/>" rel="nosublink">요금 결제내역</a></li> |
| 1527 |
- <li><a href="<c:out value='/web/member/pay/PayUserList.do'/>" rel="nosublink">요금 사용내역</a></li> |
|
| 1527 |
+ <li><a href="<c:out value='/web/member/pay/PayUserSWList.do'/>" rel="nosublink">요금 사용내역</a></li> |
|
| 1528 | 1528 |
<!-- 현금영수증 자동발행 주석 --> |
| 1529 | 1529 |
<%-- <li><a href="<c:out value='/web/member/pay/BillPub.do'/>" rel="nosublink">계산서/현금영수증 발행 등록</a></li> --%> |
| 1530 | 1530 |
<li><a href="<c:out value='/web/member/pay/BillPub.do'/>" rel="nosublink">세금계산서 발행</a></li> |
... | ... | @@ -1635,9 +1635,16 @@ |
| 1635 | 1635 |
</div> |
| 1636 | 1636 |
<div class="login_pay"> |
| 1637 | 1637 |
<div class="check_money"> |
| 1638 |
- <i></i> |
|
| 1639 |
- <fmt:formatNumber type="number" maxFractionDigits="3" value="${userMoney}" var="commaPrice" />
|
|
| 1640 |
- <p>보유잔액<em>(캐시)</em> <span class="fwMd" id="hdUserMoney"><c:out value="${commaPrice}"/></span>원</p>
|
|
| 1638 |
+ <div class="holdingsum_box"> |
|
| 1639 |
+ <i></i> |
|
| 1640 |
+ <fmt:formatNumber type="number" maxFractionDigits="3" value="${userMoney}" var="commaPrice" />
|
|
| 1641 |
+ <p>보유잔액<em>(캐시)</em> <span class="fwMd" id="hdUserMoney"><c:out value="${commaPrice}"/></span>원</p>
|
|
| 1642 |
+ <c:if test="${prePaymentYn eq 'N'}">
|
|
| 1643 |
+ <dl> |
|
| 1644 |
+ <dd>후불제 고객의 보유잔액(캐시)은 당월 발송 가능<br>금액을 말하며 <span>매월 1일 자동으로 충전</span>됩니다.</dd> |
|
| 1645 |
+ </dl> |
|
| 1646 |
+ </c:if> |
|
| 1647 |
+ </div> |
|
| 1641 | 1648 |
<button type="button" class="btnType btnType3" onclick="location.href='/web/member/pay/PayView.do'">충전</button> |
| 1642 | 1649 |
<div class="account_box"> |
| 1643 | 1650 |
<button type="button" class="btnType btnType3" onclick="location.href='/web/member/pay/PayView.do?tabType=2'">전용계좌</button> |
--- src/main/webapp/WEB-INF/jsp/web/com/webLayout.jsp
+++ src/main/webapp/WEB-INF/jsp/web/com/webLayout.jsp
... | ... | @@ -30,7 +30,12 @@ |
| 30 | 30 |
</c:if> |
| 31 | 31 |
<meta property="og:image" content="https://www.munjaon.co.kr/publish/images/favicon/ms-icon-144x144.png"> |
| 32 | 32 |
<meta property="og:url" content="https://www.munjaon.co.kr/web/main/mainPage.do"> |
| 33 |
- |
|
| 33 |
+ |
|
| 34 |
+ |
|
| 35 |
+<c:if test="${fn:contains(pageContext.request.requestURL, '/web/pay/PayGuide.do')}">
|
|
| 36 |
+ <!-- 요금안내 화면 태그 추가 --> |
|
| 37 |
+ <meta name="robots" content="noindex"> |
|
| 38 |
+</c:if> |
|
| 34 | 39 |
<c:choose> |
| 35 | 40 |
<c:when test="${fn:contains(pageContext.request.requestURL, '/web/main/mainPage.do')}">
|
| 36 | 41 |
<link rel="canonical" href="https://www.munjaon.co.kr/web/main/mainPage.do"> |
--- src/main/webapp/WEB-INF/jsp/web/cop/bbs/EgovNoticeRegist.jsp
+++ src/main/webapp/WEB-INF/jsp/web/cop/bbs/EgovNoticeRegist.jsp
... | ... | @@ -114,25 +114,25 @@ |
| 114 | 114 |
<div class="input_list_item bis_status"> |
| 115 | 115 |
<div class="input_left">이메일</div> |
| 116 | 116 |
<div class="input_right"> |
| 117 |
- <label for="" class="label">이메일 주소 앞자리</label> |
|
| 118 |
- <input type="text" value="${fn:substringBefore(mberManageVO.mberEmailAdres, '@')}" class="list_inputType1" disabled>
|
|
| 117 |
+ <label for="emailId" class="label">이메일 주소 앞자리</label> |
|
| 118 |
+ <input type="text" id="emailId" value="${fn:substringBefore(mberManageVO.mberEmailAdres, '@')}" class="list_inputType1" disabled>
|
|
| 119 | 119 |
<span>@</span> |
| 120 |
- <label for="" class="label">이메일 주소 뒷자리</label> |
|
| 121 |
- <input type="text" value="${fn:substringAfter(mberManageVO.mberEmailAdres, '@')}" class="list_inputType1" disabled>
|
|
| 120 |
+ <label for="emailDomain" class="label">이메일 주소 뒷자리</label> |
|
| 121 |
+ <input type="text" id="emailDomain" value="${fn:substringAfter(mberManageVO.mberEmailAdres, '@')}" class="list_inputType1" disabled>
|
|
| 122 | 122 |
</div> |
| 123 | 123 |
</div> |
| 124 | 124 |
<div class="input_list_item"> |
| 125 | 125 |
<div class="input_left">휴대폰</div> |
| 126 | 126 |
<div class="input_right"> |
| 127 |
- <label for="" class="label">휴대폰</label> |
|
| 128 |
- <input type="text" class="list_inputType1" value="${mberManageVO.moblphonNo}" disabled>
|
|
| 127 |
+ <label for="moblphonNo" class="label">휴대폰</label> |
|
| 128 |
+ <input type="text" class="list_inputType1" id="moblphonNo" value="${mberManageVO.moblphonNo}" disabled>
|
|
| 129 | 129 |
</div> |
| 130 | 130 |
</div> |
| 131 | 131 |
<c:if test="${boardType ne 'suggest'}">
|
| 132 | 132 |
<div class="input_list_item"> |
| 133 | 133 |
<div class="input_left">구분</div> |
| 134 | 134 |
<div class="input_right"> |
| 135 |
- <label for="" class="label">구분 선택</label> |
|
| 135 |
+ <label for="bbsId" class="label">구분 선택</label> |
|
| 136 | 136 |
<select class="list_selType1" name="bbsId" id="bbsId"> |
| 137 | 137 |
<c:forEach var="result" items="${boardMenuList}" varStatus="status">
|
| 138 | 138 |
<option value="${result.bbsId}">${result.bbsNm}</option>
|
... | ... | @@ -147,14 +147,14 @@ |
| 147 | 147 |
<div class="input_list_item"> |
| 148 | 148 |
<div class="input_left">제목</div> |
| 149 | 149 |
<div class="input_right"> |
| 150 |
- <label for="" class="label">문의사항 제목</label> |
|
| 150 |
+ <label for="nttSj" class="label">문의사항 제목</label> |
|
| 151 | 151 |
<input type="text" name="nttSj" id="nttSj" value="" class="list_inputType1" placeholder="문의사항 제목 입력" onfocus="this.placeholder=''" onblur="this.placeholder='문의사항 제목 입력 입력'"> |
| 152 | 152 |
</div> |
| 153 | 153 |
</div> |
| 154 | 154 |
<div class="input_list_item textWrap"> |
| 155 | 155 |
<div class="input_left">내용</div> |
| 156 | 156 |
<div> |
| 157 |
- <label for="" class="label">문의내용</label> |
|
| 157 |
+ <label for="nttCn" class="label">문의내용</label> |
|
| 158 | 158 |
<form:textarea path="nttCn"/> |
| 159 | 159 |
</div> |
| 160 | 160 |
</div> |
--- src/main/webapp/WEB-INF/jsp/web/cop/bbs/EgovNoticeUpdt.jsp
+++ src/main/webapp/WEB-INF/jsp/web/cop/bbs/EgovNoticeUpdt.jsp
... | ... | @@ -106,27 +106,27 @@ |
| 106 | 106 |
<div class="input_list_item bis_status"> |
| 107 | 107 |
<div class="input_left">이메일</div> |
| 108 | 108 |
<div class="input_right"> |
| 109 |
- <label for="" class="label">이메일 주소 앞자리</label> |
|
| 110 |
- <input type="text" value="${fn:substringBefore(mberManageVO.mberEmailAdres, '@')}" class="list_inputType1" disabled>
|
|
| 109 |
+ <label for="emailId" class="label">이메일 주소 앞자리</label> |
|
| 110 |
+ <input type="text" id="emailId" value="${fn:substringBefore(mberManageVO.mberEmailAdres, '@')}" class="list_inputType1" disabled>
|
|
| 111 | 111 |
<span>@</span> |
| 112 |
- <label for="" class="label">이메일 주소 뒷자리</label> |
|
| 113 |
- <input type="text" value="${fn:substringAfter(mberManageVO.mberEmailAdres, '@')}" class="list_inputType1" disabled>
|
|
| 112 |
+ <label for="emailDomain" class="label">이메일 주소 뒷자리</label> |
|
| 113 |
+ <input type="text" id="emailDomain" value="${fn:substringAfter(mberManageVO.mberEmailAdres, '@')}" class="list_inputType1" disabled>
|
|
| 114 | 114 |
</div> |
| 115 | 115 |
</div> |
| 116 | 116 |
<div class="input_list_item"> |
| 117 | 117 |
<div class="input_left">휴대폰</div> |
| 118 | 118 |
<div class="input_right"> |
| 119 |
- <label for="" class="label">휴대폰</label> |
|
| 120 |
- <input type="text" class="list_inputType1" value="${mberManageVO.moblphonNo}" disabled>
|
|
| 119 |
+ <label for="moblphonNo" class="label">휴대폰</label> |
|
| 120 |
+ <input type="text" id="moblphonNo" class="list_inputType1" value="${mberManageVO.moblphonNo}" disabled>
|
|
| 121 | 121 |
</div> |
| 122 | 122 |
</div> |
| 123 | 123 |
<div class="input_list_item"> |
| 124 | 124 |
<div class="input_left">구분</div> |
| 125 | 125 |
<div class="input_right"> |
| 126 |
- <label for="" class="label">구분 선택</label> |
|
| 127 | 126 |
<c:forEach var="result" items="${boardMenuList}" varStatus="status">
|
| 128 | 127 |
<c:if test="${result.bbsId eq brdMstrVO.bbsId}">
|
| 129 |
- ${result.bbsNm}
|
|
| 128 |
+ <label for="bbsNm" class="label">구분 선택</label> |
|
| 129 |
+ <input type="text" id="bbsNm" class="list_inputType1" value="${result.bbsNm}" disabled>
|
|
| 130 | 130 |
</c:if> |
| 131 | 131 |
</c:forEach> |
| 132 | 132 |
</div> |
... | ... | @@ -134,14 +134,14 @@ |
| 134 | 134 |
<div class="input_list_item"> |
| 135 | 135 |
<div class="input_left">제목</div> |
| 136 | 136 |
<div class="input_right"> |
| 137 |
- <label for="" class="label">문의사항 제목</label> |
|
| 137 |
+ <label for="nttSj" class="label">문의사항 제목</label> |
|
| 138 | 138 |
<input type="text" name="nttSj" id="nttSj" value="${board.nttSj}" class="list_inputType1" placeholder="문의사항 제목 입력" onfocus="this.placeholder=''" onblur="this.placeholder='문의사항 제목 입력 입력'">
|
| 139 | 139 |
</div> |
| 140 | 140 |
</div> |
| 141 | 141 |
<div class="input_list_item textWrap"> |
| 142 | 142 |
<div class="input_left">문의내용</div> |
| 143 | 143 |
<div> |
| 144 |
- <label for="" class="label">문의내용</label> |
|
| 144 |
+ <label for="nttCn" class="label">문의내용</label> |
|
| 145 | 145 |
<form:textarea path="nttCn"/> |
| 146 | 146 |
</div> |
| 147 | 147 |
</div> |
--- src/main/webapp/WEB-INF/jsp/web/cop/bbs/FaqList.jsp
+++ src/main/webapp/WEB-INF/jsp/web/cop/bbs/FaqList.jsp
... | ... | @@ -123,7 +123,7 @@ |
| 123 | 123 |
<div> |
| 124 | 124 |
<div class="search_wrap clearfix"> |
| 125 | 125 |
<div class="btn_left"> |
| 126 |
- <label for="" class="label">검색조건 선택</label> |
|
| 126 |
+ <label for="searchSel" class="label">검색조건 선택</label> |
|
| 127 | 127 |
<select name="searchCnd" id="searchSel" class="selType2"> |
| 128 | 128 |
<option value="" <c:if test="${searchVO.searchCnd == ''}">selected="selected"</c:if>>전체</option>
|
| 129 | 129 |
<option value="0" <c:if test="${searchVO.searchCnd == '0'}">selected="selected"</c:if>>제목</option>
|
--- src/main/webapp/WEB-INF/jsp/web/cop/bbs/QnaList.jsp
+++ src/main/webapp/WEB-INF/jsp/web/cop/bbs/QnaList.jsp
... | ... | @@ -161,7 +161,7 @@ |
| 161 | 161 |
<button type="button" class="btnType btnType2" onclick="javascript:linkPage('1'); return false;"><img src="/publish/images/content/searchW.png" alt="검색"></button>
|
| 162 | 162 |
</div> |
| 163 | 163 |
<div class="btn_right2"> |
| 164 |
- <label for="searchCnd" class="label">검색조건 선택</label> |
|
| 164 |
+ <label for="searchSel" class="label">검색조건 선택</label> |
|
| 165 | 165 |
<select name="searchCnd" id="searchSel" class="selType2"> |
| 166 | 166 |
<option value="" <c:if test="${searchVO.searchCnd == ''}">selected="selected"</c:if>>전체</option>
|
| 167 | 167 |
<option value="0" <c:if test="${searchVO.searchCnd == '0'}">selected="selected"</c:if>>제목</option>
|
--- src/main/webapp/WEB-INF/jsp/web/cop/bbs/SuggestList.jsp
+++ src/main/webapp/WEB-INF/jsp/web/cop/bbs/SuggestList.jsp
... | ... | @@ -161,7 +161,7 @@ |
| 161 | 161 |
<button type="button" class="btnType btnType2" onclick="javascript:linkPage('1'); return false;"><img src="/publish/images/content/searchW.png" alt="검색"></button>
|
| 162 | 162 |
</div> |
| 163 | 163 |
<div class="btn_right2"> |
| 164 |
- <label for="searchCnd" class="label">검색조건 선택</label> |
|
| 164 |
+ <label for="searchSel" class="label">검색조건 선택</label> |
|
| 165 | 165 |
<select name="searchCnd" id="searchSel" class="selType2"> |
| 166 | 166 |
<option value="" <c:if test="${searchVO.searchCnd == ''}">selected="selected"</c:if>>전체</option>
|
| 167 | 167 |
<option value="0" <c:if test="${searchVO.searchCnd == '0'}">selected="selected"</c:if>>제목</option>
|
--- src/main/webapp/WEB-INF/jsp/web/custom/MsgCustomListAjax.jsp
+++ src/main/webapp/WEB-INF/jsp/web/custom/MsgCustomListAjax.jsp
... | ... | @@ -16,14 +16,20 @@ |
| 16 | 16 |
<c:forEach var="customList" items="${resultCustomList}" varStatus="status">
|
| 17 | 17 |
<li id="${customList.letterId}">
|
| 18 | 18 |
<c:set var="strImgPath" value="${customList.fileStreCours}/${customList.streFileNm}.${customList.fileExtsn}"/>
|
| 19 |
+ |
|
| 20 |
+ <%-- 이미지 alt 값 셋팅 --%> |
|
| 21 |
+ <c:set var="imgAlt" value="${customList.letterAlt}"/>
|
|
| 22 |
+ <c:if test="${empty imgAlt}">
|
|
| 23 |
+ <c:set var="imgAlt" value="맞춤제작 샘플 이미지"/> |
|
| 24 |
+ </c:if> |
|
| 19 | 25 |
<div class="hover_cont"> |
| 20 | 26 |
<a ref='#' onclick='selectSampleImg("${customList.attachFileId}","${customList.fileSn}","${customList.letterId}");'>
|
| 21 |
- <img src="<c:url value='/cmm/fms/getImage2.do'/>?atchFileId=<c:out value="${customList.attachFileId}"/>&fileSn=<c:out value="${customList.fileSn}"/>" alt="<c:out value='${customList.letterAlt}'/>">
|
|
| 27 |
+ <img src="<c:url value='/cmm/fms/getImage2.do'/>?atchFileId=<c:out value="${customList.attachFileId}"/>&fileSn=<c:out value="${customList.fileSn}"/>" alt="<c:out value='${imgAlt}'/>">
|
|
| 22 | 28 |
</a> |
| 23 | 29 |
</div> |
| 24 | 30 |
<div class="photo_cont"> |
| 25 | 31 |
<a ref='#' onclick='selectSampleImg("${customList.attachFileId}","${customList.fileSn}","${customList.letterId}");'>
|
| 26 |
- <img src="<c:url value='/cmm/fms/getImage2.do'/>?atchFileId=<c:out value="${customList.attachFileId}"/>&fileSn=<c:out value="${customList.fileSn}"/>" alt="<c:out value='${customList.letterAlt}'/>">
|
|
| 32 |
+ <img src="<c:url value='/cmm/fms/getImage2.do'/>?atchFileId=<c:out value="${customList.attachFileId}"/>&fileSn=<c:out value="${customList.fileSn}"/>" alt="<c:out value='${imgAlt}'/>">
|
|
| 27 | 33 |
</a> |
| 28 | 34 |
</div> |
| 29 | 35 |
</li> |
--- src/main/webapp/WEB-INF/jsp/web/kakao/template/at/KakaoAlimtalkTemplateDetail.jsp
+++ src/main/webapp/WEB-INF/jsp/web/kakao/template/at/KakaoAlimtalkTemplateDetail.jsp
... | ... | @@ -732,8 +732,8 @@ |
| 732 | 732 |
<div class="top_content kakaotalkset_cont current pay_tab_wrap"> |
| 733 | 733 |
<div class="heading"> |
| 734 | 734 |
<h2>카카오톡 설정</h2> |
| 735 |
- <button type="button" class="button info" |
|
| 736 |
- onclick="window.open('popup_kakaoset_template.html','_blank','width=790, height=300, top=100, left=100, fullscreen=no, menubar=no, status=no, toolbar=no, titlebar=yes, location=no, scrollbars=yes')">사용안내</button>
|
|
| 735 |
+ <%-- <button type="button" class="button info" onclick="window.open('popup_kakaoset_template.html','_blank','width=790, height=300, top=100, left=100, fullscreen=no, menubar=no, status=no, toolbar=no, titlebar=yes, location=no, scrollbars=yes')">사용안내</button> --%>
|
|
| 736 |
+ <button type="button" class="button info" onclick="window.open('/web/pop/kakaoTemplatePop.do','_blank','width=790, height=300, top=100, left=100, fullscreen=no, menubar=no, status=no, toolbar=no, titlebar=yes, location=no, scrollbars=yes')">사용안내</button>
|
|
| 737 | 737 |
</div> |
| 738 | 738 |
<div class="list_tab_wrap2 type2 "> |
| 739 | 739 |
<!-- tab button --> |
--- src/main/webapp/WEB-INF/jsp/web/main/mainPage.jsp
+++ src/main/webapp/WEB-INF/jsp/web/main/mainPage.jsp
... | ... | @@ -1499,7 +1499,7 @@ |
| 1499 | 1499 |
<div class="inner"> |
| 1500 | 1500 |
<!-- <p class="tit_text">이런 문자 어때요?</p> --> |
| 1501 | 1501 |
<p class="tit_text">이런 단체문자, 대량문자 샘플 어때요?</p> |
| 1502 |
- <p class="sub_text">단체문자, 대량문자, 경조문자, 부고문자, 광고문자, 홍보문자, 조문문자, 결혼문자, 예약문자, 사진문자, 그림문자, SMS, LMS, MMS, 병원문자, 위로문자, 응원문자, 행사문자, 기념일문자, 웹문자, 인터넷문자, 문자사이트, 답례문자, 그룹문자 등 다양한 샘플 무료 제공</p> |
|
| 1502 |
+ <!-- <p class="sub_text">단체문자, 대량문자, 경조문자, 부고문자, 광고문자, 홍보문자, 조문문자, 결혼문자, 예약문자, 사진문자, 그림문자, SMS, LMS, MMS, 병원문자, 위로문자, 응원문자, 행사문자, 기념일문자, 웹문자, 인터넷문자, 문자사이트, 답례문자, 그룹문자 등 다양한 샘플 무료 제공</p> --> |
|
| 1503 | 1503 |
<div class="tabs"> |
| 1504 | 1504 |
<!-- Default tab_depth1 - 전체 / tab_depth2 - 인기그림문자 / tab_depth3 - BEST --> |
| 1505 | 1505 |
<!-- <div class="tab_depth1 tDep2_mType"> |
--- src/main/webapp/WEB-INF/jsp/web/msgcampain/MsgDataSMLView.jsp
+++ src/main/webapp/WEB-INF/jsp/web/msgcampain/MsgDataSMLView.jsp
... | ... | @@ -3259,7 +3259,7 @@ |
| 3259 | 3259 |
<div class="tooltip-wrap"> |
| 3260 | 3260 |
<div class="popup-com candidate_layer candidate_popup01" tabindex="0" data-tooltip-con="candidate_popup01" data-focus="candidate_popup01" data-focus-prev="candidate_popup01-close" style="width: 620px;"> |
| 3261 | 3261 |
<div class="popup_heading"> |
| 3262 |
- <p>후보자 등록정보</p> |
|
| 3262 |
+ <p>후보자 등록</p> |
|
| 3263 | 3263 |
<button type="button" class="tooltip-close" data-focus="candidate_popup01-close"><img src="/publish/images/content/layerPopup_close.png" alt="팝업 닫기"></button> |
| 3264 | 3264 |
</div> |
| 3265 | 3265 |
|
--- src/main/webapp/WEB-INF/jsp/web/msgcampain/PhotoListAjax.jsp
+++ src/main/webapp/WEB-INF/jsp/web/msgcampain/PhotoListAjax.jsp
... | ... | @@ -21,8 +21,13 @@ |
| 21 | 21 |
--%> |
| 22 | 22 |
</div> |
| 23 | 23 |
<div class="photo_cont"> |
| 24 |
+ <%-- 이미지 alt 값 셋팅 --%> |
|
| 25 |
+ <c:set var="imgAlt" value="${photoList.letterAlt}"/>
|
|
| 26 |
+ <c:if test="${empty imgAlt}">
|
|
| 27 |
+ <c:set var="imgAlt" value="선거문자 샘플 이미지"/> |
|
| 28 |
+ </c:if> |
|
| 24 | 29 |
<%-- <img class="photoOnImg" src="<c:url value='${strImgPath}'/>" alt=""> --%>
|
| 25 |
- <img class="photoOnImg" id="${photoList.letterId}" src="<c:url value='/cmm/fms/getImage2.do'/>?atchFileId=<c:out value="${photoList.attachFileId}"/>&fileSn=<c:out value="${photoList.fileSn}"/>" alt="<c:out value='${photoList.letterAlt}'/>">
|
|
| 30 |
+ <img class="photoOnImg" id="${photoList.letterId}" src="<c:url value='/cmm/fms/getImage2.do'/>?atchFileId=<c:out value="${photoList.attachFileId}"/>&fileSn=<c:out value="${photoList.fileSn}"/>" alt="<c:out value='${imgAlt}'/>">
|
|
| 26 | 31 |
<input type="hidden" id="photoOnImg_${status.index + 1}" name="photoOnImg_${status.index + 1}" value="${photoList.attachFileId}"/>
|
| 27 | 32 |
</div> |
| 28 | 33 |
</li> |
--- src/main/webapp/WEB-INF/jsp/web/msgcampain/tw/MsgTWDataSMLView.jsp
+++ src/main/webapp/WEB-INF/jsp/web/msgcampain/tw/MsgTWDataSMLView.jsp
... | ... | @@ -3489,7 +3489,7 @@ |
| 3489 | 3489 |
<div class="tooltip-wrap"> |
| 3490 | 3490 |
<div class="popup-com candidate_layer candidate_popup01" tabindex="0" data-tooltip-con="candidate_popup01" data-focus="candidate_popup01" data-focus-prev="candidate_popup01-close" style="width: 620px;"> |
| 3491 | 3491 |
<div class="popup_heading"> |
| 3492 |
- <p>후보자 등록정보</p> |
|
| 3492 |
+ <p>후보자 등록</p> |
|
| 3493 | 3493 |
<button type="button" class="tooltip-close" data-focus="candidate_popup01-close"><img src="/publish/images/content/layerPopup_close.png" alt="팝업 닫기"></button> |
| 3494 | 3494 |
</div> |
| 3495 | 3495 |
|
... | ... | @@ -3817,28 +3817,29 @@ |
| 3817 | 3817 |
</div> |
| 3818 | 3818 |
<!--// 주소록에 등록 팝업 --> |
| 3819 | 3819 |
|
| 3820 |
- <!--선거문자 이용안내 팝업 --> |
|
| 3821 |
- <div class="tooltip-wrap"> |
|
| 3820 |
+ <!--선거 20건문자 이용안내 팝업 추가 --> |
|
| 3821 |
+ <div class="tooltip-wrap tw_wrap "> |
|
| 3822 | 3822 |
<div class="popup-com ad_layer candidate_popup03" tabindex="0" data-tooltip-con="candidate_popup03" data-focus="candidate_popup03" data-focus-prev="candidate_popup03-close" style="width: 795px"> |
| 3823 | 3823 |
<div class="popup_heading"> |
| 3824 |
- <p>선거문자 안내</p> |
|
| 3824 |
+ <p>20건 문자(수동문자) 이용안내</p> |
|
| 3825 | 3825 |
<button type="button" class="tooltip-close" data-focus="candidate_popup03-close"><img src="/publish/images/content/layerPopup_close.png" alt="팝업 닫기"></button> |
| 3826 | 3826 |
</div> |
| 3827 | 3827 |
<div class="layer_in"> |
| 3828 |
- <img src="/publish/images/content/candidatePop_banner.png" alt="선거문자 이용안내 배너" class="candidate_banner"> |
|
| 3828 |
+ <img src="/publish/images/popup/tw_popup/tw_banner.png" alt="문자온에서 후보님의 당선을 지원합니다. 20건 문자(수동문자) 이용안내" class="candidate_banner"> |
|
| 3829 | 3829 |
<ul class="info_list"> |
| 3830 | 3830 |
<li>- 90byte 초과 시, 자동으로 장문으로 전환됩니다. 장문 문자는 최대 2,000byte까지만 작성할 수 있습니다.</li> |
| 3831 | 3831 |
<li>- 그림문자 1건당 최대 3장까지 이미지 첨부 가능 [권장 사이즈 : <strong>640 x 960</strong>픽셀 / 최대용량 : <strong>10MB</strong> 이내]</li> |
| 3832 |
- <li>- 광고성 메시지는 <span>반드시 아래 유의사항을 사전 확인</span> 후 발송해 주시기 바랍니다.</li> |
|
| 3833 | 3832 |
</ul> |
| 3834 | 3833 |
<!-- 이용방법/혜택 --> |
| 3835 | 3834 |
<div class="cdpop_cont current" id="listTab2_1"> |
| 3836 |
- <div> |
|
| 3835 |
+ <div class="con"> |
|
| 3837 | 3836 |
<p class="cdpop_title"> |
| 3838 |
- <i class="cdpop_title_icon1"></i>선거문자 이용방법 |
|
| 3837 |
+ <i class="tw_title01_icon"></i>20건 문자 이용절차 |
|
| 3838 |
+ <!-- |
|
| 3839 | 3839 |
<span class="customReq"> |
| 3840 | 3840 |
<button type="button" onclick="goToCustom();"><i></i>선거문자 맞춤제작</button> |
| 3841 | 3841 |
</span> |
| 3842 |
+ --> |
|
| 3842 | 3843 |
</p> |
| 3843 | 3844 |
<ul class="cdpop_info"> |
| 3844 | 3845 |
<li> |
... | ... | @@ -3879,80 +3880,86 @@ |
| 3879 | 3880 |
</li> |
| 3880 | 3881 |
</ul> |
| 3881 | 3882 |
</div> |
| 3882 |
- <div> |
|
| 3883 |
- <p class="cdpop_title"><i class="cdpop_title_icon2"></i>문자온 선거문자만의 장점 및 혜택</p> |
|
| 3884 |
- <ul class="cdpop_benefit"> |
|
| 3885 |
- <li> |
|
| 3886 |
- <div> |
|
| 3887 |
- <i class="benefit1"></i> |
|
| 3888 |
- <p>한 번에 대량으로 보내야 한다면?<span>10만건까지 동시 전송 가능</span></p> |
|
| 3889 |
- </div> |
|
| 3890 |
- <p>문자온의 대량전송(엑셀·TXT) 모듈을 통해 |
|
| 3891 |
- 10만건의 대량문자도 쉽고 빠르게 전송 가능합니다.</p> |
|
| 3892 |
- </li> |
|
| 3893 |
- <li> |
|
| 3894 |
- <div> |
|
| 3895 |
- <i class="benefit2"></i> |
|
| 3896 |
- <p>수신거부 번호가 필요하세요?<span>080 수신거부 번호 무료제공</span></p> |
|
| 3897 |
- </div> |
|
| 3898 |
- <p>선거문자 발송규정 준수를 위해 |
|
| 3899 |
- 080 수신거부 번호를 무료로 제공해 드립니다.</p> |
|
| 3900 |
- </li> |
|
| 3901 |
- <li> |
|
| 3902 |
- <div> |
|
| 3903 |
- <i class="benefit3"></i> |
|
| 3904 |
- <p>주소록 등록이 번거로우신가요?<span>주소록 등록 무료대행</span></p> |
|
| 3905 |
- </div> |
|
| 3906 |
- <p>주소록 등록파일(엑셀·TXT)을 문자온에 제공해 |
|
| 3907 |
- 주시면 무료로 빠르고 신속하게 등록해 드립니다.</p> |
|
| 3908 |
- </li> |
|
| 3909 |
- <li> |
|
| 3910 |
- <div> |
|
| 3911 |
- <i class="benefit4"></i> |
|
| 3912 |
- <p>홍보효과를 높이고 싶다면?<span>후보자만의 그림문자 맞춤제작</span></p> |
|
| 3913 |
- </div> |
|
| 3914 |
- <p>선거공약, 인사말, 후보자 사진 등을 넣어 그림문자를 |
|
| 3915 |
- 맞춤 제작하여 홍보효과를 극대화할 수 있습니다.</p> |
|
| 3916 |
- </li> |
|
| 3917 |
- <li> |
|
| 3918 |
- <div> |
|
| 3919 |
- <i class="benefit5"></i> |
|
| 3920 |
- <p>오류·실패건의 문자를 보상받고 싶다면?<span>오류·실패건 문자 100% 환불</span></p> |
|
| 3921 |
- </div> |
|
| 3922 |
- <p>번호오류, 수신거부, 수신실패 등으로 인해 문자전송이 |
|
| 3923 |
- 실패한 경우 100% 환불(자동충전)해 드립니다.</p> |
|
| 3924 |
- </li> |
|
| 3925 |
- <li> |
|
| 3926 |
- <div> |
|
| 3927 |
- <i class="benefit6 "></i> |
|
| 3928 |
- <p>전송결과가 궁금하다면?<span>실시간 전송결과 확인 가능</span></p> |
|
| 3929 |
- </div> |
|
| 3930 |
- <p>전송결과 및 실패사유를 실시간으로 제공해드립니다.</p> |
|
| 3931 |
- </li> |
|
| 3932 |
- <li> |
|
| 3933 |
- <div> |
|
| 3934 |
- <i class="benefit7"></i> |
|
| 3935 |
- <p>20건씩 나눠서 보내야한다면?<span>20건씩 분할 예약 전송 가능</span></p> |
|
| 3936 |
- </div> |
|
| 3937 |
- <p>누구나 쉽고 편리하게 20건씩 나눠서 분할 전송이 가능합니다.</p> |
|
| 3938 |
- </li> |
|
| 3939 |
- <li> |
|
| 3940 |
- <div> |
|
| 3941 |
- <i class="benefit8"></i> |
|
| 3942 |
- <p>필요한 서류가 있다면?<span>문자온에서 간편하게 신청 가능</span></p> |
|
| 3943 |
- </div> |
|
| 3944 |
- <p>문자온에서 발송내역서 출력이 가능하며, |
|
| 3945 |
- 세금계산서는 메일로 자동으로 발행됩니다.</p> |
|
| 3946 |
- </li> |
|
| 3947 |
- </ul> |
|
| 3883 |
+ <div class="con"> |
|
| 3884 |
+ <p class="cdpop_title tw_title"><i class="tw_title02_icon"></i>후보자 등록 방법</p> |
|
| 3885 |
+ <div class="tw_con"> |
|
| 3886 |
+ <ul> |
|
| 3887 |
+ <li>- 선거관리위원회에 등록된 후보자 정보와 세금계산서 담당자 정보를 입력합니다.</li> |
|
| 3888 |
+ <li class="sub_te">세금계산서 발행을 위한 정보로만 사용됩니다.</li> |
|
| 3889 |
+ </ul> |
|
| 3890 |
+ <img src="/publish/images/popup/tw_popup/tw_con_01.jpg" alt="받는 사람 목록 불러오기"> |
|
| 3891 |
+ </div> |
|
| 3948 | 3892 |
</div> |
| 3949 |
- </div><!--// 이용방법/혜택 --> |
|
| 3893 |
+ <div class="con"> |
|
| 3894 |
+ <p class="cdpop_title tw_title"><i class="tw_title03_icon"></i>받는 사람 목록 불러오기</p> |
|
| 3895 |
+ <div class="tw_con"> |
|
| 3896 |
+ <ul> |
|
| 3897 |
+ <li>- 주소록 관리 메뉴에서 등록한 주소록을 불러오거나 PC에 저장된 엑셀 파일을 불러올 수 있습니다.</li> |
|
| 3898 |
+ <li>- 주소록 불러오기 |
|
| 3899 |
+ <ul class="sub_li"> |
|
| 3900 |
+ <li>① 그룹을 선택합니다.</li> |
|
| 3901 |
+ <li>② 체크박스 개별 또는 전체 선택을 통해 받는 사람 목록을 선택합니다.</li> |
|
| 3902 |
+ <li>③ 추가 버튼을 클릭합니다.</li> |
|
| 3903 |
+ </ul> |
|
| 3904 |
+ </li> |
|
| 3905 |
+ <li class="li_02">- 엑셀 불러오기 |
|
| 3906 |
+ <ul class="sub_li"> |
|
| 3907 |
+ <li>① 찾아보기를 클릭하여 불러올 엑셀 파일을 선택합니다.</li> |
|
| 3908 |
+ <li>② 추가 버튼을 클릭합니다.</li> |
|
| 3909 |
+ </ul> |
|
| 3910 |
+ </li> |
|
| 3911 |
+ </ul> |
|
| 3912 |
+ <img src="/publish/images/popup/tw_popup/tw_con_02.jpg" alt="받는 사람 목록 불러오기 1"> |
|
| 3913 |
+ <ul> |
|
| 3914 |
+ <li class="te">- 받는 사람 목록 선택이 완료되면 20건 씩 받는 사람을 선택할 수 있도록 화면에 표시되며, 불러온 받는 사람 목록 전체에 대한 전체 받는사람 수, 전송완료 수, 잔여 받는사람 수를 확인할 수 있습니다.</li> |
|
| 3915 |
+ <li class="sub_te">불러온 받는 사람 목록은 재접속, 재로그인 시에도 유지되오니 목록을 삭제하고 싶은 경우에는<br>초기화 버튼을 눌러주세요.</li> |
|
| 3916 |
+ </ul> |
|
| 3917 |
+ <img src="/publish/images/popup/tw_popup/tw_con_03.jpg" alt="받는 사람 목록 불러오기 2"> |
|
| 3918 |
+ </div> |
|
| 3919 |
+ </div> |
|
| 3920 |
+ <div class="con"> |
|
| 3921 |
+ <p class="cdpop_title tw_title"><i class="tw_title04_icon"></i>20명 수동 선택 후 발송하기</p> |
|
| 3922 |
+ <div class="tw_con"> |
|
| 3923 |
+ <ul> |
|
| 3924 |
+ <li>- 수동 선택 방법 (4가지 방법 가능) |
|
| 3925 |
+ <ul class="sub_li"> |
|
| 3926 |
+ <li>① 체크박스를 하나씩 차례로 선택</li> |
|
| 3927 |
+ <li>② 받는 사람 목록 전화번호 위에서 마우스 왼쪽을 길게 누르고 드래그하여 영역 선택</li> |
|
| 3928 |
+ <li>③ 1명씩 선택 버튼을 계속 누르고 있으면 20명이 모두 선택</li> |
|
| 3929 |
+ <li>④ 전체버튼을 누르면 20명이 한번에 선택</li> |
|
| 3930 |
+ </ul> |
|
| 3931 |
+ </li> |
|
| 3932 |
+ <li class="te" style="margin-top: 10px;"> |
|
| 3933 |
+ - 발송하기 버튼을 클릭하면 선택한 20건 문자가 발송되고 받는 사람 목록에 있는 다음 20건이 자동으로 화면에 표시됩니다. |
|
| 3934 |
+ </li> |
|
| 3935 |
+ </ul> |
|
| 3936 |
+ <img src="/publish/images/popup/tw_popup/tw_con_04.jpg" alt="20명 수동 선택 후 발송하기"> |
|
| 3937 |
+ </div> |
|
| 3938 |
+ </div> |
|
| 3939 |
+ <div class="con"> |
|
| 3940 |
+ <p class="cdpop_title tw_title"><i class="tw_title05_icon"></i>예약문자 발송하기</p> |
|
| 3941 |
+ <div class="tw_con"> |
|
| 3942 |
+ <ul> |
|
| 3943 |
+ <li class="te">- 선택한 20건 문자의 발송이 예약되고, 받는 사람 목록에 있는 다음 20건이 자동으로 화면에 표시됩니다. |
|
| 3944 |
+ <ul class="sub_li" style="margin-top: 5px;"> |
|
| 3945 |
+ <li>① 예약 라디오 버튼을 클릭합니다.</li> |
|
| 3946 |
+ <li>② 예약일자 및 시간을 선택합니다.</li> |
|
| 3947 |
+ <li>③ 예약하기 버튼을 클릭합니다.</li> |
|
| 3948 |
+ </ul> |
|
| 3949 |
+ </li> |
|
| 3950 |
+ </ul> |
|
| 3951 |
+ <img src="/publish/images/popup/tw_popup/tw_con_05.jpg" alt="예약문자 발송하기" style="margin-bottom: 0;"> |
|
| 3952 |
+ </div> |
|
| 3953 |
+ </div> |
|
| 3954 |
+ </div> |
|
| 3955 |
+ <!--// 이용방법/혜택 --> |
|
| 3950 | 3956 |
</div> |
| 3951 | 3957 |
<div class="popup_btn_wrap2" style="margin: 0 auto 30px auto;"> |
| 3952 | 3958 |
<button type="button" class="tooltip-close" data-focus="candidate_popup03-close" data-focus-next="candidate_popup03">닫기</button> |
| 3953 | 3959 |
</div> |
| 3954 | 3960 |
</div> |
| 3955 |
- </div><!--// 선거문자 이용안내 팝업 --> |
|
| 3961 |
+ </div> |
|
| 3962 |
+ <!--//선거 20건문자 이용안내 팝업 추가 --> |
|
| 3956 | 3963 |
|
| 3957 | 3964 |
<!-- 이벤트 잔여 캐시 정보 표시 팝업 --> |
| 3958 | 3965 |
<div class="tooltip-wrap"> |
... | ... | @@ -4072,7 +4079,7 @@ |
| 4072 | 4079 |
<h2>20건 문자(수동문자) 전송</h2> |
| 4073 | 4080 |
<div class="election_btnWrap"> |
| 4074 | 4081 |
<button type="button" class="button2 info" onclick="infoPop('selectMsgDataView2');">발송규정</button>
|
| 4075 |
- <!-- <button type="button" class="button2 info" data-tooltip="candidate_popup03">사용안내</button> --> |
|
| 4082 |
+ <button type="button" class="button2 info" data-tooltip="candidate_popup03">사용안내</button> |
|
| 4076 | 4083 |
<c:choose> |
| 4077 | 4084 |
<c:when test="${empty LoginVO}">
|
| 4078 | 4085 |
<button type="button" class="btnType" onclick="javascript:fn_candidateLoginChk(); return false;"><i class="election_btn1"></i>후보자 등록</button> |
--- src/main/webapp/WEB-INF/jsp/web/msgdata/MainPhotoListAjax.jsp
+++ src/main/webapp/WEB-INF/jsp/web/msgdata/MainPhotoListAjax.jsp
... | ... | @@ -66,11 +66,15 @@ |
| 66 | 66 |
<div class="btn_more"><img src="/publish/images/main/btn_more01.png" alt="" /></div> |
| 67 | 67 |
<div class="area_img"> |
| 68 | 68 |
<%-- <img src="${strImgPath}" alt="" onerror="this.src='/publish/images/main/template02.jpg';"> --%>
|
| 69 |
- <img class="lazy" data-src="<c:url value='/cmm/fms/getImage2.do'/>?atchFileId=<c:out value="${photoList.attachFileId}"/>&fileSn=<c:out value="${photoList.fileSn}"/>" alt="<c:out value='${photoList.letterAlt}'/>" onerror="this.src='/publish/images/main/template02.jpg';">
|
|
| 69 |
+ <c:set var="imgAlt" value="${photoList.letterAlt}"/>
|
|
| 70 |
+ <c:if test="${empty imgAlt}">
|
|
| 71 |
+ <c:set var="imgAlt" value="그림문자 샘플 이미지"/> |
|
| 72 |
+ </c:if> |
|
| 73 |
+ <img class="lazy" data-src="<c:url value='/cmm/fms/getImage2.do'/>?atchFileId=<c:out value="${photoList.attachFileId}"/>&fileSn=<c:out value="${photoList.fileSn}"/>" alt="<c:out value='${imgAlt}'/>" onerror="this.src='/publish/images/main/template02.jpg';">
|
|
| 70 | 74 |
</div> |
| 71 | 75 |
<div class="area_img_text"> |
| 72 | 76 |
<c:out value="${photoList.letterSj}"/>
|
| 73 |
- <p class="sub_text"><c:out value="${msgKeywordSample}"/></p>
|
|
| 77 |
+ <!--<p class="sub_text"><c:out value="${msgKeywordSample}"/></p>-->
|
|
| 74 | 78 |
</div> |
| 75 | 79 |
</div> |
| 76 | 80 |
</div> |
--- src/main/webapp/WEB-INF/jsp/web/msgdata/PhotoListAjax.jsp
+++ src/main/webapp/WEB-INF/jsp/web/msgdata/PhotoListAjax.jsp
... | ... | @@ -21,8 +21,12 @@ |
| 21 | 21 |
--%> |
| 22 | 22 |
</div> |
| 23 | 23 |
<div class="photo_cont"> |
| 24 |
+ <c:set var="imgAlt" value="${photoList.letterAlt}"/>
|
|
| 25 |
+ <c:if test="${empty imgAlt}">
|
|
| 26 |
+ <c:set var="imgAlt" value="그림문자 샘플 이미지"/> |
|
| 27 |
+ </c:if> |
|
| 24 | 28 |
<%-- <img class="photoOnImg" src="<c:url value='${strImgPath}'/>" alt=""> --%>
|
| 25 |
- <img class="photoOnImg" id="${photoList.letterId}" src="<c:url value='/cmm/fms/getImage2.do'/>?atchFileId=<c:out value="${photoList.attachFileId}"/>&fileSn=<c:out value="${photoList.fileSn}"/>" alt="<c:out value='${photoList.letterAlt}'/>">
|
|
| 29 |
+ <img class="photoOnImg" id="${photoList.letterId}" src="<c:url value='/cmm/fms/getImage2.do'/>?atchFileId=<c:out value="${photoList.attachFileId}"/>&fileSn=<c:out value="${photoList.fileSn}"/>" alt="<c:out value='${imgAlt}'/>">
|
|
| 26 | 30 |
<input type="hidden" id="photoOnImg_${status.index + 1}" name="photoOnImg_${status.index + 1}" value="${photoList.attachFileId}"/>
|
| 27 | 31 |
</div> |
| 28 | 32 |
</li> |
--- src/main/webapp/WEB-INF/jsp/web/pay/BillPub.jsp
+++ src/main/webapp/WEB-INF/jsp/web/pay/BillPub.jsp
... | ... | @@ -23,6 +23,7 @@ |
| 23 | 23 |
|
| 24 | 24 |
<script type="text/javaScript" language="javascript"> |
| 25 | 25 |
$( document ).ready(function() {
|
| 26 |
+ |
|
| 26 | 27 |
//현금영수증 사업자번호 넣어주기 |
| 27 | 28 |
if("${mberManageVO.cashbillBizNo}" != ""){
|
| 28 | 29 |
//사업자번호 - 넣어주기 |
... | ... | @@ -452,6 +453,10 @@ |
| 452 | 453 |
|
| 453 | 454 |
$(window).on('load',function(){
|
| 454 | 455 |
$('.bill_content_wrap .bill_content').eq(0).show();
|
| 456 |
+ |
|
| 457 |
+ var billDept = $("input[name=billDepth]:checked");
|
|
| 458 |
+ billDepth(billDept); |
|
| 459 |
+ |
|
| 455 | 460 |
}); |
| 456 | 461 |
|
| 457 | 462 |
function billDepth(obj){
|
... | ... | @@ -490,7 +495,7 @@ |
| 490 | 495 |
<li class="tab"><button type="button" onclick="location.href='/web/pay/PayGuide.do'">요금안내/견적내기</button></li> |
| 491 | 496 |
<li class="tab"><button type="button" onclick="location.href='/web/member/pay/PayView.do'">결제하기</button></li> |
| 492 | 497 |
<li class="tab"><button type="button" onclick="location.href='/web/member/pay/PayList.do'">요금 결제내역</button></li> |
| 493 |
- <li class="tab"><button type="button" onclick="location.href='/web/member/pay/PayUserList.do'">요금 사용내역</button></li> |
|
| 498 |
+ <li class="tab"><button type="button" onclick="location.href='/web/member/pay/PayUserSWList.do'">요금 사용내역</button></li> |
|
| 494 | 499 |
<!-- <li class="tab active"><button type="button">계산서/현금영수증 발행 등록</button></li> --> |
| 495 | 500 |
<li class="tab active"><button type="button">세금계산서 발행 등록</button></li> |
| 496 | 501 |
</ul><!--// tab button --> |
... | ... | @@ -505,8 +510,8 @@ |
| 505 | 510 |
<div class="pay_cont current" id="tab1_1"> |
| 506 | 511 |
<div class="bill_tab"> |
| 507 | 512 |
<ul> |
| 508 |
- <li><input type="radio" name="billDepth" id="billDepth1" checked="checked" onchange="billDepth(this);" value="biz" /><label for="billDepth1">기업</label></li> |
|
| 509 |
- <li><input type="radio" name="billDepth" id="billDepth2" onchange="billDepth(this);" value="regi" /><label for="billDepth2">개인</label></li> |
|
| 513 |
+ <li><input type="radio" name="billDepth" id="billDepth1" <c:if test="${mberManageVO.taxbillAuto eq 'B'}">checked="checked"</c:if> onchange="billDepth(this);" value="biz" /><label for="billDepth1">기업</label></li>
|
|
| 514 |
+ <li><input type="radio" name="billDepth" id="billDepth2" <c:if test="${mberManageVO.taxbillAuto eq 'C'}">checked="checked"</c:if> onchange="billDepth(this);" value="regi" /><label for="billDepth2">개인</label></li>
|
|
| 510 | 515 |
</ul> |
| 511 | 516 |
<p>* 자동 발행은 기업/개인 중에 한 곳만 가능합니다.</p> |
| 512 | 517 |
</div> |
--- src/main/webapp/WEB-INF/jsp/web/pay/MsgPrintStatementPopUp.jsp
+++ src/main/webapp/WEB-INF/jsp/web/pay/MsgPrintStatementPopUp.jsp
... | ... | @@ -127,7 +127,14 @@ |
| 127 | 127 |
</div> |
| 128 | 128 |
<div class="cont2 clearfix"> |
| 129 | 129 |
<p>총 사용금액</p> |
| 130 |
- <p><span>${totalSumPrice}</span> 원(VAT 별도)</p>
|
|
| 130 |
+ <c:choose> |
|
| 131 |
+ <c:when test="${searchVO.addVatType eq 'N'}">
|
|
| 132 |
+ <p><span>${totalSumPrice}</span> 원(VAT 별도)</p>
|
|
| 133 |
+ </c:when> |
|
| 134 |
+ <c:otherwise> |
|
| 135 |
+ <p><span>${addTaxSumPrice}</span> 원(VAT 포함)</p>
|
|
| 136 |
+ </c:otherwise> |
|
| 137 |
+ </c:choose> |
|
| 131 | 138 |
</div> |
| 132 | 139 |
<div class="cont3"> |
| 133 | 140 |
<p>(단위 : 원, 건)</p> |
... | ... | @@ -194,7 +201,7 @@ |
| 194 | 201 |
<c:otherwise> |
| 195 | 202 |
<tr> |
| 196 | 203 |
<td colspan="5"> |
| 197 |
- <spring:message code="common.nodata.msg" /> |
|
| 204 |
+ 거래내역이 없습니다. |
|
| 198 | 205 |
</td> |
| 199 | 206 |
</tr> |
| 200 | 207 |
</c:otherwise> |
... | ... | @@ -207,18 +214,32 @@ |
| 207 | 214 |
<table class="est_table"> |
| 208 | 215 |
<caption>공급가액, 총 결제금액에 대한 표</caption> |
| 209 | 216 |
<colgroup> |
| 210 |
- <col style="width: 64px;"> |
|
| 217 |
+ <col style="width: 100px;"> |
|
| 211 | 218 |
<col style="width: auto;"> |
| 212 | 219 |
</colgroup> |
| 213 | 220 |
<tbody> |
| 214 | 221 |
<tr> |
| 215 | 222 |
<th>공급가액</th> |
| 216 |
- <td><span>${supplySumPrice}</span> 원</td>
|
|
| 223 |
+ <td><span>${supplySumPrice}</span></td>
|
|
| 217 | 224 |
</tr> |
| 218 |
- <tr> |
|
| 219 |
- <th>총 결제금액</th> |
|
| 220 |
- <td><span>${totalSumPrice}</span> 원</td>
|
|
| 221 |
- </tr> |
|
| 225 |
+ <c:choose> |
|
| 226 |
+ <c:when test="${searchVO.addVatType eq 'N'}">
|
|
| 227 |
+ <tr class="total_price"> |
|
| 228 |
+ <th>총 사용금액</th> |
|
| 229 |
+ <td><span>${totalSumPrice}</span></td>
|
|
| 230 |
+ </tr> |
|
| 231 |
+ </c:when> |
|
| 232 |
+ <c:otherwise> |
|
| 233 |
+ <tr> |
|
| 234 |
+ <th>세액(부가세)</th> |
|
| 235 |
+ <td>${addTax}</td>
|
|
| 236 |
+ </tr> |
|
| 237 |
+ <tr class="total_price"> |
|
| 238 |
+ <th>총 사용금액</th> |
|
| 239 |
+ <td><span>${addTaxSumPrice}</span></td>
|
|
| 240 |
+ </tr> |
|
| 241 |
+ </c:otherwise> |
|
| 242 |
+ </c:choose> |
|
| 222 | 243 |
</tbody> |
| 223 | 244 |
</table> |
| 224 | 245 |
</div> |
--- src/main/webapp/WEB-INF/jsp/web/pay/MsgPrintUsageDetailsPopUp.jsp
+++ src/main/webapp/WEB-INF/jsp/web/pay/MsgPrintUsageDetailsPopUp.jsp
... | ... | @@ -85,7 +85,14 @@ |
| 85 | 85 |
</div> |
| 86 | 86 |
<div class="cont2 clearfix"> |
| 87 | 87 |
<p>총 사용금액</p> |
| 88 |
- <p><span>${totalSumPrice}</span> 원(VAT 별도)</p>
|
|
| 88 |
+ <c:choose> |
|
| 89 |
+ <c:when test="${searchVO.addVatType eq 'N'}">
|
|
| 90 |
+ <p><span>${totalSumPrice}</span> 원(VAT 별도)</p>
|
|
| 91 |
+ </c:when> |
|
| 92 |
+ <c:otherwise> |
|
| 93 |
+ <p><span>${addTaxSumPrice}</span> 원(VAT 포함)</p>
|
|
| 94 |
+ </c:otherwise> |
|
| 95 |
+ </c:choose> |
|
| 89 | 96 |
</div> |
| 90 | 97 |
<div class="cont3"> |
| 91 | 98 |
<p>(단위 : 원, 건)</p> |
... | ... | @@ -150,29 +157,61 @@ |
| 150 | 157 |
</c:forEach> |
| 151 | 158 |
</c:when> |
| 152 | 159 |
<c:otherwise> |
| 153 |
- |
|
| 160 |
+ <tr> |
|
| 161 |
+ <td colspan="4"> |
|
| 162 |
+ 사용내역이 없습니다. |
|
| 163 |
+ </td> |
|
| 164 |
+ </tr> |
|
| 154 | 165 |
</c:otherwise> |
| 155 |
- </c:choose> |
|
| 166 |
+ </c:choose> |
|
| 167 |
+ </tbody> |
|
| 168 |
+ </table> |
|
| 169 |
+ </div> |
|
| 170 |
+ </div> |
|
| 171 |
+ |
|
| 172 |
+ <div class="cont4"> |
|
| 173 |
+ <table class="est_table"> |
|
| 174 |
+ <caption>공급가액, 총 결제금액에 대한 표</caption> |
|
| 175 |
+ <colgroup> |
|
| 176 |
+ <col style="width: 100px;"> |
|
| 177 |
+ <col style="width: auto;"> |
|
| 178 |
+ </colgroup> |
|
| 179 |
+ <tbody> |
|
| 180 |
+ <tr> |
|
| 181 |
+ <th>공급가액</th> |
|
| 182 |
+ <td><span>${supplySumPrice}</span></td>
|
|
| 183 |
+ </tr> |
|
| 156 | 184 |
<c:choose> |
| 157 | 185 |
<c:when test="${not empty resultList}">
|
| 158 |
- <tr class="total_price"> |
|
| 159 |
- <td>계</td> |
|
| 160 |
- <td>${sendSumCount}</td>
|
|
| 161 |
- <td>${supplySumPrice}</td>
|
|
| 162 |
- <td>${totalSumPrice}</td>
|
|
| 163 |
- </tr> |
|
| 186 |
+ <c:choose> |
|
| 187 |
+ <c:when test="${searchVO.addVatType eq 'N'}">
|
|
| 188 |
+ <tr class="total_price"> |
|
| 189 |
+ <th>총 사용금액</th> |
|
| 190 |
+ <td><span>${totalSumPrice}</span></td>
|
|
| 191 |
+ </tr> |
|
| 192 |
+ </c:when> |
|
| 193 |
+ <c:otherwise> |
|
| 194 |
+ <tr> |
|
| 195 |
+ <th>세액(부가세)</th> |
|
| 196 |
+ <td>${addTax}</td>
|
|
| 197 |
+ </tr> |
|
| 198 |
+ <tr class="total_price"> |
|
| 199 |
+ <th>총 사용금액</th> |
|
| 200 |
+ <td><span>${addTaxSumPrice}</span></td>
|
|
| 201 |
+ </tr> |
|
| 202 |
+ </c:otherwise> |
|
| 203 |
+ </c:choose> |
|
| 164 | 204 |
</c:when> |
| 165 | 205 |
<c:otherwise> |
| 166 | 206 |
<tr> |
| 167 | 207 |
<td colspan="5"> |
| 168 |
- <spring:message code="common.nodata.msg" /> |
|
| 208 |
+ 사용내역이 없습니다. |
|
| 169 | 209 |
</td> |
| 170 | 210 |
</tr> |
| 171 | 211 |
</c:otherwise> |
| 172 | 212 |
</c:choose> |
| 173 |
- </tbody> |
|
| 174 |
- </table> |
|
| 175 |
- </div> |
|
| 213 |
+ </tbody> |
|
| 214 |
+ </table> |
|
| 176 | 215 |
</div> |
| 177 | 216 |
<div class="cont5"> |
| 178 | 217 |
<p><span>${year} 년 <span>${month}</span> 월 <span>${day}</span> 일</p>
|
--- src/main/webapp/WEB-INF/jsp/web/pay/PayGuide.jsp
+++ src/main/webapp/WEB-INF/jsp/web/pay/PayGuide.jsp
... | ... | @@ -405,7 +405,7 @@ |
| 405 | 405 |
<li class="tab active"><button type="button">요금안내/견적내기</button></li> |
| 406 | 406 |
<li class="tab"><button type="button" onclick="location.href='/web/member/pay/PayView.do'">결제하기</button></li> |
| 407 | 407 |
<li class="tab"><button type="button" onclick="location.href='/web/member/pay/PayList.do'">요금 결제내역</button></li> |
| 408 |
- <li class="tab"><button type="button" onclick="location.href='/web/member/pay/PayUserList.do'">요금 사용내역</button></li> |
|
| 408 |
+ <li class="tab"><button type="button" onclick="location.href='/web/member/pay/PayUserSWList.do'">요금 사용내역</button></li> |
|
| 409 | 409 |
<li class="tab"><button type="button" onclick="location.href='/web/member/pay/BillPub.do'">세금계산서 발행 등록</button></li> |
| 410 | 410 |
</ul> |
| 411 | 411 |
<!--// tab button --> |
--- src/main/webapp/WEB-INF/jsp/web/pay/PayList.jsp
+++ src/main/webapp/WEB-INF/jsp/web/pay/PayList.jsp
... | ... | @@ -19,7 +19,7 @@ |
| 19 | 19 |
//이전달 첫날/마지막날 조회 |
| 20 | 20 |
if(date.getMonth()+1 == 1){
|
| 21 | 21 |
lastfulstday = date.getFullYear()-1 + "/12" + "/01"; |
| 22 |
- lastfuledday = date.getFullYear()-1 + "/12" + "/"+new Date(date.getFullYear()-1, 12, 0); |
|
| 22 |
+ lastfuledday = date.getFullYear()-1 + "/12" + "/"+new Date(date.getFullYear()-1, 12, 0).getDate()+""; |
|
| 23 | 23 |
}else{
|
| 24 | 24 |
lastfulstday = date.getFullYear() + "/" ; |
| 25 | 25 |
lastfulstday += date.getMonth() < 10 ? "0"+ (date.getMonth()) : date.getMonth()+"" ; |
... | ... | @@ -171,7 +171,7 @@ |
| 171 | 171 |
<li class="tab"><button type="button" onclick="location.href='/web/pay/PayGuide.do'">요금안내/견적내기</button></li> |
| 172 | 172 |
<li class="tab"><button type="button" onclick="location.href='/web/member/pay/PayView.do'">결제하기</button></li> |
| 173 | 173 |
<li class="tab active"><button type="button" >요금 결제내역</button></li> |
| 174 |
- <li class="tab"><button type="button" onclick="location.href='/web/member/pay/PayUserList.do'">요금 사용내역</button></li> |
|
| 174 |
+ <li class="tab"><button type="button" onclick="location.href='/web/member/pay/PayUserSWList.do'">요금 사용내역</button></li> |
|
| 175 | 175 |
<!-- 현금영수증 자동발행 주석 --> |
| 176 | 176 |
<!-- <li class="tab"><button type="button" onclick="location.href='/web/member/pay/BillPub.do'">계산서/현금영수증 발행 등록</button></li> --> |
| 177 | 177 |
<li class="tab"><button type="button" onclick="location.href='/web/member/pay/BillPub.do'">세금계산서 발행 등록</button></li> |
... | ... | @@ -199,7 +199,7 @@ |
| 199 | 199 |
</c:when> |
| 200 | 200 |
<c:otherwise> |
| 201 | 201 |
<ul class="tabType1"> |
| 202 |
- <li class="tab active"><button type="button" onclick="TabType5(this,'1');listLoad('/web/member/pay/PayListAllAjax.do'); return false;" >전체</button></li>
|
|
| 202 |
+ <li class="tab active"><button type="button" onclick="TabType5(this,'1');listLoad('/web/member/pay/PayListAllAjax.do'); return false;" >후불 결제내역</button></li>
|
|
| 203 | 203 |
<li class="tab"><button type="button" onclick="TabType5(this,'6');listLoad('/web/member/pay/PayListPointAjax.do'); return false;">포인트 교환내역</button></li>
|
| 204 | 204 |
</ul> |
| 205 | 205 |
</c:otherwise> |
--- 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 넣기 |
... | ... | @@ -390,10 +402,19 @@ |
| 390 | 402 |
</table> |
| 391 | 403 |
<div class="excel_middle"> |
| 392 | 404 |
<div class="select_btnWrap clearfix"> |
| 393 |
- <div class="add_text2" style="line-height: 1.2em;"> |
|
| 405 |
+ <div class="add_text2" style="line-height: 1.3em;"> |
|
| 394 | 406 |
※ 요금 결제내역은 결제일을 기준으로 최대 6개월까지만 조회가능합니다. |
| 395 | 407 |
<br /> |
| 396 |
- ※ 간편결제 영수증은 결제하신 서비스를 통해 제공됩니다. |
|
| 408 |
+ <c:choose> |
|
| 409 |
+ <c:when test="${prePaymentYn eq 'Y'}">
|
|
| 410 |
+ ※ 간편결제 영수증은 결제하신 서비스를 통해 제공됩니다. |
|
| 411 |
+ </c:when> |
|
| 412 |
+ <c:otherwise> |
|
| 413 |
+ ※ 후불제 고객의 사용금액 결제수단은 계좌이체만 가능합니다. <br /> |
|
| 414 |
+ ※ 세금계산서 발행 후 매월 15일(공휴일인 경우 다음 영업일) 이전까지 아래 계좌로 입금 부탁드립니다.<br /> |
|
| 415 |
+ <p class="accountinfo"><span>-입금은행:</span>우리은행<span>-입금계좌:</span>1005-904-154328<span>-받는사람:</span>주식회사 아이티앤</p> |
|
| 416 |
+ </c:otherwise> |
|
| 417 |
+ </c:choose> |
|
| 397 | 418 |
</div> |
| 398 | 419 |
<div style="padding-top: 10px;"> |
| 399 | 420 |
<button type="button" class="level_btn" data-tooltip="level_check_popup01" id="levelIconBtn" style="display: none;"> |
... | ... | @@ -558,6 +579,58 @@ |
| 558 | 579 |
</c:if> |
| 559 | 580 |
</c:when> |
| 560 | 581 |
<c:otherwise> |
| 582 |
+ <c:if test="${result.pgStatus eq '0'}">
|
|
| 583 |
+ <!-- 후불제 회원 입금대기 상태인 경우 처리 --> |
|
| 584 |
+ |
|
| 585 |
+ <!-- 세금계산서 발행 전 (자동발행 안되어 있는 경우) 세금계산서 버튼 노출 --> |
|
| 586 |
+ <c:if test="${result.confirmYn eq null || result.confirmYn eq ''}">
|
|
| 587 |
+ <button type="button" class="btnType btnType20" data-tooltip="cashReceipt_popup02" onclick="javascript:taxValue('${result.moid}');">세금계산서</button>
|
|
| 588 |
+ </c:if> |
|
| 589 |
+ |
|
| 590 |
+ <!-- 발행대기 --> |
|
| 591 |
+ <c:if test="${result.confirmYn eq 'N'}">
|
|
| 592 |
+ <c:if test="${result.rcptType eq '9'}">
|
|
| 593 |
+ <p class="fwRg c_002c9a">세금계산서 발행대기</p> |
|
| 594 |
+ </c:if> |
|
| 595 |
+ <c:if test="${result.rcptType eq '1' || result.rcptType eq '2'}">
|
|
| 596 |
+ <p class="fwRg c_002c9a">현금영수증 발행대기</p> |
|
| 597 |
+ </c:if> |
|
| 598 |
+ <c:if test="${result.rcptType eq '5'}">
|
|
| 599 |
+ <p class="fwRg c_002c9a">관리자 현금영수증 발행대기</p> |
|
| 600 |
+ </c:if> |
|
| 601 |
+ |
|
| 602 |
+ <!-- 의무발생일경우 --> |
|
| 603 |
+ <c:if test="${result.rcptType eq '3'}">
|
|
| 604 |
+ <c:if test="${result.payMethod eq 'BANK' or result.payMethod eq 'VBANK'}">
|
|
| 605 |
+ <c:if test="${result.btnChk eq 'Y'}">
|
|
| 606 |
+ <button type="button" class="btnType btnType20" data-tooltip="cashReceipt_popup02" onclick="javascript:taxValue('${result.moid}');">세금계산서</button>
|
|
| 607 |
+ <button type="button" class="btnType btnType20" data-tooltip="cashReceipt_popup01" onclick="javascript:cashValue('${result.moid}');">현금영수증</button>
|
|
| 608 |
+ </c:if> |
|
| 609 |
+ |
|
| 610 |
+ <%-- <button type="button" class="btnType btnType20" onclick="fnSimpRecip('<c:out value="${result.tid}"/>','<c:out value="${result.moid}"/>'); return false;">간이영수증</button> --%>
|
|
| 611 |
+ </c:if> |
|
| 612 |
+ |
|
| 613 |
+ <!-- 휴대폰결제 --> |
|
| 614 |
+ <c:if test="${result.payMethod eq 'CELLPHONE'}">
|
|
| 615 |
+ <!-- 22.12.09 휴대폰결제는 현금영수증 제외 --> |
|
| 616 |
+ <%-- <button type="button" class="btnType btnType20" onclick="fnSimpRecip('<c:out value="${result.tid}"/>','<c:out value="${result.moid}"/>'); return false;">간이영수증</button> --%>
|
|
| 617 |
+ 휴대폰결제(증빙서류 발급불가) |
|
| 618 |
+ </c:if> |
|
| 619 |
+ </c:if> |
|
| 620 |
+ </c:if> |
|
| 621 |
+ <!-- 발행완료 --> |
|
| 622 |
+ <c:if test="${result.confirmYn eq 'Y'}">
|
|
| 623 |
+ <c:if test="${result.rcptType eq '9'}">
|
|
| 624 |
+ <p class="fwRg c_002c9a">세금계산서 발행완료</p> |
|
| 625 |
+ </c:if> |
|
| 626 |
+ <c:if test="${result.rcptType eq '1' || result.rcptType eq '2'}">
|
|
| 627 |
+ <p class="fwRg c_002c9a">현금영수증 발행완료</p> |
|
| 628 |
+ </c:if> |
|
| 629 |
+ <c:if test="${result.rcptType eq '5'}">
|
|
| 630 |
+ <p class="fwRg c_002c9a">관리자 현금영수증 발행완료</p> |
|
| 631 |
+ </c:if> |
|
| 632 |
+ </c:if> |
|
| 633 |
+ </c:if> |
|
| 561 | 634 |
<c:if test="${result.pgStatus eq '1'}">
|
| 562 | 635 |
<!-- 발행전 --> |
| 563 | 636 |
<c:if test="${result.confirmYn eq null || result.confirmYn eq ''}">
|
... | ... | @@ -816,8 +889,8 @@ |
| 816 | 889 |
<!-- 선거 후보자정보와 업체정보 둘 다 등록되어있는 경우 : radio 선택하여 영역 보여주기 --> |
| 817 | 890 |
<th scope="row">발행대상</th> |
| 818 | 891 |
<td> |
| 819 |
- <input type="radio" name="bizOrRegi" value="biz" id="biz" onchange="fncBizOrRegi(this.value); return false;" checked="checked" /><label for="biz">기업</label> |
|
| 820 |
- <input type="radio" name="bizOrRegi" value="regi" id="regi" onchange="fncBizOrRegi(this.value); return false;" /><label for="regi">개인</label> |
|
| 892 |
+ <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>
|
|
| 893 |
+ <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>
|
|
| 821 | 894 |
</td> |
| 822 | 895 |
</tr> |
| 823 | 896 |
<!-- 업체정보 --> |
--- src/main/webapp/WEB-INF/jsp/web/pay/PayListRefundAjax.jsp
+++ src/main/webapp/WEB-INF/jsp/web/pay/PayListRefundAjax.jsp
... | ... | @@ -461,7 +461,7 @@ |
| 461 | 461 |
<p>- 취소 처리기간 경과시에 증빙서류를 첨부해야 환불가능합니다.</p> |
| 462 | 462 |
<p>- 모든 결제는 부분취소가 불가하여, 사용금액(차액) 결제 후 전액취소를 원칙으로 합니다.</p> |
| 463 | 463 |
<p> (예) 휴대폰 3만원 결제 후 3천원 사용한 경우, 3,300원(부가세포함)송금 또는 3천원 휴대폰 결제 후 3만원 전액취소</p> |
| 464 |
- <p><span>- 환불업무는 매주 수요일에 순차적으로 처리됩니다.</span></p> |
|
| 464 |
+ <p><span>- 환불업무는 매주 수요일(금~화 신청분), 금요일 (수,목 신청분)에 순차적으로 처리됩니다.</span></p> |
|
| 465 | 465 |
</div> |
| 466 | 466 |
<ul class="clause_list"> |
| 467 | 467 |
<li class="list_open on"> |
--- src/main/webapp/WEB-INF/jsp/web/pay/PayUserSWList.jsp
+++ src/main/webapp/WEB-INF/jsp/web/pay/PayUserSWList.jsp
... | ... | @@ -203,87 +203,192 @@ |
| 203 | 203 |
<h2>요금 사용내역</h2> |
| 204 | 204 |
<button type="button" class="button info" onclick="infoPop('PayUserList');">사용안내</button>
|
| 205 | 205 |
</div> |
| 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"> |
|
| 206 |
+ <c:choose> |
|
| 207 |
+ <c:when test="${mberManageVO.prePaymentYn eq 'Y'}">
|
|
| 208 |
+ <div class="hisroy_price"> |
|
| 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> |
|
| 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> |
|
| 276 | 288 |
</div> |
| 277 |
- <div class="clearfix"> |
|
| 278 |
- <p>포인트</p> |
|
| 279 |
- <p> |
|
| 280 |
- <span> |
|
| 281 |
- <fmt:formatNumber value="${mberManageVO.userPoint}" pattern="" />
|
|
| 282 |
- </span>원 |
|
| 283 |
- </p> |
|
| 289 |
+ </c:when> |
|
| 290 |
+ <c:otherwise> |
|
| 291 |
+ <p class="tRight c_666" style="margin: 0 0 10px 0">(VAT 별도)</p> |
|
| 292 |
+ <div class="hisroy_price"> |
|
| 293 |
+ |
|
| 294 |
+ <%-- 누적 사용금액 => 현재까지 실제 문자발송에 사용된 캐시의 합산 --%> |
|
| 295 |
+ <div class="hisroy_defprice_in"> |
|
| 296 |
+ <p><i></i>누적 사용금액</p> |
|
| 297 |
+ <div class="clearfix"> |
|
| 298 |
+ <p>캐시</p> |
|
| 299 |
+ <p> |
|
| 300 |
+ <span> |
|
| 301 |
+ <fmt:formatNumber value="${totSumCashAfterPay}" pattern="" />
|
|
| 302 |
+ </span>원 |
|
| 303 |
+ </p> |
|
| 304 |
+ </div> |
|
| 305 |
+ |
|
| 306 |
+ <%-- 현재까지 적립된 포인트의 합산 --%> |
|
| 307 |
+ <div class="clearfix"> |
|
| 308 |
+ <p>포인트</p> |
|
| 309 |
+ <p> |
|
| 310 |
+ <span> |
|
| 311 |
+ <fmt:formatNumber value="${totSumPointAfterPay}" pattern="" />
|
|
| 312 |
+ </span>원 |
|
| 313 |
+ </p> |
|
| 314 |
+ </div> |
|
| 315 |
+ </div> |
|
| 316 |
+ |
|
| 317 |
+ <%-- 누적 납부금액 => 현재까지 실제 납입하여 결제 완료 처리된 금액 (미납금액 제외) --%> |
|
| 318 |
+ <div class="hisroy_defprice_in"> |
|
| 319 |
+ <p><i></i>누적 납부금액</p> |
|
| 320 |
+ <div class="clearfix"> |
|
| 321 |
+ <p>캐시</p> |
|
| 322 |
+ <p> |
|
| 323 |
+ <span> |
|
| 324 |
+ <fmt:formatNumber value="${totSumPaymentAfterPay}" pattern="" />
|
|
| 325 |
+ </span>원 |
|
| 326 |
+ </p> |
|
| 327 |
+ </div> |
|
| 328 |
+ |
|
| 329 |
+ <%-- 누적 납부금액에 대한 2%의 포인트 --%> |
|
| 330 |
+ <div class="clearfix"> |
|
| 331 |
+ <p>포인트</p> |
|
| 332 |
+ <p> |
|
| 333 |
+ <span> |
|
| 334 |
+ <fmt:formatNumber value="${sumPaymentPointAfterPay}" pattern="" />
|
|
| 335 |
+ </span>원 |
|
| 336 |
+ </p> |
|
| 337 |
+ </div> |
|
| 338 |
+ </div> |
|
| 339 |
+ |
|
| 340 |
+ <%-- 당월 납부 예상 금액 => (누적 사용금액 - 누적 납부금액) --%> |
|
| 341 |
+ <div class="hisroy_defprice_in"> |
|
| 342 |
+ <p><i></i>당월 납부 예상금액</p> |
|
| 343 |
+ <div class="clearfix"> |
|
| 344 |
+ <p>캐시</p> |
|
| 345 |
+ <p> |
|
| 346 |
+ <span> |
|
| 347 |
+ <fmt:formatNumber value="${unPaymentAfterPay}" pattern="" />
|
|
| 348 |
+ </span>원 |
|
| 349 |
+ </p> |
|
| 350 |
+ </div> |
|
| 351 |
+ |
|
| 352 |
+ <%-- 당월 납부 예상금액에 대한 2%의 포인트 --%> |
|
| 353 |
+ <div class="clearfix"> |
|
| 354 |
+ <p>포인트</p> |
|
| 355 |
+ <p> |
|
| 356 |
+ <span> |
|
| 357 |
+ <fmt:formatNumber value="${unPaymentPointAfterPay}" pattern="" />
|
|
| 358 |
+ </span>원 |
|
| 359 |
+ </p> |
|
| 360 |
+ </div> |
|
| 361 |
+ <dl> |
|
| 362 |
+ <dt>* 당월 납부 예상 포인트</dt> |
|
| 363 |
+ <dd>- 납부 예상금액 결제 시 적립되는 포인트</dd> |
|
| 364 |
+ </dl> |
|
| 365 |
+ </div> |
|
| 366 |
+ |
|
| 367 |
+ <%-- 현재 회원의 보유잔액(캐시) --%> |
|
| 368 |
+ <div class="hisroy_defprice_in"> |
|
| 369 |
+ <p><i></i>잔액 (사용가능금액)</p> |
|
| 370 |
+ <div class="clearfix"> |
|
| 371 |
+ <p>캐시</p> |
|
| 372 |
+ <p> |
|
| 373 |
+ <span> |
|
| 374 |
+ <fmt:formatNumber value="${mberManageVO.userMoney}" pattern="" />
|
|
| 375 |
+ </span>원 |
|
| 376 |
+ </p> |
|
| 377 |
+ </div> |
|
| 378 |
+ |
|
| 379 |
+ <%-- 현재 회원의 보유 포인트 --%> |
|
| 380 |
+ <div class="clearfix"> |
|
| 381 |
+ <p>포인트</p> |
|
| 382 |
+ <p> |
|
| 383 |
+ <span> |
|
| 384 |
+ <fmt:formatNumber value="${mberManageVO.userPoint}" pattern="" />
|
|
| 385 |
+ </span>원 |
|
| 386 |
+ </p> |
|
| 387 |
+ </div> |
|
| 388 |
+ </div> |
|
| 284 | 389 |
</div> |
| 285 |
- </div> |
|
| 286 |
- </div> |
|
| 390 |
+ </c:otherwise> |
|
| 391 |
+ </c:choose> |
|
| 287 | 392 |
<div class="history_details"> |
| 288 | 393 |
<p class="tType1_title"><img src="/publish/images/content/history_details_title.png" alt=""> 발송내역</p> |
| 289 | 394 |
<div class="details_wrap"> |
--- src/main/webapp/WEB-INF/jsp/web/pay/PayUserSWListAjax.jsp
+++ src/main/webapp/WEB-INF/jsp/web/pay/PayUserSWListAjax.jsp
... | ... | @@ -111,7 +111,7 @@ |
| 111 | 111 |
return; |
| 112 | 112 |
} |
| 113 | 113 |
} |
| 114 |
- |
|
| 114 |
+ |
|
| 115 | 115 |
document.listForm.action = url; |
| 116 | 116 |
document.listForm.method = "post"; |
| 117 | 117 |
window.open("about:blank", 'printPop', 'width='+ popup_wid +', height='+ popup_ht +', left=' + popup_left + ', top='+ popup_top + ', fullscreen=no, menubar=no, status=no, toolbar=no, titlebar=yes, location=no, scrollbars=1');
|
... | ... | @@ -160,7 +160,7 @@ |
| 160 | 160 |
|
| 161 | 161 |
$("#listForm").attr("target","msgSentPrint");
|
| 162 | 162 |
window.open('', 'msgSentPrint', 'width='+ popup_wid +', height='+ popup_ht +', left=' + popup_left + ', top='+ popup_top );
|
| 163 |
- $("#listForm").attr({"action":"/web/member/pay/PrintPayUserListAjax.do", "method":"post"}).submit();
|
|
| 163 |
+ $("#listForm").attr({"action":"/web/member/pay/PrintPayUserSWListAjax.do", "method":"post"}).submit();
|
|
| 164 | 164 |
} |
| 165 | 165 |
|
| 166 | 166 |
//환불요청 내역 프린트 출력 팝업 |
... | ... | @@ -201,7 +201,7 @@ |
| 201 | 201 |
<input type="hidden" id="searchSortCnd" name="searchSortCnd" value="<c:out value="${searchVO.searchSortCnd}" />" />
|
| 202 | 202 |
<input type="hidden" id="searchSortOrd" name="searchSortOrd" value="<c:out value="${searchVO.searchSortOrd}" />" />
|
| 203 | 203 |
<div class="list_info"> |
| 204 |
- <p>총 <span>${paginationInfo.totalRecordCount}</span>건</p>
|
|
| 204 |
+ <p>총 <span>${paginationInfo.totalRecordCount}</span>건 (<fmt:formatNumber value="${totSuccSendPrice}" pattern="" /> 원)</p>
|
|
| 205 | 205 |
<div> |
| 206 | 206 |
<button type="button" class="print_btn" onclick="javascript:fnPayUserPrintPopup();"> |
| 207 | 207 |
<i class="print_img"></i>인쇄하기 |
... | ... | @@ -257,7 +257,7 @@ |
| 257 | 257 |
<!-- <th colspan="2">잔액</th> --> |
| 258 | 258 |
</tr> |
| 259 | 259 |
<tr> |
| 260 |
- <th>캐시</th> |
|
| 260 |
+ <th>충전금</th> |
|
| 261 | 261 |
<th>포인트</th> |
| 262 | 262 |
<!-- <th>캐시</th> --> |
| 263 | 263 |
<!-- <th>포인트</th> --> |
... | ... | @@ -332,13 +332,13 @@ |
| 332 | 332 |
</p> |
| 333 | 333 |
</td> |
| 334 | 334 |
<td> |
| 335 |
- <p> |
|
| 335 |
+ <p class="fwRg c_002c9a"> |
|
| 336 | 336 |
<fmt:formatNumber type="number" maxFractionDigits="3" value="${payUserInfo.succSendPrice}" var="succCash" />
|
| 337 | 337 |
<c:out value="${succCash}"/>
|
| 338 | 338 |
</p> |
| 339 | 339 |
</td> |
| 340 | 340 |
<td> |
| 341 |
- <p> |
|
| 341 |
+ <p class="fwRg c_002c9a"> |
|
| 342 | 342 |
<%-- <fmt:formatNumber type="number" maxFractionDigits="3" value="${payUserInfo.befPoint}" var="befPoint" />
|
| 343 | 343 |
<c:out value="${befPoint}"/> --%>
|
| 344 | 344 |
0 |
... | ... | @@ -395,7 +395,7 @@ |
| 395 | 395 |
</c:when> |
| 396 | 396 |
<c:otherwise> |
| 397 | 397 |
<tr> |
| 398 |
- <td colspan="8"> |
|
| 398 |
+ <td colspan="6"> |
|
| 399 | 399 |
검색 결과가 없습니다. |
| 400 | 400 |
</td> |
| 401 | 401 |
</tr> |
... | ... | @@ -410,6 +410,11 @@ |
| 410 | 410 |
<label for="publish1">거래명세서</label> |
| 411 | 411 |
<input type="radio" name="publish" id="publish2" value="details"> |
| 412 | 412 |
<label for="publish2">사용내역서</label> |
| 413 |
+ <label for="" class="label">부가세 포함,별도 선택</label> |
|
| 414 |
+ <select id="addVatType" name="addVatType" class="selType2"> |
|
| 415 |
+ <option value="N" selected>부가세 별도</option> |
|
| 416 |
+ <option value="Y">부가세 포함</option> |
|
| 417 |
+ </select> |
|
| 413 | 418 |
</div> |
| 414 | 419 |
<div> |
| 415 | 420 |
<c:choose> |
--- src/main/webapp/WEB-INF/jsp/web/pay/PayView.jsp
+++ src/main/webapp/WEB-INF/jsp/web/pay/PayView.jsp
... | ... | @@ -604,12 +604,13 @@ |
| 604 | 604 |
|
| 605 | 605 |
var form = document.pgForm; |
| 606 | 606 |
|
| 607 |
- if(sendCnt >= 3){
|
|
| 607 |
+ |
|
| 608 |
+ /* if(sendCnt >= 3){
|
|
| 608 | 609 |
|
| 609 | 610 |
alert("일일 문자발송은 3회까지만 가능합니다.");
|
| 610 | 611 |
return false; |
| 611 | 612 |
|
| 612 |
- } |
|
| 613 |
+ } */ |
|
| 613 | 614 |
|
| 614 | 615 |
if(form.callTo.value == '' || form.callTo.length == 0){
|
| 615 | 616 |
|
... | ... | @@ -799,7 +800,7 @@ |
| 799 | 800 |
<li class="tab"><button type="button" onclick="location.href='/web/pay/PayGuide.do'">요금안내/견적내기</button></li> |
| 800 | 801 |
<li class="tab active"><button type="button">결제하기</button></li> |
| 801 | 802 |
<li class="tab"><button type="button" onclick="location.href='/web/member/pay/PayList.do'">요금 결제내역</button></li> |
| 802 |
- <li class="tab"><button type="button" onclick="location.href='/web/member/pay/PayUserList.do'">요금 사용내역</button></li> |
|
| 803 |
+ <li class="tab"><button type="button" onclick="location.href='/web/member/pay/PayUserSWList.do'">요금 사용내역</button></li> |
|
| 803 | 804 |
<!-- 현금영수증 자동발행 주석 --> |
| 804 | 805 |
<!-- <li class="tab"><button type="button" onclick="location.href='/web/member/pay/BillPub.do'">계산서/현금영수증 발행 등록</button></li> --> |
| 805 | 806 |
<li class="tab"><button type="button" onclick="location.href='/web/member/pay/BillPub.do'">세금계산서 발행 등록</button></li> |
... | ... | @@ -992,7 +993,7 @@ |
| 992 | 993 |
<p>- 이체 후 충전 확인까지 <span>최대 10분이 소요</span>됩니다.</p> |
| 993 | 994 |
<p>- 이체금액에서 <span>부가세 10%가 제외되고 충전</span>됩니다.</p> |
| 994 | 995 |
<!-- <p>- 예금주 : 문자온</p> --> |
| 995 |
- <p>- 계좌번호 문자로 받기(일/3회까지) |
|
| 996 |
+ <p>- 계좌번호 문자로 받기(유료) |
|
| 996 | 997 |
<label for="" class="label">전화번호 입력</label> |
| 997 | 998 |
<input type="text" id="callTo" name="callTo" maxLength="11" placeholder="‘-’ 없이 받으실 휴대폰 번호를 입력해주세요." onfocus="this.placeholder=''" onblur="this.placeholder='‘-’ 없이 전화번호를 입력해주세요'"> |
| 998 | 999 |
<button type="button" onclick="fnSmsSend(<c:out value='${resultMsgInfo.sendCnt}'/>); return false;">문자받기</button>
|
+++ src/main/webapp/WEB-INF/jsp/web/pay/PrintPayUserSWListPopUp.jsp
... | ... | @@ -0,0 +1,227 @@ |
| 1 | +<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> | |
| 2 | +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> | |
| 3 | +<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui"%> | |
| 4 | +<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %> | |
| 5 | +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %> | |
| 6 | +<%@ page import="itn.com.cmm.LoginVO" %> | |
| 7 | +<!DOCTYPE html> | |
| 8 | +<html lang="ko"> | |
| 9 | + <head> | |
| 10 | + <meta charset="UTF-8"> | |
| 11 | + <meta http-equiv="X-UA-Compatible" content="IE=edge"> | |
| 12 | + <title>요금 사용내역</title> | |
| 13 | + <link href="https://fonts.googleapis.com/css2?family=Noto+Sans+KR:wght@100;300;400;500;700;900&display=swap" rel="stylesheet"> | |
| 14 | + <link rel="stylesheet" href="/publish/css/reset.css"> | |
| 15 | + <link rel="stylesheet" href="/publish/css/common.css"> | |
| 16 | + <link rel="stylesheet" href="/publish/css/estimate.css"> | |
| 17 | + <link rel="stylesheet" href="/publish/css/font.css"> | |
| 18 | + <link rel="stylesheet" href="/publish/css/button.css"> | |
| 19 | + </head> | |
| 20 | + <script type="text/javascript"> | |
| 21 | + function f_print(){ | |
| 22 | + | |
| 23 | + document.getElementById('est_btn_wrap').style.display = 'none'; | |
| 24 | + var initBody = document.body.innerHTML; | |
| 25 | + window.onbeforeprint = function(){ | |
| 26 | + // print_area는 인쇄하고자 하는 영역의 ID를 말합니다.( 필수 ) | |
| 27 | +// document.body.innerHTML = document.getElementById("print_area").innerHTML; | |
| 28 | + } | |
| 29 | + window.onafterprint = function(){ | |
| 30 | + document.body.innerHTML = initBody; | |
| 31 | + } | |
| 32 | + window.print(); | |
| 33 | + document.getElementById('est_btn_wrap').style.display = ''; | |
| 34 | + } | |
| 35 | + </script> | |
| 36 | + <body> | |
| 37 | + <!-- 견적서 --> | |
| 38 | + <div class="estimate_wrap"> | |
| 39 | + <div class="estimate"> | |
| 40 | + <div class="est_head clearfix"> | |
| 41 | + <img src="/publish/images/CI.png" alt="문자온 CI"> | |
| 42 | + <div class="clearfix"> | |
| 43 | + <p>(12248) 경기도 남양주시 다산순환로 20, A동 735호(다산동, 현대프리미어캠퍼스)</p> | |
| 44 | + <p>TEL 010-8432-9333</p> | |
| 45 | + </div> | |
| 46 | + </div> | |
| 47 | + <div class="est_body"> | |
| 48 | + <h2>요금 사용내역</h2> | |
| 49 | + <div class="cont1 tb_ver2"> | |
| 50 | + <div> | |
| 51 | + <table class="est_table"> | |
| 52 | + <caption>발신자 정보</caption> | |
| 53 | + <colgroup> | |
| 54 | + <col style="width: 50px;"> | |
| 55 | + <col style="width: auto;"> | |
| 56 | + </colgroup> | |
| 57 | + <tbody> | |
| 58 | + <tr> | |
| 59 | + <th></th> | |
| 60 | + <td colspan="2" class="colspan"> | |
| 61 | + <span><c:out value="${userNm}"/></span> 님의 사용내역을 아래와 같이 확인합니다. | |
| 62 | + </td> | |
| 63 | + </tr> | |
| 64 | + </tbody> | |
| 65 | + </table> | |
| 66 | + </div> | |
| 67 | + </div> | |
| 68 | + <div class="cont3"> | |
| 69 | + <div class="est_table2_wrap"> | |
| 70 | + <table class="est_table2"> | |
| 71 | + <caption>사용날짜, 문자유형, 문자내용, 충전 충전금, 충전 포인트, 사용 충전금, 사용 포인트, 잔액 충전금, 잔액 포인트를 제공하는 표</caption> | |
| 72 | + <colgroup> | |
| 73 | + <col style="width: 15%;"> | |
| 74 | + <col style="width: 10%;"> | |
| 75 | + <col style="width: 15%;"> | |
| 76 | + <col style="width: 15%;"> | |
| 77 | + <col style="width: 10%;"> | |
| 78 | + <%-- <col style="width: 10%;"> | |
| 79 | + <col style="width: 15%;"> | |
| 80 | + <col style="width: 10%;"> --%> | |
| 81 | + </colgroup> | |
| 82 | + <thead> | |
| 83 | + <tr> | |
| 84 | + <th rowspan="2" style=" vertical-align : middle;"> | |
| 85 | + 날짜 | |
| 86 | + </th> | |
| 87 | + <th rowspan="2" style=" vertical-align : middle;"> | |
| 88 | + 문자유형 | |
| 89 | + </th> | |
| 90 | + <th rowspan="2" style=" vertical-align : middle;border-right:1px solid #ccc;"> | |
| 91 | + 발송건수 | |
| 92 | + </th> | |
| 93 | + <!-- <th colspan="2">충전</th> --> | |
| 94 | + <th colspan="2">사용</th> | |
| 95 | + <!-- <th colspan="2">잔액</th> --> | |
| 96 | + </tr> | |
| 97 | + <tr> | |
| 98 | + <th>충전금</th> | |
| 99 | + <th>포인트</th> | |
| 100 | + <!-- <th>충전금</th> | |
| 101 | + <th>포인트</th> | |
| 102 | + <th>충전금</th> | |
| 103 | + <th>포인트</th> --> | |
| 104 | + </tr> | |
| 105 | + </thead> | |
| 106 | + <tbody> | |
| 107 | + <c:choose> | |
| 108 | + <c:when test="${not empty payUserList}"> | |
| 109 | + <c:forEach var="payUserInfo" items="${payUserList}" varStatus="status"> | |
| 110 | + <tr> | |
| 111 | + <td> | |
| 112 | + <c:out value="${payUserInfo.regDate}"/> | |
| 113 | + </td> | |
| 114 | + <td> | |
| 115 | + <p style="text-align:center;"> | |
| 116 | + <c:choose> | |
| 117 | + <c:when test="${payUserInfo.msgTypeTxt eq '6' && payUserInfo.fileCnt eq 0 }"> | |
| 118 | + 장문 | |
| 119 | + </c:when> | |
| 120 | + <c:when test="${payUserInfo.msgTypeTxt eq '6' && payUserInfo.fileCnt ne 0 }"> | |
| 121 | + 그림 | |
| 122 | + </c:when> | |
| 123 | + <c:when test="${payUserInfo.msgTypeTxt eq '8'}"> | |
| 124 | + 알림톡 | |
| 125 | + </c:when> | |
| 126 | + <c:when test="${payUserInfo.msgTypeTxt eq '9'}"> | |
| 127 | + 친구톡 | |
| 128 | + </c:when> | |
| 129 | + <c:when test="${payUserInfo.msgTypeTxt eq 'fax'}"> | |
| 130 | + 펙스 | |
| 131 | + </c:when> | |
| 132 | + <c:otherwise> | |
| 133 | + 단문 | |
| 134 | + </c:otherwise> | |
| 135 | + </c:choose> | |
| 136 | + </p> | |
| 137 | + </td> | |
| 138 | + <td> | |
| 139 | + <c:out value="${payUserInfo.succSendCnt}"/> | |
| 140 | + <c:if test="${payUserInfo.msgTypeTxt eq 'fax'}"> | |
| 141 | + (<c:out value="${payUserInfo.fileCnt}"/>) | |
| 142 | + </c:if> | |
| 143 | + </td> | |
| 144 | + <td> | |
| 145 | + <p class="fwRg c_002c9a" style="text-align:center;"> | |
| 146 | + <fmt:formatNumber type="number" maxFractionDigits="3" value="${payUserInfo.succSendPrice}" var="succCash" /> | |
| 147 | + <c:out value="${succCash}"/> | |
| 148 | + </p> | |
| 149 | + </td> | |
| 150 | + <td> | |
| 151 | + <p class="fwRg c_002c9a" style="text-align:center;"> | |
| 152 | + 0 | |
| 153 | + </p> | |
| 154 | + </td> | |
| 155 | + <%-- <td> | |
| 156 | + <p class="fwRg c_002c9a"> | |
| 157 | + <fmt:formatNumber type="number" maxFractionDigits="3" value="${payUserInfo.totPrice}" var="totPrice" /> | |
| 158 | + <c:out value="${totPrice}"/> | |
| 159 | + </p> | |
| 160 | + </td> | |
| 161 | + <td> | |
| 162 | + <p class="fwRg c_002c9a"> | |
| 163 | + 0 | |
| 164 | + </p> | |
| 165 | + </td> | |
| 166 | + <td> | |
| 167 | + <p class="fwRg c_222"> | |
| 168 | + <fmt:formatNumber type="number" maxFractionDigits="3" value="${payUserInfo.thisPoint}" var="thisPoint" /> | |
| 169 | + <c:out value="${thisPoint}"/> | |
| 170 | + </p> | |
| 171 | + </td> | |
| 172 | + <td> | |
| 173 | + <p class="fwRg c_222"> | |
| 174 | + <c:out value="${payUserInfo.befPoint}"/> | |
| 175 | + </p> | |
| 176 | + </td> --%> | |
| 177 | + </tr> | |
| 178 | + </c:forEach> | |
| 179 | + </c:when> | |
| 180 | + <c:otherwise> | |
| 181 | + <tr> | |
| 182 | + <td colspan="5"> | |
| 183 | + 사용내역이 없습니다. | |
| 184 | + </td> | |
| 185 | + </tr> | |
| 186 | + </c:otherwise> | |
| 187 | + </c:choose> | |
| 188 | + </tbody> | |
| 189 | + </table> | |
| 190 | + </div> | |
| 191 | + </div> | |
| 192 | + <div class="cont4"> | |
| 193 | + <table class="est_table"> | |
| 194 | + <caption>공급가액, 부가세, 총 결제금액에 대한 표</caption> | |
| 195 | + <colgroup> | |
| 196 | + <col style="width: 64px;"> | |
| 197 | + <col style="width: auto;"> | |
| 198 | + </colgroup> | |
| 199 | + <tbody> | |
| 200 | + <tr> | |
| 201 | + <th>대표번호</th> | |
| 202 | + <td>010-8432-9333</td> | |
| 203 | + </tr> | |
| 204 | + <tr> | |
| 205 | + <th>이메일</th> | |
| 206 | + <td>help@iten.co.kr</td> | |
| 207 | + </tr> | |
| 208 | + </tbody> | |
| 209 | + </table> | |
| 210 | + </div> | |
| 211 | + <div class="cont5"> | |
| 212 | + <p><span><c:out value="${year}"/></span> 년 <span><c:out value="${month}"/></span> 월 <span><c:out value="${day}"/></span> 일</p> | |
| 213 | + <div> | |
| 214 | + <span>주식회사 아이티앤 대표이사</span> | |
| 215 | + <span>유 인 식</span> | |
| 216 | + <span class="big_stamp"><img src="/publish/images/content/big_stamp.png"></span> | |
| 217 | + </div> | |
| 218 | + </div> | |
| 219 | + </div> | |
| 220 | + <div class="est_btn_wrap" id="est_btn_wrap"> | |
| 221 | + <button type="button" class="btnType" onclick="javascript:f_print(); return false;"><i class="print_img"></i>인쇄하기</button> | |
| 222 | + </div> | |
| 223 | + </div> | |
| 224 | + </div> | |
| 225 | + <!--// 견적서 --> | |
| 226 | + </body> | |
| 227 | +</html> |
--- src/main/webapp/WEB-INF/jsp/web/user/mberInfoIndex.jsp
+++ src/main/webapp/WEB-INF/jsp/web/user/mberInfoIndex.jsp
... | ... | @@ -255,12 +255,13 @@ |
| 255 | 255 |
<div class="my_dashboard_cont1"> |
| 256 | 256 |
<button type="button" class="level_icon" data-tooltip="level_check_popup01" id="levelIconBtn" style="display: none;"> |
| 257 | 257 |
</button> |
| 258 |
- <div> |
|
| 259 |
- <p> |
|
| 260 |
- <span><c:out value="${mberManageVO.mberNm}"/></span> 회원님 반갑습니다
|
|
| 258 |
+ <div class="title_wrap"> |
|
| 259 |
+ <p class="user_text"> |
|
| 260 |
+ <span class="user_name"><c:out value="${mberManageVO.mberNm}"/></span>
|
|
| 261 |
+ 회원님 반갑습니다 |
|
| 261 | 262 |
</p> |
| 262 | 263 |
<c:if test="${loginVO.dept eq 'p'}">
|
| 263 |
- <button type="button" class="btnType" onclick="location.href='/web/user/membershipChange.do'">기업회원전환</button> |
|
| 264 |
+ <button type="button" class="btnType" onclick="location.href='/web/user/membershipChange.do'">기업회원전환</button> |
|
| 264 | 265 |
</c:if> |
| 265 | 266 |
</div> |
| 266 | 267 |
<div class="send_price"> |
... | ... | @@ -365,45 +366,125 @@ |
| 365 | 366 |
</div> |
| 366 | 367 |
<div class="my_dashboard_cont3"> |
| 367 | 368 |
<p class="dashboard_title">이용내역</p> |
| 368 |
- <p class="reqTxt2">(단위 : 건, 원)</p> |
|
| 369 |
- <div class="table_wrap"> |
|
| 370 |
- <table> |
|
| 371 |
- <caption>구분, 충전금액, 사용금액, 잔액 등 정보를 제공하는 표</caption> |
|
| 372 |
- <colgroup> |
|
| 373 |
- <col style="width: 115px;"> |
|
| 374 |
- <col style="width: calc((100% - 115px)/3);"> |
|
| 375 |
- <col style="width: calc((100% - 115px)/3);"> |
|
| 376 |
- <col style="width: calc((100% - 115px)/3);"> |
|
| 377 |
- </colgroup> |
|
| 378 |
- <thead> |
|
| 379 |
- <tr> |
|
| 380 |
- <th scope="col">구분</th> |
|
| 381 |
- <th scope="col">충전금액</th> |
|
| 382 |
- <th scope="col">사용금액</th> |
|
| 383 |
- <th scope="col">잔액</th> |
|
| 384 |
- </tr> |
|
| 385 |
- </thead> |
|
| 386 |
- <tbody> |
|
| 387 |
- <tr> |
|
| 388 |
- <td>캐시</td> |
|
| 389 |
- <c:forEach var="cashInfo" items="${cashInfoList}" varStatus="status">
|
|
| 390 |
- <td> |
|
| 391 |
- <fmt:formatNumber value="${cashInfo.cashSum}" pattern="" />
|
|
| 392 |
- </td> |
|
| 393 |
- </c:forEach> |
|
| 394 |
- </tr> |
|
| 395 |
- <tr> |
|
| 396 |
- <td>포인트</td> |
|
| 397 |
- <c:forEach var="pointInfo" items="${pointInfoList}" varStatus="status">
|
|
| 398 |
- <td> |
|
| 399 |
- <fmt:formatNumber value="${pointInfo.sumPay}" pattern="" />
|
|
| 400 |
- </td> |
|
| 401 |
- </c:forEach> |
|
| 402 |
- </tr> |
|
| 403 |
- </tbody> |
|
| 404 |
- </table> |
|
| 405 |
- </div> |
|
| 406 |
- <button type="button" onclick="location.href='/web/member/pay/PayUserList.do';"> |
|
| 369 |
+ |
|
| 370 |
+ <c:choose> |
|
| 371 |
+ <c:when test="${mberManageVO.prePaymentYn eq 'Y'}">
|
|
| 372 |
+ <p class="reqTxt2">(단위 : 건, 원)</p> |
|
| 373 |
+ <div class="table_wrap"> |
|
| 374 |
+ <table> |
|
| 375 |
+ <caption>구분, 충전금액, 사용금액, 잔액 등 정보를 제공하는 표</caption> |
|
| 376 |
+ <colgroup> |
|
| 377 |
+ <col style="width: 115px;"> |
|
| 378 |
+ <col style="width: calc((100% - 115px)/3);"> |
|
| 379 |
+ <col style="width: calc((100% - 115px)/3);"> |
|
| 380 |
+ <col style="width: calc((100% - 115px)/3);"> |
|
| 381 |
+ </colgroup> |
|
| 382 |
+ <thead> |
|
| 383 |
+ <tr> |
|
| 384 |
+ <th scope="col">구분</th> |
|
| 385 |
+ <th scope="col">충전금액</th> |
|
| 386 |
+ <th scope="col">사용금액</th> |
|
| 387 |
+ <th scope="col">잔액</th> |
|
| 388 |
+ </tr> |
|
| 389 |
+ </thead> |
|
| 390 |
+ <tbody> |
|
| 391 |
+ <tr> |
|
| 392 |
+ <td>캐시</td> |
|
| 393 |
+ <c:forEach var="cashInfo" items="${cashInfoList}" varStatus="status">
|
|
| 394 |
+ <td> |
|
| 395 |
+ <fmt:formatNumber value="${cashInfo.cashSum}" pattern="" />
|
|
| 396 |
+ </td> |
|
| 397 |
+ </c:forEach> |
|
| 398 |
+ </tr> |
|
| 399 |
+ <tr> |
|
| 400 |
+ <td>포인트</td> |
|
| 401 |
+ <c:forEach var="pointInfo" items="${pointInfoList}" varStatus="status">
|
|
| 402 |
+ <td> |
|
| 403 |
+ <fmt:formatNumber value="${pointInfo.sumPay}" pattern="" />
|
|
| 404 |
+ </td> |
|
| 405 |
+ </c:forEach> |
|
| 406 |
+ </tr> |
|
| 407 |
+ </tbody> |
|
| 408 |
+ </table> |
|
| 409 |
+ </div> |
|
| 410 |
+ </c:when> |
|
| 411 |
+ <c:otherwise> |
|
| 412 |
+ <p class="reqTxt2">(단위 : 건, 원) VAT 별도</p> |
|
| 413 |
+ <div class="table_wrap"> |
|
| 414 |
+ <table> |
|
| 415 |
+ <caption>구분, 충전금액, 사용금액, 잔액 등 정보를 제공하는 표</caption> |
|
| 416 |
+ <colgroup> |
|
| 417 |
+ <col style="width: 115px;"> |
|
| 418 |
+ <col style="width: calc((100% - 115px)/4);"> |
|
| 419 |
+ <col style="width: calc((100% - 115px)/4);"> |
|
| 420 |
+ <col style="width: calc((100% - 115px)/4);"> |
|
| 421 |
+ <col style="width: calc((100% - 115px)/4);"> |
|
| 422 |
+ </colgroup> |
|
| 423 |
+ <thead> |
|
| 424 |
+ <tr> |
|
| 425 |
+ <th scope="col">구분</th> |
|
| 426 |
+ <th scope="col">누적 사용금액</th> |
|
| 427 |
+ <th scope="col">누적 납부금액</th> |
|
| 428 |
+ <th scope="col">당월 납부 예상금액</th> |
|
| 429 |
+ <th scope="col">잔액 (사용가능금액)</th> |
|
| 430 |
+ </tr> |
|
| 431 |
+ </thead> |
|
| 432 |
+ <tbody> |
|
| 433 |
+ <tr> |
|
| 434 |
+ <td>캐시</td> |
|
| 435 |
+ <%-- <c:forEach var="cashInfo" items="${cashInfoList}" varStatus="status">
|
|
| 436 |
+ <td> |
|
| 437 |
+ <fmt:formatNumber value="${cashInfo.cashSum}" pattern="" />
|
|
| 438 |
+ </td> |
|
| 439 |
+ </c:forEach> --%> |
|
| 440 |
+ <td> |
|
| 441 |
+ <%-- 누적 사용금액 => 현재까지 실제 문자발송에 사용된 캐시의 합산 --%> |
|
| 442 |
+ <fmt:formatNumber value="${totSumCashAfterPay}" pattern="" />
|
|
| 443 |
+ </td> |
|
| 444 |
+ <td> |
|
| 445 |
+ <%-- 누적 납부금액 => 현재까지 실제 납입하여 결제 완료 처리된 금액 (미납금액 제외) --%> |
|
| 446 |
+ <fmt:formatNumber value="${totSumPaymentAfterPay}" pattern="" />
|
|
| 447 |
+ </td> |
|
| 448 |
+ <td> |
|
| 449 |
+ <%-- 당월 납부 예상 금액 => (누적 사용금액 - 누적 납부금액) --%> |
|
| 450 |
+ <fmt:formatNumber value="${unPaymentAfterPay}" pattern="" />
|
|
| 451 |
+ </td> |
|
| 452 |
+ <td> |
|
| 453 |
+ <%-- 현재 회원의 보유잔액(캐시) --%> |
|
| 454 |
+ <fmt:formatNumber value="${mberManageVO.userMoney}" pattern="" />
|
|
| 455 |
+ </td> |
|
| 456 |
+ </tr> |
|
| 457 |
+ <tr> |
|
| 458 |
+ <td>포인트</td> |
|
| 459 |
+ <%-- <c:forEach var="pointInfo" items="${pointInfoList}" varStatus="status">
|
|
| 460 |
+ <td> |
|
| 461 |
+ <fmt:formatNumber value="${pointInfo.sumPay}" pattern="" />
|
|
| 462 |
+ </td> |
|
| 463 |
+ </c:forEach> --%> |
|
| 464 |
+ <td> |
|
| 465 |
+ <%-- 현재까지 적립된 포인트의 합산 --%> |
|
| 466 |
+ <fmt:formatNumber value="${totSumPointAfterPay}" pattern="" />
|
|
| 467 |
+ </td> |
|
| 468 |
+ <td> |
|
| 469 |
+ <%-- 누적 납부금액에 대한 2%의 포인트 --%> |
|
| 470 |
+ <fmt:formatNumber value="${sumPaymentPointAfterPay}" pattern="" />
|
|
| 471 |
+ </td> |
|
| 472 |
+ <td> |
|
| 473 |
+ <%-- 당월 납부 예상금액에 대한 2%의 포인트 --%> |
|
| 474 |
+ <fmt:formatNumber value="${unPaymentPointAfterPay}" pattern="" />
|
|
| 475 |
+ </td> |
|
| 476 |
+ <td> |
|
| 477 |
+ <%-- 현재 회원의 보유 포인트 --%> |
|
| 478 |
+ <fmt:formatNumber value="${mberManageVO.userPoint}" pattern="" />
|
|
| 479 |
+ </td> |
|
| 480 |
+ </tr> |
|
| 481 |
+ </tbody> |
|
| 482 |
+ </table> |
|
| 483 |
+ </div> |
|
| 484 |
+ </c:otherwise> |
|
| 485 |
+ </c:choose> |
|
| 486 |
+ |
|
| 487 |
+ <button type="button" onclick="location.href='/web/member/pay/PayUserSWList.do';"> |
|
| 407 | 488 |
<img src="/publish/images/content/mypage_plus.png" alt="더보기"> |
| 408 | 489 |
</button> |
| 409 | 490 |
<div class="table_wrap"> |
--- src/main/webapp/js/user/fax/sendListInit.js
+++ src/main/webapp/js/user/fax/sendListInit.js
... | ... | @@ -16,7 +16,7 @@ |
| 16 | 16 |
//이전달 첫날/마지막날 조회 |
| 17 | 17 |
if(date.getMonth()+1 == 1){
|
| 18 | 18 |
lastfulstday = date.getFullYear()-1 + "/12" + "/01"; |
| 19 |
- lastfuledday = date.getFullYear()-1 + "/12" + "/"+new Date(date.getFullYear()-1, 12, 0); |
|
| 19 |
+ lastfuledday = date.getFullYear()-1 + "/12" + "/"+new Date(date.getFullYear()-1, 12, 0).getDate()+""; |
|
| 20 | 20 |
}else{
|
| 21 | 21 |
lastfulstday = date.getFullYear() + "/" ; |
| 22 | 22 |
lastfulstday += date.getMonth() < 10 ? "0"+ (date.getMonth()) : date.getMonth()+"" ; |
--- src/main/webapp/publish/css/common.css
+++ src/main/webapp/publish/css/common.css
... | ... | @@ -116,7 +116,7 @@ |
| 116 | 116 |
.login2 .login_info button {margin-right: 2px;}
|
| 117 | 117 |
.login2 .login_pay {display:flex;}
|
| 118 | 118 |
.login2 .check_money p span, .login2 .point p span {padding-left: 4px;}
|
| 119 |
-.login2 .check_money {margin-right: 20px;}
|
|
| 119 |
+.login2 .check_money {margin-right: 20px; display: inline-flex;}
|
|
| 120 | 120 |
.login2 .check_money p {padding-right: 6px;display: inline-block;vertical-align: middle;}
|
| 121 | 121 |
.login2 .check_money i {background-image: url(/publish/images/check_money2.png);width: 29px;height: 30px;margin-right: 3px;}
|
| 122 | 122 |
.login2 .check_money button {margin-right: 2px;}
|
... | ... | @@ -127,6 +127,13 @@ |
| 127 | 127 |
.login2 .check_money .account_box dl dt:before {content:'';display:inline-block;width:22px;height:20px;margin:0 5px 0 0;vertical-align:top;background:url(/publish/images/content/icon_account_layer.png) no-repeat left top;}
|
| 128 | 128 |
.login2 .check_money .account_box dl dd {margin:7px 0 0;font-size:15px;font-weight:500;white-space:nowrap;}
|
| 129 | 129 |
.login2 .check_money .account_box:hover dl {display:block;}
|
| 130 |
+ /*후불 회원에게만 노출되는 안내레이어*/ |
|
| 131 |
+.login2 .check_money .holdingsum_box {position: relative;}
|
|
| 132 |
+.login2 .check_money .holdingsum_box dl {display:none;position:absolute;left:50%;top:41px;padding:12px;border:2px solid #002c9a;background:#fff;border-radius:10px;box-shadow:0px 3px 10px 0px rgba(0, 0, 0, 0.5);transform:translateX(-50%);}
|
|
| 133 |
+.login2 .check_money .holdingsum_box dl:after {content:'';position:absolute;left:50%;top:-10px;width:16px;height:10px;margin:0 0 0 -8px;background:url(../images/content/icon_account_arrow.png) no-repeat left top;}
|
|
| 134 |
+.login2 .check_money .holdingsum_box dl dd {margin:3px;font-size:15px;font-weight:500;white-space:nowrap; line-height:20px;}
|
|
| 135 |
+.login2 .check_money .holdingsum_box:hover dl {display:block;}
|
|
| 136 |
+ |
|
| 130 | 137 |
.login2 .point p {padding-right: 6px;display: inline-block; vertical-align: middle;}
|
| 131 | 138 |
.login2 .point i {background-image: url(/publish/images/pointIcon2.png);width: 30px;height: 28px;margin-right: 3px;margin-top: -2px;}
|
| 132 | 139 |
.login2 .login_right button i {background-image: url(/publish/images/login_introIcon.png);width: 20px;height: 18px;margin: 0 6px 3px 0;}
|
--- src/main/webapp/publish/css/content.css
+++ src/main/webapp/publish/css/content.css
... | ... | @@ -408,7 +408,7 @@ |
| 408 | 408 |
.list_bottom .list_bottom_right {float: right; font-size: 16px; display: flex;}
|
| 409 | 409 |
.list_bottom .list_bottom_right p {line-height: 36px;}
|
| 410 | 410 |
.list_bottom .list_bottom_right span {font-size: 20px; font-weight: 600 !important;}
|
| 411 |
-.list_bottom .list_bottom_right .address_reg2 {height: 36px; padding: 0 10px; border-radius: 5px;font-weight: 300; background-color: #6a6c72; color: #fff; margin-left: 10px;}
|
|
| 411 |
+.list_bottom .list_bottom_right .address_reg2 {height: 36px; padding: 0 10px; border-radius: 5px;font-weight: 400; background-color: #6a6c72; color: #fff; margin-left: 10px;}
|
|
| 412 | 412 |
|
| 413 | 413 |
.list_bottom .remove_btnWrap .address_reg2 {width: calc(100% - 246px); background-color: #6a6c72; color: #fff; border-radius: 5px; font-weight: 300;}
|
| 414 | 414 |
.list_bottom .remove_btnWrap .check_validity {height: 32px; position: absolute; right: 0;}
|
... | ... | @@ -477,11 +477,11 @@ |
| 477 | 477 |
.send_top .top_content {background-color: #fff;padding: 30px 40px;border-radius: 10px;}
|
| 478 | 478 |
.send_top .send_price {display: inline-block;position: relative;margin-left:50px;vertical-align: middle;line-height: 25px;height: 27.5px;}
|
| 479 | 479 |
.send_top .send_price::after {content: "";position: absolute;background-color: #002c9a;width: 3px;height: 20px;border-radius: 2px; top: 50%;transform: translateY(-50%);left: -30px;}
|
| 480 |
-.send_top .send_price li {display: inline-block;color: #555;padding-right: 12px;margin-right: 6px;position: relative; font-size: 15px; letter-spacing: -0.5px;}
|
|
| 480 |
+.send_top .send_price li {display: inline-block;color: #555;padding-right: 7px;margin-right: 5px;position: relative; font-size: 15px; letter-spacing: -0.5px;}
|
|
| 481 | 481 |
.send_top .heading .send_price li:first-child {margin-right:28px;}
|
| 482 | 482 |
.send_top .send_price .price_line::after {content: "/";position: absolute;top: 50%;transform: translateY(-50%);right: 0;color: #ababab;font-size: 14px;}
|
| 483 | 483 |
.send_top .send_price li .type {border: 1px solid #46484a;border-radius: 3px;margin-right: 8px; color: #46484a;padding: 0 4px;}
|
| 484 |
-.send_top .send_price li .price {color: #e40000;font-size: 18px;font-weight: 700;}
|
|
| 484 |
+.send_top .send_price li .price {color: #e40000;font-size: 16px;font-weight: 700;}
|
|
| 485 | 485 |
.send_top .send_general {width: 100%;display: flex;display: -ms-flexbox; justify-content: space-between; position: relative;}
|
| 486 | 486 |
/* left area 내용 입력 */ |
| 487 | 487 |
.send_top .send_left {max-width: 870px;flex-basis: 68%;}
|
... | ... | @@ -619,13 +619,15 @@ |
| 619 | 619 |
.sub .election .receipt_number_table_wrap .put_right .receipt_info dd b{font-size:16px;font-weight:500;}
|
| 620 | 620 |
.sub .election .receipt_number_table_wrap .put_right .receipt_info .btn_reset{font-size:14px;font-weight:500;color:#333;}
|
| 621 | 621 |
.sub .election .receipt_number_table_wrap .put_right .receipt_info .btn_reset i{display:inline-block;width:15px;height:13px;margin:-1px 2px 0 0;background:url(/publish/images/icon_reset.png) no-repeat center center;}
|
| 622 |
-.sub .election .list_bottom{display:flex;width:100%;align-items:center;justify-content:space-between;padding:0 0 10px 0;}
|
|
| 622 |
+.sub .election .list_bottom{display:flex;width:94.8%;align-items:center;justify-content:space-between;padding:0 0 10px 0;}
|
|
| 623 |
+.sub .election .receipt_number_table_wrap .list_bottom{width:100%;}
|
|
| 623 | 624 |
.sub .election .list_bottom .pagination{display:inline-flex;width:auto;margin:0;justify-content:flex-start;}
|
| 624 |
-.sub .election .list_bottom .pagination button{height:32px;}
|
|
| 625 |
-.sub .election .list_bottom .list_bottom_right{float:none;display:inline-flex;justify-content:flex-end;}
|
|
| 626 |
-.sub .election .list_bottom .list_bottom_right button{height:32px;padding:0 13px;font-weight:400 !important;}
|
|
| 625 |
+.sub .election .list_bottom .pagination button{display:inline-flex;align-items:center;justify-content:center;height:32px;}
|
|
| 626 |
+.sub .election .list_bottom .list_bottom_right{float:none;display:inline-flex;justify-content:flex-end;align-items:center;}
|
|
| 627 |
+.sub .election .list_bottom .list_bottom_right p{margin:0 10px 0 0;}
|
|
| 628 |
+.sub .election .list_bottom .list_bottom_right button{width:95px;height:32px;font-size:14px;padding:0 2px;font-weight:400 !important;}
|
|
| 627 | 629 |
.sub .election .list_bottom .list_bottom_right>button{margin:0 4px 0 0;}
|
| 628 |
-.sub .election .list_bottom .list_bottom_right .btn_yellow{display:inline-flex;align-items:center;padding:0 10px;}
|
|
| 630 |
+.sub .election .list_bottom .list_bottom_right .btn_yellow{display:inline-flex;align-items:center;justify-content:center;padding:0 2px;}
|
|
| 629 | 631 |
.sub .election .list_bottom .list_bottom_right .btn_yellow i.qmMark{background:url(/publish/images/content/qmIcon_black.png) no-repeat center;margin:0 0 0 2px;}
|
| 630 | 632 |
|
| 631 | 633 |
/* 2023/12/07 선거문자 - 20건문자(수동문자) 전송 추가 table에서 ul로 변경 */ |
... | ... | @@ -994,7 +996,8 @@ |
| 994 | 996 |
.pay_cont .excel_middle {margin: 20px 0 10px 0;}
|
| 995 | 997 |
.pay_cont .excel_middle .selType2 {width: 82px; height: 32px; margin-left: 0;}
|
| 996 | 998 |
.pay_cont .select_btnWrap .add_text2 {font-size: 16px; padding-top: 7px; color: #666; font-weight: 300;}
|
| 997 |
- |
|
| 999 |
+.pay_cont .select_btnWrap .add_text2 .accountinfo {padding:2px 0 0 10px; color:#21376c; font-weight:400;}
|
|
| 1000 |
+.pay_cont .select_btnWrap .add_text2 .accountinfo span {font-size:14px; color:#697593; padding:0 0 0 10px;}
|
|
| 998 | 1001 |
/*등급 및 누적결제액 확인 버튼 추가*/ |
| 999 | 1002 |
.pay_cont .excel_middle .level_btn{margin: 0 5px; border: 1px solid #002c9a; color: #002c9a;}
|
| 1000 | 1003 |
.pay_cont .excel_middle .level_btn img{margin-top: -3px;}
|
... | ... | @@ -1049,6 +1052,26 @@ |
| 1049 | 1052 |
.hisroy_price .hisroy_price_in>div>p:first-child {float: left;}
|
| 1050 | 1053 |
.hisroy_price .hisroy_price_in>div>p:last-child {float: right;}
|
| 1051 | 1054 |
.hisroy_price .hisroy_price_in>div>p>span {font-size: 22px; font-family: 'GmarketSansBold'; color: #002c9a; padding-right: 5px;}
|
| 1055 |
+ /*후불회원 요금 사용내역*/ |
|
| 1056 |
+.hisroy_price .hisroy_defprice_in {position:relative; background-color: #f2f2f2; width: calc(100%/4 - 10px); padding: 28px 22px 40px 22px; border-radius: 5px; box-sizing: border-box;}
|
|
| 1057 |
+.hisroy_price .hisroy_defprice_in>p {font-size: 20px; font-weight: 600; margin-bottom: 25px; font-family: 'GmarketSansBold';}
|
|
| 1058 |
+.hisroy_price .hisroy_defprice_in i{background-size: 100%;}
|
|
| 1059 |
+.hisroy_price .hisroy_defprice_in:nth-child(1) i {background-image: url(/publish/images/content/history_icon1.png); width: 23px; height: 26px; margin: 0 10px 2px 0;}
|
|
| 1060 |
+.hisroy_price .hisroy_defprice_in:nth-child(2) i {background-image: url(/publish/images/content/history_icon2.png); width: 26px; height: 24px; margin: 0 10px 2px 0;}
|
|
| 1061 |
+.hisroy_price .hisroy_defprice_in:nth-child(3) i {background-image: url(/publish/images/content/history_icon4.png); width: 22px; height: 24px; margin: 0 10px 2px 0;}
|
|
| 1062 |
+.hisroy_price .hisroy_defprice_in:nth-child(4) i {background-image: url(/publish/images/content/history_icon3.png); width: 21px; height: 21px; margin: 0 10px 2px 0;}
|
|
| 1063 |
+.hisroy_price .hisroy_defprice_in>div {background-color: #fff; height: 50px; padding: 0 20px; border-radius: 5px; line-height: 50px; box-sizing: border-box;}
|
|
| 1064 |
+.hisroy_price .hisroy_defprice_in>div:last-child {margin-top: 10px;}
|
|
| 1065 |
+.hisroy_price .hisroy_defprice_in>div>p {font-size: 15px; font-weight: 300;}
|
|
| 1066 |
+.hisroy_price .hisroy_defprice_in>div>p:first-child {float: left;}
|
|
| 1067 |
+.hisroy_price .hisroy_defprice_in>div>p:last-child {float: right;}
|
|
| 1068 |
+.hisroy_price .hisroy_defprice_in>div>p>span {font-size: 20px; font-family: 'GmarketSansBold'; color: #002c9a; padding-right: 1px;}
|
|
| 1069 |
+.hisroy_price .hisroy_defprice_in .clearfix{ display: flex; justify-content: space-between; align-items: center; height: 40px; background-color: #fff; padding: 5px 10px; border-radius: 5px; margin: 0 0 10px 0;}
|
|
| 1070 |
+.hisroy_price .hisroy_defprice_in .clearfix:last-child{margin: 0 0 0 0; text-align: right;}
|
|
| 1071 |
+.hisroy_price .hisroy_defprice_in .clearfix p:nth-child(2n){width: calc(100% - 5px); text-align: right;}
|
|
| 1072 |
+.hisroy_price .hisroy_defprice_in dl {position: absolute; font-size:13px; color:#777; padding:0; top:178px;}
|
|
| 1073 |
+.hisroy_price .hisroy_defprice_in dl dd {padding:2px 0 0 8px;}
|
|
| 1074 |
+ |
|
| 1052 | 1075 |
.history_details .tType1_title{margin: 0;}
|
| 1053 | 1076 |
.history_details .tType1_title img{margin: -4px 0 0 0;}
|
| 1054 | 1077 |
.history_details .details_wrap{width: 100%; background-color: #f2f2f2; border-radius: 5px; padding: 15px 20px 15px 20px; box-sizing: border-box;}
|
... | ... | @@ -2001,6 +2024,7 @@ |
| 2001 | 2024 |
.send_top {margin: 0 30px;}
|
| 2002 | 2025 |
.send_bottom {margin: 60px 30px 0 30px;}
|
| 2003 | 2026 |
.list_bottom {width: calc(100% - 200px);}
|
| 2027 |
+ .sub .election .list_bottom{width:calc(100% - 100px)}
|
|
| 2004 | 2028 |
.area_tabcontent.photo_sample {min-height:737px;}
|
| 2005 | 2029 |
/* .area_tabcontent.photo_sample li {height:355.5px;} */
|
| 2006 | 2030 |
.area_tabcontent.photo_sample li .photo_cont {max-height:307.5px;}
|
... | ... | @@ -2060,6 +2084,10 @@ |
| 2060 | 2084 |
.sub .election .receipt_number_table_wrap+.list_bottom .list_bottom_right button{font-size:14px;letter-spacing:-1px;}
|
| 2061 | 2085 |
.sub .election .receipt_number_table_wrap+.list_bottom .list_bottom_right .btn_gray.fill{padding:0 5px;}
|
| 2062 | 2086 |
.sub .election .receipt_number_table_wrap+.list_bottom .list_bottom_right .btn_yellow.fill{padding:0 3px;}
|
| 2087 |
+ |
|
| 2088 |
+ /* 후불회원 요금사용내역*/ |
|
| 2089 |
+ .hisroy_price .hisroy_defprice_in>p {font-size: 18px; font-weight: 600; margin-bottom: 25px; font-family: 'GmarketSansBold';}
|
|
| 2090 |
+ .hisroy_price .hisroy_defprice_in>div>p>span {font-size: 17px; font-family: 'GmarketSansBold'; color: #002c9a; padding-right: 1px;}
|
|
| 2063 | 2091 |
} |
| 2064 | 2092 |
|
| 2065 | 2093 |
@media only screen and (max-width:1480px){
|
... | ... | @@ -2158,9 +2186,10 @@ |
| 2158 | 2186 |
.rev_admin_cont .select_btnWrap .btn_right .select_btn{width: 105px;}
|
| 2159 | 2187 |
|
| 2160 | 2188 |
/* 선거문자 */ |
| 2161 |
- .sub .election .list_bottom{width:100%;}
|
|
| 2162 |
- .sub .election .receipt_number_table_wrap+.list_bottom .list_bottom_right button{letter-spacing:-1.4px;}
|
|
| 2163 |
- .sub .election .list_bottom .pagination button{width:30px;height:30px;}
|
|
| 2189 |
+ .sub .election .list_bottom{width:calc(100% - 154px);}
|
|
| 2190 |
+ .sub .election .receipt_number_table_wrap .list_bottom{width:100%;}
|
|
| 2191 |
+ .sub .election .list_bottom .list_bottom_right button{height:30px;font-size:14px;letter-spacing:-1.4px;}
|
|
| 2192 |
+ .sub .election .list_bottom .pagination button{display:inline-flex;width:25px;height:30px;align-items:center;justify-content:center;}
|
|
| 2164 | 2193 |
} |
| 2165 | 2194 |
|
| 2166 | 2195 |
@media only screen and (max-width:1380px){
|
... | ... | @@ -2198,6 +2227,10 @@ |
| 2198 | 2227 |
|
| 2199 | 2228 |
/* 카카오톡 */ |
| 2200 | 2229 |
.kakaotalkset_cont .kakao_wrap .template_category{width: 259px;}
|
| 2230 |
+ |
|
| 2231 |
+ /* 선거문자 */ |
|
| 2232 |
+ .sub .election .list_bottom .list_bottom_right button{width:90px;height:30px;font-size:14px;letter-spacing:-1.4px;}
|
|
| 2233 |
+ |
|
| 2201 | 2234 |
} |
| 2202 | 2235 |
|
| 2203 | 2236 |
@media only screen and (max-width:1300px){
|
--- src/main/webapp/publish/css/main.css
+++ src/main/webapp/publish/css/main.css
... | ... | @@ -116,7 +116,7 @@ |
| 116 | 116 |
.msg_photo .swiper-slide .slide_area:hover div.btn_more{display: block; width: 54px; height: 54px; background-color: rgba(0,0,0,0.4); border-radius: 100%; line-height: 48px; position: absolute;top: 50%;left: 50%;transform: translate(-50%,-50%);}
|
| 117 | 117 |
.msg_photo .area_img{display:flex;height:365px; border-radius: 16px 16px 0 0; overflow: hidden;align-items:center;}
|
| 118 | 118 |
.msg_photo .area_img img{width: 100%; height: auto;}
|
| 119 |
-.msg_photo .area_img_text{font-size: 17px;padding: 12px 10px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;}
|
|
| 119 |
+.msg_photo .area_img_text{font-size: 17px;padding: 18px 10px 0 10px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;}
|
|
| 120 | 120 |
.msg_photo .area_img_text .sub_text{display: block; font-size: 14px; color: #777; margin: 5px auto;}
|
| 121 | 121 |
.msg_photo_wrap .swiper-button-prev {margin:0;background-image:url(/publish/images/main/btn_prev.png);background-size:12px 21px;}
|
| 122 | 122 |
.msg_photo_wrap .swiper-button-next {margin:0;background-image:url(/publish/images/main/btn_next.png);background-size:12px 21px;}
|
--- src/main/webapp/publish/css/mem.css
+++ src/main/webapp/publish/css/mem.css
... | ... | @@ -315,11 +315,11 @@ |
| 315 | 315 |
.send_top .send_price li:last-child {margin-right: 0;}
|
| 316 | 316 |
.my_dashboard .event_text{width: 558px; margin: 8px 0 0 auto; text-align: left; font-size: 15px; color: #555;}
|
| 317 | 317 |
.my_dashboard .event_text span{font-size: 15px; font-weight: bold; color: #e40000; padding: 0 0 0 0;} */
|
| 318 |
-.my_dashboard .send_price{display: flex; width: calc(100% - 390px); height: 80%; margin: 0 0 0 0; line-height: 1; align-items: stretch;}
|
|
| 318 |
+.my_dashboard .send_price{display: flex;width: calc(100% - 490px); height: 80%; margin: 0 0 0 0; line-height: 1; align-items: stretch;}
|
|
| 319 | 319 |
.my_dashboard .send_price::after{display: none;}
|
| 320 |
-.my_dashboard .send_price .price_title{display: flex; width: 100px; background-color: #eea301; color: #fff; font-size: 20px; font-weight: bold; border-radius: 10px 0 0 10px; align-items: center; justify-content: center; line-height: 1.5;}
|
|
| 321 |
-.my_dashboard .send_price .price_wrap{width: calc(100% - 100px); background-color: #fff; border-radius: 0 10px 10px 0;}
|
|
| 322 |
-.my_dashboard .send_price ul{display: flex; width: calc(100% - 20px); border-bottom: 1px dashed #d5d5d5; margin: 0 auto; padding: 10px 15px; align-items: center; flex-wrap: wrap; box-sizing: border-box;}
|
|
| 320 |
+.my_dashboard .send_price .price_title{display: flex; width: 100px; background-color: #eea301; color: #fff; font-size: 18px; font-weight: bold; border-radius: 10px 0 0 10px; align-items: center; justify-content: center; line-height: 1.5;}
|
|
| 321 |
+.my_dashboard .send_price .price_wrap{width: calc(135% - 100px); background-color: #fff; border-radius: 0 10px 10px 0;}
|
|
| 322 |
+.my_dashboard .send_price ul{display: flex; width: calc(100% - 0px); border-bottom: 1px dashed #d5d5d5; margin: 0 auto; padding: 10px 14px; align-items: center; flex-wrap: wrap; box-sizing: border-box;}
|
|
| 323 | 323 |
.my_dashboard .send_price ul:last-child{border: 0; align-items: flex-start;}
|
| 324 | 324 |
.my_dashboard .send_price ul:first-child li:last-child{margin: 0; padding: 0}
|
| 325 | 325 |
.my_dashboard .send_price .price_wrap .title{font-size: 16px; color: #222;}
|
... | ... | @@ -374,12 +374,17 @@ |
| 374 | 374 |
.my_dashboard .my_dashboard_cont1 button {font-size: 17px; height: 45px; padding: 0 15px; border: 1px solid #002c9a; border-radius: 5px; margin-left: 15px; color: #002c9a; background-color: #fff; position: relative; right: 5px; top: 3px;}
|
| 375 | 375 |
.my_dashboard_cont1>span {background-color: #fff; height: 43px; padding: 0 30px; border-radius: 21.5px; align-items: center; display: flex; font-weight: 300;}
|
| 376 | 376 |
.my_dashboard_cont1>span>span {font-weight: 500;}
|
| 377 |
+.my_dashboard_cont1 .title_wrap{width:450px;}
|
|
| 378 |
+.my_dashboard_cont1 .user_text{display:flex;max-width:calc(100% - 115px);align-items:center;flex-wrap:wrap;margin:0 10px 0 0;line-height:1.3;}
|
|
| 379 |
+.my_dashboard_cont1 .user_name{word-break:break-all;margin:0 5px 0 0;}
|
|
| 380 |
+.my_dashboard_cont1 .title_wrap .btnType{position:inherit;height:36px;margin:0;}
|
|
| 381 |
+ |
|
| 377 | 382 |
|
| 378 | 383 |
/* mypage dashboard cont1 등급제 기간 추가 - 기간 지나면 이부분 삭제 */ |
| 379 | 384 |
.my_dashboard .my_dashboard_cont1 {padding: 25px 30px;}
|
| 380 | 385 |
.my_dashboard_cont1>div {display: flex; align-items: center;}
|
| 381 | 386 |
.my_dashboard_cont1 p {font-size: 16px; font-weight: 300;}
|
| 382 |
-.my_dashboard_cont1 p span {font-size: 24px; font-weight: 600; padding-right: 3px; margin-left: -20px;}
|
|
| 387 |
+.my_dashboard_cont1 p span {font-size: 24px; font-weight: 600; padding-right: 3px; /*margin-left: -20px;*/}
|
|
| 383 | 388 |
.my_dashboard .my_dashboard_cont1 button {font-size: 17px; height: 45px; padding: 0 8px; border: 1px solid #002c9a; border-radius: 5px; margin-left: 15px; color: #002c9a; background-color: #fff; position: relative; right: 5px; top: 3px;}
|
| 384 | 389 |
.my_dashboard_cont1>span {background-color: #fff; height: 43px; padding: 0 30px; border-radius: 21.5px; align-items: center; display: flex; font-weight: 300;}
|
| 385 | 390 |
.my_dashboard_cont1>span>span {font-weight: 500;}
|
... | ... | @@ -667,8 +672,14 @@ |
| 667 | 672 |
|
| 668 | 673 |
/* 마이페이지 */ |
| 669 | 674 |
/*등급제 아이콘 추가*/ |
| 670 |
- |
|
| 671 |
- |
|
| 675 |
+@media only screen and (max-width:1540px){
|
|
| 676 |
+ .my_dashboard .send_price{width: calc(102% - 486px);}
|
|
| 677 |
+ .my_dashboard .send_price .price_wrap{width: calc(105% - 73px);}
|
|
| 678 |
+ .my_dashboard .send_price .price_title{width: 65px;}
|
|
| 679 |
+ .send_top .send_price li{margin-right: 2px; padding-right:6px;}
|
|
| 680 |
+ .my_dashboard>.my_dashboard_cont1, .my_dashboard>.my_dashboard_cont3{flex-wrap: nowrap;}
|
|
| 681 |
+ .send_top .send_price .price_line::after{content: none;}
|
|
| 682 |
+} |
|
| 672 | 683 |
|
| 673 | 684 |
|
| 674 | 685 |
/* media queries */ |
... | ... | @@ -677,7 +688,7 @@ |
| 677 | 688 |
.my_dashboard_cont1 p{font-size: 16px;}
|
| 678 | 689 |
.my_dashboard_cont1 p span{font-size: 24px;}
|
| 679 | 690 |
.my_dashboard .my_dashboard_cont1 button{height: 40px; padding: 0 15px; font-size: 16px; font-weight: 500;}
|
| 680 |
- .my_dashboard .send_price{width: calc(100% - 340px);}
|
|
| 691 |
+ .my_dashboard .send_price{width: calc(100% - 387px);}
|
|
| 681 | 692 |
.send_top .send_price li{letter-spacing: -1px;}
|
| 682 | 693 |
.send_top .send_price .title{padding: 0 4px 0 0;}
|
| 683 | 694 |
|
... | ... | @@ -687,7 +698,10 @@ |
| 687 | 698 |
.my_dashboard .my_dashboard_cont1 button {font-size: 16px; padding: 0 8px; margin: 0 0 0 13px; color: #002c9a;}
|
| 688 | 699 |
.my_dashboard_cont1 .level_icon{margin: 0 22px 0 0;}
|
| 689 | 700 |
.my_dashboard .send_price{margin: 0 -24px 0 0;}
|
| 690 |
- .my_dashboard .send_price .price_title{width: 75px;}
|
|
| 701 |
+ .my_dashboard .send_price .price_wrap{width: calc(104% - 88px);}
|
|
| 702 |
+ .my_dashboard .title_wrap .btnType{margin: 0 10px 0 0;}
|
|
| 703 |
+ /*.my_dashboard .send_price .price_title{width: 75px;}*/
|
|
| 704 |
+ .my_dashboard .send_price .price_title{width: 50px; font-size: 16px; line-height: 1.4:}
|
|
| 691 | 705 |
} |
| 692 | 706 |
|
| 693 | 707 |
@media only screen and (max-width:1380px){
|
... | ... | @@ -697,6 +711,11 @@ |
| 697 | 711 |
@media only screen and (max-width:1300px){
|
| 698 | 712 |
/* join3 */ |
| 699 | 713 |
.mem_cont.join3 .text_middle>div {font-size: 16px;}
|
| 714 |
+ .my_dashboard .send_price .price_wrap{width:calc(101% - 72px);}
|
|
| 715 |
+ .my_dashboard .send_price{width: calc(102% - 320px);}
|
|
| 716 |
+} |
|
| 717 |
+@media only screen and (max-width:1280px{
|
|
| 718 |
+ .my_dashboard .send_price ul{padding: 10px 10px;}
|
|
| 700 | 719 |
} |
| 701 | 720 |
@media only screen and (max-width:1260px){
|
| 702 | 721 |
/* �߽Ź�ȣ ���� */ |
--- src/main/webapp/publish/css/popupLayer.css
+++ src/main/webapp/publish/css/popupLayer.css
... | ... | @@ -290,7 +290,7 @@ |
| 290 | 290 |
.error_hover_cont {top: 45px; right: -1px; width: 320px;line-height:1.4;}
|
| 291 | 291 |
.test_hover_cont {top: 54px; right: -1px; width: 220px;}
|
| 292 | 292 |
.addr_hover_cont {top:inherit;bottom:40px;}
|
| 293 |
- |
|
| 293 |
+.sub .election .list_bottom_right .send_hover_cont{width:270px;}
|
|
| 294 | 294 |
|
| 295 | 295 |
|
| 296 | 296 |
/* 통신사 고객센터 정보 */ |
... | ... | @@ -1132,6 +1132,20 @@ |
| 1132 | 1132 |
.toast_popup .title{font-size:16px;font-weight:500;color:#fff;line-height:1.5;}
|
| 1133 | 1133 |
.toast_popup .btn_close{display:inline-block;width:20px;height:20px;background:url(/publish/images/icon_toast_close.png) no-repeat center center;}
|
| 1134 | 1134 |
|
| 1135 |
+/*20건 문자(수동문자) 이용안내 팝업*/ |
|
| 1136 |
+.tw_wrap .con .tw_title{padding: 0 0 10px 0;}
|
|
| 1137 |
+.tw_wrap .tw_title01_icon{background-image: url(/publish/images/popup/tw_popup/title01_icon.png); width: 28px; height: 24px; margin: 0 5px 0 0;}
|
|
| 1138 |
+.tw_wrap .con .tw_title .tw_title02_icon{background-image: url(/publish/images/popup/tw_popup/title02_icon.png); width: 28px; height: 24px; margin: 0 5px 0 0;}
|
|
| 1139 |
+.tw_wrap .con .tw_title .tw_title03_icon{background-image: url(/publish/images/popup/tw_popup/title03_icon.png); width: 28px; height: 24px; margin: 0 5px 0 0;}
|
|
| 1140 |
+.tw_wrap .con .tw_title .tw_title04_icon{background-image: url(/publish/images/popup/tw_popup/title04_icon.png); width: 28px; height: 24px; margin: 0 5px 0 0;}
|
|
| 1141 |
+.tw_wrap .con .tw_title .tw_title05_icon{background-image: url(/publish/images/popup/tw_popup/title05_icon.png); width: 28px; height: 24px; margin: 2px 5px 0 0;}
|
|
| 1142 |
+.tw_wrap .con .tw_con ul li{font-size: 17px; color: #222; font-weight: 500; line-height: 1.8;}
|
|
| 1143 |
+.tw_wrap .con .tw_con ul .te{line-height: 1.4; text-indent: -10px; word-break: keep-all; margin: 0 0 10px 13px;}
|
|
| 1144 |
+.tw_wrap .con .tw_con ul .sub_te{font-size: 16px; color: #666; font-weight: 400; line-height: 1.5; margin: -5px 0 0 11px;}
|
|
| 1145 |
+.tw_wrap .con .tw_con .sub_li li{font-size: 16px; color: #666; font-weight: 400; line-height: 1.6; margin: 0 0 0 11px;}
|
|
| 1146 |
+.tw_wrap .con .tw_con .li_02{margin: 10px 0 0 0;}
|
|
| 1147 |
+.tw_wrap .con .tw_con img{width: 100%; margin: 22px 0 40px 0;}
|
|
| 1148 |
+ |
|
| 1135 | 1149 |
|
| 1136 | 1150 |
/* ie */ |
| 1137 | 1151 |
@media screen and (-ms-high-contrast: active), (-ms-high-contrast: none) {
|
--- src/main/webapp/publish/guide_2022.html
+++ src/main/webapp/publish/guide_2022.html
... | ... | @@ -18,6 +18,7 @@ |
| 18 | 18 |
<!-- <p>***<span class="font1"> (컨텐츠)</span> : 반복적으로 사용 안함</p> |
| 19 | 19 |
<p>***<span class="font2"> (보드)</span> : 반복적으로 사용</p> --> |
| 20 | 20 |
<ul class="page"> |
| 21 |
+ <li><a href="/publish/payment6.html">payment6.html</a>후불회원 : 결제관리 > 요금사용내역</li> |
|
| 21 | 22 |
<li><a href="/publish/sub_election_2023.html">sub_election_2023.html</a>선거문자</li> |
| 22 | 23 |
<li><a href="/publish/publish_text/send_text.html">send_text.html</a>문자보내기</li> |
| 23 | 24 |
<li><a href="/publish/publish_text/text_send.html">text_send.html</a>문자발송</li> |
+++ src/main/webapp/publish/images/content/history_icon4.png
| Binary file is not shown |
+++ src/main/webapp/publish/images/popup/tw_popup/title01_icon.png
| Binary file is not shown |
+++ src/main/webapp/publish/images/popup/tw_popup/title02_icon.png
| Binary file is not shown |
+++ src/main/webapp/publish/images/popup/tw_popup/title03_icon.png
| Binary file is not shown |
+++ src/main/webapp/publish/images/popup/tw_popup/title04_icon.png
| Binary file is not shown |
+++ src/main/webapp/publish/images/popup/tw_popup/title05_icon.png
| Binary file is not shown |
+++ src/main/webapp/publish/images/popup/tw_popup/tw_con_01.jpg
| Binary file is not shown |
+++ src/main/webapp/publish/images/popup/tw_popup/tw_con_02.jpg
| Binary file is not shown |
+++ src/main/webapp/publish/images/popup/tw_popup/tw_con_03.jpg
| Binary file is not shown |
+++ src/main/webapp/publish/images/popup/tw_popup/tw_con_04.jpg
| Binary file is not shown |
+++ src/main/webapp/publish/images/popup/tw_popup/tw_con_05.jpg
| Binary file is not shown |
--- src/main/webapp/publish/index_2023.html
+++ src/main/webapp/publish/index_2023.html
... | ... | @@ -288,10 +288,21 @@ |
| 288 | 288 |
<button type="button" class="btnType btnType2">로그아웃</button> |
| 289 | 289 |
</div> |
| 290 | 290 |
<div class="check_money"> |
| 291 |
- <i></i> |
|
| 292 |
- <p>보유잔액 <span class="fwMd">3,000</span>원</p> |
|
| 291 |
+ <div class="holdingsum_box"> |
|
| 292 |
+ <i></i> |
|
| 293 |
+ <p>보유잔액 <span class="fwMd">3,000</span>원</p> |
|
| 294 |
+ <dl> |
|
| 295 |
+ <dd>후불제 고객의 보유잔액(캐시)은 당월 발송 가능<br>금액을 말하며 <span>매월 1일 자동으로 충전</span>됩니다.</dd> |
|
| 296 |
+ </dl> |
|
| 297 |
+ </div> |
|
| 293 | 298 |
<button type="button" class="btnType btnType3">충전</button> |
| 294 |
- <button type="button" class="btnType btnType3">전용계좌</button> |
|
| 299 |
+ <div class="account_box"> |
|
| 300 |
+ <button type="button" class="btnType btnType3">전용계좌</button> |
|
| 301 |
+ <dl> |
|
| 302 |
+ <dt>전용계좌</dt> |
|
| 303 |
+ <dd>신한은행 56212519515101</dd> |
|
| 304 |
+ </dl> |
|
| 305 |
+ </div> |
|
| 295 | 306 |
</div> |
| 296 | 307 |
<div class="point"> |
| 297 | 308 |
<i></i> |
+++ src/main/webapp/publish/payment6.html
... | ... | @@ -0,0 +1,590 @@ |
| 1 | +<!DOCTYPE html> | |
| 2 | +<html lang="ko"> | |
| 3 | + | |
| 4 | +<head> | |
| 5 | + <meta charset="UTF-8"> | |
| 6 | + <meta http-equiv="X-UA-Compatible" content="IE=edge"> | |
| 7 | + <title>문자온_요금사용내역</title> | |
| 8 | + | |
| 9 | + <link href="https://fonts.googleapis.com/css2?family=Noto+Sans+KR:wght@100;300;400;500;700;900&display=swap" rel="stylesheet"> | |
| 10 | + <link rel="stylesheet" href="/publish/css/reset.css"> | |
| 11 | + <link rel="stylesheet" href="/publish/css/jquery.mCustomScrollbar.css"> | |
| 12 | + <link rel="stylesheet" href="/publish/css/common.css"> | |
| 13 | + <link rel="stylesheet" href="/publish/css/button.css"> | |
| 14 | + <link rel="stylesheet" href="/publish/css/content.css"> | |
| 15 | + <link rel="stylesheet" href="/publish/css/mem.css"> | |
| 16 | + <link rel="stylesheet" href="/publish/css/font.css"> | |
| 17 | + <link rel="stylesheet" href="/publish/css/popupLayer.css"> | |
| 18 | + <link rel="stylesheet" href="/publish/js/datepicker/classic.css"> | |
| 19 | + <link rel="stylesheet" href="/publish/js/datepicker/classic.date.css"> | |
| 20 | + | |
| 21 | + | |
| 22 | + <script src="/publish/js/jquery-3.5.0.js"></script> | |
| 23 | + <script src="/publish/js/jquery.mCustomScrollbar.concat.min.js"></script> | |
| 24 | + <script src="/publish/js/common.js"></script> | |
| 25 | + <script src="/publish/js/content.js"></script> | |
| 26 | + <script src="/publish/js/calendar.js"></script> | |
| 27 | + <script src="/publish/js/popupLayer.js"></script> | |
| 28 | + <script type="text/javascript" src="/publish/js/datepicker/picker.js"></script> | |
| 29 | + <script type="text/javascript" src="/publish/js/datepicker/picker.date.js"></script> | |
| 30 | + <script type="text/javascript" src="/publish/js/datepicker/ko_KR.js"></script> | |
| 31 | + | |
| 32 | +</head> | |
| 33 | + | |
| 34 | +<body> | |
| 35 | + <div class="mask"></div> | |
| 36 | + <!-- skip 메뉴 --> | |
| 37 | + <div class="skip_menu"> | |
| 38 | + <a href="#cont" title="본문 바로가기" class="contGo">본문 바로가기</a> | |
| 39 | + </div> | |
| 40 | + <!--// skip 메뉴 --> | |
| 41 | + <!-- quick 메뉴 --> | |
| 42 | + <div class="quickMenu"> | |
| 43 | + <div> | |
| 44 | + <p class="quick_title">QUICK<br>MENU</p> | |
| 45 | + <p class="quick_title2">QUICK</p> | |
| 46 | + <ul class="quickMenuIn"> | |
| 47 | + <li> | |
| 48 | + <a href="/publish/index.html"><i class="quick1"></i><span>이용안내</span></a> | |
| 49 | + <div class="hover_cont">이용안내</div> | |
| 50 | + </li> | |
| 51 | + <li> | |
| 52 | + <a href="#"><i class="quick2"></i><span>채팅상담</span></a> | |
| 53 | + <div class="hover_cont">채팅상담</div> | |
| 54 | + </li> | |
| 55 | + <li> | |
| 56 | + <a href="#"><i class="quick3"></i><span>원격지원</span></a> | |
| 57 | + <div class="hover_cont">원격지원</div> | |
| 58 | + </li> | |
| 59 | + <li> | |
| 60 | + <a href="#"><i class="quick4"></i><span>맞춤제작</span></a> | |
| 61 | + <div class="hover_cont">맞춤제작</div> | |
| 62 | + </li> | |
| 63 | + <li> | |
| 64 | + <a href="#"><i class="quick5"></i><span>주소록 등록</span></a> | |
| 65 | + <div class="hover_cont">주소록 등록</div> | |
| 66 | + </li> | |
| 67 | + <li> | |
| 68 | + <a href="#"><i class="quick6"></i><span>엑셀 전송</span></a> | |
| 69 | + <div class="hover_cont">엑셀 대량전송</div> | |
| 70 | + </li> | |
| 71 | + <li> | |
| 72 | + <a href="#"><i class="quick7"></i><span>견적서</span></a> | |
| 73 | + <div class="hover_cont">견적서</div> | |
| 74 | + </li> | |
| 75 | + <li> | |
| 76 | + <a href="#"><i class="quick8"></i><span>결제</span></a> | |
| 77 | + <div class="hover_cont">결제</div> | |
| 78 | + </li> | |
| 79 | + <li> | |
| 80 | + <a href="#"><i class="quick9"></i><span>영수증/계산서</span></a> | |
| 81 | + <div class="hover_cont">영수증/계산서</div> | |
| 82 | + </li> | |
| 83 | + </ul> | |
| 84 | + <button type="button" class="goTop" title="맨 위로 이동">TOP<i></i></button> | |
| 85 | + </div> | |
| 86 | + </div> | |
| 87 | + <!--// quick 메뉴 --> | |
| 88 | + <!-- header 영역 --> | |
| 89 | + <header id="header" class="header"> | |
| 90 | + <!-- header top 영역 --> | |
| 91 | + <div class="header_top"> | |
| 92 | + <div class="inner"> | |
| 93 | + <ul class="menu_left"> | |
| 94 | + <li><a href="#"><i class="hdTop_fav"></i>즐겨찾기추가</a></li> | |
| 95 | + <li><a href="#"><i class="hdTop_mypage"></i>마이페이지</a></li> | |
| 96 | + <li><a href="#"><i class="hdTop_center"></i>고객센터</a></li> | |
| 97 | + </ul> | |
| 98 | + <ul class="menu_right"> | |
| 99 | + <li><a href="#">충전하기</a></li> | |
| 100 | + <li class="SortLine"><a href="#">요금안내</a></li> | |
| 101 | + <li class="SortLine"><a href="#">이용안내</a></li> | |
| 102 | + <li class="SortLine"><a href="#">1:1고객상담</a></li> | |
| 103 | + </ul> | |
| 104 | + </div> | |
| 105 | + </div><!-- header top 영역 --> | |
| 106 | + <!-- header body 영역 --> | |
| 107 | + <div class="header_body"> | |
| 108 | + <div class="inner table"> | |
| 109 | + <h1 class="logo"><a href="/publish/index.html" alt="문자온 메인 바로가기"><img src="/publish/images/CI.png" alt="문자온 CI"></a></h1> | |
| 110 | + <ul class="gnbWrap table_cell"> | |
| 111 | + <li><a href="#">문자발송</a></li> | |
| 112 | + <li><a href="#">선거문자</a></li> | |
| 113 | + <li><a href="#">맞춤제작</a></li> | |
| 114 | + <li><a href="#">비즈톡</a></li> | |
| 115 | + <li><a href="#">주소록 관리</a></li> | |
| 116 | + <li><a href="#">발송결과</a></li> | |
| 117 | + <li><a href="#">예약관리</a></li> | |
| 118 | + <li><a href="#">결제내역</a></li> | |
| 119 | + </ul> | |
| 120 | + <div class="s_menu"> | |
| 121 | + <i class="allSearch_info"><span>문자검색</span></i> | |
| 122 | + <button type="button" title="전체검색" class="allSearch" onclick="searchToggle();"><img src="/publish/images/search.png" alt="검색영역 열기" class="allMenu"></button> | |
| 123 | + <button type="button" title="전체메뉴"><img src="/publish/images/all_menu.png" alt="전체메뉴 열기"></button> | |
| 124 | + </div> | |
| 125 | + </div> | |
| 126 | + <!-- search popup 영역 --> | |
| 127 | + <div class="pop_search"> | |
| 128 | + <div class="inner"> | |
| 129 | + <div class="area_search"> | |
| 130 | + <select name="" id=""> | |
| 131 | + <option value="">그림문자</option> | |
| 132 | + <option value="">단문문자</option> | |
| 133 | + <option value="">장문문자</option> | |
| 134 | + <option value="">GIF</option> | |
| 135 | + </select> | |
| 136 | + <input type="text" placeholder="문자샘플 검색하기"> | |
| 137 | + <button><img src="/publish/images/search02.png" alt=""></button> | |
| 138 | + </div> | |
| 139 | + <div class="area_popular"> | |
| 140 | + <p><i></i>인기검색어</p> | |
| 141 | + <ul class="popular_tag"> | |
| 142 | + <li><a href="#">#정월대보름</a></li> | |
| 143 | + <li class="on"><a href="#">#추석</a></li> | |
| 144 | + <li><a href="#">#가을인사</a></li> | |
| 145 | + <li><a href="#">#좋은하루</a></li> | |
| 146 | + </ul> | |
| 147 | + </div> | |
| 148 | + <button class="btn_close" onclick="searchToggle();"><img src="/publish/images/btn_searchclose.png" alt=""></button> | |
| 149 | + </div> | |
| 150 | + </div> | |
| 151 | + <!--// search popup 영역 --> | |
| 152 | + </div> | |
| 153 | + <!--// header body 영역 --> | |
| 154 | + <div id="login" class="login"> | |
| 155 | + <div class="inner table"> | |
| 156 | + <div class="login_left table_cell"> | |
| 157 | + <div class="login_put"> | |
| 158 | + <label for="id_text" class="label"></label> | |
| 159 | + <input type="text" placeholder="아이디를 입력해주세요" id="id_text" class="id_text" maxlength="30" size="18"> | |
| 160 | + <label for="password_text" class="label"></label> | |
| 161 | + <input type="password" placeholder="비밀번호를 입력해주세요" id="password_text" class="password_text" maxlength="30" size="18"> | |
| 162 | + <label for="login_button" class="label"></label> | |
| 163 | + <button type="submit" class="btnType btnType1" class="login_button">로그인</button> | |
| 164 | + </div> | |
| 165 | + <div class="login_save"> | |
| 166 | + <input type="checkbox" id="save_id"> | |
| 167 | + <label for="save_id">아이디 저장</label> | |
| 168 | + </div> | |
| 169 | + <div class="login_find"> | |
| 170 | + <a href="#">아이디찾기 /</a> | |
| 171 | + <a href="#">비밀번호 찾기</a> | |
| 172 | + </div> | |
| 173 | + <div> | |
| 174 | + <button type="button" class="btnType btnType2">회원가입</button> | |
| 175 | + <button type="button" class="btnType btnType3">둘러보기</button> | |
| 176 | + </div> | |
| 177 | + </div> | |
| 178 | + <div class="login_right"> | |
| 179 | + <span><i></i>이달의 이벤트</span> | |
| 180 | + <button type="button" class="btnType btnType4">바로가기</button> | |
| 181 | + </div> | |
| 182 | + </div> | |
| 183 | + </div> | |
| 184 | + <!--// login 영역 --> | |
| 185 | + </header> | |
| 186 | + <!--// header 영역 --> | |
| 187 | + <!-- login 영역 --> | |
| 188 | + <!-- content 영역 --> | |
| 189 | + <div id="container" class="cont sub"> | |
| 190 | + <div class="inner"> | |
| 191 | + <!-- send top --> | |
| 192 | + <div class="send_top"> | |
| 193 | + <!-- tab button --> | |
| 194 | + <ul class="tabType4"> | |
| 195 | + <li class="tab"><button type="button" onclick="TabType5(this,'1');">요금안내/견적내기</button></li> | |
| 196 | + <li class="tab"><button type="button" onclick="TabType5(this,'1');">결제하기</button></li> | |
| 197 | + <li class="tab"><button type="button" onclick="TabType5(this,'2');">요금 결제내역</button></li> | |
| 198 | + <li class="tab active"><button type="button" onclick="TabType5(this,'3');">요금 사용내역</button></li> | |
| 199 | + <li class="tab"><button type="button" onclick="TabType5(this,'4');">계산서/현금영수증 발행 등록</button></li> | |
| 200 | + </ul> | |
| 201 | + <!--// tab button --> | |
| 202 | + <!-- 결제관리 - 요금 사용내역 --> | |
| 203 | + <div class="serv_content current" id="tab5_4"> | |
| 204 | + <div class="heading"> | |
| 205 | + <h2>요금 사용내역</h2> | |
| 206 | + </div> | |
| 207 | + <p class="tRight c_666" style="margin: 0 0 10px 0">(VAT 별도)</p> | |
| 208 | + <div class="hisroy_price"> | |
| 209 | + <div class="hisroy_defprice_in"> | |
| 210 | + <p><i></i>누적 사용금액</p> | |
| 211 | + <div class="clearfix"> | |
| 212 | + <p>캐시</p> | |
| 213 | + <p><span>120</span>원</p> | |
| 214 | + </div> | |
| 215 | + <div class="clearfix"> | |
| 216 | + <p>포인트</p> | |
| 217 | + <p><span>120</span>원</p> | |
| 218 | + </div> | |
| 219 | + </div> | |
| 220 | + <div class="hisroy_defprice_in"> | |
| 221 | + <p><i></i>누적 납부금액</p> | |
| 222 | + <div class="clearfix"> | |
| 223 | + <p>캐시</p> | |
| 224 | + <p><span>120</span>원</p> | |
| 225 | + </div> | |
| 226 | + <div class="clearfix"> | |
| 227 | + <p>포인트</p> | |
| 228 | + <p><span>120</span>원</p> | |
| 229 | + </div> | |
| 230 | + </div> | |
| 231 | + <div class="hisroy_defprice_in"> | |
| 232 | + <p><i></i>당월 납부 예상금액</p> | |
| 233 | + <div class="clearfix"> | |
| 234 | + <p>캐시</p> | |
| 235 | + <p><span>120</span>원</p> | |
| 236 | + </div> | |
| 237 | + <div class="clearfix"> | |
| 238 | + <p>포인트</p> | |
| 239 | + <p><span>120</span>원</p> | |
| 240 | + </div> | |
| 241 | + </div> | |
| 242 | + <div class="hisroy_defprice_in"> | |
| 243 | + <p><i></i>잔액 (사용가능금액)</p> | |
| 244 | + <div class="clearfix"> | |
| 245 | + <p>캐시</p> | |
| 246 | + <p><span>43,898.6</span>원</p> | |
| 247 | + </div> | |
| 248 | + <div class="clearfix"> | |
| 249 | + <p>포인트</p> | |
| 250 | + <p><span>120</span>원</p> | |
| 251 | + </div> | |
| 252 | + </div> | |
| 253 | + </div> | |
| 254 | + <div class="history_details"> | |
| 255 | + <p class="tType1_title"><img src="images/content/history_details_title.png" alt=""> 발송내역</p> | |
| 256 | + <div class="details_wrap"> | |
| 257 | + <table> | |
| 258 | + <colgroup> | |
| 259 | + <col style="width: calc(100% / 5);"> | |
| 260 | + <col style="width: calc(100% / 5);"> | |
| 261 | + <col style="width: calc(100% / 5);"> | |
| 262 | + <col style="width: calc(100% / 5);"> | |
| 263 | + <col style="width: calc(100% / 5);"> | |
| 264 | + </colgroup> | |
| 265 | + <thead> | |
| 266 | + <tr> | |
| 267 | + <th>구분</th> | |
| 268 | + <th>문자</th> | |
| 269 | + <th>알림톡</th> | |
| 270 | + <th>팩스</th> | |
| 271 | + <th>계</th> | |
| 272 | + </tr> | |
| 273 | + </thead> | |
| 274 | + <tbody> | |
| 275 | + <tr> | |
| 276 | + <td>발송건(매)수</td> | |
| 277 | + <td>100,000,000</td> | |
| 278 | + <td>100,000,000</td> | |
| 279 | + <td>100,000,000</td> | |
| 280 | + <td>100,000,000</td> | |
| 281 | + </tr> | |
| 282 | + <tr> | |
| 283 | + <td>예약건수</td> | |
| 284 | + <td>100,000,000</td> | |
| 285 | + <td>100,000,000</td> | |
| 286 | + <td>100,000,000</td> | |
| 287 | + <td>100,000,000</td> | |
| 288 | + </tr> | |
| 289 | + </tbody> | |
| 290 | + </table> | |
| 291 | + </div> | |
| 292 | + </div> | |
| 293 | + <p class="tType1_title"><img src="/publish/images/content/icon_details_breakdown.png" alt=""> 세부내역</p> | |
| 294 | + <div class="excel_middle"> | |
| 295 | + <div class="select_btnWrap clearfix"> | |
| 296 | + <div class="btn_left"> | |
| 297 | + <span class="cal_label">기간선택</span> | |
| 298 | + <div class="calendar_wrap"> | |
| 299 | + <input type="text" class="startDate inp calendar picker__input" title="검색 시작일" id="startDate" name="startDate" value="" data-datecontrol="true" readonly="" aria-haspopup="true" aria-expanded="false" aria-readonly="false" aria-owns="startDate_root"> | |
| 300 | + <span class="dateEtc">~</span> | |
| 301 | + <input type="text" class="endDate inp calendar picker__input" title="검색 종료일" id="endDate" name="endDate" value="" data-datecontrol="true" readonly="" aria-haspopup="true" aria-expanded="false" aria-readonly="false" aria-owns="endDate_root"> | |
| 302 | + </div> | |
| 303 | + <button type="button">이번년도</button> | |
| 304 | + <button type="button">전월</button> | |
| 305 | + <button type="button">당월</button> | |
| 306 | + <button type="button" class="btnType6">조회</button> | |
| 307 | + <span class="reqTxt4"><span class="vMiddle">*</span> 조회기간의 사용내역만 보여집니다.</span> | |
| 308 | + </div> | |
| 309 | + <div> | |
| 310 | + </div> | |
| 311 | + </div> | |
| 312 | + </div> | |
| 313 | + <div class="list_tab_wrap2 type2"> | |
| 314 | + <!-- tab button --> | |
| 315 | + <ul class="list_tab"> | |
| 316 | + <li class="tab active"><button type="button" onclick="listTab2(this,'1');">전체</button></li> | |
| 317 | + <li class="tab"><button type="button" onclick="listTab2(this,'2');">단문</button></li> | |
| 318 | + <li class="tab"><button type="button" onclick="listTab2(this,'3');">장문</button></li> | |
| 319 | + <li class="tab"><button type="button" onclick="listTab2(this,'4');">그림</button></li> | |
| 320 | + <li class="tab"><button type="button" onclick="listTab2(this,'5');">선거</button></li> | |
| 321 | + <li class="tab"><button type="button" onclick="listTab2(this,'5');">알림톡</button></li> | |
| 322 | + <li class="tab"><button type="button" onclick="listTab2(this,'5');">친구톡</button></li> | |
| 323 | + <li class="tab"><button type="button" onclick="listTab2(this,'5');">팩스</button></li> | |
| 324 | + </ul> | |
| 325 | + <!--// tab button --> | |
| 326 | + </div> | |
| 327 | + <div class="price_history_cont" id="listTab2_5"> | |
| 328 | + <div class="list_info"> | |
| 329 | + <p>총 <span>10</span>건 / 사용금액 합계 : <span>25,000</span>원</p> | |
| 330 | + <div> | |
| 331 | + <button type="button" class="print_btn"><i class="print_img"></i>인쇄하기</button> | |
| 332 | + <button type="button" class="pdf_btn"><i class="pdf_img"></i>PDF저장</button> | |
| 333 | + <button type="button" class="excel_btn"><i class="downroad"></i>엑셀 다운로드</button> | |
| 334 | + </div> | |
| 335 | + </div> | |
| 336 | + <div class="tb_wrap"> | |
| 337 | + <table class="tType4"> | |
| 338 | + <colgroup> | |
| 339 | + <col style="width: 17%;"> | |
| 340 | + <col style="width: 17%;"> | |
| 341 | + <col style="width: 17%;"> | |
| 342 | + <col style="width: 15%;"> | |
| 343 | + <col style="width: *%;"> | |
| 344 | + <col style="width: *%;"> | |
| 345 | + </colgroup> | |
| 346 | + <thead> | |
| 347 | + <tr> | |
| 348 | + <th rowspan="2"> | |
| 349 | + 발송일시 | |
| 350 | + <div class="sort_wrap"> | |
| 351 | + <button type="button"><img src="images/sortUp.png" alt="오름차순으로 분류"></button> | |
| 352 | + <button type="button"><img src="images/sortDown.png" alt="내림차순으로 분류"></button> | |
| 353 | + </div> | |
| 354 | + </th> | |
| 355 | + <th rowspan="2"> | |
| 356 | + 문자유형 | |
| 357 | + <div class="sort_wrap"> | |
| 358 | + <button type="button"><img src="images/sortUp.png" alt="오름차순으로 분류"></button> | |
| 359 | + <button type="button"><img src="images/sortDown.png" alt="내림차순으로 분류"></button> | |
| 360 | + </div> | |
| 361 | + </th> | |
| 362 | + <th rowspan="2"> | |
| 363 | + 내용 | |
| 364 | + </th> | |
| 365 | + <th rowspan="2"> | |
| 366 | + 발송건수 | |
| 367 | + </th> | |
| 368 | + <th colspan="2">사용</th> | |
| 369 | + </tr> | |
| 370 | + <tr> | |
| 371 | + <th>충전금</th> | |
| 372 | + <th>포인트</th> | |
| 373 | + </tr> | |
| 374 | + </thead> | |
| 375 | + <tbody> | |
| 376 | + <tr> | |
| 377 | + <td> | |
| 378 | + <p>2023-12-28 07:32</p> | |
| 379 | + </td> | |
| 380 | + <td> | |
| 381 | + <p>장문</p> | |
| 382 | + </td> | |
| 383 | + <td> | |
| 384 | + <p><button class="btnType btnType20" onclick="#">상세보기</button></p> | |
| 385 | + </td> | |
| 386 | + <td> | |
| 387 | + <p>8888</p> | |
| 388 | + </td> | |
| 389 | + <td> | |
| 390 | + <p class="fwRg c_002c9a">0</p> | |
| 391 | + </td> | |
| 392 | + <td> | |
| 393 | + <p class="fwRg c_002c9a">50</p> | |
| 394 | + </td> | |
| 395 | + </tr> | |
| 396 | + <tr> | |
| 397 | + <td> | |
| 398 | + <p>2023-12-28 07:32</p> | |
| 399 | + </td> | |
| 400 | + <td> | |
| 401 | + <p>장문</p> | |
| 402 | + </td> | |
| 403 | + <td> | |
| 404 | + <p><button class="btnType btnType20" onclick="#">상세보기</button></p> | |
| 405 | + </td> | |
| 406 | + <td> | |
| 407 | + <p>8</p> | |
| 408 | + </td> | |
| 409 | + <td> | |
| 410 | + <p class="fwRg c_002c9a">0</p> | |
| 411 | + </td> | |
| 412 | + <td> | |
| 413 | + <p class="fwRg c_002c9a">50</p> | |
| 414 | + </td> | |
| 415 | + </tr> | |
| 416 | + <tr> | |
| 417 | + <td> | |
| 418 | + <p>2023-12-28 07:32</p> | |
| 419 | + </td> | |
| 420 | + <td> | |
| 421 | + <p>장문</p> | |
| 422 | + </td> | |
| 423 | + <td> | |
| 424 | + <p><button class="btnType btnType20" onclick="#">상세보기</button></p> | |
| 425 | + </td> | |
| 426 | + <td> | |
| 427 | + <p>8</p> | |
| 428 | + </td> | |
| 429 | + <td> | |
| 430 | + <p class="fwRg c_002c9a">0</p> | |
| 431 | + </td> | |
| 432 | + <td> | |
| 433 | + <p class="fwRg c_002c9a">50</p> | |
| 434 | + </td> | |
| 435 | + </tr> | |
| 436 | + <tr> | |
| 437 | + <td> | |
| 438 | + <p>2023-12-28 07:32</p> | |
| 439 | + </td> | |
| 440 | + <td> | |
| 441 | + <p>장문</p> | |
| 442 | + </td> | |
| 443 | + <td> | |
| 444 | + <p><button class="btnType btnType20" onclick="#">상세보기</button></p> | |
| 445 | + </td> | |
| 446 | + <td> | |
| 447 | + <p>8</p> | |
| 448 | + </td> | |
| 449 | + <td> | |
| 450 | + <p class="fwRg c_002c9a">0</p> | |
| 451 | + </td> | |
| 452 | + <td> | |
| 453 | + <p class="fwRg c_002c9a">50</p> | |
| 454 | + </td> | |
| 455 | + </tr> | |
| 456 | + <tr> | |
| 457 | + <td> | |
| 458 | + <p>2023-12-28 07:32</p> | |
| 459 | + </td> | |
| 460 | + <td> | |
| 461 | + <p>장문</p> | |
| 462 | + </td> | |
| 463 | + <td> | |
| 464 | + <p><button class="btnType btnType20" onclick="#">상세보기</button></p> | |
| 465 | + </td> | |
| 466 | + <td> | |
| 467 | + <p>8</p> | |
| 468 | + </td> | |
| 469 | + <td> | |
| 470 | + <p class="fwRg c_002c9a">0</p> | |
| 471 | + </td> | |
| 472 | + <td> | |
| 473 | + <p class="fwRg c_002c9a">50</p> | |
| 474 | + </td> | |
| 475 | + </tr> | |
| 476 | + <tr> | |
| 477 | + <td> | |
| 478 | + <p>2023-12-28 07:32</p> | |
| 479 | + </td> | |
| 480 | + <td> | |
| 481 | + <p>장문</p> | |
| 482 | + </td> | |
| 483 | + <td> | |
| 484 | + <p><button class="btnType btnType20" onclick="#">상세보기</button></p> | |
| 485 | + </td> | |
| 486 | + <td> | |
| 487 | + <p>8(1)</p> | |
| 488 | + </td> | |
| 489 | + <td> | |
| 490 | + <p class="fwRg c_002c9a">0</p> | |
| 491 | + </td> | |
| 492 | + <td> | |
| 493 | + <p class="fwRg c_002c9a">50</p> | |
| 494 | + </td> | |
| 495 | + </tr> | |
| 496 | + <tr> | |
| 497 | + <td> | |
| 498 | + <p>2023-12-28 07:32</p> | |
| 499 | + </td> | |
| 500 | + <td> | |
| 501 | + <p>장문</p> | |
| 502 | + </td> | |
| 503 | + <td> | |
| 504 | + <p><button class="btnType btnType20" onclick="#">상세보기</button></p> | |
| 505 | + </td> | |
| 506 | + <td> | |
| 507 | + <p>5897</p> | |
| 508 | + </td> | |
| 509 | + <td> | |
| 510 | + <p class="fwRg c_002c9a">0</p> | |
| 511 | + </td> | |
| 512 | + <td> | |
| 513 | + <p class="fwRg c_002c9a">500</p> | |
| 514 | + </td> | |
| 515 | + </tr> | |
| 516 | + </tbody> | |
| 517 | + </table> | |
| 518 | + </div> | |
| 519 | + <div class="publish_btn clearfix"> | |
| 520 | + <div> | |
| 521 | + <input type="radio" checked> | |
| 522 | + <label for="">거래명세서</label> | |
| 523 | + <input type="radio"> | |
| 524 | + <label for="">사용내역서</label> | |
| 525 | + </div> | |
| 526 | + <div> | |
| 527 | + <button type="button" class="btnType">발행하기</button> | |
| 528 | + </div> | |
| 529 | + </div> | |
| 530 | + <!-- pagination --> | |
| 531 | + <ul class="pagination"> | |
| 532 | + <li class="page_first"><button><img src="/publish/images/content/page_first.png" alt=""></button></li> | |
| 533 | + <li class="page_prev"><button><img src="/publish/images/content/page_prev.png" alt=""></button></li> | |
| 534 | + <li class="on"><button>1</button></li> | |
| 535 | + <li><button>2</button></li> | |
| 536 | + <li><button>3</button></li> | |
| 537 | + <li><button>4</button></li> | |
| 538 | + <li><button>5</button></li> | |
| 539 | + <li><button>6</button></li> | |
| 540 | + <li><button>7</button></li> | |
| 541 | + <li><button>8</button></li> | |
| 542 | + <li><button>9</button></li> | |
| 543 | + <li><button>10</button></li> | |
| 544 | + <li class="page_next"><button><img src="/publish/images/content/page_next.png" alt=""></button></li> | |
| 545 | + <li class="page_last"><button><img src="/publish/images/content/page_last.png" alt=""></button></li> | |
| 546 | + </ul><!-- pagination --> | |
| 547 | + </div><!-- 결제관리 - 요금 사용내역 --> | |
| 548 | + </div> | |
| 549 | + </div> | |
| 550 | + <!--// send top --> | |
| 551 | + </div> | |
| 552 | + </div> | |
| 553 | + <!--// content 영역 --> | |
| 554 | + <!-- footer 영역 --> | |
| 555 | + <footer id="footer" class="footer"> | |
| 556 | + <div class="footer_top"> | |
| 557 | + <div class="inner table"> | |
| 558 | + <ul class="table_cell"> | |
| 559 | + <li><a href="#">이용약관</a></li> | |
| 560 | + <li class="SortLine fwRg c_white"><a href="#">개인정보취급방침</a></li> | |
| 561 | + <li class="SortLine fwRg c_white"><a href="#">스팸관리정책</a></li> | |
| 562 | + <li class="SortLine"><a href="#">불법스팸예방안내</a></li> | |
| 563 | + </ul> | |
| 564 | + </div> | |
| 565 | + </div> | |
| 566 | + <div class="footer_body"> | |
| 567 | + <div class="inner table"> | |
| 568 | + <div class="table_cell"> | |
| 569 | + <a href="#" class="footer_logo"><img src="/publish/images/CI_white.png" alt="문자온 CI"></a> | |
| 570 | + <div class="footer_info"> | |
| 571 | + <p>주소 : 경기도 남양주시 다산중앙로 19번길 21 1027호, 1028호(블루웨일 지식산업센터 1차)</p> | |
| 572 | + <p>사업자번호 : 653-87-00858 | 대표 : 유인식 | 통신판매등록번호 : 제 다산-12345호 | 문의전화 : 070-4786-0007</p> | |
| 573 | + <p>Copyright 2020 ⓒ MUNJAON co. Ltd, All rights reserved.</p> | |
| 574 | + </div> | |
| 575 | + <div class="footer_service_center"> | |
| 576 | + <i></i> | |
| 577 | + <div> | |
| 578 | + <p>고객센터</p> | |
| 579 | + <span class="footer_service_num">070-4786-0008</span> | |
| 580 | + <span>E-mail : help@iten.co.kr</span> | |
| 581 | + </div> | |
| 582 | + </div> | |
| 583 | + </div> | |
| 584 | + </div> | |
| 585 | + </div> | |
| 586 | + </footer> | |
| 587 | + <!--// footer 영역 --> | |
| 588 | +</body> | |
| 589 | + | |
| 590 | +</html>(No newline at end of file) |
+++ src/main/webapp/publish/publish_adv/adv_template_v1_manuscript_15.html
... | ... | @@ -0,0 +1,385 @@ |
| 1 | +<!DOCTYPE html> | |
| 2 | +<html lang="ko"> | |
| 3 | + | |
| 4 | +<head> | |
| 5 | + <meta charset="UTF-8"> | |
| 6 | + <meta http-equiv="X-UA-Compatible" content="IE=edge"> | |
| 7 | + <meta name="viewport" content="width=device-width, initial-scale=1.0"> | |
| 8 | + <title>설날문자 인사말 문구 모음 - 문자온</title> | |
| 9 | + | |
| 10 | + <meta name="Keywords" content="문자전송, 문자발송, SMS, LMS, MMS, 문자보내기, 단체문자, 단체문자전송, 단체문자발송,단체문자사이트,문자사이트, 대량문자"> | |
| 11 | + <meta name="description" content="설날은 한 해가 시작되는 새해 새 달의 첫 날로 한 해의 최초 명절이라는 의미를 가지고 있습니다. 우리에게 있어서 설날은 빼놓을 수 없는 중요한 명절인데요. 긴 연휴를 앞두고 주변인들에게 덕담 한마디와 반가운 인사말을 문자로 남겨보시는 건 어떨까요? 어떻게 작성하면 좋을지 고민하고 계시는 여러분들을 위해 문자온이 다양한 예시를 보여드리도록 하겠습니다."> | |
| 12 | + <meta property="og:type" content="website"> | |
| 13 | + <meta property="og:title" content="설날문자 인사말 문구 모음 - 문자온"> | |
| 14 | + <meta property="og:description" content="설날은 한 해가 시작되는 새해 새 달의 첫 날로 한 해의 최초 명절이라는 의미를 가지고 있습니다. 우리에게 있어서 설날은 빼놓을 수 없는 중요한 명절인데요. 긴 연휴를 앞두고 주변인들에게 덕담 한마디와 반가운 인사말을 문자로 남겨보시는 건 어떨까요? 어떻게 작성하면 좋을지 고민하고 계시는 여러분들을 위해 문자온이 다양한 예시를 보여드리도록 하겠습니다."> | |
| 15 | + <link rel="apple-touch-icon" sizes="57x57" href="/publish/images/favicon/apple-icon-57x57.png"> | |
| 16 | + <link rel="apple-touch-icon" sizes="60x60" href="/publish/images/favicon/apple-icon-60x60.png"> | |
| 17 | + <link rel="apple-touch-icon" sizes="72x72" href="/publish/images/favicon/apple-icon-72x72.png"> | |
| 18 | + <link rel="apple-touch-icon" sizes="76x76" href="/publish/images/favicon/apple-icon-76x76.png"> | |
| 19 | + <link rel="apple-touch-icon" sizes="114x114" href="/publish/images/favicon/apple-icon-114x114.png"> | |
| 20 | + <link rel="apple-touch-icon" sizes="120x120" href="/publish/images/favicon/apple-icon-120x120.png"> | |
| 21 | + <link rel="apple-touch-icon" sizes="144x144" href="/publish/images/favicon/apple-icon-144x144.png"> | |
| 22 | + <link rel="apple-touch-icon" sizes="152x152" href="/publish/images/favicon/apple-icon-152x152.png"> | |
| 23 | + <link rel="apple-touch-icon" sizes="180x180" href="/publish/images/favicon/apple-icon-180x180.png"> | |
| 24 | + <link rel="icon" type="image/png" sizes="192x192" href="/publish/images/favicon/android-icon-192x192.png"> | |
| 25 | + <link rel="icon" type="image/png" sizes="32x32" href="/publish/images/favicon/favicon-32x32.png"> | |
| 26 | + <link rel="icon" type="image/png" sizes="96x96" href="/publish/images/favicon/favicon-96x96.png"> | |
| 27 | + <link rel="icon" type="image/png" sizes="16x16" href="/publish/images/favicon/favicon-16x16.png"> | |
| 28 | + <link rel="manifest" href="/publish/images/favicon/manifest.json"> | |
| 29 | + | |
| 30 | + <link rel="stylesheet" href="/publish/publish_adv/css/reset.css"> | |
| 31 | + <link rel="stylesheet" href="/publish/publish_adv/css/style.css"> | |
| 32 | + <link rel="stylesheet" href="/publish/css/font.css"> | |
| 33 | + | |
| 34 | + <script src="/publish/js/jquery-3.5.0.js"></script> | |
| 35 | + <script> | |
| 36 | + function topBtn() {
| |
| 37 | + $("html").scrollTop("0");
| |
| 38 | + } | |
| 39 | + </script> | |
| 40 | +</head> | |
| 41 | + | |
| 42 | +<body> | |
| 43 | + <div class="template_v1_content content_ten con_four"> | |
| 44 | + <button type="button" class="top_btn" onclick="topBtn()" style="z-index: 2;">▲<br>TOP</button> | |
| 45 | + <header> | |
| 46 | + <div class="inner"> | |
| 47 | + <a href="https://www.munjaon.co.kr"> | |
| 48 | + <h1><img src="/publish/publish_adv/img/template_v1_header_logo.png" alt=""></h1> | |
| 49 | + </a> | |
| 50 | + </div> | |
| 51 | + </header> | |
| 52 | + <div class="visual"> | |
| 53 | + <div class="inner"> | |
| 54 | + <p class="keyword">keyword</p> | |
| 55 | + <h2>설날문자 인사말 문구 모음</h2> | |
| 56 | + <p class="sub_text obituary_te">설날은 한 해가 시작되는 새해 새 달의 첫 날로 한 해의 최초 명절이라는 의미를 가지고 있습니다. 우리에게 있어서 설날은 빼놓을 수 없는 중요한 명절인데요. 긴 연휴를 앞두고 주변인들에게 덕담 한마디와 반가운 인사말을 문자로 남겨보시는 건 어떨까요? 어떻게 작성하면 좋을지 고민하고 계시는 여러분들을 위해 문자온이 다양한 예시를 보여드리도록 하겠습니다.</p> | |
| 57 | + </div> | |
| 58 | + </div> | |
| 59 | + | |
| 60 | + <!-- | |
| 61 | + <div class="index"> | |
| 62 | + <div class="inner"> | |
| 63 | + <p>목 차</p> | |
| 64 | + <nav> | |
| 65 | + <ul> | |
| 66 | + <li><a href="#section01">설날문자 예시</a></li> | |
| 67 | + </ul> | |
| 68 | + </nav> | |
| 69 | + </div> | |
| 70 | + </div> | |
| 71 | + --> | |
| 72 | + | |
| 73 | + <!--연관 내용--> | |
| 74 | + <!-- | |
| 75 | + <div class="ass"> | |
| 76 | + <div class="inner"> | |
| 77 | + <div class="ass_con"> | |
| 78 | + <p class="title">연관 내용</p> | |
| 79 | + <p><a href="https://www.munjaon.co.kr/publish/publish_adv/adv_template_v1_manuscript_12.html">- 연말연시 감사 인사말 문구</a></p> | |
| 80 | + <p><a href="https://www.munjaon.co.kr/publish/publish_adv/adv_template_v1_manuscript_13.html">- 크리스마스 문자 예시 모음</a></p> | |
| 81 | + </div> | |
| 82 | + </div> | |
| 83 | + </div> | |
| 84 | + --> | |
| 85 | + | |
| 86 | + <section class="section section01" id="section01"> | |
| 87 | + <div class="inner obituary_inner"> | |
| 88 | + <h3>설날문자 예시</h3> | |
| 89 | + <div class="short"> | |
| 90 | + <p class="text bold" style="margin: 0 0 8px 0;">[단문]</p> | |
| 91 | + <ul class="obituary"> | |
| 92 | + <li> | |
| 93 | + <div class="wrap"> | |
| 94 | + <div class="title"> | |
| 95 | + <p class="text">설날문자</p> | |
| 96 | + </div> | |
| 97 | + <div class="inner_text"> | |
| 98 | + 온 가족 한자리에 모여 떡국을 먹고<br> | |
| 99 | + 한 살 더 먹는 설날. 새해에 소원성취하길 바랍니다♧ | |
| 100 | + <p class="date">PM 3:45</p> | |
| 101 | + </div> | |
| 102 | + </div> | |
| 103 | + <div class="people_01"></div> | |
| 104 | + <div class="speech_bubble"></div> | |
| 105 | + </li> | |
| 106 | + <li class="move_line"> | |
| 107 | + <div class="wrap"> | |
| 108 | + <div class="title"> | |
| 109 | + <p class="text">설날문자</p> | |
| 110 | + </div> | |
| 111 | + <div class="inner_text"> | |
| 112 | + 새롭게 다시 시작하는 설날!<br> | |
| 113 | + 새로운 마음으로 새로운 꿈과 목표를 향해 힘차게 출발해요! 아자! | |
| 114 | + <p class="date">PM 5:30</p> | |
| 115 | + </div> | |
| 116 | + </div> | |
| 117 | + <div class="people_02"></div> | |
| 118 | + <div class="speech_bubble"></div> | |
| 119 | + </li> | |
| 120 | + <li class="move_line"> | |
| 121 | + <div class="wrap"> | |
| 122 | + <div class="title"> | |
| 123 | + <p class="text">설날문자</p> | |
| 124 | + </div> | |
| 125 | + <div class="inner_text"> | |
| 126 | + 민족 대명절, 설날은 웃어른을 찾아뵙고<br> | |
| 127 | + 인사드리며 덕담을 나누는 날입니다.<br> | |
| 128 | + 행복한 설 연휴 보내세요. | |
| 129 | + <p class="date">PM 8:55</p> | |
| 130 | + </div> | |
| 131 | + </div> | |
| 132 | + <div class="people_03"></div> | |
| 133 | + <div class="speech_bubble"></div> | |
| 134 | + </li> | |
| 135 | + <li class="second_line move_line"> | |
| 136 | + <div class="wrap"> | |
| 137 | + <div class="title"> | |
| 138 | + <p class="text">설날문자</p> | |
| 139 | + </div> | |
| 140 | + <div class="inner_text"> | |
| 141 | + 설날 고향 가시는 길 운전 조심히 하시고<br> | |
| 142 | + 건강히 잘 다녀오세요.<br> | |
| 143 | + 새해 복 많이 받으시고 행복하세요~^^ | |
| 144 | + <p class="date">AM 8:40</p> | |
| 145 | + </div> | |
| 146 | + </div> | |
| 147 | + <div class="people_02"></div> | |
| 148 | + <div class="speech_bubble"></div> | |
| 149 | + </li> | |
| 150 | + <li class="second_line move_line"> | |
| 151 | + <div class="wrap"> | |
| 152 | + <div class="title"> | |
| 153 | + <p class="text">설날문자</p> | |
| 154 | + </div> | |
| 155 | + <div class="inner_text"> | |
| 156 | + 설날을 맞이하여 더욱 건강하시고<br> | |
| 157 | + 원하시는 일 모두 이루시기 바랍니다.<br> | |
| 158 | + 새해 복 많이 받으세요. | |
| 159 | + <p class="date">PM 2:15</p> | |
| 160 | + </div> | |
| 161 | + </div> | |
| 162 | + <div class="people_02"></div> | |
| 163 | + <div class="speech_bubble"></div> | |
| 164 | + </li> | |
| 165 | + <li class="second_line move_line"> | |
| 166 | + <div class="wrap"> | |
| 167 | + <div class="title"> | |
| 168 | + <p class="text">설날문자</p> | |
| 169 | + </div> | |
| 170 | + <div class="inner_text"> | |
| 171 | + ㆀ┌─♡┐~빵 <br> | |
| 172 | + ┌┘▧▧└┐~빵<br> | |
| 173 | + └◎──◎┘<br> | |
| 174 | + 고향 가는 길 운전 조심하고 즐겁게 보내세요. | |
| 175 | + <p class="date">AM 9:30</p> | |
| 176 | + </div> | |
| 177 | + </div> | |
| 178 | + <div class="people_03"></div> | |
| 179 | + <div class="speech_bubble"></div> | |
| 180 | + </li> | |
| 181 | + <li class="second_line move_line"> | |
| 182 | + <div class="wrap"> | |
| 183 | + <div class="title"> | |
| 184 | + <p class="text">설날문자</p> | |
| 185 | + </div> | |
| 186 | + <div class="inner_text"> | |
| 187 | + 정월 초하룻날인 설날입니다.<br> | |
| 188 | + 가족들이 한자리에 모여 웃음이 끊이지 않는<br> | |
| 189 | + 정 넘치는 설 연휴 되세요. | |
| 190 | + <p class="date">PM 2:20</p> | |
| 191 | + </div> | |
| 192 | + </div> | |
| 193 | + <div class="people_03"></div> | |
| 194 | + <div class="speech_bubble"></div> | |
| 195 | + </li> | |
| 196 | + <li class="second_line move_line"> | |
| 197 | + <div class="wrap"> | |
| 198 | + <div class="title"> | |
| 199 | + <p class="text">설날문자</p> | |
| 200 | + </div> | |
| 201 | + <div class="inner_text"> | |
| 202 | + 즐거운 설입니다.<br> | |
| 203 | + 어깨에 올려진 걱정, 근심 모두 내려놓으시고<br> | |
| 204 | + 설날의 여유로움을 즐기세요♡ | |
| 205 | + <p class="date">PM 6:50</p> | |
| 206 | + </div> | |
| 207 | + </div> | |
| 208 | + <div class="people_03"></div> | |
| 209 | + <div class="speech_bubble"></div> | |
| 210 | + </li> | |
| 211 | + <li class="second_line move_line"> | |
| 212 | + <div class="wrap"> | |
| 213 | + <div class="title"> | |
| 214 | + <p class="text">설날문자</p> | |
| 215 | + </div> | |
| 216 | + <div class="inner_text"> | |
| 217 | + 즐거운 명절 설날!<br> | |
| 218 | + 올해에는 마음, 재물, 건강, 웃음, 행복, 행운<br> | |
| 219 | + 모두 부자 되시길 기원합니다~♬ | |
| 220 | + <p class="date">AM 9:30</p> | |
| 221 | + </div> | |
| 222 | + </div> | |
| 223 | + <div class="people_03"></div> | |
| 224 | + <div class="speech_bubble"></div> | |
| 225 | + </li> | |
| 226 | + <li class="second_line move_line"> | |
| 227 | + <div class="wrap"> | |
| 228 | + <div class="title"> | |
| 229 | + <p class="text">설날문자</p> | |
| 230 | + </div> | |
| 231 | + <div class="inner_text"> | |
| 232 | + 까치의 울음소리에 밝은 새해를 기뻐하는<br> | |
| 233 | + 설날 아침입니다.<br> | |
| 234 | + 가족들이랑 즐거운 설 연휴 보내세요. | |
| 235 | + <p class="date">AM 11:20</p> | |
| 236 | + </div> | |
| 237 | + </div> | |
| 238 | + <div class="people_03"></div> | |
| 239 | + <div class="speech_bubble"></div> | |
| 240 | + </li> | |
| 241 | + </ul> | |
| 242 | + </div> | |
| 243 | + | |
| 244 | + <div class="line"></div> | |
| 245 | + | |
| 246 | + <div class="long"> | |
| 247 | + <p class="text bold" style="margin: 0 0 8px 0;">[장문]</p> | |
| 248 | + <ul class="obituary"> | |
| 249 | + <li> | |
| 250 | + <div class="wrap"> | |
| 251 | + <div class="title"> | |
| 252 | + <p class="text">설날문자</p> | |
| 253 | + </div> | |
| 254 | + <div class="inner_text"> | |
| 255 | + 까치 까치 설날은 어저께고요, 우리 우리 설날은 오늘이래요~♬<br><br> | |
| 256 | + 어느새 2024년 첫 연휴인, 설날이 코앞으로 다가왔습니다.<br><br> | |
| 257 | + 날씨는 춥지만 가족, 친지들과 모여 훈훈한 정을 나누는 명절 보내시길 바랍니다. | |
| 258 | + <p class="date">PM 1:10</p> | |
| 259 | + </div> | |
| 260 | + </div> | |
| 261 | + | |
| 262 | + <div class="people_01"></div> | |
| 263 | + <div class="speech_bubble"></div> | |
| 264 | + </li> | |
| 265 | + <li class="move_line"> | |
| 266 | + <div class="wrap"> | |
| 267 | + <div class="title"> | |
| 268 | + <p class="text">설날문자</p> | |
| 269 | + </div> | |
| 270 | + <div class="inner_text"> | |
| 271 | + 다사다난했던 2023년이 저물어 가고 희망찬 새해가 다가 옵니다.<br> | |
| 272 | + 2023년 힘들고 안 좋았던 기억들은 저물어 가는 해에 다 실어 보내세요.<br><br> | |
| 273 | + 2024년엔 새로운 희망들이 우리를 찾아오리라 기대해 봅니다.<br><br> | |
| 274 | + 늘 건강하시고, 많은 행운들이 함께 하시길 기원합니다. | |
| 275 | + 새해 복 많이 받으세요. | |
| 276 | + <p class="date">AM 8:45</p> | |
| 277 | + </div> | |
| 278 | + </div> | |
| 279 | + <div class="people_02"></div> | |
| 280 | + <div class="speech_bubble"></div> | |
| 281 | + </li> | |
| 282 | + <li class="move_line"> | |
| 283 | + <div class="wrap"> | |
| 284 | + <div class="title"> | |
| 285 | + <p class="text">설날문자</p> | |
| 286 | + </div> | |
| 287 | + <div class="inner_text"> | |
| 288 | + 우리는 옛날부터 설날에는 떡국을 먹어야 한 살 더 먹는 것이라고 여겨왔습니다.<br> | |
| 289 | + 한살 더 먹은 만큼 지혜로워지고, 그만큼 더 성숙해져서 보다 슬기로운 삶을 살 수 있는 것과 마찬가지겠죠~<br> | |
| 290 | + 이번 설을 계기로 새로 출발하는 좋은 시작점이 되기를 희망해봅니다.<br> | |
| 291 | + 올 한 해 강건하시고, 소망하시는 일 이루시길 다시 한 번 기원합니다.<br> | |
| 292 | + 즐겁고 따뜻한 명절 보내십시오. | |
| 293 | + <p class="date">PM 5:35</p> | |
| 294 | + </div> | |
| 295 | + </div> | |
| 296 | + <div class="people_01"></div> | |
| 297 | + <div class="speech_bubble"></div> | |
| 298 | + </li> | |
| 299 | + <li class="second_line move_line"> | |
| 300 | + <div class="wrap"> | |
| 301 | + <div class="title"> | |
| 302 | + <p class="text">설날문자</p> | |
| 303 | + </div> | |
| 304 | + <div class="inner_text"> | |
| 305 | + 곧 있으면 2024년 첫 명절, 설날입니다.<br> | |
| 306 | + 사랑하는 부모님, 친지들 찾아뵙고<br> | |
| 307 | + 온 가족이 둘러앉아 다같이 명절음식을 나눠먹으며 행복한 연휴 보내세요.<br><br> | |
| 308 | + 아마 추운 겨울날에 가족을 더 생각하는 것이지 싶어요.<br> | |
| 309 | + 이번 설에도 칼바람이 볼을 에는 추위가 계속된다고 합니다. 모두 건강 유의하시고 행복한 시간 되시기 바랍니다.<br> | |
| 310 | + <p class="date">AM 8:30</p> | |
| 311 | + </div> | |
| 312 | + </div> | |
| 313 | + <div class="people_02"></div> | |
| 314 | + <div class="speech_bubble"></div> | |
| 315 | + </li> | |
| 316 | + <li class="second_line move_line"> | |
| 317 | + <div class="wrap"> | |
| 318 | + <div class="title"> | |
| 319 | + <p class="text">설날문자</p> | |
| 320 | + </div> | |
| 321 | + <div class="inner_text"> | |
| 322 | + 즐거운 설 명절 입니다.<br> | |
| 323 | + 새해의 좋은 기운을 많이 받으셔서 2023년 계묘년도 승승장구하시는 한 해 되시기를 기원드립니다.<br><br> | |
| 324 | + 그동안의 보살핌에 감사드리고, 새해에도 많은 가르침 부탁드립니다.<br> | |
| 325 | + 고맙습니다.<br><br> | |
| 326 | + 늘 건강하시고, 새해 복 많이 받으세요. | |
| 327 | + <p class="date">PM 5:15</p> | |
| 328 | + </div> | |
| 329 | + </div> | |
| 330 | + <div class="people_02"></div> | |
| 331 | + <div class="speech_bubble"></div> | |
| 332 | + </li> | |
| 333 | + <li class="second_line move_line"> | |
| 334 | + <div class="wrap"> | |
| 335 | + <div class="title"> | |
| 336 | + <p class="text">설날문자</p> | |
| 337 | + </div> | |
| 338 | + <div class="inner_text"> | |
| 339 | + 설날이 며칠 앞으로 다가왔습니다.<br><br> | |
| 340 | + 설맞이 행복하고, 가족의 따스한 정과 소중함을 느끼시는 설날되셨으면 좋겠네요.<br><br> | |
| 341 | + 추운 날씨에 항상 감기 조심하시고, 언제나 당신의 삶에 행복이 가득하시길 바랍니다 ^-^<br> | |
| 342 | + 새해 복 많이 받으시고, 올 한해 행복하세요~ | |
| 343 | + <p class="date">PM 5:30</p> | |
| 344 | + </div> | |
| 345 | + </div> | |
| 346 | + <div class="people_01"></div> | |
| 347 | + <div class="speech_bubble"></div> | |
| 348 | + </li> | |
| 349 | + <li class="second_line move_line"> | |
| 350 | + <div class="wrap"> | |
| 351 | + <div class="title"> | |
| 352 | + <p class="text">설날문자</p> | |
| 353 | + </div> | |
| 354 | + <div class="inner_text"> | |
| 355 | + 2023년 새해엔 복 많이 받으시고<br><br> | |
| 356 | + 행복한 한해 되세요~~!!<br> | |
| 357 | + 꾸벅~ 큰절~^^<br><br> | |
| 358 | + 세뱃돈은 당신의 환한 웃음이면 충분해요. ^^ | |
| 359 | + <p class="date">PM 7:30</p> | |
| 360 | + </div> | |
| 361 | + </div> | |
| 362 | + <div class="people_01"></div> | |
| 363 | + <div class="speech_bubble"></div> | |
| 364 | + </li> | |
| 365 | + </ul> | |
| 366 | + </div> | |
| 367 | + | |
| 368 | + <div class="line"></div> | |
| 369 | + | |
| 370 | + <div class="drawing"> | |
| 371 | + <p class="text bold" style="margin: 0 0 8px 0;">[그림문자]</p> | |
| 372 | + <img src="/publish/publish_adv/img/template_v1_manuscript_15_section01_img01.png" alt=""> | |
| 373 | + </div> | |
| 374 | + </div> | |
| 375 | + </section> | |
| 376 | + <div class="btn_wrap"> | |
| 377 | + <div class="inner"> | |
| 378 | + <a href="https://www.munjaon.co.kr/web/mjon/msgdata/selectMsgDataView.do">설날문자 보내기</a> | |
| 379 | + </div> | |
| 380 | + </div> | |
| 381 | + </div> | |
| 382 | + | |
| 383 | +</body> | |
| 384 | + | |
| 385 | +</html>(No newline at end of file) |
+++ src/main/webapp/publish/publish_adv/img/template_v1_manuscript_15_section01_img01.png
| Binary file is not shown |
--- src/main/webapp/publish/publish_m/css/style.css
+++ src/main/webapp/publish/publish_m/css/style.css
... | ... | @@ -52,12 +52,27 @@ |
| 52 | 52 |
footer ul li:last-child{margin: 0 auto;}
|
| 53 | 53 |
footer .iten{padding: 22px 0 40px 0; font-size: 26px; font-weight: 300; opacity: 40%;}
|
| 54 | 54 |
|
| 55 |
+/*intro_03 내용 수정*/ |
|
| 56 |
+.visual .banner_con ul{padding: 50px 20px;}
|
|
| 57 |
+.visual .banner_con ul li{width:calc((100% - 15px)/2)}
|
|
| 58 |
+.visual .banner_con ul .wrap{border: none;}
|
|
| 59 |
+.visual .banner_con ul .wrap .inner_text{border-radius: 8px; font-weight: 700; padding: 15px 7px; line-height: 1.1; box-shadow: 0 0 20px rgba(0,0,0,0.3 );}
|
|
| 60 |
+.visual .banner_con ul .wrap .inner_text span{font-size: 20px;}
|
|
| 61 |
+.con .add_wrap .text .inner_sub{font-size: 30px; font-weight: 300;}
|
|
| 62 |
+ |
|
| 55 | 63 |
/*미디어쿼리_640x*/ |
| 56 | 64 |
@media screen and (max-width:640px){
|
| 57 | 65 |
.visual{background-image: url(/publish/publish_m/img/main_bg.png);}
|
| 58 | 66 |
} |
| 59 | 67 |
|
| 60 |
-/*미디어쿼리_500x*/ |
|
| 68 |
+/*미디어쿼리_585px*/ |
|
| 69 |
+@media screen and (max-width:585px){
|
|
| 70 |
+ /*intro_03 내용 수정*/ |
|
| 71 |
+ .visual .banner_con ul .wrap .inner_text{font-size: 18px;}
|
|
| 72 |
+ .visual .banner_con ul .wrap .inner_text span{font-size: 14px;}
|
|
| 73 |
+} |
|
| 74 |
+ |
|
| 75 |
+/*미디어쿼리_500px*/ |
|
| 61 | 76 |
@media screen and (max-width:500px){
|
| 62 | 77 |
/*header*/ |
| 63 | 78 |
header .inner{border-radius: 0 0 20px 0; padding: 3px 20px;}
|
... | ... | @@ -91,11 +106,29 @@ |
| 91 | 106 |
footer .title p{margin: 0 0 0 10px;}
|
| 92 | 107 |
footer ul li{width: 210px; margin: 0 auto 8px auto; border-radius: 8px; font-size: 22px; padding: 8px 0 5px 0;}
|
| 93 | 108 |
footer .iten{padding: 12px 0 20px 0; font-size: 13px;}
|
| 109 |
+ |
|
| 110 |
+ /*intro_03 내용 수정*/ |
|
| 111 |
+ .visual .banner_con ul .wrap{border: none;}
|
|
| 112 |
+ .visual .banner_con ul .wrap .inner_text{font-size: 18px; border-radius: 8px; font-weight: 700; font-size: 18px; padding: 15px 7px 13px 7px; line-height: 1.1; box-shadow: 0 0 20px rgba(0,0,0,0.3 );}
|
|
| 113 |
+ .visual .banner_con ul .wrap .inner_text span{font-size: 14px;}
|
|
| 114 |
+ .con .add_wrap .text .inner_sub{font-size: 15px;}
|
|
| 94 | 115 |
} |
| 95 | 116 |
|
| 96 |
-/*미디어쿼리_460pxx*/ |
|
| 117 |
+/*미디어쿼리_460px*/ |
|
| 97 | 118 |
@media screen and (max-width:460px){
|
| 98 | 119 |
.visual{background-image: url(/publish//publish_m/img/main_bg_small_01.png);}
|
| 120 |
+ /*intro_03 내용 수정*/ |
|
| 121 |
+ .visual .banner_con ul .wrap .inner_text{font-size: 16px;}
|
|
| 122 |
+} |
|
| 123 |
+ |
|
| 124 |
+/*미디어쿼리_383px*/ |
|
| 125 |
+@media screen and (max-width:383px){
|
|
| 126 |
+ .visual .banner_con ul .wrap .second_te{padding: 15px 6px 13px 6px;}
|
|
| 127 |
+} |
|
| 128 |
+ |
|
| 129 |
+/*미디어쿼리_382px*/ |
|
| 130 |
+@media screen and (max-width:382px){
|
|
| 131 |
+ .visual .banner_con ul .wrap .second_te{padding: 15px 7px 13px 7px;}
|
|
| 99 | 132 |
} |
| 100 | 133 |
|
| 101 | 134 |
/*미디어쿼리_360x*/ |
... | ... | @@ -107,10 +140,19 @@ |
| 107 | 140 |
@media screen and (max-width:340px){
|
| 108 | 141 |
.visual .price ul .wrap .title{font-size: 13px;}
|
| 109 | 142 |
.visual .price ul{padding: 0 15px;}
|
| 143 |
+ /*intro_03 내용 수정*/ |
|
| 144 |
+ .visual .banner_con ul{padding: 40px 15px;}
|
|
| 110 | 145 |
} |
| 111 | 146 |
|
| 112 | 147 |
/*미디어쿼리_310x*/ |
| 113 | 148 |
@media screen and (max-width:310px){
|
| 114 | 149 |
.visual .price ul .wrap .title{font-size: 12px;}
|
| 115 | 150 |
.visual .price ul{padding: 0 9px;}
|
| 151 |
+ /*intro_03 내용 수정*/ |
|
| 152 |
+ .visual .banner_con ul{padding: 40px 15px;}
|
|
| 153 |
+} |
|
| 154 |
+/*미디어쿼리_310x*/ |
|
| 155 |
+@media screen and (max-width:300px){
|
|
| 156 |
+ /*intro_03 내용 수정*/ |
|
| 157 |
+ .visual .banner_con ul .wrap .inner_text{font-size: 15px;}
|
|
| 116 | 158 |
}(No newline at end of file) |
+++ src/main/webapp/publish/publish_m/munjaon_intro_03.html
... | ... | @@ -0,0 +1,146 @@ |
| 1 | +<!DOCTYPE html> | |
| 2 | +<html lang="ko"> | |
| 3 | +<head> | |
| 4 | + <meta charset="UTF-8"> | |
| 5 | + <meta http-equiv="X-UA-Compatible" content="IE=edge"> | |
| 6 | + <meta name="viewport" content="width=device-width, initial-scale=1.0"> | |
| 7 | + <title>프리미엄 문자 발송 서비스 문자온</title> | |
| 8 | + <meta property="og:title" content="프리미엄 문자 발송 서비스 문자온"> | |
| 9 | + <meta property="og:image" content="https://www.munjaon.co.kr/publish/publish_m/img/preview_logo.png"> | |
| 10 | + | |
| 11 | + <link rel="apple-touch-icon" sizes="57x57" href="/publish/images/favicon/apple-icon-57x57.png"> | |
| 12 | + <link rel="apple-touch-icon" sizes="60x60" href="/publish/images/favicon/apple-icon-60x60.png"> | |
| 13 | + <link rel="apple-touch-icon" sizes="72x72" href="/publish/images/favicon/apple-icon-72x72.png"> | |
| 14 | + <link rel="apple-touch-icon" sizes="76x76" href="/publish/images/favicon/apple-icon-76x76.png"> | |
| 15 | + <link rel="apple-touch-icon" sizes="114x114" href="/publish/images/favicon/apple-icon-114x114.png"> | |
| 16 | + <link rel="apple-touch-icon" sizes="120x120" href="/publish/images/favicon/apple-icon-120x120.png"> | |
| 17 | + <link rel="apple-touch-icon" sizes="144x144" href="/publish/images/favicon/apple-icon-144x144.png"> | |
| 18 | + <link rel="apple-touch-icon" sizes="152x152" href="/publish/images/favicon/apple-icon-152x152.png"> | |
| 19 | + <link rel="apple-touch-icon" sizes="180x180" href="/publish/images/favicon/apple-icon-180x180.png"> | |
| 20 | + <link rel="icon" type="image/png" sizes="192x192" href="/publish/images/favicon/android-icon-192x192.png"> | |
| 21 | + <link rel="icon" type="image/png" sizes="32x32" href="/publish/images/favicon/favicon-32x32.png"> | |
| 22 | + <link rel="icon" type="image/png" sizes="96x96" href="/publish/images/favicon/favicon-96x96.png"> | |
| 23 | + <link rel="icon" type="image/png" sizes="16x16" href="/publish/images/favicon/favicon-16x16.png"> | |
| 24 | + <link rel="manifest" href="/publish/images/favicon/manifest.json"> | |
| 25 | + | |
| 26 | + <link rel="stylesheet" href="/publish/publish_m/css/reset.css"> | |
| 27 | + <link rel="stylesheet" href="/publish/publish_m/css/style.css"> | |
| 28 | +</head> | |
| 29 | + | |
| 30 | +<body> | |
| 31 | + <div class="con_wrap"> | |
| 32 | + <header> | |
| 33 | + <div class="inner"> | |
| 34 | + <a href="https://www.munjaon.co.kr"> | |
| 35 | + <h1><img src="/publish/publish_m/img/header_logo.png" alt="문자온 로고"></h1> | |
| 36 | + <p>munjaon.co.kr</p> | |
| 37 | + </a> | |
| 38 | + </div> | |
| 39 | + </header> | |
| 40 | + <div class="visual"> | |
| 41 | + <div class="inner"> | |
| 42 | + <h2><span>프리미엄</span> 문자<br>발송 서비스</h2> | |
| 43 | + <div class="button"> | |
| 44 | + <a href="https://www.munjaon.co.kr"> | |
| 45 | + <p>문자온 바로가기 <span>(클릭)</span></p> | |
| 46 | + </a> | |
| 47 | + </div> | |
| 48 | + <div class="price banner_con"> | |
| 49 | + <ul> | |
| 50 | + <li> | |
| 51 | + <div class="wrap"> | |
| 52 | + <p class="inner_text">최저가 요금<span>(후불제 가능)</span></p> | |
| 53 | + </div> | |
| 54 | + </li> | |
| 55 | + <li> | |
| 56 | + <div class="wrap"> | |
| 57 | + <p class="inner_text second_te">편리한 선거문자 시스템</p> | |
| 58 | + </div> | |
| 59 | + </li> | |
| 60 | + </ul> | |
| 61 | + </div> | |
| 62 | + </div> | |
| 63 | + </div> | |
| 64 | + <section> | |
| 65 | + <div class="con"> | |
| 66 | + <div class="title"> | |
| 67 | + <p class="num">1</p> | |
| 68 | + <p>특장점</p> | |
| 69 | + </div> | |
| 70 | + <div class="text_wrap add_wrap"> | |
| 71 | + <div class="text"> | |
| 72 | + <p class="te">편리한 20건 선거문자 발송</p> | |
| 73 | + <p class="inner_sub">(자동분류, 전체선택 가능)</p> | |
| 74 | + </div> | |
| 75 | + <div class="text"> | |
| 76 | + <p class="te">업계 최저가 요금</p> | |
| 77 | + <p class="inner_sub">(현 요금보다 저렴하게 제공)</p> | |
| 78 | + </div> | |
| 79 | + <div class="text"> | |
| 80 | + <p class="te">단문<span class="inner_sub">(SMS)</span>, 장문<span class="inner_sub">(LMS)</span>, 그림문자<span class="inner_sub">(MMS)</span>, 카카오 알림톡, 팩스 발송 기능 제공</p> | |
| 81 | + </div> | |
| 82 | + <div class="text"> | |
| 83 | + <p class="te">최신 트렌드 반영 서비스 제공</p> | |
| 84 | + <div class="text_sub"> | |
| 85 | + <p>- 주소록 입력 대행(무료)</p> | |
| 86 | + <p>- 예약발송 기능 제공(분 단위)</p> | |
| 87 | + <p>- 문자메시지 지도‧약도 자동 첨부 가능</p> | |
| 88 | + <p>- 그림문자 주문제작 서비스 제공</p> | |
| 89 | + <p>- 다양한 결제수단 제공(신용카드, 휴대폰 결제, 전용계좌, 즉시이체, 간편결제 등)</p> | |
| 90 | + <p>- 무제한 발송량 제공</p> | |
| 91 | + <p>- 특정 공통문구(이름, 일시, 비용 등) 일괄 변경 기능 제공</p> | |
| 92 | + </div> | |
| 93 | + </div> | |
| 94 | + <div class="text"> | |
| 95 | + <p class="te">기업‧단체‧공공기관 B2B 전용라인 제공</p> | |
| 96 | + </div> | |
| 97 | + </div> | |
| 98 | + </div> | |
| 99 | + </section> | |
| 100 | + <section> | |
| 101 | + <div class="con"> | |
| 102 | + <div class="title"> | |
| 103 | + <p class="num">2</p> | |
| 104 | + <p>이용고객</p> | |
| 105 | + </div> | |
| 106 | + <div class="text_wrap add_wrap"> | |
| 107 | + <div class="text"> | |
| 108 | + <p class="te">개인<span class="inner_sub">(사업자)</span></p> | |
| 109 | + <div class="text_sub"> | |
| 110 | + <p>- 동호회, 동문회, 향우회, 병원, 부동산, 음식점, 마트, 대리점, 숙박업, 전문직 사무실, 소셜커머스 사업자, 교육시설(학원, 학교, 유치원, 어린이집), 스포츠시설(골프장, 피트니스) 등</p> | |
| 111 | + </div> | |
| 112 | + </div> | |
| 113 | + <div class="text"> | |
| 114 | + <p class="te">기업‧협회‧단체</p> | |
| 115 | + <div class="text_sub"> | |
| 116 | + <p>- 기업(대‧중‧소기업), 협회, 조합, 비영리단체, 종교단체(교회, 사찰), 은행, 카드사, 쇼핑몰, 택배사, 보험사, 리서치사 등</p> | |
| 117 | + </div> | |
| 118 | + </div> | |
| 119 | + <div class="text"> | |
| 120 | + <p class="te">공공</p> | |
| 121 | + <div class="text_sub"> | |
| 122 | + <p>- 정부, 지방자치단체, 국회, 지방의회, 법원, 공공기관, 공직유관단체, 도서관, 미술관, 전시관, 공연시설, 영화관 등</p> | |
| 123 | + </div> | |
| 124 | + </div> | |
| 125 | + </div> | |
| 126 | + </div> | |
| 127 | + </section> | |
| 128 | + <footer> | |
| 129 | + <div class="title"> | |
| 130 | + <img src="/publish/publish_m/img/tel_icon.png" alt="고객센터 아이콘"> | |
| 131 | + <p>고객센터</p> | |
| 132 | + </div> | |
| 133 | + <ul> | |
| 134 | + <li> | |
| 135 | + <a href="tel:010-8432-9333">010-8432-9333</a> | |
| 136 | + </li> | |
| 137 | + <li> | |
| 138 | + <a href="tel:010-2290-4789">010-2290-4789</a> | |
| 139 | + </li> | |
| 140 | + </ul> | |
| 141 | + <p class="iten">주식회사 아이티앤</p> | |
| 142 | + </footer> | |
| 143 | + </div> | |
| 144 | + | |
| 145 | +</body> | |
| 146 | +</html>(No newline at end of file) |
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?