whakdo963 преди 2 години
родител
ревизия
83f87f5f0a

+ 0 - 43
src/main/webapp/app/popup/biz/BIZPOP_DLV_LMT_PAY.html

@@ -1,43 +0,0 @@
1
-<div id="ITP_BIZPOP_DLV_LMT_PAY" class="modal itp_modal">
2
-	<div class="modal-dialog" style="width:350px;">
3
-		<div class="modal-content">
4
-			<form id="ITP_FORM_BIZPOP_DLV_LMT_PAY">
5
-				<input type="hidden" id="ITP_FORM_BIZPOP_DLV_LMT_PAY_BRAND_ID" name="sbrandId" value="">
6
-				<div class="modal-body">
7
-					<div class="itp_form fix">
8
-						<div class="col-xs-12 itp_form_inline">
9
-							<div class="form-horizontal fix">
10
-								<div style="margin:25px 0;">
11
-									<div class="itp_div_label">
12
-										<label>납품요청일</label>
13
-										<span>:</span>
14
-										<div class="fnDlvReqDt col_a">2022.09.30</div>
15
-									</div>
16
-									<div class="itp_div_label">
17
-										<label>품목수</label>
18
-										<span>:</span>
19
-										<div class="fnPchReqQty col_a">2개</div>
20
-									</div>
21
-									<div class="itp_div_label">
22
-										<label>구매금액</label>
23
-										<span>:</span>
24
-										<div class="fnPchReqAmt col_a">424,000원</div>
25
-									</div>
26
-								</div>
27
-								<label style="text-align:left; width:100%;">구매한도가 부족합니다.</label>
28
-								<label style="text-align:left; width:100%;">선결재를 하신 후에 구매요청을 하시기 바랍니다. 결재 버튼을 누르시면 임시 저장 후 결재가 진행이 됩니다.</label>
29
-								<label style="text-align:center; width:100%; margin-top:10px;">결재를 하시겠습니까?</label>
30
-							</div>
31
-						</div>
32
-					</div>
33
-				</div>
34
-				<div class="modal-bottom">
35
-					<button type="button" class="col_3 btn btn-default" id="ITP_MODAL_ALERT_CANCEL" data-dismiss="modal">취소</button>
36
-					<button type="button" class="col_7 btn btn-primary" id="ITP_MODAL_ALERT_PAYMENT">결제</button>
37
-				</div>
38
-			</form>
39
-		</div>
40
-	</div>
41
-
42
-	<div id="ITP_POPUP_JS"></div>
43
-</div>

+ 0 - 40
src/main/webapp/app/popup/biz/BIZPOP_DLV_PCH_OK.html

@@ -1,40 +0,0 @@
1
-<div id="ITP_BIZPOP_DLV_PCH_OK" class="modal itp_modal">
2
-	<div class="modal-dialog" style="width:350px;">
3
-		<div class="modal-content">
4
-			<form id="ITP_FORM_BIZPOP_DLV_PCH_OK">
5
-				<input type="hidden" id="ITP_FORM_BIZPOP_DLV_PCH_OK_BRAND_ID" name="sbrandId" value="">
6
-				<div class="modal-body">
7
-					<div class="itp_form fix">
8
-						<div class="col-xs-12 itp_form_inline">
9
-							<div class="form-horizontal fix">
10
-								<div style="margin:25px 0;">
11
-									<div class="itp_div_label">
12
-										<label>납품요청일</label>
13
-										<span>:</span>
14
-										<div class="fnDlvReqDt col_a">2022.09.30</div>
15
-									</div>
16
-									<div class="itp_div_label">
17
-										<label>품목수</label>
18
-										<span>:</span>
19
-										<div class="fnPchReqQty col_a">2개</div>
20
-									</div>
21
-									<div class="itp_div_label">
22
-										<label>구매금액</label>
23
-										<span>:</span>
24
-										<div class="fnPchReqAmt col_a">424,000원</div>
25
-									</div>
26
-								</div>
27
-								<label style="text-align:center; width:100%;">구매요청 하시겠습니까?</label>
28
-							</div>
29
-						</div>
30
-					</div>
31
-				</div>
32
-				<div class="modal-bottom">
33
-					<button type="button" class="col_3 btn btn-default" id="ITP_MODAL_ALERT_CANCEL" data-dismiss="modal">취소</button>
34
-					<button type="button" class="col_7 btn btn-primary" id="ITP_MODAL_ALERT_CONFIRM">확인</button>
35
-				</div>
36
-			</form>
37
-		</div>
38
-	</div> 
39
-	<div id="ITP_POPUP_JS"></div>
40
-</div>

