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

src/main/java/com/style24/admin/biz/dao/TsaDisplayDao.java

@@ -371,4 +371,12 @@ public interface TsaDisplayDao {
 	 * @since 2021. 3. 19
 	 */
 	void saveGnbTabPreview(GnbTab gnbTab);
+
+	/**
+	 * 메인전시 컨텐츠 미리보기 상품 리스트
+	 * @return
+	 * @author bin2107
+	 * @since 2021. 6. 9
+	 */
+	Collection<Goods> getContentsForGoodsList(Contents contents);
 }

src/main/java/com/style24/admin/biz/dao/TsaPlanDao.java

@@ -615,5 +615,13 @@ public interface TsaPlanDao {
 	 */
 	Collection<Plan> getPlanningCategoryList(Plan param);
 	
-
+	/**
+	 * 출석체크 쿠폰 유효검사
+	 *
+	 * @param plan
+	 * @return
+	 * @author sowon
+	 * @since 2021. 06. 09
+	 */
+	Collection<Plan> getPlanAttendCoupon(Plan param);
 }

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

@@ -523,7 +523,12 @@ public class TsaDisplayService {
 	 * @since 2021. 2. 23
 	 */
 	public Collection<Contents> getContentsPreviewList(Contents contents) {
-		return displayDao.getContentsPreviewList(contents);
+		Collection<Contents> previewList = displayDao.getContentsPreviewList(contents);
+		for(Contents tempGoods : previewList){
+			tempGoods.setContentsGoodsList(displayDao.getContentsForGoodsList(tempGoods));
+		}
+
+		return previewList;
 	}
 
 	/**

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

@@ -1815,5 +1815,17 @@ public class TsaPlanService {
 		return planDao.getPlanningCategoryList(param);
 	}
 	
+	/**
+	 * 출석체크 쿠폰 유효검사
+	 *
+	 * @param plan
+	 * @return
+	 * @author sowon
+	 * @since 2021. 06. 09
+	 */
+	public Collection<Plan> getPlanAttendCoupon(Plan param){
+		return planDao.getPlanAttendCoupon(param);
+	}
+	
 		
 }

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

@@ -2562,6 +2562,20 @@ public class TsaMarketingController extends TsaBaseController {
 		socialService.deleteSocialGoods(paramList);
 		return super.ok(message.getMessage("SUCC_0003"));
 	}
+	
+	/**
+	 * 출석체크 쿠폰 유효 확인
+	 *
+	 * @param plan 조회 정보
+	 * @return plan 목록
+	 * @author sowon
+	 * @since 2021. 6. 9
+	 */
+	@PostMapping("/planning/attend/coupon")
+	@ResponseBody
+	public Collection<Plan> getPlanAttendCoupon(@RequestBody Plan plan) {
+		return planService.getPlanAttendCoupon(plan);
+	}
 
 	/**
 	 * 상품권 대량 등록 화면

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

@@ -261,9 +261,21 @@ public class TsaOrderController extends TsaBaseController {
 	 */
 	@PostMapping("/seller/unorder/list")
 	@ResponseBody
