통테 수정사항 처리

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

@@ -889,6 +889,12 @@ public class TsaDisplayController extends TsaBaseController {
 	@ResponseBody
 	public GagaMap getLookbookList(@RequestBody Lookbook lookbook) {
 		GagaMap result = new GagaMap();
+		if(lookbook.getDispStdt() != null){
+			lookbook.setDispStdt(lookbook.getDispStdt().replaceAll("-",""));
+		}
+		if(lookbook.getDispEddt() != null){
+			lookbook.setDispEddt(lookbook.getDispEddt().replaceAll("-",""));
+		}
 
 		lookbook.setRegNo(TsaSession.getInfo().getUserNo());
 		lookbook.setPageable(new TscPageRequest(lookbook.getPageNo() - 1, lookbook.getPageSize()));

src/main/webapp/WEB-INF/views/display/CategoryGoodsForm.html

@@ -261,10 +261,21 @@
 	 * 상품조회 버튼 클릭시
 	 */
 	$("#btnSearch").on('click', function(){
-		$("#searchForm input[name=searchGb]").val("BASIC");
+		if(gagajf.isNull($("#goodsSearch").find("input[name=goodsCd]").val())){
+            mcxDialog.alert("상품코드를 입력하세요.");
+            return false;
+        }
+	    $("#searchForm input[name=searchGb]").val("BASIC");
 		gagaPaging.load(1);
 	});
 
+    //페이징
+    $('#searchForm select[name=pageSize]').on('change', function() {
+        $("#searchForm input[name=pageNo]").val('1');
+        $("#searchForm input[name=searchGb]").val("BASIC");
+        gagaPaging.load(1);
+    });
+
 	/**
 	 * 상품추가 버튼 클릭 시
 	 */

src/main/webapp/WEB-INF/views/display/LookbookListForm.html

@@ -147,6 +147,7 @@
 		},
 		{headerName: "타이틀", field: "title", width: 200, cellClass: 'text-center'},
 		{headerName: "브랜드", field: "brandCd", width: 80, cellClass: 'text-center'},
+		{headerName: "브랜드명", field: "brandNm", width: 80, cellClass: 'text-center'},
 		{headerName: "메인룩북", field: "mainDispYn", width: 80, cellClass: 'text-center'},
 		{headerName: "노출여부", field: "dispYn", width: 80, cellClass: 'text-center'},
 		{headerName: "노출시작일", field: "dispStdt", width: 150, cellClass: 'text-center'},
@@ -181,8 +182,39 @@
 
 	// 조회
 	$("#btnSearch").on('click', function(){
-		$("#searchForm input[name=dispStTime]").val($('#searchForm #schStTimeHour').val()+$('#searchForm #schStTimeMin').val()+'00');
-		$("#searchForm input[name=dispEdTime]").val($('#searchForm #schEdTimeHour').val()+$('#searchForm #schEdTimeMin').val()+'59');
+		var fromDate = '';
+		var toDate = '';
+		if(!gagajf.isNull($("#searchForm input[name=dispStdt]").val())){
+			$("#searchForm input[name=dispStTime]").val($('#searchForm #schStTimeHour').val()+$('#searchForm #schStTimeMin').val()+'00');
+			fromDate = $("#searchForm input[name=dispStdt]").val().replaceAll('-','')+$("#searchForm input[name=dispStTime]").val();
+		}
+		if(!gagajf.isNull($("#searchForm input[name=dispEddt]").val())){
+			$("#searchForm input[name=dispEdTime]").val($('#searchForm #schEdTimeHour').val()+$('#searchForm #schEdTimeMin').val()+'59');
+			toDate = $("#searchForm input[name=dispEddt]").val().replaceAll('-','')+$("#searchForm input[name=dispEdTime]").val();
+		}
+
+		if (!gagajf.isNull(fromDate) || !gagajf.isNull(toDate)) {
+			if (gagajf.isNull(fromDate) || gagajf.isNull(toDate)) {
+				mcxDialog.alertC("시작일자와 종료일자를 입력하세요.", {
+					sureBtnText: "확인",
+					sureBtnClick: function() {
+						$('#searchForm input[name=dispStTime]').focus();
+					}
+				});
+				return false;
+			}
+
+			if (fromDate > toDate) {
+				mcxDialog.alertC("시작일자는 종료일자 보다 클 수 없습니다.", {
+					sureBtnText: "확인",
+					sureBtnClick: function() {
+						$('#searchForm input[name=dispEdTime]').focus();
+					}
+				});
+				return false;
+			}
+		}
+
 		fnSearch();
 	});
 
@@ -191,6 +223,13 @@
 		gagaPaging.load(1);
 	};
 
