Merge branch 'develop' into bin2107

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

@@ -342,9 +342,7 @@ public class TsaPlanService {
 		}
 		
 		//기존 회원구분 삭제
-		for (int i = 0; i < param.getUsableCustGbArr().length; i++) {
-			planDao.deletePlanCustGb(param);
-		}
+		planDao.deletePlanCustGb(param);
 		
 		
 		// 기획전 회원구분 insert
@@ -357,9 +355,8 @@ public class TsaPlanService {
 		}
 		
 		//기존 회원등급 삭제
-		for (int i = 0; i < param.getUsableCustGradeArr().length; i++) {
-			planDao.deletePlanCustGrade(param);
-		}
+		planDao.deletePlanCustGrade(param);
+		
 		
 		// 기획전 회원등급 insert
 		String[] custGrade = param.getUsableCustGradeArr();
@@ -369,6 +366,7 @@ public class TsaPlanService {
 			plan.setRegNo(TsaSession.getInfo().getUserNo());
 			planDao.createPlanCustGrade(plan);
 		}
+		
 		int ind = 1;
 		if(param.getMainPimg() != null && !"".equals(param.getMainPimg())){
 			String imgInd = String.valueOf(ind);

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

@@ -21,5 +21,6 @@ public class DelvFeePolicy extends TscBaseDomain {
 	private int delvFee;			// 배송비
 	private int rtnDelvFee;			// 반품배송비
 	private String useYn;			// 사용여부
+	private String distributionGb;	// 유통구분
 
 }

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

@@ -348,7 +348,18 @@
 		     , USE_YN = #{useYn}
 		     , UPD_NO = #{updNo}
 		     , UPD_DT = NOW()
-		WHERE  DELV_FEE_CD = #{delvFeeCd}
+		WHERE  1 = 1
+		<choose>
+		    <when test="distributionGb == 'G065_20'"> <!-- 입점-위탁 -->
+		AND    DELV_FEE_CD = #{delvFeeCd}
+		    </when>
+		    <otherwise>
+		AND    SUPPLY_COMP_CD IN (SELECT SUPPLY_COMP_CD
+		                          FROM   TB_SUPPLY_COMPANY
+		                          WHERE  DISTRIBUTION_GB != 'G065_20' /*자사*/
+		                         )
+		    </otherwise>
+		</choose>
 	</update>
 	
 	<!-- 출고처 목록 -->

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

@@ -439,6 +439,13 @@
 		$('#detailForm input[name=bizDtlAddr]').val(event.data.bizDtlAddr);
 		$('#detailForm input[name=homepageUrl]').val(event.data.homepageUrl);
 		$('#detailForm select[name=distributionGb]').val(event.data.distributionGb);
+		
+		if (event.data.distributionGb == 'G065_20') { // 입점업체
+			$('#btnAddDelvFeePolicy').show();
+		} else { // 자사업체
+			$('#btnAddDelvFeePolicy').hide();
+		}
+		
 		$('#detailForm input[name=mainTelno]').val(event.data.mainTelno);
 		$('#detailForm input[name=mainFaxno]').val(event.data.mainFaxno);
 		$('#detailForm input[name=sellFeeRate]').val(event.data.sellFeeRate);
@@ -656,6 +663,7 @@
 					params.delvFee = $(this).find('input[name=delvFee]').val();
 					params.rtnDelvFee = $(this).find('select[name=rtnDelvFee]').val();
 					params.useYn = $(this).find('select[name=useYn]').val();
+					params.distributionGb = $('#detailForm select[name=distributionGb]').val();
 					arrData.push(params);
 				});
 				
@@ -690,10 +698,6 @@
 	$(document).ready(function() {
 		// Create a agGrid
 		gagaAgGrid.createGrid('gridList', gridOptions);
-		
-		// Create a summernote
-		var snOptions = gagaSn.getToolbarOptions('media');
-		gagaSn.createSummernote(snOptions, '#note');
 	});
 /*]]>*/
 </script>

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

@@ -134,7 +134,7 @@
 					<tr>
 					</tr>
 					<tr>
-						<th>사용고객등급구분<em class="required" title="필수"></em></th>
+						<th>사용고객등급구분</th>
 						<td>
 							<label class="chkBox" th:if="${usableCustGradeList}" th:each="oneData, status : ${usableCustGradeList}">
 								<input type="checkbox" name="usableCustGradeArr" th:value="${oneData.cd}" th:text="${oneData.cdNm}"/>
@@ -529,7 +529,7 @@
 						
 					</tr>
 					<tr>
