수정

style24.admin/src/main/webapp/WEB-INF/views/envset/ClauseDetailForm.html

@@ -77,7 +77,7 @@
 						<tr>
 							<th>약관 내용<em class="required" title="필수"></em></th>
 							<td colspan="3">
-								<textarea class="textareaR4 summernote" name="clauseContent" data-valid-name="약관 내용"></textarea>
+								<textarea class="textareaR4" id="clauseContent" name="clauseContent" data-valid-name="약관 내용"></textarea>
 							</td>
 						</tr>
 					</tbody>
@@ -138,7 +138,7 @@
 						<tr>
 							<th>약관 내용<em class="required" title="필수"></em></th>
 							<td colspan="3">
-								<textarea class="textareaR4 summernote" name="clauseContent" data-valid-name="약관 내용" th:field="*{clauseContent}"></textarea>
+								<textarea class="textareaR4" id="clauseContent" name="clauseContent" data-valid-name="약관 내용" th:field="*{clauseContent}"></textarea>
 							</td>
 						</tr>
 					</tbody>
@@ -150,38 +150,19 @@
 		<!-- 버튼 배치 영역 -->
 		<ul class="panelBar">
 			<li class="right">
-				<button type="button" class="btn btn-info btn-lg" onclick="fnSaveClause('#clauseDetailForm');">저장</button>
+				<button type="button" class="btn btn-info btn-lg" id="btnSaveClause">저장</button>
 			</li>
 		</ul>
 		<!-- //버튼 배치 영역 -->
 	</div>
 </div>
 
-<script type="text/javascript" src="/ux/plugins/summernote/summernote.js"></script>
+<script type="text/javascript" src="/ux/plugins/summernote/summernote.js?v=2020102902"></script>
+<script type="text/javascript" src="/ux/plugins/gaga/gaga.summernote.js?v=2020102904"></script>
 <script th:inline="javascript">
 /*<![CDATA[*/
-	let mode = [[${mode}]];
-	
-	// 초기화
-	let fnInitialize = function() {
-// 		let clauseInfo = [[${clauseInfo}]];
-		
-// 		$('#clauseDetailForm input[name=clauseSq]').val(clauseInfo.clauseSq);
-// 		$('#clauseDetailForm select[name=siteCd]').val(clauseInfo.siteCd);
-// 		$('#clauseDetailForm select[name=clauseType]').val(clauseInfo.clauseType);
-// 		$('#clauseDetailForm input[name=effectDt]').val(clauseInfo.effectDt.toDate("YYYYMMDD").format("YYYY-MM-DD"));
-// 		$('#clauseDetailForm input[name=clauseTitle]').val(clauseInfo.clauseTitle);
-// 		$('#clauseDetailForm textarea[name=clauseContent]').val(clauseInfo.clauseContent);
-		
-// 		if (clauseInfo.dispYn == 'Y') {
-// 			$('#clauseDetailForm input:checkbox[name=chkDispYn]').attr('checked', true);
-// 		} else {
-// 			$("#clauseDetailForm input:checkbox[name=chkDispYn]").attr('checked', false);
-// 		}
-	}
-	
 	// 저장
-	var fnSaveClause = function() {
+	$('#btnSaveClause').on('click', function() {
 		// 입력 값 체크
 		if (!gagajf.validation('#clauseDetailForm'))
 			return false;
@@ -198,13 +179,14 @@
 				});
 			}
 		});
-	}
+	});
+	
+	// Get a summernote options
+	let snOptions = gagaSn.getToolbarOptions();
 	
 	$(document).ready(function() {
-		// 상세/수정 화면이면
-		if (mode == 'U') {
-			fnInitialize();
-		}
+		// Create a summernote
+		gagaSn.createSummernote(snOptions, '#clauseContent');
 	});
 /*]]>*/
 </script>

style24.admin/src/main/webapp/WEB-INF/views/envset/ClauseForm.html

