1122

src/main/java/com/style24/admin/biz/web/TsaOrderChangeController.java

@@ -60,7 +60,7 @@ public class TsaOrderChangeController extends TsaBaseController {
 	private TscOrderRefundService coreOrderRefundService;
 	
 	/**
-	 * 취소요청 화면 (관리자)
+	 * 취소요청, 취소완료 통합 화면 (관리자)
 	 * 
 	 * @param ordNo - 주문번호
 	 * @param cncWait - 취소대기요청 구분
@@ -110,7 +110,7 @@ public class TsaOrderChangeController extends TsaBaseController {
 	}
 	
 	/**
-	 * 취소요청 (ADMIN, NAPY, 외부몰) (배치)
+	 * 취소요청 (ADMIN, NAPY, 외부몰) (배치) (사용안함)
 	 * 
 	 * @param OrderChange - 주문취소신청정보
 	 * @return
@@ -190,18 +190,6 @@ public class TsaOrderChangeController extends TsaBaseController {
 		mav.set("ordNo"			, cnclReq.getOrdNo());
 		mav.set("ordChgSq"		, cnclReq.getOrdChgSq());
 		
-		Order order = new Order();
-		
-		// 2. 취소가능 주문상세상탭값 설정
-		String[] ordDtlStatArr = new String[4];
-		ordDtlStatArr[0] = TscConstants.OrderDetailStat.DEPOSIT_WAIT.value();
-		ordDtlStatArr[1] = TscConstants.OrderDetailStat.PAYMENT_COMPLETE.value();
-		ordDtlStatArr[2] = TscConstants.OrderDetailStat.GOODS_PREPARE.value();
-		ordDtlStatArr[3] = TscConstants.OrderDetailStat.DELIVERY_PREPARE.value();
-		order.setOrdDtlStatArr(ordDtlStatArr);
-
-		mav.set("cancelRequestTargetList", coreOrderChangeService.getCancelRequestTargetList(order));
-		
 		// 2.취소요청철회 
 		mav = coreOrderChangeService.cnclReqCancel(mav, userNo);
 		
@@ -227,7 +215,7 @@ public class TsaOrderChangeController extends TsaBaseController {
 	}
 	
 	/**
-	 * 취소완료 (관리자)
+	 * 취소 요청, 완료 통합 (관리자)
 	 * @param Collection<Order> - 주문취소신청목록
 	 * @return
 	 * @author jsh77b

src/main/webapp/WEB-INF/views/order/CnclReqViewForm.html

@@ -43,8 +43,10 @@
 <script th:inline="javascript">
 /*<![CDATA[*/
 var ordNo 					= [[${ordNo}]];									// 주문번호
+var ordChgSq 				= [[${ordChgSq}]];								// 주문변경번호
 var orderChangeList 		= [[${orderChangeList}]];						// 취소/반품/교환요청 정보
 
+//
 //var orderInfoList 		= [[${orderInfoList}]];							// 주문기본정보
 //var payMeans 				= orderInfoList[0].payMeans;					// 결제수단
 //var chgReason				= orderChangeList[0].chgReason;					// 변경사유코드

src/main/webapp/WEB-INF/views/order/OrderDetailChangeHst.html

@@ -53,12 +53,13 @@ var columnDefs4OrderDetailChangeHstList = [
 	{headerName: "택배사"			, field: "shipCompNm"	, width: 130	, cellClass: 'text-center'}
 ];
 
-var gridOptions4OrderDetailChangeHstList = orderAgGrid.getGridOptions(columnDefs4OrderDetailChangeHstList);
+var gridOptions4OrderDetailChangeHstList = gagaAgGrid.getGridOptions(columnDefs4OrderDetailChangeHstList);
 
 $(document).ready(function() {	
 	// Create a agGrid
 	gagaAgGrid.createGrid('gridOrderDetailChangeHstList', gridOptions4OrderDetailChangeHstList);
 	gridOptions4OrderDetailChangeHstList.api.setRowData(orderDetailHstList);
+	gagaAgGrid.hideStatusBar('gridOrderDetailChangeHstList');
 });
 /*]]>*/
 

src/main/webapp/WEB-INF/views/order/OrderDetailForm.html

@@ -921,12 +921,17 @@ $(document).ready(function () {
 		
 		// 입금대기, 결제완료, 상품준비중, 배송준비중 일때 취소가능
 		if (rowNode.data.ordDtlStat == 'G013_10' || rowNode.data.ordDtlStat == 'G013_20' || rowNode.data.ordDtlStat == 'G013_30' || rowNode.data.ordDtlStat == 'G013_40') {
-			$("#btnCancel").removeClass("off");	//취소요청
+			// 주문수량 > 취소수량 + 취소신청수량 클때 취소가능
+			if (rowNode.data.ordQty > (rowNode.data.cnclRtnQty + rowNode.data.ordReqChgQty)) {
+				$("#btnCancel").removeClass("off");	//취소요청	
+			}
 		}
-		
+
 		// 배송중, 출고완료, 배송완료 일때 반품, 교환 가능
 		if ((rowNode.data.ordDtlStat == 'G013_50' || rowNode.data.ordDtlStat == 'G013_55' || rowNode.data.ordDtlStat == 'G013_60') && rowNode.data.ordQty > rowNode.data.ordReqChgQty) {
-			$("#btnReturn, #btnExchange").removeClass("off");
+			if (rowNode.data.ordQty > (rowNode.data.cnclRtnQty + rowNode.data.ordReqChgQty)) {
+				$("#btnReturn, #btnExchange").removeClass("off");
+			}
 		}
 		
 		// 입금대기, 결제완료, 상품준비중, 배송준비중 일때 취소가능

src/main/webapp/WEB-INF/views/order/OrderDetailGiftcardHst.html

@@ -87,53 +87,16 @@ var columnDefsOrderGiftcardInfo = [
 		}
 ];
 
-var gridOptionsOrderGiftcardInfo = orderAgGrid.getGridOptions(columnDefsOrderGiftcardInfo);
+var gridOptionsOrderGiftcardInfo = gagaAgGrid.getGridOptions(columnDefsOrderGiftcardInfo);
 
 $(document).ready(function() {	
 	// Create a agGrid
 	gagaAgGrid.createGrid('gridOrderGiftcardInfo', gridOptionsOrderGiftcardInfo);
 	gridOptionsOrderGiftcardInfo.api.setRowData(orderGiftcardHstList);
+	gagaAgGrid.hideStatusBar('gridOrderGiftcardInfo');
 });
 /*]]>*/
 
-</script>
-
-<!-- AgGrid 컬럼 세팅 -->
-<script>
-// 공통1. 주문상세 그리드 옵션 정보 적용
-var orderAgGrid = {
-	getGridOptions : function(colDefs) {
-		return {
-			columnDefs					: colDefs
-			, detailCellRendererParams	: {
-				detailGridOptions	: {
-					columnDefs				: []
-					, defaultColDef			: {
-						resizable: true
-					}
-					, suppressLoadingOverlay: false
-					, onGridReady			: function (params) {
-						params.api.setDomLayout('autoHeight');
-					}
-					, onFirstDataRendered	: function (params) {
-						params.api.sizeColumnsToFit();
-					}
-				}
-				, getDetailRowData: function (params) {
-					params.successCallback(params.data.orderDetailList);
-				}
-			}
-			, defaultColDef: {
-				resizable: true
-			}
-			, isRowMaster: function (dataItem) {
-				return dataItem ? dataItem.orderDetailList.length > 1 : false;
-			}
-			, suppressRowTransform: true
-			, enableRangeSelection: true
-		};
-	}
-}
 </script>
 </html>
 

src/main/webapp/WEB-INF/views/order/OrderDetailPointHst.html

@@ -77,54 +77,18 @@ var columnDefsOrderPointInfo = [
 		}
 ];
 
-var gridOptionsOrderPointInfo = orderAgGrid.getGridOptions(columnDefsOrderPointInfo);
+var gridOptionsOrderPointInfo = gagaAgGrid.getGridOptions(columnDefsOrderPointInfo);
 
 $(document).ready(function() {	
 	// Create a agGrid
 	gagaAgGrid.createGrid('gridOrderPointInfo', gridOptionsOrderPointInfo);
 	gridOptionsOrderPointInfo.api.setRowData(orderPointHstList);
+	gagaAgGrid.hideStatusBar('gridOrderPointInfo');
 });
 /*]]>*/
 
 </script>
 
-<!-- AgGrid 컬럼 세팅 -->
-<script>
-// 공통1. 주문상세 그리드 옵션 정보 적용
-var orderAgGrid = {
-	getGridOptions : function(colDefs) {
-		return {
-			columnDefs					: colDefs
-			, detailCellRendererParams	: {
-				detailGridOptions	: {
-					columnDefs				: []
-					, defaultColDef			: {
-						resizable: true
-					}
-					, suppressLoadingOverlay: false
-					, onGridReady			: function (params) {
-						params.api.setDomLayout('autoHeight');
-					}
-					, onFirstDataRendered	: function (params) {
-						params.api.sizeColumnsToFit();
-					}
-				}
-				, getDetailRowData: function (params) {
-					params.successCallback(params.data.orderDetailList);
-				}
-			}
-			, defaultColDef: {
-				resizable: true
-			}
-			, isRowMaster: function (dataItem) {
-				return dataItem ? dataItem.orderDetailList.length > 1 : false;
-			}
-			, suppressRowTransform: true
-			, enableRangeSelection: true
-		};
-	}
-}
-</script>
 </html>
 
 

src/main/webapp/WEB-INF/views/order/OrderDetailTmtbHst.html

@@ -59,53 +59,16 @@ var columnDefsOrderGiftcardInfo = [
 		}
 ];
 
