소스 검색

모바일 결제 수정

juney 2 년 전
부모
커밋
697da9b826

+ 42 - 41
src/main/webapp/mobile/app/easypay/oqpo/mobile_order_res_submit.jsp

@@ -36,39 +36,39 @@ request.setCharacterEncoding("utf-8");
36 36
     {
37 37
         var res_cd = "<%=getNullToSpace(request.getParameter("sp_res_cd"))%>";
38 38
         // <!--공통-->
39
-        window.document.getElementById("sp_res_cd").value             = res_cd;  // [필수]응답코드
40
-        window.document.getElementById("sp_res_msg").value            = "<%=getNullToSpace(request.getParameter("sp_res_msg"))          %>";  // [필수]응답메세지
41
-        window.document.getElementById("sp_tr_cd").value              = "<%=getNullToSpace(request.getParameter("sp_tr_cd"))            %>";  // [필수]결제창 요청구분
42
-        window.document.getElementById("sp_ret_pay_type").value       = "<%=getNullToSpace(request.getParameter("sp_ret_pay_type"))     %>";  // [필수]결제수단
43
-        window.document.getElementById("sp_trace_no").value           = "<%=getNullToSpace(request.getParameter("sp_trace_no"))         %>";  // [선택]추적번호
44
-        window.document.getElementById("sp_order_no").value           = "<%=getNullToSpace(request.getParameter("sp_order_no"))         %>";  // [필수]가맹점 주문번호
45
-        window.document.getElementById("sp_sessionkey").value         = "<%=getNullToSpace(request.getParameter("sp_sessionkey"))       %>";  // [필수]세션키
46
-        window.document.getElementById("sp_encrypt_data").value       = "<%=getNullToSpace(request.getParameter("sp_encrypt_data"))     %>";  // [필수]암호화전문
47
-        window.document.getElementById("sp_mall_id").value            = "<%=getNullToSpace(request.getParameter("sp_mall_id"))          %>";  // [필수]가맹점 ID
48
-        window.document.getElementById("sp_mobilereserved1").value    = "<%=getNullToSpace(request.getParameter("sp_mobilereserved1"))  %>";  // [선택]여유필드
49
-        window.document.getElementById("sp_mobilereserved2").value    = "<%=getNullToSpace(request.getParameter("sp_mobilereserved2"))  %>";  // [선택]여유필드
50
-        window.document.getElementById("sp_reserved1").value          = "<%=getNullToSpace(request.getParameter("sp_reserved1"))        %>";  // [선택]여유필드
51
-        window.document.getElementById("sp_reserved2").value          = "<%=getNullToSpace(request.getParameter("sp_reserved2"))        %>";  // [선택]여유필드
52
-        window.document.getElementById("sp_reserved3").value          = "<%=getNullToSpace(request.getParameter("sp_reserved3"))        %>";  // [선택]여유필드
53
-        window.document.getElementById("sp_reserved4").value          = "<%=getNullToSpace(request.getParameter("sp_reserved4"))        %>";  // [선택]여유필드
39
+        document.getElementById("sp_res_cd").value             = res_cd;  // [필수]응답코드
40
+        document.getElementById("sp_res_msg").value            = "<%=getNullToSpace(request.getParameter("sp_res_msg"))          %>";  // [필수]응답메세지
41
+        document.getElementById("sp_tr_cd").value              = "<%=getNullToSpace(request.getParameter("sp_tr_cd"))            %>";  // [필수]결제창 요청구분
42
+        document.getElementById("sp_ret_pay_type").value       = "<%=getNullToSpace(request.getParameter("sp_ret_pay_type"))     %>";  // [필수]결제수단
43
+        document.getElementById("sp_trace_no").value           = "<%=getNullToSpace(request.getParameter("sp_trace_no"))         %>";  // [선택]추적번호
44
+        document.getElementById("sp_order_no").value           = "<%=getNullToSpace(request.getParameter("sp_order_no"))         %>";  // [필수]가맹점 주문번호
45
+        document.getElementById("sp_sessionkey").value         = "<%=getNullToSpace(request.getParameter("sp_sessionkey"))       %>";  // [필수]세션키
46
+        document.getElementById("sp_encrypt_data").value       = "<%=getNullToSpace(request.getParameter("sp_encrypt_data"))     %>";  // [필수]암호화전문
47
+        document.getElementById("sp_mall_id").value            = "<%=getNullToSpace(request.getParameter("sp_mall_id"))          %>";  // [필수]가맹점 ID
48
+        document.getElementById("sp_mobilereserved1").value    = "<%=getNullToSpace(request.getParameter("sp_mobilereserved1"))  %>";  // [선택]여유필드
49
+        document.getElementById("sp_mobilereserved2").value    = "<%=getNullToSpace(request.getParameter("sp_mobilereserved2"))  %>";  // [선택]여유필드
50
+        document.getElementById("sp_reserved1").value          = "<%=getNullToSpace(request.getParameter("sp_reserved1"))        %>";  // [선택]여유필드
51
+        document.getElementById("sp_reserved2").value          = "<%=getNullToSpace(request.getParameter("sp_reserved2"))        %>";  // [선택]여유필드
52
+        document.getElementById("sp_reserved3").value          = "<%=getNullToSpace(request.getParameter("sp_reserved3"))        %>";  // [선택]여유필드
53
+        document.getElementById("sp_reserved4").value          = "<%=getNullToSpace(request.getParameter("sp_reserved4"))        %>";  // [선택]여유필드
54 54
 
55 55
         // <!--신용카드-->
56
-        window.document.getElementById("sp_card_code").value          = "<%=getNullToSpace(request.getParameter("sp_card_code"))        %>";  // [필수]카드코드
57
-        window.document.getElementById("sp_eci_code").value           = "<%=getNullToSpace(request.getParameter("sp_eci_code"))         %>";  // [선택]ECI코드(MPI인 경우)
58
-        window.document.getElementById("sp_card_req_type").value      = "<%=getNullToSpace(request.getParameter("sp_card_req_type"))    %>";  // [필수]거래구분
59
-        window.document.getElementById("sp_save_useyn").value         = "<%=getNullToSpace(request.getParameter("sp_save_useyn"))       %>";  // [선택]카드사 세이브 여부
60
-        window.document.getElementById("sp_card_prefix").value        = "<%=getNullToSpace(request.getParameter("sp_card_prefix"))      %>";  // [선택]신용카드 Prefix
61
-        window.document.getElementById("sp_card_no_7").value          = "<%=getNullToSpace(request.getParameter("sp_card_no_7"))        %>";  // [선택]신용카드번호 앞7자리
56
+        document.getElementById("sp_card_code").value          = "<%=getNullToSpace(request.getParameter("sp_card_code"))        %>";  // [필수]카드코드
57
+        document.getElementById("sp_eci_code").value           = "<%=getNullToSpace(request.getParameter("sp_eci_code"))         %>";  // [선택]ECI코드(MPI인 경우)
58
+        document.getElementById("sp_card_req_type").value      = "<%=getNullToSpace(request.getParameter("sp_card_req_type"))    %>";  // [필수]거래구분
59
+        document.getElementById("sp_save_useyn").value         = "<%=getNullToSpace(request.getParameter("sp_save_useyn"))       %>";  // [선택]카드사 세이브 여부
60
+        document.getElementById("sp_card_prefix").value        = "<%=getNullToSpace(request.getParameter("sp_card_prefix"))      %>";  // [선택]신용카드 Prefix
61
+        document.getElementById("sp_card_no_7").value          = "<%=getNullToSpace(request.getParameter("sp_card_no_7"))        %>";  // [선택]신용카드번호 앞7자리
62 62
 
63 63
         // <!--간편결제-->
64
-        window.document.getElementById("sp_spay_cp").value            = "<%=getNullToSpace(request.getParameter("sp_spay_cp"))          %>";  // [선택]간편결제 CP코드
64
+        document.getElementById("sp_spay_cp").value            = "<%=getNullToSpace(request.getParameter("sp_spay_cp"))          %>";  // [선택]간편결제 CP코드
65 65
 
66 66
         // <!--선불카드-->
67
-        window.document.getElementById("sp_prepaid_cp").value         = "<%=getNullToSpace(request.getParameter("sp_prepaid_cp"))       %>";  // [선택]선불카드 CP코드
67
+        document.getElementById("sp_prepaid_cp").value         = "<%=getNullToSpace(request.getParameter("sp_prepaid_cp"))       %>";  // [선택]선불카드 CP코드
68 68
 
69 69
         if( res_cd == "0000" )
70 70
         {
71
-            location.replace('app:pay:result:' + JSON.stringify(objectifyForm()));
71
+            location.replace('app:pay:result:' + JSON.stringify(serialize()));
72 72
         }
73 73
         else
74 74
         {
@@ -83,30 +83,31 @@ request.setCharacterEncoding("utf-8");
83 83
         return decodeURIComponent((str + '').replace(/\+/g, '%20'));
84 84
     }
85 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)];
86
+    function serialize() {
87
+        var form = document.getElementById("frm_pay");
88
+        const serialized = {};
89
+        for (let i = 0, length = form.elements.length; i < length; i++) {
90
+            const field = form.elements[i];
91
+            if (field.name && !field.disabled && "file" !== field.type && "reset" !== field.type && "submit" !== field.type && "button" !== field.type) {
92
+                console.log('field.type : ' + field.type);
93
+                if(field.type === 'text' || field.type === 'hidden') {
94
+                    serialized[field.name] = trim(field.value);
97 95
                 }
98
-            } else {
99
-                result[element.name] = $.trim(element.value);
100 96
             }
101
-        };
102
-        $.each(formArray, extend);
103
-        return result;
97
+        }
98
+        console.log('serialize : ' + JSON.stringify(serialized));
99
+        return serialized;
100
+    }
101
+
102
+    function trim(text) {
103
+        var regex = / /gi;
104
+        return text.replace(regex, '');
104 105
     }
