구매요청시 결재 팝업 수정

src/main/webapp/js/app/config.js

@@ -2411,11 +2411,15 @@ function itp_fn_modal_confirm(msg, fn, args) {
 };
 // 구매요청확인
 function itp_fn_modal_confirm_req1(param, fn, args) {
+	
+	
 	$('#ITP_MODAL_PR_ALERT_CANCEL').show();
 	$('#ITP_MODAL_PR_ALERT').modal('show');
 	$('#ITP_MODAL_PR_ALERT').find('.fnDlvReqDt').html(param.dlvReqDt);
 	$('#ITP_MODAL_PR_ALERT').find('.fnItemcnt').html(param.itemcnt + " 개");
-	$('#ITP_MODAL_PR_ALERT').find('.fnPchReqAmt').html(param.dlvReqAmt + " 원");
+	$('#ITP_MODAL_PR_ALERT').find('.fnPchReqAmt').html(param.pchReqAtm + " 원");
+	$('#ITP_MODAL_PR_ALERT').find('.fnPchPssblAmt').html(param.pchPssblAtm + " 원");
+	$('#ITP_MODAL_PR_ALERT').find('.fnPchAmt').html(param.dlvReqAmt + " 원");
 	
 	if (fn !== undefined || typeof fn !== 'undefined') {
 		console.log("config button");
@@ -2429,11 +2433,15 @@ function itp_fn_modal_confirm_req1(param, fn, args) {
 };
 //선불매장결제확인
 function itp_fn_modal_confirm_req2(param, fn, args) {
+	
 	$('#ITP_MODAL_ALERT_ADV_CANCEL').show();
 	$('#ITP_MODAL_ADV_ALERT').modal('show');
 	$('#ITP_MODAL_ADV_ALERT').find('.fnDlvReqDt').html(param.dlvReqDt);
 	$('#ITP_MODAL_ADV_ALERT').find('.fnItemcnt').html(param.itemcnt + " 개");
-	$('#ITP_MODAL_ADV_ALERT').find('.fnDlvReqAmt').html(param.dlvReqAmt + " 원");
+	$('#ITP_MODAL_ADV_ALERT').find('.fnPchReqAmt').html(param.pchReqAtm + " 원");
+	$('#ITP_MODAL_ADV_ALERT').find('.fnPchPssblAmt').html(param.pchPssblAtm + " 원");
+	$('#ITP_MODAL_ADV_ALERT').find('.fnPchAmt').html(param.dlvReqAmt + " 원");
+	
 	if (fn !== undefined || typeof fn !== 'undefined') {
 		$('#ITP_MODAL_ALERT_ADV_CONFIRM').off('click');
 		$('#ITP_MODAL_ALERT_ADV_CONFIRM').on('click', function() {
@@ -2444,11 +2452,14 @@ function itp_fn_modal_confirm_req2(param, fn, args) {
 };
 //구매한도부족알림
 function itp_fn_modal_confirm_req3(param, fn, args) {
+	
 	$('#ITP_MODAL_ALERT_LM_CANCEL').show();
 	$('#ITP_MODAL_LM_ALERT').modal('show');
 	$('#ITP_MODAL_LM_ALERT').find('.fnDlvReqDt').html(param.dlvReqDt);
 	$('#ITP_MODAL_LM_ALERT').find('.fnItemcnt').html(param.itemcnt + " 개");
-	$('#ITP_MODAL_LM_ALERT').find('.fnDlvReqAmt').html(param.dlvReqAmt + " 원");
+	$('#ITP_MODAL_LM_ALERT').find('.fnPchReqAmt').html(param.pchReqAtm + " 원");
+	$('#ITP_MODAL_LM_ALERT').find('.fnPchPssblAmt').html(param.pchPssblAtm + " 원");
+	$('#ITP_MODAL_LM_ALERT').find('.fnPchAmt').html(param.dlvReqAmt + " 원");
 	if (fn !== undefined || typeof fn !== 'undefined') {
 		$('#ITP_MODAL_ALERT_LM_CONFIRM').off('click');
 		$('#ITP_MODAL_ALERT_LM_CONFIRM').on('click', function() {
@@ -2459,11 +2470,14 @@ function itp_fn_modal_confirm_req3(param, fn, args) {
 };
 //선불매장결제확인-임시저장
 function itp_fn_modal_confirm_req4(param, fn, args) {
+	
 	$('#ITP_MODAL_ALERT_SAVE_ADV_CANCEL').show();
 	$('#ITP_MODAL_SAVE_ADV_ALERT').modal('show');
 	$('#ITP_MODAL_SAVE_ADV_ALERT').find('.fnDlvReqDt').html(param.dlvReqDt);
 	$('#ITP_MODAL_SAVE_ADV_ALERT').find('.fnItemcnt').html(param.itemcnt + " 개");
-	$('#ITP_MODAL_SAVE_ADV_ALERT').find('.fnDlvReqAmt').html(param.dlvReqAmt + " 원");
+	$('#ITP_MODAL_SAVE_ADV_ALERT').find('.fnPchReqAmt').html(param.pchReqAtm + " 원");
+	$('#ITP_MODAL_SAVE_ADV_ALERT').find('.fnPchPssblAmt').html(param.pchPssblAtm + " 원");
+	$('#ITP_MODAL_SAVE_ADV_ALERT').find('.fnPchAmt').html(param.dlvReqAmt + " 원");
 	if (fn !== undefined || typeof fn !== 'undefined') {
 		$('#ITP_MODAL_ALERT_SAVE_ADV_CONFIRM').off('click');
 		$('#ITP_MODAL_ALERT_SAVE_ADV_CONFIRM').on('click', function() {
@@ -2474,11 +2488,14 @@ function itp_fn_modal_confirm_req4(param, fn, args) {
 };
 //구매한도부족알림-임시저장
 function itp_fn_modal_confirm_req5(param, fn, args) {
+	
 	$('#ITP_MODAL_ALERT_SAVE_LM_CANCEL').show();
 	$('#ITP_MODAL_SAVE_LM_ALERT').modal('show');
 	$('#ITP_MODAL_SAVE_LM_ALERT').find('.fnDlvReqDt').html(param.dlvReqDt);
 	$('#ITP_MODAL_SAVE_LM_ALERT').find('.fnItemcnt').html(param.itemcnt + " 개");
-	$('#ITP_MODAL_SAVE_LM_ALERT').find('.fnDlvReqAmt').html(param.dlvReqAmt + " 원");
+	$('#ITP_MODAL_SAVE_LM_ALERT').find('.fnPchReqAmt').html(param.pchReqAtm + " 원");
+	$('#ITP_MODAL_SAVE_LM_ALERT').find('.fnPchPssblAmt').html(param.pchPssblAtm + " 원");
+	$('#ITP_MODAL_SAVE_LM_ALERT').find('.fnPchAmt').html(param.dlvReqAmt + " 원");
 	if (fn !== undefined || typeof fn !== 'undefined') {
 		$('#ITP_MODAL_ALERT_SAVE_LM_CONFIRM').off('click');
 		$('#ITP_MODAL_ALERT_SAVE_LM_CONFIRM').on('click', function() {

src/main/webapp/js/app/pomng/ITP_POMNG01010.js

@@ -361,19 +361,11 @@ let createObj = {
 					var pchActAtm = itp_fn_currency_unfmatter($('#ITP_FORM_POMNG01010_DETAIL .fnPchActAmt').text(),"","");
 					var pchReqAtm = itp_fn_currency_unfmatter($('#ITP_FORM_POMNG01010_DETAIL .fnPchReqAmt').text(),"","");
 					var mallId = $('#ITP_FORM_POMNG01010_DETAIL_MALL_ID').val();
-					
-					let pchActAtmNum;
-					if (loanDvsn == 'loanDvsn') {
-						if(pchActAtm == '0' || pchActAtm == 0 || pchActAtm == Infinity || pchActAtm == 'Infinity') {
-							pchActAtmNum = 'Infinity';
-						} else {
-							pchActAtmNum = pchActAtm
-						}
-					}
-					
-					if (parseFloat(pchActAtmNum) < parseFloat(pchReqAtm)) {
-						dlvReqAmt = itp_fn_number_comma(String(parseInt(pchReqAtm) - parseInt(pchActAtm)));
 						
+					if (parseFloat(pchActAtm) < parseFloat(pchReqAtm)) {
+						
+						dlvReqAmt = itp_fn_number_comma(String(parseInt(pchReqAtm) - parseInt(pchActAtm)));
+						console.log(dlvReqAmt);
 						if (mallId == '') {
 							if (loanDvsn == 'LD01') {
 								apprTypeCd = 'NPN';
@@ -388,6 +380,8 @@ let createObj = {
 							}
 							
 						}
+					} else {
+						dlvReqAmt = 0 ;
 					}
 				}    
 			}        
@@ -427,8 +421,12 @@ let createObj = {
 					
 					apprArg.dlvReqDt = dlvReqDt;
 					apprArg.itemcnt = itemcnt;
+					apprArg.pchReqAtm = itp_fn_number_comma(pchReqAtm);
+					apprArg.pchPssblAtm = itp_fn_number_comma(pchActAtm);
 					apprArg.dlvReqAmt = dlvReqAmt;
 					
+					console.log(apprArg);
+					
 					if (apprTypeCd == "Y") {  // 여신 구분, 여신금액
 						
 						var prIngFn =  {

src/main/webapp/js/app/pomng/ITP_POMNG02010.js

@@ -792,10 +792,12 @@ let modifyObj = {
 			
 			
 			//console.log(loanDvsn);
+			var pchActAtm = itp_fn_currency_unfmatter($('#ITP_FORM_POMNG02010_DETAIL .fnPchActAmt').text(),"","");
+			var pchReqAtm = itp_fn_currency_unfmatter($('#ITP_FORM_POMNG02010_DETAIL .fnPchReqTotalAmt').text(),"","");
+					
 			if (loanDvsn != null && loanDvsn != "") {
 				if (loanDvsn != 'LD03' && arg == 'PR20' ) {
-					var pchActAtm = itp_fn_currency_unfmatter($('#ITP_FORM_POMNG02010_DETAIL .fnPchActAmt').text(),"","");
-					var pchReqAtm = itp_fn_currency_unfmatter($('#ITP_FORM_POMNG02010_DETAIL .fnPchReqTotalAmt').text(),"","");
+					
 					var mallId = $('#ITP_FORM_POMNG02010_DETAIL_MALL_ID').val();
 					
 					if (parseInt(pchActAtm) < parseInt(pchReqAtm)) {
@@ -814,6 +816,8 @@ let modifyObj = {
 								apprTypeCd = 'NA';
 							}
 						} 
+					} else {
+						dlvReqAmt = 0 ;
 					}
 				}    
 			}        
@@ -844,13 +848,15 @@ let modifyObj = {
 				if (chkQtyYn == "Y") return;
 				
 				if (arg == 'PR20') {
-					
+					console.log("=========");
+					console.log(pchReqAtm);
+					console.log(pchActAtm);
 					apprArg.dlvReqDt = dlvReqDt;
 					apprArg.itemcnt = itemcnt;
+					apprArg.pchReqAtm = itp_fn_number_comma(pchReqAtm);
+					apprArg.pchPssblAtm = itp_fn_number_comma(pchActAtm);
 					apprArg.dlvReqAmt = dlvReqAmt;
 					
-					console.log("-----------------------");
-					console.log(dlvReqAmt, apprArg.dlvReqAmt);
 					
 					if (apprTypeCd == "Y") {  // 여신 구분, 여신금액
 						

src/main/webapp/main.html

@@ -402,7 +402,7 @@
 										<label>납품요청일</label>
 									</div>
 									<div class="itp_info_area">
-										<div class="fnDlvReqDt"></div>
+										<div class="fnDlvReqDt" style="text-align:center;"></div>
 									</div>
 								</div>
 								<div class="itp_alt_box">
@@ -410,7 +410,7 @@
 										<label>품목수</label>
 									</div>
 									<div class="itp_info_area">
-										<div class="fnItemcnt"></div>
+										<div class="fnItemcnt" style="text-align:right;"></div>
 									</div>
 								</div>
 								<div class="itp_alt_box">
@@ -418,7 +418,7 @@
 										<label>구매요청금액</label>
 									</div>
 									<div class="itp_info_area">
-										<div class="fnPchReqAmt"></div>
+										<div class="fnPchReqAmt" style="text-align:right;"></div>
 									</div>
 								</div>
 								<div class="itp_alt_box">
@@ -426,7 +426,7 @@
 										<label>구매가능금액</label>
 									</div>
 									<div class="itp_info_area">
-										<div class="fnPchPssblAmt"></div>
+										<div class="fnPchPssblAmt" style="text-align:right;"></div>
 									</div>
 								</div>
 								<div class="itp_alt_box border">
@@ -434,7 +434,7 @@
 										<label>결제금액</label>
 									</div>
 									<div class="itp_info_area">
-										<div class="fnPchAmt"></div>
+										<div class="fnPchAmt" style="text-align:right;"></div>
 									</div>
 								</div>
 								<label class="error_info">구매요청 하시겠습니까?</label>
@@ -458,7 +458,7 @@
 										<label>납품요청일</label>
 									</div>
 									<div class="itp_info_area">
-										<div class="fnDlvReqDt"></div>
+										<div class="fnDlvReqDt" style="text-align:center;"></div>
 									</div>
 								</div>
 								<div class="itp_alt_box">
@@ -466,7 +466,7 @@
 										<label>품목수</label>
 									</div>
 									<div class="itp_info_area">
-										<div class="fnItemcnt"></div>
+										<div class="fnItemcnt" style="text-align:right;"></div>
 									</div>
 								</div>
 								<div class="itp_alt_box">
@@ -474,7 +474,7 @@
 										<label>구매요청금액</label>
 									</div>
 									<div class="itp_info_area">
-										<div class="fnPchReqAmt"></div>
+										<div class="fnPchReqAmt" style="text-align:right;"></div>
 									</div>
 								</div>
 								<div class="itp_alt_box">
@@ -482,7 +482,7 @@
 										<label>구매가능금액</label>
 									</div>
 									<div class="itp_info_area">
-										<div class="fnPchPssblAmt"></div>
+										<div class="fnPchPssblAmt" style="text-align:right;"></div>
 									</div>
 								</div>
 								<div class="itp_alt_box border">
@@ -490,7 +490,7 @@
 										<label>결제금액</label>
 									</div>
 									<div class="itp_info_area">
-										<div class="fnPchAmt"></div>
+										<div class="fnPchAmt" style="text-align:right;"></div>
 									</div>
 								</div>
 								<label class="error_info">선불매장이므로 결재를 하셔야<br> 구매요청이 진행이 됩니다.<br>결재를 하시겠습니까?</label>
@@ -514,7 +514,7 @@
 										<label>납품요청일</label>
 									</div>
 									<div class="itp_info_area">
-										<div class="fnDlvReqDt"></div>
+										<div class="fnDlvReqDt" style="text-align:center;"></div>
 									</div>
 								</div>
 								<div class="itp_alt_box">
@@ -522,7 +522,7 @@
 										<label>품목수</label>
 									</div>
 									<div class="itp_info_area">
-										<div class="fnItemcnt"></div>
+										<div class="fnItemcnt" style="text-align:right;"></div>
 									</div>
 								</div>
 								<div class="itp_alt_box">
@@ -530,7 +530,7 @@
 										<label>구매요청금액</label>
 									</div>
 									<div class="itp_info_area">
-										<div class="fnPchReqAmt"></div>
+										<div class="fnPchReqAmt" style="text-align:right;"></div>
 									</div>
 								</div>
 								<div class="itp_alt_box">
@@ -538,7 +538,7 @@
 										<label>구매가능금액</label>
 									</div>
 									<div class="itp_info_area">
-										<div class="fnPchPssblAmt"></div>
+										<div class="fnPchPssblAmt" style="text-align:right;"></div>
 									</div>
 								</div>
 								<div class="itp_alt_box border">
@@ -546,7 +546,7 @@
 										<label>결제금액</label>
 									</div>
 									<div class="itp_info_area">
-										<div class="fnPchAmt"></div>
+										<div class="fnPchAmt" style="text-align:right;"></div>
 									</div>
 								</div>
 								<label class="error_info" style="line-height: 1.5;">구매한도가 부족합니다.<br> 선결재를 하신 후에 구매요청이 진행이 됩니다.<br>결재를 하시겠습니까?</label>
@@ -570,7 +570,7 @@
 										<label>납품요청일</label>
 									</div>
 									<div class="itp_info_area">
-										<div class="fnDlvReqDt"></div>
+										<div class="fnDlvReqDt" style="text-align:center;"></div>
 									</div>
 								</div>
 								<div class="itp_alt_box">
@@ -578,7 +578,7 @@
 										<label>품목수</label>
 									</div>
 									<div class="itp_info_area">
-										<div class="fnItemcnt"></div>
+										<div class="fnItemcnt" style="text-align:right;"></div>
 									</div>
 								</div>
 								<div class="itp_alt_box">
@@ -586,7 +586,7 @@
 										<label>구매요청금액</label>
 									</div>
 									<div class="itp_info_area">
-										<div class="fnPchReqAmt"></div>
+										<div class="fnPchReqAmt" style="text-align:right;"></div>
 									</div>
 								</div>
 								<div class="itp_alt_box">
@@ -594,7 +594,7 @@
 										<label>구매가능금액</label>
 									</div>
 									<div class="itp_info_area">
-										<div class="fnPchPssblAmt"></div>
+										<div class="fnPchPssblAmt" style="text-align:right;"></div>
 									</div>
 								</div>
 								<div class="itp_alt_box border">
@@ -602,7 +602,7 @@
 										<label>결제금액</label>
 									</div>
 									<div class="itp_info_area">
-										<div class="fnPchAmt"></div>
+										<div class="fnPchAmt" style="text-align:right;"></div>
 									</div>
 								</div>
 								<label class="error_info">선불매장이므로 입급을 하시고, 입금등록 후 브랜드에서 승인이 되어야 구매요청을 하실 수 있습니다.</label>
@@ -626,7 +626,7 @@
 										<label>납품요청일</label>
 									</div>
 									<div class="itp_info_area">
-										<div class="fnDlvReqDt"></div>
+										<div class="fnDlvReqDt" style="text-align:center;"></div>
 									</div>
 								</div>
 								<div class="itp_alt_box">
@@ -634,7 +634,7 @@
 										<label>품목수</label>
 									</div>
 									<div class="itp_info_area">
-										<div class="fnItemcnt"></div>
+										<div class="fnItemcnt" style="text-align:right;"></div>
 									</div>
 								</div>
 								<div class="itp_alt_box">
@@ -642,7 +642,7 @@
 										<label>구매요청금액</label>
 									</div>
 									<div class="itp_info_area">
-										<div class="fnPchReqAmt"></div>
+										<div class="fnPchReqAmt" style="text-align:right;"></div>
 									</div>
 								</div>
 								<div class="itp_alt_box">
@@ -650,7 +650,7 @@
 										<label>구매가능금액</label>
 									</div>
 									<div class="itp_info_area">
-										<div class="fnPchPssblAmt"></div>
+										<div class="fnPchPssblAmt" style="text-align:right;"></div>
 									</div>
 								</div>
 								<div class="itp_alt_box border">
@@ -658,7 +658,7 @@
 										<label>결제금액</label>
 									</div>
 									<div class="itp_info_area">
-										<div class="fnPchAmt"></div>
+										<div class="fnPchAmt" style="text-align:right;"></div>
 									</div>
 								</div>
 								<label class="error_info" style="line-height: 1.5;">구매한도가 부족합니다.<br>선입금을 하시고, 입금등록 후 브랜드에서 승인이 되어야 구매요청을 하실 수 있습니다.</label>