@@ -101,7 +101,15 @@
 		},
 		{headerName: "노출여부", field: "dispYn", width: 100, cellClass: 'text-center'},
 		{headerName: "등록자", field: "regNm", width: 100, cellClass: 'text-center'},
-		{headerName: "수정자", field: "updNm", width: 100, cellClass: 'text-center'}
+		{
+			headerName: "등록일시", field: "regDt", width: 150, cellClass: 'text-center',
+			cellRenderer: function(params) { return gagaAgGrid.toDateTimeFormat(params.value); }
+		},
+		{headerName: "수정자", field: "updNm", width: 100, cellClass: 'text-center'},
+		{
+			headerName: "수정일시", field: "updDt", width: 150, cellClass: 'text-center',
+			cellRenderer: function(params) { return gagaAgGrid.toDateTimeFormat(params.value); }
+		}
 	];
 	
 	// Get GridOptions

style24.admin/src/main/webapp/WEB-INF/views/envset/EnvsetHistoryForm.html

@@ -53,11 +53,11 @@
 	// 기본설정
 	var columnDefsB11 = [
 		{headerName: 'No', width: 60, cellClass: 'text-center', valueGetter: function(params) { return params.node.rowIndex + 1 }},
-		{headerName: "탈퇴후재가입불가기간(월)", field: "numSetVal1", width: 150, cellClass: 'text-center'},
-		{headerName: "휴면회원선정기간(일)", field: "numSetVal2", width: 150, cellClass: 'text-center'},
-		{headerName: "휴면회원전환기간(일)", field: "numSetVal3", width: 150, cellClass: 'text-center'},
-		{headerName: "회원등급산정기간(월)", field: "numSetVal4", width: 150, cellClass: 'text-center'},
-		{headerName: "무료배송비최소주문금액", field: "numSetVal5", width: 150, cellClass: 'text-center', cellRenderer: function (params) { return gagaAgGrid.toAddComma(params.value);}},
+		{headerName: "탈퇴후재가입불가기간(월)", field: "strSetVal1", width: 150, cellClass: 'text-center'},
+		{headerName: "휴면회원선정기간(일)", field: "strSetVal2", width: 150, cellClass: 'text-center'},
+		{headerName: "휴면회원전환기간(일)", field: "strSetVal3", width: 150, cellClass: 'text-center'},
+		{headerName: "회원등급산정기간(월)", field: "strSetVal4", width: 150, cellClass: 'text-center'},
+		{headerName: "무료배송비최소주문금액", field: "strSetVal5", width: 150, cellClass: 'text-center', cellRenderer: function (params) { return gagaAgGrid.toAddComma(params.value);}},
 		{headerName: "등록자", field: "regNm", width: 100, cellClass: 'text-center'},
 		{headerName: "등록일시", field: "regDt", width: 150, cellClass: 'text-center', cellRenderer: function (params) { return gagaAgGrid.toDateTimeFormat(params.value); }}
 	];
@@ -79,7 +79,7 @@
 		{headerName: 'No', width: 60, cellClass: 'text-center', valueGetter: function(params) { return params.node.rowIndex + 1 }},
 		{headerName: "상품평노출여부", field: "strSetVal1", width: 150, cellClass: 'text-center', cellRenderer: function (params) { return params.value == 'Y' ? '노출' : '미노출'; }},
 		{headerName: "품절상품노출여부", field: "strSetVal2", width: 150, cellClass: 'text-center', cellRenderer: function (params) { return params.value == 'Y' ? '노출' : '미노출'; }},
-		{headerName: "특가세일노출기준", field: "numSetVal1", width: 150, cellClass: 'text-center'},
+		{headerName: "특가세일노출기준", field: "strSetVal3", width: 150, cellClass: 'text-center', cellRenderer: function (params) { return params.value + '%'; }},
 		{headerName: "등록자", field: "regNm", width: 100, cellClass: 'text-center'},
 		{headerName: "등록일시", field: "regDt", width: 150, cellClass: 'text-center', cellRenderer: function (params) { return gagaAgGrid.toDateTimeFormat(params.value); }}
 	];
