Merge remote-tracking branch 'origin/xodud1202' into develop

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

@@ -207,7 +207,7 @@
 											<div><i class="fa fa-info-circle"></i> 사은품은 최대 <font color="red">5</font>개까지 설정하실 수 있습니다.</div>
 											<div><i class="fa fa-info-circle"></i> 구매 금액 조건을 추가하시면 구매 금액 충족 조건에 맞는 것으로 지급됩니다. 구매금액 조건은 최대 2개까지만등록 하실 수 있습니다.</div>
 											<div><i class="fa fa-info-circle"></i> 장바구니에 담았을 때의 가격 기준으로 적용됩니다.(주문상품쿠폰(다운로드쿠폰)/장바구니 쿠폰 할인 적용 전 판매가)</div>
-											<label for="saleAmt">구매금액</label><input type="text" class="w300 disabledPoint" id="saleAmt" name="sectionVal" data-valid-type="numeric"/> <br/>
+											<label for="saleAmt">구매금액</label><input type="text" class="w300 disabledPoint" id="saleAmt" name="sectionVal" data-valid-type="pinteger"/> <br/>
 											<span>사은품 목록</span>
 											<button type="button" class="btn btnRight btn-success btn-lg hideButten" id="btnAddFreeGoods1">+ 사은품 선택</button>
 											<button type="button" class="btn btnRight btn-success btn-lg hideButten" id="btnDeleteFreeGoods1">선택삭제</button>
@@ -220,7 +220,7 @@
 									<th>사은품 조건2<br/>(최대 2개)</th>
 									<td>
 										<div>
-											<label for="saleAmt2">구매금액</label><input type="text" class="w300 disabledPoint" id="saleAmt2"  name="sectionVal2" data-valid-type="numeric"/> <br/>
+											<label for="saleAmt2">구매금액</label><input type="text" class="w300 disabledPoint" id="saleAmt2"  name="sectionVal2" data-valid-type="pinteger"/> <br/>
 											<span>사은품 목록</span>
 											<button type="button" class="btn btnRight btn-success btn-lg hideButten" id="btnAddFreeGoods2">+ 사은품 선택</button>
 											<button type="button" class="btn btnRight btn-success btn-lg hideButten" id="btnDeleteFreeGoods2">선택삭제</button>
@@ -555,6 +555,21 @@
 				$("#freeGoodsPromotionForm #btnFreegoodsPromotionSave").show();		// 저장
 				$("#freeGoodsPromotionForm #btnChangeStatIng").show();				// 진행
 				$("#freeGoodsPromotionForm #btnPromotionDelete").show();			// 삭제
+
+				//gridOptionsFreeGoods1List.columnApi.getColumn("usePoint").colDef.cellStyle = {backgroundColor: '#aaaaff'};
+				gridOptionsFreeGoods1List.columnApi.getColumn("itemQty").colDef.cellStyle = {backgroundColor: '#aaaaff'};
+				gridOptionsFreeGoods1List.columnApi.getColumn("limitQty").colDef.cellStyle = {backgroundColor: '#aaaaff'};
+				//gridOptionsFreeGoods2List.columnApi.getColumn("usePoint").colDef.cellStyle = {backgroundColor: '#aaaaff'};
+				gridOptionsFreeGoods2List.columnApi.getColumn("itemQty").colDef.cellStyle = {backgroundColor: '#aaaaff'};
+				gridOptionsFreeGoods2List.columnApi.getColumn("limitQty").colDef.cellStyle = {backgroundColor: '#aaaaff'};
+
+				if(freegift.allYn == "Y") {
+					gridOptionsFreeGoods1List.columnApi.getColumn("usePoint").colDef.editable = false;
+					gridOptionsFreeGoods2List.columnApi.getColumn("usePoint").colDef.editable = false;
+				} else {
+					gridOptionsFreeGoods1List.columnApi.getColumn("usePoint").colDef.cellStyle = {backgroundColor: '#aaaaff'};
+					gridOptionsFreeGoods2List.columnApi.getColumn("usePoint").colDef.cellStyle = {backgroundColor: '#aaaaff'};
+				}
 			} else {
 				// 대기 상태일 경우를 제외하면 모든 상태 수정 불가(기획서대로 진행 상태에서 일부 수정 가능할 경우 if문 주석 제거)
 				//if(freegift.freegiftStat == "G232_11") {
@@ -632,6 +647,13 @@
 			$('#freeGoodsPromotionForm #freegiftEdHH option:last').prop("selected", true);
 			$("#freeGoodsPromotionForm #freegiftEdMM option").hide();
 			$('#freeGoodsPromotionForm #freegiftEdMM option:first').show().prop("selected", true);
+
+			gridOptionsFreeGoods1List.columnApi.getColumn("usePoint").colDef.editable = false;
+			gridOptionsFreeGoods2List.columnApi.getColumn("usePoint").colDef.editable = false;
+			gridOptionsFreeGoods1List.columnApi.getColumn("itemQty").colDef.cellStyle = {color: '#fffff', backgroundColor: '#aaaaff'};
+			gridOptionsFreeGoods1List.columnApi.getColumn("limitQty").colDef.cellStyle = {color: '#fffff', backgroundColor: '#aaaaff'};
+			gridOptionsFreeGoods2List.columnApi.getColumn("itemQty").colDef.cellStyle = {color: '#fffff', backgroundColor: '#aaaaff'};
+			gridOptionsFreeGoods2List.columnApi.getColumn("limitQty").colDef.cellStyle = {color: '#fffff', backgroundColor: '#aaaaff'};
 		} else {
 			fnFreegiftSearch();
 		}
