Bläddra i källkod

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

yhl88 2 år sedan
förälder
incheckning
8ea5853e71

+ 1 - 1
src/main/webapp/app/popup/biz/BIZPOP_STTL_REJECT_REASON.html

@@ -12,7 +12,7 @@
12 12
 							<form id="ITP_FORM_STTL_REJECT_REASON_POPUP">
13 13
 								<div class="form-group">
14 14
 									<label class="col-xs-2 itp_lb">반려사유</label>
15
-									<div class="col-xs-10 itp_ip">
15
+									<div class="col-xs-9 itp_ip">
16 16
 									<input type="text" id="ITP_FORM_STTL_REJECT_REASON_POPUP_STTL_RJCT_RSN" class="form-control itp_input" name="sttlRjctRsn" />
17 17
 									</div>									
18 18
 								</div>								

+ 15 - 11
src/main/webapp/app/settmng/SETTMNG01010.html

@@ -21,21 +21,27 @@
21 21
 								
22 22
 									<div class="form-group">
23 23
 										<div class="col-xs-2 itp_ip itp_noMar">
24
-											<input type="text" id="ITP_FORM_SETTMNG01010_SEARCH_STORE_NM" class="form-control itp_input" name="sstoreNm" placeholder="매장선택" readonly="readonly" value="" />
24
+											<div class="input-group">
25
+												<input type="text" id="ITP_FORM_SETTMNG01010_SEARCH_STORE_NM" class="form-control itp_input" name="sstoreNm" placeholder="매장선택" readonly="readonly" value="" />
26
+												<span class="input-group-btn">
27
+													<button id="ITP_BTN_SETTMNG01010_STORE_ERASE" class="btn btn-default btn-sm itp_btn UPB" type="button"><i class="glyphicon glyphicon-remove"></i></button>
28
+												</span>
29
+											</div>
25 30
 										</div>
26 31
 										<div class="col-xs-1 itp_ip itp_noMar">
27 32
 											<button type="button" id="ITP_BTN_SETTMNG01010_STORE_SEARCH" class="btn btn-success btn-sm SEB" style="display: inline-block;"><i class="glyphicon glyphicon-search"></i></button>
28
-											<button type="button" id="ITP_BTN_SETTMNG01010_STORE_ERASE" class="btn btn-primary btn-sm UPB" style="display: inline-block;"><i class="glyphicon glyphicon-erase"></i></button>
29 33
 										</div>
30
-										<div class="col-xs-3 itp_ip itp_noMar">
31
-											<div class="col-xs-4 itp_ip itp_noMar" style="top:2px">
32
-												<label>입고/수거일자</label>
34
+										<div class="col-xs-5 itp_ip itp_noMar">
35
+											<div class="col-xs-4 itp_ip itp_noMar">
36
+												<select id="ITP_FORM_SETTMNG01010_SEARCH_" class="form-control itp_input" >
37
+													<option value="">입고/수거일자</option>
38
+												</select>
33 39
 											</div>
34 40
 											<div class="col-xs-8 itp_ip itp_noMar">
35 41
 												<div class="input-daterange input-group date">
36
-													<input type="text" id="ITP_FORM_SETTMNG01010_SEARCH_FROM_DT" class="form-control itp_input" name="fromDt" value="">
42
+													<input type="text" id="ITP_FORM_SETTMNG01010_SEARCH_FROM_DT" class="form-control itp_input" name="fromDt" value="" readonly>
37 43
 													<span class="input-group-addon itp_date_to">~</span>
38
-													<input type="text" id="ITP_FORM_SETTMNG01010_SEARCH_TO_DT" class="form-control itp_input" name="toDt" value="">
44
+													<input type="text" id="ITP_FORM_SETTMNG01010_SEARCH_TO_DT" class="form-control itp_input" name="toDt" value="" readonly>
39 45
 												</div>
40 46
 											</div>
41 47
 										</div>
@@ -66,8 +72,7 @@
66 72
 								<input type="hidden" id="ITP_FORM_SETTMNG01010_DETAIL_STTL_MGNT_UNQ_NO" name="sttlMgntUnqNo" value="">
67 73
 					
68 74
 								<section class="itp_form_sec">
69
-									<h4 class="itp_form_tit">정산 상세정보</h4>
70
-									<div class="itp_form_in">
75
+									<div class="itp_form_in border-top">
71 76
 										<div class="form-group">
72 77
 											<label class="col-xs-2 itp_lb">브랜드 *</label>
73 78
 												<div class="col-xs-4 itp_ip">
@@ -123,11 +128,10 @@
123 128
 						</div>
124 129
 					</div>
125 130
 					<div class="itp_table fix">
126
-					    <div class="itp_table_head fix" style="background:#f5f5f5;">
131
+					    <div class="itp_table_head fix" style="background:#fff;">
127 132
 					        <h4 class="itp_table_tit">정산 대상 내역</h4>
128 133
 					    </div>
129 134
 					    <div id="ITP_SETTMNG01010_DETAIL_jqGrid_list" class="itp_tb_list">
130
-					        <div id="ITP_SETTMNG01010_DETAIL_jqGridView" class="itp_views fix"></div>
131 135
 					        <table id="ITP_SETTMNG01010_DETAIL_jqGrid"></table>
132 136
 					        <div id="ITP_SETTMNG01010_DETAIL_jqGridPager"></div>
133 137
 					        <div id="ITP_SETTMNG01010_DETAIL_jqGridEmpty" class="itp_no_data"></div>

+ 17 - 12
src/main/webapp/app/settmng/SETTMNG02010.html

@@ -23,21 +23,26 @@
23 23
 								
24 24
 									<div class="form-group">
25 25
 										<div class="col-xs-2 itp_ip itp_noMar">
26
-											<input type="text" id="ITP_FORM_SETTMNG02010_SEARCH_STORE_SPPLY_NM" class="form-control itp_input" placeholder="공급사명" readonly="readonly" />
26
+											<div class="input-group">
27
+												<input type="text" id="ITP_FORM_SETTMNG02010_SEARCH_STORE_SPPLY_NM" class="form-control itp_input" placeholder="공급사명" readonly="readonly" />
28
+												<span class="input-group-btn">
29
+													<button id="ITP_BTN_SETTMNG02010_SEARCH_ERASE" class="btn btn-default btn-sm itp_btn UPB" type="button"><i class="glyphicon glyphicon-remove"></i></button>
30
+												</span>
31
+											</div>
27 32
 										</div>
28 33
 										<div class="col-xs-1 itp_in" style="width:8%; padding:0px;">
29 34
 											<button type="button" id="ITP_BTN_SETTMNG02010_SEARCH_SPPLY_POP" class="btn btn-success btn-sm SEB" style="display: inline-block;"><i class="glyphicon glyphicon-search"></i></button>
30
-											<button type="button" id="ITP_BTN_SETTMNG02010_SEARCH_ERASE" class="btn btn-primary btn-sm SEB" style="display: inline-block;"><i class="glyphicon glyphicon-erase"></i></button>
31 35
 						                </div>
32
-						                
33
-						                <div class="col-xs-1 itp_ip itp_noMar" style="top:3px; margin-right: -15px;" >
34
-											<label>정산요청일</label>
36
+						                <div class="col-xs-2 itp_ip itp_noMar">
37
+											<select id="ITP_FORM_SETTMNG02010_SEARCH_" class="form-control itp_input" >
38
+												<option value="">정산요청일</option>
39
+											</select>
35 40
 										</div>
36
-										<div class="col-xs-2 itp_ip itp_noMar">
41
+										<div class="col-xs-3 itp_ip itp_noMar">
37 42
 											<div class="input-daterange input-group date">
38
-												<input type="text" id="ITP_FORM_SETTMNG02010_SEARCH_FROM_DT" class="form-control itp_input" name="fromDt" value="">
43
+												<input type="text" id="ITP_FORM_SETTMNG02010_SEARCH_FROM_DT" class="form-control itp_input" name="fromDt" value="" readonly>
39 44
 												<span class="input-group-addon itp_date_to">~</span>
40
-												<input type="text" id="ITP_FORM_SETTMNG02010_SEARCH_TO_DT" class="form-control itp_input" name="toDt" value=""> 
45
+												<input type="text" id="ITP_FORM_SETTMNG02010_SEARCH_TO_DT" class="form-control itp_input" name="toDt" value="" readonly> 
41 46
 											</div>
42 47
 										</div>
43 48
 										<div class="col-xs-2 itp_ip itp_noMar">
@@ -68,8 +73,7 @@
68 73
 								<input type="hidden" id="ITP_FORM_SETTMNG02010_DETAIL_STTL_MGNT_UNQ_NO" name="sttlMgntUnqNo" value="">
69 74
 					
70 75
 								<section class="itp_form_sec">
71
-									<h4 class="itp_form_tit">정산 상세정보</h4>
72
-									<div class="itp_form_in">
76
+									<div class="itp_form_in border-top">
73 77
 										<div class="form-group">
74 78
 											<label class="col-xs-2 itp_lb">브랜드</label>
75 79
 												<div class="col-xs-4 itp_ip">
@@ -128,9 +132,10 @@
128 132
 						</div>
129 133
 					</div>
130 134
 					<div class="itp_table fix">
131
-						<h4 class="itp_form_tit" style="background:#eee; padding:18px 18px; margin:0; border-left:none;">정산 대상 내역</h4>
135
+				    	<div class="itp_table_head fix" style="background:#fff;">
136
+							<h4 class="itp_form_tit">정산 대상 내역</h4>
137
+						</div>
132 138
 						<div id="ITP_SETTMNG02010_DETAIL_jqGrid_list" class="itp_tb_list itp_gType1" data-total-cnt="${totalCnt}">
133
-							<div id="ITP_SETTMNG02010_DETAIL_jqGridView" class="itp_views fix"></div>
134 139
 							<table id="ITP_SETTMNG02010_DETAIL_jqGrid"></table>
135 140
 							<div id="ITP_SETTMNG02010_DETAIL_jqGridPager"></div>
136 141
 							<div id="ITP_SETTMNG02010_DETAIL_jqGridEmpty" class="itp_no_data"></div>

+ 16 - 28
src/main/webapp/app/settmng/SETTMNG03010.html

@@ -21,45 +21,33 @@
21 21
 								<input type="hidden" id="ITP_FORM_SETTMNG03010_SEARCH_STORE_SPPLY_GUBUN" name="sgubun" value="1">
22 22
 								
23 23
 									<div class="form-group">
24
-										<!--  
25
-										<div class="col-xs-2 itp_ip itp_noMar">
26
-											<select id="ITP_FORM_SETTMNG03010_SEARCH_STORE_SPPLY_GUBUN" class="form-control itp_input" name="sgubun">
27
-												<option value="1">매장</option>											
28
-												<option value="2">공급업체</option>											
29
-											</select>
30
-										</div>
31
-										-->
32 24
 										<div class="col-xs-2 itp_ip itp_noMar">
25
+											<div class="input-group">
33 26
 											<input type="text" id="ITP_FORM_SETTMNG03010_SEARCH_STORE_SPPLY_NM" class="form-control itp_input" placeholder="매장명" readonly="readonly" />
27
+												<span class="input-group-btn">
28
+													<button id="ITP_BTN_SETTMNG03010_SEARCH_ERASE" class="btn btn-default btn-sm itp_btn UPB" type="button"><i class="glyphicon glyphicon-remove"></i></button>
29
+												</span>
30
+											</div>
34 31
 										</div>
35 32
 										<div class="col-xs-1 itp_in" style="width:8%; padding:0px;">
36 33
 											<button type="button" id="ITP_BTN_SETTMNG03010_SEARCH_STORE_POP" class="btn btn-success btn-sm SEB" style="display: inline-block;"><i class="glyphicon glyphicon-search"></i></button>
37
-											<button type="button" id="ITP_BTN_SETTMNG03010_SEARCH_ERASE" class="btn btn-primary btn-sm SEB" style="display: inline-block;"><i class="glyphicon glyphicon-erase"></i></button>
38 34
 						                </div>
39
-						                
40
-						                <div class="col-xs-1 itp_ip itp_noMar" style="top:3px; margin-right: -15px;" >
41
-											<label>정산요청일</label>
35
+						                <div class="col-xs-2 itp_ip itp_noMar">
36
+											<select id="ITP_FORM_SETTMNG03010_SEARCH_" class="form-control itp_input" >
37
+												<option value="">정산요청일</option>
38
+											</select>
42 39
 										</div>
43
-										<div class="col-xs-2 itp_ip itp_noMar">
40
+										<div class="col-xs-3 itp_ip itp_noMar">
44 41
 											<div class="input-daterange input-group date">
45
-												<input type="text" id="ITP_FORM_SETTMNG03010_SEARCH_FROM_DT" class="form-control itp_input" name="fromDt" value="">
42
+												<input type="text" id="ITP_FORM_SETTMNG03010_SEARCH_FROM_DT" class="form-control itp_input" name="fromDt" value="" readonly>
46 43
 												<span class="input-group-addon itp_date_to">~</span>
47
-												<input type="text" id="ITP_FORM_SETTMNG03010_SEARCH_TO_DT" class="form-control itp_input" name="toDt" value=""> 
44
+												<input type="text" id="ITP_FORM_SETTMNG03010_SEARCH_TO_DT" class="form-control itp_input" name="toDt" value="" readonly> 
48 45
 											</div>
49 46
 										</div>
50 47
 										<div class="col-xs-2 itp_ip itp_noMar">
51 48
 											<select id="ITP_FORM_SETTMNG03010_SEARCH_STTL_ST_CD" data-select-code="STTL_ST_CD" class="form-control itp_input" name="ssttlStCd"></select>
52 49
 										</div>
53
-										<!--  
54
-										<div class="col-xs-2 itp_ip itp_noMar">
55
-											<input type="text" id="ITP_FORM_SETTMNG03010_SEARCH_ITEM_NM" class="form-control itp_input" name="sitemNm" placeholder="품목명" />
56
-										</div>
57
-										-->						                
58
-									</div>
59
-									<!--  
60
-									<div class="form-group" style="padding-top: 10px; border-top: 1px dotted #ccc;">										
61 50
 									</div>
62
-									-->
63 51
 								</form>
64 52
 							</div>
65 53
 						</div>
@@ -86,8 +74,7 @@
86 74
 								<input type="hidden" id="ITP_FORM_SETTMNG03010_DETAIL_STTL_REQ_AMT" name="sttlReqAmt" value="">
87 75
 					
88 76
 								<section class="itp_form_sec">
89
-									<h4 class="itp_form_tit">정산 상세정보</h4>
90
-									<div class="itp_form_in">
77
+									<div class="itp_form_in border-top">
91 78
 										<div class="form-group">
92 79
 											<label class="col-xs-2 itp_lb">브랜드 *</label>
93 80
 												<div class="col-xs-4 itp_ip">
@@ -166,9 +153,10 @@
166 153
 						</div>
167 154
 					</div>
168 155
 					<div class="itp_table fix">
169
-						<h4 class="itp_form_tit" style="background:#eee; padding:18px 18px; margin:0; border-left:none;">정산 대상 내역</h4>
156
+						<div class="itp_table_head fix" style="background:#fff;">
157
+							<h4 class="itp_form_tit">정산 대상 내역</h4>
158
+						</div>						
170 159
 						<div id="ITP_SETTMNG03010_DETAIL_jqGrid_list" class="itp_tb_list itp_gType1" data-total-cnt="${totalCnt}">
171
-							<div id="ITP_SETTMNG03010_DETAIL_jqGridView" class="itp_views fix"></div>
172 160
 							<table id="ITP_SETTMNG03010_DETAIL_jqGrid"></table>
173 161
 							<div id="ITP_SETTMNG03010_DETAIL_jqGridPager"></div>
174 162
 							<div id="ITP_SETTMNG03010_DETAIL_jqGridEmpty" class="itp_no_data"></div>

Filskillnaden har hållts tillbaka eftersom den är för stor
+ 6 - 1
src/main/webapp/bootstrap/dist/css/bootstrap.min.css


+ 8 - 4
src/main/webapp/css/style.css

@@ -571,9 +571,13 @@ _:-ms-fullscreen, :root .itp_logs {max-width: 1287px}
571 571
 #ITP_FOOTER .itp_modal .itp_form .input-daterange .input-group-addon {padding:3px 5px;}
572 572
 #ITP_FOOTER .itp_modal .itp_form .itp_date_to {background:#fff;}
573 573
 #ITP_FOOTER .itp_modal .itp_form .itp_lb.itp_required:before {content:'*'; color:#a94442; position:absolute; top:8px; left:8px;}
574
-#ITP_FOOTER .modal-body .itp_alt_box {display:inline-flex;}
575
-#ITP_FOOTER .modal-body .itp_alt_box label {text-align:left; min-width:80px;}
576
-#ITP_FOOTER .modal-body .itp_alt_box div {text-align:right; width:100px;}
574
+#ITP_FOOTER .modal-body .itp_alt_box {display:inline-flex; border:2px solid #ccc; border-bottom:none;}
575
+#ITP_FOOTER .modal-body .itp_alt_box.border {border-bottom:1px solid #ccc;}
576
+#ITP_FOOTER .modal-body .itp_alt_box .itp_label_area {width:100px; height:40px; padding:10px; text-align:left; background:#f5f5f5;}
577
+#ITP_FOOTER .modal-body .itp_alt_box .itp_label_area label {text-align:left; min-width:80px;}
578
+#ITP_FOOTER .modal-body .itp_alt_box .itp_info_area {border-left:1px solid #ccc; width:210px;}
579
+#ITP_FOOTER .modal-body .itp_alt_box .itp_info_area div {text-align: left; width:auto; padding:10px;}
580
+#ITP_FOOTER .modal-body .error_info {margin-top:15px;}
577 581
 #ITP_FOOTER .modal.in .modal-dialog {
578 582
     -webkit-transform:translate(0, calc(50vh - 50%));
579 583
     -ms-transform:translate(0, 50vh) translate(0, -50%);
@@ -592,7 +596,7 @@ _:-ms-fullscreen, :root .itp_logs {max-width: 1287px}
592 596
 #ITP_ASIDE .itp_modal .itp_form .shot{height:43px !important; border-bottom:1px solid #aaa;}
593 597
 #ITP_ASIDE .itp_modal .itp_form .form-group.border {border-bottom:1px solid #ddd;}
594 598
 #ITP_ASIDE .itp_modal .itp_form .form-control {font-size:13px; color:#333;}
595
-#ITP_ASIDE .itp_modal .itp_form .itp_lb {top:0; font-size:13px; margin:0; padding:13px 12px; height:44px; background:#eee; width:100px; min-width:100px; border-right:1px solid #aaa; border-left:1px solid #ccc;}
599
+#ITP_ASIDE .itp_modal .itp_form .itp_lb {top:0; font-size:13px; margin:0; padding:13px 12px; height:44px; background:#eee; width:125px; min-width:100px; border-right:1px solid #aaa; border-left:1px solid #ccc;}
596 600
 #ITP_ASIDE .itp_modal .itp_form .itp_lb.itp_normal {font-weight:normal; padding-left:19px;}
597 601
 #ITP_ASIDE .itp_modal .itp_form .itp_ip {padding:9px 10px 0 10px;;}