@@ -87,8 +87,9 @@
 	// 상품보관
 	var columnDefsG11 = [
 		{headerName: 'No', width: 60, cellClass: 'text-center', valueGetter: function(params) { return params.node.rowIndex + 1 }},
-		{headerName: "장바구니보관기간", field: "numSetVal1", width: 150, cellClass: 'text-center'},
-		{headerName: "위시리스트보관기간", field: "numSetVal2", width: 150, cellClass: 'text-center'},
+		{headerName: "장바구니보관기간", field: "strSetVal1", width: 150, cellClass: 'text-center', cellRenderer: function(params) { return params.value + '일'; }},
+		{headerName: "장바구니담기최대상품수", field: "strSetVal2", width: 150, cellClass: 'text-center', cellRenderer: function(params) { return params.value + '일'; }},
+		{headerName: "위시리스트보관기간", field: "strSetVal3", width: 150, cellClass: 'text-center', cellRenderer: function(params) { return params.value + '일'; }},
 		{headerName: "등록자", field: "regNm", width: 100, cellClass: 'text-center'},
 		{headerName: "등록일시", field: "regDt", width: 150, cellClass: 'text-center', cellRenderer: function (params) { return gagaAgGrid.toDateTimeFormat(params.value); }}
 	];
@@ -97,7 +98,7 @@
 // 	var columnDefsB14 = [
 // 		{headerName: 'No', width: 60, cellClass: 'text-center', valueGetter: function(params) { return params.node.rowIndex + 1 }},
 // 		{headerName: "품절안내방법", field: "strSetVal1", width: 150, cellClass: 'text-center', cellRenderer: function (params) { return params.value == 'A' ? '발송' : '미발송'; }},
-// 		{headerName: "품절안내메시지발송기간", field: "numSetVal1", width: 150, cellClass: 'text-center'},
+// 		{headerName: "품절안내메시지발송기간", field: "strSetVal1", width: 150, cellClass: 'text-center'},
 // 		{headerName: "등록자", field: "regNm", width: 100, cellClass: 'text-center'},
 // 		{headerName: "등록일시", field: "regDt", width: 150, cellClass: 'text-center', cellRenderer: function (params) { return gagaAgGrid.toDateTimeFormat(params.value); }}
 // 	];
@@ -105,8 +106,8 @@
 // 	// 배송/구매확정
 // 	var columnDefsB15 = [
 // 		{headerName: 'No', width: 60, cellClass: 'text-center', valueGetter: function(params) { return params.node.rowIndex + 1 }},
-// 		{headerName: "배송완료처리기간", field: "numSetVal1", width: 150, cellClass: 'text-center'},
-// 		{headerName: "구매확정처리기간", field: "numSetVal2", width: 150, cellClass: 'text-center'},
+// 		{headerName: "배송완료처리기간", field: "strSetVal1", width: 150, cellClass: 'text-center'},
+// 		{headerName: "구매확정처리기간", field: "strSetVal2", width: 150, cellClass: 'text-center'},
 // 		{headerName: "등록자", field: "regNm", width: 100, cellClass: 'text-center'},
 // 		{headerName: "등록일시", field: "regDt", width: 150, cellClass: 'text-center', cellRenderer: function (params) { return gagaAgGrid.toDateTimeFormat(params.value); }}
 // 	];
@@ -117,7 +118,7 @@
 // 		{headerName: "가입축하쿠폰", field: "strSetVal1", width: 150, cellClass: 'text-center'},
 // 		{headerName: "앱푸쉬수신동의쿠폰", field: "strSetVal2", width: 150, cellClass: 'text-center'},
 // 		{headerName: "생일축하쿠폰", field: "strSetVal2", width: 150, cellClass: 'text-center'},
-// 		{headerName: "생일쿠폰발급도래시점", field: "numSetVal1", width: 150, cellClass: 'text-center'},
+// 		{headerName: "생일쿠폰발급도래시점", field: "strSetVal1", width: 150, cellClass: 'text-center'},
 // 		{headerName: "등록자", field: "regNm", width: 100, cellClass: 'text-center'},
 // 		{headerName: "등록일시", field: "regDt", width: 150, cellClass: 'text-center', cellRenderer: function (params) { return gagaAgGrid.toDateTimeFormat(params.value); }}
 // 	];