+ 0 - 41
src/main/webapp/app/popup/biz/BIZPOP_DLV_PPAY.html

@@ -1,41 +0,0 @@
1
-<div id="ITP_BIZPOP_DLV_PPAY" class="modal itp_modal">
2
-	<div class="modal-dialog" style="width:350px;">
3
-		<div class="modal-content">
4
-			<form id="ITP_FORM_BIZPOP_DLV_PPAY">
5
-				<input type="hidden" id="ITP_FORM_BIZPOP_DLV_PPAY_BRAND_ID" name="sbrandId" value="">
6
-				<div class="modal-body">
7
-					<div class="itp_form fix">
8
-						<div class="col-xs-12 itp_form_inline">
9
-							<div class="form-horizontal fix">
10
-								<div style="margin:25px 0;">
11
-									<div class="itp_div_label">
12
-										<label>납품요청일</label>
13
-										<span>:</span>
14
-										<div class="fnDlvReqDt col_a">2022.09.30</div>
15
-									</div>
16
-									<div class="itp_div_label">
17
-										<label>품목수</label>
18
-										<span>:</span>
19
-										<div class="fnPchReqQty col_a">2개</div>
20
-									</div>
21
-									<div class="itp_div_label">
22
-										<label>구매금액</label>
23
-										<span>:</span>
24
-										<div class="fnPchReqAmt col_a">424,000원</div>
25
-									</div>
26
-								</div>
27
-								<label style="text-align:left; width:100%;">선불매장이므로 결재를 하셔야 구매요청이 진행이 됩니다.</label>
28
-								<label style="text-align:center; width:100%; margin-top:10px;">결재를 하시겠습니까?</label>
29
-							</div>
30
-						</div>
31
-					</div>
32
-				</div>
33
-				<div class="modal-bottom">
34
-					<button type="button" class="col_3 btn btn-default" id="ITP_MODAL_ALERT_CANCEL" data-dismiss="modal">취소</button>
35
-					<button type="button" class="col_7 btn btn-primary" id="ITP_MODAL_ALERT_PAYMENT">결제</button>
36
-				</div>
37
-			</form>
38
-		</div>
39
-	</div>
40
-	<div id="ITP_POPUP_JS"></div>
41
-</div>

Файловите разлики са ограничени, защото са твърде много
+ 1 - 1
src/main/webapp/bootstrap/dist/css/bootstrap.min.css


+ 18 - 18
src/main/webapp/js/app/config.js

@@ -2409,38 +2409,38 @@ function itp_fn_modal_confirm(msg, fn, args) {
2409 2409
 	}
2410 2410
 };