-var gridOptionsOrderTmtbInfo = orderAgGrid.getGridOptions(columnDefsOrderGiftcardInfo);
+var gridOptionsOrderTmtbInfo = gagaAgGrid.getGridOptions(columnDefsOrderGiftcardInfo);
 
 $(document).ready(function() {	
 	// Create a agGrid
 	gagaAgGrid.createGrid('gridOrderTmtbInfo', gridOptionsOrderTmtbInfo);
 	gridOptionsOrderTmtbInfo.api.setRowData(orderTmtbHstList);
+	gagaAgGrid.hideStatusBar('gridOrderTmtbInfo');
 });
 /*]]>*/
 
-</script>
-
-<!-- AgGrid 컬럼 세팅 -->
-<script>
-// 공통1. 주문상세 그리드 옵션 정보 적용
-var orderAgGrid = {
-	getGridOptions : function(colDefs) {
-		return {
-			columnDefs					: colDefs
-			, detailCellRendererParams	: {
-				detailGridOptions	: {
-					columnDefs				: []
-					, defaultColDef			: {
-						resizable: true
-					}
-					, suppressLoadingOverlay: false
-					, onGridReady			: function (params) {
-						params.api.setDomLayout('autoHeight');
-					}
-					, onFirstDataRendered	: function (params) {
-						params.api.sizeColumnsToFit();
-					}
-				}
-				, getDetailRowData: function (params) {
-					params.successCallback(params.data.orderDetailList);
-				}
-			}
-			, defaultColDef: {
-				resizable: true
-			}
-			, isRowMaster: function (dataItem) {
-				return dataItem ? dataItem.orderDetailList.length > 1 : false;
-			}
-			, suppressRowTransform: true
-			, enableRangeSelection: true
-		};
-	}
-}
 </script>
 </html>