598 602
 #ITP_ASIDE .itp_modal .itp_form .itp_ip.itp_pr {margin-right:0; padding-right:10px;}

+ 30 - 1
src/main/webapp/js/app/config.js

@@ -2456,7 +2456,36 @@ function itp_fn_modal_confirm_req3(param, fn, args) {
2456 2456
 		});
2457 2457
 	}
2458 2458
 };
2459
-
2459
+//선불매장결제확인-임시저장
2460
+function itp_fn_modal_confirm_req4(param, fn, args) {
2461
+	$('#ITP_MODAL_ALERT_SAVE_ADV_CANCEL').show();
2462
+	$('#ITP_MODAL_SAVE_ADV_ALERT').modal('show');
2463
+	$('#ITP_MODAL_SAVE_ADV_ALERT').find('.fnDlvReqDt').html(param.dlvReqDt);
2464
+	$('#ITP_MODAL_SAVE_ADV_ALERT').find('.fnItemcnt').html(param.itemcnt + " 개");
2465
+	$('#ITP_MODAL_SAVE_ADV_ALERT').find('.fnDlvReqAmt').html(param.dlvReqAmt + " 원");
2466
+	if (fn !== undefined || typeof fn !== 'undefined') {
2467
+		$('#ITP_MODAL_ALERT_SAVE_ADV_CONFIRM').off('click');
2468
+		$('#ITP_MODAL_ALERT_SAVE_ADV_CONFIRM').on('click', function() {
2469
+			fn.callBack(args);
2470
+			$('#ITP_MODAL_ADV_ALERT').modal('hide');
2471
+		});
2472
+	}
2473
+};
2474
+//구매한도부족알림-임시저장
2475
+function itp_fn_modal_confirm_req5(param, fn, args) {
2476
+	$('#ITP_MODAL_ALERT_SAVE_LM_CANCEL').show();
2477
+	$('#ITP_MODAL_SAVE_LM_ALERT').modal('show');
2478
+	$('#ITP_MODAL_SAVE_LM_ALERT').find('.fnDlvReqDt').html(param.dlvReqDt);
2479
+	$('#ITP_MODAL_SAVE_LM_ALERT').find('.fnItemcnt').html(param.itemcnt + " 개");
2480
+	$('#ITP_MODAL_SAVE_LM_ALERT').find('.fnDlvReqAmt').html(param.dlvReqAmt + " 원");
2481
+	if (fn !== undefined || typeof fn !== 'undefined') {
2482
+		$('#ITP_MODAL_ALERT_SAVE_LM_CONFIRM').off('click');
2483
+		$('#ITP_MODAL_ALERT_SAVE_LM_CONFIRM').on('click', function() {
2484
+			fn.callBack(args);
2485
+			$('#ITP_MODAL_LM_ALERT').modal('hide');
2486
+		});
2487
+	}
2488
+};
2460 2489
 function itp_fn_form_clear_validate(modal, form) {
2461 2490
 	$(form).find('.itp_ip').removeClass('has-error');
2462 2491
 	$(form).find('.help-block').remove();

+ 16 - 7
src/main/webapp/js/app/settmng/ITP_SETTMNG01010.js

@@ -68,7 +68,7 @@ const gridColModel = {
68 68
 		{
69 69
 			index: 'STORE_NM', name: 'storeNm',
70 70
 			label: "매장명",
71
-			width: '10', fixed: false, align: 'center',
71
+			width: '10', fixed: false, align: 'left',
72 72
 			sortable: false, hidden: false
73 73
 		},
74 74
 		{
@@ -99,12 +99,14 @@ const gridColModel = {
99 99
 			index: 'ITEM_ID', name: 'itemId',
100 100
 			label: "품목코드",
101 101
 			width: '10', fixed: false, align: 'center',
102
+			minwidth: 140,
102 103
 			sortable: false, editable: false, edittype: 'text'
103 104
 		},
104 105
 		{
105 106
 			index: 'ITEM_NM', name: 'itemNm',
106 107
 			label: "품목명",
107
-			width: '10', fixed: false, align: 'center',
108
+			width: '10', fixed: false, align: 'left',
109
+			minwidth: 100,
108 110
 			sortable: false, editable: false, edittype: 'text'
109 111
 		},
110 112
 		{
@@ -116,28 +118,31 @@ const gridColModel = {
116 118
 		{
117 119
 			index: 'UNIT_AMT', name: 'unitAmt',
118 120
 			label: "단가",
119
-			width: '7', fixed: false, align: 'center',
121
+			width: '7', fixed: false, align: 'right',
120 122
 			sortable: false, editable: false, edittype: 'text', 
121 123
 			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
122 124
 		},
123 125
 		{
124 126
 			index: 'PODR_QTY', name: 'podrQty',
125 127
 			label: "발주수량",
126
-			width: '7', fixed: false, align: 'center',
128
+			width: '7', fixed: false, align: 'right',
129
+			minwidth: 80,
127 130
 			sortable: false, editable: false, edittype: 'text', 
128 131
 			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
129 132
 		},
130 133
 		{
131 134
 			index: 'DLV_QTY', name: 'dlvQty',
132 135
 			label: "납품수량",
133
-			width: '7', fixed: false, align: 'center',
136
+			width: '7', fixed: false, align: 'right',
137
+			minwidth: 80,
134 138
 			sortable: false, editable: false, edittype: 'text', 
135 139
 			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
136 140
 		},
137 141
 		{
138 142
 			index: 'WHS_COL_QTY', name: 'whsColQty',
139 143
 			label: "입고/수거수량",
140
-			width: '10', fixed: false, align: 'center',
144
+			width: '10', fixed: false, align: 'right',
145
+			minwidth: 100,
141 146
 			sortable: false, editable: false, edittype: 'text', 
142 147
 			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
143 148
 		}, 
@@ -145,12 +150,14 @@ const gridColModel = {
145 150
 			index: 'WHS_COL_DT', name: 'whsColDt',
146 151
 			label: "입고/수거일자",
147 152
 			width: '10', fixed: false, align: 'center',
153
+			minwidth: 100,
148 154
 			sortable: false, editable: false, edittype: 'text'
149 155
 		},
150 156
 		{
151 157
 			index: 'WHS_COL_AMT', name: 'whsColAmt',
152 158
 			label: "입고/수거금액",
153
-			width: '10', fixed: false, align: 'center',
159
+			width: '10', fixed: false, align: 'right',
160
+			minwidth: 100,
154 161
 			sortable: false, editable: false, edittype: 'text', 
155 162
 			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
156 163
 		},
@@ -170,11 +177,13 @@ const gridColModel = {
170 177
 			index: 'PODR_UNQ_NO', name: 'podrUnqNo',
171 178
 			label: "발주번호",
172 179
 			width: '8', fixed: false, align: 'center',
180
+			minwidth: 140,
173 181
 			sortable: false, editable: false, edittype: 'text'
174 182
 		},
175 183
 		{
176 184
 			index: 'PODR_DTL_NO', name: 'podrDtlNo',
177 185
 			label: "발주항번",
186
+			minwidth: 80,
178 187
 			width: '7', fixed: false, align: 'center',
179 188
 			sortable: false, editable: false, edittype: 'text'
180 189
 		}	

+ 5 - 4
src/main/webapp/js/app/settmng/ITP_SETTMNG02010.js

@@ -57,12 +57,13 @@ const gridColModel = {
57 57
 		{
58 58
 			index: 'SPPLY_NM', name: 'spplyNm',
59 59
 			label: "공급사명",
60
-			width: '10', fixed: false, align: 'center',
60
+			width: '10', fixed: false, align: 'left',
61 61
 			sortable: false, hidden: false
62 62
 		},
63 63
 		{
64 64
 			index: 'STTL_MGNT_UNQ_NO', name: 'sttlMgntUnqNo',
65 65
 			label: "정산번호", 
66
+			minwidth: 160,
66 67
 			width: '10', fixed: false, align: 'center',
67 68
 			sortable: false, hidden: false
68 69
 		},
@@ -87,7 +88,7 @@ const gridColModel = {
87 88
 		{
88 89
 			index: 'STTL_REQ_AMT', name: 'sttlReqAmt',
89 90
 			label: "정산요청금액",
90
-			width: '10', fixed: false, align: 'center',
91
+			width: '10', fixed: false, align: 'right',
91 92
 			sortable: false, editable: false, edittype: 'text', 
92 93
 			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
93 94
 		}, 
@@ -100,14 +101,14 @@ const gridColModel = {
100 101
 		{
101 102
 			index: 'STTL_REQ_AMT', name: 'sttlAmt',
102 103
 			label: "정산금액",
103
-			width: '10', fixed: false, align: 'center',
104
+			width: '10', fixed: false, align: 'right',
104 105
 			sortable: false, editable: false, edittype: 'text', 
105 106
 			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
106 107
 		},
107 108
 		{
108 109
 			index: 'ACCT_BAL', name: 'acctBal',
109 110
 			label: "잔금",
110
-			width: '10', fixed: false, align: 'center',
111
+			width: '10', fixed: false, align: 'right',
111 112
 			sortable: false, editable: false, edittype: 'text', 
112 113
 			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
113 114
 		}, 

+ 5 - 4
src/main/webapp/js/app/settmng/ITP_SETTMNG03010.js

@@ -50,7 +50,7 @@ const gridColModel = {
50 50
 		{
51 51
 			index: 'STORE_NM', name: 'storeNm',
52 52
 			label: "매장명",
53
-			width: '10', fixed: false, align: 'center',
53
+			width: '10', fixed: false, align: 'left',
54 54
 			sortable: false, hidden: false
55 55
 		},
56 56
 		{
@@ -69,6 +69,7 @@ const gridColModel = {
69 69
 			index: 'STTL_MGNT_UNQ_NO', name: 'sttlMgntUnqNo',
70 70
 			label: "정산번호", 
71 71
 			width: '10', fixed: false, align: 'center',
72
+			minwidth: 180,
72 73
 			sortable: false, hidden: false
73 74
 		},
74 75
 		{
@@ -92,7 +93,7 @@ const gridColModel = {
92 93
 		{
93 94
 			index: 'STTL_REQ_AMT', name: 'sttlReqAmt',
94 95
 			label: "정산요청금액",
95
-			width: '10', fixed: false, align: 'center',
96
+			width: '10', fixed: false, align: 'right',
96 97
 			sortable: false, editable: false, edittype: 'text', 
97 98
 			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
98 99
 		}, 
@@ -105,14 +106,14 @@ const gridColModel = {
105 106
 		{
106 107
 			index: 'STTL_REQ_AMT', name: 'sttlAmt',
107 108
 			label: "정산확정금액",
108
-			width: '10', fixed: false, align: 'center',
109
+			width: '10', fixed: false, align: 'right',
109 110
 			sortable: false, editable: false, edittype: 'text', 
110 111
 			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
111 112
 		},
112 113
 		{
113 114
 			index: 'UNPAID_AMT', name: 'unpaidAmt',
114 115
 			label: "미납금액",
115
-			width: '10', fixed: false, align: 'center',
116
+			width: '10', fixed: false, align: 'right',
116 117
 			sortable: false, editable: false, edittype: 'text', 
117 118
 			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
118 119
 		}, 

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

@@ -305,33 +305,42 @@
305 305
 						</div>
306 306
 						<div class="modal-bottom">
307 307
 							<button type="button" class="btn btn-default col_4" id="ITP_MODAL_ALERT_CANCEL" data-dismiss="modal">취소</button>
308
-							<button type="button" class="btn btn-primary col_6" id="ITP_MODAL_ALERT_CONFIRM">확인</button>
308
+							<button type="button" class="btn btn-primary col_10" id="ITP_MODAL_ALERT_CONFIRM">확인</button>
309 309
 						</div>
310 310
 					</div>
311 311
 				</div>
312 312
 			</div>
313
-			<!-- 구매요청확인 -->
313
+			<!-- 구매요청확인 --><!-- ITP_MODAL_PR_ALERT -->
314 314
 			<div id="ITP_MODAL_PR_ALERT" class="modal itp_modal">
315
-				<div class="modal-dialog modal-xs">
315
+				<div class="modal-dialog modal-md">
316 316
 					<div class="modal-content">
317 317
 						<div class="modal-body">
318
-							<div class="text-center" style="margin-top:10px;">
318
+							<div class="text-left" style="margin-top:10px;">
319 319
 								<div class="itp_alt_box">
320
-									<label>납품요청일</label>
321
-									<span>:</span>
322
-									<div class="fnDlvReqDt"></div>
320
+									<div class="itp_label_area">
321
+										<label>납품요청일</label>
322
+									</div>
323
+									<div class="itp_info_area">
324
+										<div class="fnDlvReqDt"></div>
325
+									</div>
323 326
 								</div>
324 327
 								<div class="itp_alt_box">
325
-									<label>품목수</label>
326
-									<span>:</span>
327
-									<div class="fnItemcnt"></div>
328
+									<div class="itp_label_area">
329
+										<label>품목수</label>
330
+									</div>
331
+									<div class="itp_info_area">
332
+										<div class="fnItemcnt"></div>
333
+									</div>
328 334
 								</div>
329
-								<div class="itp_alt_box">
330
-									<label>구매금액</label>
331
-									<span>:</span>
332
-									<div class="fnPchReqAmt"></div>
335
+								<div class="itp_alt_box border">
336
+									<div class="itp_label_area">
337
+										<label>구매금액</label>
338
+									</div>
339
+									<div class="itp_info_area">
340
+										<div class="fnPchReqAmt"></div>
341
+									</div>
333 342
 								</div>
334
-								<label style="margin:10px 0;">구매요청 하시겠습니까?</label>
343
+								<label class="error_info">구매요청 하시겠습니까?</label>
335 344
 							</div>
336 345
 						</div>
337 346
 						<div class="modal-bottom">
@@ -341,28 +350,37 @@
341 350
 					</div>
342 351
 				</div>
343 352
 			</div>
344
-			<!-- 선불매장결제확인 -->
353
+			<!-- 선불매장결제확인 --><!-- ITP_MODAL_ADV_ALERT -->
345 354
 			<div id="ITP_MODAL_ADV_ALERT" class="modal itp_modal">
346
-				<div class="modal-dialog modal-sm">
355
+				<div class="modal-dialog modal-md">
347 356
 					<div class="modal-content">		
348 357
 						<div class="modal-body">
349
-							<div class="text-center">
358
+							<div class="text-left">
350 359
 								<div class="itp_alt_box">
351
-									<label>납품요청일</label>
352
-									<span>:</span>
353
-									<div class="fnDlvReqDt"></div>
360
+									<div class="itp_label_area">
361
+										<label>납품요청일</label>
362
+									</div>
363
+									<div class="itp_info_area">
364
+										<div class="fnDlvReqDt"></div>
365
+									</div>
354 366
 								</div>
355 367
 								<div class="itp_alt_box">
356
-									<label>품목수</label>
357
-									<span>:</span>
358
-									<div class="fnItemcnt"></div>
368
+									<div class="itp_label_area">
369
+										<label>품목수</label>
370
+									</div>
371
+									<div class="itp_info_area">
372
+										<div class="fnItemcnt"></div>
373
+									</div>
359 374
 								</div>
360
-								<div class="itp_alt_box">
361
-									<label>추가결재금액</label>
362
-									<span>:</span>
363
-									<div class="fnDlvReqAmt"></div>
375
+								<div class="itp_alt_box border">
376
+									<div class="itp_label_area">
377
+										<label>구매금액</label>
378
+									</div>
379
+									<div class="itp_info_area">
380
+										<div class="fnPchReqAmt"></div>
381
+									</div>
364 382
 								</div>
365
-								<label style="margin:10px 0;">선불매장이므로 결재를 하셔야 구매요청이 진행이 됩니다.<br>결재를 하시겠습니까?</label>
383
+								<label class="error_info">선불매장이므로 결재를 하셔야<br> 구매요청이 진행이 됩니다.<br>결재를 하시겠습니까?</label>
366 384
 							</div>
367 385
 						</div>
368 386
 						<div class="modal-bottom">
@@ -372,28 +390,37 @@
372 390
 					</div>
373 391
 				</div>
374 392
 			</div>
375
-			<!-- 구매한도부족알림 -->
393
+			<!-- 구매한도부족알림 --><!-- ITP_MODAL_LM_ALERT -->
376 394
 			<div id="ITP_MODAL_LM_ALERT" class="modal itp_modal">
377
-				<div class="modal-dialog modal-sm">
395
+				<div class="modal-dialog modal-md">
378 396
 					<div class="modal-content">
379 397
 						<div class="modal-body">
380
-							<div class="text-center">
398
+							<div class="text-left">
381 399
 								<div class="itp_alt_box">
382
-									<label>납품요청일</label>
383
-									<span>:</span>
384
-									<div class="fnDlvReqDt"></div>
400
+									<div class="itp_label_area">
401
+										<label>납품요청일</label>
402
+									</div>
403
+									<div class="itp_info_area">
404
+										<div class="fnDlvReqDt"></div>
405
+									</div>
385 406
 								</div>
386 407
 								<div class="itp_alt_box">
387
-									<label>품목수</label>
388
-									<span>:</span>
389
-									<div class="fnItemcnt"></div>
408
+									<div class="itp_label_area">
409
+										<label>품목수</label>
410
+									</div>
411
+									<div class="itp_info_area">
412
+										<div class="fnItemcnt"></div>
413
+									</div>
390 414
 								</div>
391
-								<div class="itp_alt_box">
392
-									<label>추가결재금액</label>
393
-									<span>:</span>
394
-									<div class="fnDlvReqAmt"></div>
415
+								<div class="itp_alt_box border">
416
+									<div class="itp_label_area">
417
+										<label>구매금액</label>
418
+									</div>
419
+									<div class="itp_info_area">
420
+										<div class="fnPchReqAmt"></div>
421
+									</div>
395 422
 								</div>
396
-								<label style="margin:10px 0; line-height: 1.5;">구매한도가 부족합니다.<br>선결재를 하신 후에 구매요청을 하시기 바랍니다. 결재 버튼을 누르시면 임시 저장 후 결재가 진행이 됩니다. <br>결재를 하시겠습니까?</label>
423
+								<label class="error_info" style="line-height: 1.5;">구매한도가 부족합니다.<br>선결재를 하신 후에 구매요청을 하시기 바랍니다.<br>결재 버튼을 누르시면 임시 저장 후 결재가 진행이 됩니다.<br>결재를 하시겠습니까?</label>
397 424
 							</div>						
398 425
 						</div>
399 426
 						<div class="modal-bottom">
@@ -402,7 +429,87 @@
402 429
 						</div>
403 430
 					</div>
404 431
 				</div>
405
-			</div>			
432
+			</div>		
433
+			<!-- 임시저장-선불매장결제확인 --><!-- ITP_MODAL_SAVE_ADV_ALERT -->
434
+			<div id=ITP_MODAL_SAVE_ADV_ALERT class="modal itp_modal">
435
+				<div class="modal-dialog modal-md">
436
+					<div class="modal-content">		
437
+						<div class="modal-body">
438
+							<div class="text-left">
439
+								<div class="itp_alt_box">
440
+									<div class="itp_label_area">
441
+										<label>납품요청일</label>
442
+									</div>
443
+									<div class="itp_info_area">
444
+										<div class="fnDlvReqDt"></div>
445
+									</div>
446
+								</div>
447
+								<div class="itp_alt_box">
448
+									<div class="itp_label_area">
449
+										<label>품목수</label>
450
+									</div>
451
+									<div class="itp_info_area">
452
+										<div class="fnItemcnt"></div>
453
+									</div>
454
+								</div>
455
+								<div class="itp_alt_box border">
456
+									<div class="itp_label_area">
457
+										<label>구매금액</label>
458
+									</div>
459
+									<div class="itp_info_area">
460
+										<div class="fnPchReqAmt"></div>
461
+									</div>
462
+								</div>
463
+								<label class="error_info">선불매장이므로 입급을 하시고, 입금등록 후 브랜드에서 승인이 되어야 구매요청을 하실 수 있습니다.</label>
464
+							</div>
465
+						</div>
466
+						<div class="modal-bottom">
467
+							<button type="button" class="btn btn-default col_4" id="ITP_MODAL_ALERT_SAVE_ADV_CANCEL" data-dismiss="modal">취소</button>
468
+							<button type="button" class="btn btn-primary col_6" id="ITP_MODAL_ALERT_SAVE_ADV_CONFIRM">임시저장</button>
469
+						</div>
470
+					</div>
471
+				</div>
472
+			</div>
473
+			<!-- 임시저장-구매한도부족알림 --><!-- ITP_MODAL_SAVE_LM_ALERT -->
474
+			<div id="ITP_MODAL_SAVE_LM_ALERT" class="modal itp_modal">
475
+				<div class="modal-dialog modal-md">
476
+					<div class="modal-content">
477
+						<div class="modal-body">
478
+							<div class="text-left">
479
+								<div class="itp_alt_box">
480
+									<div class="itp_label_area">
481
+										<label>납품요청일</label>
482
+									</div>
483
+									<div class="itp_info_area">
484
+										<div class="fnDlvReqDt"></div>
485
+									</div>
486
+								</div>
487
+								<div class="itp_alt_box">
488
+									<div class="itp_label_area">
489
+										<label>품목수</label>
490
+									</div>
491
+									<div class="itp_info_area">
492
+										<div class="fnItemcnt"></div>
493
+									</div>
494
+								</div>
495
+								<div class="itp_alt_box border">
496
+									<div class="itp_label_area">
497
+										<label>구매금액</label>
498
+									</div>
499
+									<div class="itp_info_area">
500
+										<div class="fnPchReqAmt"></div>
501
+									</div>
502
+								</div>
503
+								<label class="error_info" style="line-height: 1.5;">구매한도가 부족합니다.<br>선입금을 하시고, 입금등록 후 브랜드에서 승인이 되어야 구매요청을 하실 수 있습니다.</label>
504
+							</div>						
505
+						</div>
506
+						<div class="modal-bottom">
507
+							<button type="button" class="btn btn-default col_4" id="ITP_MODAL_ALERT_SAVE_LM_CANCEL" data-dismiss="modal">취소</button>
508
+							<button type="button" class="btn btn-primary col_6" id="ITP_MODAL_ALERT_SAVE_LM_CONFIRM">임시저장</button>
509
+						</div>
510
+					</div>
511
+				</div>
512
+			</div>
406 513
 			<!-- 결제확인 -->
407 514
 			<div id="ITP_MODAL_ALERT_AJAX" class="modal itp_modal">
408 515
 				<div class="modal-dialog modal-sm">
@@ -414,8 +521,8 @@
414 521
 						<div class="modal-body">
415 522
 							<div class="text-center itp_alert_txt"></div>
416 523
 						</div>
417
-						<div class="modal-footer">
418
-							<button type="button" class="btn btn-primary" id="ITP_MODAL_ALERT_AJAX_CONFIRM">확인</button>
524
+						<div class="modal-bottom">
525
+							<button type="button" class="btn btn-primary col_10" id="ITP_MODAL_ALERT_AJAX_CONFIRM">확인</button>
419 526
 						</div>
420 527
 					</div>
421 528
 				</div>

+ 29 - 16
src/main/webapp/mobile/app/easypay/oqpo/mobile_order_res_submit.jsp

@@ -29,16 +29,14 @@ request.setCharacterEncoding("utf-8");
29 29
 <meta http-equiv="X-UA-Compatible" content="IE=Edge" />
30 30
 <meta name="robots" content="noindex, nofollow" />
31 31
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
32
+<script src="../../../../js/jquery.min.js"></script>
32 33
 <script>
33 34
     /*--KICC 서버로부터 인증응답 파라미터 수신--*/
34 35
     window.onload = function()
35 36
     {
36
-        try {
37
-        } catch (err) {
38
-        }
39
-        console.log(res_cd + " : <%=getNullToSpace(request.getParameter("sp_res_cd"))           %>");
37
+        var res_cd = "<%=getNullToSpace(request.getParameter("sp_res_cd"))%>";
40 38
         // <!--공통-->
41
-        window.document.getElementById("sp_res_cd").value             = "<%=getNullToSpace(request.getParameter("sp_res_cd"))           %>";  // [필수]응답코드
39
+        window.document.getElementById("sp_res_cd").value             = res_cd;  // [필수]응답코드
42 40
         window.document.getElementById("sp_res_msg").value            = "<%=getNullToSpace(request.getParameter("sp_res_msg"))          %>";  // [필수]응답메세지
43 41
         window.document.getElementById("sp_tr_cd").value              = "<%=getNullToSpace(request.getParameter("sp_tr_cd"))            %>";  // [필수]결제창 요청구분
44 42
         window.document.getElementById("sp_ret_pay_type").value       = "<%=getNullToSpace(request.getParameter("sp_ret_pay_type"))     %>";  // [필수]결제수단
@@ -68,27 +66,42 @@ request.setCharacterEncoding("utf-8");
68 66
         // <!--선불카드-->
69 67
         window.document.getElementById("sp_prepaid_cp").value         = "<%=getNullToSpace(request.getParameter("sp_prepaid_cp"))       %>";  // [선택]선불카드 CP코드
70 68
 
71
-        if( "<%=request.getParameter("sp_res_cd") %>" == "0000" )
69
+        if( res_cd == "0000" )
72 70
         {
73
-            // alert('TODO 결제승인처리');
74
-            frm_pay.target = "_self";
75
-            frm_pay.action = "../easypay_request.jsp";
76
-            frm_pay.submit();
71
+            location.replace('app:pay:result:' + JSON.stringify(objectifyForm()));
77 72
         }
78 73
         else
79 74
         {
80
-            alert( urldecode("<%=request.getParameter("sp_res_cd") %> : <%=request.getParameter("sp_res_msg") %>"));
81
-            // 에러 발생시 어떻게 처리할까?
82
-            // 이전 팝업으로는 돌아갈 수 없다.
83
-            // location.href="./order.jsp";
84
-            history.back(-1);
75
+            alert( urldecode(res_cd + " : <%=request.getParameter("sp_res_msg") %>"));
76
+            var resText = '{\"sp_res_cd\" : \"' + res_cd + '\"}';
77
+            location.replace('app:pay:result:' + resText);
85 78
         }
86
-    }
79
+    };
87 80
     
88 81
     function urldecode( str ) {
89 82
         // 공백 문자인 + 를 처리하기 위해 +('%20') 을 공백으로 치환
90 83
         return decodeURIComponent((str + '').replace(/\+/g, '%20'));
91 84
     }
85
+
86
+    function objectifyForm() {
87
+        var formArray = $("#frm_pay").serializeArray();
88
+        var result = {};
89
+
90
+        var extend = function(i, element) {
91
+            var node = result[element.name];
92
+            if ('undefined' !== typeof node && node !== null) {
93
+                if ($.isArray(node)) {
94
+                    node.push($.trim(element.value));
95
+                } else {
96
+                    result[element.name] = [node, $.trim(element.value)];
97
+                }
98
+            } else {
99
+                result[element.name] = $.trim(element.value);
100
+            }
101
+        };
102
+        $.each(formArray, extend);
103
+        return result;
104
+    }
92 105
 </script>
93 106
 <title>오더퀸 수발주 결제하기</title>
94 107
 </head>

+ 1 - 1
src/main/webapp/mobile/app/mloanmng/MLOANMNG02010.html

@@ -144,7 +144,7 @@
144 144
 					</div>
145 145
 					<div class="list_info" style="padding-top:10px;">
146 146
 						<div class="pay_info fnItemNm"></div>
147
-						<input id="ITP_FORM_MLOANMNG02010_PAY_GOODS_AMT" name="goodsAmt" value="1000" type="text" readonly>
147
+						<input id="ITP_FORM_MLOANMNG02010_PAY_GOODS_AMT" name="goodsAmt" value="100" type="text" readonly>
148 148
 					</div>
149 149
 				</div>
150 150
 				<div class="list_line">

+ 2 - 1
src/main/webapp/mobile/app/mpomng/MPOMNG02010.html

@@ -164,6 +164,7 @@
164 164
       <input type="hidden" id="ITP_FORM_MPOMNG02010_MODIFY_PCH_REQ_DVSN" name="pchReqDvsn" value="">
165 165
       <input type="hidden" id="ITP_FORM_MPOMNG02010_MODIFY_PCH_REQ_UNQ_NO" name="pchReqUnqNo" value="">
166 166
       <input type="hidden" id="ITP_FORM_MPOMNG02010_MODIFY_PCH_REQ_ST_CD" name="pchReqStCd" value="">
167
+      <input type="hidden" id="ITP_FORM_MPOMNG02010_MODIFY_PG_AFFL_ID" name="pgAfflId" value="">
167 168
       <div class="content">
168 169
         <div class="line">
169 170
           <label>납기요청일</label>
@@ -250,7 +251,7 @@
250 251
         <label>구매금액 &nbsp;&nbsp;:</label>
251 252
         <div class="fnOrdAmt">원</div>
252 253
       </div>
253
-      <label class="pop_label msg_save">구매요청 하시겠습니까?</label>
254
+      <label class="pop_label pop_msg">구매요청 하시겠습니까?</label>
254 255
       <div class="popup_btn">
255 256
         <button id="ITP_BTN_MPOMNG02010_POP_REQ_CLOSE" class="cancel btn-gray CLB btn-pop-close">취소</button>
256 257
         <button id="ITP_BTN_MPOMNG02010_POP_REQ_CONFIRM" class="ok btn-primary COK">확인</button>

+ 208 - 212
src/main/webapp/mobile/app/payment.html

@@ -10,6 +10,7 @@
10 10
 
11 11
 	<script>
12 12
 		VIEW_PAGE = 'PAY';
13
+		var CONN_KEY; //Jwt 토큰을 담기위한 변수
13 14
 	</script>
14 15
 
15 16
 	<script src="../js/properties.js"></script>
@@ -17,219 +18,214 @@
17 18
 </head>
18 19
 <body>
19 20
 <div id="ITP_BIZPOP_PO_PAYMENT">
20
-	<div>
21
-		<form name="frm_pay" id="frm_pay" method="post" action="">
22
-			<input type="hidden" id="poOrdNo" name="poOrdNo" value="" />
23
-			<input type="hidden" id="payTpCd" name="payTpCd" value="" />
24
-			<input type="hidden" id="sttlMgntUnqNoList" name="sttlMgntUnqNoList" value="" />
25
-			<input type="hidden" id="brandId" name="brandId" value="" />
26
-			<input type="hidden" id="storeId" name="storeId" value="" />
27
-
28
-			<input type="hidden" id="kiccActionWebUrl" 		name="kiccActionWebUrl"			value="">
29
-			<input type="hidden" id="kiccActionMobileUrl" 	name="kiccActionMobileUrl"		value="">
30
-
31
-			<!-- WEB -->
32
-
33
-			<!--------------------------->
34
-			<!-- ::: 공통 인증 요청 값 -->
35
-			<!--------------------------->
36
-
37
-			<input type="hidden" id="EP_mall_nm"        name="EP_mall_nm"           value="">         <!-- 브랜드그룹명-->
38
-			<input type="hidden" id="EP_currency"       name="EP_currency"          value="00">       <!-- 통화코드 // 00 : 원화-->
39
-			<input type="hidden" id="EP_return_url"     name="EP_return_url"        value="">         <!-- 브랜드그룹 CALLBACK URL // -->
40
-			<input type="hidden" id="EP_ci_url"         name="EP_ci_url"            value="">         <!-- CI LOGO URL // -->
41
-			<input type="hidden" id="EP_lang_flag"      name="EP_lang_flag"         value="KOR">      <!-- 언어 // -->
42
-			<input type="hidden" id="EP_charset"        name="EP_charset"           value="UTF-8">    <!-- 브랜드그룹 CharSet // EUC-KR,UTF-8 사용시 대문자 이용-->
43
-			<input type="hidden" id="EP_user_id"        name="EP_user_id"           value="">         <!-- 브랜드그룹 고객ID // -->
44
-			<input type="hidden" id="EP_memb_user_no"   name="EP_memb_user_no"      value="">         <!-- 브랜드그룹 고객일련번호 // -->
45
-			<input type="hidden" id="EP_user_nm"        name="EP_user_nm"           value="">         <!-- 브랜드그룹 고객명 // -->
46
-			<input type="hidden" id="EP_user_mail"      name="EP_user_mail"         value="">         <!-- 브랜드그룹 고객 E-mail // -->
47
-			<input type="hidden" id="EP_user_phone1"    name="EP_user_phone1"       value="">         <!-- 브랜드그룹 고객 연락처1 // -->
48
-			<input type="hidden" id="EP_user_phone2"    name="EP_user_phone2"       value="">         <!-- 브랜드그룹 고객 연락처2 // -->
49
-			<input type="hidden" id="EP_user_addr"      name="EP_user_addr"         value="">         <!-- 브랜드그룹 고객 주소 // -->
50
-			<input type="hidden" id="EP_user_define1"   name="EP_user_define1"      value="">         <!-- 브랜드그룹 필드1 // -->
51
-			<input type="hidden" id="EP_user_define2"   name="EP_user_define2"      value="">         <!-- 브랜드그룹 필드2 // -->
52
-			<input type="hidden" id="EP_user_define3"   name="EP_user_define3"      value="">         <!-- 브랜드그룹 필드3 // -->
53
-			<input type="hidden" id="EP_user_define4"   name="EP_user_define4"      value="">         <!-- 브랜드그룹 필드4 // -->
54
-			<input type="hidden" id="EP_user_define5"   name="EP_user_define5"      value="">         <!-- 브랜드그룹 필드5 // -->
55
-			<input type="hidden" id="EP_user_define6"   name="EP_user_define6"      value="">         <!-- 브랜드그룹 필드6 // -->
56
-			<input type="hidden" id="EP_product_type"   name="EP_product_type"      value="0">        <!-- 상품정보구분 // -->
57
-			<input type="hidden" id="EP_product_expr"   name="EP_product_expr"      value="">         <!-- 서비스 기간 // (YYYYMMDD) -->
58
-			<input type="hidden" id="EP_disp_cash_yn"   name="EP_disp_cash_yn"      value="">         <!-- 현금영수증 화면표시여부 //미표시 : "N", 그외: DB조회 -->
59
-
60
-
61
-			<!--------------------------->
62
-			<!-- ::: 카드 인증 요청 값 -->
63
-			<!--------------------------->
64
-
65
-			<input type="hidden" id="EP_usedcard_code"      name="EP_usedcard_code"     value="">      <!-- 사용가능한 카드 LIST // FORMAT->카드코드:카드코드: ... :카드코드 EXAMPLE->029:027:031 // 빈값 : DB조회-->
66
-			<input type="hidden" id="EP_quota"              name="EP_quota"             value="">      <!-- 할부개월 (카드코드-할부개월) -->
67
-			<input type="hidden" id="EP_os_cert_flag"       name="EP_os_cert_flag"      value="2">     <!-- 해외안심클릭 사용여부(변경불가) // -->
68
-			<input type="hidden" id="EP_noinst_flag"        name="EP_noinst_flag"       value="">      <!-- 무이자 여부 (Y/N) // -->
69
-			<input type="hidden" id="EP_noinst_term"        name="EP_noinst_term"       value="">      <!-- 무이자 기간 (카드코드-더할할부개월) // -->
70
-			<input type="hidden" id="EP_set_point_card_yn"  name="EP_set_point_card_yn" value="">      <!-- 카드사포인트 사용여부 (Y/N) // -->
71
-			<input type="hidden" id="EP_point_card"         name="EP_point_card"        value="">      <!-- 포인트카드 LIST  // -->
72
-			<input type="hidden" id="EP_join_cd"            name="EP_join_cd"           value="">      <!-- 조인코드 // -->
73
-			<input type="hidden" id="EP_kmotion_useyn"      name="EP_kmotion_useyn"     value="Y">     <!-- 국민앱카드 사용유무 (Y/N)// -->
74
-
75
-			<!------------------------------->
76
-			<!-- ::: 가상계좌 인증 요청 값 -->
77
-			<!------------------------------->
78
-
79
-			<input type="hidden" id="EP_vacct_bank"         name="EP_vacct_bank"        value="">      <!-- 가상계좌 사용가능한 은행 LIST // -->
80
-			<input type="hidden" id="EP_vacct_end_date"     name="EP_vacct_end_date"    value="">      <!-- 입금 만료 날짜 // -->
81
-			<input type="hidden" id="EP_vacct_end_time"     name="EP_vacct_end_time"    value="">      <!-- 입금 만료 시간 // -->
82
-
83
-			<!------------------------------->
84
-			<!-- ::: 선불카드 인증 요청 값 -->
85
-			<!------------------------------->
86
-
87
-			<input type="hidden" id="EP_prepaid_cp"         name="EP_prepaid_cp"        value="">      <!-- 선불카드 CP // FORMAT->코드:코드: ... :코드 EXAMPLE->CCB:ECB // 빈값 : DB조회-->
88
-
89
-			<!--------------------------------->
90
-			<!-- ::: 인증응답용 인증 요청 값 -->
91
-			<!--------------------------------->
92
-
93
-			<input type="hidden" id="EP_res_cd"             name="EP_res_cd"            value="">      <!--  응답코드 // -->
94
-			<input type="hidden" id="EP_res_msg"            name="EP_res_msg"           value="">      <!--  응답메세지 // -->
95
-			<input type="hidden" id="EP_tr_cd"              name="EP_tr_cd"             value="">      <!--  결제창 요청구분 // -->
96
-			<input type="hidden" id="EP_ret_pay_type"       name="EP_ret_pay_type"      value="">      <!--  결제수단 // -->
97
-			<input type="hidden" id="EP_ret_complex_yn"     name="EP_ret_complex_yn"    value="">      <!--  복합결제 여부 (Y/N) // -->
98
-			<input type="hidden" id="EP_card_code"          name="EP_card_code"         value="">      <!--  카드코드 (ISP:KVP카드코드 MPI:카드코드) // -->
99
-			<input type="hidden" id="EP_eci_code"           name="EP_eci_code"          value="">      <!--  MPI인 경우 ECI코드 // -->
100
-			<input type="hidden" id="EP_card_req_type"      name="EP_card_req_type"     value="">      <!--  거래구분 // -->
101
-			<input type="hidden" id="EP_save_useyn"         name="EP_save_useyn"        value="">      <!--  카드사 세이브 여부 (Y/N) // -->
102
-			<input type="hidden" id="EP_trace_no"           name="EP_trace_no"          value="">      <!--  추적번호 // -->
103
-			<input type="hidden" id="EP_sessionkey"         name="EP_sessionkey"        value="">      <!--  세션키 // -->
104
-			<input type="hidden" id="EP_encrypt_data"       name="EP_encrypt_data"      value="">      <!--  암호화전문 // -->
105
-			<input type="hidden" id="EP_spay_cp"            name="EP_spay_cp"           value="">      <!--  간편결제 CP 코드 // -->
106
-			<input type="hidden" id="EP_card_prefix"        name="EP_card_prefix"       value="">      <!--  신용카드prefix // -->
107
-			<input type="hidden" id="EP_card_no_7"          name="EP_card_no_7"         value="">      <!--  신용카드번호 앞7자리 // -->
108
-
109
-			<!--------------------------------->
110
-			<!-- ::: 브랜드그룹 정보 -->
111
-			<!--------------------------------->
112
-
113
-			<input type="hidden" id="EP_mall_id"          	name="EP_mall_id"         	value="">      	   <!--  브랜드그룹ID // -->
114
-
115
-			<!--------------------------------->
116
-			<!-- ::: 결제 정보 -->
117
-			<!--------------------------------->
118
-
119
-			<input type="hidden" id="EP_pay_type"           name="EP_pay_type"           value="">      	<!--  결제수단 // -->
120
-			<input type="hidden" id="EP_window_type"        name="EP_window_type"        value="popup">    <!--  윈도우타입 (iframe[default], popup) // -->
121
-			<input type="hidden" id="EP_cert_type"          name="EP_cert_type"          value="">      	<!--  인증타입 (일반-"", 인증-"21", 비인증-"22") // -->
122
-
123
-			<!--------------------------------->
124
-			<!-- ::: 주문 정보 -->
125
-			<!--------------------------------->
126
-
127
-			<input type="hidden" id="EP_order_no"         	name="EP_order_no"           value="">      	<!--  주문번호 // -->
128
-			<input type="hidden" id="EP_product_nm"         name="EP_product_nm"         value="">      	<!--  상품명 // -->
129
-			<input type="hidden" id="EP_product_amt"        name="EP_product_amt"        value="">      	<!--  상품금액 // -->
130
-
131
-			<!-- // WEB END -->
132
-
133
-			<!-- MOBILE -->
134
-			<!-- [START] 인증요청 필드 -->     <!--  <table>내에도 일부 파라미터 존재합니다.-->
135
-
136
-			<!--------------------------->
137
-			<!-- ::: 공통 인증 요청 값 -->
138
-			<!--------------------------->
139
-			<input type="hidden" id="sp_mall_nm"           name="sp_mall_nm"           value="" />               <!--[선택]브랜드그룹명 -->
140
-			<input type="hidden" id="sp_order_no"          name="sp_order_no"          value="" />               <!--[필수]브랜드그룹 주문번호(인증응답) -->
141
-			<input type="hidden" id="sp_currency"          name="sp_currency"          value="00" />             <!--[필수]통화코드(수정불가) -->
142
-			<input type="hidden" id="sp_return_url"        name="sp_return_url"        value="" />         		 <!--[필수]브랜드그룹 return URL -->
143
-			<input type="hidden" id="sp_lang_flag"         name="sp_lang_flag"         value="KOR" />            <!--[선택]언어 -->
144
-			<input type="hidden" id="sp_charset"           name="sp_charset"           value="UTF-8" />          <!--[선택]브랜드그룹 charset -->
145
-			<input type="hidden" id="sp_user_id"           name="sp_user_id"           value="" />               <!--[선택]브랜드그룹 고객ID -->
146
-			<input type="hidden" id="sp_memb_user_no"      name="sp_memb_user_no"      value="" />               <!--[선택]브랜드그룹 고객일련번호 -->
147
-			<input type="hidden" id="sp_user_nm"           name="sp_user_nm"           value="" />           	 <!--[선택]브랜드그룹 고객명 -->
148
-			<input type="hidden" id="sp_user_mail"         name="sp_user_mail"         value="" />           	 <!--[선택]브랜드그룹 고객 E-mail -->
149
-			<input type="hidden" id="sp_user_phone1"       name="sp_user_phone1"       value="" />               <!--[선택]브랜드그룹 고객 연락처1 -->
150
-			<input type="hidden" id="sp_user_phone2"       name="sp_user_phone2"       value="" />               <!--[선택]브랜드그룹 고객 연락처2 -->
151
-			<input type="hidden" id="sp_user_addr"         name="sp_user_addr"         value="" />               <!--[선택]브랜드그룹 고객 주소 -->
152
-			<input type="hidden" id="sp_user_define1"      name="sp_user_define1"      value="" />               <!--[선택]브랜드그룹 필드1 -->
153
-			<input type="hidden" id="sp_user_define2"      name="sp_user_define2"      value="" />               <!--[선택]브랜드그룹 필드2 -->
154
-			<input type="hidden" id="sp_user_define3"      name="sp_user_define3"      value="" />               <!--[선택]브랜드그룹 필드3 -->
155
-			<input type="hidden" id="sp_user_define4"      name="sp_user_define4"      value="" />               <!--[선택]브랜드그룹 필드4 -->
156
-			<input type="hidden" id="sp_user_define5"      name="sp_user_define5"      value="" />               <!--[선택]브랜드그룹 필드5 -->
157
-			<input type="hidden" id="sp_user_define6"      name="sp_user_define6"      value="" />               <!--[선택]브랜드그룹 필드6 -->
158
-			<input type="hidden" id="sp_product_type"      name="sp_product_type"      value="" />               <!--[선택]상품정보구분 -->
159
-			<input type="hidden" id="sp_product_expr"      name="sp_product_expr"      value="" />               <!--[선택]서비스 기간 -->
160
-			<input type="hidden" id="sp_app_scheme"        name="sp_app_scheme"        value="" />               <!--[선택]브랜드그룹 APP scheme -->
161
-
162
-			<input type="hidden" id="sp_mall_id"		   name="sp_mall_id"		   value="" />               <!--[필수]브랜드그룹 ID -->
163
-			<input type="hidden" id="sp_pay_type"      	   name="sp_pay_type"   	   value="" />               <!--[필수]결제수단 -->
164
-			<input type="hidden" id="sp_cert_type"	       name="sp_cert_type"   	   value="" />               <!--[선택]인증타입 -->
165
-			<input type="hidden" id="sp_product_nm"    	   name="sp_product_nm"   	   value="" />               <!--[필수]상품명 -->
166
-			<input type="hidden" id="sp_product_amt"   	   name="sp_product_amt"       value="" />               <!--[필수]상품금액 -->
167
-			<input type="hidden" id="sp_window_type"       name="sp_window_type"       value="" />               <!--[선택]윈도우타입 -->
168
-			<input type="hidden" id="sp_disp_cash_yn"      name="sp_disp_cash_yn"      value="" />               <!--[선택]현금영수증 화면표시여부 -->
169
-			<input type="hidden" id="sp_kmotion_useyn"     name="sp_kmotion_useyn"     value="" />               <!--[선택]국민앱카드 사용유무 -->
170
-
171
-
172
-			<!--신용카드-->
173
-			<input type="hidden" id="sp_usedcard_code"     name="sp_usedcard_code"     value="" />               <!--[선택]사용가능카드 LIST -->
174
-			<input type="hidden" id="sp_quota"             name="sp_quota"             value="" />               <!--[선택]할부개월 -->
175
-			<input type="hidden" id="sp_os_cert_flag"      name="sp_os_cert_flag"      value="2" />               <!--[선택]해외안심클릭 사용여부-->
176
-			<input type="hidden" id="sp_noinst_flag"       name="sp_noinst_flag"       value="" />               <!--[선택]무이자 여부(Y/N)-->
177
-			<input type="hidden" id="sp_noinst_term"       name="sp_noinst_term"       value="" />               <!--[선택]무이자 기간 -->
178
-			<input type="hidden" id="sp_set_point_card_yn" name="sp_set_point_card_yn" value="" />               <!--[선택]카드사포인트 사용여부(Y/N)-->
179
-			<input type="hidden" id="sp_point_card"        name="sp_point_card"        value="" />               <!--[선택]포인트카드 LIST(카드코드-더할 할부개월) -->
180
-			<input type="hidden" id="sp_join_cd"           name="sp_join_cd"           value="" />               <!--[선택]조인코드 -->
181
-
182
-			<!--가상계좌-->
183
-			<input type="hidden" id="sp_vacct_bank"        name="sp_vacct_bank"         value="" />               <!--[선택]가상계좌 사용가능한 은행 LIST -->
184
-			<input type="hidden" id="sp_vacct_end_date"    name="sp_vacct_end_date"     value="" />               <!--[선택]입금 만료 날짜 -->
185
-			<input type="hidden" id="sp_vacct_end_time"    name="sp_vacct_end_time"     value="" />               <!--[선택]입금 만료 시간 -->
186
-
187
-			<!--선불카드-->
188
-			<input type="hidden" id="sp_prepaid_cp"        name="sp_prepaid_cp"         value="" />               <!--[선택]선불카드 CP -->
189
-
190
-			<!-- [END] 인증요청 필드  -->
191
-
192
-			<!-- [START] 인증응답 필드 -->
193
-
194
-			<!--------------------------->
195
-			<!-- ::: 공통 응답 값 -->
196
-			<!--------------------------->
197
-			<input type="hidden" id="sp_res_cd"              name="sp_res_cd"                value="" />         <!-- [필수]응답코드        -->
198
-			<input type="hidden" id="sp_res_msg"             name="sp_res_msg"               value="" />         <!-- [필수]응답메시지      -->
199
-			<input type="hidden" id="sp_tr_cd"               name="sp_tr_cd"                 value="" />         <!-- [필수]결제창 요청구분 -->
200
-			<input type="hidden" id="sp_ret_pay_type"        name="sp_ret_pay_type"          value="" />         <!-- [필수]결제수단        -->
201
-			<input type="hidden" id="sp_trace_no"            name="sp_trace_no"              value="" />         <!-- [선택]추적번호        -->
202
-			<!-- 브랜드그룹 주문번호 인증요청 필드에 존재.                                                                [필수]브랜드그룹 주문번호 -->
203
-			<input type="hidden" id="sp_sessionkey"          name="sp_sessionkey"            value="" />         <!-- [필수]세션키          -->
204
-			<input type="hidden" id="sp_encrypt_data"        name="sp_encrypt_data"          value="" />         <!-- [필수]암호화전문      -->
205
-			<!-- 브랜드그룹 ID  인증요청 필드에 존재.                                                                 [필수]브랜드그룹 ID       -->
206
-			<input type="hidden" id="sp_mobilereserved1"     name="sp_mobilereserved1"       value="" />         <!-- [선택]여유필드        -->
207
-			<input type="hidden" id="sp_mobilereserved2"     name="sp_mobilereserved2"       value="" />         <!-- [선택]여유필드        -->
208
-			<input type="hidden" id="sp_reserved1"           name="sp_reserved1"             value="" />         <!-- [선택]여유필드        -->
209
-			<input type="hidden" id="sp_reserved2"           name="sp_reserved2"             value="" />         <!-- [선택]여유필드        -->
210
-			<input type="hidden" id="sp_reserved3"           name="sp_reserved3"             value="" />         <!-- [선택]여유필드        -->
211
-			<input type="hidden" id="sp_reserved4"           name="sp_reserved4"             value="" />         <!-- [선택]여유필드        -->
212
-
213
-			<!--신용카드-->
214
-			<input type="hidden" id="sp_card_code"            name="sp_card_code"            value="" />         <!-- [필수]카드코드               -->
215
-			<input type="hidden" id="sp_eci_code"             name="sp_eci_code"             value="" />         <!-- [선택]ECI코드(MPI인 경우)    -->
216
-			<input type="hidden" id="sp_card_req_type"        name="sp_card_req_type"        value="" />         <!-- [필수]거래구분               -->
217
-			<input type="hidden" id="sp_save_useyn"           name="sp_save_useyn"           value="" />         <!-- [선택]카드사 세이브 여부     -->
218
-			<input type="hidden" id="sp_card_prefix"          name="sp_card_prefix"          value="" />         <!-- [선택]신용카드 Prefix        -->
219
-			<input type="hidden" id="sp_card_no_7"            name="sp_card_no_7"            value="" />         <!-- [선택]신용카드번호 앞7자리   -->
220
-
221
-			<!--간편결제-->
222
-			<input type="hidden" id="sp_spay_cp"              name="sp_spay_cp"              value="" />          <!-- [선택]간편결제 CP코드 -->
223
-
224
-			<!--선불카드-->
225
-			<input type="hidden" id="sp_prepaid_cp"           name="sp_prepaid_cp"           value="" />          <!-- [선택]선불카드 CP코드 -->
226
-
227
-			<!-- [END] 인증응답 필드  -->
228
-			<!-- // MOBILE END -->
229
-		</form>
230
-	</div>
231
-	<script src="../js/app/payment.js"></script>
21
+	<form name="frm_pay" id="frm_pay" method="post" action="">
22
+		<input type="hidden" id="poOrdNo" name="poOrdNo" value="" />
23
+		<input type="hidden" id="payTpCd" name="payTpCd" value="" />
24
+		<input type="hidden" id="sttlMgntUnqNoList" name="sttlMgntUnqNoList" value="" />
25
+		<input type="hidden" id="brandId" name="brandId" value="" />
26
+		<input type="hidden" id="storeId" name="storeId" value="" />
27
+
28
+		<input type="hidden" id="kiccActionWebUrl" 		name="kiccActionWebUrl"			value="">
29
+		<input type="hidden" id="kiccActionMobileUrl" 	name="kiccActionMobileUrl"		value="">
30
+
31
+		<!-- WEB -->
32
+
33
+		<!--------------------------->
34
+		<!-- ::: 공통 인증 요청 값 -->
35
+		<!--------------------------->
36
+
37
+		<input type="hidden" id="EP_mall_nm"        name="EP_mall_nm"           value="">         <!-- 브랜드그룹명-->
38
+		<input type="hidden" id="EP_currency"       name="EP_currency"          value="00">       <!-- 통화코드 // 00 : 원화-->
39
+		<input type="hidden" id="EP_return_url"     name="EP_return_url"        value="">         <!-- 브랜드그룹 CALLBACK URL // -->
40
+		<input type="hidden" id="EP_ci_url"         name="EP_ci_url"            value="">         <!-- CI LOGO URL // -->
41
+		<input type="hidden" id="EP_lang_flag"      name="EP_lang_flag"         value="KOR">      <!-- 언어 // -->
42
+		<input type="hidden" id="EP_charset"        name="EP_charset"           value="UTF-8">    <!-- 브랜드그룹 CharSet // EUC-KR,UTF-8 사용시 대문자 이용-->
43
+		<input type="hidden" id="EP_user_id"        name="EP_user_id"           value="">         <!-- 브랜드그룹 고객ID // -->
44
+		<input type="hidden" id="EP_memb_user_no"   name="EP_memb_user_no"      value="">         <!-- 브랜드그룹 고객일련번호 // -->
45
+		<input type="hidden" id="EP_user_nm"        name="EP_user_nm"           value="">         <!-- 브랜드그룹 고객명 // -->
46
+		<input type="hidden" id="EP_user_mail"      name="EP_user_mail"         value="">         <!-- 브랜드그룹 고객 E-mail // -->
47
+		<input type="hidden" id="EP_user_phone1"    name="EP_user_phone1"       value="">         <!-- 브랜드그룹 고객 연락처1 // -->
48
+		<input type="hidden" id="EP_user_phone2"    name="EP_user_phone2"       value="">         <!-- 브랜드그룹 고객 연락처2 // -->
49
+		<input type="hidden" id="EP_user_addr"      name="EP_user_addr"         value="">         <!-- 브랜드그룹 고객 주소 // -->
50
+		<input type="hidden" id="EP_user_define1"   name="EP_user_define1"      value="">         <!-- 브랜드그룹 필드1 // -->
51
+		<input type="hidden" id="EP_user_define2"   name="EP_user_define2"      value="">         <!-- 브랜드그룹 필드2 // -->
52
+		<input type="hidden" id="EP_user_define3"   name="EP_user_define3"      value="">         <!-- 브랜드그룹 필드3 // -->
53
+		<input type="hidden" id="EP_user_define4"   name="EP_user_define4"      value="">         <!-- 브랜드그룹 필드4 // -->
54
+		<input type="hidden" id="EP_user_define5"   name="EP_user_define5"      value="">         <!-- 브랜드그룹 필드5 // -->
55
+		<input type="hidden" id="EP_user_define6"   name="EP_user_define6"      value="">         <!-- 브랜드그룹 필드6 // -->
56
+		<input type="hidden" id="EP_product_type"   name="EP_product_type"      value="0">        <!-- 상품정보구분 // -->
57
+		<input type="hidden" id="EP_product_expr"   name="EP_product_expr"      value="">         <!-- 서비스 기간 // (YYYYMMDD) -->
58
+		<input type="hidden" id="EP_disp_cash_yn"   name="EP_disp_cash_yn"      value="">         <!-- 현금영수증 화면표시여부 //미표시 : "N", 그외: DB조회 -->
59
+
60
+
61
+		<!--------------------------->
62
+		<!-- ::: 카드 인증 요청 값 -->
63
+		<!--------------------------->
64
+
65
+		<input type="hidden" id="EP_usedcard_code"      name="EP_usedcard_code"     value="">      <!-- 사용가능한 카드 LIST // FORMAT->카드코드:카드코드: ... :카드코드 EXAMPLE->029:027:031 // 빈값 : DB조회-->
66
+		<input type="hidden" id="EP_quota"              name="EP_quota"             value="">      <!-- 할부개월 (카드코드-할부개월) -->
67
+		<input type="hidden" id="EP_os_cert_flag"       name="EP_os_cert_flag"      value="2">     <!-- 해외안심클릭 사용여부(변경불가) // -->
68
+		<input type="hidden" id="EP_noinst_flag"        name="EP_noinst_flag"       value="">      <!-- 무이자 여부 (Y/N) // -->
69
+		<input type="hidden" id="EP_noinst_term"        name="EP_noinst_term"       value="">      <!-- 무이자 기간 (카드코드-더할할부개월) // -->
70
+		<input type="hidden" id="EP_set_point_card_yn"  name="EP_set_point_card_yn" value="">      <!-- 카드사포인트 사용여부 (Y/N) // -->
71
+		<input type="hidden" id="EP_point_card"         name="EP_point_card"        value="">      <!-- 포인트카드 LIST  // -->
72
+		<input type="hidden" id="EP_join_cd"            name="EP_join_cd"           value="">      <!-- 조인코드 // -->
73
+		<input type="hidden" id="EP_kmotion_useyn"      name="EP_kmotion_useyn"     value="Y">     <!-- 국민앱카드 사용유무 (Y/N)// -->
74
+
75
+		<!------------------------------->
76
+		<!-- ::: 가상계좌 인증 요청 값 -->
77
+		<!------------------------------->
78
+
79
+		<input type="hidden" id="EP_vacct_bank"         name="EP_vacct_bank"        value="">      <!-- 가상계좌 사용가능한 은행 LIST // -->
80
+		<input type="hidden" id="EP_vacct_end_date"     name="EP_vacct_end_date"    value="">      <!-- 입금 만료 날짜 // -->
81
+		<input type="hidden" id="EP_vacct_end_time"     name="EP_vacct_end_time"    value="">      <!-- 입금 만료 시간 // -->
82
+
83
+		<!------------------------------->
84
+		<!-- ::: 선불카드 인증 요청 값 -->
85
+		<!------------------------------->
86
+
87
+		<input type="hidden" id="EP_prepaid_cp"         name="EP_prepaid_cp"        value="">      <!-- 선불카드 CP // FORMAT->코드:코드: ... :코드 EXAMPLE->CCB:ECB // 빈값 : DB조회-->
88
+
89
+		<!--------------------------------->
90
+		<!-- ::: 인증응답용 인증 요청 값 -->
91
+		<!--------------------------------->
92
+
93
+		<input type="hidden" id="EP_res_cd"             name="EP_res_cd"            value="">      <!--  응답코드 // -->
94
+		<input type="hidden" id="EP_res_msg"            name="EP_res_msg"           value="">      <!--  응답메세지 // -->
95
+		<input type="hidden" id="EP_tr_cd"              name="EP_tr_cd"             value="">      <!--  결제창 요청구분 // -->
96
+		<input type="hidden" id="EP_ret_pay_type"       name="EP_ret_pay_type"      value="">      <!--  결제수단 // -->
97
+		<input type="hidden" id="EP_ret_complex_yn"     name="EP_ret_complex_yn"    value="">      <!--  복합결제 여부 (Y/N) // -->
98
+		<input type="hidden" id="EP_card_code"          name="EP_card_code"         value="">      <!--  카드코드 (ISP:KVP카드코드 MPI:카드코드) // -->
99
+		<input type="hidden" id="EP_eci_code"           name="EP_eci_code"          value="">      <!--  MPI인 경우 ECI코드 // -->
100
+		<input type="hidden" id="EP_card_req_type"      name="EP_card_req_type"     value="">      <!--  거래구분 // -->
101
+		<input type="hidden" id="EP_save_useyn"         name="EP_save_useyn"        value="">      <!--  카드사 세이브 여부 (Y/N) // -->
102
+		<input type="hidden" id="EP_trace_no"           name="EP_trace_no"          value="">      <!--  추적번호 // -->
103
+		<input type="hidden" id="EP_sessionkey"         name="EP_sessionkey"        value="">      <!--  세션키 // -->
104
+		<input type="hidden" id="EP_encrypt_data"       name="EP_encrypt_data"      value="">      <!--  암호화전문 // -->
105
+		<input type="hidden" id="EP_spay_cp"            name="EP_spay_cp"           value="">      <!--  간편결제 CP 코드 // -->
106
+		<input type="hidden" id="EP_card_prefix"        name="EP_card_prefix"       value="">      <!--  신용카드prefix // -->
107
+		<input type="hidden" id="EP_card_no_7"          name="EP_card_no_7"         value="">      <!--  신용카드번호 앞7자리 // -->
108
+
109
+		<!--------------------------------->
110
+		<!-- ::: 브랜드그룹 정보 -->
111
+		<!--------------------------------->
112
+
113
+		<input type="hidden" id="EP_mall_id"          	name="EP_mall_id"         	value="">      	   <!--  브랜드그룹ID // -->
114
+
115
+		<!--------------------------------->
116
+		<!-- ::: 결제 정보 -->
117
+		<!--------------------------------->
118
+
119
+		<input type="hidden" id="EP_pay_type"           name="EP_pay_type"           value="">      	<!--  결제수단 // -->
120
+		<input type="hidden" id="EP_window_type"        name="EP_window_type"        value="popup">    <!--  윈도우타입 (iframe[default], popup) // -->
121
+		<input type="hidden" id="EP_cert_type"          name="EP_cert_type"          value="">      	<!--  인증타입 (일반-"", 인증-"21", 비인증-"22") // -->
122
+
123
+		<!--------------------------------->
124
+		<!-- ::: 주문 정보 -->
125
+		<!--------------------------------->
126
+
127
+		<input type="hidden" id="EP_order_no"         	name="EP_order_no"           value="">      	<!--  주문번호 // -->
128
+		<input type="hidden" id="EP_product_nm"         name="EP_product_nm"         value="">      	<!--  상품명 // -->
129
+		<input type="hidden" id="EP_product_amt"        name="EP_product_amt"        value="">      	<!--  상품금액 // -->
130
+
131
+		<!-- // WEB END -->
132
+
133
+		<!-- MOBILE -->
134
+		<!-- [START] 인증요청 필드 -->     <!--  <table>내에도 일부 파라미터 존재합니다.-->
135
+
136
+		<!--------------------------->
137
+		<!-- ::: 공통 인증 요청 값 -->
138
+		<!--------------------------->
139
+		<input type="hidden" id="sp_mall_nm"           name="sp_mall_nm"           value="" />               <!--[선택]브랜드그룹명 -->
140
+		<input type="hidden" id="sp_order_no"          name="sp_order_no"          value="" />               <!--[필수]브랜드그룹 주문번호(인증응답) -->
141
+		<input type="hidden" id="sp_currency"          name="sp_currency"          value="00" />             <!--[필수]통화코드(수정불가) -->
142
+		<input type="hidden" id="sp_return_url"        name="sp_return_url"        value="" />         		 <!--[필수]브랜드그룹 return URL -->
143
+		<input type="hidden" id="sp_lang_flag"         name="sp_lang_flag"         value="KOR" />            <!--[선택]언어 -->
144
+		<input type="hidden" id="sp_charset"           name="sp_charset"           value="UTF-8" />          <!--[선택]브랜드그룹 charset -->
145
+		<input type="hidden" id="sp_user_id"           name="sp_user_id"           value="" />               <!--[선택]브랜드그룹 고객ID -->
146
+		<input type="hidden" id="sp_memb_user_no"      name="sp_memb_user_no"      value="" />               <!--[선택]브랜드그룹 고객일련번호 -->
147
+		<input type="hidden" id="sp_user_nm"           name="sp_user_nm"           value="" />           	 <!--[선택]브랜드그룹 고객명 -->
148
+		<input type="hidden" id="sp_user_mail"         name="sp_user_mail"         value="" />           	 <!--[선택]브랜드그룹 고객 E-mail -->
149
+		<input type="hidden" id="sp_user_phone1"       name="sp_user_phone1"       value="" />               <!--[선택]브랜드그룹 고객 연락처1 -->
150
+		<input type="hidden" id="sp_user_phone2"       name="sp_user_phone2"       value="" />               <!--[선택]브랜드그룹 고객 연락처2 -->
151
+		<input type="hidden" id="sp_user_addr"         name="sp_user_addr"         value="" />               <!--[선택]브랜드그룹 고객 주소 -->
152
+		<input type="hidden" id="sp_user_define1"      name="sp_user_define1"      value="" />               <!--[선택]브랜드그룹 필드1 -->
153
+		<input type="hidden" id="sp_user_define2"      name="sp_user_define2"      value="" />               <!--[선택]브랜드그룹 필드2 -->
154
+		<input type="hidden" id="sp_user_define3"      name="sp_user_define3"      value="" />               <!--[선택]브랜드그룹 필드3 -->
155
+		<input type="hidden" id="sp_user_define4"      name="sp_user_define4"      value="" />               <!--[선택]브랜드그룹 필드4 -->
156
+		<input type="hidden" id="sp_user_define5"      name="sp_user_define5"      value="" />               <!--[선택]브랜드그룹 필드5 -->
157
+		<input type="hidden" id="sp_user_define6"      name="sp_user_define6"      value="" />               <!--[선택]브랜드그룹 필드6 -->
158
+		<input type="hidden" id="sp_product_type"      name="sp_product_type"      value="" />               <!--[선택]상품정보구분 -->
159
+		<input type="hidden" id="sp_product_expr"      name="sp_product_expr"      value="" />               <!--[선택]서비스 기간 -->
160
+		<input type="hidden" id="sp_app_scheme"        name="sp_app_scheme"        value="" />               <!--[선택]브랜드그룹 APP scheme -->
161
+
162
+		<input type="hidden" id="sp_mall_id"		   name="sp_mall_id"		   value="" />               <!--[필수]브랜드그룹 ID -->
163
+		<input type="hidden" id="sp_pay_type"      	   name="sp_pay_type"   	   value="" />               <!--[필수]결제수단 -->
164
+		<input type="hidden" id="sp_cert_type"	       name="sp_cert_type"   	   value="" />               <!--[선택]인증타입 -->
165
+		<input type="hidden" id="sp_product_nm"    	   name="sp_product_nm"   	   value="" />               <!--[필수]상품명 -->
166
+		<input type="hidden" id="sp_product_amt"   	   name="sp_product_amt"       value="" />               <!--[필수]상품금액 -->
167
+		<input type="hidden" id="sp_window_type"       name="sp_window_type"       value="" />               <!--[선택]윈도우타입 -->
168
+		<input type="hidden" id="sp_disp_cash_yn"      name="sp_disp_cash_yn"      value="" />               <!--[선택]현금영수증 화면표시여부 -->
169
+		<input type="hidden" id="sp_kmotion_useyn"     name="sp_kmotion_useyn"     value="" />               <!--[선택]국민앱카드 사용유무 -->
170
+
171
+
172
+		<!--신용카드-->
173
+		<input type="hidden" id="sp_usedcard_code"     name="sp_usedcard_code"     value="" />               <!--[선택]사용가능카드 LIST -->
174
+		<input type="hidden" id="sp_quota"             name="sp_quota"             value="" />               <!--[선택]할부개월 -->
175
+		<input type="hidden" id="sp_os_cert_flag"      name="sp_os_cert_flag"      value="2" />               <!--[선택]해외안심클릭 사용여부-->
176
+		<input type="hidden" id="sp_noinst_flag"       name="sp_noinst_flag"       value="" />               <!--[선택]무이자 여부(Y/N)-->
177
+		<input type="hidden" id="sp_noinst_term"       name="sp_noinst_term"       value="" />               <!--[선택]무이자 기간 -->
178
+		<input type="hidden" id="sp_set_point_card_yn" name="sp_set_point_card_yn" value="" />               <!--[선택]카드사포인트 사용여부(Y/N)-->
179
+		<input type="hidden" id="sp_point_card"        name="sp_point_card"        value="" />               <!--[선택]포인트카드 LIST(카드코드-더할 할부개월) -->
180
+		<input type="hidden" id="sp_join_cd"           name="sp_join_cd"           value="" />               <!--[선택]조인코드 -->
181
+
182
+		<!--가상계좌-->
183
+		<input type="hidden" id="sp_vacct_bank"        name="sp_vacct_bank"         value="" />               <!--[선택]가상계좌 사용가능한 은행 LIST -->
184
+		<input type="hidden" id="sp_vacct_end_date"    name="sp_vacct_end_date"     value="" />               <!--[선택]입금 만료 날짜 -->
185
+		<input type="hidden" id="sp_vacct_end_time"    name="sp_vacct_end_time"     value="" />               <!--[선택]입금 만료 시간 -->
186
+
187
+		<!--선불카드-->
188
+		<input type="hidden" id="sp_prepaid_cp"        name="sp_prepaid_cp"         value="" />               <!--[선택]선불카드 CP -->
189
+
190
+		<!-- [END] 인증요청 필드  -->
191
+
192
+		<!-- [START] 인증응답 필드 -->
193
+
194
+		<!--------------------------->
195
+		<!-- ::: 공통 응답 값 -->
196
+		<!--------------------------->
197
+		<input type="hidden" id="sp_res_cd"              name="sp_res_cd"                value="" />         <!-- [필수]응답코드        -->
198
+		<input type="hidden" id="sp_res_msg"             name="sp_res_msg"               value="" />         <!-- [필수]응답메시지      -->
199
+		<input type="hidden" id="sp_tr_cd"               name="sp_tr_cd"                 value="" />         <!-- [필수]결제창 요청구분 -->
200
+		<input type="hidden" id="sp_ret_pay_type"        name="sp_ret_pay_type"          value="" />         <!-- [필수]결제수단        -->
201
+		<input type="hidden" id="sp_trace_no"            name="sp_trace_no"              value="" />         <!-- [선택]추적번호        -->
202
+		<!-- 브랜드그룹 주문번호 인증요청 필드에 존재.                                                                [필수]브랜드그룹 주문번호 -->
203
+		<input type="hidden" id="sp_sessionkey"          name="sp_sessionkey"            value="" />         <!-- [필수]세션키          -->
204
+		<input type="hidden" id="sp_encrypt_data"        name="sp_encrypt_data"          value="" />         <!-- [필수]암호화전문      -->
205
+		<!-- 브랜드그룹 ID  인증요청 필드에 존재.                                                                 [필수]브랜드그룹 ID       -->
206
+		<input type="hidden" id="sp_mobilereserved1"     name="sp_mobilereserved1"       value="" />         <!-- [선택]여유필드        -->
207
+		<input type="hidden" id="sp_mobilereserved2"     name="sp_mobilereserved2"       value="" />         <!-- [선택]여유필드        -->
208
+		<input type="hidden" id="sp_reserved1"           name="sp_reserved1"             value="" />         <!-- [선택]여유필드        -->
209
+		<input type="hidden" id="sp_reserved2"           name="sp_reserved2"             value="" />         <!-- [선택]여유필드        -->
210
+		<input type="hidden" id="sp_reserved3"           name="sp_reserved3"             value="" />         <!-- [선택]여유필드        -->
211
+		<input type="hidden" id="sp_reserved4"           name="sp_reserved4"             value="" />         <!-- [선택]여유필드        -->
212
+
213
+		<!--신용카드-->
214
+		<input type="hidden" id="sp_card_code"            name="sp_card_code"            value="" />         <!-- [필수]카드코드               -->
215
+		<input type="hidden" id="sp_eci_code"             name="sp_eci_code"             value="" />         <!-- [선택]ECI코드(MPI인 경우)    -->
216
+		<input type="hidden" id="sp_card_req_type"        name="sp_card_req_type"        value="" />         <!-- [필수]거래구분               -->
217
+		<input type="hidden" id="sp_save_useyn"           name="sp_save_useyn"           value="" />         <!-- [선택]카드사 세이브 여부     -->
218
+		<input type="hidden" id="sp_card_prefix"          name="sp_card_prefix"          value="" />         <!-- [선택]신용카드 Prefix        -->
219
+		<input type="hidden" id="sp_card_no_7"            name="sp_card_no_7"            value="" />         <!-- [선택]신용카드번호 앞7자리   -->
220
+
221
+		<!--간편결제-->
222
+		<input type="hidden" id="sp_spay_cp"              name="sp_spay_cp"              value="" />          <!-- [선택]간편결제 CP코드 -->
223
+
224
+		<!-- [END] 인증응답 필드  -->
225
+		<!-- // MOBILE END -->
226
+	</form>
232 227
 	<div id="ITP_POPUP_KICC_JS"></div>
228
+	<script src="../js/app/payment.js"></script>
233 229
 </div>
234 230
 </body>
235 231
 </html>

+ 1 - 0
src/main/webapp/mobile/app/popup/biz/BIZPOP_PO_PAYMENT.html

@@ -97,6 +97,7 @@
97 97
 							
98 98
 							<input type="hidden" id="kiccActionWebUrl" 		name="kiccActionWebUrl"			value="">
99 99
 							<input type="hidden" id="kiccActionMobileUrl" 	name="kiccActionMobileUrl"		value="">
100
+							<input type="hidden" id="kiccJavascriptUrl" 	name="kiccJavascriptUrl"		value="">
100 101
 							
101 102
 							<!-- WEB -->
102 103
 							

+ 7 - 3
src/main/webapp/mobile/js/app/main.js

@@ -16,10 +16,14 @@ var mobMainObj = {
16 16
 
17 17
 };
18 18
 
19
-function jsBarcodeFn(barcode) {
20
-	mobContentObj.barcode.callbackApp(barcode);
19
+function appJsFnBarcode(barcode) {
20
+	appCallFunction.barcode.result(barcode);
21
+}
22
+
23
+function appJsFnPayment(param) {
24
+	appCallFunction.payment.result(param);
21 25
 }
22 26
 
23 27
 function jsAppBackPressed() {
24
-	mobPageObj.app.backPressed();
28
+	appCallFunction.backPressed();
25 29
 }

+ 7 - 84
src/main/webapp/mobile/js/app/mloanmng/ITP_MLOANMNG02010.js

@@ -19,7 +19,6 @@ let EASYPAY_PAYMENT_CREATE 			= '/api/easypay/payment/create';
19 19
 
20 20
 const PAGE_MODE_LIST				= "LIST";
21 21
 const PAGE_MODE_VIEW				= "VIEW";
22
-const PAGE_MODE_PAY					= "PAY";
23 22
 
24 23
 let mobPageObj = {
25 24
 	viewMode: PAGE_MODE_LIST,
@@ -74,15 +73,6 @@ let mobPageObj = {
74 73
 				return false;
75 74
 			});
76 75
 
77
-			$('button[id^="ITP_BTN_MLOANMNG02010_VIEW"]').on('click', function() {
78
-				var id = $(this).attr('id');
79
-				switch (id) {
80
-					case 'ITP_BTN_MLOANMNG02010_VIEW_PAY_REQ'		: mobContentObj.view.payment();		break;
81
-					case 'ITP_BTN_MLOANMNG02010_VIEW_CANCEL_LIST'	: mobContentObj.view.cancel();		break;
82
-				}
83
-				return false;
84
-			});
85
-
86 76
 			$('button[id^="ITP_BTN_MLOANMNG02010_PAY"]').on('click', function() {
87 77
 				var id = $(this).attr('id');
88 78
 				switch (id) {
@@ -130,8 +120,6 @@ let mobPageObj = {
130 120
 		} else if(mode === PAGE_MODE_VIEW) {
131 121
 			$('#ITP_AJAX_MLOANMNG02010_VIEW_CONTAINER').show();
132 122
 			this.moreView(false);
133
-		} else if(mode === PAGE_MODE_PAY) {
134
-			$('#ITP_AJAX_MLOANMNG02010_PAY_CONTAINER').show();
135 123
 		}
136 124
 	},
137 125
 	moreView: function(isScroll) {
@@ -223,44 +211,7 @@ let mobContentObj = {
223 211
 					alert('신규입금 처리를 위한 매장을 선택하세요.');
224 212
 					return;
225 213
 				}
226
-				// if(CommonObj.isApp) {
227
-				// 	mobPageObj.switchScreen(PAGE_MODE_PAY);
228
-				// 	this.load();
229
-				// } else {
230
-				// 	this.popup();
231
-				// }
232
-				mobPageObj.switchScreen(PAGE_MODE_PAY);
233
-				$('#ITP_FORM_MLOANMNG02010_PAY_STORE_ID').val(storeId);
234
-				this.load();
235
-			},
236
-			load: function() {
237
-				var callbackFn = function(result) {
238
-					console.log(result);
239
-					var id = '#ITP_AJAX_MLOANMNG02010_PAY_CONTAINER';
240
-					$(id).find('.fnPoOrdNo').text(result.poOrdNo);
241
-					$(id).find('.fnOrdNm').text(result.ordNm);
242
-					$(id).find('.fnGoodsNm').text(result.goodsNm);
243
-					$(id).find('#ITP_FORM_MLOANMNG02010_PAY_PO_ORD_NO').val(result.poOrdNo);
244
-					$(id).find('#ITP_FORM_MLOANMNG02010_PAY_ORD_NM').val(result.ordNm);
245
-					$(id).find('#ITP_FORM_MLOANMNG02010_PAY_GOODS_NM').val(result.goodsNm);
246
-					$(id).find('#ITP_FORM_MLOANMNG02010_PAY_MALL_ID').val(result.mallId);
247
-					$(id).find('#ITP_FORM_MLOANMNG02010_PAY_MOBILE_URL').val(result.kicc_action_mobile_url);
248
-					$(id).find('#ITP_FORM_MLOANMNG02010_PAY_JS_URL').val(result.kicc_javascript_url);
249
-					if(result.ordEmail) {
250
-						var email = result.ordEmail.split('@');
251
-						if(email.length === 2) {
252
-							$(id).find('#ITP_FORM_MLOANMNG02010_PAY_ORD_EMAIL').val(email);
253
-							$(id).find('#ITP_FORM_MLOANMNG02010_PAY_EMAIL_ID').val(email[0]);
254
-							$(id).find('#ITP_FORM_MLOANMNG02010_PAY_EMAIL_NM').val(email[1]);
255
-						}
256
-					}
257
-				};
258
-				var param = {
259
-					'goodsAmt': '0',
260
-					'brandId': $('#ITP_FORM_MLOANMNG02010_LIST_SEARCH_BRAND_ID').val(),
261
-					'storeId': $('#ITP_FORM_MLOANMNG02010_LIST_SEARCH_STORE_ID').val()
262
-				};
263
-				fn_ajax_call(EASYPAY_PAYMENT_CREATE, JSON.stringify(param), callbackFn, 'POST');
214
+				this.popup();
264 215
 			},
265 216
 			popup: function() {
266 217
 				// 결제 팝업 결과
@@ -269,47 +220,15 @@ let mobContentObj = {
269 220
 					listObj.grid.search();
270 221
 				};
271 222
 				// 결제 팝업
272
-				// 결제타입코드 : 10(선불(충전)), 20(후불(결제)), 30(후불(선결제))
223
+				// 결제타입코드 : 10(선불(충전)), 20(후불(결제)), 30(후불(선결제)), 30(후불(선결제))
273 224
 				var loanDvsn = $('#ITP_FORM_LOANMNG02010_SEARCH_STORE_LOAN_DVSN').val();
274 225
 				var args = {
275
-					'payTpCd': loanDvsn == 'LD01' ? '10' : '30',
226
+					'payTpCd': loanDvsn === 'LD01' ? '10' : '30',
276 227
 					'brandId': $('#ITP_FORM_MLOANMNG02010_LIST_SEARCH_BRAND_ID').val(),
277 228
 					'storeId': $('#ITP_FORM_MLOANMNG02010_LIST_SEARCH_STORE_ID').val()
278 229
 				};
279 230
 				fn_call_popup('biz', 'BIZPOP_PO_PAYMENT', '#ITP_ASIDE', popFn, args, 'M');
280 231
 			},
281
-			request: function() {
282
-				var param = $('#ITP_FORM_MLOANMNG02010_PAY').serializeObject();
283
-				var loanDvsn = $('#ITP_FORM_LOANMNG02010_SEARCH_STORE_LOAN_DVSN').val();
284
-				param['brandNm'] = fn_make_user_info.get('brandNm');
285
-				param['payTpCd'] = loanDvsn == 'LD01' ? '10' : '30';
286
-				console.log(param);
287
-				$(location).attr('href', MOBILE_CONTEXTPATH + '/app/payment.html?' + $.param(param));
288
-				// itp_fn_call_app.payment(param);
289
-			},
290
-			payResult: function(result) {
291
-				console.log(result);
292
-			},
293
-			cancel: function() {
294
-				var id = '#ITP_FORM_MLOANMNG02010_PAY';
295
-				$(id).find('.fnPoOrdNo').text('');
296
-				$(id).find('.fnOrdNm').text('');
297
-				$(id).find('.fnGoodsNm').text('');
298
-				$(id).find('#ITP_FORM_MLOANMNG02010_PAY_PO_ORD_NO').val('');
299
-				$(id).find('#ITP_FORM_MLOANMNG02010_PAY_ORD_NM').val('');
300
-				$(id).find('#ITP_FORM_MLOANMNG02010_PAY_GOODS_NM').val('');
301
-				$(id).find('#ITP_FORM_MLOANMNG02010_PAY_GOODS_AMT').val('');
302
-				$(id).find('#ITP_FORM_MLOANMNG02010_PAY_MALL_ID').val('');
303
-				$(id).find('#ITP_FORM_MLOANMNG02010_PAY_MOBILE_URL').val('');
304
-				$(id).find('#ITP_FORM_MLOANMNG02010_PAY_JS_URL').val('');
305
-				mobPageObj.switchScreen(PAGE_MODE_LIST);
306
-			}
307
-		},
308
-		payRequest: function() {
309
-			location.replace('app:payment');
310
-		},
311
-		payCancel: function() {
312
-			mobPageObj.switchScreen(PAGE_MODE_VIEW);
313 232
 		},
314 233
 		add: function() {
315 234
 			var storeId = $('#ITP_FORM_MLOANMNG02010_LIST_SEARCH_STORE_ID').val();
@@ -563,3 +482,7 @@ let mobPopObj = {
563 482
 		$('#' + popId).closest('.mobile-pop-close').hide();
564 483
 	}
565 484
 };
485
+
486
+var paymentObj = {
487
+
488
+};

+ 33 - 18
src/main/webapp/mobile/js/app/mpomng/ITP_MPOMNG01010.js

@@ -345,7 +345,6 @@ let mobPopObj = {
345 345
 								this.saveMode = 5;
346 346
 								popMsg = 	'구매한도가 부족합니다.<br>' +
347 347
 											'선결재를 하신 후에 구매요청을 하시기 바랍니다.<br>' +
348
-											'결재 버튼을 누르시면 임시 저장 후 결재가 진행이 됩니다.<br>' +
349 348
 											'결재를 하시겠습니까?';
350 349
 								$('#ITP_POP_MPOMNG01010_REQ_AREA #ITP_BTN_MPOMNG01010_POP_REQ_CONFIRM').text('결제');
351 350
 							}
@@ -393,24 +392,40 @@ let mobPopObj = {
393 392
 					$('#ITP_FORM_MPOMNG01010_DETAIL #ITP_FORM_MPOMNG01010_DETAIL_PCH_REQ_ST_CD').val(PCH_REQ_ST_CD_TEMP_SAVE);
394 393
 				procSave();
395 394
 			} else if (this.saveMode === 4 || this.saveMode === 5) {
396
-				var procPay = function() {
397
-					var payFn = function(result) {
398
-						console.log(result);
399
-						mobContObj.data.load();
400
-					};
401
-					var args = {
402
-						'payTpCd': this.saveMode === 4 ? '10' : '30',
403
-						'brandId': $('#ITP_FORM_MPOMNG01010_DETAIL_BRAND_ID').val(),
404
-						'storeId': $('#ITP_FORM_MPOMNG01010_DETAIL_STORE_ID').val()
405
-					};
406
-					itp_fn_payment.call(args, payFn);
395
+				// 결제 팝업 결과
396
+				var popFn = function(rowDataPop) {
397
+					console.log(JSON.stringify(rowDataPop));
398
+					procSave(function(result) { mobContObj.data.load(); });
407 399
 				};
408
-				if(this.saveMode === 5) {
409
-					$('#ITP_FORM_MPOMNG01010_DETAIL #ITP_FORM_MPOMNG01010_DETAIL_PCH_REQ_ST_CD').val(PCH_REQ_ST_CD_TEMP_SAVE);
410
-					procSave(procPay);
411
-				} else {
412
-					mobPopObj.hide('ITP_POP_MPOMNG01010_REQ_AREA');
413
-				}
400
+				// 결제 팝업
401
+				var ordUseAmt = CommonObj.onlyNumber($('#ITP_FORM_MPOMNG01010_DETAIL .fnOrdUseAmt').text());
402
+				var pchReqAmtTot = CommonObj.onlyNumber($('#ITP_FORM_MPOMNG01010_DETAIL .fnPchReqAmtTot').text());
403
+				var args = {
404
+					'payTpCd'	: '40',
405
+					'brandId'	: $('#ITP_FORM_MPOMNG01010_DETAIL_BRAND_ID').val(),
406
+					'storeId'	: $('#ITP_FORM_MPOMNG01010_DETAIL_STORE_ID').val(),
407
+					'goodsAmt'	: Number(pchReqAmtTot - ordUseAmt)
408
+				};
409
+				fn_call_popup('biz', 'BIZPOP_PO_PAYMENT', '#ITP_ASIDE', popFn, args, 'M');
410
+
411
+				// var procPay = function() {
412
+				// 	var payFn = function(result) {
413
+				// 		console.log(result);
414
+				// 		mobContObj.data.load();
415
+				// 	};
416
+				// 	var args = {
417
+				// 		'payTpCd': this.saveMode === 4 ? '10' : '30',
418
+				// 		'brandId': $('#ITP_FORM_MPOMNG01010_DETAIL_BRAND_ID').val(),
419
+				// 		'storeId': $('#ITP_FORM_MPOMNG01010_DETAIL_STORE_ID').val()
420
+				// 	};
421
+				// 	itp_fn_payment.call(args, payFn);
422
+				// };
423
+				// if(this.saveMode === 5) {
424
+				// 	$('#ITP_FORM_MPOMNG01010_DETAIL #ITP_FORM_MPOMNG01010_DETAIL_PCH_REQ_ST_CD').val(PCH_REQ_ST_CD_TEMP_SAVE);
425
+				// 	procSave(procPay);
426
+				// } else {
427
+				// 	mobPopObj.hide('ITP_POP_MPOMNG01010_REQ_AREA');
428
+				// }
414 429
 			}
415 430
 		}
416 431
 	},

+ 125 - 4
src/main/webapp/mobile/js/app/mpomng/ITP_MPOMNG02010.js

@@ -43,6 +43,16 @@ let mobPageObj = {
43 43
 			// 조회일자 지정
44 44
 			$('#ITP_FORM_MPOMNG02010_LIST_SEARCH_FROM_DT').val(itp_fn_date_add('M', -1));
45 45
 			$('#ITP_FORM_MPOMNG02010_LIST_SEARCH_TO_DT').val(itp_fn_date_add('M', 0));
46
+
47
+			if(fn_make_user_info.get('authTpCd') === '50') {
48
+				$('#ITP_FORM_MPOMNG02010_LIST_SEARCH #ITP_FORM_MPOMNG02010_LIST_SEARCH_WHS_NM').attr('readonly', true);
49
+				$('#ITP_FORM_MPOMNG02010_LIST_SEARCH #ITP_BTN_MPOMNG02010_LIST_SEARCH_WHS_NM').attr('disabled', true);
50
+				$('#ITP_FORM_MPOMNG02010_LIST_SEARCH #ITP_BTN_MPOMNG02010_LIST_DELETE_WHS_NM').attr('disabled', true);
51
+
52
+				$('#ITP_FORM_MPOMNG02010_MODIFY #ITP_FORM_MPOMNG02010_MODIFY_WHS_NM').attr('readonly', true);
53
+				$('#ITP_FORM_MPOMNG02010_MODIFY #ITP_BTN_MPOMNG02010_MODIFY_SEARCH_WHS_NM').attr('disabled', true);
54
+				$('#ITP_FORM_MPOMNG02010_MODIFY #ITP_BTN_MPOMNG02010_MODIFY_DELETE_WHS_NM').attr('disabled', true);
55
+			}
46 56
 		},
47 57
 		info: function() {
48 58
 			$('input:hidden[id$="_BRAND_ID"]').val(fn_make_user_info.get('brandId'));
@@ -88,6 +98,7 @@ let mobPageObj = {
88 98
 				return false;
89 99
 			});
90 100
 
101
+			$(document).off('click', '#ITP_LIST_MPOMNG02010_MODIFY_ROWS li button');
91 102
 			$(document).on('click', '#ITP_LIST_MPOMNG02010_MODIFY_ROWS li button', function() {
92 103
 				if($(this).hasClass('DETAIL_ITEM_PLUS')) {
93 104
 					mobContentObj.modify.list.actPlus($(this));
@@ -259,13 +270,21 @@ let mobContentObj = {
259 270
 			$('#ITP_FORM_MPOMNG02010_MODIFY #ITP_FORM_MPOMNG02010_MODIFY_DLV_REQ_DT').val(result.dlvReqDt.replace(/\./g, "-"));
260 271
 			$(id).find('.fnPchReqTotalAmt').text(CommonObj.currency.add(result.pchReqTotalAmt));
261 272
 			$(id).find('.fnOrdUseAmt').text(CommonObj.currency.add(result.ordUseAmt));
273
+			$('#ITP_FORM_MPOMNG02010_MODIFY #ITP_FORM_MPOMNG02010_MODIFY_BRAND_ID').val(result.brandId);
274
+			$('#ITP_FORM_MPOMNG02010_MODIFY #ITP_FORM_MPOMNG02010_MODIFY_STORE_ID').val(result.storeId);
262 275
 			$('#ITP_FORM_MPOMNG02010_MODIFY #ITP_FORM_MPOMNG02010_MODIFY_LOAN_DVSN').val(result.loanDvsn);
263 276
 			$('#ITP_FORM_MPOMNG02010_MODIFY #ITP_FORM_MPOMNG02010_MODIFY_LOAN_MGNT_UNQ_NO').val(result.loanMgntUnqNo);
264 277
 			$('#ITP_FORM_MPOMNG02010_MODIFY #ITP_FORM_MPOMNG02010_MODIFY_PCH_REQ_UNQ_NO').val(result.pchReqUnqNo);
265 278
 			$('#ITP_FORM_MPOMNG02010_MODIFY #ITP_FORM_MPOMNG02010_MODIFY_PCH_REQ_DVSN').val(result.pchReqDvsn);
266
-			$('#ITP_FORM_MPOMNG02010_MODIFY #ITP_FORM_MPOMNG02010_MODIFY_WHS_NM').val(result.whsNm);
267
-			$('#ITP_FORM_MPOMNG02010_MODIFY #ITP_FORM_MPOMNG02010_MODIFY_WHS_ID').val(result.whsId);
268
-			$('#ITP_FORM_MPOMNG02010_MODIFY #ITP_FORM_MPOMNG02010_MODIFY_LOCATION').val(result.location);
279
+			$('#ITP_FORM_MPOMNG02010_MODIFY #ITP_FORM_MPOMNG02010_MODIFY_PG_AFFL_ID').val(result.pgAfflId);
280
+
281
+			$('#ITP_FORM_MPOMNG02010_MODIFY .fnOrdUseAmt').text(CommonObj.currency.add(result.ordUseAmt));
282
+			if(result.whsId !== '' && result.location !== '') {
283
+				$('#ITP_FORM_MPOMNG02010_MODIFY #ITP_FORM_MPOMNG02010_MODIFY_WHS_ID').val(result.whsId);
284
+				$('#ITP_FORM_MPOMNG02010_MODIFY #ITP_FORM_MPOMNG02010_MODIFY_WHS_NM').val(result.whsNm);
285
+				$('#ITP_FORM_MPOMNG02010_MODIFY #ITP_FORM_MPOMNG02010_MODIFY_LOCATION').val(result.location);
286
+			}
287
+
269 288
 			_this.list.init(result.pchReqDtlList);
270 289
 		},
271 290
 		list: {
@@ -514,7 +533,7 @@ let mobPopObj = {
514 533
 				mobPopObj.hide(ID_ITP_POP_MPOMNG02010_WHS_AREA);
515 534
 			}
516 535
 		}
517
-	},
536
+	},/*
518 537
 	popReqConfirm: {
519 538
 		popId: 'ITP_POP_MPOMNG02010_REQ_AREA',
520 539
 		pchReqStCd: '',
@@ -587,6 +606,108 @@ let mobPopObj = {
587 606
 				fn_ajax_call(API_MOBILE_SAVE, JSON.stringify(param), saveFn, 'POST');
588 607
 			}
589 608
 		}
609
+	},*/
610
+	popReqConfirm: {
611
+		popId: 'ITP_POP_MPOMNG02010_REQ_AREA',
612
+		pchReqStCd: '',
613
+		saveMode: 1, // 1 : 임시저장, 2 : 구매요청, 요청금액이 가능금액보다 클 경우 (3 : PG 정보 없음, 4 : 선불매장, 5 : 후불매장)
614
+		init: function (pchReqStCd) {
615
+			this.formId = '#ITP_FORM_MPOMNG02010_MODIFY';
616
+			this.pchReqStCd = pchReqStCd;
617
+			mobPopObj.show(this.popId);
618
+			this.view();
619
+			this.action();
620
+		},
621
+		view: function() {
622
+			var popMsg = '';
623
+			var loanDvsn = $('#ITP_FORM_MPOMNG02010_MODIFY #ITP_FORM_MPOMNG02010_MODIFY_LOAN_DVSN').val();
624
+			var ordUseAmt = CommonObj.onlyNumber($('#ITP_FORM_MPOMNG02010_MODIFY .fnOrdUseAmt').text());
625
+			var pchReqAmtTot = CommonObj.onlyNumber($('#ITP_FORM_MPOMNG02010_MODIFY .fnPchReqAmtTot').text());
626
+			if(this.pchReqStCd === PCH_REQ_ST_CD_REQUEST_SAVE) { // 구매요청
627
+				if(loanDvsn === 'LD03') {		// 무정산
628
+					this.saveMode = 2;
629
+					popMsg = '구매요청 하시겠습니까?';
630
+					$('#ITP_POP_MPOMNG02010_REQ_AREA #ITP_BTN_MPOMNG02010_POP_REQ_CONFIRM').text('확인');
631
+				} else {
632
+					if (ordUseAmt < pchReqAmtTot) { // 요청금액이 가능금액보다 클 경우
633
+						if($('#ITP_FORM_MPOMNG02010_MODIFY #ITP_FORM_MPOMNG02010_MODIFY_PG_AFFL_ID').val() === '') {	// PG 정보 없음
634
+							this.saveMode = 3;
635
+							popMsg = 	'무통장 입금 후 구매요청해 주세요.<br>' +
636
+								'임시저장 하시겠습니까?';
637
+							$('#ITP_POP_MPOMNG02010_REQ_AREA #ITP_BTN_MPOMNG02010_POP_REQ_CONFIRM').text('확인');
638
+						} else {
639
+							if(loanDvsn === 'LD01') {	// 선불매장
640
+								this.saveMode = 4;
641
+								popMsg = 	'선불매장이므로 결재를 하셔야 구매요청이 진행이 됩니다.<br>' +
642
+									'결재를 하시겠습니까?';
643
+								$('#ITP_POP_MPOMNG02010_REQ_AREA #ITP_BTN_MPOMNG02010_POP_REQ_CONFIRM').text('결제');
644
+							} else if(loanDvsn === 'LD02') { // 후불매장
645
+								this.saveMode = 5;
646
+								popMsg = 	'구매한도가 부족합니다.<br>' +
647
+									'선결재를 하신 후에 구매요청을 하시기 바랍니다.<br>' +
648
+									'결재를 하시겠습니까?';
649
+								$('#ITP_POP_MPOMNG02010_REQ_AREA #ITP_BTN_MPOMNG02010_POP_REQ_CONFIRM').text('결제');
650
+							}
651
+						}
652
+					} else {
653
+						this.saveMode = 2;
654
+						popMsg = '구매요청 하시겠습니까?';
655
+						$('#ITP_POP_MPOMNG02010_REQ_AREA #ITP_BTN_MPOMNG02010_POP_REQ_CONFIRM').text('확인');
656
+					}
657
+				}
658
+			} else { // 임시저장
659
+				this.saveMode = 1;
660
+				popMsg = '임시저장 하시겠습니까?';
661
+				$('#ITP_POP_MPOMNG02010_REQ_AREA #ITP_BTN_MPOMNG02010_POP_REQ_CONFIRM').text('확인');
662
+			}
663
+			$('#ITP_POP_MPOMNG02010_REQ_AREA .fnPopDlvReqDt').text($('#ITP_FORM_MPOMNG02010_MODIFY #ITP_FORM_MPOMNG02010_MODIFY_DLV_REQ_DT').val());
664
+			$('#ITP_POP_MPOMNG02010_REQ_AREA .fnItemQty').text(CommonObj.currency.add(mobContentObj.modify.list.rows.length, '개'));
665
+			$('#ITP_POP_MPOMNG02010_REQ_AREA .fnOrdAmt').text(CommonObj.currency.add(pchReqAmtTot));
666
+			$('#ITP_POP_MPOMNG02010_REQ_AREA .pop_msg').html(popMsg);
667
+		},
668
+		action: function() {
669
+			var _this = this;
670
+			$('#ITP_POP_MPOMNG02010_REQ_AREA button[id="ITP_BTN_MPOMNG02010_POP_REQ_CONFIRM"]').off('click').on('click', function() {
671
+				$('#ITP_FORM_MPOMNG02010_MODIFY #ITP_FORM_MPOMNG02010_MODIFY_PCH_REQ_ST_CD').val(_this.pchReqStCd);
672
+				_this.save();
673
+			});
674
+		},
675
+		save: function() {
676
+			var procSave = function (rtnFn) {
677
+				let param = $('#ITP_FORM_MPOMNG02010_MODIFY').serializeObject();
678
+				$.each(mobContentObj.modify.list.rows, function(index, item) {
679
+					item['viewCd'] = 'C';
680
+				});
681
+				param.gridInsertData = mobContentObj.modify.list.rows;
682
+				param['dlvReqDt'] = param.dlvReqDt.replace(/[^0-9]/g, "");
683
+				var saveFn = function (result) {
684
+					console.log(result);
685
+					mobPopObj.hide('ITP_POP_MPOMNG02010_REQ_AREA');
686
+					if(typeof rtnFn === 'function') rtnFn();
687
+				};
688
+				fn_ajax_call(API_MOBILE_SAVE, JSON.stringify(param), saveFn, 'POST');
689
+			};
690
+			if (this.saveMode === 1 || this.saveMode === 2 || this.saveMode === 3) {
691
+				if(this.saveMode === 3)
692
+					$('#ITP_FORM_MPOMNG02010_MODIFY #ITP_FORM_MPOMNG02010_MODIFY_PCH_REQ_ST_CD').val(PCH_REQ_ST_CD_TEMP_SAVE);
693
+				procSave();
694
+			} else if (this.saveMode === 4 || this.saveMode === 5) {
695
+				// 결제 팝업 결과
696
+				var popFn = function(rowDataPop) {
697
+					console.log(JSON.stringify(rowDataPop));
698
+				};
699
+				// 결제 팝업
700
+				var ordUseAmt = CommonObj.onlyNumber($('#ITP_FORM_MPOMNG02010_MODIFY .fnOrdUseAmt').text());
701
+				var pchReqAmtTot = CommonObj.onlyNumber($('#ITP_FORM_MPOMNG02010_MODIFY .fnPchReqAmtTot').text());
702
+				var args = {
703
+					'payTpCd'	: '40',
704
+					'brandId'	: $('#ITP_FORM_MPOMNG02010_MODIFY_BRAND_ID').val(),
705
+					'storeId'	: $('#ITP_FORM_MPOMNG02010_MODIFY_STORE_ID').val(),
706
+					'goodsAmt'	: Number(pchReqAmtTot - ordUseAmt)
707
+				};
708
+				fn_call_popup('biz', 'BIZPOP_PO_PAYMENT', '#ITP_ASIDE', popFn, args, 'M');
709
+			}
710
+		}
590 711
 	},
591 712
 	show: function(popId) {
592 713
 		$('button[id$="_CLOSE"]').off('click').on('click', function() {

+ 8 - 6
src/main/webapp/mobile/js/app/mstockmng/ITP_MSTOCKMNG02010.js

@@ -222,8 +222,14 @@ let mobContentObj = {
222 222
 				location.replace('app:scan');
223 223
 				// location.href = 'app:scan';
224 224
 			}
225
-		},
226
-		callbackApp: function(barcode) {
225
+		}
226
+	}
227
+};
228
+
229
+var appCallFunction = {
230
+	barcode: {
231
+		result: function(barcode) {
232
+			console.log(JSON.stringify(barcode));
227 233
 			var infoFn = function(result) {
228 234
 				if(result) {
229 235
 					mobContentObj.list.itemAdd([result]);
@@ -327,7 +333,3 @@ let mobPopObj = {
327 333
 		$('#' + popId).closest('.mobile-pop-close').hide();
328 334
 	}
329 335
 };
330
-
331
-function jsBarcodeFn(barcode) {
332
-	mobContentObj.barcode.callbackApp(barcode);
333
-}

+ 30 - 319
src/main/webapp/mobile/js/app/payment.js

@@ -2,331 +2,42 @@ require(['config'], function() {
2 2
 	require([
3 3
 		'jquery'
4 4
 	], function($) {
5
-		popPageObj.init();
5
+		setTimeout(function() {
6
+			pageObj.init();
7
+		}, 300);
6 8
 	});
7 9
 });
8 10
 
9
-let EASYPAY_PAYMENT_CREATE = '/api/easypay/payment/create'; // 이지페이 결제 생성
10
-let EASYPAY_PAYMENT_REQUEST = '/api/easypay/payment/request';
11
-
12
-let KICC_JAVASCRIPT_URL;
13
-let KICC_ACTION_WEB_URL;
14
-let KICC_ACTION_MOBILE_URL; 
15
-let MALL_ID;
16
-let WEB_RETURN_URL;
17
-let MOBILE_RETURN_URL;
18
-
19
-var popPageObj = {
20
-	init: function () {
21
-		this.view();
11
+var pageObj = {
12
+	init: function() {
13
+		this.setParam();
14
+		this.mobileCert();
22 15
 	},
23
-	parentPopFn: null,
24
-	args: null,
25
-	returnType: null,
26
-	setPay: function() {
27
-
16
+	setParam() {
17
+		var nowAddress = unescape(location.href);
18
+		var parameters = (nowAddress.slice(nowAddress.indexOf('?') + 1,
19
+			nowAddress.length)).split('&');
20
+		for (var i = 0; i < parameters.length; i++) {
21
+			var param = parameters[i].split('=');
22
+			$('#frm_pay input[name="' + param[0] + '"]').val(param[1]);
23
+		}
24
+		console.log(JSON.stringify($('#frm_pay').serializeObject()));
28 25
 	},
29
-	view: function() {
30
-		var payTpCd = CommonObj.getParameter('payTpCd');
31
-		var brandId = CommonObj.getParameter('brandId');
32
-		var brandNm = CommonObj.getParameter('brandNm');
33
-		var storeId = CommonObj.getParameter('storeId');
34
-		var poOrdNo = CommonObj.getParameter('poOrdNo');
35
-		var ordNm = CommonObj.getParameter('ordNm');
36
-		var goodsNm = CommonObj.getParameter('goodsNm');
37
-		var goodsAmt = CommonObj.getParameter('goodsAmt');
38
-		var mallId = CommonObj.getParameter('mallId');
39
-		var payMethod = CommonObj.getParameter('payMethod');
40
-		var ordTel = CommonObj.getParameter('ordTel');
41
-		var ordEmail = CommonObj.getParameter('ordEmail');
42
-
43
-		var kicc_action_mobile_url = CommonObj.getParameter('kicc_action_mobile_url');
44
-		var kicc_javascript_url = CommonObj.getParameter('kicc_javascript_url');
45
-
46
-		KICC_JAVASCRIPT_URL = kicc_javascript_url;
47
-		KICC_ACTION_MOBILE_URL = kicc_action_mobile_url;
48
-		MALL_ID = mallId;
49
-		WEB_RETURN_URL = window.location.href.replace('main.html', 'easypay/oqpo/oqpo_order_res.jsp');
50
-		MOBILE_RETURN_URL = window.location.href.replace('main.html', 'easypay/oqpo/mobile_order_res_submit.jsp');
51
-
52
-		var frm_pay = document.frm_pay;
53
-
54
-		/*--모바일 결제--*/
55
-		/*--공통--*/
56
-		frm_pay.kiccActionWebUrl.value  	= KICC_ACTION_WEB_URL;
57
-		frm_pay.kiccActionMobileUrl.value  	= KICC_ACTION_MOBILE_URL;
58
-		frm_pay.EP_mall_id.value        = MALL_ID;       						   	//브랜드그룹 ID
59
-		frm_pay.EP_mall_nm.value        = brandNm;		   							//브랜드그룹명
60
-		frm_pay.EP_order_no.value       = poOrdNo;   					   			//브랜드그룹 주문번호
61
-		//결제수단(select)
62
-		frm_pay.EP_currency.value       = "00";                                    	//통화코드 : 00-원
63
-		frm_pay.EP_product_nm.value     = goodsNm;				   		   			//상품명
64
-		frm_pay.EP_product_amt.value    = goodsAmt;									//상품금액
65
-		//브랜드그룹 return_url(윈도우 타입 선택 시, 분기)
66
-		frm_pay.EP_lang_flag.value      = "KOR";                                    //언어: KOR / ENG
67
-		frm_pay.EP_charset.value        = "UTF-8";                                  //브랜드그룹 Charset: EUC-KR(default) / UTF-8
68
-		frm_pay.EP_user_id.value        = "";		                               //브랜드그룹 고객 ID
69
-		frm_pay.EP_memb_user_no.value   = "";			                           //브랜드그룹 고객 일련번호
70
-		frm_pay.EP_user_nm.value        = ordNm;						   	   //브랜드그룹 고객명
71
-		frm_pay.EP_user_mail.value      = ordEmail;                     	   //브랜드그룹 고객 이메일
72
-		frm_pay.EP_user_phone1.value    = ordTel;                       	   //브랜드그룹 고객 번호1
73
-		frm_pay.EP_user_phone2.value    = "";			                           //브랜드그룹 고객 번호2
74
-		frm_pay.EP_user_addr.value      = "";      								   //브랜드그룹 고객 주소
75
-		frm_pay.EP_product_type.value   = "0";                                     //상품정보구분 : 0-실물, 1-서비스
76
-		frm_pay.EP_product_expr.value   = "";             				           //서비스기간 : YYYYMMDD
77
-		frm_pay.EP_return_url.value     = WEB_RETURN_URL;  							   // Return 받을 URL (HTTP부터 입력)
78
-
79
-		/*--신용카드--*/
80
-		frm_pay.EP_usedcard_code.value  = "";                                      //사용가능한 카드 LIST
81
-		frm_pay.EP_quota.value          = "";                                      //할부개월
82
-
83
-		//무이자 여부(Y/N) (select)
84
-		frm_pay.EP_noinst_term.value    = "";		                               //무이자기간
85
-		//카드사포인트 사용여부(select)
86
-		frm_pay.EP_point_card.value     = "";	                                   //포인트카드 LIST
87
-		//조인코드(select)
88
-		//국민 앱카드 사용(select)
89
-
90
-		/*--가상계좌--*/
91
-		frm_pay.EP_vacct_bank.value     = "";                                      //가상계좌 사용가능한 은행 LIST
92
-		frm_pay.EP_vacct_end_date.value = "";		                               //입금 만료 날짜
93
-		frm_pay.EP_vacct_end_time.value = "";        	                           //입금 만료 시간
94
-
95
-		/*--모바일 결제--*/
96
-		/*--공통--*/
97
-		frm_pay.sp_mall_id.value        = MALL_ID;    							   //브랜드그룹 ID
98
-		frm_pay.sp_mall_nm.value        = brandNm;		   							//브랜드그룹명
99
-		frm_pay.sp_order_no.value       = poOrdNo;  						   //브랜드그룹 주문번호
100
-		//결제수단(select)
101
-		frm_pay.sp_currency.value       = "00";                                    //통화코드 : 00-원
102
-		frm_pay.sp_product_nm.value     = goodsNm;               	   	   //상품명
103
-		frm_pay.sp_product_amt.value    = goodsAmt; 							//상품금액
104
-		//브랜드그룹 return_url(윈도우 타입 선택 시, 분기)
105
-		frm_pay.sp_lang_flag.value      = "KOR";                                    //언어: KOR / ENG
106
-		frm_pay.sp_charset.value        = "UTF-8";                                  //브랜드그룹 Charset: EUC-KR(default) / UTF-8
107
-		frm_pay.sp_user_id.value        = "";           	                       //브랜드그룹 고객 ID
108
-		frm_pay.sp_memb_user_no.value   = "";                 		  	           //브랜드그룹 고객 일련번호
109
-		frm_pay.sp_user_nm.value        = ordNm;                            //브랜드그룹 고객명
110
-		frm_pay.sp_user_mail.value      = ordEmail;                         //브랜드그룹 고객 이메일
111
-		frm_pay.sp_user_phone1.value    = ordTel;                           //브랜드그룹 고객 번호1
112
-		frm_pay.sp_user_phone2.value    = "";              				           //브랜드그룹 고객 번호2
113
-		frm_pay.sp_user_addr.value      = "";  									   //브랜드그룹 고객 주소
114
-		frm_pay.sp_product_type.value   = "0";                                     //상품정보구분 : 0-실물, 1-서비스
115
-		frm_pay.sp_product_expr.value   = "";									   //서비스기간 : YYYYMMDD
116
-		frm_pay.sp_app_scheme.value     = "";                                      //브랜드그룹 app scheme : 모바일app으로 서비스시 필수
117
-
118
-		/*--신용카드--*/
119
-		frm_pay.sp_usedcard_code.value  = "";                                      //사용가능한 카드 LIST
120
-		frm_pay.sp_quota.value          = "";                                      //할부개월
121
-																				   //무이자 여부(Y/N) (select)
122
-		frm_pay.sp_noinst_term.value    = "";		                               //무이자기간
123
-		//카드사포인트 사용여부(select)
124
-		frm_pay.sp_point_card.value     = "";         		                       //포인트카드 LIST
125
-		//조인코드(select)
126
-		/*--가상계좌--*/
127
-		frm_pay.sp_vacct_bank.value     = "";                                      //가상계좌 사용가능한 은행 LIST
128
-		frm_pay.sp_vacct_end_date.value = "";               		               //입금 만료 날짜
129
-		frm_pay.sp_vacct_end_time.value = "";                       	           //입금 만료 시간
130
-
131
-		frm_pay.sp_pay_type.value       = payMethod;  								// 결제방법
132
-
26
+	mobileCert() {
27
+		var KICC_JAVASCRIPT_URL = CommonObj.getParameter('kiccJavascriptUrl');
28
+		console.log('KICC_JAVASCRIPT_URL : ' + KICC_JAVASCRIPT_URL);
29
+
30
+		var head = document.getElementsByTagName('head')[0];
31
+		var script = document.createElement('script');
32
+		script.type = 'text/javascript';
33
+		script.src = KICC_JAVASCRIPT_URL;
34
+		head.appendChild(script);
35
+
36
+		// const js = '<script src="' + KICC_JAVASCRIPT_URL + '"></script>';
37
+		// $('#ITP_BIZPOP_PO_PAYMENT #ITP_POPUP_KICC_JS').empty();
38
+		// $('#ITP_BIZPOP_PO_PAYMENT #ITP_POPUP_KICC_JS').append(js);
133 39
 		$.getScript(KICC_JAVASCRIPT_URL, function() {
134
-			if (isMobile() || window.innerWidth < 1201 ) {
135
-				f_mobile_cert();
136
-			} else {
137
-				f_cert();
138
-				// f_mobile_cert();
139
-			}
40
+			easypay_card_webpay(frm_pay,"/oqpo-view/mobile/app/easypay/oqpo/mobile_order_req.jsp","_self","0","0","submit",30);
140 41
 		});
141
-
142
-	},
143
-	fnPaymentReq: function() {
144
-		const formId = '#ITP_FORM_PO_PAYMENT_POPUP';
145
-		itp_fn_form_clear_validate(null, formId);
146
-
147
-		var vali_goodsAmt = itp_fn_form_validate(formId, formId + '_GOODS_AMT', ['empty'], undefined);
148
-		var vali_ordTel = itp_fn_form_validate(formId, formId + '_ORD_TEL', ['empty'], undefined);
149
-		var vali_ordEmail = itp_fn_form_validate(formId, formId + '_ORD_EMAIL', ['email'], undefined);
150
-
151
-		if (vali_goodsAmt && vali_ordTel && vali_ordEmail) {
152
-			// var sttlRjctRsn = $('#ITP_FORM_PO_PAYMENT_POPUP_STTL_RJCT_RSN').val();
153
-
154
-			// popPageObj.parentPopFn(sttlRjctRsn);
155
-			// $('#ITP_BIZPOP_PO_PAYMENT').modal('hide'); // 팝업닫기
156
-
157
-			// $(formId).attr('action', '/oqpo-view/easypay/oqpo/oqpo_order.jsp');
158
-			// $(formId).submit();
159
-
160
-			var frm_pay = document.frm_pay;
161
-			frm_pay.EP_pay_type.value       = $('#ITP_FORM_PO_PAYMENT_POPUP_PAY_METHOD').val();  	// 결제방법
162
-			frm_pay.EP_product_amt.value    = $('#ITP_FORM_PO_PAYMENT_POPUP_GOODS_AMT').val();  	// 결제금액
163
-			frm_pay.EP_user_phone1.value    = $('#ITP_FORM_PO_PAYMENT_POPUP_ORD_TEL').val();  		// 휴대폰
164
-			frm_pay.EP_user_mail.value      = $('#ITP_FORM_PO_PAYMENT_POPUP_ORD_EMAIL').val();  	// 이메일
165
-
166
-			frm_pay.sp_pay_type.value       = $('#ITP_FORM_PO_PAYMENT_POPUP_PAY_METHOD').val();  	// 결제방법
167
-			frm_pay.sp_product_amt.value    = $('#ITP_FORM_PO_PAYMENT_POPUP_GOODS_AMT').val();  	// 결제금액
168
-			frm_pay.sp_user_phone1.value    = $('#ITP_FORM_PO_PAYMENT_POPUP_ORD_TEL').val();  		// 휴대폰
169
-			frm_pay.sp_user_mail.value      = $('#ITP_FORM_PO_PAYMENT_POPUP_ORD_EMAIL').val();  	// 이메일
170
-
171
-			if (isMobile() || window.innerWidth < 1201 ) {
172
-				f_mobile_cert();
173
-			} else {
174
-			    f_cert();
175
-				// f_mobile_cert();
176
-			}
177
-		}
178 42
 	}
179 43
 };
180
-
181
-/* 인증창 호출, 인증 요청 */
182
-function f_cert() {
183
-    var frm_pay = document.frm_pay;
184
-
185
-    /*  주문정보 확인 */
186
-    if( !frm_pay.EP_order_no.value ) {
187
-        alert("브랜드그룹주문번호가 존재하지않습니다.");
188
-        frm_pay.EP_order_no.focus();
189
-        return;
190
-    }
191
-
192
-    if( !frm_pay.EP_product_amt.value ) {
193
-        alert("상품금액이 존재하지않습니다.");
194
-        frm_pay.EP_product_amt.focus();
195
-        return;
196
-    }
197
-
198
-    /* UTF-8 사용브랜드그룹의 경우 EP_charset 값 셋팅 필수 */
199
-    if( frm_pay.EP_charset.value == "UTF-8" ) {
200
-        // 한글이 들어가는 값은 모두 encoding 필수.
201
-        frm_pay.EP_mall_nm.value        = encodeURIComponent( frm_pay.EP_mall_nm.value );
202
-        frm_pay.EP_product_nm.value     = encodeURIComponent( frm_pay.EP_product_nm.value );
203
-        frm_pay.EP_user_nm.value        = encodeURIComponent( frm_pay.EP_user_nm.value );
204
-        frm_pay.EP_user_addr.value      = encodeURIComponent( frm_pay.EP_user_addr.value );
205
-    }
206
-
207
-    /* 브랜드그룹에서 원하는 인증창 호출 방법을 선택 */
208
-    if( frm_pay.EP_window_type.value == "iframe" ) {
209
-
210
-    	easypay_webpay(frm_pay,"/oqpo-view/easypay/oqpo/oqpo_iframe_req.jsp","hiddenifr","0","0","iframe",30);
211
-
212
-        if( frm_pay.EP_charset.value == "UTF-8" ) {
213
-            // encoding 된 값은 모두 decoding 필수.
214
-            frm_pay.EP_mall_nm.value        = decodeURIComponent( frm_pay.EP_mall_nm.value );
215
-            frm_pay.EP_product_nm.value     = decodeURIComponent( frm_pay.EP_product_nm.value );
216
-            frm_pay.EP_user_nm.value        = decodeURIComponent( frm_pay.EP_user_nm.value );
217
-            frm_pay.EP_user_addr.value      = decodeURIComponent( frm_pay.EP_user_addr.value );
218
-        }
219
-    } else if( frm_pay.EP_window_type.value == "popup" ) {
220
-
221
-        easypay_webpay(frm_pay,"/oqpo-view/easypay/oqpo/oqpo_popup_req.jsp","hiddenifr","","","popup",30);
222
-
223
-        if( frm_pay.EP_charset.value == "UTF-8" ) {
224
-            // encoding 된 값은 모두 decoding 필수.
225
-            frm_pay.EP_mall_nm.value        = decodeURIComponent( frm_pay.EP_mall_nm.value );
226
-            frm_pay.EP_product_nm.value     = decodeURIComponent( frm_pay.EP_product_nm.value );
227
-            frm_pay.EP_user_nm.value        = decodeURIComponent( frm_pay.EP_user_nm.value );
228
-            frm_pay.EP_user_addr.value      = decodeURIComponent( frm_pay.EP_user_addr.value );
229
-        }
230
-    }
231
-}
232
-
233
-/* 인증창 호출, 인증 요청 */
234
-function f_mobile_cert() {
235
-    var frm_pay = document.frm_pay;
236
-    
237
-    /*  주문정보 확인 */
238
-    if( !frm_pay.sp_order_no.value ) {
239
-        alert("브랜드그룹주문번호가 존재하지않습니다.");
240
-        frm_pay.sp_order_no.focus();
241
-        return;
242
-    }
243
-
244
-    if( !frm_pay.sp_product_amt.value ) {
245
-        alert("상품금액이 존재하지않습니다.");
246
-        frm_pay.sp_product_amt.focus();
247
-        return;
248
-    }
249
-    /* UTF-8 사용브랜드그룹의 경우 EP_charset 값 셋팅 필수 */
250
-    if( frm_pay.sp_charset.value == "UTF-8" ) {
251
-        // 한글이 들어가는 값은 모두 encoding 필수.
252
-        frm_pay.sp_mall_nm.value      = encodeURIComponent( frm_pay.sp_mall_nm.value );
253
-        frm_pay.sp_product_nm.value   = encodeURIComponent( frm_pay.sp_product_nm.value );
254
-        frm_pay.sp_user_nm.value      = encodeURIComponent( frm_pay.sp_user_nm.value );
255
-        frm_pay.sp_user_addr.value    = encodeURIComponent( frm_pay.sp_user_addr.value );
256
-    }
257
-
258
-   	frm_pay.sp_return_url.value = MOBILE_RETURN_URL; //
259
-	console.log( $('#frm_pay').serializeObject());
260
-    easypay_card_webpay(frm_pay,"/oqpo-view/mobile/app/easypay/oqpo/mobile_order_req.jsp","_self","0","0","submit",30);
261
-}
262
-
263
-/* 승인 요청 */
264
-function f_submit() {
265
-
266
-	var reqDataList = [];	
267
-	var ca = $('#sttlMgntUnqNoList').val().split(';');
268
-    for(var i = 0 ; i < ca.length ; i++) {
269
-		reqDataList.push( { sttlMgntUnqNo : ca[i] } );
270
-	}	
271
-		
272
-	let param = $('#frm_pay').serializeObject();
273
-	param.reqDataList = reqDataList;
274
-	
275
-	// console.log("REQ : " + JSON.stringify(param));
276
-		
277
-	fn_ajax_call(EASYPAY_PAYMENT_REQUEST, JSON.stringify(param), function(result) {
278
-		
279
-		// console.log("RES : " + JSON.stringify(result));
280
-		
281
-		if(result.res_cd == '0000') {
282
-			popPageObj.parentPopFn(result);			
283
-			$('#ITP_BIZPOP_PO_PAYMENT').modal('hide'); // 팝업닫기
284
-		} else {
285
-			itp_fn_modal_alert_ajax(result.res_msg);			
286
-		}
287
-		
288
-	}, 'POST');	
289
-}
290
-
291
-/* 모바일 승인 요청 */
292
-function f_moblie_submit() {
293
-	f_submit();
294
-//      var frm_pay = document.frm_pay;
295
-//
296
-//      // 정상("0000") 일 때 승인요청페이지로 이동.
297
-//      if( frm_pay.sp_res_cd.value == "0000" ) {
298
-//
299
-//          if( frm_pay.sp_charset.value == "UTF-8" ) {
300
-//              // 인증요청 시 인코딩 한 값은 승인요청 시 디코딩 처리해야함.
301
-//              frm_pay.sp_mall_nm.value      = decodeURIComponent( frm_pay.sp_mall_nm.value );
302
-//              frm_pay.sp_product_nm.value   = decodeURIComponent( frm_pay.sp_product_nm.value );
303
-//              frm_pay.sp_user_nm.value      = decodeURIComponent( frm_pay.sp_user_nm.value );
304
-//              frm_pay.sp_user_addr.value    = decodeURIComponent( frm_pay.sp_user_addr.value );
305
-//          }
306
-//
307
-//          frm_pay.target = "_self";
308
-//          // frm_pay.action = "${contextPath}/easypay_request.itp";
309
-//          // frm_pay.submit();
310
-//      }
311
-}
312
-
313
-function isMobile() {
314
-    // if we want a more complete list use this: http://detectmobilebrowsers.com/
315
-    // str.test() is more efficent than str.match()
316
-    // remember str.test is case sensitive
317
-    var isMobile = (/iphone|ipod|android|ie|blackberry|fennec/).test(navigator.userAgent.toLowerCase());
318
-    return isMobile;
319
-}
320
-
321
-function itp_fn_BIZPOP_PO_PAYMENT(parentPopFn, args, returnType) {
322
-	$('#ITP_BIZPOP_PO_PAYMENT').one('shown.bs.modal', function(e) {
323
-		itp_fn_fire_window_resize();
324
-	}).one('hidden.bs.modal', function(e) {
325
-		$('#ITP_BIZPOP_PO_PAYMENT').remove();
326
-	}).modal('show');
327
-
328
-	popPageObj.parentPopFn = parentPopFn;
329
-	popPageObj.args = args;
330
-	popPageObj.returnType = returnType;
331
-	popPageObj.init();
332
-}

+ 37 - 13
src/main/webapp/mobile/js/app/popup/biz/ITP_BIZPOP_PO_PAYMENT.js

@@ -68,6 +68,10 @@ var popPageObj = {
68 68
 			$('#ITP_FORM_PO_PAYMENT_POPUP_GOODS_AMT').attr('readonly','readonly');			
69 69
 		} else if(popPageObj.args.payTpCd == '30') {  
70 70
 			$('#ITP_BIZPOP_PO_PAYMENT_PAY_TP_NM').text('후불(선결제)');
71
+		} else if(popPageObj.args.payTpCd == '40') {
72
+			$('#ITP_BIZPOP_PO_PAYMENT_PAY_TP_NM').text('충전');
73
+			$('#ITP_FORM_PO_PAYMENT_POPUP_GOODS_AMT').val(popPageObj.args.goodsAmt); // 결제금액
74
+			$('#ITP_FORM_PO_PAYMENT_POPUP_GOODS_AMT').attr('readonly','readonly');
71 75
 		}			
72 76
 		// 이지페이 결제 생성
73 77
 		let param = $('#ITP_FORM_PO_PAYMENT_POPUP').serializeObject();	
@@ -86,13 +90,9 @@ var popPageObj = {
86 90
 			$('#ITP_FORM_PO_PAYMENT_POPUP .fnPoOrdNo').text(result.poOrdNo); // 주문번호
87 91
 			$('#ITP_FORM_PO_PAYMENT_POPUP .fnOrdNm').text(result.ordNm); // 구매자명
88 92
 			$('#ITP_FORM_PO_PAYMENT_POPUP .fnGoodsNm').text(result.goodsNm); // 상품명
89
-			$('#ITP_FORM_PO_PAYMENT_POPUP_ORD_TEL').val(result.ordTel); // 휴대전화번호
90
-
91
-
92
-			$('#ITP_FORM_PO_PAYMENT_POPUP_GOODS_AMT').val('1000'); // 결제금액
93
+			// $('#ITP_FORM_PO_PAYMENT_POPUP_ORD_TEL').val(result.ordTel); // 휴대전화번호
93 94
 			$('#ITP_FORM_PO_PAYMENT_POPUP_ORD_TEL').val('010-2329-8816'); // 휴대전화번호
94 95
 
95
-
96 96
 			if(result.ordEmail) {
97 97
 				var email = result.ordEmail.split('@');
98 98
 				if(email.length === 2) {
@@ -109,9 +109,9 @@ var popPageObj = {
109 109
 			WEB_RETURN_URL = window.location.href.replace('main.html', 'easypay/oqpo/oqpo_order_res.jsp');
110 110
 			MOBILE_RETURN_URL = window.location.href.replace('main.html', 'easypay/oqpo/mobile_order_res_submit.jsp');
111 111
 			
112
-			const js = '<script src="'+KICC_JAVASCRIPT_URL+'"></script>';
113
-	        $('#ITP_ASIDE #ITP_BIZPOP_PO_PAYMENT #ITP_POPUP_KICC_JS').empty();
114
-	        $('#ITP_ASIDE #ITP_BIZPOP_PO_PAYMENT #ITP_POPUP_KICC_JS').append(js);
112
+			// const js = '<script src="'+KICC_JAVASCRIPT_URL+'"></script>';
113
+	        // $('#ITP_ASIDE #ITP_BIZPOP_PO_PAYMENT #ITP_POPUP_KICC_JS').empty();
114
+	        // $('#ITP_ASIDE #ITP_BIZPOP_PO_PAYMENT #ITP_POPUP_KICC_JS').append(js);
115 115
 			
116 116
 			// console.log('KICC_JAVASCRIPT_URL : ' + KICC_JAVASCRIPT_URL);
117 117
             // console.log('KICC_ACTION_WEB_URL : ' + KICC_ACTION_WEB_URL);
@@ -123,8 +123,9 @@ var popPageObj = {
123 123
 			/*--모바일 결제--*/
124 124
 		    /*--공통--*/        
125 125
 		    frm_pay.kiccActionWebUrl.value  	= KICC_ACTION_WEB_URL;       						  
126
-		    frm_pay.kiccActionMobileUrl.value  	= KICC_ACTION_MOBILE_URL;       						  
127
-		    frm_pay.EP_mall_id.value        = MALL_ID;       						   //브랜드그룹 ID
126
+		    frm_pay.kiccActionMobileUrl.value  	= KICC_ACTION_MOBILE_URL;
127
+			frm_pay.kiccJavascriptUrl.value  	= KICC_JAVASCRIPT_URL;
128
+			frm_pay.EP_mall_id.value        = MALL_ID;       						   //브랜드그룹 ID
128 129
 		    frm_pay.EP_mall_nm.value        = fn_make_user_info.get('brandNm');		   //브랜드그룹명
129 130
 		    frm_pay.EP_order_no.value       = result.poOrdNo;   					   //브랜드그룹 주문번호
130 131
 		                                                                               //결제수단(select)
@@ -237,6 +238,23 @@ var popPageObj = {
237 238
 	}
238 239
 };
239 240
 
241
+var appCallFunction = {
242
+	payment: {
243
+		result: function(param) {
244
+			console.log('appCallFunction ===> ' + param);
245
+			var paramObj = JSON.parse(param);
246
+			console.log('appCallFunction res_cd ===> ' + paramObj.sp_res_cd);
247
+			if(paramObj.sp_res_cd === '0000') {
248
+				f_submit();
249
+			}
250
+		}
251
+	}
252
+};
253
+
254
+function appJsFnPayment(param) {
255
+	appCallFunction.payment.result(param);
256
+}
257
+
240 258
 /* 인증창 호출, 인증 요청 */
241 259
 function f_cert() {
242 260
     var frm_pay = document.frm_pay;
@@ -315,7 +333,13 @@ function f_mobile_cert() {
315 333
     }
316 334
 
317 335
    	frm_pay.sp_return_url.value = MOBILE_RETURN_URL; //    	
318
-    easypay_card_webpay(frm_pay,"/oqpo-view/mobile/app/easypay/oqpo/mobile_order_req.jsp","_self","0","0","submit",30);
336
+    // easypay_card_webpay(frm_pay,"/oqpo-view/mobile/app/easypay/oqpo/mobile_order_req.jsp","_self","0","0","submit",30);
337
+	// setTimeout(function() {
338
+	// 	$('#ITP_BIZPOP_PO_PAYMENT').modal('hide'); // 팝업닫기
339
+	// }, 200);
340
+	var param = $('#frm_pay').serializeObject();
341
+	// $(location).attr('href', MOBILE_CONTEXTPATH + '/app/payment.html?' + $.param(param));
342
+	itp_fn_call_app.payment($.param(param));
319 343
 }
320 344
 
321 345
 /* 승인 요청 */
@@ -323,7 +347,7 @@ function f_submit() {
323 347
 	
324 348
 	$('#frm_pay #poOrdNo').val($('#ITP_FORM_PO_PAYMENT_POPUP_PO_ORD_NO').val()); 
325 349
 	$('#frm_pay #payTpCd').val($('#ITP_FORM_PO_PAYMENT_POPUP_PAY_TP_CD').val()); 
326
-	// $('#frm_pay #sttlMgntUnqNo').val($('#ITP_FORM_PO_PAYMENT_POPUP_STTL_MGNT_UNQ_NO').val()); 
350
+	// $('#frm_pay #sttlMgntUnqNo').val($('#ITP_FORM_PO_PAYMENT_POPUP_STTL_MGNT_UNQ_NO').val());
327 351
 	$('#frm_pay #brandId').val($('#ITP_FORM_PO_PAYMENT_POPUP_BRAND_ID').val()); 
328 352
 	$('#frm_pay #storeId').val($('#ITP_FORM_PO_PAYMENT_POPUP_STORE_ID').val()); 
329 353
 	
@@ -346,7 +370,7 @@ function f_submit() {
346 370
 			popPageObj.parentPopFn(result);			
347 371
 			$('#ITP_BIZPOP_PO_PAYMENT').modal('hide'); // 팝업닫기
348 372
 		} else {
349
-			itp_fn_modal_alert_ajax(result.res_msg);			
373
+			alert(result.res_msg);
350 374
 		}
351 375
 		
352 376
 	}, 'POST');	

+ 5 - 4
src/main/webapp/mobile/js/config.js

@@ -42,7 +42,7 @@ require([
42 42
 	'jquery.bootstrap.datepicker.locale',
43 43
 	'message.locale'
44 44
 ], function($) {
45
-	history.pushState(null, null, location.href);
45
+	// history.pushState(null, null, location.href);
46 46
 
47 47
 	CommonObj.init();
48 48
 
@@ -429,7 +429,9 @@ function fn_ajax_call(href, param, fn, type, errFn) {
429 429
 		},
430 430
 		beforeSend: function(xhr) {
431 431
 			$('#ITP_OVERLAY').show();
432
-			xhr.setRequestHeader('X-AUTH-TOKEN', CONN_KEY); //Jwt 토큰을 헤더에 담아서 보낸다.
432
+			var data = JSON.parse(sessionStorage.getItem('itp_login_info'));
433
+			xhr.setRequestHeader('X-AUTH-TOKEN', (data) ? data.connKey : null); //Jwt 토큰을 헤더에 담아서 보낸다.
434
+			// xhr.setRequestHeader('X-AUTH-TOKEN', CONN_KEY); //Jwt 토큰을 헤더에 담아서 보낸다.
433 435
 		},
434 436
 		complete: function() {
435 437
 			$('#ITP_OVERLAY').hide();
@@ -697,8 +699,7 @@ let itp_fn_call_app = {
697 699
 
698 700
 	},
699 701
 	payment: function(param) {
700
-		console.log('app:payment:' + $.param(param));
701
-		location.replace('app:payment:' + $.param(param));
702
+		location.replace('app:payment:' + param);
702 703
 	},
703 704
 	backPress: function() {
704 705
 		location.replace('app:pageBack');