카드결제 및 구매발주 배송구분 수정

src/main/webapp/app/pomng/POMNG01010.html

@@ -21,6 +21,7 @@
 								<input type="hidden" id="ITP_FORM_POMNG01010_DETAIL_PCH_REQ_DVSN" name="pchReqDvsn" value="">
 								<input type="hidden" id="ITP_FORM_POMNG01010_DETAIL_PCH_REQ_ST_CD" name="pchReqStCd" value="">
 								<input type="hidden" id="ITP_FORM_POMNG01010_DETAIL_PCH_REQ_UNQ_NO" name="pchReqUnqNo" value="">
+								<input type="hidden" id="ITP_FORM_POMNG01010_DETAIL_MALL_ID" name="mallId" value="">
 					
 								<section class="itp_form_sec">
 									<div class="itp_form_in border-top">	

src/main/webapp/app/pomng/POMNG03010.html

@@ -92,6 +92,7 @@
 								<input type="hidden" id="ITP_FORM_POMNG03010_DETAIL_SHMT_LOCATION" name="shmtLocation" value="">
 								<input type="hidden" id="ITP_FORM_POMNG03010_DETAIL_PODR_MGR_ID" name="podrMgrId" value="">
 								<input type="hidden" id="ITP_FORM_POMNG03010_DETAIL_PODR_MGR_TEL_NO" name="podrMgrTelNo" value="">
+								<input type="text" id="ITP_FORM_POMNG03010_DETAIL_DLV_DVSN" name="dlvDvsn" value="">
 								
 								
 								
@@ -129,14 +130,10 @@
 											<label class="col-xs-2 itp_lb">발주담당자</label>
 											<div class="col-xs-4 itp_ip fnPodrMgrNm"></div>
 											<label class="col-xs-2 itp_lb">배송구분</label>
-											<div class="col-xs-4 itp_ip">
-												<div class="col-xs-5 itp_in">
-												    <select id="ITP_FORM_POMNG03010_DETAIL_DLV_DVSN" data-select-code="DLV_DVSN" data-check-required="empty" class="form-control itp_input" name="dlvDvsn" readonly="readonly" >
-												    </select>
-												</div>
-											</div>
+											<div class="col-xs-4 itp_ip fnDlvDvsnNm"></div>
 										</div>
 									</div>
+									
 									<div class="itp_form_in">	
 										<div class="form-group">
 											<label class="col-xs-2 itp_lb">납품요청일</label>

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

@@ -2467,7 +2467,7 @@ function itp_fn_modal_confirm_req4(param, fn, args) {
 		$('#ITP_MODAL_ALERT_SAVE_ADV_CONFIRM').off('click');
 		$('#ITP_MODAL_ALERT_SAVE_ADV_CONFIRM').on('click', function() {
 			fn.callBack(args);
-			$('#ITP_MODAL_ADV_ALERT').modal('hide');
+			$('#ITP_MODAL_SAVE_ADV_ALERT').modal('hide');
 		});
 	}
 };
@@ -2482,7 +2482,7 @@ function itp_fn_modal_confirm_req5(param, fn, args) {
 		$('#ITP_MODAL_ALERT_SAVE_LM_CONFIRM').off('click');
 		$('#ITP_MODAL_ALERT_SAVE_LM_CONFIRM').on('click', function() {
 			fn.callBack(args);
-			$('#ITP_MODAL_LM_ALERT').modal('hide');
+			$('#ITP_MODAL_SAVE_LM_ALERT').modal('hide');
 		});
 	}
 };

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

