card007 5 лет назад
Родитель
Сommit
8d415e88eb

+ 1 - 1
src/main/java/com/style24/persistence/mybatis/shop/TsfGiftcard.xml

@@ -222,7 +222,7 @@
 		     , O.ORD_NM
 		     , O.ORD_PHNNO
 		     , O.ORD_EMAIL
-		     , MAX((SELECT GOODS_NM FROM TB_GOODS WHERE GOODS_CD = OD.GOODS_CD)) OVER(ORDER BY OD.ORD_DTL_NO) AS GOODS_NM
+		     , MAX((SELECT GOODS_NM FROM TB_GOODS WHERE GOODS_CD = OD.GOODS_CD)) AS GOODS_NM
 		     , SUM(OD.GFCD_USE_AMT) AS US_GFCD_AMT
 		  FROM TB_ORDER O
 		 INNER JOIN TB_ORDER_DETAIL OD

+ 4 - 4
src/main/webapp/WEB-INF/views/mob/mypage/MypageCreListFormMob.html

@@ -102,7 +102,7 @@ $(document).ready(function() {
 	$('#htopTitle').text('취소/반품/교환내역');
 
 	jsonObj = {
-		"pageNo" 			: 0
+		"pageNo" 			: 1
 		, "pageSize" 		: 5
 		, "pageUnit" 		: 10
 		, "chgStat" 		: ""
@@ -167,7 +167,7 @@ $(document).ready(function() {
 		$("#listBox").html("");
 
 		// 초기화설정
-		fnGetInfiniteScrollDataList(0);
+		fnGetInfiniteScrollDataList(1);
 
 		// 팝업닫기
 		$(".popup_close").trigger("click");
@@ -178,7 +178,7 @@ $(document).ready(function() {
 var fnGetInfiniteScrollDataList = function(pageNo) {
 
 	// 페이지번호가 없으면 1페이지 설정
-	if (pageNo == null) {
+	if (pageNo == null || pageNo == 0) {
 		pageNo = 1;
 	}
 	
@@ -225,7 +225,7 @@ var fnSetSearchPeriod = function(period) {
 	$("#listBox").html("");
 	
 	// 초기화설정
-	fnGetInfiniteScrollDataList(0);
+	fnGetInfiniteScrollDataList(1);
 	
 	$("#odDatePop .popup_con button").removeClass("on");
 	

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

@@ -956,7 +956,6 @@
 	//let delvMemo			= [[${deliveryAddrInfo.delvMemo}]];
 
 	$(document).ready(function() {
-		mcxDialog.alert(kcpReceiptUrl);
 		// 타이틀명
 		$('#htopTitle').text('주문상세');
 		
@@ -1057,9 +1056,9 @@
 	// 전체취소 버튼 클릭 이벤트
 	var fnAllCancel = function() {
 		// 환불계좌 체크
-		let accountNo = $('#orderDetailForm input[name=accountNo]').val();
-		let accountNm = $('#orderDetailForm input[name=accountNm]').val();
-		let bankCd = $('#orderDetailForm input[name=bankCd]').val();
+		let accountNo = $('#mypageOrderDetailForm input[name=accountNo]').val();
+		let accountNm = $('#mypageOrderDetailForm input[name=accountNm]').val();
+		let bankCd = $('#mypageOrderDetailForm input[name=bankCd]').val();
 
 		if (paymentInfo.payMeans == 'G014_20' && paymentInfo.payStat == 'G016_30' && (gagajf.isNull(accountNo) || gagajf.isNull(accountNm) || gagajf.isNull(bankCd))) {
 			let data = {};
@@ -1096,13 +1095,13 @@
 				
 				// 주문상세번호 설정
 				let ordDtlNoArr = [];
-				$.each($('#orderDetailForm input[name=ordDtlNoArr]'), function(idx, item) {
+				$.each($('#mypageOrderDetailForm input[name=ordDtlNoArr]'), function(idx, item) {
 					ordDtlNoArr.push($(item).val());
 				});
 				
 				// 취소 수량 설정
 				let cnclRtnReqQtyArr = [];
-				$.each($('#orderDetailForm input[name=cnclRtnReqQtyArr]'), function(idx, item) {
+				$.each($('#mypageOrderDetailForm input[name=cnclRtnReqQtyArr]'), function(idx, item) {
 					cnclRtnReqQtyArr.push($(item).val());
 				});
 				
@@ -1118,7 +1117,7 @@
 				data.reqGbn = 'cnclComplete';
 				data.ordDtlNoArr = ordDtlNoArr;
 				data.cnclRtnReqQtyArr = cnclRtnReqQtyArr;
-				
+
 				let jsonData = JSON.stringify(data);
 				
 				gagajf.ajaxJsonSubmit(url, jsonData, function(result) {
@@ -1162,9 +1161,9 @@
 	// 환불계좌 등록 콜백 처리
 	var fnRegisterAccountCallback = function(result) {
 		// 환불계좌 정보 설정
-		$('#orderDetailForm input[name=accountNo]').val(result.accountNo);
-		$('#orderDetailForm input[name=accountNm]').val(result.accountNm);
-		$('#orderDetailForm input[name=bankCd]').val(result.bankCd);
+		$('#mypageOrderDetailForm input[name=accountNo]').val(result.accountNo);
+		$('#mypageOrderDetailForm input[name=accountNm]').val(result.accountNm);
+		$('#mypageOrderDetailForm input[name=bankCd]').val(result.bankCd);
 		
 		// 전체취소 처리
 		fnAllCancel();

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

@@ -193,7 +193,7 @@ $(document).ready(function() {
 
 	// AJAX 로드를 위한 변수 설정
 	jsonObj = {
-		"pageNo" 			: 0
+		"pageNo" 			: 1
 		, "pageSize" 		: 5
 		, "pageUnit" 		: 10
 		, "ordDtlStat" 		: ""
@@ -273,7 +273,7 @@ $(document).ready(function() {
 		$("#listBox").html("");
 		
 		// 초기화설정
-		fnGetInfiniteScrollDataList(0);
+		fnGetInfiniteScrollDataList(1);
 
 		// 팝업닫기
 		$(".popup_close").trigger("click");
@@ -289,10 +289,10 @@ $(document).ready(function() {
 var fnGetInfiniteScrollDataList = function(pageNo) {
 
 	// 페이지번호가 없으면 1페이지 설정
-	if (pageNo == null) {
+	if (pageNo == null || pageNo == 0) {
 		pageNo = 1;
 	}
-	
+
 	// 페이지설정
 	$("#searchForm input[name=pageNo]").val(pageNo);
 	
@@ -339,7 +339,7 @@ var fnSetSearchPeriod = function(period) {
 	$("#listBox").html("");
 	
 	// 초기화설정
-	fnGetInfiniteScrollDataList(0);
+	fnGetInfiniteScrollDataList(1);
 	
 	$("#odDatePop .popup_con button").removeClass("on");
 	

+ 4 - 4
src/main/webapp/WEB-INF/views/mob/mypage/NoMemberCreListFormMob.html

@@ -119,7 +119,7 @@ $(document).ready(function() {
 	$('#htopTitle').text('취소/반품/교환내역');
 
 	jsonObj = {
-		"pageNo" 			: 0
+		"pageNo" 			: 1
 		, "pageSize" 		: 5
 		, "pageUnit" 		: 10
 		, "chgStat" 		: ""
@@ -186,7 +186,7 @@ $(document).ready(function() {
 		$("#listBox").html("");
 		
 		// 초기화설정
-		fnGetInfiniteScrollDataList(0);
+		fnGetInfiniteScrollDataList(1);
 
 		// 팝업 닫기
 		$(".popup_close").trigger("click");
@@ -197,7 +197,7 @@ $(document).ready(function() {
 var fnGetInfiniteScrollDataList = function(pageNo) {
 
 	// 페이지번호가 없으면 1페이지 설정
-	if (pageNo == null) {
+	if (pageNo == null || pageNo == 0) {
 		pageNo = 1;
 	}
 	
@@ -244,7 +244,7 @@ var fnSetSearchPeriod = function(period) {
 	$("#listBox").html("");
 	
 	// 초기화설정
-	fnGetInfiniteScrollDataList(0);
+	fnGetInfiniteScrollDataList(1);
 	
 	$("#odDatePop .popup_con button").removeClass("on");
 	

+ 4 - 4
src/main/webapp/WEB-INF/views/mob/mypage/NoMemberOrderListFormMob.html

@@ -127,7 +127,7 @@ $(document).ready(function() {
 
 	// AJAX 로드를 위한 변수 설정
 	jsonObj = {
-		"pageNo" 			: 0
+		"pageNo" 			: 1
 		, "pageSize" 		: 5
 		, "pageUnit" 		: 10
 		, "ordDtlStat" 		: ""
@@ -194,7 +194,7 @@ $(document).ready(function() {
 		$("#listBox").html("");
 
 		// 초기화설정
-		fnGetInfiniteScrollDataList(0);
+		fnGetInfiniteScrollDataList(1);
 
 		// 팝업 닫기
 		$(".popup_close").trigger("click");
@@ -205,7 +205,7 @@ $(document).ready(function() {
 var fnGetInfiniteScrollDataList = function(pageNo) {
 
 	// 페이지번호가 없으면 1페이지 설정
-	if (pageNo == null) {
+	if (pageNo == null || pageNo == 0) {
 		pageNo = 1;
 	}
 	
@@ -254,7 +254,7 @@ var fnSetSearchPeriod = function(period) {
 	$("#listBox").html("");
 	
 	// 초기화설정
-	fnGetInfiniteScrollDataList(0);
+	fnGetInfiniteScrollDataList(1);
 	
 	$("#odDatePop .popup_con button").removeClass("on");
 	

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

@@ -292,7 +292,7 @@
 		let chgerNm = delvObj.recipNm;
 		let chgerPhnno = delvObj.recipPhnno;
 		let chgerZipcode = delvObj.recipZipcode;
-		let chgerBaseAddr = delvObj.recipBaseAddr;
+		let chgerBaseAddr = delvObj.recipBaseAddr;getCashReceiptsInfo
 		let chgerDtlAddr = delvObj.recipDtlAddr;
 		let chgerRtnMemo = delvObj.delvMemo;
 		let chgerAddr = chgerBaseAddr + ' ' + chgerDtlAddr;