@@ -125,11 +126,11 @@
 // 	// 회원포인트
 // 	var columnDefsP10 = [
 // 		{headerName: 'No', width: 60, cellClass: 'text-center', valueGetter: function(params) { return params.node.rowIndex + 1 }},
-// 		{headerName: "가입축하기본포인트", field: "numSetVal1", width: 150, cellClass: 'text-center', cellRenderer: function (params) { return gagaAgGrid.toAddComma(params.value); }},
-// 		{headerName: "가입축하추가포인트", field: "numSetVal6", width: 150, cellClass: 'text-center', cellRenderer: function (params) { return gagaAgGrid.toAddComma(params.value); }},
-// 		{headerName: "생일축하포인트", field: "numSetVal2", width: 150, cellClass: 'text-center', cellRenderer: function (params) { return gagaAgGrid.toAddComma(params.value); }},
-// 		{headerName: "앱설치후최초로그인포인트", field: "numSetVal3", width: 200, cellClass: 'text-center', cellRenderer: function (params) { return gagaAgGrid.toAddComma(params.value); }},
-// 		{headerName: "출석체크1일포인트", field: "numSetVal4", width: 150, cellClass: 'text-center', cellRenderer: function (params) { return gagaAgGrid.toAddComma(params.value); }},
+// 		{headerName: "가입축하기본포인트", field: "strSetVal1", width: 150, cellClass: 'text-center', cellRenderer: function (params) { return gagaAgGrid.toAddComma(params.value); }},
+// 		{headerName: "가입축하추가포인트", field: "strSetVal6", width: 150, cellClass: 'text-center', cellRenderer: function (params) { return gagaAgGrid.toAddComma(params.value); }},
+// 		{headerName: "생일축하포인트", field: "strSetVal2", width: 150, cellClass: 'text-center', cellRenderer: function (params) { return gagaAgGrid.toAddComma(params.value); }},
+// 		{headerName: "앱설치후최초로그인포인트", field: "strSetVal3", width: 200, cellClass: 'text-center', cellRenderer: function (params) { return gagaAgGrid.toAddComma(params.value); }},
+// 		{headerName: "출석체크1일포인트", field: "strSetVal4", width: 150, cellClass: 'text-center', cellRenderer: function (params) { return gagaAgGrid.toAddComma(params.value); }},
 // 		{headerName: "등록자", field: "regNm", width: 100, cellClass: 'text-center'},
 // 		{headerName: "등록일시", field: "regDt", width: 150, cellClass: 'text-center', cellRenderer: function (params) { return gagaAgGrid.toDateTimeFormat(params.value); }}
 // 	];
@@ -137,14 +138,14 @@
 // 	// 구매포인트
 // 	var columnDefsP11 = [
 // 		{headerName: 'No', width: 60, cellClass: 'text-center', valueGetter: function(params) { return params.node.rowIndex + 1 }},