105 106
 </script>
106 107
 <title>오더퀸 수발주 결제하기</title>
107 108
 </head>
108 109
 <body>
109
-<form name="frm_pay" method="post" >
110
+<form name="frm_pay" id="frm_pay" method="post" >
110 111
     <!-- [START] 인증응답 필드 -->
111 112
 
112 113
     <!--공통-->

+ 41 - 43
src/main/webapp/mobile/app/popup/biz/BIZPOP_PO_PAYMENT.html

@@ -6,13 +6,15 @@
6 6
 				<h5 class="modal-title">수발주 결제</h5>
7 7
 			</div>
8 8
 			<div class="modal-body">
9
-			
10
-				<div class=" ">
11
-					<div class="col-xs-12" style="padding:10px 15px 30px 15px;">
12
-					수발주 <b><span id="ITP_BIZPOP_PO_PAYMENT_PAY_TP_NM"></span></b>을 위해 아래 항목을 입력을 한 후에 결제 버튼을 클릭하여 PG사 결제 절차에 따라 결재을 진행해 주시기 바랍니다.
9
+
10
+				<div class="itp_form itp_type1 fix">
11
+					<div class="col-xs-12 itp_ip">
12
+						수발주 <b><span id="ITP_BIZPOP_PO_PAYMENT_PAY_TP_NM"></span></b>을 위해 아래 항목을 입력을 한 후에 결제 버튼을 클릭하여 PG사 결제 절차에 따라 결재을 진행해 주시기 바랍니다.
13
+						<br>
14
+						<br>
13 15
 					</div>
