2 次代碼提交 99202731d3 ... 75ca8693f5

作者 SHA1 備註 提交日期
  isna 75ca8693f5 Merge branch 'master' of http://106.246.249.162:13000/orderqueen/oqpo-view 2 年之前
  isna e1b6f36cb4 결재창 테스트 2 年之前
共有 1 個文件被更改,包括 10 次插入37 次删除
  1. 10 37
      src/main/webapp/mobile/js/app/popup/biz/ITP_BIZPOP_PO_PAYMENT.js

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

@@ -120,10 +120,9 @@ var popPageObj = {
120 120
             KICC_ACTION_WEB_URL = result.kicc_action_web_url;
121 121
             KICC_ACTION_MOBILE_URL = result.kicc_action_mobile_url;
122 122
 			MALL_ID = result.mallId;
123
-			WEB_RETURN_URL = 'http://106.246.249.162:38051/oqpo-view/easypay/oqpo/oqpo_order_res.jsp';
124
-			// window.location.href.replace('main.html', 'easypay/oqpo/oqpo_order_res.jsp');
125
-			MOBILE_RETURN_URL = window.location.href.replace('main.html', 'easypay/oqpo/mobile_order_res_submit.jsp');
123
+			WEB_RETURN_URL = window.location.href.replace('main.html', 'easypay/oqpo/oqpo_order_res.jsp');
126 124
 			/*
125
+			MOBILE_RETURN_URL = window.location.href.replace('main.html', 'easypay/oqpo/mobile_order_res_submit.jsp');
127 126
 			const js = '<script src="'+KICC_JAVASCRIPT_URL+'"></script>';
128 127
 	        $('#ITP_ASIDE #ITP_BIZPOP_PO_PAYMENT #ITP_POPUP_KICC_JS').empty();
129 128
 	        $('#ITP_ASIDE #ITP_BIZPOP_PO_PAYMENT #ITP_POPUP_KICC_JS').append(js);
@@ -320,46 +319,20 @@ function f_mobile_cert() {
320 319
         frm_pay.sp_product_nm.value   = encodeURIComponent( frm_pay.sp_product_nm.value );
321 320
         frm_pay.sp_user_nm.value      = encodeURIComponent( frm_pay.sp_user_nm.value );
322 321
         frm_pay.sp_user_addr.value    = encodeURIComponent( frm_pay.sp_user_addr.value );
323
-    }
322
+    } 
323
+	frm_pay.sp_return_url.value =  window.location.href.replace('main.html', 'easypay/oqpo/mobile_order_res_submit.jsp');
324 324
 
325
-	console.log("xxxxxx mobile pay xxxxxxxx", CommonObj, frm_pay, frm_pay.EP_window_type, typeof easypay_webpay)
326 325
 	if( CommonObj.isApp) {		 
327 326
 		var param = $('#frm_pay').serializeObject();
328
-		frm_pay.sp_return_url.value = MOBILE_RETURN_URL; //
329
-		
330 327
 		// $(location).attr('href', MOBILE_CONTEXTPATH + '/app/payment.html?' + $.param(param));
331 328
 		itp_fn_call_app.payment($.param(param));
332 329
 	} else {
333
-		/*
334
-		frm_pay.kiccActionWebUrl.value  	= KICC_ACTION_WEB_URL;       						  
335
-		frm_pay.kiccActionMobileUrl.value  	= KICC_ACTION_MOBILE_URL;
336
-		frm_pay.sp_return_url.value = WEB_RETURN_URL; //
337
-		// easypay_webpay(frm_pay,"/oqpo-view/mobile/app/easypay/oqpo/mobile_order_req.jsp","hiddenifr","0","0","iframe",30);
338
-		if( frm_pay.EP_charset.value == "UTF-8" ) {
339
-			// encoding 된 값은 모두 decoding 필수.
340
-			frm_pay.EP_mall_nm.value        = decodeURIComponent( frm_pay.EP_mall_nm.value );
341
-			frm_pay.EP_product_nm.value     = decodeURIComponent( frm_pay.EP_product_nm.value );
342
-			frm_pay.EP_user_nm.value        = decodeURIComponent( frm_pay.EP_user_nm.value );
343
-			frm_pay.EP_user_addr.value      = decodeURIComponent( frm_pay.EP_user_addr.value );
344
-		} 
345
-		setTimeout(function() {
346
-		 	$('#ITP_BIZPOP_PO_PAYMENT').modal('hide'); // 팝업닫기
347
-		}, 200); 
348
-		
349
-		*/ 
350
-		var head = document.getElementsByTagName('head')[0];
351
-		var script = document.createElement('script');
352
-		script.type = 'text/javascript';
353
-		script.src = KICC_JAVASCRIPT_URL;
354
-		head.appendChild(script);
355
-		frm_pay.sp_return_url.value = WEB_RETURN_URL;
356
-		console.log("xxxxxx KICC_JAVASCRIPT_URL xxxxxx", KICC_JAVASCRIPT_URL, WEB_RETURN_URL)
357
-		// const js = '<script src="' + KICC_JAVASCRIPT_URL + '"></script>';
358
-		// $('#ITP_BIZPOP_PO_PAYMENT #ITP_POPUP_KICC_JS').empty();
359
-		// $('#ITP_BIZPOP_PO_PAYMENT #ITP_POPUP_KICC_JS').append(js);
360
-		$.getScript(KICC_JAVASCRIPT_URL, function() { 
361
-			easypay_card_webpay(frm_pay,"/oqpo-view/mobile/app/easypay/oqpo/mobile_order_req.jsp","KICC_PAYMENT","0","0","popup",30);
362
-		});
330
+		frm_pay.sp_return_url.value = window.location.href.replace('main.html', 'easypay/oqpo/mobile_order_res_web.jsp')
331
+		var param = $('#frm_pay').serializeObject();
332
+		var popOpt = "top=0,left=0,height=600,width=500,";
333
+		popOpt += "dependent=yes, status=no, minimizable=no, fullscreen=no, location=no, scrollbars=no, menubar=no, toolbar=no, titlebar=no, directories=no, resizable=no";
334
+		const popup = window.open(MOBILE_CONTEXTPATH + '/app/payment.html?' + $.param(param), "EASYPAY_POPUP", popOpt );
335
+		popup.focus();
363 336
 	}
364 337
 
365 338