+	//페이징
+	$('#searchForm select[name=pageSize]').on('change', function() {
+		$("#searchForm input[name=pageNo]").val('1');
+		gagaPaging.init('searchForm', fnSearchCallBack, 'lookbookListPagination', $('#searchForm').find('#pageSize').val());
+		gagaPaging.load(1);
+	});
+
 	var fnSearchCallBack = function(result){
 		$('#searchForm').find('#gridRowTotalCount').html(result.pageing.pageable.totalCount.addComma());
 		$('#searchForm').find('#pageNo').val(result.pageing.pageable.pageNo.addComma());

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

@@ -317,6 +317,7 @@
 				return !gagajf.isNull(params.value) ? params.value.toDate("YYYYMMDDHHmmss").format("YYYY-MM-DD HH:mm:ss") : '';
 			}
 		},
+		{headerName: "상품타입", field: "goodsType" , width: 100, cellClass: 'text-center', hide: true},
 		{headerName: "수정자", field: "updNm" , width: 100, cellClass: 'text-center'}
 	];
 

src/main/webapp/WEB-INF/views/marketing/MorebetterListForm.html

@@ -112,12 +112,16 @@
 		{headerName: 'No', width: 60, cellClass: 'text-center',
 			valueGetter: function(params) { return cfnGridNumner('searchForm',params.node.rowIndex, 'A');}
 		},