14 16
 				</div>
15
-				
17
+
16 18
 				<div class="itp_form itp_type1 fix">
17 19
 					<div class="col-xs-12">
18 20
 						<div class="form-horizontal">
@@ -33,45 +35,43 @@
33 35
 								<input type="hidden" id="ITP_FORM_PO_PAYMENT_POPUP_KICC_ACTION_WEB_URL" name="kiccActionWebUrl" value="" />
34 36
 								<input type="hidden" id="ITP_FORM_PO_PAYMENT_POPUP_KICC_ACTION_MOBILE_URL" name="kiccActionMobileUrl" value="" />
35 37
 								<input type="hidden" id="ITP_FORM_PO_PAYMENT_POPUP_MALL_ID" name="mallId" value="" />
36
-							
37
-								<div class="form-group itp_mg_btm">
38
-									<label class="col-xs-3 itp_mlb itp_mg_btm">주문번호</label>
39
-									<div class="col-xs-9 itp_mip fnPoOrdNo">adfasdfafda</div>
38
+
39
+								<div class="form-group shot">
40
+									<label class="col-xs-2 itp_lb shot">주문번호</label>
41
+									<div class="col-xs-9 itp_ip fnPoOrdNo"></div>
40 42
 								</div>
41
-								<div class="form-group itp_mg_btm">
42
-									<label class="col-xs-3 itp_mlb itp_mg_btm">구매자명</label>
43
-									<div class="col-xs-9 itp_mip fnOrdNm">asdfasdfasdfa</div>
43
+								<div class="form-group shot">
44
+									<label class="col-xs-2 itp_lb shot">구매자명</label>
45
+									<div class="col-xs-9 itp_ip fnOrdNm"></div>
44 46
 								</div>
45
-								<div class="form-group itp_mg_btm">
46
-									<label class="col-xs-3 itp_mlb itp_mg_btm">상품명</label>
47
-									<div class="col-xs-9 itp_mip fnGoodsNm">adsfasdf</div>
47
+								<div class="form-group shot">
48
+									<label class="col-xs-2 itp_lb shot">상품명</label>
49
+									<div class="col-xs-9 itp_ip fnGoodsNm"></div>
48 50
 								</div>
49
-								<div class="form-group itp_mg_btm">
50
-									<label class="col-xs-3 itp_mlb itp_mg_btm">결제금액*</label>
51
-									<div class="col-xs-9 itp_mip">
52
-									<input type="text" id="ITP_FORM_PO_PAYMENT_POPUP_GOODS_AMT" class="form-control itp_input" name="goodsAmt" data-key-up="number" />
53
-									</div>									
51
+								<div class="form-group">
52
+									<label class="col-xs-2 itp_lb">결제금액*</label>
53
+									<div class="col-xs-9 itp_ip">
54
+										<input type="text" id="ITP_FORM_PO_PAYMENT_POPUP_GOODS_AMT" class="form-control itp_input" name="goodsAmt" />
55
+									</div>
54 56
 								</div>
55
-								<div class="form-group itp_mg_btm">
56
-									<label class="col-xs-3 itp_mlb itp_mg_btm">결제방법*</label>
57
-									<div class="col-xs-9 itp_mip">
58
-										<div class="col-xs-5 itp_pd_none">
59
-											<select id="ITP_FORM_PO_PAYMENT_POPUP_PAY_METHOD" class="form-control itp_input" name="payMethod">
60
-												<option value="11">신용카드</option>
61
-												<option value="21">계좌이체</option>
62
-											</select>
63
-										</div>
64
-									</div>	
65
-								</div>								
66
-								<div class="form-group itp_mg_btm">
67
-									<label class="col-xs-3 itp_mlb itp_mg_btm">휴대폰번호*</label>
68
-									<div class="col-xs-9 itp_mip">
69
-									<input type="text" id="ITP_FORM_PO_PAYMENT_POPUP_ORD_TEL" class="form-control itp_input" name="ordTel" data-key-up="tel" placeholder="010-0000-0000" maxlength="13" />
57
+								<div class="form-group shot">
58
+									<label class="col-xs-2 itp_lb shot">결제방법*</label>
59
+									<div class="col-xs-3 itp_ip">
60
+										<select id="ITP_FORM_PO_PAYMENT_POPUP_PAY_METHOD" class="form-control itp_input" name="payMethod">
61
+											<option value="11">신용카드</option>
62
+											<option value="21">계좌이체</option>
63
+										</select>
64
+									</div>
65
+								</div>
66
+								<div class="form-group">
67
+									<label class="col-xs-2 itp_lb">휴대폰번호*</label>
68
+									<div class="col-xs-9 itp_ip">
69
+										<input type="text" id="ITP_FORM_PO_PAYMENT_POPUP_ORD_TEL" class="form-control itp_input" name="ordTel" placeholder="010-0000-0000" />
70 70
 									</div>
71 71
 								</div>