2411 2411
 function itp_fn_modal_confirm_req1(msg, fn, args) {
2412
-	$('#ITP_MODAL_ALERT_CANCEL').show();
2413
-	$('#ITP_MODAL_ALERT').modal('show');
2414
-	$('#ITP_MODAL_ALERT').find('.itp_alert_txt').html(msg);
2412
+	$('#ITP_MODAL_PR_ALERT_CANCEL').show();
2413
+	$('#ITP_MODAL_PR_ALERT').modal('show');
2414
+	$('#ITP_MODAL_PR_ALERT').find('.itp_alert_txt').html(msg);
2415 2415
 	if (fn !== undefined || typeof fn !== 'undefined') {
2416
-		$('#ITP_MODAL_ALERT_CONFIRM').off('click');
2417
-		$('#ITP_MODAL_ALERT_CONFIRM').on('click', function() {
2416
+		$('#ITP_MODAL_PR_ALERT_CONFIRM').off('click');
2417
+		$('#ITP_MODAL_PR_ALERT_CONFIRM').on('click', function() {
2418 2418
 			fn.callBack(args);
2419
-			$('#ITP_MODAL_ALERT').modal('hide');
2419
+			$('#ITP_MODAL_PR_ALERT').modal('hide');
2420 2420
 		});
2421 2421
 	}
2422 2422
 };
2423 2423
 function itp_fn_modal_confirm_req2(msg, fn, args) {
2424
-	$('#ITP_MODAL_ALERT_CANCEL').show();
2425
-	$('#ITP_MODAL_ALERT').modal('show');
2426
-	$('#ITP_MODAL_ALERT').find('.itp_alert_txt').html(msg);
2424
+	$('#ITP_MODAL_ADV_ALERT_CANCEL').show();
2425
+	$('#ITP_MODAL_ADV_ALERT').modal('show');
2426
+	$('#ITP_MODAL_ADV_ALERT').find('.itp_alert_txt').html(msg);
2427 2427
 	if (fn !== undefined || typeof fn !== 'undefined') {
2428
-		$('#ITP_MODAL_ALERT_CONFIRM').off('click');
2429
-		$('#ITP_MODAL_ALERT_CONFIRM').on('click', function() {
2428
+		$('#ITP_MODAL_ADV_ALERT_CONFIRM').off('click');
2429
+		$('#ITP_MODAL_ADV_ALERT_CONFIRM').on('click', function() {
2430 2430
 			fn.callBack(args);
2431
-			$('#ITP_MODAL_ALERT').modal('hide');
2431
+			$('#ITP_MODAL_ADV_ALERT').modal('hide');
2432 2432
 		});
2433 2433
 	}
2434 2434
 };
2435 2435
 function itp_fn_modal_confirm_req3(msg, fn, args) {
2436
-	$('#ITP_MODAL_ALERT_CANCEL').show();
2437
-	$('#ITP_MODAL_ALERT').modal('show');
2438
-	$('#ITP_MODAL_ALERT').find('.itp_alert_txt').html(msg);
2436
+	$('#ITP_MODAL_LM_ALERT_CANCEL').show();
2437
+	$('#ITP_MODAL_LM_ALERT').modal('show');
2438
+	$('#ITP_MODAL_LM_ALERT').find('.itp_alert_txt').html(msg);
2439 2439
 	if (fn !== undefined || typeof fn !== 'undefined') {
2440
-		$('#ITP_MODAL_ALERT_CONFIRM').off('click');
2441
-		$('#ITP_MODAL_ALERT_CONFIRM').on('click', function() {
2440
+		$('#ITP_MODAL_LM_ALERT_CONFIRM').off('click');
2441
+		$('#ITP_MODAL_LM_ALERT_CONFIRM').on('click', function() {
2442 2442
 			fn.callBack(args);
2443
-			$('#ITP_MODAL_ALERT').modal('hide');
2443
+			$('#ITP_MODAL_LM_ALERT').modal('hide');
2444 2444
 		});
2445 2445
 	}
2446 2446
 };

+ 0 - 36
src/main/webapp/js/app/popup/biz/ITP_BIZPOP_DLV_LMT_PAY.js

@@ -1,36 +0,0 @@
1
-require(['config'], function() {
2
-	require([
3
-		'jquery'
4
-	], function($) {
5
-
6
-	});
7
-});
8
-
9
-let API_POP_INV_INFO = '/api/pomng/save-pchReq';
10
-
11
-function itp_fn_BIZPOP_DLV_LMT_PAY(parentPopFn, args, returnType) {
12
-	
13
-	let pageObj = {
14
-			init: function() {
15
-				this.button();
16
-			},
17
-			call: function( param) {
18
-				fn_ajax_call(API_POP_INV_INFO, JSON.stringify(param), this.callback, 'POST');
19
-				
20
-			},
21
-			button: function() {
22
-				$('#ITP_MODAL_ALERT_CANCEL').on('click', function (){
23
-					
24
-				});
25
-				$('#ITP_MODAL_ALERT_PAYMENT').on('click', function (){
26
-					
27
-				});
28
-			}, 
29
-			callback: function (result) {
30
-				console.log(result);
31
-				$('#ITP_BIZPOP_DLV_LMT_PAY .fnDlvReqDt').text(result.dlvReqDt);
32
-				$('#ITP_BIZPOP_DLV_LMT_PAY .fnPchReqQty').text(result.pchReqQty);
33
-				$('#ITP_BIZPOP_DLV_LMT_PAY .fnPchReqAmt').text(result.pchReqAmt);
34
-			},
35
-	};
36
-};

+ 0 - 36
src/main/webapp/js/app/popup/biz/ITP_BIZPOP_DLV_PCH_OK.js

@@ -1,36 +0,0 @@
1
-require(['config'], function() {
2
-	require([
3
-		'jquery'
4
-	], function($) {
5
-
6
-	});
7
-});
8
-
9
-let API_POP_INV_INFO = '/api/pomng/save-pchReq';
10
-
11
-function itp_fn_BIZPOP_DLV_PCH_OK(parentPopFn, args, returnType) {
12
-	
13
-	let pageObj = {
14
-			init: function() {
15
-				this.button();
16
-			},
17
-			call: function( param) {
18
-				fn_ajax_call(API_POP_INV_INFO, JSON.stringify(param), this.callback, 'POST');
19
-				
20
-			},
21
-			button: function() {
22
-				$('#ITP_MODAL_ALERT_CANCEL').on('click', function (){
23
-					
24
-				});
25
-				$('#ITP_MODAL_ALERT_PAYMENT').on('click', function (){
26
-					
27
-				});
28
-			}, 
29
-			callback: function (result) {
30
-				console.log(result);
31
-				$('#ITP_BIZPOP_DLV_PCH_OK .fnDlvReqDt').text(result.dlvReqDt);
32
-				$('#ITP_BIZPOP_DLV_PCH_OK .fnPchReqQty').text(result.pchReqQty);
33
-				$('#ITP_BIZPOP_DLV_PCH_OK .fnPchReqAmt').text(result.pchReqAmt);
34
-			},
35
-	};
36
-};

+ 0 - 36
src/main/webapp/js/app/popup/biz/ITP_BIZPOP_DLV_PPAY.js

@@ -1,36 +0,0 @@
1
-require(['config'], function() {
2
-	require([
3
-		'jquery'
4
-	], function($) {
5
-
6
-	});
7
-});
8
-
9
-let API_POP_INV_INFO = '/api/pomng/save-pchReq';
10
-
11
-function itp_fn_BIZPOP_DLV_DLV_PPAY(parentPopFn, args, returnType) {
12
-	
13
-	let pageObj = {
14
-			init: function() {
15
-				this.button();
16
-			},
17
-			call: function( param) {
18
-				fn_ajax_call(API_POP_INV_INFO, JSON.stringify(param), this.callback, 'POST');
19
-				
20
-			},
21
-			button: function() {
22
-				$('#ITP_MODAL_ALERT_CANCEL').on('click', function (){
23
-					
24
-				});
25
-				$('#ITP_MODAL_ALERT_PAYMENT').on('click', function (){
26
-					
27
-				});
28
-			}, 
29
-			callback: function (result) {
30
-				console.log(result);
31
-				$('#ITP_BIZPOP_DLV_DLV_PPAY .fnDlvReqDt').text(result.dlvReqDt);
32
-				$('#ITP_BIZPOP_DLV_DLV_PPAY .fnPchReqQty').text(result.pchReqQty);
33
-				$('#ITP_BIZPOP_DLV_DLV_PPAY .fnPchReqAmt').text(result.pchReqAmt);
34
-			},
35
-	};
36
-};

+ 46 - 4
src/main/webapp/main.html

@@ -299,14 +299,56 @@
299 299
 						<div class="modal-body">
300 300
 							<div class="text-center itp_alert_txt"></div>
301 301
 						</div>
302
-						<div class="modal-footer">
303
-							<button type="button" class="btn btn-default" id="ITP_MODAL_ALERT_CANCEL" data-dismiss="modal">취소</button>
304
-							<button type="button" class="btn btn-primary" id="ITP_MODAL_ALERT_CONFIRM">확인</button>
302
+						<div class="modal-bottom">
303
+							<button type="button" class="btn btn-default col_4" id="ITP_MODAL_ALERT_CANCEL" data-dismiss="modal">취소</button>
304
+							<button type="button" class="btn btn-primary col_6" id="ITP_MODAL_ALERT_CONFIRM">확인</button>
305 305
 						</div>
306 306
 					</div>
307 307
 				</div>
308 308
 			</div>
309
-		
309
+			<!-- 구매요청확인 -->
310
+			<div id="ITP_MODAL_PR_ALERT" class="modal itp_modal">
311
+				<div class="modal-dialog modal-xs">
312
+					<div class="modal-content">
313
+						<div class="modal-body">
314
+							<div class="text-center itp_alert_txt"></div>
315
+						</div>
316
+						<div class="modal-bottom">
317
+							<button type="button" class="btn btn-default col_4" id="ITP_MODAL_PR_ALERT_CANCEL" data-dismiss="modal">취소</button>
318
+							<button type="button" class="btn btn-primary col_6" id="ITP_MODAL_PR_ALERT_CONFIRM">확인</button>
319
+						</div>
320
+					</div>
321
+				</div>
322
+			</div>
323
+			<!-- 선불매장결제확인 -->
324
+			<div id="ITP_MODAL_ADV_ALERT" class="modal itp_modal">
325
+				<div class="modal-dialog modal-sm">
326
+					<div class="modal-content">		
327
+						<div class="modal-body">
328
+							<div class="text-center itp_alert_txt"></div>
329
+						</div>
330
+						<div class="modal-bottom">
331
+							<button type="button" class="btn btn-default col_4" id="ITP_MODAL_ALERT_ADV_CANCEL" data-dismiss="modal">취소</button>
332
+							<button type="button" class="btn btn-primary col_6" id="ITP_MODAL_ALERT_ADV_CONFIRM">결제</button>
333
+						</div>
334
+					</div>
335
+				</div>
336
+			</div>
337
+			<!-- 구매한도부족알림 -->
338
+			<div id="ITP_MODAL_LM_ALERT" class="modal itp_modal">
339
+				<div class="modal-dialog modal-sm">
340
+					<div class="modal-content">
341
+						<div class="modal-body">
342
+							<div class="text-center itp_alert_txt"></div>
343
+						</div>
344
+						<div class="modal-bottom">
345
+							<button type="button" class="btn btn-default col_4" id="ITP_MODAL_ALERT_LM_CANCEL" data-dismiss="modal">취소</button>
346
+							<button type="button" class="btn btn-primary col_6" id="ITP_MODAL_ALERT_LM_CONFIRM">결제</button>
347
+						</div>
348
+					</div>
349
+				</div>
350
+			</div>			
351
+			<!-- 결제확인 -->
310 352
 			<div id="ITP_MODAL_ALERT_AJAX" class="modal itp_modal">
311 353
 				<div class="modal-dialog modal-sm">
312 354
 					<div class="modal-content">