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

src/main/java/com/style24/admin/biz/service/TsaPlanService.java

@@ -388,32 +388,33 @@ public class TsaPlanService {
 				}
 				newFile.renameTo(uniqueFile);
 				param.setMainPimg("/planning/" + yearMonth + "/" + newFilename);
-			}
-			
-		}
-		if(param.getMainMimg() != null && !"".equals(param.getMainMimg())){
-			String imgInd = String.valueOf(ind);
-			if (ind < 10) {
-				imgInd = "0" + imgInd;
-			}
-			if(!param.getMainMimg().contains("planning")) {
-				String planUploadPath = env.getProperty("upload.default.target.path");
-				String yearMonth = GagaDateUtil.getToday().substring(0, 6);
-				planUploadPath = GagaFileUtil.getConcatenationPath(planUploadPath, "/planning");
-				File newFile = new File(GagaFileUtil.getConcatenationPath(planUploadPath, param.getMainMimg()));
-				planUploadPath = GagaFileUtil.getConcatenationPath(planUploadPath, yearMonth);
-				String newFilename = "PLANNING_" + GagaDateUtil.getTodayDateTime() + "_" + imgInd + "." + StringUtils.getFilenameExtension(param.getMainMimg());
-				File uniqueFile = GagaFileUtil.getUniqueFile(new File(GagaFileUtil.getConcatenationPath(planUploadPath, newFilename)));
-				// Rename a file
-				File path = new File(planUploadPath);
-				if (!path.exists()) {
-					path.mkdir();
-				}
-				newFile.renameTo(uniqueFile);
 				param.setMainMimg("/planning/" + yearMonth + "/" + newFilename);
 			}
 			
 		}
+//		if(param.getMainMimg() != null && !"".equals(param.getMainMimg())){
+//			String imgInd = String.valueOf(ind);
+//			if (ind < 10) {
+//				imgInd = "0" + imgInd;
+//			}
+//			if(!param.getMainMimg().contains("planning")) {
+//				String planUploadPath = env.getProperty("upload.default.target.path");
+//				String yearMonth = GagaDateUtil.getToday().substring(0, 6);
+//				planUploadPath = GagaFileUtil.getConcatenationPath(planUploadPath, "/planning");
+//				File newFile = new File(GagaFileUtil.getConcatenationPath(planUploadPath, param.getMainMimg()));
+//				planUploadPath = GagaFileUtil.getConcatenationPath(planUploadPath, yearMonth);
+//				String newFilename = "PLANNING_" + GagaDateUtil.getTodayDateTime() + "_" + imgInd + "." + StringUtils.getFilenameExtension(param.getMainMimg());
+//				File uniqueFile = GagaFileUtil.getUniqueFile(new File(GagaFileUtil.getConcatenationPath(planUploadPath, newFilename)));
+//				// Rename a file
+//				File path = new File(planUploadPath);
+//				if (!path.exists()) {
+//					path.mkdir();
+//				}
+//				newFile.renameTo(uniqueFile);
+//				param.setMainMimg("/planning/" + yearMonth + "/" + newFilename);
+//			}
+//			
+//		}
 		// 이벤트 출석체크
 		planDao.deletePlanAttendBenefitList(param);
 		

src/main/java/com/style24/persistence/mybatis/shop/TsaFreegiftPromotion.xml

@@ -80,6 +80,7 @@
 			 , FG.FREEGIFT_STAT
 			 , (SELECT CD_NM FROM TB_COMMON_CODE WHERE CD = FG.FREEGIFT_STAT) AS FREEGIFT_STAT_NM
 			 , FG.SELF_YN
+		     , FG.ALL_YN
 			 , DATE_FORMAT(FG.FREEGIFT_STDT, '%Y-%m-%d %H:%i:%S') AS FREEGIFT_STDT
 			 , DATE_FORMAT(FG.FREEGIFT_EDDT, '%Y-%m-%d %H:%i:%S') AS FREEGIFT_EDDT
 			 , (SELECT USER_NM FROM TB_USER WHERE USER_NO = FG.REG_NO) AS REG_NM

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

@@ -73,9 +73,6 @@
 			, {headerName: "품번코드", field: "goodsNum", width: 150, cellClass: 'text-center'}
 			, {headerName: "사은품명", field: "goodsNm", width: 300, cellClass: 'text-center'}
 			, {headerName: "상태", field: "useYn", width: 50, cellClass: 'text-center'}
-			, {headerName: "잔여수량", field: "supplyStatNm", width: 150, cellClass: 'text-center'
-				,valueFormatter: function(params) { return '999'; }
-			}    <!-- 잔여 수량 해당 시점 기준 I/F 재고수량 표시 라고 되어있는데 맞는지 확인 필요함 -->
 		];
 
 		let gridOptionsFreeGoodsPopupList = gagaAgGrid.getGridOptions(columnFreeGoodsPopupDefList);

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

@@ -312,7 +312,7 @@
 											<td class="dcCdCheck2">
 												<input type="text" class="w200" name="onePubQty" id="onePubQty" value="1" required="required" data-valid-name="1회발행수량" data-valid-type="numeric" style="text-align: right;">개
 											</td>
-											<th class="downAblArea">다운로드가능여부<em class="required" title="필수"></em></th>
+											<th class="downAblArea">상픔상세노출여부<em class="required" title="필수"></em></th>
 											<td class="downAblArea">
 												<select name="downAblYn" id="downAblYn" required="required" data-valid-name="다운로드가능여부">
 													<option value="Y">Y</option>

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

@@ -521,6 +521,12 @@
 			$("#freeGoodsPromotionForm #regInfo").text(freegift.regNm + "(" + freegift.regDt + ")");
 			$("#freeGoodsPromotionForm #updInfo").text(freegift.updNm + "(" + freegift.updDt + ")");
 
+			if(freegift.allYn == "Y") {
+				$("#freeGoodsPromotionForm #allY").prop("checked", true);
+			} else {
+				$("#freeGoodsPromotionForm #allN").prop("checked", true);
+			}
+
 			// 자사 적용일 경우
 			if(freegift.selfYn == "Y") {
 				$("#freeGoodsPromotionForm input[name=selfYn]").prop("checked", true);