오류 수정

src/main/java/com/style24/front/biz/web/TsfMypageController.java

@@ -8,6 +8,7 @@ import javax.servlet.http.HttpServletRequest;
 
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.core.env.Environment;
 import org.springframework.mobile.device.Device;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -77,6 +78,9 @@ import lombok.extern.slf4j.Slf4j;
 @Slf4j
 public class TsfMypageController extends TsfBaseController {
 
+	@Autowired
+	private Environment env;
+
 	@Autowired
 	private TscMessageByLocale message;
 
@@ -272,6 +276,9 @@ public class TsfMypageController extends TsfBaseController {
 		// 상품권 현금영수증 신청 정보 조회
 		mav.addObject("cashReceiptsInfo", giftcardService.getCashReceiptsRequestInfo(order));
 
+		// KCP 전표 경로 설정
+		mav.addObject("kcpReceiptUrl", env.getProperty("pg.kcp.receipt.url"));
+
 		mav.setViewName(super.getDeviceViewName("mypage/MypageOrderDetailForm"));
 
 		return mav;
@@ -996,6 +1003,9 @@ public class TsfMypageController extends TsfBaseController {
 		order.setOrdNo(orderChange.getOrdNo());
 		mav.addObject("paymentInfo", orderService.getPaymentInfoForMypage(order));
 
+		// KCP 전표 경로 설정
+		mav.addObject("kcpReceiptUrl", env.getProperty("pg.kcp.receipt.url"));
+
 		mav.setViewName(super.getDeviceViewName("mypage/MypageCreCancelDetailForm"));
 
 		return mav;
@@ -1032,6 +1042,9 @@ public class TsfMypageController extends TsfBaseController {
 		order.setOrdNo(orderChange.getOrdNo());
 		mav.addObject("paymentInfo", orderService.getPaymentInfoForMypage(order));
 
+		// KCP 전표 경로 설정
+		mav.addObject("kcpReceiptUrl", env.getProperty("pg.kcp.receipt.url"));
+
 		mav.setViewName(super.getDeviceViewName("mypage/MypageCreReturnDetailForm"));
 
 		return mav;
@@ -1062,6 +1075,9 @@ public class TsfMypageController extends TsfBaseController {
 		mav.addObject("exchangeDetailList", map);
 		mav.addObject("oneData", oneData);
 
+		// KCP 전표 경로 설정
+		mav.addObject("kcpReceiptUrl", env.getProperty("pg.kcp.receipt.url"));
+
 		mav.setViewName(super.getDeviceViewName("mypage/MypageCreExchangeDetailForm"));
 
 		return mav;

src/main/java/com/style24/front/biz/web/TsfNoMemberController.java

@@ -6,6 +6,7 @@ import java.util.List;
 
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.core.env.Environment;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -52,6 +53,9 @@ import lombok.extern.slf4j.Slf4j;
 @Slf4j
 public class TsfNoMemberController extends TsfBaseController {
 
+	@Autowired
+	private Environment env;
+
 	@Autowired
 	private TscMessageByLocale message;
 
@@ -220,6 +224,9 @@ public class TsfNoMemberController extends TsfBaseController {
 		// 상품권 현금영수증 신청 정보 조회
 		mav.addObject("cashReceiptsInfo", giftcardService.getCashReceiptsRequestInfo(order));
 
+		// KCP 전표 경로 설정
+		mav.addObject("kcpReceiptUrl", env.getProperty("pg.kcp.receipt.url"));
+
 		mav.setViewName(super.getDeviceViewName("mypage/NoMemberOrderDetailForm"));
 
 		return mav;
@@ -1090,6 +1097,9 @@ public class TsfNoMemberController extends TsfBaseController {
 		order.setOrdNo(orderChange.getOrdNo());
 		mav.addObject("paymentInfo", orderService.getPaymentInfoForMypage(order));
 
+		// KCP 전표 경로 설정
+		mav.addObject("kcpReceiptUrl", env.getProperty("pg.kcp.receipt.url"));
+
 		mav.setViewName(super.getDeviceViewName("mypage/NoMemberCreCancelDetailForm"));
 
 		return mav;
@@ -1151,6 +1161,9 @@ public class TsfNoMemberController extends TsfBaseController {
 		order.setOrdNo(orderChange.getOrdNo());
 		mav.addObject("paymentInfo", orderService.getPaymentInfoForMypage(order));
 
+		// KCP 전표 경로 설정
+		mav.addObject("kcpReceiptUrl", env.getProperty("pg.kcp.receipt.url"));
+
 		mav.setViewName(super.getDeviceViewName("mypage/NoMemberCreReturnDetailForm"));
 
 		return mav;
@@ -1206,6 +1219,9 @@ public class TsfNoMemberController extends TsfBaseController {
 		mav.addObject("exchangeDetailList", map);
 		mav.addObject("oneData", oneData);
 
+		// KCP 전표 경로 설정
+		mav.addObject("kcpReceiptUrl", env.getProperty("pg.kcp.receipt.url"));
+
 		mav.setViewName(super.getDeviceViewName("mypage/NoMemberCreExchangeDetailForm"));
 
 		return mav;

src/main/webapp/WEB-INF/views/mob/common/layout/MypageLayoutMob.html

@@ -48,6 +48,15 @@
 	</div>
 	<!-- //교환상품 옵션변경 팝업 -->
 
+	<div class="modal pop_full reclaim_pop" id="reclaimPop" tabindex="-1" role="dialog" aria-labelledby="reclaimLabel" aria-hidden="true" style="display: none;">
+			<div class="modal-dialog" role="document">
+				<div class="modal-content">
+
+				</div>
+			</div>
+			<a href="#close-modal" rel="modal:close" id="adrsAddPop_close" class="close-modal">Close</a>
+		</div>
+
 	<th:block th:replace="~{mob/common/fragments/ScriptsMob :: scripts}"></th:block>
 	
 	<script th:src="@{'/biz/mypage.js?v=' + ${#calendars.format(#calendars.createNow(), 'yyyyMMddHHmmss')}}" src="/biz/mypage.js"></script>

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

@@ -215,6 +215,7 @@
 /*<![CDATA[*/
 let oneData = [[${oneData}]];
 var isLogin = [[${isLogin}]];
+let kcpReceiptUrl = [[${kcpReceiptUrl}]];
 
 $(document).ready(function() {
 	// 타이틀명

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

@@ -234,6 +234,64 @@
 				</div>
 			</div>
 		</th:block>
+		<th:block th:if="${oneData.addPayCost > 0}">
+			<div class="inner">
+				<!-- 210409_수정 : 환불 정보 -> 결제 정보 영역으로 수정. -->
+				<div class="tbl_wrap pay_wrap">
+					<div class="tbl_tit">
+						<h3>결제 정보</h3>
+						<strong class="pay"><span th:text="${#numbers.formatInteger(oneData.addPayCost, 1, 'COMMA')}"></span>원</strong>
+					</div>
+					<div class="tbl type1">
+						<table>
+							<colgroup>
+								<col width="227">
+								<col width="*">
+							</colgroup>
+							<tbody>
+								<tr>
+									<td>
+										<dl>
+											<!-- 210415_ 변경 : 결제정보 테이블 내용 변경 -->
+											<div>
+												<dt>배송비</dt>
+												<dd>
+													<div>
+														<span th:text="${#numbers.formatInteger(oneData.addPayCost, 1, 'COMMA')}"></span>원
+													</div>
+												</dd>
+											</div>
+	<!--										<div>-->
+	<!--											<dt>제휴 할인</dt>-->
+	<!--											<dd>-->
+	<!--												<div>-->
+	<!--													<span>-123,456,789</span>원-->
+	<!--												</div>-->
+	<!--											</dd>-->
+	<!--										</div>-->
+											<div>
+												<dt>결제수단</dt>
+												<dd>
+													<div>
+														<span th:if="${oneData.payMeans == 'G014_30'}" th:text="|${oneData.payMeansNm}(${oneData.cardNm}) / ${oneData.cardMips}|"></span>
+														<span th:if="${oneData.payMeans == 'G014_60'}" th:text="${oneData.payMeansNm}"></span>
+													</div>
+												</dd>
+											</div>
+										</dl>
+									</td>
+								</tr>
+							</tbody>
+						</table>
+						<th:block th:if="${oneData.payMeans == 'G014_30'}">
+							<button type="button" class="btn btn_default" onclick="fnReceipt('card')"><span>신용카드 전표</span></button>
+						</th:block>
+					</div>
+				<!-- 210415_ 추가 : 결제정보 안내 텍스트 추가/ [ .desc_txt ] 제거 -->
+				<p class="txt_ref">NPAY등의 대체결제수단으로 결제 시 해당 결제 플랫폼에서 영수증 확인이 가능합니다.</p>
+				</div>
+			</div>
+		</th:block>
 		<div class="inner">
 			<div class="btn_group"><button class="btn btn_dark" onclick="cfnGoToPage(_PAGE_MYPAGE_CRE_LIST);"><span>확인</span></button></div>
 		</div>
@@ -244,6 +302,7 @@
 	/*<![CDATA[*/
 	let addrGb = '';
 	let memoGb = '';
+	let kcpReceiptUrl = [[${kcpReceiptUrl}]];
 
 	$(document).ready(function() {
 		// 타이틀명

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

@@ -336,6 +336,15 @@ var delvMemoSet = function(delvMemoObj) {
 	});
 	
 }
+
+//회수조회_팝업 210504_추가
+$(document).on('click','#btn_reclaim_pop',function(e){
+	$("#reclaimPop").modal("show");
+	return false;
+});
+$("#reclaimPop_close").click(function() {
+	$("#reclaimPop").modal("hide");
+});
 /*]]>*/
 </script>
 

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

@@ -60,7 +60,7 @@
 								<input type="hidden" name="ordDtlNoArr" th:value="${ordDtl.ordDtlNo}"/>
 								<input type="hidden" name="cnclRtnReqQtyArr" th:value="${ordDtl.ordQty - ordDtl.cnclRtnQty}"/>
 														
-								<a href="javascript:void(0);" onclick="fnGoToGoodsDetail(this)">
+								<a href="javascript:void(0);" th:attr="goodsCd=${ordDtl.goodsCd}" onclick="fnGoToGoodsDetail(this)">
 									<div class="thumb_box">
 										<img th:src="${imageUrl + '/' + ordDtl.sysImgNm}" width="100%" alt="">
 									</div>

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

@@ -67,7 +67,7 @@
 								<input type="hidden" name="ordDtlNoArr" th:value="${ordDtl.ordDtlNo}"/>
 								<input type="hidden" name="cnclRtnReqQtyArr" th:value="${ordDtl.ordQty - ordDtl.cnclRtnQty}"/>
 														
-								<a href="javascript:void(0);" onclick="fnGoToGoodsDetail(this)">
+								<a href="javascript:void(0)" th:attr="goodsCd=${ordDtl.goodsCd}" onclick="fnGoToGoodsDetail(this)">
 									<div class="thumb_box">
 										<img th:src="${imageUrl + '/' + ordDtl.sysImgNm}" width="100%" alt="">
 									</div>
@@ -950,11 +950,13 @@
 	let paymentInfo 		= [[${paymentInfo}]];
 	let orderAmtInfo 		= [[${orderAmtInfo}]];
 	let deliveryAddrInfo 	= [[${deliveryAddrInfo}]];
-	let kcpReceiptUrl 		= [[${@environment.getProperty('pg.kcp.receipt.url')}]];
+	//let kcpReceiptUrl 		= [[${@environment.getProperty('pg.kcp.receipt.url')}]];
+	let kcpReceiptUrl 		= [[${kcpReceiptUrl}]];
 	let jsonObj 			= {};
 	//let delvMemo			= [[${deliveryAddrInfo.delvMemo}]];
 
 	$(document).ready(function() {
+		mcxDialog.alert(kcpReceiptUrl);
 		// 타이틀명
 		$('#htopTitle').text('주문상세');
 		

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

@@ -210,6 +210,7 @@
 /*<![CDATA[*/
 let oneData = [[${oneData}]];
 var isLogin = [[${isLogin}]];
+let kcpReceiptUrl = [[${kcpReceiptUrl}]];
 
 $(document).ready(function() {
 	// 타이틀명

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

@@ -224,6 +224,64 @@
 				</div>
 			</div>
 		</th:block>
+		<th:block th:if="${not #strings.isEmpty(oneData.addPayCost)}">
+			<div class="inner">
+				<!-- 210409_수정 : 환불 정보 -> 결제 정보 영역으로 수정. -->
+				<div class="tbl_wrap pay_wrap">
+					<div class="tbl_tit">
+						<h3>결제 정보</h3>
+						<strong class="pay"><span th:text="${#numbers.formatInteger(oneData.addPayCost, 1, 'COMMA')}"></span>원</strong>
+					</div>
+					<div class="tbl type1">
+						<table>
+							<colgroup>
+								<col width="227">
+								<col width="*">
+							</colgroup>
+							<tbody>
+								<tr>
+									<td>
+										<dl>
+											<!-- 210415_ 변경 : 결제정보 테이블 내용 변경 -->
+											<div>
+												<dt>배송비</dt>
+												<dd>
+													<div>
+														<span th:text="${#numbers.formatInteger(oneData.addPayCost, 1, 'COMMA')}"></span>원
+													</div>
+												</dd>
+											</div>
+	<!--										<div>-->
+	<!--											<dt>제휴 할인</dt>-->
+	<!--											<dd>-->
+	<!--												<div>-->
+	<!--													<span>-123,456,789</span>원-->
+	<!--												</div>-->
+	<!--											</dd>-->
+	<!--										</div>-->
+											<div>
+												<dt>결제수단</dt>
+												<dd>
+													<div>
+														<span th:if="${oneData.payMeans == 'G014_30'}" th:text="|${oneData.payMeansNm}(${oneData.cardNm}) / ${oneData.cardMips}|"></span>
+														<span th:if="${oneData.payMeans == 'G014_60'}" th:text="${oneData.payMeansNm}"></span>
+													</div>
+												</dd>
+											</div>
+										</dl>
+									</td>
+								</tr>
+							</tbody>
+						</table>
+						<th:block th:if="${oneData.payMeans == 'G014_30'}">
+							<button type="button" class="btn btn_default" onclick="fnReceipt('card')"><span>신용카드 전표</span></button>
+						</th:block>
+					</div>
+				<!-- 210415_ 추가 : 결제정보 안내 텍스트 추가/ [ .desc_txt ] 제거 -->
+				<p class="txt_ref">NPAY등의 대체결제수단으로 결제 시 해당 결제 플랫폼에서 영수증 확인이 가능합니다.</p>
+				</div>
+			</div>
+		</th:block>
 		<div class="inner">
 			<div class="btn_group"><button class="btn btn_dark" onclick="cfnGoToPage(_PAGE_NOMEMBER_CRE_LIST);"><span>확인</span></button></div>
 		</div>

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

@@ -270,6 +270,7 @@
 /*<![CDATA[*/
 let oneData = [[${oneData}]];
 var isLogin = [[${isLogin}]];
+let kcpReceiptUrl = [[${kcpReceiptUrl}]];
 
 $(document).ready(function() {
 	// 타이틀명

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

@@ -597,7 +597,8 @@
 	let paymentInfo 		= [[${paymentInfo}]];
 	let orderAmtInfo 		= [[${orderAmtInfo}]];
 	let deliveryAddrInfo 	= [[${deliveryAddrInfo}]];
-	let kcpReceiptUrl 		= [[${@environment.getProperty('pg.kcp.receipt.url')}]];
+	//let kcpReceiptUrl 		= [[${@environment.getProperty('pg.kcp.receipt.url')}]];
+	let kcpReceiptUrl		= [[${kcpReceiptUrl}]];
 	let jsonObj 			= {};
 	//let delvMemo			= [[${deliveryAddrInfo.delvMemo}]];
 

src/main/webapp/WEB-INF/views/mob/popup/TrackWithdrawPopupFormMob.html

@@ -0,0 +1,35 @@
+<form class="form_wrap form_full" name="trackWithdrawForm" id="trackWithdrawForm">
+	<div class="modal-header htop" style="border-bottom: 1px solid rgba(0, 0, 0, 0.1);">
+		<h5 class="modal-title" id="reclaimLabel">회수 조회</h5>
+	</div>
+	<div class="modal-body">
+		<div class="pop_cont">
+			<!-- 210506_수정 : 테이블 변경 -->
+			<div class="goods_tbl">
+				<div class="tblWrap">
+					<table class="table">
+						<colgroup>
+							<col style="width: 34%;">
+							<col style="width: 33%;">
+							<col style="width: 33%;">
+						</colgroup>
+						<thead>
+							<tr>
+								<th scope="col">시간</th>
+								<th scope="col">장소</th>
+								<th scope="col">유형</th>
+							</tr>
+						</thead>
+						<tbody>
+							<tr th:if="${sweetTrackerInfoList}" th:each="sweetTrackerInfo, status : ${sweetTrackerInfoList}">
+								<td th:utext="|${#strings.substring(sweetTrackerInfo.timeTrans, 0, 10)}<br/>${#strings.substring(sweetTrackerInfo.timeTrans, 11, 19)}|"></td>
+								<td th:text="${sweetTrackerInfo.delvWhere}"></td>
+								<td th:text="${sweetTrackerInfo.details}"></td>
+							</tr>
+						</tbody>
+					</table>
+				</div>
+			</div>
+		</div>
+	</div>
+</form>

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

@@ -207,7 +207,7 @@
 <script th:inline="javascript">
 	/*<![CDATA[*/
 	let oneData = [[${oneData}]];
-	let kcpReceiptUrl = [[${@environment.getProperty('pg.kcp.receipt.url')}]];
+	let kcpReceiptUrl = [[${kcpReceiptUrl}]];
 	let refundYn = [[${refundYn}]];
 
 	$(document).ready(function() {

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

@@ -273,7 +273,8 @@
 	let oneData = [[${oneData}]];
 	var isLogin = [[${isLogin}]];
 	let ordNo = oneData.ordNo;
-	let kcpReceiptUrl = [[${@environment.getProperty('pg.kcp.receipt.url')}]];
+	//let kcpReceiptUrl = [[${@environment.getProperty('pg.kcp.receipt.url')}]];
+	let kcpReceiptUrl = [[${kcpReceiptUrl}]];
 	let jsonObj = {};
 
 	$(document).ready(function() {

src/main/webapp/WEB-INF/views/web/popup/TrackWithdrawPopupFormWeb.html

@@ -24,11 +24,11 @@
 						</tr>
 					</thead>
 					<tbody>
-						<tr>
-							<td>2020.10.05 09:10:22</td>
-							<td>시흥 대리점</td>
-							<td>집화 처리</td>
-							<td>010-1234-5678</td>
+						<tr th:if="${sweetTrackerInfoList}" th:each="sweetTrackerInfo, status : ${sweetTrackerInfoList}">
+							<td th:text="${sweetTrackerInfo.timeTrans}"></td>
+							<td th:text="${sweetTrackerInfo.delvWhere}"></td>
+							<td th:text="${sweetTrackerInfo.details}"></td>
+							<td th:text="${sweetTrackerInfo.telno}"></td>
 						</tr>
 					</tbody>
 				</table>

src/main/webapp/biz/mypage.js

@@ -330,7 +330,7 @@ var fnReceipt = function(param) {
 		receiptWin += '&tno=' + paymentInfo.pgTid;
 		receiptWin += '&order_no=' + ordNo;
 		receiptWin += '&trade_mony=' + (orderAmtInfo.realOrdAmt + orderAmtInfo.realDelvAmt);
-		console.log(receiptWin);
+
 		// 팝업 크기 설정
 		option = 'width=455, height=815';
 	} else if (param == 'cash') {