@@ -361,14 +361,26 @@ let createObj = {
 					//itp_fn_currency_unfmatter
 					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();
+					
+					
 					
 					if (parseInt(pchActAtm) < parseInt(pchReqAtm)) {
 						dlvReqAmt = itp_fn_number_comma(String(parseInt(pchReqAtm) - parseInt(pchActAtm)));
-						console.log(dlvReqAmt);
-						if (loanDvsn == 'LD01') {
-							apprTypeCd = 'NP';
+						
+						if (mallId == '') {
+							if (loanDvsn == 'LD01') {
+								apprTypeCd = 'NPN';
+							} else {
+								apprTypeCd = 'NAN';
+							}
 						} else {
-							apprTypeCd = 'NA';
+							if (loanDvsn == 'LD01') {
+								apprTypeCd = 'NP';
+							} else {
+								apprTypeCd = 'NA';
+							}
+							
 						}
 					}
 				}    
@@ -470,12 +482,12 @@ let createObj = {
 			itp_fn_modal_confirm(ITP_MSG_LOCALE.message.ajax.tmpSave, saveFn, null);
 		},
 		saveApprReq: function(param, apprTypeCd, arg) {
+			
 			var apprFn =  {
 				callBack: function(args) {
 						// 결재금액이 부족하여 결재란으로 이동처리
 						var popFn = function(rowDataPop) {
 							// 결재 성공시 승인처리함 
-							console.log(rowDataPop);
 							createObj.button.saveLastReq(arg);
 						};			
 						// 결제 팝업 : LD01(선불(충전)), LD02(후불(신용))
@@ -495,11 +507,27 @@ let createObj = {
 						fn_call_popup('biz', 'BIZPOP_PO_PAYMENT', '#ITP_ASIDE', popFn, args, 'S');
 					}
 				};
+				
+			var apprNFn =  {
+				callBack: function(args) {
+						// 임시저장 처리한다.
+						arg = 'PR00';
+						$('#ITP_FORM_POMNG01010_DETAIL_PCH_REQ_ST_CD').val(arg);
+						
+						createObj.button.saveLastReq(arg);
+					}
+				};
 			
+			//console.log(apprTypeCd) ;
 			if (apprTypeCd == 'NP') {  // 선불
 				itp_fn_modal_confirm_req2(param, apprFn, arg);
-			} else { //후불
+			} else if (apprTypeCd == 'NA') { //후불
 				itp_fn_modal_confirm_req3(param, apprFn, arg);
+			} else if (apprTypeCd == 'NPN') { //선불 pg없음 임시저장으로
+				itp_fn_modal_confirm_req4(param, apprNFn, arg);
+			} else if (apprTypeCd == 'NAN') { //후불  pg없음 임시저장으로
+				console.log("itp_fn_modal_confirm_req5");
+				itp_fn_modal_confirm_req5(param, apprNFn, arg);
 			}
 		},
 		saveLastReq: function(arg) {
@@ -556,6 +584,8 @@ let createObj = {
 		$('#ITP_FORM_POMNG01010_DETAIL #ITP_FORM_POMNG01010_DETAIL_WHS_NM').val(result.whsNm);
 		$('#ITP_FORM_POMNG01010_DETAIL #ITP_FORM_POMNG01010_DETAIL_LOCATION').val(result.location);
 		$('#ITP_FORM_POMNG01010_DETAIL #ITP_FORM_POMNG01010_DETAIL_LOCATION_NM').val(result.locationNm);
+		$('#ITP_FORM_POMNG01010_DETAIL #ITP_FORM_POMNG01010_DETAIL_MALL_ID').val(result.mallId);
+		
 		$('#ITP_FORM_POMNG01010_DETAIL .fnBrandNm').text(result.brandNm);
 		$('#ITP_FORM_POMNG01010_DETAIL .fnPchReqDept').text(result.reqDept);
 		$('#ITP_FORM_POMNG01010_DETAIL .fnPchReqMgrNm').text(result.userNm);

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

@@ -1140,7 +1140,7 @@ let modifyObj = {
 		$('#ITP_FORM_POMNG03010_DETAIL .fnPodrMgrNm').text(result.podrMgrNm);
 		$('#ITP_FORM_POMNG03010_DETAIL #ITP_FORM_POMNG03010_DETAIL_PODR_MGR_TEL_NO').val(result.podrMgrTelNo);
 		$('#ITP_FORM_POMNG03010_DETAIL #ITP_FORM_POMNG03010_DETAIL_DLV_DVSN').val(result.dlvDvsn);
-		//$('#ITP_FORM_POMNG03010_DETAIL #ITP_FORM_POMNG03010_DETAIL_').val(result.dlvDvsnNm);
+		$('#ITP_FORM_POMNG03010_DETAIL .fnDlvDvsnNm').text(result.dlvDvsnNm);
 		$('#ITP_FORM_POMNG03010_DETAIL .fnPodrAmt').text(itp_fn_number_comma(result.podrTotalAmt));
 		$('#ITP_FORM_POMNG03010_DETAIL #ITP_FORM_POMNG03010_DETAIL_DLV_REQ_DT').val(result.dlvReqDt);
 		$('#ITP_FORM_POMNG03010_DETAIL #ITP_FORM_POMNG03010_DETAIL_SHMT_WHS_ID').val(result.shmtWhsId);

src/main/webapp/main.html

@@ -376,7 +376,7 @@
 										<label>구매금액</label>
 									</div>
 									<div class="itp_info_area">
-										<div class="fnPchReqAmt"></div>
+										<div class="fnDlvReqAmt"></div>
 									</div>
 								</div>
 								<label class="error_info">선불매장이므로 결재를 하셔야<br> 구매요청이 진행이 됩니다.<br>결재를 하시겠습니까?</label>
@@ -416,10 +416,10 @@
 										<label>구매금액</label>
 									</div>
 									<div class="itp_info_area">
-										<div class="fnPchReqAmt"></div>
+										<div class="fnDlvReqAmt"></div>
 									</div>
 								</div>
-								<label class="error_info" style="line-height: 1.5;">구매한도가 부족합니다.<br>선결재를 하신 후에 구매요청을 하시기 바랍니다.<br>결재 버튼을 누르시면 임시 저장 후 결재가 진행이 됩니다.<br>결재를 하시겠습니까?</label>
+								<label class="error_info" style="line-height: 1.5;">구매한도가 부족합니다.<br> 선결재를 하신 후에 구매요청이 진행이 됩니다.<br>결재를 하시겠습니까?</label>
 							</div>						
 						</div>
 						<div class="modal-bottom">
@@ -456,7 +456,7 @@
 										<label>구매금액</label>
 									</div>
 									<div class="itp_info_area">
-										<div class="fnPchReqAmt"></div>
+										<div class="fnDlvReqAmt"></div>
 									</div>
 								</div>
 								<label class="error_info">선불매장이므로 입급을 하시고, 입금등록 후 브랜드에서 승인이 되어야 구매요청을 하실 수 있습니다.</label>
@@ -496,7 +496,7 @@
 										<label>구매금액</label>
 									</div>
 									<div class="itp_info_area">
-										<div class="fnPchReqAmt"></div>
+										<div class="fnDlvReqAmt"></div>
 									</div>
 								</div>
 								<label class="error_info" style="line-height: 1.5;">구매한도가 부족합니다.<br>선입금을 하시고, 입금등록 후 브랜드에서 승인이 되어야 구매요청을 하실 수 있습니다.</label>