From 0069e3bb017ba3dc5e675c6ec5ea200ed30430dc Mon Sep 17 00:00:00 2001
From: zxcxz2002 <zxcxz2002@DESKTOP-RMOPKIS>
Date: Mon, 20 Mar 2023 02:41:21 +0900
Subject: [PATCH] ver 0.2

---
 .../web/controller/home/SellInfoController.java      | 12 ++++++++++--
 .../resources/static/res/front/js/biz/sell/add.js    | 10 +++++-----
 .../resources/static/res/front/js/biz/sell/info.js   | 11 +++++++----
 src/main/webapp/WEB-INF/view/sell/add.jsp            |  6 ++++--
 4 files changed, 26 insertions(+), 13 deletions(-)

diff --git a/src/main/java/com/ns/mobile/website/web/controller/home/SellInfoController.java b/src/main/java/com/ns/mobile/website/web/controller/home/SellInfoController.java
index 8eb90dc..a8e3cfd 100644
--- a/src/main/java/com/ns/mobile/website/web/controller/home/SellInfoController.java
+++ b/src/main/java/com/ns/mobile/website/web/controller/home/SellInfoController.java
@@ -123,9 +123,17 @@ public class SellInfoController extends BaseController {
 		                		date1.set(yyyy, MM, dd);
 		                		cell.setCellValue(date1);
 		                		cell.setCellStyle(formatCs);
-		                	}else if(myTitle[c].equals("정산금액") || myTitle[c].equals("세금") || myTitle[c].equals("실마진")) {
+		                		//현금수납 or 유선상품권	
+		                		//
+		                	}else if(myTitle[c].equals("정산금액") || myTitle[c].equals("세금") || myTitle[c].equals("실마진") || myTitle[c].equals("채권발생액") || myTitle[c].equals("현금수납 or 유선상품권") ||  myTitle[c].equals("중간마진") ||  myTitle[c].equals("P/B") 
+		                			|| myTitle[c].equals("액면R/B") || myTitle[c].equals("추가R/B") || myTitle[c].equals("고객현금") || myTitle[c].equals("차감") || myTitle[c].equals("유심비") || myTitle[c].equals("수수료") ||  myTitle[c].equals("출고가") 
+		                			|| myTitle[c].equals("공시지원금") ||  myTitle[c].equals("할부원금") || myTitle[c].equals("실채권입금액") ) {
 		                		Long money = Long.parseLong(dataArry.getJSONObject(r).getString(myTitle[c]).replaceAll(",", ""));
-		                		cell.setCellValue(money);                	
+		                		if(money == 0) {
+		                			cell.setCellValue('0');
+		                		}else {		                			
+		                			cell.setCellValue(money);                	
+		                		}
 		                	}else {
 		                		cell.setCellValue(dataArry.getJSONObject(r).getString(myTitle[c]));
 		                	}
diff --git a/src/main/resources/static/res/front/js/biz/sell/add.js b/src/main/resources/static/res/front/js/biz/sell/add.js
index 7ae867a..c03266c 100644
--- a/src/main/resources/static/res/front/js/biz/sell/add.js
+++ b/src/main/resources/static/res/front/js/biz/sell/add.js
@@ -119,11 +119,11 @@ let appVue = new Vue({
 				alert('액면가를 입력하세요');
 				return false;
 			}
-			if($this.cashRebate== '' || $this.cashRebate== 0){
-				alert('현금수납를 입력하세요');
-				return false;
-			}
 			if($this.insertType != 'other'){
+				if($this.cashRebate== '' || $this.cashRebate== 0){
+					alert('현금수납를 입력하세요');
+					return false;
+				}
 				if($this.phoneNumber== ''){
 					alert('핸드폰번호를 입력하세요');
 					return false;
@@ -333,7 +333,7 @@ let appVue = new Vue({
 		formulaChange: function(e){
 			let $this = this; 
 			var result = 0;
-			var calc = $this.formula+'+'+$this.addFormula + $this.deductionFormula; //-1-2-3 = -6
+			var calc = $this.formula;//+'+'+$this.addFormula + $this.deductionFormula; //-1-2-3 = -6
 			var plusList = calc.split('+');//-1-2-3
 			
 			for(var i=0;i<plusList.length;i++){
diff --git a/src/main/resources/static/res/front/js/biz/sell/info.js b/src/main/resources/static/res/front/js/biz/sell/info.js
index 20229f7..d330457 100644
--- a/src/main/resources/static/res/front/js/biz/sell/info.js
+++ b/src/main/resources/static/res/front/js/biz/sell/info.js
@@ -75,9 +75,10 @@ let appVue = new Vue({
 		},
 		getSettlementAmount: function(x){
 			//(액면리베이트+고객현금)-(현금수납+유심비+수수료) = 정산금액
+			
 			let $this = this;      
 			let fees = $this.getFees(x);
-			var settlementAmount = (x.faceValueRebate+x.guestMoney) - (x.cashRebate+x.usim+fees);
+			var settlementAmount = (x.faceValueRebate+x.guestMoney+x.addRebate) - (x.cashRebate+x.usim+fees);
 
 			return moneyText(settlementAmount,'Y');			
 		},
@@ -118,12 +119,14 @@ let appVue = new Vue({
 			return moneyText(value,'Y');
 		},
 		getBondIssuanceAmount: function(x){
-			//(액면리베이트+추가리베이트+유심)-(현금수납+수수료+차감) = 채권발생액 //차감없음
+			//(액면리베이트+추가리베이트+유심)-(현금수납+수수료+차감) = 채권발생액 
 			let $this = this;        	
 			let fees = $this.getFees(x);
-			
+		
+			if(x.name=='황재승')
+			debugger;
 			var settlementAmount = Number($this.getSettlementAmount(x).replaceAll(',',''));
-			var bondIssuanceAmount = ((settlementAmount + x.addRebate + x.usim)-(x.guestMoney+fees));
+			var bondIssuanceAmount = ((settlementAmount + x.usim)-(x.guestMoney+fees+x.deduction));
 					
 			return moneyText(bondIssuanceAmount,'Y');
 		},
diff --git a/src/main/webapp/WEB-INF/view/sell/add.jsp b/src/main/webapp/WEB-INF/view/sell/add.jsp
index 8fb2bcc..3fefdc4 100644
--- a/src/main/webapp/WEB-INF/view/sell/add.jsp
+++ b/src/main/webapp/WEB-INF/view/sell/add.jsp
@@ -100,7 +100,9 @@
 						    </div>
 						</div>
 					</div>
-					※ 유선시 P(현금수납 or 상품권) = 고객현금 + 페이백(P/B) 
+					※ 유선시 P(현금수납 or 상품권) = 추가/RB = 상품권
+					<br>
+					※ 가이드 = P(현금수납 or 상품권)  
 					<h5 class="mt-3 mb-3">고객정보 등록</h5>
 					<div class="border border-2 mb-3">
 						<div class="row d-flex justify-content-center">
@@ -222,7 +224,7 @@
 						    </div>
 						</div>
 						
-						
+						※ 워치 는 유심비 0원
 						
 						<div class="row d-flex justify-content-center">
 							<label for="payBackDay" class="col-sm-2 col-form-label mb-3">페이백 지급예정일자</label>