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

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

@@ -576,7 +576,8 @@ public class TsaMarketingController extends TsaBaseController {
 		// 쿠폰다운로드 방식 조회
 		mav.addObject("dnGbList", rendererService.getCommonCodeList("G058"));
 		// 결제수단 조회
-		mav.addObject("payTypeList", rendererService.getCommonCodeList("G015"));
+		String[] exceptCds2 = {"INICIS","ISTYLE","NAVER_ORDER","NICE"};
+		mav.addObject("payTypeList", rendererService.getCommonCodeList("G015", "Y", exceptCds2));
 		// 상위제휴채널 조회
 		mav.addObject("upperAfLinkCdList", rendererService.getCommonCodeList("G053"));
 		// 선착순쿠폰 조회

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

@@ -145,6 +145,7 @@
 		SELECT COUNT(1)
 		  FROM TB_PlAN
 		 WHERE 1=1
+		 AND DEL_YN = 'N'
 		 <include refid="getPlanListCondition_sql"/>
 	</select>
 	

src/main/webapp/WEB-INF/views/business/SupplyCompanyForm.html

@@ -157,12 +157,13 @@
 						<th>사업장주소</th>
 						<td colspan="5">
 							<input type="text" name="bizZipcode"  class="w100" data-valid-name="우편번호" readonly="readonly"/>
+							<button type="button" class="btn btn-info btn-lg" onclick="fnOpenDaumAddr();">우편번호찾기</button>
 							<input type="text" name="bizBaseAddr" class="w300" maxlength="200" readonly="readonly"/>
-							<input type="text" name="bizDtlAddr" class="w300" maxlength="200" readonly="readonly"/>
+							<input type="text" name="bizDtlAddr" class="w300" maxlength="200"/>
 						</td>
 						<th>홈페이지URL</th>
 						<td>
-							<input type="text" name="homepageUrl" readonly="readonly"/>
+							<input type="text" name="homepageUrl" maxlength="100" readonly="readonly"/>
 						</td>
 					</tr>
 					<tr>
@@ -469,6 +470,7 @@
 		$('#detailForm input[name=accountNo]').val(event.data.accountNo);
 		$('#detailForm input[name=depositorNm]').val(event.data.depositorNm);
 		$('#detailForm textarea[name=remarks]').val(event.data.remarks);
+		$('#detailForm textarea[name=note]').val(event.data.note);
 		
 		if (event.data.useYn == 'Y') {
 			$('#detailForm input:radio[name=useYn]').eq(0).trigger('click');
@@ -482,11 +484,6 @@
 			$('#detailForm input:radio[name=shotDelvYn]').eq(1).trigger('click');
 		}
 		
-		// 공지내용. Summernote에 값 세팅
-		if (!gagajf.isNull(event.data.note)){
-			gagaSn.setContents('#note', event.data.note);	
-		}
-		
 		// 배송비 정책 조회
 		fnGetDeliveryFeePolicy(event.data.supplyCompCd);
 	}

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

@@ -338,7 +338,7 @@
 											<th>결제수단<em class="required" title="필수"></em></th>
 											<td colspan="5">
 												<label class="chkBox" th:if="${payTypeList}" th:each="oneData, status : ${payTypeList}">
-													<input type="checkbox" name="payTypeArr" th:value="${oneData.cd}" th:text="${oneData.cdNm}"/>
+													<input type="checkbox" name="payTypeArr" th:value="${oneData.cd}" th:text="${oneData.cdNm}" checked="checked"/>
 												</label>
 											</td>
 										</tr>
@@ -2486,10 +2486,6 @@
 				$("#CouponForm .buttonSpan").hide();	//행추가,삭제버튼
 			}
 
-			if($("#CouponForm input[name=rdoDcWay]:checked").val() == 'G240_10'){
-				$("#CouponForm .maxDcAmtArea").hide();
-			}
-
 			// 사용가능고객구분 체크박스 체크 제거
 			$('#CouponForm input:checkbox[name=usableCustGbArr]').prop('checked', false);
 			if(cpnCustGbList.length > 0){
@@ -2727,6 +2723,14 @@
 				}
 			}
 
+			if($("#CouponForm input[name=rdoDcWay]:checked").val() == 'G240_10') {
+				$("#CouponForm .maxDcAmtArea").hide();
+			}else{
+				$('#dcPvalSpan').text("%");
+				$('#dcMvalSpan').text("%");
+				$('#dcAvalSpan').text("%");
+			}
+
 			// 쿠폰다운 날짜
 			let edDtArr;
 			if(!gagajf.isNull(cpnDetail.downEddt)){

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

@@ -1152,10 +1152,14 @@
 					if(!validationPlanDetail()){
 						return false;
 					}
-					if ($('#planRegisterForm input[name=mainPimg]').val()=='') {
-						mcxDialog.alert("메인이미지를 등록하세요.");
-						return false;
-					}
+					
+					if($('#planRegisterForm select[name=planGb]').val() != 'S'){
+						if ($('#planRegisterForm input[name=mainPimg]').val()=='') {
+							mcxDialog.alert("목록 이미지를 등록하세요.");
+							return false;
+						}
+					} 
+					
 					var chkFrontGb = $('#planRegisterForm input:checkbox[name=frontGb]:checked');
 					
 					if(chkFrontGb.length < 1){

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

@@ -86,13 +86,6 @@
 										th:value="${oneData.cd}"
 										th:text="|[${oneData.cd}] ${oneData.cdNm}|"></option>
 							</select></td>
-
-							<!-- <th>기획전템플릿유형</th>
-							<td colspan="3"><select name="templateType">
-									<option value="">전체</option>
-									<option value="H">HTML</option>
-									<option value="T">TEXT</option>
-							</select></td> -->
 						</tr>
 
 						<tr>