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

@@ -873,7 +873,7 @@ public class TsaPlanService {
 		// 리뷰 등록
 		Plan rePlan = new Plan();
 		//리뷰 등록 - tb_plan_contents
-		if(param.getReTitle() != "" || !org.apache.commons.lang3.StringUtils.isAllEmpty(param.getMultiPlanReview())) {
+//		if(param.getReTitle() != "" || !org.apache.commons.lang3.StringUtils.isAllEmpty(param.getMultiPlanReview())) {
 			rePlan.setRegNo(regNo);
 			rePlan.setUpdNo(regNo);
 			rePlan.setTmplType("G082_10");
@@ -901,12 +901,12 @@ public class TsaPlanService {
 					planDao.createPlanContentsItem(rePlan);
 				}
 			}
-		}
+//		}
 		
 		// 쿠폰등록
 		Plan cuPlan = new Plan();
 		//쿠폰 등록 - tb_plan_contents
-		if(param.getCuTitle() != "" || param.getMultiPlanCoupon().length>0) {
+//		if(param.getCuTitle() != "" || param.getMultiPlanCoupon().length>0) {
 			cuPlan.setRegNo(regNo);
 			cuPlan.setUpdNo(regNo);
 			cuPlan.setTmplType("G082_20");
@@ -953,7 +953,7 @@ public class TsaPlanService {
 					planDao.createPlanContentsItem(cuPlan);
 				}
 			}
-		}
+//		}
 		
 		//이미지등록
 		Plan filePlan = new Plan();

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

