Merge branch 'master' of http://106.246.249.162:13000/orderqueen/oqpo-view

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

@@ -22,8 +22,7 @@
 								<input type="hidden" id="ITP_FORM_POMNG01010_DETAIL_PCH_REQ_ST_CD" name="pchReqStCd" value="">
 					
 								<section class="itp_form_sec">
-									<h4 class="itp_form_tit">구매요청정보</h4>
-									<div class="itp_form_in">	
+									<div class="itp_form_in border-top">	
 										<div class="form-group">
 											<label class="col-xs-2 itp_lb">브랜드 *</label>
 											<div class="col-xs-4 itp_ip">
@@ -61,7 +60,7 @@
 												<div class="col-xs-4 itp_ip">
 													<div class="col-xs-4 itp_in">
 														<div class="input-daterange input-group date">
-															<input type="text" id="ITP_FORM_POMNG01010_DETAIL_DLV_REQ_DT" data-check-required="empty" class="form-control itp_input" name="dlvReqDt" value="">
+															<input type="text" id="ITP_FORM_POMNG01010_DETAIL_DLV_REQ_DT" data-check-required="empty" class="form-control itp_input" name="dlvReqDt" value="" readonly>
 														</div>
 													</div>
 												</div>
@@ -72,12 +71,16 @@
 													<input type="hidden" id="ITP_FORM_POMNG01010_DETAIL_WHS_ID" class="form-control itp_input" name="whsId" value="" />
 												</div>
 												<div class="col-xs-4 itp_in">
-													<input type="text" id="ITP_FORM_POMNG01010_DETAIL_LOCATION_NM" data-check-required="empty" class="form-control itp_input" name="locationNm" value="" />
-													<input type="hidden" id="ITP_FORM_POMNG01010_DETAIL_LOCATION" class="form-control itp_input" name="location" value="" />
+													<div class="input-group">
+														<input type="text" id="ITP_FORM_POMNG01010_DETAIL_LOCATION_NM" data-check-required="empty" class="form-control itp_input" name="locationNm" value="" />
+														<input type="hidden" id="ITP_FORM_POMNG01010_DETAIL_LOCATION" class="form-control itp_input" name="location" value="" />
+														<span class="input-group-btn">
+															<button id="ITP_FORM_POMNG01010_DELETE_WHS_NM" class="btn btn-default btn-sm itp_btn UPB SHOW" type="button"><i class="glyphicon glyphicon-erase"></i></button>
+														</span>
+													</div>
 												</div>
 												<div class="col-xs-1 itp_in" style="width:23%; padding:0px;">
 													<button type="button" id="ITP_FORM_POMNG01010_SEARCH_WHS_NM" class="btn btn-success btn-sm SEB SHOW" style="display: inline-block;"><i class="glyphicon glyphicon-search"></i></button>
-													<button type="button" id="ITP_FORM_POMNG01010_DELETE_WHS_NM" class="btn btn-primary btn-sm UPB SHOW" style="display: inline-block;"><i class="glyphicon glyphicon-erase"></i></button>
 								                </div>		
 											</div>
 										</div>
@@ -103,7 +106,7 @@
 										</div>
 									</div>
 									<div class="itp_form_in">
-										<div class="itp_table_head fix" style="background:#f5f5f5;">
+										<div class="itp_table_head fix" style="background:#fff;">
 											<h4 class="itp_table_tit">요청 품목</h4>
 											<div class="pull-right itp_cicon">
 												<button type="button" id="ITP_BTN_POMNG01010_DETAIL_ADDROW" class="btn btn-primary btn-sm ARB" style="display: inline-block;"><i class="glyphicon "></i>&nbsp;&nbsp;품목추가&nbsp;&nbsp;</button>

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

@@ -28,9 +28,9 @@
 										</div>										
 										<div class="col-xs-3 itp_ip itp_noMar">
 											<div class="input-daterange input-group date">
-												<input type="text" id="ITP_FORM_POMNG02010_SEARCH_FROM_DT" class="form-control itp_input" name="fromDt" value="">
+												<input type="text" id="ITP_FORM_POMNG02010_SEARCH_FROM_DT" class="form-control itp_input" name="fromDt" value="" readonly>
 												<span class="input-group-addon itp_date_to">~</span>
-												<input type="text" id="ITP_FORM_POMNG02010_SEARCH_TO_DT" class="form-control itp_input" name="toDt" value="">
+												<input type="text" id="ITP_FORM_POMNG02010_SEARCH_TO_DT" class="form-control itp_input" name="toDt" value="" readonly>
 											</div>
 										</div>
 										<div class="col-xs-3 itp_ip itp_noMar">

