Merge remote-tracking branch 'origin/card007' into xodud1202

src/main/webapp/WEB-INF/views/mob/mypage/MypageCancelFormMob.html

@@ -312,7 +312,8 @@ let paymentInfo 	= [[${paymentInfo}]];
 let addPayCost 		= 0;
 
 $(document).ready(function() {
-	
+	// 타이틀명
+	$('#htopTitle').text('주문취소');
 });
 
 // 취소수량버튼기능

src/main/webapp/WEB-INF/views/mob/mypage/MypageOrderListFormMob.html

@@ -319,7 +319,6 @@ var fnGetInfiniteScrollDataList = function(pageNo) {
 			if (result != null) {
 				$("#listBox").css("display", "block");
 				$("#listBox").append(result);
-				console.log(result);
 				scrollTemp = true;
 				
 				// 인피니티 스크롤 기억기능

src/main/webapp/WEB-INF/views/mob/mypage/MypageReturnFormMob.html

@@ -24,7 +24,7 @@
 			<input type="hidden" name="accountNm" 	th:value="${oneData.accountNm}"/>
 			<input type="hidden" name="bankCd" 		th:value="${oneData.bankCd}"/>
 			<input type="hidden" name="chgReason"/>
-					
+
 			<div class="inner wide bg_beige">
 				<div class="order_number">
 					<dl class="clear">
@@ -39,7 +39,7 @@
 						<div th:unless="${oneData.giftPackYn == 'Y'}" class="goods_date">주문일<span class="date" th:text="${oneData.ordDt}"></span></div>
 						<div th:if="${oneData.giftPackYn == 'Y'}" class="goods_date">선물일<span class="date" th:text="${oneData.ordDt}"></span></div>
 					</div>
-					
+
 					<!-- 반품상품목록 -->
 					<th:block th:if="${returnList.returnList}" th:each="return, status : ${returnList.returnList}" th:with="imageUrl=${@environment.getProperty('upload.goods.view')}">
 						<div class="goods_section">
@@ -467,6 +467,9 @@ $(document).ready(function() {
 		$('#withdraw').click();
 		$('.wdGb').css('display','none');
 	}
+
+	// 타이틀명
+	$('#htopTitle').text('반품 신청');
 });
 
 // 반품수량버튼기능

src/main/webapp/WEB-INF/views/mob/order/OrderFormMob.html

@@ -2501,8 +2501,9 @@ $(document).ready( function() {
 
 // PG 카카오페이 결제준비 처리
 var fnKakaoPaymentReady = function() {
-	let nextRedirectUrl = $('#order_info input[name=nextRedirectPcUrl]').val();
-	let option = 'width=420, height=520';
+	//let nextRedirectUrl = $('#order_info input[name=nextRedirectPcUrl]').val();
+	let nextRedirectUrl = $('#order_info input[name=nextRedirectMobileUrl]').val();
+	//let option = 'width=420, height=520';
 	
 	window.open(nextRedirectUrl, 'kakaoPaymentPopup', option);
 }
@@ -2520,10 +2521,10 @@ var fnKakaoPaymentRequest = function(pgToken) {
 
 // PG 네이버페이 결제준비 처리
 var fnNaverPaymentReady = function() {
-	let naverPayUrl = 'https://' + [[${@environment.getProperty('naverPay.payUrl.web')}]];
+	let naverPayUrl = 'https://' + [[${@environment.getProperty('naverPay.payUrl.mob')}]];
 	let reserveId = $('#order_info input[name=reserveId]').val();
 	let url = naverPayUrl + '/payments/' + reserveId;
-	let option = 'width=750, height=' + $(window).height();
+	//let option = 'width=750, height=' + $(window).height();
 	
 	window.open(url, 'naverPaymentPopup', option);
 }

src/main/webapp/WEB-INF/views/web/mypage/MypageCancelFormWeb.html

@@ -356,7 +356,8 @@
 			let sumDeliveryFee = Number(result.sumDeliveryFee);						// 원주문배송비
 			let spanTotDeliveryFee = Number(result.spanTotDeliveryFee);				// 추가배송비 (무료배송비 허들 깨져서 발생한 배송비)
 			let spanRefundAmt = Number(result.spanRefundAmt);						// 환불 예정 금액
-			
+			console.log('sumDeliveryFee : '+sumDeliveryFee);
+			console.log('spanTotDeliveryFee : '+spanTotDeliveryFee);
 			let goodsCancelAmt = spanCnclRtnAmt;									// 상품취소금액
 			let deliveryFee = sumDeliveryFee - spanTotDeliveryFee;					// 배송비 (마지막 취소 시 돌려줘야할 원주문 배송비 - 추가배송비)
 			let deductDcAmt = 0 - spanCpnDcAmt - spanTmtbDcAmt - spanPrePntDcAmt;	// 할인금액 차감 (쿠폰+다다익선+선포인트)