-	public Collection<Order> getOrderSellerUnorderList(@RequestBody Order order) throws Exception {
+	public GagaMap getOrderSellerUnorderList(@RequestBody Order order) throws Exception {
+		GagaMap result = new GagaMap();
+
+		order.setPageable(new TscPageRequest(0, 10000));
+
+		// 주문전체건수 조회
+		int totalCount = orderService.getOrderSellerUnorderListCount(order);
+		order.getPageable().setTotalCount(totalCount);
+
 		Collection<Order> orderList = orderService.getOrderSellerUnorderList(order);
-		return orderList;
+
+		result.set("pageing"	, order);
+		result.set("orderList"	, orderList);
+
+		return result;
 	}
 
 	/**

src/main/java/com/style24/persistence/domain/Contents.java

@@ -4,6 +4,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import com.style24.persistence.TscBaseDomain;
 import lombok.Data;
 
+import java.util.Collection;
 import java.util.List;
 
 @SuppressWarnings("serial")
@@ -94,4 +95,6 @@ public class Contents extends TscBaseDomain {
     private String group3brandCd;
     private String group3brandNm;
     private String group3brandImg;
+
+    Collection<Goods> contentsGoodsList;	//상품목록
 }

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

@@ -1347,44 +1347,6 @@
 		     , A.BRAND_GROUP_NO
 		     , A.BRAND_GROUP_IMG
 		     , A.MD_TITLE
-		     ,(SELECT GROUP_CONCAT(B.GOODS_CD ORDER BY B.DISP_ORD SEPARATOR ',')
-		        FROM  TB_CONTENTS_GOODS B
-		       WHERE  1=1
-		       <if test="contentsLoc != 'SMM012'">
-		         AND  B.CATE_NO = A.CATE_NO
-		       </if>
-		         AND  B.CONTENTS_LOC = A.CONTENTS_LOC
-		         AND  B.CONTENTS_SQ = A.DISP_ORD
-		       <if test="contentsLoc != 'SMM012'">
-		         AND  B.CATE_NO = #{cateNo}
-		       </if>
-		         AND  B.CONTENTS_LOC = #{contentsLoc}) AS GOODS_CD_LIST
-		     ,(SELECT 	GROUP_CONCAT(B.GOODS_NM ORDER BY B.DISP_ORD SEPARATOR ',')
-		       FROM	TB_CONTENTS_GOODS B
-		       WHERE 1=1
-		       <if test="contentsLoc != 'SMM012'">
-		         AND B.CATE_NO = A.CATE_NO
-		       </if>
-		         AND B.CONTENTS_LOC = A.CONTENTS_LOC
-		         AND B.CONTENTS_SQ = A.DISP_ORD
-		       <if test="contentsLoc != 'SMM012'">
-		         AND  B.CATE_NO = #{cateNo}
-		       </if>
-		         AND B.CONTENTS_LOC = #{contentsLoc}) AS GOODS_NM_LIST
-		     ,(SELECT GROUP_CONCAT(GI.SYS_IMG_NM ORDER BY B.DISP_ORD SEPARATOR ',')
-		       FROM TB_CONTENTS_GOODS B
-		       JOIN TB_GOODS G ON B.GOODS_CD = G.GOODS_CD
-		       JOIN TB_GOODS_IMG GI ON G.GOODS_CD = GI.GOODS_CD AND G.MAIN_COLOR_CD = COLOR_CD AND GI.DEFAULT_IMG_YN = 'Y'
-		       WHERE 1=1
-		       <if test="contentsLoc != 'SMM012'">
-		         AND B.CATE_NO = A.CATE_NO
-		       </if>
-		        AND B.CONTENTS_LOC = A.CONTENTS_LOC
-		        AND B.CONTENTS_SQ = A.DISP_ORD
-		       <if test="contentsLoc != 'SMM012'">
-		        AND  B.CATE_NO = #{cateNo}
-		       </if>
-		        AND B.CONTENTS_LOC = #{contentsLoc}) AS GOODS_IMG_LIST
 		     , A.USE_YN
 		     , A.REG_NO
 		     , A.REG_DT
@@ -1901,6 +1863,7 @@
 				  AND	BRAND_GROUP_NO = #{brandGroupNo}
 			  </if>
 		  </if>
+		ORDER BY DISP_ORD
 		;
 	</select>
 
@@ -1964,4 +1927,20 @@
 			</if>
 		</if>
 	</insert>
+
+	<select id="getContentsForGoodsList" parameterType="Contents" resultType="Goods">
+		/* TsaDisplay.getContentsForGoodsList */
+		SELECT CG.GOODS_CD
+		     , G.GOODS_NM
+		     , GI.SYS_IMG_NM
+		FROM TB_CONTENTS_GOODS CG
+		JOIN TB_GOODS G ON CG.GOODS_CD = G.GOODS_CD
+		JOIN TB_GOODS_IMG GI ON G.GOODS_CD = GI.GOODS_CD AND G.MAIN_COLOR_CD = COLOR_CD AND GI.DEFAULT_IMG_YN = 'Y'
+		WHERE 1=1
+		<if test="contentsLoc != 'SMM012'">
+		AND CG.CATE_NO = #{cateNo}
+		</if>
+		AND CG.CONTENTS_LOC = #{contentsLoc}
+		AND CG.CONTENTS_SQ = #{dispOrd}
+	</select>
 </mapper>

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

@@ -1488,7 +1488,7 @@
 	
 	<!-- 기획전 카테고리 목록 -->
 	<select id="getPlanningCategoryList" parameterType="Plan" resultType="Plan">
-		/* TssPlan.getPlanningCategoryList */
+		/* TsaPlan.getPlanningCategoryList */
 		SELECT C.CATE1_NO AS CATE_NO            /*카테고리번호*/
 		     , C.CATE1_NM AS CATE_NM /*카테고리명*/
 		FROM TB_CATE1 C
@@ -1497,6 +1497,19 @@
 		AND    C.CATE_TYPE = 'G031_10' /*상품카테고리*/
 		AND    C.DISP_YN = 'Y' /*전시하는 카테고리*/
 	</select>
+	
+	<select id="getPlanAttendCoupon" parameterType="Plan" resultType="Plan">
+		/* TsaPlan.getPlanAttendCoupon */
+		SELECT C.CPN_ID 
+		      ,C.CPN_NM 
+		      ,C.CPN_STAT 
+		FROM TB_COUPON C
+		WHERE 1=1
+		AND C.CPN_ID = #{cpnId}
+		AND C.CPN_TYPE IN ('G230_11' ,'G230_12','G230_13','G230_30')
+		AND C.CPN_STAT = 'G232_11'
+		AND NOW() <![CDATA[<=]]> IF (C.PD_GB = 'D', CONCAT(CURRENT_DATE + INTERVAL C.AVAIL_DAYS DAY, ' 23:59:59'), C.AVAIL_EDDT)
+	</select>
 </mapper>
 
 

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

@@ -205,9 +205,12 @@
 		<if test='frontGb == "P"'> <!-- PC웹 -->
 		    AND A.FRONT_GB IN ('A','P')
 		</if>
-		<if test='frontGb == "A" or frontGb == "M"'> <!-- 모바일 -->
+		<if test='frontGb == "M"'> <!-- 모바일 -->
 		    AND A.FRONT_GB IN ('A','M')
 		</if> 
+		<if test='frontGb == "A"'> <!-- 전체 -->
+		    AND A.FRONT_GB IN ('A','M','P')
+		</if> 
 		AND A.APPLY_GB IN ('A', #{applyGb})
 		<if test="socialSq != null and socialSq != ''">
 		AND A.SOCIAL_SQ != #{socialSq}

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

@@ -15,7 +15,7 @@
  * 1.0  2021.2.23    bin2107     최초 작성
  *******************************************************************************
  -->
-<div class="modalPopup" data-width="1500" >
+<div class="modalPopup" data-width="1500" th:with="imgGoodsUrl=${@environment.getProperty('upload.goods.view')}, uxImgUrl=${@environment.getProperty('domain.uximage')}, imgUrl=${@environment.getProperty('upload.image.view')}">
 	<div class="panelStyle">
 		<div class="panelTitle">
 			<h2 id="popTitle" th:text="${contentsLoc}"></h2>
@@ -159,11 +159,11 @@
 				html += '</tr>';
 				if(result[i].strVar1=='M'){
 					html += '<tr class="cateTypeTr" name="tvM'+i+'">';
-					html +='	<th>파일첨부<em className="required" title="필수"></em></th>';
-					html +='	<td className="infoTxt" colSpan="5">';
-					html +='		<div className="uFile w300">';
-					html +='			<input id="file'+i+'" name="file" type="file" className="uFileInput w300" onchange="fnVideoFileUpload(this, '+i+')"/>';
-					html +='			<label htmlFor="file'+i+'" className="uFileLabel">파일선택</label>';
+					html +='	<th>파일첨부<em class="required" title="필수"></em></th>';
+					html +='	<td class="infoTxt" colSpan="5">';
+					html +='		<div class="uFile w300">';
+					html +='			<input id="file'+i+'" name="file" type="file" class="uFileInput w300" onchange="fnVideoFileUpload(this, '+i+')"/>';
+					html +='			<label htmlFor="file'+i+'" class="uFileLabel">파일선택</label>';
 					html +='			<input type="hidden" name="kufKey" value="'+result[i].strVar3+'"/>';
 					html +='			<input type="hidden" name="kmcKey"/>';
 					html +='		</div>';
@@ -252,7 +252,7 @@
 				html += '			<input type="hidden" name="newImgFile" value="" />';
 				html += '		</div>';
 				html += '	<div id="imgViewPop_1" class=';
-				if(src!=''){
+				if(src!='' && result[i].imgPath2 != ''){
 					html += '"on">';
 				}else{
 					html += '"off">';
@@ -403,8 +403,14 @@
 						html += fnAddTitlePopRow(strTitle);
 					}
 					if(contentsLoc!='SGNB001' && contentsLoc!='SGNB002'){
-						if(imgPath!=null && imgPath!='null' && imgPath!='' ){
-							html += fnAddImgPopRow(imgPath, j);
+						if(contentsLoc=='SMM001' || contentsLoc=='SBM004' || contentsLoc=='SOM001'){
+							if(j<3){
+								html += fnAddImgPopRow(imgPath, j);
+							}
+						}else{
+							if(imgPath!=null && imgPath!='null' && imgPath!='' ){
+								html += fnAddImgPopRow(imgPath, j);
+							}
 						}
 					}
 					if(strVar!=null && strVar!='null' && strVar!='' ){
@@ -449,20 +455,12 @@
 			let idx = $(this).find('[name=tableIdx]').val();
 			let bannerCateType = $("#mcTable"+idx).find('input:radio[name=cateType'+idx+']:checked').val();
 
-			if(bannerCateType=='OPEN'){
+			// if(bannerCateType=='OPEN'){
 				let htmlDesc = $("#mcTable"+idx).find('input[name=htmlDesc'+idx+']').val();
 				var snOptions1 = gagaSn.getToolbarOptions('media');
 				gagaSn.createSummernote(snOptions1, '#openBannerDesc'+idx);
 				// gagaSn.setContents('#openBannerDesc'+idx, '');
 				$('#openBannerDesc'+idx).summernote('code', htmlDesc);
-			}
-			// if(bannerCateType=='OPEN'){
-			// 	let bannerType = $("#mcTable"+idx).find('input:radio[name=openBannerType'+idx+']:checked').val();
-			// 	if(bannerType=='HTML'){
-			// 		let htmlDesc = $("#mcTable"+idx).find('input[name=htmlDesc'+idx+']').val();
-			// 		gagaSn.setContents('#openBannerDesc'+idx, '');
-			// 		$('#openBannerDesc'+idx).summernote('code', htmlDesc);
-			// 	}
 			// }
 		});
 	}
@@ -612,7 +610,7 @@
 				html += ' id="addImg'+dataIdx+'" onclick="fnAddImgPopRow(this);">이미지추가</button>';
 			}
 			if(contentsLoc=='SMM001' || contentsLoc=='SOM001' || contentsLoc=='SBM004'){
-				html += '<button type="button" style="display: none;" class="btn btn-base btn-lg" id="addMobImg'+dataIdx+'" onclick="fnAddMobImgPopRow(this);">모바일이미지추가</button>';
+				html += '<button type="button" style="display: none;" class="btn btn-base btn-lg" id="addMobImg'+dataIdx+'" onclick="fnAddMobImgPopRow(this, '+dataIdx+');">모바일이미지추가</button>';
 			}
 			html += '<button type="button" class="btn btn-base btn-lg"';
 			if(contentsLoc=='SMM001' || contentsLoc=='SOM001' || contentsLoc=='SBM004' || contentsLoc=='SCM001'){
@@ -809,7 +807,7 @@
 		if(contentsLoc=='SGNB001'){
 			gagaSn.setContents('#openBannerDesc'+dataIdx, '');
 		}
-
+		fnResetDispOrd();
 		tableLen = tableLen+1;
 	});
 
@@ -858,8 +856,8 @@
 		$("#mcTable"+tableDataId).find("tr[name=subTextPopRow]").find("input[name=subText]").val(result[0].dtlTitle1);
 		$("#mcTable"+tableDataId).find("tr[name=linkPopRow]").find("input[name=link]").val('/planning/detail/form?planSq='+result[0].planSq);
 		$("#mcTable"+tableDataId).find("tr[id=mobImgPop]").find("input[name=imgPath]").val(result[0].mainPimg);
-		$("#mcTable"+tableDataId).find('.mobImg').find("#bannerPreViewUrlPop_0").attr('src',$("#uploadDefaultUrlPop").val().replace('/contents/', '')+result[0].mainPimg);
-		$("#mcTable"+tableDataId).find('.mobImg').find("#imgViewPop_0").removeClass("off").addClass("on");
+		$("#mcTable"+tableDataId).find('.mobImg').find("#bannerPreViewUrlPop_"+tableDataId).attr('src', $("#uploadDefaultUrlPop").val().replace('/contents/', '')+result[0].mainPimg);
+		$("#mcTable"+tableDataId).find('.mobImg').find("#imgViewPop_"+tableDataId).removeClass("off").addClass("on");
 
 		let stdt = result[0].dispStdt.split(" ");
 		let eddt = result[0].dispEddt.split(" ");
@@ -882,6 +880,7 @@
 
 	// SMM001 데이터 validation 체크
 	function smm001DataValidation(){
+		var dataBool = true;
 		$(".mcTable").each(function(i){
 			var thisIdx = $(this).find("input[name=tableIdx]").val();
 			var contentsTypeVal = $(this).find("input:radio[name=contentsType"+thisIdx+"]:checked").val();
@@ -889,21 +888,71 @@
 
 			if(gagajf.isNull(contentsTypeVal)){
 				mcxDialog.alert('컨텐츠 유형을 선택해주세요.');
-				return false;
+				dataBool = false;
 			}
 			if(contentsTypeVal=='P'){
 				if(gagajf.isNull($(this).find("input[name=planSq"+thisIdx+"]").val())){
 					mcxDialog.alert('기획전 번호를 입력해주세요.');
-					return false;
+					$(this).find("input[name=planSq"+thisIdx+"]").focus();
+					dataBool = false;
 				}
 			}
 			if(gagajf.isNull(textColorVal)){
 				mcxDialog.alert('썸네일 글자 색상을 선택해주세요.');
-				return false;
+				dataBool = false;
 			}
 		});
+		if(!dataBool){
+			return false;
+		}else{
+			return true;
+		}
+	}
 
-		return true;
+	// 전시 일시 체크
+	function dateValidation(){
+		var dateBool = true;
+		$(".mcTable").each(function(i){
+			var thisIdx = $(this).find("input[name=tableIdx]").val();
+			var dispStdt = $(this).find("[name=dispStdt]").val().replace(/[^0-9]/g, '') + "" +$(this).find("[name=stTimeHour]").val().replace('시', '') + "" +$(this).find("[name=stTimeMin]").val().replace('분', '') + "00";
+			var dispEddt = $(this).find("[name=dispEddt]").val().replace(/[^0-9]/g, '') + "" +$(this).find("[name=edTimeHour]").val().replace('시', '') + "" +$(this).find("[name=edTimeMin]").val().replace('분', '') + "59";
+
+			let fromDate = dispStdt.replace(/[^0-9]/g, '');
+			let toDate = dispEddt.replace(/[^0-9]/g, '');
+			if(fromDate > toDate){
+				mcxDialog.alert((i+1) +"번째 " +"시작일자는 종료일자 보다 클 수 없습니다.");
+				$(this).find('input[name=dispStdt]').focus();
+				dateBool = false;
+			}
+		});
+		if(!dateBool){
+			return false;
+		}else{
+			return true;
+		}
+	}
+
+	// 동영상 확장자 체크
+	function videoValidation(){
+		var dataBool = true;
+		$(".mcTable").each(function(i){
+			var thisIdx = $(this).find("input[name=tableIdx]").val();
+			if($(this).find("input:radio[name=tvPlayer"+thisIdx+"]:checked").val()=='M'){
+				var fileName = $(this).find("input:file[name=file]").val();
+				var ext =  fileName.split('.').pop().toLowerCase();
+				if(ext!='mp4'&&ext!='MP4'){
+					mcxDialog.alert((i+1) +'번째 ' +ext+'파일은 업로드 하실 수 없습니다.');
+					$(this).find("input:radio[name=tvPlayer"+thisIdx+"]").focus();
+					dataBool = false;
+				}
+			}
+		});
+
+		if(!dataBool){
+			return false;
+		}else{
+			return true;
+		}
 	}
 
 	/**
@@ -915,6 +964,17 @@
 			return;
 		}
 
+		// 전시일시 체크
+		if(!dateValidation()){
+			return false;
+		}
+
+		if(contentsLoc=='SMM011' || contentsLoc=='SBM012'){
+			if(!videoValidation()){
+				return false;
+			}
+		}
+
 		if(contentsLoc=='SMM001' || contentsLoc=='SOM001'){
 			if(!smm001DataValidation()){
 				return false;
@@ -1164,7 +1224,7 @@
 		var html = '<tr name="linkPopRow">';
 		html += '<th>링크 (없으면 #)</th>';
 		html += '<td><input name="link" type="text" maxlength="200" required="required" data-valid-name="링크" value="'+val+'"/></td>';
-		if(contentsLoc!='SMM001' && contentsLoc!='SOM001' && contentsLoc!='SCM001'){
+		if(contentsLoc!='SMM001' && contentsLoc!='SOM001' && contentsLoc!='SCM001' && contentsLoc!='SBM004'){
 			html += '<td class="aL"><button type="button" class="btn icn" onclick="fnDeleteTrRow(this);"><i class="fa fa-times" aria-hidden="true"></i></button></td>';
 		}
 		html += '</tr>';
@@ -1195,7 +1255,7 @@
 		var html = '<tr name="subTextPopRow">'
 		html += '<th>서브텍스트</th>';
 		html += '<td><input type="text" name="subText" maxlength="200" value="'+val+'"/></td>';
-		if(contentsLoc!='SMM001' && contentsLoc!='SOM001' && contentsLoc!='SCM001'){
+		if(contentsLoc!='SMM001' && contentsLoc!='SOM001' && contentsLoc!='SCM001' && contentsLoc!='SBM004'){
 			html += '<td class="aL"><button type="button" class="btn icn" onclick="fnDeleteTrRow(this);"><i class="fa fa-times" aria-hidden="true"></i></button></td>';
 		}
 		html += '</tr>';
@@ -1215,7 +1275,6 @@
 	 */
 	var brandDescIndex = 0;
 	var fnAddBrandDescRow = function (param){
-		console.log('here');
 		var val = typeof param=='object'?'':param;
 		var html = '<tr name="subTextPopRow">'
 		html += '<th>브랜드소개';
@@ -1265,14 +1324,14 @@
 		html += '<input type="hidden" name="newImgFile" value="" />';
 		html += '</div>';
 		html += '<div id="imgViewPop_'+imgIndex+'" class=';
-		if(src!=''){
+		if(src!='' && imgPath !=''){
 			html += '"on">';
 		}else{
 			html += '"off">';
 		}
 		html += '<img id="bannerPreViewUrlPop_'+imgIndex+'" src="'+src+'" style="height:100px; max-width:500px;"  onclick="cfnOpenImagePreViewPopup(\'bannerPreimgViewPop\',$(this).attr(\'src\'));"/>';
 		html += '</div></td>';
-		if(contentsLoc!='SMM001' && contentsLoc!='SOM001' && contentsLoc!='SCM001'){
+		if(contentsLoc!='SMM001' && contentsLoc!='SOM001' && contentsLoc!='SCM001' && contentsLoc!='SBM004'){
 			html += '<td class="aL"><button type="button" class="btn icn" onclick="fnDeleteTrRow(this);"><i class="fa fa-times" aria-hidden="true"></i></button></td>';
 		}
 		html += '</tr>';
@@ -1290,6 +1349,7 @@
 			}
 			imgIndex++;
 			$(param).closest("table").find("tbody").append(html);
+			return html;
 		}else{
 			imgIndex++;
 			return html;
@@ -1299,8 +1359,9 @@
 	/**
 	 * 모바일용 이미지 추가
 	 */
-	var imgMobIndex = 5000;
-	var fnAddMobImgPopRow = function (param){
+	var imgMobIndex = 0;
+	var fnAddMobImgPopRow = function (param , idx){
+		imgMobIndex = idx;
 		var src = '';
 		var imgPath = '';
 		if(typeof param!='object'){
@@ -1324,7 +1385,7 @@
 		}
 		html += '<img id="bannerPreViewUrlPop_'+imgMobIndex+'" src="'+src+'" style="height:100px; max-width:500px;"  onclick="cfnOpenImagePreViewPopup(\'bannerPreimgViewPop\',$(this).attr(\'src\'));"/>';
 		html += '</div></td>';
-		if(contentsLoc!='SMM001' && contentsLoc!='SOM001' && contentsLoc!='SCM001'){
+		if(contentsLoc!='SMM001' && contentsLoc!='SOM001' && contentsLoc!='SCM001' && contentsLoc!='SBM004'){
 			html += '<td class="aL"><button type="button" class="btn icn" onclick="fnDeleteTrRow(this);"><i class="fa fa-times" aria-hidden="true"></i></button></td>';
 		}
 		html += '</tr>';
@@ -1356,7 +1417,7 @@
 		var html = '<tr name="titlePopRow">';
 		html += '<th>타이틀</th>';
 		html += '<td><input name="title" type="text" maxlength="200" data-valid-name="타이틀" value="'+val+'"/></td>';
-		if(contentsLoc!='SMM001' && contentsLoc!='SOM001' && contentsLoc!='SCM001'){
+		if(contentsLoc!='SMM001' && contentsLoc!='SOM001' && contentsLoc!='SCM001' && contentsLoc!='SBM004'){
 			html += '<td class="aL"><button type="button" class="btn icn" onclick="fnDeleteTrRow(this);"><i class="fa fa-times" aria-hidden="true"></i></button></td>';
 		}
 		html += '</tr>';
@@ -1373,7 +1434,14 @@
 
 	// 컨텐츠 행삭제
 	var fnDeleteContentsRow = function (obj){
-		$(obj).closest("table").remove();
+		mcxDialog.confirm('삭제시 전시순서가 초기화됩니다. 삭제하시겠습니까?', {
+			cancelBtnText: "취소",
+			sureBtnText: "확인",
+			sureBtnClick: function(){
+				$(obj).closest("table").remove();
+				fnResetDispOrd();
+			}
+		});
 	}
 
 	// 행삭제
@@ -1428,8 +1496,7 @@
 
 	let fnBrandDesc = function (){
 		$(".mcTable").each(function (idx){
-			console.log(idx);
-			// cfnGetTextLength($(this).find('textarea[name=subText]'), 4000, $('#brandDescContent'+idx));
+			cfnGetTextLength($(this).find('textarea[name=subText]'), 4000, $('#brandDescContent'+idx));
 		});
 	}
 

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

@@ -192,7 +192,7 @@
 			$("#brandListTd2").sortable();
 			$("#brandListTd3").sortable();
 		}
-
+		fnResetDispOrd();
 		tableIdx = tableIdx+1;
 	}
 
@@ -266,7 +266,36 @@
 
 	// 컨텐츠 행삭제
 	var fnDeleteContentsRow = function (obj){
-		$(obj).closest("table").remove();
+		mcxDialog.confirm('삭제시 전시순서가 초기화됩니다. 삭제하시겠습니까?', {
+			cancelBtnText: "취소",
+			sureBtnText: "확인",
+			sureBtnClick: function(){
+				$(obj).closest("table").remove();
+				fnResetDispOrd();
+			}
+		});
+	}
+
+	// 전시 일시 체크
+	function dateValidation(){
+		var dateBool = true;
+		$(".tabTable").each(function(i){
+			var dispStdt = $(this).find("[name=dispStdt]").val().replace(/[^0-9]/g, '') + "" +$(this).find("[name=stTimeHour]").val().replace('시', '') + "" +$(this).find("[name=stTimeMin]").val().replace('분', '') + "00";
+			var dispEddt = $(this).find("[name=dispEddt]").val().replace(/[^0-9]/g, '') + "" +$(this).find("[name=edTimeHour]").val().replace('시', '') + "" +$(this).find("[name=edTimeMin]").val().replace('분', '') + "59";
+
+			let fromDate = dispStdt.replace(/[^0-9]/g, '');
+			let toDate = dispEddt.replace(/[^0-9]/g, '');
+			if(fromDate > toDate){
+				mcxDialog.alert("시작일자는 종료일자 보다 클 수 없습니다.");
+				$(this).find('input[name=dispStdt]').focus();
+				dateBool = false;
+			}
+		});
+		if(!dateBool){
+			return false;
+		}else{
+			return true;
+		}
 	}
 
 	/**
@@ -278,6 +307,11 @@
 			return;
 		}
 
+		// 전시일시 체크
+		if(!dateValidation()){
+			return false;
+		}
+
 		dataArr = [];
 		$("#gnbTabList .tabTable").each(function (){
 			var newImgFileArr = [];

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

@@ -640,7 +640,8 @@
 			}
 		});
 		if(!contentLocCheck){
-			mcxDialog.alert('위치코드가 중복 되었습니다.');
+			// mcxDialog.alert('위치코드가 중복 되었습니다.');
+			mcxDialog.alert('이미 레이아웃 설정된 컨텐츠입니다.');
 			return;
 		}
 

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

@@ -106,7 +106,7 @@ console.log('brandGroupNo:'+brandGroupNo);
 				html += '<button type="button" class="btn btn-base btn-lg" onclick="fnAddTitlePopRow(this);">타이틀추가</button>';
 				html += '<button type="button" class="btn btn-base btn-lg" onclick="fnAddSubTextPopRow(this);">서브텍스트추가</button>';
 			}
-			html += '<button type="button" class="btn btn-base btn-lg" onclick="fnAddGoodsRow(this,this,this);">상품추가</button>';
+			html += '<button type="button" class="btn btn-base btn-lg" onclick="fnAddGoodsRow(this);">상품추가</button>';
 			html += '<button type="button" class="btn btn-danger btn-lg" onclick="fnDeleteBrandRow(this);">삭제</button></td>';
 			html += '</tr>';
 			if(contentsLoc=='SMM009' || contentsLoc=='SMM012'){
@@ -174,8 +174,9 @@ console.log('brandGroupNo:'+brandGroupNo);
 					}
 				}
 			}
-			if(!gagajf.isNull(result[i].goodsCdList)){
-				html += fnAddGoodsRow(result[i].goodsCdList,result[i].goodsNmList,result[i].goodsImgList);
+			if(!gagajf.isNull(result[i].contentsGoodsList)){
+				console.log(fnAddGoodsRow(result[i].contentsGoodsList));
+				html += fnAddGoodsRow(result[i].contentsGoodsList);
 			}
 			html += '</tbody></table>';
 		}
@@ -268,7 +269,7 @@ console.log('brandGroupNo:'+brandGroupNo);
 			html += '<button type="button" class="btn btn-base btn-lg" onclick="fnAddTitlePopRow(this);">타이틀추가</button>';
 			html += '<button type="button" class="btn btn-base btn-lg" onclick="fnAddSubTextPopRow(this);">서브텍스트추가</button>';
 		}
-		html += '<button type="button" class="btn btn-base btn-lg" onclick="fnAddGoodsRow(this,this,this);">상품추가</button>';
+		html += '<button type="button" class="btn btn-base btn-lg" onclick="fnAddGoodsRow(this);">상품추가</button>';
 		html += '<button type="button" class="btn btn-danger btn-lg" onclick="fnDeleteBrandRow(this);">삭제</button></td>';
 		html += '</tr>';
 		if(contentsLoc=='SMM009' || contentsLoc=='SMM012'){
@@ -495,8 +496,14 @@ console.log('brandGroupNo:'+brandGroupNo);
 
 	// 컨텐츠 행삭제
 	var fnDeleteBrandRow = function (obj){
-		$(obj).closest("table").remove();
-		fnReloadIdx();
+		mcxDialog.confirm('삭제시 전시순서가 초기화됩니다. 삭제하시겠습니까?', {
+			cancelBtnText: "취소",
+			sureBtnText: "확인",
+			sureBtnClick: function(){
+				$(obj).closest("table").remove();
+				fnReloadIdx();
+			}
+		});
 	}
 
 	// 행삭제
@@ -537,6 +544,28 @@ console.log('brandGroupNo:'+brandGroupNo);
 		uifnPopupClose('popupMainMultiContents');
 	}
 
+	// 전시 일시 체크
+	function dateValidation(){
+		var dateBool = true;
+		$(".tableTest").each(function(i){
+			var dispStdt = $(this).find("[name=dispStdt]").val().replace(/[^0-9]/g, '') + "" +$(this).find("[name=stTimeHour]").val().replace('시', '') + "" +$(this).find("[name=stTimeMin]").val().replace('분', '') + "00";
+			var dispEddt = $(this).find("[name=dispEddt]").val().replace(/[^0-9]/g, '') + "" +$(this).find("[name=edTimeHour]").val().replace('시', '') + "" +$(this).find("[name=edTimeMin]").val().replace('분', '') + "59";
+
+			let fromDate = dispStdt.replace(/[^0-9]/g, '');
+			let toDate = dispEddt.replace(/[^0-9]/g, '');
+			if(fromDate > toDate){
+				mcxDialog.alert("시작일자는 종료일자 보다 클 수 없습니다.");
+				$(this).find('input[name=dispStdt]').focus();
+				dateBool = false;
+			}
+		});
+		if(!dateBool){
+			return false;
+		}else{
+			return true;
+		}
+	}
+
 	/**
 	 * 임시저장
 	 */
@@ -546,6 +575,11 @@ console.log('brandGroupNo:'+brandGroupNo);
 			return;
 		}
 
+		// 전시일시 체크
+		if(!dateValidation()){
+			return false;
+		}
+
 		dataArr = [];
 		$("#multiPopSortable .tableTest").each(function(){	//$("#multiPopSortable table").each(function(){
 			var newImgFileArr = [];
@@ -745,60 +779,39 @@ console.log('brandGroupNo:'+brandGroupNo);
 	 * 상품추가
 	 */
 	var goodsIdx = 0;
-	var fnAddGoodsRow = function (param, param2, param3){
+	var fnAddGoodsRow = function (param){
 		var addRow = "goodsListTd"+goodsIdx;
-		//console.log('addRow::'+addRow);
 
 		var html = '<tr name="goodsRow">';
 		html += '<th>상품추가<br><button type="button" class="btn btn-base btn-lg" onclick="fnSearchGoods(\''+addRow+'\');">상품조회</button>';
 		html += '<br></br><button type="button" class="btn btn-danger btn-lg" onclick="fnDeleteTrRow(this);">삭제</button>';
 		html += '</th>';
 		html += '<td colspan="3">';
-		//html += '<table style="border-style: solid;border-color: #ac2925; width:100%; height:20px;">';
-		//html += '<colgroup>';
-		//html += '<col style="width:90%;"/>';
-		//html += '<col style="width:10%;"/>';
-		//html += '<col/>';
-		//html += '</colgroup>';
-		//html += '<thead>';
 		html += '<div class="sortableWrap" data-unit="7" style="overflow-y:scroll;">';
 		html += '<div class="itemWrap" id="goodsListTd'+goodsIdx+'">';
 		if(typeof param!='object'){
-			var goodsCdList = [];
-			var goodsNmList = [];
-			var goodsImgList = [];
-			goodsCdList = param;
-			goodsNmList = param2;
-			goodsImgList = param3;
-			// 여기서 부터 시작! 상품불러오는거 똑같이 html 추가해서 체크
-			// +) 저장할때 TB_CONTENTS_GOODS 에 상품코드, 상품명, 상품이미지경로 추가해서 3개다 불러와서 데이터 뿌릴수 있게
-			$.each(goodsCdList.split(','),function (i){
+			var imgPath = _goodsUrl;
+			for(let i=0; i<param.length; i++){
 				html += '<ul id="goodsUl'+i+'" class="item ui-state-default goodsClass" style="min-height:140px;"> ';
-				goodsImg = goodsImgList.split(',')[i];
-				goodsCd = goodsCdList.split(',')[i];
-				goodsNm = goodsNmList.split(',')[i];
 				html += '<li class="img">';
-				var imgPath = _goodsUrl;
-				html += '<img src="'+imgPath+ "/" +goodsImg+'" onerror="this.src=\'/image/no.png\';"/>';
+				html += '<img src="'+imgPath+ "/" +param[i].sysImgNm+'" onerror="this.src=\'/image/no.png\';"/>';
 				html += '</li>';
 				html += '<li class="cont">';
 				html += '<ul>';
-				html += '<li class="no" name="goodsCdLi"><span>'+goodsCd+'</span>';
-				html += '<input type="hidden" name="goodsImgPath" value="'+goodsImg+'">';
-				html += '<input type="hidden" name="goodsCd" value="'+goodsCd+'">';
-				html += '<input type="hidden" name="goodsNm" value="'+goodsNm+'">';
+				html += '<li class="no" name="goodsCdLi"><span>'+param[i].goodsCd+'</span>';
+				html += '<input type="hidden" name="goodsImgPath" value="'+param[i].sysImgNm+'">';
+				html += '<input type="hidden" name="goodsCd" value="'+param[i].goodsCd+'">';
+				html += '<input type="hidden" name="goodsNm" value="'+param[i].goodsNm+'">';
 				html += '<span style="margin-left:5px;"><a href="javascript:void(0);" id="delId" onclick="fnRemoveGoods(this,'+i+');">X</a></span>';
 				html += '</li>';
 				html += '</li>';
-				html += '<li class="title">'+goodsNm+'</li>';
+				html += '<li class="title">'+param[i].goodsNm+'</li>';
 				html += '</ul>';
 				html += '</ul>';
-			});
+			}
 		}
 		html += '</div>';
 		html += '</div>';
-		//html += '</thead>';
-		//html += '</table>';
 		html += '</td>';
 		html += '</tr>';
 		if(typeof param == 'object'){
@@ -808,7 +821,7 @@ console.log('brandGroupNo:'+brandGroupNo);
 			}
 			goodsIdx++;
 			$(param).closest("table").find("tbody").append(html);
-
+			return html;
 		}else{
 			goodsIdx++;
 			return html;

src/main/webapp/WEB-INF/views/envset/BasicEnvsetForm.html

@@ -185,7 +185,9 @@
 					<tr>
 						<th>장바구니보관기간(일)</th>
 						<td>
-							장바구니 보관기간은 <input name="g11StrSetVal1" type="text" class="w50 aR" maxlength="3" data-valid-type="integer" data-valid-name="장바구니보관기간"/><span class="cRed">일</span> 입니다. 보관기간 경과 시 자동 삭제됩니다.
+							<!-- 2021-06-08 장바구니 보관 기간 30일 고정 > 지하 1층 회의실B 에서 한수인리더 확인.
+							     장바구니 20일 경과 상품 구매 알림톡 보내기 위해 수정되지 않도록 변경 -xodud1202 -->
+							장바구니 보관기간은 <input name="g11StrSetVal1" type="text" class="w50 aR" maxlength="3" data-valid-type="integer" readonly disabled data-valid-name="장바구니보관기간"/><span class="cRed">일</span> 입니다. 보관기간 경과 시 자동 삭제됩니다. (보관기간 30일 고정)
 							<span class="infoTxt cBlue"><i class="fa fa-info-circle marL20" aria-hidden="true"></i>0으로 설정하면 자동으로 삭제 처리를 하지 않습니다.</span>
 						</td>
 					</tr>

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

@@ -484,7 +484,7 @@
 					<tr>
 						<th>기획전명<em class="required" title="필수"></em></th>
 						<td>
-							<input type="text" name="planNm" id="planNm" maxlength="50" required="required" data-valid-name="기획전명"/>
+							<input type="text" name="planNm" id="planNm" maxlength="50" required="required" />
 						</td>
 						<th>서브제목</th>
 						<td>
@@ -987,7 +987,6 @@
 		$("#append3").css('display','none');
 	} */
 	
-	
 
 	// 기획전 복사
 	var fnPlanCopyPopup = function() {
@@ -1021,9 +1020,97 @@
 	}
 
 	 var fnPlanSave = function(formId) {
-		/* if (!gagajf.validation(formId))
-			return;  */
+		var attendData = gagaAgGrid.getAllRowData(gridOptionsAttendList);
+		if ($('#planRegisterForm select[name=planGb]').val() == "C" || $('#planUpdateForm select[name=planGb]').val() == "C" ) {
+			var arr = []; 
+			$.each(attendData, function(idx, item) {
+				arr[idx] = item.basDays;
+			});
+			
+			for(let i = 0; i < attendData.length; i++) {
 
+				if (attendData[i].benefitGb == 'A') {
+					if (attendData[i].basDays == "") {
+						mcxDialog.alert('혜택(포인트/혜택) 적용 일수를 입력하세요.');
+						return false;
+					}
+					else if (attendData[i].cpnId == "") {
+						mcxDialog.alert('혜택(포인트/혜택) 적용 쿠폰ID를 입력하세요.');
+						return false;
+					}
+					else if (attendData[i].pntAmt == "") {
+						mcxDialog.alert('혜택(포인트/혜택) 적용 포인트를 입력하세요.');
+						return false;
+					}else if (attendData[i].pntUsableDay == "") {
+						mcxDialog.alert('혜택(포인트/혜택) 유효기간 일수를 입력하세요.');
+						return false;
+					}
+				}
+				if (attendData[i].benefitGb == 'P') {
+					if (attendData[i].basDays == "") {
+						mcxDialog.alert('혜택(포인트) 적용 일수를 입력하세요.');
+						return false;
+					}
+					else if (attendData[i].pntAmt == "") {
+						mcxDialog.alert('혜택(포인트) 적용 포인트를 입력하세요.');
+						return false;
+					}else if (attendData[i].pntUsableDay == "") {
+						mcxDialog.alert('혜택(포인트) 유효기간 일수를 입력하세요.');
+						return false;
+					}
+				}
+				if (attendData[i].benefitGb == 'C') {
+					if (attendData[i].basDays == "") {
+						mcxDialog.alert('혜택(쿠폰) 적용 일수를 입력하세요.');
+						return false;
+					}
+					else if (attendData[i].cpnId == "") {
+						mcxDialog.alert('혜택(쿠폰) 적용 쿠폰ID를 입력하세요.');
+						return false;
+					}
+				}
+				
+				if (attendData[i].benefitGb == 'A' || attendData[i].benefitGb == 'C') {
+					data = {cpnId : attendData[i].cpnId};
+					var jsonData = JSON.stringify(data);
+					gagajf.ajaxJsonSubmit('marketing/planning/attend/coupon', jsonData, function(result) {
+						if (result.length < 1) {
+							mcxDialog.alert('입력하신 쿠폰 아이디 ' + attendData[i].cpnId.addComma() + '은 유효하지 않습니다.');
+							flag = false;
+							return;
+						}
+					});
+					
+					if (flag == false) {
+						return;
+					}
+				}
+			};
+		}
+			
+		var dupYn = false;
+		for(let i = 0; i < arr.length; i++) {
+		  const currElem = arr[i];
+		  for(let j = i+1; j < arr.length; j++) {
+		    if(currElem === arr[j]) {
+		      dupYn = true;
+		      break;
+		    }
+		  }
+		}
+		
+		if (dupYn == true) {
+			mcxDialog.alert('혜택적용 일수가 동일합니다.');
+			return;
+		}
+	 
+	 	gagajf.ajaxFormSubmit('/marketing/poll/list', formId, function(result) {
+				if (result.length < 1) {
+					mcxDialog.alert('입력하신 투표 일련번호가 존재 하지않습니다.');
+					return false;
+				}
+		});
+		
 		// 날짜 유효성 체크
 		var stDate = $(formId + ' input[name=startSearchDate]').val().replaceAll("-", "");
 		var edDate = $(formId + ' input[name=endSearchDate]').val().replaceAll("-", "");
@@ -1122,19 +1209,12 @@
 			multiBrand.push(item.brandGroupNo);
 		});
 		
-		//let allCateData = gagaAgGrid.getAllRowData(gridOptionsFGCateList);
-		/* var multiCate = [];
-		$.each(allCateData, function(idx, item) {
-			multiCate.push(item.cateNo);
-		}); */
-		
 		let allChannelData = gagaAgGrid.getAllRowData(gridOptionsAfList);
 		var multiChannel = [];
 		$.each(allChannelData, function(idx, item) {
 			multiChannel.push(item.afLinkCd);
 		});
-		
-		let attendData = gagaAgGrid.getAllRowData(gridOptionsAttendList);
+
 		
 		// poll 관리일련번호 유효성 체크
 		if (!gagajf.isNull($(formId + ' input[name=pollSq]').val())) {
@@ -1152,7 +1232,9 @@
 				cancelBtnText: "취소",
 				sureBtnText: "확인",
 				sureBtnClick: function() {
-					if(!validationPlanDetail()){
+					
+					if( $('#planRegisterForm input[name=planNm]').val() == ''){
+						mcxDialog.alert('기획전명을 입력하세요.');
 						return false;
 					}
 					
@@ -1164,7 +1246,6 @@
 					} 
 					
 					var chkFrontGb = $('#planRegisterForm input:checkbox[name=frontGb]:checked');
-					
 					if(chkFrontGb.length < 1){
 						mcxDialog.alert("프론트구분을 체크해주세요.");
 						return false;
@@ -1247,6 +1328,7 @@
 						}	
 					
 					var jsonData =  JSON.stringify(data);
+					
 					gagajf.ajaxJsonSubmit("/marketing/planning/detail/create", jsonData, fnPlanDetailCallBack); 
 					uifnPopupClose('popupPlanDetail');
 					fnPlanListSearch();
@@ -1259,7 +1341,8 @@
 				cancelBtnText: "취소",
 				sureBtnText: "확인",
 				sureBtnClick: function() {
-					if(!validationPlanDetail()){
+					if( $('#planUpdateForm input[name=planNm]').val() == ''){
+						mcxDialog.alert('기획전명을 입력하세요.');
 						return false;
 					}
 					
@@ -1492,55 +1575,6 @@
 		}
 	};
 	
-	// 카테고리 리스트 설정
-/* 	var columnCateList = [
-		{width: 40, minWidth: 40, cellClass: 'text-center', headerCheckboxSelection: true, checkboxSelection: true, filter: false},
-		{headerName: "사이트", field: "siteCd", width: 120, cellClass: 'text-center'},
-		{headerName: "카테고리 구분", field: "cateGb", width: 110, cellClass: 'text-center'},
-		{headerName: "카테고리 이름", field: "cateNm", width: 120, cellClass: 'text-center'},
-		{headerName: "번호", field: "cateNo", width: 150, cellClass: 'text-center', hide: true},
-	]; */ 
-	
-	// 카테고리 그리드 설정
-	/* var gridOptionsFGCateList = gagaAgGrid.getGridOptions(columnCateList);
-	gridOptionsFGCateList.rowSelection = "multiple";
-	gridOptionsFGCateList.suppressRowClickSelection = true; */
-	
-	// 브랜드 설정 선택삭제 버튼 클릭시
-   /*  $('#btnDeleteCate').on('click', function() {
-    	gridOptionsFGCateList.api.updateRowData({remove:gagaAgGrid.selectedRowData(gridOptionsFGCateList)});
-    });
-	 */
-
-	
-	// 카테고리 추가
-	/* $('#btnAddCate').on('click' , function () {
-		cfnOpenCategoryPopup("fnSetPopupCategoryInfo");
-	}); */
-	
-	// 카테고리 추가 콜백 함수
-	/* var fnSetPopupCategoryInfo = function (result) {
-		// 기존 리스트 데이터 for
-		for(let i = 0 ; i < result.length ; i++) {
-			let addChk = true, gridListValue = gagaAgGrid.getAllRowData(gridOptionsFGCateList);		// 받아온 모든 데이터
-
-			// 받아온 data for
-			for(let j = 0 ; j < gridListValue.length ; j++) {
-				// 동일한 data는 추가하지 않음
-				if(gridListValue[j].cateNo == result[i].cateNo) {	addChk = false;	}		// 중복체크
-			}
-
-			// 중복되지 않은 데이터 리스트에 추가
-			if(addChk) {
-				if(result[i].cate2No!=null)
-				{
-					mcxDialog.alert('카테고리1에서 선택하세요.');
-					return;
-				}
-				gagaAgGrid.addRowData(gridOptionsFGCateList, {"siteCd":result[i].siteCd , "cateGb":result[i].cateGb, "cateNm":result[i].cateNm, "cateNo":result[i].cateNo});
-			}
-		}
-	} */
 	
 	// 제휴채널 추가
 	$('#btnAddAf').on('click' , function () {
@@ -1571,15 +1605,6 @@
     	gridOptionsAfList.api.updateRowData({remove:gagaAgGrid.selectedRowData(gridOptionsAfList)});
     });
 	
-	// validation 체크
-	function validationPlanDetail() {
-		if( $('#planUpdateForm input[name=planNm]').val() == '' || $('#planRegisterForm input[name=planNm]').val() == ''){
-			mcxDialog.alert('기획전명을 입력하세요.');
-			return false;
-		}
-		return true;
-	} 
-	
 	// 신규회원여부 변경시
 	function newCustYnChange(pThis){
 		var selectVal = $(pThis).val();
@@ -1657,7 +1682,7 @@
 			return;
 		} else {
 	
-			var data = { benefit: '포인트',benefitGb: 'P', pntAmt:'', cpnId: ''};
+			var data = { benefit: '포인트',benefitGb: 'P', basDays:'' ,pntAmt:'', cpnId: '', pntUsableDay:''};
 			gagaAgGrid.addRowData(gridOptionsAttendList, data);
 		}
 
@@ -1724,6 +1749,7 @@
 		
 		 if (mode =='U') {
 			 if(planInfo.newCustYn == 'Y'){
+				 $('.custJoinDateTr').show();
 				 $("#planUpdateForm input[name=custJoinStDay]").val(planInfo.custJoinStdt.split(' ')[0]);
 				 $("#planUpdateForm input[name=custJoinEdDay]").val(planInfo.custJoinEddt.split(' ')[0]);
 			 }

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

@@ -1,357 +0,0 @@
-<!DOCTYPE html>
-<html lang="ko" xmlns:th="http://www.thymeleaf.org">
-<!--
- *******************************************************************************
- * @source  : OrderSellerListForm.html
- * @desc    : 입점업체미발주목록조회 Page
- *============================================================================
- * STYLE24
- * Copyright(C) 2020 TSIT, All rights reserved.
- *============================================================================
- * VER  DATE         AUTHOR      DESCRIPTION
- * ===  ===========  ==========  =============================================
- * 1.0  2020.11.16   jsh77b       최초 작성
- *******************************************************************************
- -->
-
-<div id="main">
-	<!-- 메인타이틀 영역 -->
-	<div class="main-title">
-	</div>
-	<!-- //메인타이틀 영역 -->
-
-	<!-- 메뉴 설명 -->
-	<div class="infoBox menu-desc">
-	</div>
-
-	<form id="searchForm" name="searchForm" action="#" th:action="@{'/order/seller/order/list'}">
-		<input type="hidden" id="searchGb" name="searchGb" />
-		<input type="hidden" id="imageViewYn" name="imageViewYn" />
-
-		<!-- 패널 영역1 -->
-		<div class="panelStyle" >
-			<!-- 검색조건 영역 -->
-			<!-- TITLE -->
-			<div class="panelTitle">
-				<h3>
-					<i class="fa fa-info-circle"></i>아래 검색조건 중 <font color="red">주문번호</font> 또는 <font color="red">검색조건</font> 하나를 꼭 입력해 주세요.
-				</h3>
-				<span class="panelControl">
-					<i class="fa fa-chevron-up"></i>
-				</span>
-			</div>
-
-			<div class="panelContent">
-				<table class="frmStyle">
-					<colgroup>
-						<col style="width:10%;"/>
-						<col style="width:15%;"/>
-						<col style="width:10%;"/>
-						<col style="width:15%;"/>
-						<col style="width:10%;"/>
-						<col style="width:15%;"/>
-						<col style="width:10%;"/>
-						<col style="width:15%;"/>
-					</colgroup>
-					<tr>
-						<th>업체/브랜드<em class="required" title="필수"></em></th>
-						<td colspan="7">
-							<!-- <label class="rdoBtn"><input type="radio" name="selfYn" id="selfYnY" value="N" />자사</label> -->
-							<label class="rdoBtn"><input type="radio" name="selfYn" id="selfYnN" value="Y" checked/>입점</label>
-							<select name="supplyCompCd" id="supplyCompCd">
-								<option value="" th:if="${sessionInfo.roleCd} != 'G001_B000'">[전체]</option>
-								<option th:if="${supplyCompList}" th:each="oneData, status : ${supplyCompList}" th:value="${oneData.cd}" th:text="${'[' + oneData.cd + '] ' + oneData.cdNm}"></option>
-							</select>
-							<span id="multiBrand"></span>
-						</td>
-					</tr>
-					<tr>
-						<th>주문번호</th>
-						<td>
-							<input type="text" name="ordNo" placeholder="" maxlength="20"/>
-						</td>
-						<th>주문자명</th>
-						<td>
-							<input type="text" name="ordNm" placeholder="" maxlength="20"/>
-						</td>
-						<th>상품코드</th>
-						<td>
-							<input type="text" name="goodsCd" placeholder="" maxlength="20"/>
-						</td>
-						<th>주문상세상태</th>
-						<td>
-							<select name="ordDtlStat" id="ordDtlStat">
-								<option value="G013_20">결제완료</option>
-								<option value="G013_30">상품준비중</option>
-								<option value="G013_40">배송준비중</option>
-								<option value="G013_50" selected>배송중</option>
-								<option value="G013_60">배송완료</option>
-								<option value="G013_70">구매확정</option>
-							</select>
-						</td>
-					</tr>
-					<tr>
-						<th>조회일자</th>
-						<td colspan="7">
-							<select name="searchDateGb">
-								<option value="ordDt">주문일자</option>
-							</select>
-							<span id="terms"></span>
-						</td>
-					</tr>
-				</table>
-
-				<ul class="panelBar">
-					<li class="center">
-						<button type="button" class="btn btn-info btn-lg" id="btnOrderSearch">조회</button>
-						<button type="button" class="btn btn-gray btn-lg" id="btnInit">초기화</button>
-					</li>
-				</ul>
-
-			</div>
-		</div>
-
-		<div class="panelStyle">
-			<!--<ul class="panelBar">
-				<li>
-					<button type="button" class="btn btn-info btn-lg" onclick="cfnDownloadSampleFile('SF020');">입점송장번호등록다운로드</button>
-				</li>
-				<li class="aR">
-					<button type="button" id="btnExcelDown" class="btn btn-info btn-lg">엑셀다운로드</button>
-					<button type="button" id="btnInvoiceExcelUpLoad" class="btn btn-success btn-lg">송장엑셀업로드</button>
-					<button type="button" id="btnSave" class="btn btn-success btn-lg">저장</button>
-				</li>
-			</ul>-->
-
-			<div class="panelContent" style="overflow: hidden;">
-				<div id="gridList" style="width: 100%; height: 600px;" class="ag-theme-balham lh30"></div>
-			</div>
-		</div>
-
-		<!-- //리스트 영역 -->
-		<label class="off">
-			<a href="javascript:void(0);" id="excelList" style="display: none;">엑셀다운로드</a>
-		</label>
-
-	</form>
-</div>
-
-<label class="off">
-	<a href="javascript:void(0);" id="hdOrderExcelList" style="display: none;">엑셀다운로드</a>
-</label>
-
-<script type="text/javascript" src="/ux/plugins/gaga/gaga.paging.js?v=2019072202"></script>
-
-<script th:inline="javascript">
-	/*<![CDATA[*/
-	var sessRoleCd 		= [[${sessionInfo.roleCd}]];
-	var shipCompanyList = gagajf.convertToArray([[${shipCompanyList}]]);
-
-	var columnDefs = [
-		{width: 40, minWidth: 40, cellClass: 'text-right', headerCheckboxSelection: true, checkboxSelection: true, filter: false},
-		{headerName: 'No', width: 60, cellClass: 'text-center', valueGetter: function(params) { return params.node.rowIndex + 1 }},
-		{headerName: "입점업체",			field:"supplyCompNm",		width:100, cellClass: 'text-center'},
-		{headerName: "입점업체코드",		field:"supplyCompCd",		width:100, cellClass: 'text-center', hide: true},
-		{headerName: "브랜드",			field:"brandKnm",			width:100, cellClass: 'text-center'},
-		{headerName: "주문번호",			field:"ordNo",				width:100, cellClass: 'text-center'},
-		{headerName: "주문상세번호",		field:"ordDtlNo",			width:100, cellClass: 'text-center'},
-		{headerName: "주문상세상태",		field:"ordDtlStatNm", 		width:100, cellClass: 'text-center'},
-		{headerName: "주문자명",			field:"ordNm",				width:100, cellClass: 'text-center'},
-		{headerName: "주문일시",			field:"ordDt",				width:100, cellClass: 'text-center',
-			cellRenderer		: function (params) {
-				return !gagajf.isNull(params.value) ? params.value.toDate("YYYYMMDDHHmmss").format("YYYY-MM-DD HH:mm:ss") : '';
-			}
-		},
-		{headerName: "결제수단",			field:"payMeansNm",			width:100, cellClass: 'text-center'},
-		{headerName: "주문자휴대전화",		field:"ordPhnno",			width:100, cellClass: 'text-center'},
-		{headerName: "수령자명",			field:"recipNm",			width:100, cellClass: 'text-center'},
-		{headerName: "수령자휴대전화",		field:"recipPhnno",			width:120, cellClass: 'text-center'},
-		{headerName: "수령자우편번호",		field:"recipZipcode",		width:120, cellClass: 'text-center'},
-		{headerName: "수령자기본주소",		field:"recipBaseAddr",		width:120, cellClass: 'text-center'},
-		{headerName: "수령자상세주소",		field:"recipDtlAddr",		width:120, cellClass: 'text-center'},
-		{headerName: "업체상품코드",		field:"supplyGoodsCd",		width:100, cellClass: 'text-center'},
-		{headerName: "상품코드",			field:"goodsCd",			width:100, cellClass: 'text-center'},
-		{headerName: "상품명",			field:"goodsNm",			width:100, cellClass: 'text-center'},
-		{headerName: "사이즈",			field:"optCd2",				width:100, cellClass: 'text-center'},
-		{headerName: "주문수량",			field:"ordQty",				width:100, cellClass: 'text-center'},
-		{headerName: "취소수량",			field:"cnclRtnQty",			width:100, cellClass: 'text-center'},
-		{headerName: "주문금액",			field:"ordAmt",				width:100, cellClass: 'text-center'},
-		{headerName: "할인금액",			field:"totDcAmt",			width:100, cellClass: 'text-center'},
-		{headerName: "실결제금액",		field:"realOrdAmt",			width:100, cellClass: 'text-center'},
-		{headerName: "배송업체",			field:"shipCompCd",			width:150, cellClass: 'text-center'},
-		{headerName: "송장",				field:"invoiceNo",			width:150, cellClass: 'text-center'}
-	];
-
-	var gridOptions = gagaAgGrid.getGridOptions(columnDefs);
-	gridOptions.suppressRowClickSelection = true;
-	gridOptions.rowSelection = 'multiple';
-	gridOptions.stopEditingWhenGridLosesFocus = true;
-
-	// 조회버튼
-	$('#btnOrderSearch').on('click', function() {
-		fnSearch();
-	});
-
-	// 검색
-	var fnSearch = function() {
-		var formId = '#searchForm';
-		var ordNo = $('#searchForm input[name=ordNo]').val();
-		var stDate = $('#stDate').val();
-		var edDate = $('#edDate').val();
-
-		if (gagajf.isNull(ordNo)) {
-			if (gagajf.isNull(stDate)) {
-				mcxDialog.alert('시작 기간을 입력하세요.');
-				return;
-			}
-
-			if (gagajf.isNull(edDate)) {
-				mcxDialog.alert('종료 기간을 입력하세요.');
-				return;
-			}
-		}
-
-		gagaAgGrid.fetch($(formId).prop('action'), gridOptions, formId);
-	}
-
-	// 엑셀다운로드 시 주문상태 변경
-	$('#btnExcelDown').on('click', function () {
-		var selectedData = gridOptions.api.getSelectedRows();
-
-		if (selectedData.length == 0) {
-			mcxDialog.alert('선택된 행이 없습니다.');
-			return;
-		}
-
-		mcxDialog.confirm('엑셀 다운로드 하시겠습니까?', {
-			cancelBtnText	: "취소",
-			sureBtnText		: "확인",
-			sureBtnClick	: function(){
-				var jsonData = JSON.stringify(selectedData);
-				gagajf.ajaxJsonSubmit('/order/seller/unorder/status/save', jsonData, fnExcelDownCollback);
-			}
-		});
-	});
-
-	// 엑셀다운로드
-	var fnExcelDownCollback = function(flag){
-		$('#excelList').attr({ href : '/order/seller/unorder/excel/list' }).get(0).click();
-	}
-
-	// 송장 엑셀 업로드
-	$('#btnInvoiceExcelUpLoad').on('click', function() {
-		cfnExcelUploadPopup('invoiceExcelUpload', 'invoiceExcelUpload');
-	});
-
-	var invoiceExcelUpload = function(result){
-		mcxDialog.confirm('송장 변경을 진행하시겠습니까?', {
-			cancelBtnText	: "취소"
-			, sureBtnText	: "확인"
-			, sureBtnClick	: function(){
-				var data = {
-					procJob 		: result.procJob
-					, excelFileNm 	: result.excelFileNm
-				};
-
-				var jsonData = JSON.stringify(data);
-				gagajf.ajaxJsonSubmit('/order/seller/unorder/invoice/excelupload/save', jsonData, fnInvoiceSaveCollback);
-			}
-		});
-	}
-
-	// 송장번호 저장후
-	var fnInvoiceSaveCollback = function(result){
-		mcxDialog.alert(result.msg);
-		fnSearch();
-		return;
-	}
-
-	// 송장번호 저장시
-	$('#btnSave').on('click', function () {
-		var selectedData = gridOptions.api.getSelectedRows();
-
-		if (selectedData.length == 0) {
-			mcxDialog.alert('선택된 행이 없습니다.');
-			return;
-		}
-
-		var checkFlag = false;
-		$.each(selectedData, function(idx, item) {
-			if (gagajf.isNull(item.shipCompCd)){
-				checkFlag = true;
-				mcxDialog.alert('배송업체를 선택하세요.');
-				return;
-			}
-
-			if (gagajf.isNull(item.invoiceNo)){
-				checkFlag = true;
-				mcxDialog.alert('송장번호를 입력하세요.');
-				return;
-			}
-		});
-
-		if (checkFlag){
-			return false;
-		}
-
-		mcxDialog.confirm('저장 하시겠습니까?', {
-			cancelBtnText	: "취소",
-			sureBtnText		: "확인",
-			sureBtnClick	: function(){
-				var jsonData = JSON.stringify(selectedData);
-				gagajf.ajaxJsonSubmit('/order/seller/unorder/invoice/save', jsonData, fnInvoiceSaveCollback);
-
-			}
-		});
-
-	});
-
-	// 초기화 클릭시
-	$('#btnInit').on('click', function() {
-		$('#searchForm')[0].reset();
-		$("#multiBrand").empty();
-	});
-
-	// 자사/입점 변경여부
-	$("#searchForm input[name=selfYn]").bind('click change', function () {
-		var radioValue = $(this).val();
-		var selfGb = "S";	// 자사 공급 업체
-
-		if (radioValue == "N"){
-			selfGb = "E";	//입점 공급업체
-		}
-
-		var actionUrl = '/renderer/supply/company/list/'+ selfGb;
-
-		$('#searchForm').find('#multiBrand').empty();
-
-		cfnCreateCombo(actionUrl, $('#searchForm select[name=supplyCompCd]'), "[전체]", "");
-	});
-
-	// 업체변경시
-	$('#searchForm select[name=supplyCompCd]').on('change', function() {
-		var actionUrl = '/renderer/supplyCompany/brand/list/' + $(this).val();
-
-		if (sessRoleCd == "G001_B000") {
-			actionUrl = '/renderer/brand/AuthBrandlist';
-		}
-
-		cfnCreateMultiCombo(actionUrl,"multiBrand",  "[전체]",null, 'Y');
-	});
-
-	//초기설정
-	$(document).ready(function() {
-		// 달력기능 활성화
-		cfnCreateCalendar('#terms', 'stDate', 'edDate', true, '주문');
-		gagaAgGrid.createGrid('gridList', gridOptions);
-		gridOptions.api.hideOverlay();
-	});
-
-</script>
-
-</html>
-
-
-
-
-

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

@@ -1,138 +0,0 @@
-<!DOCTYPE html>
-<html lang="ko" xmlns:th="http://www.thymeleaf.org">
-<!--
- *******************************************************************************
- * @source  : OrderSellerDelvListForm.html
- * @desc    : 입점발주최종확인 Page
- *============================================================================
- * SISUN
- * Copyright(C) 2020 TSIT, All rights reserved.
- *============================================================================
- * VER  DATE         AUTHOR      DESCRIPTION
- * ===  ===========  ==========  =============================================
- * 1.0  2021.04.20   xodud1202   최초 작성
- *******************************************************************************
- -->
- 
-<div id="main">
-	<!-- 메인타이틀 영역 -->
-	<div class="main-title">
-	</div>
-	<!-- //메인타이틀 영역 -->
-	
-	<!-- 메뉴 설명 -->
-	<div class="infoBox menu-desc">
-	</div>
-	
-	<form id="searchForm" name="searchForm" action="#" th:action="@{'/order/seller/unorder/list'}">
-		<input type="hidden" name="ordDtlStat" value="G013_40" />
-		<input type="hidden" name="supplyCompCd" th:value="${supplyCompCd}" />
-		<div class="panelStyle">
-			<ul class="panelBar">
-				<li class="aR">
-					<button type="button" id="btnSave" class="btn btn-success btn-lg">저장</button>
-				</li>
-			</ul>
-			
-			<div class="panelContent" style="overflow: hidden;">
-				<div id="gridList" style="width: 100%; height: 700px;" class="ag-theme-balham lh30"></div>
-			</div>
-		</div>
-	</form>
-</div>
-
-<script th:inline="javascript">
-var shipCompanyList = gagajf.convertToArray([[${shipCompanyList}]]);
-var columnDefs = [
-	{width: 40, minWidth: 40, cellClass: 'text-right', headerCheckboxSelection: true, checkboxSelection: true, filter: false},
-	{headerName: 'No', width: 60, cellClass: 'text-center', valueGetter: function(params) { return params.node.rowIndex + 1 }},
-	{headerName: "입점업체",			field:"supplyCompNm",		width:70, cellClass: 'text-center'},
-	{headerName: "입점업체코드",		field:"supplyCompCd",		width:80, cellClass: 'text-center', hide: true},
-	{headerName: "브랜드",			field:"brandKnm",			width:80, cellClass: 'text-center'},
-	{headerName: "주문번호",			field:"ordNo",				width:70, cellClass: 'text-center'},
-	{headerName: "주문상세번호",		field:"ordDtlNo",			width:100, cellClass: 'text-center'},
-	{headerName: "업체상품코드",		field:"supplyGoodsCd",		width:100, cellClass: 'text-center'},
-	{headerName: "상품코드",			field:"goodsCd",			width:100, cellClass: 'text-center'},
-	{headerName: "상품명",			field:"goodsNm",			width:300, cellClass: 'text-center'},
-	{headerName: "옵션1",			field:"optCd1",				width:100, cellClass: 'text-center'},
-	{headerName: "옵션2",			field:"optCd2",				width:100, cellClass: 'text-center'},
-	{headerName: "배송업체",			field:"shipCompCd",			width:120, cellClass: 'text-center'
-		, valueFormatter: function (params) {
-			return gagaAgGrid.lookupValue(shipCompanyList, params.value);
-		}
-		, valueParser: function (params) {
-			return gagaAgGrid.lookupKey(shipCompanyList, params.newValue);
-		}
-	},
-	{headerName: "송장",				field:"invoiceNo",			width:120, cellClass: 'text-center'},
-	{headerName: "주문수량",			field:"ordQty",				width:100, cellClass: 'text-center'},
-	{headerName: "취소수량",			field:"cnclRtnQty",			width:100, cellClass: 'text-center'},
-	{headerName: "결품수량",			field: "cnclRtnQty",		width: 100, cellClass: 'text-center', hide: true},
-	{headerName: "결제PG",			field: "pgGb",				width: 100, cellClass: 'text-center', hide: true},
-	{headerName: "결제수단",			field: "payMeans",			width: 100, cellClass: 'text-center', hide: true},
-	{headerName: "고객번호",			field: "custNo",			width: 100, cellClass: 'text-center', hide: true},
-	{headerName: "주문고객명",		field: "ordNm",				width: 100, cellClass: 'text-center', hide: true},
-	{headerName: "환불계좌은행코드",	field: "bankCd",			width: 100, cellClass: 'text-center', hide: true},
-	{headerName: "환불계좌예금주명",	field: "accountNm",			width: 100, cellClass: 'text-center', hide: true},
-	{headerName: "환불계좌번호",		field: "accountNo",			width: 100, cellClass: 'text-center', hide: true}
-];
-
-var gridOptions = gagaAgGrid.getGridOptions(columnDefs);
-gridOptions.suppressRowClickSelection = true;
-gridOptions.rowSelection = 'multiple';
-gridOptions.stopEditingWhenGridLosesFocus = true;
-
-// 검색
-var fnSearch = function() {
-	var formId = '#searchForm';
-	gagaAgGrid.fetch($(formId).prop('action'), gridOptions, formId);
-}
-
-//초기설정
-$(document).ready(function() {
-	// 달력기능 활성화
-	gagaAgGrid.createGrid('gridList', gridOptions);
-	gridOptions.api.hideOverlay();
-
-	fnSearch();
-});
-
-$("#btnSave").on("click", function(e) {
-	var selectedData = gridOptions.api.getSelectedRows();
-
-	if (selectedData.length == 0) {
-		mcxDialog.alert('선택된 행이 없습니다.');
-		return;
-	}
-
-	for(let i = 0 ; i < selectedData.length ; i++) {
-		let rowData = selectedData[i];
-		if(typeof rowData.cancelQty == "undefined") {
-			mcxDialog.alert('선택된 행의 미출고수량을 입력해주세요.');
-			return;
-		}
-	}
-
-	mcxDialog.confirm('선택된 주문을 배송중으로 변경하시겠습니까?', {
-		cancelBtnText	: "취소",
-		sureBtnText		: "확인",
-		sureBtnClick	: function(){
-			var jsonData = JSON.stringify(selectedData);
-			gagajf.ajaxJsonSubmit('/order/seller/delv/started', jsonData, fnEndFunction);
-		}
-	});
-
-	// 엑셀다운로드
-	var fnEndFunction = function(result){
-		mcxDialog.alert("성공적으로 저장되었습니다.");
-		fnSearch();
-	}
-});
-</script>
-
-</html>
-
-
-
-
-

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

@@ -27,6 +27,7 @@
 	<form id="searchForm" name="searchForm" action="#" th:action="@{'/order/seller/unorder/list'}">
 		<input type="hidden" id="searchGb" name="searchGb" />
 		<input type="hidden" id="imageViewYn" name="imageViewYn" />
+		<input type="hidden" name="pageNo" id="pageNo" value ="1"/>
 		
 		<!-- 패널 영역1 -->
 		<div class="panelStyle" >
@@ -136,8 +137,8 @@
 <label class="off">
 	<a href="javascript:void(0);" id="hdOrderExcelList" style="display: none;">엑셀다운로드</a>
 </label>
-	
-<script type="text/javascript" src="/ux/plugins/gaga/gaga.paging.js?v=2019072202"></script>
+
+<script type="text/javascript" src="/ux/plugins/gaga/gaga.paging.js?v=20210114"></script>
 
 <script th:inline="javascript">
 /*<![CDATA[*/
@@ -215,8 +216,20 @@ var fnSearch = function() {
 			return;
 		}
 	}
-	
-	gagaAgGrid.fetch($(formId).prop('action'), gridOptions, formId);
+
+	gagaPaging.init('searchForm', fnSearchCallBack, 'orderListPagination', 100);
+	gagaPaging.load($("#searchForm input[name=pageNo]").val());
+	// gagaAgGrid.fetch($(formId).prop('action'), gridOptions, formId);
+}
+
+var fnSearchCallBack = function(result){
+	$('#searchForm').find('#gridRowTotalCount').html(result.pageing.pageable.totalCount.addComma());
+	$('#searchForm').find('#pageNo').val(result.pageing.pageable.pageNo.addComma());
+	$('#searchForm').find('#pgNo').html(result.pageing.pageable.pageNo.addComma());
+	$('#searchForm').find('#endPgNo').html(result.pageing.pageable.totalPage.addComma());
+
+	gridOptions.api.setRowData(result.orderList);
+	gagaPaging.createPagination(result.pageing.pageable);
 }
 
 // 엑셀다운로드 시 주문상태 변경