-						<th>사용고객등급구분<em class="required" title="필수"></em></th>
+						<th>사용고객등급구분</th>
 						<td>
 							<label class="chkBox" th:if="${usableCustGradeList}" th:each="oneData, status : ${usableCustGradeList}">
 								<input type="checkbox" name="usableCustGradeArr" th:value="${oneData.cd}" th:text="${oneData.cdNm}"/>
@@ -1162,10 +1162,10 @@
 					var usableCustGradeArr = [];
 					var chkCustGrade = $('#planRegisterForm input:checkbox[name=usableCustGradeArr]:checked');
 					
-					if(chkCustGrade.length < 1){
+					/* if(chkCustGrade.length < 1){
 						mcxDialog.alert("사용가능고객등급을 체크해주세요.");
 						return false;
-					}
+					} */
 					for(let i=0; i< chkCustGrade.length; i++){
 						usableCustGradeArr.push(chkCustGrade.eq(i).val());
 					}
@@ -1258,10 +1258,10 @@
 					var usableCustGradeArr = [];
 					var chkCustGrade = $('#planUpdateForm input:checkbox[name=usableCustGradeArr]:checked');
 					
-					if(chkCustGrade.length < 1){
+					/* if(chkCustGrade.length < 1){
 						mcxDialog.alert("사용가능고객등급을 체크해주세요.");
 						return false;
-					}
+					} */
 					
 					for(let i=0; i< chkCustGrade.length; i++){
 						usableCustGradeArr.push(chkCustGrade.eq(i).val());

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

@@ -2130,12 +2130,12 @@
 	
 	
 $(document).ready(function() {
-		gagaSn.setContents('#fsrcPcBtm', ''); 
-		gagaSn.setContents('#fsrcMobileBtm', '');
-		gagaSn.setContents('#fsrcPcTop', ''); 
-		gagaSn.setContents('#fsrcMobileTop', '');
-		gagaSn.setContents('#note', '');
-/* 		var snOptions1 = gagaSn.getToolbarOptions('media');
+		//gagaSn.setContents('#fsrcPcBtm', ''); 
+		//gagaSn.setContents('#fsrcMobileBtm', '');
+		//gagaSn.setContents('#fsrcPcTop', ''); 
+		//gagaSn.setContents('#fsrcMobileTop', '');
+		//gagaSn.setContents('#note', '');
+ 		var snOptions1 = gagaSn.getToolbarOptions('media');
 		var snOptions2 = gagaSn.getToolbarOptions('media');
 		var snOptions3 = gagaSn.getToolbarOptions('media');
 		var snOptions4 = gagaSn.getToolbarOptions('media');
@@ -2144,7 +2144,7 @@ $(document).ready(function() {
 		gagaSn.createSummernote(snOptions1, '#fsrcPcTop');
 		gagaSn.createSummernote(snOptions2, '#fsrcMobileTop');
 		gagaSn.createSummernote(snOptions3, '#fsrcPcBtm');
-		gagaSn.createSummernote(snOptions4, '#fsrcMobileBtm');  */
+		gagaSn.createSummernote(snOptions4, '#fsrcMobileBtm');  
 		
 		// 그리드 그리기
 		gagaAgGrid.createGrid("gridListPlanReview", gridOptionsPlanReviewList);

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

@@ -268,8 +268,8 @@
 							<li class="right">
 								<button type="button" class="btn btn-default btn-lg" onclick="fnOpenGoodsPopup();">상품추가</button>
 								<button type="button" class="btn btn-default btn-lg" onclick="fnDeleteGoods();">상품삭제</button>
-								<!-- <button type="button" class="btn btn-default btn-lg" onclick="fnSocialGoodsExcelUpload();">엑셀상품추가</button>
-								<button type="button" class="btn btn-default btn-lg" onclick="cfnDownloadSampleFile('SF011');">엑셀상품추가 양식 다운로드</button> -->
+								<button type="button" class="btn btn-default btn-lg" onclick="fnSocialGoodsExcelUpload();">엑셀상품추가</button>
+								<button type="button" class="btn btn-default btn-lg" onclick="cfnDownloadSampleFile('SF011');">엑셀상품추가 양식 다운로드</button>
 								<button type="button" class="btn btn-success btn-lg" onclick="fnSocialGoodsSave();">저장</button>
 							</li>
 						</ul>

src/main/webapp/ux/plugins/gaga/gaga.summernote.js

@@ -139,5 +139,6 @@ var gagaSn = {
 			}
 		});
 	}
-
+	
 }
+