-// 		{headerName: "자사상품정상포인트(PC)", field: "numSetVal1", width: 150, cellClass: 'text-center'},
-// 		{headerName: "자사상품정상포인트(모바일)", field: "numSetVal2", width: 150, cellClass: 'text-center'},
-// 		{headerName: "자사상품이월포인트(PC)", field: "numSetVal3", width: 150, cellClass: 'text-center'},
-// 		{headerName: "자사상품이월포인트(모바일)", field: "numSetVal4", width: 150, cellClass: 'text-center'},
-// 		{headerName: "입점상품정상포인트(PC)", field: "numSetVal5", width: 150, cellClass: 'text-center'},
-// 		{headerName: "입점상품정상포인트(모바일)", field: "numSetVal6", width: 150, cellClass: 'text-center'},
-// 		{headerName: "입점상품이월포인트(PC)", field: "numSetVal7", width: 150, cellClass: 'text-center'},
-// 		{headerName: "입점상품이월포인트(모바일)", field: "numSetVal8", width: 150, cellClass: 'text-center'},
+// 		{headerName: "자사상품정상포인트(PC)", field: "strSetVal1", width: 150, cellClass: 'text-center'},
+// 		{headerName: "자사상품정상포인트(모바일)", field: "strSetVal2", width: 150, cellClass: 'text-center'},
+// 		{headerName: "자사상품이월포인트(PC)", field: "strSetVal3", width: 150, cellClass: 'text-center'},
+// 		{headerName: "자사상품이월포인트(모바일)", field: "strSetVal4", width: 150, cellClass: 'text-center'},
+// 		{headerName: "입점상품정상포인트(PC)", field: "strSetVal5", width: 150, cellClass: 'text-center'},
+// 		{headerName: "입점상품정상포인트(모바일)", field: "strSetVal6", width: 150, cellClass: 'text-center'},
+// 		{headerName: "입점상품이월포인트(PC)", field: "strSetVal7", width: 150, cellClass: 'text-center'},
+// 		{headerName: "입점상품이월포인트(모바일)", field: "strSetVal8", width: 150, cellClass: 'text-center'},
 // 		{headerName: "등록자", field: "regNm", width: 100, cellClass: 'text-center'},
 // 		{headerName: "등록일시", field: "regDt", width: 150, cellClass: 'text-center', cellRenderer: function (params) { return gagaAgGrid.toDateTimeFormat(params.value); }}
 // 	];
@@ -155,10 +156,10 @@
 // 		{headerName: "포인트지급방법", field: "strSetVal1", width: 150, cellClass: 'text-center',
 // 			valueFormatter: function (params) { return gagaAgGrid.lookupValue(pointGiveType, params.value); }
 // 		},
-// 		{headerName: "텍스트상품평포인트", field: "numSetVal1", width: 150, cellClass: 'text-center'},
-// 		{headerName: "포토상품평포인트", field: "numSetVal2", width: 150, cellClass: 'text-center'},
-// 		{headerName: "최초텍스트상품평배율", field: "numSetVal3", width: 150, cellClass: 'text-center'},
-// 		{headerName: "최초포토상품평포인트배율", field: "numSetVal4", width: 150, cellClass: 'text-center'},
+// 		{headerName: "텍스트상품평포인트", field: "strSetVal1", width: 150, cellClass: 'text-center'},
+// 		{headerName: "포토상품평포인트", field: "strSetVal2", width: 150, cellClass: 'text-center'},
+// 		{headerName: "최초텍스트상품평배율", field: "strSetVal3", width: 150, cellClass: 'text-center'},
+// 		{headerName: "최초포토상품평포인트배율", field: "strSetVal4", width: 150, cellClass: 'text-center'},
 // 		{headerName: "등록자", field: "regNm", width: 100, cellClass: 'text-center'},
 // 		{headerName: "등록일시", field: "regDt", width: 150, cellClass: 'text-center', cellRenderer: function (params) { return gagaAgGrid.toDateTimeFormat(params.value); }}
 // 	];
@@ -166,10 +167,10 @@
 // 	// 클레임포인트
 // 	var columnDefsP13 = [
 // 		{headerName: 'No', width: 60, cellClass: 'text-center', valueGetter: function(params) { return params.node.rowIndex + 1 }},
-// 		{headerName: "배송지연보상기준일수", field: "numSetVal1", width: 150, cellClass: 'text-center'},
-// 		{headerName: "배송지연보상포인트", field: "numSetVal2", width: 150, cellClass: 'text-center'},
-// 		{headerName: "품절보상기준일수", field: "numSetVal3", width: 150, cellClass: 'text-center'},
-// 		{headerName: "품절보상포인트", field: "numSetVal4", width: 150, cellClass: 'text-center'},
+// 		{headerName: "배송지연보상기준일수", field: "strSetVal1", width: 150, cellClass: 'text-center'},
+// 		{headerName: "배송지연보상포인트", field: "strSetVal2", width: 150, cellClass: 'text-center'},
+// 		{headerName: "품절보상기준일수", field: "strSetVal3", width: 150, cellClass: 'text-center'},
+// 		{headerName: "품절보상포인트", field: "strSetVal4", width: 150, cellClass: 'text-center'},
 // 		{headerName: "등록자", field: "regNm", width: 100, cellClass: 'text-center'},
 // 		{headerName: "등록일시", field: "regDt", width: 150, cellClass: 'text-center', cellRenderer: function (params) { return gagaAgGrid.toDateTimeFormat(params.value); }}
 // 	];