72
-								<div class="form-group itp_mg_btm">
73
-									<label class="col-xs-3 itp_mlb itp_mg_btm">이메일</label>
74
-									<div class="col-xs-9 itp_mip">
72
+								<div class="form-group shot">
73
+									<label class="col-xs-2 itp_lb shot">이메일</label>
74
+									<div class="col-xs-9 itp_ip">
75 75
 										<div class="col-xs-3 itp_pd_none">
76 76
 											<input id="ITP_FORM_PO_PAYMENT_POPUP_ORD_EMAIL" name="ordEmail" class="" type="hidden">
77 77
 											<input type="text" id="ITP_FORM_PO_PAYMENT_POPUP_ORD_EMAIL_ID" class="form-control itp_input" name="emailId" />
@@ -254,9 +254,7 @@
254 254
 							<input type="hidden" id="sp_vacct_bank"        name="sp_vacct_bank"         value="" />               <!--[선택]가상계좌 사용가능한 은행 LIST -->
255 255
 							<input type="hidden" id="sp_vacct_end_date"    name="sp_vacct_end_date"     value="" />               <!--[선택]입금 만료 날짜 -->
256 256
 							<input type="hidden" id="sp_vacct_end_time"    name="sp_vacct_end_time"     value="" />               <!--[선택]입금 만료 시간 -->
257
-							                                                                                                     
258
-							<!--선불카드-->                                                                                      
259
-							<input type="hidden" id="sp_prepaid_cp"        name="sp_prepaid_cp"         value="" />               <!--[선택]선불카드 CP -->
257
+
260 258
 							                        
261 259
 							<!-- [END] 인증요청 필드  --> 
262 260
 							
@@ -304,8 +302,8 @@
304 302
 				</div>
305 303
 			</div>
306 304
 			<div class="modal-footer">
307
-				<button type="button" id="ITP_BTN_PO_PAYMENT_CLOSE_POP" class="btn btn-danger btn-sm itp_mg_top CLB">&nbsp;&nbsp;취소&nbsp;&nbsp;</button>
308
-				<button type="button" id="ITP_BTN_PO_PAYMENT_CONFIRM_POP" class="btn btn-primary btn-sm itp_mg_top SAB" style="display: inline-block;">&nbsp;&nbsp;결제요청&nbsp;&nbsp;</button>
305
+				<button type="button" id="ITP_BTN_PO_PAYMENT_CLOSE_POP" class="btn btn-danger btn-sm CLB">&nbsp;&nbsp;취소&nbsp;&nbsp;</button>
306
+				<button type="button" id="ITP_BTN_PO_PAYMENT_CONFIRM_POP" class="btn btn-primary btn-sm SAB" style="display: inline-block;">&nbsp;&nbsp;결제요청&nbsp;&nbsp;</button>
309 307
 			</div>
310 308
 		</div>
311 309
 	</div>

+ 0 - 8
src/main/webapp/mobile/js/app/main.js

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

+ 1 - 5
src/main/webapp/mobile/js/app/mloanmng/ITP_MLOANMNG02010.js

@@ -217,7 +217,7 @@ let mobContentObj = {
217 217
 				// 결제 팝업 결과
218 218
 				var popFn = function(rowDataPop) {
219 219
 					console.log(JSON.stringify(rowDataPop));
220
-					listObj.grid.search();
220
+					// listObj.grid.search();
221 221
 				};
222 222
 				// 결제 팝업
223 223
 				// 결제타입코드 : 10(선불(충전)), 20(후불(결제)), 30(후불(선결제)), 30(후불(선결제))
@@ -482,7 +482,3 @@ let mobPopObj = {
482 482
 		$('#' + popId).closest('.mobile-pop-close').hide();
483 483
 	}
484 484
 };
485
-
486
-var paymentObj = {
487
-
488
-};

+ 0 - 26
src/main/webapp/mobile/js/app/mpomng/ITP_MPOMNG01010.js

@@ -62,13 +62,6 @@ let mobPageObj = {
62 62
 				}
63 63
 				return false;
64 64
 			});
65
-			// $(document).on('click', '#ITP_BTN_MPOMNG01010_DETAIL_PLUS', function() {
66
-			// 	console.log('ITP_BTN_MPOMNG01010_DETAIL_PLUS ===> ');
67
-			// 	mobContObj.list.actPlus($(this));
68
-			// });
69
-			// $(document).on('click', '#ITP_BTN_MPOMNG01010_DETAIL_MINUS', function() {
70
-			// 	mobContObj.list.actMinus($(this));
71
-			// });
72 65
 		}
73 66
 	},
74 67
 	ready: function() {
@@ -409,25 +402,6 @@ let mobPopObj = {
409 402
 					'goodsAmt'	: Number(pchReqAmtTot - ordUseAmt)
410 403
 				};
411 404
 				fn_call_popup('biz', 'BIZPOP_PO_PAYMENT', '#ITP_ASIDE', popFn, args, 'M');
412
-
413
-				// var procPay = function() {
414
-				// 	var payFn = function(result) {
415
-				// 		console.log(result);
416
-				// 		mobContObj.data.load();
417
-				// 	};
418
-				// 	var args = {
419
-				// 		'payTpCd': this.saveMode === 4 ? '10' : '30',
420
-				// 		'brandId': $('#ITP_FORM_MPOMNG01010_DETAIL_BRAND_ID').val(),
421
-				// 		'storeId': $('#ITP_FORM_MPOMNG01010_DETAIL_STORE_ID').val()
422
-				// 	};
423
-				// 	itp_fn_payment.call(args, payFn);
424
-				// };
425
-				// if(this.saveMode === 5) {
426
-				// 	$('#ITP_FORM_MPOMNG01010_DETAIL #ITP_FORM_MPOMNG01010_DETAIL_PCH_REQ_ST_CD').val(PCH_REQ_ST_CD_TEMP_SAVE);
427
-				// 	procSave(procPay);
428
-				// } else {
429
-				// 	mobPopObj.hide('ITP_POP_MPOMNG01010_REQ_AREA');
430
-				// }
431 405
 			}
