Commit @0ce9d438916020b2cfccffecf4851cd10d98f217

rosewiper 2024-01-15

요금사용내역 거래명세서, 사용내역서 Vat 포함 / 미포한 팝업 화면 개선 - 기존 VAT 별도 내역만 나오던 화면을 포함된 내역도 나오도록 기능 개선

 - 기존 VAT 별도 내역만 나오던 화면을 포함된 내역도 나오도록 기능 개선

@0ce9d438916020b2cfccffecf4851cd10d98f217

faeca71

0ce9d43

src/main/java/itn/let/mjo/msg/service/MjonMsgVO.java

--- src/main/java/itn/let/mjo/msg/service/MjonMsgVO.java

+++ src/main/java/itn/let/mjo/msg/service/MjonMsgVO.java


 	private double supplyPrice;		// 공급가액
 	private double vatPrice;		// 부가세
 	private double totalPrice;		// 금액
+	private String addVatType;		// 부가세 포함 여부
 	
 	private String addrGrpId;		// 주소록 그룹아이디
 	private String addrGrpNm;		// 주소록 그룹명

 	public void setTotalPrice(double totalPrice) {
 		this.totalPrice = totalPrice;
 	}
+	public String getAddVatType() {
+		return addVatType;
+	}
+	public void setAddVatType(String addVatType) {
+		this.addVatType = addVatType;
+	}
 	public String getDetailType() {
 		return detailType;
 	}

faeca71

0ce9d43

src/main/java/itn/let/mjo/pay/web/MjonPayController.java

--- src/main/java/itn/let/mjo/pay/web/MjonPayController.java

+++ src/main/java/itn/let/mjo/pay/web/MjonPayController.java


 		model.addAttribute("mberNm", mberNm);
 		model.addAttribute("managerNm", managerNm);
 		model.addAttribute("moblphonNo", moblphonNo);
+		
+		//부가세 포함 가격 정보 계산
+		double addTax = Math.round(totalSumPrice * 0.1);
+		
+		model.addAttribute("addTax", decFormat.format(addTax));
+		model.addAttribute("addTaxSumPrice", decFormat.format(addTax+totalSumPrice));
 
 		
 		return "/web/pay/MsgPrintUsageDetailsPopUp";

 		model.addAttribute("managerNm", managerNm);
 		model.addAttribute("moblphonNo", moblphonNo);
 		
+		
+		//부가세 포함 가격 정보 계산
+		double addTax = Math.round(totalSumPrice * 0.1);
+		
+		model.addAttribute("addTax", decFormat.format(addTax));
+		model.addAttribute("addTaxSumPrice", decFormat.format(addTax+totalSumPrice));
+		
     	return "/web/pay/MsgPrintStatementPopUp";
     }
     

faeca71

0ce9d43

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

--- 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>
...	...	@@ -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>

faeca71

0ce9d43

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

--- 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,50 @@
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>
159		- <td>계</td>
160		- <td>${sendSumCount}</td>
161		- <td>${supplySumPrice}</td>
162		- <td>${totalSumPrice}</td>
163		- </tr>-->
164		- <tr class="total_price">
165		- <td>총 공급가액</td>
166		- <td colspan="3">2,227</td>
167		- </tr>
168		- <tr>
169		- <td>세액(부가세)</td>
170		- <td colspan="3">227</td>
171		- </tr>
172		- <tr class="total_price">
173		- <td class="total_price">총 사용금액</td>
174		- <td colspan="3">1,258</td>
175		- </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>
176	204	</c:when>
177	205	<c:otherwise>
178	206	<tr>
...	...	@@ -182,9 +210,8 @@
182	210	</tr>
183	211	</c:otherwise>
184	212	</c:choose>
185		- </tbody>
186		- </table>
187		- </div>
	213	+ </tbody>
	214	+ </table>
188	215	</div>
189	216	<div class="cont5">
190	217	<p><span>${year} 년  <span>${month}</span> 월  <span>${day}</span> 일</p>

faeca71

0ce9d43

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

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

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


 			return;
 		}
 	}
-  
+	
 	document.listForm.action = url;
 	document.listForm.method = "post"; 
 	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');

 			<input type="radio" name="publish" id="publish2" value="details">
 			<label for="publish2">사용내역서</label>
 			<label for="" class="label">부가세 포함,별도 선택</label>
-			<select id="isVat" name="isVat" class="selType2">
-				<option value="0">부가세 별도</option>
-				<option value="1" selected>부가세 포함</option>
+			<select id="addVatType" name="addVatType" class="selType2">
+				<option value="N" selected>부가세 별도</option>
+				<option value="Y">부가세 포함</option>
 			</select>
 		</div>
 		<div>

Add a comment

Open 0
Closed 0

List

...	...	@@ -500,6 +500,7 @@
500	500	private double supplyPrice; // 공급가액
501	501	private double vatPrice; // 부가세
502	502	private double totalPrice; // 금액
	503	+ private String addVatType; // 부가세 포함 여부
503	504
504	505	private String addrGrpId; // 주소록 그룹아이디
505	506	private String addrGrpNm; // 주소록 그룹명
...	...	@@ -1299,6 +1300,12 @@
1299	1300	public void setTotalPrice(double totalPrice) {
1300	1301	this.totalPrice = totalPrice;
1301	1302	}
	1303	+ public String getAddVatType() {
	1304	+ return addVatType;
	1305	+ }
	1306	+ public void setAddVatType(String addVatType) {
	1307	+ this.addVatType = addVatType;
	1308	+ }
1302	1309	public String getDetailType() {
1303	1310	return detailType;
1304	1311	}

...	...	@@ -4869,6 +4869,12 @@
4869	4869	model.addAttribute("mberNm", mberNm);
4870	4870	model.addAttribute("managerNm", managerNm);
4871	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));
4872	4878
4873	4879
4874	4880	return "/web/pay/MsgPrintUsageDetailsPopUp";
...	...	@@ -5111,6 +5117,13 @@
5111	5117	model.addAttribute("managerNm", managerNm);
5112	5118	model.addAttribute("moblphonNo", moblphonNo);
5113	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	+
5114	5127	return "/web/pay/MsgPrintStatementPopUp";
5115	5128	}
5116	5129

...	...	@@ -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');
...	...	@@ -411,9 +411,9 @@
411	411	<input type="radio" name="publish" id="publish2" value="details">
412	412	<label for="publish2">사용내역서</label>
413	413	<label for="" class="label">부가세 포함,별도 선택</label>
414		- <select id="isVat" name="isVat" class="selType2">
415		- <option value="0">부가세 별도</option>
416		- <option value="1" selected>부가세 포함</option>
	414	+ <select id="addVatType" name="addVatType" class="selType2">
	415	+ <option value="N" selected>부가세 별도</option>
	416	+ <option value="Y">부가세 포함</option>
417	417	</select>
418	418	</div>
419	419	<div>

Delete comment