Merge branch 'master' into kakaoFT
This commit is contained in:
rosewiper
commit
e7f60f7bf8
@ -500,6 +500,7 @@ public class MjonMsgVO extends ComDefaultVO{
|
||||
private double supplyPrice; // 공급가액
|
||||
private double vatPrice; // 부가세
|
||||
private double totalPrice; // 금액
|
||||
private String addVatType; // 부가세 포함 여부
|
||||
|
||||
private String addrGrpId; // 주소록 그룹아이디
|
||||
private String addrGrpNm; // 주소록 그룹명
|
||||
@ -1299,6 +1300,12 @@ public class MjonMsgVO extends ComDefaultVO{
|
||||
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;
|
||||
}
|
||||
|
||||
@ -4869,6 +4869,12 @@ public class MjonPayController {
|
||||
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";
|
||||
@ -5111,6 +5117,13 @@ public class MjonPayController {
|
||||
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";
|
||||
}
|
||||
|
||||
|
||||
@ -127,7 +127,14 @@ function f_print(){
|
||||
</div>
|
||||
<div class="cont2 clearfix">
|
||||
<p>총 사용금액</p>
|
||||
<p><span>${totalSumPrice}</span> 원(VAT 별도)</p>
|
||||
<c:choose>
|
||||
<c:when test="${searchVO.addVatType eq 'N'}">
|
||||
<p><span>${totalSumPrice}</span> 원(VAT 별도)</p>
|
||||
</c:when>
|
||||
<c:otherwise>
|
||||
<p><span>${addTaxSumPrice}</span> 원(VAT 포함)</p>
|
||||
</c:otherwise>
|
||||
</c:choose>
|
||||
</div>
|
||||
<div class="cont3">
|
||||
<p>(단위 : 원, 건)</p>
|
||||
@ -207,18 +214,32 @@ function f_print(){
|
||||
<table class="est_table">
|
||||
<caption>공급가액, 총 결제금액에 대한 표</caption>
|
||||
<colgroup>
|
||||
<col style="width: 64px;">
|
||||
<col style="width: 100px;">
|
||||
<col style="width: auto;">
|
||||
</colgroup>
|
||||
<tbody>
|
||||
<tr>
|
||||
<th>공급가액</th>
|
||||
<td><span>${supplySumPrice}</span> 원</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>총 결제금액</th>
|
||||
<td><span>${totalSumPrice}</span> 원</td>
|
||||
<td><span>${supplySumPrice}</span></td>
|
||||
</tr>
|
||||
<c:choose>
|
||||
<c:when test="${searchVO.addVatType eq 'N'}">
|
||||
<tr class="total_price">
|
||||
<th>총 사용금액</th>
|
||||
<td><span>${totalSumPrice}</span></td>
|
||||
</tr>
|
||||
</c:when>
|
||||
<c:otherwise>
|
||||
<tr>
|
||||
<th>세액(부가세)</th>
|
||||
<td>${addTax}</td>
|
||||
</tr>
|
||||
<tr class="total_price">
|
||||
<th>총 사용금액</th>
|
||||
<td><span>${addTaxSumPrice}</span></td>
|
||||
</tr>
|
||||
</c:otherwise>
|
||||
</c:choose>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
|
||||
@ -85,7 +85,14 @@ function f_print(){
|
||||
</div>
|
||||
<div class="cont2 clearfix">
|
||||
<p>총 사용금액</p>
|
||||
<p><span>${totalSumPrice}</span> 원(VAT 별도)</p>
|
||||
<c:choose>
|
||||
<c:when test="${searchVO.addVatType eq 'N'}">
|
||||
<p><span>${totalSumPrice}</span> 원(VAT 별도)</p>
|
||||
</c:when>
|
||||
<c:otherwise>
|
||||
<p><span>${addTaxSumPrice}</span> 원(VAT 포함)</p>
|
||||
</c:otherwise>
|
||||
</c:choose>
|
||||
</div>
|
||||
<div class="cont3">
|
||||
<p>(단위 : 원, 건)</p>
|
||||
@ -150,17 +157,50 @@ function f_print(){
|
||||
</c:forEach>
|
||||
</c:when>
|
||||
<c:otherwise>
|
||||
|
||||
<tr>
|
||||
<td colspan="4">
|
||||
사용내역이 없습니다.
|
||||
</td>
|
||||
</tr>
|
||||
</c:otherwise>
|
||||
</c:choose>
|
||||
</c:choose>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="cont4">
|
||||
<table class="est_table">
|
||||
<caption>공급가액, 총 결제금액에 대한 표</caption>
|
||||
<colgroup>
|
||||
<col style="width: 100px;">
|
||||
<col style="width: auto;">
|
||||
</colgroup>
|
||||
<tbody>
|
||||
<tr>
|
||||
<th>공급가액</th>
|
||||
<td><span>${supplySumPrice}</span></td>
|
||||
</tr>
|
||||
<c:choose>
|
||||
<c:when test="${not empty resultList}">
|
||||
<tr class="total_price">
|
||||
<td>계</td>
|
||||
<td>${sendSumCount}</td>
|
||||
<td>${supplySumPrice}</td>
|
||||
<td>${totalSumPrice}</td>
|
||||
</tr>
|
||||
<c:choose>
|
||||
<c:when test="${searchVO.addVatType eq 'N'}">
|
||||
<tr class="total_price">
|
||||
<th>총 사용금액</th>
|
||||
<td><span>${totalSumPrice}</span></td>
|
||||
</tr>
|
||||
</c:when>
|
||||
<c:otherwise>
|
||||
<tr>
|
||||
<th>세액(부가세)</th>
|
||||
<td>${addTax}</td>
|
||||
</tr>
|
||||
<tr class="total_price">
|
||||
<th>총 사용금액</th>
|
||||
<td><span>${addTaxSumPrice}</span></td>
|
||||
</tr>
|
||||
</c:otherwise>
|
||||
</c:choose>
|
||||
</c:when>
|
||||
<c:otherwise>
|
||||
<tr>
|
||||
@ -170,9 +210,8 @@ function f_print(){
|
||||
</tr>
|
||||
</c:otherwise>
|
||||
</c:choose>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
<div class="cont5">
|
||||
<p><span>${year} 년 <span>${month}</span> 월 <span>${day}</span> 일</p>
|
||||
|
||||
@ -111,7 +111,7 @@ function fnShowPrintPopup() {
|
||||
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');
|
||||
@ -410,6 +410,11 @@ function fnShowPdfPrintPopup(){
|
||||
<label for="publish1">거래명세서</label>
|
||||
<input type="radio" name="publish" id="publish2" value="details">
|
||||
<label for="publish2">사용내역서</label>
|
||||
<label for="" class="label">부가세 포함,별도 선택</label>
|
||||
<select id="addVatType" name="addVatType" class="selType2">
|
||||
<option value="N" selected>부가세 별도</option>
|
||||
<option value="Y">부가세 포함</option>
|
||||
</select>
|
||||
</div>
|
||||
<div>
|
||||
<c:choose>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user