Merge branch 'develop' of http://112.172.147.34:4936/style24/style24.admin into develop

src/main/webapp/WEB-INF/views/goods/GoodsDetailForm.html

@@ -1601,7 +1601,7 @@
 			return;
 		}
 		//시즌
-		if ("Y" == $("#goodsDetailForm input[name=selfGoodsYn]").val()){
+		//if ("Y" == $("#goodsDetailForm input[name=selfGoodsYn]").val()){
 			if(gagajf.isNull($("#goodsDetailForm select[name=seasonCd]").val())){
 				mcxDialog.alertC("시즌을 선택해 주세요.", {
 					sureBtnText: "확인",
@@ -1611,7 +1611,7 @@
 				});
 				return;
 			}
-		}	
+		//}	
 
 		//정상가
 		if(gagajf.isNull($("#goodsDetailForm input[name=listPrice]").val())) {

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

@@ -305,7 +305,9 @@ var columnDefsGoodsInfo = [
 				, cellClass		: 'text-center'
 				, cellRenderer: function (params) {
 					var retStr = "";
-					
+					// 네이버페이 주문형은 버튼 생성X
+					if(params.data.pgGb == "NAVER_ORDER") return retStr;
+
 					// 결제완료, 상품준비중, 출고처지정, 배송준비중 (주문취소) 
 					if (params.value == 'G013_20' || params.value == 'G013_30' || params.value == 'G013_35' || params.value == 'G013_40') {
 						if (params.data.ordQty > (params.data.cnclRtnQty + params.data.ordReqChgQty)) {