432 406
 		}
433 407
 	},

+ 1 - 74
src/main/webapp/mobile/js/app/mpomng/ITP_MPOMNG02010.js

@@ -526,80 +526,7 @@ let mobPopObj = {
526 526
 				mobPopObj.hide(ID_ITP_POP_MPOMNG02010_WHS_AREA);
527 527
 			}
528 528
 		}
529
-	},/*
530
-	popReqConfirm: {
531
-		popId: 'ITP_POP_MPOMNG02010_REQ_AREA',
532
-		pchReqStCd: '',
533
-		init: function (pchReqStCd) {
534
-			this.formId = '#ITP_FORM_MPOMNG02010_MODIFY';
535
-			this.pchReqStCd = pchReqStCd;
536
-			mobPopObj.show(this.popId);
537
-			this.view();
538
-			this.action();
539
-		},
540
-		view: function() {
541
-			$('#ITP_POP_MPOMNG02010_REQ_AREA .fnPopDlvReqDt').text($('#ITP_FORM_MPOMNG02010_MODIFY #ITP_FORM_MPOMNG02010_MODIFY_DLV_REQ_DT').val());
542
-			$('#ITP_POP_MPOMNG02010_REQ_AREA .fnItemQty').text(CommonObj.currency.add(mobContentObj.modify.list.rows.length, '개'));
543
-			$('#ITP_POP_MPOMNG02010_REQ_AREA .fnOrdAmt').text($('#ITP_FORM_MPOMNG02010_MODIFY .fnPchReqAmtTot').text());
544
-			if(this.pchReqStCd === PCH_REQ_ST_CD_REQUEST_SAVE) {
545
-				var popMsg = '구매요청 하시겠습니까?';
546
-				let param = $(this.formId).serializeObject();
547
-				var ordUseAmt = CommonObj.onlyNumber($('#ITP_FORM_MPOMNG02010_DETAIL .fnOrdUseAmt').text());
548
-				var pchReqAmtTot = CommonObj.onlyNumber($('#ITP_FORM_MPOMNG02010_DETAIL .fnPchReqAmtTot').text());
549
-				if (parseInt(ordUseAmt) < parseInt(pchReqAmtTot)) {
550
-					popMsg = (param.loanDvsn !== 'LD03' && param.loanDvsn === 'LD01') ? ITP_MSG_LOCALE.message.ajax.lackReqAmt : ITP_MSG_LOCALE.message.ajax.lackReqAmt;
551
-					$('#ITP_POP_MPOMNG02010_REQ_AREA #ITP_BTN_MPOMNG02010_POP_REQ_CONFIRM').text('결제');
552
-					this.saveMode = 'PAY';
553
-				}
554
-				$('#ITP_POP_MPOMNG02010_REQ_AREA .msg_save').text(popMsg);
555
-			} else {
556
-				this.saveMode = 'SAVE';
557
-				$('#ITP_POP_MPOMNG02010_REQ_AREA .msg_save').text('임시저장 하시겠습니까?');
558
-				$('#ITP_POP_MPOMNG02010_REQ_AREA #ITP_BTN_MPOMNG02010_POP_REQ_CONFIRM').text('확인');
559
-			}
560
-		},
561
-		action: function() {
562
-			var _this = this;
563
-			$('#ITP_POP_MPOMNG02010_REQ_AREA button[id="ITP_BTN_MPOMNG02010_POP_REQ_CONFIRM"]').off('click').on('click', function() {
564
-				$('#ITP_FORM_MPOMNG02010_MODIFY #ITP_FORM_MPOMNG02010_MODIFY_PCH_REQ_ST_CD').val(_this.pchReqStCd);
565
-				_this.save('#ITP_FORM_MPOMNG02010_MODIFY');
566
-			});
567
-		},
568
-		save: function(formId) {
569
-			var _this = this;
570
-			let param = $(formId).serializeObject();
571
-
572
-			if(this.saveMode === 'PAY') {
573
-				alert('결제 페이지 이동!!!');
574
-			} else {
575
-				var gridInsertData = [];
576
-				var gridUpdateData = [];
577
-				var gridDeleteData = [];
578
-				$.each(mobContentObj.modify.list.rows, function(index, item) {
579
-					item['pchReqUnqNo'] = param.pchReqUnqNo;
580
-					if(item.viewCd === 'R' || item.viewCd === 'C' ) {
581
-						item['viewCd'] = 'C';
582
-						gridInsertData.push(item);
583
-					} else if(item.viewCd === 'U') {
584
-						gridUpdateData.push(item);
585
-					} else if(item.viewCd === 'D') {
586
-						gridDeleteData.push(item);
587
-					}
588
-				});
589
-				param['dlvReqDt'] = param.dlvReqDt.replace(/[^0-9]/g, "");
590
-				param.gridInsertData = gridInsertData;
591
-				param.gridUpdateData = gridUpdateData;
592
-				param.gridDeleteData = gridDeleteData;
593
-				console.log(JSON.stringify(param));
594
-				var saveFn = function (result) {
595
-					console.log(result);
596
-					mobPopObj.hide(_this.popId);
597
-					mobContentObj.list.init();
598
-				};
599
-				fn_ajax_call(API_MOBILE_SAVE, JSON.stringify(param), saveFn, 'POST');
600
-			}
601
-		}
602
-	},*/
529
+	},
603 530
 	popReqConfirm: {
604 531
 		popId: 'ITP_POP_MPOMNG02010_REQ_AREA',
605 532
 		pchReqStCd: '',

+ 14 - 20
src/main/webapp/mobile/js/app/mstockmng/ITP_MSTOCKMNG02010.js

@@ -218,33 +218,27 @@ let mobContentObj = {
218 218
 			var formId = '#ITP_FORM_MSTOCKMNG02010_LIST_SEARCH';
219 219
 			itp_fn_form_clear_validate(null, formId);
220 220
 			if (itp_fn_form_event.isValid(formId)) {
221
-				// this.callbackApp('BRD2211000022211100000003005');
222 221
 				location.replace('app:scan');
223
-				// location.href = 'app:scan';
224 222
 			}
225 223
 		}
226 224
 	}