src/main/webapp/css/ui.jqgrid-bootstrap.css

@@ -1035,7 +1035,7 @@ td.menu_text {
 .table-striped>tbody>tr:nth-of-type(odd) {
 	background-color:inherit;
 }
-.ui-jqgrid input[type=checkbox] {width:15px; height:15px;}
+.ui-jqgrid input[type=checkbox] {width:15px; height:15px; margin:0 auto;}
 
 .ui-jqgrid .jqgrid-rownum {background-color: transparent !important;}
 .table>tbody>tr.active .jqgrid-rownum {background:#e8e8e8 !important; z-index:1}

src/main/webapp/mobile/app/login.html

@@ -19,7 +19,6 @@
       <form id="ITP_FORM_MOBILE_LOGIN" class="form-horizontal" action="" method="post" onsubmit="return false;">
         <input id="userId" name="userId" type="hidden" value="" />
         <input id="password" name="password" type="hidden" value="" />
-        <!--<input id="brandId" name="brandId" type="hidden" value="" />-->
       <div class="login_popup">
         <div class="login_info">
           <h1>서비스<br>VISUAL IMAGE</h1>
@@ -46,7 +45,7 @@
             <label for="ITP_FORM_LOGIN_USER_PW">비밀번호</label>
           </div>
         </div>
-        <div class="error">
+        <div class="error" style="display: none">
           <label>사업자번호와 관련된 브랜드 정보가 없습니다.</label>
         </div>
       </div>

src/main/webapp/mobile/app/mpomng/MPOMNG01010.html

@@ -7,7 +7,8 @@
       <input type="hidden" id="ITP_FORM_MPOMNG01010_DETAIL_LOAN_DVSN" name="loanDvsn" value="">
       <input type="hidden" id="ITP_FORM_MPOMNG01010_DETAIL_LOAN_MGNT_UNQ_NO" name="loanMgntUnqNo" value="">
       <input type="hidden" id="ITP_FORM_MPOMNG01010_DETAIL_PCH_REQ_DVSN" name="pchReqDvsn" value="">
-        <input type="hidden" id="ITP_FORM_MPOMNG01010_DETAIL_PCH_REQ_ST_CD" name="pchReqStCd" value="">
+      <input type="hidden" id="ITP_FORM_MPOMNG01010_DETAIL_PCH_REQ_ST_CD" name="pchReqStCd" value="">
+      <input type="hidden" id="ITP_FORM_MPOMNG01010_DETAIL_PG_AFFL_ID" name="pgAfflId" value="">
       <div class="content">
         <div class="line">
           <label>납기요청일</label>

src/main/webapp/mobile/js/app/login.js

@@ -36,9 +36,9 @@ function itp_fn_login_init() {
 
 function itp_fn_login_reg_no() {
 	if ($('#ITP_FORM_LOGIN_BSNS_REG_NO').val() === '') {
-		$('#ITP_FORM_LOGIN_ERROR_REG_NO').show();
+		$('.error').show();
 	} else {
-		$('#ITP_FORM_LOGIN_ERROR_REG_NO').hide();
+		$('.error').hide();
 
 		var callbackFn = function(result) {
 			fn_make_select_brand(result.gridRows, 'ITP_FORM_LOGIN_BRAND_ID');

src/main/webapp/mobile/js/app/main.js

@@ -12,9 +12,6 @@ require(['config'], function() {
 
 var mobMainObj = {
 	init: function () {
-		$('#ITP_BTN_CLOSE').on('click', function() {
-			console.log('ITP_BTN_CLOSE clicked!!!');
-		});
 	},
 
 };

src/main/webapp/mobile/js/app/mloanmng/ITP_MLOANMNG02010.js

@@ -63,7 +63,7 @@ let mobPageObj = {
 				switch (id) {
 					case 'ITP_BTN_MLOANMNG02010_LIST_SEARCH_RTN_PLACE'	: mobPopObj.popStoreNm.init(); 			break;
 					case 'ITP_BTN_MLOANMNG02010_LIST_DELETE_RTN_PLACE'	: mobPopObj.popStoreNm.delete(); 		break;
-					case 'ITP_BTN_MLOANMNG02010_LIST_PAY'				: mobContentObj.list.payment.view();		break;
+					case 'ITP_BTN_MLOANMNG02010_LIST_PAY'				: mobContentObj.list.payment.view();	break;
 					case 'ITP_BTN_MLOANMNG02010_LIST_ADD'				: mobContentObj.list.add();				break;
 					case 'ITP_BTN_MLOANMNG02010_LIST_SEARCH'			: mobContentObj.list.search();			break;
 				}

src/main/webapp/mobile/js/app/mpomng/ITP_MPOMNG01010.js

@@ -89,8 +89,18 @@ let mobContObj = {
 				$('#ITP_FORM_MPOMNG01010_DETAIL #ITP_FORM_MPOMNG01010_DETAIL_LOAN_DVSN').val(result.loanDvsn);
 				$('#ITP_FORM_MPOMNG01010_DETAIL #ITP_FORM_MPOMNG01010_DETAIL_LOAN_MGNT_UNQ_NO').val(result.loanMgntUnqNo);
 				$('#ITP_FORM_MPOMNG01010_DETAIL #ITP_FORM_MPOMNG01010_DETAIL_PCH_REQ_DVSN').val(result.pchReqDvsn);
+				$('#ITP_FORM_MPOMNG01010_DETAIL #ITP_FORM_MPOMNG01010_DETAIL_PG_AFFL_ID').val(result.pgAfflId);
 
 				$('#ITP_FORM_MPOMNG01010_DETAIL .fnOrdUseAmt').text(CommonObj.currency.add(result.ordUseAmt));
+				if(result.whsId !== '' && result.location !== '') {
+					$('#ITP_FORM_MPOMNG01010_DETAIL #ITP_FORM_MPOMNG01010_DETAIL_WHS_ID').val(result.whsId);
+					$('#ITP_FORM_MPOMNG01010_DETAIL #ITP_FORM_MPOMNG01010_DETAIL_WHS_NM').val(result.whsNm);
+					$('#ITP_FORM_MPOMNG01010_DETAIL #ITP_FORM_MPOMNG01010_DETAIL_LOCATION').val(result.location);
+
+					$('#ITP_FORM_MPOMNG01010_DETAIL #ITP_FORM_MPOMNG01010_DETAIL_WHS_NM').attr('readonly', true);
+					$('#ITP_FORM_MPOMNG01010_DETAIL #ITP_BTN_MPOMNG01010_DETAIL_SEARCH_WHS_NM').attr('disabled', true);
+					$('#ITP_FORM_MPOMNG01010_DETAIL #ITP_BTN_MPOMNG01010_DETAIL_DELETE_WHS_NM').attr('disabled', true);
+				}
 			};
 			const param = {brandId:fn_make_user_info.get('brandId'), storeId:fn_make_user_info.get('storeId')};
 			fn_ajax_call(API_MOBILE_INIT_INFO, param, callbackFn, 'GET');
@@ -299,6 +309,7 @@ let mobPopObj = {
 		}
 	},
 	popReqConfirm: {
+		saveMode: 1, // 1 : 임시저장, 2 : 구매요청, 요청금액이 가능금액보다 클 경우 (3 : PG 정보 없음, 4 : 선불매장, 5 : 후불매장)
 		init: function (parentId) {
 			this.formId = '#ITP_FORM_MPOMNG01010_DETAIL';
 			this.pchReqStCd = (parentId === 'ITP_BTN_MPOMNG01010_DETAIL_REQ_ORDER') ? PCH_REQ_ST_CD_REQUEST_SAVE : PCH_REQ_ST_CD_TEMP_SAVE;
@@ -306,25 +317,53 @@ let mobPopObj = {
 			this.action();
 		},
 		view: function() {
-			$('#ITP_POP_MPOMNG01010_REQ_AREA .fnPopDlvReqDt').text($('#ITP_FORM_MPOMNG01010_DETAIL #ITP_FORM_MPOMNG01010_DETAIL_DLV_REQ_DT').val());
-			$('#ITP_POP_MPOMNG01010_REQ_AREA .fnItemQty').text(CommonObj.currency.add(mobContObj.list.rows.length, '개'));
-			$('#ITP_POP_MPOMNG01010_REQ_AREA .fnOrdAmt').text(CommonObj.currency.add($('#ITP_FORM_MPOMNG01010_DETAIL .fnPchReqAmtTot').text()));
-			if(this.pchReqStCd === PCH_REQ_ST_CD_REQUEST_SAVE) {
-				var popMsg = '구매요청 하시겠습니까?';
-				let param = $(this.formId).serializeObject();
-				var ordUseAmt = CommonObj.onlyNumber($('#ITP_FORM_MPOMNG01010_DETAIL .fnOrdUseAmt').text());
-				var pchReqAmtTot = CommonObj.onlyNumber($('#ITP_FORM_MPOMNG01010_DETAIL .fnPchReqAmtTot').text());
-				if (parseInt(ordUseAmt) < parseInt(pchReqAmtTot)) {
-					popMsg = (param.loanDvsn !== 'LD03' && param.loanDvsn === 'LD01') ? ITP_MSG_LOCALE.message.ajax.lackReqAmt : ITP_MSG_LOCALE.message.ajax.lackReqAmt;
-					$('#ITP_POP_MPOMNG01010_REQ_AREA #ITP_BTN_MPOMNG01010_POP_REQ_CONFIRM').text('결제');
-					this.saveMode = 'PAY';
+			var popMsg = '';
+			var loanDvsn = $('#ITP_FORM_MPOMNG01010_DETAIL #ITP_FORM_MPOMNG01010_DETAIL_LOAN_DVSN').val();
+			if(this.pchReqStCd === PCH_REQ_ST_CD_REQUEST_SAVE) { // 구매요청
+				console.log(loanDvsn);
+				if(loanDvsn === 'LD03') {		// 무정산
+					this.saveMode = 2;
+					popMsg = '구매요청 하시겠습니까?';
+					$('#ITP_POP_MPOMNG01010_REQ_AREA #ITP_BTN_MPOMNG01010_POP_REQ_CONFIRM').text('확인');
+				} else {
+					var ordUseAmt = CommonObj.onlyNumber($('#ITP_FORM_MPOMNG01010_DETAIL .fnOrdUseAmt').text());
+					var pchReqAmtTot = CommonObj.onlyNumber($('#ITP_FORM_MPOMNG01010_DETAIL .fnPchReqAmtTot').text());
+					if (parseInt(ordUseAmt) < parseInt(pchReqAmtTot)) { // 요청금액이 가능금액보다 클 경우
+						if($('#ITP_FORM_MPOMNG01010_DETAIL #ITP_FORM_MPOMNG01010_DETAIL_PG_AFFL_ID').val() === '') {	// PG 정보 없음
+							this.saveMode = 3;
+							popMsg = 	'무통장 입금 후 구매요청해 주세요.\n' +
+										'임시저장 하시겠습니까?';
+							$('#ITP_POP_MPOMNG01010_REQ_AREA #ITP_BTN_MPOMNG01010_POP_REQ_CONFIRM').text('확인');
+						} else {
+							if(loanDvsn === 'LD01') {	// 선불매장
+								this.saveMode = 4;
+								popMsg = 	'선불매장이므로 결재를 하셔야 구매요청이 진행이 됩니다.\n' +
+											'결재를 하시겠습니까?';
+								$('#ITP_POP_MPOMNG01010_REQ_AREA #ITP_BTN_MPOMNG01010_POP_REQ_CONFIRM').text('결제');
+							} else if(loanDvsn === 'LD02') { // 후불매장
+								this.saveMode = 5;
+								popMsg = 	'구매한도가 부족합니다.\n' +
+											'선결재를 하신 후에 구매요청을 하시기 바랍니다.\n' +
+											'결재 버튼을 누르시면 임시 저장 후 결재가 진행이 됩니다.\n' +
+											'결재를 하시겠습니까?';
+								$('#ITP_POP_MPOMNG01010_REQ_AREA #ITP_BTN_MPOMNG01010_POP_REQ_CONFIRM').text('결제');
+							}
+						}
+					} else {
+						this.saveMode = 2;
+						popMsg = '구매요청 하시겠습니까?';
+						$('#ITP_POP_MPOMNG01010_REQ_AREA #ITP_BTN_MPOMNG01010_POP_REQ_CONFIRM').text('확인');
+					}
 				}
-				$('#ITP_POP_MPOMNG01010_REQ_AREA .msg_save').text(popMsg);
-			} else {
-				this.saveMode = 'SAVE';
-				$('#ITP_POP_MPOMNG01010_REQ_AREA .msg_save').text('임시저장 하시겠습니까?');
+			} else { // 임시저장
+				this.saveMode = 1;
+				popMsg = '임시저장 하시겠습니까?';
 				$('#ITP_POP_MPOMNG01010_REQ_AREA #ITP_BTN_MPOMNG01010_POP_REQ_CONFIRM').text('확인');
 			}
+			$('#ITP_POP_MPOMNG01010_REQ_AREA .fnPopDlvReqDt').text($('#ITP_FORM_MPOMNG01010_DETAIL #ITP_FORM_MPOMNG01010_DETAIL_DLV_REQ_DT').val());
+			$('#ITP_POP_MPOMNG01010_REQ_AREA .fnItemQty').text(CommonObj.currency.add(mobContObj.list.rows.length, '개'));
+			$('#ITP_POP_MPOMNG01010_REQ_AREA .fnOrdAmt').text($('#ITP_FORM_MPOMNG01010_DETAIL .fnPchReqAmtTot').text());
+			$('#ITP_POP_MPOMNG01010_REQ_AREA .msg_save').text(popMsg);
 		},
 		action: function() {
 			var _this = this;
@@ -334,22 +373,8 @@ let mobPopObj = {
 			});
 		},
 		save: function() {
-			let param = $(this.formId).serializeObject();
-			console.log(JSON.stringify(param));
-
-			// if (param.loanDvsn !== 'LD03' && this.pchReqStCd === PCH_REQ_ST_CD_REQUEST_SAVE ) {
-			// 	var pchActAtm = $('#ITP_FORM_POMNG01010_DETAIL .fnPchActAmt').text();
-			// 	var pchReqAtm = $('#ITP_FORM_POMNG01010_DETAIL .fnPchReqAmt').text();
-			//
-			// 	if (parseInt(pchActAtm) < parseInt(pchReqAtm)) {
-			// 		alert(ITP_MSG_LOCALE.message.ajax.lackReqAmt);
-			// 		return;
-			// 	}
-			// }
-
-			if(this.saveMode === 'PAY') {
-				alert('결제 페이지 이동!!!');
-			} else {
+			var procSave = function () {
+				let param = $('#ITP_FORM_MPOMNG01010_DETAIL').serializeObject();
 				$.each(mobContObj.list.rows, function(index, item) {
 					item['viewCd'] = 'C';
 				});
@@ -361,6 +386,21 @@ let mobPopObj = {
 					mobPopObj.hide('ITP_POP_MPOMNG01010_REQ_AREA');
 				};
 				fn_ajax_call(API_MOBILE_SAVE, JSON.stringify(param), saveFn, 'POST');
+			};
+			if (this.saveMode === 1 || this.saveMode === 2 || this.saveMode === 3) {
+				if(this.saveMode === 3)
+					$('#ITP_FORM_MPOMNG01010_DETAIL #ITP_FORM_MPOMNG01010_DETAIL_PCH_REQ_ST_CD').val(PCH_REQ_ST_CD_TEMP_SAVE);
+				procSave();
+			} else if (this.saveMode === 4 || this.saveMode === 5) {
+				var payFn = function(result) {
+					console.log(result);
+				};
+				var args = {
+					'payTpCd': this.saveMode === 4 ? '10' : '30',
+					'brandId': $('#ITP_FORM_MPOMNG01010_DETAIL_BRAND_ID').val(),
+					'storeId': $('#ITP_FORM_MPOMNG01010_DETAIL_STORE_ID').val()
+				};
+				itp_fn_payment.call(args, payFn);
 			}
 		}
 	},

src/main/webapp/mobile/js/config.js

@@ -675,6 +675,26 @@ let itp_fn_form_event = {
 	}
 };
 
+let itp_fn_payment = {
+	call: function(param, fn) {
+		this.popup(param, fn);
+	},
+	popup: function(param, fn) {
+		// 결제 팝업 결과
+		var popFn = function(rowDataPop) {
+			if(fn) fn(rowDataPop);
+		};
+		// 결제 팝업
+		// 결제타입코드 : 10(선불(충전)), 20(후불(결제)), 30(후불(선결제))
+		var args = {
+			'payTpCd': param.loanDvsn,
+			'brandId': param.brandId,
+			'storeId': param.storeId
+		};
+		fn_call_popup('biz', 'BIZPOP_PO_PAYMENT', '#ITP_ASIDE', popFn, args, 'M');
+	}
+};
+
 let CommonObj = {
 	listSize: 10,
 	jsonParam: function(formId) {

src/main/webapp/mobile/js/properties.js

@@ -1,5 +1,6 @@
 
-const DOMAIN = 'http://106.246.249.162:38050';
+//const DOMAIN = 'http://106.246.249.162:38050';
+const DOMAIN = 'http://192.168.0.13:8050';
 const ITP_CONTEXTPATH = '/oqpo-view';
 const MOBILE_CONTEXTPATH = ITP_CONTEXTPATH + '/mobile';
 const ITP_LANGUAGE = 'ko';