@@ -41,8 +41,21 @@ public class TsaSocialService {
 		social.setSocialSq(param.getSocialSq());
 		social.setUseYn(param.getUseYn());
 		social.setApplyGb(param.getApplyGb());
-		if(socialDao.getSocialGoOffCount(social) > 0) {
-			throw new IllegalStateException("진행중인 소셜(핫딜)이 있습니다.");
+		social.setFrontGb(param.getFrontGb());
+		
+		String applyGb = param.getApplyGb();
+		String useYn = param.getUseYn();
+		
+		// 적용상태로 저장을 할 경우
+		if (applyGb.equals("A") && useYn.equals("Y")) {
+			if(socialDao.getSocialGoOffCount(social) > 0) {
+				throw new IllegalStateException("진행중인 소셜(핫딜)이 있습니다.");
+			}
+		// 대기상태로 저장을 할 경우 
+		}else if(applyGb.equals("P") && useYn.equals("Y")) {
+			if(socialDao.getSocialGoOffCount(social) > 0) {
+				throw new IllegalStateException("선택하신 날짜에 대기중이거나 진행중인 소셜(핫딜)이 있습니다.");
+			}
 		}
 		Integer userNo = TsaSession.getInfo().getUserNo();
 		param.setRegNo(userNo);

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

@@ -644,8 +644,11 @@ public class TsaWithdrawService {
 		change.setMallGb(params.getString("mallGb"));
 		change.setSpanRefundAmt(params.getInt("spanRefundAmt"));
 		change.setPgStat(params.getString("pgStat"));
-		
-		
+		change.setCodFeeYn(params.getString("codFeeYn"));
+		change.setCodFee(params.getInt("codFee"));
+		change.setEnCloseFeeYn(params.getString("enCloseFeeYn"));
+		change.setEncloseFee(params.getInt("enCloseFee"));
+		change.setWdInvoiceNo(params.getString("wdInvoiceNo"));
 		
 		
 		String allCanYn = params.getString("allCanYn");
@@ -677,7 +680,11 @@ public class TsaWithdrawService {
 			info.set("ordChgSq", params.getInt("ordChgSq"));
 			info.set("mallGb", params.getString("mallGb"));
 			info.set("pgStat", params.getString("pgStat"));
-			
+			info.set("codFee", params.getInt("codFee"));
+			info.set("codFeeYn", params.getString("codFeeYn"));
+			info.set("enCloseFeeYn", params.getString("enCloseFeeYn"));
+			info.set("enCloseFee", params.getInt("enCloseFee"));
+			info.set("wdInvoiceNo", params.getInt("wdInvoiceNo"));
 			
 			
 			orderChangeService.partialRefund(info, userNo);

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

@@ -131,6 +131,7 @@ public class Delivery extends TscBaseDomain {
 	private int currPrice;
 	private int saleAmt;
 	private int realOrdAmt;
+	private int stockQty;
 	
 	private Double delvFeeRate;
 	

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

@@ -83,13 +83,15 @@ public class Withdraw extends TscBaseDomain {
 	private String accountNm;
 	private String accountNo;
 	private String bankCd;	
-	
+	private String invoiceNo;
+
 	private Integer ordNo;
 	private Integer ordDtlNo; 
 	private Integer ordChgSq;
 	private Integer userNo;
 	private Integer custNo;
 	private Integer delvAddrSq;
+	private Integer delvFeeSq;
 	
 	private int chgQty;
 	private int wdQty;

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

@@ -326,10 +326,10 @@
 		</if>
 		<if test='termGb == "ordDt"'>
 		    <if test='stDate != null and stDate != ""'>
-		AND   A.REG_DT >= STR_TO_DATE(REPLACE(#{stDate},'-',''), '%Y%m%d%H%i%s')    
+		AND   A.ORD_DT >= STR_TO_DATE(REPLACE(#{stDate},'-',''), '%Y%m%d%H%i%s')    
 		    </if>
 		    <if test='edDate != null and edDate != ""'>
-		AND   A.REG_DT <![CDATA[<]]> DATE_ADD(STR_TO_DATE(REPLACE(#{edDate},'-',''), '%Y%m%d%H%i%s'), INTERVAL 1 DAY) 
+		AND   A.ORD_DT <![CDATA[<]]> DATE_ADD(STR_TO_DATE(REPLACE(#{edDate},'-',''), '%Y%m%d%H%i%s'), INTERVAL 1 DAY) 
 		    </if>
 		</if>
 		<if test='termGb == "delvDt"'>
@@ -568,10 +568,10 @@
 						AND    'D' = #{delvGb} -- 배송지시
 						</if>
 						<if test="stDate != null and stDate != ''">
-						AND    O.REG_DT <![CDATA[>=]]> STR_TO_DATE(REPLACE(#{stDate},'-','') , '%Y%m%d%H%i%s')
+						AND    O.ORD_DT <![CDATA[>=]]> STR_TO_DATE(REPLACE(#{stDate},'-','') , '%Y%m%d%H%i%s')
 						</if>
 						<if test="edDate != null and edDate != ''">
-						AND    O.REG_DT <![CDATA[<]]> DATE_ADD(STR_TO_DATE(REPLACE(#{edDate},'-','') , '%Y%m%d%H%i%s'), INTERVAL 1 DAY) 
+						AND    O.ORD_DT <![CDATA[<]]> DATE_ADD(STR_TO_DATE(REPLACE(#{edDate},'-','') , '%Y%m%d%H%i%s'), INTERVAL 1 DAY) 
 						</if>
 						<if test="siteCd != null and siteCd != ''">
 						AND    O.SITE_CD = #{siteCd}
@@ -657,10 +657,10 @@
 						AND    'D' = #{delvGb} -- 배송지시
 						</if>
 						<if test="stDate != null and stDate != ''">
-						AND    O.REG_DT <![CDATA[>=]]> STR_TO_DATE(REPLACE(#{stDate},'-','') , '%Y%m%d%H%i%s')
+						AND    O.ORD_DT <![CDATA[>=]]> STR_TO_DATE(REPLACE(#{stDate},'-','') , '%Y%m%d%H%i%s')
 						</if>
 						<if test="edDate != null and edDate != ''">
-						AND    O.REG_DT <![CDATA[<]]> DATE_ADD(STR_TO_DATE(REPLACE(#{edDate},'-','') , '%Y%m%d%H%i%s'), INTERVAL 1 DAY) 
+						AND    O.ORD_DT <![CDATA[<]]> DATE_ADD(STR_TO_DATE(REPLACE(#{edDate},'-','') , '%Y%m%d%H%i%s'), INTERVAL 1 DAY) 
 						</if>
 						<if test="siteCd != null and siteCd != ''">
 						AND    O.SITE_CD = #{siteCd}

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

@@ -2969,7 +2969,7 @@
 		           #{videoSq}
 		         , #{goodsCd}
 		         , #{videoGb}
-		         , #{kmcKey}
+		         , CASE WHEN LENGTH(#{kmcKey}) = 0 THEN NULL ELSE #{kmcKey} END
 		         , #{kufKey}
 		         , #{dispYn}
 		         , #{regNo}
@@ -2989,7 +2989,7 @@
 		UPDATE TB_GOODS_VIDEO SET
 		           DISP_YN = #{dispYn}
 		         , VIDEO_GB = #{videoGb}
-		         , KMC_KEY = #{kmcKey}
+		         , KMC_KEY = CASE WHEN LENGTH(#{kmcKey}) = 0 THEN NULL ELSE #{kmcKey} END
 		         , UPD_NO = #{updNo}
 		         , UPD_DT = NOW()
 		WHERE VIDEO_SQ = #{videoSq}

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

@@ -199,13 +199,21 @@
 	<!-- 진행중인 소셜 확인 -->
 	<select id="getSocialGoOffCount" parameterType="Social" resultType="int">
 		SELECT COUNT(*)
-		FROM tb_social A
+		FROM TB_SOCIAL A
 		WHERE 1=1
-			AND A.USE_YN = 'Y'
-			AND A.APPLY_GB = 'A'
-			AND A.SOCIAL_SQ != #{socialSq}
-			AND  (A.SOCIAL_STDT <![CDATA[ <= ]]>  DATE_FORMAT(DATE_ADD(#{socialStdt}, INTERVAL 0 DAY), '%Y%m%d%H%i%S')  
-			OR A.SOCIAL_EDDT <![CDATA[ >= ]]>  DATE_FORMAT(DATE_ADD(#{socialStdt}, INTERVAL 0 DAY), '%Y%m%d%H%i%S'))  
+		AND A.USE_YN = 'Y'
+		<if test='frontGb == "P"'> <!-- PC웹 -->
+		    AND A.FRONT_GB IN ('A','P')
+		</if>
+		<if test='frontGb == "A" or frontGb == "M"'> <!-- 모바일 -->
+		    AND A.FRONT_GB IN ('A','M')
+		</if> 
+		AND A.APPLY_GB IN ('A', #{applyGb})
+		<if test="socialSq != null and socialSq != ''">
+		AND A.SOCIAL_SQ != #{socialSq}
+		</if>
+		AND A.SOCIAL_STDT <![CDATA[ <= ]]> DATE_FORMAT(#{socialStdt} , '%Y-%m-%d %H:%i:%S')
+		AND A.SOCIAL_EDDT <![CDATA[ >= ]]> DATE_FORMAT(#{socialStdt} , '%Y-%m-%d %H:%i:%S');
 	</select>
 	
 	

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

@@ -511,7 +511,8 @@
 				, CA.ACCOUNT_NM 
 				, CA.BANK_CD 	
 				, E.ORD_NM 	
-				, C.DELV_ADDR_SQ 
+				, C.DELV_ADDR_SQ
+				, F.WD_INVOICE_NO 
 		  FROM TB_ORDER_CHANGE A
 		  JOIN TB_ORDER_CHANGE_DETAIL B ON B.ORD_CHG_SQ = A.ORD_CHG_SQ 
 		  JOIN TB_ORDER_DETAIL C ON C.ORD_DTL_NO = B.ORD_DTL_NO 

src/main/webapp/WEB-INF/views/board/NoticeForm.html

@@ -491,6 +491,8 @@
 		$('#detailForm input[name=noticeSq]').val('');
 		$('#detailForm input[name=noticeStdt]').val(_today);
 		$('#detailForm input[name=noticeEddt]').val(_today);
+		
+		gagaSn.setContents('#noticeContent', ''); 
 	});
 	
 	// 저장

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

@@ -1396,13 +1396,24 @@
 		uifnPopupClose('popupMainContents');
 	}
 
+	var fnResetDispOrd = function (){
+		$('.mcTable').each(function (idx){
+			$(this).find('input[name=dispOrd]').val(idx+1);
+		});
+	}
+
 	$(document).ready(function() {
 		$("#popTitle").text("["+contentsLoc+"] "+gagaAgGrid.lookupValue(contentsLocArr, contentsLoc));
 
 		$("#popSortable").disableSelection();
 		fnGetContentsPreviewList();
 
-
+		$("#popSortable").sortable({
+			stop: function(event, ui) {
+				//fnResetTabIdx();
+				fnResetDispOrd();
+			}
+		});
 	});
 	/*]]>*/
 </script>

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

@@ -767,11 +767,18 @@
 		}
 	}
 
+	var fnResetDispOrd = function (){
+		$('.tabTable').each(function (idx){
+			$(this).find('input[name=dispOrd]').val(idx+1);
+		});
+	}
+
 	$(document).ready(function() {
 		$("#gnbTabList").disableSelection();
 		$("#gnbTabList").sortable({
 			stop: function(event, ui) {
 				//fnResetTabIdx();
+				fnResetDispOrd();
 			}
 		});
 

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

@@ -60,7 +60,7 @@
 										<col width="90%" />
 									</colgroup>
 									<tr>
-										<th>리뷰<br/>[전시여부<label class="chkBox"><input type="checkbox" name="reDispYn" onclick="fnAttachYnClick('reDispYn')" value="N"/></label>]</th>
+										<th>리뷰<br/>[전시여부<label class="chkBox"><input type="checkbox" name="reDispYn" onclick="fnAttachYnClick('reDispYn')" value="Y" checked/></label>]</th>
 										<td>
 											<table class="frmStyle">
 												<tr>
@@ -106,7 +106,7 @@
 										<col width="90%" />
 									</colgroup>
 									<tr>
-										<th>쿠폰<br/>[전시여부<label class="chkBox"><input type="checkbox" name="cuDispYn" id="cuDispYn" value="N"/></label>]</th>
+										<th>쿠폰<br/>[전시여부<label class="chkBox"><input type="checkbox" name="cuDispYn" id="cuDispYn" value="Y" checked/></label>]</th>
 										<td>
 											<table class="frmStyle">
 												<tr>
@@ -178,7 +178,7 @@
 										<col width="90%" />
 									</colgroup>
 									<tr>
-										<th>이미지 첨부<br/>[전시여부<label class="chkBox"><input type="checkbox" name="fileDispYn" value="N"/></label>]</th>
+										<th>이미지 첨부<br/>[전시여부<label class="chkBox"><input type="checkbox" name="fileDispYn" value="Y" checked/></label>]</th>
 										<td colspan="5">
 											<div id="registeredFile"></div>
 											<div style="display: block">
@@ -243,7 +243,7 @@
 										<col width="90%" />
 									</colgroup>
 									<tr>
-										<th>유의사항<br/>[전시여부<label class="chkBox"><input type="checkbox" name="noticeDispYn" value="N"/></label>]</th>
+										<th>유의사항<br/>[전시여부<label class="chkBox"><input type="checkbox" name="noticeDispYn" value="Y" checked/></label>]</th>
 										<td colspan="5">
 											<div id="registeredFile"></div>
 											<div style="display: block">
@@ -293,7 +293,7 @@
 										<col width="90%" />
 									</colgroup>
 									<tr>
-										<th>[전시여부<label class="chkBox"><input type="checkbox" name="topFsrcDispYn" value="N"/></label>]</th>	
+										<th>[전시여부<label class="chkBox"><input type="checkbox" name="topFsrcDispYn" value="Y" checked/></label>]</th>	
 										<!-- <td><input type="text" name ="topFsrcDispOrd" value="" class="w100 aR" data-valid-type="numeric"></td> -->
 									</tr>
 									<tr>
@@ -337,7 +337,7 @@
 										<col width="90%" />
 									</colgroup>
 									<tr>
-										<th>[전시여부<label class="chkBox"><input type="checkbox" name="btmFsrcDispYn" value="N"/></label>]</th>	
+										<th>[전시여부<label class="chkBox"><input type="checkbox" name="btmFsrcDispYn" value="Y" checked/></label>]</th>	
 										<!-- <td><input type="text" name ="btmFsrcDispOrd" value="" class="w100 aR" data-valid-type="numeric"></td> -->
 									</tr>
 									<tr>
@@ -395,7 +395,7 @@
 											<col width="90%" />
 										</colgroup>
 										<tr>
-											<th>상품 구분 1<br/>[전시여부<label class="chkBox" style="padding-left: 0px;"><input type="checkbox" name="goodsDispYn1" value="N" ></label>]<br>
+											<th>상품 구분 1<br/>[전시여부<label class="chkBox" style="padding-left: 0px;"><input type="checkbox" name="goodsDispYn1" value="Y" checked></label>]<br>
 												<button type="button" class="btn btn-danger btn-lg" id="" onclick="btnDeleteGridNum1();">구분 삭제</button>
 											</th>
 											<td>
@@ -404,7 +404,7 @@
 														<tr>
 															<th>상품 노출 기준</th>
 															<td>
-																<label class="rdoBtn"><input type="radio" name="goodsType1" value="G082_50" />1개</label> 
+																<label class="rdoBtn"><input type="radio" name="goodsType1" value="G082_50" checked/>1개</label> 
 																<label class="rdoBtn"><input type="radio" name="goodsType1" value="G082_51" />2개</label> 
 																<label class="rdoBtn"><input type="radio" name="goodsType1" value="G082_52" />4개</label>
 															</td>
@@ -459,7 +459,7 @@
 											<col width="90%" />
 										</colgroup>
 										<tr>
-											<th>상품 구분 2<br/>[전시여부<label class="chkBox" style="padding-left: 0px;"><input type="checkbox" name="goodsDispYn2" value="N" ></label>]<br>
+											<th>상품 구분 2<br/>[전시여부<label class="chkBox" style="padding-left: 0px;"><input type="checkbox" name="goodsDispYn2" value="Y" checked></label>]<br>
 											<br>
 												<button type="button" class="btn btn-danger btn-lg" id=""
 													onclick="btnDeleteGridNum2();">구분 삭제</button>
@@ -470,7 +470,7 @@
 														<tr>
 															<th>상품 노출 기준</th>
 															<td>
-																<label class="rdoBtn"><input type="radio" name="goodsType2" value="G082_50" />1개</label> 
+																<label class="rdoBtn"><input type="radio" name="goodsType2" value="G082_50" checked/>1개</label> 
 																<label class="rdoBtn"><input type="radio" name="goodsType2" value="G082_51" />2개</label> 
 																<label class="rdoBtn"><input type="radio" name="goodsType2" value="G082_52" />4개</label>
 															</td>
@@ -525,7 +525,7 @@
 											<col width="90%" />
 										</colgroup>
 										<tr>
-											<th>상품 구분 3<br/>[전시여부<label class="chkBox" style="padding-left: 0px;"><input type="checkbox" name="goodsDispYn3" value="N" ></label>]<br>
+											<th>상품 구분 3<br/>[전시여부<label class="chkBox" style="padding-left: 0px;"><input type="checkbox" name="goodsDispYn3" value="Y" checked></label>]<br>
 											<br>
 												<button type="button" class="btn btn-danger btn-lg" id=""
 													onclick="btnDeleteGridNum3('gridOptions_c3');">구분
@@ -537,7 +537,7 @@
 														<tr>
 															<th>상품 노출 기준</th>
 															<td>
-																<label class="rdoBtn"><input type="radio" name="goodsType3" value="G082_50" />1개</label> 
+																<label class="rdoBtn"><input type="radio" name="goodsType3" value="G082_50" checked/>1개</label> 
 																<label class="rdoBtn"><input type="radio" name="goodsType3" value="G082_51" />2개</label> 
 																<label class="rdoBtn"><input type="radio" name="goodsType3" value="G082_52" />4개</label>
 															</td>
@@ -592,7 +592,7 @@
 											<col width="90%" />
 										</colgroup>
 										<tr>
-											<th>상품 구분 4<br/>[전시여부<label class="chkBox" style="padding-left: 0px;"><input type="checkbox" name="goodsDispYn4" value="N" ></label>]<br>
+											<th>상품 구분 4<br/>[전시여부<label class="chkBox" style="padding-left: 0px;"><input type="checkbox" name="goodsDispYn4" value="Y" checked></label>]<br>
 											<br>
 												<button type="button" class="btn btn-danger btn-lg" id=""
 													onclick="btnDeleteGridNum4('gridOptions_c4');">구분
@@ -604,7 +604,7 @@
 														<tr>
 															<th>상품 노출 기준</th>
 															<td>
-																<label class="rdoBtn"><input type="radio" name="goodsType4" value="G082_50" />1개</label> 
+																<label class="rdoBtn"><input type="radio" name="goodsType4" value="G082_50" checked/>1개</label> 
 																<label class="rdoBtn"><input type="radio" name="goodsType4" value="G082_51" />2개</label> 
 																<label class="rdoBtn"><input type="radio" name="goodsType4" value="G082_52" />4개</label>
 															</td>
@@ -659,7 +659,7 @@
 											<col width="90%" />
 										</colgroup>
 										<tr>
-											<th>상품 구분 5<br/>[전시여부<label class="chkBox" style="padding-left: 0px;"><input type="checkbox" name="goodsDispYn5" value="N" ></label>]<br>
+											<th>상품 구분 5<br/>[전시여부<label class="chkBox" style="padding-left: 0px;"><input type="checkbox" name="goodsDispYn5" value="Y" checked></label>]<br>
 											<br>
 												<button type="button" class="btn btn-danger btn-lg" id=""
 													onclick="btnDeleteGridNum5('gridOptions_c5');">구분
@@ -671,7 +671,7 @@
 														<tr>
 															<th>상품 노출 기준</th>
 															<td>
-																<label class="rdoBtn"><input type="radio" name="goodsType5" value="G082_50" />1개</label> 
+																<label class="rdoBtn"><input type="radio" name="goodsType5" value="G082_50" checked/>1개</label> 
 																<label class="rdoBtn"><input type="radio" name="goodsType5" value="G082_51" />2개</label> 
 																<label class="rdoBtn"><input type="radio" name="goodsType5" value="G082_52" />4개</label>
 															</td>
@@ -726,10 +726,10 @@
 											<col width="90%" />
 										</colgroup>
 										<tr>
-											<th>상품 구분 6<br/>[전시여부<label class="chkBox" style="padding-left: 0px;"><input type="checkbox" name="goodsDispYn6" value="N" ></label>]<br>
+											<th>상품 구분 6<br/>[전시여부<label class="chkBox" style="padding-left: 0px;"><input type="checkbox" name="goodsDispYn6" value="Y" checked></label>]<br>
 											<br>
 												<button type="button" class="btn btn-danger btn-lg" id=""
-													onclick="btnDeleteGridNum5('gridOptions_c6');">구분
+													onclick="btnDeleteGridNum6('gridOptions_c6');">구분
 													삭제</button>
 											</th>
 											<td>
@@ -738,7 +738,7 @@
 														<tr>
 															<th>상품 노출 기준</th>
 															<td>
-																<label class="rdoBtn"><input type="radio" name="goodsType6" value="G082_50" />1개</label> 
+																<label class="rdoBtn"><input type="radio" name="goodsType6" value="G082_50" checked/>1개</label> 
 																<label class="rdoBtn"><input type="radio" name="goodsType6" value="G082_51" />2개</label> 
 																<label class="rdoBtn"><input type="radio" name="goodsType6" value="G082_52" />4개</label>
 															</td>
@@ -793,10 +793,10 @@
 											<col width="90%" />
 										</colgroup>
 										<tr>
-											<th>상품 구분 7<br/>[전시여부<label class="chkBox" style="padding-left: 0px;"><input type="checkbox" name="goodsDispYn7" value="N" ></label>]<br>
+											<th>상품 구분 7<br/>[전시여부<label class="chkBox" style="padding-left: 0px;"><input type="checkbox" name="goodsDispYn7" value="Y" checked></label>]<br>
 											<br>
 												<button type="button" class="btn btn-danger btn-lg" id=""
-													onclick="btnDeleteGridNum5('gridOptions_c7');">구분
+													onclick="btnDeleteGridNum7('gridOptions_c7');">구분
 													삭제</button>
 											</th>
 											<td>
@@ -805,7 +805,7 @@
 														<tr>
 															<th>상품 노출 기준</th>
 															<td>
-																<label class="rdoBtn"><input type="radio" name="goodsType7" value="G082_50" />1개</label> 
+																<label class="rdoBtn"><input type="radio" name="goodsType7" value="G082_50" checked/>1개</label> 
 																<label class="rdoBtn"><input type="radio" name="goodsType7" value="G082_51" />2개</label> 
 																<label class="rdoBtn"><input type="radio" name="goodsType7" value="G082_52" />4개</label>
 															</td>
@@ -860,7 +860,7 @@
 											<col width="90%" />
 										</colgroup>
 										<tr>
-											<th>상품 구분 8<br/>[전시여부<label class="chkBox" style="padding-left: 0px;"><input type="checkbox" name="goodsDispYn8" value="N" ></label>]<br>
+											<th>상품 구분 8<br/>[전시여부<label class="chkBox" style="padding-left: 0px;"><input type="checkbox" name="goodsDispYn8" value="Y" checked></label>]<br>
 											<br>
 												<button type="button" class="btn btn-danger btn-lg" id=""
 													onclick="btnDeleteGridNum8('gridOptions_c8');">구분
@@ -872,7 +872,7 @@
 														<tr>
 															<th>상품 노출 기준</th>
 															<td>
-																<label class="rdoBtn"><input type="radio" name="goodsType8" value="G082_50" />1개</label> 
+																<label class="rdoBtn"><input type="radio" name="goodsType8" value="G082_50" checked/>1개</label> 
 																<label class="rdoBtn"><input type="radio" name="goodsType8" value="G082_51" />2개</label> 
 																<label class="rdoBtn"><input type="radio" name="goodsType8" value="G082_52" />4개</label>
 															</td>
@@ -927,10 +927,10 @@
 											<col width="90%" />
 										</colgroup>
 										<tr>
-											<th>상품 구분 9<br/>[전시여부<label class="chkBox" style="padding-left: 0px;"><input type="checkbox" name="goodsDispYn9" value="N" ></label>]<br>
+											<th>상품 구분 9<br/>[전시여부<label class="chkBox" style="padding-left: 0px;"><input type="checkbox" name="goodsDispYn9" value="Y" checked></label>]<br>
 											<br>
 												<button type="button" class="btn btn-danger btn-lg" id=""
-													onclick="btnDeleteGridNum8('gridOptions_c9');">구분
+													onclick="btnDeleteGridNum9('gridOptions_c9');">구분
 													삭제</button>
 											</th>
 											<td>
@@ -939,7 +939,7 @@
 														<tr>
 															<th>상품 노출 기준</th>
 															<td>
-																<label class="rdoBtn"><input type="radio" name="goodsType9" value="G082_50" />1개</label> 
+																<label class="rdoBtn"><input type="radio" name="goodsType9" value="G082_50" checked/>1개</label> 
 																<label class="rdoBtn"><input type="radio" name="goodsType9" value="G082_51" />2개</label> 
 																<label class="rdoBtn"><input type="radio" name="goodsType9" value="G082_52" />4개</label>
 															</td>
@@ -994,10 +994,10 @@
 											<col width="90%" />
 										</colgroup>
 										<tr>
-											<th>상품 구분 10<br/>[전시여부<label class="chkBox" style="padding-left: 0px;"><input type="checkbox" name="goodsDispYn10" value="N" ></label>]<br>
+											<th>상품 구분 10<br/>[전시여부<label class="chkBox" style="padding-left: 0px;"><input type="checkbox" name="goodsDispYn10" value="Y" checked></label>]<br>
 											<br>
 												<button type="button" class="btn btn-danger btn-lg" id=""
-													onclick="btnDeleteGridNum8('gridOptions_c10');">구분
+													onclick="btnDeleteGridNum10('gridOptions_c10');">구분
 													삭제</button>
 											</th>
 											<td>
@@ -1006,7 +1006,7 @@
 														<tr>
 															<th>상품 노출 기준</th>
 															<td>
-																<label class="rdoBtn"><input type="radio" name="goodsType10" value="G082_50" />1개</label> 
+																<label class="rdoBtn"><input type="radio" name="goodsType10" value="G082_50" checked/>1개</label> 
 																<label class="rdoBtn"><input type="radio" name="goodsType10" value="G082_51" />2개</label> 
 																<label class="rdoBtn"><input type="radio" name="goodsType10" value="G082_52" />4개</label>
 															</td>
@@ -1370,10 +1370,8 @@
 			$("#planTemplateForm input[name=goodsTitle1]").val('');
 			$("#planTemplateForm input[name=goodsUrl1]").val('');
 			$("#planTemplateForm input[name=goodsDispOrd1]").val('');
-			$('#planTemplateForm input:radio[name=goodsType1]').prop('checked', false);
-			$('#planTemplateForm input:radio[name=linkOpenGb1]').prop('checked', false);
-			$('#planTemplateForm input:checkbox[name=goodsDispYn1]').prop('checked', false);
-			gridOptions_p1.api.updateRowData();
+			//gagaAgGrid.removeRowData(gridOptions_p1, false);
+			gridOptions_p1.api.updateRowData({remove:gagaAgGrid.getAllRowData(gridOptions_p1)});
 		}
 	}		
 	function btnDeleteGridNum2(param){
@@ -1388,10 +1386,7 @@
 			$("#planTemplateForm input[name=goodsTitle2]").val('');
 			$("#planTemplateForm input[name=goodsUrl2]").val('');
 			$("#planTemplateForm input[name=goodsDispOrd2]").val('');
-			$('#planTemplateForm input:radio[name=goodsType2]').prop('checked', false);
-			$('#planTemplateForm input:radio[name=linkOpenGb2]').prop('checked', false);
-			$('#planTemplateForm input:checkbox[name=goodsDispYn2]').prop('checked', false);
-			gridOptions_p2.api.updateRowData();
+			gridOptions_p2.api.updateRowData({remove:gagaAgGrid.getAllRowData(gridOptions_p2)});
 		}			
 	}			
 	function btnDeleteGridNum3(param){
@@ -1406,10 +1401,7 @@
 			$("#planTemplateForm input[name=goodsTitle3]").val('');
 			$("#planTemplateForm input[name=goodsUrl3]").val('');
 			$("#planTemplateForm input[name=goodsDispOrd3]").val('');
-			$('#planTemplateForm input:radio[name=goodsType3]').prop('checked', false);
-			$('#planTemplateForm input:radio[name=linkOpenGb3]').prop('checked', false);
-			$('#planTemplateForm input:checkbox[name=goodsDispYn3]').prop('checked', false);
-			gridOptions_p3.api.updateRowData();
+			gridOptions_p3.api.updateRowData({remove:gagaAgGrid.getAllRowData(gridOptions_p3)});
 		}			
 	}		
 	function btnDeleteGridNum4(param){
@@ -1424,10 +1416,7 @@
 			$("#planTemplateForm input[name=goodsTitle4]").val('');
 			$("#planTemplateForm input[name=goodsUrl4]").val('');
 			$("#planTemplateForm input[name=goodsDispOrd4]").val('');
-			$('#planTemplateForm input:radio[name=goodsType4]').prop('checked', false);
-			$('#planTemplateForm input:radio[name=linkOpenGb4]').prop('checked', false);
-			$('#planTemplateForm input:checkbox[name=goodsDispYn4]').prop('checked', false);
-			gridOptions_p4.api.updateRowData();
+			gridOptions_p4.api.updateRowData({remove:gagaAgGrid.getAllRowData(gridOptions_p4)});
 		}			
 	}
 	function btnDeleteGridNum5(param){
@@ -1442,10 +1431,7 @@
 			$("#planTemplateForm input[name=goodsTitle5]").val('');
 			$("#planTemplateForm input[name=goodsUrl5]").val('');
 			$("#planTemplateForm input[name=goodsDispOrd5]").val('');
-			$('#planTemplateForm input:radio[name=goodsType5]').prop('checked', false);
-			$('#planTemplateForm input:radio[name=linkOpenGb5]').prop('checked', false);
-			$('#planTemplateForm input:checkbox[name=goodsDispYn5]').prop('checked', false);
-			gridOptions_p5.api.updateRowData();
+			gridOptions_p5.api.updateRowData({remove:gagaAgGrid.getAllRowData(gridOptions_p5)});
 		}
 	} 
 	function btnDeleteGridNum6(param){
@@ -1460,10 +1446,7 @@
 			$("#planTemplateForm input[name=goodsTitle6]").val('');
 			$("#planTemplateForm input[name=goodsUrl6]").val('');
 			$("#planTemplateForm input[name=goodsDispOrd6]").val('');
-			$('#planTemplateForm input:radio[name=goodsType6]').prop('checked', false);
-			$('#planTemplateForm input:radio[name=linkOpenGb6]').prop('checked', false);
-			$('#planTemplateForm input:checkbox[name=goodsDispYn6]').prop('checked', false);
-			gridOptions_p6.api.updateRowData();
+			gridOptions_p6.api.updateRowData({remove:gagaAgGrid.getAllRowData(gridOptions_p6)});
 		}
 	} 
 	function btnDeleteGridNum7(param){
@@ -1478,10 +1461,7 @@
 			$("#planTemplateForm input[name=goodsTitle7]").val('');
 			$("#planTemplateForm input[name=goodsUrl7]").val('');
 			$("#planTemplateForm input[name=goodsDispOrd7]").val('');
-			$('#planTemplateForm input:radio[name=goodsType7]').prop('checked', false);
-			$('#planTemplateForm input:radio[name=linkOpenGb7]').prop('checked', false);
-			$('#planTemplateForm input:checkbox[name=goodsDispYn7]').prop('checked', false);
-			gridOptions_p7.api.updateRowData();
+			gridOptions_p7.api.updateRowData({remove:gagaAgGrid.getAllRowData(gridOptions_p7)});
 		}
 	} 
 	function btnDeleteGridNum8(param){
@@ -1496,10 +1476,7 @@
 			$("#planTemplateForm input[name=goodsTitle8]").val('');
 			$("#planTemplateForm input[name=goodsUrl8]").val('');
 			$("#planTemplateForm input[name=goodsDispOrd8]").val('');
-			$('#planTemplateForm input:radio[name=goodsType8]').prop('checked', false);
-			$('#planTemplateForm input:radio[name=linkOpenGb8]').prop('checked', false);
-			$('#planTemplateForm input:checkbox[name=goodsDispYn8]').prop('checked', false);
-			gridOptions_p8.api.updateRowData();
+			gridOptions_p8.api.updateRowData({remove:gagaAgGrid.getAllRowData(gridOptions_p8)});
 		}
 	} 
 	function btnDeleteGridNum9(param){
@@ -1514,10 +1491,7 @@
 			$("#planTemplateForm input[name=goodsTitle9]").val('');
 			$("#planTemplateForm input[name=goodsUrl9]").val('');
 			$("#planTemplateForm input[name=goodsDispOrd9]").val('');
-			$('#planTemplateForm input:radio[name=goodsType9]').prop('checked', false);
-			$('#planTemplateForm input:radio[name=linkOpenGb9]').prop('checked', false);
-			$('#planTemplateForm input:checkbox[name=goodsDispYn9]').prop('checked', false);
-			gridOptions_p9.api.updateRowData();
+			gridOptions_p9.api.updateRowData({remove:gagaAgGrid.getAllRowData(gridOptions_p9)});
 		}
 	} 
 	function btnDeleteGridNum10(param){
@@ -1532,10 +1506,7 @@
 			$("#planTemplateForm input[name=goodsTitle10]").val('');
 			$("#planTemplateForm input[name=goodsUrl10]").val('');
 			$("#planTemplateForm input[name=goodsDispOrd10]").val('');
-			$('#planTemplateForm input:radio[name=goodsType10]').prop('checked', false);
-			$('#planTemplateForm input:radio[name=linkOpenGb10]').prop('checked', false);
-			$('#planTemplateForm input:checkbox[name=goodsDispYn10]').prop('checked', false);
-			gridOptions_p10.api.updateRowData();
+			gridOptions_p10.api.updateRowData({remove:gagaAgGrid.getAllRowData(gridOptions_p10)});
 		}
 	} 	
 	
@@ -1745,108 +1716,6 @@
 			}
 		}
 		
-		// 리뷰 전시 클릭했을 경우
-		if($("input:checkbox[name=reDispYn]").prop("checked")){
-			$("input:checkbox[name=reDispYn]").val('Y');
-			if($("input[name=reTitle]").val()==''){
-				mcxDialog.alert('리뷰 타이틀을 입력하세요.');
-				return;
-			}
-			if($("input[name=reDispOrd]").val()==''){
-				mcxDialog.alert('리뷰 전시순서를 입력하세요.');
-				return;
-			}
-			if(multiPlanReview.length == 0){
-				mcxDialog.alert('리뷰 상품을 선택하세요.');
-				return;
-			}
-			
-		}else{
-			$("input:checkbox[name=reDispYn]").val('N');
-		}
-		
-		// 쿠폰 전시 클랙했을 경우
-		if($("input:checkbox[name=cuDispYn]").prop("checked")){
-			$("input:checkbox[name=cuDispYn]").val('Y');
-			if($("input[name=cuTitle]").val()==''){
-				mcxDialog.alert('쿠폰 타이틀을 입력하세요.');
-				return;
-			}
-			if($("input[name=cuDispOrd]").val()==''){
-				mcxDialog.alert('쿠폰 전시순서를 입력하세요.');
-				return;
-			}
-			if(multiPlanCoupon.length == 0){
-				mcxDialog.alert('쿠폰을 선택하세요.');
-				return;
-			}
-			/* 
-			if(multiPlanCouponNotice.length == 0){
-				mcxDialog.alert('쿠폰 유의사항을 입력하세요.');
-				return;
-			} */
-			
-			
-		}else{
-			$("input:checkbox[name=cuDispYn]").val('N');
-		}
-		
-		// 이미지 전시 클랙했을 경우
-		if($("input:checkbox[name=fileDispYn]").prop("checked")){
-			$("input:checkbox[name=fileDispYn]").val('Y');
-			
-			if($("input[name=fileDispOrd]").val()==''){
-				mcxDialog.alert('이미지 전시순서를 입력하세요.');
-				return;
-			}
-			if(multiPlanFile.length == 0 && $("#dnFile").text() == null){
-				mcxDialog.alert('등록할 이미지를 등록하세요.');
-				return;
-			}
-			
-		}else{
-			$("input:checkbox[name=fileDispOrd]").val('N');
-		}
-		
-		// 유의사항 전시 클랙했을 경우
-		if($("input:checkbox[name=noticeDispYn]").prop("checked")){
-			$("input:checkbox[name=noticeDispYn]").val('Y');
-			
-			if($("input[name=noticeDispOrd]").val()==''){
-				mcxDialog.alert('유의사항 전시순서를 입력하세요.');
-				return;
-			}
-			if(multiPlanNotice.length == 0){
-				mcxDialog.alert('등록할 유의사항를 입력하세요.');
-				return;
-			}
-			
-		}else{
-			$("input:checkbox[name=noticeDispOrd]").val('N');
-		}
-		
-		// html 상단 전시 클릭했을 경우
-		if($("input:checkbox[name=topFsrcDispYn]").prop("checked")){
-			$("input:checkbox[name=topFsrcDispYn]").val('Y');
-			if($("textarea[name=fsrcMobileTop]").val()=='' && $("textarea[name=fsrcPcTop]").val()==''){
-				mcxDialog.alert('HTML[상단] 내용을  입력하세요.');
-				return;
-			}
-		}else{
-			$("input:checkbox[name=topFsrcDispYn]").val('N');
-		}
-		
-		// html 하단 전시 클릭했을 경우
-		if($("input:checkbox[name=btmFsrcDispYn]").prop("checked")){
-			$("input:checkbox[name=btmFsrcDispYn]").val('Y');
-			if($("textarea[name=fsrcMobileBtm]").val()=='' && $("textarea[name=fsrcPcBtm]").val()==''){
-				mcxDialog.alert('HTML[하단] 내용을  입력하세요.');
-				return;
-			}
-		}else{
-			$("input:checkbox[name=btmFsrcDispYn]").val('N');
-		}
-		
 		// 상품 등록
 		let arrayData1 = gagaAgGrid.getAllRowData(gridOptions_p1)
 		let arrayData2 = gagaAgGrid.getAllRowData(gridOptions_p2)
@@ -1860,208 +1729,6 @@
 		let arrayData10 = gagaAgGrid.getAllRowData(gridOptions_p10)
 		
 
-		//상품 등록 CHECK
-		//상품구분 1
-		if($("input:checkbox[name=goodsDispYn1]").prop("checked")){
-			$("input:checkbox[name=goodsDispYn1]").val('Y');
-			
-			if($("input[name=goodsTitle1]").val()==''){
-				mcxDialog.alert('상품 구분1의 타이틀을 입력하세요.');
-				return;
-			}
-			if($("input[name=goodsDispOrd1]").val()==''){
-				mcxDialog.alert('상품 구분1의 전시순서를 입력하세요.');
-				return;
-			}
-			if(arrayData1.length == 0 && $('#btnAddGridNum1').css('display') != 'none'){
-				mcxDialog.alert('상품 구분1 의 상품을 등록해주세요.');
-				return false;
-			}
-		}else{
-			$("input:checkbox[name=goodsDispYn1]").val('N');
-		}
-		
-		//상품구분 2
-		if($("input:checkbox[name=goodsDispYn2]").prop("checked")){
-			$("input:checkbox[name=goodsDispYn2]").val('Y');
-			
-			if($("input[name=goodsTitle2]").val()==''){
-				mcxDialog.alert('상품 구분2의 타이틀을 입력하세요.');
-				return;
-			}
-			if($("input[name=goodsDispOrd2]").val()==''){
-				mcxDialog.alert('상품 구분2의 전시순서를 입력하세요.');
-				return;
-			}
-			if(arrayData2.length == 0 && $('#btnAddGridNum2').css('display') != 'none'){
-				mcxDialog.alert('상품 구분2 의 상품을 등록해주세요.');
-				return false;
-			}
-		}else{
-			$("input:checkbox[name=goodsDispYn2]").val('N');
-		}
-		
-		//상품구분 3
-		if($("input:checkbox[name=goodsDispYn3]").prop("checked")){
-			$("input:checkbox[name=goodsDispYn3]").val('Y');
-			
-			if($("input[name=goodsTitle3]").val()==''){
-				mcxDialog.alert('상품 구분3의 타이틀을 입력하세요.');
-				return;
-			}
-			if($("input[name=goodsDispOrd3]").val()==''){
-				mcxDialog.alert('상품 구분3의 전시순서를 입력하세요.');
-				return;
-			}
-			if(arrayData3.length == 0 && $('#btnAddGridNum3').css('display') != 'none'){
-				mcxDialog.alert('상품 구분3 의 상품을 등록해주세요.');
-				return false;
-			}
-		}else{
-			$("input:checkbox[name=goodsDispYn3]").val('N');
-		}
-		
-		//상품구분 4
-		if($("input:checkbox[name=goodsDispYn4]").prop("checked")){
-			$("input:checkbox[name=goodsDispYn4]").val('Y');
-			
-			if($("input[name=goodsTitle4]").val()==''){
-				mcxDialog.alert('상품 구분4의 타이틀을 입력하세요.');
-				return;
-			}
-			if($("input[name=goodsDispOrd4]").val()==''){
-				mcxDialog.alert('상품 구분4의 전시순서를 입력하세요.');
-				return;
-			}
-			if(arrayData4.length == 0 && $('#btnAddGridNum4').css('display') != 'none'){
-				mcxDialog.alert('상품 구분4 의 상품을 등록해주세요.');
-				return false;
-			}
-		}else{
-			$("input:checkbox[name=goodsDispYn4]").val('N');
-		}
-		
-		//상품구분 5
-		if($("input:checkbox[name=goodsDispYn5]").prop("checked")){
-			$("input:checkbox[name=goodsDispYn5]").val('Y');
-			
-			if($("input[name=goodsTitle5]").val()==''){
-				mcxDialog.alert('상품 구분5의 타이틀을 입력하세요.');
-				return;
-			}
-			if($("input[name=goodsDispOrd5]").val()==''){
-				mcxDialog.alert('상품 구분5의 전시순서를 입력하세요.');
-				return;
-			}
-			if(arrayData5.length == 0 && $('#btnAddGridNum5').css('display') != 'none'){
-				mcxDialog.alert('상품 구분5 의 상품을 등록해주세요.');
-				return false;
-			}
-		}else{
-			$("input:checkbox[name=goodsDispYn5]").val('N');
-		}
-		
-		//상품구분 6
-		if($("input:checkbox[name=goodsDispYn6]").prop("checked")){
-			$("input:checkbox[name=goodsDispYn6]").val('Y');
-			
-			if($("input[name=goodsTitle6]").val()==''){
-				mcxDialog.alert('상품 구분6의 타이틀을 입력하세요.');
-				return;
-			}
-			if($("input[name=goodsDispOrd6]").val()==''){
-				mcxDialog.alert('상품 구분6의 전시순서를 입력하세요.');
-				return;
-			}
-			if(arrayData6.length == 0 && $('#btnAddGridNum6').css('display') != 'none'){
-				mcxDialog.alert('상품 구분6 의 상품을 등록해주세요.');
-				return false;
-			}
-		}else{
-			$("input:checkbox[name=goodsDispYn6]").val('N');
-		}
-		
-		//상품구분 7
-		if($("input:checkbox[name=goodsDispYn7]").prop("checked")){
-			$("input:checkbox[name=goodsDispYn7]").val('Y');
-			
-			if($("input[name=goodsTitle7]").val()==''){
-				mcxDialog.alert('상품 구분7의 타이틀을 입력하세요.');
-				return;
-			}
-			if($("input[name=goodsDispOrd7]").val()==''){
-				mcxDialog.alert('상품 구분7의 전시순서를 입력하세요.');
-				return;
-			}
-			if(arrayData7.length == 0 && $('#btnAddGridNum7').css('display') != 'none'){
-				mcxDialog.alert('상품 구분7 의 상품을 등록해주세요.');
-				return false;
-			}
-		}else{
-			$("input:checkbox[name=goodsDispYn7]").val('N');
-		}
-		
-		//상품구분 8
-		if($("input:checkbox[name=goodsDispYn8]").prop("checked")){
-			$("input:checkbox[name=goodsDispYn8]").val('Y');
-			
-			if($("input[name=goodsTitle8]").val()==''){
-				mcxDialog.alert('상품 구분8의 타이틀을 입력하세요.');
-				return;
-			}
-			if($("input[name=goodsDispOrd8]").val()==''){
-				mcxDialog.alert('상품 구분8의 전시순서를 입력하세요.');
-				return;
-			}
-			if(arrayData8.length == 0 && $('#btnAddGridNum8').css('display') != 'none'){
-				mcxDialog.alert('상품 구분8 의 상품을 등록해주세요.');
-				return false;
-			}
-		}else{
-			$("input:checkbox[name=goodsDispYn8]").val('N');
-		}
-		
-		//상품구분 9
-		if($("input:checkbox[name=goodsDispYn9]").prop("checked")){
-			$("input:checkbox[name=goodsDispYn9]").val('Y');
-			
-			if($("input[name=goodsTitle9]").val()==''){
-				mcxDialog.alert('상품 구분9의 타이틀을 입력하세요.');
-				return;
-			}
-			if($("input[name=goodsDispOrd9]").val()==''){
-				mcxDialog.alert('상품 구분9의 전시순서를 입력하세요.');
-				return;
-			}
-			if(arrayData9.length == 0 && $('#btnAddGridNum9').css('display') != 'none'){
-				mcxDialog.alert('상품 구분9 의 상품을 등록해주세요.');
-				return false;
-			}
-		}else{
-			$("input:checkbox[name=goodsDispYn9]").val('N');
-		}
-		
-		//상품구분 10
-		if($("input:checkbox[name=goodsDispYn10]").prop("checked")){
-			$("input:checkbox[name=goodsDispYn10]").val('Y');
-			
-			if($("input[name=goodsTitle10]").val()==''){
-				mcxDialog.alert('상품 구분10의 타이틀을 입력하세요.');
-				return;
-			}
-			if($("input[name=goodsDispOrd10]").val()==''){
-				mcxDialog.alert('상품 구분10의 전시순서를 입력하세요.');
-				return;
-			}
-			if(arrayData10.length == 0 && $('#btnAddGridNum10').css('display') != 'none'){
-				mcxDialog.alert('상품 구분10의 상품을 등록해주세요.');
-				return false;
-			}
-		}else{
-			$("input:checkbox[name=goodsDispYn10]").val('N');
-		}
-	
-		
 		let goodsTemp1 = {};
 		let goodsTemp2 = {};
 		let goodsTemp3 = {};
@@ -2277,6 +1944,139 @@ $(document).ready(function() {
 		gagaAgGrid.createGrid("gridTempGbList9", gridOptions_p9);
 		gagaAgGrid.createGrid("gridTempGbList10", gridOptions_p10);
 		
+		$("input:checkbox[name=reDispYn]").change(function() {
+			if($("input:checkbox[name=reDispYn]").is(":checked")){
+				$("input:checkbox[name=reDispYn]").val('Y');
+	        }else{
+	        	$("input:checkbox[name=reDispYn]").val('N');
+	        }
+		})
+		
+		$("input:checkbox[name=cuDispYn]").change(function() {
+			if($("input:checkbox[name=cuDispYn]").is(":checked")){
+				$("input:checkbox[name=cuDispYn]").val('Y');
+	        }else{
+	        	$("input:checkbox[name=cuDispYn]").val('N');
+	        }
+		})
+		
+		$("input:checkbox[name=fileDispYn]").change(function() {
+			if($("input:checkbox[name=fileDispYn]").is(":checked")){
+				$("input:checkbox[name=fileDispYn]").val('Y');
+	        }else{
+	        	$("input:checkbox[name=fileDispYn]").val('N');
+	        }
+		})
+		
+		$("input:checkbox[name=noticeDispYn]").change(function() {
+			if($("input:checkbox[name=noticeDispYn]").is(":checked")){
+				$("input:checkbox[name=noticeDispYn]").val('Y');
+	        }else{
+	        	$("input:checkbox[name=noticeDispYn]").val('N');
+	        }
+		})
+		
+		$("input:checkbox[name=topFsrcDispYn]").change(function() {
+			if($("input:checkbox[name=topFsrcDispYn]").is(":checked")){
+				$("input:checkbox[name=topFsrcDispYn]").val('Y');
+	        }else{
+	        	$("input:checkbox[name=topFsrcDispYn]").val('N');
+	        }
+		})
+		
+		$("input:checkbox[name=btmFsrcDispYn]").change(function() {
+			if($("input:checkbox[name=btmFsrcDispYn]").is(":checked")){
+				$("input:checkbox[name=btmFsrcDispYn]").val('Y');
+	        }else{
+	        	$("input:checkbox[name=btmFsrcDispYn]").val('N');
+	        }
+		})
+		
+		$("input:checkbox[name=goodsDispYn1]").change(function() {
+			if($("input:checkbox[name=goodsDispYn1]").is(":checked")){
+				$("input:checkbox[name=goodsDispYn1]").val('Y');
+	        }else{
+	        	$("input:checkbox[name=goodsDispYn1]").val('N');
+	        }
+		})
+		
+		$("input:checkbox[name=goodsDispYn2]").change(function() {
+			if($("input:checkbox[name=goodsDispYn2]").is(":checked")){
+				$("input:checkbox[name=goodsDispYn2]").val('Y');
+	        }else{
+	        	$("input:checkbox[name=goodsDispYn2]").val('N');
+	        }
+		})
+		
+		$("input:checkbox[name=goodsDispYn3]").change(function() {
+			if($("input:checkbox[name=goodsDispYn3]").is(":checked")){
+				$("input:checkbox[name=goodsDispYn3]").val('Y');
+	        }else{
+	        	$("input:checkbox[name=goodsDispYn3]").val('N');
+	        }
+		})
+		
+		$("input:checkbox[name=goodsDispYn4]").change(function() {
+			if($("input:checkbox[name=goodsDispYn4]").is(":checked")){
+				$("input:checkbox[name=goodsDispYn4]").val('Y');
+	        }else{
+	        	$("input:checkbox[name=goodsDispYn4]").val('N');
+	        }
+		})
+		
+		$("input:checkbox[name=goodsDispYn5]").change(function() {
+			if($("input:checkbox[name=goodsDispYn5]").is(":checked")){
+				$("input:checkbox[name=goodsDispYn5]").val('Y');
+	        }else{
+	        	$("input:checkbox[name=goodsDispYn5]").val('N');
+	        }
+		})
+		
+		$("input:checkbox[name=goodsDispYn6]").change(function() {
+			if($("input:checkbox[name=goodsDispYn6]").is(":checked")){
+				$("input:checkbox[name=goodsDispYn6]").val('Y');
+	        }else{
+	        	$("input:checkbox[name=goodsDispYn6]").val('N');
+	        }
+		})
+		
+		$("input:checkbox[name=goodsDispYn7]").change(function() {
+			if($("input:checkbox[name=goodsDispYn7]").is(":checked")){
+				$("input:checkbox[name=goodsDispYn7]").val('Y');
+	        }else{
+	        	$("input:checkbox[name=goodsDispYn7]").val('N');
+	        }
+		})
+		
+		$("input:checkbox[name=goodsDispYn8]").change(function() {
+			if($("input:checkbox[name=goodsDispYn8]").is(":checked")){
+				$("input:checkbox[name=goodsDispYn8]").val('Y');
+	        }else{
+	        	$("input:checkbox[name=goodsDispYn8]").val('N');
+	        }
+		})
+		
+		$("input:checkbox[name=goodsDispYn9]").change(function() {
+			if($("input:checkbox[name=goodsDispYn9]").is(":checked")){
+				$("input:checkbox[name=goodsDispYn9]").val('Y');
+	        }else{
+	        	$("input:checkbox[name=goodsDispYn9]").val('N');
+	        }
+		})
+		
+		$("input:checkbox[name=goodsDispYn10]").change(function() {
+			if($("input:checkbox[name=goodsDispYn10]").is(":checked")){
+				$("input:checkbox[name=goodsDispYn10]").val('Y');
+	        }else{
+	        	$("input:checkbox[name=goodsDispYn10]").val('N');
+	        }
+		})
+		
+		
+		
+		
+		
+		
 		if(mode == 'U'){
 			if(typeof reviewList[0] != 'undefined'){
 				// 리뷰
@@ -2342,7 +2142,8 @@ $(document).ready(function() {
 					$("#planTemplateForm select[name=couponCnt]").val(10);
 					$("#cpnNote9").val(couponNotice.cpnNote9);
 				}
-				if(couponList.length > 0)
+				
+				if(couponList[0].cuItemNm != null && couponList[0].cuItemNm != '')
 				{
 					for (var i = 0; i <couponList.length; i++) {
 						var html =  '<tr>';
@@ -2440,45 +2241,77 @@ $(document).ready(function() {
 			//상품
 			if(typeof goodsList[0] != 'undefined'){
 				for (var i = 0; i < goodsList.length; i++) {
-					
-					
 					$('#planTemplateForm input[name=goodsTitle'+(i+1)+']').val(goodsList[i].title);						
 					$('#planTemplateForm input[name=goodsUrl'+(i+1)+']').val(goodsList[i].linkUrl);
 					$('#planTemplateForm input[name=goodsDispOrd'+(i+1)+']').val(goodsList[i].dispOrd);
 					$('#planTemplateForm input[name=goodsPlanContSq'+(i+1)+']').val(goodsList[i].planContSq);
 					$('#planTemplateForm input[name=goodsPlanContItemSq'+(i+1)+']').val(goodsList[i].planContItemSq);
 					
-					if (goodsList[i].dispYn == 'Y') {
-						$('#planTemplateForm input:checkbox[name=goodsDispYn'+(i+1)+']').prop('checked', true);
+					if (goodsList[i].title != '' || goodsList[i].linkUrl != '' ){
+						if (goodsList[i].dispYn == 'Y') {
+							$('#planTemplateForm input:checkbox[name=goodsDispYn'+(i+1)+']').prop('checked', true);
+						}else{
+							$('#planTemplateForm input:checkbox[name=goodsDispYn'+(i+1)+']').prop('checked', false);
+						}
+						
+						if(goodsList[i].tmplType == "G082_50"){
+							$('#planTemplateForm input:radio[name=goodsType'+(i+1)+']:radio[value="G082_50"]').prop('checked', true);
+						}else if(goodsList[i].tmplType == "G082_51"){
+							$('#planTemplateForm input:radio[name=goodsType'+(i+1)+']:radio[value="G082_51"]').prop('checked', true);
+						}else if(goodsList[i].tmplType == "G082_52"){
+							$('#planTemplateForm input:radio[name=goodsType'+(i+1)+']:radio[value="G082_52"]').prop('checked', true);
+						}
+						
+						if (goodsList[i].linkOpenGb == "M") {
+							$('#planTemplateForm input:radio[name=linkOpenGb'+(i+1)+']:radio[value="M"]').prop('checked', true);
+						}else if(goodsList[i].linkOpenGb == "N"){
+							$('#planTemplateForm input:radio[name=linkOpenGb'+(i+1)+']:radio[value="N"]').prop('checked', true);
+						}
+						$('#btnAddGridNum' + (i + 1)).show();
+						
 					}
 					
-					if(goodsList[i].tmplType == "G082_50"){
-						$('#planTemplateForm input:radio[name=goodsType'+(i+1)+']:radio[value="G082_50"]').prop('checked', true);
-					}else if(goodsList[i].tmplType == "G082_51"){
-						$('#planTemplateForm input:radio[name=goodsType'+(i+1)+']:radio[value="G082_51"]').prop('checked', true);
-					}else if(goodsList[i].tmplType == "G082_52"){
-						$('#planTemplateForm input:radio[name=goodsType'+(i+1)+']:radio[value="G082_52"]').prop('checked', true);
+					if(goodsDetailList1.length > 0){
+						gridOptions_p1.api.setRowData(goodsDetailList1);
+						$('#btnAddGridNum1').show();
 					}
-					
-					if (goodsList[i].linkOpenGb == "M") {
-						$('#planTemplateForm input:radio[name=linkOpenGb'+(i+1)+']:radio[value="M"]').prop('checked', true);
-					}else if(goodsList[i].linkOpenGb == "N"){
-						$('#planTemplateForm input:radio[name=linkOpenGb'+(i+1)+']:radio[value="N"]').prop('checked', true);
+					if(goodsDetailList2.length > 0){
+						gridOptions_p2.api.setRowData(goodsDetailList2);
+						$('#btnAddGridNum2').show();
 					}
-					$('#btnAddGridNum' + (i + 1)).show();
-					
-					
-					gridOptions_p1.api.setRowData(goodsDetailList1);
-					gridOptions_p2.api.setRowData(goodsDetailList2);
-					gridOptions_p3.api.setRowData(goodsDetailList3);
-					gridOptions_p4.api.setRowData(goodsDetailList4);
-					gridOptions_p5.api.setRowData(goodsDetailList5);
-					gridOptions_p6.api.setRowData(goodsDetailList6);
-					gridOptions_p7.api.setRowData(goodsDetailList7);
-					gridOptions_p8.api.setRowData(goodsDetailList8);
-					gridOptions_p9.api.setRowData(goodsDetailList9);
-					gridOptions_p10.api.setRowData(goodsDetailList10);
-					
+					if(goodsDetailList3.length > 0){
+						gridOptions_p3.api.setRowData(goodsDetailList3);
+						$('#btnAddGridNum3').show();
+					}
+					if(goodsDetailList4.length > 0){
+						gridOptions_p4.api.setRowData(goodsDetailList4);
+						$('#btnAddGridNum4').show();
+					}
+					if(goodsDetailList5.length > 0){
+						gridOptions_p5.api.setRowData(goodsDetailList5);
+						$('#btnAddGridNum5').show();
+					}
+					if(goodsDetailList6.length > 0){
+						gridOptions_p6.api.setRowData(goodsDetailList6);
+						$('#btnAddGridNum6').show();
+					}
+					if(goodsDetailList7.length > 0){
+						gridOptions_p7.api.setRowData(goodsDetailList7);
+						$('#btnAddGridNum7').show();
+					}
+					if(goodsDetailList8.length > 0){
+						gridOptions_p8.api.setRowData(goodsDetailList8);
+						$('#btnAddGridNum8').show();
+					}
+					if(goodsDetailList9.length > 0){
+						gridOptions_p9.api.setRowData(goodsDetailList9);
+						$('#btnAddGridNum9').show();
+					}
+					if(goodsDetailList10.length > 0){
+						gridOptions_p10.api.setRowData(goodsDetailList10);
+						$('#btnAddGridNum10').show();
+					} 
+						
 				}
 			}
 			

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

@@ -445,41 +445,13 @@
 			}
 		}
 		
-		$(formId + ' input[name=socialStdt]').val($(formId + ' input[name=stDate]').val() + ' ' + stTime);
-		$(formId + ' input[name=socialEddt]').val($(formId + ' input[name=edDate]').val() + ' ' + '23:59:59');
+		$(formId + ' input[name=socialStdt]').val($(formId + ' input[name=stDate]').val() + ' ' + stTime + ':00:00');
+		$(formId + ' input[name=socialEddt]').val($(formId + ' input[name=edDate]').val() + ' ' + edTime + ':59:59');
 		
 		//fnPlanCheck(planSq, msg);
 		fnSocialSave(msg);
 	}
-	
-	// 기획전 체크
-	/* var fnPlanCheck = function(planSq, msg) {
-		if (gagajf.isNull(planSq)) {
-			fnSocialSave(msg);
-			return;
-		}
-		
-		var params = new Object();
-		params.planSq = planSq;
-		var jsonData = JSON.stringify(params);
-		
-		gagajf.ajaxJsonSubmit('marketing/social/list', jsonData, function(result) {
-			if (result.length > 0) {
-				
-				var checkFlag = false;
-				var socialSq = $('#detailForm input[name=socialSq]').val();
-				$(result).each(function(idx, data) {
-					if (data.socialSq != socialSq) checkFlag = true;
-				});
-				
-				if (checkFlag) {
-					mcxDialog.alert('선택한 기획전은 이미 다른 소셜에 적용되어있습니다.');
-					return;
-				}
-			} 
-			fnSocialSave(msg);
-		});
-	} */
+
 	
 	// 소셜 저장
 	var fnSocialSave = function(msg) {

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

@@ -66,8 +66,9 @@ var columnDefs = [
 	},
 	{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:"delvQty",			width:100, cellClass: 'text-center'},
-	{headerName: "미출고수량",			field:"cancelQty",			width:100, cellClass: 'text-center'
+	{headerName: "미출고수량",		field:"cancelQty",			width:100, cellClass: 'text-center'
 		, editable 			: true
 		, cellEditor		: 'agRichSelectCellEditor'
 		, cellStyle			: {color: '#fffff', 'background-color': '#aaaaff'}

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

@@ -108,7 +108,7 @@
 			</div>
 		</div>
 
-		<div class="panelStyle">
+		<!--<div class="panelStyle">
 			<ul class="panelBar">
 				<li>
 					<button type="button" class="btn btn-info btn-lg" onclick="cfnDownloadSampleFile('SF020');">입점송장번호등록다운로드</button>
@@ -123,7 +123,7 @@
 			<div class="panelContent" style="overflow: hidden;">
 				<div id="gridList" style="width: 100%; height: 600px;" class="ag-theme-balham lh30"></div>
 			</div>
-		</div>
+		</div>-->
 		
 		<!-- //리스트 영역 -->
 		<label class="off">
@@ -169,19 +169,14 @@ var columnDefs = [
 	{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:"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:"realOrdAmt",			width:100, cellClass: 'text-center'},
 	{headerName: "배송업체",			field:"shipCompCd",			width:150, cellClass: 'text-left'
-		, editable 			: true
-		, cellEditor		: 'agRichSelectCellEditor'
-		, cellStyle			: {color: '#fffff', 'background-color': '#aaaaff'}
-		, cellEditorParams	: {
-			values: gagaAgGrid.extractValues(shipCompanyList)
-		}
 		, valueFormatter: function (params) {
 			return gagaAgGrid.lookupValue(shipCompanyList, params.value);
 		}
@@ -189,8 +184,7 @@ var columnDefs = [
 			return gagaAgGrid.lookupKey(shipCompanyList, params.newValue);
 		}
 	},
-	{headerName: "송장",				field:"invoiceNo",			width:150, cellClass: 'text-left', editable : true
-		, cellStyle			: {color: '#fffff', 'background-color': '#aaaaff'}	}
+	{headerName: "송장",				field:"invoiceNo",			width:150, cellClass: 'text-left'}
 ];
 
 var gridOptions = gagaAgGrid.getGridOptions(columnDefs);

src/main/webapp/WEB-INF/views/withdraw/RefundDetailForm.html

@@ -324,9 +324,13 @@
 		reFundInfo.ordNm       = data.ordNm;
 		reFundInfo.delvAddrSq  = data.reFundInfo;
 		reFundInfo.delvExpnYn  = data.delvExpnYn;
-		reFundInfo.mallGb           = mallGb;
-		reFundInfo.ordNo            = ordNo;
-		reFundInfo.ordChgSq         = ordChgSq;
+		reFundInfo.wdInvoiceNo   = data.wdInvoiceNo;
+		reFundInfo.mallGb      = mallGb;
+		reFundInfo.ordNo       = ordNo;
+		reFundInfo.ordChgSq    = ordChgSq;
+		
+		
+		
 		
 		// 환불컨펌 상세
 		$("#wdGbNm").text(data.wdGbNm); // 회수구분 
@@ -395,8 +399,13 @@
 		fnSetTotRefundData();
 	}
 	
-	var addDeliveryFee = 0;
+	var addDeliveryFee   = 0;
 	var addDeliveryFeeYn = "N";
+	var codFeeAmt        = 0;
+	var codFeeYn         = 'N';
+	var enCloseFeeAmt    = 0;
+	var enCloseFeeYn     = "N";
+	
 	/*************************************************************************
 	*  환불 금액 계산
 	**************************************************************************/		
@@ -404,7 +413,13 @@
 		var enCloseFee = $("#withdrawDetailForm input[name=encloseFee]").val(); //  동봉비 
 		var codFee     = $("#withdrawDetailForm input[name=codFee]").val(); //      착불비 
 		var addPaycost = $("#withdrawDetailForm input[name=addPayCost]").val(); //  추가 결제비 
-
+		addDeliveryFee   = 0;
+		addDeliveryFeeYn = "N";
+		codFeeAmt        = 0;
+		codFeeYn         = "N";
+		enCloseFeeAmt    = Number(enCloseFee);
+		enCloseFeeYn     = "N";
+		
 		if(delvExpnYn == "Y"){ // 출고예외(확정후 품절,불량)일 경우 
 			if(toTalOrdQty == ordChgQty){ // 총 주문수량  =  반품수량   배송비가 있을시 환불해줌 
 				
@@ -412,11 +427,11 @@
 					addDeliveryFee = reFundInfo.spanSumDeliveryFee - reFundInfo.spanDelvCpnDcAmt;
 					addDeliveryFeeYn = "Y";
 				}
-				//alert("총수량 출고예외 ");
+				alert("총수량 출고예외 ");
 				// 환불금액  = 취소 상품 실결제 금액 + 배송비 
 				reFundInfo.spanRefundAmt = (reFundInfo.spanRealCnclRtnAmt + reFundInfo.spanSumDeliveryFee - reFundInfo.spanDelvCpnDcAmt);
 			} else { // 총 주문수량  <>  반품수량   
-				//alert("출고예외");
+				alert("출고예외");
 				reFundInfo.spanRefundAmt = reFundInfo.spanRealCnclRtnAmt;
 			}
 			
@@ -424,34 +439,55 @@
 			if(toTalOrdQty == ordChgQty){// 총 주문수량  =  반품수량   
 				if(isCustomer){ //고객귀책 
 					if(wdGb == "W"){ // 회수요청
-						//alert("총수량 고객귀책 - 회수요청");
+						alert("총수량 고객귀책 - 회수요청");
 						// 환불금액  = 취소 상품 실결제 금액 + 배송비 - 추가배송비 - 반품배송비 
+						if(Number(enCloseFee) > 0){
+							enCloseFeeYn = "Y";
+						}
 						reFundInfo.spanRefundAmt = (reFundInfo.spanRealCnclRtnAmt + Number(enCloseFee) + Number(addPaycost)) - (reFundInfo.spanTotDeliveryFee - reFundInfo.spanDelvCpnDcAmt)  - reFundInfo.spanTotRtnDelvFee;
 					} else {         // 직접배송
-						//alert("총수량 고객귀책 - 직접배송");
+						alert("총수량 고객귀책 - 직접배송");
+					
+						if(Number(codFee) > 0){
+							codFeeAmt = Number(codFee);
+							codFeeYn  = "Y";
+						}
+						if(Number(enCloseFee) > 0){
+							enCloseFeeYn = "Y";
+						}
 						reFundInfo.spanRefundAmt = (reFundInfo.spanRealCnclRtnAmt + Number(enCloseFee) + Number(addPaycost)) - (reFundInfo.spanTotDeliveryFee - reFundInfo.spanDelvCpnDcAmt) - Number(codFee);
 					}
 				} else { // 회사귀책
-					//alert("총수량 회사귀책 ");
+					alert("총수량 회사귀책 ");
 					if(reFundInfo.spanSumDeliveryFee > 0){
 						addDeliveryFee = reFundInfo.spanSumDeliveryFee - reFundInfo.spanDelvCpnDcAmt;
 						addDeliveryFeeYn = "Y";
 					}
-					reFundInfo.spanRefundAmt = (reFundInfo.spanRealCnclRtnAmt + (reFundInfo.spanSumDeliveryFee - reFundInfo.spanDelvCpnDcAmt) - Number(codFee)) 
+					reFundInfo.spanRefundAmt = (reFundInfo.spanRealCnclRtnAmt + (reFundInfo.spanSumDeliveryFee - reFundInfo.spanDelvCpnDcAmt)) 
 				}
 			} else { // 총 주문수량  <>  반품수량   
 				if(isCustomer){ //고객귀책 
 					if(wdGb == "W"){ // 회수요청
-						//alert(" 고객귀책- 회수요청 ");
+						alert(" 고객귀책- 회수요청 ");
+						if(Number(enCloseFee) > 0){
+							enCloseFeeYn = "Y";
+						}
 						// 환불금액  = 취소 상품 실결제 금액   - 반품배송비 
 						reFundInfo.spanRefundAmt = (reFundInfo.spanRealCnclRtnAmt + Number(enCloseFee) + Number(addPaycost))  - reFundInfo.spanTotRtnDelvFee;
 					} else {         // 직접배송
-						//alert(" 고객귀책- 직접배송 ");
+						alert(" 고객귀책- 직접배송 ");
+						if(Number(codFee) > 0){
+							codFeeAmt = Number(codFee);
+							codFeeYn  = "Y";
+						}
+						if(Number(enCloseFee) > 0){
+							enCloseFeeYn = "Y";
+						}
 						reFundInfo.spanRefundAmt = (reFundInfo.spanRealCnclRtnAmt + Number(enCloseFee) - Number(codFee));
 					}
 				} else { // 회사귀책
-					//alert(" 회사귀책 ");
-					reFundInfo.spanRefundAmt = reFundInfo.spanRealCnclRtnAmt - Number(codFee);
+					alert(" 회사귀책 ");
+					reFundInfo.spanRefundAmt = reFundInfo.spanRealCnclRtnAmt ;
 				}
 			}
 		}
@@ -511,7 +547,11 @@
 		var pgStat = $('#withdrawDetailForm input:checkbox[name=pgStats]').is(":checked") ? "Y" : "N"; 
 		reFundInfo.addDeliveryFee   = addDeliveryFee;
 		reFundInfo.addDeliveryFeeYn = addDeliveryFeeYn;
+		reFundInfo.codFee           = codFeeAmt;
+		reFundInfo.codFeeYn         = codFeeYn;
 		reFundInfo.pgStat           = pgStat;
+		reFundInfo.enCloseFeeYn     = enCloseFeeYn;
+		reFundInfo.enCloseFee       = enCloseFeeAmt;
 		
 		var jsonData = JSON.stringify(reFundInfo);