227 225
 };
228 226
 
229
-var appCallFunction = {
230
-	barcode: {
231
-		result: function(barcode) {
232
-			console.log(JSON.stringify(barcode));
233
-			var infoFn = function(result) {
234
-				if(result) {
235
-					mobContentObj.list.itemAdd([result]);
236
-				}
237
-			};
238
-			const param = {
239
-				'sBrandId': $('#ITP_FORM_MSTOCKMNG02010_LIST_SEARCH #ITP_FORM_MLOANMNG02010_LIST_SEARCH_BRAND_ID').val(),
240
-				'sWhsId': $('#ITP_FORM_MSTOCKMNG02010_LIST_SEARCH #ITP_FORM_MSTOCKMNG02010_LIST_SEARCH_WHS_ID').val(),
241
-				'sLocation': $('#ITP_FORM_MSTOCKMNG02010_LIST_SEARCH #ITP_FORM_MSTOCKMNG02010_LIST_SEARCH_LOCATION').val(),
242
-				'sBarcode': barcode
243
-			};
244
-			fn_ajax_call(API_MOBILE_BARCODE, param, infoFn, 'GET');
227
+function appCallFnBarcode(barcode) {
228
+	console.log(JSON.stringify(barcode));
229
+	var infoFn = function(result) {
230
+		if(result) {
231
+			mobContentObj.list.itemAdd([result]);
245 232
 		}
246
-	}
247
-};
233
+	};
234
+	const param = {
235
+		'sBrandId': $('#ITP_FORM_MSTOCKMNG02010_LIST_SEARCH #ITP_FORM_MLOANMNG02010_LIST_SEARCH_BRAND_ID').val(),
236
+		'sWhsId': $('#ITP_FORM_MSTOCKMNG02010_LIST_SEARCH #ITP_FORM_MSTOCKMNG02010_LIST_SEARCH_WHS_ID').val(),
237
+		'sLocation': $('#ITP_FORM_MSTOCKMNG02010_LIST_SEARCH #ITP_FORM_MSTOCKMNG02010_LIST_SEARCH_LOCATION').val(),
238
+		'sBarcode': barcode
239
+	};
240
+	fn_ajax_call(API_MOBILE_BARCODE, param, infoFn, 'GET');
241
+}
248 242
 
249 243
 let mobPopObj = {
250 244
 	popItemNm: {

+ 46 - 98
src/main/webapp/mobile/js/app/popup/biz/ITP_BIZPOP_PO_PAYMENT.js

@@ -57,7 +57,7 @@ var popPageObj = {
57 57
 		$('#ITP_FORM_PO_PAYMENT_POPUP_BRAND_NM').val(fn_make_user_info.get('brandNm'));
58 58
 		$('#ITP_FORM_PO_PAYMENT_POPUP_STORE_ID').val(popPageObj.args.storeId);
59 59
 		
60
-		// 결제타입코드 : 10(선불(충전)), 20(후불(결제)), 30(후불(선결제))
60
+		// 결제타입코드 : 10(선불(충전)), 20(후불(결제)), 30(후불(선결제)), 40(구매요청)
61 61
 		if(popPageObj.args.payTpCd == '10') {  
62 62
 			$('#ITP_BIZPOP_PO_PAYMENT_PAY_TP_NM').text('선불(충전)');
63 63
 		} else if(popPageObj.args.payTpCd == '20') {  
@@ -69,7 +69,7 @@ var popPageObj = {
69 69
 		} else if(popPageObj.args.payTpCd == '30') {  
70 70
 			$('#ITP_BIZPOP_PO_PAYMENT_PAY_TP_NM').text('후불(선결제)');
71 71
 		} else if(popPageObj.args.payTpCd == '40') {
72
-			$('#ITP_BIZPOP_PO_PAYMENT_PAY_TP_NM').text('충전');
72
+			$('#ITP_BIZPOP_PO_PAYMENT_PAY_TP_NM').text('구매요청');
73 73
 			$('#ITP_FORM_PO_PAYMENT_POPUP_GOODS_AMT').val(popPageObj.args.goodsAmt); // 결제금액
74 74
 			$('#ITP_FORM_PO_PAYMENT_POPUP_GOODS_AMT').attr('readonly','readonly');
75 75
 		}			
@@ -91,7 +91,15 @@ var popPageObj = {
91 91
 			$('#ITP_FORM_PO_PAYMENT_POPUP .fnOrdNm').text(result.ordNm); // 구매자명
92 92
 			$('#ITP_FORM_PO_PAYMENT_POPUP .fnGoodsNm').text(result.goodsNm); // 상품명
93 93
 			// $('#ITP_FORM_PO_PAYMENT_POPUP_ORD_TEL').val(result.ordTel); // 휴대전화번호
94
+
95
+
96
+
97
+
94 98
 			$('#ITP_FORM_PO_PAYMENT_POPUP_ORD_TEL').val('010-2329-8816'); // 휴대전화번호
99
+			$('#ITP_FORM_PO_PAYMENT_POPUP_GOODS_AMT').val('100'); // 휴대전화번호
100
+
101
+
102
+
95 103
 
96 104
 			if(result.ordEmail) {
97 105
 				var email = result.ordEmail.split('@');
@@ -228,83 +236,45 @@ var popPageObj = {
228 236
 			frm_pay.sp_user_phone1.value    = $('#ITP_FORM_PO_PAYMENT_POPUP_ORD_TEL').val();  		// 휴대폰
229 237
 			frm_pay.sp_user_mail.value      = $('#ITP_FORM_PO_PAYMENT_POPUP_ORD_EMAIL').val();  	// 이메일
230 238
 
231
-			if (isMobile() || window.innerWidth < 1201 ) {
232
-				f_mobile_cert();
233
-			} else {
234
-			    f_cert();
235
-				// f_mobile_cert();
236
-			}
239
+			f_mobile_cert();
237 240
 		}
238 241
 	}
239 242
 };
240 243
 
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
-		}
244
+function appCallFnPayment(param) {
245
+	console.log('appCallFnPayment ===> ' + param);
246
+	var paramObj = JSON.parse(param);
247
+	if(paramObj && paramObj.sp_res_cd === '0000') {
248
+		$('#frm_pay #sp_tr_cd').val(paramObj.sp_tr_cd);              			// [필수]결제창 요청구분
249
+		$('#frm_pay #sp_ret_pay_type').val(paramObj.sp_ret_pay_type);       	// [필수]결제수단
250
+		$('#frm_pay #sp_trace_no').val(paramObj.sp_trace_no);           		// [선택]추적번호
251
+		$('#frm_pay #sp_order_no').val(paramObj.sp_order_no);           		// [필수]가맹점 주문번호
252
+		$('#frm_pay #sp_sessionkey').val(paramObj.sp_sessionkey);         		// [필수]세션키
253
+		$('#frm_pay #sp_encrypt_data').val(paramObj.sp_encrypt_data);       	// [필수]암호화전문
254
+		$('#frm_pay #sp_mall_id').val(paramObj.sp_mall_id);            			// [필수]가맹점 ID
255
+		$('#frm_pay #sp_mobilereserved1').val(paramObj.sp_mobilereserved1);		// [선택]여유필드
256
+		$('#frm_pay #sp_mobilereserved2').val(paramObj.sp_mobilereserved2);		// [선택]여유필드
257
+		$('#frm_pay #sp_reserved1').val(paramObj.sp_reserved1);          		// [선택]여유필드
258
+		$('#frm_pay #sp_reserved2').val(paramObj.sp_reserved2);          		// [선택]여유필드
259
+		$('#frm_pay #sp_reserved3').val(paramObj.sp_reserved3);          		// [선택]여유필드
260
+		$('#frm_pay #sp_reserved4').val(paramObj.sp_reserved4);          		// [선택]여유필드
261
+
262
+		// <!--신용카드-->
263
+		$('#frm_pay #sp_card_code').val(paramObj.sp_card_code);          		// [필수]카드코드
264
+		$('#frm_pay #sp_eci_code').val(paramObj.sp_eci_code);           		// [선택]ECI코드(MPI인 경우)
265
+		$('#frm_pay #sp_card_req_type').val(paramObj.sp_card_req_type);      	// [필수]거래구분
266
+		$('#frm_pay #sp_save_useyn').val(paramObj.sp_save_useyn);         		// [선택]카드사 세이브 여부
267
+		$('#frm_pay #sp_card_prefix').val(paramObj.sp_card_prefix);        		// [선택]신용카드 Prefix
268
+		$('#frm_pay #sp_card_no_7').val(paramObj.sp_card_no_7);          		// [선택]신용카드번호 앞7자리
269
+
270
+		// <!--간편결제-->
271
+		$('#frm_pay #sp_spay_cp').val(paramObj.sp_spay_cp);            			// [선택]간편결제 CP코드
272
+
273
+		// <!--선불카드-->
274
+		$('#frm_pay #sp_prepaid_cp').val(paramObj.sp_prepaid_cp);         		// [선택]선불카드 CP코드
275
+
276
+		f_moblie_submit();
251 277
 	}
252
-};
253
-
254
-function appJsFnPayment(param) {
255
-	appCallFunction.payment.result(param);
256
-}
257
-
258
-/* 인증창 호출, 인증 요청 */
259
-function f_cert() {
260
-    var frm_pay = document.frm_pay;
261
-
262
-    /*  주문정보 확인 */
263
-    if( !frm_pay.EP_order_no.value ) {
264
-        alert("브랜드그룹주문번호가 존재하지않습니다.");
265
-        frm_pay.EP_order_no.focus();
266
-        return;
267
-    }
268
-
269
-    if( !frm_pay.EP_product_amt.value ) {
270
-        alert("상품금액이 존재하지않습니다.");
271
-        frm_pay.EP_product_amt.focus();
272
-        return;
273
-    }
274
-
275
-    /* UTF-8 사용브랜드그룹의 경우 EP_charset 값 셋팅 필수 */
276
-    if( frm_pay.EP_charset.value == "UTF-8" ) {
277
-        // 한글이 들어가는 값은 모두 encoding 필수.
278
-        frm_pay.EP_mall_nm.value        = encodeURIComponent( frm_pay.EP_mall_nm.value );
279
-        frm_pay.EP_product_nm.value     = encodeURIComponent( frm_pay.EP_product_nm.value );
280
-        frm_pay.EP_user_nm.value        = encodeURIComponent( frm_pay.EP_user_nm.value );
281
-        frm_pay.EP_user_addr.value      = encodeURIComponent( frm_pay.EP_user_addr.value );
282
-    }
283
-
284
-    /* 브랜드그룹에서 원하는 인증창 호출 방법을 선택 */
285
-    if( frm_pay.EP_window_type.value == "iframe" ) {
286
-
287
-    	easypay_webpay(frm_pay,"/oqpo-view/easypay/oqpo/oqpo_iframe_req.jsp","hiddenifr","0","0","iframe",30);
288
-
289
-        if( frm_pay.EP_charset.value == "UTF-8" ) {
290
-            // encoding 된 값은 모두 decoding 필수.
291
-            frm_pay.EP_mall_nm.value        = decodeURIComponent( frm_pay.EP_mall_nm.value );
292
-            frm_pay.EP_product_nm.value     = decodeURIComponent( frm_pay.EP_product_nm.value );
293
-            frm_pay.EP_user_nm.value        = decodeURIComponent( frm_pay.EP_user_nm.value );
294
-            frm_pay.EP_user_addr.value      = decodeURIComponent( frm_pay.EP_user_addr.value );
295
-        }
296
-    } else if( frm_pay.EP_window_type.value == "popup" ) {
297
-
298
-        easypay_webpay(frm_pay,"/oqpo-view/easypay/oqpo/oqpo_popup_req.jsp","hiddenifr","","","popup",30);
299
-
300
-        if( frm_pay.EP_charset.value == "UTF-8" ) {
301
-            // encoding 된 값은 모두 decoding 필수.
302
-            frm_pay.EP_mall_nm.value        = decodeURIComponent( frm_pay.EP_mall_nm.value );
303
-            frm_pay.EP_product_nm.value     = decodeURIComponent( frm_pay.EP_product_nm.value );
304
-            frm_pay.EP_user_nm.value        = decodeURIComponent( frm_pay.EP_user_nm.value );
305
-            frm_pay.EP_user_addr.value      = decodeURIComponent( frm_pay.EP_user_addr.value );
306
-        }
307
-    }
308 278
 }
309 279
 
310 280
 /* 인증창 호출, 인증 요청 */
@@ -342,8 +312,8 @@ function f_mobile_cert() {
342 312
 	itp_fn_call_app.payment($.param(param));
343 313
 }
344 314
 
345
-/* 승인 요청 */
346
-function f_submit() {
315
+/* 모바일 승인 요청 */
316
+function f_moblie_submit() {
347 317
 	
348 318
 	$('#frm_pay #poOrdNo').val($('#ITP_FORM_PO_PAYMENT_POPUP_PO_ORD_NO').val()); 
349 319
 	$('#frm_pay #payTpCd').val($('#ITP_FORM_PO_PAYMENT_POPUP_PAY_TP_CD').val()); 
@@ -376,28 +346,6 @@ function f_submit() {
376 346
 	}, 'POST');	
377 347
 }
378 348
 
379
-/* 모바일 승인 요청 */
380
-function f_moblie_submit() {
381
-	f_submit();
382
-//      var frm_pay = document.frm_pay;
383
-//
384
-//      // 정상("0000") 일 때 승인요청페이지로 이동.
385
-//      if( frm_pay.sp_res_cd.value == "0000" ) {
386
-//
387
-//          if( frm_pay.sp_charset.value == "UTF-8" ) {
388
-//              // 인증요청 시 인코딩 한 값은 승인요청 시 디코딩 처리해야함.
389
-//              frm_pay.sp_mall_nm.value      = decodeURIComponent( frm_pay.sp_mall_nm.value );
390
-//              frm_pay.sp_product_nm.value   = decodeURIComponent( frm_pay.sp_product_nm.value );
391
-//              frm_pay.sp_user_nm.value      = decodeURIComponent( frm_pay.sp_user_nm.value );
392
-//              frm_pay.sp_user_addr.value    = decodeURIComponent( frm_pay.sp_user_addr.value );
393
-//          }
394
-//
395
-//          frm_pay.target = "_self";
396
-//          // frm_pay.action = "${contextPath}/easypay_request.itp";
397
-//          // frm_pay.submit();
398
-//      }
399
-}
400
-
401 349
 function isMobile() {
402 350
     // if we want a more complete list use this: http://detectmobilebrowsers.com/
403 351
     // str.test() is more efficent than str.match()

+ 2 - 2
src/main/webapp/mobile/js/config.js

@@ -663,8 +663,8 @@ let itp_fn_form_event = {
663 663
 				isValid = itp_fn_form_validate(formId, '#' + $(this).attr('id'), arry, undefined, alertMsg);
664 664
 				if(!isValid) {
665 665
 					if(alertMsg && alertMsg.length > 0) {
666
-						// itp_fn_modal_alert($(this).data('alert-msg'));
667
-						alert($(this).data('alert-msg'));
666
+						itp_fn_modal_alert($(this).data('alert-msg'));
667
+						// alert($(this).data('alert-msg'));
668 668
 					}
669 669
 					return false;
670 670
 				}