-		{headerName: "프로모션ID", field: "tmtbSq", width: 80, cellClass: 'text-center',
-			cellRenderer: function(params) {
-				return "<a href=\"javascript:void(0);\" onclick=\"cfnOpenMorebetterSetPopup('U','" + params.value + "');\">" + params.value + "</a>";
+		{headerName: "프로모션ID", field: "tmtbSq", width: 80, cellClass: 'text-center'
+			// cellRenderer: function(params) {
+			// 	return "<a href=\"javascript:void(0);\" onclick=\"cfnOpenMorebetterSetPopup('U','" + params.value + "');\">" + params.value + "</a>";
+			// }
+		},
+		{headerName: "프로모션명", field: "tmtbNm", width: 200, cellClass: 'text-center'
+			,cellRenderer: function(params) {
+				return '<a href="javascript:void(0);">' + params.value + '</a>';
 			}
 		},
-		{headerName: "프로모션명", field: "tmtbNm", width: 200, cellClass: 'text-center'},
 		{headerName: "상태", field: "tmtbStat", width: 140, cellClass: 'text-center'},
 		{headerName: "시작일", field: "tmtbStdt", width: 140, cellClass: 'text-center'},
 		{headerName: "종료일", field: "tmtbEddt", width: 140, cellClass: 'text-center'},
@@ -138,10 +142,10 @@
 
 	// Row Click
 	gridOptions.onCellClicked = function(event) {
-		var goodsCd = event.data.goodsCd;
+		var tmtbSq = event.data.tmtbSq;
 		if (event.colDef.field == "tmtbNm"){
 			// 수정 필요
-			// cfnOpenGoodsDetailPopup('U',goodsCd);
+			cfnOpenMorebetterSetPopup('U',tmtbSq);
 		}
 	}
 

src/main/webapp/WEB-INF/views/marketing/MorebetterPopupForm.html

@@ -620,18 +620,19 @@
 		return true;
 	};
 
-	// 저장
-	$('#btnMorebetterSave').on('click', function() {
-		// validation
-		if (!gagajf.validation('#moreBetterForm'))
+	var checkDateValidation = function (){
+		if (gagajf.isNull($('#moreBetterForm input[name=eventStdt]').val())) {
+			mcxDialog.alert("시작일자를 입력하세요.");
+			$('#moreBetterForm input[name=tmtbStdt]').focus();
 			return false;
+		}
 
-		// 행사기간 확인
-		if (gagajf.isNull($('#moreBetterForm input[name=eventStdt]').val()) || gagajf.isNull($('#moreBetterForm input[name=eventEddt]').val())) {
-			mcxDialog.alert("행사 기간 시작일자와 종료일자를 입력하세요.");
-			$('#moreBetterForm input[name=tmtbStdt]').focus();
+		if (gagajf.isNull($('#moreBetterForm input[name=eventEddt]').val())) {
+			mcxDialog.alert("종료일자를 입력하세요.");
+			$('#moreBetterForm input[name=eventEddt]').focus();
 			return false;
 		}
+
 		var eventStDt = "";
 		var eventEdDt = "";
 
@@ -645,15 +646,30 @@
 		eventStDt = eventStDt.replace(/[^0-9]/g, '');
 		eventEdDt = eventEdDt.replace(/[^0-9]/g, '');
 
-		let fromDate = $('#moreBetterForm input[name=tmtbStdt]').val(eventStDt);
-		let toDate = $('#moreBetterForm input[name=tmtbEddt]').val(eventEdDt);
-
-		if (fromDate > toDate) {
+		if (eventStDt > eventEdDt) {
 			mcxDialog.alert("시작일자는 종료일자 보다 클 수 없습니다.");
 			$('#moreBetterForm input[name=tmtbStdt]').focus();
 			return false;
 		}
 
+		$('#moreBetterForm input[name=tmtbStdt]').val(eventStDt);
+		$('#moreBetterForm input[name=tmtbEddt]').val(eventEdDt);
+
+		return true;
+	}
+
+	// 저장
+	$('#btnMorebetterSave').on('click', function() {
+		// validation
+		if (!gagajf.validation('#moreBetterForm')){
+			return false;
+		}
+
+		// 기간체크
+		if(!checkDateValidation()){
+			return false;
+		}
+
 		// 적용상품 그리드에 기본상품 1개이상 있는지 체크
 		if(!fnGoodsGbCheck()) {
 			return false;
@@ -723,7 +739,7 @@
 
 		var jsonData = JSON.stringify(data);
 
-		gagajf.ajaxJsonSubmit($('#moreBetterForm').prop('action'), jsonData, fnMorebetterSaveCollback);
+		// gagajf.ajaxJsonSubmit($('#moreBetterForm').prop('action'), jsonData, fnMorebetterSaveCollback);
 	});
 
 	var fnMorebetterSaveCollback = function(result){
@@ -838,10 +854,14 @@
 		let addCnt = 0;
 		let failCnt = 0;
 		let dupliCnt = 0;
+		let goodsDCnt = 0;
 
 		for(let i = 0 ; i < result.length ; i++) {
 			let addChk = true, gridListValue = gagaAgGrid.getAllRowData(OriginGridListOption);		// 받아온 모든 데이터
-
+			if(result[i].goodsType == 'G056_D'){ //딜상품 제외
+				addChk = false;
+				goodsDCnt++;
+			}
 			// 받아온 data for
 			for(let j = 0 ; j < gridListValue.length ; j++) {
 				if(gridListValue[j].goodsCd == result[i].goodsCd) { // 중복체크
@@ -858,8 +878,8 @@
 			}
 		}
 		uifnPopupClose('popupGoods');
-		failCnt = result.length - addCnt - dupliCnt;
-		mcxDialog.alert("데이터가 적용되었습니다.<br/>" + addCnt + "건 성공, "+ dupliCnt + "건 중복, " + failCnt + "건 실패");
+		failCnt = result.length - addCnt - dupliCnt - goodsDCnt;
+		mcxDialog.alert("데이터가 적용되었습니다.<br/>" + addCnt + "건 성공, "+ dupliCnt + "건 중복, "+ goodsDCnt + "건 딜상품 제외, " + failCnt + "건 실패");
 	}
 
 	// 공급업체 설정 업체 추가 버튼 클릭시
@@ -933,6 +953,13 @@
 		var sectionGbValue = $('input:radio[name="sectionGb"]:checked').val();
 		var dcWayValue = $('input:radio[name="dcWay"]:checked').val();
 
+		var optionList = gagaAgGrid.getAllRowData(gridOptionsSectionGbList);
+
+		if (optionList.length > 4) {
+			mcxDialog.alert('할인 구간은 최대 5개까지 등록 가능합니다.');
+			return;
+		}
+
 		var data = { tmtbSq: tmtbSq ,sectionGb: sectionGbValue, sectionVal: null, dcWay: dcWayValue, dcVal: null };
 		gagaAgGrid.addRowData(gridOptionsSectionGbList, data, "sectionVal");
 	});
@@ -985,8 +1012,12 @@
 		if (!gagajf.validation('#moreBetterForm'))
 			return false;
 
+		// 기간체크
+		if(!checkDateValidation()){
+			return false;
+		}
 		// 행사기간 확인
-		let fromDate = $('#moreBetterForm input[name=tmtbStdt]').val();
+		/*let fromDate = $('#moreBetterForm input[name=tmtbStdt]').val();
 		let toDate = $('#moreBetterForm input[name=tmtbEddt]').val();
 
 		if (gagajf.isNull(fromDate) || gagajf.isNull(toDate)) {
@@ -999,7 +1030,7 @@
 			mcxDialog.alert("시작일자는 종료일자 보다 클 수 없습니다.");
 			$('#moreBetterForm input[name=tmtbStdt]').focus();
 			return false;
-		}
+		}*/
 
 		// disabled 값 넘겨주기
 		$('#moreBetterForm input[name=tmtbSq]').val($('#moreBetterForm input[name=disTmtbSq]').val());
@@ -1060,6 +1091,11 @@
 			return false;
 		}
 
+		// 기간체크
+		if(!checkDateValidation()){
+			return false;
+		}
+
 		// 공급업체+브랜드 상품조회
 		var multiSupplyCompCd = [];
 		$.each(allSupplyCompData, function(idx, item) {
@@ -1081,34 +1117,6 @@
 			multiExceptGoods.push(item.goodsCd);
 		});
 
-		// 행사기간 확인
-		if (gagajf.isNull($('#moreBetterForm input[name=eventStdt]').val()) || gagajf.isNull($('#moreBetterForm input[name=eventEddt]').val())) {
-			mcxDialog.alert("행사 기간 시작일자와 종료일자를 입력하세요.");
-			$('#moreBetterForm input[name=tmtbStdt]').focus();
-			return false;
-		}
-		var eventStDt = "";
-		var eventEdDt = "";
-
-		eventStDt = $('#moreBetterForm input[name=eventStdt]').val()+$('#moreBetterForm select[name=eventStHH]').val()+$('#moreBetterForm select[name=eventStMM]').val()+'00';
-		if($('#moreBetterForm select[name=eventEdHH]').val() == "24"){
-			eventEdDt = $('#moreBetterForm input[name=eventEddt]').val()+'235959';
-		}else{
-			eventEdDt = $('#moreBetterForm input[name=eventEddt]').val()+$('#moreBetterForm select[name=eventEdHH]').val()+$('#moreBetterForm select[name=eventEdMM]').val()+'00';
-		}
-
-		eventStDt = eventStDt.replace(/[^0-9]/g, '');
-		eventEdDt = eventEdDt.replace(/[^0-9]/g, '');
-
-		let fromDate = $('#moreBetterForm input[name=tmtbStdt]').val(eventStDt);
-		let toDate = $('#moreBetterForm input[name=tmtbEddt]').val(eventEdDt);
-
-		if (fromDate > toDate) {
-			mcxDialog.alert("시작일자는 종료일자 보다 클 수 없습니다.");
-			$('#moreBetterForm input[name=tmtbStdt]').focus();
-			return false;
-		}
-
 		/*var data = {
 			mode : $('#moreBetterForm input[name=mode]').val()
 			, tmtbSq : $('#moreBetterForm input[name=disTmtbSq]').val()