Merge branch 'develop' into bin2107

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

@@ -55,6 +55,7 @@ public class SupplyCompany extends TscBaseDomain {
 	private String econtractYn;			// 전자계약여부
 	private String remarks;				// 비고
 	private String useYn;				// 사용여부
+	private String note;				// 배송안내정보(상품상세FRONT노출용)
 
 	// 검색조건
 	private String searchGb;			// 검색구분

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

@@ -139,6 +139,7 @@
 		     , SC.ECONTRACT_YN                                         /*전자계약여부*/
 		     , SC.REMARKS                                              /*비고*/
 		     , SC.USE_YN                                               /*사용여부*/
+		     , SC.NOTE                                                 /*배송안내*/
 		FROM   TB_SUPPLY_COMPANY SC
 		     , TB_SUPPLY_VENDOR SV
 		WHERE  SC.SUPPLY_VENDOR_CD = SV.SUPPLY_VENDOR_CD
@@ -213,6 +214,7 @@
 		     , ECONTRACT_YN
 		     , REMARKS
 		     , USE_YN
+		     , NOTE
 		     , REG_NO
 		     , REG_DT
 		     , UPD_NO
@@ -249,6 +251,7 @@
 		     , #{econtractYn}
 		     , #{remarks}
 		     , #{useYn}
+		     , #{note}
 		     , #{regNo}
 		     , NOW()
 		     , #{updNo}
@@ -279,6 +282,7 @@
 		     , ECONTRACT_YN = #{econtractYn}
 		     , REMARKS = #{remarks}
 		     , USE_YN = #{useYn}
+		     , NOTE = #{note}
 		     , UPD_NO = #{updNo}
 		     , UPD_DT = NOW()
 		WHERE  SUPPLY_COMP_CD = #{supplyCompCd}

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

@@ -3429,6 +3429,10 @@
 		     , #{updNo}
 		     , NOW()
 		)
+		ON DUPLICATE KEY UPDATE
+		       DISP_ORD = #{dispOrd}
+		     , UPD_NO = #{updNo}
+		     , UPD_DT = NOW()
 	</insert>
 	
 	<!-- 광고 키워드 삭제 -->

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

@@ -258,6 +258,12 @@
 							<textarea name="remarks" class="textareaR2"  data-valid-name="비고" ></textarea>
 						</td>
 					</tr>
+					<tr>
+						<th>배송안내</th>
+						<td colspan="7">
+							<textarea class="textareaR3" name="note" id="note"  data-valid-name="배송안내"></textarea>
+						</td>
+					</tr>
 				</table>
 			</form>
 			
@@ -469,6 +475,9 @@
 			$('#detailForm input:radio[name=shotDelvYn]').eq(1).trigger('click');
 		}
 		
+		// 공지내용. Summernote에 값 세팅
+		gagaSn.setContents('#note', event.data.note);
+		
 		// 배송비 정책 조회
 		fnGetDeliveryFeePolicy(event.data.supplyCompCd);
 	}
@@ -489,7 +498,7 @@
 	// 신규버튼
 	$('#btnNew').on('click', function() {
 		$("#detailForm")[0].reset();
-		
+		gagaSn.setContents('#note', '');
 		// 배송비 정책 초기화
 		$('#tbodyDelvFeePolicy').html('');
 		$('.delvFeePolicy').hide();
@@ -679,6 +688,10 @@
 	$(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/CouponPopupForm.html

@@ -320,7 +320,7 @@
 											<td>
 												<select name="downAblYn" id="downAblYn" required="required" data-valid-name="다운로드가능여부">
 													<option value="Y">Y</option>
-													<option value="Y" selected="selected">N</option>
+													<option value="N" selected="selected">N</option>
 												</select>
 											</td>
 										</tr>