@@ -177,8 +178,8 @@
 // 	// 가용포인트전환
 // 	var columnDefsP20 = [
 // 		{headerName: 'No', width: 60, cellClass: 'text-center', valueGetter: function(params) { return params.node.rowIndex + 1 }},
-// 		{headerName: "가용포인트전환대기일수", field: "numSetVal1", width: 150, cellClass: 'text-center'},
-// 		{headerName: "가용포인트추가적립율", field: "numSetVal2", width: 150, cellClass: 'text-center'},
+// 		{headerName: "가용포인트전환대기일수", field: "strSetVal1", width: 150, cellClass: 'text-center'},
+// 		{headerName: "가용포인트추가적립율", field: "strSetVal2", width: 150, cellClass: 'text-center'},
 // 		{headerName: "등록자", field: "regNm", width: 100, cellClass: 'text-center'},
 // 		{headerName: "등록일시", field: "regDt", width: 150, cellClass: 'text-center', cellRenderer: function (params) { return gagaAgGrid.toDateTimeFormat(params.value); }}
 // 	];
@@ -197,11 +198,11 @@
 // 				return value + '단위절사';
 // 			}
 // 		},
-// 		{headerName: "사용가능보유포인트금액", field: "numSetVal1", width: 150, cellClass: 'text-center', cellRenderer: function (params) { return gagaAgGrid.toAddComma(params.value); }},
-// 		{headerName: "사용가능최소포인트금액", field: "numSetVal2", width: 150, cellClass: 'text-center', cellRenderer: function (params) { return gagaAgGrid.toAddComma(params.value); }},
-// 		{headerName: "사용가능최대포인트율", field: "numSetVal3", width: 150, cellClass: 'text-center'},
-// 		{headerName: "즉시사용최대포인트금액", field: "numSetVal5", width: 150, cellClass: 'text-center', cellRenderer: function (params) { return gagaAgGrid.toAddComma(params.value); }},
-// 		{headerName: "최소주문제한금액", field: "numSetVal4", width: 120, cellClass: 'text-center', cellRenderer: function (params) { return gagaAgGrid.toAddComma(params.value); }},
+// 		{headerName: "사용가능보유포인트금액", field: "strSetVal1", width: 150, cellClass: 'text-center', cellRenderer: function (params) { return gagaAgGrid.toAddComma(params.value); }},
+// 		{headerName: "사용가능최소포인트금액", field: "strSetVal2", width: 150, cellClass: 'text-center', cellRenderer: function (params) { return gagaAgGrid.toAddComma(params.value); }},
+// 		{headerName: "사용가능최대포인트율", field: "strSetVal3", width: 150, cellClass: 'text-center'},
+// 		{headerName: "즉시사용최대포인트금액", field: "strSetVal5", width: 150, cellClass: 'text-center', cellRenderer: function (params) { return gagaAgGrid.toAddComma(params.value); }},
+// 		{headerName: "최소주문제한금액", field: "strSetVal4", width: 120, cellClass: 'text-center', cellRenderer: function (params) { return gagaAgGrid.toAddComma(params.value); }},
 // 		{headerName: "등록자", field: "regNm", width: 100, cellClass: 'text-center'},
 // 		{headerName: "등록일시", field: "regDt", width: 150, cellClass: 'text-center', cellRenderer: function (params) { return gagaAgGrid.toDateTimeFormat(params.value); }}
 // 	];