@@ -942,6 +964,38 @@
 		}
 	});
 
+	// 지급 방법 변경
+	$("#freeGoodsPromotionForm input[name=allYn]").on('change', function () {
+		if($(this).val() == "Y") {
+			// 등록된 포인트액 0원으로 수정
+			let goods1List = gagaAgGrid.getAllRowData(gridOptionsFreeGoods1List);
+			let goods2List = gagaAgGrid.getAllRowData(gridOptionsFreeGoods2List);
+
+			for(var z = 0 ; z < goods1List.length ; z++) {goods1List[z].usePoint = 0};
+			for(var z = 0 ; z < goods2List.length ; z++) {goods2List[z].usePoint = 0};
+
+			// 포인트액 수정 불가 및 수정가능 색상 제거
+			console.log(gridOptionsFreeGoods1List.columnApi.getColumn("usePoint").colDef.cellStyle);
+			gridOptionsFreeGoods1List.columnApi.getColumn("usePoint").colDef.cellStyle = {backgroundColor: 'clear'};
+			gridOptionsFreeGoods2List.columnApi.getColumn("usePoint").colDef.cellStyle = {backgroundColor: 'clear'};
+			gridOptionsFreeGoods1List.columnApi.getColumn("usePoint").colDef.editable = false;
+			gridOptionsFreeGoods2List.columnApi.getColumn("usePoint").colDef.editable = false;
+
+			gridOptionsFreeGoods1List.api.setRowData(goods1List);
+			gridOptionsFreeGoods2List.api.setRowData(goods2List);
+		} else {
+			console.log(gridOptionsFreeGoods1List.columnApi.getColumn("usePoint").colDef.cellStyle);
+			// 포인트액 수정 가능 및 수정가능 색상으로 변경
+			gridOptionsFreeGoods1List.columnApi.getColumn("usePoint").colDef.cellStyle = {backgroundColor: '#aaaaff'};
+			gridOptionsFreeGoods2List.columnApi.getColumn("usePoint").colDef.cellStyle = {backgroundColor: '#aaaaff'};
+			gridOptionsFreeGoods1List.columnApi.getColumn("usePoint").colDef.editable = true;
+			gridOptionsFreeGoods2List.columnApi.getColumn("usePoint").colDef.editable = true;
+
+			gridOptionsFreeGoods1List.api.setRowData(gagaAgGrid.getAllRowData(gridOptionsFreeGoods1List));
+			gridOptionsFreeGoods2List.api.setRowData(gagaAgGrid.getAllRowData(gridOptionsFreeGoods2List));
+		}
+	});
+
 	// 목록 버튼 클릭
 	$("#freeGoodsPromotionForm #btnSearchList").on("click", function() {
 		uifnPopupClose('popupFreeGoodsPromotionRegi');