Prechádzať zdrojové kódy

Merge branch 'card007' into develop

card007 5 rokov pred
rodič
commit
9493f7f758

+ 2 - 0
src/main/webapp/WEB-INF/views/mob/mypage/MypageCreExchangeDetailFormMob.html

@@ -303,6 +303,8 @@
 	let addrGb = '';
 	let memoGb = '';
 	let kcpReceiptUrl = [[${kcpReceiptUrl}]];
+	let oneData = [[${oneData}]];
+	let isLogin = [[${isLogin}]];
 
 	$(document).ready(function() {
 		// 타이틀명

+ 38 - 0
src/main/webapp/WEB-INF/views/mob/mypage/MypageOrderDetailFormMob.html

@@ -1183,6 +1183,44 @@
 			cfnGoToPage(_PAGE_MYPAGE_ORDER_DETAIL + ordNo);
 		});
 	}
+
+	// 전체구매확정 버튼 클릭 이벤트
+	var fnAllDecideOrder = function(param) {
+		let orderDecisionArr = [];
+		let ordNo = $(param).attr('ordNo');
+
+		// 주문상세번호 설정
+		$.each($('#mypageOrderDetailForm input[name=ordDtlNoArr]'), function(idx, item) {
+			orderDecisionArr.push($(item).val());
+		});
+
+		if (orderDecisionArr.length == 0) {
+			mcxDialog.alert('구매확정 가능한 상품이 없습니다.');
+			return false;
+		}
+
+		mcxDialog.confirm('구매확정 후에는 반품/교환이 불가합니다. 구매확정하시겠습니까?', {
+			cancelBtnText: "취소",
+			sureBtnText: "확인",
+			sureBtnClick: function(){
+				let data = {};
+
+				data.ordNo = ordNo;
+				data.ordDtlNoArr = orderDecisionArr;
+
+				var jsonData = JSON.stringify(data);
+				gagajf.ajaxJsonSubmit('/mypage/order/decision'
+					, jsonData
+					, function() {
+						if (typeof(fnReloadStatusCount) == 'function') {
+							fnReloadStatusCount();
+						} else {
+							cfnGoToPage(_PAGE_MYPAGE_ORDER_DETAIL + ordNo);
+						}
+					});
+			}
+		});
+	}
 </script>
 
 </th:block>

+ 1 - 0
src/main/webapp/WEB-INF/views/mob/mypage/NoMemberCreExchangeDetailFormMob.html

@@ -292,6 +292,7 @@
 	/*<![CDATA[*/
 	let oneData = [[${oneData}]];
 	var isLogin = [[${isLogin}]];
+	let kcpReceiptUrl = [[${kcpReceiptUrl}]];
 	let addrGb = '';
 	let memoGb = '';
 

+ 1 - 1
src/main/webapp/WEB-INF/views/web/mypage/MypageCreExchangeDetailFormWeb.html

@@ -296,7 +296,7 @@
 	var isLogin = [[${isLogin}]];
 	let oneData = [[${oneData}]];
 	let ordNo = oneData.ordNo;
-	let kcpReceiptUrl = [[${@environment.getProperty('pg.kcp.receipt.url')}]];
+	let kcpReceiptUrl = [[${kcpReceiptUrl}]];
 
 	// 추가배송비 전표 데이터 설정
 	let paymentInfo = {};

+ 1 - 1
src/main/webapp/WEB-INF/views/web/mypage/NoMemberCreExchangeDetailFormWeb.html

@@ -293,7 +293,7 @@
 	var isLogin = [[${isLogin}]];
 	let oneData = [[${oneData}]];
 	let ordNo = oneData.ordNo;
-	let kcpReceiptUrl = [[${@environment.getProperty('pg.kcp.receipt.url')}]];
+	let kcpReceiptUrl = [[${kcpReceiptUrl}]];
 
 	// 추가배송비 전표 데이터 설정
 	let paymentInfo = {};